From ede7e78925a07dc800bc4e1dda10b2321d176f7d Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Sun, 4 Oct 2015 21:34:01 -0400
Subject: [PATCH] webstaff: browser client: Remove closed dates editor XUL-y
 requirements

Replace JSAN date functions with manual, inline date formatting
functions.  Remove JSAN and XUL constants requirements.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../xul/staff_client/server/admin/closed_dates.js  | 28 +++++++++-------------
 .../staff_client/server/admin/closed_dates.xhtml   |  2 --
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.js b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
index e5ee4a8fab..50d74c2832 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.js
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.js
@@ -24,19 +24,6 @@ var myPerms = [
 
 function cdEditorInit() {
 
-    try {
-        if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); }
-        JSAN.errorLevel = "die"; // none, warn, or die
-        JSAN.addRepository('..');
-        JSAN.use('util.error'); g.error = new util.error();
-        JSAN.use('util.date');
-    } catch(E) {
-        var err_msg = "!! This software has encountered an error.  Please tell your friendly " +
-            "system administrator or software developer the following:\nadmin/closed_dates.xhtml\n" + E + '\n';
-        try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
-        alert(err_msg);
-    }
-
     /* set the various template rows */
     cdTbody = $('cd_tbody');
     cdRowTemplate                    = cdTbody.removeChild($('cd_row'));
@@ -176,11 +163,18 @@ function cdBuild(r) {
 }
 
 function cdDateToHours(date) {
-    return util.date.formatted_date(date, '%H:%M');
+    var date_obj = new Date(Date.parse(date));
+    var hrs = date_obj.getHours();
+    var mins = date_obj.getMinutes();
+    // wee, strftime
+    if (hrs < 10) hrs = '0' + hrs;
+    if (mins < 10) mins = '0' + mins;
+    return hrs + ':' + mins;
 }
 
 function cdDateToDate(date) {
-    return util.date.formatted_date(date, '%F');
+    var date_obj = new Date(Date.parse(date));
+    return date_obj.toISOString().replace(/T.*/,''); // == %F
 }
 
 
@@ -396,8 +390,8 @@ function cdGetOrgList(org) {
 function cdCreateOne( org, start, end, note, refresh ) {
     var date = new aoucd();
 
-    date.close_start(util.date.formatted_date(start, '%{iso8601}'));
-    date.close_end(util.date.formatted_date(end, '%{iso8601}'));
+    date.close_start(start.toISOString());
+    date.close_end(end.toISOString());
     date.org_unit(org);
     date.reason(note);
 
diff --git a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
index c4e1bf02ab..8eb074e4c1 100644
--- a/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
+++ b/Open-ILS/xul/staff_client/server/admin/closed_dates.xhtml
@@ -23,8 +23,6 @@
         <script type='text/javascript' src='/opac/common/js/org_utils.js'> </script>
         <script type='text/javascript' src='/opac/common/js/init.js'> </script>
         <script type='text/javascript' src='/opac/common/js/RemoteRequest.js'> </script>
-        <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
-        <script type="text/javascript" src="/xul/server/main/constants.js" />
         <script type='text/javascript' src='adminlib.js'> </script>
         <script type='text/javascript' src='closed_dates.js'> </script>
 
-- 
2.11.0