Merge pull request #131 from JocelynDelalande/members-weights

Added Members weights handling

1 files changed, 12 insertions, 4 deletions

diff --git a/budget/forms.py b/budget/forms.py
index 2dde57d..7d6eb51 100644
--- a/budget/forms.py
+++ b/budget/forms.py
@@ -152,27 +152,35 @@ class BillForm(Form):
 class MemberForm(Form):
 
     name = TextField(_("Name"), validators=[Required()])
+    weight = CommaDecimalField(_("Weight"), default=1)
     submit = SubmitField(_("Add"))
 
-    def __init__(self, project, *args, **kwargs):
+    def __init__(self, project, edit=False, *args, **kwargs):
         super(MemberForm, self).__init__(*args, **kwargs)
         self.project = project
+        self.edit = edit
 
     def validate_name(form, field):
         if field.data == form.name.default:
             raise ValidationError(_("User name incorrect"))
-        if Person.query.filter(Person.name == field.data)\
-                .filter(Person.project == form.project)\
-                .filter(Person.activated == True).all():
+        if (not form.edit and Person.query.filter(
+                Person.name == field.data,
+                Person.project == form.project,
+                Person.activated == True).all()):
             raise ValidationError(_("This project already have this member"))
 
     def save(self, project, person):
         # if the user is already bound to the project, just reactivate him
         person.name = self.name.data
         person.project = project
+        person.weight = self.weight.data
 
         return person
 
+    def fill(self, member):
+        self.name.data = member.name
+        self.weight.data = member.weight
+
 
 class InviteForm(Form):
     emails = TextAreaField(_("People to notify"))