Changeset 647 for trunk/Common/Form

Timestamp:

Mar 25, 2014, 7:09:47 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Podpora pro virtuální tabulky.
• Přidáno: Roční přehledy roků a subjektů.
• Přidáno: Evidence zaměstnanců a mezd v nabídce v IS.

Location:

trunk/Common/Form

Files:

• Form.php (modified) (1 diff)
• Types/OneToMany.php (modified) (1 diff)

trunk/Common/Form/Form.php

@@ -162 +162 @@
     }
     $Columns = implode(',', $Columns);
-    $DbResult = $this->Database->query('SELECT '.$Columns.' FROM `'.$this->Definition['Table'].'` AS `T` WHERE `T`.`Id`='.$Id);
+    if(array_key_exists('SQL', $this->Definition))
+      $SourceTable = '('.$this->Definition['SQL'].') AS `TX`';
+      else $SourceTable = '`'.$this->Definition['Table'].'` AS `TX`';
+    $DbResult = $this->Database->query('SELECT '.$Columns.' FROM '.$SourceTable.' WHERE `TX`.`Id`='.$Id);
     $DbRow = $DbResult->fetch_array();
     foreach($this->Definition['Items'] as $Index => $Item)

trunk/Common/Form/Types/OneToMany.php

@@ -80 +80 @@
       $Output = '`'.$Item['Name'].'`, (SELECT '.$Type['Parameters']['Name'].''.
         ' AS `Name` FROM '.$Table.' WHERE `'.
-        $Type['Parameters']['Id'].'`=`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`';
+        $Type['Parameters']['Id'].'`=`TX`.`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`';
     //} else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
     return($Output);