Changeset 676

Timestamp:

Jul 22, 2014, 10:25:19 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: U záznamu signálu také zapisovat, ze kterého zařízení se měřilo.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 675; // Subversion revision
-$DatabaseRevision = 674; // SQL structure revision
+$Revision = 676; // Subversion revision
+$DatabaseRevision = 676; // SQL structure revision
 $ReleaseTime = strtotime('2014-07-22');

trunk/Common/Setup/Updates.php

@@ -840 +840 @@
 }
 
+function UpdateTo676($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD `Device` INT NULL ,
+ADD INDEX ( `Device` ) ;');
+  $Manager->Execute('ALTER TABLE `NetworkSignal` ADD FOREIGN KEY ( `Device` ) REFERENCES `centrala_big`.`NetworkDevice` (
+`Id`) ON DELETE RESTRICT ON UPDATE RESTRICT ;');
+}
+
 class Updates
 {
@@ -885 +893 @@
       668 => array('Revision' => 671, 'Function' => 'UpdateTo671'),
       671 => array('Revision' => 674, 'Function' => 'UpdateTo674'),
+      674 => array('Revision' => 676, 'Function' => 'UpdateTo676'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -242 +242 @@
         'RateRx' => array('Type' => 'Integer', 'Caption' => 'Rychlost', 'Default' => '0', 'Suffix' => 'MHz'),
         'RateTx' => array('Type' => 'Integer', 'Caption' => 'Rychlost', 'Default' => '0', 'Suffix' => 'MHz'),
+        'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Měřeno z', 'Default' => '0'),
       ),
     ));

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -58 +58 @@
       $System->Database->insert('NetworkSignal', array('MAC' => $Properties['mac-address'],
         'Value' => $Strength, 'RateRx' => $RateRx, 'RateTx' => $RateTx,
-        'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface));
+        'Time' => TimeToMysqlDateTime($Time), 'Interface' => $Interface, 'Device' => $Device['Id']));
       /*
       $DbResult = $System->Database->select('Measure', 'Id', '`Name` = "'.$Properties['mac-address'].'"');