X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fcontrollers%2Ftransfer.py;h=ed0601845fc58b9db6f8ad67bfd1daf1e10d0702;hb=9cc05ca9160a9432d037afb9cc22c511e2542947;hp=b4b375ab2de4019a765aae26b301e24bf3d17be5;hpb=d24e23a6a01ed245e204c8c29fc10a5fbc6f8bc4;p=bluechips.git

diff --git a/bluechips/controllers/transfer.py b/bluechips/controllers/transfer.py
index b4b375a..ed06018 100644
--- a/bluechips/controllers/transfer.py
+++ b/bluechips/controllers/transfer.py
@@ -4,47 +4,74 @@ Handle transfers
 
 import logging
 
+from datetime import date
+
 from bluechips.lib.base import *
-from bluechips.widgets import transfer
 
-from pylons import request
+from pylons import request, app_globals as g
+from pylons.decorators import validate
+from pylons.decorators.secure import authenticate_form
+from pylons.controllers.util import abort
+
+from formencode import Schema, validators
+
+from mailer import Message
 
 log = logging.getLogger(__name__)
 
+
+class TransferSchema(Schema):
+    "Validate a transfer."
+    allow_extra_fields = False
+    debtor_id = validators.Int(not_empty=True)
+    creditor_id = validators.Int(not_empty=True)
+    amount = model.types.CurrencyValidator(not_empty=True)
+    description = validators.UnicodeString()
+    date = validators.DateConverter()
+ 
+
 class TransferController(BaseController):
     def index(self):
-        c.title = 'Add a New Transfer'
-        
-        c.transfer = dict()
-        c.transfer['debtor'] = request.environ['user']
-        
-        return render('/transfer/index.mako')
+       return self.edit()
     
-    def edit(self, id):
-        c.title = 'Edit a Transfer'
-        
-        c.transfer = meta.Session.query(model.Transfer).get(id)
-        
+    def edit(self, id=None):
+        c.users = meta.Session.query(model.User.id, model.User.name)
+        if id is None:
+            c.title = 'Add a New Transfer'
+            c.transfer = model.Transfer()
+            c.transfer.debtor_id = request.environ['user'].id
+            c.transfer.date = date.today()
+        else:
+            c.title = 'Edit a Transfer'
+            c.transfer = meta.Session.query(model.Transfer).get(id)
+            if c.transfer is None:
+                abort(404)
         return render('/transfer/index.mako')
     
-    @validate(form=transfer.new_transfer_form, error_handler='index')
+    @redirect_on_get('edit')
+    @authenticate_form
+    @validate(schema=TransferSchema(), form='edit')
     def update(self, id=None):
-        # Validate the submission
-        if not valid(self, transfer.new_transfer_form):
-            if id is None:
-                return self.index()
-            else:
-                return self.edit(id)
-        
         if id is None:
             t = model.Transfer()
             meta.Session.add(t)
+            op = 'created'
         else:
             t = meta.Session.query(model.Transfer).get(id)
+            if t is None:
+                abort(404)
+            op = 'updated'
         
         update_sar(t, self.form_result)
         meta.Session.commit()
-        
-        h.flash('Transfer recorded.')
-        
+       
+        show = ('Transfer of %s from %s to %s %s.' %
+                (t.amount, t.debtor, t.creditor, op))
+        h.flash(show)
+
+        # Send email notification to involved users if they have an email set.
+        body = render('/emails/transfer.txt', extra_vars={'transfer': t,
+                                                          'op': op})
+        g.handle_notification((t.debtor, t.creditor), show, body)
+
         return h.redirect_to('/')