ACQ Vandelay : Ui refactor for standalone vl agent

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

diff --git a/Open-ILS/src/templates/acq/picklist/upload.tt2 b/Open-ILS/src/templates/acq/picklist/upload.tt2
index ac7308b..388dcee 100644 (file)
--- a/Open-ILS/src/templates/acq/picklist/upload.tt2
+++ b/Open-ILS/src/templates/acq/picklist/upload.tt2
@@ -33,47 +33,7 @@
             </tr>
 
             <tr><td colspan='2'><hr/></td></tr>
-
-            <tr>
-                <td>[% l('Record Match Set') %]</td>
-                <td><div id='acq-upload-vl-match-set'></div></td>
-            </tr>
-            <tr>
-                <td>[% l('Merge Profile') %]</td>
-                <td><div id='acq-upload-vl-merge-profile'></div></td>
-            </tr>
-            <tr>
-                <td>[% l('Import Non-Matching Records') %]</td>
-                <td><input dojoType='dijit.form.CheckBox' jsId='acqPlUploadImportNomatch'></input></td>
-            </tr>
-            <tr>
-                <td>[% l('Select a Record Source') %]</td>
-                <td><div id='acq-upload-vl-bib-source'></div></td>
-            </tr>
-            <tr>
-                <td>[% l('Merge On Exact Match (901c)') %]</td>
-                <td><input dojoType='dijit.form.CheckBox' jsId='acqPlUploadAutoOverlayExact'></input></td>
-            </tr>
-            <tr>
-                <td>[% l('Merge On Single Match') %]</td>
-                <td><input dojoType='dijit.form.CheckBox' jsId='acqPlUploadAutoOverlay1Match'></input></td>
-            </tr>
-            <tr>
-                <td>[% l('Merge On Best Match') %]</td>
-                <td><input dojoType='dijit.form.CheckBox' jsId='acqPlUploadAutoOverlayBestMatch'></input></td>
-            </tr>
-            <tr>
-                <td>[% l('Best/Single Match Minimum Quality Ratio') %]</td>
-                <td colspan='4'>
-                    <input style='width:3em' value='0.0' jsId='vlUploadQueueAutoOverlayBestMatchRatio' dojoType='dijit.form.TextBox'/>
-                    <span style='padding-left: 10px; font-size:90%'>[% l('New Record Quality / Quality of Best Match') %]</span>
-                </td>
-            </tr>
-            <tr>
-                <td>[% l('Insufficient Quality Fall-Through Profile') %]</td>
-                <td><div id='acq-upload-vl-fallthru-merge-profile'></div></td>
-            </tr>
-
+            [% INCLUDE 'acq/common/vlagent.tt2' %]
             <tr><td colspan='2'><hr/></td></tr>
 
             <tr>
@@ -130,5 +90,6 @@
         </div>
     </div>
 </form>
+<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/picklist/upload.js'> </script>
 [% END %]

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 f64544f..bd7727d 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/picklist/upload.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/upload.js
@@ -13,12 +13,7 @@ dojo.require('openils.acq.Picklist');
 var VANDELAY_URL = '/vandelay-upload';
 var providerWidget;
 var orderAgencyWidget;
-
-var matchSet;
-var mergeProfile;
-var importNomatch;
-var importBibSource;
-var autoOveralayExact;
+var vlAgent;
 
 function init() {
     dojo.byId('acq-pl-upload-ses').value = openils.User.authtoken;
@@ -41,33 +36,8 @@ function init() {
         function(w) { orderAgencyWidget = w }
     );
 
-    new openils.widget.AutoFieldWidget({
-        fmClass : 'vms', 
-        selfReference : true,
-        orgLimitPerms : ['CREATE_PURCHASE_ORDER'],
-        parentNode : dojo.byId('acq-upload-vl-match-set')
-    }).build(function(w) {  }); 
-
-    new openils.widget.AutoFieldWidget({
-        fmClass : 'vmp', 
-        selfReference : true,
-        orgLimitPerms : ['CREATE_PURCHASE_ORDER'],
-        parentNode : dojo.byId('acq-upload-vl-merge-profile')
-    }).build(function(w) {  }); 
-
-    new openils.widget.AutoFieldWidget({
-        fmClass : 'vmp', 
-        selfReference : true,
-        orgLimitPerms : ['CREATE_PURCHASE_ORDER'],
-        parentNode : dojo.byId('acq-upload-vl-fallthru-merge-profile')
-    }).build(function(w) {  }); 
-
-    new openils.widget.AutoFieldWidget({
-        fmClass : 'cbs', 
-        selfReference : true,
-        orgLimitPerms : ['CREATE_PURCHASE_ORDER'],
-        parentNode : dojo.byId('acq-upload-vl-bib-source')
-    }).build(function(w) {  }); 
+    vlAgent = new VLAgent();
+    vlAgent.init();
 
     fieldmapper.standardRequest(
         ['open-ils.acq', 'open-ils.acq.picklist.user.retrieve.atomic'],
@@ -123,23 +93,18 @@ function acqSendUploadForm(args) {
 function acqHandlePostUpload(key) {
 
     var args = {
-        picklist : args.picklist,
+        picklist : acqPlUploadPlSelector.attr('value'),
         provider : providerWidget.attr('value'),
         ordering_agency : orderAgencyWidget.attr('value'),
         create_po : acqPlUploadCreatePo.attr('value'),
         activate_po : acqPlUploadActivatePo.attr('value'),
-        vandelay : {
-            import_no_match : acqPlUploadImportNomatch.attr('value'),
-            auto_overlay_exact : acqPlUploadAutoOverlayExact.attr('value'),
-            auto_overlay_1match : acqPlUploadAutoOverlay1Match.attr('value'),
-            auto_overlay_best_match : acqPlUploadAutoOverlayBestMatch.attr('value')
-        }
+        vandelay : vlAgent.values()
     };
 
     fieldmapper.standardRequest(
         ['open-ils.acq', 'open-ils.acq.process_upload_records'],
         {   async: true,
-            params: [openils.User.authtoken, key],
+            params: [openils.User.authtoken, key, args],
             onresponse : function(r) {
                 var resp = openils.Util.readResponse(r);
                 console.log(js2JSON(resp));