Index: lams_tool_scribe/conf/language/ApplicationResources.properties
===================================================================
diff -u -r4b4b0d35dcce611d0cb85cab458f2e9687858ef0 -r06c2af4dcb52885a46843b1addc693af52754c95
--- lams_tool_scribe/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4b4b0d35dcce611d0cb85cab458f2e9687858ef0)
+++ lams_tool_scribe/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 06c2af4dcb52885a46843b1addc693af52754c95)
@@ -107,6 +107,7 @@
button.agree = Agree
button.submitReport = Submit Report
button.forceComplete = Force Complete
+button.submit = Submit
message.voteStatistics = {0} out of {1} agree
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
diff -u -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0 -r06c2af4dcb52885a46843b1addc693af52754c95
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 06c2af4dcb52885a46843b1addc693af52754c95)
@@ -77,6 +77,11 @@
Long toolContentID = new Long(WebUtil.readLongParam(request,
AttributeNames.PARAM_TOOL_CONTENT_ID));
+ String contentFolderID = WebUtil.readStrParam(request,
+ AttributeNames.PARAM_CONTENT_FOLDER_ID);
+ MonitoringForm monForm = (MonitoringForm)form;
+ monForm.setContentFolderID(contentFolderID);
+
// set up scribeService
if (scribeService == null) {
scribeService = ScribeServiceProxy.getScribeService(this.getServlet()
@@ -87,6 +92,8 @@
ScribeDTO scribeDTO = setupScribeDTO(scribe);
request.setAttribute("monitoringDTO", scribeDTO);
+ request.setAttribute("contentFolderID", contentFolderID);
+
return mapping.findForward("success");
}
@@ -120,6 +127,8 @@
ScribeDTO scribeDTO = setupScribeDTO(session.getScribe());
request.setAttribute("monitoringDTO", scribeDTO);
+ request.setAttribute("contentFolderID", monForm.getContentFolderID());
+
return mapping.findForward("success");
}
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java
===================================================================
diff -u -r893a9fc55bf32709c48cc4c1e235d1191beaf085 -r06c2af4dcb52885a46843b1addc693af52754c95
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision 893a9fc55bf32709c48cc4c1e235d1191beaf085)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision 06c2af4dcb52885a46843b1addc693af52754c95)
@@ -36,6 +36,7 @@
String dispatch;
Long toolSessionID;
+ String contentFolderID;
Long appointedScribeUID;
public String getDispatch() {
@@ -56,4 +57,10 @@
public void setAppointedScribeUID(Long appointedScribeUID) {
this.appointedScribeUID = appointedScribeUID;
}
+ public String getContentFolderID() {
+ return contentFolderID;
+ }
+ public void setContentFolderID(String contentFolderID) {
+ this.contentFolderID = contentFolderID;
+ }
}
Index: lams_tool_scribe/web/pages/monitoring/editActivity.jsp
===================================================================
diff -u -r676776bec1c35957910e6911d9f7d280f646d28d -r06c2af4dcb52885a46843b1addc693af52754c95
--- lams_tool_scribe/web/pages/monitoring/editActivity.jsp (.../editActivity.jsp) (revision 676776bec1c35957910e6911d9f7d280f646d28d)
+++ lams_tool_scribe/web/pages/monitoring/editActivity.jsp (.../editActivity.jsp) (revision 06c2af4dcb52885a46843b1addc693af52754c95)
@@ -28,6 +28,7 @@
+
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rc6b8ac8a336ac260986c41a3049a5d1bc0a743c0 -r06c2af4dcb52885a46843b1addc693af52754c95
--- lams_tool_scribe/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision c6b8ac8a336ac260986c41a3049a5d1bc0a743c0)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 06c2af4dcb52885a46843b1addc693af52754c95)
@@ -24,6 +24,7 @@
+
@@ -37,7 +38,9 @@
-
+
+
+