beefd up po search form

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
index 29d0783..834f78f 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/search.js
@@ -7,6 +7,8 @@ dojo.require('openils.acq.Provider');
 dojo.require('fieldmapper.OrgUtils');
 dojo.require('dojo.date.locale');
 dojo.require('dojo.date.stamp');
+dojo.require('openils.User');
+dojo.require('openils.widget.OrgUnitFilteringSelect');
 
 function getOrgInfo(rowIndex) {
     data = poGrid.model.getRow(rowIndex);
@@ -67,6 +69,8 @@ function loadForm() {
         },
         'MANAGE_PROVIDER'
     );
+
+    new openils.User().buildPermOrgSelector('VIEW_PURCHASE_ORDER', poSearchOrderingAgencySelect);
 }
 
 dojo.addOnLoad(loadForm);

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
index 17852d7..e71599e 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/search.html
@@ -29,12 +29,37 @@
         doSearch(fields);
         return false; /* don't redirect */
     </script>
-    <label for='id'>${_('ID')}</label>
-    <input dojoType='dijit.form.NumberTextBox' name='id'> </input>
-    <label for='provider'>${_('Provider')}</label>
-    <select labelAttr='code' searchAttr='code' name='provider' 
-        style='overflow-y:auto;' jsId="providerSelector" dojoType="dijit.form.FilteringSelect"> </select>
-    <div dojoType='dijit.form.Button' type='submit'>${_("Search")}</div>
+    <style>#oils-acq-po-search-table td { padding: 4px; } </style>
+    <table id='oils-acq-po-search-table'>
+        <tr>
+            <td><label for='id'>${_('ID')}</label></td>
+            <td><input dojoType='dijit.form.NumberTextBox' name='id'> </input></td>
+        </tr>
+        <tr>
+            <td><label for='provider'>${_('Provider')}</label></td>
+            <td><select labelAttr='code' searchAttr='code' name='provider' 
+                style='overflow-y:auto;' jsId="providerSelector" dojoType="dijit.form.FilteringSelect"> </select></td>
+        </tr>
+        <tr>
+            <td><label for='state'>${_('State')}</label></td>
+            <td>
+                <select dojoType='dijit.form.FilteringSelect' name='state' value=''>
+                    <option value='new'>${_("New")}</option>
+                    <option value='in-process'>${_("In Process")}</option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td><label for='ordering_agency'>${_('Ordering Agency')}</label></td>
+            <td><select jsId='poSearchOrderingAgencySelect' 
+                dojoType='openils.widget.OrgUnitFilteringSelect' name='ordering_agency'>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td style='text-align:center;'><div dojoType='dijit.form.Button' type='submit'>${_("Search")}</div></td>
+        </tr>
+    </table>
 </form>
 
 <script>