could not get jubgrid to display anything. basically started over by copying lineitem...

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js
index 2f1dd7f..7d7aa32 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/ui_js/oils/default/acq/receiving/process.js
@@ -13,12 +13,12 @@ dojo.require('openils.widget.OrgUnitFilteringSelect');
 var lineitems = [];
 
 function drawForm() {
-    new openils.User().buildPermOrgSelector('VIEW_PURCHASE_ORDER', orderingAgencySelector);
+    new openils.User().buildPermOrgSelector('VIEW_PURCHASE_ORDER', orderingAgencySelect);
 }
-dojo.addOnLoad(drawForm);
 
 var liReceived;
 function doSearch(values) {
+
     var search = {
         attr_values : [values.identifier],
         po_agencies : (values.ordering_agency) ? [values.ordering_agency] : null,
@@ -48,8 +48,7 @@ function handleResult(r) {
 
 function viewList() {
     dojo.style('searchProgress', 'visibility', 'hidden');
-    dojo.style('oils-acq-li-recv-grid', 'visibility', 'visible');
-    dojo.style('oils-acq-li-recv-grid', 'display', 'block');
+    dojo.style('oils-acq-recv-grid', 'visibility', 'visible');
     var store = new dojo.data.ItemFileWriteStore(
         {data:jub.toStoreData(lineitems, null, 
             {virtualFields:['estimated_price', 'actual_price']})});
@@ -58,5 +57,5 @@ function viewList() {
     JUBGrid.populate(liGrid, model, lineitems);
 }
 
-
+dojo.addOnLoad(drawForm);
 

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
index 722ce5c..21584b3 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/receiving/process.html
@@ -1,60 +1,46 @@
 # -*- coding: utf-8 -*-
-<!-- 
- vim:ts=4:sw=4:et:ft=mako: 
+<!--
+- vim:ts=4:sw=4:et:ft=mako:
 -->
 <%inherit file='base.html'/>
-<%namespace file='../../common/jubgrid.html' name='jubgrid'/>
-
-<%def name="block_js()">
-    ${parent.block_js()}
-    <script src='${c.oils.core.media_prefix.value}/ui_js/oils/default/acq/receiving/process.js'> </script>
-</%def>
 <%def name="page_title()">${_('Receiving')}</%def>
+<%namespace file='../../common/jubgrid.html' name='jubgrid'/>
 
 <%def name="block_content()">
-<div dojoType="dijit.layout.LayoutContainer" style="height:100%">
-    <div dojoType="dijit.layout.ContentPane" layoutAlign="top">
-        <h1>Receiving Processing</h1>
-        <div>
-            <form dojoType='dijit.form.Form' action='' method=''>
-                <script type="dojo/method" event="onSubmit">
-                    doSearch(this.getValues());
-                    return false; /* don't redirect */
-                </script>
-                <table class='oils-acq-basic-form-table'>
-                    <tr>
-                        <td><label for='identifier'>${_('Identifier')}</label></td>
-                        <td>
-                            <input dojoType='dijit.form.TextBox' name='identifier'/>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for='ordering_agency'>${_('Ordering Agency')}</label></td>
-                        <td>
-                            <!-- make it a multi-select ? -->
-                            <select dojoType="openils.widget.OrgUnitFilteringSelect" jsId='orderingAgencySelector'
-                                searchAttr="shortname" name="ordering_agency" autocomplete="true" labelAttr='shortname'> </select>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td colspan='2'><div dojoType='dijit.form.Button' type='submit'>${_("Search")}</div></td>
-                    </tr>
-                </table>
-            </form>
-        </div>
-
-        <div id='oils-acq-li-recv-progress'>
-            <div dojoType="dijit.ProgressBar" style="width:300px" class='invisible'
-                jsId="searchProgress" id="searchProgress"/>
-        </div>
+    <script src='${c.oils.core.media_prefix.value}/ui_js/oils/default/acq/receiving/process.js'> </script>
+    <h1>Receiving Processing</h1><br/>
+    <div id='oils-acq-recv-search-block' class='container'>
+        <form dojoType='dijit.form.Form' action='' method=''>
+            <script type="dojo/method" event="onSubmit">
+                doSearch(this.getValues());
+                return false; /* don't redirect */
+            </script>
+            <table class='oils-acq-basic-form-table'>
+                <tr>
+                    <td><label for='identifier'>${_('Identifier')}</label></td>
+                    <td>
+                        <input dojoType='dijit.form.TextBox' name='identifier'/>
+                    </td>
+                </tr>
+                <tr>
+                    <td><label for="name">${_('Ordering Agency:')}</label></td>
+                    <td>
+                        <input dojoType="openils.widget.OrgUnitFilteringSelect" jsId='orderingAgencySelect'
+                            searchAttr="shortname" name="ordering_agency" autocomplete="true" labelAttr='shortname'> </input>
+                    </td>
+                </tr>
+                <tr>
+                    <td colspan='2'><div dojoType='dijit.form.Button' type='submit'>${_("Search")}</div></td>
+                </tr>
+            </table>
+        </form>
     </div>
-    <div dojoType="dijit.layout.ContentPane">
-        <div id='oils-acq-li-recv-grid'>
-            ${jubgrid.jubgrid('oils-acq-recv', 'liGrid')}
-        </div>
+    <div dojoType="dijit.ProgressBar" style="width:300px" jsId="searchProgress" id="searchProgress"></div>
+    <script>dojo.style('searchProgress', 'visibility', 'hidden');</script>
+    <div id='oils-acq-recv-grid' style='height:100%'>
+        ${jubgrid.jubgrid('oils-acq-recv', 'liGrid')}
     </div>
-</div>
+    <script>dojo.style('oils-acq-recv-grid', 'visibility', 'hidden');</script>
 </%def>
 <!-- Local Variables: -->
 <!-- mmm-classes: html-js -->