Changeset 711 for trunk/Modules/Employee

Timestamp:

Dec 29, 2014, 12:43:16 AM (10 years ago)

Author:

chronos

Message:

• Modified: Some FormType definition moved from global file to corresponding modules.

File:

• trunk/Modules/Employee/Employee.php (modified) (1 diff)

trunk/Modules/Employee/Employee.php

@@ -19 +19 @@
       'Title' => 'Zaměstnanci',
       'Table' => 'Employee',
-      'DefaultSortColumn' => 'Name',
       'Items' => array(
         'FirstName' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
-        'SecondName' => array('Type' => 'String', 'Caption' => 'Přijímení', 'Default' => ''),
-        'PeriodicSalary' => array('Type' => 'Integer', 'Caption' => 'Pravidlená mzda', 'Default' => '0', 'Suffix' => 'Kč'),
-        'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => '0'),
+        'SecondName' => array('Type' => 'String', 'Caption' => 'Příjmení', 'Default' => ''),
+        'Salary' => array('Type' => 'Integer', 'Caption' => 'Pevná mzda', 'Default' => '0', 'Suffix' => 'Kč'),
+        'ValidFrom' => array('Type' => 'Date', 'Caption' => 'Platnost od', 'Default' => ''),
         'ValidTo' => array('Type' => 'Date', 'Caption' => 'Platnost do', 'Default' => '', 'Null' => true),
+        'SalaryList' => array('Type' => 'TEmployeeSalaryList', 'Caption' => 'Mzda', 'Default' => ''),
       ),
     ));
-    $this->System->FormManager->RegisterClass('EmployeePayment', array(
-      'Title' => 'Výplaty zaměstnacům',
-      'Table' => 'EmployeePayment',
+    $this->System->FormManager->RegisterClass('EmployeeSalary', array(
+      'Title' => 'Výplaty zaměstnanců',
+      'Table' => 'EmployeeSalary',
       'Items' => array(
-        'Employee' => array('Type' => 'TEmployee', 'Caption' => 'Zaměstnanec', 'Default' => ''),
-        'PeriodFrom' => array('Type' => 'Date', 'Caption' => 'Období od', 'Default' => '0'),
-        'PeriodTo' => array('Type' => 'Date', 'Caption' => 'Období do', 'Default' => ''),
-        'Salary' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '', 'Suffix' => 'Kč'),
-        'DatePayment' => array('Type' => 'Date', 'Caption' => 'Datum vyplacení', 'Default' => ''),
-        'WorkHours' => array('Type' => 'Integer', 'Caption' => 'Počet hodin', 'Default' => '0'),
-        'PayPerHour' => array('Type' => 'Integer', 'Caption' => 'Hodinová mzda', 'Default' => '0'),
-        'TaxAdvance' => array('Type' => 'Integer', 'Caption' => 'Záloha daně', 'Default' => '0'),
+        'Date' => array('Type' => 'Date', 'Caption' => 'Datum', 'Default' => ''),
+        'Employee' => array('Type' => 'TEmployee', 'Caption' => 'Zaměstnance', 'Default' => ''),
+        'Amount' => array('Type' => 'Integer', 'Caption' => 'Částka', 'Default' => '0', 'Suffix' => 'Kč'),
+        'Contract' => array('Type' => 'TContract', 'Caption' => 'Smlouva', 'Default' => ''),
       ),
+    ));         
+        $this->System->FormManager->RegisterFormType('TEmployee', array(
+      'Type' => 'Reference',
+        'Table' => 'Employee',
+        'Id' => 'Id',
+        'Name' => 'CONCAT(FirstName, " ", SecondName)',
+        'Filter' => '1',
+    ));   
+    $this->System->FormManager->RegisterFormType('TEmployeeSalaryList', array(
+        'Type' => 'ManyToOne',
+        'Table' => 'EmployeeSalary',
+        'Id' => 'Id',
+        'Ref' => 'Employee',
+        'Filter' => '1',
     ));
-
   }
 }