X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=bluechips%2Fcontrollers%2Ftransfer.py;h=50948456fad832da5bd81035aee1ea08a6d15d8c;hb=01eb085c206c4ba88045fb88a2f1076622bd2585;hp=79628ef3c18b0abb834e97ecbd12dd3ae377850e;hpb=acccaf1c26b247e15d6fe5e10658548cc4718295;p=bluechips.git

diff --git a/bluechips/controllers/transfer.py b/bluechips/controllers/transfer.py
index 79628ef..5094845 100644
--- a/bluechips/controllers/transfer.py
+++ b/bluechips/controllers/transfer.py
@@ -4,13 +4,18 @@ Handle transfers
 
 import logging
 
+from datetime import date
+
 from bluechips.lib.base import *
 
-from pylons import request
+from pylons import request, app_globals as g
 from pylons.decorators import validate
+from pylons.controllers.util import abort
 
 from formencode import Schema, validators
 
+from mailer import Message
+
 log = logging.getLogger(__name__)
 
 
@@ -19,9 +24,9 @@ class TransferSchema(Schema):
     allow_extra_fields = False
     debtor_id = validators.Int(not_empty=True)
     creditor_id = validators.Int(not_empty=True)
-    amount = validators.Number(not_empty=True)
+    amount = model.types.CurrencyValidator(not_empty=True)
     description = validators.UnicodeString()
-    date = validators.String()
+    date = validators.DateConverter()
  
 
 class TransferController(BaseController):
@@ -34,23 +39,37 @@ class TransferController(BaseController):
             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')
     
+    @redirect_on_get('edit')
     @validate(schema=TransferSchema(), form='edit')
     def update(self, id=None):
         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'
         
-        t.amount = self.form_result.pop('amount') * 100
         update_sar(t, self.form_result)
         meta.Session.commit()
-        
-        h.flash('Transfer updated.')
-        
+       
+        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('/')