Changeset 540 for trunk/Modules

Timestamp:

May 28, 2013, 10:19:39 PM (12 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.

Location:

trunk/Modules

Files:

• Finance/Finance.php (modified) (1 diff)
• Finance/Manage.php (modified) (3 diffs)
• IS/IS.php (modified) (1 diff)
• NetworkConfigRouterOS/Generators/Queue.php (modified) (2 diffs)
• NetworkConfigRouterOS/RouterboardAPI.php (added)

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'].')';