added a default list of vendor order record data types. changed data type entry...

git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9613 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
index 84a3bbd..f0a280c 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/financial/view_provider.js
@@ -1,6 +1,7 @@
 dojo.require("dijit.Dialog");
 dojo.require('dijit.layout.TabContainer');
 dojo.require('dijit.layout.ContentPane');
+dojo.require('dijit.form.FilteringSelect');
 dojo.require('dojox.grid.Grid');
 dojo.require("fieldmapper.OrgUtils");
 dojo.require('openils.acq.Provider');
@@ -76,6 +77,13 @@ function createOrderRecordField(fields) {
     );
 }
 
+function setORDesc() {
+    var code = dijit.byId('oils-acq-provider-or-code');
+    var desc = dijit.byId('oils-acq-provider-or-desc');
+    desc.setValue(code.getDisplayedValue());
+}
+
+
 dojo.addOnLoad(fetchProvider);
 
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
index 43535c8..0b39f3b 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_provider.html
@@ -33,14 +33,31 @@
                 <div dojoType="dijit.form.DropDownButton">
                     <span>${('Create Order Record Field')}</span>
                     <div dojoType="dijit.TooltipDialog" execute="createOrderRecordField(arguments[0]);">
+                        <script type='dojo/connect' event='onOpen'>setORDesc();</script>
                         <table class='dijitTooltipTable'>
                             <tr>
                                 <td><label for="code">${_('Code:')} </label></td>
-                                <td><input dojoType='dijit.form.TextBox' name='code'></input></td>
+                                <td>
+                                    <!--
+                                    <select id='oils-acq-provider-or-code' name="code" dojoType="dijit.form.FilteringSelect">
+                                    -->
+                                    <select id='oils-acq-provider-or-code' name="code" dojoType="dijit.form.ComboBox">
+                                        <script type='dojo/connect' event='onChange'>setORDesc();</script>
+                                        <option value='fund_code'>Fund Code</option>
+                                        <option value='shelving_location'>Shelving Location</option>
+                                        <option value='quantity'>Quantity</option>
+                                        <option value='order_date'>Order Date</option>
+                                        <option value='volume_count'>Volume Count </option>
+                                        <option value='currency_type'>Currency Type</option>
+                                        <option value='internal_notes'>Internal Notes </option>
+                                        <option value='vendor_notes'>Vendor Notes</option>
+                                        <option value='estimated_price'>Estimated Price</option>
+                                    </select>
+                                </td>
                             </tr>
                             <tr>
                                 <td><label for="description">${_('Description:')} </label></td>
-                                <td><input dojoType="dijit.form.TextBox" name="description"> </input></td>
+                                <td><input id='oils-acq-provider-or-desc' dojoType="dijit.form.TextBox" name="description"> </input></td>
                             </tr>
                             <tr>
                                 <td><label for="amount">${_('XPath:')} </label></td>