added a 'My Share' column to lists of expenditures

diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py
index dda06c1e0a9c7bf837e3668eef7835dc5cf2ca70..296ecf04929aa2c3c66790d3f5a86a76cdcd88b9 100644 (file)
--- a/bluechips/model/expenditure.py
+++ b/bluechips/model/expenditure.py
@@ -93,4 +93,14 @@ class Expenditure(object):
                 filter(Split.user == user).\
                 filter(Split.share != 0).first() is not None)
 
+    def share(self, user):
+        "Return the share corresponding to ``user``."
+        share = meta.Session.query(Split.share).\
+                filter(Split.expenditure == self).\
+                filter(Split.user == user).scalar()
+        if share is None:
+            return Currency(0)
+        else:
+            return share
+
 __all__ = ['Expenditure']

diff --git a/bluechips/public/css/main.css b/bluechips/public/css/main.css
index 008d925aa211a1ebbb20ec5c6271d9207d6f724c..2be0d56c61b791ce86c2fdfb9a438651aaf03879 100644 (file)
--- a/bluechips/public/css/main.css
+++ b/bluechips/public/css/main.css
@@ -59,6 +59,9 @@ table.list td.user {
 table.list td.amount {
     width: 90px;
 }
+table.list td.share {
+    width: 90px;
+}
 #totals {
     margin-bottom: 10px;
 }

diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index 23e32f1469ac123eaa7c0e4c5ab670bd3528b8b3..49476f16bbb8d8cda609071b3a298b24874e91fb 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -76,6 +76,7 @@
       <th class="user">Spender</th>
       <th class="description">Description</th>
       <th class="amount">Amount</th>
+      <th class="share">My Share</th>
       <th class="editlink"></th>
     </tr>
     % for e in es:
@@ -90,6 +91,7 @@
         <td class="user">${formatUser(e.spender)}</td>
         <td class="description">${e.description}</td>
         <td class="amount">${e.amount}</td>
+        <td class="share">${e.share(request.environ['user'])}</td>
         <td class="editlink">${h.link_to('Edit', h.url_for(controller='spend', action='edit', id=e.id))}</td>
       </tr>
     % endfor