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

Timestamp:

Jan 2, 2015, 11:16:56 PM (10 years ago)

Author:

chronos

Message:

• Added: Support for Hidden items in form types values.
• Added: Support for Filtered items in form types values.
• Modified: FinanceOperation Value splitted to (Direction * Value). Direction can be +1 or -1 depends on if money goes out or in company.
• Added: Menu "Incomes and spends" is now splitted to incomes/spends of bank account or treasury. Direction and document line is filled automatically.

File:

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

trunk/Modules/IS/IS.php

@@ -26 +26 @@
     $this->System->FormManager->ShowRelation = true;
 
+    // a - action
     if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
       else $Action = '';
+    // t - table
     if(array_key_exists('t', $_GET)) $Table = $_GET['t'];
       else $Table = '';
+    // i - index of item 
     if(array_key_exists('i', $_GET)) $ItemId = $_GET['i'];
       else $ItemId = 0;
+    // fc - preset colum 
+    if(array_key_exists('fn', $_GET)) $FilterName = $_GET['fn'];
+      else $FilterName = '';
+    if(array_key_exists('fv', $_GET)) $FilterValue = $_GET['fv'];
+      else $FilterValue = '';
     if(array_key_exists('menutype', $_COOKIE)) $MenuType = $_COOKIE['menutype'];
       else $MenuType = 0;
@@ -37 +45 @@
     setcookie('menutype', $MenuType, time() + 60 * 60 * 24 * 365);
 
-    if($Action == 'list') $Content = $this->ShowList($Table);
+    if($Action == 'list') {
+        if($FilterName == '') $Content = $this->ShowList($Table);
+          else $Content = $this->ShowList($Table, '', '', $FilterName, $FilterValue);
+    }
     else if($Action == 'select') $Content = $this->ShowSelect($Table);
     else if($Action == 'mapselect') $Content = $this->ShowMapSelect($Table);
@@ -70 +81 @@
   {
     $Output = '<strong>Nástěnka:</strong><br/>';
-    $DbResult = $this->Database->select('Task', 'COUNT(*)', 'Progress < 100');
+    $DbResult = $this->Database->select('Task', 'COUNT(*)', '`Progress` < 100');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Nedokončených úkolů: '.$DbRow['0'].'<br/>';
+    
     $DbResult = $this->Database->select('Member', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Zákazníků: '.$DbRow['0'].'<br/>';
+    
     $DbResult = $this->Database->select('Subject', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Subjektů: '.$DbRow['0'].'<br/>';
+    
     $DbResult = $this->Database->select('User', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Uživatelů: '.$DbRow['0'].'<br/>';
+    
     $DbResult = $this->Database->select('NetworkDevice', 'COUNT(*)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Registrovaných zařízení: '.$DbRow['0'].'<br/>';
-    $DbResult = $this->Database->select('FinanceOperation', 'SUM(Value)', '1');
+    
+    $DbResult = $this->Database->select('FinanceOperation', 'SUM(`Value` * `Direction`)', '1');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Stav placení: '.$DbRow['0'].'<br/>';
-    $DbResult = $this->Database->select('FinanceBankImport', 'COUNT(*)', 'FinanceOperation IS NULL');
+    
+    $DbResult = $this->Database->select('FinanceBankImport', 'COUNT(*)', '`FinanceOperation` IS NULL');
     $DbRow = $DbResult->fetch_row();
     $Output .= 'Nezpárovaných plateb: '.$DbRow['0'].'<br/>';
@@ -397 +414 @@
       else $SourceTable = '`'.$FormClass['Table'].'` AS `TX`';
 
+    // Build form type filter
+    $TypeFilter = '';
+    foreach($FormClass['Items'] as $ItemIndex => $FormItem)    
+    if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
+    (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
+    ($this->System->FormManager->FormTypes[$FormItem['Type']]['Type'] != 'ManyToOne')))
+    if(array_key_exists('Filter', $FormItem) and ($FormItem['Filter'] == true))
+    {
+        if($TypeFilter != '') $TypeFilter .= ' AND ';           
+        $TypeFilter .= '('.$ItemIndex.' = "'.$FormItem['Default'].'")';
+    }      
+    if($TypeFilter != '')
+    {
+        if($Filter != '') $Filter = ' AND';
+        $Filter .= ' '.$TypeFilter;
+    }
+    
     // Build user filter
     $UserFilter = '';
@@ -403 +437 @@
     {
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
+      if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
       if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
@@ -435 +470 @@
     if($Filter != '') $Filter = ' HAVING '.$Filter;
 
-    foreach($FormClass['Items'] as $ItemIndex => $FormItem)
+    foreach($FormClass['Items'] as $ItemIndex => $FormItem)     
       if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
@@ -441 +476 @@
       {
         if($ExcludeColumn != $ItemIndex)
+        if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
           $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
         $UseType = $UseType = $FormItem['Type'];
@@ -499 +535 @@
     $Output .= '<tr><form action="?a='.$_GET['a'].'&amp;t='.$Table.'&amp;filter=1'.$Addition.'" method="post">';
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
+    if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
     if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
     (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
@@ -520 +557 @@
       $Output .= '<tr>';
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
+      if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
       if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and