dojo-ized the provider detail display

moved some inline style to the .css files

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py
index ac16702..fb043ab 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/provider.py
@@ -13,12 +13,9 @@ class ProviderController(BaseController):
 
     def view(self, **kwargs):
         r = RequestMgr()
-        provider = provider_mgr.retrieve(r, kwargs['id'])
-        provider.owner(OrgUtil.get_org_unit(provider.owner()))
-        r.ctx.acq.provider.value = provider
+        r.ctx.acq.provider_id = kwargs['id']
         return r.render('acq/financial/view_provider.html')
 
-
     def create(self):
         r = RequestMgr()
         ses = ClientSession(oils.const.OILS_APP_ACQ)

diff --git a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
index ec7d6bc..3814371 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
+++ b/Open-ILS/web/oilsweb/oilsweb/public/oils/media/css/skin/default/acq.css
@@ -6,6 +6,8 @@
 .oils-sub-navigate-block span { padding: 3px; }
 */
 
+.oils-acq-detail-content-pane {height:600px;width:100%}
+
 /* bib search */
 #oils-acq-search-container { width:100%; }
 #oils-acq-search-sources-block { width:32%; vertical-align: top; float: left; margin-right: 10px;}

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
index ecc148f..d9fec41 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
@@ -95,10 +95,6 @@
     <div id='oils-acq-list-header-label'>${_('Fund Details')}</div>
 </div>
 
-<style>
-    .oils-acq-detail-content-pane {height:500px;width:100%}
-</style>
-
 <div dojoType="dijit.layout.ContentPane" layoutAlign="top">
     <div dojoType="dijit.layout.TabContainer">
         <div dojoType="dijit.layout.ContentPane" 

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 aa856b0..efed380 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
@@ -1,25 +1,70 @@
 # -*- coding: utf-8 -*-
 <%inherit file='../base.html'/>
-<%namespace file='../../common/widgets.html' name='widget'/>
 <%def name="page_title()">${_('View Provider')}</%def>
 <%def name="block_content()">
 
-<% provider = c.oils.acq.provider.value %>
+<script>
+    dojo.require("dijit.Dialog");
+    dojo.require('dijit.layout.TabContainer');
+    dojo.require('dijit.layout.ContentPane');
+    dojo.require('dojox.grid.Grid');
+    dojo.require("fieldmapper.OrgUtils");
+    dojo.require('openils.acq.Provider');
+    dojo.require('openils.Event');
+    dojo.require('openils.User');
 
-<div id='oils-acq-list-header' class='container'>
-    <div id='oils-acq-list-header-label'>${provider.name()}</div>
+    var providerId = ${c.oils.acq.provider_id};
+    var provider = null;
+
+    function getOrgInfo(rowIndex) {
+        data = providerGrid.model.getRow(rowIndex);
+        if(!data) return;
+        return fieldmapper.aou.findOrgUnit(data.owner).shortname();
+    }
+
+    function loadProviderGrid() {
+        var store = new dojo.data.ItemFileReadStore({data:acqpro.toStoreData([provider])});
+        var model = new dojox.grid.data.DojoData(
+            null, store, {rowsPerPage: 20, clientSort: true, query:{id:'*'}});
+        providerGrid.setModel(model);
+        providerGrid.update();
+    }
+
+    function fetchProvider() {
+        fieldmapper.standardRequest(
+            ['open-ils.acq', 'open-ils.acq.provider.retrieve'],
+            {   async: true,
+                params: [ openils.User.authtoken, providerId ],
+                oncomplete: function(r) {
+                    provider = r.recv().content();
+                    loadProviderGrid(provider);
+                }
+            }
+        );
+    }
+
+    dojo.addOnLoad(fetchProvider);
+</script>
+
+
+<div dojoType="dijit.layout.ContentPane" layoutAlign="top">
+    <div dojoType="dijit.layout.TabContainer">
+        <div dojoType="dijit.layout.ContentPane" 
+                class='oils-acq-detail-content-pane' title="${_('Summary')}" selected='true' style='height:400px;'>
+            <script>
+                var providerGridLayout = [{
+                    cells : [[
+                        {name: '${_("ID")}', field: 'id'},
+                        {name: '${_("Name")}', field: "name", width:'auto'}, 
+                        {name: '${_("Owner")}', get:getOrgInfo}, 
+                        {name: '${_("Currency Type")}', field: "currency_type"},
+                    ]]
+                }];
+            </script>
+            <div jsId='providerGrid' dojoType="dojox.Grid" structure='providerGridLayout'> </div>
+        </div>
+    </div>
 </div>
 
-<table class='oils-admin-table'>
-    <tbody>
-        <tr>
-            <td class='oils-admin-label'>${_('Owner')}</td>
-            <td>${provider.owner().name()}</td> 
-        </tr>
-        <tr>
-            <td class='oils-admin-label'>${_('Currency')}</td>
-            <td>${provider.currency_type()}</td> 
-        </tr>
-    </tbody>
-</table>
 </%def>
+