Changeset 647 for trunk/Modules

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/Modules

Files:

• Finance/Finance.php (modified) (1 diff)
• IS/IS.php (modified) (12 diffs)
• Network/Network.php (modified) (1 diff)

trunk/Modules/Finance/Finance.php

@@ -502 +502 @@
       'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
     ));
+    $this->System->FormManager->RegisterClass('Employee', array(
+      'Title' => 'Zaměstnanci',
+      'Table' => 'Employee',
+      'Items' => array(
+        'FirstName' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+        '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('EmployeeSalary', array(
+      'Title' => 'Výplaty zaměstnanců',
+      'Table' => 'EmployeeSalary',
+      'Items' => array(
+        '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' => ''),
+      ),
+      'BeforeInsert' => array($this, 'BeforeInsertFinanceOperation'),
+    ));
 
     $this->System->AddModule(new Bill($this->System));

trunk/Modules/IS/IS.php

@@ -74 +74 @@
   function ShowEdit($Table, $Id)
   {
+        $this->ShortTitle .= ' - Úprava '.$Table;
     $Output = '';
     if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
@@ -84 +85 @@
         $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
+        $this->ShortTitle .= ' - úprava '.$Form->Definition['Title'];
         try {
           $Form->Validate();
@@ -111 +113 @@
       $Form->SetClass($Table);
       $Form->LoadValuesFromDatabase($Id);
+      $this->ShortTitle .= ' - úprava '.$Form->Definition['Title'];
       $Form->OnSubmit = '?a=edit&t='.$Table.'&i='.$_GET['i'].'&o=save';
       $Output .= $Form->ShowEditForm();
@@ -130 +133 @@
     if(defined('NEW_PERMISSION') and !$this->System->User->CheckPermission($this->TableToModule($Table), 'Write'))
       return('Nemáte oprávnění');
+    $this->ShortTitle .= ' - odstranění '.$Table;
     $DbResult = $this->Database->select($Table, '*', '`Id`='.$Id);
     if($DbResult->num_rows > 0)
@@ -160 +164 @@
         $Form->SetClass($Table);
         $Form->LoadValuesFromForm();
+        $this->ShortTitle .= ' - přidání '.$Form->Definition['Title'];
         try {
           $Form->Validate();
@@ -209 +214 @@
       $Form = new Form($this->System->FormManager);
       $Form->SetClass($Table);
+      $this->ShortTitle .= ' - přidání '.$Form->Definition['Title'];
       // Load presets from URL
       foreach($_GET as $Key => $Value)
@@ -252 +258 @@
     $Form = new Form($this->System->FormManager);
     $Form->SetClass($Table);
+    $this->ShortTitle .= ' - položka '.$Form->Definition['Title'];
     $Form->LoadValuesFromDatabase($Id);
     $Form->OnSubmit = '?a=view';
@@ -302 +309 @@
         if($Table != '') $FormClass = $this->System->FormManager->Classes[$Table];
       else return($this->SystemMessage('Chyba', 'Tabulka nenalezena'));
+      
+    if(array_key_exists('SQL', $FormClass))
+      $SourceTable = '('.$FormClass['SQL'].') AS `TX`';
+      else $SourceTable = '`'.$FormClass['Table'].'` AS `TX`';
 
     // Build user filter
@@ -359 +370 @@
 
         if(!array_key_exists('SQL', $FormItem)) $FormItem['SQL'] = '';
-          else $FormItem['SQL'] = str_replace('#Id', '`'.$FormClass['Table'].'`.`Id`', $FormItem['SQL']);
+          else $FormItem['SQL'] = str_replace('#Id', '`TX`.`Id`', $FormItem['SQL']);
         $Columns[] = $this->System->FormManager->Type->ExecuteTypeEvent($UseType, 'OnFilterNameQuery',
           array('Value' => $Value, 'Name' => $ItemIndex,
@@ -366 +377 @@
 
     // Get total item count in database
-    $Query = 'SELECT COUNT(*) FROM `'.$FormClass['Table'].'`';
+    $Query = 'SELECT COUNT(*) FROM '.$SourceTable;
     $DbResult = $this->Database->query($Query);
     $DbRow = $DbResult->fetch_assoc();
@@ -375 +386 @@
     if($Filter != '')
     {
-      $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM `'.$FormClass['Table'].'`) AS `TS` '.$Filter;
+      $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM '.$SourceTable.') AS `TS` '.$Filter;
       $DbResult = $this->Database->query($Query);
       $DbRow = $DbResult->fetch_row();
@@ -410 +421 @@
 
     // Load and show items
-    $Query = 'SELECT * FROM (SELECT '.$Columns.' FROM `'.$FormClass['Table'].'`) AS `TS` '.
+    $Query = 'SELECT * FROM (SELECT '.$Columns.' FROM '.$SourceTable.') AS `TS` '.
       $Filter.' '.$Order['SQL'].$PageList['SQLLimit'];
     $VisibleItemCount = 0;

trunk/Modules/Network/Network.php

@@ -155 +155 @@
           'WHERE `FinanceOperation`.`Subject`=#Id) - (SELECT SUM(`FinanceInvoice`.`Value`) FROM `FinanceInvoice` '.
           'WHERE `FinanceInvoice`.`Subject`=#Id)'),
+      ),
+    ));
+    $this->System->FormManager->RegisterClass('SubjectReport', array(
+      'Title' => 'Přehled subjektů',
+      'Table' => 'SubjectReport',
+      'DefaultSortColumn' => 'Id',
+      'SQL' => '(SELECT Id FROM Subject)',
+      'Items' => array(
+        'Id' => array('Type' => 'TSubject', 'Caption' => 'Subjekt', 'Default' => '', 'ReadOnly' => true),
+        'Income' => array('Type' => 'Integer', 'Caption' => 'Příjmy', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          'AND (`FinanceOperation`.`Value` > 0))'),
+        'Spending' => array('Type' => 'Integer', 'Caption' => 'Výdaje', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => '(SELECT -ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          'AND (`FinanceOperation`.`Value` < 0))'),
+        'OperationBalance' => array('Type' => 'Integer', 'Caption' => 'Zisk', 'Default' => '0', 'Suffix' => 'Kč', 'ReadOnly' => true,
+          'SQL' => '(SELECT ROUND(SUM(`FinanceOperation`.`Value`)) FROM `FinanceOperation` WHERE (`FinanceOperation`.`Subject` = TX.`Id`) '.
+          ')'),
       ),
     ));