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

[zubair assad]

Mapping Team Members of a Team aka Group

Mapping Team Members of a Team aka Group

[Pat Tressel (ptressel)]

Looks good!

review: Approve

=== modified file 'controllers/vol.py'
--- controllers/vol.py	2010-08-05 19:00:29 +0000
+++ controllers/vol.py	2010-08-11 18:18:50 +0000
@@ -4,6 +4,8 @@
     Volunteer Management System
 """
 
+from gluon.sql import Rows
+
 module = request.controller
 
 if module not in deployment_settings.modules:
@@ -43,7 +45,9 @@
         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("Map Team"), False, URL(r=request, f="view_team_map", args=[group_id])],
+                ]],
             ]
             menu.extend(menu_teams)
 
@@ -78,7 +82,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
@@ -371,6 +375,58 @@
 
 
 # -----------------------------------------------------------------------------
+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.time)
+    #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
+
+
+# -----------------------------------------------------------------------------
 # TODO: Is resource a bad name, due to possible confusion with other usage?
 def resource():
     "Select resources a volunteer has."

=== 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-11 18:18:50 +0000
@@ -0,0 +1,2 @@
+{{extend 'layout.html'}}
+{{=XML(map)}}
\ No newline at end of file