Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 9484c9de

Přidáno uživatelem Ondřej Anděl před více než 3 roky(ů)

Bug #8529: Upravit pořadí filterů pro slovesa

Zobrazit rozdíly:

application/view/modals/detailModal.html
73 73
                    </div>
74 74

  
75 75
                    <!-- conditional render -->
76
                    <div class="row" id="person-wrapper">
77
                        <div class="col-xs-12 col-sm-4">
78
                            <label>Osoba:</label>
79
                        </div>
80
                        <div class="col-xs-12 col-sm-8">
81
                            <i id="person"></i>
82
                        </div>
83
                    </div>
76 84
                    <div class="row" id="case-wrapper">
77 85
                        <div class="col-xs-12 col-sm-4">
78 86
                            <label>Pád:</label>
......
97 105
                            <i id="gender"></i>
98 106
                        </div>
99 107
                    </div>
100
                    <div class="row" id="grade-wrapper">
101
                        <div class="col-xs-12 col-sm-4">
102
                            <label>Stupeň:</label>
103
                        </div>
104
                        <div class="col-xs-12 col-sm-8">
105
                            <i id="grade"></i>
106
                        </div>
107
                    </div>
108 108
                    <div class="row" id="shape-wrapper">
109 109
                        <div class="col-xs-12 col-sm-4">
110 110
                            <label>Tvar:</label>
......
113 113
                            <i id="shape"></i>
114 114
                        </div>
115 115
                    </div>
116
                    <div class="row" id="k-type-wrapper">
116
                    <div class="row" id="grade-wrapper">
117 117
                        <div class="col-xs-12 col-sm-4">
118
                            <label>Typ:</label>
118
                            <label>Stupeň:</label>
119 119
                        </div>
120 120
                        <div class="col-xs-12 col-sm-8">
121
                            <i id="k-type"></i>
121
                            <i id="grade"></i>
122 122
                        </div>
123 123
                    </div>
124 124
                    <div class="row" id="type-wrapper">
......
129 129
                            <i id="type"></i>
130 130
                        </div>
131 131
                    </div>
132
                    <div class="row" id="time-wrapper">
133
                        <div class="col-xs-12 col-sm-4">
134
                            <label>Čas:</label>
135
                        </div>
136
                        <div class="col-xs-12 col-sm-8">
137
                            <i id="time"></i>
138
                        </div>
139
                    </div>
132 140
                    <div class="row" id="mood-wrapper">
133 141
                        <div class="col-xs-12 col-sm-4">
134 142
                            <label>Způsob:</label>
......
145 153
                            <i id="irregular"></i>
146 154
                        </div>
147 155
                    </div>
148
                    <div class="row" id="person-wrapper">
149
                        <div class="col-xs-12 col-sm-4">
150
                            <label>Osoba:</label>
151
                        </div>
152
                        <div class="col-xs-12 col-sm-8">
153
                            <i id="person"></i>
154
                        </div>
155
                    </div>
156
                    <div class="row" id="time-wrapper">
157
                        <div class="col-xs-12 col-sm-4">
158
                            <label>Čas:</label>
159
                        </div>
160
                        <div class="col-xs-12 col-sm-8">
161
                            <i id="time"></i>
162
                        </div>
163
                    </div>
164 156
                    <div class="row" id="v-type-wrapper">
165 157
                        <div class="col-xs-12 col-sm-4">
166 158
                            <label>Slovesný rod:</label>
......
177 169
                            <i id="vid"></i>
178 170
                        </div>
179 171
                    </div>
172
                    <div class="row" id="k-type-wrapper">
173
                        <div class="col-xs-12 col-sm-4">
174
                            <label>Typ:</label>
175
                        </div>
176
                        <div class="col-xs-12 col-sm-8">
177
                            <i id="k-type"></i>
178
                        </div>
179
                    </div>
180 180
                </div>
181 181
            </div>
182 182
            <div class="modal-footer">
......
209 209
    function analyzeMorphem(modal, morphem) {
210 210
        modal.find('#wordclass').text(codeToWordclass[morphem.charAt(0)]);
211 211

  
212
        let movedNode;
213
        let beforeNode;
214
        if(morphem.charAt(0) === 'V') {
215
            movedNode = document.getElementById("case-wrapper");
216
            beforeNode = document.getElementById(null);
217
            movedNode.parentNode.insertBefore(movedNode, beforeNode);
218
        } else {
219
            movedNode = document.getElementById("case-wrapper");
220
            beforeNode = document.getElementById("countability-wrapper");
221
            movedNode.parentNode.insertBefore(movedNode, beforeNode);
222
        }
223

  
212 224
        (morphem.charAt(1) === '-') ? modal.find('#case-wrapper').hide() :
213 225
            modal.find('#case-wrapper').show();
214 226
        modal.find('#case').text(codeToCase[morphem.charAt(1)]);
application/view/searchContent.php
76 76
        <script>
77 77
            function filtersChange() {
78 78
                const value = document.getElementById("wordclass").value;
79
                let movedNode;
80
                let beforeNode;
79 81
                switch (value) {
80 82
                    case "N":
81 83
                        setFilerVisibility([
......
93 95
                            false,
94 96
                            false
95 97
                        ]);
98
                        movedNode = document.getElementById("filter-case");
99
                        beforeNode = document.getElementById("filter-countability");
100
                        movedNode.parentNode.insertBefore(movedNode, beforeNode);
96 101
                        break;
97 102
                    case "A":
98 103
                        setFilerVisibility([
......
110 115
                            false,
111 116
                            false
112 117
                        ]);
118
                        movedNode = document.getElementById("filter-case");
119
                        beforeNode = document.getElementById("filter-countability");
120
                        movedNode.parentNode.insertBefore(movedNode, beforeNode);
113 121
                        break;
114 122
                    case "P":
115 123
                        setFilerVisibility([
......
127 135
                            false,
128 136
                            false
129 137
                        ]);
138
                        movedNode = document.getElementById("filter-case");
139
                        beforeNode = document.getElementById("filter-countability");
140
                        movedNode.parentNode.insertBefore(movedNode, beforeNode);
130 141
                        break;
131 142
                    case "C":
132 143
                        setFilerVisibility([
......
144 155
                            false,
145 156
                            false
146 157
                        ]);
158
                        movedNode = document.getElementById("filter-case");
159
                        beforeNode = document.getElementById("filter-countability");
160
                        movedNode.parentNode.insertBefore(movedNode, beforeNode);
147 161
                        break;
148 162
                    case "V":
149 163
                        setFilerVisibility([
......
161 175
                            true,
162 176
                            false
163 177
                        ]);
178
                        movedNode = document.getElementById("filter-case");
179
                        beforeNode = document.getElementById("filter-vid");
180
                        movedNode.parentNode.insertBefore(movedNode, null);
164 181
                        break;
165 182
                    case "D":
166 183
                        setFilerVisibility([
......
292 309
        </script>
293 310

  
294 311
        <!-- conditionaly rendered filters-->
312
        <div class="mr-3" id="filter-person">
313
            <label for="person" class="mr-2">Osoba</label>
314
            <select id="person">
315
                <option selected="selected" value = "">Nevybráno</option>
316
                <option value = "1">1.</option>
317
                <option value = "2">2.</option>
318
                <option value = "3">3.</option>
319
            </select>
320
        </div>
295 321
        <div class="mr-3" id="filter-case">
296 322
            <label for="case" class="mr-2">Pád</label>
297 323
            <select id="case">
......
354 380
                <option value = "W">Negativa</option>
355 381
            </select>
356 382
        </div>
383
        <div class="mr-3" id="filter-time">
384
            <label for="time" class="mr-2">Čas</label>
385
            <select id="time">
386
                <option selected="selected" value = "">Nevybráno</option>
387
                <option value = "P">Prézens</option>
388
                <option value = "A">Aorist</option>
389
                <option value = "R">Préteritum</option>
390
                <option value = "I">Imperfektum</option>
391
                <option value = "H">Plusquamperfektum</option>
392
                <option value = "F">Futurum</option>
393
            </select>
394
        </div>
357 395
        <div class="mr-3" id="filter-mood">
358 396
            <label for="mood" class="mr-2">Způsob</label>
359 397
            <select id="mood" onchange="moodChange()">
......
375 413
                <option value = "P">Part. perf. pas.</option>
376 414
            </select>
377 415
        </div>
378
        <div class="mr-3" id="filter-person">
379
            <label for="person" class="mr-2">Osoba</label>
380
            <select id="person">
381
                <option selected="selected" value = "">Nevybráno</option>
382
                <option value = "1">1.</option>
383
                <option value = "2">2.</option>
384
                <option value = "3">3.</option>
385
            </select>
386
        </div>
387
        <div class="mr-3" id="filter-time">
388
            <label for="time" class="mr-2">Čas</label>
389
            <select id="time">
416
        <div class="mr-3" id="filter-v-type">
417
            <label for="v-type" class="mr-2">Slovesný rod</label>
418
            <select id="v-type">
390 419
                <option selected="selected" value = "">Nevybráno</option>
391
                <option value = "P">Prézens</option>
392
                <option value = "A">Aorist</option>
393
                <option value = "R">Préteritum</option>
394
                <option value = "I">Imperfektum</option>
395
                <option value = "H">Plusquamperfektum</option>
396
                <option value = "F">Futurum</option>
420
                <option value = "A">Aktivum</option>
421
                <option value = "P">Pasivum</option>
397 422
            </select>
398 423
        </div>
399 424
        <div class="mr-3" id="filter-vid">
......
404 429
                <option value = "I">Imperfektivum </option>
405 430
            </select>
406 431
        </div>
407
        <div class="mr-3" id="filter-v-type">
408
            <label for="v-type" class="mr-2">Slovesný rod</label>
409
            <select id="v-type">
410
                <option selected="selected" value = "">Nevybráno</option>
411
                <option value = "A">Aktivum</option>
412
                <option value = "P">Pasivum</option>
413
            </select>
414
        </div>
415 432
        <div class="mr-3" id="filter-k-type">
416 433
            <label for="k-type" class="mr-2">Typ</label>
417 434
            <select id="k-type">

Také k dispozici: Unified diff