Changeset 452

Timestamp:

Oct 28, 2012, 10:20:32 AM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazování odkazů v aktualitách.
• Upraveno: Tabulka Product rozdělena na Product a StockItem. Upravena struktura.

Location:

trunk

Files:

• Common/Global.php (modified) (1 diff)
• aktuality/news.php (modified) (1 diff)
• finance/spotreba.php (modified) (1 diff)
• finance/tarify.php (modified) (1 diff)
• finance/zarizeni.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)
• sql/updates/446.sql (modified) (6 diffs)
• temp/product.php (modified) (1 diff)

trunk/Common/Global.php

@@ -213 +213 @@
   global $Config, $Database, $System, $ScriptTimeStart, $ConfigFileName, $Mail, $Type;
   
+  date_default_timezone_set('Europe/Prague');
   $ScriptTimeStart = GetMicrotime();
   // SQL injection hack protection

trunk/aktuality/news.php

@@ -22 +22 @@
     {
       $I = strpos($Content, 'http://');
-      if(($I > 0) and ($Content{$I - 1} != '"'))
+      if((($I == 0)) or
+      (($I > 0) and ($Content{$I - 1} != '"')))
       {
         $Result .= substr($Content, 0, $I);
         $Content = substr($Content, $I);
-        if(strpos($Content, ' ') !== false)
-          $URL = substr($Content, 0, strpos($Content, ' '));
-          else $URL = substr($Content, 0);
-        if(strpos($Content, '<') !== false)
-          $URL = substr($Content, 0, strpos($Content, '<'));
-          else $URL = substr($Content, 0);
+        $URL = $Content;
+        if(strpos($URL, '<') !== false) $URL = substr($URL, 0, strpos($URL, '<'));
+        if(strpos($URL, ' ') !== false) $URL = substr($URL, 0, strpos($URL, ' '));
         $Result .= '<a href="'.$URL.'">'.$URL.'</a>';
         $Content = substr($Content, strlen($URL));

trunk/finance/spotreba.php

@@ -16 +16 @@
     $CelkovaSpotreba = 0;
     $DbResult = $this->Database->query('SELECT * FROM NetworkSegment');
-    while($Segment = $DbResult->fetch_array())
+    while($Segment = $DbResult->fetch_assoc())
     {
-      $DbResult2 = $this->Database->query('SELECT SUM(Consumption) FROM Product WHERE Segment='.$Segment['Id'].' AND Used=1');
-      $Row2 = $DbResult2->fetch_array();
-      $CelkovaSpotreba = $CelkovaSpotreba + $Row2[0];
-      $Output .= '<tr><td>'.$Segment['Name'].'</td><td align="right">'.$Row2[0].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2[0]).'</td></tr>';
+      $DbResult2 = $this->Database->query('SELECT SUM(Product.Consumption) AS Consumption FROM StockItem JOIN Product ON Product.Id = StockItem.Product WHERE (StockItem.Segment='.$Segment['Id'].') AND (StockItem.TimeElimination IS NULL)');
+      $Row2 = $DbResult2->fetch_assoc();
+      $CelkovaSpotreba = $CelkovaSpotreba + $Row2['Consumption'];
+      $Output .= '<tr><td>'.$Segment['Name'].'</td><td align="right">'.$Row2['Consumption'].'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($Row2['Consumption']).'</td></tr>';
     }
     $Output .= '<tr style="font-weight: Bold;"><td><strong>Celkem</strong></td><td align="right">'.$CelkovaSpotreba.'</td><td align="right">'.$this->System->Modules['Finance']->W2Kc($CelkovaSpotreba).'</td></tr>';

trunk/finance/tarify.php

@@ -62 +62 @@
 
     $Output .= '<br />Tarif na další období si lze nastavit po přihlášení do systému pomocí nastavení domácnosti přes pravé užifatelské menu.<br />';
-    $Output .= '<a href="http://centrala.zdechov.net/forum/viewtopic.php?t=50">Diskuse</a><br />';
+    $Output .= '<a href="http://forum.zdechov.net/viewtopic.php?t=50">Diskuse</a><br />';
     return($Output);
   }

trunk/finance/zarizeni.php

@@ -11 +11 @@
   {
     // Seznam segmentů a zařízení
+    $Price = 0;
     $Output = 'Seznam segmentů a zařízení:<br><table style="font-size: smaller;" class="WideTable"><tr><th>Název</th><th>Spotřeba<br>[W]</th><th>Datum<br>zakoupení</th><th>Cena [Kč]</th></tr>';
     $DbResult = $this->Database->query('SELECT * FROM NetworkSegment');    
-    while($Segment = $DbResult->fetch_array())
+    while($Segment = $DbResult->fetch_assoc())
     {
       $Output .= '<tr><td style="text-align: left" colspan="3"><strong>Segment: '.$Segment['Name'].' ('.$Segment['Users'].')</strong></td><td style="font-weight: Bold;" align="right">'.$Segment['Price'].'</td></tr>';
-      $DbResult2 = $this->Database->query('SELECT * FROM Product WHERE Segment='.$Segment['Id'].' AND used=1');
-      while($Row = $DbResult2->fetch_array())
+      $DbResult2 = $this->Database->query('SELECT Product.Consumption AS Consumption, Product.Name AS Name, '.
+         'StockItem.BuyPrice AS Price, StockItem.TimeEnlistment AS Date '.
+         'FROM StockItem JOIN Product ON Product.Id = StockItem.Product WHERE (StockItem.Segment='.$Segment['Id'].') AND (StockItem.TimeElimination IS NULL)');
+      while($Row = $DbResult2->fetch_assoc())
       {
-        $Output .= '<tr><td style="text-align: left; padding-left: 20px;">'.$Row['Name'].'</td><td align="right">'.$Row['Consumption'].'</td><td align="right">'.HumanDate($Row['Date']).'</td><td align="right">'.$Row['Price'].'</td></tr>';
+        $Output .= '<tr><td style="text-align: left; padding-left: 20px;">'.
+          $Row['Name'].'</td><td align="right">'.$Row['Consumption'].'</td><td align="right">'.
+          HumanDate($Row['Date']).'</td><td align="right">'.$Row['Price'].'</td></tr>';
       }
+      $Price = $Price + $Row['Price'];
     }
-    $DbResult = $this->Database->query('SELECT SUM(Price) FROM Product WHERE Used=1');
-    $Row = $DbResult->fetch_array();
-    $Output .= '<tr><td colspan="3"><strong>Celkem:</strong></td><td align="right"><strong>'.$Row[0].'</strong></td></tr>';
+    $Output .= '<tr><td colspan="3"><strong>Celkem:</strong></td><td align="right"><strong>'.
+      $Price.'</strong></td></tr>';
     $Output .= '</table>';
     return($Output);

trunk/form_classes.php

@@ -76 +76 @@
       'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Datum zadání', 'Default' => ''),
       'TimeDue' => array('Type' => 'Date', 'Caption' => 'Termín', 'Default' => ''),
-      'TimeClose' => array('Type' => 'Date', 'Caption' => 'Datum uzavření', 'Default' => ''),
+      'TimeClose' => array('Type' => 'Date', 'Caption' => 'Datum uzavření', 'Default' => '', 'Null' => true),
       'Priority' => array('Type' => 'TPriority', 'Caption' => 'Důležitost', 'Default' => '0'),
       'Conclusion' => array('Type' => 'Text', 'Caption' => 'Vyhodnocení', 'Default' => ''),

trunk/sql/updates/446.sql

@@ -1 @@
-ALTER TABLE SystemVersion CHANGE COLUMN Rev441 Rev445 bit;
+ALTER TABLE SystemVersion CHANGE COLUMN Rev445 Rev446 bit;
 
 RENAME TABLE `Product` TO `ProductOld` ;
@@ -13 +13 @@
   `Product` int(11) NOT NULL,
   `TimeEnlistment` date NOT NULL,
-  `TimeElimination` date NOT NULL,
-  `Amount` float NOT NULL,
+  `TimeElimination` date NULL,
+  `BuyPrice` DECIMAL NOT NULL,
+  `SellPrice` DECIMAL NOT NULL,
   `SerialNumber` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   `Location` int(11) DEFAULT NULL COMMENT 'Member',
-  `Segment` int(11) NOT NULL,
+  `Segment` int(11) NULL,
+  `Info` TEXT NOT NULL,
   PRIMARY KEY (`Id`),
-  KEY `Location` (`Location`),
   KEY `Product` (`Product`),
   KEY `Stock` (`Stock`),
-  KEY `Segment` (`Segment`)
+  KEY `Segment` (`Segment`),
+  KEY `Location` (`Location`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=3 ;
 
@@ -30 +32 @@
   ADD CONSTRAINT `StockItem_ibfk_3` FOREIGN KEY (`Location`) REFERENCES `Member` (`Id`),
   ADD CONSTRAINT `StockItem_ibfk_5` FOREIGN KEY (`Product`) REFERENCES `Product` (`Id`);
-ALTER TABLE `StockItem` CHANGE `Segment` `Segment` INT( 11 ) NULL;
-ALTER TABLE `StockItem` ADD `Info` TEXT NOT NULL ;
-ALTER TABLE `StockItem` CHANGE `TimeElimination` `TimeElimination` DATE NULL;
 
-ALTER TABLE `Stock` ADD `Location` INT NULL , ADD INDEX ( `Location` );
+ALTER TABLE `Stock` ADD `Location` INT NULL ;
 ALTER TABLE `Stock` ADD FOREIGN KEY ( `Location` ) REFERENCES `Member` (`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
-
-
-
 
 
@@ -46 +42 @@
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1 ;
+
+INSERT INTO `Language` (`Id`, `Name`) VALUES
+(1, 'Česky'),
+(2, 'Slovensky'),
+(3, 'Anglicky'),
+(4, 'Německy'),
+(5, 'Slovensky'),
+(6, 'Polsky');
+
 
 UPDATE `TV` SET Language=1 WHERE Language="česky";
@@ -55 +60 @@
 ALTER TABLE `TV` CHANGE `Language` `Language` INT( 11 ) NULL ;
 UPDATE `TV` SET Language=NULL WHERE Language=0;
-ALTER TABLE `TV` ADD INDEX ( `Language` );
-ALTER TABLE `TV` DROP INDEX ( `ShortName_2` );
+ALTER TABLE `TV` ADD INDEX  `Language` ;
+ALTER TABLE `TV` DROP INDEX `ShortName_2` ;
 ALTER TABLE `TV` ADD FOREIGN KEY ( `Language` ) REFERENCES `Language` (`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
 
@@ -84 +89 @@
 ALTER TABLE `TV` ADD INDEX ( `Category` );
 ALTER TABLE `TV` ADD FOREIGN KEY ( `Category` ) REFERENCES `TVGroup` (`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;
+
+TRUNCATE TABLE `ISMenuItem`;
+INSERT INTO `ISMenuItem` (`Id`, `Name`, `Parent`, `Table`) VALUES
+(1, 'Síť', NULL, ''),
+(2, 'Finance', NULL, ''),
+(12, 'Obecné', NULL, ''),
+(23, 'Systém', NULL, ''),
+(27, 'Sklad', NULL, ''),
+(3, 'Zařízení', 1, 'NetworkDevice'),
+(4, 'Rozhraní', 1, 'NetworkInterface'),
+(5, 'Příjmy a výdaje', 2, 'FinanceOperation'),
+(6, 'Závazky a pohledávky', 2, 'FinanceClaimsLiabilities'),
+(7, 'Typ zařízení', 1, 'NetworkDeviceType'),
+(8, 'Typ rozhraní', 1, 'NetworkInterfaceType'),
+(9, 'Doménové aliasy', 1, 'NetworkDomainAlias'),
+(10, 'Bankovní účty', 2, 'FinanceBankAccount'),
+(11, 'Pokladny', 2, 'FinanceTreasury'),
+(13, 'Uživatelé', 12, 'User'),
+(14, 'Subjekty', 12, 'Subject'),
+(15, 'Země', 12, 'Country'),
+(16, 'Produkty', 27, 'Product'),
+(17, 'Sklady', 27, 'Stock'),
+(18, 'Platební období', 2, 'FinanceBillingPeriod'),
+(19, 'Tarify', 2, 'FinanceTariff'),
+(20, 'Zákazníci', 2, 'Member'),
+(22, 'Podsítě', 1, 'NetworkSubnet'),
+(24, 'Záznamy', 23, 'Log'),
+(25, 'Úkoly', 12, 'Task'),
+(26, 'Kategorie úkolů', 12, 'TaskGroup'),
+(28, 'Měrné jednotky', 27, 'UnitOfMeasure'),
+(29, 'Skladové položky', 27, 'StockItem'),
+(30, 'TV kanály', 12, 'TV'),
+(31, 'Jazyky', 12, 'Language'),
+(32, 'Kategorie TV kanálů', 12, 'TVGroup'),
+(33, 'Účetní roky', 2, 'FinanceYear'),
+(34, 'Dokladové řady', 2, 'DocumentLine'),
+(35, 'Čísleník dokladové řady', 2, 'DocumentLineSequence');

trunk/temp/product.php

@@ -12 +12 @@
   echo($DbRow['Name'].', ');
   
-  $System->Database->insert('Product', array('Name' => $DbRow['Name'], 'SellPrice' => $DbRow['Price'],
-    'BuyPrice' => $DbRow['Price'],
+  $System->Database->insert('Product', array('Name' => $DbRow['Name'], 
+    'SellPrice' => $DbRow['Price'], 'BuyPrice' => $DbRow['Price'],
     'Consumption' => $DbRow['Consumption'], 'UnitOfMeasure' => 1, 'VAT' => 20));
   $ProductId = $System->Database->insert_id;
+  if($DbRow['Used'] == 1) $Elimination = 'NULL';
+    else $Elimination = $DbRow['TimeElimination'];
   $Database->insert('StockItem', array('Stock' => 1, 'Product' => $ProductId, 'Amount' => $DbRow['Count'],
-    'Segment' => $DbRow['Segment'], 'TimeEnlistment' => $DbRow['Date'], 'SerialNumber' => $DbRow['DeviceId'],
+    'Segment' => $DbRow['Segment'], 'TimeEnlistment' => $DbRow['Date'], 'TimeElimination' => $Elimination, 
+    'SerialNumber' => $DbRow['DeviceId'], 'BuyPrice' => $DbRow['Price'], 'SellPrice' => $DbRow['Price'],
     'Location' => $DbRow['User'], 'Info' => $DbRow['Info']));
 }