Changeset 825 for trunk/Modules

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

Files:

• Finance/Manage.php (modified) (2 diffs)
• Finance/UserState.php (modified) (2 diffs)
• IS/IS.php (modified) (2 diffs)
• Network/Network.php (modified) (2 diffs)
• Network/Subnet.php (modified) (2 diffs)
• System/System.php (modified) (2 diffs)
• TV/TV.php (modified) (2 diffs)
• TimeMeasure/Main.php (modified) (2 diffs)
• User/UserList.php (modified) (2 diffs)
• User/UserPage.php (modified) (2 diffs)
• Wiki/Wiki.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'];
 

trunk/Modules/IS/IS.php

@@ -527 +527 @@
       $TotalFilteredCount = $DbRow[0];
     } else $TotalFilteredCount = $TotalCount;
-    $PageList = GetPageList($TotalFilteredCount);
+    $PageList = GetPageList($Table, $TotalFilteredCount);
 
     $Output = $PageList['Output'];
@@ -537 +537 @@
     if(!array_key_exists('DefaultSortOrder', $FormClass))
       $FormClass['DefaultSortOrder'] = 0;
-    $Order = GetOrderTableHeader($TableColumns, $FormClass['DefaultSortColumn'], $FormClass['DefaultSortOrder']);
+    $Order = GetOrderTableHeader($Table, $TableColumns, $FormClass['DefaultSortColumn'], $FormClass['DefaultSortOrder']);
     $Output .= $Order['Output'];
 

trunk/Modules/Network/Network.php

@@ -208 +208 @@
         'Wireless' => array('Type' => 'TNetworkInterfaceWirelessListInterface', 'Caption' => 'Bezdrátové spoje', 'Default' => ''),
         'Ports' => array('Type' => 'TDevicePortListInterface', 'Caption' => 'Síťové porty', 'Default' => ''),
-        'Latency' => array('Type' => 'TDeviceInterfaceLatencyListInterface', 'Caption' => 'Odezva sítě', 'Default' => ''),
+        'Latency' => array('Type' => 'TDeviceInterfaceLatencyListInterface', 'Caption' => 'Síťová odezva', 'Default' => ''),
       ),
       'AfterInsert' => array($this, 'AfterInsertNetworkInterface'),
@@ -261 +261 @@
     ));
     $this->System->FormManager->RegisterClass('NetworkInterfaceLatency', array(
-      'Title' => 'Sťová odezva',
+      'Title' => 'Síťová odezva',
       'Table' => 'NetworkInterfaceLatency',
+      'DefaultSortColumn' => 'Time',
+      'DefaultSortOrder' => 1,
       'Items' => array(
         'Time' => array('Type' => 'DateTime', 'Caption' => 'Čas', 'Default' => ''),

trunk/Modules/Network/Subnet.php

@@ -15 +15 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `NetworkSubnet`');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('Subnets', $DbRow[0]);
 
     $Output = $PageList['Output'];
@@ -30 +30 @@
       array('Name' => 'SubjectName', 'Title' => 'Účastník'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'AddressRange', 0);
+    $Order = GetOrderTableHeader('Subnets', $TableColumns, 'AddressRange', 0);
     $Output .= $Order['Output'];
 

trunk/Modules/System/System.php

@@ -16 +16 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Module`');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('Modules', $DbRow[0]);
 
     $Output .= $PageList['Output'];
@@ -31 +31 @@
       array('Name' => '', 'Title' => 'Akce'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Order = GetOrderTableHeader('Modules', $TableColumns, 'Name', 0);
     $Output .= $Order['Output'];
     $Query = 'SELECT *, (SELECT GROUP_CONCAT(`T1`.`Name` SEPARATOR ", ") FROM `ModuleLink` '.

trunk/Modules/TV/TV.php

@@ -32 +32 @@
       ' LEFT JOIN `Language` ON `Language`.`Id` = `TV`.`Language` WHERE (`TV`.`Stream` <> "") OR (`TV`.`StreamWeb` <> "")');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('TVChannels', $DbRow[0]);
 
     $Output .= $PageList['Output'];
@@ -44 +44 @@
       array('Name' => '', 'Title' => 'Ladění'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Order = GetOrderTableHeader('TVChannels', $TableColumns, 'Name', 0);
     $Output .= $Order['Output'];
 

trunk/Modules/TimeMeasure/Main.php

@@ -200 +200 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Measure` WHERE `Enabled`=1');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('Measures', $DbRow[0]);
 
     $Output = $PageList['Output'];
@@ -217 +217 @@
       $TableColumns[] = array('Name' => 'MeasureDuration', 'Title' => 'Čas vykonání');
     }
-    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Order = GetOrderTableHeader('Measures', $TableColumns, 'Name', 0);
     $Output .= $Order['Output'];
 

trunk/Modules/User/UserList.php

@@ -11 +11 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User`');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('Users', $DbRow[0]);
 
     $Output = $PageList['Output'];
@@ -21 +21 @@
       array('Name' => '', 'Title' => 'Počítače'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Order = GetOrderTableHeader('Users', $TableColumns, 'Name', 0);
     $Output .= $Order['Output'];
 

trunk/Modules/User/UserPage.php

@@ -22 +22 @@
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS T');
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
+    $PageList = GetPageList('Contacts', $DbRow[0]);
 
     $Output = '<div>Kontakty</div>';
@@ -32 +32 @@
       array('Name' => 'Value', 'Title' => 'Hodnota'),
     );
-    $Order = GetOrderTableHeader($TableColumns, 'Value', 0);
+    $Order = GetOrderTableHeader('Contacts', $TableColumns, 'Value', 0);
     $Output .= $Order['Output'];
 

trunk/Modules/Wiki/Wiki.php

@@ -185 +185 @@
         $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM `WikiPageContent` WHERE Page='.$DbRow['Id']);
         $DbRow2 = $DbResult2->fetch_row();
-        $PageList = GetPageList($DbRow2[0]);
+        $PageList = GetPageList('WikiHistory', $DbRow2[0]);
 
         $Output .= $PageList['Output'];
@@ -196 +196 @@
         );
 
-        $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
+        $Order = GetOrderTableHeader('WikiHistory', $TableColumns, 'Time', 1);
         $Output .= $Order['Output'];