X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fcontrollers%2Fspend.py;h=43293071bdca31592c60f10d575bd281a6872363;hb=4d724b5efd7fd7c2c38a25e9d9210fe869aa0441;hp=2b4be30aa5ea276ace26de0852945a0ecbfb9c11;hpb=70206c7ae5218b469189b44881ce73a93498da07;p=bluechips.git diff --git a/bluechips/controllers/spend.py b/bluechips/controllers/spend.py index 2b4be30..4329307 100644 --- a/bluechips/controllers/spend.py +++ b/bluechips/controllers/spend.py @@ -2,42 +2,84 @@ Handle expenditures """ +from __future__ import division import logging +import re +import string from decimal import Decimal, InvalidOperation from bluechips.lib.base import * from pylons import request, app_globals as g -from pylons.decorators.rest import dispatch_on from pylons.decorators import validate +from pylons.decorators.secure import authenticate_form from pylons.controllers.util import abort +import formencode from formencode import validators, Schema from formencode.foreach import ForEach from formencode.variabledecode import NestedVariables +from formencode.schema import SimpleFormValidator from mailer import Message log = logging.getLogger(__name__) +class ExpenditureExpression(validators.FancyValidator): + goodChars = set('1234567890.+-/*() ') + + def _to_python(self, value, state): + if (not set(value) <= self.goodChars or + re.search(r'([\+\-\*\/])\1', value)): + raise formencode.Invalid("Expression contains illegal characters", value, state) + + if value == '': + return value, Decimal("0") + + try: + number = eval(value) + return value, Decimal(str(number)) + 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." allow_extra_fields = False user_id = validators.Int(not_empty=True) - amount = validators.Number(not_empty=True) + amount = ExpenditureExpression() +def validate_state(value_dict, state, validator): + if all(s['amount'] == 0 for s in value_dict['shares']): + return {'shares-0.amount': 'Need at least one non-zero share'} +ValidateNotAllZero = SimpleFormValidator(validate_state) + + +def prune_tags(): + for tag in meta.Session.query(model.Tag).all(): + if not tag.expenditures: + meta.Session.delete(tag) + meta.Session.commit() + class ExpenditureSchema(Schema): "Validate an expenditure." allow_extra_fields = False pre_validators = [NestedVariables()] spender_id = validators.Int(not_empty=True) amount = model.types.CurrencyValidator(not_empty=True) - description = validators.UnicodeString() + description = validators.UnicodeString(not_empty=True) + tags = TagValidator() date = validators.DateConverter() shares = ForEach(ShareSchema) + chained_validators = [ValidateNotAllZero] class SpendController(BaseController): @@ -45,7 +87,7 @@ class SpendController(BaseController): return self.edit() def edit(self, id=None): - c.users = meta.Session.query(model.User.id, model.User) + c.users = get_users() if id is None: c.title = 'Add a New Expenditure' c.expenditure = model.Expenditure() @@ -57,11 +99,12 @@ class SpendController(BaseController): c.values = {} for ii, user_row in enumerate(c.users): user_id, user = user_row + val = 0 if user.resident: - val = Decimal(100) / Decimal(num_residents) - else: - val = 0 + 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) @@ -70,21 +113,17 @@ class SpendController(BaseController): c.values = {} for ii, user_row in enumerate(c.users): user_id, user = user_row - try: - share = [s.share for s in c.expenditure.splits - if s.user == user][0] - if c.expenditure.amount == 0: - percent = 0 - else: - percent = (Decimal(100) * Decimal(int(share)) / - Decimal(int(c.expenditure.amount))).\ - quantize(Decimal("0.001")) - except IndexError: - percent = 0 - c.values['shares-%d.amount' % ii] = percent + shares_by_user = dict(((sp.user, sp.share_text) for sp + in c.expenditure.splits)) + share = shares_by_user.get(user, '') + c.values['shares-%d.amount' % ii] = share + + c.values['tags'] = ', '.join(c.expenditure.tags) return render('/spend/index.mako') + @redirect_on_get('edit') + @authenticate_form @validate(schema=ExpenditureSchema(), form='edit', variable_decode=True) def update(self, id=None): # Either create a new object, or, if we're editing, get the @@ -101,15 +140,21 @@ 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()) split_dict = {} + split_text_dict = {} for share_params in shares: user = users[share_params['user_id']] - split_dict[user] = Decimal(str(share_params['amount'])) - e.split(split_dict) - + amount_text, amount = share_params['amount'] or ('',Decimal('0')) + split_dict[user] = amount + split_text_dict[user] = amount_text + e.split(split_dict, split_text_dict) + e.tags.clear() + e.tags |= tags + meta.Session.commit() show = ("Expenditure of %s paid for by %s %s." % @@ -124,4 +169,40 @@ class SpendController(BaseController): 'op': op}) g.handle_notification(involved_users, show, body) + prune_tags() + + return h.redirect_to('/') + + def delete(self, id): + c.title = 'Delete an Expenditure' + c.expenditure = meta.Session.query(model.Expenditure).get(id) + if c.expenditure is None: + abort(404) + + return render('/spend/delete.mako') + + @redirect_on_get('delete') + @authenticate_form + def destroy(self, id): + e = meta.Session.query(model.Expenditure).get(id) + if e is None: + abort(404) + + if 'delete' in request.params: + meta.Session.delete(e) + + meta.Session.commit() + show = ("Expenditure of %s paid for by %s deleted." % + (e.amount, e.spender)) + h.flash(show) + + involved_users = set(sp.user for sp in e.splits if sp.share != 0) + involved_users.add(e.spender) + body = render('/emails/expenditure.txt', + extra_vars={'expenditure': e, + 'op': 'deleted'}) + g.handle_notification(involved_users, show, body) + + prune_tags() + return h.redirect_to('/')