Changeset 531 for trunk

Timestamp:

Apr 23, 2013, 11:36:41 PM (11 years ago)

Author:

chronos

Message:

• Upraveno: Nezobrazovat před názvem číselné ID položek při zobrazení výběru 1:N. Pokud potřebuje tabulka zpřístupnit uživateli ID, tak jej může zobrazovat jako pole pouze pro čtení.
• Přidáno: Zobrazení součtu zobrazených, filtrovaný a celkového počtu na konci tabulek.
• Přidáno: Zobrazení nástěnky při vstupu do "Správy dat".

Location:

trunk

Files:

• Common/Form/Types/OneToMany.php (modified) (1 diff)
• Common/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (5 diffs)
• admin/Updates.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)

trunk/Common/Form/Types/OneToMany.php

@@ -41 +41 @@
     {
       if($Item['Value'] == $DbRow['Id']) $Selected = ' selected="1"'; else $Selected = '';
-      $Output .= '<option value="'.$DbRow['Id'].'"'.$Selected.'>'.$DbRow['Id'].': '.$DbRow['Name'].'</option>';
+      $Output .= '<option value="'.$DbRow['Id'].'"'.$Selected.'>'.$DbRow['Name'].'</option>';
     }
     $Output .= '</select>';

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 530; // Subversion revision
+$Revision = 531; // Subversion revision
 $DatabaseRevision = 527; // SQL structure revision
 $ReleaseTime = '2013-04-23';

trunk/Modules/IS/IS.php

@@ -29 +29 @@
     else if($Action == 'view') $Content = $this->ShowView($Table, $ItemId);
     else if($Action == 'delete') $Content = $this->ShowDelete($Table, $ItemId);
-    else $Content = '';
+    else $Content = $this->Dashboard();
     if($this->HideMenu == false)
     {
@@ -39 +39 @@
     } else $Output = $Content;
     
+    return($Output);
+  }
+  
+  function Dashboard()
+  {
+    $Output = '<strong>Nástěnka:</strong><br/>'; 
+    $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');
+    $DbRow = $DbResult->fetch_row();
+    $Output .= 'Stav placení: '.$DbRow['0'].'<br/>';
     return($Output);
   }
@@ -200 +224 @@
       }
     }      
-    $Output .= '<tr><form action="?a=select&amp;filter=1" method="post">';
+    $Output .= '<tr><form action="?a=select&amp;t='.$Table.'&amp;r='.$_GET['r'].'&amp;filter=1" method="post">';
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
       if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
@@ -313 +337 @@
     $Output .= '<td><input type="Submit" value="Hledat"/></td></form></tr>';
 
-    $Query = 'SELECT * FROM `'.$FormClass['Table'].'`'.$Filter.' '.$Order['SQL'].$PageList['SQLLimit'];
-    
+    // Get total item count in database
+    $Query = 'SELECT COUNT(*) FROM `'.$FormClass['Table'].'`';
+    $DbResult = $this->Database->query($Query);
+    $DbRow = $DbResult->fetch_assoc();
+    $TotalCount = $DbRow['COUNT(*)'];
+    
+    // Get total filtered item count in database
+    if($UserFilter != '') 
+    {
+      $Query = 'SELECT COUNT(*) FROM `'.$FormClass['Table'].'`'.$Filter;
+      $DbResult = $this->Database->query($Query);
+      $DbRow = $DbResult->fetch_assoc();
+      $TotalFilteredCount = $DbRow['COUNT(*)'];
+    }    
+    
+    // Load and show items
+    $Query = 'SELECT * FROM `'.$FormClass['Table'].'`'.$Filter.' '.$Order['SQL'].$PageList['SQLLimit'];    
+    $VisibleItemCount = 0;
     $DbResult = $this->Database->query($Query);
     while($Row = $DbResult->fetch_assoc()) 
@@ -359 +399 @@
       }
       $Output .= '</td></tr>';
-    }
+      $VisibleItemCount = $VisibleItemCount + 1;
+    }
+    $Output .= '<tr><td colspan="'.count($TableColumns).'" style="text-align: right;">Zobrazeno <strong>'.$VisibleItemCount.'</strong>';
+    if($UserFilter != '') $Output .= ' z filtrovaných <strong>'.$TotalFilteredCount.'</strong>';
+    $Output .= ' z celkem <strong>'.$TotalCount.'</strong></td></tr>';
     $Output .= '</table>';
     $Output .= $PageList['Output'];

trunk/admin/Updates.php

@@ -301 +301 @@
   $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
     "VALUES (NULL , 'Nabídky', '23', '".$ActionId."', '1');");  
-  
 }
 

trunk/form_classes.php

@@ -586 +586 @@
     'DefaultSortColumn' => 'Name',
     'Items' => array(
+      'Id' => array('Type' => 'Integer', 'Caption' => 'Identifikace', 'Default' => '', 'ReadOnly' => true),
       'Name' => array('Type' => 'String', 'Caption' => 'Celé jméno', 'Default' => ''),
       'AddressStreet' => array('Type' => 'String', 'Caption' => 'Ulice', 'Default' => ''),