Changeset 914 for trunk/Modules/IS/IS.php

Timestamp:

Sep 22, 2021, 10:34:30 PM (3 years ago)

Author:

chronos

Message:

• Added: Made IS dashboard numbers as links with filters.

File:

• trunk/Modules/IS/IS.php (modified) (2 diffs)

trunk/Modules/IS/IS.php

@@ -549 +549 @@
   }
 
+  function GetParam(string $Name, string $Default): string
+  {
+    $Result = $Default;
+    if (array_key_exists($Name, $_POST) and ($_POST[$Name] != ''))
+    {
+      $Result = $_POST[$Name];
+    }
+    if (array_key_exists($Name, $_GET) and ($_GET[$Name] != ''))
+    {
+      $Result = $_GET[$Name];
+    }
+    return $Result;
+  }
+
   function ShowTable(string $Table, string $Filter = '', string $Title = '', string $RowActions = '', string $ExcludeColumn = ''): string
   {
@@ -604 +618 @@
         $FilterName = $this->System->FormManager->Type->ExecuteTypeEvent($UseType, 'OnFilterName',
           array('Name' => $ItemIndex, 'Type' => $FormItem['Type']));
-        if (array_key_exists('Filter'.$ItemIndex, $_POST) and ($_POST['Filter'.$ItemIndex] != ''))
+
+        $SqlOperator = array(
+          'like' => 'LIKE',
+          'notlike' => 'NOT LIKE',
+          'equal' => '=',
+          'notequal' => '!=',
+          'less' => '<',
+          'lessorequal' => '<=',
+          'greater' => '>',
+          'greaterorequal' => '>=',
+          'isnull' => 'IS NULL',
+          'isnotnull' => 'IS NOT NULL',
+        );
+        $Operator = $this->GetParam('FilterOp'.$ItemIndex, 'like');
+        if (array_key_exists($Operator, $SqlOperator))
+        {
+          $OperatorSql = $SqlOperator[$Operator];
+        } else $OperatorSql = $SqlOperator['like'];
+
+        $FilterValue = $this->GetParam('Filter'.$ItemIndex, '');
+        if ($FilterValue != '')
         {
           if ($UserFilter != '') $UserFilter .= ' AND ';
-          $UserFilter .= '('.$FilterName.' LIKE "%'.$_POST['Filter'.$ItemIndex].'%")';
+          $UserFilter .= '('.$FilterName.' '.$OperatorSql;
+          if (($Operator == 'like') or ($Operator == 'notlike')) $UserFilter .= ' "%'.$FilterValue.'%")';
+            else if (($Operator == 'isnull') or ($Operator == 'isnotnull')) $UserFilter .= ')';
+            else $UserFilter .= ' "'.$FilterValue.'")';
         }
       }
     }
+    echo($UserFilter);
     if ($UserFilter != '')
     {