patron search

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

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
index 8e7b334..3e86214 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
@@ -26,7 +26,7 @@
                mw.spawn_check_out(document,'replace_tab','main_tabbox',{}); "/>        
 
        <command id="cmd_circ_search" oncommand="
-               mw.spawn_circ_search(document,'replace_tab','main_tabbox',{}); "/>      
+               mw.spawn_patron_search(document,'replace_tab','main_tabbox',{}); "/>    
 
        <command id="cmd_circ_display" oncommand="
                mw.spawn_circ_display(document,'replace_tab','main_tabbox',{}); "/>

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
new file mode 100644 (file)
index 0000000..7184501
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.js
@@ -0,0 +1,32 @@
+sdump('D_TRACE','Loading patron_search.js\n');
+
+var test_variable = false;
+
+function patron_search_init(p) {
+       dump("TESTING: patron_search.js: " + mw.G['main_test_variable'] + '\n');
+
+       var clamshell = spawn_clamshell( 
+               p.w.document, 'new_iframe', p.clamshell, {
+
+                       'onload' : function (w) {
+                               var form = spawn_patron_search_form(
+                                       w.document, 
+                                       'new_iframe', 
+                                       w.first_deck, {
+                                               'onload' : function(w2) {
+                                                       w2.register_search_callback(
+                                                               function (ev) {
+                                                                       alert('Submitted: ' + 
+                                                                               js2JSON(form.crazy_search_hash) + '\n');
+                                                                       test_variable = true; });
+
+                                                       w.new_card_in_second_deck(
+                                                               'chrome://evergreen/content/main/about.xul', {}); 
+                                               }
+                                       }
+                               );
+       
+                       }
+               }
+       );
+}

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul
new file mode 100644 (file)
index 0000000..2c43672
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search.xul
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!-- Clamlication: Evergreen Staff Client -->
+
+<!-- Localization -->
+<!DOCTYPE page SYSTEM "chrome://evergreen/locale/patron_search.dtd">
+
+<page id="patron_search_win"
+       orient="vertical" style="overflow: auto" width="800" height="500"
+       sizemode="maximized" persist="width height" 
+       onload="params.clamshell = 'PatronSearch_clamshell'; params.w = window; params.app = 'PatronSearch'; mw.OpenILS_init(params);"
+       onunload="mw.OpenILS_exit(params);"
+       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+       <!-- 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/patron_search.css" type="text/css"?>
+       
+       <!-- Overlays for this XUL file -->
+       <?xul-overlay href="chrome://evergreen/content/patron/patron_search_overlay.xul"?>
+
+       <!-- XUL'ified abstraction for logic to attach to widgets -->
+       <commandset id="PatronSearch_cmds" />
+
+       <!-- Accelerator Keys (Accessor Keys are in DTD's) -->
+       <keyset id="PatronSearch_keys" />
+
+       <!-- Layout to be filled in by overlays and javascript -->
+       <box id="PatronSearch_main" />
+
+</page>
+

diff --git a/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul
new file mode 100644 (file)
index 0000000..16b5874
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/patron/patron_search_overlay.xul
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE overlay SYSTEM "chrome://evergreen/locale/patron_search.dtd">
+<overlay id="patron_search_overlay" 
+       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<commandset id="PatronSearch_cmds">
+
+       <command id="cmd_broken" oncommand="
+               alert('Not Yet Implemented'); "/>
+
+</commandset>
+
+<!-- main widget for patron_search -->
+<box id="PatronSearch_main" flex="1" orient="vertical">
+       <box id="PatronSearch_clamshell" flex="1" orient="horizontal"/>
+</box>
+
+<!-- Accelerator Keys (Accessor Keys are in DTD's) -->
+<keyset id="PatronSearch_keys">
+</keyset>
+
+</overlay>

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/error.js b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
index 0e20b4a..5debb90 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/error.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/error.js
@@ -6,19 +6,20 @@ var sdump_levels = {
        'D_UTIL' : false,
        'D_EXPLODE' : false,
        'D_PRINT' : false,
-       'D_SES' : true,
+       'D_SES' : false,
        'D_SPAWN' : true,
-       'D_TAB' : true,
+       'D_TAB' : false,
        'D_OPAC' : true,
-       'D_STRING' : true,
-       'D_WIN' : true,
+       'D_STRING' : false,
+       'D_WIN' : false,
+       'D_PATRON_SEARCH' : true,
        'D_PATRON_SEARCH_FORM' : true
 };
 
 function sdump(level,msg) {
        try {
                if (sdump_levels[level])
-                       debug(msg);
+                       debug(level + ': ' + msg);
        } catch(E) {}
 }
 
@@ -35,7 +36,7 @@ function arg_dump(args,dump_these) {
                        if (dump_these[i]) {
 
                                var arg = args[i];
-                               dump('dump_these[i] = ' + dump_these[i] + '  arg = ' + arg + '\n');
+                               //dump('dump_these[i] = ' + dump_these[i] + '  arg = ' + arg + '\n');
 
                                if (typeof(dump_these[i])=='string') {
 

diff --git a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
index 7373c2e..5a003cb 100644 (file)
--- a/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
+++ b/Evergreen/staff_client/chrome/content/evergreen/util/spawn_win.js
@@ -26,6 +26,7 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params) {
                case 'new_editor' :
                        var el = placement.slice(4);
                        var frame = d.createElement( el );
+                       frame.setAttribute('flex','1');
                        get_widget( d, place ).appendChild( frame );
                        w = spawn_interface(d,'set_frame',frame,chrome,label,passthru_params); break;
 
@@ -42,42 +43,47 @@ function spawn_interface(d,placement,place,chrome,label,passthru_params) {
 
 function spawn_batch_copy_editor(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/cat/copy_edit.xul';
-       spawn_interface(d,placement,place,chrome,getString('copies_editor_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('copies_editor_interface_label'),passthru_params);
 }
 
 function spawn_bill_pay(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/bill/bill.xul';
-       spawn_interface(d,placement,place,chrome,getString('bills_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('bills_interface_label'),passthru_params);
 }
 
 function spawn_check_in(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/circ/checkin.xul';
-       spawn_interface(d,placement,place,chrome,getString('checkin_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('checkin_interface_label'),passthru_params);
 }
 
 function spawn_check_out(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/circ/checkout.xul';
-       spawn_interface(d,placement,place,chrome,getString('checkout_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('checkout_interface_label'),passthru_params);
 }
 
 function spawn_circ_display(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/circ/circ_deck_patron.xul';
-       spawn_interface(d,placement,place,chrome,getString('display_patron_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('display_patron_interface_label'),passthru_params);
 }
 
 function spawn_circ_list(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/circ/circ_list.xul';
-       spawn_interface(d,placement,place,chrome,getString('items_out_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('items_out_interface_label'),passthru_params);
 }
 
 function spawn_circ_search(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/circ/circ_deck_search.xul';
-       spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params);
+}
+
+function spawn_clamshell(d,placement,place,passthru_params) {
+       var chrome = 'chrome://evergreen/content/main/clam_shell.xul';
+       return spawn_interface(d,placement,place,chrome,'clamshell',passthru_params);
 }
 
 function spawn_copy_browser(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/cat/browse_list.xul';
-       spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('copy_browser_interface_label'),passthru_params);
 }
 
 function spawn_main() {
@@ -101,13 +107,13 @@ function spawn_main() {
 
 function spawn_marc_editor(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/cat/marc.xul';
-       spawn_interface(d,placement,place,chrome,getString('marc_editor_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('marc_editor_interface_label'),passthru_params);
 }
 
 function spawn_opac_navigator(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/opac/opac.xul';
        //var chrome = 'http://google.com/';
-       spawn_interface(d,placement,place,chrome,getString('opac_navigator_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('opac_navigator_interface_label'),passthru_params);
 }
 
 function spawn_oclc_import(d,placement,place,params) {
@@ -139,47 +145,56 @@ function spawn_oclc_import(d,placement,place,params) {
 
 function spawn_patron_edit(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/patron/patron_edit.xul';
-       spawn_interface(d,placement,place,chrome,getString('patron_editor_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('patron_editor_interface_label'),passthru_params);
 }
 
 function spawn_patron_register(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/patron/patron_new.xul';
-       spawn_interface(d,placement,place,chrome,getString('patron_register_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('patron_register_interface_label'),passthru_params);
 }
 
+function spawn_patron_search(d,placement,place,passthru_params) {
+       var chrome = 'chrome://evergreen/content/patron/patron_search.xul';
+       return spawn_interface(d,placement,place,chrome,getString('patron_interface_label'),passthru_params);
+}
+
+function spawn_patron_search_form(d,placement,place,passthru_params) {
+       var chrome = 'chrome://evergreen/content/patron/patron_search_form.xul';
+       return spawn_interface(d,placement,place,chrome,getString('patron_search_interface_label'),passthru_params);
+}
 
 function spawn_copy_stat_cat_edit(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/stat_cat/copy_stat_cat_editor.xul';
-       spawn_interface(d,placement,place,chrome,getString('copy_stat_cat_editor_interface'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('copy_stat_cat_editor_interface'),passthru_params);
 }
 
 function spawn_patron_stat_cat_edit(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/stat_cat/patron_stat_cat_editor.xul';
-       spawn_interface(d,placement,place,chrome,getString('patron_stat_cat_editor_interface'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('patron_stat_cat_editor_interface'),passthru_params);
 }
 
 function spawn_survey_admin_wizard(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/survey/survey_wizard.xul';
-       spawn_interface(d,placement,place,chrome,getString('survey_admin_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('survey_admin_interface_label'),passthru_params);
 }
 
 
 function spawn_z3950_import(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/z39_50/z39_50.xul';
-       spawn_interface(d,placement,place,chrome,getString('z39_50_import_interface_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('z39_50_import_interface_label'),passthru_params);
 }
 
 function spawn_javascript_console(d,placement,place,passthru_params) {
        var chrome = 'chrome://global/cotnent/console.xul';
-       spawn_interface(d,placement,place,chrome,getString('javascript_console_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('javascript_console_label'),passthru_params);
 }
 
 function spawn_xuleditor(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/util/xuledit.xul';
-       spawn_interface(d,placement,place,chrome,getString('xuleditor_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('xuleditor_label'),passthru_params);
 }
 
 function spawn_javascript_shell(d,placement,place,passthru_params) {
        var chrome = 'chrome://evergreen/content/util/shell.html';
-       spawn_interface(d,placement,place,chrome,getString('javascript_shell_label'),passthru_params);
+       return spawn_interface(d,placement,place,chrome,getString('javascript_shell_label'),passthru_params);
 }

diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties
index ce2dd35..b16ec78 100644 (file)
--- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties
+++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/OpenILS.properties
@@ -10,6 +10,7 @@ opac_navigator_interface_label=CATALOG NAVIGATOR
 patron_editor_interface_label=PATRON EDIT
 patron_search_interface_label=PATRON SEARCH
 patron_register_interface_label=NEW PATRON
+patron_interface_label=PATRON 
 survey_admin_interface_label=SURVEY ADMIN
 copy_stat_cat_editor_interface_label=COPY STAT-CATS
 patron_stat_cat_editor_interface_label=PATRON STAT-CATS

diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd b/Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd
new file mode 100644 (file)
index 0000000..8b13789
--- /dev/null
+++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/patron_search.dtd
@@ -0,0 +1 @@
+

diff --git a/Evergreen/staff_client/chrome/skin/evergreen/patron_search.css b/Evergreen/staff_client/chrome/skin/evergreen/patron_search.css
new file mode 100644 (file)
index 0000000..19db78e
--- /dev/null
+++ b/Evergreen/staff_client/chrome/skin/evergreen/patron_search.css
@@ -0,0 +1,3 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); 
+@namespace html url("http://www.w3.org/TR/REC-html40"); 
+