Berufsgruppen werden in den Ergebnissen angezeigt.

src/Model/BfwBerufModel.php

@@ -37,7 +37,7 @@ class BfwBerufModel extends Model
     {
         $objDatabase = \Database::getInstance();
 
-        $sql = "SELECT tl_bfw_berufe.name AS beruf, tl_member_berufe.hinweis AS hinweis, tl_bfw_abschluesse.name AS abschluss, tl_bfw_dauer.name AS dauer, tl_member.company AS bfwname
+        $sql = "SELECT tl_bfw_berufe.name AS beruf, tl_member_berufe.hinweis AS hinweis, tl_bfw_abschluesse.name AS abschluss, tl_bfw_dauer.name AS dauer, tl_member.company AS bfwname, tl_bfw_berufsgruppen.title AS grpname
     	               FROM tl_bfw_berufe
     	               INNER JOIN tl_member_berufe ON tl_bfw_berufe.id = tl_member_berufe.beruf_id
     	               INNER JOIN tl_bfw_berufsgruppen ON tl_bfw_berufe.pid = tl_bfw_berufsgruppen.id
@@ -45,7 +45,7 @@ class BfwBerufModel extends Model
     	               INNER JOIN tl_bfw_dauer ON tl_bfw_dauer.id = tl_member_berufe.dauer_id
     	               INNER JOIN tl_member ON tl_member_berufe.pid = tl_member.id
     	               WHERE tl_bfw_berufsgruppen.id LIKE ? AND tl_member_berufe.pid = ?
-    	               ORDER BY tl_bfw_berufe.name";
+    	               ORDER BY tl_bfw_berufsgruppen.title, tl_bfw_berufe.name";
         $result = $objDatabase->prepare($sql)->execute($bggruppe, $bfw);
 
         return $result->fetchAllAssoc();

src/Resources/public/assets/js/bfw-search.js

@@ -61,31 +61,21 @@ $(function () {
 
     var results = {};
 
-    var showHideContent = function(selector, show, loading){
-        var loader = $('#loader');
-        var content = $(selector);
-        if(show === true){
-            loader.hide('fade', function(){
-                content.filter(':hidden').show('fade');
-            });
-        } else {
-            content.filter(':visible').hide('fade', function(){
-                if(loading == true) {
-                    loader.show('fade');
-                }
-            }).after(loader);
-        }
-    }
-
     var getResultContent = function(results){
         var ret = '';
+        var grpName = '';
         results.forEach(function(result){
+            ret += '<div class="mb-3 mt-5">';
             for(var e in result) {
                 if(result[e] != '' && result[e] != undefined) {
+                    if(result.grpname != undefined && (grpName == '' || grpName != result.grpname)){
+                        grpName = result.grpname;
+                        ret += '<div class="row"><h4>'+grpName+'</h4></div>';
+                    }
                     ret += '<div class="row"><div class="col-1">'+e+': </div><div>'+result[e]+'</div></div>';
                 }
             }
-            ret += '<div class="row"><hr></div>';
+            ret += '</div>';
         });
 
         return ret;
@@ -127,8 +117,10 @@ $(function () {
         });
 
         child.selectpicker('refresh');
-        showHideContent('#'+show+'-search', true);
-        // $('#'+show+'-search').show('fade');
+        // showHideContent('#'+show+'-search', true);
+        $('#loader').hide(function(){
+            $('#'+show+'-search').show('fade');
+        });
     };
 
 
@@ -270,19 +262,6 @@ $(function () {
                     }
                 });
             });
-
-
-
-            // showHideContent('#result', true);
-            // showHideContent('.results', false);
-            // $('#result .results').html('Lade Daten...');
-            // $('.results').promise().done(function(){
-                // $('#result').show('fade');
-
-            // });
-
-
-
         }
 
     });