From c6d3222685aa8ff567d1f700cd4bc64c680574ca Mon Sep 17 00:00:00 2001
From: hahn <axel.hahn@iml.unibe.ch>
Date: Tue, 28 May 2019 09:19:07 +0200
Subject: [PATCH] - update appmonitor client class - simplify filter on top in
 the project overview

---
 .../deployment/classes/projectlist.class.php  | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php
index e18d23cb..064b8fdc 100644
--- a/public_html/deployment/classes/projectlist.class.php
+++ b/public_html/deployment/classes/projectlist.class.php
@@ -292,6 +292,20 @@ class projectlist extends base{
                     */
                     function setDefaultView(){
 
+                        
+                        if (localStorage.getItem("progress") && localStorage.getItem("progress")!=\'null\'){
+                            $("#progressfilter").val(localStorage.getItem("progress"));
+                        } else {
+                            $("#progressfilter").val($("#progressfilter option:first").val());
+                        }
+                        if (localStorage.getItem("efilter") && localStorage.getItem("efilter")!=\'null\') {
+                            $("#efilter").val(localStorage.getItem("efilter"));
+                            window.setTimeout("filterTableByTyping();", 10);
+                        }
+                        // window.setTimeout("filterOverviewTable();", 10);
+                        filterOverviewTable();
+                        
+                        /*
                         if(localStorage.getItem("selectedPrj") && localStorage.getItem("selectedPrj")!=\'null\'){
                             $("#prjfilter").val(localStorage.getItem("selectedPrj"));
                         } else {
@@ -304,18 +318,6 @@ class projectlist extends base{
                             $("#phasefilter").val($("#phasefilter option:first").val());
                         }
                         
-                        if (localStorage.getItem("progress") && localStorage.getItem("progress")!=\'null\'){
-                            $("#progressfilter").val(localStorage.getItem("progress"));
-                        } else {
-                            $("#progressfilter").val($("#progressfilter option:first").val());
-                        }
-                        // window.setTimeout("filterOverviewTable();", 10);
-                        filterOverviewTable();
-                        
-                        if (localStorage.getItem("efilter") && localStorage.getItem("efilter")!=\'null\') {
-                            $("#efilter").val(localStorage.getItem("efilter"));
-                            window.setTimeout("filterTableByTyping();", 10);
-                        }
                         if (localStorage.getItem("role") && localStorage.getItem("role")!=\'null\') {
                             $("#rolefilter").val(localStorage.getItem("role"));
                             window.setTimeout("setrole();", 20);
@@ -325,6 +327,7 @@ class projectlist extends base{
                             var sMode=localStorage.getItem("mode");
                             if (sMode)setview(sMode);
                         }
+                        */
                     }
                     
                     /**
-- 
GitLab