Index: lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java =================================================================== diff -u -rb39597d17e4c55346d4732e0867fd2be09393fa5 -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java (.../CentralConstants.java) (revision b39597d17e4c55346d4732e0867fd2be09393fa5) +++ lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java (.../CentralConstants.java) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -210,4 +210,5 @@ public static final String TOOL_SIGNATURE_LEADERSELECTION = "lalead11"; public static final String TOOL_SIGNATURE_MCQ = "lamc11"; public static final String TOOL_SIGNATURE_SCRATCHIE = "lascrt11"; + public static final String TOOL_SIGNATURE_PEER_REVIEW = "laprev11"; } \ No newline at end of file Index: lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rb26f90eccf164c7058201360d2ca771adcfb597a -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision b26f90eccf164c7058201360d2ca771adcfb597a) +++ lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -421,6 +421,7 @@ label.tra =tRA label.burning.questions =Burning Qs label.forum =Forum +label.peer.review =Peer Review label.aes =AEs label.sequence =Sequence label.sequence.diagram =Sequence diagram Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java =================================================================== diff -u -ra05411c3da91b4b357b1615cc5361ea25e3614da -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java (.../TblMonitoringAction.java) (revision a05411c3da91b4b357b1615cc5361ea25e3614da) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java (.../TblMonitoringAction.java) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -230,7 +230,25 @@ return mapping.findForward("forum"); } + + /** + * Shows peerreview page + */ + public ActionForward peerreview(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + long peerreviewActivityId = WebUtil.readLongParam(request, "activityId"); + ToolActivity peerreviewActivity = (ToolActivity) monitoringService.getActivityById(peerreviewActivityId); + + int attemptedLearnersNumber = lessonService.getCountLearnersHaveAttemptedActivity(peerreviewActivity); + request.setAttribute("attemptedLearnersNumber", attemptedLearnersNumber); + Set toolSessions = peerreviewActivity.getToolSessions(); + request.setAttribute("toolSessions", toolSessions); + + return mapping.findForward("peerreview"); + } + /** * Shows sequence diagram page */ @@ -378,6 +396,10 @@ } else if (CentralConstants.TOOL_SIGNATURE_FORUM.equals(toolSignature)) { request.setAttribute("isForumAvailable", true); request.setAttribute("forumActivityId", toolActivityId); + + } else if (CentralConstants.TOOL_SIGNATURE_PEER_REVIEW.equals(toolSignature)) { + request.setAttribute("isPeerreviewAvailable", true); + request.setAttribute("peerreviewToolContentId", toolContentId); //tRA is the first scratchie activity } else if (!scratchiePassed && CentralConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) { Index: lams_monitoring/web/WEB-INF/struts-config.xml =================================================================== diff -u -rd7ed1173946998f754a2efef09d68c9e3bfe307f -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_monitoring/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision d7ed1173946998f754a2efef09d68c9e3bfe307f) +++ lams_monitoring/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -205,6 +205,11 @@ redirect="false" /> + +<%@ page import="org.lamsfoundation.lams.util.CentralConstants"%> + + + +
+
+

+ +

+
+
+ + + +
+
+
+
+

+ + : ${attemptedLearnersNumber}/ +

+
+
+
+
+ + + +
+
+ +

+ + +
+
+

+ +

+
+ +
+
+ + + +
+
+
+
+ +
+
+ + Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp =================================================================== diff -u -ra05411c3da91b4b357b1615cc5361ea25e3614da -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision a05411c3da91b4b357b1615cc5361ea25e3614da) +++ lams_monitoring/web/tblmonitor/tblmonitor.jsp (.../tblmonitor.jsp) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -75,6 +75,10 @@ options = { activityId: "${forumActivityId}" }; + + } else if (method == "peerreview") { + toolContentID = "${peerreviewToolContentId}"; + url = "tool/laprev11/tblmonitoring.do"; } // Merge additional options into existing options object @@ -235,6 +239,17 @@ + + + + + + + + + + + Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/TblMonitoringAction.java =================================================================== diff -u --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/TblMonitoringAction.java (revision 0) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/TblMonitoringAction.java (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -0,0 +1,72 @@ +package org.lamsfoundation.lams.tool.peerreview.web.action; + +import java.io.IOException; +import java.util.List; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +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.rating.model.RatingCriteria; +import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants; +import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary; +import org.lamsfoundation.lams.tool.peerreview.model.Peerreview; +import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.action.LamsDispatchAction; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.util.SessionMap; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +public class TblMonitoringAction extends LamsDispatchAction { + private static Logger log = Logger.getLogger(TblMonitoringAction.class); + + private static IPeerreviewService peerreviewService; + + /** + * Shows tra page + */ + public ActionForward peerreview(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + initializePeerreviewService(); + + // initial Session Map + SessionMap sessionMap = new SessionMap(); + request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); + request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); + + Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + List groupList = peerreviewService.getGroupSummaries(contentId); + + Peerreview peerreview = peerreviewService.getPeerreviewByContentId(contentId); + + // cache into sessionMap + sessionMap.put(PeerreviewConstants.ATTR_SUMMARY_LIST, groupList); + sessionMap.put(PeerreviewConstants.PAGE_EDITABLE, peerreview.isContentInUse()); + sessionMap.put(PeerreviewConstants.ATTR_PEERREVIEW, peerreview); + sessionMap.put(PeerreviewConstants.ATTR_TOOL_CONTENT_ID, contentId); + sessionMap.put(PeerreviewConstants.ATTR_IS_GROUPED_ACTIVITY, peerreviewService.isGroupedActivity(contentId)); + sessionMap.put("tblMonitoring", true); + + List criterias = peerreviewService.getRatingCriterias(contentId); + request.setAttribute(PeerreviewConstants.ATTR_CRITERIAS, criterias); + + return mapping.findForward("summary"); + } + + // ************************************************************************************* + // Private method + // ************************************************************************************* + private void initializePeerreviewService() { + if (peerreviewService == null) { + WebApplicationContext wac = WebApplicationContextUtils + .getRequiredWebApplicationContext(getServlet().getServletContext()); + peerreviewService = (IPeerreviewService) wac.getBean(PeerreviewConstants.PEERREVIEW_SERVICE); + } + } +} \ No newline at end of file Index: lams_tool_preview/web/WEB-INF/struts-config.xml =================================================================== diff -u -r412fe7a30d27bd7402ae872029af8dd655d4a638 -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_tool_preview/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 412fe7a30d27bd7402ae872029af8dd655d4a638) +++ lams_tool_preview/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -227,6 +227,12 @@ type="org.lamsfoundation.lams.tool.peerreview.web.action.MonitoringAction" parameter="setUserHidden" > + + + + Index: lams_tool_preview/web/pages/monitoring/summary.jsp =================================================================== diff -u -r8e090b3ddf269cdffececa4bc55a9333da5b0858 -r6a8cbf03dadd48f4ba4feb43fedffa052a8b177b --- lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 8e090b3ddf269cdffececa4bc55a9333da5b0858) +++ lams_tool_preview/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6a8cbf03dadd48f4ba4feb43fedffa052a8b177b) @@ -16,6 +16,7 @@ } + @@ -120,7 +121,7 @@ - criteria.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&criteriaId=${criteria.ratingCriteriaId} + ?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&criteriaId=${criteria.ratingCriteriaId} @@ -131,7 +132,7 @@
- reflections.do?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID} + ?sessionMapID=${sessionMapID}&toolSessionId=${groupSummary.sessionId}&toolContentID=${sessionMap.toolContentID} loffset5 @@ -170,4 +171,6 @@
-<%@ include file="advanceoptions.jsp"%> + + <%@ include file="advanceoptions.jsp"%> +