Changeset 581 for trunk/Common

Timestamp:

Oct 14, 2013, 12:26:30 AM (11 years ago)

Author:

chronos

Message:

• Přidáno: Možnost určovat položky formulářových typů jako virtuální zadané jako SQL poddotaz.

Location:

trunk/Common

Files:

• Form/Form.php (modified) (2 diffs)
• Form/Types/Base.php (modified) (1 diff)
• System.php (modified) (1 diff)
• Version.php (modified) (1 diff)

trunk/Common/Form/Form.php ¶

@@ -136 +136 @@
             $UseType = 'Enumeration';
         } else $UseType = $Item['Type'];
+      if(!array_key_exists('SQL', $Item)) $Item['SQL'] = '';
+        else $Item['SQL'] = str_replace('#Id', $Id, $Item['SQL']);
       $Columns[] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnFilterNameQuery',
-        array('Name' => $Index, 'Type' => $Item['Type']));
+        array('Name' => $Index, 'Type' => $Item['Type'], 'SQL' => $Item['SQL']));
     }
     $Columns = implode(',', $Columns);
@@ -227 +229 @@
             $this->FormManager->Type->RegisterType($Item['Type'], '', 
               $this->FormManager->FormTypes[$Item['Type']]);
-          if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Reference') 
-            $UseType = 'OneToMany';
-          else if($this->FormManager->FormTypes[$Item['Type']]['Type'] == 'Enumeration') 
+          $CustomType = $this->FormManager->FormTypes[$Item['Type']]['Type'];
+          if($CustomType == 'Reference') 
+            $UseType = 'OneToMany';
+          else if($CustomType == 'Enumeration') 
             $UseType = 'Enumeration';
         } else $UseType = $Item['Type'];

trunk/Common/Form/Types/Base.php ¶

@@ -47 +47 @@
   function OnFilterName($Item)
   {
-    return('`'.$Item['Name'].'`');
+    if($Item['SQL'] != '') $SQL = '('.$Item['SQL'].') AS ';
+      else $SQL = '';
+    return($SQL.'`'.$Item['Name'].'`');
   }
 
   function OnFilterNameQuery($Item)
   {
-    return('`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`');
+    if($Item['SQL'] != '') 
+      $Output = '('.$Item['SQL'].') AS `'.$Item['Name'].'`, ('.$Item['SQL'].') AS `'.$Item['Name'].'_Filter`';
+      else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
+    return($Output);
   }
 }

trunk/Common/System.php ¶

@@ -137 +137 @@
     //$this->ModuleManager->Modules['Setup']->Start();
     $this->ModuleManager->LoadModules();
+    $this->ModuleManager->Modules['Setup']->Start();
     $this->ModuleManager->StartAll();
     if($this->ShowPage)

trunk/Common/Version.php ¶

@@ -1 +1 @@
 <?php
 
-$Revision = 578; // Subversion revision
+$Revision = 581; // Subversion revision
 $DatabaseRevision = 574; // SQL structure revision
-$ReleaseTime = '2013-10-10';
+$ReleaseTime = '2013-10-14';