[open-ils-commits] r14910 - in trunk/Open-ILS: web/opac/locale/en-US xul/staff_client/server/circ xul/staff_client/server/locale/en-US xul/staff_client/server/patron (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Nov 13 14:31:22 EST 2009
Author: phasefx
Date: 2009-11-13 14:31:18 -0500 (Fri, 13 Nov 2009)
New Revision: 14910
Modified:
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js
trunk/Open-ILS/xul/staff_client/server/circ/copy_status.xul
trunk/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul
trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
trunk/Open-ILS/xul/staff_client/server/patron/items.js
trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
Log:
UI entry points for Triggered Events from Item Status and Items Out
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2009-11-13 19:31:18 UTC (rev 14910)
@@ -1891,6 +1891,8 @@
<!ENTITY staff.circ.copy_status_overlay.sel_copy_details.accesskey "I">
<!ENTITY staff.circ.copy_status_overlay.sel_patron.label "Show Last Few Circulations">
<!ENTITY staff.circ.copy_status_overlay.sel_patron.accesskey "L">
+<!ENTITY staff.circ.copy_status_overlay.cmd_triggered_events.label "Show Triggered Events">
+<!ENTITY staff.circ.copy_status_overlay.cmd_triggered_events.accesskey "T">
<!ENTITY staff.circ.copy_status_overlay.sel_edit.label "Edit Item Attributes">
<!ENTITY staff.circ.copy_status_overlay.sel_edit.accesskey "E">
<!ENTITY staff.circ.copy_status_overlay.sel_mark_items_damaged.label "Mark Item Damaged">
@@ -2806,6 +2808,8 @@
<!ENTITY staff.patron.items_overlay.sel_copy_details.accesskey "I">
<!ENTITY staff.patron.items_overlay.sel_patron.label "Show Last Few Circulations">
<!ENTITY staff.patron.items_overlay.sel_patron.accesskey "L">
+<!ENTITY staff.patron.items_overlay.cmd_triggered_events.label "Show Triggered Events">
+<!ENTITY staff.patron.items_overlay.cmd_triggered_events.accesskey "T">
<!ENTITY staff.patron.items_overlay.items_edit.label "Edit Due Date">
<!ENTITY staff.patron.items_overlay.items_mark_lost.label "Mark Lost (by Patron)">
<!ENTITY staff.patron.items_overlay.items_claimed_returned.label "Mark Claimed Returned">
Modified: trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/xul/staff_client/server/circ/copy_status.js 2009-11-13 19:31:18 UTC (rev 14910)
@@ -63,6 +63,7 @@
obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true');
obj.controller.view.sel_mark_items_missing.setAttribute('disabled','true');
obj.controller.view.sel_patron.setAttribute('disabled','true');
+ obj.controller.view.cmd_triggered_events.setAttribute('disabled','true');
obj.controller.view.sel_spine.setAttribute('disabled','true');
obj.controller.view.sel_transit_abort.setAttribute('disabled','true');
obj.controller.view.sel_clip.setAttribute('disabled','true');
@@ -82,6 +83,7 @@
obj.controller.view.sel_edit.setAttribute('disabled','false');
obj.controller.view.sel_opac.setAttribute('disabled','false');
obj.controller.view.sel_patron.setAttribute('disabled','false');
+ obj.controller.view.cmd_triggered_events.setAttribute('disabled','false');
obj.controller.view.sel_bucket.setAttribute('disabled','false');
obj.controller.view.sel_copy_details.setAttribute('disabled','false');
obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
@@ -162,6 +164,26 @@
}
},
],
+ 'cmd_triggered_events' : [
+ ['command'],
+ function() {
+ try {
+ for (var i = 0; i < obj.selection_list.length; i++) {
+ xulG.new_tab(
+ urls.XUL_TRIGGER_EVENTS,
+ {
+ 'tab_name' : document.getElementById('commonStrings').getFormattedString('tab.label.triggered_events_for_copy',[ obj.selection_list[i].barcode ])
+ },
+ {
+ 'copy_id' : obj.selection_list[i].copy_id
+ }
+ );
+ }
+ } catch(E) {
+ alert('Error in copy_status.js, cmd_triggered_events: ' + E);
+ }
+ }
+ ],
'sel_checkin' : [
['command'],
function() {
Modified: trunk/Open-ILS/xul/staff_client/server/circ/copy_status.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/copy_status.xul 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/xul/staff_client/server/circ/copy_status.xul 2009-11-13 19:31:18 UTC (rev 14910)
@@ -101,6 +101,7 @@
<command id="cmd_copy_status_upload_file" />
<command id="cmd_copy_status_print" />
<command id="cmd_alt_view" />
+ <command id="cmd_triggered_events" />
<command id="save_columns" />
<command id="sel_copy_details" disabled="true"/>
<command id="sel_mark_items_damaged" disabled="true"/>
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 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/xul/staff_client/server/circ/copy_status_overlay.xul 2009-11-13 19:31:18 UTC (rev 14910)
@@ -117,6 +117,7 @@
<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+ <menuitem command="cmd_triggered_events" label="&staff.circ.copy_status_overlay.cmd_triggered_events.label;" accesskey="&staff.circ.copy_status_overlay.cmd_triggered_events.accesskey;"/>
<menuseparator/>
<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
<menuitem command="cmd_transfer_items" label="&staff.circ.copy_status_overlay.cmd_transfer_items.label;" accesskey="&staff.circ.copy_status_overlay.cmd_transfer_items.accesskey;"/>
@@ -147,6 +148,7 @@
<menuitem command="sel_opac" label="&staff.circ.copy_status_overlay.sel_opac.label;" accesskey="&staff.circ.copy_status_overlay.sel_opac.accesskey;" />
<menuitem command="sel_copy_details" label="&staff.circ.copy_status_overlay.sel_copy_details.label;" accesskey="&staff.circ.copy_status_overlay.sel_copy_details.accesskey;" />
<menuitem command="sel_patron" label="&staff.circ.copy_status_overlay.sel_patron.label;" accesskey="&staff.circ.copy_status_overlay.sel_patron.accesskey;"/>
+ <menuitem command="cmd_triggered_events" label="&staff.circ.copy_status_overlay.cmd_triggered_events.label;" accesskey="&staff.circ.copy_status_overlay.cmd_triggered_events.accesskey;"/>
<menuseparator />
<menuitem command="sel_edit" label="&staff.circ.copy_status_overlay.sel_edit.label;" accesskey="&staff.circ.copy_status_overlay.sel_edit.accesskey;" />
<menuseparator />
Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/common.properties 2009-11-13 19:31:18 UTC (rev 14910)
@@ -187,4 +187,4 @@
staff.util.timestamp_dialog.future_date_disallowed=Future dates disallowed.
staff.util.timestamp_dialog.past_date_disallowed=Past dates disallowed.
staff.util.timestamp_dialog.today_disallowed=Today disallowed.
-
+tab.label.triggered_events_for_copy=Triggered Events: %1$s
Modified: trunk/Open-ILS/xul/staff_client/server/patron/items.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/items.js 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/xul/staff_client/server/patron/items.js 2009-11-13 19:31:18 UTC (rev 14910)
@@ -33,6 +33,48 @@
'sel_clip' : [ ['command'], function() { obj.list.clipboard(); } ],
'sel_clip2' : [ ['command'], function() { obj.list2.clipboard(); } ],
'sel_patron' : [ ['command'], function() { JSAN.use('circ.util'); circ.util.show_last_few_circs(obj.retrieve_ids); } ],
+ 'cmd_triggered_events' : [
+ ['command'],
+ function() {
+ try {
+ var copy_ids = util.functional.map_list( obj.retrieve_ids, function(o) { return o.copy_id; } );
+ var barcodes = util.functional.map_list( obj.retrieve_ids, function(o) { return o.barcode; } );
+ for (var i = 0; i < copy_ids.length; i++) {
+ xulG.new_tab(
+ urls.XUL_TRIGGER_EVENTS,
+ {
+ 'tab_name' : document.getElementById('commonStrings').getFormattedString('tab.label.triggered_events_for_copy',[ barcodes[i] ])
+ },
+ {
+ 'copy_id' : copy_ids[i]
+ }
+ );
+ }
+ } catch(E) {
+ alert('Error in copy_status.js, cmd_triggered_events: ' + E);
+ }
+ }
+ ],
+ 'cmd_triggered_events2' : [
+ ['command'],
+ function() {
+ try {
+ var copy_ids = util.functional.map_list( obj.retrieve_ids2, function(o) { return o.copy_id; } );
+ for (var i = 0; i < copy_ids.length; i++) {
+ xulG.new_tab(
+ urls.XUL_TRIGGER_EVENTS,
+ {},
+ {
+ 'copy_id' : copy_ids[i]
+ }
+ );
+ }
+ } catch(E) {
+ alert('Error in copy_status.js, cmd_triggered_events: ' + E);
+ }
+ }
+ ],
+
'sel_bucket' : [
['command'],
function() {
@@ -126,8 +168,10 @@
obj.controller.view.sel_bucket2.setAttribute('disabled','true');
obj.controller.view.sel_copy_details.setAttribute('disabled','true');
obj.controller.view.sel_patron.setAttribute('disabled','true');
+ obj.controller.view.cmd_triggered_events.setAttribute('disabled','true');
obj.controller.view.sel_copy_details2.setAttribute('disabled','true');
obj.controller.view.sel_patron2.setAttribute('disabled','true');
+ obj.controller.view.cmd_triggered_events2.setAttribute('disabled','true');
obj.controller.view.cmd_items_claimed_returned.setAttribute('disabled','true');
obj.controller.view.cmd_items_renew.setAttribute('disabled','true');
obj.controller.view.cmd_items_renew_with_date.setAttribute('disabled','true');
@@ -871,6 +915,7 @@
obj.controller.view.sel_copy_details.setAttribute('disabled','false');
obj.controller.view.sel_bucket.setAttribute('disabled','false');
obj.controller.view.sel_patron.setAttribute('disabled','false');
+ obj.controller.view.cmd_triggered_events.setAttribute('disabled','false');
obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','false');
obj.controller.view.sel_mark_items_missing.setAttribute('disabled','false');
@@ -893,6 +938,7 @@
obj.controller.view.sel_copy_details2.setAttribute('disabled','false');
obj.controller.view.sel_bucket2.setAttribute('disabled','false');
obj.controller.view.sel_patron2.setAttribute('disabled','false');
+ obj.controller.view.cmd_triggered_events2.setAttribute('disabled','false');
obj.controller.view.sel_mark_items_damaged2.setAttribute('disabled','false');
obj.controller.view.sel_mark_items_missing2.setAttribute('disabled','false');
Modified: trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul 2009-11-13 18:51:25 UTC (rev 14909)
+++ trunk/Open-ILS/xul/staff_client/server/patron/items_overlay.xul 2009-11-13 19:31:18 UTC (rev 14910)
@@ -13,6 +13,7 @@
<command id="sel_clip" />
<command id="sel_copy_details"/>
<command id="sel_patron"/>
+ <command id="cmd_triggered_events"/>
<command id="cmd_items_print" />
<command id="cmd_items_export" />
<command id="cmd_items_renew" />
@@ -34,6 +35,7 @@
<command id="sel_clip2" />
<command id="sel_copy_details2"/>
<command id="sel_patron2"/>
+ <command id="cmd_triggered_events2"/>
<command id="cmd_items_print2" />
<command id="cmd_items_export2" />
<command id="cmd_items_renew2" />
@@ -57,6 +59,7 @@
<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
<menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
<menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+ <menuitem command="cmd_triggered_events" label="&staff.patron.items_overlay.cmd_triggered_events.label;" accesskey="&staff.patron.items_overlay.cmd_triggered_events.accesskey;"/>
<menuseparator />
<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
@@ -75,6 +78,7 @@
<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
<menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
<menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+ <menuitem command="cmd_triggered_events2" label="&staff.patron.items_overlay.cmd_triggered_events.label;" accesskey="&staff.patron.items_overlay.cmd_triggered_events.accesskey;"/>
<menuseparator />
<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
@@ -129,6 +133,7 @@
<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog" />
<menuitem command="sel_copy_details" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
<menuitem command="sel_patron" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+ <menuitem command="cmd_triggered_events" label="&staff.patron.items_overlay.cmd_triggered_events.label;" accesskey="&staff.patron.items_overlay.cmd_triggered_events.accesskey;"/>
<menuseparator />
<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit" />
<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost" />
@@ -155,6 +160,7 @@
<menuitem label="&staff.patron.items_overlay.show_catalog.label;" command="cmd_show_catalog2" />
<menuitem command="sel_copy_details2" label="&staff.patron.items_overlay.sel_copy_details.label;" accesskey="&staff.patron.items_overlay.sel_copy_details.accesskey;" />
<menuitem command="sel_patron2" label="&staff.patron.items_overlay.sel_patron.label;" accesskey="&staff.patron.items_overlay.sel_patron.accesskey;"/>
+ <menuitem command="cmd_triggered_events2" label="&staff.patron.items_overlay.cmd_triggered_events.label;" accesskey="&staff.patron.items_overlay.cmd_triggered_events.accesskey;"/>
<menuseparator />
<menuitem label="&staff.patron.items_overlay.items_edit.label;" command="cmd_items_edit2" />
<menuitem label="&staff.patron.items_overlay.items_mark_lost.label;" command="cmd_items_mark_lost2" />
More information about the open-ils-commits
mailing list