Merge branch 'fronkdev' into 'master'

Added extended search to Preorder Index

See merge request fronk/thetool!216

application/AddressDB/AddressDB.php

@@ -37,6 +37,7 @@ class AddressDB {
     `Hausnummer`.`rollout` AS `rollout`,
     `Hausnummer`.`rollout_info` AS `rollout_info`,
     `Hausnummer`.`freigabe` AS `freigabe`,
+    `Hausnummer`.`rimo_id` AS `hausnummer_rimo_id`,
     `Hausnummer`.`rimo_fcp_name` AS `rimo_fcp_name`,
     `Wohneinheit`.`id` AS `wohneinheit_id`,
     `Wohneinheit`.`oaid` AS `wohneinheit_oaid`,

application/Preorder/PreorderController.php

@@ -175,14 +175,30 @@ class PreorderController extends mfBaseController {
     
     $new_filter['add-where'] = "";
     
-    if(array_key_exists("search",$filter) && trim($filter['search'])) {
-      $search = trim($filter['search']);
+    if(array_key_exists("magic_search",$filter) && trim($filter['magic_search'])) {
+      $search = trim($filter['magic_search']);
       $new_filter['add-where'] .= " AND (";
-      $new_filter['add-where'] .= " adb_hausnummer.gemeinde like '%$search%' OR adb_hausnummer.plz like '%$search%' OR adb_hausnummer.strasse like '%$search%'";
-      $new_filter['add-where'] .= " OR company like '%$search%' OR firstname like '%$search%' OR lastname like '%$search%' OR concat(firstname, ' ', lastname) like '%$search%' OR concat(lastname, ' ', firstname) like '%$search%' OR street like '%$search%' OR zip like '%$search%' OR city like '%$search%' OR email like '%$search' OR phone like '%$search'";
-      $new_filter['add-where'] .= " OR ucode like '%$search' OR oaid like '%$search'";
+      $new_filter['add-where'] .= " adb_hausnummer.gemeinde like '%$search%' OR adb_hausnummer.plz like '%$search%' OR adb_hausnummer.strasse like '%$search%'
+         OR adb_hausnummer.hausnummer like '%$search%' OR CONCAT (adb_hausnummer.strasse, ' ', adb_hausnummer.hausnummer) like '%$search%'
+         OR CONCAT (adb_hausnummer.strasse, ' ', adb_hausnummer.hausnummer) like '%".str_replace(" ", "%", $search)."%'";
+      $new_filter['add-where'] .= " OR company like '%$search%' OR firstname like '%$search%' OR lastname like '%$search%' OR concat(firstname, ' ', lastname) like '%$search%' OR concat(lastname, ' ', firstname) like '%$search%' OR street like '%$search%' OR zip like '%$search%' OR city like '%$search%' OR email like '%$search%' OR phone like '%$search%'";
+      $new_filter['add-where'] .= " OR tt_preorder.ucode like '%$search%' OR tt_preorder.oaid like '%$search%'";
+      
+      $new_filter['add-where'] .= " OR adb_wohneinheit.extref like '%$search%'";
+      $new_filter['add-where'] .= " OR adb_hausnummer.hausnummer_extref like '%$search%'";
+      $new_filter['add-where'] .= " OR adb_hausnummer.adrcd like '%$search%'";
+      $new_filter['add-where'] .= " OR adb_hausnummer.grund_nr like '%$search%'";
+      
+      $new_filter['add-where'] .= " OR adb_hausnummer.rimo_fcp_name like '%$search%'";
+      $new_filter['add-where'] .= " OR workorder.rimo_status like '%$search%'";
+      $new_filter['add-where'] .= " OR workorder.rimo_name like '%$search%'";
+        
+      //$new_filter['add-where'] .= " OR ";
+      $new_filter['add-where'] .= " )";
     }
     
+    //echo $new_filter['add-where'];exit;
+    
     if(array_key_exists("address", $filter) && $filter["address"]) {
       $address = $this->db()->escape($filter['address']);
       $new_filter['add-where'] .= " AND (adb_hausnummer.gemeinde like '%$address%' OR adb_hausnummer.plz like '%$address%' OR adb_hausnummer.strasse like '%$address%'
@@ -241,6 +257,14 @@ class PreorderController extends mfBaseController {
       unset($filter['rimo_workorder']);
     }
     
+    if(array_key_exists("rimo_workorder_status", $filter) && $filter['rimo_workorder_status']) {
+      $new_filter["rimo_workorder_status"] = $filter['rimo_workorder_status'];
+    }
+    
+    if(array_key_exists("rimo_workorder_name", $filter) && $filter['rimo_workorder_name']) {
+      $new_filter["rimo_workorder_name"] = $filter['rimo_workorder_name'];
+    }
+    
     if(array_key_exists("ucode", $filter) && $filter['ucode']) {
       $new_filter['ucode'] = "%".$filter['ucode']."%";
       unset($filter['ucode']);

application/Preorder/PreorderModel.php

@@ -142,7 +142,7 @@ class PreorderModel {
             LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id
+            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id
             WHERE $where
             ORDER BY $orderBy
             LIMIT 1";
@@ -171,7 +171,7 @@ class PreorderModel {
             LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id
+            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id
             LEFT JOIN Preorderlogistics ON (Preorderlogistics.preorder_id = tt_preorder.id)
             WHERE $where
       ";
@@ -196,7 +196,7 @@ class PreorderModel {
             LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id
+            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id
             LEFT JOIN Preorderlogistics ON (Preorderlogistics.preorder_id = tt_preorder.id)
             WHERE $where
             ORDER BY lastname, firstname
@@ -241,7 +241,7 @@ class PreorderModel {
               LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus as tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
               LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
               LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-              LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id,
+              LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id,
               JSON_TABLE(tt_preorder.addon_services, 
                 '$[*]' COLUMNS (
                   ordered VARCHAR(64) PATH '$.ordered'
@@ -273,7 +273,7 @@ class PreorderModel {
             LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus as tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id,
+            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id,
             JSON_TABLE(tt_preorder.addon_services, 
               '$[*]' COLUMNS (
                 ordered VARCHAR(64) PATH '$.ordered'
@@ -313,7 +313,7 @@ class PreorderModel {
             LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id
+            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id
             WHERE $where
       ";
     
@@ -337,7 +337,7 @@ class PreorderModel {
             LEFT JOIN `".FRONKDB_DBNAME."`.Preorderstatus tt_preorderstatus ON (tt_preorder.status_id = tt_preorderstatus.id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.view_hausnummer as adb_hausnummer ON (tt_preorder.adb_hausnummer_id = adb_hausnummer.hausnummer_id)
             LEFT JOIN `".ADDRESSDB_DBNAME."`.Wohneinheit as adb_wohneinheit ON (tt_preorder.adb_wohneinheit_id = adb_wohneinheit.id)
-            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) wocount ON adb_wohneinheit.id = wocount.adb_wohneinheit_id
+            LEFT OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id
             WHERE $where
             ORDER BY lastname, firstname
       ";
@@ -568,9 +568,23 @@ class PreorderModel {
     if(array_key_exists("rimo_workorder", $filter)) {
       $rimo_workorder = $filter['rimo_workorder'];
       if($rimo_workorder === null || $rimo_workorder === false) {
-        $where .= " AND (wocount.cnt IS NULL OR wocount.cnt = 0)";
+        $where .= " AND (workorder.cnt IS NULL OR workorder.cnt = 0)";
       } elseif($rimo_workorder) {
-        $where .= " AND wocount.cnt > 0";
+        $where .= " AND workorder.cnt > 0";
+      }
+    }
+    
+    if(array_key_exists("rimo_workorder_status", $filter)) {
+      $rimo_workorder_status = FronkDB::singleton()->escape($filter['rimo_workorder_status']);
+      if($rimo_workorder_status) {
+        $where .= " AND workorder.rimo_status = '$rimo_workorder_status'";
+      }
+    }
+    
+    if(array_key_exists("rimo_workorder_name", $filter)) {
+      $rimo_workorder_name = FronkDB::singleton()->escape($filter['rimo_workorder_name']);
+      if($rimo_workorder_name) {
+        $where .= " AND workorder.rimo_name = '$rimo_workorder_name'";
       }
     }