Switch from using Decimal to using a new Currency class

[bluechips.git] / bluechips / controllers / status.py

diff --git a/bluechips/controllers/status.py b/bluechips/controllers/status.py
index cba63e394a09e039ea948659f4550f3b8ebc2670..f3373ddc398ba93fcb3c6ebbc512d80be532189a 100644 (file)
--- a/bluechips/controllers/status.py
+++ b/bluechips/controllers/status.py
@@ -10,7 +10,8 @@ from bluechips.lib.totals import *
 import sqlalchemy
 
 from datetime import date, timedelta
-from decimal import Decimal
+
+from bluechips.model.types import Currency
 
 from pylons import request
 
@@ -21,7 +22,7 @@ class StatusController(BaseController):
         c.debts = debts()
         c.settle = settle(c.debts)
         
-        c.total = self._total(True)
+        c.total = self._total(sqlalchemy.text('1=1'))
         
         year = date.today() - timedelta(days=365)
         this_year = date.today().replace(month=1, day=1)
@@ -38,16 +39,18 @@ class StatusController(BaseController):
                     model.expenditures.c.date < this_month))
         
         c.expenditures = meta.Session.query(model.Expenditure).\
-            filter(model.Expenditure.spender==request.environ['user']).all()
+            filter(model.Expenditure.spender==request.environ['user']).\
+            limit(10).all()
         c.transfers = meta.Session.query(model.Transfer).\
             filter(sqlalchemy.or_(
                 model.Transfer.debtor==request.environ['user'],
-                model.Transfer.creditor==request.environ['user'])).all()
+                model.Transfer.creditor==request.environ['user'])).\
+                limit(10).all()
         
         return render('/status/index.mako')
     
     def _total(self, where):
-        return (meta.Session.execute(sqlalchemy.sql.select([
+        return Currency(meta.Session.execute(sqlalchemy.sql.select([
                 sqlalchemy.func.sum(model.expenditures.c.amount).\
                     label('total')]).\
-                    where(where)).scalar() or Decimal("0.00")) / 100
+                    where(where)).scalar() or 0)