Changeset 601

Timestamp:

Dec 7, 2013, 10:54:21 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Tabulka pro evidenci bezdrátovách rozhraní.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Form/Types/Base.php (modified) (2 diffs)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Network/Network.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 599; // Subversion revision
-$DatabaseRevision = 597; // SQL structure revision
-$ReleaseTime = '2013-12-06';
+$Revision = 601; // Subversion revision
+$DatabaseRevision = 601; // SQL structure revision
+$ReleaseTime = '2013-12-07';

trunk/Common/Form/Types/Base.php

@@ -47 +47 @@
   function OnFilterName($Item)
   {
-    if($Item['SQL'] != '') $SQL = '('.$Item['SQL'].') AS ';
+    if(array_key_exists('SQL', $Item) and ($Item['SQL'] != '')) 
+      $SQL = '('.$Item['SQL'].') AS ';
       else $SQL = '';
     return($SQL.'`'.$Item['Name'].'`');
@@ -54 +55 @@
   function OnFilterNameQuery($Item)
   {
-    if($Item['SQL'] != '') 
+    if(array_key_exists('SQL', $Item) and ($Item['SQL'] != '')) 
       $Output = '('.$Item['SQL'].') AS `'.$Item['Name'].'`, ('.$Item['SQL'].') AS `'.$Item['Name'].'_Filter`';
       else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';

trunk/Common/Setup/Updates.php

@@ -463 +463 @@
 }
 
+function UpdateTo601($Manager)
+{
+  $Manager->Execute('CREATE TABLE IF NOT EXISTS `NetworkInterfaceWireless` (
+  `Id` int(11) NOT NULL AUTO_INCREMENT,
+  `NetworkInterface` int(11) NOT NULL,
+  `TxPower` int(11) NOT NULL,
+  `CableAttenuation` int(11) NOT NULL,
+  `AntenaGain` int(11) NOT NULL,
+  `Frequency` float NOT NULL,
+  `ChannelWidth` int(11) NOT NULL,
+  `SSID` varchar(255) NOT NULL,
+  PRIMARY KEY (`Id`),
+  KEY `NetworkInterface` (`NetworkInterface`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;');
+
+  $Manager->Execute('ALTER TABLE `NetworkInterfaceWireless`
+  ADD CONSTRAINT `NetworkInterfaceWireless_ibfk_1` FOREIGN KEY (`NetworkInterface`) REFERENCES `NetworkInterface` (`Id`);');
+  $Manager->Execute("INSERT INTO `centrala_big`.`Action` (
+`Id` ,`Name` ,`Title` ,`Type` ,`URL` ,`Group` ,`Icon` ,`PermissionOperation` ,
+`Enable`) VALUES (NULL , '', 'Wifi rozhraní', '1', '/is/?t=NetworkInterfaceWireless&a=list', NULL , NULL , NULL , '1'
+);");
+  $ActionId = $Manager->Database->insert_id;
+  $Manager->Execute("INSERT INTO `MenuItem` (`Id` ,`Name` ,`Parent` ,`Action` ,`Menu`) ".
+    "VALUES (NULL , 'Bezdrátové rozhraní', '1', '".$ActionId."', '1');");
+}
+
 class Updates
 {
@@ -492 +518 @@
       584 => array('Revision' => 591, 'Function' => 'UpdateTo591'),
       591 => array('Revision' => 597, 'Function' => 'UpdateTo597'),
+      597 => array('Revision' => 601, 'Function' => 'UpdateTo601'),
     ));
   }

trunk/Modules/Network/Network.php

@@ -275 +275 @@
       ),
     ));
-    
-    
+    $this->System->FormManager->RegisterClass('NetworkInterfaceWireless', array(
+      'Title' => 'Bezdrátová rozhraní',
+      'Table' => 'NetworkInterfaceWireless',
+      'Items' => array(
+        'SSID' => array('Type' => 'String', 'Caption' => 'SSID', 'Default' => ''),
+        'NetworkInterface' => array('Type' => 'TNetworkInterface', 'Caption' => 'Rozhraní', 'Default' => ''),
+        'TxPower' => array('Type' => 'Integer', 'Caption' => 'Výstupní výkon', 'Default' => '18', 'Suffix' => 'dBm'),
+        'CableAttenuation' => array('Type' => 'Integer', 'Caption' => 'Útlum vedení', 'Default' => '0', 'Suffix' => 'dB'),
+        'AntenaGain' => array('Type' => 'Integer', 'Caption' => 'Zisk antény', 'Default' => '', 'Suffix' => 'dBi'),
+        'Frequency' => array('Type' => 'Float', 'Caption' => 'Frekvence', 'Default' => '5600', 'Suffix' => 'MHz'),
+        'ChannelWidth' => array('Type' => 'Integer', 'Caption' => 'Šírka kanálu', 'Default' => '20', 'Suffix' => 'MHz'),
+        'TotalPower' => array('Type' => 'Integer', 'Caption' => 'Celkový výkon', 'Default' => '20', 'Suffix' => 'dBm', 
+          'SQL' => '(`TxPower` - `CableAttenuation` + `AntenaGain`)', 'ReadOnly' => true),
+        'LimitPower' => array('Type' => 'Integer', 'Caption' => 'Max. limit', 'Default' => '', 'Suffix' => 'dBm',
+          'ReadOnly' => true, 'SQL' => '(CASE WHEN `Frequency` >= 5450 AND `Frequency` <= 5725 THEN 27 ELSE 20 END)'),
+        'UnderLimit' => array('Type' => 'Boolean', 'Caption' => 'V limitu', 'Default' => '', 'Suffix' => '',
+          'ReadOnly' => true, 'SQL' => '((`TxPower` - `CableAttenuation` + `AntenaGain`) <= (CASE WHEN `Frequency` >= 5450 AND `Frequency` <= 5725 THEN 27 ELSE 20 END))'),
+      ),
+    ));
   }