Merge lp:~sahana-eden-vms/sahana-eden/vms into lp:sahana-eden

[Pat Tressel]

This is Zubair's GSoC version. (It temporarily omits Dominic's vol changes -- we'll recover and merge those separately.) Changes in this version include maps of individual and team member locations, email to individual and team members. Multiselect widget for adding skills to a person has been removed as it's inappropriate for a table with multiple fields. This uses standard crud for skills, so they need to be added one at a time. Should not be a big issue. A skill can be deleted from a person by clicking edit on that skill, then delete skill on the edit page. We'll look into a fancier widget later.

=== modified file 'controllers/msg.py'
--- controllers/msg.py	2010-08-07 20:12:56 +0000
+++ controllers/msg.py	2010-08-17 03:20:56 +0000
@@ -353,60 +353,8 @@
     return shn_rest_controller(module, resource, deletable=False, listadd=False)
 
 def compose():
-    """ Form to Compose a Message """
-    resource1 = "log"
-    tablename1 = module + "_" + resource1
-    table1 = db[tablename1]
-    resource2 = "outbox"
-    tablename2 = module + "_" + resource2
-    table2 = db[tablename2]
-
-    if auth.is_logged_in() or auth.basic():
-        pass
-    else:
-        redirect(URL(r=request, c="default", f="user", args="login",
-            vars={"_next":URL(r=request, c="msg", f="compose")}))
-
-    # Model options
-    table1.sender.writable = table1.sender.readable = False
-    table1.fromaddress.writable = table1.fromaddress.readable = False
-    table1.pe_id.writable = table1.pe_id.readable = False
-    table1.verified.writable = table1.verified.readable = False
-    table1.verified_comments.writable = table1.verified_comments.readable = False
-    table1.actioned.writable = table1.actioned.readable = False
-    table1.actionable.writable = table1.actionable.readable = False
-    table1.actioned_comments.writable = table1.actioned_comments.readable = False
-    
-    table1.subject.label = T("Subject")
-    table1.message.label = T("Message")
-    table1.priority.label = T("Priority")
-    
-    table2.pe_id.writable = table2.pe_id.readable = True
-    table2.pe_id.label = T("Recipients")
-
-    def compose_onvalidation(form):
-        """ Set the sender and use msg.send_by_pe_id to route the message """
-        if not request.vars.pe_id:
-            session.error = T("Please enter the recipient")
-            redirect(URL(r=request,c="msg", f="compose"))
-        sender_pe_id = db(db.pr_person.uuid == auth.user.person_uuid).select(db.pr_person.pe_id, limitby=(0, 1)).first().pe_id
-        if msg.send_by_pe_id(request.vars.pe_id,
-                             request.vars.subject,
-                             request.vars.message,
-                             sender_pe_id,
-                             request.vars.pr_message_method):
-            session.flash = T("Message sent to outbox")
-            redirect(URL(r=request, c="msg", f="compose"))
-        else:
-            session.error = T("Error in message")
-            redirect(URL(r=request,c="msg", f="compose"))
-
-
-    logform = crud.create(table1,
-                          onvalidation = compose_onvalidation)
-    outboxform = crud.create(table2)
-    
-    return dict(logform = logform, outboxform = outboxform, title = T("Send Message"))
+
+    return shn_msg_compose()
 
 def outbox():
     "View the contents of the Outbox"

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2010-08-13 23:00:35 +0000
+++ controllers/vol.py	2010-08-17 03:20:56 +0000
@@ -4,6 +4,8 @@
     Volunteer Management System
 """
 
+from gluon.sql import Rows
+
 module = request.controller
 
 if module not in deployment_settings.modules:
@@ -33,7 +35,7 @@
     menu_teams = [
         [T("Teams"), False, URL(r=request, f="group"),[
             [T("List"), False, URL(r=request, f="group")],
-            [T("Add"), False, URL(r=request, f="group", args="create", vars={"_next":URL(r=request, args=request.args, vars=request.vars)})],
+            [T("Add"), False, URL(r=request, f="group", args="create")],
         ]]
     ]
     menu.extend(menu_teams)
@@ -43,14 +45,17 @@
         if selection:
             team_name = shn_pr_group_represent(group_id)
             menu_teams = [
-                ["%s %s" % (T("Team:"), team_name), False, URL(r=request, f="group", args=[group_id, "read"])],
+                ["%s %s" % (T("Team:"), team_name), False, URL(r=request, f="group", args=[group_id, "read"]),[
+                    [T("View On Map"), False, URL(r=request, f="view_team_map", args=[group_id])],
+                    [T("Send Mail"), False, URL(r=request, f="compose_group", vars={"group_id":group_id})],
+                ]],
             ]
             menu.extend(menu_teams)
 
     menu_persons = [
-        [T("Persons"), False, URL(r=request, f="person", args=["search_simple"], vars={"_next":URL(r=request, f="person", args=["[id]", "volunteer"], vars={"vol_tabs":"volunteer"})}),[
-            [T("List"), False, URL(r=request, f="person", vars={"_next":URL(r=request, f="person", args=["[id]", "volunteer"], vars={"vol_tabs":"volunteer"})})],
-            [T("Add"), False, URL(r=request, f="person", args="create", vars={"_next":URL(r=request, f="person", args=["[id]", "volunteer"], vars={"vol_tabs":"volunteer"})})],
+        [T("Persons"), False, URL(r=request, f="person", args=["search_simple"]),[
+            [T("List"), False, URL(r=request, f="person")],
+            [T("Add"), False, URL(r=request, f="person", args="create")],
         ]]
     ]
     menu.extend(menu_persons)
@@ -68,7 +73,8 @@
                     [T("Volunteer Data"), False, URL(r=request, f="person", args=[person_id, "volunteer"], vars={"vol_tabs":"volunteer"})],
                     # The default tab is pr_person, which is fine here.
                     [T("Person Data"), False, URL(r=request, f="person", args=[person_id], vars={"vol_tabs":"person"})],
-                    [T("View Map"), False, URL(r=request, f="view_map", args=[person_id])],
+                    [T("View On Map"), False, URL(r=request, f="view_map", args=[person_id])],
+                    [T("Send Mail"), False, URL(r=request, f="compose_person", vars={"person_id":person_id})],
                 ]],
             ]
             menu.extend(menu_person)
@@ -78,7 +84,7 @@
     menu.extend(menu_skills)
     if auth.user is not None:
         menu_user = [
-            [T("My Tasks"), False, URL(r=request, f="task", args="")]
+            [T("My Tasks"), False, URL(r=request, f="task", args="")],
         ]
         menu.extend(menu_user)
     response.menu_options = menu
@@ -237,13 +243,13 @@
 
     person_id = request.args(0)
 
-    presence_query = (db.pr_person.id == person_id) and (db.pr_presence.pe_id == db.pr_person.pe_id) and (db.gis_location.id == db.pr_presence.location_id)
+    presence_query = (db.pr_person.id == person_id) & (db.pr_presence.pe_id == db.pr_person.pe_id) & (db.gis_location.id == db.pr_presence.location_id)
 
     # Need sql.Rows object for show_map, so don't extract individual row.
-    location = db(presence_query).select(db.gis_location.ALL, orderby=~db.pr_presence.time, limitby=(0, 1))
+    location = db(presence_query).select(db.gis_location.ALL, orderby=~db.pr_presence.datetime, limitby=(0, 1))
 
     if not location:
-        address_query = (db.pr_person.id == person_id) and (db.pr_address.pe_id == db.pr_person.pe_id) and (db.gis_location.id == db.pr_address.location_id)
+        address_query = (db.pr_person.id == person_id) & (db.pr_address.pe_id == db.pr_person.pe_id) & (db.gis_location.id == db.pr_address.location_id)
         # TODO: If there are multiple addresses, which should we choose?
         # For now, take whichever address is supplied first.
         location = db(address_query).select(db.gis_location.ALL, limitby=(0, 1))
@@ -371,6 +377,86 @@
 
 
 # -----------------------------------------------------------------------------
+def view_team_map():
+    """
+    Map Location of Volunteer in a Team.
+    Use most recent presence if available, else any address that's available.
+    """
+
+    group_id = request.args(0)
+
+    members_query = (db.pr_group_membership.group_id == group_id)
+    members = db(members_query).select(db.pr_group_membership.person_id) #members of a team aka group
+    member_person_ids = [ x.person_id for x in members ] #list of members
+
+    #Presence Data of the members with Presence Logs
+    presence_rows = db(db.pr_person.id.belongs(member_person_ids) & (db.pr_presence.pe_id == db.pr_person.pe_id) & (db.gis_location.id ==  db.pr_presence.location_id)).select(db.gis_location.ALL, db.pr_person.id, orderby=~db.pr_presence.datetime)
+    #Get Latest Presence Data
+    person_location_sort = presence_rows.sort(lambda row:row.pr_person.id)
+    previous_person_id = None
+    locations_list = []
+    for row in person_location_sort:
+        if row.pr_person.id != previous_person_id:
+            locations_list.append(row["gis_location"])
+            member_person_ids.remove(row.pr_person.id)
+            previous_person_id = row.pr_person.id
+
+    #Address of those members without Presence data
+    address = db(db.pr_person.id.belongs(member_person_ids) & (db.pr_address.pe_id == db.pr_person.pe_id) & (db.gis_location.id ==  db.pr_address.location_id)).select(db.gis_location.ALL)
+
+    locations_list.extend(address)
+
+    if locations_list:
+
+        bounds = gis.get_bounds(features=locations_list)
+
+        volunteer = {"feature_group" : "People"}
+        html = gis.show_map(
+            feature_queries = [{"name" : "Volunteer", "query" : locations_list, "active" : True, "marker" : db(db.gis_marker.name == "volunteer").select().first().id}],
+            feature_groups = [volunteer],
+            wms_browser = {"name" : "Risk Maps", "url" : "http://preview.grid.unep.ch:8080/geoserver/ows?service=WMS&request=GetCapabilities"},
+            catalogue_overlays = True,
+            catalogue_toolbar = True,
+            toolbar = True,
+            search = True,
+            bbox = bounds,
+            window = True,
+        )
+        return dict(map=html)
+
+    # TODO: What is an appropriate response if no location is available?
+    return None
+
+
+# -----------------------------------------------------------------------------
+def compose_person():
+    "Send message to volunteer"  
+
+    person_pe_id_query = (db.pr_person.id == request.vars.person_id)
+    pe_id_row = db(person_pe_id_query).select(db.pr_person.pe_id).first()
+    request.vars.pe_id = pe_id_row["pe_id"]
+    
+    return shn_msg_compose( redirect_module=module, 
+                            redirect_function="compose_person", 
+                            redirect_vars={"person_id":request.vars.person_id}, 
+                            title_name="Send a message to a volunteer" )
+
+
+# -----------------------------------------------------------------------------
+def compose_group():
+    "Send message to members of a team"  
+
+    group_pe_id_query = (db.pr_group.id == request.vars.group_id)
+    pe_id_row = db(group_pe_id_query).select(db.pr_group.pe_id).first()
+    request.vars.pe_id = pe_id_row["pe_id"]
+
+    return shn_msg_compose( redirect_module=module, 
+                            redirect_function="compose_group", 
+                            redirect_vars={"group_id":request.vars.group_id}, 
+                            title_name="Send a message to a team of volunteers" )
+
+
+# -----------------------------------------------------------------------------
 # TODO: Is resource a bad name, due to possible confusion with other usage?
 def resource():
     "Select resources a volunteer has."

=== modified file 'models/msg.py'
--- models/msg.py	2010-08-11 22:48:49 +0000
+++ models/msg.py	2010-08-17 03:20:56 +0000
@@ -270,3 +270,69 @@
                     Field("url", requires=IS_NULL_OR(IS_URL())),
                     migrate=migrate)
     table.uuid.requires = IS_NOT_IN_DB(db, "%s.uuid" % tablename)
+
+def shn_msg_compose( redirect_module = "msg", 
+                     redirect_function = "compose", 
+                     redirect_vars = None,
+                     title_name = "Send Message" ):
+    """ 
+        Form to Compose a Message 
+
+        @param redirect_module: Redirect to the specified module's url after login.
+        @param redirect_function: Redirect to the specified function
+        @param redirect_vars:  Dict with vars to include in redirects
+        @param title_name: Title of the page
+    """
+
+    resource1 = "log"
+    tablename1 = "msg" + "_" + resource1
+    table1 = db[tablename1]
+    resource2 = "outbox"
+    tablename2 = "msg" + "_" + resource2
+    table2 = db[tablename2]
+
+    if auth.is_logged_in() or auth.basic():
+        pass
+    else:
+        redirect(URL(r=request, c="default", f="user", args="login",
+            vars={"_next":URL(r=request, c=redirect_module, f=redirect_function, vars=redirect_vars)}))
+
+    # Model options
+    table1.sender.writable = table1.sender.readable = False
+    table1.fromaddress.writable = table1.fromaddress.readable = False
+    table1.pe_id.writable = table1.pe_id.readable = False
+    table1.verified.writable = table1.verified.readable = False
+    table1.verified_comments.writable = table1.verified_comments.readable = False
+    table1.actioned.writable = table1.actioned.readable = False
+    table1.actionable.writable = table1.actionable.readable = False
+    table1.actioned_comments.writable = table1.actioned_comments.readable = False
+    
+    table1.subject.label = T("Subject")
+    table1.message.label = T("Message")
+    table1.priority.label = T("Priority")
+    
+    table2.pe_id.writable = table2.pe_id.readable = True
+    table2.pe_id.label = T("Recipients")
+
+    def compose_onvalidation(form):
+        """ Set the sender and use msg.send_by_pe_id to route the message """
+        if not request.vars.pe_id:
+            session.error = T("Please enter the recipient")
+            redirect(URL(r=request,c=redirect_module, f=redirect_function, vars=redirect_vars))
+        sender_pe_id = db(db.pr_person.uuid == auth.user.person_uuid).select(db.pr_person.pe_id, limitby=(0, 1)).first().pe_id
+        if msg.send_by_pe_id(request.vars.pe_id,
+                             request.vars.subject,
+                             request.vars.message,
+                             sender_pe_id,
+                             request.vars.pr_message_method):
+            session.flash = T("Message sent to outbox")
+            redirect(URL(r=request, c=redirect_module, f=redirect_function, vars=redirect_vars))
+        else:
+            session.error = T("Error in message")
+            redirect(URL(r=request,c=redirect_module, f=redirect_function, vars=redirect_vars))
+
+    logform = crud.create(table1,
+                          onvalidation = compose_onvalidation)
+    outboxform = crud.create(table2)
+    
+    return dict(logform = logform, outboxform = outboxform, title = T(title_name))

=== modified file 'models/vol.py'
--- models/vol.py	2010-08-16 21:08:38 +0000
+++ models/vol.py	2010-08-17 03:20:56 +0000
@@ -19,9 +19,6 @@
                     migrate=migrate)
 
     # -------------------------------------------------------------------------
-    # Person components which are specifically volunteer data:
-    shn_vol_volunteer_data = ("volunteer", "group_membership", "skill")
-    # -------------------------------------------------------------------------
     # pr_volunteer (Component of pr_person)
     #   describes a person's availability as a volunteer
 
@@ -399,11 +396,11 @@
     s3.crud_strings[tablename] = Storage(
         title_create = T("Add Skill Type"),
         title_display = T("Skill Type Details"),
-        title_list = T("Skill Type"),
+        title_list = T("Skill Types"),
         title_update = T("Edit Skill Type"),
-        title_search = T("Search Skill Type"),
+        title_search = T("Search Skill Types"),
         subtitle_create = T("Add New Skill Type"),
-        subtitle_list = T("Skill Type"),
+        subtitle_list = T("Skill Types"),
         label_list_button = T("List Skill Types"),
         label_create_button = T("Add Skill Types"),
         label_delete_button = T("Delete Skill Type"),
@@ -412,22 +409,6 @@
         msg_record_deleted = T("Skill Type deleted"),
         msg_list_empty = T("No Skill Types currently set"))
 
-    field_settings = S3CheckboxesWidget(db = db,
-                                        lookup_table_name = "vol_skill_types",
-                                        lookup_field_name = "name",
-                                        multiple = True,
-                                        num_column=3
-                                        )
-
-    # Reusable field
-    skill_ids = db.Table(None, "skill_ids",
-                         FieldS3("skill_ids",
-                         requires = field_settings.requires,
-                         widget = field_settings.widget,
-                         represent = field_settings.represent,
-                         label = T("skills"),
-                         ondelete = "RESTRICT"))
-
     # Representation function
     def vol_skill_types_represent(id):
         if id:
@@ -441,47 +422,31 @@
         else:
             return None
 
+    skill_types_id = db.Table(None, "skill_types_id",
+                              FieldS3("skill_types_id", db.vol_skill_types,
+                                      sortby = ["category", "name"],
+                                      requires = IS_ONE_OF(db, "vol_skill_types.id", vol_skill_types_represent),
+                                      represent = vol_skill_types_represent,
+                                      label = T("Skill"),
+                                      ondelete = "RESTRICT"))
+
 
     # -------------------------------------------------------------------------
     # vol_skill
     #   A volunteer's skills (component of pr)
     #
 
-    def multiselect_widget(f, v):
-        import uuid
-        d_id = "multiselect-" + str(uuid.uuid4())[:8]
-        wrapper = DIV(_id=d_id)
-        inp = SQLFORM.widgets.options.widget(f, v)
-        inp["_multiple"] = "multiple"
-        inp["_style"] = "min-width: %spx;" % (len(f.name) * 20 + 50)
-        if v:
-            if not isinstance(v,list): v = str(v).split("|")
-            opts = inp.elements("option")
-            for op in opts:
-                if op["_value"] in v:
-                    op["_selected"] = "selected"
-        scr = SCRIPT('jQuery("#%s select").multiSelect({'\
-                     'noneSelected:"Select %ss"});' % (d_id, f.name))
-        wrapper.append(inp)
-        wrapper.append(scr)
-        if request.vars.get(inp["_id"] + "[]", None):
-            var = request.vars[inp["_id"] + "[]"]
-            if not isinstance(var,list): var = [var]
-            request.vars[f.name] = "|".join(var)
-            del request.vars[inp["_id"] + "[]"]
-	return wrapper
-
     resource = "skill"
     tablename = module + "_" + resource
-    table = db.define_table(tablename, timestamp, uuidstamp, deletion_status,
-                person_id,
-        Field("skill_types_id"),
-        Field("status", requires=IS_IN_SET(["approved", "unapproved", "denied"]), label=T("status"), notnull=True, default="unapproved"),
-                    migrate=migrate)
-
-    db.vol_skill.skill_types_id.widget = multiselect_widget
-    db.vol_skill.skill_types_id.requires = IS_ONE_OF(db, "vol_skill_types.id", vol_skill_types_represent, multiple=True)
-    #db.vol_skill.skill_types_id.represent = vol_skill_types_represent
+    table = db.define_table(
+        tablename, timestamp, uuidstamp, deletion_status,
+        person_id, skill_types_id,
+        Field("status",
+              requires=IS_IN_SET(["approved","unapproved","denied"]),
+              label=T("Status"),
+              notnull=True,
+              default="unapproved"),
+        migrate=migrate)
 
     s3xrc.model.add_component(module, resource,
         multiple=True,
@@ -502,17 +467,18 @@
         title_display = T("Skill Details"),
         title_list = SKILL,
         title_update = T("Edit Skill"),
-        title_search = T("Search Skill"),
+        title_search = T("Search Skills"),
         subtitle_create = T("Add New Skill"),
         subtitle_list = SKILL,
-        label_list_button = T("List Skill"),
+        label_list_button = T("List Skills"),
         label_create_button = ADD_SKILL,
+        label_delete_button = T("Delete Skill"),
         msg_record_created = T("Skill added"),
         msg_record_modified = T("Skill updated"),
         msg_record_deleted = T("Skill deleted"),
         msg_list_empty = T("No skills currently set"))
 
-    # shn_pr_group_represent -----------------------------------------------------
+    # shn_pr_group_represent -------------------------------------------------
     #
     def teamname(record):
         """
@@ -536,77 +502,3 @@
 
         name = cache.ram("pr_group_%s" % id, lambda: _represent(id))
         return name
-
-    # -----------------------------------------------------------------------------
-    def shn_vol_view_map(jr, **attr):
-        """
-        Map Location of Volunteer.
-        Use most recent presence if available, else any address that's available.
-        """
-
-        response.view = "vol/view_map.html"
-        rheader = shn_vol_rheader(jr)
-
-        output = dict(title=T("Volunteer location"), rheader=rheader)
-
-        if jr.id:
-            person_id = jr.id
-
-            presence_query = (db.pr_person.id == person_id) & \
-                             (db.pr_presence.pe_id == db.pr_person.pe_id) & \
-                             (db.gis_location.id == db.pr_presence.location_id)
-
-            # Need sql.Rows object for show_map, so don't extract individual row.
-            location = db(presence_query).select(db.gis_location.ALL,
-                                                orderby=~db.pr_presence.time,
-                                                limitby=(0, 1))
-
-            if not location:
-                address_query = (db.pr_person.id == person_id) & \
-                                (db.pr_address.pe_id == db.pr_person.pe_id) & \
-                                (db.gis_location.id == db.pr_address.location_id)
-
-                # TODO: If there are multiple addresses, which should we choose?
-                # For now, take whichever address is supplied first.
-                location = db(address_query).select(db.gis_location.ALL, limitby=(0, 1))
-
-            if location:
-                # Center and zoom the map.
-                location_row = location.first()  # location is a sql.Rows
-                lat = location_row.lat
-                lon = location_row.lon
-                bounds = gis.get_bounds(features=location)
-
-                marker = db(db.gis_marker.name == "volunteer").select().first()
-                if marker:
-                    marker = marker.id
-                else:
-                    marker = None
-
-                volunteer = {"feature_group" : "People"}
-                html = gis.show_map(
-                    feature_queries = [{"name" : "Volunteer",
-                                        "query" : location,
-                                        "active" : True,
-                                        "marker" : marker}],
-                    feature_groups = [volunteer],
-                    catalogue_overlays = True,
-                    catalogue_toolbar = False,
-                    toolbar = True,
-                    search = True,
-                    lat = lat,
-                    lon = lon,
-                    bbox = bounds,
-                    window = True,
-                )
-                output.update(map=html)
-
-            else:
-                # TODO: What is an appropriate response if no location is available?
-                html = T("No location known of this person.")
-                output.update(map=html)
-
-        return output
-
-    s3xrc.model.set_method("pr", "person", method="view_map", action=shn_vol_view_map)
-

=== added file 'views/msg/_compose.html'
--- views/msg/_compose.html	1970-01-01 00:00:00 +0000
+++ views/msg/_compose.html	2010-08-17 03:20:56 +0000
@@ -0,0 +1,133 @@
+{{try:}}
+ {{=H2(title)}}
+{{except:}}
+{{pass}}
+<script type="text/javascript">//<![CDATA[
+$(function() {
+    // Hide the real Input Field
+    $('#msg_outbox_pe_id').hide();
+    // Autocomplete-enable the Dummy Input
+    $('#dummy').autocomplete('{{=URL(r=request, c="msg", f="search")}}', {
+        minChars: 2,
+            //mustMatch: true,
+    	    // TODO : Should get multiple working 
+		multiple: false,
+		matchContains: true,
+		autofill: true,
+		dataType: 'json',
+        parse: function(data) {
+            var rows = new Array();
+            for(var i=0; i<data.length; i++){
+                rows[i] = { data:data[i], value:data[i].id, result:data[i].name };
+            }
+            return rows;
+        },
+         formatItem: function(row, i, n) {
+             return row.name;
+ 	    	}
+    });
+    // Populate the real Input when the Dummy is selected
+    $('#dummy').result(function(event, data, formatted) {
+        var newvalue = data.id;
+        $('#msg_outbox_pe_id').val(newvalue);
+    });
+//     $('#dummy_submit').click(function(){
+// 		return true;
+//     });
+$('#msg_outbox_pr_message_method').change(function() {
+    if ($(this).val() == 1){//Dependent on pr_message_method
+        $('#msg_log_subject__row').show();
+    }
+    else{
+        $('#msg_log_subject__row').hide();
+    }
+    });
+});
+//]]></script>
+
+<div class='form-container'>
+{{try:}}
+ {{=logform.custom.begin}}
+ <table>
+ <tbody>
+ <tr id='msg_outbox_pr_message_method__row'>
+ <td>
+ <label>{{=outboxform.custom.label.pr_message_method}}</label>
+ </td>
+ <td>
+ {{=outboxform.custom.widget.pr_message_method}}
+ </td>
+ <td>
+ {{=outboxform.custom.comment.pr_message_method}}
+ </td>
+ </tr>
+ <tr id='msg_outbox_pe_id__row'>
+ <td>
+ <label>{{=outboxform.custom.label.pe_id}}</label>
+ </td>
+ {{if 'pe_id' in request.vars:}}
+ <script type="text/javascript">//<![CDATA[
+ $('#msg_outbox_pe_id').val({{=request.vars.pe_id}})
+ //]]></script>
+ <td>
+ {{=shn_pentity_represent(request.vars.pe_id)}}
+ </td>
+ {{else:}}
+ <td>
+ {{=INPUT(_id="dummy", _class="ac_input", _size="50")}}
+  {{=outboxform.custom.widget.pe_id}}
+ </td>
+ <td>
+ {{=outboxform.custom.comment.pe_id}}
+ </td>
+ {{pass}}
+ </tr>
+ <tr id='msg_log_subject__row'>
+ <td>
+ <label>{{=logform.custom.label.subject}}</label>
+ </td>
+ <td>
+ {{=logform.custom.widget.subject}}
+ </td>
+ <td>
+ {{=logform.custom.comment.subject}}
+ </td>
+ </tr>
+ <tr id='msg_log_message__row'>
+ <td>
+ <label>{{=logform.custom.label.message}}</label>
+ </td>
+ <td>
+ {{=logform.custom.widget.message}}
+ </td>
+ <td>
+ {{=logform.custom.comment.message}}
+ </td>
+ </tr>
+ <tr id='msg_log_priority__row'>
+ <td>
+ <label>{{=logform.custom.label.priority}}</label>
+ </td>
+ <td>
+ {{=logform.custom.widget.priority}}
+ </td>
+ <td>
+ {{=logform.custom.comment.priority}}
+ </td>
+ </tr>
+ <tr id='submit_record__row'>
+ <td>
+ </td>
+ <td>
+  {{=INPUT(_type="submit", _value=T("Send message"), _id="dummy_submit")}}
+ </td>
+ </tr>
+ <td>
+ </td>
+ </tbody>
+ </table>
+ {{=logform.custom.end}}
+{{except:}}
+{{pass}}
+</div>
+<p>&nbsp;</p>

=== modified file 'views/msg/compose.html'
--- views/msg/compose.html	2010-07-24 16:05:47 +0000
+++ views/msg/compose.html	2010-08-17 03:20:56 +0000
@@ -1,125 +1,2 @@
-{{extend "layout.html"}}
-{{try:}}
- {{=H2(title)}}
-{{except:}}
-{{pass}}
-<script type="text/javascript">//<![CDATA[
-$(function() {
-    // Hide the real Input Field
-    $('#msg_outbox_pe_id').hide();
-    // Autocomplete-enable the Dummy Input
-    $('#dummy').autocomplete('{{=URL(r=request, c="msg", f="search")}}', {
-        minChars: 2,
-		//mustMatch: true,
-		// TODO : Should get multiple working 
-		multiple: false,
-		matchContains: true,
-		autofill: true,
-		dataType: 'json',
-        parse: function(data) {
-            var rows = new Array();
-            for(var i=0; i<data.length; i++){
-                rows[i] = { data:data[i], value:data[i].id, result:data[i].name };
-            }
-            return rows;
-        },
-         formatItem: function(row, i, n) {
-             return row.name;
- 		}
-    });
-    // Populate the real Input when the Dummy is selected
-    $('#dummy').result(function(event, data, formatted) {
-        var newvalue = data.id;
-        $('#msg_outbox_pe_id').val(newvalue);
-    });
-//     $('#dummy_submit').click(function(){
-// 		return true;
-//     });
-$('#msg_outbox_pr_message_method').change(function() {
-    if ($(this).val() == 1){//Dependent on pr_message_method
-        $('#msg_log_subject__row').show();
-    }
-    else{
-        $('#msg_log_subject__row').hide();
-    }
-    });
-});
-//]]></script>
-
-<div class='form-container'>
-{{try:}}
- {{=logform.custom.begin}}
- <table>
- <tbody>
- <tr id='msg_outbox_pr_message_method__row'>
- <td>
- <label>{{=outboxform.custom.label.pr_message_method}}</label>
- </td>
- <td>
- {{=outboxform.custom.widget.pr_message_method}}
- </td>
- <td>
- {{=outboxform.custom.comment.pr_message_method}}
- </td>
- </tr>
- <tr id='msg_outbox_pe_id__row'>
- <td>
- <label>{{=outboxform.custom.label.pe_id}}</label>
- </td>
- <td>
- {{=INPUT(_id="dummy", _class="ac_input", _size="50")}}
-  {{=outboxform.custom.widget.pe_id}}
- </td>
- <td>
- {{=outboxform.custom.comment.pe_id}}
- </td>
-</tr>
- <tr id='msg_log_subject__row'>
- <td>
- <label>{{=logform.custom.label.subject}}</label>
- </td>
- <td>
- {{=logform.custom.widget.subject}}
- </td>
- <td>
- {{=logform.custom.comment.subject}}
- </td>
- </tr>
- <tr id='msg_log_message__row'>
- <td>
- <label>{{=logform.custom.label.message}}</label>
- </td>
- <td>
- {{=logform.custom.widget.message}}
- </td>
- <td>
- {{=logform.custom.comment.message}}
- </td>
- </tr>
- <tr id='msg_log_priority__row'>
- <td>
- <label>{{=logform.custom.label.priority}}</label>
- </td>
- <td>
- {{=logform.custom.widget.priority}}
- </td>
- <td>
- {{=logform.custom.comment.priority}}
- </td>
- </tr>
- <tr id='submit_record__row'>
- <td>
- </td>
- <td>
-  {{=INPUT(_type="submit", _value=T("Send message"), _id="dummy_submit")}}
- </td>
- </tr>
- <td>
- </td>
- </tbody>
- </table>
- {{=logform.custom.end}}
-{{except:}}
-{{pass}}
-</div>
-<p>&nbsp;</p>
+{{extend 'layout.html'}}
+{{include 'msg/_compose.html'}}

=== added file 'views/vol/compose_group.html'
--- views/vol/compose_group.html	1970-01-01 00:00:00 +0000
+++ views/vol/compose_group.html	2010-08-17 03:20:56 +0000
@@ -0,0 +1,2 @@
+{{extend 'layout.html'}}
+{{include 'msg/_compose.html'}}

=== added file 'views/vol/compose_person.html'
--- views/vol/compose_person.html	1970-01-01 00:00:00 +0000
+++ views/vol/compose_person.html	2010-08-17 03:20:56 +0000
@@ -0,0 +1,2 @@
+{{extend 'layout.html'}}
+{{include 'msg/_compose.html'}}

=== added file 'views/vol/view_team_map.html'
--- views/vol/view_team_map.html	1970-01-01 00:00:00 +0000
+++ views/vol/view_team_map.html	2010-08-17 03:20:56 +0000
@@ -0,0 +1,2 @@
+{{extend 'layout.html'}}
+{{=XML(map)}}
\ No newline at end of file