Index: lams_tool_gmap/.classpath =================================================================== diff -u -r866dc94326b7624341331da05940cfe57a8d9ccd -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/.classpath (.../.classpath) (revision 866dc94326b7624341331da05940cfe57a8d9ccd) +++ lams_tool_gmap/.classpath (.../.classpath) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -13,5 +13,8 @@ + + + Index: lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml =================================================================== diff -u -r4125a04e76b7cafc0a7d4fe906affec3d45aa06b -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml (.../GmapMarker.hbm.xml) (revision 4125a04e76b7cafc0a7d4fe906affec3d45aa06b) +++ lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml (.../GmapMarker.hbm.xml) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -116,6 +116,16 @@ column="updated_by" /> + + Index: lams_tool_gmap/web/common/learnerheader.jsp =================================================================== diff -u -rc4045234656a5aabbbb34257161bd099ad98b48e -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision c4045234656a5aabbbb34257161bd099ad98b48e) +++ lams_tool_gmap/web/common/learnerheader.jsp (.../learnerheader.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -6,6 +6,7 @@ + @@ -22,14 +23,24 @@ <%@ include file="/includes/jsp/mapFunctions.jsp"%> - <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script> <script type="text/javascript"> <!-- - var webAppUrl = "${tool}"; + var YELLOW_MARKER_ICON = "${tool}/images/yellow_Marker.png"; + var BLUE_MARKER_ICON = "${tool}/images/blue_Marker.png"; + var LIGHTBLUE_MARKER_ICON = "${tool}/images/paleblue_Marker.png"; + var RED_MARKER_ICON = "${tool}/images/red_Marker.png"; + var TREE_CLOSED_ICON = "${tool}/images/tree_closed.gif"; + var TREE_OPEN_ICON = "${tool}/images/tree_open.gif"; + var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>'; var makerLimitMsg = '<fmt:message key="label.learner.markerLimitReached"/>' + var confirmDelete = '<fmt:message key="label.authoring.basic.confirmDelete"/>'; + + var sessionName = '${gmapSessionDTO.sessionName}'; + var map; var markers; + var users; var geocoder = null; var currUser; var currUserId; @@ -44,6 +55,7 @@ //map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(640,320) } ); map = new GMap2(document.getElementById("map_canvas"), { size: new GSize(500,320) } ); markers = new Array(); + users = new Array(); geocoder = new GClientGeocoder(); map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' )); @@ -60,26 +72,33 @@ <c:if test="${gmapDTO.allowHybrid == false}">map.removeMapType(G_HYBRID_MAP);</c:if> map.setMapType(${gmapDTO.mapType}); - <c:forEach var="marker" items="${gmapDTO.gmapMarkers}"> - <c:choose> - <c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}"> - addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ),'${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}'); - userMarkerCount ++; - </c:when> - <c:otherwise> + + + addUserToList('0','<fmt:message key="label.authoring.basic.authored"></fmt:message>' ); + <c:forEach var="user" items="${gmapSessionDTO.userDTOs}"> + addUserToList('${user.uid}','${user.firstName} ${user.lastName}'); + </c:forEach> + + <c:forEach var="marker" items="${gmapSessionDTO.markerDTOs}"> <c:choose> - <c:when test="${marker.isAuthored}"> - addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0' ); + <c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}"> + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ),'${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}'); + userMarkerCount ++; </c:when> - <c:when test="${gmapDTO.allowShowAllMarkers}"> - addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' ); - </c:when> + <c:otherwise> + <c:choose> + <c:when test="${marker.isAuthored}"> + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '<fmt:message key="label.authoring.basic.authored"></fmt:message>', '0' ); + </c:when> + <c:when test="${gmapDTO.allowShowAllMarkers}"> + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' ); + </c:when> + </c:choose> + </c:otherwise> </c:choose> - </c:otherwise> - </c:choose> </c:forEach> - refreshSideBar(); + refreshSideBar(sessionName); } } //--> Index: lams_tool_gmap/web/images/yellow_Marker.png =================================================================== diff -u Binary files differ Index: lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js =================================================================== diff -u -r0df949c35b97a625059e37ca0902ac238e2ecadc -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js (.../mapFunctionsAuthoring.js) (revision 0df949c35b97a625059e37ca0902ac238e2ecadc) +++ lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js (.../mapFunctionsAuthoring.js) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -21,8 +21,8 @@ try{map.removeOverlay(markers[x]);} catch (e){} markers[x].state = "remove"; - refreshSideBar(); - //serialiseMarkers(); + refreshSideBarAuthoring(); + selectedMarker = -1; } } @@ -55,7 +55,7 @@ else (markers[x].state ="save"); updateMarkerInfoWindowHtml(markers[x]); - refreshSideBar(); + refreshSideBarAuthoring(); openInfoWindow(x); } } @@ -73,4 +73,23 @@ else if (mapTypeName == "Terrain") { mapType = "G_PHYSICAL_MAP"; } else { mapType = "G_NORMAL_MAP"; } document.getElementById("mapType").value=mapType; +} + +function refreshSideBarAuthoring() +{ + //marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'"; + var sideBarText = ""; + var i=0; + for (;i<markers.length; i++) + { + if (markers[i].state != "remove" && markers[i].state != "unsaved") + { + sideBarText += "<span id='markerSpan" +markers[i].sideBarIndex+ "'>"; + sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\")' "; + sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>" + sideBarText += "</span><br />"; + //sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />"; + } + } + document.getElementById("sidebar").innerHTML = sideBarText; } \ No newline at end of file Index: lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js =================================================================== diff -u -r0df949c35b97a625059e37ca0902ac238e2ecadc -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js (.../mapFunctionsLearning.js) (revision 0df949c35b97a625059e37ca0902ac238e2ecadc) +++ lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js (.../mapFunctionsLearning.js) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -23,9 +23,9 @@ try{map.removeOverlay(markers[x]);} catch (e){} markers[x].state = "remove"; - refreshSideBar(); + refreshSideBar(sessionName); userMarkerCount --; - //serialiseMarkers(); + selectedMarker = -1; } } @@ -53,13 +53,17 @@ markers[x].title = title; markers[x].infoMessage = info; markers[x].editingOn = false; + markers[x].highlight = selectedUser == markers[x].createdById; // change the state to update if it is a pre-existing marker if (markers[x].state == "unchanged") {markers[x].state = "update";} else (markers[x].state ="save"); + + refreshSideBar(sessionName); + alert(selectedUser); + //showSelectedUser(selectedUser); updateMarkerInfoWindowHtml(markers[x]); - refreshSideBar(); openInfoWindow(x); } } Index: lams_tool_gmap/web/includes/jsp/mapFunctions.jsp =================================================================== diff -u -r0d541026c4054da24c534165f6f92b35adef0537 -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/includes/jsp/mapFunctions.jsp (.../mapFunctions.jsp) (revision 0d541026c4054da24c534165f6f92b35adef0537) +++ lams_tool_gmap/web/includes/jsp/mapFunctions.jsp (.../mapFunctions.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -1,11 +1,23 @@ <%@ include file="/common/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" %> +<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys" %> <c:set var="tool"> <lams:WebAppURL /> </c:set> + + +<script src="http://maps.google.com/maps?file=api&v=2&key=<%= Configuration.get(ConfigurationKeys.GMAP_KEY) %>" type="text/javascript"></script> + + <script type="text/javascript"> <!-- + +var selectedUser = -1; +var selectedMarker = -1; + + // add a marker at the given point function addMarker(point, infoMessage, title, uid, isSaved, editAble, createdBy, createdById) { @@ -18,6 +30,7 @@ marker.editAble = editAble; marker.createdBy = createdBy; marker.createdById = createdById; + marker.sideBarIndex = markers.length; map.addOverlay(marker); @@ -32,10 +45,12 @@ GEvent.addListener(marker, "click", function() { marker.openInfoWindowHtml(marker.infoWindowHtml); + showSelectedMarkerSideBar(marker.sideBarIndex); }); GEvent.addListener(marker, "infowindowclose", function() { updateMarkerInfoWindowHtml(marker); + showSelectedMarkerSideBar(marker.sideBarIndex); }); if (infoMessage!=null) @@ -47,7 +62,6 @@ marker.infoMessage = ""; } marker.title = title; - // set the state of the marker marker.editingOn = !isSaved; @@ -56,7 +70,7 @@ else {marker.state="unsaved";} //marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'"; - marker.sideBarIndex = markers.length; + marker.highlight = false; marker.removeLink = "<a href='javascript:removeMarker(" + markers.length + ")'><fmt:message key='button.remove'/></a>" ; marker.editLink = "<a href='javascript:editMarker(" + markers.length + ")'><fmt:message key='button.edit'/></a>"; marker.saveLink = "<a href='javascript:saveMarkerInfo(" + markers.length + ");'><fmt:message key='button.save'/></a>"; @@ -66,27 +80,132 @@ } +function addUserToList(id, name) +{ + var user = new Object(); + user.name = name; + user.id = id; + users[users.length] = user; +} -function refreshSideBar() +function makeUsersSideBarVisible(id) { - //marker.sideBarLinkPrefix = "<span class='sidebar'><a href='javascript:GEvent.trigger(markers["+markers.length+"],\"click\")'"; + var div = document.getElementById("userdiv" + id); + + if (div.style.display == "block") + { + document.getElementById("userdiv" + id).style.display = "none"; + document.getElementById("userTreeIcon" + id).src = TREE_CLOSED_ICON; + } + else if (div.style.display == "none") + { + document.getElementById("userdiv" + id).style.display = "block"; + document.getElementById("userTreeIcon" + id).src = TREE_OPEN_ICON; + + } +} + +function showSelectedUser(id) +{ + map.closeInfoWindow(); + + var div = document.getElementById("userdiv" + id); + var i; + + if (selectedUser == -1) + { + fitMapMarkers(); + document.getElementById("userSpan" + id).style.backgroundColor = "yellow"; + selectedUser = id; + } + else if (selectedUser == id) + { + document.getElementById("userSpan" + selectedUser).style.backgroundColor = ""; + selectedUser = -1; + } + else + { + fitMapMarkers(); + document.getElementById("userSpan" + selectedUser).style.backgroundColor = ""; + document.getElementById("userSpan" + id).style.backgroundColor = "yellow"; + selectedUser = id; + } + + + for (i=0;i<markers.length; i++) + { + if (markers[i].createdById == selectedUser) + { + //markers[i].setImage(YELLOW_MARKER_ICON); + markers[i].highlight=true; + } + else + { + //markers[i].setImage(BLUE_MARKER_ICON); + markers[i].highlight=false; + } + updateMarkerInfoWindowHtml(markers[i]); + } + +} + +function showSelectedMarkerSideBar(id) +{ + + //alert ("Marker to select: " +id+ "\nSelected marker: " + selectedMarker); + + var selectedMarkerSpan = document.getElementById("markerSpan" + selectedMarker); + var markerSpanToSelect = document.getElementById("markerSpan" + id); + + if (selectedMarker == -1 && markerSpanToSelect != null) + { + document.getElementById("markerSpan" + id).style.backgroundColor = "yellow"; + selectedMarker = id; + } + else if (selectedMarker == id && selectedMarkerSpan!= null) + { + document.getElementById("markerSpan" + selectedMarker).style.backgroundColor = ""; + selectedMarker = -1; + } + else if (selectedMarkerSpan != null && markerSpanToSelect!= null) + { + document.getElementById("markerSpan" + selectedMarker).style.backgroundColor = ""; + document.getElementById("markerSpan" + id).style.backgroundColor = "yellow"; + selectedMarker = id; + } +} + +function refreshSideBar(groupName) +{ var sideBarText = ""; - var i=0; - for (;i<markers.length; i++) + + var j; + var i; + + //sideBarText += "<a href='javascript:refreshSideBar()'>View All</a><br>"; + sideBarText += "<h2>" + groupName + "</h2>"; + for (j=0;j<users.length; j++) { - if (markers[i].state != "remove" && markers[i].state != "unsaved") + sideBarText += "<nobr><img src='" +TREE_CLOSED_ICON+ "' id='userTreeIcon" + users[j].id + "' onclick='javascript:makeUsersSideBarVisible(" + users[j].id + ");' />"; + sideBarText += " <a href='javascript:showSelectedUser(" + users[j].id + ");'><span id='userSpan" + users[j].id +"'>" + users[j].name + "</span></a></nobr><br>"; + sideBarText += "<div style='display:none;' id='userdiv" + users[j].id + "'>"; + for (i=0;i<markers.length; i++) { - sideBarText += "<span class='sidebar'>"; - sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\")' "; - sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>" - sideBarText += "</span><br />"; - //sideBarText += markers[i].sideBarLinkPrefix + " title='" + markers[i].createdBy + "' >" + markers[i].title+"</a></span><br />"; + if (markers[i].createdById == users[j].id) + { + sideBarText += "    <span id='markerSpan" + markers[i].sideBarIndex + "'><nobr>"; + sideBarText += "<a href='javascript:GEvent.trigger(markers[" + markers[i].sideBarIndex + "],\"click\");' "; + sideBarText += "title='" + markers[i].createdBy + "' >" + markers[i].title + "</a>" + sideBarText += "</span></nobr><br />"; + } } + sideBarText += "</div>"; } - document.getElementById("sidebar").innerHTML = sideBarText; + document.getElementById("usersidebar").innerHTML = sideBarText; } + function cancelEditMarkerInfo(x) { if (markers[x].state == "unsaved") @@ -154,17 +273,22 @@ { if (markerIn.state == "unchanged") { - markerIn.setImage("${tool}/images/blue_Marker.png"); + markerIn.setImage(BLUE_MARKER_ICON); } else if (markerIn.state == "update" || markerIn.state == "save") { - markerIn.setImage("${tool}/images/paleblue_Marker.png"); + markerIn.setImage(LIGHTBLUE_MARKER_ICON); } else if (markerIn.state == "unsaved") { - markerIn.setImage("${tool}/images/red_Marker.png"); + markerIn.setImage(RED_MARKER_ICON); } + if (markerIn.highlight) + { + markerIn.setImage(YELLOW_MARKER_ICON); + } + if (markerIn.editingOn) { markerIn.linksBar = "<br/ >" + markerIn.saveLink + " " + markerIn.cancelLink; @@ -223,6 +347,9 @@ } + + + function test() { serialiseMarkers(); Index: lams_tool_gmap/web/layouts/tabLayout.jsp =================================================================== diff -u -r3299d560146318cb6f26ec2b234e3af70ec21eba -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/layouts/tabLayout.jsp (.../tabLayout.jsp) (revision 3299d560146318cb6f26ec2b234e3af70ec21eba) +++ lams_tool_gmap/web/layouts/tabLayout.jsp (.../tabLayout.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -1,5 +1,4 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" - "http://www.w3.org/TR/html4/loose.dtd"> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <%@ include file="/common/taglibs.jsp"%> Index: lams_tool_gmap/web/pages/authoring/basic.jsp =================================================================== diff -u -r66e0ef387697b413fc28adcf7ca665d03d8d4ef1 -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 66e0ef387697b413fc28adcf7ca665d03d8d4ef1) +++ lams_tool_gmap/web/pages/authoring/basic.jsp (.../basic.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -31,7 +31,7 @@ <div id="map_canvas" style="width: 500px; height: 300px"></div> --> <table cellpadding='0' cellspacing='0' border='0'> - <tr><td><div id="map_canvas" style="width: 400px; height: 300px;" ></div></td> + <tr><td><div id="map_canvas" style="width: 400px; height: 300px;" ><fmt:message key="error.cantLoadMap"></fmt:message></div></td> <td><div id="sidebar" style="width:100px; overflow:auto;height:320px; background:WhiteSmoke; "></div></td></tr> <tr><td> <a href="javascript:addMarkerToCenter()" class="button"/><fmt:message key="button.addMarker"/></a> @@ -78,7 +78,7 @@ map.setMapType(${formBean.gmap.mapType}); addAuthorMarkers(); - refreshSideBar(); + refreshSideBarAuthoring(); } } Index: lams_tool_gmap/web/pages/authoring/headItems.jsp =================================================================== diff -u -r66e0ef387697b413fc28adcf7ca665d03d8d4ef1 -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/pages/authoring/headItems.jsp (.../headItems.jsp) (revision 66e0ef387697b413fc28adcf7ca665d03d8d4ef1) +++ lams_tool_gmap/web/pages/authoring/headItems.jsp (.../headItems.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -4,16 +4,9 @@ </c:set> <script type="text/javascript" src="${tool}includes/javascript/authoring.js"></script> - -<!-- -<script type="text/javascript" src="${tool}includes/javascript/mapFunctions.js"></script> ---> - +<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsAuthoring.js"></script> <%@ include file="/includes/jsp/mapFunctions.jsp"%> -<script type="text/javascript" src="${tool}includes/javascript/mapFunctionsAuthoring.js"></script> -<script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAAvPAE96y1iioFQOnrP1RCBxS3S_A0Q4kgEfsHF6TMv6-oezFszBTPVN72_75MGlxr3nP_6ixxWd30jw" type="text/javascript"></script> - <script type="text/javascript"> <!-- var errorMissingTitle = '<fmt:message key="error.missingMarkerTitle"/>'; @@ -23,6 +16,12 @@ var geocoder = null; var currUser; var currUserId; + var YELLOW_MARKER_ICON = "${tool}/images/yellow_Marker.png"; + var BLUE_MARKER_ICON = "${tool}/images/blue_Marker.png"; + var LIGHTBLUE_MARKER_ICON = "${tool}/images/paleblue_Marker.png"; + var RED_MARKER_ICON = "${tool}/images/red_Marker.png"; + var TREE_CLOSED_ICON = "${tool}/images/tree_closed.gif"; + var TREE_OPEN_ICON = "${tool}/images/tree_open.gif"; //--> </script> Index: lams_tool_gmap/web/pages/export/exportPortfolio.jsp =================================================================== diff -u -rb98ee53474d6d81dcac88593ffa57f947d2ccb84 -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision b98ee53474d6d81dcac88593ffa57f947d2ccb84) +++ lams_tool_gmap/web/pages/export/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -12,15 +12,20 @@ - - Index: lams_tool_gmap/web/pages/monitoring/summary.jsp =================================================================== diff -u -rb98ee53474d6d81dcac88593ffa57f947d2ccb84 -rbaf5d2db55e5db78d24d07464b301c0568762607 --- lams_tool_gmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b98ee53474d6d81dcac88593ffa57f947d2ccb84) +++ lams_tool_gmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision baf5d2db55e5db78d24d07464b301c0568762607) @@ -1,60 +1,95 @@ <%@ include file="/common/taglibs.jsp"%> - - +
+ + + + + + + + + - -
+

Group:

+ 		+

+
No groups found for lesson.
-

- ${session.sessionName} -

+ ${session.sessionName}
- - - - - -
- - + ${session.numberOfLearners}
+ + + + + + + + + + + +
+
+
+
+ +
+ + +
+ " /> + +
- - - - - - - - -
-
-
-
- -
- - -
- " /> - -
- + } - + function addMarkersForSession${session.sessionID}() + { + + + + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName} ()', '0'); + + + addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), '${marker.infoWindowMessage}', '${marker.title}', '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}'); + + + + refreshSideBar("${session.sessionName}"); + fitMapMarkers(); + } + + + clearMap(); + addUsersForSession${session.sessionID}(); + addMarkersForSession${session.sessionID}(); + + + + +//--> + + +