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

[Graeme Foster]

The demo data for prepopulating for a LA

Probably need to add more data but this gives:

L1 & L2 data (list provided)
Organisations (6)
Offices (15)
users (5)
HRM people (5)
HRM skills (list provided 64)
requests donations 3
request items (6)
requests volunteers 2
request skills (2)

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

2360. By graeme-acm on 2011-08-05

merge la

2361. By graeme-acm on 2011-08-06

merge la

2362. By graeme-acm on 2011-08-06

add callback for specific reports, allow for different data sources in the pdf table

2363. By graeme-acm on 2011-08-07

add raw data mode for pdf tables and some cell styling

2364. By graeme-acm on 2011-08-07

add vol assignments plus some bug fixes in s3import and appadmin

2365. By graeme-acm on 2011-08-07

fixed vol assignments

2366. By graeme-acm on 2011-08-08

merge la

2367. By graeme-acm on 2011-08-08

volunteer roster report

2368. By graeme-acm on 2011-08-09

volunteer roster report, and vol application prepop

2369. By graeme-acm on 2011-08-09

merge la

2370. By graeme-acm on 2011-08-09

merge la

2371. By graeme-acm on 2011-08-09

volunteer roster report, and vol application prepop

2372. By graeme-acm on 2011-08-09

merge la

2373. By graeme-acm on 2011-08-10

volunteer roster report, and vol application prepop

2374. By graeme-acm on 2011-08-10

merge la

2375. By graeme-acm on 2011-08-11

merge la

2376. By graeme-acm on 2011-08-11

prepopulate fix and some bug fixes

2377. By graeme-acm on 2011-08-11

vol assignment form

2378. By graeme-acm on 2011-08-11

merge la, fix importer bug

2379. By graeme-acm on 2011-08-11

vol assignment form

2380. By graeme-acm on 2011-08-11

merge la

2381. By graeme-acm on 2011-08-12

vol assignment form

2382. By graeme-acm on 2011-08-12

merge la

2383. By graeme-acm on 2011-08-13

volunteer assignment form

2384. By graeme-acm on 2011-08-13

merge la

2385. By graeme-acm on 2011-08-17

merge trunk

2386. By graeme-acm on 2011-08-17

fixes to prepopulate and some pdf reports

2387. By graeme-acm on 2011-08-17

make prepopulate flag a simple numerical flag

2388. By graeme-acm on 2011-08-17

merge trunk

2389. By graeme-acm on 2011-08-18

fix for dateutils and re_req import

2390. By graeme-acm on 2011-08-18

merge trunk

2391. By graeme-acm on 2011-08-18

fix for pre-populate flag in 000_config

2392. By graeme-acm on 2011-08-22

merge trunk

2393. By graeme-acm on 2011-08-22

minor bug fix

2394. By graeme-acm on 2011-08-27

merge trunk

2395. By graeme-acm on 2011-08-27

merge trunk

2396. By graeme-acm on 2011-08-27

changes to vol assignment pdf - see logs

2397. By graeme-acm on 2011-08-27

add volunteer certificate

2398. By graeme-acm on 2011-08-28

fixed bug in volunteer roster

2399. By graeme-acm on 2011-08-28

fixed bug set margin and then used margins in volunteer assignment report

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

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

vol & don certificates

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

merge trunk

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

donation certificate

2406. By graeme-acm on 2011-09-02

merge trunk

2407. By graeme-acm on 2011-09-02

logo in volunteer badge

2408. By graeme-acm on 2011-09-02

date represent change and vol assignmnet pdf tweak

2409. By graeme-acm on 2011-09-02

fix date represent for utc

2410. By graeme-acm on 2011-09-02

various fixes logs 152, 227 & 276

2411. By graeme-acm on 2011-09-03

various logs.

2412. By graeme-acm on 2011-09-06

merge trunk

2413. By graeme-acm on 2011-09-06

fix personal menu to give it maximum space available

2414. By graeme-acm on 2011-09-06

bug fix when adding donation form button (if no rheader bang)

2415. By graeme-acm on 2011-09-07

some work on the donation form plus fix to log 298

2416. By graeme-acm on 2011-09-07

merge trunk

2417. By graeme-acm on 2011-09-07

donation request from

2418. By graeme-acm on 2011-09-08

restrict an org to commit vols to the slots available

2419. By graeme-acm on 2011-09-08

log 306 - Excel colours

2420. By graeme-acm on 2011-09-11

change prepopulate to use new importer code (actual change rolled back until it works with the demos that we have)

2421. By graeme-acm on 2011-09-12

added a link for printing of a volunteer certificate

2422. By graeme-acm on 2011-09-12

breadcrumbs and warnings were overlapping

2423. By graeme-acm on 2011-09-12

merge trunk - resolve conflict

2424. By graeme-acm on 2011-09-12

fix emergency contacts on pre-populate

2425. By graeme-acm on 2011-09-12

merge trunk

2426. By graeme-acm on 2011-09-13

Update Help add FAQ

2427. By graeme-acm on 2011-09-13

merge trunk

2428. By graeme-acm on 2011-09-14

fix string %(descriptors)s

2429. By graeme-acm on 2011-09-14

merge trunk

2430. By graeme-acm on 2011-09-15

merge trunk

2431. By graeme-acm on 2011-09-15

donation certificate

2432. By graeme-acm on 2011-09-15

donation req signature

2433. By graeme-acm on 2011-09-15

donation add cert and request button and add signature line for certificate

2434. By graeme-acm on 2011-09-15

removed comment, confirmation received

2435. By graeme-acm on 2011-09-15

added on validate to the create org popup

2436. By graeme-acm on 2011-09-15

merge trunk

2437. By graeme-acm on 2011-09-15

merge trunk

2438. By graeme-acm on 2011-09-15

merge trunk

2439. By graeme-acm on 2011-09-16

merge trunk

2440. By graeme-acm on 2011-09-16

fix for log 347 vol ass form check in and check out time

2441. By graeme-acm on 2011-09-25

added selenium scripts used to generate the language file

2442. By graeme-acm on 2011-11-18

merge trunk

2443. By graeme-acm on 2011-11-18

minor tweaks to PDF and xls output

Unmerged revisions

2443. By graeme-acm on 2011-11-18

minor tweaks to PDF and xls output

2442. By graeme-acm on 2011-11-18

merge trunk

2441. By graeme-acm on 2011-09-25

added selenium scripts used to generate the language file

2440. By graeme-acm on 2011-09-16

fix for log 347 vol ass form check in and check out time

2439. By graeme-acm on 2011-09-16

merge trunk

2438. By graeme-acm on 2011-09-15

merge trunk

2437. By graeme-acm on 2011-09-15

merge trunk

2436. By graeme-acm on 2011-09-15

merge trunk

2435. By graeme-acm on 2011-09-15

added on validate to the create org popup

2434. By graeme-acm on 2011-09-15

removed comment, confirmation received

=== modified file 'VERSION'
--- VERSION	2011-11-17 22:53:42 +0000
+++ VERSION	2011-11-18 07:40:33 +0000
@@ -1,1 +1,3 @@
-r2906 (2011-11-17 22:53:41)
 \ No newline at end of file
+<<<<<<< TREE
+r2906 (2011-11-17 22:53:41)=======
+r2928 (2011-11-17 09:42:19)>>>>>>> MERGE-SOURCE
 
=== added file 'clean_la.cmd'
--- clean_la.cmd	1970-01-01 00:00:00 +0000
+++ clean_la.cmd	2011-11-18 07:40:33 +0000
@@ -0,0 +1,11 @@
+@echo off
+rem CHOICE Do you want to delete and reinitialise the Sahana Eden Database
+rem if ERRORLEVEL N goto end 
+
+rd /Q /S compiled
+
+del databases\*.* /Q 
+del errors\*.* /Q 
+del sessions\*.* /Q 
+python ..\..\web2py.py -S la -M -R applications\la\static\scripts\tools\noop.py
+PAUSE
 \ No newline at end of file
 
=== modified file 'controllers/admin.py'
--- controllers/admin.py	2011-10-16 02:20:28 +0000
+++ controllers/admin.py	2011-11-18 07:40:33 +0000
@@ -73,6 +73,37 @@
 
 
 # -----------------------------------------------------------------------------
+def register_onaccept(form):
+    """
+        LA-specific:
+            Ensure manually-created users get added to 'Staff' role &
+            have an HRM record created.
+    """
+    # Usual Registration Tasks
+    # (PR record, Authenticated Role, Contacts)
+    person = auth.s3_register(form)
+
+    # LA-specific
+    # Add to 'Staff' role
+    table = db.auth_group
+    STAFF = db(table.uuid == "STAFF").select(table.id,
+                                             limitby=(0, 1)).first().id
+    table = db.pr_person
+    person_uuid = db(table.id == person).select(table.uuid,
+                                                limitby=(0, 1)).first().uuid
+    table = db.auth_user
+    query = (table.person_uuid == person_uuid)
+    user = db(query).select(table.id,
+                            limitby=(0, 1)).first().id
+    table = db.auth_membership
+    table.insert(user_id = user,
+                 group_id = STAFF)
+
+    # Create an HRM record so that the user appears in human_resource_id() lookups
+    table = db.hrm_human_resource
+    table.insert(person_id=person)
+
+# -----------------------------------------------------------------------------
 @auth.s3_requires_membership(1)
 def user():
     """ RESTful CRUD controller """
@@ -84,7 +115,10 @@
     s3mgr.configure(tablename,
                     main="first_name",
                     # Add users to Person Registry & 'Authenticated' role:
-                    create_onaccept = auth.s3_register)
+                    create_onaccept = register_onaccept)
+
+    # Staff don't need a Mobile Phone
+    deployment_settings.auth.registration_requests_mobile_phone = False
 
     def disable_user(r):
         if not r.id:
@@ -116,7 +150,7 @@
         table = auth.settings.table_user
         query = (table.id == r.id)
         db(query).update(registration_key = "")
-
+        
         session.confirmation = T("User Account has been Approved")
         redirect(URL(args=[]))
 
@@ -751,6 +785,20 @@
     return response.stream(portable_app)
 
 # =============================================================================
+# LA Code
+# =============================================================================
+@auth.s3_requires_membership(1)
+def rostermail():
+    """
+        Email Addresses for the Volunteer Roster to be sent to
+    """
+
+    return s3_rest_controller("vol", resourcename)
+
+
+
+
+# =============================================================================
 # Deprecated Code below here
 # =============================================================================
 @auth.s3_requires_membership(1)
 
=== modified file 'controllers/default.py'
--- controllers/default.py	2011-11-14 23:42:57 +0000
+++ controllers/default.py	2011-11-18 07:40:33 +0000
@@ -25,6 +25,7 @@
 
     return response.download(request, db)
 
+<<<<<<< TREE
 # =============================================================================
 def register_validation(form):
     """ Validate the fields in registration form """
@@ -105,293 +106,17 @@
                                                        T("This setting can only be controlled by the Administrator.")))
 
 # =============================================================================
+=======
+# -----------------------------------------------------------------------------
+>>>>>>> MERGE-SOURCE
 def index():
     """ Main Home Page """
 
     title = deployment_settings.get_system_name()
     response.title = title
 
-    if deployment_settings.has_module("cr"):
-        s3mgr.load("cr_shelter")
-        SHELTERS = s3.crud_strings["cr_shelter"].subtitle_list
-    else:
-        SHELTERS = ""
-
-    # Menu Boxes
-    menu_btns = [#div, label, app, function
-                ["facility", SHELTERS, "cr", "shelter"],
-                ["facility", T("Warehouses"), "inv", "warehouse"],
-                ["facility", T("Hospitals"), "hms", "hospital"],
-                ["facility", T("Offices"), "org", "office"],
-                ["sit", T("Incidents"), "irs", "ireport"],
-                ["sit", T("Assessments"), "assess", "assess"],
-                ["sit", T("Assets"), "asset", "asset"],
-                ["sit", T("Inventory Items"), "inv", "inv_item"],
-                ["dec", T("Gap Map"), "project", "gap_map"],
-                ["dec", T("Gap Report"), "project", "gap_report"],
-                ["dec", T("Requests"), "req", "req"],
-                ["res", T("Projects"), "project", "project"],
-                ["res", T("Activities"), "project", "assess"],
-                ["res", T("Commitments"), "req", "commit"],
-                ["res", T("Sent Shipments"), "inv", "send"],
-                ["res", T("Received Shipments"), "inv", "recv"],
-                ]
-
-    # Change to (Mitigation)/Preparedness/Response/Recovery?
-    menu_divs = {"facility": DIV( H3(T("Facilities")),
-                                 _id = "facility_box", _class = "menu_box"),
-                 "sit": DIV( H3(T("Situation")),
-                              _id = "menu_div_sit", _class = "menu_div"),
-                 "dec": DIV( H3(T("Decision")),
-                              _id = "menu_div_dec", _class = "menu_div"),
-                 "res": DIV( H3(T("Response")),
-                              _id = "menu_div_res", _class = "menu_div"),
-                }
-
-    for div, label, app, function in menu_btns:
-        if deployment_settings.has_module(app):
-            # @ToDo: Also check permissions (e.g. for anonymous users)
-            menu_divs[div].append(A( DIV(label,
-                                         _class = "menu-btn-r"),
-                                     _class = "menu-btn-l",
-                                     _href = URL(app,function)
-                                    )
-                                 )
-
-    div_arrow = DIV(IMG(_src = "/%s/static/img/arrow_blue_right.png" % \
-                               request.application),
-                          _class = "div_arrow")
-    sit_dec_res_box = DIV(menu_divs["sit"],
-                          div_arrow,
-                          menu_divs["dec"],
-                          div_arrow,
-                          menu_divs["res"],
-                          _id = "sit_dec_res_box",
-                          _class = "menu_box fleft swidth"
-                     #div_additional,
-                    )
-    facility_box  = menu_divs["facility"]
-    facility_box.append( A( IMG(_src = "/%s/static/img/map_icon_128.png" % \
-                                    request.application),
-                            _href = URL(c="gis", f="index"),
-                            _title = T("Map")
-                            )
-                        )
-
-    datatable_ajax_source = ""
-    # Check logged in AND permissions
-    if AUTHENTICATED in session.s3.roles and \
-       auth.s3_has_permission("read", db.org_organisation):
-        org_items = organisation()
-        datatable_ajax_source = "/%s/default/organisation.aaData" % \
-                                request.application
-        response.s3.actions = None
-        response.view = "default/index.html"
-        auth.permission.controller = "org"
-        auth.permission.function = "site"
-        permitted_facilities = auth.permission.permitted_facilities(redirect_on_error=False)
-        manage_facility_box = ""
-        if permitted_facilities:
-            facility_list = s3_represent_facilities(db, permitted_facilities,
-                                                    link=False)
-            facility_opts = [OPTION(opt[1], _value = opt[0])
-                             for opt in facility_list]
-            if facility_list:
-                manage_facility_box = DIV(H3(T("Manage Your Facilities")),
-                                    SELECT(_id = "manage_facility_select",
-                                            _style = "max-width:400px;",
-                                            *facility_opts
-                                            ),
-                                    A(T("Go"),
-                                        _href = URL(c="default", f="site",
-                                                    args=[facility_list[0][0]]),
-                                        #_disabled = "disabled",
-                                        _id = "manage_facility_btn",
-                                        _class = "action-btn"
-                                        ),
-                                    _id = "manage_facility_box",
-                                    _class = "menu_box fleft")
-                response.s3.jquery_ready.append( """
-$('#manage_facility_select').change(function() {
-    $('#manage_facility_btn').attr('href', S3.Ap.concat('/default/site/',  $('#manage_facility_select').val()));
-})""" )
-            else:
-                manage_facility_box = DIV()
-
-        org_box = DIV( H3(T("Organizations")),
-                       A(T("Add Organization"),
-                          _href = URL(c="org", f="organisation",
-                                      args=["create"]),
-                          _id = "add-btn",
-                          _class = "action-btn",
-                          _style = "margin-right: 10px;"),
-                        org_items["items"],
-                        _id = "org_box",
-                        _class = "menu_box fleft"
-                        )
-    else:
-        manage_facility_box = ""
-        org_box = ""
-
-    # @ToDo: Replace this with an easily-customisable section on the homepage
-    #settings = db(db.s3_setting.id == 1).select(limitby=(0, 1)).first()
-    #if settings:
-    #    admin_name = settings.admin_name
-    #    admin_email = settings.admin_email
-    #    admin_tel = settings.admin_tel
-    #else:
-    #    # db empty and prepopulate is false
-    #    admin_name = T("Sahana Administrator").xml(),
-    #    admin_email = "support@Not Set",
-    #    admin_tel = T("Not Set").xml(),
-
-    # Login/Registration forms
-    self_registration = deployment_settings.get_security_self_registration()
-    registered = False
-    login_form = None
-    login_div = None
-    register_form = None
-    register_div = None
-    if AUTHENTICATED not in session.s3.roles:
-        # This user isn't yet logged-in
-        if request.cookies.has_key("registered"):
-            # This browser has logged-in before
-            registered = True
-
-        # Provide a login box on front page
-        request.args = ["login"]
-        auth.messages.submit_button = T("Login")
-        login_form = auth()
-        login_div = DIV(H3(T("Login")),
-                        P(XML("%s <b>%s</b> %s" % (T("Registered users can"),
-                                                   T("login"),
-                                                   T("to access the system")))))
-
-        if self_registration:
-            # Provide a Registration box on front page
-            request.args = ["register"]
-            if deployment_settings.get_terms_of_service():
-                auth.messages.submit_button = T("I accept. Create my account.")
-            else:
-                auth.messages.submit_button = T("Register")
-            register_form = auth()
-            register_div = DIV(H3(T("Register")),
-                               P(XML("%s <b>%s</b>" % (T("If you would like to help, then please"),
-                                                       T("sign-up now")))))
-
-             # Add client-side validation
-            s3_register_validation()
-
-            if session.s3.debug:
-                response.s3.scripts.append( "%s/jquery.validate.js" % s3_script_dir )
-            else:
-                response.s3.scripts.append( "%s/jquery.validate.min.js" % s3_script_dir )
-            if request.env.request_method == "POST":
-                post_script = """// Unhide register form
-    $('#register_form').removeClass('hide');
-    // Hide login form
-    $('#login_form').addClass('hide');"""
-            else:
-                post_script = ""
-            register_script = """
-    // Change register/login links to avoid page reload, make back button work.
-    $('#register-btn').attr('href', '#register');
-    $('#login-btn').attr('href', '#login');
-    %s
-    // Redirect Register Button to unhide
-    $('#register-btn').click(function() {
-        // Unhide register form
-        $('#register_form').removeClass('hide');
-        // Hide login form
-        $('#login_form').addClass('hide');
-    });
-
-    // Redirect Login Button to unhide
-    $('#login-btn').click(function() {
-        // Hide register form
-        $('#register_form').addClass('hide');
-        // Unhide login form
-        $('#login_form').removeClass('hide');
-    });""" % post_script
-            response.s3.jquery_ready.append(register_script)
-
-    if deployment_settings.frontpage.rss:
-        response.s3.external_stylesheets.append( "http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.css" )
-        response.s3.scripts.append( "http://www.google.com/jsapi?key=notsupplied-wizard" )
-        response.s3.scripts.append( "http://www.google.com/uds/solutions/dynamicfeed/gfdynamicfeedcontrol.js" )
-        counter = 0
-        feeds = ""
-        for feed in deployment_settings.frontpage.rss:
-            counter += 1
-            feeds = "".join((feeds,
-                             "{title: '%s',\n" % feed["title"],
-                             "url: '%s'}" % feed["url"]))
-            # Don't add a trailing comma for old IEs
-            if counter != len(deployment_settings.frontpage.rss):
-                feeds += ",\n"
-        feed_control = "".join(("""
-function LoadDynamicFeedControl() {
-  var feeds = [
-    """, feeds, """
-  ];
-  var options = {
-    // milliseconds before feed is reloaded (5 minutes)
-    feedCycleTime : 300000,
-    numResults : 5,
-    stacked : true,
-    horizontal : false,
-    title : '""", str(T("News")), """'
-  };
-  new GFdynamicFeedControl(feeds, 'feed-control', options);
-}
-// Load the feeds API and set the onload callback.
-google.load('feeds', '1');
-google.setOnLoadCallback(LoadDynamicFeedControl);"""))
-        response.s3.js_global.append( feed_control )
-
-    return dict(title = title,
-
-                sit_dec_res_box = sit_dec_res_box,
-                facility_box = facility_box,
-                manage_facility_box = manage_facility_box,
-                org_box = org_box,
-
-                r = None, # Required for dataTable to work
-                datatable_ajax_source = datatable_ajax_source,
-                #admin_name=admin_name,
-                #admin_email=admin_email,
-                #admin_tel=admin_tel,
-                self_registration=self_registration,
-                registered=registered,
-                login_form=login_form,
-                login_div=login_div,
-                register_form=register_form,
-                register_div=register_div
-                )
-
-# -----------------------------------------------------------------------------
-def organisation():
-    """
-        Function to handle pagination for the org list on the homepage
-    """
-
-    table = db.org_organisation
-    table.id.label = T("Organization")
-    table.id.represent = organisation_represent
-
-    response.s3.dataTable_sPaginationType = "two_button"
-    response.s3.dataTable_sDom = "rtip" #"frtip" - filter broken
-    response.s3.dataTable_iDisplayLength = 25
-
-    s3mgr.configure("org_organisation",
-                    listadd = False,
-                    addbtn = True,
-                    super_entity = db.pr_pentity,
-                    linkto = "/%s/org/organisation/%s" % (request.application,
-                                                          "%s"),
-                    list_fields = ["id",])
-
-    return s3_rest_controller("org", "organisation")
+    return dict(title = title)
+
 # -----------------------------------------------------------------------------
 def site():
     """
@@ -410,7 +135,7 @@
                      args = [id]))
     else:
         raise HTTP(404)
-
+        
 # -----------------------------------------------------------------------------
 def message():
     #if "verify_email_sent" in request.args:
@@ -447,12 +172,13 @@
     _table_user = auth.settings.table_user
     if request.args and request.args(0) == "profile":
         #_table_user.organisation.writable = False
-        _table_user.utc_offset.readable = True
-        _table_user.utc_offset.writable = True
+        #_table_user.utc_offset.readable = True
+        #_table_user.utc_offset.writable = True
+        pass
 
     login_form = register_form = None
     if request.args and request.args(0) == "login":
-        auth.messages.submit_button = T("Login")
+        auth.messages.submit_button = T("Sign In")
         form = auth()
         login_form = form
         if s3.crud.submit_style:
@@ -577,10 +303,25 @@
                 xlwt_version=xlwt_version
                 )
 
+# =============================================================================
+# LA Custom Views
+# =============================================================================
+def why():
+    """ Custom View """
+    response.title = T("Why?")
+    return dict()
+    
+# -----------------------------------------------------------------------------
+def contact():
+    """ Custom View """
+    response.title = T("Contact us")
+    return dict()
+
 # -----------------------------------------------------------------------------
 def help():
     """ Custom View """
     response.title = T("Help")
+<<<<<<< TREE
     return dict()
 
 # -----------------------------------------------------------------------------
@@ -623,5 +364,641 @@
         response.title = T("Contact us")
         return dict()
 
+=======
+    entries = []
+    question = T("How do I register as a volunteer?")
+    reply = T("Follow these steps, to register:")
+    list = []
+    list.append(T("On the Home Page, click the 'Volunteer' link.  Review the 'List of Requests for Volunteers'.  To select a %(request)s (Volunteer Task), click on %(apply)s; OR You can register by clicking the 'Register' link located on the top of the web page.") % dict(request="<i>%s</i>" % T("Request for Volunteers"),
+                                                                                                                                                                                                                                                                                apply = "<strong>%s</strong>" % T("'APPLY'")))
+    list.append(T("Enter your information into the Required Fields.  After you have entered your information, click %(accept)s to register.") % dict(accept="<strong>%s</strong" % T("'I ACCEPT, CREATE MY ACCOUNT'")))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("How do I update my Profile, Skills and Emergency Details?")
+    reply = T("After you are signed-in, please follow these steps to edit your profile: ")
+    list = []
+    list.append(T("On the top menu, click %(volunteer)s.") % dict(volunteer="<strong>%s</strong>" % T("VOLUNTEER")))
+    list.append(T("On the left menu, click %(profile)s .") % dict(profile="<strong>%s</strong>" % T("'My Profile'")))
+    list.append(T("On this page, you can update your profile."))
+    list.append(T("Additional information like %(notifications)s and other volunteer agency affiliations also can be updated in this page.") % dict(notifications="<strong>%s</strong>" % T("Notifications")))
+    list.append(T("Then click %(save)s") % dict(save="<strong>%s</strong>" % T("Save")))
+    list.append(T("On the left menu, click %(skills)s.") % dict(skills="<strong>%s</strong>" % T("Skills")))
+    list.append(T("Click the %s sign next to the skill(s) that best describes how you can support the City.") % "<strong>'+'</strong>")
+    list.append(T("You may also search for a skill by providing the first few characters in the search box.  (Example: When searching for 'Driving' skills, enter the first letters of the word)."))
+    list.append(T("If your skill(s) is not listed, you may enter it in the %(extraSkills)s field below.") % dict(extraSkills="<strong>%s</strong>" % T("Skills")))
+    list.append(T("Then click %(save)s") % dict(save="<strong>%s</strong>") % T("Save"))
+    list.append(T("You may also update your Emergency Contacts information by clicking on 'Emergency Contacts' located on the left menu."))
+    list.append(T("Then click %(save)s") % dict(save="<strong>%s</strong>") % T("Save"))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("How do I apply for a Volunteer Request after I have registered with Give2LA?")
+    reply = T("You can apply by clicking the %(signin)s link located on the top of the web page.") % dict(signin="<strong>%s</strong>" % T("'Sign-In'"))
+    list = []
+    list.append(T("Enter your E-Mail and Password information."))
+    list.append(T("Review the 'List of Requests for Volunteers'."))
+    list.append(T("To select a Volunteer Task, click on %(apply)s.") % dict(apply="<strong>%s</strong>") % T("'APPLY'"))
+    list.append(T("Review the 'Volunteer Assignment Details'.  Enter your Emergency Contact information."))
+    list.append(T("Download the Give2LA Volunteer Registration Forms, complete the forms, and take them with you to your Volunteer Assignment."))
+    list.append(T("Then click %(commit)s.") % dict(commit="<strong>%s</strong>") % T("Commit"))
+    list.append(T("Review the Volunteer Application details."))
+    list.append(T("Then click %(form)s and take them with you to your Volunteer Assignment.") % dict(form="<strong>%s</strong>" % T("'Print Volunteer Assignment Form'")))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("Can I provide feedback or evaluation for an assignment after volunteering?")
+    reply = T("Yes.  After you have signed-in, follow these steps:")
+    list = []
+    list.append(T("On the top menu, click %(volunteer)s.") % dict(volunteer="<strong>%s</strong>") % T("VOLUNTEER"))
+    list.append(T("On the left menu, click  %(assignments)s.") % dict(assignments="<strong>%s</strong>") % T("'My Assignments'"))
+    list.append(T("Click on the 'Details' button of the Volunteer Task you have completed."))
+    list.append(T("Scroll down to the bottom of the screen to get to 'Evaluation of Event'."))
+    list.append(T("Enter the evaluation details; and click %(save)s") % dict(save="<strong>%s</strong>") % T("Save"))
+    entry = (question, reply, list)
+    entries.append(entry)
+    question = T("I would like to register my corporation for donations, what is the process?")
+    reply = T("Follow these steps, to register")
+    list = []
+    list.append(T("Locate the %(register)s for Corporations and Organizations on the Home Page and click on it.") % dict(register="<strong>%s</strong>" % T("'CLICK HERE TO REGISTER'")))
+    list.append(T("Enter the Mandatory details and click on the button %(accept)s at the bottom of the screen to register") % dict(accept="<strong>%s</strong" % T("'I ACCEPT, CREATE MY ACCOUNT'")))
+    entry = (question, reply, list)
+    entries.append(entry)
+
+    return dict(entries=entries)
+
+# -----------------------------------------------------------------------------
+def faq():
+    """ Custom View """
+    donateLink = A(T("Donate Page"), _href=URL(c="don", f="index"))
+
+    response.title = T("Frequently Asked Questions")
+    entries = []
+    question = T("Is there a minimum age limit to volunteer?")
+    reply = T("Yes, you have to be at least 18 years of age to Volunteer.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("What is the Privacy policy of Give2LA?")
+    reply = T("Please refer to the %(privacy)s") % dict(privacy=A(T("Privacy Policy"),
+                                                        _href=URL(c="default", f="disclaimer")))
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Can I bring a friend to volunteer?")
+    reply = T("Yes, but your friend must also %(register)s and apply to the same Volunteer Assignment.") % dict(register=A(T("Register"),
+                                                                                                                _href=URL(c="vol", f="register")))
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Will I get any food or reimbursements for expenses while volunteering?")
+    reply = T("No, unless it is otherwise stated on the Volunteer Assignment.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Can I donate cash to support the City of Los Angeles?")
+    reply = T("Yes, you can donate cash to the %(laepf)s who support the City of Los Angeles or other partner organizations listed on the %(donate)s. These links will take you directly to the organization's website to complete the cash donation transaction.") % dict(laepf="<a href=http://laemergencypreparednessfoundation.org/>LAEPF</a>", donate=donateLink)
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("What is the process for donating in-kind Items?")
+    reply = T("The City of Los Angeles prefers cash donations. In-kind items can be donated directly to the organization(s) listed under Donate Items  or through any Upcoming Donation Drive  on the %(donate)s") % dict(donate=donateLink)
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Do I have to be a U.S. citizen or legal U.S. resident to volunteer?")
+    reply = T("Yes.  You must be a U.S. citizen,  legal U.S. resident, or have gained legal entry into the United States.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Do I have to live in the City of Los Angeles to volunteer?")
+    reply = T("No, anyone may register to support the City of Los Angeles' volunteer efforts.")
+    entry = (question, reply)
+    entries.append(entry)
+    question = T("Is my donation tax deductible?")
+    reply = T("Yes.  All donations are tax deductible.  The partner organization that receives your donation will provide a receipt for your donation.  Please make sure you obtain your tax receipt from the organization and keep it in a safe place for tax purposes.  The City of Los Angeles will not issue receipts for your donation.")
+    entry = (question, reply)
+    entries.append(entry)
+
+    return dict(entries=entries)
+
+# -----------------------------------------------------------------------------
+def sitemap():
+    """ Custom View """
+    response.title = T("Site Map")
+    return dict()
+
+# -----------------------------------------------------------------------------
+def disclaimer():
+    """ Custom View """
+    response.title = T("Disclaimer")
+    return dict()
+
+# -----------------------------------------------------------------------------
+def register():
+    """
+        Registration for Organisations
+        - custom form
+    """
+
+    # Which type of organisation are we registering?
+    don = False
+    vol = False
+    if "type" in request.vars:
+        if request.vars.type == "don":
+            don = True
+        elif request.vars.type == "vol":
+            vol = True
+            auth.settings.registration_requires_approval = True
+
+    auth.messages.submit_button = T("I accept. Create my account.")
+    request.args = ["register"]
+    _table_user.language.default = T.accepted_language
+    _table_user.language.readable = False
+    _table_user.language.writable = False
+    form = auth()
+    form.attributes["_id"] = "regform"
+    # Custom class for Submit Button
+    form[0][-1][0][0]["_class"] = "accept-button"
+
+    # Cancel button
+    form[0][-1][0].append(BR())
+    #form[0][-1][1].append(INPUT(_type="reset", _value=T("Cancel")))
+    form[0][-1][0].append(INPUT(_type="button",
+                                _value=T("Cancel"),
+                                _class="wide-grey-button",
+                                _onClick="javascript: history.go(-1)"))
+
+    formstyle = s3.crud.formstyle
+
+    # Organisation
+    if form.errors.organisation:
+        organisation_error = DIV(form.errors.organisation,
+                                 _id="organisation__error",
+                                 _class="error",
+                                 _style="display: block;")
+    else:
+        organisation_error = ""
+    if don:
+        label = T("Corporation/Organization Name")
+    else:
+        label = T("Organization Name")
+    row = formstyle(id      = "organisation", 
+                    label   = LABEL("%s:" % label,
+                                    SPAN(" *", _class="req")), 
+                    widget  = DIV(INPUT(_name="organisation",
+                                        _id="organisation",
+                                        _class="string"),
+                                  organisation_error),
+                    comment = "")
+    form[0].insert(0, row)
+
+    # Industry Sector
+    if vol:
+        hidden = True
+        widget = INPUT(_name="sector_id",
+                       _id="sector_id",
+                       _class="string")
+    else:
+        from gluon.sqlhtml import OptionsWidget
+        hidden = False
+        widget = OptionsWidget.widget(db.org_organisation.sector_id,
+                                      value="")
+    # dropdown
+    row = formstyle(id      = "sector_id", 
+                    label   = LABEL("%s:" % T("Industry Sector")), 
+                    widget  = widget,
+                    comment = "",
+                    hidden = hidden)
+    form[0].insert(1, row)
+    # freetext box for not listed
+    row = formstyle(id      = "sector_other",
+                    label   = LABEL("%s:" % T("Other Sector not listed")), 
+                    widget  = INPUT(_name="sector_other",
+                                    _id="sector_other",
+                                    _class="string"),
+                    comment = "",
+                    hidden = hidden)
+    form[0].insert(2, row)
+
+
+    # Primary Contact Person section
+    row = TR(TD(LABEL(T("Primary Contact")),
+                _colspan="3",
+                _class="subheading"))
+    form[0][2].append(row)
+    row = formstyle(id      = "middle_name", 
+                    label   = LABEL("%s:" % T("Middle Name")), 
+                    widget  = INPUT(_name="middle_name",
+                                    _id="middle_name",
+                                    _class="string"),
+                    comment = "")
+    form[0][4].append(row)
+
+    row = formstyle(id      = "secondary_email", 
+                    label   = LABEL("%s:" % T("Secondary Email")), 
+                    widget  = INPUT(_name="secondary_email",
+                                    _id="secondary_email",
+                                    _class="string"),
+                    comment = "")
+    form[0][12].append(row)
+
+    # What are you offering?
+    if don or vol:
+        hidden = True
+    else:
+        hidden = False
+    row = formstyle(id      = "offer", 
+                    hidden  = hidden,
+                    label   = LABEL("%s:" % T("We can offer"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = (T("Items"),
+                               INPUT(_type="checkbox",
+                                     _value="on",
+                                     value="on" if don else "",
+                                     _name="has_items",
+                                     _id="has_items",
+                                     _class="boolean"),
+                               T("Volunteers"),
+                               INPUT(_type="checkbox",
+                                     _value="on",
+                                     value="on" if vol else "",
+                                     _name="vols",
+                                     _id="vols",
+                                     _class="boolean"),
+                               ),
+                    comment = "")
+    form[0][12].append(row)
+    
+    # Phone
+    mobile_phone_widget = INPUT(_name="mobile_phone",
+                                _id="",
+                                _class="string")
+    if form.errors.mobile_phone:
+        mobile_phone_error = DIV(form.errors.mobile_phone,
+                                 _id="mobile_phone__error",
+                                 _class="error",
+                                 _style="display: block;")
+        # Can't wrap widget in a DIV for client-side validation, so only do so
+        # when server-side validation happens
+        mobile_phone_widget = DIV(mobile_phone_widget,
+                                  mobile_phone_error)
+
+    if form.errors.work_phone:
+        work_phone_error = DIV(form.errors.work_phone,
+                                 _id="work_phone__error",
+                                 _class="error",
+                                 _style="display: block;")
+    else:
+        work_phone_error = ""
+    row = formstyle(id      = "phone", 
+                    label   = LABEL("%s:" % T("Work Phone")), 
+                    widget  = DIV(INPUT(_name="work_phone",
+                                        _id="",
+                                        _class="string"),
+                                  work_phone_error),
+                    comment = "")
+    form[0][12].append(row)
+    row = formstyle(id      = "phone", 
+                    label   = LABEL("%s:" % current.deployment_settings.get_ui_label_mobile_phone(),
+                                    SPAN(" *", _class="req")), 
+                    widget  = mobile_phone_widget,
+                    comment = "")
+    form[0][12].append(row)
+
+    # Address
+    row = TR(TD(LABEL(T("Corporation/Organization Address")),
+                _colspan="3",
+                _class="subheading"))
+    form[0][12].append(row)
+    if form.errors.address1:
+        address1_error = DIV(form.errors.address1,
+                             _id="address1__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        address1_error = ""
+    row = formstyle(id      = "address1", 
+                    label   = LABEL("%s:" % T("Address 1"),
+                                    SPAN(" *", _class="req")
+                                    ), 
+                    widget  = (INPUT(_name="address1",
+                                     _id="address1",
+                                     _class="string"),
+                               address1_error),
+                    comment = "")
+    form[0][12].append(row)
+    row = formstyle(id      = "address2", 
+                    label   = LABEL("%s:" % T("Address 2")), 
+                    widget  = INPUT(_name="address2",
+                                    _id="address2",
+                                    _class="string"),
+                    comment = "")
+    form[0][12].append(row)
+    row = formstyle(id      = "city", 
+                    label   = LABEL("%s:" % T("City"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = INPUT(_name="city",
+                    _id     = "city",
+                    _class  = "string"),
+                    comment = "")
+    form[0][12].append(row)
+    states = S3LocationDropdownWidget(level="L1",
+                                      default="California",
+                                      empty=False)
+    widget = states(db.pr_address.location_id, None)
+    row = formstyle(id      = "state", 
+                    label   = LABEL("%s:" % T("State"),
+                                    SPAN(" *", _class="req")), 
+                    widget  = widget,
+                    comment = "")
+    form[0][12].append(row)
+    if form.errors.zip:
+        zip_error = DIV(form.errors.zip,
+                        _id="zip__error",
+                        _class="error",
+                        _style="display: block;")
+    else:
+        zip_error = ""
+    row = formstyle(id      = "zip", 
+                    label   = LABEL("%s:" % T("Zip"),
+                                    SPAN(" *", _class="req")
+                                   ),
+                    widget  = ( INPUT(_name="zip",
+                                      _id="zip",
+                                      _class="string"),
+                                zip_error
+                                ),
+                    comment = "")
+    form[0][12].append(row)
+
+    
+    #form[0][-2].append(TR(TD(LABEL(T("Terms of Service:"),
+    #                               _id="terms_of_service__label"),
+    #                         _class="w2p_fl"),
+    #                      TD(LABEL(TEXTAREA(deployment_settings.get_terms_of_service(),
+    #                                        _onfocus="this.rows=10",
+    #                                        _readonly="readonly",
+    #                                        _style="width:100%;text-align:",
+    #                                        _cols="80", _rows="10"),
+    #                               _id="terms_of_service"),
+    #                         _class="w2p_fw",
+    #                         _colspan="2"),
+    #                      _id="terms_of_service__row"))
+
+    # Add client-side validation
+    # simplified copy of s3_register_validation()
+    script = "".join(( """
+var required = '""", str(T("This field is required.")), """';
+$('#regform').validate({
+    errorClass: 'req',
+    rules: {
+        first_name: {
+            required: true
+            },
+        last_name: {
+            required: true
+            },
+        email: {
+            required: true,
+            email: true
+        },
+        organisation: {
+            required: true
+        },
+        mobile_phone: {
+            required: true
+        },
+        address1: {
+            required: true
+        },
+        city: {
+            required: true
+        },
+        zip: {
+            required: true
+        },
+        password: {
+            required: true
+        },
+        password_two: {
+            required: true,
+            equalTo: '.password:first'
+        }
+    },
+    messages: {
+        first_name: '""", str(T("Enter your firstname")), """',
+        last_name: required,
+        email: {
+            required: '""", str(T("Please enter a valid email address")), """',
+            minlength: '""", str(T("Please enter a valid email address")), """'
+        },
+        mobile_phone: required,
+        address1: required,
+        city: required,
+        zip: required,
+        password: {
+            required: '""", str(T("Provide a password")), """'
+        },
+        password_two: {
+            required: '""", str(T("Repeat your password")), """',
+            equalTo: '""", str(T("Enter the same password as above")), """'
+        }
+    },
+    errorPlacement: function(error, element) {
+        error.appendTo( element.parent().next() );
+    },
+    submitHandler: function(form) {
+        form.submit();
+    }
+});""" ))
+    response.s3.jquery_ready.append( script )
+
+    if session.s3.debug:
+        response.s3.scripts.append( "%s/jquery.validate.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.js" % s3_script_dir )
+    else:
+        response.s3.scripts.append( "%s/jquery.validate.min.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.min.js" % s3_script_dir )
+
+    response.s3.jquery_ready.append("$('.password:first').pstrength();\n")
+    response.s3.js_global.append("".join((
+        "S3.i18n.password_chars = '%s';\n" % T("The minimum number of characters is "),
+        "S3.i18n.very_weak = '%s';\n" % T("Very Weak"),
+        "S3.i18n.weak = '%s';\n" % T("Weak"),
+        "S3.i18n.medium = '%s';\n" % T("Medium"),
+        "S3.i18n.strong = '%s';\n" % T("Strong"),
+        "S3.i18n.very_strong = '%s';\n" % T("Very Strong"),
+        "S3.i18n.too_short = '%s';\n" % T("Too Short"),
+        "S3.i18n.unsafe_password = '%s';\n" % T("Unsafe Password Word!"),
+    )))
+
+    response.title = T("Register")
+    response.s3.has_required = True
+    
+    return dict(form=form)
+
+# -----------------------------------------------------------------------------
+def register_validation(form):
+    """ Validate the custom fields in registration form """
+    # Name
+    if "organisation" in request.post_vars and request.post_vars.organisation:
+        # Check not in use
+        table = db.org_organisation
+        query = (table.name == request.post_vars.organisation)
+        name = db(query).select(table.id, limitby=(0, 1)).first()
+        if name:
+            form.errors.organisation = T("Organisation Name is already in use")
+    else:
+        form.errors.organisation = T("Organisation Name is required")
+    # Phone
+    if "work_phone" in request.post_vars and request.post_vars.work_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.work_phone):
+            form.errors.work_phone = T("Invalid phone number")
+    if "mobile_phone" in request.post_vars and request.post_vars.mobile_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.mobile_phone):
+            form.errors.mobile_phone = T("Invalid phone number")
+    else:
+        form.errors.mobile_phone = T("Phone number is required")
+    # Address
+    if not request.post_vars.address1:
+        form.errors.address1 = T("Address is required")
+    if not request.post_vars.city:
+        form.errors.city = T("City is required")
+    if not request.post_vars.zip:
+        form.errors.zip = T("Zip is required")
+
+    return
+
+# -----------------------------------------------------------------------------
+def register_onaccept(form):
+    # Usual Registration Tasks
+    # (PR record, Authenticated Role, Contacts)
+    person = auth.s3_register(form)
+
+    # LA-specific
+    ptable = db.pr_person
+    query = (ptable.id == person)
+
+    db(query).update(middle_name=request.post_vars.middle_name)
+
+    pe = db(query).select(ptable.pe_id,
+                          limitby=(0, 1)).first().pe_id
+
+    # Organisation
+    organisation = request.post_vars.organisation
+    if "vols" in request.post_vars and request.post_vars.vols == "on":
+        has_vols = True
+    else:
+        has_vols = False
+    if "has_items" in request.post_vars and request.post_vars.has_items == "on":
+        has_items = True
+    else:
+        has_items = False
+
+    # Phone
+    table = db.pr_contact
+    work_phone = request.post_vars.work_phone
+    mobile_phone = request.post_vars.mobile_phone
+    if mobile_phone:
+        # Don't auto-subscribe to SMS (priority 10)
+        table.insert(pe_id = pe,
+                     contact_method = "SMS",
+                     value = mobile_phone,
+                     priority=10)
+    if work_phone:
+        table.insert(pe_id = pe,
+                     contact_method = "WORK_PHONE",
+                     value = work_phone)
+
+    # Address
+    address1 = request.post_vars.address1
+    address2 = request.post_vars.address2
+    #if address2:
+    #    address = "%s\n%s" % (address1,
+    #                          address2)
+    #else:
+    #    address = address1
+    city = request.post_vars.city
+    state = request.post_vars.location_id
+    zip = request.post_vars.zip
+    if request.post_vars.sector_other:
+        sector_other = "Sector: %s" % request.post_vars.sector_other
+    else:
+        sector_other = ""
+    otable = db.org_organisation
+    org = otable.insert(name = organisation,
+                        has_vols = has_vols,
+                        has_items = has_items,
+                        #phone=phone,
+                        address=address1,
+                        address_2=address2,
+                        L3=city,
+                        L1=state,
+                        postcode=zip,
+                        sector_id=request.post_vars.sector_id,
+                        comments=sector_other)
+    record = Storage(id=org)
+    s3mgr.model.update_super(otable, record)
+    auth.s3_set_record_owner(otable, org)
+    # For OrgDons which don't require approval
+    if auth.user:
+        # Update the session
+        auth.user.organisation_id = org
+        user_id = auth.user.id
+    else:
+        user_id = form.vars.id
+
+    # Create HRM
+    table = db.hrm_human_resource
+    hrm = table.insert(person_id = person,
+                       organisation_id = org,
+                       focal_point = True,
+                       owned_by_user = user_id)
+    record = Storage(id=hrm)
+    s3mgr.model.update_super(table, record)
+    auth.s3_set_record_owner(table, hrm)
+
+    # Set the Roles
+    person = db(query).select(ptable.uuid,
+                              limitby=(0, 1)).first()
+    if not person:
+        # Error
+        return
+    utable = db[auth.settings.table_user]
+    query = (utable.person_uuid == person.uuid)
+    db(query).update(organisation_id = org)
+    user = db(query).select(utable.id,
+                            limitby=(0, 1)).first()
+    if not user:
+        # Error
+        return
+    mtable = db[auth.settings.table_membership]
+    gtable = db[auth.settings.table_group]
+    _org = db(otable.id == org).select(otable.owned_by_organisation,
+                                       limitby=(0, 1)).first()
+    if _org:
+        mtable.insert(user_id = user.id,
+                      group_id = _org.owned_by_organisation)
+        
+    if has_vols:
+        OrgVol = db(gtable.uuid == ORG_VOL).select(gtable.id,
+                                                   limitby=(0, 1)).first()
+        if OrgVol:
+            mtable.insert(user_id = user.id,
+                          group_id = OrgVol.id)
+        # Go to the Contacts page so that a secondary contact can be added
+        # Flag that we've come from registration for subsequent workflow
+        #redirect(URL(c="vol", f="organisation", args=[org, "human_resource"],
+        #             vars={"register":1}))
+
+    if has_items:
+        OrgDon = db(gtable.uuid == ORG_DON).select(gtable.id,
+                                                   limitby=(0, 1)).first()
+        if OrgDon:
+            mtable.insert(user_id = user.id,
+                          group_id = OrgDon.id)
+        # Go to the Contacts page so that a secondary contact can be added
+        # Flag that we've come from registration for subsequent workflow
+        redirect(URL(c="don", f="organisation", args=[org, "human_resource"],
+                     vars={"register":1}))
+
+# -----------------------------------------------------------------------------
+#auth.settings.registration_requires_approval = True
+auth.settings.register_onvalidation = register_validation
+auth.settings.register_onaccept = register_onaccept
+>>>>>>> MERGE-SOURCE
 
 # END =========================================================================
 
=== added file 'controllers/don.py'
--- controllers/don.py	1970-01-01 00:00:00 +0000
+++ controllers/don.py	2011-11-18 07:40:33 +0000
@@ -0,0 +1,1041 @@
+# -*- coding: utf-8 -*-
+
+"""
+    Donations (LA Specific)
+
+    @author: Michael Howden ([e-mail])
+    @date-created: 2011-08-02
+"""
+
+
+module = request.controller
+resourcename = request.function
+
+if not deployment_settings.has_module(module):
+    raise HTTP(404, body="Module disabled: %s" % module)
+
+# Options Menu (available in all Functions)
+shn_menu(module)
+
+# Load Models
+s3mgr.load("don_collect")
+# -----------------------------------------------------------------------------
+def index():
+    """ Custom View """
+    if s3_has_role(STAFF) or s3_has_role(BOC):
+        redirect(URL(f="req"))
+    else:
+        response.menu_options = []
+        if session.s3.debug:
+            response.s3.scripts.append( "%s/jquery.hoverIntent.js" % s3_script_dir )
+        else:
+            response.s3.scripts.append( "%s/jquery.hoverIntent.minified.js" % s3_script_dir )
+
+        response.title = T("Donate")
+        response.s3.jquery_ready.append("""
+        $(".donate-popup").css("display", "none");
+        $(".organizations-list li a").hoverIntent(donateFadeIn, donateFadeOut);
+        """)
+        response.s3.js_global.append("""
+        function donateFadeIn(){$(this).next(".donate-popup").fadeIn();}
+        function donateFadeOut(){$(this).next(".donate-popup").fadeOut();}
+        """)
+
+        # Get Donation Drives List
+        table = db.don_collect
+        query = ( ( table.end_datetime > request.utcnow ) &
+                  ( table.deleted == False )
+                  )
+        rows = db(query).select( table.start_datetime,
+                                 table.end_datetime,
+                                 table.site_id,
+                                 orderby = table.start_datetime
+                                )
+        if rows:
+            list = []
+            offset = IS_UTC_OFFSET.get_offset_value(session.s3.utc_offset)
+            for row in rows:
+                if offset:
+                    start_datetime = row.start_datetime + datetime.timedelta(seconds=offset)
+                    end_datetime = row.end_datetime + datetime.timedelta(seconds=offset)
+
+                start_date = start_datetime.strftime("%b %d")
+                start_time = start_datetime.strftime("%I:%M %p")
+                end_date = end_datetime.strftime("%b %d")
+                end_time = end_datetime.strftime("%I:%M %p")
+
+                site = shn_site_represent(row.site_id, address = True)
+
+                if start_date == end_date:
+                    list.append( LI( SPAN( start_date, _class = "date"),
+                                     " %s - %s" % (start_time, end_time),
+                                     site,
+                                     BR()
+                                    )
+                                )
+                else:
+                    list.append( LI( SPAN( start_date, _class = "date" ),
+                                     " %s - " % start_time,
+                                     SPAN( end_date, _class = "date" ),
+                                     " %s" % end_time,
+                                     site,
+                                     BR()
+                                    )
+                                )
+            donation_drives = TAG[""](*list)
+        else:
+            donation_drives = P(T("No Donation Drives Scheduled. Please check back later"))
+
+        return dict(donation_drives = donation_drives)
+
+# -----------------------------------------------------------------------------
+def don_organisation_represent(id):
+    if isinstance(id, Row):
+        # Do not repeat the lookup if already done by IS_ONE_OF or RHeader
+        org = id
+    else:
+        table = db.org_organisation
+        query = (table.id == id)
+        org = db(query).select(table.name,
+                               limitby = (0, 1)).first()
+    if org:
+        return  A(org.name,
+                  _href = URL(c="don", f="organisation", args = [id]))
+    else:
+        return NONE
+
+# -----------------------------------------------------------------------------
+def match():
+    # Get Req Resource Details
+    tablename, req_id = request.vars.viewing.split(".")
+
+    # create fake resource for rheader
+    s3mgr.load("req_req")
+    req = db(db.req_req.id == req_id).select(limitby = (0, 1)).first()
+    r = Storage()
+    r.record = req
+    r.representation = "html"
+    r.name = "don"
+    r.function = "match"
+    r.vars = request.vars
+    rheader = req_rheader(r)
+
+    # Get Item Filter
+    req_item = db(db.req_req_item.req_id == req_id).select(db.req_req_item.item_id,
+                                                                    limitby = [0,1]
+                                                                    ).first()
+    if req_item:
+        item_id = req_item.item_id
+    else:
+        item_id = None
+    response.s3.filter = (db.don_don_item.item_id == item_id)
+
+    # Configure don_don_item list
+    db.don_don_item.organisation_id.represent = don_organisation_represent
+    s3mgr.configure("don_don_item",
+                    insertable = False,
+                    list_fields = ["id",
+                                   "organisation_id",
+                                   "item_id",
+                                   "quantity",
+                                   "type",
+                                   "comments"]
+                                   )
+    response.s3.actions = [dict(url = URL(c="don", f="req",
+                                                      args = [req_id, "commit"],
+                                                      vars = dict(don_item_id = "[id]")
+                                                      ),
+                                            _class = "action-btn",
+                                            label = str(T("Select")),
+                                            )
+                           ]
+
+    output = don_item()
+
+    # Customize form
+    output["rheader"] = rheader
+    output["title"] = T("Request for Donations Details")
+    output["subtitle"] = T("Matching Resources in Virtual Donation Inventory")
+
+    return output
+# -----------------------------------------------------------------------------
+def req_summary(r):
+    rtable = db.req_req
+    itable = db.req_req_item
+    ctable = db.req_commit
+    req = r.record
+    item = req.req_req_item.select().first() or Storage()
+    commit = req.req_commit.select().first() or Storage()
+
+    item_str = response.s3.concat_item_pack_quantity( item.item,
+                                                      item.item_pack,
+                                                      item.quantity)
+
+    summary = TABLE( TR( TH( rtable.status.label ),
+                         rtable.status.represent(req.status),
+                         TH( ctable.status.label ),
+                         ctable.status.represent(commit.status),
+                        ),
+                     #TR( TH( rtable.event_id.label ),
+                     #     rtable.event_id.represent(req.event_id),
+                     #    TH( rtable.incident_id.label ),
+                     #     rtable.incident_id.represent(req.incident_id),
+                     #     ),
+                     TR( TH( rtable.request_number.label ),
+                         req.request_number,
+                         TH( rtable.priority.label ),
+                         rtable.priority.represent( req.priority ),
+                        ),
+                     TR( TH( rtable.date_required.label ),
+                         req.date_required,
+                         TH( rtable.site_id.label ),
+                         rtable.site_id.represent( req.site_id ),
+                        ),
+                     TR( TH( itable.item.label ),
+                         item_str,
+                         TH( itable.item_id.label ),
+                         itable.item_id.represent( item.item_id ),
+                        ),
+                     TR( #TH( rtable.purpose.label ),
+                         #req.purpose,
+                         TH( itable.specs.label ),
+                         item.specs,
+                        ),
+                    )
+    return summary
+# -----------------------------------------------------------------------------
+def req_form(r):
+    form_btns = DIV( BUTTON(T("Request for Donation Form"),
+                            _class = "accept-button",
+                            _onClick = "javascript: window.location='%s'" % \
+                                        URL(c = request.controller,
+                                            f = "req_print",
+                                            args = r.id
+                                            )
+                             ),
+                     # 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"),
+                    )
+
+    ftable = db.req_fulfill
+    query = (ftable.req_id == r.id)
+    frecord = db(query).select(limitby=(0, 1)).first()
+    if frecord and frecord.datetime_fulfill != None:
+        form_btns.append( BUTTON (T("Donation Certificate"),
+                                  _class = "accept-button",
+                                  _onClick = "javascript: window.location='%s'" % \
+                                              URL(c = request.controller,
+                                                  f = "req_print",
+                                                  args = [r.id, True]
+                                          )
+                                ))
+    return form_btns
+# -----------------------------------------------------------------------------
+def req_rheader(r):
+    """
+        Resource Header for Requests for Donations
+        - Staff View
+    """
+    record = r.record
+    if r.representation == "html" and  record:
+        tabs = [(T("Details"), None)]
+        req_item_tab_label = T("Resource")
+        tabs.append((req_item_tab_label, "req_item"))
+        tabs.append((T("Find Match"), "match/"))
+        if deployment_settings.get_req_use_commit():
+            tabs.append((T("Donation"), "commit"))
+        tabs.append(( T("Received"), "fulfill"))
+        tabs.append(( T("Surplus"), "surplus_item"))
+        if deployment_settings.has_module("doc"):
+            tabs.append((T("Documents"), "document"))
+
+        rheader_tabs = s3_rheader_tabs(r, tabs)
+
+        site_id = request.vars.site_id
+        if site_id:
+            site_name = shn_site_represent(site_id, show_link = False)
+            commit_btn = TAG[""](
+                        A( T("Commit from %s") % site_name,
+                            _href = URL(c = "req",
+                                        f = "commit_req",
+                                        args = [r.id],
+                                        vars = dict(site_id = site_id)
+                                        ),
+                            _class = "action-btn"
+                           ),
+                        A( T("Send from %s") % site_name,
+                            _href = URL(c = "req",
+                                        f = "send_req",
+                                        args = [r.id],
+                                        vars = dict(site_id = site_id)
+                                        ),
+                            _class = "action-btn"
+                           )
+                        )
+        #else:
+        #    commit_btn = A( T("Commit"),
+        #                    _href = URL(c = "req",
+        #                                f = "commit",
+        #                                args = ["create"],
+        #                                vars = dict(req_id = r.id)
+        #                                ),
+        #                    _class = "action-btn"
+        #                   )
+            response.s3.rfooter = commit_btn
+
+        rheader = DIV( req_summary(r),
+                       req_form(r)
+                      )
+
+        rheader.append(rheader_tabs)
+
+        return rheader
+    #else:
+        # No Record means that we are either a Create or List Create
+        # Inject the helptext script
+        # Removed because causes an error if validation fails twice
+        # return response.s3.req_helptext_script
+    return None
+# -----------------------------------------------------------------------------
+def req():
+    """
+        /don/req
+    """
+    s3mgr.load("req_req")
+    req_table = db.req_req
+
+    req_type = 1
+    req_table.type.default = req_type
+    query = (db.req_req.type == req_type)
+    if response.s3.filter:
+        response.s3.filter = response.s3.filter & query
+    else:
+        response.s3.filter = query
+    # -------------------------------------------------------------------------------------------
+    s3mgr.configure("req_req",
+                    list_fields = ["id",
+                                   #"priority",
+                                   "status",
+                                   (T("BOC Status"), "req_commit_status"),
+                                   "created_on",
+                                   "date_required",
+                                   (T("Resource"), "item"),
+                                   "site_id",
+                                ],
+                    orderby = ["created_on"])
+
+    s3mgr.load("req_req")
+
+    # -------------------------------------------------------------------------------------------
+    ADD_ITEM_REQUEST = T("Make a Request for Donations")
+    LIST_ITEM_REQUEST = T("List Requests for Donations")
+    s3.crud_strings["req_req"] =  Storage(
+        title_create = ADD_ITEM_REQUEST,
+        title_display = T("Request for Donations Details"),
+        title_list = LIST_ITEM_REQUEST,
+        title_update = T("Edit Request for Donations"),
+        title_search = T("Search Requests for Donations"),
+        subtitle_create = ADD_ITEM_REQUEST,
+        subtitle_list = T("Requests for Donations"),
+        label_list_button = LIST_ITEM_REQUEST,
+        label_create_button = ADD_ITEM_REQUEST,
+        label_delete_button = T("Delete Request for Donations"),
+        msg_record_created = T("Request for Donations Added"),
+        msg_record_modified = T("Request for Donations Updated"),
+        msg_record_deleted = T("Request for Donations Canceled"),
+        msg_list_empty = T("No Requests for Donations")
+    )
+
+    # Request for Donation labels
+    req_table.purpose.label = T("What the Resources will be used for")
+    req_table.site_id.label =T("Deliver To Facility")
+    req_table.request_for_id.label = T("Deliver To Person")
+    req_table.created_on.label = T("Pushed to BOC")
+
+    if "document" in request.args:
+        s3mgr.load("doc_document")
+
+    def prep(r):
+        # Remove type from list_fields
+        list_fields = s3mgr.model.get_config("req_req",
+                                             "list_fields")
+        try:
+            list_fields.remove("type")
+        except:
+             # It has already been removed.
+             # This can happen if the req controller is called
+             # for a second time, such as when printing reports
+             # see vol.print_assignment()
+            pass
+        s3mgr.configure(tablename, list_fields=list_fields)
+
+
+        if r.interactive:
+            # Set Fields and Labels
+            req_table.type.readable = False
+            req_table.type.writable = False
+
+
+            if r.method != "create" and False: # @ToDo: Remove "and False" - this has been added for training to allow records to be edit
+                # Disable Edit for fields where WebEOC is Master
+                req_table.event_id.writable = False
+                req_table.incident_id.writable = False
+                req_table.request_number.writable = False
+                req_table.priority.writable = False
+                req_table.site_id.writable = False
+                req_table.request_for_id.writable = False
+                req_table.date_required.writable = False
+                req_table.date_required_until.writable = False
+                req_table.purpose.writable = False
+                req_table.date.writable = False
+                req_table.requester_id.writable = False
+                req_table.approved_by_id.writable = False
+                req_table.comments.writable = False
+                req_table.cancel.writable = False
+
+            if r.record and r.record.req_req_item.count():#r.component and r.component.name == "req_item":
+                # Is this component being updated (not created)
+                req_item_table = db.req_req_item
+                #req_item_table.item.writable = False
+                req_item_table.item_pack_id.writable = False
+                req_item_table.quantity.writable = False
+
+            elif r.record and r.record.req_req_skill.count():#r.component and r.component.name == "req_skill":
+                # Is this component being updated (not created)
+                req_skill_table = db.req_req_skill
+                req_skill_table.skill_id.writable = False
+                req_skill_table.quantity.writable = False
+
+            #req_table.recv_by_id.label = T("Delivered To")
+
+            # Update Donated By from selection on Match tab
+            don_item_id = request.vars.don_item_id
+            if r.component and r.component.name == "commit" and don_item_id:
+                request.vars.pop("don_item_id")
+                don_item = db(db.don_don_item.id == don_item_id
+                              ).select(db.don_don_item.organisation_id,
+                                       limitby=[0,1]).first()
+                if don_item:
+                    db.req_commit.donated_by_id.default = don_item.organisation_id
+                    db(db.req_commit.req_id == r.id).update(donated_by_id = don_item.organisation_id)
+            if r.component and r.component.name == "req_item":
+                s3mgr.s3.crud.submit_button = T("Save&Find Match")
+                match_url = URL(c="don", f = "match",
+                                vars = dict(viewing="req_req.%s" % r.id)
+                                )
+                s3mgr.configure("req_req_item",
+                                update_next = match_url,
+                                create_next = match_url
+                                )
+
+            if r.method != "update" and r.method != "read":
+                if not r.component:
+                    # Hide fields which don't make sense in a Create form
+                    # - includes one embedded in list_create
+                    # - list_fields over-rides, so still visible within list itself
+                    response.s3.req_create_form_mods()
+
+                    # Get the default Facility for this user
+                    # @ToDo: Use site_id in User Profile (like current organisation_id)
+                    if deployment_settings.has_module("hrm"):
+                        query = (db.hrm_human_resource.person_id == s3_logged_in_person())
+                        site = db(query).select(db.org_site.id,
+                                                limitby=(0, 1)).first()
+                        if site:
+                            r.table.site_id.default = site.id
+
+                elif r.component.name == "document":
+                    s3.crud.submit_button = T("Add")
+                    table = r.component.table
+                    # @ToDo: Fix for Link Table
+                    #table.date.default = r.record.date
+                    #if r.record.site_id:
+                    #    stable = db.org_site
+                    #    query = (stable.id == r.record.site_id)
+                    #    site = db(query).select(stable.location_id,
+                    #                            stable.organisation_id,
+                    #                            limitby=(0, 1)).first()
+                    #    if site:
+                    #        table.location_id.default = site.location_id
+                    #        table.organisation_id.default = site.organisation_id
+
+                elif r.component.name == "req_item":
+                    table = r.component.table
+                    table.site_id.writable = table.site_id.readable = False
+                    response.s3.req_hide_quantities(table)
+
+        if r.component:
+            if r.component.name == "document" or \
+                 r.component.name == "req_item" or \
+                 r.component.name == "req_skill":
+                # Limit site_id to facilities the user has permissions for
+                # @ToDo: Non-Item requests shouldn't be bound to a Facility?
+                auth.permission.permitted_facilities(table=r.table,
+                                                     error_msg=T("You do not have permission for any facility to make a request."))
+        else:
+            # Limit site_id to facilities the user has permissions for
+            # @ToDo: Non-Item requests shouldn't be bound to a Facility?
+            auth.permission.permitted_facilities(table=r.table,
+                                                 error_msg=T("You do not have permission for any facility to make a request."))
+
+        return True
+    response.s3.prep = prep
+
+    # Post-process
+    def postp(r, output):
+        if r.interactive:
+            s3_action_buttons(r)
+            if r.component and r.component.name == "req_item":
+                req_item_don_item_btn = dict(url = URL(c = "req",
+                                                       f = "req_item_don_item",
+                                                       args = ["[id]"]
+                                            ),
+                     _class = "action-btn",
+                     label = str(T("Find")), # Change to Fulfil? Match?
+                     )
+                response.s3.actions.append(req_item_don_item_btn)
+        return output
+
+    response.s3.postp = postp
+
+    output = s3_rest_controller("req", "req", rheader=req_rheader)
+    return output
+# -----------------------------------------------------------------------------
+def req_print():
+    """ Print Donation Request Form """
+    s3mgr.load("req_req")
+    r = s3base.S3Request(s3mgr,
+                         prefix="req",
+                         name="req",
+                         extension="pdf",
+                         args = request.args[0])
+    if len(request.args) > 1:
+        s3mgr.configure("req_req",
+                        callback = response.s3.donationCertificate,
+                        formname = T("Donation Certificate"),
+                        header = response.s3.donCertBorder,
+                        footer = lambda x, y: None,
+                        )
+    else:
+        s3mgr.configure("req_req",
+                        callback = response.s3.donationRequest,
+                        formname = T("Request for Donations"),
+                        footer = response.s3.donationFooter
+                        )
+    return r()
+
+# -----------------------------------------------------------------------------
+
+def loan():
+    """ Loans REST Controller """
+
+    s3mgr.load("req_commit")
+    ctable = db.req_commit
+
+    # Filter for Loans
+    response.s3.filter = (ctable.status == 9 )
+    s3mgr.configure("req_commit",
+                    list_fields = ["donated_by_id",
+                                   "specs",
+                                   # Site virtual Field?
+                                   "datetime_return",
+                                ],
+                    orderby = ["datetime_return"])
+    output = s3_rest_controller("req", "commit")
+    if isinstance(output, dict):
+        output["title"] = T("Donations on Loan Report")
+        output["subtitle"] = T("Donations on Loan")
+    response.s3.actions = [dict(url = URL(c = "don",
+                                          f = "req",
+                                          args = ["commit","[id]"],
+                                         ),
+                                _class = "action-btn",
+                                label = str(T("Open")),
+                                ),
+                           ]
+    return output
+
+# -----------------------------------------------------------------------------
+s3mgr.configure("don_don_item",
+                list_fields = ["id",
+                               "organisation_id",
+                               "item_category_id",
+                               "item_id",
+                               "pack_value",
+                               "quantity",
+                            ]
+                )
+
+ADD_ITEM = T("Add Donation Resource")
+LIST_ITEMS = T("List Donation Resources")
+s3.crud_strings["don_don_item"] = Storage(
+    title_create = ADD_ITEM,
+    title_display = T("Donation Resource Details"),
+    title_list = LIST_ITEMS,
+    title_update = T("Edit Donation Resource"),
+    title_search = T("Search Donation Resources"),
+    subtitle_create = ADD_ITEM,
+    subtitle_list = T("Donation Resources"),
+    label_list_button = LIST_ITEMS,
+    label_create_button = ADD_ITEM,
+    label_delete_button = T("Remove Donation Resource"),
+    msg_record_created = T("Donation Resource Added"),
+    msg_record_modified = T("Donation Resource updated"),
+    msg_record_deleted = T("Donation Resource removed"),
+    msg_list_empty = T("No Donation Resources for this Corporation"))
+
+ADD_GOODS = T("In the event of a declared disaster we MAY be able to donate the following Goods:")
+LIST_GOODS = T("List Donation Goods")
+s3.crud_strings["don_good"] = Storage(
+    title_create = ADD_GOODS,
+    title_display = T("Donation Good Details"),
+    title_list = LIST_GOODS,
+    title_update = T("Edit Donation Goods"),
+    title_search = T("Search Donation Goods"),
+    subtitle_create = ADD_GOODS,
+    subtitle_list = T("Donate Goods"),
+    label_list_button = LIST_GOODS,
+    label_create_button = ADD_GOODS,
+    label_delete_button = T("Remove Donation Goods"),
+    msg_record_created = T("Donation Goods Added"),
+    msg_record_modified = T("Donation Goods updated"),
+    msg_record_deleted = T("Donation Goods removed"),
+    msg_list_empty = T("No Donation Goods for this Corporation"))
+
+ADD_SERVICE = T("In the event of a declared disaster we MAY be able to donate the following Services:")
+LIST_SERVICES = T("List Donation Services")
+s3.crud_strings["don_service"] = Storage(
+    title_create = ADD_SERVICE,
+    title_display = T("Donation Service Details"),
+    title_list = LIST_SERVICES,
+    title_update = T("Edit Donation Service"),
+    title_search = T("Search Donation Services"),
+    subtitle_create = ADD_SERVICE,
+    subtitle_list = T("Donate Services"),
+    label_list_button = LIST_SERVICES,
+    label_create_button = ADD_SERVICE,
+    label_delete_button = T("Remove Donation Service"),
+    msg_record_created = T("Donation Service Added"),
+    msg_record_modified = T("Donation Service updated"),
+    msg_record_deleted = T("Donation Service removed"),
+    msg_list_empty = T("No Donation Services for this Corporation"))
+
+ADD_FACILITY = T("In the event of a declared disaster we MAY be able to donate the following Facilities:")
+LIST_FACILITYS = T("List Donation Facilities")
+s3.crud_strings["don_facility"] = Storage(
+    title_create = ADD_FACILITY,
+    title_display = T("Donation Facility Details"),
+    title_list = LIST_FACILITYS,
+    title_update = T("Edit Donation Facility"),
+    title_search = T("Search Donation Facilities"),
+    subtitle_create = ADD_FACILITY,
+    subtitle_list = T("Donate Facilities"),
+    label_list_button = LIST_FACILITYS,
+    label_create_button = ADD_FACILITY,
+    label_delete_button = T("Remove Donation Facility"),
+    msg_record_created = T("Donation Facility Added"),
+    msg_record_modified = T("Donation Facility updated"),
+    msg_record_deleted = T("Donation Facility removed"),
+    msg_list_empty = T("No Donation Facilities for this Corporation"))
+
+# -----------------------------------------------------------------------------
+def don_item_filter(don_item_add_filter_func):
+    """
+        Filter donated 'items' by category
+            Services = category 'SERVICES'
+            Facilities = category 'FACILITY'
+            Goods = everything else
+    """
+    itable = db.don_don_item
+    ctable = db.supply_item_category
+
+    query = (ctable.code == "FACILITY")
+    facility_cat_id = db(query).select(ctable.id,
+                                       limitby = (0, 1),
+                                       cache = gis.cache).first().id
+    query = (ctable.code == "SERVICES")
+    service_cat_id = db(query).select(ctable.id,
+                                      limitby = (0, 1),
+                                      cache = gis.cache).first().id
+
+    itable.organisation_id.widget = None # Implement SearchACWidget for Organisations
+    itable.organisation_id.requires = IS_NULL_OR(IS_ONE_OF(db, "org_organisation.id",
+                                                           organisation_represent,
+                                                           orderby="org_organisation.name",
+                                                           sort=True,
+                                                           filterby = "has_items",
+                                                           filter_opts = [True])
+                                                 )
+    itable.item_id.widget = None
+
+    if not s3_has_role(STAFF):
+        # Only Staff can add Categories
+        itable.item_category_id.comment = ""
+        # Only Staff can add Item Types
+        # @ToDo: Allow adding Items to 'OTHER' category
+        itable.item_id.comment = ""
+        # Only Staff can add Item Units
+        # @ToDo: Should Units for Services/Facilities be hardcoded/hidden?
+        #        (always day/ea)
+        comment = DIV(_class="tooltip",
+                      _title="%s|%s" % (T("Resource Units"),
+                                        T("The way in which an item is normally distributed")))
+        script = SCRIPT(
+"""
+S3FilterFieldChange({
+    'FilterField':    'item_id',
+    'Field':        'item_pack_id',
+    'FieldResource':'item_pack',
+    'FieldPrefix':    'supply',
+    'msgNoRecords':    S3.i18n.no_packs,
+    'fncPrep':        fncPrepItem,
+    'fncRepresent':    fncRepresentItem
+});""")
+        itable.item_pack_id.comment = TAG[""](comment, script)
+
+    item_type = request.vars.item
+    if item_type == "goods":
+        s3.crud_strings["don_don_item"] = s3.crud_strings["don_good"]
+
+        itable.lead_time.readable = True
+        itable.lead_time.writable = True
+        itable.type.readable = True
+        itable.type.writable = True
+        itable.item_category_id.requires = IS_NULL_OR(IS_ONE_OF(db,
+                                                    "supply_item_category.id",
+                                                    "%(name)s",
+                                                    not_filterby = "id",
+                                                    not_filter_opts = [facility_cat_id, service_cat_id],
+                                                    sort=True))
+        response.s3.jquery_ready = [
+"""
+$(document).ready(function() {
+    S3FilterFieldChange({
+        'FilterField':    'item_category_id',
+        'Field':        'item_id',
+        'FieldResource':'item',
+        'FieldPrefix':    'supply',
+        //'url':             S3.Ap.concat('/req/req_item_packs/'),
+        //'msgNoRecords':    S3.i18n.no_packs,
+        //'fncPrep':        fncPrepItem,
+        //'fncRepresent':    fncRepresentItem
+    });
+});
+"""
+]
+        query = (itable.item_category_id != facility_cat_id) & \
+                (itable.item_category_id != service_cat_id)
+        don_item_add_filter_func( query )
+    elif item_type in ["services", "facilities"]:
+        if item_type == "services":
+            s3.crud_strings["don_don_item"] = s3.crud_strings["don_service"]
+
+            item_category_filter = service_cat_id
+            itable.item_id.label = T("Service Type")
+            if s3_has_role(STAFF):
+                itable.item_id.comment = DIV(A(T("Add Service Type"),
+                                             _class="colorbox",
+                                             _href=URL(c="supply", f="item",
+                                                       args="create",
+                                                       vars=dict(format="popup")),
+                                             _target="top",
+                                             _title=T("Add Service Type")))
+            itable.quantity.label = T("Duration of Donated Services")
+            itable.item_pack_id.label = T("Unit of Time")
+            itable.item_pack_id.readable = True
+            itable.item_pack_id.writable = True
+            itable.pack_value.label = T("Estimated Value ($) per Unit of Time")
+
+        elif item_type == "facilities":
+            s3.crud_strings["don_don_item"] = s3.crud_strings["don_facility"]
+
+            item_category_filter = facility_cat_id
+            itable.item_id.label = T("Facility Type")
+            if s3_has_role(STAFF):
+                itable.item_id.comment = DIV(A(T("Add Facility Type"),
+                                             _class="colorbox",
+                                             _href=URL(c="supply", f="item",
+                                                       args="create",
+                                                       vars=dict(format="popup")),
+                                             _target="top",
+                                             _title=T("Add Facility Type")))
+            itable.specs.label = T("Specifications (Square Feet, Building Type, Stories, Services)")
+
+        itable.item_category_id.readable = itable.item_category_id.writable = False
+        itable.item_category_id.default = item_category_filter
+
+        itable.item_id.requires = IS_ONE_OF(db, "supply_item.id",
+                                            lambda id: response.s3.item_represent(id,
+                                                            show_um = False,
+                                                            show_link = False),
+                                            filterby = "item_category_id",
+                                            filter_opts = [item_category_filter],
+                                            sort=True)
+
+        query = (itable.item_category_id == item_category_filter)
+        don_item_add_filter_func( query )
+# -----------------------------------------------------------------------------
+def organisation():
+    """
+        /org/organisation/ corporation
+    """
+
+    otable = db.org_organisation
+
+    otable.acronym.readable = False
+    otable.acronym.writable = False
+    otable.sector_id.readable = True
+    otable.sector_id.writable = True
+    org_has_items_field = otable.has_items
+    org_has_items_field.default = True
+    response.s3.filter = (org_has_items_field == True)
+
+    if not s3_has_role(STAFF):
+        # Tweak the breadcrumb
+        breadcrumbs[2] = (T("Organization Profile"), False,
+                          URL(c=request.controller,
+                              f=request.function,
+                              args=request.args))
+
+    def corporation_rheader(r, tabs = []):
+        """ Corporation rheader """
+
+        if r.representation == "html":
+
+            if r.record is None:
+                # List or Create form: rheader makes no sense here
+                return None
+
+            tabs = [(T("Basic Details"), None),
+                    (T("Contacts"), "human_resource"),
+                    (T("Donate Goods"), "don_item", dict(item="goods")),
+                    (T("Donate Services "), "don_item", dict(item="services")),
+                    (T("Donate Facilities "), "don_item", dict(item="facilities")),
+                    ]
+            if "register" not in request.vars:
+                tabs.append( (T("Donations"), "commit") )
+            rheader_tabs = s3_rheader_tabs(r, tabs)
+
+            organisation = r.record
+            if organisation.sector_id:
+                _sectors = org_sector_represent(organisation.sector_id)
+            else:
+                _sectors = None
+
+            if deployment_settings.get_ui_cluster():
+                sector_label = T("Cluster(s)")
+            else:
+                sector_label = T("Sector(s)")
+
+            rheader = DIV(TABLE(
+                TR(
+                    TH("%s: " % T("Corporation")),
+                    organisation.name,
+                    TH("%s: " % sector_label),
+                    _sectors
+                    )),
+                rheader_tabs
+            )
+            return rheader
+        return None
+
+    ADD_CORPORATION = T("Add Corporation / Organization")
+    LIST_CORPORATIONS = T("List Corporations & Organizations")
+    s3.crud_strings["org_organisation"] = Storage(
+        title_create = ADD_CORPORATION,
+        title_display = T("Corporation / Organization Details"),
+        title_list = LIST_CORPORATIONS,
+        title_update = T("Edit Corporation / Organization"),
+        title_search = T("Search Corporations & Organizations"),
+        subtitle_create = T("Add New Corporation / Organization"),
+        subtitle_list = T("Corporations & Organizations"),
+        label_list_button = LIST_CORPORATIONS,
+        label_create_button = ADD_CORPORATION,
+        label_delete_button = T("Delete Corporation / Organization"),
+        msg_record_created = T("Corporation / Organization added"),
+        msg_record_modified = T("Corporation / Organization updated"),
+        msg_record_deleted = T("Corporation / Organization deleted"),
+        msg_list_empty = T("No Corporations & Organizations currently registered"))
+
+    def prep(r):
+        don_item_filter(lambda query:
+                             r.resource.add_component_filter("don_item", query))
+        if r.component:
+            if r.component.name == "don_item":
+                itable = db.don_don_item
+                itable.currency.readable = False
+            elif r.component.name == "human_resource":
+                hrtable = db.hrm_human_resource
+                hrtable.type.writable = hrtable.type.readable = False
+                hrtable.status.writable = hrtable.status.readable = False
+                hrtable.focal_point.writable = hrtable.focal_point.readable = False
+                response.s3.jquery_ready.append("$('#hrm_human_resource_person_id__row1').hide();")
+
+                s3.crud_strings["hrm_human_resource"] = Storage(
+                    title_create = T("Add Contact"),
+                    title_display = T("Contact Details"),
+                    title_list = T("Contacts"),
+                    title_update = T("Edit Contact"),
+                    title_search = T("Search Contacts"),
+                    subtitle_create = T("Additional Contacts (optional)"),
+                    subtitle_list = T("Contacts"),
+                    label_list_button = T("List Contacts"),
+                    label_create_button = T("Add Contacts"),
+                    label_delete_button = T("Delete Contact"),
+                    msg_record_created = T("Contact added"),
+                    msg_record_modified = T("Contact updated"),
+                    msg_record_deleted = T("Contact deleted"),
+                    msg_no_match = T("No Contacts Found"),
+                    msg_list_empty = T("Currently there are no Contact registered"))
+
+                # Donation Organization Regisration Workflow
+                if "register" in request.vars:
+                    # Only force the open on 1st run
+                    response.s3.show_listadd = True
+                    s3mgr.configure("hrm_human_resource",
+                                    create_next = URL(c="don", f="organisation",
+                                                      args = [r.record.id, "don_item"],
+                                                      vars = dict(item="goods"))
+                                    )
+
+    # Add req to Corporations as Donations
+    s3mgr.configure("req_commit",
+                    insertable = False,
+                    editable = False,
+                    deletable = False,
+                    )
+
+    s3mgr.configure( "org_organisation",
+                     list_fields = ["id",
+                                    "name",
+                                    #"type",
+                                    "sector_id",
+                                    #"country",
+                                    #"website"
+                                 ])
+
+    # req CRUD strings
+    REQ = T("Donation")
+    #ADD_REQ = T("Add Donation")
+    LIST_REQ = T("List Donations")
+    s3.crud_strings["req_req"] = Storage(
+        #title_create = ADD_REQ,
+        title_display = T("Donation Details"),
+        title_list = LIST_REQ,
+        #title_update = T("Edit Donation"),
+        title_search = T("Search Donations"),
+        #subtitle_create = ADD_REQ,
+        subtitle_list = T("Donations"),
+        label_list_button = LIST_REQ,
+        #label_create_button = ADD_REQ,
+        #label_delete_button = T("Remove Donations"),
+        #msg_record_created = T("Donation Added"),
+        #msg_record_modified = T("Donation updated"),
+        #msg_record_deleted = T("Donation removed"),
+        msg_list_empty = T("No Donations from this Corporation"))
+
+    if not s3_has_role(STAFF):
+        response.s3.donate_cash_link =True
+
+    return organisation_controller(organisation_rheader = corporation_rheader,
+                                   org_prep = prep)
+
+# -----------------------------------------------------------------------------
+def don_item():
+    """ REST Controller """
+
+    def don_item_add_filter_func(query):
+        response.s3.filter = query
+    don_item_filter(don_item_add_filter_func)
+
+    # Tweak the breadcrumb
+    type = request.get_vars.item
+    if type == "goods":
+        label = T("Goods")
+    elif type == "services":
+        label = T("Services")
+    elif type == "facilities":
+        label = T("Facilities")
+    else:
+        # Error!
+        label = ""
+    breadcrumbs[2] = (label, False,
+                      URL(c=request.controller,
+                          f=request.function,
+                          vars=request.vars))
+
+    def postp(r, output):
+        # maintain the ?items= type
+        if "type" in request.vars:
+            response.s3.actions = [
+                dict(label=str(UPDATE),
+                     _class="action-btn",
+                     url=URL(args = ["[id]"] + ["update"],
+                             vars=request.vars)),
+            ]
+        return output
+    response.s3.postp = postp
+
+    output = s3_rest_controller(module, "don_item")
+    return output
+
+# -----------------------------------------------------------------------------
+def collect():
+    """ REST Controller """
+    def prep(r):
+        s3mgr.configure("don_collect",
+                list_fields = ["id",
+                               "start_datetime",
+                               "end_datetime",
+                               "site_id",
+                               "organisation_id",
+                            ])
+        return True
+
+    response.s3.prep = prep
+    output = s3_rest_controller(module, resourcename)
+    return output
+
+# -----------------------------------------------------------------------------
+def distribute():
+    """ REST Controller """
+    output = s3_rest_controller(module, resourcename)
+    return output
+
+# -----------------------------------------------------------------------------
+def profile():
+    """ Organisation Profile """
+    return organisation_profile()
+
+# -----------------------------------------------------------------------------
+################################################################################
+### Hook to call get the donation certificate
+################################################################################
+#def certprint():
+#    """ Print Cert TEST """
+#    s3mgr.load("don_distribute")
+#    r = s3base.S3Request(s3mgr,
+#                         prefix="don",
+#                         name="distribute",
+#                         extension="pdf")
+#    s3mgr.configure("don_distribute",
+#                    callback = response.s3.donationCertificate,
+#                    formname = "Donation Certificate",
+#                    header = response.s3.donCertBorder,
+#                    footer = lambda x, y: None,
+#                    )
+#    return r()
+################################################################################
+###
+################################################################################
+
+
+# END =========================================================================
 \ No newline at end of file
 
=== modified file 'controllers/event.py'
--- controllers/event.py	2011-10-13 16:40:31 +0000
+++ controllers/event.py	2011-11-18 07:40:33 +0000
@@ -32,6 +32,16 @@
     redirect(URL(f="event", args="create"))
 
 # =============================================================================
+# Incidents
+# =============================================================================
+def incident():
+    """ RESTful CRUD controller """
+
+    tablename = "event_incident"
+    s3mgr.load(tablename)
+    return s3_rest_controller(module, resourcename)
+
+# =============================================================================
 # Events
 # =============================================================================
 def event():
@@ -184,7 +194,7 @@
     tabs.append((T("Map Configuration"), "config"))
 
     rheader = lambda r, tabs=tabs: event_rheader(r, tabs)
-    output = s3_rest_controller("event", resourcename,
+    output = s3_rest_controller(module, resourcename,
                                 rheader=rheader)
     return output
 
 
=== modified file 'controllers/gis.py'
--- controllers/gis.py	2011-11-12 23:58:22 +0000
+++ controllers/gis.py	2011-11-18 07:40:33 +0000
@@ -98,7 +98,7 @@
         catalogue_toolbar = False
 
     # @ToDo: Make these configurable
-    search = True
+    search = False
     googleEarth = True
     googleStreetview = True
     catalogue_layers = True
@@ -127,7 +127,8 @@
                        search=search,
                        catalogue_layers=catalogue_layers,
                        mouse_position = mouse_position,
-                       print_tool = print_tool
+                       print_tool = print_tool,
+                       collapsed = True
                       )
 
     return map
 
=== modified file 'controllers/hrm.py'
--- controllers/hrm.py	2011-11-17 14:39:04 +0000
+++ controllers/hrm.py	2011-11-18 07:40:33 +0000
@@ -1033,4 +1033,228 @@
                                    redirect_vars = {fieldname: id},
                                    title_name = title)
 
+# =============================================================================
+# Adding a human resource inline
+# =============================================================================
+
+def create_inline():
+
+    # arguments ?
+    formstyle = s3_formstyle
+    field_name = field.name
+    
+    # Set up fields
+    pr_person = db.pr_person
+    hrm_human_resource = db.hrm_human_resource
+    
+    fields = [
+        pr_person.first_name,
+        pr_person.middle_name,
+        pr_person.last_name,
+        
+        hrm_human_resource.job_title,
+    ]
+    
+    emailRequired = (
+        request.controller == "hrm" and 
+        deployment_settings.get_hrm_email_required()
+    )
+        
+    if emailRequired:
+        email_validator = IS_EMAIL()
+    else:
+        email_validator = IS_NULL_OR(IS_EMAIL())
+        
+    email_field_name = "email_address"
+    mobile_phone_field_name = "mobile_phone"
+    fields.extend([
+        Field(
+            "organisation_id",
+            notnull=True,
+            requires = hrm_human_resource.organisation_id.requires,
+            label = hrm_human_resource.organisation_id.label,
+            represent = hrm_human_resource.organisation_id.represent,
+        ),
+        Field(
+            email_field_name,
+            notnull=emailRequired,
+            requires=email_validator,
+            label=T("Email Address")
+        ),
+        Field(
+            mobile_phone_field_name,
+            label=T("Mobile Phone Number")
+        )
+    ])
+    
+    labels, required = s3_mark_required(fields)
+    if required:
+        response.s3.has_required = True
+
+    form = SQLFORM.factory(table_name="hrm_human_resource",
+                           labels=labels,
+                           formstyle=formstyle,
+                           separator = "",
+                           *fields)
+
+    # JavaScript
+    def add_script(script_name):
+        response.s3.scripts.append(
+            "%s/%s" % (response.s3.script_dir, script_name)
+        )
+    
+    result = dict(
+        form = TAG[""](
+            # to stop some browsers appying a default table style to unstyled tables
+            XML("""<style type="text/css">table { font-size:inherit; }</style>"""),
+            form
+        ),
+        created_object_id = None,
+        created_object_representation = "",
+        errors = form.errors
+    )
+    
+    accepted = form.accepts(request.vars)#, session):
+
+    # more validation, don't let other validation errors upset this, 
+    # as the user wants to see all errors in one go
+    pr_contact = db.pr_contact
+    pr_person = db.pr_person
+    def var(name):
+        return request.vars.get(name, None)
+
+    def check_request_var_matches_value_if_given(var_name, value):
+        if var(var_name):
+            if var(var_name) != value:
+                if not form.errors.has_key(var_name):
+                    form.errors[var_name] = (
+                        T("There is a existing record, but the %(property)s is different. "
+                        "(Clearing this field allows use of the existing record)")
+                    ) % dict(
+                        property = var_name.replace("_", " ")
+                    )
+
+    def existing(*query):
+        return db(*query).select().first()
+
+    existing_mobile_phone_contact = None
+    existing_person = None
+    existing_human_resource = None
+    
+    # look for a person with the same email address
+    email_address = var(email_field_name)
+    if email_address:
+        existing_email_contact = existing(
+            (pr_contact.contact_method == "EMAIL") &
+            (pr_contact.value == email_address)
+        )
+        if existing_email_contact is not None:
+            # check every other contact detail matches, otherwise complain
+            
+            # mobile phone
+            existing_mobile_phone_contact = existing(
+                (pr_contact.contact_method == "MOBILE PHONE") &
+                (pr_contact.pe_id == existing_email_contact.pe_id)
+            )
+            if existing_mobile_phone_contact is not None:
+                check_request_var_matches_value_if_given(
+                    "mobile_phone",
+                    existing_mobile_phone_contact.value
+                )
+            
+            # person details
+            existing_person = existing(
+                pr_person.pe_id == existing_email_contact.pe_id
+            )
+            if existing_person is not None:
+                check_request_var_matches_value_if_given(
+                    "first_name",
+                    existing_person.first_name
+                )
+                check_request_var_matches_value_if_given(
+                    "middle_name",
+                    existing_person.middle_name
+                )
+                check_request_var_matches_value_if_given(
+                    "last_name",
+                    existing_person.last_name
+                )
+                
+                # human resource 
+                existing_human_resource = existing(
+                    hrm_human_resource.person_id == existing_person.id
+                )
+                if existing_human_resource is not None:
+                    check_request_var_matches_value_if_given(
+                        "job_title",
+                        existing_human_resource.job_title
+                    )
+                    check_request_var_matches_value_if_given(
+                        "organisation_id",
+                        existing_human_resource.organisation_id
+                    )
+
+    if accepted: # create objects as necessary
+        # an email address is assumed to uniquely identify a person
+        # however, there is no guarantee that a person has an email address
+        if existing_email_contact is None:
+            # there is no pr_pentity
+            pe_id = db.pr_pentity.insert(
+            ).pe_id
+            
+            db.pr_contact.insert(
+                pe_id = pe_id,
+                contact_method = "EMAIL",
+                value = email_address,
+            )
+        else:
+            contact_id = existing_email_contact.id
+            pe_id = existing_email_contact.pe_id
+            
+        assert pe_id is not None
+            
+        if existing_mobile_phone_contact is None:
+            if var(mobile_phone_field_name):
+                db.pr_contact.insert(
+                    pe_id = pe_id,
+                    contact_method = "MOBILE PHONE",
+                    value = var(mobile_phone_field_name)
+                )
+
+        if existing_person is None:
+            person_id = db.pr_person.insert(
+                pe_id = pe_id,
+                first_name = var("first_name"),
+                middle_name = var("middle_name"),
+                last_name = var("last_name")
+            )
+        else:
+            person_id = existing_person.id
+    
+        if form.errors:
+            response.flash = "form is invalid"
+        else:
+            if existing_human_resource:
+                result.update(
+                    created_object_id = existing_human_resource.id,
+                    created_object_representation = hrm_human_resource_represent(existing_human_resource)
+                )
+                # nothing needs adding?            
+            else:
+                created_human_resource = db.hrm_human_resource.insert(
+                    person_id = person_id,
+                    job_title = var("job_title"),
+                    organisation_id = var("organisation_id")
+                )
+                db.commit()
+                result.update(
+                    created_object_id = created_human_resource.id,
+                    created_object_representation = hrm_human_resource_represent(created_human_resource)
+                )
+            response.flash = T("form accepted")
+
+    result["vars"] = form.vars
+    response.view="inner_form.html"
+    return result
+
 # END =========================================================================
 
=== added file 'controllers/master.py'
--- controllers/master.py	1970-01-01 00:00:00 +0000
+++ controllers/master.py	2011-11-18 07:40:33 +0000
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+"""
+    Master Data - Controllers
+
+    @author: Fran
+"""
+
+module = request.controller
+
+if module not in deployment_settings.modules:
+    raise HTTP(404, body="Module disabled: %s" % module)
+
+# Options Menu (available in all Functions' Views)
+shn_menu(module)
+
+def index():
+    "Module's Home Page"
+
+    module_name = deployment_settings.modules[module].name_nice
+    response.title = module_name
+    return dict(module_name=module_name)
 
=== modified file 'controllers/org.py'
--- controllers/org.py	2011-10-28 22:01:42 +0000
+++ controllers/org.py	2011-11-18 07:40:33 +0000
@@ -159,4 +159,127 @@
 
     return output
 
+
+# =============================================================================
+def add_site_inline():
+    """ Form to be pulled in by AJAX by the S3AddObjectWidget """
+    formstyle = s3_formstyle
+    field_name = field.name
+    
+    # Set up fields
+    org_office = db.org_office
+    
+    field_names = [
+        "type",
+        "name",
+        "address",
+        "address_2",
+        "L3",
+        "L1",
+        "postcode",
+        "phone1",
+    ]
+    fields = []
+    for field_name in field_names:
+        fields.append(getattr(org_office, field_name))
+    
+    labels, required = s3_mark_required(fields)
+    if required:
+        response.s3.has_required = True
+
+    form = SQLFORM.factory(table_name="org_office",
+                           labels=labels,
+                           formstyle=formstyle,
+                           separator = "",
+                           *fields)
+    
+    # change submit button text
+    submit_line = form[0][-1][0]
+    submit_button = submit_line[0]
+    submit_button.attributes["_value"] = T("Save")
+
+    # add cancel and reset buttons
+    submit_line.append(
+        INPUT(_type="button", _value=T("Cancel"), _onclick="close_iframe()")
+    )
+    submit_line.append(
+        INPUT(_type="reset", _value=T("Clear"))
+    )
+
+    # JavaScript
+    def add_script(script_name):
+        response.s3.scripts.append(
+            "%s/%s" % (response.s3.script_dir, script_name)
+        )
+    
+    result = dict(
+        form = TAG[""](
+            # to stop some browsers appying a default table style to unstyled tables
+            XML("""<style type="text/css">table { font-size:inherit; }</style>"""),
+            form
+        ),
+        created_object_id = None,
+        created_object_representation = "",
+        errors = form.errors
+    )
+    
+    accepted = form.accepts(request.vars)#, session):
+    # more validation, don't let other validation errors upset this, 
+    # as the user wants to see all errors in one go
+    def var(name):
+        return request.vars.get(name, None)
+    def check_request_var_matches_value_if_given(var_name, value):
+        if var(var_name):
+            if var(var_name) != value:
+                if not form.errors.has_key(var_name):
+                    form.errors[var_name] = (
+                        T("There is a existing record, but the %(property)s is different. "
+                        "(Clearing this field allows use of the existing record)")
+                    ) % dict(
+                        property = var_name.replace("_", " ")
+                    )
+    def existing(*query):
+        return db(*query).select().first()
+    # look for an office with the same name
+    name = var("name")
+    if name:
+        existing_office = existing(
+            org_office.name == name
+        )
+        if existing_office is not None:
+            for field_name in field_names:
+                check_request_var_matches_value_if_given(
+                    field_name,
+                    getattr(existing_office, field_name)
+                )
+    else:
+        existing_office = None
+    if accepted:
+        # create objects as necessary
+        if form.errors:
+            response.flash = "form is invalid"
+        else:
+            if existing_office is not None:
+                result.update(
+                    created_object_id = existing_office.id,
+                    created_object_representation = existing_office.name
+                )
+                # nothing needs adding?            
+            else:
+                created_office = db.org_office.insert(
+                    **dict(
+                        (field_name, var(field_name)) for field_name in field_names
+                    )
+                )
+                db.commit()
+                result.update(
+                    created_object_id = created_office.id,
+                    created_object_representation = created_office.name
+                )
+            response.flash = T("form accepted")
+
+    result["vars"] = form.vars
+    response.view="inner_form.html"
+    return result
+
 # END =========================================================================
 
=== modified file 'controllers/project.py'
--- controllers/project.py	2011-11-04 10:52:23 +0000
+++ controllers/project.py	2011-11-18 07:40:33 +0000
@@ -16,7 +16,6 @@
 
 # =============================================================================
 def index():
-
     """ Module's Home Page """
 
     module_name = deployment_settings.modules[module].name_nice
@@ -30,21 +29,18 @@
 
 # =============================================================================
 def need():
-
     """ RESTful CRUD controller """
 
     return s3_rest_controller(module, resourcename)
 
 # -----------------------------------------------------------------------------
 def need_type():
-
     """ RESTful CRUD controller """
 
     return s3_rest_controller(module, resourcename)
 
 # =============================================================================
 def project():
-
     """ RESTful CRUD controller """
 
     tablename = "%s_%s" % (module, resourcename)
@@ -117,9 +113,9 @@
                               rheader = site_rheader)
 # =============================================================================
 def activity():
-
     """ RESTful CRUD controller """
 
+<<<<<<< TREE
     tablename = "%s_%s" % (module, resourcename)
     table = db[tablename]
 
@@ -172,10 +168,13 @@
                             )
             return rheader
     return None
+=======
+    # Defined in the Model for use from Multiple Controllers for unified menus
+    return response.s3.project_activity_controller()
+>>>>>>> MERGE-SOURCE
 
 # =============================================================================
 def task():
-
     """ RESTful CRUD controller """
 
     # Pre-process
@@ -257,7 +256,6 @@
 
 # =============================================================================
 def gap_report():
-
     """ Provide a Report on Gaps between Activities & Needs Assessments """
 
     # Get all assess_summary
 
=== modified file 'controllers/req.py'
--- controllers/req.py	2011-11-07 19:55:13 +0000
+++ controllers/req.py	2011-11-18 07:40:33 +0000
@@ -37,9 +37,13 @@
         - custom View
     """
 
-    module_name = deployment_settings.modules[module].name_nice
-    response.title = module_name
-    return dict(module_name=module_name)
+    if s3_has_role("ADMIN"):
+        module_name = deployment_settings.modules[module].name_nice
+        response.title = module_name
+        return dict(module_name=module_name)
+
+    else:
+        redirect(URL(f="req_skill"))
 
 # -----------------------------------------------------------------------------
 def is_affiliated():
@@ -68,10 +72,13 @@
 
 # -----------------------------------------------------------------------------
 def req():
-    """ REST Controller """
-
-    # Defined in the Model for use from Multiple Controllers for unified menus
-    return response.s3.req_controller()
+    """ REST Controller for non-interactive ONLY"""
+
+    if "rcomponents" not in request.get_vars:
+        request.get_vars.update(rcomponents="pr_contact")
+
+    response.s3.prep = lambda r: not r.interactive
+    return s3_rest_controller("req", "req")
 
 # =============================================================================
 def req_item():
@@ -135,10 +142,10 @@
 
     output["title"] = T("Request Item from Available Inventory")
     output["req_btn"] = A( T("Return to Request"),
-                           _href = URL( c = "req",
-                                        f = "req",
-                                        args = [req_item.req_id, "req_item"]
-                                        ),
+                           _href = URL(c = "req",
+                                       f = "req",
+                                       args = [req_item.req_id, "req_item"]
+                                       ),
                            _class = "action-btn"
                            )
 
@@ -301,8 +308,13 @@
     if r.representation == "html":
         record = r.record
         if record and r.name == "commit":
+<<<<<<< TREE
             tabs = [(T("Edit Details"), None)]
 
+=======
+            tabs = [(T("Details"), None)]
+            
+>>>>>>> MERGE-SOURCE
             if record.type == 1:
                 tabs.append((T("Items"), "commit_item"))
 
 
=== modified file 'controllers/supply.py'
--- controllers/supply.py	2011-10-29 12:26:52 +0000
+++ controllers/supply.py	2011-11-18 07:40:33 +0000
@@ -87,10 +87,25 @@
 # =============================================================================
 def item():
     """ RESTful CRUD controller """
+    itable = db.supply_item
+    if "item_category_id" in request.vars:
+        itable.item_category_id.default = request.vars.item_category_id
+        itable.item_category_id.writable = False
 
+    # LA: Hide Extra Item Fields
+    itable.code.readable = itable.code.writable = False
+    itable.brand_id.readable = itable.brand_id.writable = False
+    itable.model.readable = itable.model.writable = False
+    itable.year.readable = itable.year.writable = False
+    itable.weight.readable = itable.weight.writable = False
+    itable.length.readable = itable.length.writable = False
+    itable.width.readable = itable.width.writable = False
+    itable.height.readable = itable.height.writable = False
+    itable.volume.readable = itable.volume.writable = False
+        
     # Sort Alphabetically for the AJAX-pulled dropdown
     s3mgr.configure("supply_item",
-                    orderby=db.supply_item.name)
+                    orderby=itable.name)
 
     # Defined in the Model for use from Multiple Controllers for unified menus
     return response.s3.supply_item_controller()
 
=== modified file 'controllers/vol.py' (properties changed: +x to -x)
--- controllers/vol.py	2011-10-13 16:40:31 +0000
+++ controllers/vol.py	2011-11-18 07:40:33 +0000
@@ -2,8 +2,6 @@
 
 """
    Volunteer Module
-   - A 'My Sahana' view of an individual Volunteer's Data, Tasks, etc
-   (Ability for Anonymous users to sign-up as a Volunteer?)
 """
 
 module = request.controller
@@ -19,8 +17,11 @@
 def index():
     """ Module's Home Page """
 
-    # Default to the Personal profile
-    return person()
+    if s3_has_role(STAFF):
+        response.view = "vol/index.html"
+        return dict()
+    else:
+        redirect(URL(c="vol", f="req_skill"))
 
 # -----------------------------------------------------------------------------
 # People
@@ -28,150 +29,41 @@
 def person():
     """
         Person Controller
-        - allows a person to view/update the details held about them
+        - List of Volunteers
     """
 
+    module = "pr"
     resourcename = "person"
+    tablename = "pr_person"
+    table = db[tablename]
+
+    response.s3.filter = (table.volunteer == True)
 
     # Load Model
     s3mgr.load("pr_address")
-    s3mgr.load("hrm_skill")
-
-    s3.crud.submit_button = T("Next")
-
-    s3mgr.model.add_component("hrm_certification",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_competency",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_credential",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_training",
-                              pr_person="person_id")
-
-    s3mgr.model.add_component("hrm_experience",
-                              pr_person="person_id")
-
-    # Q: Are volunteers assigned to a specific organisation outside of a specific Event?
-    # Yes, some are: CERT
-    s3mgr.model.add_component("hrm_human_resource",
-                              pr_person="person_id")
-
-    # Configure human resource table
-    # - for Positions
-    tablename = "hrm_human_resource"
-    table = db[tablename]
-    table.type.readable = True
-    table.type.writable = False
-    table.location_id.writable = False # Populated from pr_address
-    table.location_id.readable = False
-    s3mgr.configure(tablename,
-                    list_fields=["id",
-                                 "organisation_id",
-                                 "job_title",
-                                 "status"])
-
-    # Configure person table
-    # - hide fields
-    tablename = "pr_person"
-    table = db[tablename]
-    table.pe_label.readable = False
-    table.pe_label.writable = False
-    table.missing.readable = False
-    table.missing.writable = False
-    table.age_group.readable = False
-    table.age_group.writable = False
-    s3mgr.configure(tablename,
-                    # Wizard: Move to next Tab after Save
-                    update_next = URL(args=["[id]", "address"]),
-                    deletable=False)
-
-    # Configure for personal mode
-    s3.crud_strings[tablename].update(
-        title_display = T("Personal Profile"),
-        title_update = T("Personal Profile"))
-    # People can view their own HR data, but not edit it
-    db.hrm_human_resource.organisation_id.readable = True
-    s3mgr.configure("hrm_human_resource",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_certification",
-                    insertable = True,
-                    editable = True,
-                    deletable = True)
-    s3mgr.configure("hrm_credential",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_competency",
-                    insertable = True,  # Can add unconfirmed
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_training",    # Can add but not provide grade
-                    insertable = True,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("hrm_experience",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    s3mgr.configure("pr_group_membership",
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-    tabs = [(T("Person Details"), None),
-            (T("Addresses"), "address"),
-            (T("Certificates"), "certification"),
-            (T("Contact Information"), "contact"),
-            #(T("Skills"), "competency"),
-            #(T("Credentials"), "credential"),
-            #(T("Trainings"), "training"),
-            #(T("Mission Record"), "experience"),
-            #(T("Positions"), "human_resource"),
-            #(T("Teams"), "group_membership")
-           ]
-
-    # Prepare CRUD
-    def prep(r):
-        if r.interactive:
-            resource = r.resource
-            r.resource.build_query(id=s3_logged_in_person())
-            if resource.count() == 1:
-                resource.load()
-                r.record = resource.records().first()
-                if r.record:
-                    r.id = r.record.id
-            if r.component:
-                if r.component.name == "address":
-                    s3mgr.configure("pr_address",
-                                    create_next = URL(args=[str(r.id), "certification"]))
-                elif r.component.name == "certification":
-                    r.component.table.certificate_id.comment = None
-                    r.component.table.organisation_id.readable = False
-                    s3mgr.configure("hrm_certification",
-                                     create_next = URL(args=[str(r.id), "contact"]))
-                #elif r.component.name == "contact":
-                #    s3mgr.configure("pr_contact",
-                #                   create_next = URL(#                                      args=[str(r.id), ""]))
-
-            return True
-        else:
-            # This controller is only for interactive use
-            redirect(URL(f='default', c="index"))
-    response.s3.prep = prep
-
-    rheader = lambda r, tabs=tabs: vol_rheader(r, tabs)
-
-    output = s3_rest_controller("pr", resourcename,
-                                native=False,
-                                rheader=rheader)
+    s3mgr.load("vol_skill")
+
+    s3mgr.model.add_component("vol_skill",
+                              pr_person="person_id")
+
+    s3mgr.configure("vol_skill",
+                    deletable = False)
+
+    tabs = [ (T("Basic Details"), None),
+             (T("Skills"), "skill"),
+             (T("Organizational Affiliations"), "organisation"),
+             (T("Address"), "address"),
+             (T("Contact Details"), "contact"),
+        ]
+
+    rheader = lambda r: vol_pr_rheader(r, tabs=tabs)
+
+    output = s3_rest_controller(module, resourcename, rheader=rheader)
+
     return output
 
 # -----------------------------------------------------------------------------
-def vol_rheader(r, tabs=[]):
+def vol_pr_rheader(r, tabs=[]):
     """ Resource headers for component views """
 
     rheader = None
@@ -190,46 +82,2367 @@
                        TH(""),
                        ""),
 
-                    TR(TH("%s: " % T("Date of Birth")),
-                       "%s" % (s3_date_represent(person.date_of_birth) or T("unknown")),
-                       TH(""),
-                       ""),
-
                     ), rheader_tabs)
 
     return rheader
 
-# -----------------------------------------------------------------------------
-# Tasks
-# -----------------------------------------------------------------------------
-def task():
-
-    """ Allow a volunteer to View the details of their own tasks """
-
-    tablename = "project_task"
-    s3mgr.load(tablename)
-    table = db[tablename]
-
-    my_person_id = s3_logged_in_person()
-
-    if not my_person_id:
-        session.error = T("No person record found for current user.")
-        redirect(URL(f="index"))
-
-    table.person_id.default = my_person_id
-
-    response.s3.filter = (table.person_id == my_person_id)
-
-    s3.crud_strings[tablename].title_list = T("My Tasks")
-    s3.crud_strings[tablename].subtitle_list = T("Task List")
-    s3.crud_strings[tablename].msg_list_empty = T("No tasks currently assigned")
-
-    s3mgr.configure(tablename,
-                    insertable = False,
-                    editable = False,
-                    deletable = False)
-
-    return s3_rest_controller("project", "task")
+# =============================================================================
+def organisation():
+    """
+        Org Controller for OrgAdmins
+    """
+
+    table = db.org_organisation
+
+    table.acronym.readable = False
+    table.acronym.writable = False
+    org_has_vols_field = table.has_vols
+    org_has_vols_field.default = True
+    response.s3.filter = (org_has_vols_field == True)
+
+    if "register" in request.vars:
+        response.s3.show_listadd = True
+    output = organisation_controller(organisation_rheader = organisation_rheader)
+
+    if isinstance(output, dict):
+        output["title"] = T("Edit Organization Profile")
+    return output
+
+# -----------------------------------------------------------------------------
+def organisation_rheader(r, tabs = []):
+    """ Organisation rheader """
+
+    if r.representation == "html":
+
+        if r.record is None:
+            # List or Create form: rheader makes no sense here
+            return None
+
+        tabs = [(T("Basic Details"), None),
+                (T("Contacts"), "human_resource"),
+                #(T("Activities"), "activity")
+                ]
+        rheader_tabs = s3_rheader_tabs(r, tabs)
+
+        organisation = r.record
+
+        rheader = DIV(TABLE(
+            TR(
+                TH("%s: " % T("Organization")),
+                organisation.name,
+                ),
+            ),
+            rheader_tabs
+        )
+        return rheader
+    return None
+
+# =============================================================================
+def vol_sidebar():
+    """ Sidebar for people who aren't logged-in """
+
+    request.args = ["login"]
+    loginform = auth()
+    loginform.attributes["_id"] = "loginform"
+    request.args = []
+
+    if not response.menu_left:
+        response.menu_left = DIV()
+
+    if not auth.is_logged_in():
+        response.menu_left.append(
+    DIV(
+        P(T("Already registered?"),
+          BR(),
+          "%s:" % T("Sign in here")),
+        #loginform,
+        FORM(
+            LABEL(T("Email"), _for="email"),
+            INPUT(_type="text", _name="email", _title=T("Email")),
+            LABEL(T("Password"), _for="password"),
+            INPUT(_type="password", _name="password", _title=T("Password")),
+            A(SPAN(T("Sign In")),
+              _href="#",
+              _onclick="$('#sign-in-menu form').submit();",
+              _class="sign-in-button"),
+            loginform.custom.end,
+        _action="", _enctype="multipart/form-data", _method="post"),
+    _id="sign-in-menu",
+    _class="sub-menu"))
+    response.menu_left.append(
+    DIV(
+        P("%s:" % T("Other Volunteering Opportunities"), _class="osm-title"),
+        UL(
+            LI(
+                A(
+                    DIV("American Red Cross", _class="link-name"),
+                    DIV(
+                        H3("redcrossla.org"),
+                        IMG(_src="/%s/static/img/la/logo_arc.png" % request.application, _width="87", _height="29", _alt="American Red Cross Logo"),
+                        P(T("Rooted in over a century's tradition of service to the community, the American Red Cross is one of the world's most renowned humanitarian organizations.  American Red Cross volunteers assist with community emergency preparedness, services to the armed forces, emergency and disaster response, blood services, health and safety education, international services and other support volunteer services.")),
+                    _class="other-popup"),
+                _href="http://redcrossla.org", _target="_blank",
+                _title="American Red Cross - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("CERT", _class="link-name"),
+                    DIV(
+                        H3("www.cert-la.com"),
+                        IMG(_src="/%s/static/img/la/logo_cert.png" % request.application, _width="101", _height="100", _alt="CERT Logo"),
+                        P(T("The Los Angeles Fire Department Community Emergency Response Training Program (CERT), has been educating the citizens of Los Angeles in Disaster Preparedness since 1987.")),
+                    _class="other-popup"),
+                _href="http://www.cert-la.com", _target="_blank",
+                _title="CERT - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("LA County Disaster Healthcare Volunteers", _class="link-name"),
+                    DIV(
+                        H3("www.lacountydhv.org"),
+                        IMG(_src="/%s/static/img/la/logo_dhv.png" % request.application, _width="88", _height="30", _alt="Disaster Healthcare Volunteers"),
+                        P(T("LA County Disaster Healthcare Volunteers, comprised of 4 volunteer units, is led by the County of LA Departments of Health Services, Emergency Medical Services Agency and Public Health Emergency Preparedness and Response Program.  It is specifically for licensed medical, health, mental health, and other volunteers who want to volunteer their professional skills for public health emergencies or other large scale disasters.  Actively licensed health professionals are encouraged to register with one of the four units (MRC LA, LA County Surge Unit, Long Beach MRC, Beach Cities Health District MRC) on the State of California Disaster Healthcare Volunteers (DHV) site in advance of the next disaster.")),
+                    _class="other-popup"),
+                _href="http://www.lacountydhv.org", _target="_blank",
+                _title="Disaster Healthcare Volunteers - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("L.A. Works", _class="link-name"),
+                    DIV(
+                        H3("www.laworks.com"),
+                        IMG(_src="/%s/static/img/la/laworks.png" % request.application, _width="47", _height="40", _alt="L.A. Works Logo"),
+                        P(T("L.A. Works is a 501(c)3 nonprofit, volunteer action center that creates and implements hands-on community service projects throughout the greater LA area.")),
+                    _class="other-popup"),
+                _href="http://www.laworks.com", _target="_blank",
+                _title="L.A. Works - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("Public Health Emergency Volunteer Network", _class="link-name"),
+                    DIV(
+                        H3("publichealth.lacounty.gov"),
+                        IMG(_src="/%s/static/img/la/logo_phev.png" % request.application, _width="121", _height="30", _alt="Public Health Emergency Volunteer (PHEV) Network"),
+                        P(T("The purpose of the Public Health Emergency Volunteer (PHEV) Network is to increase the coordination and collaboration with established community volunteer units that are willing to assist the Department of Public Health in responding to public health emergencies by creating a system to engage, train, and deploy these groups.")),
+                    _class="other-popup"),
+                _href="http://publichealth.lacounty.gov/eprp/volview.htm", _target="_blank",
+                _title="Public Health Emergency Volunteer (PHEV) Network - %s" % T("Link will open to new Window"))
+            ),
+            LI(
+                A(
+                    DIV("VCLA", _class="link-name"),
+                    DIV(
+                        H3("www.vcla.net"),
+                        IMG(_src="/%s/static/img/la/vcla.png" % request.application, _width="40", _height="40", _alt="VCLA Logo"),
+                        P(T("The Volunteer Center of Los Angeles (VCLA) is one of the largest civic action centers in the nation. We are the volunteer hub that connects people, communities, resources and businesses across Los Angeles. Our mission is to change lives and communities by connecting volunteers with community needs to make Los Angeles a safer, greener, healthier and more hopeful place to live and work.")),
+                    _class="other-popup"),
+                _href="http://www.vcla.net", _target="_blank",
+                _title="VCLA - %s" % T("Link will open to new Window"))
+            )
+        ),
+    _class="other-sub-menu")
+    )
+    if session.s3.debug:
+        response.s3.scripts.append( "%s/jquery.hoverIntent.js" % s3_script_dir )
+    else:
+        response.s3.scripts.append( "%s/jquery.hoverIntent.minified.js" % s3_script_dir )
+
+    response.s3.jquery_ready.append("""
+$('.other-popup').css('display', 'none');
+$('.tooltip .message').css('display', 'none');
+$('.other-sub-menu li a').hoverIntent(menuFadeIn, menuFadeOut);
+$('.tooltip a').hoverIntent(tooltipFadeIn, tooltipFadeOut);""")
+    response.s3.js_global.append("""
+// For Popup Panels for the Other Menu
+function menuFadeIn(){$(this).children('.other-popup').fadeIn();}
+function menuFadeOut(){$(this).children('.other-popup').fadeOut();}
+// For Tooltop Panels for the Other Menu
+function tooltipFadeIn(){$(this).next('.message').fadeIn();}
+function tooltipFadeOut(){$(this).next('.message').fadeOut();}""")
+
+# -----------------------------------------------------------------------------
+def register():
+    """ Custom Registration Form """
+
+    auth.messages.submit_button = T("I accept. Create my account.")
+    request.args = ["register"]
+    db[auth.settings.table_user].language.default = T.accepted_language
+    # @ToDo: Make use to the SQLFORM.createform function instead of inserting fields?
+    form = auth()
+    form.attributes["_id"] = "regform"
+    # Custom class for Submit Button
+    form[0][-1][0][0]["_class"] = "accept-button"
+
+    # Cancel button
+    form[0][-1][0].append(BR())
+    #form[0][-1][0].append(INPUT(_type="reset", _value=T("Cancel")))
+    form[0][-1][0].append(INPUT(_type="button",
+                                _value=T("Cancel"),
+                                _class="wide-grey-button",
+                                _onClick="javascript: history.go(-1)"))
+
+    formstyle = s3.crud.formstyle
+
+    # Medical note
+    row = formstyle(id      = "",
+                    label   = "",
+                    widget  = DIV("%s:" % T("If you are a Medical or Health Professional and wish to volunteer in a professional capacity, please register at"),
+                                BR(),
+                                A("LA County Disaster Healthcare Volunteers",
+                                  _href="http://www.lacountydhv.org",
+                                  _target="_blank"),
+                                BR(),
+                                BR(),
+                                "%s:" % T("Individuals or Volunteer Units/Organizations interested in assisting during public health emergencies (i.e. Mass vaccine/medication dispensing sites or PODs) please register at"),
+                                BR(),
+                                A("LA County Department of Public Health Emergency Preparedness and Response Program",
+                                  _href="http://publichealth.lacounty.gov/eprp/volview.htm",
+                                  _target="_blank"),
+                                _style="width: 400px;",
+                                ),
+                    comment = "")
+    form[0].insert(0, row)
+
+    # Middle Name
+    row = formstyle(id      = "middle_name",
+                    label   = LABEL("%s:" % T("Middle Name"),
+                                    _for="middle_name"),
+                    widget  = INPUT(_name="middle_name",
+                                    _id="middle_name",
+                                    _class="string"),
+                    comment = "")
+    form[0][2].append(row)
+
+    # Phone
+    phone_opts = {
+        "SMS": current.deployment_settings.get_ui_label_mobile_phone(),
+        "HOME_PHONE":   T("Home phone"),
+        "WORK_PHONE":   T("Work phone")
+    }
+    if form.errors.phone:
+        phone_error = DIV(form.errors.phone,
+                          _id="phone__error",
+                          _class="error",
+                          _style="display: block;")
+    else:
+        phone_error = ""
+    phone_widget = (INPUT(_name="phone",
+                          _id="",
+                          _class="string"),
+                    SELECT(OPTION(current.deployment_settings.get_ui_label_mobile_phone(), _value="SMS"),
+                           OPTION(T("Home phone"), _value="HOME_PHONE"),
+                           OPTION(T("Work phone"), _value="WORK_PHONE"),
+                           requires=IS_IN_SET(phone_opts),
+                           value="SMS",
+                           _name="phone_type",
+                           _alt="Phone Type",
+                           _id="phone_type"),
+                    phone_error
+                   )
+    phone_help = DIV(_class="tooltip",
+                     _title="%s|%s" % (T("Phone"),
+                                       T("if you provide your Cell phone then you can choose to subscribe to SMS notifications by selecting 'My Profile' once you have completed registration.")))
+    row = formstyle(id      = "phone",
+                    label   = LABEL("%s:" % T("Phone"),
+                                    SPAN(" *", _class="req"),
+                                    _for="phone"),
+                    widget  = phone_widget,
+                    comment = phone_help)
+    form[0][11].append(row)
+
+    # Address
+    if form.errors.address1:
+        address1_error = DIV(form.errors.address1,
+                             _id="address1__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        address1_error = ""
+    row = formstyle(id      = "address1",
+                    label   = LABEL("%s:" % T("Address 1"),
+                                    SPAN(" *", _class="req"),
+                                    _for="address1"),
+                    widget  = (INPUT(_name="address1",
+                                     _id="address1",
+                                     _class="string"),
+                               address1_error),
+                    comment = "")
+    form[0][11].append(row)
+    row = formstyle(id      = "address2",
+                    label   = LABEL("%s:" % T("Address 2"),
+                                    _for="address2"),
+                    widget  = INPUT(_name="address2",
+                                    _id="address2",
+                                    _class="string"),
+                    comment = "")
+    form[0][11].append(row)
+    row = formstyle(id      = "city",
+                    label   = LABEL("%s:" % T("City"),
+                                    SPAN(" *", _class="req"),
+                                    _for="city"),
+                    widget  = INPUT(_name="city",
+                                    _id     = "city",
+                                    _class  = "string"),
+                    comment = "")
+    form[0][11].append(row)
+    states = S3LocationDropdownWidget(level="L1",
+                                      default="California",
+                                      empty=False)
+    widget = states(db.pr_address.location_id, None)
+    row = formstyle(id      = "state",
+                    label   = LABEL("%s:" % T("State"),
+                                    SPAN(" *", _class="req"),
+                                    _for="location_id"),
+                    widget  = widget,
+                    comment = "")
+    form[0][11].append(row)
+    if form.errors.zip:
+        zip_error = DIV(form.errors.zip,
+                        _id="zip__error",
+                        _class="error",
+                        _style="display: block;")
+    else:
+        zip_error = ""
+    row = formstyle(id      = "zip",
+                    label   = LABEL("%s:" % T("Zip"),
+                                    SPAN(" *", _class="req"),
+                                    _for="zip"
+                                   ),
+                    widget  = ( INPUT(_name="zip",
+                                      _id="zip",
+                                      _class="string"),
+                                zip_error
+                                ),
+                    comment = "")
+    form[0][11].append(row)
+
+
+    #form[0][-2].append(TR(TD(LABEL(T("Terms of Service:"),
+    #                               _id="terms_of_service__label"),
+    #                         _class="w2p_fl"),
+    #                      TD(LABEL(TEXTAREA(deployment_settings.get_terms_of_service(),
+    #                                        _onfocus="this.rows=10",
+    #                                        _readonly="readonly",
+    #                                        _style="width:100%;text-align:",
+    #                                        _cols="80", _rows="10"),
+    #                               _id="terms_of_service"),
+    #                         _class="w2p_fw",
+    #                         _colspan="2"),
+    #                      _id="terms_of_service__row"))
+
+    # Eighteen
+    if form.errors.eighteen:
+        eighteen_error = DIV(form.errors.eighteen,
+                             _id="eighteen__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        eighteen_error = ""
+    label = LABEL(#"%s:" % T("I am 18 or over"),
+                  T("I am 18 or over"),
+                  SPAN(" *", _class="req"),
+                  _for="eighteen",
+                  _style="display: inline;",
+                  _id="eighteen__label")
+    widget = INPUT(_type="checkbox",
+                   _value="on",
+                   _name="eighteen",
+                   _id="eighteen",
+                   _class="boolean")
+    #row = formstyle(id      = "eighteen",
+    #                label   = label,
+    #                widget  = (widget,
+    #                           eighteen_error),
+    #                comment = "")
+    row = TR(TD(widget, label, eighteen_error),
+             TD(),
+             _id="eighteen")
+    form[0][-2].append(row)
+
+    # US Citizen
+    if form.errors.citizen:
+        citizen_error = DIV(form.errors.citizen,
+                             _id="citizen__error",
+                             _class="error",
+                             _style="display: block;")
+    else:
+        citizen_error = ""
+    label = LABEL(#"%s:" % T("I am a U.S. Citizen"),
+                  T("I am a U.S. Citizen"),
+                  SPAN(" *", _class="req"),
+                  _for="citizen",
+                  _style="display: inline;",
+                  _id="citizen__label")
+    widget = INPUT(_type="checkbox",
+                   _value="on",
+                   _name="citizen",
+                   _id="citizen",
+                   _class="boolean")
+    #row = formstyle(id      = "citizen",
+    #                label   = label,
+    #                widget  = (widget,
+    #                           citizen_error),
+    #                comment = "")
+    row = TR(TD(widget, label, citizen_error),
+             TD(),
+             _id="citizen")
+    form[0][-2].append(row)
+
+    # Privacy Policy
+    row = formstyle(id      = "",
+                    label   = "",
+                    widget  = DIV(XML(T("By clicking on 'I accept' below you are agreeing to the %(privacy_policy)s.") % \
+                                    dict(privacy_policy = A(T("Privacy Policy"),
+                                                        _href = URL(c="default",
+                                                                    f="disclaimer#privacy"),
+                                                        _target = "_blank"
+                                                        )
+                                     )
+                                    ),
+                                _style="width: 300px;",
+                                ),
+                    comment = "")
+    form[0][-2].append(row)
+
+    # Add client-side validation
+    # simplified copy of s3_register_validation()
+    script = "".join(( """
+var required = '""", str(T("This field is required.")), """';
+$('#regform').validate({
+    errorClass: 'req',
+    rules: {
+        first_name: {
+            required: true
+            },
+        last_name: {
+            required: true
+            },
+        phone: {
+            required: true
+        },
+        email: {
+            required: true,
+            email: true
+        },
+        address1: {
+            required: true
+        },
+        city: {
+            required: true
+        },
+        zip: {
+            required: true
+        },
+        password: {
+            required: true
+        },
+        password_two: {
+            required: true,
+            equalTo: '.password:first'
+        },
+        eighteen: {
+            required: true
+        },
+        citizen: {
+            required: true
+        }
+    },
+    messages: {
+        first_name: '""", str(T("Enter your firstname")), """',
+        last_name: required,
+        phone: required,
+        email: {
+            required: '""", str(T("Please enter a valid email address")), """',
+            minlength: '""", str(T("Please enter a valid email address")), """'
+        },
+        address1: required,
+        city: required,
+        zip: required,
+        password: {
+            required: '""", str(T("Provide a password")), """'
+        },
+        password_two: {
+            required: '""", str(T("Repeat your password")), """',
+            equalTo: '""", str(T("Enter the same password as above")), """'
+        },
+        eighteen: '""", str(T("If you are under the age 18, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")), """',
+        citizen: '""", str(T("If you are not a US citizen, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")), """',
+    },
+    errorPlacement: function(error, element) {
+        error.appendTo( element.parent().next() );
+    },
+    submitHandler: function(form) {
+        form.submit();
+    }
+});""" ))
+    response.s3.jquery_ready.append( script )
+
+    if session.s3.debug:
+        response.s3.scripts.append( "%s/jquery.validate.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.js" % s3_script_dir )
+    else:
+        response.s3.scripts.append( "%s/jquery.validate.min.js" % s3_script_dir )
+        response.s3.scripts.append( "%s/jquery.pstrength.1.3.min.js" % s3_script_dir )
+
+    response.s3.jquery_ready.append("$('.password:first').pstrength();\n")
+    response.s3.js_global.append("".join((
+        "S3.i18n.password_chars = '%s';\n" % T("The minimum number of characters is "),
+        "S3.i18n.very_weak = '%s';\n" % T("Very Weak"),
+        "S3.i18n.weak = '%s';\n" % T("Weak"),
+        "S3.i18n.medium = '%s';\n" % T("Medium"),
+        "S3.i18n.strong = '%s';\n" % T("Strong"),
+        "S3.i18n.very_strong = '%s';\n" % T("Very Strong"),
+        "S3.i18n.too_short = '%s';\n" % T("Too Short"),
+        "S3.i18n.unsafe_password = '%s';\n" % T("Unsafe Password Word!"),
+    )))
+
+    # Add sidebar for login box & other volunteering opportunities
+    vol_sidebar()
+
+    response.s3.donate_cash_link = True
+
+    response.title = T("Register")
+    response.s3.has_required = True
+
+    return dict(form=form)
+
+# -----------------------------------------------------------------------------
+def register_validation(form):
+    """ Validate the custom fields in registration form """
+    # Terms of Service
+    if "eighteen" not in request.post_vars or request.post_vars.eighteen != "on":
+        form.errors.eighteen = T("If you are under the age 18, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")
+    if "citizen" not in request.post_vars or request.post_vars.citizen != "on":
+        form.errors.citizen = T("If you are not a U.S. citizen, you may not register to apply to be a volunteer.  Thank you for your interest in our volunteer opportunities.")
+    # Phone
+    if "phone" in request.post_vars and request.post_vars.phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.phone):
+            form.errors.phone = T("Invalid phone number")
+    else:
+        form.errors.phone = T("Phone number is required")
+    # Address
+    if not request.post_vars.address1:
+        form.errors.address1 = T("Address is required")
+    if not request.post_vars.city:
+        form.errors.city = T("City is required")
+    if not request.post_vars.zip:
+        form.errors.zip = T("Zip is required")
+
+    return
+
+# -----------------------------------------------------------------------------
+def register_onaccept(form):
+    # Usual Registration Tasks
+    # (PR record, Authenticated Role, Contacts)
+    person = auth.s3_register(form)
+
+    # LA-specific
+    table = db.pr_person
+    query = (table.id == person)
+
+    db(query).update(volunteer=True,
+                     middle_name=request.post_vars.middle_name)
+
+    pe = db(query).select(table.pe_id,
+                          limitby=(0, 1)).first().pe_id
+
+    # Phone
+    table = db.pr_contact
+    phone = request.post_vars.phone
+    phone_type = request.post_vars.phone_type
+    # Don't auto-subscribe to SMS (priority 10)
+    table.insert(pe_id = pe,
+                 contact_method = phone_type,
+                 value = phone,
+                 priority=10)
+
+    # Address
+    table = db.gis_location
+    address1 = request.post_vars.address1
+    address2 = request.post_vars.address2
+    if address2:
+        address = "%s\n%s" % (address1,
+                              address2)
+    else:
+        address = address1
+    city = request.post_vars.city
+    location = request.post_vars.location_id
+    state = db(table.id == location).select(table.id,
+                                            table.name,
+                                            cache=gis.cache,
+                                            limitby=(0, 1)).first()
+    if state:
+        statename = state.name
+    else:
+        # Duff data - not USA
+        statename = "unknown"
+    zip = request.post_vars.zip
+    county = ""
+    if city:
+        query = (table.name == city) & \
+                (table.level == "L3") & \
+                (table.path.like("%%/%s/%%" % state))
+        _city = db(query).select(table.id,
+                                 table.parent,
+                                 limitby=(0, 1)).first()
+        if _city:
+            if _city.parent != state:
+                query = (table.id == _city.parent)
+                county = db(query).select(table.name,
+                                          limitby=(0, 1)).first().name
+        elif state:
+            _city = table.insert(name=city, level="L3", parent=state.id)
+            gis.update_location_tree(_city, state.id)
+        else:
+            usa = db(table.code == "US").select(table.id,
+                                                limitby=(0, 1)).first().id
+            _city = table.insert(name=city, level="L3", parent=usa)
+            gis.update_location_tree(_city, usa)
+    else:
+        _city = None
+    location = table.insert(addr_street=address, addr_postcode=zip, parent=_city)
+    gis.update_location_tree(location, _city)
+    s3mgr.load("pr_address")
+    table = db.pr_address
+    table.insert(pe_id = pe,
+                 location_id = location,
+                 address=address,
+                 postcode=zip,
+                 L3=city,
+                 L2=county,
+                 L1=statename,
+                 L0="United States")
+
+# -----------------------------------------------------------------------------
+auth.settings.register_onvalidation = register_validation
+auth.settings.register_onaccept = register_onaccept
+auth.settings.register_next = URL(c="vol", f="skill", args=["create"])
+
+# Organisation widget for use in Registration Screen
+# NB User Profile is only editable by Admin - using User Management
+org_widget = IS_ONE_OF(db, "org_organisation.id",
+                       organisation_represent,
+                       orderby="org_organisation.name",
+                       sort=True)
+if deployment_settings.get_auth_registration_organisation_mandatory():
+    _table_user.organisation_id.requires = org_widget
+else:
+    _table_user.organisation_id.requires = IS_NULL_OR(org_widget)
+
+# =============================================================================
+def profile():
+    """ Custom Profile Screen """
+
+    if not auth.is_logged_in():
+        redirect(URL(f="user", args="login"))
+    elif s3_has_role(ORG_VOL):
+        #return organisation_profile()
+        redirect(URL(f="organisation", args=[auth.user.organisation_id]))
+
+    # Only show admin-set fields if there is data
+    table = db.auth_user
+    if not auth.user.organisation_id:
+        # Not relevant to Volunteers
+        table.organisation_id.readable = False
+    if not auth.user.site_id:
+        # Only relevant to Field Staff
+        table.site_id.readable = False
+
+    # Validate the custom fields
+    auth.settings.profile_onvalidation = profile_validation
+
+    # Process the custom fields
+    auth.settings.profile_onaccept = profile_onaccept
+
+    auth.messages.profile_save_button = "Save"
+
+    request.args = ["profile"]
+    form = auth()
+
+    # Custom class for Submit Button
+    form[0][-1][1][0]["_class"] = "submit-button"
+
+    # Lookup the Person
+    id = auth.s3_logged_in_person()
+    table = db.pr_person
+    person = db(table.id == id).select(table.pe_id,
+                                       table.middle_name,
+                                       table.volunteer,
+                                       limitby=(0, 1)).first()
+
+    row = TR(TD(LABEL("%s:" % table.middle_name.label, _for="middle_name")),
+             TD(INPUT(_name="middle_name",
+                      _id="middle_name",
+                      _class="string",
+                      _value=person.middle_name)))
+    form[0][0].append(row)
+
+    # Lookup the Contacts
+    table = db.pr_contact
+    query = (table.pe_id == person.pe_id) & \
+            (table.deleted == False)
+    contacts = db(query).select(table.contact_method,
+                                table.value,
+                                table.priority)
+    cell = ""
+    home = ""
+    work = ""
+    sms_enabled = False
+    email_enabled = True
+    for contact in contacts:
+        if contact.contact_method == "SMS":
+            cell = contact.value
+            if contact.priority == 10:
+                sms_enabled = False
+            else:
+                sms_enabled = True
+        elif contact.contact_method == "EMAIL":
+            if contact.priority == 10:
+                email_enabled = False
+            else:
+                email_enabled = True
+        elif contact.contact_method == "HOME_PHONE":
+            home = contact.value
+        elif contact.contact_method == "WORK_PHONE":
+            work = contact.value
+
+    # Cell phone
+    if form.errors.mobile:
+        cell_error = DIV(form.errors.mobile,
+                         _id="mobile__error",
+                         _class="error",
+                         _style="display: block;")
+    else:
+        cell_error = ""
+    row = TR(TD(LABEL("%s:" % msg.CONTACT_OPTS["SMS"], _for="mobile")),
+             TD(INPUT(_name="mobile",
+                      _id="mobile",
+                      _class="string",
+                      _value=cell),
+                cell_error))
+    form[0][2].append(row)
+    # @ToDo: JS validation
+
+    if person.volunteer:
+        # Home phone
+        if form.errors.home_phone:
+            home_phone_error = DIV(form.errors.home_phone,
+                                   _id="home_phone__error",
+                                   _class="error",
+                                   _style="display: block;")
+        else:
+            home_phone_error = ""
+        row = TR(TD(LABEL("%s:" % msg.CONTACT_OPTS["HOME_PHONE"], _for="home_phone")),
+                 TD(INPUT(_name="home_phone",
+                          _id="home_phone",
+                          _class="string",
+                          _value=home),
+                    home_phone_error))
+        form[0][2].append(row)
+        # @ToDo: JS validation
+
+        # Work phone
+        if form.errors.work_phone:
+            work_phone_error = DIV(form.errors.work_phone,
+                                   _id="work_phone__error",
+                                   _class="error",
+                                   _style="display: block;")
+        else:
+            work_phone_error = ""
+        row = TR(TD(LABEL("%s:" % msg.CONTACT_OPTS["WORK_PHONE"], _for="work_phone")),
+                 TD(INPUT(_name="work_phone",
+                          _id="work_phone",
+                          _class="string",
+                          _value=work),
+                    work_phone_error))
+        form[0][2].append(row)
+        # @ToDo: JS validation
+
+        # Lookup the Address
+        table = db.pr_address
+        query = (table.pe_id == person.pe_id) & \
+                (table.deleted == False)
+        address = db(query).select(table.location_id,
+                                   limitby=(0, 1)).first()
+        address1 = ""
+        address2 = ""
+        city = ""
+        state = ""
+        zip = ""
+        if address:
+            table = db.gis_location
+            query = (table.id == address.location_id)
+            location = db(query).select(table.id,
+                                        table.path,
+                                        table.parent,
+                                        table.addr_street,
+                                        table.addr_postcode,
+                                        limitby=(0, 1)).first()
+            if location:
+                try:
+                    address1, address2 = location.addr_street.split("\n", 1)
+                except ValueError:
+                    address1 = location.addr_street
+                zip = location.addr_postcode
+                results = gis.get_parent_per_level(None, location.id, location)
+                try:
+                    city = results["L3"].name
+                #except KeyError, AttributeError:
+                except:
+                    pass
+                try:
+                    state = results["L1"].name
+                #except KeyError, AttributeError:
+                except:
+                    pass
+
+        if form.errors.address1:
+            address1_error = DIV(form.errors.address1,
+                                 _id="address1__error",
+                                 _class="error",
+                                 _style="display: block;")
+        else:
+            address1_error = ""
+        row = TR(TD(LABEL("%s: " % T("Address 1"),
+                          SPAN("*", _class="req"),
+                          _for="address1")),
+                 TD(INPUT(_name="address1",
+                          _id="address1",
+                          _class="string",
+                          _value=address1),
+                    address1_error))
+        form[0][2].append(row)
+        row = TR(TD(LABEL("%s:" % T("Address 2"), _for="address2")),
+                 TD(INPUT(_name="address2",
+                          _id="address2",
+                          _class="string",
+                          _value=address2)))
+        form[0][2].append(row)
+        row = TR(TD(LABEL("%s: " % T("City"),
+                          SPAN("*", _class="req"),
+                          _for="city")),
+                 TD(INPUT(_name="city",
+                          _id="city",
+                          _class="string",
+                          _value=city)))
+        form[0][2].append(row)
+        states = S3LocationDropdownWidget(level="L1",
+                                          default=state or "California",
+                                          empty=False)
+        widget = states(db.pr_address.location_id, None)
+        row = TR(TD(LABEL("%s:" % T("State"),
+                          SPAN("*", _class="req"),
+                          _for="location_id")),
+                 TD(widget))
+        form[0][2].append(row)
+        if form.errors.zip:
+            zip_error = DIV(form.errors.zip,
+                            _id="zip__error",
+                            _class="error",
+                            _style="display: block;")
+        else:
+            zip_error = ""
+        row = TR(TD(LABEL("%s:" % T("Zip"),
+                          SPAN("*", _class="req"),
+                          _for="zip")),
+                 TD(INPUT(_name="zip",
+                          _id="zip",
+                          _class="string",
+                          _value=zip),
+                    zip_error))
+        form[0][2].append(row)
+
+        # Notifications
+        div = DIV(TR(TD(LABEL("%s:" % T("Notifications"))),
+                     TD()
+                    ),
+                  TR(TD(T("Receive Notifications via Email?")),
+                     TD(INPUT(_type="checkbox",
+                        _value="on",
+                        value="on" if email_enabled else "",
+                        _name="sub_email",
+                        _id="sub_email",
+                        _alt=T("Receive Notifications via Email?"),
+                        _class="boolean"))
+                    ),
+                  TR(TD(T("Receive Notifications via SMS?")),
+                     TD(INPUT(_type="checkbox",
+                        _value="on",
+                        value="on" if sms_enabled else "",
+                        _name="sub_sms",
+                        _id="sub_sms",
+                        _alt=T("Receive Notifications via SMS?"),
+                        _class="boolean")),
+                     TD(DIV(_class="tooltip",
+                            _title="%s|%s" % (T("Receive Notifications via SMS"),
+                                              T("Note that this may incur costs from your carrier."))))
+                    )
+                )
+        form[0][-2].append(div)
+
+        # Affiliated Orgs
+        s3mgr.load("vol_organisation")
+        table = db.vol_organisation
+        orgs = db(table.pe_id == person.pe_id).select(table.organisations_id,
+                                                      limitby=(0, 1)).first()
+        if orgs:
+            orgs = orgs.organisations_id
+            table = db.org_organisation
+            if orgs:
+                _orgs = db(table.id.belongs(orgs)).select(table.name)
+            else:
+                _orgs = []
+            orgs = []
+            for org in _orgs:
+                orgs.append(org.name)
+        else:
+            orgs = []
+
+        div = DIV(TR(TD(),
+                     TD(B(T("Affiliation with other volunteer organizations")))),
+                  TR(TD(T("Are you affiliated with other volunteer organizations?"),
+                        " (", DIV(T("Check all that apply"),
+                                 _style="display: inline;",
+                                 _class="red"),
+                        ")",
+                        _colspan=2)),
+                  TR(TD("American Red Cross"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "American Red Cross of Greater Los Angeles" in orgs else "",
+                              _name="arc",
+                              _id="arc",
+                              _alt=T("American Red Cross"),
+                              _class="boolean"))),
+                  TR(TD("CERT"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "CERT Los Angeles" in orgs else "",
+                              _name="cert",
+                              _id="cert",
+                              _alt=T("CERT"),
+                              _class="boolean"))),
+                  TR(TD("Disaster Healthcare Volunteers"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "Disaster Healthcare Volunteers" in orgs else "",
+                              _name="dhv",
+                              _id="dhv",
+                              _alt=T("Disaster Healthcare Volunteers"),
+                              _class="boolean"))),
+                  TR(TD("L.A. Works"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "LA Works" in orgs else "",
+                              _name="laworks",
+                              _id="laworks",
+                              _alt=T("L.A. Works"),
+                              _class="boolean"))),
+                  TR(TD("Volunteer Center of Los Angeles"),
+                     TD(INPUT(_type="checkbox",
+                              _value="on",
+                              value="on" if "Volunteer Center of Los Angeles" in orgs else "",
+                              _name="vcla",
+                              _id="vcla",
+                              _alt=T("Volunteer Center of Los Angeles"),
+                              _class="boolean"))),
+                )
+        form[0][-2].append(div)
+
+        # Skills
+        # - separate screen
+
+    response.title = T("Profile")
+    response.s3.has_required = True
+
+    return dict(form=form)
+
+# -----------------------------------------------------------------------------
+def profile_validation(form):
+    """ Validate the custom fields in profile form """
+
+    if s3_has_role(STAFF):
+        volunteer = False
+    else:
+        volunteer = True
+
+    # Mobile Phone
+    if "mobile" in request.post_vars and request.post_vars.mobile:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.mobile):
+            form.errors.mobile = T("Invalid phone number")
+    elif "sub_sms" in request.post_vars and request.post_vars.sub_sms == "on":
+        form.errors.mobile = T("Cell phone number is required for SMS notifications")
+    # Home Phone
+    if "home_phone" in request.post_vars and request.post_vars.home_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.home_phone):
+            form.errors.home_phone = T("Invalid phone number")
+    # Work Phone
+    if "work_phone" in request.post_vars and request.post_vars.work_phone:
+        regex = re.compile(single_phone_number_pattern)
+        if not regex.match(request.post_vars.work_phone):
+            form.errors.work_phone = T("Invalid phone number")
+    # Address
+    if volunteer and not request.post_vars.address1:
+        form.errors.address1 = T("Address is required")
+    if volunteer and not request.post_vars.zip:
+        form.errors.zip = T("Zip is required")
+
+    return
+
+# -----------------------------------------------------------------------------
+def profile_onaccept(form):
+    """ Process the custom fields """
+
+    if s3_has_role(STAFF):
+        volunteer = False
+    else:
+        volunteer = True
+
+    table = db.pr_person
+    query = (table.id == auth.s3_logged_in_person())
+    db(query).update(middle_name=request.post_vars.middle_name)
+    pe = db(query).select(table.pe_id,
+                          limitby=(0, 1)).first().pe_id
+
+    if volunteer:
+        # Contacts / Notifications
+        if "sub_email" in request.post_vars and \
+            request.post_vars.sub_email == "on":
+            email_enabled = True
+        else:
+            email_enabled = False
+        if "sub_sms" in request.post_vars and \
+            request.post_vars.sub_sms == "on":
+            sms_enabled = True
+        else:
+            sms_enabled = False
+        home_phone = request.post_vars.home_phone
+        work_phone = request.post_vars.work_phone
+    email = request.post_vars.email
+    cell = request.post_vars.mobile
+    table = db.pr_contact
+    if email:
+        utable = db.auth_user
+        query = (utable.id == auth.user.id)
+        _email = db(query).select(utable.email,
+                                  limitby=(0, 1)).first().email
+        if not _email == email:
+            # Email has changed
+            # Check that the new email doesn't clash
+            query2 = (utable.email == email)
+            test = db(query2).select(utable.id,
+                                     limitby=(0, 1)).first()
+            if not test:
+                # update auth_user
+                db(query).update(email=email)
+                # update pr_contact
+                query = (table.value == _email)
+                if volunteer:
+                    priority = 1 if email_enabled else 10
+                    db(query).update(value=email, priority=priority)
+                else:
+                    db(query).update(value=email)
+            else:
+                # Existing .requires validation prevents the user from reusing
+                # an existing email
+                pass
+        elif volunteer:
+            # Just update the notifications
+            query = (table.value == email)
+            priority = 1 if email_enabled else 10
+            db(query).update(priority=priority)
+
+    _cell = ""
+    _home_phone = ""
+    _work_phone = ""
+    query = (table.pe_id == pe) & \
+            (table.deleted == False)
+    contacts = db(query).select(table.contact_method,
+                                table.value)
+    for contact in contacts:
+        if contact.contact_method == "SMS":
+            _cell = contact.value
+        elif contact.contact_method == "HOME_PHONE":
+            _home_phone = contact.value
+        elif contact.contact_method == "WORK_PHONE":
+            _work_phone = contact.value
+    table = db.pr_contact
+    base_query = (table.pe_id == pe)
+    if volunteer:
+        priority = 1 if sms_enabled else 10
+        if _cell:
+            # Update existing record
+            query = base_query & (table.value == _cell)
+            db(query).update(value=cell, priority=priority)
+        elif cell:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="SMS", value=cell,
+                         priority=priority)
+        if _home_phone:
+            # Update existing record
+            query = base_query & (table.value == _home_phone)
+            db(query).update(value=home_phone)
+        elif home_phone:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="HOME_PHONE",
+                         value=home_phone)
+
+        if _work_phone:
+            # Update existing record
+            query = base_query & (table.value == _work_phone)
+            db(query).update(value=work_phone)
+        elif work_phone:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="WORK_PHONE",
+                         value=work_phone)
+
+        # Address
+        address1 = request.post_vars.address1
+        address2 = request.post_vars.address2
+        if address2:
+            address = "%s\n%s" % (address1, address2)
+        else:
+            address = address1
+        zip = request.post_vars.zip
+        city = request.post_vars.city
+        state = request.post_vars.location_id
+        table = db.gis_location
+        statename = db(table.id == state).select(table.name,
+                                                 cache=gis.cache,
+                                                 limitby=(0, 1)).first().name
+        county = ""
+        if city:
+            query = (table.name == city) & \
+                    (table.level == "L3") & \
+                    (table.path.like("%%/%s/%%" % state))
+            _city = db(query).select(table.id,
+                                     table.parent,
+                                     limitby=(0, 1)).first()
+            if _city:
+                if _city.parent != state:
+                    query = (table.id == _city.parent)
+                    county = db(query).select(table.name,
+                                              limitby=(0, 1)).first().name
+            else:
+                _city = table.insert(name=city, level="L3", parent=state)
+                gis.update_location_tree(_city, state)
+        else:
+            _city = None
+        table = db.pr_address
+        query = (table.pe_id == pe) & \
+                (table.deleted == False)
+        test = db(query).select(table.location_id,
+                                limitby=(0, 1)).first()
+        if test:
+            db(query).update(address=address,
+                             postcode=zip,
+                             L3=city,
+                             L2=county,
+                             L1=statename,
+                             L0="United States")
+            table = db.gis_location
+            location = test.location_id
+            query = (table.id == location)
+            db(query).update(addr_street=address,
+                             addr_postcode=zip,
+                             parent=_city)
+            gis.update_location_tree(location, _city)
+
+        # Affiliated Organisations
+        # Also in models/vol.py
+        vol_orgs = ["American Red Cross of Greater Los Angeles",
+                    "CERT Los Angeles",
+                    "Disaster Healthcare Volunteers",
+                    "LA Works",
+                    "Volunteer Center of Los Angeles"]
+        table = db.org_organisation
+        query = (table.name.belongs(vol_orgs))
+        orgs = db(query).select(table.id,
+                                table.name,
+                                cache=(cache.ram, 60))
+        for org in orgs:
+            if org.name == "American Red Cross of Greater Los Angeles":
+                ARC = org.id
+            elif org.name == "CERT Los Angeles":
+                CERT = org.id
+            elif org.name == "Disaster Healthcare Volunteers":
+                DHV = org.id
+            elif org.name == "LA Works":
+                LAW = org.id
+            elif org.name == "Volunteer Center of Los Angeles":
+                VCLA = org.id
+        orgs = []
+        if "arc" in request.post_vars and request.post_vars.arc == "on":
+            orgs.append(ARC)
+        if "cert" in request.post_vars and request.post_vars.cert == "on":
+            orgs.append(CERT)
+        if "dhv" in request.post_vars and request.post_vars.dhv == "on":
+            orgs.append(DHV)
+        if "laworks" in request.post_vars and \
+           request.post_vars.laworks == "on":
+            orgs.append(LAW)
+        if "vcla" in request.post_vars and request.post_vars.vcla == "on":
+            orgs.append(VCLA)
+        s3mgr.load("vol_organisation")
+        table = db.vol_organisation
+        query = (table.pe_id == pe)
+        test = db(query).select(table.id,
+                                limitby=(0, 1)).first()
+        if test:
+            db(query).update(organisations_id = orgs)
+        else:
+            table.insert(pe_id = pe,
+                         organisations_id = orgs,
+                         owned_by_user = auth.user.id)
+
+    else:
+        # Not a volunteer: EOC staff
+        if _cell:
+            # Update existing record
+            query = base_query & (table.value == _cell)
+            db(query).update(value=cell)
+        elif cell:
+            # Insert new record
+            table.insert(pe_id=pe, contact_method="SMS", value=cell)
+
+# -----------------------------------------------------------------------------
+# Skills
+# -----------------------------------------------------------------------------
+def skill():
+    """
+        Collect a Volunteer's Skills
+    """
+
+    tablename = "vol_skill"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    person = auth.s3_logged_in_person()
+    table.person_id.default = person
+    table.person_id.writable = table.person_id.readable = False
+
+    s3mgr.configure(tablename,
+                    # Workflow: Prompt for creating Emergency Contacts after adding Skills
+                    create_next = URL(f="contact", args=["my"]),
+                    update_next = URL(f="skill", args=["my"]),
+                    deletable = False,
+                    listadd = False)
+
+    # Parse the request
+    if "my" in request.args:
+        query = (table.person_id == person)
+        record = db(query).select(table.id,
+                                  limitby=(0, 1),
+                                  cache = gis.cache).first()
+        if record:
+            r = s3mgr.parse_request(args=[str(record.id)])
+        else:
+            r = s3mgr.parse_request(args=["create"])
+    else:
+        r = s3mgr.parse_request()
+
+    # Execute the request
+    output = r()
+
+    response.title = T("My Skills")
+    return output
+
+# -----------------------------------------------------------------------------
+# Contacts
+# -----------------------------------------------------------------------------
+def contact():
+    """
+        Emergency Contacts for the volunteer
+    """
+
+    tablename = "vol_contact"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    person = auth.s3_logged_in_person()
+    table.person_id.default = person
+    table.person_id.writable = table.person_id.readable = False
+
+    s3mgr.configure(tablename,
+                    create_next = URL(f="req_skill"),
+                    update_next = URL(f="contact", args=["my"]),
+                    deletable = False,
+                    listadd = False)
+
+    # Parse the request
+    if "my" in request.args:
+        query = (table.person_id == person)
+        record = db(query).select(table.id,
+                                  limitby=(0, 1)).first()
+        if record:
+            r = s3mgr.parse_request(args=[str(record.id)])
+        else:
+            r = s3mgr.parse_request(args=["create"])
+    else:
+        r = s3mgr.parse_request()
+
+    # Execute the request
+    output = r()
+
+    response.title = T("Emergency Contact")
+    return output
+
+# -----------------------------------------------------------------------------
+# Assignments
+# - My Assignments menu
+# -----------------------------------------------------------------------------
+def assignment():
+
+    """ Allow a Volunteer/Org to View the details of their own assignments """
+
+    tablename = "vol_assignment"
+    s3mgr.load(tablename)
+    table = db[tablename]
+
+    if auth.user.organisation_id:
+        response.s3.filter = (table.organisation_id == auth.user.organisation_id)
+        # Control List View
+        table.person_id.readable = False
+        table.number.readable = True
+        table.number.label = T("Number of Volunteers Committed")
+    else:
+        my_person_id = s3_logged_in_person()
+        # Control List View
+        table.person_id.readable = False
+
+        if not my_person_id:
+            session.error = T("No person record found for current user.")
+            redirect(URL(f="index"))
+
+        response.s3.filter = (table.person_id == my_person_id)
+
+    # Filter for current/past assignments
+    sel = ((table.checkout == None) |
+           (table.checkout >= request.utcnow) |
+           (table.task_evaluation == None))
+    s3.crud_strings[tablename].update(
+        subtitle_list = T("Current Assignments"))
+    if "show" in request.get_vars:
+        show = request.get_vars["show"]
+        if show == "past":
+            sel = ((table.checkout < request.utcnow) &
+                   (table.task_evaluation != None))
+            s3.crud_strings[tablename].update(
+                subtitle_list = T("Past Assignments"),
+                msg_no_match = T("No past assignments"))
+    response.s3.filter &= sel
+
+    # Post-process
+    def postp(r, output):
+        if r.interactive:
+            response.s3.actions = [dict(
+                        url = URL(c = "vol",
+                                  f = "req",
+                                  args = ["assignment", "[id]"]),
+                        _class = "action-btn",
+                        label = str(T("Details"))
+                    )]
+            if "show" in request.get_vars and request.get_vars["show"] == "past":
+                response.s3.actions += [dict(
+                            url = URL(c=request.controller,
+                                      f="req",
+                                      args=["assignment",
+                                            "[id]",
+                                            "print"]),
+                            _class = "action-btn",
+                            label = str(T("Certificate"))
+                        )]
+
+        return output
+    response.s3.postp = postp
+
+    output = s3_rest_controller("vol", "assignment")
+    return output
+
+# -----------------------------------------------------------------------------
+# Requests
+# -----------------------------------------------------------------------------
+def vol_req_rheader(r):
+    """
+        Resource Header for Requests
+        - Volunteer view
+        - inc Volunteer Roster
+    """
+
+    if r.representation == "html":
+        if r.name == "req":
+            record = r.record
+            if record:
+                if s3_has_role(STAFF):
+                    # Show Tabs on Roster
+                    tabs = [(T("Details"), None)]
+                    if record.type == 3 and deployment_settings.has_module("hrm"):
+                        tabs.append((T("Requested Volunteers"), "req_skill"))
+                    if deployment_settings.has_module("doc"):
+                        tabs.append((T("Documents"), "document"))
+                    #if deployment_settings.get_req_use_commit():
+                    #    tabs.append((T("Commitments"), "commit"))
+                    tabs.append((T("Roster"), "assignment"))
+                    try:
+                        # Remove the default_type from URLs as set within respective controller
+                        r.vars.pop("default_type")
+                    except KeyError:
+                        pass
+                    rheader_tabs = s3_rheader_tabs(r, tabs)
+                elif not r.component:
+                    # Volunteers should only ever access Requests via the Components
+                    return
+
+                table = db.req_req_skill
+                query = (table.req_id == record.id)
+                srecord = db(query).select(table.skill_id,
+                                           table.quantity,
+                                           table.quantity_commit,
+                                           limitby=(0, 1)).first()
+                if srecord:
+                    skills = response.s3.hrm_multi_skill_represent(srecord.skill_id)
+                    requested = srecord.quantity
+                    required = srecord.quantity - srecord.quantity_commit
+                else:
+                    skills = requested = required = ""
+
+                address = shn_site_represent(record.site_id, address=True)
+                #table = db.org_office
+                #query = (table.id == record.site_id)
+                #srecord = db(query).select(table.name,
+                #                           table.address,
+                #                           table.postcode,
+                #                           table.L3,
+                #                           table.L1,
+                #                           limitby=(0, 1)).first()
+                #if srecord:
+                #    location = T("%(site)s in %(location)s") % dict(site = srecord.name,
+                #                                                    location = record.location)
+                #    ltable = db.gis_location
+                #    query = (ltable.name == srecord.L1)
+                #    state = db(query).select(ltable.code,
+                #                             limitby=(0, 1),
+                #                             cache=gis.cache).first()
+                #    if state:
+                #        statecode = state.code
+                #    else:
+                #        # Not valid US data (e.g. prepopulate)
+                #        statecode = None
+                #    address = "%s, %s %s %s" % (srecord.address,
+                #                                srecord.L3,
+                #                                statecode,
+                #                                srecord.postcode)
+                #else:
+                #    location = address = ""
+
+                table = db.hrm_human_resource
+                query = (table.id == record.request_for_id)
+                person = db(query).select(table.person_id,
+                                          limitby=(0, 1)).first()
+                phone = email = report_to = ""
+                if person:
+                    report_to = person_represent(person.person_id)
+
+                    ptable = db.pr_person
+                    ctable = db.pr_contact
+                    query = (ptable.id == person.person_id) & \
+                            (ctable.pe_id == ptable.pe_id)
+                    contacts = db(query).select(ctable.contact_method,
+                                                ctable.value)
+                    for contact in contacts:
+                        if contact.contact_method == "SMS":
+                            phone = contact.value
+                        elif contact.contact_method == "EMAIL":
+                            email = contact.value
+
+                if s3_has_role(STAFF):
+                    subtitle = T("Request Details")
+                    buttons = DIV(
+                        BUTTON(T("PRINT ROSTER"),
+                               _class="wide-grey-button",
+                               _onClick="javascript: window.location='%s'" % \
+                                    URL(c=request.controller,
+                                        f="req",
+                                        args=[record.id,
+                                              "assignment",
+                                              "print"])),
+                        BUTTON(T("CANCEL REQUEST"),
+                               _class="wide-grey-button",
+                               _onClick="javascript: window.location='%s'" % \
+                                    URL(c=request.controller,
+                                        f="req",
+                                        args=[record.id,
+                                              "cancel"]))
+                        )
+                    textbox = ""
+                else:
+                    subtitle = T("Volunteer Assignment Details")
+                    buttons = ""
+                    if r.component.name == "application":
+                        textbox = P(T("When you volunteer with Give2LA, you are an extension of the good will of the City of Los Angeles. For many survivors, volunteers are their first point of contact. Your respect, courtesy and sensitivity during these difficult times are vital. In addition, following directions, procedures, and processes given to you by your supervisor are essential; failure to do so may exclude you from future volunteer assignments."))
+                    else:
+                        give2la_forms = A( T("Give2LA Registration Forms"),
+                                           _href = URL(c="static",
+                                                       f="Volunteer_Ethics_and_Conduct.pdf"),
+                                          _target="_blank"
+                                          )
+                        textbox = DIV(P(T("Thank you for Volunteering. Please print out your Volunteer Assignment Form as it contains important information about who, when, and where to report to for your Volunteer Assignment.")),
+                                      P(XML(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_forms)s.") %
+                                            dict(give2la_forms = give2la_forms) )),
+                                      P(T("Please let us know in advance if you cannot report for your Volunteer Assignment by calling the Point of Contact listed above.")),
+                                      )
+
+                if record.date_required:
+                    time_req = s3_time_represent(record.date_required,
+                                                 utc=True)
+                else:
+                    time_req = ""
+                if record.date_required_until:
+                    time_until = s3_time_represent(record.date_required_until,
+                                                   utc=True)
+                else:
+                    time_until = ""
+
+                class DL(DIV):
+                    tag = 'dl'
+
+                class DT(DIV):
+                    tag = 'dt'
+
+                class DD(DIV):
+                    tag = 'dd'
+
+                rheader = DIV(
+                                textbox,
+                                H2(subtitle, _class="paper-strip"),
+                                buttons,
+                                DIV(
+                                    TABLE(
+                                       TR(
+                                        TH(T("Request Number")),
+                                        TH(T("Task")),
+                                        TH(T("Date+Time")),
+                                        TH(T("Required Skills")),
+                                        TH(T("Request Priority")),
+                                        TH(T("Location")),
+                                        TH(T("Number of Volunteers"),BR(),DIV("(", T("Still Required"), "/", T("Total Requested"), ")")), # (assigned/required)
+                                        _class="odd"
+                                        ),
+                                       TR(
+                                        TD(record.request_number),
+                                        TD(record.purpose),
+                                        TD(B(s3_date_represent_utc(record.date_required)),
+                                           BR(),
+                                           "%s - %s" % (time_req,
+                                                        time_until),
+                                           ),
+                                        TD(skills),
+                                        TD(response.s3.req_priority_represent(record.priority) ),
+                                        TD(record.location or ""),
+                                        TD(B(required),
+                                           " / %s" % requested,
+                                           _class="red"),
+                                        _class="even"
+                                        ),
+                                    _class="datatable display"
+                                    ),
+                                _id="table-container"
+                                ),
+                                DL(
+                                   DT(T("Point of Contact")),
+                                   DD(report_to,
+                                      BR(),
+                                      "%s: %s" % (T("Phone"),
+                                                  phone),
+                                      BR(),
+                                      "%s: %s" % (T("Email"),
+                                                  email),
+                                     ),
+                                   DT(T("Volunteering Location")),
+                                   DD(#location,
+                                      #BR(),
+                                      address),
+                                   DT(T("Comments")),
+                                   DD(record.comments),
+                                   _class="assignment-details"
+                                ),
+                            )
+                if r.component and r.component.name == "assignment":
+                    if s3_has_role(STAFF):
+                        # Volunteer Roster
+                        response.s3.rfooter = DIV(
+                            BUTTON(T("CHECK-IN ALL"),
+                                   _class="wide-grey-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=[record.id,
+                                                  "assignment",
+                                                  "checkin"])),
+                            BUTTON(T("CHECK-OUT ALL"),
+                                   _class="wide-grey-button",
+                                   _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=[record.id,
+                                                  "assignment",
+                                                  "checkout"]))
+                            )
+                    else:
+                        # Volunteer Assignment
+                        assignment = r.component_id
+                        table = db.vol_assignment
+                        query = table.id == r.component_id
+                        record = db(query).select(limitby=(0, 1)).first()
+                        if not record:
+                            # Probably a Volunteer trying to use a URL for STAFF
+                            session.error = auth.permission.INSUFFICIENT_PRIVILEGES
+                            redirect(URL(c="vol", f="req_skill"))
+                        req_id = record.req_id
+                        if record.checkout != None and record.task_evaluation != None:
+                            printBtn = T("PRINT CERTIFICATE")
+                        else:
+                            printBtn = T("PRINT VOLUNTEER ASSIGNMENT FORM")
+                        if record.checkin:
+                            cancelBtn = ""
+                        else:
+                            # Only show the Cancel button if Volunteer not yet checked-in
+                            cancelBtn = BUTTON(T("CANCEL ASSIGNMENT"),
+                                               _class="wide-grey-button",
+                                               _onClick="javascript: window.location='%s'" % \
+                                                    URL(c=request.controller,
+                                                        f="req",
+                                                        args=[record.req_id,
+                                                              "assignment",
+                                                              assignment,
+                                                              "delete"]))
+
+                        rheader.append(
+                          DIV(
+                            A(SPAN(printBtn),
+                              _class="big-red-arrow",
+                              _onClick="javascript: window.location='%s'" % \
+                                        URL(c=request.controller,
+                                            f="req",
+                                            args=["assignment",
+                                                  assignment,
+                                                  "print"])),
+                            # Also in controllers/don.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"),
+                            BR(),
+                            cancelBtn
+                            )
+                        )
+                if s3_has_role(STAFF):
+                    rheader.append(rheader_tabs)
+
+                return rheader
+    return None
+
+# -----------------------------------------------------------------------------
+def req():
+    """ REST Controller """
+
+    s3mgr.load("req_req")
+    default_type = 3
+    request.vars["default_type"] = 3
+
+    if "skill_id" in request.get_vars:
+        # Look up the Request from the Skill component
+        # (since that is what is available to us within the dataTables row)
+        table = db.req_req_skill
+        query = (table.id == request.vars.skill_id)
+        req = db(query).select(table.req_id,
+                               limitby=(0, 1)).first()
+        if not req:
+            session.error = T("Invalid Request!")
+            redirect(URL(f="req_skill", args=[], vars={}))
+        # @ToDo: A nicer way to do this (without a 2nd request)
+        # simply amending request.args doesn't work
+        # Need to rewrite to not use prep/postp but rather process r() directly
+        redirect(URL(args = [req.req_id, "application", "create"],
+                     vars={}))
+
+    if "document" in request.args:
+        s3mgr.load("doc_document")
+
+    req_table = db.req_req
+    s3mgr.configure(req_table,
+                    orderby=~req_table.priority)
+
+    type_field = req_table.type
+    type_field.default = int(default_type)
+    type_field.writable = False
+
+    if s3_has_role(STAFF):
+        if "assignment" in request.args or \
+           "checkin" in request.args or \
+           "checkout" in request.args:
+            s3mgr.load("vol_assignment")
+
+    elif s3_has_role(ORG_VOL):
+        s3mgr.load("vol_application")
+        # Volunteer Orgs can see Public Requests & those published for them
+        org = auth.user.organisation_id
+        response.s3.filter = (req_table.public == True) | \
+                             (req_table.organisations_id.belongs((org,)))
+        s3mgr.configure(req_table,
+                        editable=False), # We need the Controller/Table ACL to be editable to be able to add components
+        if "application" in request.args:
+            s3.crud.submit_button = T("COMMIT")
+            table = db.vol_application
+            table.organisation_id.default = org
+            table.organisation_id.readable = table.organisation_id.writable = False
+            table.number.readable = table.number.writable = True
+            table.person_id.readable = table.person_id.writable = False
+            field = table.team_leader_id
+            field.readable = field.writable = True
+            field.requires = IS_NOT_EMPTY()
+            #table.person_id.label = T("Team Leader")
+            #table.person_id.comment = None
+            #table.person_id.widget = S3AddPersonWidget(
+            #                                #select_existing=False
+            #                            )
+            #table.person_id.requires = IS_ADD_PERSON_WIDGET()
+            #field = table.team_leader
+            #field.readable = field.writable = True
+            #field.requires = IS_NOT_EMPTY()
+            #field = table.team_leader_contact
+            #field.readable = field.writable = True
+            #field.requires = IS_NOT_EMPTY()
+            table.emergency_contact_name.readable = table.emergency_contact_name.writable = False
+            table.emergency_contact_name.requires = []
+            table.emergency_contact_relationship.readable = table.emergency_contact_relationship.writable = False
+            table.emergency_contact_relationship.requires = []
+            table.emergency_contact_phone.readable = table.emergency_contact_phone.writable = False
+            table.emergency_contact_phone.requires = []
+            s3.crud_strings["vol_application"].subtitle_create = ""
+
+        elif "assignment" in request.args:
+            table = db.vol_assignment
+            table.organisation_id.default = org
+            table.organisation_id.readable = table.organisation_id.writable = False
+            table.person_id.readable = table.person_id.writable = False
+            # Make the component multiple=False
+            s3mgr.model.add_component("vol_assignment",
+                                      req_req=dict(joinby="req_id",
+                                                   multiple=False))
+    else:
+        s3mgr.load("vol_application")
+        # Volunteers can only see Public Requests
+        response.s3.filter = (req_table.public == True)
+        s3mgr.configure(req_table,
+                        editable=False), # We need the Controller/Table ACL to be editable to be able to add components
+        person = s3_logged_in_person()
+        if "application" in request.args:
+            # Check for required Skills
+            table = db.req_req_skill
+            query = (table.req_id == request.args[0])
+            req = db(query).select(table.skill_id,
+                                   limitby=(0, 1)).first()
+            if req and req.skill_id:
+                # Read the applicant's skills
+                table = db.vol_skill
+                query = (table.person_id == auth.s3_logged_in_person())
+                skillset = db(query).select(table.skill_id,
+                                            limitby=(0, 1)).first()
+                gap = False
+                if not skillset:
+                    gap = True
+                else:
+                    for skill in req.skill_id:
+                        if not skill in skillset.skill_id:
+                            gap = True
+                            break
+                if gap:
+                    response.warning = T("Please check that you have the required skills for this assignment as you've not specified that you have all the required skills.")
+
+            s3.crud.submit_button = T("COMMIT")
+            table = db.vol_application
+            table.person_id.default = person
+            table.person_id.readable = table.person_id.writable = False
+            s3.crud_strings["vol_application"].subtitle_create = ""
+            # Read in current Emergency Contacts
+            ctable = db.vol_contact
+            query = (ctable.person_id == person)
+            contacts = db(query).select(limitby=(0, 1)).first()
+            if contacts:
+                table.emergency_contact_name.default = contacts.emergency_contact_name
+                table.emergency_contact_relationship.default = contacts.emergency_contact_relationship
+                table.emergency_contact_phone.default = contacts.emergency_contact_phone
+
+        elif "assignment" in request.args:
+            table = db.vol_assignment
+            table.person_id.default = person
+            table.person_id.readable = table.person_id.writable = False
+            # Make the component multiple=False
+            # @ToDo: Currently multiple=False will just return the .first() record even if inaccessible!
+            #        That would be fixed by a filter, however then UI would break.
+            s3mgr.model.add_component("vol_assignment",
+                                      req_req=dict(joinby="req_id",
+                                                    multiple=False))
+
+    def prep(r):
+        db.req_req.status.readable = db.req_req.status.writable = False
+
+        # Remove type from list_fields
+        list_fields = s3mgr.model.get_config("req_req",
+                                             "list_fields")
+        try:
+            list_fields.remove("type")
+        except:
+             # It has already been removed.
+             # This can happen if the req controller is called
+             # for a second time, such as when printing reports
+             # see vol.print_assignment()
+            pass
+        s3mgr.configure(tablename, list_fields=list_fields)
+
+        # @ToDo: MH - type is always 3
+        type = ( r.record and r.record.type ) or \
+               ( request.vars and request.vars.default_type )
+        if type:
+            type = int(type)
+            req_table.type.default = int(type)
+
+        # Filter the query based on type
+        if response.s3.filter:
+            response.s3.filter = response.s3.filter & \
+                                 (db.req_req.type == type)
+        else:
+            response.s3.filter = (db.req_req.type == type)
+
+        #if type == 3:
+        s3mgr.configure("req_req",
+                        list_fields = ["id",
+                                       "priority",
+                                       "event_id",
+                                       "purpose",
+                                       "site_id",
+                                       "date_required",
+                                    ])
+
+        if r.interactive:
+            # Set Fields and Labels depending on type
+            # @ToDo: MH - type is always 3
+            if type:
+                # This prevents the type from being edited AFTER it is set
+                req_table.type.readable = False
+                req_table.type.writable = False
+
+                # @ToDo: MH - refer to crud strings here - rather than in deployment_settings
+                crud_strings = deployment_settings.get_req_req_crud_strings(type)
+                if crud_strings:
+                    s3.crud_strings["req_req"] = crud_strings
+
+                if "application" in request.args:
+                    s3.crud_strings["req_req"].title_display = T("Volunteer Application")
+                elif "assignment" in request.args:
+                    if s3_has_role(STAFF) and not r.component_id:
+                        s3.crud_strings["req_req"].title_display = T("Volunteer Roster")
+                    else:
+                        s3.crud_strings["req_req"].title_display = T("Volunteer Assignment")
+                        atable = db.vol_assignment
+                        # @ToDo: Hide if vol hasn't yet checked-out or if time not > time_until
+                        #atable.task_evaluation.readable = False
+
+
+            if r.method != "create" and False:  # @ToDo: Remove "and False" - this has been added for training to allow records to be edit
+                # Disable Edit for fields where WebEOC is Master
+                req_table.event_id.writable = False
+                req_table.incident_id.writable = False
+                #req_table.incident_id.writable = True
+                req_table.request_number.writable = False
+                req_table.priority.writable = False
+                req_table.site_id.writable = False
+                req_table.request_for_id.writable = False
+                req_table.date_required.writable = False
+                req_table.date_required_until.writable = False
+                req_table.purpose.writable = False
+                req_table.date.writable = False
+                req_table.requester_id.writable = False
+                req_table.approved_by_id.writable = False
+                req_table.comments.writable = False
+                req_table.cancel.writable = False
+
+            if r.record and r.record.req_req_skill.count():#r.component and r.component.name == "req_skill":
+                # Is this component being updated (not created)
+                req_skill_table = db.req_req_skill
+                req_skill_table.skill_id.writable = False
+                req_skill_table.quantity.writable = False
+
+            # @ToDo: apply these changes via JS for the create form where type is editable
+            #if type == 3: # Person
+            req_table.date_required.requires = req_table.date_required.requires.other
+            req_table.date_required_until.requires = req_table.date_required_until.requires.other
+            req_table.location.readable = True
+            req_table.public.readable = True
+            req_table.organisations_id.readable = True
+            req_table.emailed.readable = True
+
+            if r.method == "create" or True:  # @ToDo: Remove "or True" - this has been added for training to allow records to be edit
+                # Only enable Edit for fields where Sahana (not WebEOC) is Master
+                req_table.location.writable = True
+                req_table.public.writable = True
+                req_table.organisations_id.writable = True
+
+            req_table.purpose.label = T("Task Details")
+            req_table.site_id.label =  T("Report To Facility")
+            req_table.request_for_id.label = T("Point of Contact")
+
+            if r.method != "update" and r.method != "read":
+                if not r.component:
+                    # Hide fields which don't make sense in a Create form
+                    # - includes one embedded in list_create
+                    # - list_fields over-rides, so still visible within list itself
+                    response.s3.req_create_form_mods()
+
+                    # Get the default Facility for this user
+                    # @ToDo: Use site_id in User Profile (like current organisation_id)
+                    if deployment_settings.has_module("hrm"):
+                        query = (db.hrm_human_resource.person_id == s3_logged_in_person())
+                        site = db(query).select(db.org_site.id,
+                                                limitby=(0, 1)).first()
+                        if site:
+                            r.table.site_id.default = site.id
+
+                elif r.component.name == "document":
+                    s3.crud.submit_button = T("Add")
+                    table = r.component.table
+                    # @ToDo: Fix for Link Table
+                    #table.date.default = r.record.date
+                    #if r.record.site_id:
+                    #    stable = db.org_site
+                    #    query = (stable.id == r.record.site_id)
+                    #    site = db(query).select(stable.location_id,
+                    #                            stable.organisation_id,
+                    #                            limitby=(0, 1)).first()
+                    #    if site:
+                    #        table.location_id.default = site.location_id
+                    #        table.organisation_id.default = site.organisation_id
+
+                elif r.component.name == "req_skill":
+                    #req_hide_quantities(r.component.table)
+                    table = r.component.table
+                    table.quantity_commit.writable = table.quantity_commit.readable = False
+                    table.quantity_fulfil.writable = table.quantity_fulfil.readable = False
+
+        if r.component:
+            if r.component.name == "document" or \
+                 r.component.name == "req_skill":
+                # Limit site_id to facilities the user has permissions for
+                # @ToDo: Non-Item requests shouldn't be bound to a Facility?
+                auth.permission.permitted_facilities(table=r.table,
+                                                     error_msg=T("You do not have permission for any facility to make a request."))
+
+            elif r.component.name == "assignment":
+                table = db.vol_assignment
+                # Tweak the breadcrumb
+                if r.component.count() > 1:
+                    label = T("Roster")
+                else:
+                    label = T("Assignment")
+                breadcrumbs[2] = (label, False,
+                                  URL(c=request.controller,
+                                      f=request.function,
+                                      args=request.args))
+                if s3_has_role(STAFF):
+                    table.report_to_id.default = r.record.request_for_id
+                else:
+                    # Volunteer can evaluate task if vol has checked-in and (checked-out or time > time_until)
+                    query = (table.id == r.component_id)
+                    assign = db(query).select(table.checkin,
+                                              table.checkout,