Changeset 536 for trunk/Common/Form

Timestamp:

May 18, 2013, 6:51:10 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Položky nabídky ve Správě dat se opakovaně všechny načítaly z databáze pro každou skupinu.
• Opraveno: Nyní funguje také rychlé filtrování tabulek ve Správě dat dle sloupců s typem OneToMany.
• Upraveno: Optimalizace načítání textových názvů položek typu OneToMany. Dříve se načítaly samostatným SQL dotazem pro každý řádek zvlášť. Nyní se načítají jako jeden SELECT.
• Přidáno: Modul TimeMeasure pro měření a zobrazování časových grafů veličin.

Location:

trunk/Common/Form

Files:

• Form.php (modified) (5 diffs)
• Types/Base.php (modified) (1 diff)
• Types/OneToMany.php (modified) (2 diffs)

trunk/Common/Form/Form.php

@@ -9 +9 @@
   var $Definition;
   var $Values;
+  var $ValuesFilter;
   var $OnSubmit;
   var $Database;
@@ -18 +19 @@
     $this->Definition = array();
     $this->Values = array();    
+    $this->ValuesFilter = array();    
     $this->OnSubmit = '';
   }
@@ -49 +51 @@
       $Edit = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnView', 
         array('Value' => $this->Values[$Index], 'Name' => $Index, 
-        'Type' => $Item['Type'], 'Values' => $this->Values));
+        'Type' => $Item['Type'], 'Values' => $this->Values,             
+        'Filter' => $this->ValuesFilter[$Index]));
       if(array_key_exists('Suffix', $Item)) $Edit .= ' '.$Item['Suffix'];
       if(!$this->FormManager->Type->IsHidden($UseType))
@@ -116 +119 @@
 
   function LoadValuesFromDatabase($Id)
-  {
-    $DbResult = $this->Database->query('SELECT T.* FROM '.$this->Definition['Table'].' AS T WHERE T.Id='.$Id);
+  {    
+    foreach($this->Definition['Items'] as $Index => $Item)
+    if(!array_key_exists($Item['Type'], $this->FormManager->FormTypes) or 
+    (array_key_exists($Item['Type'], $this->FormManager->FormTypes) and 
+    ($this->FormManager->FormTypes[$Item['Type']]['Type'] != 'ManyToOne')))
+    {
+      if(!array_key_exists($Index, $this->Values) and isset($Item['Default'])) $this->Values[$Index] = $Item['Default']; 
+        if(array_key_exists($Item['Type'], $this->FormManager->FormTypes))
+        {            
+          if(!array_key_exists($Item['Type'], $this->FormManager->Type->TypeDefinitionList)) 
+            $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') 
+            $UseType = 'Enumeration';
+        } else $UseType = $Item['Type'];
+      $Columns[] = $this->FormManager->Type->ExecuteTypeEvent($UseType, 'OnFilterNameQuery',
+        array('Name' => $Index, 'Type' => $Item['Type']));
+    }
+    $Columns = implode(',', $Columns);
+    $DbResult = $this->Database->query('SELECT '.$Columns.' FROM `'.$this->Definition['Table'].'` AS `T` WHERE `T`.`Id`='.$Id);
     $DbRow = $DbResult->fetch_array();
     foreach($this->Definition['Items'] as $Index => $Item)
@@ -138 +161 @@
             array('Value' => $DbRow[$Index], 'Name' => $Index, 
             'Type' => $Item['Type'], 'Values' => $this->Values));
+        $this->ValuesFilter[$Index] = $DbRow[$Index.'_Filter'];
     }
   }

trunk/Common/Form/Types/Base.php

@@ -44 +44 @@
     return(addslashes($Value));
   }
+  
+  function OnFilterName($Item)
+  {
+    return('`'.$Item['Name'].'`');
+  }
+
+  function OnFilterNameQuery($Item)
+  {
+    return('`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`');
+  }
 }
 

trunk/Common/Form/Types/OneToMany.php

@@ -12 +12 @@
     if($Item['Value'] != '')
     {
-      if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
+      /*if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
         else $Table = $Type['Parameters']['Table'];
       $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].
-        ' AS `Name` FROM '.$Table.' WHERE `'.
+        ' AS `Name` FROM `'.$Table.'` WHERE `'.
         $Type['Parameters']['Id'].'`='.$Item['Value']);
       $DbRow = $DbResult->fetch_assoc();
       $Output = '<a href="?t='.$Type['Parameters']['Table'].'&amp;a='.
-        'view'.'&amp;i='.$Item['Value'].'">'.$DbRow['Name'].'</a>';
-    } else $Output = '';
+        'view'.'&amp;i='.$Item['Value'].'">'.$DbRow['Name'].'</a>';*/
+      $Output = '<a href="?t='.$Type['Parameters']['Table'].'&amp;a='.
+        'view'.'&amp;i='.$Item['Value'].'">'.$Item['Filter'].'</a>';
+    } else $Output = '';    
     return($Output);
   }
@@ -60 +62 @@
       else return($Item['Value']);
   }
+  
+  function OnFilterName($Item)
+  {
+    return('`'.$Item['Name'].'_Filter`');
+  }
+    
+  function OnFilterNameQuery($Item)
+  {
+    $Type = $this->FormManager->Type->TypeDefinitionList[$Item['Type']];
+    //if($Item['Value'] != '')
+    //{
+      if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
+        else $Table = $Type['Parameters']['Table'];
+      $Output = '`'.$Item['Name'].'`, (SELECT '.$Type['Parameters']['Name'].
+        ' AS `Name` FROM `'.$Table.'` WHERE `'.
+        $Type['Parameters']['Id'].'`=`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`';
+    //} else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
+    return($Output);    
+  }
 }