Changeset 679

Timestamp:

Jul 26, 2014, 9:25:03 PM (10 years ago)

Author:

chronos

Message:

• Přidáno: U zařízení je možno nastavit ozančení použitého produktu.
• Upraveno: Umožněno přidávat rozhraní bez IP adresy. Potřeba pro registraci wifi rozhraní bez ip zapoojených v mostu pro měření signálu.

Location:

trunk

Files:

• Application/FormClasses.php (modified) (1 diff)
• Application/Version.php (modified) (1 diff)
• Common/Global.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (2 diffs)
• Modules/NetworkConfigRouterOS/Generators/Signal.php (modified) (1 diff)
• Modules/Stock/Stock.php (modified) (4 diffs)
• images/favicons/Organization.png (added)
• images/favicons/Signal.png (added)
• images/favicons/UpDown.png (added)

trunk/Application/FormClasses.php

@@ -576 +576 @@
     'Filter' => '1',
   ),
+  'TNetworkDeviceListProduct' => array(
+    'Type' => 'ManyToOne',
+    'Table' => 'NetworkDevice',
+    'Id' => 'Id',
+    'Ref' => 'Product',
+    'Filter' => '1',
+  ),
   'TDocumentLine' => array(
     'Type' => 'Reference',

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 678; // Subversion revision
-$DatabaseRevision = 678; // SQL structure revision
-$ReleaseTime = strtotime('2014-07-25');
+$Revision = 679; // Subversion revision
+$DatabaseRevision = 679; // SQL structure revision
+$ReleaseTime = strtotime('2014-07-26');

trunk/Common/Global.php

@@ -365 +365 @@
   global $Database;
 
-  $DbResult = $Database->query('SELECT Id FROM Member WHERE (SELECT Member FROM NetworkDevice WHERE (SELECT Device FROM NetworkInterface WHERE LocalIP = "'.$IP.'") = NetworkDevice.Id) = Member.Id');
+  $DbResult = $Database->query('SELECT Id FROM Member WHERE '.
+  '(SELECT Member FROM NetworkDevice WHERE (SELECT Device FROM NetworkInterface '.
+  'WHERE LocalIP = "'.$IP.'") = NetworkDevice.Id) = Member.Id');
   if($DbResult->num_rows > 0)
   {

trunk/Common/Setup/Updates.php

@@ -879 +879 @@
 }
 
+function UpdateTo679($Manager)
+{
+  $Manager->Execute('ALTER TABLE `NetworkDevice` ADD `Product` INT NOT NULL AFTER `Id` ,
+ADD INDEX ( `Product` ) ;');
+}
+
 class Updates
 {
@@ -926 +932 @@
       674 => array('Revision' => 676, 'Function' => 'UpdateTo676'),
       676 => array('Revision' => 678, 'Function' => 'UpdateTo678'),
+      678 => array('Revision' => 679, 'Function' => 'UpdateTo679'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -156 +156 @@
         'Interfaces' => array('Type' => 'TInterfaceList', 'Caption' => 'Rozhraní', 'Default' => ''),
         'MapPosition' => array('Type' => 'TMapPosition', 'Caption' => 'Pozice na mapě', 'Default' => '0', 'Null' => true),
+        'Product' => array('Type' => 'TProduct', 'Caption' => 'Produkt', 'Default' => '', 'Null' => true),
         'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => '', 'Null' => true),
         'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => '', 'Null' => true),
@@ -180 +181 @@
         'Type' => array('Type' => 'TNetworkInterfaceType', 'Caption' => 'Typ', 'Default' => '0'),
         'MAC' => array('Type' => 'MacAddress', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
-        'LocalIP' => array('Type' => 'IPv4Address', 'Caption' => 'IPv4', 'Default' => ''),
+        'LocalIP' => array('Type' => 'IPv4Address', 'Caption' => 'IPv4', 'Default' => '', 'Null' => true),
         'IPv6' => array('Type' => 'IPv6Address', 'Caption' => 'IPv6', 'Default' => '', 'Null' => true),
         'ExternalIP' => array('Type' => 'IPv4Address', 'Caption' => 'Veřejná IPv4', 'Default' => '', 'Null' => true),

trunk/Modules/NetworkConfigRouterOS/Generators/Signal.php

@@ -37 +37 @@
     echo($Device['LocalIP']."\n");
     $Routerboard = new RouterosAPI();
+    //$Routerboard->SSL = true;
+    //$Routerboard->Port = 8729;
     $Routerboard->Connect($Device['LocalIP'], $Config['API']['UserName'], $Config['API']['Password']);
     $Routerboard->Write('/interface/wireless/registration-table/getall', false);

trunk/Modules/Stock/Stock.php

@@ -13 +13 @@
     $this->Dependencies = array('User', 'Customer', 'Network');
   }
-  
+
   function DoStart()
   {
@@ -31 +31 @@
         'UnitOfMeasure' => array('Type' => 'TUnitOfMeasure', 'Caption' => 'Měrná jednotka', 'Default' => '', 'Null' => true),
         'StockItems' => array('Type' => 'TStockItemListProduct', 'Caption' => 'Položky na skladě', 'Default' => '', 'Suffix' => 'ks'),
+        'NetworkDevices' => array('Type' => 'TNetworkDeviceListProduct', 'Caption' => 'Síťová zařízení', 'Default' => ''),
       ),
     ));
@@ -51 +52 @@
         'Info' => array('Type' => 'Text', 'Caption' => 'Informace', 'Default' => ''),
         'Esemble' => array('Type' => 'TStockItem', 'Caption' => 'Celek', 'Default' => ''),
-        'Parts' => array('Type' => 'TStockItemListStockItem', 'Caption' => 'Části', 'Default' => ''),          
+        'Parts' => array('Type' => 'TStockItemListStockItem', 'Caption' => 'Části', 'Default' => ''),
       ),
     ));
@@ -62 +63 @@
         'Location' => array('Type' => 'TMember', 'Caption' => 'Umístění', 'Default' => '', 'Null' => true),
         'Items' => array('Type' => 'TStockItemListStock', 'Caption' => 'Položky', 'Default' => ''),
-        'ItemsCount' => array('Type' => 'Integer', 'Caption' => 'Položek', 'Default' => '', 
+        'ItemsCount' => array('Type' => 'Integer', 'Caption' => 'Položek', 'Default' => '',
           'ReadOnly' => true, 'SQL' => '(SELECT COUNT(*) FROM `StockItem` WHERE '.
           '(`StockItem`.`Stock`=#Id) AND (`StockItem`.`TimeElimination` IS NULL))'),
-        'TotalPrice' => array('Type' => 'Integer', 'Caption' => 'Celková cena', 'Default' => '', 
+        'TotalPrice' => array('Type' => 'Integer', 'Caption' => 'Celková cena', 'Default' => '',
           'ReadOnly' => true, 'SQL' => '(SELECT SUM(`SellPrice`) FROM `StockItem` WHERE '.
           '(`StockItem`.`Stock`=#Id) AND (`StockItem`.`TimeElimination` IS NULL))', 'Suffix' => 'Kč'),
       ),
     ));
-  }  
+  }
 }