[open-ils-commits] r15732 - in trunk/Open-ILS: web/js/ui/default/acq/common web/opac/locale/en-US xul/staff_client/chrome/content/main xul/staff_client/chrome/content/util xul/staff_client/chrome/locale/en-US xul/staff_client/server/cat xul/staff_client/server/locale/en-US (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Mar 8 10:31:06 EST 2010
Author: phasefx
Date: 2010-03-08 10:31:03 -0500 (Mon, 08 Mar 2010)
New Revision: 15732
Modified:
trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js
trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js
trunk/Open-ILS/xul/staff_client/server/cat/copy_editor.js
trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
Log:
Batch barcode editing and copy (item attribute) editor tweaks. A few things here, and I apologize for not cherry-picking into separate commits:
* Modified the volume/copy creator to serve double-duty as an existing copy rebarcoder UI. This also gets us closer to being able to shove in existing pre-cats as an alternative cataloging workflow to transfering pre-cats to
targeted volumes.
* Tested this out as a Replace Barcode replacement in Holdings Maintenance, but the real motivator was for the Update Barcodes link for lineitems in acquisitions.
* The volume/copy interface now has two options, the new one bypasses the item attribute editor and creates or modifies the items instantly.
* Button labeling tweaks in the item attribute editor.
* Allow folks to change the item status for new copies. I can't recall the rationale for disallowing this in the first place, but I've heard enough arguments asking for us to allow this. If need be, we can wrap it in a perm if
folks do want to lock it down . We may also want to implement an org setting at some point for configuring the default status.
TODO: Replace "Replace Barcode" with this in Item Status UI
TODO: Allow batch call number editing. There's an existing UI for this, but we need something in the context of acquisitions for taking care of those autogenerated call numbers and barcodes in one shot.
Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-03-08 15:31:03 UTC (rev 15732)
@@ -323,7 +323,7 @@
// test should be "if 1 or more real (acp) copies exist
openils.Util.show(real_copies_link);
real_copies_link.onclick = function() {
- self.showRealCopies(li);
+ self.showRealCopyEditUI(li);
}
return;
}
@@ -1762,6 +1762,60 @@
);
}
+ this.showRealCopyEditUI = function(li) {
+ copyList = [];
+ var self = this;
+ this.volCache = {};
+
+ this._fetchLineitem(li.id(),
+ function(fullLi) {
+ li = self.liCache[li.id()] = fullLi;
+
+ self.pcrud.search(
+ 'acp', {
+ id : li.lineitem_details().map(
+ function(item) { return item.eg_copy_id() }
+ )
+ }, {
+ async : true,
+ oncomplete : function(r) {
+ try {
+ var r_list = openils.Util.readResponse( r );
+ for (var i = 0; i < r_list.length; i++) {
+ var copy = r_list[i];
+ var volId = copy.call_number();
+ var volume = self.volCache[volId];
+ if(!volume) {
+ volume = self.volCache[volId] = self.pcrud.retrieve('acn', volId);
+ }
+ copy.call_number(volume);
+ copyList.push(copy);
+ }
+ if (xulG) {
+ // If we need to, we can pass in an update_copy function to handle the update instead of volume_item_creator
+ xulG.volume_item_creator( { 'existing_copies' : copyList } );
+ }
+ } catch(E) {
+ alert('error in oncomplete: ' + E);
+ }
+ }
+ }
+ );
+ }
+ );
+ }
+
+
+ /*
+ this.saveRealCopies = function() {
+ progressDialog.show(true);
+ var list = this.realCopyList.filter(function(copy) { return copy.ischanged(); });
+ this.pcrud.update(list, {oncomplete: function() {
+ progressDialog.hide();
+ self.show('list');
+ }});
+ }
+
// grab the li-details for this lineitem, grab the linked copies and volumes, add them to the table
this.showRealCopies = function(li) {
while(this.realCopiesTbody.childNodes[0])
@@ -1861,13 +1915,6 @@
this.realCopiesTbody.appendChild(row);
if(selectNode) selectNode.select();
};
+ */
- this.saveRealCopies = function() {
- progressDialog.show(true);
- var list = this.realCopyList.filter(function(copy) { return copy.ischanged(); });
- this.pcrud.update(list, {oncomplete: function() {
- progressDialog.hide();
- self.show('list');
- }});
- }
}
Modified: trunk/Open-ILS/web/opac/locale/en-US/lang.dtd
===================================================================
--- trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/web/opac/locale/en-US/lang.dtd 2010-03-08 15:31:03 UTC (rev 15732)
@@ -2509,8 +2509,6 @@
<!ENTITY staff.cat.volume_copy_creator.check_barcodes.accesskey "B">
<!ENTITY staff.cat.volume_copy_creator.print_labels.label "Print Labels?">
<!ENTITY staff.cat.volume_copy_creator.print_labels.accesskey "P">
-<!ENTITY staff.cat.volume_copy_creator.create.label "Edit then Create">
-<!ENTITY staff.cat.volume_copy_creator.create.accesskey "C">
<!ENTITY staff.cat.volume_copy_creator.library_label.value "Library">
<!ENTITY staff.cat.volume_copy_creator.num_of_volumes_label.value "# of volumes">
<!ENTITY staff.cat.volume_editor.title "Volumes">
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/menu.js 2010-03-08 15:31:03 UTC (rev 15732)
@@ -1326,6 +1326,16 @@
var url = obj.url_prefix( horizontal_interface ? urls.XUL_PATRON_HORIZ_DISPLAY : urls.XUL_PATRON_DISPLAY );
obj.new_tab(url,params ? params : {},content_params ? content_params : {});
},
+ 'volume_item_creator' : function(params) {
+ var obj = this;
+ JSAN.use('util.window'); var win = new util.window();
+ var w = win.open(
+ obj.url_prefix(urls.XUL_VOLUME_COPY_CREATOR),
+ document.getElementById('offlineStrings').getString('staff.cat.create_or_rebarcode_items'),
+ 'chrome,resizable',
+ params
+ );
+ },
'set_tab' : function(url,params,content_params) {
var obj = this;
if (!url) url = '/xul/server/';
@@ -1344,6 +1354,7 @@
content_params.close_tab = function() { return obj.close_tab(); };
content_params.new_patron_tab = function(a,b) { return obj.new_patron_tab(a,b); };
content_params.set_patron_tab = function(a,b) { return obj.set_patron_tab(a,b); };
+ content_params.volume_item_creator = function(a) { return obj.volume_item_creator(a); };
content_params.set_tab_name = function(name) { tab.setAttribute('label',(idx + 1) + ' ' + name); };
content_params.open_chrome_window = function(a,b,c) { return xulG.window.open(a,b,c); };
content_params.url_prefix = function(url) { return obj.url_prefix(url); };
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/util/browser.js 2010-03-08 15:31:03 UTC (rev 15732)
@@ -136,6 +136,9 @@
cw.xulG = obj.passthru_content_params || {};
cw.xulG.set_tab = window.xulG.set_tab;
cw.xulG.new_tab = window.xulG.new_tab;
+ cw.xulG.new_patron_tab = window.xulG.new_patron_tab;
+ cw.xulG.set_patron_tab = window.xulG.set_patron_tab;
+ cw.xulG.volume_item_creator = window.xulG.volume_item_creator;
cw.xulG.url_prefix = window.xulG.url_prefix;
cw.xulG.urls = window.urls;
try { s += ('******** cw = ' + cw + ' cw.xulG = ' + (cw.xulG) + '\n'); } catch(E) { s+=E + '\n'; }
Modified: trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties 2010-03-08 15:31:03 UTC (rev 15732)
@@ -259,4 +259,4 @@
staff.cat.opac.title_for_hold_transfer.destination_needed.label=Need to mark a record as a Title Hold Transfer Destination first.
staff.cat.opac.title_for_hold_transfer.success.label=Holds transferred.
staff.cat.opac.title_for_hold_transfer.failure.label=Holds not transferred.
-
+staff.cat.create_or_rebarcode_items=Create or Re-barcode Items
Modified: trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/server/cat/copy_browser.js 2010-03-08 15:31:03 UTC (rev 15732)
@@ -306,19 +306,13 @@
list = util.functional.map_list(
list,
function (o) {
- return obj.map_acp[ o ].barcode();
+ var cloned_copy_obj = JSON2js( js2JSON( obj.map_acp[ o ] ) );
+ cloned_copy_obj.call_number( obj.map_acn[ 'acn_' + cloned_copy_obj.call_number() ] );
+ return cloned_copy_obj;
}
);
- JSAN.use('cat.util');
- for (var i = 0; i < list.length; i++) {
- try {
- cat.util.replace_barcode(list[i]);
- } catch(E) {
- obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getFormattedString('staff.cat.copy_browser.replace_barcode.failed', [list[i]]),E);
- }
- }
- obj.refresh_list();
+ xulG.volume_item_creator( {'existing_copies':list, 'onrefresh' : function() { obj.refresh_list(); } } );
} catch(E) {
obj.error.standard_unexpected_error_alert(document.getElementById('catStrings').getString('staff.cat.copy_browser.replace_barcode.error'),E);
Modified: trunk/Open-ILS/xul/staff_client/server/cat/copy_editor.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/copy_editor.js 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/server/cat/copy_editor.js 2010-03-08 15:31:03 UTC (rev 15732)
@@ -116,21 +116,20 @@
if (g.copies.length > 0 && g.copies[0].id() < 0) {
document.getElementById('copy_notes').setAttribute('hidden','true');
- g.apply("status",5 /* In Process */);
$('save').setAttribute('label', $('catStrings').getString('staff.cat.copy_editor.create_copies'));
- } else {
- g.panes_and_field_names.left_pane =
- [
- [
- $('catStrings').getString('staff.cat.copy_editor.status'),
- {
- render: 'typeof fm.status() == "object" ? fm.status().name() : g.data.hash.ccs[ fm.status() ].name()',
- input: g.safe_to_edit_copy_status() ? 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.ccs, function(obj) { return [ obj.name(), obj.id(), typeof my_constants.magical_statuses[obj.id()] != "undefined" ? true : false ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);' : undefined,
- //input: 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( util.functional.filter_list( g.data.list.ccs, function(obj) { return typeof my_constants.magical_statuses[obj.id()] == "undefined"; } ), function(obj) { return [ obj.name(), obj.id() ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
- }
- ]
- ].concat(g.panes_and_field_names.left_pane);
+ $('save').setAttribute('accesskey', $('catStrings').getString('staff.cat.copy_editor.create_copies.accesskey'));
}
+ g.panes_and_field_names.left_pane =
+ [
+ [
+ $('catStrings').getString('staff.cat.copy_editor.status'),
+ {
+ render: 'typeof fm.status() == "object" ? fm.status().name() : g.data.hash.ccs[ fm.status() ].name()',
+ input: g.safe_to_edit_copy_status() ? 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( g.data.list.ccs, function(obj) { return [ obj.name(), obj.id(), typeof my_constants.magical_statuses[obj.id()] != "undefined" ? true : false ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);' : undefined,
+ //input: 'c = function(v){ g.apply("status",v); if (typeof post_c == "function") post_c(v); }; x = util.widgets.make_menulist( util.functional.map_list( util.functional.filter_list( g.data.list.ccs, function(obj) { return typeof my_constants.magical_statuses[obj.id()] == "undefined"; } ), function(obj) { return [ obj.name(), obj.id() ]; } ).sort() ); x.addEventListener("apply",function(f){ return function(ev) { f(ev.target.value); } }(c), false);',
+ }
+ ]
+ ].concat(g.panes_and_field_names.left_pane);
if (g.copies.length != 1) {
document.getElementById('copy_notes').setAttribute('hidden','true');
Modified: trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js 2010-03-08 15:31:03 UTC (rev 15732)
@@ -1,4 +1,4 @@
-const g_max_copies_that_can_be_added_at_a_time_per_volume = 100;
+const g_max_copies_that_can_be_added_at_a_time_per_volume = 999;
var g = {};
function my_init() {
@@ -8,7 +8,7 @@
/* Initial setup */
netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
+ if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); }
JSAN.errorLevel = "die"; // none, warn, or die
JSAN.addRepository('/xul/server/');
JSAN.use('util.error'); g.error = new util.error();
@@ -19,31 +19,82 @@
JSAN.use('util.network'); g.network = new util.network();
+ g.refresh = xul_param('onrefresh');
+
/***********************************************************************************************************/
- /* What record am I dealing with? Am I adding just copies or copies and volumes? */
+ /* Am I adding just copies or copies and volumes? Or am I rebarcoding existing copies? */
- g.doc_id = xul_param('doc_id');
+ // g.copy_shortcut = { ou_id : { callnumber_label : callnumber_id }, ... }
+ g.copy_shortcut = xul_param('copy_shortcut');
+ // g.existing_copies = [ copy1, copy2, ... ]
+ g.existing_copies = xul_param('existing_copies') || [];
+
+ if (g.existing_copies.length > 0) {
+ document.getElementById('EditThenCreate').setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.edit_then_rebarcode.btn.label'));
+ document.getElementById('EditThenCreate').setAttribute('accesskey',$('catStrings').getString('staff.cat.volume_copy_creator.edit_then_rebarcode.btn.accesskey'));
+ document.getElementById('CreateWithDefaults').setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.rebarcode.btn.label'));
+ document.getElementById('CreateWithDefaults').setAttribute('accesskey',$('catStrings').getString('staff.cat.volume_copy_creator.rebarcode.btn.accesskey'));
+ } else {
+ document.getElementById('EditThenCreate').setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.edit_then_create.btn.label'));
+ document.getElementById('EditThenCreate').setAttribute('accesskey',$('catStrings').getString('staff.cat.volume_copy_creator.edit_then_create.btn.accesskey'));
+ document.getElementById('CreateWithDefaults').setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.create_with_defaults.btn.label'));
+ document.getElementById('CreateWithDefaults').setAttribute('accesskey',$('catStrings').getString('staff.cat.volume_copy_creator.create_with_defaults.btn.accesskey'));
+ }
+
+ //g.error.sdump('D_ERROR','location.href = ' + location.href + '\n\ncopy_short cut = ' + g.copy_shortcut + '\n\nou_ids = ' + xul_param('ou_ids'));
+
+ var ou_ids = xul_param('ou_ids',{'concat' : true}) || [];
+
+ /***********************************************************************************************************/
+ /* If we're passed existing_copies, rig up a copy_shortcut object to leverage existing code for rendering the volume labels, etc.
+ * Also make a lookup object for existing copies keyed on org id and callnumber label, and another keyed on copy id. */
+
+ // g.org_label_existing_copy_map = { ou_id : { callnumber_label : [ copy1, copy2, ... ] }, ... }
+ g.org_label_existing_copy_map = {};
+ // g.id_copy_map = { acp_id : acp, ... }
+ g.id_copy_map = {};
+ for (var i = 0; i < g.existing_copies.length; i++) {
+ if (! g.copy_shortcut) { g.copy_shortcut = {}; }
+ var copy = g.existing_copies[i];
+ g.id_copy_map[ copy.id() ] = copy;
+ var call_number = copy.call_number();
+ g.doc_id = call_number.record();
+ if (!g.copy_shortcut[ call_number.owning_lib() ]) {
+ ou_ids.push( call_number.owning_lib() );
+ g.copy_shortcut[ call_number.owning_lib() ] = {};
+ g.org_label_existing_copy_map[ call_number.owning_lib() ] = {};
+ }
+ g.copy_shortcut[ call_number.owning_lib() ][ call_number.label() ] = call_number.id();
+ if (! g.org_label_existing_copy_map[ call_number.owning_lib() ][ call_number.label() ]) {
+ g.org_label_existing_copy_map[ call_number.owning_lib() ][ call_number.label() ] = [];
+ }
+ g.org_label_existing_copy_map[ call_number.owning_lib() ][ call_number.label() ].push( copy );
+ }
+
+ /***********************************************************************************************************/
+ /* What record am I dealing with? */
+
+ g.doc_id = g.doc_id || xul_param('doc_id');
+ if (! g.doc_id) {
+ alert('Error in volume_copy_creator.js, g.doc_id not valid');
+ window.close(); return;
+ }
var sb = document.getElementById('summary_box'); while(sb.firstChild) sb.removeChild(sb.lastChild);
var summary = document.createElement('iframe'); sb.appendChild(summary);
summary.setAttribute('src',urls.XUL_BIB_BRIEF);
summary.setAttribute('flex','1');
get_contentWindow(summary).xulG = { 'docid' : g.doc_id };
- g.copy_shortcut = xul_param('copy_shortcut',{'JSON2js_if_cgi':true});
- g.error.sdump('D_ERROR','location.href = ' + location.href + '\n\ncopy_short cut = ' + g.copy_shortcut + '\n\nou_ids = ' + xul_param('ou_ids'));
-
- var ou_ids = xul_param('ou_ids',{'JSON2js_if_cgi' : true, 'concat' : true});;
-
/***********************************************************************************************************/
/* For the call number drop down */
- var cn_blob;
- try {
- cn_blob = g.network.simple_request('BLOB_MARC_CALLNUMBERS_RETRIEVE',[g.doc_id]);
- } catch(E) {
- cn_blob = [];
- }
- if ((!g.copy_shortcut)) {
+ if (!g.copy_shortcut) {
+ var cn_blob;
+ try {
+ cn_blob = g.network.simple_request('BLOB_MARC_CALLNUMBERS_RETRIEVE',[g.doc_id]);
+ } catch(E) {
+ cn_blob = [];
+ }
var hbox = document.getElementById('marc_cn');
var ml = util.widgets.make_menulist(
util.functional.map_list(
@@ -70,7 +121,7 @@
ml.setAttribute('width', '200');
var btn = document.createElement('button');
btn.setAttribute('label',$('catStrings').getString('staff.cat.volume_copy_creator.my_init.btn.label'));
- btn.setAttribute('accesskey','A');
+ btn.setAttribute('accesskey',$('catStrings').getString('staff.cat.volume_copy_creator.my_init.btn.accesskey'));
btn.setAttribute('image','/xul/server/skin/media/images/down_arrow.gif');
hbox.appendChild(btn);
btn.addEventListener(
@@ -99,7 +150,7 @@
if ( get_bool( g.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) {
var row = document.createElement('row'); rows.appendChild(row); row.setAttribute('ou_id',ou_ids[i]);
g.render_library_label(row,ou_ids[i]);
- g.render_volume_count_entry(row,ou_ids[i]);
+ g.render_volume_count_entry( row, ou_ids[i] );
}
} catch(E) {
g.error.sdump('D_ERROR',E);
@@ -151,17 +202,17 @@
setTimeout(
function() {
try {
- if (g.copy_shortcut) {
- JSAN.use('util.functional');
- tb.value = util.functional.map_object_to_list(
- g.copy_shortcut[ou_id],
- function(o,i) {
- return g.copy_shortcut[ou_id][i];
- }
- ).length
- render_copy_count_entry({'target':tb});
- tb.disabled = true;
- }
+ if (g.copy_shortcut) {
+ JSAN.use('util.functional');
+ tb.value = util.functional.map_object_to_list(
+ g.copy_shortcut[ou_id],
+ function(o,i) {
+ return g.copy_shortcut[ou_id][i];
+ }
+ ).length;
+ render_copy_count_entry({'target':tb});
+ tb.disabled = true;
+ }
} catch(E) {
alert(E);
}
@@ -181,93 +232,101 @@
x.setAttribute('value',$("catStrings").getString('staff.cat.volume_copy_creator.render_callnumber_copy_count_entry.num_of_copies')); x.setAttribute('style','font-weight: bold');
x.setAttribute('size','3'); x.setAttribute('cols','3');
-
- function handle_change(tb1,tb2,hb3) {
- if (tb1.value == '') return;
- if (isNaN( Number( tb2.value ) )) return;
- if ( Number( tb2.value ) > g_max_copies_that_can_be_added_at_a_time_per_volume ) {
+ function handle_change(call_number_column_textbox,number_of_copies_column_textbox,barcode_column_box) {
+ if (call_number_column_textbox.value == '') return;
+ if (isNaN( Number( number_of_copies_column_textbox.value ) )) return;
+ if ( Number( number_of_copies_column_textbox.value ) > g_max_copies_that_can_be_added_at_a_time_per_volume ) {
g.error.yns_alert($("catStrings").getFormattedString('staff.cat.volume_copy_creator.render_volume_count_entry.message', [g_max_copies_that_can_be_added_at_a_time_per_volume]),
$("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.title'),
$("catStrings").getString('staff.cat.volume_copy_creator.render_volume_count_entry.ok_label'),null,null,'');
return;
}
- //if (tb1.disabled || tb2.disabled) return;
+ //if (call_number_column_textbox.disabled || number_of_copies_column_textbox.disabled) return;
- //tb1.disabled = true;
- //tb2.disabled = true;
+ //call_number_column_textbox.disabled = true;
+ //number_of_copies_column_textbox.disabled = true;
- util.widgets.remove_children(hb3);
+ util.widgets.remove_children(barcode_column_box);
- g.render_barcode_entry(hb3,tb1.value,Number(tb2.value),ou_id);
- document.getElementById("Create").disabled = false;
+ g.render_barcode_entry(barcode_column_box,call_number_column_textbox.value,Number(number_of_copies_column_textbox.value),ou_id);
+ document.getElementById("EditThenCreate").disabled = false;
+ document.getElementById("CreateWithDefaults").disabled = false;
}
- function handle_change_tb1(ev) {
- var _tb1 = ev.target;
- var _hb1 = _tb1.parentNode;
- var _hb2 = _hb1.nextSibling;
- var _tb2 = _hb2.firstChild;
- var _hb3 = _hb2.nextSibling;
- handle_change(_tb1,_tb2,_hb3);
+ function handle_change_call_number_column_textbox(ev) {
+ var _call_number_column_textbox = ev.target;
+ var _call_number_column_box = _call_number_column_textbox.parentNode;
+ var _number_of_copies_column_box = _call_number_column_box.nextSibling;
+ var _number_of_copies_column_textbox = _number_of_copies_column_box.firstChild;
+ var _barcode_column_box = _number_of_copies_column_box.nextSibling;
+ handle_change(_call_number_column_textbox,_number_of_copies_column_textbox,_barcode_column_box);
}
- function handle_change_tb2(ev) {
- var _tb2 = ev.target;
- var _hb2 = _tb2.parentNode;
- var _hb1 = _hb2.previousSibling;
- var _tb1 = _hb1.firstChild;
- var _hb3 = _hb2.nextSibling;
- handle_change(_tb1,_tb2,_hb3);
+ function handle_change_number_of_copies_column_textbox(ev) {
+ var _number_of_copies_column_textbox = ev.target;
+ var _number_of_copies_column_box = _number_of_copies_column_textbox.parentNode;
+ var _call_number_column_box = _number_of_copies_column_box.previousSibling;
+ var _call_number_column_textbox = _call_number_column_box.firstChild;
+ var _barcode_column_box = _number_of_copies_column_box.nextSibling;
+ handle_change(_call_number_column_textbox,_number_of_copies_column_textbox,_barcode_column_box);
}
for (var i = 0; i < count; i++) {
var r = document.createElement('row'); rows.appendChild(r);
- var hb1 = document.createElement('vbox'); r.appendChild(hb1);
- var hb2 = document.createElement('vbox'); r.appendChild(hb2);
- var hb3 = document.createElement('vbox'); r.appendChild(hb3);
- var tb1 = document.createElement('textbox'); hb1.appendChild(tb1);
- tb1.setAttribute('rel_vert_pos','2');
- tb1.setAttribute('ou_id',ou_id);
+ var call_number_column_box = document.createElement('vbox'); r.appendChild(call_number_column_box);
+ var number_of_copies_column_box = document.createElement('vbox'); r.appendChild(number_of_copies_column_box);
+ var barcode_column_box = document.createElement('vbox'); r.appendChild(barcode_column_box);
+ var call_number_column_textbox = document.createElement('textbox'); call_number_column_box.appendChild(call_number_column_textbox);
+ call_number_column_textbox.setAttribute('rel_vert_pos','2');
+ call_number_column_textbox.setAttribute('ou_id',ou_id);
util.widgets.apply_vertical_tab_on_enter_handler(
- tb1,
- function() { handle_change_tb1({'target':tb1}); setTimeout(function(){util.widgets.vertical_tab(tb1);},0); }
+ call_number_column_textbox,
+ function() { handle_change_call_number_column_textbox({'target':call_number_column_textbox}); setTimeout(function(){util.widgets.vertical_tab(call_number_column_textbox);},0); }
);
- var tb2 = document.createElement('textbox'); hb2.appendChild(tb2);
- tb2.setAttribute('size','3'); tb2.setAttribute('cols','3');
- tb2.setAttribute('rel_vert_pos','3');
- tb2.setAttribute('ou_id',ou_id);
+ var number_of_copies_column_textbox = document.createElement('textbox'); number_of_copies_column_box.appendChild(number_of_copies_column_textbox);
+ number_of_copies_column_textbox.setAttribute('size','3'); number_of_copies_column_textbox.setAttribute('cols','3');
+ number_of_copies_column_textbox.setAttribute('rel_vert_pos','3');
+ number_of_copies_column_textbox.setAttribute('ou_id',ou_id);
util.widgets.apply_vertical_tab_on_enter_handler(
- tb2,
- function() { handle_change_tb2({'target':tb2}); setTimeout(function(){util.widgets.vertical_tab(tb2);},0); }
+ number_of_copies_column_textbox,
+ function() { handle_change_number_of_copies_column_textbox({'target':number_of_copies_column_textbox}); setTimeout(function(){util.widgets.vertical_tab(number_of_copies_column_textbox);},0); }
);
- tb1.addEventListener( 'change', handle_change_tb1, false);
- tb1.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
- tb2.addEventListener( 'change', handle_change_tb2, false);
- tb2.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
- if ( !g.last_focus ) { tb2.focus(); g.last_focus = tb2; }
+ call_number_column_textbox.addEventListener( 'change', handle_change_call_number_column_textbox, false);
+ call_number_column_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
+ number_of_copies_column_textbox.addEventListener( 'change', handle_change_number_of_copies_column_textbox, false);
+ number_of_copies_column_textbox.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
+ if ( !g.last_focus ) { number_of_copies_column_textbox.focus(); g.last_focus = number_of_copies_column_textbox; }
setTimeout(
- function(idx,tb){
+ function(idx,call_number_column_textbox,number_of_copies_column_textbox){
return function() {
try {
- JSAN.use('util.functional');
- if (g.copy_shortcut) {
- var label = util.functional.map_object_to_list(
- g.copy_shortcut[ou_id],
- function(o,i) {
- return i;
+ JSAN.use('util.functional');
+ if (g.copy_shortcut) {
+ var label = util.functional.map_object_to_list(
+ g.copy_shortcut[ou_id],
+ function(o,i) {
+ return i;
+ }
+ )[idx];
+ if (g.org_label_existing_copy_map[ou_id]) {
+ var num_of_copies = g.org_label_existing_copy_map[ou_id][label].length;
+ if (num_of_copies>0) {
+ number_of_copies_column_textbox.value = num_of_copies;
+ number_of_copies_column_textbox.disabled = true;
+ }
}
- )[idx];
- tb.value = label; handle_change_tb1({'target':tb});
- tb.disabled = true;
- }
+ call_number_column_textbox.value = label;
+ handle_change_call_number_column_textbox({'target':call_number_column_textbox});
+ call_number_column_textbox.disabled = true;
+ }
} catch(E) {
alert(E);
}
}
- }(i,tb1),0
+ }(i,call_number_column_textbox,number_of_copies_column_textbox),0
);
}
@@ -277,7 +336,8 @@
g.render_barcode_entry = function(node,callnumber,count,ou_id) {
try {
function ready_to_create(ev) {
- document.getElementById("Create").disabled = false;
+ document.getElementById("EditThenCreate").disabled = false;
+ document.getElementById("CreateWithDefaults").disabled = false;
}
JSAN.use('util.barcode');
@@ -287,11 +347,16 @@
tb.setAttribute('ou_id',ou_id);
tb.setAttribute('callnumber',callnumber);
tb.setAttribute('rel_vert_pos','4');
+ if (g.org_label_existing_copy_map[ ou_id ]) {
+ tb.value = g.org_label_existing_copy_map[ ou_id ][ callnumber ][i].barcode();
+ tb.setAttribute('acp_id', g.org_label_existing_copy_map[ ou_id ][ callnumber ][i].id());
+ tb.select();
+ if (! g.first_focus) { g.first_focus = tb; }
+ }
util.widgets.apply_vertical_tab_on_enter_handler(
tb,
function() { ready_to_create({'target':tb}); setTimeout(function(){util.widgets.vertical_tab(tb);},0); }
);
- //tb.addEventListener('change',ready_to_create,false);
tb.addEventListener('change', function(ev) {
var barcode = String( ev.target.value ).replace(/\s/g,'');
if (barcode != ev.target.value) ev.target.value = barcode;
@@ -305,6 +370,9 @@
}, false);
tb.addEventListener( 'focus', function(ev) { g.last_focus = ev.target; }, false );
}
+
+ setTimeout( function() { if (g.first_focus) { g.first_focus.focus(); } }, 0 );
+
} catch(E) {
g.error.sdump('D_ERROR','g.render_barcode_entry: ' + E);
}
@@ -312,7 +380,7 @@
g.new_node_id = -1;
-g.stash_and_close = function() {
+g.stash_and_close = function(param) {
try {
@@ -333,6 +401,7 @@
};
for (var i = 0; i < barcodes.length; i++) {
+ var acp_id = barcodes[i].getAttribute('acp_id') || g.new_node_id--;
var ou_id = barcodes[i].getAttribute('ou_id');
var callnumber = barcodes[i].getAttribute('callnumber');
var barcode = barcodes[i].value;
@@ -340,19 +409,41 @@
if (typeof volumes_hash[ou_id] == 'undefined') { volumes_hash[ou_id] = {} }
if (typeof volumes_hash[ou_id][callnumber] == 'undefined') { volumes_hash[ou_id][callnumber] = [] }
- if (barcode != '') volumes_hash[ou_id][callnumber].push( barcode );
+ if (barcode != '') volumes_hash[ou_id][callnumber].push( { 'barcode' : barcode, 'acp_id' : acp_id } );
}
var volumes = [];
var copies = [];
var volume_labels = {};
+ function new_copy(acp_id,ou_id,acn_id,barcode) {
+ var copy = new acp();
+ copy.id( acp_id );
+ copy.isnew('1');
+ copy.barcode( barcode );
+ copy.call_number( acn_id );
+ copy.circ_lib(ou_id);
+ /* FIXME -- use constants */
+ copy.deposit(0);
+ copy.price(0);
+ copy.deposit_amount(0);
+ copy.fine_level(2);
+ copy.loan_duration(2);
+ copy.location(1);
+ copy.status(5);
+ copy.circulate(get_db_true());
+ copy.holdable(get_db_true());
+ copy.opac_visible(get_db_true());
+ copy.ref(get_db_false());
+ return copy;
+ }
+
for (var ou_id in volumes_hash) {
- for (var cn in volumes_hash[ou_id]) {
+ for (var cn_label in volumes_hash[ou_id]) {
var acn_id = g.network.simple_request(
'FM_ACN_FIND_OR_CREATE',
- [ ses(), cn, g.doc_id, ou_id ]
+ [ ses(), cn_label, g.doc_id, ou_id ]
);
if (typeof acn_id.ilsevent != 'undefined') {
@@ -360,27 +451,20 @@
continue;
}
- volume_labels[ acn_id ] = { 'label' : cn, 'owning_lib' : ou_id };
+ volume_labels[ acn_id ] = { 'label' : cn_label, 'owning_lib' : ou_id };
- for (var i = 0; i < volumes_hash[ou_id][cn].length; i++) {
- var copy = new acp();
- copy.id( g.new_node_id-- );
- copy.isnew('1');
- copy.barcode( volumes_hash[ou_id][cn][i] );
- copy.call_number( acn_id );
- copy.circ_lib(ou_id);
- /* FIXME -- use constants */
- copy.deposit(0);
- copy.price(0);
- copy.deposit_amount(0);
- copy.fine_level(2);
- copy.loan_duration(2);
- copy.location(1);
- copy.status(0);
- copy.circulate(get_db_true());
- copy.holdable(get_db_true());
- copy.opac_visible(get_db_true());
- copy.ref(get_db_false());
+ for (var i = 0; i < volumes_hash[ou_id][cn_label].length; i++) {
+ var barcode = volumes_hash[ou_id][cn_label][i].barcode;
+ var acp_id = volumes_hash[ou_id][cn_label][i].acp_id;
+ var copy;
+ if (acp_id < 0) {
+ copy = new_copy(acp_id,ou_id,acn_id,barcode);
+ } else {
+ copy = g.id_copy_map[ acp_id ];
+ copy.barcode( barcode );
+ copy.call_number( copy.call_number().id() );
+ copy.ischanged('1');
+ }
copies.push( copy );
}
}
@@ -389,7 +473,20 @@
JSAN.use('util.window'); var win = new util.window();
if (copies.length > 0) {
JSAN.use('cat.util');
- copies = cat.util.spawn_copy_editor( { 'edit' : 1, 'docid' : g.doc_id, 'copies' : copies });
+ if (param == 'edit') {
+ copies = cat.util.spawn_copy_editor( { 'edit' : true, 'docid' : g.doc_id, 'copies' : copies, 'caller_handles_update' : true });
+ }
+ if (typeof xul_param('update_copy') == 'function') {
+ xul_param('update_copy')(copies);
+ } else {
+ var r = g.network.simple_request(
+ 'FM_ACP_FLESHED_BATCH_UPDATE',
+ [ ses(),copies, true ]
+ );
+ if (typeof r.ilsevent != 'undefined') {
+ g.error.standard_unexpected_error_alert('copy update',r);
+ }
+ }
try {
//case 1706 /* ITEM_BARCODE_EXISTS */ :
if (copies && copies.length > 0 && $('print_labels').checked) {
@@ -406,9 +503,10 @@
} catch(E) {
g.error.standard_unexpected_error_alert($(catStrings).getString('staff.cat.volume_copy_creator.stash_and_close.tree_err2'),E);
}
- }
+ }
- if (typeof window.refresh == 'function') window.refresh();
+ if (typeof window.refresh == 'function') { window.refresh(); }
+ if (typeof g.refresh == 'function') { g.refresh(); }
window.close();
Modified: trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul 2010-03-08 15:31:03 UTC (rev 15732)
@@ -44,7 +44,8 @@
<spacer flex="1" />
<checkbox id="check_barcodes" label="&staff.cat.volume_copy_creator.check_barcodes.label;" oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.check_barcodes.accesskey;"/>
<checkbox id="print_labels" label="&staff.cat.volume_copy_creator.print_labels.label;" oncommand="g.save_prefs();" accesskey="&staff.cat.volume_copy_creator.print_labels.accesskey;"/>
- <button id="Create" accesskey="&staff.cat.volume_copy_creator.create.accesskey;" label="&staff.cat.volume_copy_creator.create.label;" disabled="true" oncommand="g.stash_and_close();"/>
+ <button id="CreateWithDefaults" disabled="true" oncommand="g.stash_and_close('noedit');"/>
+ <button id="EditThenCreate" disabled="true" oncommand="g.stash_and_close('edit');"/>
</hbox>
<grid flex="1">
<columns> <column flex="0"/> <column flex="0"/> <column flex="1"/> </columns>
Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties 2010-03-08 14:28:44 UTC (rev 15731)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/cat.properties 2010-03-08 15:31:03 UTC (rev 15732)
@@ -106,7 +106,8 @@
staff.cat.copy_buckets_quick.copy_buckets_new_bucket.error=Bucket creation failed.
staff.cat.copy_buckets_quick.addition.error=Addition likely failed for bucket = %1$s and copy ID = %2$s.
staff.cat.copy_editor.caption=Copy Editor
-staff.cat.copy_editor.create_copies=Create Copies
+staff.cat.copy_editor.create_copies=Modify/Create Copies
+staff.cat.copy_editor.create_copies.accesskey=M
staff.cat.copy_editor.copy_notes=Copy Notes
staff.cat.copy_editor.status=Status
staff.cat.copy_editor.retrieve_templates.error=Error retrieving templates
@@ -381,6 +382,15 @@
staff.cat.util.mark_item_missing.multiple_item_missing=%1$s items marked Missing.
staff.cat.volume_buckets.window_tab_name=Volume Buckets
staff.cat.volume_copy_creator.my_init.btn.label=Apply
+staff.cat.volume_copy_creator.my_init.btn.accesskey=A
+staff.cat.volume_copy_creator.edit_then_create.btn.label=Edit then Create
+staff.cat.volume_copy_creator.edit_then_create.btn.accesskey=C
+staff.cat.volume_copy_creator.create_with_defaults.btn.label=Create with Defaults
+staff.cat.volume_copy_creator.create_with_defaults.btn.accesskey=D
+staff.cat.volume_copy_creator.edit_then_rebarcode.btn.label=Edit then Re-barcode
+staff.cat.volume_copy_creator.edit_then_rebarcode.btn.accesskey=E
+staff.cat.volume_copy_creator.rebarcode.btn.label=Re-barcode
+staff.cat.volume_copy_creator.rebarcode.btn.accesskey=R
staff.cat.volume_copy_creator.render_volume_count_entry.message=You may not add more than %1$s items at a time for a given volume in this interface.
staff.cat.volume_copy_creator.render_volume_count_entry.title=Maximum items exceeded.
staff.cat.volume_copy_creator.render_volume_count_entry.ok_label=Ok
More information about the open-ils-commits
mailing list