Changeset 825 for trunk/Modules/Finance

Timestamp:

Apr 16, 2016, 9:53:17 PM (9 years ago)

Author:

chronos

Message:

• Added: Allow to independently select table page and column order. This solves a problem where going between pages with tables incorrectly set default ordering column.

Location:

trunk/Modules/Finance

Files:

• Manage.php (modified) (2 diffs)
• UserState.php (modified) (2 diffs)

trunk/Modules/Finance/Manage.php

@@ -81 +81 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$SQL.') AS T');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('MonthlyPayment', $DbRow[0]);
 
     $Output = $PageList['Output'];
@@ -94 +94 @@
       array('Name' => 'BillingPeriodName', 'Title' => 'Perioda'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'SubjectName', 0);
+    $Order = GetOrderTableHeader('MonthlyPayment', $TableColumns, 'SubjectName', 0);
     $Output .= $Order['Output'];
 

trunk/Modules/Finance/UserState.php

@@ -22 +22 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$UserOperationTableQuery.' AS `T1`');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('FinanceOperation', $DbRow[0]);
 
     $Output .= $PageList['Output'];
@@ -35 +35 @@
         array('Name' => 'BillCode', 'Title' => 'Doklad'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
+    $Order = GetOrderTableHeader('FinanceOperation', $TableColumns, 'Time', 1);
     $Output .= $Order['Output'];