Revize d70a8d04

Bug #8992: Upravit problémy v záznamech

application/view/contents/searchContent.php

@@ -334 +334 @@
                         result += "<td>" + renderTag(item.tag.tag) + "</td>";
                         result += "<td>" + renderManuscript(item.manuscript) + "</td>";
                         result += "<td>" + item.position1 + (item.position2 ? ("/" + item.position2 + (item.positiondetail ? "/"  + item.positiondetail :  "")) : "")  + "</td>";
-                        result += "<td>" + ((item.description2 !== null) ? item.description2 : "-") + "</td>";
+                        result += "<td>" + ((item.description2 !== null && item.description2.trim().length > 0) ? (normalizeDescription(item.description2)) : "-") + "</td>";
                         result += "<td class=\"action-td\">" +
                             "<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>" +
                             "<button class=\"btn\" title=\"Detail\"  data-toggle=\"modal\" data-target=\"#detail-modal\" data-pseudo-id='" + id + "'><i class=\"fa fa-search\"></i></button>";

application/view/js-scripts/convertors.js

@@ -59 +59 @@
     "11": "Cr",
     "12": "Fs",
     "13": "Z",
-    "14": "Js",
+    "14": "Jš",
     "15": "Pl",
 };
 
@@ -208 +208 @@
     output += ((codeToVid.hasOwnProperty(tag[11])) ? ("<span title=\""+ codeToVid[tag[11]] +"\">" + tag[11] + "</span>") : ("<span>" + tag[11] + "</span>"));
 
     return output;
+}
+
+function normalizeDescription(text){
+    console.log(text.toLowerCase());
+    if(text.toLowerCase().trim().startsWith("\\n")){
+        console.log("0");
+        text = text.replace("\\N", "-");
+        text = text.replace("\\n", "-");
+    } else {
+        console.log("1");
+        text = text.replace("\\N", "; ");
+        text = text.replace("\\n", "; ");
+    }
+    console.log(text);
+    return text;
 }

application/view/modals/detailModal.html

@@ -81 +81 @@
                             <i id="namedentity"></i>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-xs-12 col-sm-4">
-                            <label>Kontext:</label>
-                        </div>
-                        <div class="col-xs-12 col-sm-8">
-                            <i id="context"></i>
-                        </div>
-                    </div>
                     <div class="row">
                         <div class="col-xs-12 col-sm-4">
                             <label>Slovní druh:</label>
@@ -220 +212 @@
         const data_obj = data[pseudo_id];
         let modal = $(this);
 
-        modal.find('#word').text(data_obj.word);
+        modal.find('#word').text(data_obj.context + " " + data_obj.word);
         modal.find('#lemma').text(data_obj.lemma.lemma);
-        modal.find('#description').text(data_obj.description === ""? "-" :  data_obj.description);
-        modal.find('#description2').text(data_obj.description2 === ""? "-" :  data_obj.description2);
-        modal.find('#description3').text(data_obj.description3 === ""? "-" :  data_obj.description3);
+        modal.find('#description').text(data_obj.description === ""? "-" :  normalizeDescription(data_obj.description));
+        modal.find('#description2').text(data_obj.description2 === ""? "-" :  normalizeDescription(data_obj.description2));
+        modal.find('#description3').text(data_obj.description3 === ""? "-" :  normalizeDescription(data_obj.description3));
         modal.find('#date').text(convertDate(data_obj.date));
         modal.find('#manuscript').text(renderManuscript(data_obj.manuscript, false));
         modal.find('#position').text(data_obj.position1 + (data_obj.position2 ? ("/" + data_obj.position2 + (data_obj.positiondetail ? "/"  + data_obj.positiondetail :  "")) : ""));
         modal.find('#namedentity').text(data_obj.namedentity === 1? "ano" :  "ne");
-        modal.find('#context').text(data_obj.context === ""? "-" :  data_obj.context);
 
         const morphem = data_obj.tag.tag;
         analyzeMorphem(modal, morphem);