Changeset 446

Timestamp:

Oct 15, 2012, 9:32:09 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Tabulky Správy dat pro TV kanály.
• Upraveno: Systém tabulek produktů a skladových položek.

Location:

trunk

Files:

• form_classes.php (modified) (6 diffs)
• sql/updates/446.sql (added)
• tv/index.php (modified) (2 diffs)

trunk/form_classes.php

@@ -2 +2 @@
 
 $FormClasses = array(
+  'TV' => array(
+    'Title' => 'TV kanály',
+    'Table' => 'TV',
+    'DefaultSortColumn' => 'Name',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Frequency' => array('Type' => 'Integer', 'Caption' => 'Frekvence', 'Default' => ''),
+      'Norm' => array('Type' => 'String', 'Caption' => 'Video norma', 'Default' => ''),
+      'Homepage' => array('Type' => 'Hyperlink', 'Caption' => 'Web', 'Default' => ''),
+      'Language' => array('Type' => 'TLanguage', 'Caption' => 'Jazyk', 'Default' => ''),
+      'ShortName' => array('Type' => 'String', 'Caption' => 'Zkratka', 'Default' => ''),
+      'Stream' => array('Type' => 'Hyperlink', 'Caption' => 'Proud', 'Default' => ''),
+      'StreamWeb' => array('Type' => 'Hyperlink', 'Caption' => 'Proud web', 'Default' => ''),
+      'SourceType' => array('Type' => 'String', 'Caption' => 'Typ zdroje', 'Default' => ''),
+      'Category' => array('Type' => 'TTVGroup', 'Caption' => 'Kategorie', 'Default' => ''),
+    ),
+  ),
+  'TVGroup' => array(
+    'Title' => 'Skupiny TV kanálů',
+    'Table' => 'TVGroup',
+    'DefaultSortColumn' => 'Name',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+    ),
+  ),
+  'Language' => array(
+    'Title' => 'Jazyky',
+    'Table' => 'Language',
+    'DefaultSortColumn' => 'Name',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+    ),
+  ),
   'Task' => array(
     'Title' => 'Úkoly',
@@ -19 +52 @@
     ),
   ),
+  'UnitOfMeasure' => array(
+    'Title' => 'Měrné jednotky',
+    'Table' => 'UnitOfMeasure',
+    'DefaultSortColumn' => 'Name',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Unit' => array('Type' => 'String', 'Caption' => 'Jednotka', 'Default' => ''),
+    ),
+  ),
   'TaskGroup' => array(
     'Title' => 'Kategorie úkolu',
@@ -31 +73 @@
   ),
   'Product' => array(
-    'Title' => 'Zboží',
+    'Title' => 'Produkty',
     'Table' => 'Product',
     'DefaultSortColumn' => 'Name',
     'Items' => array(
       'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
-      'Price' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0'),
-      'Count' => array('Type' => 'Integer', 'Caption' => 'Počet', 'Default' => ''),
-      'Date' => array('Type' => 'Date', 'Caption' => 'Datum', 'Default' => ''),
-      'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Úsek', 'Default' => ''),
-      'Used' => array('Type' => 'Boolean', 'Caption' => 'Použito', 'Default' => '0'),
-      'Info' => array('Type' => 'Text', 'Caption' => 'Informace', 'Default' => ''),
-      'User' => array('Type' => 'TMember', 'Caption' => 'Uživatel', 'Default' => ''),
+      'SellPrice' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0'),
+      'VAT' => array('Type' => 'Integer', 'Caption' => 'DPH', 'Default' => '0'),
       'Consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => ''),
-      'DeviceId' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
-      'DeprecatedPrice' => array('Type' => 'Float', 'Caption' => 'Odpisová cena', 'Default' => ''),
-      'StockCard' => array('Type' => 'TStockCard', 'Caption' => 'Zboží', 'Default' => ''),
+      'Manufacturer' => array('Type' => 'TSubject', 'Caption' => 'Výrobce', 'Default' => ''),
+      'Code' => array('Type' => 'String', 'Caption' => 'Kód', 'Default' => ''),
+      'UnitOfMeasure' => array('Type' => 'TUnitOfMeasure', 'Caption' => 'Měrná jednotka', 'Default' => ''),
+      'StockItems' => array('Type' => 'TStockItemListProduct', 'Caption' => 'Položky na skladě', 'Default' => ''),
+    ),
+  ),
+  'StockItem' => array(
+    'Title' => 'Skladové položky',
+    'Table' => 'StockItem',
+    'DefaultSortColumn' => 'Id',
+    'Items' => array(
+      'Stock' => array('Type' => 'TStock', 'Caption' => 'Sklad', 'Default' => ''),
+      'Product' => array('Type' => 'TProduct', 'Caption' => 'Produkt', 'Default' => ''),
+      'TimeEnlistment' => array('Type' => 'Date', 'Caption' => 'Datum zařazení', 'Default' => ''),
+      'TimeElimination' => array('Type' => 'Date', 'Caption' => 'Datum vyřazení', 'Default' => ''),
+      'Amount' => array('Type' => 'Integer', 'Caption' => 'Množství', 'Default' => '1'),
+      'SerialNumber' => array('Type' => 'String', 'Caption' => 'Sériové číslo', 'Default' => ''),
+      'Location' => array('Type' => 'TMember', 'Caption' => 'Umístění', 'Default' => ''),
+      'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Úsek sítě', 'Default' => ''),
     ),
   ),
@@ -55 +108 @@
     'Items' => array(
       'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Location' => array('Type' => 'TMember', 'Caption' => 'Umístění', 'Default' => ''),
+      'Items' => array('Type' => 'TStockItemListStock', 'Caption' => 'Položky', 'Default' => ''),
     ),
   ),
@@ -618 +673 @@
     'Filter' => '1',
   ),
-  'TStockCard' => array(
-    'Type' => 'Reference',
-    'Table' => 'StockCard',
+  'TProduct' => array(
+    'Type' => 'Reference',
+    'Table' => 'Product',
     'Id' => 'Id',
     'Name' => 'Name',
@@ -632 +687 @@
     'Filter' => '1',
   ),
+  'TStock' => array(
+    'Type' => 'Reference',
+    'Table' => 'Stock',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
+  'TUnitOfMeasure' => array(
+    'Type' => 'Reference',
+    'Table' => 'UnitOfMeasure',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
+  'TLanguage' => array(
+    'Type' => 'Reference',
+    'Table' => 'Language',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
+  'TTVGroup' => array(
+    'Type' => 'Reference',
+    'Table' => 'TVGroup',
+    'Id' => 'Id',
+    'Name' => 'Name',
+    'Filter' => '1',
+  ),
+  'TStockItemListStock' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'StockItem',
+    'Id' => 'Id',
+    'Ref' => 'Stock',
+    'Filter' => '1',
+  ),
+  'TStockItemListProduct' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'StockItem',
+    'Id' => 'Id',
+    'Ref' => 'Product',
+    'Filter' => '1',
+  ),   
 );
 

trunk/tv/index.php

@@ -19 +19 @@
 
     $Where = 
-    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `TV` WHERE (`Stream` <> "") OR (`StreamWeb` <> "")');
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `TV` LEFT JOIN `TVGroup` ON `TVGroup`.`Id` = `TV`.`Category` '.
+      ' LEFT JOIN `Language` ON `Language`.`Id` = `TV`.`Language` WHERE (`TV`.`Stream` <> "") OR (`TV`.`StreamWeb` <> "")');
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);    
@@ -36 +37 @@
     $Output .= $Order['Output'];
 
-    $Query = 'SELECT * FROM `TV` WHERE (`Stream` <> "") OR (`StreamWeb` <> "") '.$Order['SQL'].$PageList['SQLLimit'];
+    $Query = 'SELECT `TV`.*, `TVGroup`.`Name` AS `Category`, `Language`.`Name` AS `Language` FROM `TV` LEFT JOIN `TVGroup` ON `TVGroup`.`Id` = `TV`.`Category` '.
+      ' LEFT JOIN `Language` ON `Language`.`Id` = `TV`.`Language` WHERE (`TV`.`Stream` <> "") OR (`TV`.`StreamWeb` <> "") '.$Order['SQL'].$PageList['SQLLimit'];
 
     $DbResult = $this->Database->query($Query);