diff --git a/signaturenDruck/defaultFiles/defaultMode.json b/signaturenDruck/defaultFiles/defaultMode.json index 7d15d28..c6ab950 100644 --- a/signaturenDruck/defaultFiles/defaultMode.json +++ b/signaturenDruck/defaultFiles/defaultMode.json @@ -4,20 +4,36 @@ { "id": 0, "format": "default_gross", - "useRegEx": true, - "exampleShelfmark": "PÄD:TG:1420:Dan::2017", - "regEx": "(.*):(.*):(.*):(.*):(.*):(.*)", - "delimiter": ":", - "result": ["Standort: $LOC", "$1 $2", "$3", "$4", "$5", "$6"] + "useRegEx": false, + "exampleShelfmark": "200 AP 14350 S377", + "regEx": "(.*)\\s(.*)\\s(.*)\\s(.*)\\s(.*)", + "delimiter": " ", + "result": [ + "$1", + "", + "$2", + "$3", + "$4" + ], + "exampleLoc": "UB", + "locRegEx": "" }, { "id": 1, "format": "default_klein", - "useRegEx": true, - "exampleShelfmark": "2018 B 1024 :1", - "regEx": "^(\\w+\\s[\\w\\.\\,]+)([\\s\\/]?)([^\\/\\:]*)([\\/\\:]?)(.*)$", - "delimiter": ":", - "result": ["$1$2", "$3$4", "$5$6"] + "useRegEx": false, + "exampleShelfmark": "200 AP 14350 S377", + "regEx": "(.*)\\s(.*)\\s(.*)\\s(.*)\\s(.*)", + "delimiter": " ", + "result": [ + "$1", + "", + "$2", + "$3", + "$4" + ], + "exampleLoc": "UB", + "locRegEx": "" } ] } \ No newline at end of file diff --git a/signaturenDruck/defaultFiles/default_gross.css b/signaturenDruck/defaultFiles/default_gross.css index 49c5891..06f6518 100644 --- a/signaturenDruck/defaultFiles/default_gross.css +++ b/signaturenDruck/defaultFiles/default_gross.css @@ -1,70 +1,60 @@ #previewBox.format_default_gross { -width: 80mm; -height: 43mm; +width: 25mm; +height: 50mm; } .format_default_gross { -text-align: initial; +text-align: center; white-space: nowrap; overflow: hidden; } .format_default_gross { -align-items: center; +align-items: initial; } -#toPrint.format_default_gross> .innerBox { -height: 43mm; -width: 80mm; -display: flex; -justify-content: center; -flex-direction: column; +#toPrint.format_default_gross.innerBox { +height: 50mm; +width: 25mm; } .format_default_gross > .innerBox > p { margin: 0px 0px 0px 0px; } .format_default_gross > .innerBox > .line_1 { -font-family: "Arial Narrow"; +font-family: "Arial"; font-size: 16pt; -font-weight: bold; +font-weight: normal; font-style: normal; -margin-left: 47%; +margin-left: 0%; } .format_default_gross > .innerBox > .line_2 { -font-family: "Arial Narrow"; +font-family: "Arial"; font-size: 16pt; -font-weight: bold; +font-weight: normal; font-style: normal; -margin-left: 47%; +margin-left: 0%; } .format_default_gross > .innerBox > .line_3 { -font-family: "Arial Narrow"; +font-family: "Arial"; font-size: 16pt; font-weight: bold; font-style: normal; -margin-left: 47%; +margin-left: 0%; } .format_default_gross > .innerBox > .line_4 { -font-family: "Arial Narrow"; +font-family: "Arial"; font-size: 16pt; -font-weight: normal; +font-weight: bold; font-style: normal; -margin-left: 47%; +margin-left: 0%; } .format_default_gross > .innerBox > .line_5 { -font-family: "Arial Narrow"; +font-family: "Arial"; font-size: 16pt; font-weight: normal; font-style: normal; -margin-left: 47%; -} -.format_default_gross > .innerBox > .line_6 { -font-family: "Arial Narrow"; -font-size: 16pt; -font-weight: bold; -font-style: normal; -margin-left: 47%; +margin-left: 0%; } @media print { #toPrint.format_default_gross > .innerBox { -margin: 2.96mm 0mm 0mm 8.985mm; +margin: 0mm 0mm 0mm -0.8mm; } body { margin: 0px; diff --git a/signaturenDruck/defaultFiles/default_gross.json b/signaturenDruck/defaultFiles/default_gross.json index 31fcf05..4e4b1ab 100644 --- a/signaturenDruck/defaultFiles/default_gross.json +++ b/signaturenDruck/defaultFiles/default_gross.json @@ -1,78 +1,74 @@ { "name": "default_gross", - "printer": "\\\\printsrv\\ulbps101", + "printer": "NPI514C48 (HP LaserJet 100 colorMFP M175nw)", "label": { - "width": "80mm", - "height": "43mm" + "width": "25mm", + "height": "50mm" }, "pdfName": "default_gross.pdf", "paper": { - "width": "99970", - "height": "48920" + "width": "25400", + "height": "50800" }, - "lines": "6", + "lines": "5", "example": { - "shelfmark": "PÄD:TG:1420:Dan::2017", + "shelfmark": "200 AP 14350 S377", "parts": [ - "PÄD", - "TG", - "1420", - "Dan", - "
", - "2017" + "200", + " ", + "AP", + "14350", + "S377", + "200", + " ", + "AP", + "14350", + "S377" ] }, - "centerHor": false, - "centerVer": true, + "centerHor": true, + "centerVer": false, "lineSpace": "0", "linesData": [ { "id": 1, - "font": "Arial Narrow", + "font": "Arial", "fontSize": "16", - "bold": true, + "bold": false, "italic": false, - "indent": "47" + "indent": "0" }, { "id": 2, - "font": "Arial Narrow", + "font": "Arial", "fontSize": "16", - "bold": true, + "bold": false, "italic": false, - "indent": "47" + "indent": "0" }, { "id": 3, - "font": "Arial Narrow", + "font": "Arial", "fontSize": "16", "bold": true, "italic": false, - "indent": "47" + "indent": "0" }, { "id": 4, - "font": "Arial Narrow", + "font": "Arial", "fontSize": "16", - "bold": false, + "bold": true, "italic": false, - "indent": "47" + "indent": "0" }, { "id": 5, - "font": "Arial Narrow", + "font": "Arial", "fontSize": "16", "bold": false, "italic": false, - "indent": "47" - }, - { - "id": 6, - "font": "Arial Narrow", - "fontSize": "16", - "bold": true, - "italic": false, - "indent": "47" + "indent": "0" } ], "marginTop": "-3" diff --git a/signaturenDruck/defaultFiles/default_klein.css b/signaturenDruck/defaultFiles/default_klein.css index b6bb1ee..940cdf2 100644 --- a/signaturenDruck/defaultFiles/default_klein.css +++ b/signaturenDruck/defaultFiles/default_klein.css @@ -1,49 +1,60 @@ #previewBox.format_default_klein { -width: 74mm; -height: 23mm; +width: 25mm; +height: 50mm; } .format_default_klein { -text-align: initial; +text-align: center; white-space: nowrap; overflow: hidden; } .format_default_klein { -align-items: center; +align-items: initial; } -#toPrint.format_default_klein> .innerBox { -height: 23mm; -width: 74mm; -display: flex; -justify-content: center; -flex-direction: column; +#toPrint.format_default_klein.innerBox { +height: 50mm; +width: 25mm; } .format_default_klein > .innerBox > p { margin: 0px 0px 0px 0px; } .format_default_klein > .innerBox > .line_1 { font-family: "Arial Narrow"; -font-size: 15pt; -font-weight: bold; +font-size: 16pt; +font-weight: normal; font-style: normal; -margin-left: 45%; +margin-left: 0%; } .format_default_klein > .innerBox > .line_2 { font-family: "Arial Narrow"; -font-size: 15pt; -font-weight: bold; +font-size: 16pt; +font-weight: normal; font-style: normal; -margin-left: 45%; +margin-left: 0%; } .format_default_klein > .innerBox > .line_3 { font-family: "Arial Narrow"; -font-size: 15pt; +font-size: 16pt; font-weight: bold; font-style: normal; -margin-left: 45%; +margin-left: 0%; +} +.format_default_klein > .innerBox > .line_4 { +font-family: "Arial Narrow"; +font-size: 16pt; +font-weight: bold; +font-style: normal; +margin-left: 0%; +} +.format_default_klein > .innerBox > .line_5 { +font-family: "Arial Narrow"; +font-size: 16pt; +font-weight: normal; +font-style: normal; +margin-left: 0%; } @media print { #toPrint.format_default_klein > .innerBox { -margin: 2.25mm 0mm 0mm 1.75mm; +margin: 0mm 0mm 0mm -0.8mm; } body { margin: 0px; diff --git a/signaturenDruck/defaultFiles/default_klein.json b/signaturenDruck/defaultFiles/default_klein.json index 2801f1f..c48ac45 100644 --- a/signaturenDruck/defaultFiles/default_klein.json +++ b/signaturenDruck/defaultFiles/default_klein.json @@ -1,51 +1,74 @@ { "name": "default_klein", - "printer": "\\\\printsrv\\ulbps124", + "printer": "NPI514C48 (HP LaserJet 100 colorMFP M175nw)", "label": { - "width": "74mm", - "height": "23mm" + "width": "25mm", + "height": "50mm" }, "pdfName": "default_klein.pdf", "paper": { - "width": "79500", - "height": "27500" + "width": "25400", + "height": "50800" }, - "lines": "3", + "lines": "5", "example": { - "shelfmark": "2018 B 1024 :1", + "shelfmark": "200 AP 14350 S377", "parts": [ - "2018 B", - "1024 :", - "1" + "200", + " ", + "AP", + "14350", + "S377", + "200", + " ", + "AP", + "14350", + "S377" ] }, - "centerHor": false, - "centerVer": true, + "centerHor": true, + "centerVer": false, "lineSpace": "0", "linesData": [ { "id": 1, "font": "Arial Narrow", - "fontSize": "15", - "bold": true, + "fontSize": "16", + "bold": false, "italic": false, - "indent": "45" + "indent": "0" }, { "id": 2, "font": "Arial Narrow", - "fontSize": "15", - "bold": true, + "fontSize": "16", + "bold": false, "italic": false, - "indent": "45" + "indent": "0" }, { "id": 3, "font": "Arial Narrow", - "fontSize": "15", + "fontSize": "16", "bold": true, "italic": false, - "indent": "45" + "indent": "0" + }, + { + "id": 4, + "font": "Arial Narrow", + "fontSize": "16", + "bold": true, + "italic": false, + "indent": "0" + }, + { + "id": 5, + "font": "Arial Narrow", + "fontSize": "16", + "bold": false, + "italic": false, + "indent": "0" } ], "marginTop": "-1"