added some search filters. added lineitem search to menu

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/li_search.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/li_search.js
index 0e255fc..b41d98c 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/li_search.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/po/li_search.js
@@ -13,17 +13,29 @@ var user = new openils.User();
 var lineitems = [];
 
 function drawForm() {
-
+    openils.acq.Provider.createStore(
+        function(store) {
+            providerSelector.store = 
+                new dojo.data.ItemFileReadStore({data:store});
+        },
+        'MANAGE_PROVIDER'
+    );
 }
 
 var liReceived;
 function doSearch(values) {
-    search = {};
-    search = {state:'new'};
+    var search = {};
+    for(var v in values) {
+        var val = values[v];
+        if(val != null && val != '')
+            search[v] = val;
+    }
+
     search = [search, {limit:searchLimit, offset:searchOffset}];
     options = {clear_marc:1, flesh_attrs:1};
 
     liReceived = 0;
+    lineitems = [];
     dojo.style('searchProgress', 'visibility', 'visible');
     fieldmapper.standardRequest(
         ['open-ils.acq', 'open-ils.acq.lineitem.search'],

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html
index 6dbbd54..1d47038 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/base.html
@@ -3,6 +3,7 @@
 <%def name='block_navigate()'>
     <div id='oils-acq-picklist-nav-div'>
         <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/search'>${_('PO Search')}</a></div>
+        <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/li_search'>${_('Lineitem Search')}</a></div>
         <div class='oils-acq-nav-link'><a href='${c.oils.acq.prefix.value}/po/marc_upload'>${_('Load Order Record')}</a></div>
     </div>
     <script>setSelectedNavLink('oils-acq-picklist-nav-div');</script>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/li_search.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/li_search.html
index 82a0238..43b2a27 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/li_search.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/po/li_search.html
@@ -15,8 +15,14 @@
                 doSearch(this.getValues());
                 return false; /* don't redirect */
             </script>
+            <label for='state'>${_('State')}</label>
             <select dojoType='dijit.form.FilteringSelect' name='state'>
                 <option value='new'>${_("New")}</option>
+                <option value='approved'>${_("Approved")}</option>
+            </select>
+            <label for='provider'>${_('Provider')}</label>
+            <select dojoType='dijit.form.FilteringSelect' name='provider' 
+                labalAttr='code' searchAttr='code' jsId='providerSelector'>
             </select>
             <div dojoType='dijit.form.Button' type='submit'>${_("Search")}</div>
         </div>