added basic fund create and view

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

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
index bcdd7cf..cca2755 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/__init__.py
@@ -31,6 +31,7 @@ class AcqContext(SubContext):
         self.picklist_entry = ContextItem() # picklist_entry object
 
         self.currency_types = ContextItem()
+        self.fund = ContextItem()
         self.fund_name = ContextItem(cgi_name='acq.fn')
         self.fund_currency_type = ContextItem(cgi_name='acq.fc')
         self.fund_owner = ContextItem(cgi_name='acq.fo')

diff --git a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
index cfc92f9..4114258 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
+++ b/Open-ILS/web/oilsweb/oilsweb/controllers/acq/fund.py
@@ -8,7 +8,16 @@ import oils.org
 class FundController(BaseController):
 
     def view(self, **kwargs):
-        return 'view %s' % kwargs['id']
+        r = RequestMgr()
+        r.ctx.core.org_tree = oils.org.OrgUtil.fetch_org_tree()
+        fund_mgr = oilsweb.lib.acq.fund.FundMgr(r)
+        fund = fund_mgr.retrieve(kwargs.get('id'))
+        fund.owner(oils.org.OrgUtil.get_org_unit(fund.owner())) # flesh the owner
+        r.ctx.acq.fund = fund
+        return r.render('acq/financial/view_fund.html')
+
+    def list(self):
+        pass
 
     def create(self):
         r = RequestMgr()
@@ -20,7 +29,7 @@ class FundController(BaseController):
             fund.owner(r.ctx.acq.fund_owner)
             fund.currency_type(r.ctx.acq.fund_currency_type)
             fund_id = fund_mgr.create_fund(fund)
-            redirect_to(controller='acq/fund', action='view', id=fund_id)
+            return redirect_to(controller='acq/fund', action='view', id=fund_id)
 
         r.ctx.acq.currency_types = fund_mgr.fetch_currency_types()
         r.ctx.core.org_tree = oils.org.OrgUtil.fetch_org_tree()

diff --git a/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py b/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py
index 215097a..dcbe6fc 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py
+++ b/Open-ILS/web/oilsweb/oilsweb/lib/acq/fund.py
@@ -14,6 +14,13 @@ class FundMgr(object):
         oils.event.Event.parse_and_raise(types)
         return types
 
+    def retrieve(self, fund_id):
+        status = self.ses.request(
+            'open-ils.acq.fund.retrieve', 
+            self.request_mgr.ctx.core.authtoken, fund_id).recv().content()
+        oils.event.Event.parse_and_raise(status)
+        return status
+
     def create_fund(self, fund):
         fund_id = self.ses.request(
             'open-ils.acq.fund.create', 

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
new file mode 100644 (file)
index 0000000..4ee52c8
--- /dev/null
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/acq/financial/view_fund.html
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+<%inherit file='../base.html'/>
+<%namespace file='../../common/widgets.html' name='widget'/>
+<%def name="page_title()">${_('Evergreen Create Fund')}</%def>
+<%def name="block_content()">
+
+<form action='${c.oils.acq.prefix}/fund/create' method='POST'>
+    <table class='oils-admin-table'>
+        <tbody>
+            <tr>
+                <td class='oils-admin-label'>${_('Fund Name')}</td>
+                <td>${c.oils.acq.fund.name()}</td>
+            </tr>
+            <tr>
+                <td class='oils-admin-label'>${_('Fund Onwer')}</td>
+                <td>${c.oils.acq.fund.owner().name()}</td> 
+            </tr>
+            <tr>
+                <td class='oils-admin-label'>${_('Fund Currency Type')}</td>
+                <td>${c.oils.acq.fund.currency_type()}</td> 
+            </tr>
+        </tbody>
+    </table>
+</form>
+</%def>

diff --git a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
index 11f1db4..3829fbe 100644 (file)
--- a/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
+++ b/Open-ILS/web/oilsweb/oilsweb/templates/oils/default/common/widgets.html
@@ -4,8 +4,12 @@
     Define some common widgets 
 -->
 
-<%def name='org_draw_node(node, indent=0)'>
-    <option value='${node.id()}'>
+<%def name='org_draw_node(node, indent=0, selected=None)'>
+    <option value='${node.id()}'
+    % if selected == node.id():
+        selected='selected'
+    %endif
+    >
         % for i in range(indent):
             &#160;&#160;
         % endfor
@@ -18,7 +22,7 @@
         
 </%def>
 
-<%def name='org_select(select_name, tree=None)'>
+<%def name='org_select(select_name, tree=None, selected=None)'>
     <!-- Draws a select dropdown of the org tree provided
         with indentation based on org depth -->
     <%
@@ -26,6 +30,6 @@
             tree = c.oils.core.org_tree
     %>
     <select name='${select_name}'>
-        ${org_draw_node(tree, 0)}
+        ${org_draw_node(tree, 0, selected)}
     </select>
 </%def>