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

[Graeme Foster]

minor fixes to vol assignment report (logo on badge, report to person)

Fix to dates to check utc details

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2011-09-02 11:01:59 +0000
+++ controllers/vol.py	2011-09-02 12:20:15 +0000
@@ -1545,7 +1545,7 @@
                                        TR(
                                         TD(record.request_number),
                                         TD(record.purpose),
-                                        TD(B(s3_date_represent(record.date_required)),
+                                        TD(B(s3_date_represent_utc(record.date_required)),
                                            BR(),
                                            "%s - %s" % (time_req,
                                                         time_until),

=== modified file 'models/00_utils.py'
--- models/00_utils.py	2011-08-29 01:19:43 +0000
+++ models/00_utils.py	2011-09-02 12:20:15 +0000
@@ -181,6 +181,7 @@
 s3_time_represent = S3DateTime.time_represent
 s3_datetime_represent = S3DateTime.datetime_represent
 s3_utc_represent = lambda dt: s3_datetime_represent(dt, utc=True)
+s3_date_represent_utc = lambda dt: s3_datetime_represent(dt, utc=True).split()[0]
 
 # -----------------------------------------------------------------------------
 def s3_filename(filename):

=== modified file 'models/req.py'
--- models/req.py	2011-09-02 11:01:59 +0000
+++ models/req.py	2011-09-02 12:20:15 +0000
@@ -1955,7 +1955,7 @@
                             time_until = ""
                         # Restore in case used later
                         deployment_settings.L10n.datetime_format = save
-                        return DIV(B(s3_date_represent(req.date_required)),
+                        return DIV(B(s3_date_represent_utc(req.date_required)),
                                    BR(),
                                    "%s - %s" % (time_req,
                                                 time_until)

=== modified file 'models/vol.py'
--- models/vol.py	2011-09-02 11:43:54 +0000
+++ models/vol.py	2011-09-02 12:20:15 +0000
@@ -827,6 +827,28 @@
                 canvas.line(width/2 - adjust, posn, width/2 - adjust, -marginB)
                 canvas.restoreState()
 
+            def badgeLogo(canvas, dataList):
+                """
+                    callback method to draw the tear off lines for the report
+                """
+                from PIL import Image
+                pdf = dataList[0]
+                top = dataList[1]
+                margin = dataList[3]
+                left1 = dataList[2] / 2 + margin
+                left2 = dataList[2] - margin
+                height = dataList[4]
+                adjust = dataList[5]
+                if pdf.logo and os.path.exists(pdf.logo):
+                    im = Image.open(pdf.logo)
+                    (iwidth, iheight) = im.size
+                    width = iwidth * (height/iheight)
+                    canvas.drawImage(pdf.logo,
+                                     left1 + adjust,
+                                     top - height - adjust,
+                                     width = width,
+                                     height = height)
+
             def pdfGridStyle(tableObj, startRow, rowCnt, endCol):
                 from reportlab.lib.colors import Color
                 style = [("FONTNAME", (0, 0), (-1, -1), "Helvetica"),
@@ -842,7 +864,7 @@
             from reportlab.lib.units import inch
             def assignmentPDF(pdf, **args):
                 # set the banner
-                pdf.setMargins(left=0.4*inch, right = 0.4*inch)
+                pdf.setMargins(bottom=0.3*inch, left=0.4*inch, right = 0.4*inch)
                 pdf.setHeaderBanner("static/img/la/Give2LAbranding_BW.jpg")
                 # get the assignment details
                 atable = db.vol_assignment
@@ -874,12 +896,12 @@
                 lbl_startTime = T("Arrival Time")
                 lbl_endTime = T("Finish Time")
                 lbl_meetingPoint = T("Location")
-                lbl_reportTo = T("Contact Person")
+                lbl_contact = T("Contact Person")
                 lbl_reportPlace = T("Contact Place")
                 lbl_email = T("Email")
                 lbl_phone = T("Phone Number")
                 lbl_title3 = "%s:" % T("Check-in Slip")
-                lbl_title4 = "%s:" % T("Volunteer ID")
+                lbl_title4 = "%s:" % T("VOLUNTEER ID")
                 lbl_volunteer = T("Volunteer")
                 lbl_task = T("Task")
                 lbl_task_comments = T("Comments")
@@ -887,6 +909,7 @@
                 lbl_checkout = T("Check-out Time")
                 lbl_address = T("Address")
                 lbl_emergenctContact = T("Emergency Contact")
+                lbl_report_to = T("Report To")
                 txt_disclaimer1 = T("As a volunteer working to assist disaster survivors and in disaster recovery efforts, you will be required to fill out and sign the Give2LA Registration Forms.")
                 txt_disclaimer2 = T("Please let us know in advance if you cannot report for your Volunteer Assignment by calling %(name)s on %(phone)s or via email at %(email)s.")
 
@@ -911,7 +934,7 @@
                 cell2 = []
                 heading = "<para align='CENTER'><b>%s</b></para>" % lbl_title2
                 cell2.append([pdf.addParagraph(heading, append=False), ""])
-                heading = "<b>%s</b>" % lbl_reportTo
+                heading = "<b>%s</b>" % lbl_contact
                 cell2.append([pdf.addParagraph(heading, append=False),
                               pdf.addParagraph(name, append=False)])
                 cell2.append(["", address])
@@ -988,7 +1011,6 @@
                 heading = "<b>%s</b>" % lbl_volunteer
                 cell3.append([pdf.addParagraph(heading, append=False),
                               pdf.addParagraph(vol_name, append=False)])
-# start log 122
                 heading = "<b>%s</b>" % lbl_task
                 cell3.append([pdf.addParagraph(heading, append=False),
                               pdf.addParagraph(record.purpose, append=False)])
@@ -999,9 +1021,6 @@
                 cell3.append([pdf.addParagraph(heading, append=False), ""])
                 heading = "<b>%s</b>" % lbl_checkout
                 cell3.append([pdf.addParagraph(heading, append=False), ""])
-# end log 122
-# log 105                heading = "<b>%s</b>" % lbl_address
-# log 105                cell3.append([pdf.addParagraph(heading, append=False), address])
                 heading = "<b>%s</b>" % lbl_emergenctContact
                 emContact = "%s<br/>%s" % (emergency_name,
                                            emergency_phone)
@@ -1010,19 +1029,22 @@
                               emContact])
 
                 cell4 = []
-                heading = "<para align='CENTER'><b>%s</b></para>" % lbl_title4
-                cell4.append([pdf.addParagraph(heading, append=False), ""])
-                heading = "<b>%s</b>" % lbl_volunteer
+                heading = "<b>%s</b>" % lbl_title4
+                cell4.append([pdf.addParagraph("", append=False),
+                              pdf.addParagraph(heading, append=False)])
+#                cell4.append([pdf.addParagraph(heading, append=False), ""])
+#                heading = "<b>%s</b>" % lbl_volunteer
+                cell4.append([pdf.addParagraph("", append=False),
+                              pdf.addParagraph("<u><b>%s</u></b>" %vol_name, append=False)])
+                heading = "<b>%s</b>" % lbl_report_to
                 cell4.append([pdf.addParagraph(heading, append=False),
-                              pdf.addParagraph(vol_name, append=False)])
+                              pdf.addParagraph(name, append=False)])
                 heading = "<b>%s</b>" % lbl_task
                 cell4.append([pdf.addParagraph(heading, append=False),
                               pdf.addParagraph(record.purpose, append=False)])
                 heading = "<b>%s</b>" % lbl_task_comments
                 cell4.append([pdf.addParagraph(heading, append=False),
                               pdf.addParagraph(comments, append=False)])
-# log 104                heading = "<b>%s</b>" % lbl_address
-# log 104                cell4.append([pdf.addParagraph(heading, append=False),address])
                 heading = "<b>%s</b>" % lbl_emergenctContact
                 cell4.append([pdf.addParagraph(heading, append=False),
                               emContact])
@@ -1036,6 +1058,7 @@
                 style1 = [("VALIGN", (0, 0), (-1, -1), "TOP"),
                           ("SPAN",(0, 0), (1, 0)),
                          ]
+                style1logo = [("VALIGN", (0, 0), (-1, -1), "TOP")]
                 style2 = [("VALIGN", (0, 0), (-1, -1), "TOP"),
                           ("SPAN",(0, 0), (1, 0)),
                           ("SPAN",(0,1),(0,2)),
@@ -1053,7 +1076,7 @@
                                            style=style1_1
                                           )
                 table3 = pdf.getStyledTable(cell3, colWidths=[col1*.3, col1*.7], style=style1)
-                table4 = pdf.getStyledTable(cell4, colWidths=[col3*.3, col3*.7], style=style1)
+                table4 = pdf.getStyledTable(cell4, colWidths=[col3*.3, col3*.7], style=style1logo)
                 tableC = pdf.getStyledTable([[table3, "", table4]],
                                            colWidths=[col1, col2, col3],
                                            style=style1_1)
@@ -1083,6 +1106,7 @@
                 # need to add the overlay at the end so that the canvas origin 
                 # is at the bottom of the printed page
                 pdf.addOverlay(tearOff, (h3[0]+5, width, 0.4*inch, 0.4*inch, inch+20))
+                pdf.addOverlay(badgeLogo, (pdf, h3[0], width, 5, .6*inch, 4))
 
             def rosterPDF(pdf, **args):
                 # set the banner

=== modified file 'private/prepopulate/demo/LA/req_req.csv'
--- private/prepopulate/demo/LA/req_req.csv	2011-09-02 08:18:15 +0000
+++ private/prepopulate/demo/LA/req_req.csv	2011-09-02 12:20:15 +0000
@@ -1,6 +1,6 @@
 "Event","Incident","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","2011-07-24 10: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","Koreatown/Wilshire District Office","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 10: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","Koreatown/Wilshire District Office","F","F","F",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#02","2011-07-24 10:00:01","High","Transportation required","2011-09-25 10:00:01","2011-09-25 20:00:01","Frank Bone","Jeff Wayne","Joe Bloggs","Curran Spencer","Koreatown/Wilshire District Office","F","F","F",,,
 "Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Inventory Items","LAUREL_CANYON*07_2011#03","2011-07-24 10: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","Koreatown/Wilshire District Office","F","F","F",,,
 "Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#04","2011-07-24 10: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","Koreatown/Wilshire District Office","F","F","T",,,
 "Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#05","2011-07-24 10: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","Koreatown/Wilshire District Office","F","F","T",,,
@@ -10,6 +10,6 @@
 "Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#09","2011-07-24 10: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","Koreatown/Wilshire District Office","F","F","T",,,
 "Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#10","2011-07-24 10: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","Koreatown/Wilshire District Office","F","F","T",,,
 "Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#11","2011-07-24 10: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","Koreatown/Wilshire District Office","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#12","2011-07-24 10:00:11","Medium","We need people to write up a summary of the event","2011-09-27 10:00:11","2011-09-26 20:00:11","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","Koreatown/Wilshire District Office","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#13","2011-07-24 10:00:12","Medium","We need people to clear up afterward","2011-09-27 10:00:12","2011-09-26 20:00:12","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","Koreatown/Wilshire District Office","F","F","T",,,
-"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#14","2011-07-24 10:00:13","Medium","We need people to man the telephones and answer queries","2011-09-27 10:00:13","2011-09-26 20:00:13","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","Koreatown/Wilshire District Office","F","F","F",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#12","2011-07-24 10:00:11","Medium","We need people to write up a summary of the event","2011-09-27 10:00:11","2011-09-27 20:00:11","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","Koreatown/Wilshire District Office","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#13","2011-07-24 10:00:12","Medium","We need people to clear up afterward","2011-09-27 10:00:12","2011-09-27 20:00:12","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","Koreatown/Wilshire District Office","F","F","T",,,
+"Summer 2011 Forest Fires","Laurel Canyon Brush Fire","Volunteer","LAUREL_CANYON*07_2011#14","2011-07-24 10:00:13","Medium","We need people to man the telephones and answer queries","2011-09-27 10:00:13","2011-09-27 20:00:13","Joe Bloggs","Jeff Wayne","Frank Bone","Emerald Potter","Koreatown/Wilshire District Office","F","F","F",,,