Changeset 721

Timestamp:

Jan 3, 2015, 7:34:55 PM (10 years ago)

Author:

chronos

Message:

• Modified: Form class ItemActions changed to define URL using #RowId instead of addition of &i=number.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Customer/Customer.php (modified) (1 diff)
• Modules/File/File.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/Finance/UserState.php (modified) (3 diffs)
• Modules/IS/IS.php (modified) (2 diffs)
• Modules/Map/Map.php (modified) (1 diff)
• Modules/NetworkConfig/NetworkConfig.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 720; // Subversion revision
+$Revision = 721; // Subversion revision
 $DatabaseRevision = 720; // SQL structure revision
-$ReleaseTime = strtotime('2015-01-02');
+$ReleaseTime = strtotime('2015-01-03');

trunk/Modules/Customer/Customer.php

@@ -36 +36 @@
         'Consumption' => array('Type' => 'TCustomerStockSerialNumber', 'Caption' => 'Spotřeba zařízení', 'Default' => ''),
       ),
+        'ItemActions' => array(
+        array('Caption' => 'Klientská sekce', 'URL' => '/finance/platby/?i=#RowId'),
+      ),
     ));   
     $this->System->FormManager->RegisterClass('MemberPayment', array(

trunk/Modules/File/File.php

@@ -130 +130 @@
       ),
       'ItemActions' => array(
-        array('Caption' => 'Stáhnout', 'URL' => '/file'),
+        array('Caption' => 'Stáhnout', 'URL' => '/file?i=#RowId'),
       ),
     ));

trunk/Modules/Finance/Finance.php

@@ -454 +454 @@
       ),
       'ItemActions' => array(
-        array('Caption' => 'Import plateb z banky', 'URL' => '/finance/import-api/'),
-        array('Caption' => 'Import plateb ze souboru', 'URL' => '/finance/import-soubor/'),
+        array('Caption' => 'Import plateb z banky', 'URL' => '/finance/import-api/?i=#RowId'),
+        array('Caption' => 'Import plateb ze souboru', 'URL' => '/finance/import-soubor/?i=#RowId'),
       ),
     ));

trunk/Modules/Finance/UserState.php

@@ -70 +70 @@
     $this->System->Modules['Finance']->LoadTariffs(1);
 
-    if(array_key_exists('Subject', $_GET))
+    // Determine which customer should be displayed
+    if(array_key_exists('i', $_GET))
     {
       if(!$this->System->User->CheckPermission('Finance', 'Manage')) return('Nemáte oprávnění');
-      $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id='.$_GET['Subject']);
-      if($DbResult->num_rows > 0)
-        $Subject = $DbResult->fetch_assoc();
-      else return($this->SystemMessage('Chyba', 'Subjekt nenalezen'));
+      $CustomerId = $_GET['i'];
     } else
     {
@@ -85 +83 @@
       {
         $CustomerUserRel = $DbResult->fetch_assoc();
-        $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id=(SELECT Subject FROM Member WHERE Id='.$CustomerUserRel['Customer'].')');
-        $Subject = $DbResult->fetch_assoc();
+        $CustomerId = $CustomerUserRel['Customer'];
       } else return($this->SystemMessage('Chyba', 'Nejste zákazníkem'));
     }
-
-    if(!array_key_exists('show', $_GET)) $_GET['show'] = '';
-    $DbResult = $this->Database->query('SELECT Member.* '.
-      'FROM Member LEFT JOIN MemberPayment ON MemberPayment.Member=Member.Id WHERE Member.Subject='.$Subject['Id']);
-    if($DbResult->num_rows == 0)
+        
+    // Load customer info
+    $DbResult = $this->Database->query('SELECT * FROM Member WHERE Id='.$CustomerId);
+    if($DbResult->num_rows == 1)
     {
-      return($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));
-    }
-    $Member = $DbResult->fetch_assoc();
-    $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';
+        $Customer = $DbResult->fetch_assoc();      
+    } else return($this->SystemMessage('Položka nenalezena', 'Zákazník nenalezen'));
+    
+    
+    // Load subject info
+    $DbResult = $this->Database->query('SELECT * FROM Subject WHERE Id='.$Customer['Subject']);
+    if($DbResult->num_rows == 1)
+    {    
+      $Subject = $DbResult->fetch_assoc();      
+    } else return($this->SystemMessage('Položka nenalezena', 'Subjekt nenalezen'));
+    
+    
+    $Output = '<table width="100%" border="0" cellspacing="0" cellpadding="3"><tr><td valign="top">';        
 
     // Account state
@@ -131 +136 @@
     $DbResult = $this->Database->query('SELECT Service.Name, Service.Price FROM ServiceCustomerRel '.
       'LEFT JOIN Service ON Service.Id=ServiceCustomerRel.Service '.
-      'WHERE (ServiceCustomerRel.Customer='.$Member['Id'].') AND (ServiceCustomerRel.Action IS NULL)');
+      'WHERE (ServiceCustomerRel.Customer='.$Customer['Id'].') AND (ServiceCustomerRel.Action IS NULL)');
     while($DbRow = $DbResult->fetch_assoc())
     {
-          $Output .= '<tr><td>'.$DbRow['Name'].'</td><td>'.$DbRow['Price'].'</td></tr>';
+            $Output .= '<tr><td>'.$DbRow['Name'].'</td><td>'.$DbRow['Price'].'</td></tr>';
       $Total += $DbRow['Price'];
     }

trunk/Modules/IS/IS.php

@@ -377 +377 @@
       foreach($FormClass['ItemActions'] as $Action)
       {
-        $URL = $this->System->Link($Action['URL']);
-        if(strpos($URL, '?') === false) $URL .= '?';
-        else if((substr($URL, -5, 5) !== '&') and (substr($URL, -1, 1) !== '?')) $URL .= '&';
-        $URL .= 'i='.$Id;
+        $URL = str_replace('#RowId', $Id, $this->System->Link($Action['URL']));
         $Actions[] = $this->ShowAction($Action['Caption'], $URL,
           $this->System->Link('/images/action.png'));
@@ -643 +640 @@
       {
         $URL = $this->System->Link($Action['URL']);
-        if(strpos($URL, '?') === false) $URL .= '?';
-        else if((substr($URL, -5, 5) !== '&') and (substr($URL, -1, 1) !== '?')) $URL .= '&';
-        $URL .= 'i=#RowId';
         $RowActions .= '<a href="'.$URL.'"><img alt="'.$Action['Caption'].'" title="'.$Action['Caption'].'" src="'.
           $this->System->Link('/images/action.png').'"/></a>';

trunk/Modules/Map/Map.php

@@ -221 +221 @@
       ),
       'ItemActions' => array(
-        array('Caption' => 'Ukázat na mapě', 'URL' => '/map/show-position'),
+        array('Caption' => 'Ukázat na mapě', 'URL' => '/map/show-position?i=#RowId'),
       ),
     ));

trunk/Modules/NetworkConfig/NetworkConfig.php

@@ -37 +37 @@
       ),
       'ItemActions' => array(
-        array('Caption' => 'Záznam', 'URL' => '/is/?a=view&t=NetworkConfigurationLog'),
+        array('Caption' => 'Záznam', 'URL' => '/is/?a=view&t=NetworkConfigurationLog&i=#RowId'),
       ),
     ));