Changeset 647 for trunk/Common

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

Files:

• Form/Form.php (modified) (1 diff)
• Form/Types/OneToMany.php (modified) (1 diff)
• Setup/Updates.php (modified) (2 diffs)

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);

trunk/Common/Setup/Updates.php

@@ -612 +612 @@
 }
 
+function UpdateTo647($Manager)
+{
+        $Manager->Execute('ALTER TABLE `EmployeeSalary` ADD FOREIGN KEY ( `Employee` ) REFERENCES `Employee` (
+`Id`
+) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
+  $Manager->Execute('ALTER TABLE `EmployeeSalary` ADD `Contract` INT NOT NULL ,
+ADD INDEX ( `Contract` ) ;');
+ $Manager->Execute('ALTER TABLE `EmployeeSalary` ADD FOREIGN KEY ( `Contract` ) REFERENCES `Contract` (
+`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
+  $Manager->Execute("INSERT INTO `Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Zaměstnanci', '1', '/is/?t=Employee&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Zaměstnanci', '2', '".$ActionId."', '1');");
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Roční výkazy', '2', NULL, '1');");
+  $MenuId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Roční přehled', '1', '/is/?t=FinanceYearReport&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Roční přehled', '".$MenuId."', '".$ActionId."', '1');");
+  $Manager->Execute("INSERT INTO `Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Výkaz subjektů', '1', '/is/?t=SubjectReport&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Výkaz subjektů', '".$MenuId."', '".$ActionId."', '1');");
+}
+
 
 class Updates
@@ -651 +686 @@
       633 => array('Revision' => 645, 'Function' => 'UpdateTo645'),
       645 => array('Revision' => 646, 'Function' => 'UpdateTo646'),
+      646 => array('Revision' => 647, 'Function' => 'UpdateTo647'),
     ));
   }