From 31d9c458d18a7af43c1ca1d6228d1c908640119d Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Fri, 22 Mar 2024 12:33:27 +0100
Subject: [PATCH] Added workorder team filter in Preorder/Index

---
 Layout/default/Preorder/Index.php            |  7 ++++++-
 application/Preorder/PreorderModel.php       | 21 +++++++++++++-------
 scripts/adb-rimo-import/rimo-import-test.php | 18 ++++++++++++-----
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php
index f9ffa4d52..42666d3a1 100644
--- a/Layout/default/Preorder/Index.php
+++ b/Layout/default/Preorder/Index.php
@@ -156,10 +156,15 @@
                 </div>
                 
                 <div class="col-2">
-                  <label class="form-label" for="filter_kunde">Rimo Workorder Name</label>
+                  <label class="form-label" for="filter_workorder_name">Rimo Workorder Name</label>
                   <input type="text" class="form-control" name="filter[rimo_workorder_name]" id="filter_workorder_name" value="<?=$filter['workorder_name'] ?? ""?>" />
                 </div>
                 
+                <div class="col-2">
+                  <label class="form-label" for="filter_workorder_team_name">Rimo Workorder Assigned Team</label>
+                  <input type="text" class="form-control" name="filter[rimo_workorder_team_name]" id="filter_workorder_team_name" value="<?=$filter['rimo_workorder_team_name'] ?? ""?>" />
+                </div>
+                
                 <div class="col-2">
                   <label class="form-label" for="rimo_home_extref">Wohneinheit Rimo-Extref</label>
                   <select name="filter[rimo_home_extref]" id="filter_rimo_home_extref" class="form-control">
diff --git a/application/Preorder/PreorderModel.php b/application/Preorder/PreorderModel.php
index 49614c3f6..6f1f8fa04 100644
--- a/application/Preorder/PreorderModel.php
+++ b/application/Preorder/PreorderModel.php
@@ -157,7 +157,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_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";
@@ -186,7 +186,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_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
       ";
@@ -211,7 +211,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_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
@@ -264,7 +264,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_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'
@@ -304,7 +304,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_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'
@@ -374,7 +374,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_name FROM `".FRONKDB_DBNAME."`.RimoWorkorder GROUP BY adb_wohneinheit_id) workorder ON adb_wohneinheit.id = workorder.adb_wohneinheit_id
             WHERE $where
       ";
     
@@ -398,7 +398,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, 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 OUTER JOIN (SELECT adb_wohneinheit_id, count(*) cnt, MAX(rimo_status) as rimo_status, MAX(rimo_name) as rimo_name, MAX(rimo_team_name) as rimo_team_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
       ";
@@ -669,6 +669,13 @@ class PreorderModel {
       }
     }
     
+    if(array_key_exists("rimo_workorder_team_name", $filter)) {
+      $rimo_workorder_team_name = FronkDB::singleton()->escape($filter['rimo_workorder_team_name']);
+      if($rimo_workorder_team_name) {
+        $where .= " AND workorder.rimo_team_name LIKE '%$rimo_workorder_team_name%'";
+      }
+    }
+    
     if(array_key_exists("netzgebiet_id", $filter)) {
       $netzgebiet_id = $filter['netzgebiet_id'];
       if(is_numeric($netzgebiet_id)) {
diff --git a/scripts/adb-rimo-import/rimo-import-test.php b/scripts/adb-rimo-import/rimo-import-test.php
index 424cd07c0..d514988fe 100755
--- a/scripts/adb-rimo-import/rimo-import-test.php
+++ b/scripts/adb-rimo-import/rimo-import-test.php
@@ -446,12 +446,20 @@ foreach($netowners as $apiOwner) {
             
             $wo = \RimoWorkorderModel::getFirst(["rimo_id" => $rimo_workorder_id]);
 
-            if($wo && $workorder_status != $wo->rimo_status) {
+            if($wo) {
               //echo "Updating Workorder $rimo_workorder_id ($workorder_home_id)\n";
-              $wo->rimo_status = $workorder_status;
-              if($team_id) $wo->rimo_team_id = $team_id;
-              if($team_name) $wo->rimo_team_name = $team_name;
-              $wo->save();
+              if($workorder_status != $wo->rimo_status) {
+                $wo->rimo_status = $workorder_status;
+                $wo->save();
+              }
+              if($team_id != $wo->rimo_team_id) {
+                $wo->rimo_team_id = $team_id;
+                $wo->save();
+              }
+              if($team_name != $wo->rimo_team_name) {
+                $wo->rimo_team_name = $team_name;
+                $wo->save();
+              }
             }
 
             if(!$wo) {