Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r3813117828096a5d4063e220506bbc6357be2683 -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3813117828096a5d4063e220506bbc6357be2683) +++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -108,5 +108,8 @@ label.unsavedMarkers =You have unsaved markers, they will be lost if you choose to continue. Do you want to continue anyway? button.refresh =Refresh Map button.Continue =Continue +heading.reflection =Reflections +pageTitle.monitoring.notebook =View Reflection +message.no.reflection.available =No notebook available #======= End labels: Exported 76 labels for en AU ===== Index: lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r3813117828096a5d4063e220506bbc6357be2683 -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3813117828096a5d4063e220506bbc6357be2683) +++ lams_tool_gmap/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -108,5 +108,8 @@ label.unsavedMarkers =You have unsaved markers, they will be lost if you choose to continue. Do you want to continue anyway? button.refresh =Refresh Map button.Continue =Continue +heading.reflection =Reflection +pageTitle.monitoring.notebook =View Reflection +message.no.reflection.available =No notebook available #======= End labels: Exported 76 labels for en AU ===== Index: lams_tool_gmap/db/model/gmap_tool.clay =================================================================== diff -u -r3070d94f2d914ef5afbd98bb7805ef528e71d5ff -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/db/model/gmap_tool.clay (.../gmap_tool.clay) (revision 3070d94f2d914ef5afbd98bb7805ef528e71d5ff) +++ lams_tool_gmap/db/model/gmap_tool.clay (.../gmap_tool.clay) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -73,8 +73,8 @@ - + @@ -345,7 +345,7 @@ - + @@ -408,8 +408,8 @@ - + @@ -425,7 +425,7 @@ - + @@ -505,8 +505,8 @@ - + @@ -548,8 +548,8 @@ - + @@ -612,8 +612,8 @@ - + @@ -632,8 +632,8 @@ - + @@ -645,8 +645,8 @@ - + @@ -658,8 +658,8 @@ - + Fisheye: Tag 910b2ac5592ed40624543c6e5d22f5a80547d588 refers to a dead (removed) revision in file `lams_tool_gmap/db/model/gmap_tool_clay_generated.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java =================================================================== diff -u -r3813117828096a5d4063e220506bbc6357be2683 -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java (.../GmapDTO.java) (revision 3813117828096a5d4063e220506bbc6357be2683) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java (.../GmapDTO.java) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -134,7 +134,7 @@ onlineInstructionsFiles = new TreeSet(); offlineInstructionsFiles = new TreeSet(); - for (Iterator i = gmap.getGmapAttachments().iterator(); i.hasNext();) { + for (Iterator i = gmap.getGmapAttachments().iterator(); i.hasNext();) { GmapAttachment att = (GmapAttachment) i.next(); if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) { GmapAttachmentDTO attDTO = new GmapAttachmentDTO(att); Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java =================================================================== diff -u -r3813117828096a5d4063e220506bbc6357be2683 -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java (.../GmapUserDTO.java) (revision 3813117828096a5d4063e220506bbc6357be2683) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java (.../GmapUserDTO.java) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -31,6 +31,8 @@ public Long uid; + public Long userId; + public String loginName; public String firstName; @@ -41,12 +43,15 @@ public boolean finishedActivity; + public boolean finishedReflection; + public GmapUserDTO(GmapUser user) { this.uid = user.getUid(); this.loginName = user.getLoginName(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.finishedActivity = user.isFinishedActivity(); + this.userId = user.getUserId(); } public int compareTo(Object o) { @@ -106,6 +111,20 @@ public void setFinishedActivity(boolean finishedActivity) { this.finishedActivity = finishedActivity; } - - + + public boolean isFinishedReflection() { + return finishedReflection; + } + + public void setFinishedReflection(boolean finishedReflection) { + this.finishedReflection = finishedReflection; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; + } } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java =================================================================== diff -u -r2e5708a7cd242f72aecf91251e52dde68a72017f -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 2e5708a7cd242f72aecf91251e52dde68a72017f) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -26,25 +26,30 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Iterator; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.gmap.dto.GmapDTO; import org.lamsfoundation.lams.tool.gmap.dto.GmapSessionDTO; +import org.lamsfoundation.lams.tool.gmap.dto.GmapUserDTO; import org.lamsfoundation.lams.tool.gmap.model.Gmap; import org.lamsfoundation.lams.tool.gmap.model.GmapSession; import org.lamsfoundation.lams.tool.gmap.model.GmapUser; import org.lamsfoundation.lams.tool.gmap.service.IGmapService; import org.lamsfoundation.lams.tool.gmap.service.GmapServiceProxy; import org.lamsfoundation.lams.tool.gmap.util.GmapException; +import org.lamsfoundation.lams.tool.gmap.util.GmapConstants; import org.lamsfoundation.lams.tool.gmap.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; /** * @author @@ -56,6 +61,7 @@ * @struts.action-forward name="success" path="tiles:/monitoring/main" * @struts.action-forward name="gmap_display" * path="tiles:/monitoring/gmap_display" + * @struts.action-forward name="notebook" path="tiles:/monitoring/notebook" * */ public class MonitoringAction extends LamsDispatchAction { @@ -87,6 +93,25 @@ { Long toolSessionID = sessionDTO.getSessionID(); sessionDTO.setMarkerDTOs(gmapService.getGmapMarkersBySessionId(toolSessionID)); + + for (GmapUserDTO userDTO :sessionDTO.getUserDTOs()) + { + // get the notebook entry. + NotebookEntry notebookEntry = gmapService.getEntry(toolSessionID, + CoreNotebookConstants.NOTEBOOK_TOOL, + GmapConstants.TOOL_SIGNATURE, userDTO.getUserId().intValue() + ); + if (notebookEntry != null) + { + userDTO.setFinishedReflection(true); + //userDTO.setNotebookEntry(notebookEntry.getEntry()); + } + else + { + userDTO.setFinishedReflection(false); + } + sessionDTO.getUserDTOs().add(userDTO); + } } request.setAttribute("gmapDTO", gmapDT0); @@ -169,4 +194,35 @@ return gmapUser; } + + /** + * Opens a user's reflection + * @param mapping + * @param form + * @param request + * @param response + * @return + */ + public ActionForward openNotebook(ActionMapping mapping, + ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + + //MonitoringForm monitorForm = (MonitoringForm) form; + Long toolSessionId = WebUtil.readLongParam(request, "toolSessionID", false); + Long userID = WebUtil.readLongParam(request, "userID", false); + + GmapUser gmapUser = gmapService.getUserByUserIdAndSessionId(userID, toolSessionId); + + NotebookEntry notebookEntry = gmapService.getEntry(toolSessionId, + CoreNotebookConstants.NOTEBOOK_TOOL, + GmapConstants.TOOL_SIGNATURE, + userID.intValue()); + + GmapUserDTO gmapUserDTO = new GmapUserDTO(gmapUser); + gmapUserDTO.setNotebookEntry(notebookEntry.getEntry()); + + request.setAttribute("gmapUserDTO", gmapUserDTO); + + return mapping.findForward("notebook"); + } } Index: lams_tool_gmap/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -r3813117828096a5d4063e220506bbc6357be2683 -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 3813117828096a5d4063e220506bbc6357be2683) +++ lams_tool_gmap/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -110,6 +110,11 @@ path="tiles:/monitoring/gmap_display" redirect="false" /> + + + + + + + Index: lams_tool_gmap/web/pages/monitoring/headItems.jsp =================================================================== diff -u -r2e5708a7cd242f72aecf91251e52dde68a72017f -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/web/pages/monitoring/headItems.jsp (.../headItems.jsp) (revision 2e5708a7cd242f72aecf91251e52dde68a72017f) +++ lams_tool_gmap/web/pages/monitoring/headItems.jsp (.../headItems.jsp) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -26,6 +26,7 @@ var map; var markers; var users; +var sessionReflectionDivs = new Array(); var geocoder = null; var userMarkerCount =0; var limitMarkers = ${gmapDTO.limitMarkers}; Index: lams_tool_gmap/web/pages/monitoring/notebook.jsp =================================================================== diff -u --- lams_tool_gmap/web/pages/monitoring/notebook.jsp (revision 0) +++ lams_tool_gmap/web/pages/monitoring/notebook.jsp (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -0,0 +1,19 @@ +<%@ include file="/common/taglibs.jsp"%> + +
+ + + + + + +
+

+ ${gmapUserDTO.firstName} ${gmapUserDTO.lastName} +

+
+

+ +

+
+ Index: lams_tool_gmap/web/pages/monitoring/summary.jsp =================================================================== diff -u -rb011786cc660c7861944698562681008be671915 -r910b2ac5592ed40624543c6e5d22f5a80547d588 --- lams_tool_gmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision b011786cc660c7861944698562681008be671915) +++ lams_tool_gmap/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 910b2ac5592ed40624543c6e5d22f5a80547d588) @@ -168,14 +168,14 @@ No groups found for lesson. - - - ${session.sessionName} - - - ${session.numberOfLearners} - - + + + ${session.sessionName} + + + ${session.numberOfLearners} + + @@ -205,7 +205,7 @@ - + @@ -220,10 +220,43 @@
- button.save +
- + + + + + + + + @@ -259,16 +292,25 @@ refreshSideBar("${session.sessionName}"); fitMapMarkers(); } - clearMap(); addUsersForSession${session.sessionID}(); addMarkersForSession${session.sessionID}(); + makeReflectionDivVisible('reflectionDiv${session.sessionID}'); + function makeReflectionDivVisible(id) + { + var i; + + document.getElementById("reflectionDiv${session.sessionID}").style.display = "none"; + + document.getElementById(id).style.display = "block"; + } + //--> - +