From ed8863d32a4d626a02bf1c5c930253003068ea3f Mon Sep 17 00:00:00 2001 From: Scott Torborg Date: Mon, 2 Nov 2009 15:36:10 -1000 Subject: [PATCH] added a 'My Share' column to lists of expenditures --- bluechips/model/expenditure.py | 10 ++++++++++ bluechips/public/css/main.css | 3 +++ bluechips/templates/base.mako | 2 ++ 3 files changed, 15 insertions(+) diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py index dda06c1..296ecf0 100644 --- 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 008d925..2be0d56 100644 --- 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 23e32f1..49476f1 100644 --- a/bluechips/templates/base.mako +++ b/bluechips/templates/base.mako @@ -76,6 +76,7 @@ Spender Description Amount + My Share % for e in es: @@ -90,6 +91,7 @@ ${formatUser(e.spender)} ${e.description} ${e.amount} + ${e.share(request.environ['user'])} ${h.link_to('Edit', h.url_for(controller='spend', action='edit', id=e.id))} % endfor -- 2.45.2