From 574ea376d2e711eeb9d2e0a5557ac5f4d969e982 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 8 Dec 2011 10:07:04 -0500
Subject: [PATCH] acq vandelay : UI, add vlagent to PO asset loader

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates/acq/common/li_table.tt2    | 25 +++++++++++++++++++++++
 Open-ILS/src/templates/acq/picklist/upload.tt2    | 12 +++++------
 Open-ILS/web/js/ui/default/acq/common/li_table.js | 20 +++++++++++++++---
 Open-ILS/web/js/ui/default/acq/common/vlagent.js  |  6 ++++++
 4 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index 7b10181762..cd0b12652a 100644
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -1,4 +1,5 @@
 <script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/acq/common/base64.js"> </script>
+<script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/common/vlagent.js'> </script>
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/common/li_table.js'> </script>
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/claim_voucher.js'> </script>
 <div id='acq-lit-table-container'>
@@ -309,6 +310,22 @@
         </div>
     </div>
 
+
+    <div class='hidden' id='acq-lit-asset-creator'>
+        <table class='oils-generic-table'>
+            <tbody>
+                [% INCLUDE 'acq/common/vlagent.tt2' %]
+                <tr>
+                    <td>
+                        <span style='margin-left:10px;'>
+                            <button dojoType="dijit.form.Button" jsId='assetCreatorButton'>[% l('Submit') %]</button>
+                        </span>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
     <div class='hidden' id='acq-lit-progress-numbers'>
         <table class='oils-generic-table'>
             <tbody>
@@ -317,6 +334,14 @@
                     <td><span id='acq-pl-lit-li-processed'>0</span></td>
                 </tr>
                 <tr>
+                    <td>[% l('Vandelay Records Queued') %]</td>
+                    <td><span id='acq-pl-lit-vqbr-processed'>0</span></td>
+                </tr>
+                <tr>
+                    <td>[% l('Bib Records Merged/Created') %]</td>
+                    <td><span id='acq-pl-lit-bibs-processed'>0</span></td>
+                </tr>
+                <tr>
                     <td>Items Processed</td>
                     <td><span id='acq-pl-lit-lid-processed'>0</span></td>
                 </tr>
diff --git a/Open-ILS/src/templates/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2
index 742133fcad..662e43d468 100644
--- a/Open-ILS/src/templates/acq/picklist/upload.tt2
+++ b/Open-ILS/src/templates/acq/picklist/upload.tt2
@@ -57,12 +57,16 @@
             <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>Lineitems Processed</td>
-                        <td><span id='acq-pl-upload-li-processed'>0</span></td>
+                        <td>[% l('Bib Records Merged/Created') %]</td>
+                        <td><span id='acq-pl-upload-bibs-processed'>0</span></td>
                     </tr>
                     <tr>
                         <td>Items Processed</td>
@@ -73,10 +77,6 @@
                         <td><span id='acq-pl-upload-debits-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>Copies Created</td>
                         <td><span id='acq-pl-upload-copies-processed'>0</span></td>
                     </tr>
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 eb0b620354..aad40ad454 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -79,6 +79,7 @@ function AcqLiTable() {
             self.fetchClaimInfo(li.id(), /* force update */ true);
         }
     );
+    this.vlAgent = new VLAgent();
 
     dojo.byId("acq-lit-li-actions-selector").onchange = function() { 
         self.applySelectedLiAction(this.options[this.selectedIndex].value);
@@ -154,6 +155,7 @@ function AcqLiTable() {
         openils.Util.hide('acq-lit-li-details');
         openils.Util.hide('acq-lit-notes-div');
         openils.Util.hide('acq-lit-real-copies-div');
+        openils.Util.hide('acq-lit-asset-creator');
         switch(div) {
             case 'list':
                 openils.Util.show('acq-lit-table-div');
@@ -170,6 +172,9 @@ function AcqLiTable() {
             case 'notes':
                 openils.Util.show('acq-lit-notes-div');
                 break;
+            case 'asset-creator':
+                openils.Util.show('acq-lit-asset-creator');
+                break;
             default:
                 if(div) 
                     openils.Util.show(div);
@@ -2023,7 +2028,7 @@ function AcqLiTable() {
                 break;
 
             case 'create_assets':
-                this.createAssets();
+                this.showAssetCreator();
                 break;
 
             case 'export_attr_list':
@@ -2085,15 +2090,23 @@ function AcqLiTable() {
         );
     };
 
+    this.showAssetCreator = function() {
+        this.show('asset-creator');
+        if(!this.vlAgent.loaded)
+            this.vlAgent.init();
+        var self = this;
+        dojo.connect(assetCreatorButton, 'onClick', 
+            function() { self.createAssets() });
+    }
+
     this.createAssets = function() {
         if(!this.isPO) return;
-        if(!confirm(localeStrings.CREATE_PO_ASSETS_CONFIRM)) return;
         this.show('acq-lit-progress-numbers');
         var self = this;
         fieldmapper.standardRequest(
             ['open-ils.acq', 'open-ils.acq.purchase_order.assets.create'],
             {   async: true,
-                params: [this.authtoken, this.isPO],
+                params: [this.authtoken, this.isPO, {vandelay : this.vlAgent.values()}],
                 onresponse: function(r) {
                     var resp = openils.Util.readResponse(r);
                     self._updateProgressNumbers(resp, true);
@@ -2341,6 +2354,7 @@ function AcqLiTable() {
         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;
+        dojo.byId('acq-pl-lit-vqbr-processed').innerHTML = resp.vqbr;
         if(resp.complete && reloadOnComplete) 
             location.href = location.href;
     }
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 565d4b9720..3fc2de02ba 100644
--- a/Open-ILS/web/js/ui/default/acq/common/vlagent.js
+++ b/Open-ILS/web/js/ui/default/acq/common/vlagent.js
@@ -19,6 +19,8 @@ function VLAgent(args) {
         {key : 'fall_through_merge_profile', cls : 'vmp'},
         {key : 'existing_queue', cls : 'vbq'}
     ];
+    
+    this.loaded = false;
 
     this.init = function() {
         var self = this;
@@ -41,6 +43,10 @@ function VLAgent(args) {
                 }
             }
         );
+        
+        // loaded != all widgets are done rendering,
+        // only that init() has been called.
+        this.loaded = true;
     }
 
     this.values = function() {
-- 
2.11.0