circ_tree is now circ_utils. patron_items is what circ_tree was. don't need the...

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
index c165c4e..cd50d21 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js
@@ -16,7 +16,6 @@ function OpenILS_init(params) {
                        case 'PatronDisplayStatus' : patron_display_status_init(params); break;
                        case 'PatronDisplayContact' : patron_display_contact_init(params); break;
                        case 'PatronItems' : patron_items_init(params); break;
-                       case 'CircTree' : circ_tree_init(params); break;
                }
 
        } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); }
@@ -49,7 +48,6 @@ function OpenILS_exit(params) {
                        case 'PatronDisplayStatus' : patron_display_status_exit(params); break;
                        case 'PatronDisplayContact' : patron_display_contact_exit(params); break;
                        case 'PatronItems' : patron_items_exit(params); break;
-                       case 'CircTree' : circ_tree_exit(params); break;
                }
 
        } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); }

diff --git a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul
index 088cabe..c785f79 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS_scripts_overlay.xul
@@ -19,7 +19,7 @@
                <script src="chrome://evergreen/content/patron/patron_display_status.js" />
                <script src="chrome://evergreen/content/patron/patron_display_contact.js" />
                <script src="chrome://evergreen/content/patron/patron_items.js" />
-               <script src="chrome://evergreen/content/circ/circ_tree.js" />
+               <script src="chrome://evergreen/content/circ/circ_utils.js" />
        </apps>
 
 </overlay>

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js
deleted file mode 100644 (file)
index fda43fd..0000000
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.js
+++ /dev/null
@@ -1,102 +0,0 @@
-sdump('D_TRACE','Loading circ_tree.js\n');
-
-function checkin_by_copy_barcode(barcode) {
-       sdump('D_CIRC_UTILS',arg_dump(arguments,{0:true}));
-       try {
-               var check = user_request(
-                       'open-ils.circ',
-                       'open-ils.circ.checkin.barcode',
-                       [ mw.G.auth_ses[0], barcode ]
-               )[0];
-               sdump('D_CIRC_UTILS','check = ' + check + '\n');
-               return check;
-       } catch(E) {
-               sdump('D_ERROR',E);
-               return null;
-       }
-}
-
-
-function circ_cols() {
-       return  [
-               {
-                       'id' : 'barcode', 'label' : getString('acp_label_barcode'), 'flex' : 1,
-                       'primary' : true, 'hidden' : false, 'fm_class' : 'acp', 'fm_field_render' : '.barcode()'
-               },
-               {
-                       'id' : 'call_number', 'label' : getString('acp_label_call_number'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.call_number()'
-               },
-               {
-                       'id' : 'copy_number', 'label' : getString('acp_label_copy_number'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.copy_number()'
-               },
-               {
-                       'id' : 'status', 'label' : getString('acp_label_status'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.status()'
-               },
-               {
-                       'id' : 'location', 'label' : getString('acp_label_location'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.location()'
-               },
-               {
-                       'id' : 'loan_duration', 'label' : getString('acp_label_loan_duration'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.loan_duration()'
-               },
-               {
-                       'id' : 'circ_lib', 'label' : getString('acp_label_circ_lib'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.circ_lib()'
-               },
-               {
-                       'id' : 'fine_level', 'label' : getString('acp_label_fine_level'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.fine_level()'
-               },
-               {
-                       'id' : 'deposit', 'label' : getString('acp_label_deposit'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.deposit()'
-               },
-               {
-                       'id' : 'deposit_amount', 'label' : getString('acp_label_deposit_amount'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.deposit_amount()'
-               },
-               {
-                       'id' : 'price', 'label' : getString('acp_label_price'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.price()'
-               },
-               {
-                       'id' : 'circ_as_type', 'label' : getString('acp_label_circ_as_type'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.circ_as_type()'
-               },
-               {
-                       'id' : 'circ_modifier', 'label' : getString('acp_label_circ_modifier'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.circ_modifier()'
-               },
-               {
-                       'id' : 'xact_start', 'label' : getString('circ_label_xact_start'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'circ', 'fm_field_render' : '.xact_start()'
-               },
-               {
-                       'id' : 'xact_finish', 'label' : getString('circ_label_xact_finish'), 'flex' : 1,
-                       'primary' : false, 'hidden' : true, 'fm_class' : 'circ', 'fm_field_render' : '.xact_finish()'
-               },
-               {
-                       'id' : 'renewal_remaining', 'label' : getString('circ_label_renewal_remaining'), 'flex' : 1,
-                       'primary' : false, 'hidden' : false, 'fm_class' : 'circ', 'fm_field_render' : '.renewal_remaining()'
-               },
-               {
-                       'id' : 'due_date', 'label' : getString('circ_label_due_date'), 'flex' : 1,
-                       'primary' : false, 'hidden' : false, 'fm_class' : 'circ', 'fm_field_render' : '.due_date()'
-               },
-               {
-                       'id' : 'title', 'label' : getString('mvr_label_title'), 'flex' : 1,
-                       'primary' : false, 'hidden' : false, 'fm_class' : 'mvr', 'fm_field_render' : '.title()'
-               },
-               {
-                       'id' : 'author', 'label' : getString('mvr_label_author'), 'flex' : 1,
-                       'primary' : false, 'hidden' : false, 'fm_class' : 'mvr', 'fm_field_render' : '.author()'
-               }
-               
-       ]
-};
-
-

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.xul b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.xul
deleted file mode 100644 (file)
index 9dc5b11..0000000
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree.xul
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!-- Clamlication: Evergreen Staff Client -->
-
-<!-- Localization -->
-<!DOCTYPE page SYSTEM "chrome://evergreen/locale/circ_tree.dtd">
-
-<page id="circ_tree_win"
-       orient="vertical" style="overflow: auto" width="800" height="500"
-       sizemode="maximized" persist="width height" 
-       onload="params.w = window; params.paged_tree = 'CircTree_pagedtree'; params.app = 'CircTree'; mw.OpenILS_init(params);"
-       onunload="mw.OpenILS_exit(params);"
-       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-       <script>mw.sdump('D_TRACE','Loading circ_tree.xul\n');</script>
-
-       <!-- Stylesheets -->
-       <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-       <?xml-stylesheet href="chrome://evergreen/skin/evergreen.css" type="text/css"?>
-       <?xml-stylesheet href="chrome://evergreen/skin/circ_tree.css" type="text/css"?>
-       
-       <!-- Overlays for this XUL file -->
-       <?xul-overlay href="chrome://evergreen/content/circ/circ_tree_overlay.xul"?>
-
-       <!-- XUL'ified abstraction for logic to attach to widgets -->
-       <commandset id="universal_cmds" />
-
-       <!-- Accelerator Keys (Accessor Keys are in DTD's) -->
-       <keyset id="CircTree_keys" />
-
-       <!-- Layout to be filled in by overlays and javascript -->
-       <box id="CircTree_main" />
-
-       <popupset id="universal_popupset" />
-
-</page>
-

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree_overlay.xul
deleted file mode 100644 (file)
index a1fe234..0000000
--- a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_tree_overlay.xul
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE overlay SYSTEM "chrome://evergreen/locale/circ_tree.dtd">
-<overlay id="circ_tree_overlay" 
-       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-       <script>mw.sdump('D_TRACE','Loading circ_tree_overlay.xul\n');</script>
-
-<commandset id="universal_cmds">
-
-       <command id="cmd_broken" oncommand="
-               alert('Not Yet Implemented'); "/>
-
-</commandset>
-
-<!-- main widget for circ_tree -->
-<box id="CircTree_main" flex="1" orient="horizontal">
-       <box id="CircTree_pagedtree" flex="1" orient="horizontal"/>
-</box>
-
-<!-- Accelerator Keys (Accessor Keys are in DTD's) -->
-<keyset id="CircTree_keys">
-</keyset>
-
-</overlay>

diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
new file mode 100644 (file)
index 0000000..fda43fd
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/circ/circ_utils.js
@@ -0,0 +1,102 @@
+sdump('D_TRACE','Loading circ_tree.js\n');
+
+function checkin_by_copy_barcode(barcode) {
+       sdump('D_CIRC_UTILS',arg_dump(arguments,{0:true}));
+       try {
+               var check = user_request(
+                       'open-ils.circ',
+                       'open-ils.circ.checkin.barcode',
+                       [ mw.G.auth_ses[0], barcode ]
+               )[0];
+               sdump('D_CIRC_UTILS','check = ' + check + '\n');
+               return check;
+       } catch(E) {
+               sdump('D_ERROR',E);
+               return null;
+       }
+}
+
+
+function circ_cols() {
+       return  [
+               {
+                       'id' : 'barcode', 'label' : getString('acp_label_barcode'), 'flex' : 1,
+                       'primary' : true, 'hidden' : false, 'fm_class' : 'acp', 'fm_field_render' : '.barcode()'
+               },
+               {
+                       'id' : 'call_number', 'label' : getString('acp_label_call_number'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.call_number()'
+               },
+               {
+                       'id' : 'copy_number', 'label' : getString('acp_label_copy_number'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.copy_number()'
+               },
+               {
+                       'id' : 'status', 'label' : getString('acp_label_status'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.status()'
+               },
+               {
+                       'id' : 'location', 'label' : getString('acp_label_location'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.location()'
+               },
+               {
+                       'id' : 'loan_duration', 'label' : getString('acp_label_loan_duration'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.loan_duration()'
+               },
+               {
+                       'id' : 'circ_lib', 'label' : getString('acp_label_circ_lib'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.circ_lib()'
+               },
+               {
+                       'id' : 'fine_level', 'label' : getString('acp_label_fine_level'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.fine_level()'
+               },
+               {
+                       'id' : 'deposit', 'label' : getString('acp_label_deposit'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.deposit()'
+               },
+               {
+                       'id' : 'deposit_amount', 'label' : getString('acp_label_deposit_amount'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.deposit_amount()'
+               },
+               {
+                       'id' : 'price', 'label' : getString('acp_label_price'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.price()'
+               },
+               {
+                       'id' : 'circ_as_type', 'label' : getString('acp_label_circ_as_type'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.circ_as_type()'
+               },
+               {
+                       'id' : 'circ_modifier', 'label' : getString('acp_label_circ_modifier'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'acp', 'fm_field_render' : '.circ_modifier()'
+               },
+               {
+                       'id' : 'xact_start', 'label' : getString('circ_label_xact_start'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'circ', 'fm_field_render' : '.xact_start()'
+               },
+               {
+                       'id' : 'xact_finish', 'label' : getString('circ_label_xact_finish'), 'flex' : 1,
+                       'primary' : false, 'hidden' : true, 'fm_class' : 'circ', 'fm_field_render' : '.xact_finish()'
+               },
+               {
+                       'id' : 'renewal_remaining', 'label' : getString('circ_label_renewal_remaining'), 'flex' : 1,
+                       'primary' : false, 'hidden' : false, 'fm_class' : 'circ', 'fm_field_render' : '.renewal_remaining()'
+               },
+               {
+                       'id' : 'due_date', 'label' : getString('circ_label_due_date'), 'flex' : 1,
+                       'primary' : false, 'hidden' : false, 'fm_class' : 'circ', 'fm_field_render' : '.due_date()'
+               },
+               {
+                       'id' : 'title', 'label' : getString('mvr_label_title'), 'flex' : 1,
+                       'primary' : false, 'hidden' : false, 'fm_class' : 'mvr', 'fm_field_render' : '.title()'
+               },
+               {
+                       'id' : 'author', 'label' : getString('mvr_label_author'), 'flex' : 1,
+                       'primary' : false, 'hidden' : false, 'fm_class' : 'mvr', 'fm_field_render' : '.author()'
+               }
+               
+       ]
+};
+
+