From 2a721693c8b5d1ebf55b51e4ed9396a29a1147b2 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Thu, 1 Nov 2012 01:02:03 +0100
Subject: [PATCH] Replaced the transaction list in attachments with a pager and
 made the sorting descent.

---
 admin/attachments.php       | 68 ++++++++++++++++++++++++-------------
 admin/db/attachments_db.inc |  6 ++++
 2 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/admin/attachments.php b/admin/attachments.php
index cc2efe93..b75c58bf 100644
--- a/admin/attachments.php
+++ b/admin/attachments.php
@@ -12,6 +12,7 @@
 $path_to_root="..";
 $page_security = 'SA_ATTACHDOCUMENT';
 
+include_once($path_to_root . "/includes/db_pager.inc");
 include_once($path_to_root . "/includes/session.inc");
 
 include_once($path_to_root . "/includes/date_functions.inc");
@@ -164,31 +165,51 @@ function viewing_controls()
 
 }
 
+function trans_view($trans)
+{
+	return get_trans_view_str($trans["type_no"], $trans["trans_no"]);
+}
+
+function edit_link($row)
+{
+  	return button('Edit'.$row["id"], _("Edit"), _("Edit"), ICON_EDIT);
+}
+
+function view_link($row)
+{
+  	return button('view'.$row["id"], _("View"), _("View"), ICON_VIEW);
+}
+
+function download_link($row)
+{
+  	return button('download'.$row["id"], _("Download"), _("Download"), ICON_DOWN);
+}
+
+function delete_link($row)
+{
+  	return button('Delete'.$row["id"], _("Delete"), _("Delete"), ICON_DELETE);
+}
+
 function display_rows($type)
 {
-	$rows = get_attached_documents($type);
-	$th = array(_("#"), _("Description"), _("Filename"), _("Size"), _("Filetype"), _("Date Uploaded"), "", "", "", "");
-	
-	start_table(TABLESTYLE);
-	table_header($th);
-	$k = 0;
-	while ($row = db_fetch($rows))
-	{
-		alt_table_row_color($k);
-		
-		label_cell(get_trans_view_str($type, $row['trans_no']));
-		label_cell($row['description']);
-		label_cell($row['filename']);
-		label_cell($row['filesize']);
-		label_cell($row['filetype']);
-		label_cell(sql2date($row['tran_date']));
- 		edit_button_cell("Edit".$row['id'], _("Edit"));
- 		button_cell("view".$row['id'], _("View"), false, ICON_VIEW);
- 		button_cell("download".$row['id'], _("Download"), false, ICON_DOWN);
- 		delete_button_cell("Delete".$row['id'], _("Delete"));
-    	end_row();
-	}	
-	end_table(1);
+	$sql = get_sql_for_attached_documents($type);
+	$cols = array(
+		_("#") => array('fun'=>'trans_view', 'ord'=>''),
+	    _("Description") => array('name'=>'description'),
+	    _("Filename") => array('name'=>'filename'),
+	    _("Size") => array('name'=>'filesize'),
+	    _("Filetype") => array('name'=>'filetype'),
+	    _("Date Uploaded") => array('name'=>'tran_date', 'type'=>'date'),
+	    	array('insert'=>true, 'fun'=>'edit_link'),
+	    	array('insert'=>true, 'fun'=>'view_link'),
+	    	array('insert'=>true, 'fun'=>'download_link'),
+	    	array('insert'=>true, 'fun'=>'delete_link')
+	    );	
+		$table =& new_db_pager('trans_tbl', $sql, $cols);
+
+		$table->width = "60%";
+
+		display_db_pager($table);
 }
 
 //----------------------------------------------------------------------------------------
@@ -199,6 +220,7 @@ viewing_controls();
 
 display_rows($_POST['filterType']);
 
+br(2);
 
 start_table(TABLESTYLE2);
 
diff --git a/admin/db/attachments_db.inc b/admin/db/attachments_db.inc
index 6ce9960f..e18000fe 100644
--- a/admin/db/attachments_db.inc
+++ b/admin/db/attachments_db.inc
@@ -78,5 +78,11 @@ function has_attachment($type, $id)
 		return $myrow['id'];
 }
 
+function get_sql_for_attached_documents($type)
+{
+	return "SELECT trans_no, description, filename, filesize, filetype, tran_date, id, type_no FROM ".TB_PREF."attachments WHERE type_no=".db_escape($type)
+	." ORDER BY trans_no DESC";
+}
+
 
 ?>
\ No newline at end of file
-- 
2.30.2