Changeset 501 for trunk/Common/Form/Types

Timestamp:

Mar 10, 2013, 8:15:46 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: FormManager pro objektové řešení zrušení vazeb na třídu System. FormManager nyní obsluhuje existující formulářové typy a třídy formulářů.
• Přidáno: Formulářový typ FileContent zajistí načtení obsahu souboru. Typ File pak zajistí i uložení do databáze a přiřazení Id do tabulky File.
• Odstraněno: Adresář docs obsahoval staré dokumenty. Ty musí být přesunuty do adresáře files a registrovány do databáze.
• Upraveno: Třídy Database nyní bude hlásit chyby přes výjimky PHP.

Location:

trunk/Common/Form

Files:

• . (added)
• Types (moved) (moved from trunk/Common/Types )
• Types/Base.php (modified) (1 diff)
• Types/Enumeration.php (modified) (2 diffs)
• Types/File.php (copied) (copied from trunk/Common/Types/File/File.php )
• Types/File/File.php (deleted)
• Types/FileContent.php (added)
• Types/Hidden.php (modified) (1 diff)
• Types/OneToMany.php (modified) (2 diffs)
• Types/RandomHash.php (modified) (1 diff)
• Types/Type.php (copied) (copied from trunk/Common/Types/Type.php ) (6 diffs)

trunk/Common/Form/Types/Base.php

@@ -3 +3 @@
 class TypeBase
 {
-  var $System;
+  var $FormManager;
+  var $Database;
   var $DatabaseCompareOperators = array();
   var $Hidden;
 
-  function __construct($System)
+  function __construct($FormManager)
   {
-    $this->System = &$System;
+    $this->FormManager = &$FormManager;
+    $this->Database = &$FormManager->Database;
     $this->Hidden = false;
   }

trunk/Common/Form/Types/Enumeration.php

@@ -7 +7 @@
   function OnView($Item)
   {
-    $Type = $this->System->Type->GetTypeDefinition($Item['Type']);
+    $Type = $this->FormManager->Type->GetTypeDefinition($Item['Type']);
     if(array_key_exists($Item['Value'], $Type['Parameters']['States']))
       $Output = $Type['Parameters']['States'][$Item['Value']];
@@ -16 +16 @@
   function OnEdit($Item)
   {
-    $Type = $this->System->Type->GetTypeDefinition($Item['Type']);
+    $Type = $this->FormManager->Type->GetTypeDefinition($Item['Type']);
     $Output = '<select name="'.$Item['Name'].'">';
       if(array_key_exists('Null', $Item) and $Item['Null']) 

trunk/Common/Form/Types/Hidden.php

@@ -5 +5 @@
 class TypeHidden extends TypeBase
 {
-  function __construct($System)
+  function __construct($FormManager)
   {
-    parent::__construct($System);
+    parent::__construct($FormManager);
     $this->Hidden = true;
   }

trunk/Common/Form/Types/OneToMany.php

@@ -25 +25 @@
   {
     $Output = '<select name="'.$Item['Name'].'">';
-    $Type = $this->System->Type->TypeDefinitionList[$Item['Type']];
+    $Type = $this->FormManager->Type->TypeDefinitionList[$Item['Type']];
     if(array_key_exists('Condition', $Type['Parameters'])) $Where = ' WHERE '.$Type['Parameters']['Condition'];
       else $Where = '';
@@ -35 +35 @@
     if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
       else $Table = $Type['Parameters']['Table'];
-    $DbResult = $this->System->Database->query('SELECT '.$Type['Parameters']['Name'].' AS `Name`,'.$Type['Parameters']['Id'].' AS `Id` FROM '.$Table.''.$Where.' ORDER BY `Name`');
+    $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].' AS `Name`,'.$Type['Parameters']['Id'].' AS `Id` FROM '.$Table.''.$Where.' ORDER BY `Name`');
     while($DbRow = $DbResult->fetch_assoc())
     {

trunk/Common/Form/Types/RandomHash.php

@@ -5 +5 @@
 class TypeRandomHash extends TypeBase
 {
-  function __construct($System)
+  function __construct($FormManager)
   {
-    parent::__construct($System);
+    parent::__construct($FormManager);
     $this->Hidden = true;
   }

trunk/Common/Form/Types/Type.php

@@ -16 +16 @@
 include(dirname(__FILE__).'/Hyperlink.php');
 include(dirname(__FILE__).'/Hidden.php');
-include(dirname(__FILE__).'/File/File.php');
+include(dirname(__FILE__).'/File.php');
+include(dirname(__FILE__).'/FileContent.php');
 include(dirname(__FILE__).'/GPS.php');
 include(dirname(__FILE__).'/IPv4Address.php');
@@ -24 +25 @@
 class Type
 {
-  var $System;
+  var $FormManager;
   var $TypeDefinitionList;
   var $Values;
 
-  function __construct($System)
+  function __construct($FormManager)
   {
-    $this->System = $System;
+    $this->FormManager = &$FormManager;
     $this->TypeDefinitionList = array
     (
@@ -52 +53 @@
       'Color' => array('Name' => 'Color', 'Class' => 'Color', 'ParentType' => '', 'Parameters' => array()),
       'RandomHash' => array('Name' => 'RandomHash', 'Class' => 'RandomHash', 'ParentType' => '', 'Parameters' => array()),
+      'FileContent' => array('Name' => 'FileContent', 'Class' => 'FileContent', 'ParentType' => '', 'Parameters' => array()),
     );
   }
@@ -61 +63 @@
       $Type = $this->TypeDefinitionList[$TypeName];
       $TypeClass = 'Type'.$Type['Class'];
-      $TypeObject = new $TypeClass($this->System);
+      $TypeObject = new $TypeClass($this->FormManager);
       if(is_callable(array($TypeObject, $Event))) return($TypeObject->$Event($Parameters));
         else return($TypeName.'->'.$Event.'('.serialize($Parameters).')');
@@ -73 +75 @@
       $Type = $this->TypeDefinitionList[$TypeName];
       $TypeClass = 'Type'.$Type['Class'];
-      $TypeObject = new $TypeClass($this->System);
+      $TypeObject = new $TypeClass($this->FormManager);
       return($TypeObject->Hidden);
     } else return(false);
@@ -92 +94 @@
   }
 
+  function UnregisterType($Name)
+  {
+    unset($this->TypeDefinitionList[$Name]);
+    // TODO: remove dependent types
+  }
+  
   function GetTypeDefinition($TypeName)
   {