Index: lams_tool_lamc/db/sql/activity_insert.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/db/sql/activity_insert.sql,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/db/sql/activity_insert.sql	8 Mar 2006 12:06:56 -0000	1.11
+++ lams_tool_lamc/db/sql/activity_insert.sql	19 Mar 2006 11:00:56 -0000	1.12
@@ -46,7 +46,7 @@
 NULL
 , 'Allows creation and use of multiple choice questioning format'
 , 'Multiple Choice Questions'
-, 'Put some help text here.'
+, 'Help text'
 , NULL
 , NULL
 , NULL
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v
diff -u -r1.72 -r1.73
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	17 Mar 2006 10:34:47 -0000	1.72
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java	19 Mar 2006 11:00:55 -0000	1.73
@@ -43,7 +43,7 @@
 	public static final String LEARNING_STARTER							="learningStarter";
 	public static final String MONITORING_STARTER						="monitoringStarter";
 	public static final String LOAD_LEARNER								="loadLearner";
-    public static final String LOAD_MONITORING_CONTENT							="loadMonitoringContent";
+    public static final String LOAD_MONITORING_CONTENT							="loadMonitoring";
     public static final String LOAD_MONITORING_CONTENT_EDITACTIVITY				="loadMonitoringEditActivity";
     public static final String EXPORT_PORTFOLIO 						= "exportPortfolio";
     public static final String INDIVIDUAL_REPORT						="individualReport";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v
diff -u -r1.40 -r1.41
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	17 Mar 2006 10:34:47 -0000	1.40
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java	19 Mar 2006 11:00:55 -0000	1.41
@@ -635,22 +635,19 @@
 	     */
 		
 	    String userID = "";
-	    /* get session from shared session.*/
 	    HttpSession ss = SessionManager.getSession();
-	    /* get back login user DTO*/
-	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	    if ((user == null) || (user.getUserID() == null))
-	    {
-	    	McUtils.cleanUpSessionAbsolute(request);
-	    	logger.debug("error: The tool expects userId");
-	    	persistError(request,"error.learningUser.notAvailable");
-	    	request.getSession().setAttribute(USER_EXCEPTION_USER_DOESNOTEXIST, new Boolean(true).toString());
-			return (mapping.findForward(ERROR_LIST));
-	    }else
-	    	userID = user.getUserID().toString();
+	    logger.debug("ss: " + ss);
 	    
-	    logger.debug("retrieved userId: " + userID);
-    	request.getSession().setAttribute(USER_ID, userID);
+	    if (ss != null)
+	    {
+		    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
+		    if ((user != null) || (user.getUserID() != null))
+		    {
+		    	userID = user.getUserID().toString();
+			    logger.debug("retrieved userId: " + userID);
+		    	request.getSession().setAttribute(USER_ID, userID);
+		    }
+	    }
 		
 	    
 	    /*
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	17 Mar 2006 10:34:47 -0000	1.18
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	19 Mar 2006 11:00:55 -0000	1.19
@@ -327,6 +327,7 @@
 		
 		request.getSession().setAttribute(EDIT_OPTIONS_MODE, new Integer(0));
 		logger.debug("setting  EDIT_OPTIONS_MODE to 0");
+		logger.debug("fwd ing to : " + LOAD_MONITORING_CONTENT);
 		
 		return (mapping.findForward(LOAD_MONITORING_CONTENT));
 	}
@@ -363,17 +364,23 @@
 
     	logger.debug("dispatching getSummary..."+ request);
     	McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
+    	logger.debug("mcMonitoringForm: "+ mcMonitoringForm);
+    	
+    	
 	 	IMcService mcService =McUtils.getToolService(request);
-    	if (mcService == null)
+	 	logger.debug("mcService: "+ mcService);
+	 	if (mcService == null)
 		{
 			logger.debug("will retrieve mcService");
 			mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 		    logger.debug("retrieving mcService from cache: " + mcService);
 		}
 	    request.getSession().setAttribute(TOOL_SERVICE, mcService);
 	 	
- 		request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary");   
- 		return (mapping.findForward(LOAD_MONITORING_CONTENT));
+ 		request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary");
+ 		
+ 		McStarterAction mcStarterAction= new McStarterAction();
+ 		return mcStarterAction.executeGetMonitoringTab(mapping, form, request, response);
 	}
     
     
@@ -408,6 +415,7 @@
 		logger.debug("monitoring data initialised..");
     	
     	McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
+    	
 	 	IMcService mcService =McUtils.getToolService(request);
 	 	logger.debug("mcService: " + mcService);
     	
@@ -418,10 +426,10 @@
 		    logger.debug("retrieving mcService from cache: " + mcService);
 		}
 	    request.getSession().setAttribute(TOOL_SERVICE, mcService);
-	 	
 	 	request.getSession().setAttribute(CURRENT_MONITORING_TAB, "instructions");
-	 	logger.debug("forwarding to: " + LOAD_MONITORING_CONTENT);
- 		return (mapping.findForward(LOAD_MONITORING_CONTENT));
+	 	
+	 	McStarterAction mcStarterAction= new McStarterAction();
+	 	return mcStarterAction.executeGetMonitoringTab(mapping, form, request, response);
 	}
 
     
@@ -456,17 +464,21 @@
 
     	logger.debug("dispatching getStats..." + request);
     	McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
-	 	IMcService mcService =McUtils.getToolService(request);
+    	
+    	IMcService mcService =McUtils.getToolService(request);
     	if (mcService == null)
 		{
 			logger.debug("will retrieve mcService");
 			mcService = McServiceProxy.getMcService(getServlet().getServletContext());
 		    logger.debug("retrieving mcService from cache: " + mcService);
 		}
 	    request.getSession().setAttribute(TOOL_SERVICE, mcService);
+	    logger.debug("mcService : " + mcService);
 	 	
  		request.getSession().setAttribute(CURRENT_MONITORING_TAB, "stats");
- 		return (mapping.findForward(LOAD_MONITORING_CONTENT));
+ 		
+ 		McStarterAction mcStarterAction= new McStarterAction();
+	 	return mcStarterAction.executeGetMonitoringTab(mapping, form, request, response);
 	}
     
     
@@ -1027,9 +1039,7 @@
                                          ServletException
     {
     	/*not doing anything for the moment*/
-    	/*McUtils.cleanUpSessionAbsolute(request); */
-    	request.getSession().setAttribute(IS_MONITORED_CONTENT_IN_USE, new Boolean(false).toString());
-    	return (mapping.findForward(LOAD_MONITORING_CONTENT));
+    	return null;
     }
     
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.19 -r1.20
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	13 Mar 2006 23:17:26 -0000	1.19
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	19 Mar 2006 11:00:55 -0000	1.20
@@ -121,6 +121,7 @@
 		if (initData == false)
 			return (mapping.findForward(ERROR_LIST));
 		
+		request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary");
 	    return (mapping.findForward(LOAD_MONITORING_CONTENT));	
 	}
 
@@ -259,25 +260,6 @@
 	protected ActionForward validateParameters(HttpServletRequest request, ActionMapping mapping)
 	{
 		logger.debug("start validating monitoring parameters...");
-		/*
-	     * obtain and setup the current user's data 
-	     */
-		/*
-	    String userID = "";
-	    HttpSession ss = SessionManager.getSession();
-	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	    if ((user == null) || (user.getUserID() == null))
-	    {
-	    	logger.debug("error: The tool expects userId");
-	    	persistError(request,"error.learningUser.notAvailable");
-	    	McUtils.cleanUpSessionAbsolute(request);
-	    	return (mapping.findForward(ERROR_LIST));
-	    }else
-	    	userID = user.getUserID().toString();
-	    
-	    logger.debug("retrieved userId: " + userID);
-    	request.getSession().setAttribute(USER_ID, userID);
-    	*/
     	
     	String strToolContentId=request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID);
     	logger.debug("strToolContentId: " + strToolContentId);
@@ -310,6 +292,7 @@
 	}
 
 	
+	
 	/**
      * persists error messages to request scope
      * @param request
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v
diff -u -r1.67 -r1.68
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	16 Mar 2006 16:45:59 -0000	1.67
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java	19 Mar 2006 11:00:55 -0000	1.68
@@ -885,7 +885,16 @@
 	}
 	
 	
+	public ActionForward executeGetMonitoringTab(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) 
+	throws IOException, ServletException, McApplicationException
+	{
+		logger.debug("CURRENT_MONITORING_TAB: " + request.getSession().getAttribute(CURRENT_MONITORING_TAB));
+		logger.debug("starting executeGetMonitoringTab for: " + LOAD_MONITORING_CONTENT);
+		return (mapping.findForward(LOAD_MONITORING_CONTENT));
+	}
+
 	
+	
 	/**
      * persists error messages to request scope
      * @param request
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v
diff -u -r1.43 -r1.44
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	7 Mar 2006 20:12:39 -0000	1.43
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	19 Mar 2006 11:00:56 -0000	1.44
@@ -32,6 +32,7 @@
    <action path="/authoringStarter" 
    			type="org.lamsfoundation.lams.tool.mc.web.McStarterAction" 
    			name="McAuthoringForm" 
+	      	scope="session"
    			input="/index.jsp"> 
 	
 		<exception
@@ -53,43 +54,43 @@
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
-		    name="loadMonitoringContent"
+		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
-	  	
+
 	  	<forward
 		    name="loadMonitoringEditActivity"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
 		    name="loadLearner"
 		    path="/learning/AnswersContent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 
 	  	<forward
 	        name="starter"
 	        path="/index.jsp"
-	        redirect="true"
+	        redirect="false"
 	     />
 	     
 	     <forward
 	        name="preview"
 	        path="/learning/Preview.jsp"
-	        redirect="true"
+	        redirect="false"
 	     />
 	  	
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	</action>  
 	
@@ -100,9 +101,7 @@
     	  	name="McAuthoringForm"
 	      	scope="session"
     	  	input="/authoring/AuthoringMaincontent.jsp"
-      		parameter="dispatch"
-      		unknown="false"
-      		validate="true">
+      		parameter="dispatch">
 	
 		<exception
 	        key="error.exception.McApplication"
@@ -123,31 +122,31 @@
 	      <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
-	        redirect="true"
+	        redirect="false"
 	      />
 	    
 	      <forward
 	        name="starter"
 	        path="/index.jsp"
-	        redirect="true"
+	        redirect="false"
 	      />
 	      
 	  	<forward
-		    name="loadMonitoringContent"
+		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
-
+	  	
 	     <forward
 	        name="preview"
 	        path="/learning/Preview.jsp"
-	        redirect="true"
+	        redirect="false"
 	     />
 	  	
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	      
     </action>
@@ -178,19 +177,19 @@
 	  	<forward
 		    name="load"
 		    path="/authoring/AuthoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
 	        name="starter"
 	        path="/index.jsp"
-	        redirect="true"
+	        redirect="false"
 	     />
 	  	
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	</action>  
     
@@ -199,6 +198,9 @@
    <action 	path="/learningStarter" 
    			type="org.lamsfoundation.lams.tool.mc.web.McLearningStarterAction" 
    			name="McLearningForm" 
+	      	scope="session"
+	      	validate="false"
+	      	unknown="false"
    			input="/learningIndex.jsp"> 
 
 		<exception
@@ -263,7 +265,7 @@
       		input="/learning/AnswersContent.jsp"
       		parameter="method"
       		unknown="false"
-      		validate="true">
+      		validate="false">
 	
 		<exception
 	        key="error.exception.McApplication"
@@ -340,7 +342,10 @@
     <!--Monitoring Starter Action: initializes the Monitoring module -->
    <action 	path="/monitoringStarter" 
    			type="org.lamsfoundation.lams.tool.mc.web.McMonitoringStarterAction" 
+	      	scope="session"
    			name="McMonitoringForm" 
+      		unknown="false"
+      		validate="true"
    			input="/monitoringIndex.jsp"> 
 
 		<exception
@@ -360,27 +365,27 @@
 	      />	         			   			
    			
 	  	<forward
-		    name="loadMonitoringContent"
+		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
-
+	  	
        <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
-	        redirect="true"
+	        redirect="false"
 	    />
 	    
 	    <forward
 	        name="starter"
 	        path="/index.jsp"
-	        redirect="true"
+	        redirect="false"
 	     />
 
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	</action>  
     
@@ -412,33 +417,40 @@
 	      />	         			      		
 
 	  	<forward
-		    name="loadMonitoringContent"
+		    name="loadMonitoring"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
 	  	<forward
+		    name="MonitoringContent"
+		    path="/monitoring/MonitoringMaincontent.jsp"
+		    redirect="false"
+	  	/>
+	  	
+	  	
+	  	<forward
 		    name="loadMonitoringEditActivity"
 		    path="/monitoring/MonitoringMaincontent.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	  	
        <forward
 	        name="load"
 	        path="/authoring/AuthoringMaincontent.jsp"
-	        redirect="true"
+	        redirect="false"
 	    />
 	    
 	    <forward
 	        name="starter"
 	        path="/index.jsp"
-	        redirect="true"
+	        redirect="false"
 	     />
 
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
 	</action>  
 
@@ -450,7 +462,7 @@
 		      scope="session"
 		      parameter="mode"
 		      unknown="false"
-		      validate="false"
+		      validate="true"
 	    >
 		<exception
 	        key="error.exception.McApplication"
@@ -467,7 +479,7 @@
 	  	<forward
 		    name="errorList"
 		    path="/McErrorBox.jsp"
-		    redirect="true"
+		    redirect="false"
 	  	/>
     </action>
  </action-mappings>
Index: lams_tool_lamc/web/authoring/OptionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/authoring/Attic/OptionsContent.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_lamc/web/authoring/OptionsContent.jsp	16 Mar 2006 16:45:59 -0000	1.9
+++ lams_tool_lamc/web/authoring/OptionsContent.jsp	19 Mar 2006 11:00:55 -0000	1.10
@@ -171,7 +171,7 @@
 					<tr> 
 						<td NOWRAP class="formlabel" valign=top>
 							<font size=2>
-	    	      				<b> <bean:message key="label.feedback.incorrect" />: <b>
+	    	      				<b> <bean:message key="label.feedback.incorrect" /> <b>
 	    	      			</font>
 	          			</td>
 						<td NOWRAP colspan=3 class="formcontrol" valign=top>
@@ -184,7 +184,7 @@
 					<tr> 
 						<td NOWRAP class="formlabel" valign=top>
 							<font size=2>
-	    	      				<b> <bean:message key="label.feedback.correct" />: <b>
+	    	      				<b> <bean:message key="label.feedback.correct" /> <b>
 	    	      			</font>
 	          			</td>
 						<td NOWRAP colspan=3 class="formcontrol" valign=top>
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	17 Mar 2006 10:34:47 -0000	1.8
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	19 Mar 2006 11:00:56 -0000	1.9
@@ -207,17 +207,6 @@
 					</c:if> 																		
 					
 				  	<html:hidden property="doneLearnerProgress"/>						   
-					<c:if test="${sessionScope.learnerProgress == 'true'}"> 							  
-		  	   		  <tr>
-		  	   		    <td colspan=2 align=right class="input" valign=top>
-			  	   		    <font size=2>
-								 <html:submit onclick="javascript:submitLearnerProgressMethod('doneLearnerProgress');" styleClass="button">
-										<bean:message key="button.done"/>
-								</html:submit>
-							</font>
-					  	 </td>
-					  </tr>
-					</c:if> 		
 				</table>
 	</html:form>
 
Index: lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.20 -r1.21
--- lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	13 Mar 2006 23:17:27 -0000	1.20
+++ lams_tool_lamc/web/monitoring/MonitoringMaincontent.jsp	19 Mar 2006 11:00:55 -0000	1.21
@@ -186,6 +186,7 @@
 
 		<!-- end tab buttons -->
 		
+		
 		<html:hidden property="method"/>	 
 		<c:choose>
 		         <c:when test='${currentMonitoringTab == "instructions"}'>
@@ -224,17 +225,6 @@
 		        <c:otherwise> 
 						<div class="tabbody content_b" >
 							<jsp:include page="/monitoring/SummaryContent.jsp" />
-								<table align=right> 	  
-									<tr>   
-										<td NOWRAP>
-											<font size=2>
-												<html:submit onclick="javascript:submitMethod('doneMonitoring');" styleClass="button">
-													<bean:message key="button.done"/>
-												</html:submit>	 				 		  					
-											</font>
-										</td>
-									</tr> 
-								</table>
 						</div>		         							
 		        </c:otherwise>
 		</c:choose>