#107 is now working

indrz · May 9, 2017 · a9861dd · a9861dd
1 parent 0c3ea14
commit a9861dd
Showing 1 changed file with 42 additions and 5 deletions.
diff --git a/indrz/homepage/templates/homepage/search.js b/indrz/homepage/templates/homepage/search.js
@@ -183,6 +183,36 @@ function clearSearchResults(){
 
 }
 
+function getResultTitle(properties){
+    var name;
+    if (properties.label) {
+        name = properties.label;
+        return name;
+    }
+    else if(properties.short_name){
+        name = properties.short_name;
+        return name;
+    }
+    else if (properties.room_code){
+        name = properties.room_code;
+        return name;
+    }
+    else if (properties.fancyname_de){
+        name = properties.fancyname_de;
+        return name;
+    }
+    else if (properties.roomcode && properties.label != undefined){
+        name = properties.roomcode;
+        return name;
+
+    }
+    else if (properties.name) {
+        name = properties.name;
+        return name;
+    }
+
+
+}
 
 function searchIndrz(campusId, searchString) {
     // var searchUrl = '/api/v1/buildings/' + buildingId + '/' + spaceName + '.json';
@@ -206,26 +236,33 @@ function searchIndrz(campusId, searchString) {
 
         searchSource.forEachFeature(function(feature) {
 
+            var f_name = feature.get("name");
+
 
             var att = searchString;
 
-            if (searchString === feature.get("name")){
+            if (searchString === f_name){
                 att = searchString;
             }else{
-                att = feature.get("name")
+                att = f_name
             }
 
+            var full_name = att;
+
+
 
             var fancyname_de, fancyname_en;
 
             if(feature.get("fancyname_de")){
                 fancyname_de = feature.get("fancyname_de");
+                full_name = fancyname_de + " " + f_name;
             }else{
                 fancyname_de = "";
             }
 
             if(feature.get("fancyname_en")){
                 fancyname_en = feature.get("fancyname_en");
+                full_name = fancyname_en + " " + f_name;
             }else{
                 fancyname_en = "";
             }
@@ -246,15 +283,15 @@ function searchIndrz(campusId, searchString) {
             var infoo = '"' + att + '"'
             if (roomcat != "" && roomcat != undefined){
                 var htmlInsert = "<a href='#' onclick='showRes(" + infoo + ")' id='searchResListItem_"+ att +
-                "' class='list-group-item indrz-search-res' >" + att +" ("+ roomcat + ") <span class='badge'>"+ gettext('Floor  ') + floor +"</span> </a>"
+                "' class='list-group-item indrz-search-res' >" + full_name +" ("+ roomcat + ") <span class='badge'>"+ gettext('Floor  ') + floor +"</span> </a>"
             }
             else if (roomcode != "" && roomcode != undefined){
                 var htmlInsert = "<a href='#' onclick='showRes(" + infoo + ")' id='searchResListItem_"+ att +
-                "' class='list-group-item indrz-search-res' >" + att + somethin + " <span class='badge'>"+ gettext('Floor  ') + floor +"</span> </a>"
+                "' class='list-group-item indrz-search-res' >" + full_name + somethin + " <span class='badge'>"+ gettext('Floor  ') + floor +"</span> </a>"
             }
             else{
                  var htmlInsert = "<a href='#' onclick='showRes(" + infoo + ")' id='searchResListItem_"+ att +
-                "' class='list-group-item indrz-search-res' >" + att + " <span class='badge'>"+ gettext('Floor  ') + floor +"</span> </a>"
+                "' class='list-group-item indrz-search-res' >" + full_name + " <span class='badge'>"+ gettext('Floor  ') + floor +"</span> </a>"
             }