From 8430384235d77fb7f8d8ca894e5efedd04d6bc0b Mon Sep 17 00:00:00 2001 From: Janusz Dobrowolski Date: Mon, 2 Feb 2009 18:43:45 +0000 Subject: [PATCH] Fixed start order in initialy sorted pagers. --- dimensions/inquiry/search_dimensions.php | 2 +- includes/db_pager.inc | 18 ++++++++++++++++-- .../allocations/supplier_allocation_main.php | 2 +- purchasing/inquiry/po_search_completed.php | 2 +- .../inquiry/supplier_allocation_inquiry.php | 2 +- purchasing/inquiry/supplier_inquiry.php | 2 +- sales/allocations/customer_allocation_main.php | 2 +- sales/inquiry/customer_allocation_inquiry.php | 2 +- 8 files changed, 23 insertions(+), 9 deletions(-) diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php index ab4d804e..0b1a47df 100644 --- a/dimensions/inquiry/search_dimensions.php +++ b/dimensions/inquiry/search_dimensions.php @@ -172,7 +172,7 @@ $cols = array( _("Name"), _("Type"), _("Date") =>'date', - _("Due Date") => array('date', 'ord'=>'asc'), + _("Due Date") => array('name'=>'due_date', 'date', 'ord'=>'asc'), _("Closed") => array('fun'=>'is_closed'), _("Balance") => array('type'=>'amount', 'insert'=>true, 'fun'=>'sum_dimension'), array('insert'=>true, 'fun'=>'edit_link') diff --git a/includes/db_pager.inc b/includes/db_pager.inc index 613d2921..ef74a95d 100644 --- a/includes/db_pager.inc +++ b/includes/db_pager.inc @@ -263,10 +263,10 @@ class db_pager { } $sql = "$select FROM $from $where"; - if($group) $sql.= " GROUP BY $group"; + if ($group) $sql.= " GROUP BY $group"; $ord = array(); - foreach( $this->columns as $col) { + foreach ($this->columns as $col) { if (isset($col['ord'])) { if ( $col['ord'] != '' && isset($col['name'])) { $ord[] = $col['name'] .' '. $col['ord']; @@ -294,6 +294,8 @@ class db_pager { // function _init() { + global $go_debug; + if ($this->ready == false ) { $sql = $this->_sql_gen(true); $result = db_query($sql, 'Error reading record set'); @@ -302,6 +304,18 @@ class db_pager { $row = db_fetch_row($result); $this->rec_count = $row[0]; $this->max_page = ceil($this->rec_count/$this->page_len); + + if ($go_debug) { // FIX - need column name parsing, but for now: + // check if field names are set explicite in col def + // for all initially ordered columns + foreach ($this->columns as $col) { + if (isset($col['ord']) && $col['ord'] != '' + && !isset($col['name'])) { + display_warning("Result field names must be set + for all intially ordered db_pager columns."); + } + } + } $this->set_page(1); $this->ready = true; } diff --git a/purchasing/allocations/supplier_allocation_main.php b/purchasing/allocations/supplier_allocation_main.php index e58582f7..0742a587 100644 --- a/purchasing/allocations/supplier_allocation_main.php +++ b/purchasing/allocations/supplier_allocation_main.php @@ -108,7 +108,7 @@ $cols = array( _("Transaction Type") => array('fun'=>'systype_name'), _("#") => array('fun'=>'trans_view'), _("Reference"), - _("Date") => array('type'=>'date', 'ord'=>'asc'), + _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Supplier") => array('ord'=>''), _("Currency") => array('align'=>'center'), _("Total") => 'amount', diff --git a/purchasing/inquiry/po_search_completed.php b/purchasing/inquiry/po_search_completed.php index 905fdc00..3e239d8e 100644 --- a/purchasing/inquiry/po_search_completed.php +++ b/purchasing/inquiry/po_search_completed.php @@ -149,7 +149,7 @@ $cols = array( _("Supplier") => array('ord'=>''), _("Location"), _("Supplier's Reference"), - _("Order Date") => array('type'=>'date', 'ord'=>'desc'), + _("Order Date") => array('name'=>'ord_date', 'type'=>'date', 'ord'=>'desc'), _("Currency") => array('align'=>'center'), _("Order Total") => 'amount', array('insert'=>true, 'fun'=>'prt_link'), diff --git a/purchasing/inquiry/supplier_allocation_inquiry.php b/purchasing/inquiry/supplier_allocation_inquiry.php index 0216392f..69e399d4 100644 --- a/purchasing/inquiry/supplier_allocation_inquiry.php +++ b/purchasing/inquiry/supplier_allocation_inquiry.php @@ -175,7 +175,7 @@ $cols = array( _("Reference"), _("Supplier") => array('ord'=>''), _("Supp Reference"), - _("Date") => array('type'=>'date', 'ord'=>'asc'), + _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Due Date") => array('fun'=>'due_date'), _("Currency") => array('align'=>'center'), _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), diff --git a/purchasing/inquiry/supplier_inquiry.php b/purchasing/inquiry/supplier_inquiry.php index a2f18aaa..c3bdbcb6 100644 --- a/purchasing/inquiry/supplier_inquiry.php +++ b/purchasing/inquiry/supplier_inquiry.php @@ -211,7 +211,7 @@ $cols = array( _("Reference"), _("Supplier"), _("Supplier's Reference"), - _("Date") => array('type'=>'date', 'ord'=>'desc'), + _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'desc'), _("Due Date") => array('type'=>'date', 'fun'=>'due_date'), _("Currency") => array('align'=>'center'), _("Debit") => array('align'=>'right', 'fun'=>'fmt_debit'), diff --git a/sales/allocations/customer_allocation_main.php b/sales/allocations/customer_allocation_main.php index 3489004d..cb88dd45 100644 --- a/sales/allocations/customer_allocation_main.php +++ b/sales/allocations/customer_allocation_main.php @@ -103,7 +103,7 @@ $cols = array( _("Transaction Type") => array('fun'=>'systype_name'), _("#") => array('fun'=>'trans_view'), _("Reference"), - _("Date") => array('type'=>'date', 'ord'=>'asc'), + _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Customer") => array('ord'=>''), _("Currency") => array('align'=>'center'), _("Total") => 'amount', diff --git a/sales/inquiry/customer_allocation_inquiry.php b/sales/inquiry/customer_allocation_inquiry.php index d7a02dc6..9bcab151 100644 --- a/sales/inquiry/customer_allocation_inquiry.php +++ b/sales/inquiry/customer_allocation_inquiry.php @@ -203,7 +203,7 @@ $cols = array( _("#") => array('fun'=>'view_link'), _("Reference"), _("Order") => array('fun'=>'order_link'), - _("Date") => array('type'=>'date', 'ord'=>'asc'), + _("Date") => array('name'=>'tran_date', 'type'=>'date', 'ord'=>'asc'), _("Due Date") => array('type'=>'date', 'fun'=>'due_date'), _("Customer"), _("Currency") => array('align'=>'center'), -- 2.30.2