Changeset 540

Timestamp:

May 28, 2013, 10:19:39 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Třída pro připojení k RouterOS přes API.
• Upraveno: Zobrazovat procházení položek 1:n pouze v modulu IS.
• Opraveno: Negenerovat záznam zákazníka při generování řízení toku sítě v případě, že je na jednoho napojeno více služeb.

Files:

• bin/config.sh (deleted)
• trunk/Common/Form/Form.php (modified) (2 diffs)
• trunk/Common/Form/Types/OneToMany.php (modified) (2 diffs)
• trunk/Common/Version.php (modified) (1 diff)
• trunk/FormClasses.php (modified) (1 diff)
• trunk/Modules/Finance/Finance.php (modified) (1 diff)
• trunk/Modules/Finance/Manage.php (modified) (3 diffs)
• trunk/Modules/IS/IS.php (modified) (1 diff)
• trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php (modified) (2 diffs)
• trunk/Modules/NetworkConfigRouterOS/RouterboardAPI.php (added)

trunk/Common/Form/Form.php

@@ -275 +275 @@
   var $Type;
   var $RootURL;
+  var $ShowRelation;
   
   function __construct($Database)
@@ -282 +283 @@
     $this->FormTypes = array();
     $this->Type = new Type($this);
+    $this->ShowRelation = false;   
   }
   

trunk/Common/Form/Types/OneToMany.php

@@ -12 +12 @@
     if($Item['Value'] != '')
     {
-      /*if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
-        else $Table = $Type['Parameters']['Table'];
-      $DbResult = $this->Database->query('SELECT '.$Type['Parameters']['Name'].
-        ' AS `Name` FROM `'.$Table.'` WHERE `'.
-        $Type['Parameters']['Id'].'`='.$Item['Value']);
-      $DbRow = $DbResult->fetch_assoc();
-      $Output = '<a href="?t='.$Type['Parameters']['Table'].'&amp;a='.
-        'view'.'&amp;i='.$Item['Value'].'">'.$DbRow['Name'].'</a>';*/
       $Output = '<a href="?t='.$Type['Parameters']['Table'].'&amp;a='.
         'view'.'&amp;i='.$Item['Value'].'">'.$Item['Filter'].'</a>';
@@ -46 +38 @@
     }
     $Output .= '</select>';
-    $Output .=  '<img src="'.$this->FormManager->Root.'/images/select.png" alf="Vybrat" language="javascript" '.
-      'onclick="return popupwindow(&quot;'.$this->FormManager->Root.'/is/?a=select&amp;t='.$Table.'&amp;r='.$Item['Name'].'&quot;,&quot;test&quot;);" style="cursor:hand;cursor:pointer"/>';
+    if($this->FormManager->ShowRelation)
+      $Output .=  '<img src="'.$this->FormManager->Root.'/images/select.png" alf="Vybrat" language="javascript" '.
+        'onclick="return popupwindow(&quot;'.$this->FormManager->Root.'/is/?a=select&amp;t='.$Table.'&amp;r='.$Item['Name'].'&quot;,&quot;test&quot;);" style="cursor:hand;cursor:pointer"/>';
     return($Output);
   }

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 538; // Subversion revision
+$Revision = 540; // Subversion revision
 $DatabaseRevision = 535; // SQL structure revision
-$ReleaseTime = '2013-05-18';
+$ReleaseTime = '2013-05-28';
 
 ?>

trunk/FormClasses.php

@@ -180 +180 @@
     ),
   ),
-  'NewNetworkDevice' => array(
-    'Title' => 'Vložit nové zařízení',
-    'Table' => 'Product',
-    'Items' => array(
-      'Name' => array('Type' => 'String', 'Caption' => 'Název', 'Default' => ''),
-      'Price' => array('Type' => 'Float', 'Caption' => 'Cena', 'Default' => 0, 'Suffix' => 'Kč'),
-      'Count' => array('Type' => 'Integer', 'Caption' => 'Počet', 'Default' => 1),
-      'Date' => array('Type' => 'Time', 'Caption' => 'Datum zakoupení', 'Default' => 'Now'),
-      'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Segment sítě', 'Default' => 0, 'Null' => true),
-      'Date' => array('Type' => 'Time', 'Caption' => 'Datum zakoupení', 'Default' => 'Now'),
-      'Used' => array('Type' => 'TNetworkDeviceState', 'Caption' => 'Stav', 'Default' => 0),
-      'Consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => 0, 'Suffix' => 'Watt'),
-      'Member' => array('Type' => 'TMember', 'Caption' => 'Subjekt', 'Default' => 0),
-      'Info' => array('Type' => 'String', 'Caption' => 'Poznámky', 'Default' => ''),
-      'Shop' => array('Type' => 'String', 'Caption' => 'Obchod', 'Default' => ''),
-      'DeviceId' => array('Type' => 'String', 'Caption' => 'Sériové číslo', 'Default' => ''),
-    ),
-  ),
   'NewNetworkDeviceHistory' => array(
     'Title' => 'Vložit záznam historie zařízení',

trunk/Modules/Finance/Finance.php

@@ -459 +459 @@
         'ReplaceId' => array('Type' => 'TFinanceCharge', 'Caption' => 'Cílová položka', 'Default' => '0', 'Null' => true),
       ),
-    ));
-    
-    
+    ));    
     
     $this->System->AddModule(new Bill($this->System));

trunk/Modules/Finance/Manage.php

@@ -26 +26 @@
       //  $Output = $this->ImportOldData();
       //  break;
-      case 'NewDeviceForm':
-        $Output = $this->ShowNewDeviceForm();
-        break;
-      case 'NewDeviceInsert':
-        $Output = $this->ShowNewDeviceInsert();
-        break;
-      case 'NewDeviceHistoryForm':
-        $Output = $this->ShowNewDeviceHistoryForm();
-        break;
-      case 'NewDeviceHistoryInsert':
-        $Output = $this->ShowNewDeviceHistoryInsert();
-        break;
       case 'NewPaymentInsert':
         $Output = $this->ShowNewPaymentInsert();
@@ -64 +52 @@
         break;
       default:
-        $Output = '<a href="?Operation=NewDeviceForm">Přidat nové zařízení</a><br />';
-        $Output .= '<a href="?Operation=NewDeviceHistoryForm">Přidat nový záznam historie zařízení</a><br />';
-        $Output .= '<a href="?Operation=NewPaymentForm">Přidat novou platbu</a><br />';
+        $Output = '<a href="?Operation=NewPaymentForm">Přidat novou platbu</a><br />';
         $Output .= '<a href="?Operation=NewInvoiceForm">Přidat novou fakturu</a><br />';
         $Output .= '<a href="?Operation=ConvertPDFToFile">Převést data z databáze do souborů</a><br />';
@@ -187 +173 @@
   }
 
-  function ShowNewDeviceForm()
-  {
-    $Form = new Form($this->System->FormManager);
-    $Form->SetClass('NewNetworkDevice');
-    $Form->OnSubmit = '?Operation=NewDeviceInsert';
-    $Output = $Form->ShowEditForm();
-    return($Output);
-  }
-
-  function ShowNewDeviceInsert()
-  {
-    $Form = new Form($this->System->FormManager);
-    $Form->SetClass('NewNetworkDevice');
-    $Form->LoadValuesFromForm();
-    $Form->SaveValuesToDatabase(0);
-    $Output = $this->SystemMessage('Finance', 'Zařízení vloženo.');
-    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewDeviceInserted');
-    return($Output);
-  }
-
-  function ShowNewDeviceHistoryForm()
-  {
-    $Form = new Form($this->System->FormManager);
-    $Form->SetClass('NewNetworkDeviceHistory');
-    $Form->OnSubmit = '?Operation=NewDeviceHistoryInsert';
-    $Output = $Form->ShowEditForm();
-    return($Output);
-  }
-
-  function ShowNewDeviceHistoryInsert()
-  {
-    $Form = new Form($this->System->FormManager);
-    $Form->SetClass('NewNetworkDeviceHistory');
-    $Form->LoadValuesFromForm();
-    $Form->SaveValuesToDatabase(0);
-    $Output = $this->SystemMessage('Finance', 'Záznam historie zařízení vložen.');
-    $this->System->ModuleManager->Modules['Log']->NewRecord('Finance', 'NewDeviceHistoryInserted');
-    return($Output);
-  }
-
-  function ShowNewPaymentForm()
+    function ShowNewPaymentForm()
   {
     $Form = new Form($this->System->FormManager);

trunk/Modules/IS/IS.php

@@ -16 +16 @@
     if(!$this->System->User->CheckPermission('IS', 'Manage')) 
       return('Nemáte oprávnění');
+    $this->System->FormManager->ShowRelation = true;
    
     if(array_key_exists('a', $_GET)) $Action = $_GET['a'];

trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php

@@ -60 +60 @@
   $Member['Name'] = RouterOSIdent($Member['Name'].'-'.$Member['Id'] );
 
+  $ServiceIndex = 1;
   echo('Zákazník '.$Member['Name']."\n");
   $DbResult4 = $System->Database->query('SELECT `Service`.*, `ServiceCustomerRel`.`Id` AS `RelId` FROM `ServiceCustomerRel` JOIN `Service` ON `Service`.`Id` = `ServiceCustomerRel`.`Service` '.
@@ -70 +71 @@
     $UserMaxSpeedIn = round($Service['InternetSpeedMax'] / $InDivider) * 1000;
     $UserMaxSpeedOut = round($Service['InternetSpeedMax'] / $OutDivider) * 1000;
-    $ItemsQueue[] = array('name' => $Member['Name'].'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
-    $ItemsQueue[] = array('name' => $Member['Name'].'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
+    if($ServiceIndex == 1)
+    {
+      $ItemsQueue[] = array('name' => $Member['Name'].'-out', 'limit-at' => $SpeedIn, 'max-limit' => $UserMaxSpeedIn, 'parent' => 'main-out');
+      $ItemsQueue[] = array('name' => $Member['Name'].'-in', 'limit-at' => $SpeedOut, 'max-limit' => $UserMaxSpeedOut, 'parent' => 'main-in');
+    }
 
     $Filter = '(`Used` = 1) AND (`Service` = '.$Service['RelId'].')';