X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fcontrollers%2Fstatus.py;h=2532dfac2da2d7189dc5bc15acdd1b22100d2c3a;hb=9458527642fab328a945d06daed04404c1ae2091;hp=9c0358f80056c95fbac0178dc7c4e40ddd7fd114;hpb=74d234f880ee6b3c510227ea94459b81a79755db;p=bluechips.git

diff --git a/bluechips/controllers/status.py b/bluechips/controllers/status.py
index 9c0358f..2532dfa 100644
--- a/bluechips/controllers/status.py
+++ b/bluechips/controllers/status.py
@@ -8,6 +8,7 @@ from bluechips.lib.base import *
 from bluechips.lib.totals import *
 
 import sqlalchemy
+from sqlalchemy import orm
 
 from datetime import date, timedelta
 
@@ -22,7 +23,7 @@ class StatusController(BaseController):
         c.debts = debts()
         c.settle = settle(c.debts)
         
-        c.total = self._total(sqlalchemy.text('1=1'))
+        c.total = self._total()
         
         year = date.today() - timedelta(days=365)
         this_year = date.today().replace(month=1, day=1)
@@ -30,17 +31,23 @@ class StatusController(BaseController):
         last_month = (date.today() - timedelta(days=30)).replace(day=1)
         
         c.year_total, c.this_year_total, c.this_month_total = \
-            [self._total(model.expenditures.c.date >= i)
+            [self._total(model.Expenditure.date >= i)
              for i in [year, this_year, this_month]]
         
 
         c.last_month_total = self._total(sqlalchemy.and_(
-                    model.expenditures.c.date >= last_month,
-                    model.expenditures.c.date < this_month))
+                    model.Expenditure.date >= last_month,
+                    model.Expenditure.date < this_month))
         
         c.expenditures = meta.Session.query(model.Expenditure).\
-            filter(model.Expenditure.spender==request.environ['user']).\
-            limit(10).all()
+                filter(sqlalchemy.or_(
+                    model.Expenditure.spender == request.environ['user'],
+                    model.Expenditure.splits.any(
+                        sqlalchemy.and_(
+                            model.Split.user == request.environ['user'],
+                            model.Split.share != 0)))).\
+                options(orm.eagerload('splits')).\
+                limit(10).all()
         c.transfers = meta.Session.query(model.Transfer).\
             filter(sqlalchemy.or_(
                 model.Transfer.debtor==request.environ['user'],
@@ -49,8 +56,9 @@ class StatusController(BaseController):
         
         return render('/status/index.mako')
     
-    def _total(self, where):
-        return Currency(meta.Session.execute(sqlalchemy.sql.select([
-                sqlalchemy.func.sum(model.expenditures.c.amount).\
-                    label('total')]).\
-                    where(where)).scalar() or 0)
+    def _total(self, conditions=None):
+        q = meta.Session.query(sqlalchemy.func.SUM(
+            model.Expenditure.amount))
+        if conditions is not None:
+            q = q.filter(conditions)
+        return q.scalar()