Changeset 656 for trunk/Common/Setup/Updates.php

Timestamp:

May 16, 2014, 10:44:07 PM (10 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení tabulky seznamu měření.
• Opraveno: Přidávání nových hodnot přes web.

File:

• trunk/Common/Setup/Updates.php (modified) (14 diffs)

trunk/Common/Setup/Updates.php

@@ -2 +2 @@
 
 function UpdateTo493($Manager)
-{      
+{
   $Manager->Execute("ALTER TABLE `UserOnline` CHANGE `User` `User` INT( 11 ) NULL DEFAULT NULL COMMENT 'User.Id'");
 }
 
 function UpdateTo494($Manager)
-{      
+{
   $Manager->Execute("ALTER TABLE `FinanceOperation` DROP FOREIGN KEY `FinanceOperation_ibfk_2` ;\n".
     "ALTER TABLE `FinanceOperation` CHANGE `Bill` `File` INT( 11 ) NULL DEFAULT NULL;\n".
@@ -183 +183 @@
   `Message` varchar(255) NOT NULL DEFAULT '',
   PRIMARY KEY (`Id`)
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;"); 
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;");
 }
 
@@ -201 +201 @@
   $Manager->Execute("INSERT INTO `ServiceCategory` (
 `Id` ,`Name`) VALUES (NULL , 'Pevný nájem');");
-  $ServiceCategoryHire = $Manager->Database->insert_id;  
+  $ServiceCategoryHire = $Manager->Database->insert_id;
   $DbResult = $Manager->Execute("SELECT * FROM Member WHERE Hire>0");
   while($Member = $DbResult->fetch_assoc())
@@ -211 +211 @@
 NULL , 'Nájem', '".$ServiceCategoryHire."', '-".$Member['Hire']."', '2', '', NULL , NULL , '', '', '', '', '', '', '', ''
 );");
-    $ServiceHire = $Manager->Database->insert_id;  
-    $Manager->Execute("INSERT INTO `ServiceCustomerRel` (`Service`, `Customer`) VALUES ". 
+    $ServiceHire = $Manager->Database->insert_id;
+    $Manager->Execute("INSERT INTO `ServiceCustomerRel` (`Service`, `Customer`) VALUES ".
       "(".$ServiceHire.",".$Member['Id'].")");
   }
@@ -226 +226 @@
   $Manager->Execute("ALTER TABLE `NetworkSubnet` ADD FOREIGN KEY ( `Service` ) REFERENCES `ServiceCustomerRel` (
 `Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;");
-  $Manager->Execute("UPDATE `NetworkSubnet` SET `Service` = (SELECT `Id` FROM `ServiceCustomerRel` WHERE `ServiceCustomerRel`.`Customer` = `NetworkSubnet`.`Member` LIMIT 1)"); 
+  $Manager->Execute("UPDATE `NetworkSubnet` SET `Service` = (SELECT `Id` FROM `ServiceCustomerRel` WHERE `ServiceCustomerRel`.`Customer` = `NetworkSubnet`.`Member` LIMIT 1)");
 }
 
@@ -252 +252 @@
       PRIMARY KEY (`Id`)
   ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=3 ;
-  
+
   INSERT INTO `ActionType` (`Id`, `Name`) VALUES
   (1, 'Odkaz'),
@@ -301 +301 @@
   $ActionId = $Manager->Database->insert_id;
   $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
-    "VALUES (NULL , 'Nabídky', '23', '".$ActionId."', '1');");  
+    "VALUES (NULL , 'Nabídky', '23', '".$ActionId."', '1');");
 }
 
@@ -310 +310 @@
   while($DbRow = $DbResult->fetch_row())
   {
-    $Manager->Execute("ALTER TABLE `".$DbRow[0]."` CONVERT TO CHARACTER SET utf8"); 
-  }  
+    $Manager->Execute("ALTER TABLE `".$DbRow[0]."` CONVERT TO CHARACTER SET utf8");
+  }
 }
 
@@ -323 +323 @@
 
 function UpdateTo550($Manager)
-{  
+{
   $Manager->Execute('ALTER TABLE `FinanceBankAccount` ADD `LastImportId` VARCHAR( 255 ) NOT NULL ;');
   $Manager->Execute('ALTER TABLE `FinanceBankAccount` ADD `LastImportDate` DATE NULL ;');
@@ -330 +330 @@
 
 function UpdateTo551($Manager)
-{  
+{
   $Manager->Execute('ALTER TABLE `FinanceOperation` ADD `DocumentLine` INT NULL AFTER `Value` ,
 ADD INDEX ( `DocumentLine` ) ;');
@@ -344 +344 @@
 
 function UpdateTo565($Manager)
-{  
+{
   $Manager->Execute('CREATE TABLE IF NOT EXISTS `WikiPage` (
     `Id` int(11) NOT NULL AUTO_INCREMENT,
@@ -370 +370 @@
 
 function UpdateTo571($Manager)
-{  
+{
   $Manager->Execute('ALTER TABLE `NetworkDevice` ADD `LoginName` VARCHAR( 255 ) NOT NULL ,
 ADD `LoginPassword` VARCHAR( 255 ) NOT NULL ;');
@@ -391 +391 @@
       PRIMARY KEY (`Id`)
   ) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=33 ;");
-  
+
   $Manager->Execute("INSERT INTO `Module` (`Id`, `Name`, `Title`) VALUES
   (1, 'Customer', 'Zákazník'),
@@ -647 +647 @@
 }
 
+function UpdateTo656($Manager)
+{
+        $Manager->Execute('CREATE TABLE IF NOT EXISTS `Measure` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Method` int(11) NOT NULL,
+  `Continuity` int(11) NOT NULL,
+  `Period` int(11) NOT NULL,
+  `Enabled` int(11) NOT NULL,
+  `Description` text NOT NULL,
+  `DataType` varchar(255) NOT NULL,
+  `DataTable` varchar(255) NOT NULL,
+  `Group` int(11) DEFAULT NULL,
+  `Cumulative` int(11) NOT NULL DEFAULT "0",
+  PRIMARY KEY (`Id`),
+  KEY `Group` (`Group`),
+  KEY `Method` (`Method`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `MeasureData` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Time` datetime NOT NULL,
+  `Level` int(11) NOT NULL,
+  `Measure` int(11) NOT NULL,
+  `Continuity` int(11) NOT NULL,
+  `Min` int(11) NOT NULL,
+  `Avg` int(11) NOT NULL,
+  `Max` int(11) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Time` (`Time`),
+  KEY `Measure` (`Measure`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `MeasureGroup` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Parent` int(11) DEFAULT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `Parent` (`Parent`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `MeasureMethod` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `Name` varchar(255) NOT NULL,
+  `Unit` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `Measure`
+  ADD CONSTRAINT `Measure_ibfk_1` FOREIGN KEY (`Group`) REFERENCES `MeasureGroup` (`Id`),
+  ADD CONSTRAINT `Measure_ibfk_2` FOREIGN KEY (`Method`) REFERENCES `MeasureMethod` (`Id`);');
+
+  $Manager->Execute('ALTER TABLE `MeasureData`
+  ADD CONSTRAINT `MeasureData_ibfk_1` FOREIGN KEY (`Measure`) REFERENCES `Measure` (`Id`);');
+
+  $Manager->Execute('ALTER TABLE `MeasureGroup`
+  ADD CONSTRAINT `MeasureGroup_ibfk_1` FOREIGN KEY (`Parent`) REFERENCES `MeasureGroup` (`Id`);');
+}
 
 class Updates