[open-ils-commits] r17229 - in trunk/Open-ILS/xul/staff_client/server: circ patron (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2010-08-16 14:44:08 -0400 (Mon, 16 Aug 2010)
New Revision: 17229

Modified:
   trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js
   trunk/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
   trunk/Open-ILS/xul/staff_client/server/patron/items.js
   trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
Log:
ui.circ.suppress_checkin_popups disables dialog prompts during check-in, but in the case print slip dialogs, it should still print the slips if the Auto-Print Hold and Transit Slips checkbox is toggled on (the action is still occuring).  However, only the dedicated Check-In interface had such a checkbox, and if you were to check-in from Item Status or Items Out with that org unit setting active, you'd have no option to print any slips associated with the check-in.  This fixes all that


Modified: trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js	2010-08-16 17:41:54 UTC (rev 17228)
+++ trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js	2010-08-16 18:44:08 UTC (rev 17229)
@@ -246,10 +246,17 @@
                         function() {
                             try {
                                 var funcs = [];
+                                var auto_print = document.getElementById('checkin_auto_print_slips');
+                                if (auto_print) auto_print = auto_print.getAttribute('checked') == 'true';
                                 JSAN.use('circ.util');
                                 for (var i = 0; i < obj.selection_list.length; i++) {
                                     var barcode = obj.selection_list[i].barcode;
-                                    var checkin = circ.util.checkin_via_barcode( ses(), { 'barcode' : barcode } );
+                                    var checkin = circ.util.checkin_via_barcode(
+                                        ses(),
+                                        { 'barcode' : barcode },
+                                        false /* backdate */,
+                                        auto_print
+                                    );
                                     funcs.push( function(a) { return function() { obj.copy_status( a, true ); }; }(barcode) );
                                 }
                                 for (var i = 0; i < funcs.length; i++) { funcs[i](); }

Modified: trunk/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul	2010-08-16 17:41:54 UTC (rev 17228)
+++ trunk/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul	2010-08-16 18:44:08 UTC (rev 17229)
@@ -192,6 +192,9 @@
     <checkbox id="trim_list" label="&staff.circ.copy_status_overlay.trim_list.label;" checked="true" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" />
     <checkbox id="strict_barcode" label="&staff.circ.copy_status_overlay.strict_barcode.label;" checked="false" oils_persist="checked" oncommand="try{this.setAttribute('checked',this.checked);}catch(E){alert(E);}" /> 
     <spacer flex="1"/>
+    <checkbox id="checkin_auto_print_slips" oils_persist="checked" 
+        label="&staff.circ.checkin_overlay.checkin_auto_print_slips.label;"
+        accesskey="&staff.circ.checkin_overlay.checkin_auto_print_slips.accesskey;"/>
 </hbox>
 
 </overlay>

Modified: trunk/Open-ILS/xul/staff_client/server/patron/items.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/items.js	2010-08-16 17:41:54 UTC (rev 17228)
+++ trunk/Open-ILS/xul/staff_client/server/patron/items.js	2010-08-16 18:44:08 UTC (rev 17229)
@@ -548,12 +548,17 @@
             }
             var r = window.confirm(msg);
             if (!r) { return; }
+            var auto_print = document.getElementById('checkin_auto_print_slips');
+            if (auto_print) auto_print = auto_print.getAttribute('checked') == 'true';
             JSAN.use('circ.util');
             for (var i = 0; i < retrieve_ids.length; i++) {
                 var copy_id = retrieve_ids[i].copy_id;
                 dump('Check in copy_id = ' + copy_id + ' barcode = ' + retrieve_ids[i].barcode + '\n');
                 var robj = circ.util.checkin_via_barcode(
-                    ses(), { 'copy_id' : copy_id }
+                    ses(),
+                    { 'copy_id' : copy_id },
+                    false /* backdate */,
+                    auto_print
                 );
                 /* circ.util.checkin_via_barcode handles errors currently */
             }

Modified: trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul	2010-08-16 17:41:54 UTC (rev 17228)
+++ trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul	2010-08-16 18:44:08 UTC (rev 17229)
@@ -180,6 +180,9 @@
 <hbox id="items_bottom_ui" flex="1">
     <button id="noncat" label="&staff.patron.items_overlay.show_noncats.label;" command="cmd_show_noncats" accesskey="&staff.patron.items_overlay.show_noncats.accesskey;"/>
     <spacer flex="1"/>
+    <checkbox id="checkin_auto_print_slips" oils_persist="checked" 
+        label="&staff.circ.checkin_overlay.checkin_auto_print_slips.label;"
+        accesskey="&staff.circ.checkin_overlay.checkin_auto_print_slips.accesskey;"/>
     <button id="items_print" label="&staff.patron_display.items.print_receipt.label;" command="cmd_items_print" accesskey="&staff.patron_display.items.print_receipt.accesskey;" />
     <button id="items_export" label="&staff.patron.items_overlay.items_export.label;" command="cmd_items_export" accesskey=""/>
 </hbox>