Changeset 383 for trunk/Common

Timestamp:

Jan 23, 2012, 10:37:31 AM (14 years ago)

Author:

chronos

Message:

• Přidáno: Kostra základního systémového modulu System.
• Přidáno: Obsluha datových typů pro HTML kód a HTTP protokol.
• Upraveno: Do ViewList zkopírování generování tabulky se stránkováním a řazením.

Location:

trunk/Common

Files:

• Global.php (modified) (4 diffs)
• Module.php (modified) (4 diffs)
• PageList.php (modified) (1 diff)
• TableHeader.php (modified) (2 diffs)
• Types (added)
• Types/Base.php (added)
• Types/Boolean.php (added)
• Types/Color.php (added)
• Types/Date.php (added)
• Types/DateTime.php (added)
• Types/Enumeration.php (added)
• Types/File (added)
• Types/File/File.php (added)
• Types/File/FileDownload.php (added)
• Types/Float.php (added)
• Types/GPS.php (added)
• Types/Hidden.php (added)
• Types/Hyperlink.php (added)
• Types/IPv4Address.php (added)
• Types/Integer.php (added)
• Types/Password.php (added)
• Types/PointerOneToMany.php (added)
• Types/PointerOneToOne.php (added)
• Types/String.php (added)
• Types/Text.php (added)
• Types/Time.php (added)
• Types/Type.php (added)
• URL.php (added)
• View.php (modified) (2 diffs)
• ViewForm.php (modified) (1 diff)
• ViewList.php (modified) (1 diff)

trunk/Common/Global.php

@@ -18 +18 @@
 include_once('HTML.php');
 include_once('XHTML.php');
+include_once('URL.php');
 include_once('PageList.php');
 include_once('TableHeader.php');
@@ -23 +24 @@
 include_once('ViewList.php');
 include_once('ViewForm.php');
+include_once('Types/Type.php');
   
 
@@ -28 +30 @@
 {  
   var $Pages = array();
+  var $Type;
+  
+  function __construct($Database)
+  {
+    parent::__construct($Database);
+    $this->Type = new Type($this); 
+  }
   
   function HumanDate($Time)
@@ -39 +48 @@
    
     return($Config['Web']['RootFolder'].$Target);
-  } 
+  }     
 }
 

trunk/Common/Module.php

@@ -77 +77 @@
   var $Modules = array();
   var $Models = array();
+  var $Menu = array();
   
   function __construct($Database)
@@ -92 +93 @@
     //DebugLog('Loading modules...');
     $this->Modules = array();
-    $Query = 'SELECT `Id`, `Name` FROM `SystemModule`';
+    $Query = 'SELECT `Id`, `Name`,`Installed` FROM `SystemModule`';
     if($Installed) $Query .= ' WHERE `Installed`=1';
-      else $Query .= ' WHERE `Installed`=0';
+      else $Query .= ''; // WHERE `Installed`=0';
     $DbResult = $this->Database->query($Query);
     while($Module = $DbResult->fetch_array())
@@ -103 +104 @@
       $NewModule = new $ModuleClassName($this->Database, $this);      
       $NewModule->Id = $Module['Id'];
+      $NewModule->Installed = $Module['Installed'];
       $this->Modules[$Module['Name']] = $NewModule;
     }     
@@ -146 +148 @@
     $this->LoadModules(false);
     foreach($this->Modules as $Index => $Module)
-    {
+    {      
       $this->Modules[$Index]->Install();
     }

trunk/Common/PageList.php

@@ -72 +72 @@
         } 
       } 
-      if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
+      if($PagesMax < ($PageCount - 1)) $this->Output .= ' ... ';
       if($this->Page < ($PageCount - 1)) 
       {

trunk/Common/TableHeader.php

@@ -13 +13 @@
   var $Columns;
   var $QueryString;
+  var $System;
 
   function __construct($System)
   {
-    parent::__construct($System);
+    //parent::__construct($System);
+    $this->System = &$System;
+    $this->Order = array();
     $this->OrderDirSQL = array('ASC', 'DESC');
     $this->OrderArrowImage = array('sort_asc.png', 'sort_desc.png');
@@ -99 +102 @@
       if(!array_key_exists('Title', $Column)) $Title = $ColumnName;
         else $Title = $Column['Title'];
-      if(strpos($Title, '<') === false) $Title = $this->System->Localization->Translate($Title);
+      //if(strpos($Title, '<') === false) $Title = $this->System->Localization->Translate($Title);
 
       // Create hyperlink

trunk/Common/View.php

@@ -23 +23 @@
 class View
 {
+  var $System;
   var $Database;
   var $Name;
@@ -29 +30 @@
   var $ModelName;
 
-  function __construct($Database)
+  function __construct($System)
   {
-    $this->Database = &$Database;    
+    $this->System = &$System;    
+    $this->Database = &$System->Database;    
   }
   

trunk/Common/ViewForm.php

@@ -7 +7 @@
   var $OnSubmit = '';
     
-  function __construct($Database)
-  {
-    $this->Database = &$Database;    
+  function __construct($System)
+  {
+    parent::__construct($System);
   }
   

trunk/Common/ViewList.php

@@ -3 +3 @@
 class ViewList extends View
 {
-  function __construct($Database)
+  var $DefaultOrder;
+  var $Columns;
+  var $SQL;
+  var $SQLJoin;
+  var $Rows;
+  var $Actions;
+  var $PageList;
+  var $TableHeader;
+  var $FilterColumn;
+  var $Module;
+  var $PanelAction;
+
+  function __construct($System)
   {
-    $this->Database = &$Database;    
+    parent::__construct($System);
+    $this->FilterColumn = '';
+    $this->FilterId = 0;
+    $this->PageList = new PageList($this->System);
+    $this->TableHeader = new TableHeader($this->System);
+    $this->Rows = array();
+    $this->PanelAction = 'ListPanel';
+    $this->DefaultOrder = array();
   }
 
+  function Show()
+  {
+    $Output = $this->PageList->Output;
+    $Output .= '<table class="WideTable">';
+    $Output .= $this->TableHeader->Output;
+    foreach($this->Rows as $Row2)
+    {
+      $Row = array();
+      foreach($Row2 as $Index => $Item)
+        $Row[$Index]['Value'] = $Item;
+      $Row = $this->ProcessRow($Row);
+
+      $Output .= '<tr>';
+      foreach($this->Columns as $ColumnName => $Column)
+      if($Column['Type'] != 'Hidden')
+      {
+        if(array_key_exists('Class', $Row[$ColumnName]) and ($Row[$ColumnName]['Class'] != ''))
+          $Style = ' class="'.$Row[$ColumnName]['Class'].'"'; else $Style ='';
+        $Output .= '<td'.$Style.'>';
+        $Output .= $this->System->Type->ExecuteTypeEvent($Column['Type'],
+          'OnView', array('Name' => $ColumnName, 'Value' => $Row[$ColumnName]['Value'], 'Type' => $Column['Type']));
+        $Output .= '</td>';
+      }
+      if(is_array($this->Actions))
+      {
+        $Output .= '<td>';
+        foreach($this->Actions as $Action)
+        {
+          if(array_key_exists('Confirm', $Action)) $Confirm = ' onclick="return confirmAction(\''.$this->System->Localization->Translate($Action['Confirm']).'\');"';
+            else $Confirm = '';
+          if(strpos($Action['Name'], '<') !== false) $ActionName = $Action['Name'];
+            else $ActionName = $this->System->Localization->Translate($Action['Name']);
+          $Output .= '<a'.$Confirm.' href="'.$this->System->Navigation->MakeLink($Action['Module'], $Action['Action'], array('Id' => $Row['Id']['Value'])).'">'.
+            $ActionName.'</a> ';
+        }
+        $Output .= '</td>';
+      }
+      $Output .= '</tr>';
+    }
+    $Output .= '</table>';
+    $Output .= $this->PageList->Output;
+    return($Output);
+  }
+
+  function LoadFromDatabase()
+  {
+    // Get total item count
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM '.$this->Name.
+      ' '.$this->SQLJoin);
+    $DbRow = $DbResult->fetch_row();
+    $this->PageList->TotalCount = $DbRow[0];
+    $this->PageList->HTMLId = $this->Module;
+    $this->PageList->QueryItems->Data['M'] = $this->Module;
+    $this->PageList->QueryItems->Data['A'] = $this->PanelAction;
+    $this->PageList->QueryItems->Data['FilterColumn'] = $this->FilterColumn;
+    $this->PageList->Process();
+
+    // Build table header and ordering
+    $this->TableHeader->QueryItems = $this->PageList->QueryItems;
+    $this->TableHeader->HTMLId = $this->Module;
+    $this->TableHeader->Columns = array();
+    foreach($this->Columns as $Item)
+    {
+      $this->TableHeader->Columns[$Item['Name']] = array('Title' => $Item['Title'], 
+        'Type' => $Item['Type'], 'SQL' => $Item['SQL']);
+    }
+    if(is_array($this->Actions))
+      $this->TableHeader->Columns['Actions'] = array('Type' => 'String', 'SQL' => '');
+    $this->TableHeader->DefaultOrder = $this->DefaultOrder;
+    $this->TableHeader->Process();
+
+    //$this->System->Navigation->UnsetParameter('Panel');
+
+    // Build column list
+    $Columns = $this->Name.'.Id';
+    foreach($this->Columns as $ColumnName => $Column)
+      $Columns .= ', '.$Column['SQL'].' AS `'.$ColumnName.'`';
+
+    $this->DbRows = array();
+    $DbResult = $this->System->Database->query('SELECT '.$Columns.' FROM '.$this->Name.
+      ' '.$this->SQLJoin.$this->TableHeader->SQL.$this->PageList->SQLLimit);
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $this->Rows[] = $DbRow;
+    }
+  }
+
+  function ProcessRow($Row)
+  {
+    return($Row);
+  }
+  
   function AddItemString($Name, $Title)
   {
-    $this->Items[$Name] = array('Name' => $Name, 'Title' => $Title, 
-      'Type' => ViewItemTypeString);
-  } 
-  
+    $this->Columns[$Name] = array('Name' => $Name, 'Title' => $Title, 
+      'Type' => ViewItemTypeString, 'SQL' => $Name);
+  }   
 }