From 073b2357aaef2cb3d45ba7da59c45aefad661530 Mon Sep 17 00:00:00 2001 From: phasefx Date: Fri, 15 Jul 2005 21:07:10 +0000 Subject: [PATCH] checkin, maybe git-svn-id: svn://svn.open-ils.org/ILS/trunk@1223 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Evergreen/staff_client/Makefile | 7 +- .../chrome/content/evergreen/Open-ILS/OpenILS.js | 14 +-- .../evergreen/Open-ILS/OpenILS_scripts_overlay.xul | 6 +- .../chrome/content/evergreen/circ/checkin.js | 129 +++++++++++++++++++++ .../chrome/content/evergreen/circ/checkin.xul | 44 +++++++ .../chrome/content/evergreen/circ/checkin_items.js | 64 ++++++++++ .../content/evergreen/circ/checkin_overlay.xul | 47 ++++++++ .../chrome/content/evergreen/util/error.js | 5 +- .../staff_client/chrome/skin/evergreen/checkin.css | 3 + 9 files changed, 301 insertions(+), 18 deletions(-) create mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/checkin.js create mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/checkin.xul create mode 100644 Evergreen/staff_client/chrome/content/evergreen/circ/checkin_items.js create mode 100755 Evergreen/staff_client/chrome/content/evergreen/circ/checkin_overlay.xul create mode 100644 Evergreen/staff_client/chrome/skin/evergreen/checkin.css diff --git a/Evergreen/staff_client/Makefile b/Evergreen/staff_client/Makefile index b22d1d4b2e..ed79ec65dc 100644 --- a/Evergreen/staff_client/Makefile +++ b/Evergreen/staff_client/Makefile @@ -30,12 +30,16 @@ patron: (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_search_results.dtd) (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/patron_checkout_items.dtd) +circ: + (cat chrome/content/evergreen/main/paged_tree_overlay.xul | sed s/paged_tree/checkin_items/g | sed s/PagedTree/CheckinItems/g > chrome/content/evergreen/circ/checkin_items_overlay.xul ) + (cp chrome/locale/en-US/evergreen/paged_tree.dtd chrome/locale/en-US/evergreen/checkin_items.dtd) + evergreen.xpi: evergreen.jar @echo @echo make the xpi file zip -r evergreen.xpi chrome/ defaults/ install.js install.rdf Makefile LICENSE README -x \*CVS\* > /dev/null -evergreen.jar: generated open-ils patron +evergreen.jar: generated open-ils patron circ @echo @echo make the jar file (cd chrome; zip -r evergreen.jar content/ locale/ skin/ -x \*CVS\* > /dev/null ) @@ -48,6 +52,7 @@ clean: rm -f chrome/content/evergreen/patron/patron_items_overlay.xul chrome/locale/en-US/evergreen/patron_items.dtd rm -f chrome/content/evergreen/patron/patron_search_results_overlay.xul chrome/locale/en-US/evergreen/patron_search_results.dtd rm -f chrome/content/evergreen/patron/patron_checkout_items_overlay.xul chrome/locale/en-US/evergreen/patron_checkout_items.dtd + rm -f chrome/content/evergreen/circ/checkin_items_overlay.xul chrome/locale/en-US/evergreen/checkin_items.dtd rm -f chrome/content/evergreen/conf/client_config.xml rm -f chrome/content/evergreen/util/fieldmapper.js rm -f chrome/content/evergreen/util/OrgTree.js 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 e88a62b0c0..3d3daa9b7e 100644 --- a/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js +++ b/Evergreen/staff_client/chrome/content/evergreen/Open-ILS/OpenILS.js @@ -10,13 +10,8 @@ function OpenILS_init(params) { case 'PagedTree' : paged_tree_init(params); break; case 'Opac' : opac_init(params); break; case 'PatronSearch' : patron_search_init(params); break; - case 'PatronSearchForm' : patron_search_form_init(params); break; - case 'PatronSearchResults' : patron_search_results_init(params); break; case 'PatronDisplay' : patron_display_init(params); break; - case 'PatronDisplayStatus' : patron_display_status_init(params); break; - case 'PatronDisplayContact' : patron_display_contact_init(params); break; - case 'PatronItems' : patron_items_init(params); break; - case 'PatronCheckoutItems' : patron_checkout_items_init(params); break; + case 'Checkin' : checkin_init(params); break; } } catch(E) { sdump('D_ERROR',js2JSON(E)+'\n'); } @@ -43,13 +38,8 @@ function OpenILS_exit(params) { case 'PagedTree' : paged_tree_exit(params); break; case 'Opac' : opac_exit(params); break; case 'PatronSearch' : patron_search_exit(params); break; - case 'PatronSearchForm' : patron_search_form_exit(params); break; - case 'PatronSearchResults' : patron_search_results_exit(params); break; case 'PatronDisplay' : patron_display_exit(params); break; - case 'PatronDisplayStatus' : patron_display_status_exit(params); break; - case 'PatronDisplayContact' : patron_display_contact_exit(params); break; - case 'PatronItems' : patron_items_exit(params); break; - case 'PatronCheckoutItems' : patron_checkout_items_exit(params); break; + case 'Checkin' : checkin_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 1cfb5860f0..96ee8688a3 100644 --- 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 @@ -16,13 +16,11 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/checkin_items.js b/Evergreen/staff_client/chrome/content/evergreen/circ/checkin_items.js new file mode 100644 index 0000000000..dd3e98c27a --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/circ/checkin_items.js @@ -0,0 +1,64 @@ +sdump('D_TRACE','Loading checkin_items.js\n'); + +function checkin_items_init(p) { + sdump('D_CHECKIN_ITEMS',"TESTING: checkin_items.js: " + mw.G['main_test_variable'] + '\n'); + sdump('D_CONSTRUCTOR',arg_dump(arguments)); + + p.checkin_items_cols = circ_cols(); + + p.paged_tree = paged_tree_init( { 'w' : p.w, 'node' : p.node, 'popupset_node' : p.popupset_node, 'cols' : p.checkin_items_cols, 'hide_nav' : true, 'hits_per_page' : '9999', 'debug' : p.app } ); + p.add_checkout_items = p.paged_tree.add_rows; + p.clear_checkout_items = p.paged_tree.clear_tree; + + p.register_checkin_items_select_callback = function (f) { + sdump('D_CHECKIN_ITEMS','p.register_checkin_items_select_callback(' + f + ')\n'); + p.paged_tree.register_select_callback( f ); + } + + p.register_flesh_checkin_items_function = function (f) { + sdump('D_CHECKIN_ITEMS','p.register_flesh_checkin_items_function(' + f + ')\n'); + p.paged_tree.register_flesh_row_function( f ); + } + + p.register_context_builder = function (f) { + sdump('D_CHECKIN_ITEMS','p.register_context_builder(' + f + ')\n'); + p.paged_tree.register_context_builder( f ); + } + + p.map_checkin_items_to_cols = function (checkin_items, treeitem) { + sdump('D_CHECKIN_ITEMS','p.map_checkin_items_to_cols( ' + checkin_items + ',' + treeitem + ')\n'); + checkin_items_tree_map_checkin_items_to_cols(p, checkin_items, treeitem); + } + + sdump('D_TRACE_EXIT',arg_dump(arguments)); + return p; +} + +function checkin_items_tree_map_checkin_items_to_cols(p, checkin_items, treeitem) { + sdump('D_CHECKIN_ITEMS',arg_dump(arguments,{1:true})); + sdump('D_TRACE_ENTER',arg_dump(arguments)); + var cols = new Array(); + for (var i = 0; i < p.checkin_items_cols.length; i++) { + var hash = p.checkin_items_cols[i]; + sdump('D_CHECKIN_ITEMS','Considering ' + js2JSON(hash) + '\n'); + var obj_string; + switch( hash.fm_class ) { + case 'acp' : obj_string = 'checkin_items.copy'; break; + case 'circ' : obj_string = 'checkin_items.circ'; break; + case 'mvr' : obj_string = 'checkin_items.record'; break; + } + var cmd = parse_render_string( obj_string, hash.fm_field_render ); + sdump('D_CHECKIN_ITEMS','cmd = ' + cmd + '\n'); + var col = ''; + try { + col = eval( cmd ); + sdump('D_CHECKIN_ITEMS','eval = ' + col + '\n'); + } catch(E) { + sdump('D_ERROR',js2JSON(E) + '\n'); + } + cols.push( col ); + } + sdump('D_CHECKIN_ITEMS','cols = ' + js2JSON(cols) + '\n'); + p.paged_tree.map_cols_to_treeitem( cols, treeitem ); + sdump('D_TRACE_EXIT',arg_dump(arguments)); +} diff --git a/Evergreen/staff_client/chrome/content/evergreen/circ/checkin_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/circ/checkin_overlay.xul new file mode 100755 index 0000000000..e3eb97d4b3 --- /dev/null +++ b/Evergreen/staff_client/chrome/content/evergreen/circ/checkin_overlay.xul @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +