Projekt

Obecné

Profil

« Předchozí | Další » 

Revize cb097b80

Přidáno uživatelem Ondřej Anděl před téměř 4 roky(ů)

Bug #8550: Oprava chyb ze schůzky 8.4.

Zobrazit rozdíly:

application/view/modals/editModal.html
9 9
                <div class="container">
10 10
                    <div class="row my-1">
11 11
                        <div class="col-xs-12 col-sm-4">
12
                            <label for="word">Slovo:</label>
12
                            <label for="lemma">Lemma:</label>
13 13
                        </div>
14 14
                        <div class="col-xs-12 col-sm-8">
15
                            <input class="min-wdth" id="word"/>
15
                            <input class="min-wdth" id="lemma"/>
16 16
                        </div>
17 17
                    </div>
18 18
                    <div class="row my-1">
19 19
                        <div class="col-xs-12 col-sm-4">
20
                            <label for="lemma">Lemma:</label>
20
                            <label for="word">Slovo:</label>
21 21
                        </div>
22 22
                        <div class="col-xs-12 col-sm-8">
23
                            <input class="min-wdth" id="lemma"/>
23
                            <input class="min-wdth" id="word"/>
24 24
                        </div>
25 25
                    </div>
26 26
                    <div class="row my-1">
......
72 72
                            <input class="min-wdth" id="context"/>
73 73
                        </div>
74 74
                    </div>
75
                    <div class="row my-1">
76
                        <div class="col-xs-12 col-sm-4">
77
                            <label for="description">Poznámka 1:</label>
78
                        </div>
79
                        <div class="col-xs-12 col-sm-8">
80
                            <input class="min-wdth" id="description"/>
81
                        </div>
82
                    </div>
83
                    <div class="row my-1">
84
                        <div class="col-xs-12 col-sm-4">
85
                            <label for="description2">Poznámka 2:</label>
86
                        </div>
87
                        <div class="col-xs-12 col-sm-8">
88
                            <input class="min-wdth" id="description2"/>
89
                        </div>
90
                    </div>
91
                    <div class="row my-1">
92
                        <div class="col-xs-12 col-sm-4">
93
                            <label for="description3">Poznámka 3:</label>
94
                        </div>
95
                        <div class="col-xs-12 col-sm-8">
96
                            <input class="min-wdth" id="description3"/>
97
                        </div>
98
                    </div>
75 99
                    <div class="row my-1">
76 100
                        <div class="col-xs-12 col-sm-4">
77 101
                            <label for="wordclass">Slovní druh:</label>
78 102
                        </div>
79 103
                        <div class="col-xs-12 col-sm-8">
80 104
                            <select class="min-wdth" onchange="changeWordType()"  id="wordclass">
81
                                <option selected="selected" value = "">Nevybráno</option>
82
                                <option value = "N">Substantiva</option>
83
                                <option value = "A">Adjektiva</option>
84
                                <option value = "P">Pronomina</option>
85
                                <option value = "C">Numeralia</option>
86
                                <option value = "V">Verba</option>
87
                                <option value = "D">Adverbia</option>
88
                                <option value = "R">Prepozice</option>
89
                                <option value = "J">Konjunkce</option>
90
                                <option value = "I">Interjekce</option>
91
                                <option value = "T">Partikule</option>
105
                                <option selected="selected" value = "">nevybráno</option>
106
                                <option value = "N">substantivum</option>
107
                                <option value = "A">adjektivum</option>
108
                                <option value = "P">pronomen</option>
109
                                <option value = "C">numeralie</option>
110
                                <option value = "V">verbum</option>
111
                                <option value = "D">adverbium</option>
112
                                <option value = "R">prepozice</option>
113
                                <option value = "J">konjunkce</option>
114
                                <option value = "T">partikule</option>
115
                                <option value = "I">interjekce</option>
92 116
                            </select>
93 117
                        </div>
94 118
                    </div>
......
100 124
                        </div>
101 125
                        <div class="col-xs-12 col-sm-8">
102 126
                            <select class="min-wdth" id="person">
103
                                <option selected="selected" value = "">Nevybráno</option>
127
                                <option selected="selected" value = "">nevybráno</option>
104 128
                                <option value = "1">1.</option>
105 129
                                <option value = "2">2.</option>
106 130
                                <option value = "3">3.</option>
......
113 137
                        </div>
114 138
                        <div class="col-xs-12 col-sm-8">
115 139
                            <select class="min-wdth" id="case">
116
                                <option selected="selected" value = "">Nevybráno</option>
117
                                <option value = "1">Nominativ</option>
118
                                <option value = "2">Genitiv</option>
119
                                <option value = "3">Dativ</option>
120
                                <option value = "4">Akuzativ</option>
121
                                <option value = "5">Vokativ</option>
122
                                <option value = "6">Lokál</option>
123
                                <option value = "7">Instrumentál</option>
140
                                <option selected="selected" value = "">nevybráno</option>
141
                                <option value = "1">nominativ</option>
142
                                <option value = "2">genitiv</option>
143
                                <option value = "3">dativ</option>
144
                                <option value = "4">akuzativ</option>
145
                                <option value = "5">vokativ</option>
146
                                <option value = "6">lokál</option>
147
                                <option value = "7">instrumentál</option>
124 148
                            </select>
125 149
                        </div>
126 150
                    </div>
......
130 154
                        </div>
131 155
                        <div class="col-xs-12 col-sm-8">
132 156
                            <select class="min-wdth" id="countability">
133
                                <option selected="selected" value = "">Nevybráno</option>
134
                                <option value = "S">Singulár</option>
135
                                <option value = "P">Plurál</option>
136
                                <option value = "D">Duál</option>
157
                                <option selected="selected" value = "">nevybráno</option>
158
                                <option value = "S">singulár</option>
159
                                <option value = "P">plurál</option>
160
                                <option value = "D">duál</option>
137 161
                            </select>
138 162
                        </div>
139 163
                    </div>
140
                    <div class="row my-1" id="gender-wrapper">
164
                    <div class="row my-1" id="mood-wrapper">
141 165
                        <div class="col-xs-12 col-sm-4">
142
                            <label for="gender">Rod:</label>
166
                            <label for="mood">Způsob:</label>
143 167
                        </div>
144 168
                        <div class="col-xs-12 col-sm-8">
145
                            <select class="min-wdth" id="gender">
146
                                <option selected="selected" value = "">Nevybráno</option>
147
                                <option value = "M">Maskulinum</option>
148
                                <option value = "F">Femininum</option>
149
                                <option value = "N">Neutrum</option>
169
                            <select class="min-wdth" id="mood" onchange="moodChange()">
170
                                <option selected="selected" value = "">nevybráno</option>
171
                                <option value = "d">indikativ</option>
172
                                <option value = "i">imperativ</option>
173
                                <option value = "c">kondicionál</option>
150 174
                            </select>
151 175
                        </div>
152 176
                    </div>
153
                    <div class="row my-1" id="shape-wrapper">
177
                    <div class="row my-1" id="time-wrapper">
154 178
                        <div class="col-xs-12 col-sm-4">
155
                            <label for="shape">Tvar:</label>
179
                            <label for="time">Čas:</label>
156 180
                        </div>
157 181
                        <div class="col-xs-12 col-sm-8">
158
                            <select class="min-wdth" id="shape">
159
                                <option selected="selected" value = "">Nevybráno</option>
160
                                <option value = "C">Složený</option>
161
                                <option value = "N">Jmenný</option>
182
                            <select class="min-wdth" id="time">
183
                                <option selected="selected" value = "">nevybráno</option>
184
                                <option value = "P">prézens</option>
185
                                <option value = "A">aorist</option>
186
                                <option value = "R">préteritum</option>
187
                                <option value = "I">imperfektum</option>
188
                                <option value = "H">plusquamperfektum</option>
189
                                <option value = "F">futurum</option>
162 190
                            </select>
163 191
                        </div>
164 192
                    </div>
165
                    <div class="row my-1" id="grade-wrapper">
193
                    <div class="row my-1" id="v-type-wrapper">
166 194
                        <div class="col-xs-12 col-sm-4">
167
                            <label for="grade">Stupeň:</label>
195
                            <label for="v-type">Slovesný rod:</label>
168 196
                        </div>
169 197
                        <div class="col-xs-12 col-sm-8">
170
                            <select class="min-wdth" id="grade">
171
                                <option selected="selected" value = "">Nevybráno</option>
172
                                <option value = "1">Pozitiv</option>
173
                                <option value = "2">Komparativ</option>
174
                                <option value = "3">Superlativ</option>
198
                            <select class="min-wdth" id="v-type">
199
                                <option selected="selected" value = "">nevybráno</option>
200
                                <option value = "A">aktivum</option>
201
                                <option value = "P">pasivum</option>
175 202
                            </select>
176 203
                        </div>
177 204
                    </div>
178
                    <div class="row my-1" id="type-wrapper">
205
                    <div class="row my-1" id="vid-wrapper">
179 206
                        <div class="col-xs-12 col-sm-4">
180
                            <label for="type">Druh:</label>
207
                            <label for="vid">Slovesný vid:</label>
181 208
                        </div>
182 209
                        <div class="col-xs-12 col-sm-8">
183
                            <select class="min-wdth" id="type">
184
                                <option selected="selected" value = "">Nevybráno</option>
185
                                <option value = "P">Personalia</option>
186
                                <option value = "S">Posesiva</option>
187
                                <option value = "D">Demonstrativa</option>
188
                                <option value = "Q">Interogativa</option>
189
                                <option value = "J">Relativa</option>
190
                                <option value = "Z">Indefinita</option>
191
                                <option value = "L">Limitativa</option>
192
                                <option value = "W">Negativa</option>
210
                            <select class="min-wdth" id="vid">
211
                                <option selected="selected" value = "">nevybráno</option>
212
                                <option value = "P">perfektivum</option>
213
                                <option value = "I">imperfektivum </option>
193 214
                            </select>
194 215
                        </div>
195 216
                    </div>
196
                    <div class="row my-1" id="time-wrapper">
217
                    <div class="row my-1" id="irregular-wrapper">
197 218
                        <div class="col-xs-12 col-sm-4">
198
                            <label for="time">Čas:</label>
219
                            <label for="irregular">Neurčitý slovesný tvar:</label>
199 220
                        </div>
200 221
                        <div class="col-xs-12 col-sm-8">
201
                            <select class="min-wdth" id="time">
202
                                <option selected="selected" value = "">Nevybráno</option>
203
                                <option value = "P">Prézens</option>
204
                                <option value = "A">Aorist</option>
205
                                <option value = "R">Préteritum</option>
206
                                <option value = "I">Imperfektum</option>
207
                                <option value = "H">Plusquamperfektum</option>
208
                                <option value = "F">Futurum</option>
222
                            <select class="min-wdth" id="irregular" onchange="irregularChange()">
223
                                <option selected="selected" value = "">nevybráno</option>
224
                                <option value = "f">infinitiv</option>
225
                                <option value = "S">supinum</option>
226
                                <option value = "e">přech. přítomný</option>
227
                                <option value = "m">přech. minulý</option>
228
                                <option value = "A">part. perf. akt.</option>
229
                                <option value = "P">part. perf. pas.</option>
209 230
                            </select>
210 231
                        </div>
211 232
                    </div>
212
                    <div class="row my-1" id="mood-wrapper">
233
                    <div class="row my-1" id="gender-wrapper">
213 234
                        <div class="col-xs-12 col-sm-4">
214
                            <label for="mood">Způsob:</label>
235
                            <label for="gender">Rod:</label>
215 236
                        </div>
216 237
                        <div class="col-xs-12 col-sm-8">
217
                            <select class="min-wdth" id="mood" onchange="moodChange()">
218
                                <option selected="selected" value = "">Nevybráno</option>
219
                                <option value = "d">Indikativ</option>
220
                                <option value = "i">Imperativ</option>
221
                                <option value = "c">Kondicionál</option>
238
                            <select class="min-wdth" id="gender">
239
                                <option selected="selected" value = "">nevybráno</option>
240
                                <option value = "M">maskulinum</option>
241
                                <option value = "F">femininum</option>
242
                                <option value = "N">neutrum</option>
222 243
                            </select>
223 244
                        </div>
224 245
                    </div>
225
                    <div class="row my-1" id="irregular-wrapper">
246
                    <div class="row my-1" id="shape-wrapper">
226 247
                        <div class="col-xs-12 col-sm-4">
227
                            <label for="irregular">Neurčitý slovesný tvar:</label>
248
                            <label for="shape">Tvar:</label>
228 249
                        </div>
229 250
                        <div class="col-xs-12 col-sm-8">
230
                            <select class="min-wdth" id="irregular" onchange="irregularChange()">
231
                                <option selected="selected" value = "">Nevybráno</option>
232
                                <option value = "f">Infinitiv</option>
233
                                <option value = "S">Supinum</option>
234
                                <option value = "e">Přech. přítomný</option>
235
                                <option value = "m">Přech. minulý</option>
236
                                <option value = "A">Part. perf. akt.</option>
237
                                <option value = "P">Part. perf. pas.</option>
251
                            <select class="min-wdth" id="shape">
252
                                <option selected="selected" value = "">nevybráno</option>
253
                                <option value = "C">složený</option>
254
                                <option value = "N">jmenný</option>
238 255
                            </select>
239 256
                        </div>
240 257
                    </div>
241
                    <div class="row my-1" id="v-type-wrapper">
258
                    <div class="row my-1" id="grade-wrapper">
242 259
                        <div class="col-xs-12 col-sm-4">
243
                            <label for="v-type">Slovesný rod:</label>
260
                            <label for="grade">Stupeň:</label>
244 261
                        </div>
245 262
                        <div class="col-xs-12 col-sm-8">
246
                            <select class="min-wdth" id="v-type">
247
                                <option selected="selected" value = "">Nevybráno</option>
248
                                <option value = "A">Aktivum</option>
249
                                <option value = "P">Pasivum</option>
263
                            <select class="min-wdth" id="grade">
264
                                <option selected="selected" value = "">nevybráno</option>
265
                                <option value = "1">pozitiv</option>
266
                                <option value = "2">komparativ</option>
267
                                <option value = "3">superlativ</option>
250 268
                            </select>
251 269
                        </div>
252 270
                    </div>
253
                    <div class="row my-1" id="vid-wrapper">
271
                    <div class="row my-1" id="type-wrapper">
254 272
                        <div class="col-xs-12 col-sm-4">
255
                            <label for="vid">Slovesný vid:</label>
273
                            <label for="type">Druh:</label>
256 274
                        </div>
257 275
                        <div class="col-xs-12 col-sm-8">
258
                            <select class="min-wdth" id="vid">
259
                                <option selected="selected" value = "">Nevybráno</option>
260
                                <option value = "P">Perfektivum</option>
261
                                <option value = "I">Imperfektivum </option>
276
                            <select class="min-wdth" id="type">
277
                                <option selected="selected" value = "">nevybráno</option>
278
                                <option value = "P">personalia</option>
279
                                <option value = "S">posesiva</option>
280
                                <option value = "D">demonstrativa</option>
281
                                <option value = "Q">interogativa</option>
282
                                <option value = "J">relativa</option>
283
                                <option value = "Z">indefinita</option>
284
                                <option value = "L">limitativa</option>
285
                                <option value = "W">negativa</option>
262 286
                            </select>
263 287
                        </div>
264 288
                    </div>
......
268 292
                        </div>
269 293
                        <div class="col-xs-12 col-sm-8">
270 294
                            <select class="min-wdth" id="k-type">
271
                                <option selected="selected" value = "">Nevybráno</option>
272
                                <option value = "V">Větná</option>
273
                                <option value = "C">Členská</option>
274
                                <option value = "N">Navazovací</option>
275
                                <option value = "P">Spojení s přechodníkem</option>
295
                                <option selected="selected" value = "">nevybráno</option>
296
                                <option value = "V">větná</option>
297
                                <option value = "C">členská</option>
298
                                <option value = "N">navazovací</option>
299
                                <option value = "P">spojení s přechodníkem</option>
276 300
                            </select>
277 301
                        </div>
278 302
                    </div>
......
292 316
        const pseudo_id = button.data('pseudo-id');// Extract info from data-* attributes
293 317
        const title = button.data('title');// Extract info from data-* attributes
294 318
        $('#manuscript-m').multiSelect({
295
            'noneText': 'Nevybráno',
319
            'noneText': 'nevybráno',
296 320
        });
297 321

  
298 322
        let modal = $(this);
......
550 574
        "#position",
551 575
        "#namedentity",
552 576
        "#context",
577
        "#description",
578
        "#description2",
579
        "#description3",
553 580
        "#wordclass"
554 581
    ];
555 582

  
......
577 604

  
578 605
        if(data !== null){
579 606
            modal.find("#context").val(data.context);
607
            modal.find("#description").val(data.description);
608
            modal.find("#description2").val(data.description2);
609
            modal.find("#description3").val(data.description3);
580 610
            modal.find("#namedentity").prop('checked', data.namedentity === 1);
581 611

  
582 612
            let position = data.position1;
......
652 682
        formData.append("lemma", modal.find("#lemma")[0].value);
653 683
        formData.append("manuscript", modal.find("#manuscript-m")[0].value);
654 684
        formData.append("context", modal.find("#context")[0].value);
685
        formData.append("description", modal.find("#description")[0].value);
686
        formData.append("description2", modal.find("#description2")[0].value);
687
        formData.append("description3", modal.find("#description3")[0].value);
655 688

  
656 689
        //morphem creation
657 690
        let morphem = "";

Také k dispozici: Unified diff