Changeset 636

Timestamp:

Jan 21, 2014, 12:02:53 AM (11 years ago)

Author:

chronos

Message:

• Upraveno: Tabulka měsíčních přehledů přepracována s použitím obecných tříd. Nyní podporuje řazení a stránkování. Celkové součty byly odebrány.

Location:

trunk

Files:

• Common/Global.php (modified) (2 diffs)
• Common/Setup/Setup.php (modified) (2 diffs)
• Common/Table.php (modified) (5 diffs)
• Modules/Finance/MonthlyOverall.php (modified) (2 diffs)

trunk/Common/Global.php

@@ -137 +137 @@
 }
 
-class Pageing 
+class Paging 
 {
         var $TotalCount;
         var $ItemPerPage;
         var $Around;
+        var $SQLLimit;
+        var $Page;
         
         function __construct()
@@ -147 +149 @@
                 global $System;
                 
-                $this->ItemPerPage = 5; //$System->Config['Web']['ItemsPerPage'];
+                $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
                 $this->Around = $System->Config['Web']['VisiblePagingItems'];
         }

trunk/Common/Setup/Setup.php

@@ -210 +210 @@
     $Pageing = new Pageing();
     $Pageing->TotalCount = count($this->System->ModuleManager->Modules);
-    $Table = new Table();    
+    $Table = new VisualTable();
     $Table->SetColumns(array(
       array('Name' => 'Name', 'Title' => 'Jméno'),
@@ -235 +235 @@
       } else $Actions .= ' <a href="?action=modules&amp;op=install&amp;name='.$Module->Name.'">Instalovat</a>';
    
-      $Table->Cells[] = array($Module->Name,
+      $Table->Table->Cells[] = array($Module->Name,
         $Module->Creator, $Module->Version, 
         $Module->License, $YesNo[$Module->Installed],

trunk/Common/Table.php

@@ -11 +11 @@
 }
 
+class Table
+{
+        function GetCell($Y, $X)
+        {
+                return('');
+        }
+
+        function BeginRead()
+        {
+        }
+        
+        function EndRead()
+        {
+        }
+        
+  function RowsCount()
+  {
+        return(0);
+  }
+}
+
+class TableMemory extends Table
+{
+        var $Cells;
+        
+        function GetCell($Y, $X)
+        {
+                return($this->Cells[$Y][$X]);
+        }
+
+  function RowsCount()
+  {
+        return(count($this->Cells));
+  }
+}
+
+class TableSQL extends Table
+{
+        var $Query;
+        var $Database;
+        var $Cells;     
+        
+        function GetCell($Y, $X)
+        {
+                return($this->Cells[$Y][$X]);
+        }
+        
+        function BeginRead()
+        {
+                $this->Cells = array();
+                $DbResult = $this->Database->query($this->Query);
+                while($DbRow = $DbResult->fetch_row())
+                {
+                        $this->Cells[] = $DbRow;
+                }
+        }
+        
+        function EndRead()
+        {
+                $this->Cells = array();
+        }
+
+  function RowsCount()
+  {
+        return(count($this->Cells));
+  }
+}
+
 class TableColumn
 {
@@ -17 +85 @@
 }
 
-class Table extends Control
+class VisualTable extends Control
 {
   var $Cells;
   var $Columns;
-  var $OrderDirSQL;
+  var $OrderSQL;
+  var $OrderColumn;
+  var $OrderDirection;
   var $OrderArrowImage;
   var $DefaultColumn;
   var $DefaultOrder;
+  var $Table;
   
   function __construct()
@@ -31 +102 @@
         
         $this->Columns = array();
-        $this->Cells = array();
+        $this->Table = new TableMemory();
     $this->OrderDirSQL = array('ASC', 'DESC');
     $this->OrderArrowImage = array($System->Link('/images/sort_asc.png'), 
@@ -57 +128 @@
           $Output = '<table class="WideTable">';
           $Output .= $this->GetOrderHeader();
-        foreach($this->Cells as $Row)
+          $this->Table->BeginRead();
+        for($Y = 0; $Y < $this->Table->RowsCount(); $Y++)
         {
             $Output .= '<tr>';
-            foreach($Row as $Cell)
+            
+            for($X = 0; $X < count($this->Columns); $X++)
             {
+                $Cell = $this->Table->GetCell($Y, $X);
                 if($Cell == '') $Output .= '<td>&nbsp;</td>'; 
                     else $Output .= '<td>'.$Cell.'</td>';
-            }
+            }       
             $Output .= '</tr>';
           }
+          $this->Table->EndRead();
           $Output .= '</table>';
     return($Output);
@@ -109 +184 @@
         else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column->Title.$ArrowImage.'</a></th>';
     }
-    $this->SQL = ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$this->OrderDirSQL[$_SESSION['OrderDir']];
-    $this->Column = $_SESSION['OrderCol'];
-    $this->Direction = $_SESSION['OrderDir'];
+    $this->OrderSQL = ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$this->OrderDirSQL[$_SESSION['OrderDir']];
+    $this->OrderColumn = $_SESSION['OrderCol'];
+    $this->OrderDirection = $_SESSION['OrderDir'];
  
     return($Result);

trunk/Modules/Finance/MonthlyOverall.php

@@ -11 +11 @@
     global $MonthNames;
 
-    $Output = '<table class="WideTable"><tr><th>Rok</th><th>Měsíc</th><th>Internet [Kč]</th><th>Účastníků</th><th>Správa [Kč/účastníka]</th><th>Správa [Kč]</th><th>Spotřeba [Kč/kWh]</th><th>Spotřeba [Kč]</th><th>Obrat [Kč]</th><th>Průměrná cena [Kč/účastníka]</th><th align="center">Investice [Kč]</th></tr>';
+    $Output = ''; 
+    $Query = 'SELECT *, YEAR(`Date`) AS `Year`, MONTH(`Date`) AS `Month`, ROUND(`TotalPaid` / `MemberCount`) AS `PaidPerCustomer` FROM `FinanceMonthlyOverall`';
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `T`');
+    $DbRow = $DbResult->fetch_row();
+    $Paging = new Paging();    
+    $Paging->TotalCount = $DbRow[0];
+    $Table = new VisualTable();
+    $Table->SetColumns(array(
+      array('Name' => 'Year', 'Title' => 'Rok'),
+      array('Name' => 'Month', 'Title' => 'Měsíc'),
+      array('Name' => 'Money', 'Title' => 'Internet [Kč]'),
+      array('Name' => 'MemberCount', 'Title' => 'Zákazníků'),
+      array('Name' => 'Administration', 'Title' => 'Správa [Kč/zákazníka]'),
+      array('Name' => 'AdministrationTotal', 'Title' => 'Správa [Kč]'),
+      array('Name' => 'kWh', 'Title' => 'Spotřeba [Kč/kWh]'),
+      array('Name' => 'ConsumptionTotal', 'Title' => 'Spotřeba [Kč]'),
+      array('Name' => 'TotalPaid', 'Title' => 'Obrat [Kč]'),
+      array('Name' => 'PaidPerCustomer', 'Title' => 'Průměrná cena [Kč/účastníka]'),
+      array('Name' => 'Investment', 'Title' => 'Investice [Kč]'),      
+    ));
+    $Output .= $Paging->Show();     
+        
+          $Table->GetOrderHeader();
+        
     $Total = array('Money' => 0, 'AdministrationTotal' => 0, 'ConsumptionTotal' => 0, 'TotalPaid' => 0, 'Investment' => 0);
-    $DbResult = $this->Database->select('FinanceMonthlyOverall', '*', '1 ORDER BY Date DESC');
+    $DbResult = $this->Database->query($Query.' WHERE 1 '.$Table->OrderSQL.' '.$Paging->SQLLimit);
     while($Month = $DbResult->fetch_array())
     {
-      $DateParts = explode('-', $Month['Date']);
-      $Output .= '<tr><td>'.$DateParts[0].'</td><td align="center">'.$MonthNames[$DateParts[1] * 1].'</td><td align="center">'.$Month['Money'].'</td><td align="center">'.$Month['MemberCount'].'</td><td align="center">'.$Month['Administration'].'</td><td align="center">'.$Month['AdministrationTotal'].'</td><td align="center">'.$Month['kWh'].'</td><td align="center">'.$Month['ConsumptionTotal'].'</td><td align="center">'.$Month['TotalPaid'].'</td><td align="center">'.round($Month['TotalPaid'] / $Month['MemberCount']).'</td><td align="center">'.$Month['Investment'].'</td></tr>';
+      $Table->Table->Cells[] = array($Month['Year'], $MonthNames[$Month['Month']],
+        $Month['Money'], $Month['MemberCount'], $Month['Administration'],
+        $Month['AdministrationTotal'], $Month['kWh'], $Month['ConsumptionTotal'],
+        $Month['TotalPaid'], $Month['PaidPerCustomer'], 
+        $Month['Investment']);
 
       $Total['Money'] += $Month['Money'];
@@ -26 +52 @@
       //if($DateParts[1] == '01') echo('<tr><td style="font-size: 4;" colspan="10">&nbsp;</td></tr>');
     }
-    $Output .= '<tr><th colspan="2">Celkem</th><th>'.$Total['Money'].'</th><th>&nbsp;</th><th>&nbsp;</th><th>'.$Total['AdministrationTotal'].'</th><th>&nbsp;</th><th>'.$Total['ConsumptionTotal'].'</th><th>'.$Total['TotalPaid'].'</th><th>&nbsp;</th><th>'.$Total['Investment'].'</th>';
-    $Output .= '</table>';
+    //$Table->Table->Cells[] = array('Celkem', '', $Total['Money'], '', '', $Total['AdministrationTotal'], 
+    //  '', $Total['ConsumptionTotal'], $Total['TotalPaid'], '', $Total['Investment']);
+    $Output .= $Table->Show();
+    $Output .= $Paging->Show();    
+   
     return($Output);
   }