Merge lp:~graeme-acm/sahana-eden/LA into lp:sahana-eden/la

[Graeme Foster]

remove donation request button when a donation has not been selected

fixed log 213 "Org Commit: Too Many for Slot should throw back error"

add fix to log 306

=== modified file 'controllers/don.py'
--- controllers/don.py	2011-09-07 02:47:29 +0000
+++ controllers/don.py	2011-09-08 12:42:18 +0000
@@ -164,34 +164,33 @@
     
     # Defined in the Model for use from Multiple Controllers for unified menus
     output =  response.s3.req_controller()
-    if len(request.args) >0:
-        args = request.args[0]
-    else:
-        args = None
-    reportButtons = DIV(
-                        BUTTON(T("Donation Request Form"),
-                               _class="accept-button",
-                               _onClick="javascript: window.location='%s'" % \
-                                    URL(c=request.controller,
-                                        f="req_print",
-                                        args=args
-                                        )
-                                ),
-                        # Also in controllers/vol.py - DRY
-                        A(IMG(_src="/%s/static/img/get_adobe_reader.png" % request.application,
-                              _title="%s - %s" % (T("Get Adobe Reader"),
-                                                  T("This link will open a new browser window.")),
-                              _alt=T("Get Adobe Reader"),
-                              _width=158,
-                              _height=39,
-                              _style="float:right;"),
-                          _href="http://www.adobe.com/products/acrobat/readstep2.html",
-                          _target="_blank"),
-                        )
     if "rheader" in output:
+        if len(request.args) >0:
+            args = request.args[0]
+        else:
+            args = None
+        reportButtons = DIV(
+                            BUTTON(T("Print Donation Request Form"),
+                                   _class="accept-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req_print",
+                                            args=args
+                                            )
+                                    ),
+                            # Also in controllers/vol.py - DRY
+                            A(IMG(_src="/%s/static/img/get_adobe_reader.png" % request.application,
+                                  _title="%s - %s" % (T("Get Adobe Reader"),
+                                                      T("This link will open a new browser window.")),
+                                  _alt=T("Get Adobe Reader"),
+                                  _width=158,
+                                  _height=39,
+                                  _style="float:right;"),
+                              _href="http://www.adobe.com/products/acrobat/readstep2.html",
+                              _target="_blank"),
+                            )
         output["rheader"].append(reportButtons)
-    else:
-        output["rheader"] = reportButtons
+
     return output
 
 def req_print():

=== modified file 'models/vol.py'
--- models/vol.py	2011-09-07 22:52:59 +0000
+++ models/vol.py	2011-09-08 12:42:18 +0000
@@ -175,11 +175,12 @@
             """
                 Check for DSW (interactive forms only)
             """
-
             if isinstance(form, FORM):
                 # Interactive form
                 _vars = request.post_vars
 
+                checkCommitmentLevels(request.args[0], None, form)
+
                 # Check for DSW
                 if "dsw" not in _vars or _vars.dsw != "on":
                     form.errors.dsw = T("You must agree to these conditions to commit to a Request for Volunteers")
@@ -537,6 +538,46 @@
                             list_fields=list_fields)
 
         # ---------------------------------------------------------------------
+        def assignment_onvalidate(form):
+
+            if isinstance(form, FORM):
+                # Interactive form
+                req_id = request.args[0]
+                if len(request.args) > 2:
+                    vas_id = request.args[2]
+                else:
+                    vas_id = None
+                checkCommitmentLevels(req_id, vas_id, form)
+                
+        def checkCommitmentLevels(req_id, vas_id, form):
+            rstable = db.req_req_skill
+            vastable = db.vol_assignment
+            _vars = request.post_vars
+            # get the number required
+            query = (rstable.req_id == req_id)
+            record = db(query).select(rstable.quantity,
+                                      limitby=(0, 1)).first()
+            needed = record.quantity
+            # get the number committed (excluding this record)
+            if vas_id == None:
+                query = (vastable.req_id == req_id) & \
+                        (vastable.deleted == False)
+            else:
+                query = (vastable.req_id == req_id) & \
+                        (vastable.deleted == False) & \
+                        (vastable.id != request.args[2])
+            rows = db(query).select(vastable.number)
+            qty = 0
+            for row in rows:
+                qty = qty + row.number
+            available = needed - qty
+            commit = _vars.number
+            # Check the number avaiblabe against the number committed
+            if available < commit:
+                form.vars.number = available
+                session.information = T("Only %s volunteers are required. The commitment total has been reduced." % available)
+            return
+        # ---------------------------------------------------------------------
         def assignment_onupdate(form):
             """
                 Update Fulfilment Status based on Check-Ins
@@ -608,6 +649,7 @@
         listadd = s3_has_role(STAFF)
 
         s3mgr.configure(tablename,
+                        onvalidation = assignment_onvalidate,
                         update_onaccept = assignment_onupdate,
                         ondelete = assignment_ondelete,
                         listadd = listadd)

=== modified file 'modules/s3/s3export.py'
--- modules/s3/s3export.py	2011-08-07 20:08:20 +0000
+++ modules/s3/s3export.py	2011-09-08 12:42:18 +0000
@@ -135,7 +135,7 @@
         table = resource.table
         query = resource.get_query()
         COL_WIDTH_MULTIPLIER = 360
-        ROW_ALTERNATING_COLOURS = [0x2A, 0x2B]
+        ROW_ALTERNATING_COLOURS = [0x2C, 0x1F]
         rowCnt = 0
         colCnt = 0
 
@@ -165,13 +165,13 @@
         styleLargeHeader.font.height = 400
         styleLargeHeader.alignment.horz = styleLargeHeader.alignment.HORZ_CENTER
         styleLargeHeader.pattern.pattern = styleLargeHeader.pattern.SOLID_PATTERN
-        styleLargeHeader.pattern.pattern_fore_colour = 0x2C
+        styleLargeHeader.pattern.pattern_fore_colour = 0x0C
 
         styleHeader = xlwt.XFStyle()
         styleHeader.font.bold = True
         styleHeader.num_format_str = "D-MMM-YYYY h:mm"
         styleHeader.pattern.pattern = styleHeader.pattern.SOLID_PATTERN
-        styleHeader.pattern.pattern_fore_colour = 0x2C
+        styleHeader.pattern.pattern_fore_colour = 0x28
 
         # Title row
         currentRow = sheet1.row(rowCnt)
@@ -203,7 +203,7 @@
         styleSubHeader = xlwt.XFStyle()
         styleSubHeader.font.bold = True
         styleSubHeader.pattern.pattern = styleHeader.pattern.SOLID_PATTERN
-        styleSubHeader.pattern.pattern_fore_colour = 0x18
+        styleSubHeader.pattern.pattern_fore_colour = 0x30
         styleOdd = xlwt.XFStyle()
         styleOdd.pattern.pattern = styleOdd.pattern.SOLID_PATTERN
         styleOdd.pattern.pattern_fore_colour = ROW_ALTERNATING_COLOURS[0]