From 5290abdf826d52acc4fb123340b0ebc36147b597 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Mon, 5 Dec 2011 15:43:10 -0500 Subject: [PATCH] acq vandelay : UI bits Signed-off-by: Bill Erickson --- Open-ILS/src/templates/acq/common/vlagent.tt2 | 10 ++++----- Open-ILS/src/templates/acq/picklist/upload.tt2 | 10 ++++----- Open-ILS/web/js/ui/default/acq/common/vlagent.js | 25 +++++------------------ Open-ILS/web/js/ui/default/acq/picklist/upload.js | 16 +++++++-------- 4 files changed, 22 insertions(+), 39 deletions(-) diff --git a/Open-ILS/src/templates/acq/common/vlagent.tt2 b/Open-ILS/src/templates/acq/common/vlagent.tt2 index 0b112bd102..55e7d6e5d2 100644 --- a/Open-ILS/src/templates/acq/common/vlagent.tt2 +++ b/Open-ILS/src/templates/acq/common/vlagent.tt2 @@ -38,13 +38,11 @@
+ [% l('Upload to Queue') %] +
- [% l('Temporary Queue') %] - - - -
- [% l('Named Queue') %] + [% l('Or create a new queue') %] + diff --git a/Open-ILS/src/templates/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2 index 388dcee601..a1d19bf747 100644 --- a/Open-ILS/src/templates/acq/picklist/upload.tt2 +++ b/Open-ILS/src/templates/acq/picklist/upload.tt2 @@ -57,6 +57,10 @@ + + + + @@ -69,14 +73,10 @@ - + - - - - diff --git a/Open-ILS/web/js/ui/default/acq/common/vlagent.js b/Open-ILS/web/js/ui/default/acq/common/vlagent.js index b53395b44c..565d4b9720 100644 --- a/Open-ILS/web/js/ui/default/acq/common/vlagent.js +++ b/Open-ILS/web/js/ui/default/acq/common/vlagent.js @@ -12,12 +12,12 @@ function VLAgent(args) { {key : 'auto_overlay_1match'}, {key : 'auto_overlay_best_match'}, {key : 'match_quality_ratio'}, - {key : 'tmp_queue'}, + {key : 'queue_name'}, {key : 'match_set', cls : 'vms'}, {key : 'bib_source', cls : 'cbs'}, {key : 'merge_profile', cls : 'vmp'}, {key : 'fall_through_merge_profile', cls : 'vmp'}, - {key : 'named_queue', cls : 'vbq'} + {key : 'existing_queue', cls : 'vbq'} ]; this.init = function() { @@ -32,7 +32,9 @@ function VLAgent(args) { selfReference : true, orgLimitPerms : [self.limitPerm || 'CREATE_PURCHASE_ORDER'], parentNode : dojo.byId('acq_vl:' + widg.key) - }).build(function(dijit) { self._widgetPostBuild(widg, dijit) }); + }).build(function(dijit) { + widg.dijit = dijit; + }); } else { // bools widg.dijit = dijit.byId('acq_vl:' + widg.key); @@ -41,23 +43,6 @@ function VLAgent(args) { ); } - this._widgetPostBuild = function(widg, dijit) { - var self = this; - widg.dijit = dijit; - - // don't allow selecting a named queue if temp queue is selected - if (widg.cls == 'vbq') { - dijit.attr('disabled', true); - var tmpd = self.widgets.filter(function(item){return (item.key == 'tmp_queue')})[0].dijit; - tmpd.attr('checked', true); - dojo.connect( - tmpd, 'onChange', - function(val) { dijit.attr('disabled', val) } - ); - } - } - - this.values = function() { var values = {}; dojo.forEach(this.widgets, diff --git a/Open-ILS/web/js/ui/default/acq/picklist/upload.js b/Open-ILS/web/js/ui/default/acq/picklist/upload.js index bd7727dc83..b56fe0989f 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/upload.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/upload.js @@ -109,6 +109,14 @@ function acqHandlePostUpload(key) { var resp = openils.Util.readResponse(r); console.log(js2JSON(resp)); if(!resp) return; + + dojo.byId('acq-pl-upload-vqbr-processed').innerHTML = resp.vqbr; + dojo.byId('acq-pl-upload-li-processed').innerHTML = resp.li; + dojo.byId('acq-pl-upload-lid-processed').innerHTML = resp.lid; + dojo.byId('acq-pl-upload-debits-processed').innerHTML = resp.debits_accrued; + dojo.byId('acq-pl-upload-bibs-processed').innerHTML = resp.bibs; + dojo.byId('acq-pl-upload-copies-processed').innerHTML = resp.copies; + if(resp.complete) { openils.Util.hide('acq-pl-upload-complete-pl'); openils.Util.hide('acq-pl-upload-complete-po'); @@ -126,14 +134,6 @@ function acqHandlePostUpload(key) { dojo.byId('acq-pl-upload-complete-po').setAttribute( 'href', oilsBasePath + '/acq/po/view/' + resp.purchase_order.id()); } - - } else { - dojo.byId('acq-pl-upload-li-processed').innerHTML = resp.li; - dojo.byId('acq-pl-upload-lid-processed').innerHTML = resp.lid; - dojo.byId('acq-pl-upload-debits-processed').innerHTML = resp.debits_accrued; - dojo.byId('acq-pl-upload-bibs-processed').innerHTML = resp.bibs; - dojo.byId('acq-pl-upload-indexed-processed').innerHTML = resp.indexed; - dojo.byId('acq-pl-upload-copies-processed').innerHTML = resp.copies; } }, } -- 2.11.0
[% l('Vandelay Records Queued') %]0
Lineitems Processed 0
0
Bib Records Imported[% l('Bib Records Merged/Created') %] 0
Bib Records Indexed0
Copies Created 0