Projekt

Obecné

Profil

« Předchozí | Další » 

Revize a5559649

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/searchContent.php
21 21

  
22 22
<div class="search-filters container" onload="filtersChange()">
23 23
    <div class="row">
24
        <div class="mr-3">
25
            <label for="wordshape" class="mr-2">Slovo</label>
26
            <input type="text" id="wordshape">
27
        </div>
28 24
        <div class="mr-3">
29 25
            <label for="lemma" class="mr-2">Lemma</label>
30 26
            <input type="text" id="lemma">
31 27
        </div>
28
        <div class="mr-3">
29
            <label for="wordshape" class="mr-2">Slovní tvar</label>
30
            <input type="text" id="wordshape">
31
        </div>
32 32
        <div class="mr-3">
33 33
            <label for="source" class="mr-2">Rukopisný pramen</label>
34 34
            <select id="source" multiple>
......
54 54
            <label for="location" class="mr-2">Pozice</label>
55 55
            <input type="text" id="location">
56 56
        </div>
57

  
57
        <div class="mr-3">
58
            <label for="description2" class="mr-2">Poznámka 2</label>
59
            <input type="text" id="description2" />
60
        </div>
58 61

  
59 62
        <div class="mr-3">
60 63
            <label for="wordclass" class="mr-2">Slovní druh</label>
61 64
            <select onchange="filtersChange()"  id="wordclass">
62
                <option selected="selected" value = "">Nevybráno</option>
63
                <option value = "N">Substantiva</option>
64
                <option value = "A">Adjektiva</option>
65
                <option value = "P">Pronomina</option>
66
                <option value = "C">Numeralia</option>
67
                <option value = "V">Verba</option>
68
                <option value = "D">Adverbia</option>
69
                <option value = "R">Prepozice</option>
70
                <option value = "J">Konjunkce</option>
71
                <option value = "I">Interjekce</option>
72
                <option value = "T">Partikule</option>
65
                <option selected="selected" value = "">nevybráno</option>
66
                <option value = "N">substantivum</option>
67
                <option value = "A">adjektivum</option>
68
                <option value = "P">pronomen</option>
69
                <option value = "C">numeralie</option>
70
                <option value = "V">verbum</option>
71
                <option value = "D">adverbium</option>
72
                <option value = "R">prepozice</option>
73
                <option value = "J">konjunkce</option>
74
                <option value = "T">partikule</option>
75
                <option value = "I">interjekce</option>
73 76
            </select>
74 77
        </div>
75 78

  
......
176 179
                            false
177 180
                        ]);
178 181
                        movedNode = document.getElementById("filter-case");
179
                        beforeNode = document.getElementById("filter-but");
182
                        beforeNode = document.getElementById("filter-control-div");
180 183
                        movedNode.parentNode.insertBefore(movedNode, beforeNode);
181 184
                        break;
182 185
                    case "D":
......
312 315
        <div class="mr-3" id="filter-person">
313 316
            <label for="person" class="mr-2">Osoba</label>
314 317
            <select id="person">
315
                <option selected="selected" value = "">Nevybráno</option>
318
                <option selected="selected" value = "">nevybráno</option>
316 319
                <option value = "1">1.</option>
317 320
                <option value = "2">2.</option>
318 321
                <option value = "3">3.</option>
......
321 324
        <div class="mr-3" id="filter-case">
322 325
            <label for="case" class="mr-2">Pád</label>
323 326
            <select id="case">
324
                <option selected="selected" value = "">Nevybráno</option>
325
                <option value = "1">Nominativ</option>
326
                <option value = "2">Genitiv</option>
327
                <option value = "3">Dativ</option>
328
                <option value = "4">Akuzativ</option>
329
                <option value = "5">Vokativ</option>
330
                <option value = "6">Lokál</option>
331
                <option value = "7">Instrumentál</option>
327
                <option selected="selected" value = "">nevybráno</option>
328
                <option value = "1">nominativ</option>
329
                <option value = "2">genitiv</option>
330
                <option value = "3">dativ</option>
331
                <option value = "4">akuzativ</option>
332
                <option value = "5">vokativ</option>
333
                <option value = "6">lokál</option>
334
                <option value = "7">instrumentál</option>
332 335
            </select>
333 336
        </div>
334 337
        <div class="mr-3" id="filter-countability">
335 338
            <label for="countability" class="mr-2">Číslo</label>
336 339
            <select id="countability">
337
                <option selected="selected" value = "">Nevybráno</option>
338
                <option value = "S">Singulár</option>
339
                <option value = "P">Plurál</option>
340
                <option value = "D">Duál</option>
340
                <option selected="selected" value = "">nevybráno</option>
341
                <option value = "S">singulár</option>
342
                <option value = "P">plurál</option>
343
                <option value = "D">duál</option>
344
            </select>
345
        </div>
346
        <div class="mr-3" id="filter-mood">
347
            <label for="mood" class="mr-2">Způsob</label>
348
            <select id="mood" onchange="moodChange()">
349
                <option selected="selected" value = "">nevybráno</option>
350
                <option value = "d">indikativ</option>
351
                <option value = "i">imperativ</option>
352
                <option value = "c">kondicionál</option>
353
            </select>
354
        </div>
355
        <div class="mr-3" id="filter-time">
356
            <label for="time" class="mr-2">Čas</label>
357
            <select id="time">
358
                <option selected="selected" value = "">nevybráno</option>
359
                <option value = "P">prézens</option>
360
                <option value = "A">aorist</option>
361
                <option value = "R">préteritum</option>
362
                <option value = "I">imperfektum</option>
363
                <option value = "H">plusquamperfektum</option>
364
                <option value = "F">futurum</option>
365
            </select>
366
        </div>
367
        <div class="mr-3" id="filter-v-type">
368
            <label for="v-type" class="mr-2">Slovesný rod</label>
369
            <select id="v-type">
370
                <option selected="selected" value = "">nevybráno</option>
371
                <option value = "A">aktivum</option>
372
                <option value = "P">pasivum</option>
373
            </select>
374
        </div>
375
        <div class="mr-3" id="filter-vid">
376
            <label for="vid" class="mr-2">Vid</label>
377
            <select id="vid">
378
                <option selected="selected" value = "">nevybráno</option>
379
                <option value = "P">perfektivum</option>
380
                <option value = "I">imperfektivum </option>
381
            </select>
382
        </div>
383
        <div class="mr-3" id="filter-irregular">
384
            <label for="irregular" class="mr-2">Neurčitý slovesný tvar</label>
385
            <select id="irregular" onchange="irregularChange()">
386
                <option selected="selected" value = "">nevybráno</option>
387
                <option value = "f">infinitiv</option>
388
                <option value = "S">supinum</option>
389
                <option value = "e">přech. přítomný</option>
390
                <option value = "m">přech. minulý</option>
391
                <option value = "A">part. perf. akt.</option>
392
                <option value = "P">part. perf. pas.</option>
341 393
            </select>
342 394
        </div>
343 395
        <div class="mr-3" id="filter-gender">
344 396
            <label for="gender" class="mr-2">Rod</label>
345 397
            <select id="gender">
346
                <option selected="selected" value = "">Nevybráno</option>
347
                <option value = "M">Maskulinum</option>
348
                <option value = "F">Femininum</option>
349
                <option value = "N">Neutrum</option>
398
                <option selected="selected" value = "">nevybráno</option>
399
                <option value = "M">maskulinum</option>
400
                <option value = "F">femininum</option>
401
                <option value = "N">neutrum</option>
350 402
            </select>
351 403
        </div>
352 404
        <div class="mr-3" id="filter-shape">
353 405
            <label for="shape" class="mr-2">Tvar</label>
354 406
            <select id="shape">
355
                <option selected="selected" value = "">Nevybráno</option>
356
                <option value = "C">Složený</option>
357
                <option value = "N">Jmenný</option>
407
                <option selected="selected" value = "">nevybráno</option>
408
                <option value = "C">složený</option>
409
                <option value = "N">jmenný</option>
358 410
            </select>
359 411
        </div>
360 412
        <div class="mr-3" id="filter-grade">
361 413
            <label for="grade" class="mr-2">Stupeň</label>
362 414
            <select id="grade">
363
                <option selected="selected" value = "">Nevybráno</option>
364
                <option value = "1">Pozitiv</option>
365
                <option value = "2">Komparativ</option>
366
                <option value = "3">Superlativ</option>
415
                <option selected="selected" value = "">nevybráno</option>
416
                <option value = "1">pozitiv</option>
417
                <option value = "2">komparativ</option>
418
                <option value = "3">superlativ</option>
367 419
            </select>
368 420
        </div>
369 421
        <div class="mr-3" id="filter-type">
370 422
            <label for="type" class="mr-2">Druh</label>
371 423
            <select id="type">
372
                <option selected="selected" value = "">Nevybráno</option>
373
                <option value = "P">Personalia</option>
374
                <option value = "S">Posesiva</option>
375
                <option value = "D">Demonstrativa</option>
376
                <option value = "Q">Interogativa</option>
377
                <option value = "J">Relativa</option>
378
                <option value = "Z">Indefinita</option>
379
                <option value = "L">Limitativa</option>
380
                <option value = "W">Negativa</option>
381
            </select>
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>
395
        <div class="mr-3" id="filter-mood">
396
            <label for="mood" class="mr-2">Způsob</label>
397
            <select id="mood" onchange="moodChange()">
398
                <option selected="selected" value = "">Nevybráno</option>
399
                <option value = "d">Indikativ</option>
400
                <option value = "i">Imperativ</option>
401
                <option value = "c">Kondicionál</option>
402
            </select>
403
        </div>
404
        <div class="mr-3" id="filter-irregular">
405
            <label for="irregular" class="mr-2">Neurčitý slovesný tvar</label>
406
            <select id="irregular" onchange="irregularChange()">
407
                <option selected="selected" value = "">Nevybráno</option>
408
                <option value = "f">Infinitiv</option>
409
                <option value = "S">Supinum</option>
410
                <option value = "e">Přech. přítomný</option>
411
                <option value = "m">Přech. minulý</option>
412
                <option value = "A">Part. perf. akt.</option>
413
                <option value = "P">Part. perf. pas.</option>
414
            </select>
415
        </div>
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">
419
                <option selected="selected" value = "">Nevybráno</option>
420
                <option value = "A">Aktivum</option>
421
                <option value = "P">Pasivum</option>
422
            </select>
423
        </div>
424
        <div class="mr-3" id="filter-vid">
425
            <label for="vid" class="mr-2">Vid</label>
426
            <select id="vid">
427
                <option selected="selected" value = "">Nevybráno</option>
428
                <option value = "P">Perfektivum</option>
429
                <option value = "I">Imperfektivum </option>
424
                <option selected="selected" value = "">nevybráno</option>
425
                <option value = "P">personalia</option>
426
                <option value = "S">posesiva</option>
427
                <option value = "D">demonstrativa</option>
428
                <option value = "Q">interogativa</option>
429
                <option value = "J">relativa</option>
430
                <option value = "Z">indefinita</option>
431
                <option value = "L">limitativa</option>
432
                <option value = "W">negativa</option>
430 433
            </select>
431 434
        </div>
432 435
        <div class="mr-3" id="filter-k-type">
433 436
            <label for="k-type" class="mr-2">Typ</label>
434 437
            <select id="k-type">
435
                <option selected="selected" value = "">Nevybráno</option>
436
                <option value = "V">Větná</option>
437
                <option value = "C">Členská</option>
438
                <option value = "N">Navazovací</option>
439
                <option value = "P">Spojení s přechodníkem</option>
438
                <option selected="selected" value = "">nevybráno</option>
439
                <option value = "V">větná</option>
440
                <option value = "C">členská</option>
441
                <option value = "N">navazovací</option>
442
                <option value = "P">spojení s přechodníkem</option>
440 443
            </select>
441 444
        </div>
442 445

  
443 446
        <!-- send button-->
444
        <button class="ml-auto btn" id="filter-but" onclick="callFilter()">
445
            Filtrovat
446
        </button>
447
        <div class="ml-auto" id="filter-control-div">
448
            <i class="mr-1 my-auto" id="hit-count">0 záznamů</i>
449
            <button class="btn" id="filter-but" onclick="callFilter()">
450
                Filtrovat
451
            </button>
452
        </div>
447 453
    </div>
448 454
</div>
449 455

  
......
451 457
    <table class="table table-striped">
452 458
        <thead>
453 459
        <tr>
454
            <th scope="col">Slovo</th>
455 460
            <th scope="col">Lemma</th>
461
            <th scope="col">Slovní tvar</th>
462
            <th scope="col">Morfologie</th>
456 463
            <th scope="col">Rukopisy</th>
457 464
            <th scope="col">Pozice</th>
465
            <th scope="col">Poznámka 2</th>
458 466
            <th scope="col"></th>
459 467
        </tr>
460 468
        </thead>
......
490 498
                    //regular
491 499
                    formData.append("lemma", document.getElementById("lemma").value);
492 500
                    formData.append("word", document.getElementById("wordshape").value);
501
                    formData.append("description2", document.getElementById("description2").value);
493 502

  
494 503
                    //positions
495 504
                    const positionSplit = document.getElementById("location").value.split("/");
......
539 548
                        filterData(formData);
540 549
                    }
541 550

  
542
                    // (A2) AJAX - USE HTTP:// NOT FILE://
551
                    // (A2) AJAX - USE HTTP:// NOT FILE:/
543 552
                    let xhr = new XMLHttpRequest();
544 553
                    xhr.open("POST", "./controller/TableController.php");
545 554
                    xhr.onload = function(){
......
552 561
                            document.getElementById("no-data-label").style.display = "none";
553 562
                            document.getElementById("paging-control").style.display = "";
554 563
                        }
564

  
565
                        if(parsedJSON.count === 1){
566
                            document.getElementById("hit-count").innerText = "1 záznamů";
567
                        } else if(parsedJSON.count < 5){
568
                            document.getElementById("hit-count").innerText = parsedJSON.count +" záznamů";
569
                        } else {
570
                            document.getElementById("hit-count").innerText = parsedJSON.count +" záznamů";
571
                        }
572

  
555 573
                        itemCount = parsedJSON.count;
556 574
                        pageCount = Math.ceil(itemCount / itemPerPage);
557 575
                        document.getElementById("page-label").value = (pageIndex + 1) + " / " + pageCount;
......
565 583
                    let output = "";
566 584
                    for(let i = 0; i < manuscripts.length; i++){
567 585
                        if(shorten)
568
                            output += codeToManuscriptShort[manuscripts[i]];
586
                            output += ("<span title=\""+ codeToManuscript[manuscripts[i]] +"\">" + codeToManuscriptShort[manuscripts[i]] + "</span>");
569 587
                        else
570 588
                            output += codeToManuscript[manuscripts[i]];
571 589

  
......
583 601
                    let result = "";
584 602
                    data.forEach((item,id) => {
585 603
                        result += "<tr>";
586
                        result += "<td>" + item.word + "</td>";
587 604
                        result += "<td>" + item.lemma.lemma + "</td>";
605
                        result += "<td>" + item.word + "</td>";
606
                        result += "<td>" + item.tag.tag + "</td>";
588 607
                        result += "<td>" + renderManuscript(item.manuscript) + "</td>";
589 608
                        result += "<td>" + item.position1 + (item.position2 ? ("/" + item.position2 + (item.positiondetail ? "/"  + item.positiondetail :  "")) : "")  + "</td>";
609
                        result += "<td>" + item.description2 + "</td>";
590 610
                        result += "<td class=\"action-td\">" +
591
                            /*"<button class=\"btn mr-1\" title=\"Upravit\"  data-toggle=\"modal\" data-target=\"#edit-modal\" data-pseudo-id='" + id + "' data-title=\"Upravit záznam\"><i class=\"fa fa-pencil\"></i></button>" + //TODO ADMIN ONLY*/
611
                            "<button class=\"btn mr-1\" title=\"Upravit\"  data-toggle=\"modal\" data-target=\"#edit-modal\" data-pseudo-id='" + id + "' data-title=\"Upravit záznam\"><i class=\"fa fa-pencil\"></i></button>" + //TODO ADMIN change , regular send report
592 612
                            "<button class=\"btn\" title=\"Detail\"  data-toggle=\"modal\" data-target=\"#detail-modal\" data-pseudo-id='" + id + "'><i class=\"fa fa-search\"></i></button>" +
593 613
                            "</td>";
594 614
                        result += "</tr>";

Také k dispozici: Unified diff