From: pines <pines@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 25 Apr 2007 20:24:46 +0000 (+0000)
Subject: Move iso8601 date extension loading as close as possible to where it's actually being... 
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=db117aca0befc55a51f5e7fd6552053c34ce2873;p=Evergreen.git

Move iso8601 date extension loading as close as possible to where it's actually being used.  Use 8601 with claim returned date


git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_0@7169 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/date.js b/Open-ILS/xul/staff_client/chrome/content/util/date.js
index e405d86c09..bc550fa86e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/date.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/date.js
@@ -80,6 +80,12 @@ util.date.formatted_date = function (date,format) {
 
 	var s = format;
 	if (s == '') { s = '%F %H:%M'; }
+	if (typeof date.iso8601Format != 'function') {
+		
+		var js = JSAN._loadJSFromUrl( urls.isodate_lib );
+		try { eval( js ); } catch(E) { alert('Problem loading ISO8601 date extension:' + E); }
+
+	}
 	if (typeof date.iso8601Format == 'function') {
 		s = s.replace( /%\{iso8601\}/g, date.iso8601Format("YMDHMS") );
 	}
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.js b/Open-ILS/xul/staff_client/server/circ/checkin.js
index f0ed62d148..05a68087b9 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.js
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.js
@@ -4,10 +4,6 @@ if (typeof circ == 'undefined') circ = {};
 circ.checkin = function (params) {
 
 	JSAN.use('util.error'); this.error = new util.error();
-
-	var js = JSAN._loadJSFromUrl( urls.isodate_lib );
-	try { eval( js ); } catch(E) { this.error.standard_unexpected_error_alert('Problem loading ISO8601 date extension',E); }
-
 	JSAN.use('util.network'); this.network = new util.network();
 	JSAN.use('util.barcode');
 	JSAN.use('util.date');
diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index 64caea1845..4ce761f400 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -395,10 +395,10 @@ patron.items.prototype = {
 	'items_claimed_returned' : function(which) {
 		var obj = this;
 		try {
+			JSAN.use('util.date');
 			var retrieve_ids = ( which == 2 ? obj.retrieve_ids2 : obj.retrieve_ids );
 			if (!retrieve_ids || retrieve_ids.length == 0) return;
 			function check_date(value) {
-				JSAN.use('util.date');
 				try {
 					if (! util.date.check('YYYY-MM-DD',value) ) { 
 						throw('Invalid Date'); 
@@ -432,6 +432,7 @@ patron.items.prototype = {
 			}
 			//alert('backdate = ' + backdate);
 			if (backdate) {
+				backdate = util.date.formatted_date(backdate + ' 00:00:00','%{iso8601}');
 				var barcodes = util.functional.map_list(retrieve_ids,function(o){return o.barcode;});
 				for (var i = 0; i < barcodes.length; i++) {
 					var robj = obj.network.simple_request(