Changeset 914 for trunk

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Form.php (modified) (2 diffs)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/FinanceBankAPI/FinanceBankAPI.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/Subject/Subject.php (modified) (1 diff)
• Modules/Task/Task.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• images/favicons/Qwant.png (added)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 911; // Subversion revision
+$Revision = 914; // Subversion revision
 $DatabaseRevision = 911; // SQL structure revision
-$ReleaseTime = strtotime('2021-07-31');
+$ReleaseTime = strtotime('2021-09-22');

trunk/Common/Form/Form.php

@@ -452 +452 @@
       if (!$this->Database->TableExists($Class['Table'])) continue;
 
-      echo($Class['Table'].'<br>');
+      echo($Class['Table'].'<br/>');
       $Module = 1;
       $DbResult = $this->Database->select('Model', 'Id', 'Name="'.$Class['Table'].'"');
@@ -503 +503 @@
         }
       }
-      echo('<br>');
+      echo('<br/>');
     }
   }

trunk/Modules/Customer/Customer.php

@@ -249 +249 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
-    $Output = 'Zákazníků: registrovaných:'.$DbRow['0'];
-
-    $DbResult = $this->Database->select('Member', 'COUNT(*)', '`Blocked`=0 AND `BillingPeriod`<>1');
+    $Output = 'Zákazníků: registrovaných: <a href="'.$this->System->Link('/is/?a=list&amp;t=Member').'">'.$DbRow['0'].'</a>';
+
+    $DbResult = $this->Database->select('Member', 'COUNT(*)', '(`Blocked`=0) AND (`BillingPeriod`<>1)');
     $DbRow = $DbResult->fetch_row();
-    $Output .= ' platících:'.$DbRow['0'].'<br/>';
+    $Output .= ' aktivních: <a href="'.$this->System->Link('/is/?a=list&t=Member&amp;filter=1&amp;FilterBlocked=0&amp;FilterBillingPeriod=Nikdy&amp;FilterOpBillingPeriod=notequal').'">'.$DbRow['0'].'</a>';
+
+    $DbResult = $this->Database->select('Member', 'COUNT(*)', '(`Blocked`=0) AND (`BillingPeriod`<>1) AND '.
+      '((SELECT SUM(Service.Price) FROM ServiceCustomerRel LEFT JOIN Service ON Service.Id=ServiceCustomerRel.Service WHERE ServiceCustomerRel.Customer=Member.Id) <> 0)');
+    $DbRow = $DbResult->fetch_row();
+    $Output .= ' platících: <a href="'.$this->System->Link('/is/?a=list&t=Member&amp;filter=1&amp;FilterBlocked=0&amp;FilterBillingPeriod=Nikdy&amp;FilterOpBillingPeriod=notequal').'">'.$DbRow['0'].'</a><br/>';
 
     return $Output;

trunk/Modules/FinanceBankAPI/FinanceBankAPI.php

@@ -86 +86 @@
     $DbResult = $this->Database->select('FinanceBankImport', 'COUNT(*)', '`FinanceOperation` IS NULL');
     $DbRow = $DbResult->fetch_row();
-    $Output = 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
+    $Output = 'Nezpárovaných plateb: <a href="'.$this->System->Link('/is/?a=list&amp;t=FinanceBankImport&amp;filter=1&amp;FilterFinanceOperation=1&amp;FilterOpFinanceOperation=isnull').'">'.$DbRow['0'].'</a><br/>';
     return $Output;
   }

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 != '')
     {

trunk/Modules/Network/Network.php

@@ -829 +829 @@
     $DbResult = $this->Database->select('NetworkDevice', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
-    $Output .= 'Síťových zařízení: registrovaných:'.$DbRow['0'];
+    $Output .= 'Síťových zařízení: registrovaných: <a href="'.$this->System->Link('/is/?a=list&amp;t=NetworkDevice').'">'.$DbRow['0'].'</a>';
 
     $DbResult = $this->Database->select('NetworkDevice', 'COUNT(*)', '`Used`=1');
     $DbRow = $DbResult->fetch_row();
-    $Output .= ' použitých:'.$DbRow['0'].'<br>';
+    $Output .= ' použitých: <a href="'.$this->System->Link('/is/?a=list&amp;t=NetworkDevice&amp;filter=1&amp;FilterUsed=1').'">'.$DbRow['0'].'</a><br/>';
 
     $DbResult = $this->Database->select('NetworkInterface', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
-    $Output .= 'Síťových rozhraní: '.$DbRow['0'].'<br>';
+    $Output .= 'Síťových rozhraní: registrovaných: <a href="'.$this->System->Link('/is/?a=list&amp;t=NetworkDevice').'">'.$DbRow['0'].'</a>';
+
+    $DbResult = $this->Database->select('NetworkInterface', 'COUNT(*)', '`Enabled`=1');
+    $DbRow = $DbResult->fetch_row();
+    $Output .= ' použitých: <a href="'.$this->System->Link('/is/?a=list&amp;t=NetworkInterface&amp;filter=1&amp;FilterEnabled=1').'">'.$DbRow['0'].'</a><br/>';
 
     $DbResult = $this->Database->select('NetworkSubnet', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
-    $Output .= 'Síťových podsítí: '.$DbRow['0'].'<br/>';
+    $Output .= 'Síťových podsítí: <a href="'.$this->System->Link('/is/?a=list&amp;t=NetworkSubnet').'">'.$DbRow['0'].'</a><br/>';
     return $Output;
   }

trunk/Modules/Subject/Subject.php

@@ -145 +145 @@
     $DbResult = $this->Database->select('Subject', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
-    $Output = 'Subjektů: '.$DbRow['0'].'<br/>';
+    $Output = 'Subjektů: <a href="'.$this->System->Link('/is/?a=list&amp;t=Subject').'">'.$DbRow['0'].'</a><br/>';
     return $Output;
   }

trunk/Modules/Task/Task.php

@@ -98 +98 @@
     $DbResult = $this->Database->select('Task', 'COUNT(*)', '`Progress` < 100');
     $DbRow = $DbResult->fetch_row();
-    $Output = 'Nedokončených úkolů: '.$DbRow['0'].'<br/>';
+    $Output = 'Nedokončených úkolů: <a href="'.$this->System->Link('/is/?a=list&amp;t=Task&amp;filter=1&amp;FilterProgress=100&amp;FilterOpProgress=less').'">'.$DbRow['0'].'</a><br/>';
     return $Output;
   }

trunk/Modules/User/User.php

@@ -198 +198 @@
     $DbResult = $this->Database->select('User', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
-    $Output = 'Uživatelů: '.$DbRow['0'].'<br/>';
+    $Output = 'Uživatelů: <a href="'.$this->System->Link('/is/?a=list&amp;t=User&amp;filter=1').'">'.$DbRow['0'].'</a><br/>';
     return $Output;
   }