From 807bf3d35e1f13ca6e727ca80f0a1797b02903b8 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Tue, 31 Aug 2021 11:59:58 +0200
Subject: [PATCH] Filter is kept after saving workflow

---
 Layout/default/Pipework/Index.php           |  6 ++--
 application/Pipework/PipeworkController.php |  8 ++---
 lib/mvcfronk/mfBase/mfBaseController.php    | 35 ++++++++++++---------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index 0383510d5..1c4cd0e19 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -110,8 +110,8 @@
                       </div>
                     </td>
                     <td>
-                      <form method="post" name="wf-building-<?=$building->id?>" id="wf-building-<?=$building->id?>" action="<?=self::getUrl("Pipework","save")?>" enctype="multipart/form-data" >
-                        <input type="hidden" name="id" value="<?=$building->id?>" />
+                      <form method="post" name="wf-building-<?=$building->id?>" id="wf-building-<?=$building->id?>" action="<?=self::getUrl("Pipework","save", ["filter" => $filter])?>" enctype="multipart/form-data" >
+			<input type="hidden" name="id" value="<?=$building->id?>" />
                         <table class="table workflow-table">
                             <?php $i = 0; foreach($building->workflowitems as $item): ?>
                               <?php if($i==0): ?>
@@ -211,4 +211,4 @@ $(document).ready(function() {
 </script>
   
 
-<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
\ No newline at end of file
+<?php include(realpath(dirname(__FILE__)."/../")."/footer.php"); ?>
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index 384564051..b400f32bd 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -196,11 +196,11 @@ class PipeworkController extends mfBaseController {
     if(defined("TT_WORKFLOW_ITEM_STATUS_FIELD") && defined("TT_WORKFLOW_ITEM_STATUS_VALUE_PASSED") && defined("TT_WORKFLOW_ITEM_STATUS_VALUE_CONNECTED")) {
       $status_value = $building->workflowitems[TT_WORKFLOW_ITEM_STATUS_FIELD]->value->value_string;
       //var_dump($status_value);exit;
-      if($status_value == TT_WORKFLOW_ITEM_STATUS_VALUE_PASSED) {
+      if($status_value == TT_WORKFLOW_ITEM_STATUS_VALUE_PASSED && $building->status_id != 4) {
         $building->status_id = 4;
         $building->save();
       }
-      if($status_value == TT_WORKFLOW_ITEM_STATUS_VALUE_CONNECTED) {
+      if($status_value == TT_WORKFLOW_ITEM_STATUS_VALUE_CONNECTED && $building->status_id != 5) {
         $building->status_id = 5;
         $building->save();
       }
@@ -250,11 +250,11 @@ class PipeworkController extends mfBaseController {
     }
     
     $this->layout->setFlash("Workflow Eintrag erfolgreich gespeichert.", "success");
-    $this->redirect("Pipework","Index", false, "object=".$building_id);
+    $this->redirect("Pipework","Index", http_build_query(["filter" => $this->request->filter]), "object=".$building_id);
     
     
       
     
   }
   
-}
\ No newline at end of file
+}
diff --git a/lib/mvcfronk/mfBase/mfBaseController.php b/lib/mvcfronk/mfBase/mfBaseController.php
index f3bc41696..2d570f1a1 100644
--- a/lib/mvcfronk/mfBase/mfBaseController.php
+++ b/lib/mvcfronk/mfBase/mfBaseController.php
@@ -207,22 +207,27 @@ class mfBaseController {
       }
     }*/
     
-    if(is_array($params) && count($params)) {
-      $url .= (MFUSEFANCYURLS) ? "/?" : "&";
-			foreach($params as $k => $v) {
-        $v = urlencode($v);
-        
-        if($k) {
-          $k = urlencode($k);
-          $url .= "$k=$v&";
-        } else {
-          $url .= "$v&";
-        }
-			}
-      
-      $url = preg_replace('/&$/', '', $url);
+    if($params) {
+
+	    if(is_array($params) && count($params)) {
+	      $url .= (MFUSEFANCYURLS) ? "/?" : "&";
+				foreach($params as $k => $v) {
+	        $v = urlencode($v);
+	        
+	        if($k) {
+	          $k = urlencode($k);
+	          $url .= "$k=$v&";
+        	} else {
+	          $url .= "$v&";
+	        }
+				}
+	      
+	      $url = preg_replace('/&$/', '', $url);
+	    } else {
+		    $url .= (MFUSEFANCYURLS) ? "/?" : "&";
+		    $url .= $params;
+	    }
     }
-    
     if($anker) {  
       $url.="#$anker";  
     }