Store splits as straight currency instead of percentages

[bluechips.git] / bluechips / model / __init__.py

diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py
index 0b6485c1c2d6ab192c4407704a599334576641e2..830623bcc56ecd1b137e569d55ef8c2d3972184a 100644 (file)
--- a/bluechips/model/__init__.py
+++ b/bluechips/model/__init__.py
@@ -27,6 +27,7 @@ expenditures = sa.Table('expenditures', meta.metadata,
                         sa.Column('spender_id', sa.types.Integer,
                                   sa.ForeignKey('users.id'), nullable=False),
                         sa.Column('amount', types.Currency, nullable=False),
+                        sa.Column('description', sa.types.Text),
                         sa.Column('date', sa.types.Date, default=sa.func.now),
                         sa.Column('entered_time', sa.types.DateTime, 
                                   default=sa.func.now)
@@ -38,7 +39,7 @@ splits = sa.Table('splits', meta.metadata,
                             sa.ForeignKey('expenditures.id'), nullable=False),
                   sa.Column('user_id', sa.types.Integer,
                             sa.ForeignKey('users.id'), nullable=False),
-                  sa.Column('share', sa.types.Integer, nullable=False)
+                  sa.Column('share', types.Currency, nullable=False)
                   )
 
 subitems = sa.Table('subitems', meta.metadata,
@@ -57,17 +58,17 @@ transfers = sa.Table('transfers', meta.metadata,
                      sa.Column('creditor_id', sa.types.Integer,
                                sa.ForeignKey('users.id'), nullable=False),
                      sa.Column('amount', types.Currency, nullable=False),
+                     sa.Column('description', sa.Text, default=None),
                      sa.Column('date', sa.types.Date, default=sa.func.now),
                      sa.Column('entered_time', sa.types.DateTime,
-                               default=sa.func.now),
-                     sa.Column('desc', sa.Text, default=None)
+                               default=sa.func.now)
                      )
 
 ### ORM Classes ###
 
 class User(object):
     def __repr__(self):
-        return '<User: %w>' % (self.username)
+        return '<User: %s>' % (self.username)
 
 class Expenditure(object):
     def __repr__(self):