use new receive response types. cleaned up some progress handling

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

diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 087863e..9f88534 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -494,7 +494,7 @@ function AcqLiTable() {
     this.createAssets = function() {
         if(!this.isPO) return;
         if(!confirm(localeStrings.CREATE_PO_ASSETS_CONFIRM)) return;
-        this.show('acq-lit-create-po-progress');
+        this.show('acq-lit-progress-numbers');
         var self = this;
         fieldmapper.standardRequest(
             ['open-ils.acq', 'open-ils.acq.purchase_order.assets.create'],
@@ -502,17 +502,7 @@ function AcqLiTable() {
                 params: [this.authtoken, this.isPO],
                 onresponse: function(r) {
                     var resp = openils.Util.readResponse(r);
-                    if(!resp) return;
-                    dojo.byId('acq-pl-lit-li-processed').innerHTML = resp.li;
-                    dojo.byId('acq-pl-lit-lid-processed').innerHTML = resp.lid;
-                    dojo.byId('acq-pl-lit-debits-processed').innerHTML = resp.debits_accrued;
-                    dojo.byId('acq-pl-lit-bibs-processed').innerHTML = resp.bibs;
-                    dojo.byId('acq-pl-lit-indexed-processed').innerHTML = resp.indexed;
-                    dojo.byId('acq-pl-lit-copies-processed').innerHTML = resp.copies;
-                    if(resp.complete) {
-                        openils.Util.hide('acq-lit-create-po-progress');
-                        self.show('list');
-                    }
+                    self._updateProgressNumbers(resp, true);
                 }
             }
         );
@@ -529,7 +519,7 @@ function AcqLiTable() {
                     progressDialogInd.hide();
                     var evt = openils.Util.readResponse(r);
                     if(evt && evt.template_output()) {
-                        win = window.open('','', 'resizable,width=700,height=500,scrollbars=1');
+                        win = window.open('','', 'resizable,width=800,height=600,scrollbars=1');
                         win.document.body.innerHTML = evt.template_output().data();
                     }
                 }
@@ -540,34 +530,35 @@ function AcqLiTable() {
 
     this.receivePO = function() {
         if(!this.isPO) return;
-        progressDialog.show();
-        var maximum = 1;
-        dojo.forEach(this.liCache, function(){maximum += 1; });
-        dojo.forEach(this.copyCache, function(){maximum += 1; });
+        this.show('acq-lit-progress-numbers');
+        var self = this;
         fieldmapper.standardRequest(
             ['open-ils.acq', 'open-ils.acq.purchase_order.receive'],
             {   async: true,
                 params: [this.authtoken, this.isPO],
                 onresponse : function(r) {
-                    var stat = openils.Util.readResponse(r);
-                    
-                    // we don't know the total amount of items to be processed
-                    // since we only have 1 page of data
-                    if(stat.progress > maximum) maximum *= 2;
-
-                    progressDialog.update({maximum:maximum, progress:stat.progress});
-                    if(stat.complete) {
-                        // XXX
-                        location.href = location.href;
-                    }
+                    var resp = openils.Util.readResponse(r);
+                    self._updateProgressNumbers(resp, true);
                 },
             }
         );
     }
 
+    this._updateProgressNumbers = function(resp, reloadOnComplete) {
+        if(!resp) return;
+        dojo.byId('acq-pl-lit-li-processed').innerHTML = resp.li;
+        dojo.byId('acq-pl-lit-lid-processed').innerHTML = resp.lid;
+        dojo.byId('acq-pl-lit-debits-processed').innerHTML = resp.debits_accrued;
+        dojo.byId('acq-pl-lit-bibs-processed').innerHTML = resp.bibs;
+        dojo.byId('acq-pl-lit-indexed-processed').innerHTML = resp.indexed;
+        dojo.byId('acq-pl-lit-copies-processed').innerHTML = resp.copies;
+        if(resp.complete && reloadOnComplete) 
+            location.href = location.href;
+    }
+
 
     this._createPO = function(fields) {
-        this.show('acq-lit-create-po-progress');
+        this.show('acq-lit-progress-numbers');
         var po = new fieldmapper.acqpo();
         po.provider(this.createPoProviderSelector.attr('value'));
 
@@ -576,6 +567,7 @@ function AcqLiTable() {
 
         var max = selected.length * 3;
 
+        var self = this;
         fieldmapper.standardRequest(
             ['open-ils.acq', 'open-ils.acq.purchase_order.create'],
             {   async: true,
@@ -590,13 +582,7 @@ function AcqLiTable() {
 
                 onresponse : function(r) {
                     var resp = openils.Util.readResponse(r);
-                    if(!resp) return;
-                    dojo.byId('acq-pl-lit-li-processed').innerHTML = resp.li;
-                    dojo.byId('acq-pl-lit-lid-processed').innerHTML = resp.lid;
-                    dojo.byId('acq-pl-lit-debits-processed').innerHTML = resp.debits_accrued;
-                    dojo.byId('acq-pl-lit-bibs-processed').innerHTML = resp.bibs;
-                    dojo.byId('acq-pl-lit-indexed-processed').innerHTML = resp.indexed;
-                    dojo.byId('acq-pl-lit-copies-processed').innerHTML = resp.copies;
+                    self._updateProgressNumbers(resp);
                     if(resp.complete) 
                         location.href = oilsBasePath + '/eg/acq/po/view/' + resp.purchase_order.id();
                 }

diff --git a/Open-ILS/web/templates/default/acq/common/li_table.tt2 b/Open-ILS/web/templates/default/acq/common/li_table.tt2
index 4be558e..caeee16 100644 (file)
--- a/Open-ILS/web/templates/default/acq/common/li_table.tt2
+++ b/Open-ILS/web/templates/default/acq/common/li_table.tt2
@@ -192,7 +192,7 @@
         </table>
     </div>
 
-    <div class='hidden' id='acq-lit-create-po-progress'>
+    <div class='hidden' id='acq-lit-progress-numbers'>
         <table class='oils-generic-table'>
             <tbody>
                 <tr>
@@ -216,7 +216,7 @@
                     <td><span id='acq-pl-lit-indexed-processed'>0</span></td>
                 </tr>
                 <tr>
-                    <td>Copies Created</td>
+                    <td>Copies Processed</td>
                     <td><span id='acq-pl-lit-copies-processed'>0</span></td>
                 </tr>
             </tbody>