Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java =================================================================== diff -u -r0697c7a71301d7d5d468f4051de6761cf5904606 -r7ba5395e1098e79e17ee4e6f60a565b6eaed1103 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 0697c7a71301d7d5d468f4051de6761cf5904606) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 7ba5395e1098e79e17ee4e6f60a565b6eaed1103) @@ -45,6 +45,7 @@ import org.lamsfoundation.lams.tool.scribe.service.ScribeServiceProxy; import org.lamsfoundation.lams.tool.scribe.util.ScribeConstants; import org.lamsfoundation.lams.tool.scribe.util.ScribeUtils; +import org.lamsfoundation.lams.tool.scribe.web.forms.LearningForm; import org.lamsfoundation.lams.tool.scribe.web.forms.MonitoringForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.WebUtil; @@ -132,6 +133,23 @@ return mapping.findForward("success"); } + + public ActionForward forceCompleteActivity(ActionMapping mapping, + ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + + MonitoringForm monForm = (MonitoringForm)form; + + ScribeSession session = scribeService.getSessionBySessionId(monForm.getToolSessionID()); + session.setForceComplete(true); + scribeService.saveOrUpdateScribeSession(session); + + ScribeDTO scribeDTO = setupScribeDTO(session.getScribe()); + request.setAttribute("monitoringDTO", scribeDTO); + request.setAttribute("contentFolderID", monForm.getContentFolderID()); + + return mapping.findForward("success"); + } /* Private Methods */ private ScribeDTO setupScribeDTO(Scribe scribe) { Index: lams_tool_scribe/web/pages/monitoring/summary.jsp =================================================================== diff -u -r6f9a82945ad22a613ebdf36b17d6b1294d81eac0 -r7ba5395e1098e79e17ee4e6f60a565b6eaed1103 --- lams_tool_scribe/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 6f9a82945ad22a613ebdf36b17d6b1294d81eac0) +++ lams_tool_scribe/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 7ba5395e1098e79e17ee4e6f60a565b6eaed1103) @@ -2,88 +2,88 @@ - - - - +

+ ${session.sessionName} +

- - - -
-

- ${session.sessionName} -

-
- - + + - - - + + + - - - + + + - + - - - + + + ${user.firstName} ${user.lastName} - - + + - - - - - + + + - - + + - - - + +

+ +

+
+
+
-
+ +
+ +
-
+

+ ${session.appointedScribe} +

- -
- -
+ + + <%@include file="/pages/parts/voteDisplay.jsp"%> -

- ${session.appointedScribe} -

+
+ +
+
+ +

+ +

+

+ +

+
+
- - <%@include file="/pages/parts/voteDisplay.jsp" %> + + + + + + + + + + -
- -
-
- -

- -

-

- -

-
-
-
-
-
+ +
@@ -130,14 +130,16 @@ + + - - + +

- - + +

-
\ No newline at end of file +