style and js fixes for structures page

ot_core/Classes/Http/ApiController.php

@@ -44,7 +44,7 @@ class ApiController
             "SELECT o.id, o.name, o.logo_id as logoId, o.principalType, p.otherWebsite as website, a.latitude, a.longitude,
            TRIM(BOTH ' ' FROM CONCAT(a.streetAddress, ' ', a.streetAddressSecond, ' ', a.streetAddressThird)) AS streetAddress,
            a.postalCode, a.addressCity, c.name AS country,
-            (SELECT CONCAT('[',GROUP_CONCAT(DISTINCT CONCAT('\"',f.code,'\"')),']')
+            (SELECT CONCAT(GROUP_CONCAT(DISTINCT CONCAT(f.code)))
             FROM Activity AS a
             LEFT JOIN activity_categories AS ac ON(ac.activity_id = a.id)
             LEFT JOIN Categories AS cs ON (cs.id = ac.categories_id)

ot_templating/Resources/Public/assets/Classic/script/structures.js

@@ -266,18 +266,20 @@ $(document).ready(function() {
         results.forEach(function(structure) {
             if (((currentPage - 1) * itemsPerPage) <= index && index < (currentPage * itemsPerPage)) {
                 let cardDiv = $(cardDivModel).clone();
+                let categoryTagModel = cardDiv.find('.structure-category-model').first();
 
                 cardDiv.data('id', structure.id);
 
-                let categoryTagModel = cardDiv.find('.structure-category-model').first();
-                structure.categories.forEach(function (cat) {
-                    let tag = categoryTagModel.clone();
-                    tag.text(structures_categories[cat]);
-                    tag.removeClass('structure-category-model')
-                    tag.addClass('structure-category')
-                    tag.show();
-                    categoryTagModel.parent().append(tag);
-                });
+                if (structure.categories !== null) {
+                    structure.categories.forEach(function (cat) {
+                        let tag = categoryTagModel.clone();
+                        tag.text(structures_categories[cat]);
+                        tag.removeClass('structure-category-model')
+                        tag.addClass('structure-category')
+                        tag.show();
+                        categoryTagModel.parent().append(tag);
+                    });
+                }
 
                 cardDiv.find('.structure-poster').first().children('img').first().attr('src', structure.logoUri);
                 cardDiv.find('.structure-name').first().text(structure.name);
@@ -378,7 +380,7 @@ $(document).ready(function() {
                 structure.n3Id = parseInt(structure.n3Id);
                 structure.n4Id = parseInt(structure.n4Id);
                 structure.n5Id = parseInt(structure.n5Id);
-                structure.categories = structure.categories || [];
+                structure.categories = structure.categories !== null ? structure.categories.split(",") : [];
                 structures.push(structure);
             })
 

ot_templating/Resources/Public/assets/Classic/style/module/_structures.scss

@@ -290,6 +290,7 @@ $input-border-color: #bfbfbf;
     font-size: 18px;
     border: none;
     width: 95%;
+    min-width: 85%;
   }
 
   .search-bar-btn {
@@ -311,8 +312,8 @@ $input-border-color: #bfbfbf;
     min-width: 100%;
     position: relative;
     display: inline-block;
-    top: -24px;
-    left: -24px;
+    top: 10px;
+    left: -100%;
   }
 
   .city-search-results, .city-search-no-result, .city-search-loading {
@@ -321,6 +322,7 @@ $input-border-color: #bfbfbf;
     background: #EEEEEE;
     box-shadow: 0 8px 16px 0 rgba(0,0,0,0.2);
     z-index: 99;
+    top: 100%;
   }
 
   .city-search-loading img {