Changeset 370

Timestamp:

Jan 19, 2012, 12:30:58 PM (13 years ago)

Author:

chronos

Message:

• Přidáno: Obecná třída pro definici zobrazovaných prvků.
• Odstraněno: Zrušena nemodulární jednotka forms_classes.

Location:

trunk

Files:

• Common/Forms.php (modified) (1 diff)
• Common/Model.php (modified) (3 diffs)
• Common/View.php (added)
• Modules/Finance/Bill.php (moved) (moved from trunk/Modules/Finance/bill.php )
• Modules/Finance/Bills.php (moved) (moved from trunk/Modules/Finance/bills.php )
• Modules/Finance/Clenove.php (moved) (moved from trunk/Modules/Finance/clenove.php )
• Modules/Finance/Finance.php (modified) (3 diffs)
• Modules/Finance/Import.php (moved) (moved from trunk/Modules/Finance/import.php )
• Modules/Finance/Inventory.php (moved) (moved from trunk/Modules/Finance/inventory.php )
• Modules/Finance/Manage.php (moved) (moved from trunk/Modules/Finance/manage.php )
• Modules/Finance/MonthlyOverall.php (moved) (moved from trunk/Modules/Finance/monthly_overall.php )
• Modules/Finance/Spotreba.php (moved) (moved from trunk/Modules/Finance/spotreba.php )
• Modules/Finance/Tarify.php (moved) (moved from trunk/Modules/Finance/tarify.php )
• Modules/Finance/UserState.php (moved) (moved from trunk/Modules/Finance/user_state.php )
• Modules/Finance/Zarizeni.php (moved) (moved from trunk/Modules/Finance/zarizeni.php )
• Modules/Finance/Zivnost.php (moved) (moved from trunk/Modules/Finance/zivnost.php )
• Modules/Member (added)
• Modules/Member/Member.php (added)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/News/News.php (modified) (2 diffs)
• Modules/Subject (added)
• Modules/Subject/Subject.php (added)
• Modules/TimeMeasure (added)
• Modules/TimeMeasure/TimeMeasure.php (added)
• Modules/User/User.php (modified) (2 diffs)
• form_classes.php (deleted)

trunk/Common/Forms.php

@@ -1 +1 @@
 <?php
-
-include_once('form_classes.php');
-include_once('Common/Database.php');
 
 class Form

trunk/Common/Model.php

@@ -22 +22 @@
 define('PropertyDouble', 'Double');
 define('PropertyOneToMany', 'OneToMany');
-define('PropertyManyToOne', 'ManyToOne');
 define('PropertyManyToMany', 'ManyToMany');
 
@@ -138 +137 @@
     $this->Properties[] = array('Name' => $Name, 'Type' => PropertyBoolean); 
   }
-
-  function AddPropertyManyToOne($Name, $TargetModel, $TargetColumn)
-  {      
-    $this->Properties[] = array('Name' => $Name, 'Type' => PropertyManyToOne, 
-      'TargetModel' => $TargetModel, 'TargetColumn' => $TargetColumn); 
-  }
-  
+ 
   function AddPropertyManyToMany($TargetModel, $Relation, $ColumOwn, $ColumnTarget)
   {      
@@ -177 +170 @@
         $Query .= '`'.$Property['Name'].'` INT(255) NOT NULL,'.
           'KEY `'.$Property['Name'].'` (`'.$Property['Name'].'`),';
-      else if($Property['Type'] == PropertyManyToOne) 
-        $Query .= '';
       else if($Property['Type'] == PropertyManyToMany) ;
         // Create many-to-many table

trunk/Modules/Finance/Finance.php

@@ -2 +2 @@
 
 include_once('FinanceOverview.php');
-include_once('tarify.php');
-include_once('zarizeni.php');
-include_once('spotreba.php');
-include_once('inventory.php');
-include_once('clenove.php');
-include_once('monthly_overall.php');
-include_once('manage.php');
-include_once('user_state.php');
-include_once('import.php');
-include_once('zivnost.php');
+include_once('Tarify.php');
+include_once('Zarizeni.php');
+include_once('Spotreba.php');
+include_once('Inventory.php');
+include_once('Clenove.php');
+include_once('MonthlyOverall.php');
+include_once('Manage.php');
+include_once('UserState.php');
+include_once('Import.php');
+include_once('Zivnost.php');
 
 class FinancePage extends Page
@@ -163 +163 @@
     $this->AddPropertyFloat('Price');
     $this->AddPropertyFloat('Quantity');
+  }
+}
+
+class FinanceOperationView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'FinanceOperation';
+    $this->Title = 'Platba';
+    $this->AddItemOneToMany('DocumentLine', 'Dokladová řada', 'DocumentLine', 3);
+    $this->AddItemTime('Time', 'Čas', 'Now');
+    $this->AddItemOneToMany('Subject', 'Subjekt', 'Subject', 0);
+    $this->AddItemFloat('Value', 'Částka [Kč]', 0);
+    $this->AddItemString('Text', 'Popis', 'Vklad');
+    $this->AddItemBoolean('Cash', 'Hotovost', 0);
+    $this->AddItemBoolean('Taxable', 'Ovlivňující daňový základ', 1);
+    $this->AddManyToOne('FinanceOperation', 'Položky');   
+  }
+}
+
+class FinanceClaimsLiabilitiesView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'FinanceClaimsLiabilities';
+    $this->Title = 'Faktura';
+    $this->AddItemOneToMany('DocumentLine', 'Dokladová řada', 'DocumentLine', 3);
+    $this->AddItemTime('TimeCreation', 'Čas vytvoření', 'Now');
+    $this->AddItemTime('TimeDue', 'Čas splatnosti', 'Now');
+    $this->AddItemOneToMany('Subject', 'Subjekt', 'Subject', 0);
+    $this->AddItemString('Text', 'Popis', 'Nákup zařízení');
+    $this->AddItemFloat('Value', 'Částka [Kč]', 0);
+    $this->AddManyToOne('FinanceClaimsLiabilitiesItems', 'Položky');   
   }
 }
@@ -206 +239 @@
       'FinanceTariff', 'FinanceOperation', 'FinanceClaimsLiabilities',
       'FinanceBills', 'FinanceBillsItems');
+    $this->Views = array('FinanceOperation', 'FinanceClaimsLiabilities'); 
   }
   

trunk/Modules/Network/Network.php

@@ -153 +153 @@
 }
 
+class EmailView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'NewEmail';
+    $this->Title = 'Nový email';
+    $this->SubmitText = 'Odeslat';
+    AddItemString('Address', 'Adresa', '');
+    AddItemString('Subject', 'Předmět', '');
+    AddItemText('Content', 'Obsah', '');
+  }
+}
+
+/*class NetworkDeviceView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'NetworkDevice';
+    $
+  'NewNetworkDevice' => array(
+    'Title' => 'Vložit nové zařízení',
+    'Table' => 'network_devices',
+    'Items' => array(
+      'name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
+      'price' => array('Type' => 'Float', 'Caption' => 'Cena', 'Default' => 0),
+      'count' => array('Type' => 'Integer', 'Caption' => 'Počet', 'Default' => 1),
+      'date' => array('Type' => 'Time', 'Caption' => 'Datum zakoupení', 'Default' => 'Now'),
+      'segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Segment sítě', 'Default' => 0),
+      'date' => array('Type' => 'Time', 'Caption' => 'Datum zakoupení', 'Default' => 'Now'),
+      'used' => array('Type' => 'TNetworkDeviceState', 'Caption' => 'Stav', 'Default' => 0),
+      'consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => 0),
+      'user' => array('Type' => 'TFinanceSubject', 'Caption' => 'Subjekt', 'Default' => 0),
+      'info' => array('Type' => 'String', 'Caption' => 'Poznámky', 'Default' => ''),
+      'shop' => array('Type' => 'String', 'Caption' => 'Obchod', 'Default' => ''),
+      'device_id' => array('Type' => 'String', 'Caption' => 'Sériové číslo', 'Default' => ''),
+  }
+}
+
+ $FormClasses = array(
+  'NewNetworkDeviceHistory' => array(
+    'Title' => 'Vložit záznam historie zařízení',
+    'Table' => 'NetworkDeviceHistory',
+    'Items' => array(
+      'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Zařízení', 'Default' => 0),
+      'Time' => array('Type' => 'Time', 'Caption' => 'Čas', 'Default' => 'Now'),
+      'Action' => array('Type' => 'TNetworkDeviceAction', 'Caption' => 'Akce', 'Default' => 0),
+      'Notice' => array('Type' => 'String', 'Caption' => 'Poznámka', 'Default' => ''),
+    ),
+  ),
+);
+
+  
+ */
+
+
 class ModuleNetwork extends Module
 {

trunk/Modules/News/News.php

@@ -70 +70 @@
 }
 
+class NewsView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'News';
+    $this->Title = 'Nová aktualita';
+    $this->SubmitText = 'Vložit';
+    AddItemOneToMany('Category', 'Kategorie', 'NewsGroup', '0');
+    AddItemString('Title', 'Nadpis', '');
+    AddItemText('Content', 'Obsah', '');
+    AddItemFileName('Enclosure1', 'Přílohy (Max. velikost souboru 1 MB)', '');
+    AddItemFileName('Enclosure2', '', '');
+    AddItemFileName('Enclosure3', '', '');
+  }
+}
+
 class ModuleNews extends Module
 {
@@ -85 +101 @@
     $this->Dependencies = array('User', 'Log');
     $this->Models = array('News', 'NewsCategory');
+    $this->Views = array('News');
   }
   

trunk/Modules/User/User.php

@@ -321 +321 @@
 }
 
+class UserOptionsView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'UserOptions';
+    $this->Title = 'Nastavení uživatele';
+    AddItemString('Login', 'Přihlašovací jméno', '');
+    AddItemPassword('Password', 'Heslo', '');
+    AddItemString('Name', 'Zobrazované jméno', '');
+    AddItemString('Email', 'E-mail', '');
+    AddItemString('PhoneNumber', 'Telefon', '');
+    AddItemString('ICQ', 'ICQ', '');
+  }
+}
+
+class UserRegisterView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'UserRegister';
+    $this->Title = 'Registrace uživatele';
+    $this->SubmitText = 'Registrovat';
+    $this->ModelName = 'User';
+    AddItemString('Login', 'Přihlašovací jméno', '');
+    AddItemPassword('Password', 'Heslo', '');
+    AddItemPassword('Password2', 'Potvrzení hesla', '');
+    AddItemString('Name', 'Zobrazované jméno', '');
+    AddItemString('Email', 'E-mail', '');
+    AddItemString('PhoneNumber', 'Telefon', '');
+    AddItemString('ICQ', 'ICQ', '');
+  }
+}
+
+class PasswordRecoveryView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'PasswordRecovery';
+    $this->Title = 'Obnova hesla';
+    $this->SubmitText = 'Obnovit';
+    AddItemString('Name', 'Přihlašovací jméno', '');
+    AddItemString('Email', 'E-mail', '');
+  }
+}
+
+class UserLoginView extends View
+{
+  function __construct()
+  {
+    $this->Name = 'UserLogin';
+    $this->Title = 'Přihlášení uživatele';
+    $this->SubmitText = 'Přihlásit';
+    AddItemString('Username', 'Přihlašovací jméno', '');
+    AddItemPassword('Password', 'Heslo', '');
+  }
+}
+
 class ModuleUser extends Module
 {
@@ -333 +390 @@
     $this->Dependencies = array();
     $this->Models = array('User', 'UserOnline');
+    $this->Views = array('UserLogin', 'PasswordRecove', 'UserRegister', 'UserOptions');
   }