Handle expenditures
"""
+from __future__ import division
import logging
+import re
+import string
from decimal import Decimal, InvalidOperation
from bluechips.lib.base import *
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
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):
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]
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()
user_id, user = user_row
val = 0
if user.resident:
- val = Decimal(100) / Decimal(num_residents)
+ 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)
c.values = {}
for ii, user_row in enumerate(c.users):
user_id, user = user_row
- shares_by_user = dict(((sp.user, sp.share) for sp
+ shares_by_user = dict(((sp.user, sp.share_text) for sp
in c.expenditure.splits))
- share = shares_by_user.get(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"))
- c.values['shares-%d.amount' % ii] = percent
+ 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')
# 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." %