[open-ils-commits] r13336 - in trunk/Open-ILS/xul/staff_client/server: circ locale/en-US (dbs)

[svn at svn.open-ils.org]

Author: dbs
Date: 2009-06-05 21:53:45 -0400 (Fri, 05 Jun 2009)
New Revision: 13336

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
Add a "Due Time" column. Useful for items that circulate only for hours at a time.

Warning: This is a gross hack, doesn't support localized displays, etc.


Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-06-05 18:32:03 UTC (rev 13335)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-06-06 01:53:45 UTC (rev 13336)
@@ -191,7 +191,16 @@
 			'primary' : false,
 			'hidden' : false,
 			'render' : function(my) { return my.due_date; }
+		},
+		{
+			'id' : 'due_time',
+			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
+			'flex' : 1,
+			'primary' : false,
+			'hidden' : false,
+			'render' : function(my) { return my.due_time; }
 		}
+
 	];
 	if (modify) for (var i = 0; i < c.length; i++) {
 		if (modify[ c[i].id ]) {
@@ -341,6 +350,14 @@
 			'primary' : false,
 			'hidden' : false,
 			'render' : function(my) { return my.due_date; }
+		},
+		{
+			'id' : 'due_time',
+			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
+			'flex' : 1,
+			'primary' : false,
+			'hidden' : false,
+			'render' : function(my) { return my.due_time; }
 		}
 	];
 	if (modify) for (var i = 0; i < c.length; i++) {
@@ -891,6 +908,25 @@
 		},
 		{
 			'persist' : 'hidden width ordinal',
+			'id' : 'due_time',
+			'label' : document.getElementById('commonStrings').getString('staff.circ_label_due_time'),
+			'flex' : 1,
+			'primary' : false,
+			'hidden' : true,
+			'render' : function(my) {
+				if (my.circ) {
+					return my.circ.due_date().substr(11,8);
+				} else {
+					if (my.acp.circulations()) {
+						return my.acp.circulations()[0].due_date().substr(11,8);
+					} else {
+						return "";
+					}
+				}
+			}
+		},
+		{
+			'persist' : 'hidden width ordinal',
 			'id' : 'create_date',
 			'label' : document.getElementById('circStrings').getString('staff.circ.utils.create_date'),
 			'flex' : 1,

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-06-05 18:32:03 UTC (rev 13335)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-06-06 01:53:45 UTC (rev 13336)
@@ -200,6 +200,7 @@
 staff.circ.utils.offline.patron_barcode=Patron Barcode
 staff.circ.utils.offline.item_barcode=Item Barcode
 staff.circ.utils.offline.due_date=Due Date
+staff.circ.utils.offline.due_time=Due Time
 staff.circ.utils.offline.backdate=Back Date
 staff.circ.utils.offline.use_time=Use Time
 staff.circ.utils.not_cataloged=Not Cataloged