From f4d8f4cc0fa9643c3ca04c7dcc2c87f3790160de Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Wed, 17 Mar 2010 20:04:30 -0400 Subject: [PATCH] Expenditures can now be given a list of "tags" Tags will be used to support future graphing features, like making graphs how much money is spent in different categories. --- bluechips/controllers/spend.py | 16 +++++++++++++++- bluechips/model/__init__.py | 16 ++++++++++++++-- bluechips/model/expenditure.py | 9 +++++++++ bluechips/model/tag.py | 10 ++++++++++ bluechips/templates/spend/index.mako | 4 ++++ 5 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 bluechips/model/tag.py diff --git a/bluechips/controllers/spend.py b/bluechips/controllers/spend.py index edc5ea2..9caa1b3 100644 --- a/bluechips/controllers/spend.py +++ b/bluechips/controllers/spend.py @@ -6,6 +6,7 @@ from __future__ import division import logging import re +import string from decimal import Decimal, InvalidOperation from bluechips.lib.base import * @@ -42,6 +43,12 @@ class ExpenditureExpression(validators.FancyValidator): except: raise formencode.Invalid("Not a valid mathematical expression", value, state) +class TagValidator(validators.FancyValidator): + def _to_python(self, value,state): + try: + return set(map(string.strip, value.split(','))) + except: + raise formencode.Invalid("Unable to parse tags", value, state) class ShareSchema(Schema): "Validate individual user shares." @@ -63,6 +70,7 @@ class ExpenditureSchema(Schema): spender_id = validators.Int(not_empty=True) amount = model.types.CurrencyValidator(not_empty=True) description = validators.UnicodeString(not_empty=True) + tags = TagValidator() date = validators.DateConverter() shares = ForEach(ShareSchema) chained_validators = [ValidateNotAllZero] @@ -89,6 +97,8 @@ class SpendController(BaseController): if user.resident: val = Decimal(1) c.values['shares-%d.amount' % ii] = val + + c.values['tags'] = u"" else: c.title = 'Edit an Expenditure' c.expenditure = meta.Session.query(model.Expenditure).get(id) @@ -102,6 +112,8 @@ class SpendController(BaseController): share = shares_by_user.get(user, '') c.values['shares-%d.amount' % ii] = share + c.values['tags'] = ', '.join([tag.tag for tag in c.expenditure.tags]) + return render('/spend/index.mako') @redirect_on_get('edit') @@ -122,6 +134,7 @@ class SpendController(BaseController): # Set the fields that were submitted shares = self.form_result.pop('shares') + tags = self.form_result.pop('tags') or set() update_sar(e, self.form_result) users = dict(meta.Session.query(model.User.id, model.User).all()) @@ -133,7 +146,8 @@ class SpendController(BaseController): split_dict[user] = amount split_text_dict[user] = amount_text e.split(split_dict, split_text_dict) - + e.tag(tags) + meta.Session.commit() show = ("Expenditure of %s paid for by %s %s." % diff --git a/bluechips/model/__init__.py b/bluechips/model/__init__.py index 90c8b4d..11fb0e5 100644 --- a/bluechips/model/__init__.py +++ b/bluechips/model/__init__.py @@ -7,6 +7,7 @@ from bluechips.model.expenditure import Expenditure from bluechips.model.split import Split from bluechips.model.subitem import Subitem from bluechips.model.transfer import Transfer +from bluechips.model.tag import Tag from bluechips.model import meta from bluechips.model import types @@ -53,6 +54,13 @@ splits = sa.Table('splits', meta.metadata, sa.Column('share', types.DBCurrency, nullable=False) ) +tags = sa.Table('tags', meta.metadata, + sa.Column('id', sa.types.Integer, primary_key=True), + sa.Column('expenditure_id', sa.types.Integer, + sa.ForeignKey('expenditures.id'), nullable=False), + sa.Column('tag', sa.Text, nullable=False)) + + subitems = sa.Table('subitems', meta.metadata, sa.Column('id', sa.types.Integer, primary_key=True), sa.Column('expenditure_id', sa.types.Integer, @@ -88,6 +96,8 @@ orm.mapper(Expenditure, expenditures, properties={ 'splits': orm.relation(Split, backref='expenditure', cascade='all, delete'), + 'tags': orm.relation(Tag, backref='expenditure', + cascade='all, delete'), 'subitems': orm.relation(Subitem, backref='expenditure', cascade='all, delete') }) @@ -96,6 +106,8 @@ orm.mapper(Split, splits, properties={ 'user': orm.relation(User) }) +orm.mapper(Tag, tags) + orm.mapper(Subitem, subitems, properties={ 'user': orm.relation(User) }) @@ -111,6 +123,6 @@ orm.mapper(Transfer, transfers, users.c.id)) }) -__all__ = ['users', 'expenditures', 'splits', 'subitems', 'transfers', - 'User', 'Expenditure', 'Split', 'Subitem', 'Transfer', +__all__ = ['users', 'expenditures', 'splits', 'tags', 'subitems', 'transfers', + 'User', 'Expenditure', 'Split', 'Tag', 'Subitem', 'Transfer', 'meta'] diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py index 8fd706b..6b3b1cb 100644 --- a/bluechips/model/expenditure.py +++ b/bluechips/model/expenditure.py @@ -2,6 +2,7 @@ from bluechips.model.user import User from bluechips.model.split import Split from bluechips.model import meta from bluechips.model.types import Currency +from bluechips.model.tag import Tag from decimal import Decimal from datetime import datetime import random @@ -74,6 +75,14 @@ class Expenditure(object): s = Split(self, user, share, split_text_dict[user]) meta.Session.add(s) + def tag(self, tags): + map(meta.Session.delete, + meta.Session.query(Tag).filter_by(expenditure_id=self.id)) + + for tag in tags: + t = Tag(self, tag) + meta.Session.add(t) + def involves(self, user): "Returns True if ``user`` is involved in this expenditure." return (any((split.user == user) and (split.share != 0) diff --git a/bluechips/model/tag.py b/bluechips/model/tag.py new file mode 100644 index 0000000..c6a3661 --- /dev/null +++ b/bluechips/model/tag.py @@ -0,0 +1,10 @@ +class Tag(object): + def __init__(self, expenditure=None, tag=u""): + self.expenditure = expenditure + self.tag = tag + + def __repr__(self): + return '' % (self.expenditure, + self.tag) + +__all__ = ['Tag'] diff --git a/bluechips/templates/spend/index.mako b/bluechips/templates/spend/index.mako index 916a307..5d2ee10 100644 --- a/bluechips/templates/spend/index.mako +++ b/bluechips/templates/spend/index.mako @@ -19,6 +19,10 @@ ${h.text('description', c.expenditure.description, size=64)} + + + ${h.text('tags', c.values['tags'], size=64)} +

Change how an expenditure is split up. Enter a percentage, or something like a percentage, for each user. They don't have to add to 100.

-- 2.45.2