Skip to content

Commit f2ae061

Browse files
EliDehEliDeh
committed
implemented modes, thulbMode & defaultMode already exist
1 parent 7b50ad1 commit f2ae061

12 files changed

Lines changed: 717 additions & 168 deletions

File tree

‎signaturenDruck/html/config.html‎

Lines changed: 166 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,184 @@
1717
<div id="configInputs">
1818
<div class="columns">
1919
<div class="column is-half">
20+
<div class="box">
21+
<h2 class="subtitle is-4">Modus</h2>
22+
<div class="field is-horizontal">
23+
<div class="field-label is-normal oneLabelSize" id="label_selectMode">
24+
<label class="label">Modus</label>
25+
</div>
26+
<div class="field-body">
27+
<div class="field">
28+
<p class="control">
29+
<div class="select oneLabelSize fullwidth" id="selectModeDiv">
30+
<select id="selectMode" class="fullwidth">
31+
<option value=''>--neuer Modus--</option>
32+
</select>
33+
</div>
34+
</p>
35+
</div>
36+
</div>
37+
</div>
38+
<div class="field is-horizontal">
39+
<div class="field-label is-normal oneLabelSize" id="label_modeName">
40+
<label class="label">- Name</label>
41+
</div>
42+
<div class="field-body">
43+
<div class="field">
44+
<p class="control">
45+
<input id="input_modeName" class="input fullwidth" type="text" placeholder="thulbMode"/>
46+
</p>
47+
</div>
48+
</div>
49+
</div>
50+
<div class="field is-horizontal">
51+
<div class="field-label is-normal oneLabelSize" id="label_selectSubMode">
52+
<label class="label">Untermodus</label>
53+
</div>
54+
<div class="field-body">
55+
<div class="field">
56+
<p class="control">
57+
<div class="select oneLabelSize fullwidth" id="selectSubModeDiv">
58+
<select id="selectSubMode" class="fullwidth">
59+
<option value=''>--neuer Untermodus--</option>
60+
</select>
61+
</div>
62+
</p>
63+
</div>
64+
</div>
65+
</div>
66+
<div class="field is-horizontal">
67+
<div class="field-label is-normal oneLabelSize" id="label_subModeName">
68+
<label class="label">- Name</label>
69+
</div>
70+
<div class="field-body">
71+
<div class="field">
72+
<p class="control">
73+
<input id="input_subModeName" class="input fullwidth" type="text" placeholder="thulb_gross"/>
74+
</p>
75+
</div>
76+
</div>
77+
</div>
78+
</div>
79+
<div class="box">
80+
<h2 class="subtitle is-4">Signaturenaufbau</h2>
81+
<div class="field is-horizontal">
82+
<div class="field-label is-normal oneLabelSize" id="label_example">
83+
<label class="label">Beispiel</label>
84+
</div>
85+
<div class="field-body">
86+
<div class="field">
87+
<p class="control">
88+
<input id="input_example" class="input fullwidth" type="text" value="">
89+
</p>
90+
</div>
91+
</div>
92+
</div>
93+
<div class="field is-horizontal">
94+
<div class="field-label is-normal oneLabelSize" id="label_regEx">
95+
<label class="label">RegEx</label>
96+
</div>
97+
<div class="field-body">
98+
<div class="field">
99+
<p class="control">
100+
<input id="input_regEx" class="input fullwidth" type="text" value="">
101+
</p>
102+
</div>
103+
</div>
104+
</div>
105+
<div class="field is-horizontal">
106+
<div class="field-label is-normal oneLabelSize" id="label_delimiter">
107+
<label class="label">Delimiter</label>
108+
</div>
109+
<div class="field-body">
110+
<div class="field">
111+
<p class="control">
112+
<input id="input_delimiter" class="input has-text-centered" type="text" maxlength="1" value="" disabled>
113+
</p>
114+
</div>
115+
</div>
116+
</div>
117+
<div class="field is-horizontal">
118+
<div class="field-body">
119+
<div class="field">
120+
<p class="control">
121+
<button id="btn_test" class="button is-success">Testen</button>
122+
<label class="radio" id="label_useRegEx">
123+
<input type="radio" name="useRegEx" id="radioBtn_useRegEx" checked>
124+
RegEx
125+
</label>
126+
<label class="radio" id="label_useDelimiter">
127+
<input type="radio" name="useRegEx" id="radioBtn_useDelimiter">
128+
Delimiter
129+
</label>
130+
</p>
131+
</div>
132+
</div>
133+
</div>
134+
</div>
135+
</div>
136+
<div class="column is-half">
137+
<div class="box">
138+
<h2 class="subtitle is-4">Hinweise</h2>
139+
<div id="infoBox">
20140

141+
</div>
142+
</div>
143+
</div>
144+
</div>
145+
<div class="columns">
146+
<div class="column is-half">
147+
<div class="box">
148+
<h2 class="subtitle is-4">Ergebnis</h2>
149+
<div class="field is-horizontal">
150+
<div class="field-label is-normal oneLabelSize" id="label_rows">
151+
<label class="label">Zeilen</label>
152+
</div>
153+
<div class="field-body">
154+
<div class="field has-addons">
155+
<p class="control fullwidth">
156+
<input id="input_labelLines" class="input" value="0" readonly />
157+
</p>
158+
<p class="control">
159+
<a id="btn_removeLine" class="button">-</a>
160+
</p>
161+
<p class="control">
162+
<a id="btn_addLine" class="button">+</a>
163+
</p>
164+
</div>
165+
</div>
166+
</div>
167+
<div class="field is-horizontal">
168+
<div class="field-body">
169+
<div class="field">
170+
<p class="control">
171+
<button id="btn_refresh" class="button is-success">Aktualisieren</button>
172+
</p>
173+
</div>
174+
</div>
175+
</div>
176+
<div id="linesBox">
177+
178+
</div>
179+
</div>
21180
</div>
22181
<div class="column is-half">
182+
<div class="box">
183+
<h2 class="subtitle is-4">Vorschau</h2>
184+
<div id='preview'>
23185

186+
</div>
187+
</div>
24188
</div>
25189
</div>
26190
</div>
27191

28192
<div id="buttonBox" class="box level">
29193
<div class="level-left">
30-
<button id="btn_save" class="button is-success">Speichern</button>
194+
<button id="btn_save" class="button is-success">Weiter</button>
31195
</div>
32196
<div class="level-right">
33-
<button id="btn_close" class="button is-danger">Schließen</button>
197+
<button id="btn_close" class="button is-danger">Abbruch</button>
34198
</div>
35199
</div>
36200

‎signaturenDruck/html/editor.html‎

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ <h2 class="subtitle is-4">Format</h2>
4242
<div class="field-body">
4343
<div class="field">
4444
<p class="control">
45-
<input id="input_fileName" class="input fullwidth" type="text" placeholder="z.B. thulb_gross"/>
45+
<input id="input_fileName" class="input fullwidth readonly" type="text" placeholder="z.B. thulb_gross" disabled/>
4646
</p>
4747
</div>
4848
</div>
@@ -64,30 +64,6 @@ <h2 class="subtitle is-4">Format</h2>
6464
</div>
6565
<div class="box" id="delimBox">
6666
<h2 class="subtitle is-4">Signatur</h2>
67-
<div class="field is-horizontal" id="useRegExBox">
68-
<div class="field-body">
69-
<div class="field">
70-
<p class="control has-text-centered">
71-
<input id="chkbx_regEx" type="checkbox" checked/>
72-
</p>
73-
</div>
74-
</div>
75-
<div class="field-label is-normal" id="label_checkboxRegEx">
76-
<label class="label">Regulären Ausdruck übernehmen</label>
77-
</div>
78-
</div>
79-
<div class="field is-horizontal">
80-
<div class="field-label is-normal oneLabelSize" id="label_delimiter">
81-
<label class="label">Trennzeichen</label>
82-
</div>
83-
<div class="field-body">
84-
<div class="field">
85-
<p class="control">
86-
<input id="input_delimiter" class="input has-text-centered" type="text" maxlength="1" value=":" />
87-
</p>
88-
</div>
89-
</div>
90-
</div>
9167
<div class="field is-horizontal">
9268
<div class="field-label is-normal oneLabelSize" id="label_example">
9369
<label class="label">Beispiel</label>
@@ -185,15 +161,9 @@ <h2 class="subtitle is-4">Label</h2>
185161
<label class="label">Zeilen</label>
186162
</div>
187163
<div class="field-body">
188-
<div class="field has-addons">
164+
<div class="field">
189165
<p class="control fullwidth">
190-
<input id="input_labelLines" class="input fullwidth" value="1" readonly />
191-
</p>
192-
<p class="control">
193-
<a id="btn_removeLine" class="button">-</a>
194-
</p>
195-
<p class="control">
196-
<a id="btn_addLine" class="button">+</a>
166+
<input id="input_labelLines" class="input fullwidth readonly" value="1" readonly />
197167
</p>
198168
</div>
199169
</div>

‎signaturenDruck/js/K10plus/loadDataFromFileK10plus.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ module.exports = function (allLines) {
3636
let allSubModeData = mode.modes[config.get('mode.defaultMode')].subModes
3737
_.forEach(allSubModeData, function (value) {
3838
let data = {
39-
'name': '',
39+
'format': '',
4040
'lines': ''
4141
}
42-
data.name = value.format
42+
data.format = value.format
4343
if (value.useRegEx) {
4444
let regex = new RegExp(value.regEx)
4545
if (regex.test(plainTxt) && sig.defaultSubMode === '') {

‎signaturenDruck/js/classes/Preview.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ class Preview {
4040
}
4141

4242
searchAndShow (found, formatLines, formatName) {
43-
let lines = _.find(found.modes, { 'name': formatName }).lines
43+
let lines = _.find(found.modes, { 'format': formatName }).lines
4444
if (found !== undefined) {
4545
this.showData(lines, formatLines)
4646
}
4747
}
4848

4949
checkIfNoIndent (cleanId, manualSignatures, formatLines, formatName) {
50-
let lines = _.find(manualSignatures[cleanId].modes, { 'name': formatName }).lines
50+
let lines = _.find(manualSignatures[cleanId].modes, { 'format': formatName }).lines
5151
this.showData(lines, formatLines)
5252
if (manualSignatures[cleanId].removeIndent) {
5353
document.getElementsByClassName('innerBox')[0].className = 'innerBox noIndent'

‎signaturenDruck/js/classes/ShelfmarksFromSRUData.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ class ShelfmarksFromSRUData {
4646
let allSubModeData = mode.modes[config.get('mode.defaultMode')].subModes
4747
_.forEach(allSubModeData, function (value) {
4848
let data = {
49-
'name': '',
49+
'format': '',
5050
'lines': ''
5151
}
52-
data.name = value.format
52+
data.format = value.format
5353
if (value.useRegEx) {
5454
let regex = new RegExp(value.regEx)
5555
if (regex.test(sig.txtOneLine) && sig.defaultSubMode === '') {

0 commit comments

Comments
 (0)