X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fcontrollers%2Fstatus.py;h=cba63e394a09e039ea948659f4550f3b8ebc2670;hb=46b297349fdb6313d34a4128caf6e5b64b57bfa8;hp=37992e59964d7b9d077644e56624b662c82c7bdc;hpb=a87834811aead8d14d349c2a0fa7af6a4d57001d;p=bluechips.git

diff --git a/bluechips/controllers/status.py b/bluechips/controllers/status.py
index 37992e5..cba63e3 100644
--- a/bluechips/controllers/status.py
+++ b/bluechips/controllers/status.py
@@ -12,6 +12,8 @@ import sqlalchemy
 from datetime import date, timedelta
 from decimal import Decimal
 
+from pylons import request
+
 log = logging.getLogger(__name__)
 
 class StatusController(BaseController):
@@ -19,7 +21,6 @@ class StatusController(BaseController):
         c.debts = debts()
         c.settle = settle(c.debts)
         
-        
         c.total = self._total(True)
         
         year = date.today() - timedelta(days=365)
@@ -36,6 +37,13 @@ class StatusController(BaseController):
                     model.expenditures.c.date >= last_month,
                     model.expenditures.c.date < this_month))
         
+        c.expenditures = meta.Session.query(model.Expenditure).\
+            filter(model.Expenditure.spender==request.environ['user']).all()
+        c.transfers = meta.Session.query(model.Transfer).\
+            filter(sqlalchemy.or_(
+                model.Transfer.debtor==request.environ['user'],
+                model.Transfer.creditor==request.environ['user'])).all()
+        
         return render('/status/index.mako')
     
     def _total(self, where):