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

[Graeme Foster]

fix pre-populate: imported vol assignments were not appearing because they were not make owners of the record. The "report to" was not appearing because that value was not copied over to the vol_assignment table, now both done in application_manage_totals(). Emergency contact details not appearing now set up in the vol_contatc table

Minor change to the look of the vol assignment pdf

[lp:~graeme-acm/sahana-eden/LA]

2400. By graeme-acm on 2011-09-01

redo the certificate

2401. By graeme-acm on 2011-09-01

merge trunk

2402. By graeme-acm on 2011-09-01

merge trunk

=== modified file 'models/vol.py'
--- models/vol.py	2011-08-30 08:38:20 +0000
+++ models/vol.py	2011-08-30 14:17:35 +0000
@@ -257,15 +257,16 @@
 
                 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
+
                 if person_id != None:
                     # Only do this for non-CSV imports
                     # 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
                     if auth.user.organisation_id:
@@ -277,7 +278,12 @@
                         assign = vastable.insert(req_id = req_id,
                                                  person_id = person_id,
                                                  report_to_id = report_to)
-                else:
+                else: # for CSV imports
+                    db(vastable.req_id == req_id).update(report_to_id = report_to,
+                                                         created_by = vastable.person_id,
+                                                         modified_by = vastable.person_id,
+                                                         owned_by_user = vastable.person_id,
+                                                         )
                     assign = None
 
                 # Calculate the number of people assigned to a request
@@ -1023,11 +1029,15 @@
                 col2 = 20
                 col1 = (width - col2) *.5
                 col3 = (width - col2) *.5
-                style = [("VALIGN", (0, 0), (-1, -1), "TOP"),
-                         ("SPAN",(0, 0), (1, 0)),
-                        ]
-                table1 = pdf.getStyledTable(cell1, colWidths=[col1*.3, col1*.7], style=style)
-                table2 = pdf.getStyledTable(cell2, colWidths=[col3*.3, col3*.7], style=style)
+                style1 = [("VALIGN", (0, 0), (-1, -1), "TOP"),
+                          ("SPAN",(0, 0), (1, 0)),
+                         ]
+                style2 = [("VALIGN", (0, 0), (-1, -1), "TOP"),
+                          ("SPAN",(0, 0), (1, 0)),
+                          ("SPAN",(0,1),(0,2)),
+                         ]
+                table1 = pdf.getStyledTable(cell1, colWidths=[col1*.3, col1*.7], style=style1)
+                table2 = pdf.getStyledTable(cell2, colWidths=[col3*.3, col3*.7], style=style2)
                 style1_1 = [("VALIGN", (0, 0), (-1, -1), "TOP"),
                             ("BOX", (0, 0), (0, 0), 1, "#000000"),
                             ("BOX", (2, 0), (2, 0), 1, "#000000"),
@@ -1038,8 +1048,8 @@
                                            colWidths=[col1, col2, col3],
                                            style=style1_1
                                           )
-                table3 = pdf.getStyledTable(cell3, colWidths=[col1*.3, col1*.7], style=style)
-                table4 = pdf.getStyledTable(cell4, colWidths=[col3*.3, col3*.7], style=style)
+                table3 = pdf.getStyledTable(cell3, colWidths=[col1*.3, col1*.7], style=style1)
+                table4 = pdf.getStyledTable(cell4, colWidths=[col3*.3, col3*.7], style=style1)
                 tableC = pdf.getStyledTable([[table3, "", table4]],
                                            colWidths=[col1, col2, col3],
                                            style=style1_1)

=== modified file 'private/prepopulate/demo/LA/tasks.cfg'
--- private/prepopulate/demo/LA/tasks.cfg	2011-08-30 04:38:26 +0000
+++ private/prepopulate/demo/LA/tasks.cfg	2011-08-30 14:17:35 +0000
@@ -26,6 +26,7 @@
 req,req,req_req.csv,req.xsl
 req,req_item,req_item.csv,req_item.xsl
 req,req_skill,req_skill.csv,req_skill.xsl
-#vol,application,vol_application.csv,application.xsl
-#vol,assignment,vol_application.csv,assignment.xsl
-#*,vol_application_onaccept_csv,req_req.csv
+vol,application,vol_application.csv,application.xsl
+vol,assignment,vol_application.csv,assignment.xsl
+vol,contact,vol_application.csv,contact.xsl
+*,vol_application_onaccept_csv,req_req.csv

=== modified file 'private/prepopulate/demo/LA/vol_application.csv'
--- private/prepopulate/demo/LA/vol_application.csv	2011-08-09 10:26:21 +0000
+++ private/prepopulate/demo/LA/vol_application.csv	2011-08-30 14:17:35 +0000
@@ -2,7 +2,7 @@
 "LAUREL_CANYON*07_2011#04","Jane","Doe","Wynne","Parent","3024587621"
 "LAUREL_CANYON*07_2011#05","Jim","Jones","Audra","Parent","3034587621"
 "LAUREL_CANYON*07_2011#05","Cecilia","Key","Jonas","Parent","3044587621"
-"LAUREL_CANYON*07_2011#05","Emerald","Potter","Dennis","Parent","3054587621"
+"LAUREL_CANYON*07_2011#05","Wendy","Moses","Dennis","Parent","3054587621"
 "LAUREL_CANYON*07_2011#05","Bethany","Poole","Harlan","Parent","3064587621"
 "LAUREL_CANYON*07_2011#05","Odette","Combs","Allistair","Parent","3074587621"
 "LAUREL_CANYON*07_2011#05","Mia","Rivera","Kirk","Parent","3084587621"

=== modified file 'private/prepopulate/demo/LA/vol_assignment.csv'
--- private/prepopulate/demo/LA/vol_assignment.csv	2011-08-07 16:17:38 +0000
+++ private/prepopulate/demo/LA/vol_assignment.csv	2011-08-30 14:17:35 +0000
@@ -2,7 +2,7 @@
 "LAUREL_CANYON*07_2011#04","Jane","Doe",,"2011-08-05 21:10:00","2011-08-05 21:18:00",5
 "LAUREL_CANYON*07_2011#05","Jim","Jones",,"2011-08-05 21:18:00","2011-08-05 21:23:00",
 "LAUREL_CANYON*07_2011#05","Cecilia","Key",,,,
-"LAUREL_CANYON*07_2011#05","Emerald","Potter",,"2011-08-05 21:10:00","2011-08-05 21:18:00",4
+"LAUREL_CANYON*07_2011#05","Wendy","Moses,,"2011-08-05 21:10:00","2011-08-05 21:18:00",4
 "LAUREL_CANYON*07_2011#05","Bethany","Poole",,,,
 "LAUREL_CANYON*07_2011#05","Odette","Combs",,,,
 "LAUREL_CANYON*07_2011#05","Mia","Rivera",,,,

=== added file 'static/formats/s3csv/vol/contact.xsl'
--- static/formats/s3csv/vol/contact.xsl	1970-01-01 00:00:00 +0000
+++ static/formats/s3csv/vol/contact.xsl	2011-08-30 14:17:35 +0000
@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+    
+    <!-- **********************************************************************
+         Request Items - CSV Import Stylesheet
+
+         - example raw URL usage:
+           Let URLpath be the URL to Sahana Eden appliation
+           Let Resource be vol/contact/create
+           Let Type be s3csv
+           Let CSVPath be the path on the server to the CSV file to be imported
+           Let XSLPath be the path on the server to the XSL transform file
+           Then in the browser type:
+           
+           URLpath/Resource.Type?filename=CSVPath&transform=XSLPath
+           
+           You can add a third argument &ignore_errors
+         CSV fields:
+         First Name......................pr_person.first_name (lookup only)
+         Last Name.......................pr_person.last_name (lookup only)
+         Emergency Contact Name..........vol_contact.emergency_contact_name
+         Emergency Contact Relationship..vol_contact.emergency_contact_relationship
+         Emergency Contact Phone.........vol_contact.emergency_contact_phone
+            
+    *********************************************************************** -->
+
+    <xsl:output method="xml"/>
+
+    <xsl:template match="/">
+        <s3xml>
+            <!-- Create each record -->
+            <xsl:for-each select="table/row">
+
+                <!-- Person record -->
+                <xsl:variable name="FName"><xsl:value-of select="col[@field='First Name']"/></xsl:variable>
+                <xsl:variable name="LName"><xsl:value-of select="col[@field='Last Name']"/></xsl:variable>
+                <xsl:variable name="Person"><xsl:value-of select="concat($FName, $LName)"/></xsl:variable>
+                <resource name="pr_person">
+                    <xsl:attribute name="tuid">
+                        <xsl:value-of select="$Person"/>
+                    </xsl:attribute>
+                    <data field="first_name"><xsl:value-of select="$FName"/></data>
+                    <data field="last_name"><xsl:value-of select="$LName"/></data>
+                </resource>
+
+                <!-- Volunteer Application -->
+                <resource name="vol_contact">
+                    <reference field="person_id" resource="pr_person">
+                        <xsl:attribute name="tuid">
+                            <xsl:value-of select="$Person"/>
+                        </xsl:attribute>
+                    </reference>
+                    <data field="emergency_contact_name"><xsl:value-of select="col[@field='Emergency Contact Name']"/></data>
+                    <data field="emergency_contact_relationship"><xsl:value-of select="col[@field='Emergency Contact Relationship']"/></data>
+                    <data field="emergency_contact_phone"><xsl:value-of select="col[@field='Emergency Contact Phone']"/></data>
+	            </resource>
+            </xsl:for-each>
+        </s3xml>
+    </xsl:template>
+</xsl:stylesheet>