Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r5a9c28b86f407f07ef7207128e726d2772fa4737 -r9183dbca5491f3aa34561b9f8de99885b59409b6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 5a9c28b86f407f07ef7207128e726d2772fa4737)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 9183dbca5491f3aa34561b9f8de99885b59409b6)
@@ -51,6 +51,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
+import org.apache.struts.action.DynaActionForm;
import org.lamsfoundation.lams.notebook.model.NotebookEntry;
import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants;
import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
@@ -137,6 +138,9 @@
request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
request.setAttribute(SbmtConstants.PAGE_EDITABLE, persistContent.isContentInUse());
+ DynaActionForm smbtMonitoringForm = (DynaActionForm) form;
+ smbtMonitoringForm.set("currentTab", WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
+
return mapping.findForward("success");
}
/**
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
===================================================================
diff -u -r9e446244a7245a4e8893e4673a801c56e4a35334 -r9183dbca5491f3aa34561b9f8de99885b59409b6
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 9e446244a7245a4e8893e4673a801c56e4a35334)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 9183dbca5491f3aa34561b9f8de99885b59409b6)
@@ -81,6 +81,8 @@
AttributeNames.PARAM_CONTENT_FOLDER_ID);
MonitoringForm monForm = (MonitoringForm)form;
monForm.setContentFolderID(contentFolderID);
+
+ monForm.setCurrentTab(WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
// set up scribeService
if (scribeService == null) {
Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java
===================================================================
diff -u -r24812cc3912113d9599602f65d81e15a06c36a89 -r9183dbca5491f3aa34561b9f8de99885b59409b6
--- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision 24812cc3912113d9599602f65d81e15a06c36a89)
+++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision 9183dbca5491f3aa34561b9f8de99885b59409b6)
@@ -39,6 +39,7 @@
Long toolContentID;
String contentFolderID;
Long appointedScribeUID;
+ Long currentTab;
public String getDispatch() {
return dispatch;
@@ -70,4 +71,10 @@
public void setToolContentID(Long toolContentID) {
this.toolContentID = toolContentID;
}
+ public Long getCurrentTab() {
+ return currentTab;
+ }
+ public void setCurrentTab(Long currentTab) {
+ this.currentTab = currentTab;
+ }
}
Index: lams_tool_scribe/web/includes/javascript/monitoring.js
===================================================================
diff -u -race8b408295af831e2715b2013d64a000aa09549 -r9183dbca5491f3aa34561b9f8de99885b59409b6
--- lams_tool_scribe/web/includes/javascript/monitoring.js (.../monitoring.js) (revision ace8b408295af831e2715b2013d64a000aa09549)
+++ lams_tool_scribe/web/includes/javascript/monitoring.js (.../monitoring.js) (revision 9183dbca5491f3aa34561b9f8de99885b59409b6)
@@ -1,7 +1,12 @@
function init() {
- // open the first tab
- selectTab(1);
+ var tag = document.getElementById("currentTab");
+ if(tag != null && tag.value != "") {
+ selectTab(tag.value);
+ }
+ else {
+ selectTab(1); //select the default tab;
+ }
}
function doSelectTab(tabId) {
Index: lams_tool_scribe/web/pages/monitoring/summary.jsp
===================================================================
diff -u -racc5f651c03bd0895c8b189c932ea35dea91dc7d -r9183dbca5491f3aa34561b9f8de99885b59409b6
--- lams_tool_scribe/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision acc5f651c03bd0895c8b189c932ea35dea91dc7d)
+++ lams_tool_scribe/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 9183dbca5491f3aa34561b9f8de99885b59409b6)
@@ -17,6 +17,7 @@
+