acq vandelay : UI; standalone vlagent response display part 2; vendor upload

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/acq/common/vlagent.tt2 b/Open-ILS/src/templates/acq/common/vlagent.tt2
index ce81494..7c8ee66 100644 (file)
--- a/Open-ILS/src/templates/acq/common/vlagent.tt2
+++ b/Open-ILS/src/templates/acq/common/vlagent.tt2
@@ -53,15 +53,15 @@
                 <td><span id='acq_vl:li-processed'>0</span></td>
             </tr>
             <tr>
-                <td>[% l('Vandelay Records Queued') %]</td>
+                <td>[% l('Vandelay Records Processed') %]</td>
                 <td><span id='acq_vl:vqbr-processed'>0</span></td>
             </tr>
             <tr>
-                <td>[% l('Bib Records Merged/Created') %]</td>
+                <td>[% l('Bib Records Merged/Imported') %]</td>
                 <td><span id='acq_vl:bibs-processed'>0</span></td>
             </tr>
             <tr>
-                <td>[% l('Items Processed') %]</td>
+                <td>[% l('ACQ Copies Processed') %]</td>
                 <td><span id='acq_vl:lid-processed'>0</span></td>
             </tr>
             <tr>
@@ -69,15 +69,7 @@
                 <td><span id='acq_vl:debits-processed'>0</span></td>
             </tr>
             <tr>
-                <td>[% l('Bib Records Imported') %]</td>
-                <td><span id='acq_vl:bibs-processed'>0</span></td>
-            </tr>
-            <tr>
-                <td>[% l('Bib Records Indexed') %]</td>
-                <td><span id='acq_vl:indexed-processed'>0</span></td>
-            </tr>
-            <tr>
-                <td>[% l('Copies Processed') %]</td>
+                <td>[% l('Real Copies Processed') %]</td>
                 <td><span id='acq_vl:copies-processed'>0</span></td>
             </tr>
         </tbody>

diff --git a/Open-ILS/src/templates/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2
index cd702d2..fc03106 100644 (file)
--- a/Open-ILS/src/templates/acq/picklist/upload.tt2
+++ b/Open-ILS/src/templates/acq/picklist/upload.tt2
@@ -1,4 +1,5 @@
 [% WRAPPER 'base.tt2' %]
+[% PROCESS 'acq/common/vlagent.tt2' %]
 
 <h1>Upload</h1><br/>
 <form id="acq-pl-upload-form" enctype="multipart/form-data">
@@ -33,9 +34,7 @@
             </tr>
 
             <tr><td colspan='2'><hr/></td></tr>
-        </tbody>
-        [% INCLUDE 'acq/common/vlagent.tt2' %]
-        <tbody>
+            [% PROCESS vlagent_form %]
             <tr><td colspan='2'><hr/></td></tr>
 
             <tr>
@@ -55,41 +54,12 @@
         <div id='acq-pl-upload-progress-bar'>
             <div dojoType="dijit.ProgressBar" style="width:300px" indeterminate="true"></div>
         </div>
-        <div>
-            <table class='oils-generic-table'>
-                <tbody>
-                    <tr>
-                        <td>Lineitems Processed</td>
-                        <td><span id='acq-pl-upload-li-processed'>0</span></td>
-                    </tr>
-                    <tr>
-                        <td>[% l('Vandelay Records Queued') %]</td>
-                        <td><span id='acq-pl-upload-vqbr-processed'>0</span></td>
-                    </tr>
-                    <tr>
-                        <td>[% l('Bib Records Merged/Created') %]</td>
-                        <td><span id='acq-pl-upload-bibs-processed'>0</span></td>
-                    </tr>
-                    <tr>
-                        <td>Items Processed</td>
-                        <td><span id='acq-pl-upload-lid-processed'>0</span></td>
-                    </tr>
-                    <tr>
-                        <td>Debits Encumbered</td>
-                        <td><span id='acq-pl-upload-debits-processed'>0</span></td>
-                    </tr>
-                    <tr>
-                        <td>Copies Created</td>
-                        <td><span id='acq-pl-upload-copies-processed'>0</span></td>
-                    </tr>
-                </tbody>
-                <tbody id='acq-pl-upload-complete' class='hidden'>
-                    <tr><td colspan='2'>Upload Complete!</td></tr>
-                    <tr><td colspan='2'><a id='acq-pl-upload-complete-po'>View Purchase Order</a></td></tr>
-                    <tr><td colspan='2'><a id='acq-pl-upload-complete-pl'>View Selection List</a></td></tr>
-                    <tr><td colspan='2'><a id='acq-pl-upload-complete-q'></a></td></tr>
-                </tbody>
-            </table>
+        [% PROCESS vlagent_results %]
+        <div id='acq-pl-upload-complete' class='hidden'>
+            <div>Upload Complete!</div><br/>
+            <div><a id='acq-pl-upload-complete-po'>View Purchase Order</a></div><br/>
+            <div><a id='acq-pl-upload-complete-pl'>View Selection List</a></div><br/>
+            <div><a id='acq-pl-upload-complete-q'></a></div><br/>
         </div>
     </div>
 </form>

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 5cef8e6..1af1f77 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/common/vlagent.js
+++ b/Open-ILS/web/js/ui/default/acq/common/vlagent.js
@@ -87,7 +87,9 @@ function VLAgent(args) {
                 res.queue_url = oilsBasePath + '/vandelay/vandelay?qtype=bib&qid=' + resp.queue.id();
             }
 
-            if (oncomplete) oncomplete(resp, res);
+            if (oncomplete) 
+                oncomplete(resp, res);
+
             return res;
         }