X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fdb_pager.inc;h=e09659a0210697dc9171dc17e335d4fe3922ca3e;hb=7796f55d85412cbc2904b0577b419d9625958257;hp=613d2921e3477d8f1024a65e382421741d25533e;hpb=818719f38b8327cdca616d58b13913dbd174d96a;p=fa-stable.git

diff --git a/includes/db_pager.inc b/includes/db_pager.inc
index 613d2921..e09659a0 100644
--- a/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //
 //	Controler part of database table pager with column sort.
@@ -52,11 +52,14 @@ class db_pager {
 	
 	var $ready = false; // this var is false after change in sql before first
 						// and before first query.
-
+	var $inactive_ctrl = false;
+	var $main_tbl;		// table and key field name for inactive ctrl and edit/delete links
+	var $key;	// key field name
+	
 	//  db_pager constructor
 	//  accepts $sql like 'SELECT ...[FROM ...][WHERE ...][GROUP ...][ORDER ...]'
 	//	$name is base name for pager controls
-	function db_pager($sql, $name, $page_len=0) 
+	function db_pager($sql, $name, $table = null, $page_len=0) 
 	{
 		global $table_style;
 		$this->width = "95%";
@@ -157,14 +160,18 @@ class db_pager {
 			$c = 0;
 		  // add result field names to column defs for 
 		  // col value retrieve and sort purposes 
-			for ($c = $i = 0; $c < count($this->columns); $c++) {
-				if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert']))
-			 		$this->columns[$c]['name']= mysql_field_name($result, $i++);
+		   $cnt = min(mysql_num_fields($result), count($this->columns));
+			for ($c = $i = 0; $c < $cnt; $c++) {
+				if (!(isset($this->columns[$c]['insert']) && $this->columns[$c]['insert'])) {
+//					if (!@($this->columns[$c]['type']=='skip'))
+			 			$this->columns[$c]['name']= mysql_field_name($result, $i);
+					if (!@($this->columns[$c]['type']=='insert'))
+			 		$i++;
+			 		}
 		  	}
-		  
-		  	while ($row = db_fetch_assoc($result))
+		  	while ($row = db_fetch_assoc($result)) {
 				$this->data[] = $row;
-		  
+		  	}
 		} else 
 		  return false;
 		return true;
@@ -217,7 +224,7 @@ class db_pager {
 					$h = '';
 					$c = $coldef;
 				} else {
-			  		$h = $coldef;
+					$h = $coldef;
 					$c = 'text';
 				}
 			}
@@ -228,11 +235,13 @@ class db_pager {
 			  $c['type'] = 'text';
 
 			switch($c['type']) {
-			  case 'insert':
-			  default:
-				$c['head'] = $h; break;
-			  case 'skip':		// skip the column (no header)
-				unset($c['head']);	// paranoid code
+				case 'inactive': 
+					$this->inactive_ctrl = true;
+				case 'insert':
+				default:
+					$c['head'] = $h; break;
+				case 'skip':		// skip the column (no header)
+					unset($c['head']); break;
 	  		}
 			$this->columns[] = $c;	
 		}
@@ -247,7 +256,7 @@ class db_pager {
 		$select = $this->select;
 		$from = $this->from;
 		$where = $this->where;
-		$group = $this->group;		
+		$group = $this->group;
 		$order = $this->order;
 
 		if(count($this->extra_where)) {
@@ -263,10 +272,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 +303,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');
@@ -301,7 +312,20 @@ class db_pager {
 				return false;
 			$row = db_fetch_row($result);
 			$this->rec_count = $row[0];
-	  		$this->max_page = ceil($this->rec_count/$this->page_len);
+	  		$this->max_page = $this->page_len ?
+				ceil($this->rec_count/$this->page_len) : 0;
+		
+			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;
 	    }
@@ -357,6 +381,44 @@ class db_pager {
 		$this->footer_fun = $func;
 		$this->footer_class = $footercl;
 	}
+	//
+	//	Setter for table editors with inactive cell control.
+	//
+	function set_inactive_ctrl($table, $key) {
+		$this->inactive_ctrl = array('table'=>$table, 'key'=>$key);
+	}
+	//
+	//	Helper for display inactive control cells
+	//
+	function inactive_control_cell(&$row)
+	{
+		if ($this->inactive_ctrl) {
+//			return inactive_control_cell($row[$this->inactive_ctrl['key']],
+//				 $row['inactive'], $this->inactive_ctrl['table'], 
+//				 $this->inactive_ctrl['key']);
+				 
+			global	$Ajax;
+
+			$key = $this->key ?
+				$this->key : $this->columns[0]['name'];		// TODO - support for complex keys
+			$id = $row[$key];
+			$table = $this->main_tbl;
+			$name = "Inactive". $id;
+			$value = $row['inactive'] ? 1:0;
+
+			if (check_value('show_inactive')) {
+				if (isset($_POST['LInact'][$id]) && (get_post('_Inactive'.$id.'_update') || 
+					get_post('Update')) && (check_value('Inactive'.$id) != $value)) {
+					update_record_status($id, !$value, $table, $key);
+					$value = !$value;
+				}
+				echo '<td align="center">'. checkbox(null, $name, $value, true, '', "align='center'")
+ 				. hidden("LInact[$id]", $value, false) . '</td>';	
+			}
+		} else
+			return '';
+	}
+
 };
 //-----------------------------------------------------------------------------
 //	Creates new db_pager $_SESSION object on first page call.
@@ -384,20 +446,22 @@ class db_pager {
 //  during display, but can be used in format handlers for 'spec' and 'insert' 
 //	type columns.
 
-function &new_db_pager($name, $sql, $coldef, $page_len = 0)  {
-
-    if ($_SERVER['REQUEST_METHOD'] == 'GET')
-		unset($_SESSION[$name]); // kill old pager if any exists on first page call
+function &new_db_pager($name, $sql, $coldef, $table = null, $key = null, $page_len = 0)  {
 
+    if (isset($_SESSION[$name]) &&
+		 ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SESSION[$name]->sql != $sql)) {
+		unset($_SESSION[$name]); // kill pager if sql has changed
+	}
 	if (!isset($_SESSION[$name])) {
-	    $_SESSION[$name] =& new db_pager($sql, $name, $page_len);
+	    $_SESSION[$name] =& new db_pager($sql, $name, $table, $page_len);
+		$_SESSION[$name]->main_tbl = $table;
+		$_SESSION[$name]->key = $key;
 		$_SESSION[$name]->set_sql($sql);
 		$_SESSION[$name]->set_columns($coldef);
 	}
 	
-	$ret = &$_SESSION[$name];
+	return  $_SESSION[$name];
 
-    return $ret;
 }
 //
 //	Force pager initialization.