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

[Graeme Foster]

Got application_onaccept_interactive() to use application_manage_totals() to create the vol_assignment and update the req_req & req_req_skill status

Fixed some bugs in branch

=== modified file 'models/vol.py'
--- models/vol.py	2011-08-10 19:44:18 +0000
+++ models/vol.py	2011-08-11 06:41:45 +0000
@@ -163,60 +163,25 @@
             """
 
             req = form.request_vars.req_id
-            rstable = db.req_req_skill
-            query = (rstable.req_id == req)
-            record = db(query).select(rstable.quantity,
-                                      rstable.quantity_commit,
+            rrtable = db.req_req
+            query = (rrtable.id == req)
+            record = db(query).select(rrtable.request_number,
                                       limitby=(0, 1)).first()
-            if record and \
-               record.quantity > record.quantity_commit:
+            if record:
                 # Lookup the Report To
-                rtable = db.req_req
-                _req = db(rtable.id == req).select(rtable.request_for_id,
-                                                   limitby=(0, 1)).first()
-                if _req:
-                    report_to = _req.request_for_id
-                else:
-                    report_to = None
-                # Add Assignment
-                table = db.vol_assignment
-                assign = table.insert(req_id = req,
-                                      person_id = s3_logged_in_person(),
-                                      report_to_id = report_to)
-                # Update Commit Quantity in Req
-                query = (table.req_id == req) & \
-                        (table.deleted == False)
-                rows = db(query).select(table.number)
-                qty = 0
-                for row in rows:
-                    qty = qty + row.number
-                if qty >= record.quantity:
-                    commit_status = 2 # Complete (defined in models/req.py)
-                else:
-                    commit_status = 1 # Partial
-                db(rstable.req_id == req).update(quantity_commit = qty)
-                db(rtable.id == req).update(commit_status = commit_status)
-                if commit_status == 2:
-                    # Mail out Volunteer Roster
-                    response.s3.vol_rostermail(req)
-
-                session.confirmation = T("Your application has been successful - please notify us if you are unable to attend")
-                redirect(URL(c="vol", f="req", args=["assignment", assign]))
-                #s3mgr.configure("vol_assignment",
-                #                create_next = URL(c="vol",
-                #                                  f="req",
-                #                                  args=["assignment", assign]))
-                
-            else:
-                session.warning = T("Unfortunately this Request is already full - please apply for another")
-                redirect(URL(c="vol", f="req_skill"))
-                #s3mgr.configure("vol_assignment",
-                #                create_next = URL(c="vol",
-                #                                  f="req_skill"))
-
+                (result, assign) = application_manage_totals(record.request_number, s3_logged_in_person())
+                if result == False:
+                    session.warning = T("Unfortunately this Request is already full - please apply for another")
+                    redirect(URL(c="vol", f="req_skill"))
+                else:
+                    if result == "Full":
+                        # Mail out Volunteer Roster
+                        response.s3.vol_rostermail(req)
+                    session.confirmation = T("Your application has been successful - please notify us if you are unable to attend")
+                    redirect(URL(c="vol", f="req", args=["assignment", assign]))
             return
 
-        def application_onaccept(req_num):
+        def application_manage_totals(req_num, person_id):
             """
                 Check whether full
                 if full:
@@ -237,19 +202,25 @@
                                       limitby=(0, 1)).first()
             if record and \
                record.req_req_skill.quantity > record.req_req_skill.quantity_commit:
-                # Lookup the Report To
                 req_id = record.req_req.id
-                _req = db(rrtable.id == req_id).select(rrtable.request_for_id,
-                                                       limitby=(0, 1)).first()
-                if _req:
-                    report_to = _req.request_for_id
-                else:
-                    report_to = None
-                # Add Assignment
-                vatable = db.vol_assignment
-                query = (vatable.req_id == req_id) & \
-                        (vatable.deleted == False)
-                rows = db(query).select(vatable.number)
+                if person_id != None:
+                    # Lookup the Report To
+                    _req = db(rrtable.id == req_id).select(rrtable.request_for_id,
+                                                           limitby=(0, 1)).first()
+                    if _req:
+                        report_to = _req.request_for_id
+                    else:
+                        report_to = None
+    
+                    # Add Assignment
+                    vastable = db.vol_assignment
+                    assign = vastable.insert(req_id = req_id,
+                                          person_id = person_id,
+                                          report_to_id = report_to)
+                # Calculate the number of people assigned to a request
+                query = (vastable.req_id == req_id) & \
+                        (vastable.deleted == False)
+                rows = db(query).select(vastable.number)
                 qty = 0
                 for row in rows:
                     qty = qty + row.number
@@ -260,11 +231,11 @@
                 db(rstable.req_id == req_id).update(quantity_commit = qty)
                 db(rrtable.id == req_id).update(commit_status = commit_status)
                 if commit_status == 2:
-                    return "Full"
+                    return ("Full", assign)
                 else:
-                    return True
+                    return (True, assign)
             else:
-                return False
+                return (False, False)
             return
 
         def vol_application_onaccept_csv(req_csv):
@@ -273,7 +244,7 @@
             for r in csvReader:
                 # this relies on the named field being in the import file
                 reqNum = r["Request Number"]
-                application_onaccept(reqNum)
+                application_manage_totals(reqNum, None)
 
 
 

=== modified file 'modules/s3/s3import.py'
--- modules/s3/s3import.py	2011-08-10 22:12:05 +0000
+++ modules/s3/s3import.py	2011-08-11 06:41:45 +0000
@@ -661,12 +661,12 @@
                                    ignore_errors = True,
                                    commit = False,
                                   )
-#        # debug diagnostics validation errors
-#        if t != None:
-#            dump = StringIO()
-#            t.write(dump, pretty_print=True)
-#            _debug(dump.getvalue())
-#            print >> sys.stderr, dump.getvalue()
+        # debug diagnostics validation errors
+        if t != None:
+            dump = StringIO()
+            t.write(dump, pretty_print=True)
+            _debug(dump.getvalue())
+            print >> sys.stderr, dump.getvalue()
 #       # @todo: make this available on the UI in advanced mode
         if job == True:
             # no elements found

=== modified file 'modules/s3/s3rest.py'
--- modules/s3/s3rest.py	2011-08-10 15:13:21 +0000
+++ modules/s3/s3rest.py	2011-08-11 06:41:45 +0000
@@ -3327,7 +3327,6 @@
                 t = s
             elif format == "json":
                 if isinstance(s, basestring):
-                    from StringIO import StringIO
                     source = StringIO(s)
                     t = xml.json2tree(s)
                 else:
@@ -3359,7 +3358,7 @@
                                    commit=commit)
         self.files = Storage()
 
-        # debug diagnostics
+#        # debug diagnostics
 #        if tree != None:
 #            dump = StringIO()
 #            tree.getroottree().write(dump, pretty_print=True)

=== modified file 'modules/s3/s3widgets.py'
--- modules/s3/s3widgets.py	2011-08-10 18:13:43 +0000
+++ modules/s3/s3widgets.py	2011-08-11 06:41:45 +0000
@@ -157,10 +157,7 @@
 
         earliest = earliest.strftime(format)
         latest = latest.strftime(format)
-        
-        earliest = earliest.strftime(format)
-        latest = latest.strftime(format)
-        
+
         default = dict(
             _type = "text",
             _class = "anytime",  # Prevent default "datetime" calendar from showing up

=== modified file 'private/prepopulate/demo/LA/req_req.csv'
--- private/prepopulate/demo/LA/req_req.csv	2011-08-09 20:28:46 +0000
+++ private/prepopulate/demo/LA/req_req.csv	2011-08-11 06:41:45 +0000
@@ -1,15 +1,15 @@
 "Scenario","Event","Request Type","Request Number","Date Requested","Priority","Purpose","Date Required","Date Required Until","Requester","Assigned To","Approved by","Requested for","Requested for Facility","Transportation Required","Security Required","Public","Date Delivered","Received by","Comments"
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#01","07-24-2011 12:00:00","Medium","Provide refreshments to people coming to the Poinsettia Recreation Center Family Assistance Center to get information","09-26-2011 10:00:00","09-26-2011 20:00:00","Frank Bone","Joe Bloggs","Jeff Wayne","Curran Spencer","San Gabriel Pomona Valley Chapter","T","T","F","07-26-2011 9:15:00",,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#02","07-24-2011 12:15:00","High","Transportation required","09-26-2011 10:00:00","09-26-2011 20:00:00","Frank Bone","Jeff Wayne","Joe Bloggs","Curran Spencer","San Gabriel Pomona Valley Chapter","F","F","F",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#03","07-24-2011 12:00:00","Low","Additional water will be needed","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Curran Spencer","San Gabriel Pomona Valley Chapter","F","F","F",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#04","07-24-2011 12:15:00","High","Drivers are needed to be on stand-by","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#05","07-24-2011 12:15:00","Medium","We need people to prepare and hand out refreshments","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#06","07-24-2011 12:15:00","High","We need people to hand out information and welcome people","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#07","07-24-2011 12:20:00","Low","We need people to take donations","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#08","07-24-2011 12:20:00","Medium","We need some posters to be designed","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#09","07-24-2011 12:20:00","Medium","We need some security guards","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#10","07-24-2011 12:20:00","Medium","We need people to help plan the event","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#11","07-24-2011 12:20:00","Medium","We need people to take photographs of the event","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#12","07-24-2011 12:20:00","Medium","We need people to write up a summary of the event","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#13","07-24-2011 12:20:00","Medium","We need people to clear up afterward","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#14","07-24-2011 12:20:00","Medium","We need people to man the telephones and answer queries","09-26-2011 10:00:00","09-26-2011 20:00:00","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","F",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#01","2011-07-24 12:00:00","Medium","Provide refreshments to people coming to the Poinsettia Recreation Center Family Assistance Center to get information","2011-09-26 10:00:00","2011-09-26 20:00:00","Frank Bone","Joe Bloggs","Jeff Wayne","Curran Spencer","San Gabriel Pomona Valley Chapter","T","T","F","07-26-2011 9:15:00",,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#02","2011-07-24 12:00:01","High","Transportation required","2011-09-26 10:00:01","2011-09-26 20:00:01","Frank Bone","Jeff Wayne","Joe Bloggs","Curran Spencer","San Gabriel Pomona Valley Chapter","F","F","F",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#03","2011-07-24 12:00:02","Low","Additional water will be needed","2011-09-26 10:00:02","2011-09-26 20:00:02","Joe Bloggs","Jeff Wayne","Frank Bone","Curran Spencer","San Gabriel Pomona Valley Chapter","F","F","F",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#04","2011-07-24 12:00:03","High","Drivers are needed to be on stand-by","2011-09-26 10:00:03","2011-09-26 20:00:03","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#05","2011-07-24 12:00:04","Medium","We need people to prepare and hand out refreshments","2011-09-26 10:00:04","2011-09-26 20:00:04","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#06","2011-07-24 12:00:05","High","We need people to hand out information and welcome people","2011-09-26 10:00:05","2011-09-26 20:00:05","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#07","2011-07-24 12:00:06","Low","We need people to take donations","2011-09-26 10:00:06","2011-09-26 20:00:06","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#08","2011-07-24 12:00:07","Medium","We need some posters to be designed","2011-09-26 10:00:07","2011-09-26 20:00:07","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#09","2011-07-24 12:00:08","Medium","We need some security guards","2011-09-26 10:00:08","2011-09-26 20:00:08","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#10","2011-07-24 12:00:09","Medium","We need people to help plan the event","2011-09-26 10:00:09","2011-09-26 20:00:09","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#11","2011-07-24 12:00:10","Medium","We need people to take photographs of the event","2011-09-26 10:00:10","2011-09-26 20:00:10","Joe Bloggs","Jeff Wayne","Frank Bone","Iliana Hurley","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#12","2011-07-24 12:00:11","Medium","We need people to write up a summary of the event","2011-09-26 10:00:11","2011-09-26 20:00:11","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#13","2011-07-24 12:00:12","Medium","We need people to clear up afterward","2011-09-26 10:00:12","2011-09-26 20:00:12","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#14","2011-07-24 12:00:13","Medium","We need people to man the telephones and answer queries","2011-09-26 10:00:13","2011-09-26 20:00:13","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","San Gabriel Pomona Valley Chapter","F","F","F",,,