Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java,v
diff -u -r1.46 -r1.47
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	17 Dec 2006 12:37:34 -0000	1.46
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/LearningUtil.java	6 Feb 2007 05:24:52 -0000	1.47
@@ -91,12 +91,12 @@
 		 	logger.debug("learnerProgress: " + learnerProgress);
 		 	mcLearningForm.setLearnerProgress(learnerProgress);
 		 	logger.debug("form is populated with learnerProgress");
+		 	String learnerProgressUserId=request.getParameter("learnerProgressUserId");
+		 	logger.debug("learnerProgressUserId: " + learnerProgressUserId);
+		 	mcLearningForm.setLearnerProgressUserId(learnerProgressUserId);
+
 	 	}
 	 	
-	 	String learnerProgressUserId=request.getParameter("learnerProgressUserId");
-	 	logger.debug("learnerProgressUserId: " + learnerProgressUserId);
-	 	mcLearningForm.setLearnerProgressUserId(learnerProgressUserId);
-
 	 	String questionListingMode=request.getParameter("questionListingMode");
 	 	logger.debug("questionListingMode: " + questionListingMode);
 	 	mcLearningForm.setQuestionListingMode(questionListingMode);
Index: lams_tool_lamc/web/learning/ViewAnswers.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/learning/ViewAnswers.jsp,v
diff -u -r1.50 -r1.51
--- lams_tool_lamc/web/learning/ViewAnswers.jsp	4 Dec 2006 16:45:58 -0000	1.50
+++ lams_tool_lamc/web/learning/ViewAnswers.jsp	6 Feb 2007 05:24:53 -0000	1.51
@@ -181,17 +181,40 @@
 					</table>
 				</c:if>				
 
-
-			<c:if test="${mcGeneralLearnerFlowDTO.reportViewOnly != 'true'}">
-				<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
-
+			<c:if test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
+				<c:if test="${mcGeneralLearnerFlowDTO.reportViewOnly != 'true'}">
 					<c:if test="${mcGeneralLearnerFlowDTO.retries == 'true'}">
-
 						<html:submit property="redoQuestions" styleClass="button">
 							<fmt:message key="label.redo.questions" />
 						</html:submit>
-						
-						<div class="right-buttons">
+					</c:if>
+				</c:if>
+			</c:if>
+									
+			<c:if test="${mcGeneralLearnerFlowDTO.reflection}">
+				<h2>
+							<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />											
+				</h2>
+
+				<p>
+					<c:choose>
+						<c:when test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
+							<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>
+						</c:when>
+						<c:otherwise>
+							<em><fmt:message key="message.no.reflection.available" /></em>  
+						</c:otherwise>
+					</c:choose>
+				</p>
+				
+			</c:if>
+
+			<c:choose>
+			<c:when test="${mcGeneralLearnerFlowDTO.learnerProgress != 'true'}">
+			
+				<c:choose>
+					<c:when test="${mcGeneralLearnerFlowDTO.retries == 'true' && mcGeneralLearnerFlowDTO.reportViewOnly!='true'}">
+						<div class="space-bottom-top align-right">
 							<c:if
 								test="${((McLearningForm.passMarkApplicable == 'true') && (McLearningForm.userOverPassMark == 'true'))}">
 								<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
@@ -209,13 +232,10 @@
 								</c:if>
 							</c:if>
 						</div>
-
-					</c:if>
-
-
-					<c:if test="${mcGeneralLearnerFlowDTO.retries != 'true'}">
-
-						<div class="right-buttons">
+					</c:when>
+					
+					<c:otherwise>
+						<div class="space-bottom-top align-right">
 							<c:if test="${mcGeneralLearnerFlowDTO.reflection != 'true'}">
 								<html:hidden property="learnerFinished" value="Finished" />
 																  			  		
@@ -229,37 +249,27 @@
 									<fmt:message key="label.continue" />
 								</html:submit>
 							</c:if>
-
 						</div>
+					</c:otherwise>	
+				</c:choose>
+			</c:when>
 
-					</c:if>
+			<c:otherwise>
+				<%-- Is monitoring screen. Can only do finish --%>
+				<div class="space-bottom-top align-right">
+						<html:hidden property="learnerFinished" value="Finished" />
+														  			  		
+						<html:submit styleClass="button" styleId="finishButton">
+							<fmt:message key="label.finished"/>
+						</html:submit>
+				</div>
+			</c:otherwise>
+			</c:choose>
 
-
-				</c:if>
-			</c:if>
-			<c:if test="${mcGeneralLearnerFlowDTO.reflection}">
-				<h2>
-							<c:out value="${mcGeneralLearnerFlowDTO.reflectionSubject}" escapeXml="false" />											
-				</h2>
-
-				<p>
-					<c:choose>
-						<c:when test="${not empty mcGeneralLearnerFlowDTO.notebookEntry}">
-							<c:out value="${mcGeneralLearnerFlowDTO.notebookEntry}" escapeXml="false"/>
-						</c:when>
-						<c:otherwise>
-							<em><fmt:message key="message.no.reflection.available" /></em>  
-						</c:otherwise>
-					</c:choose>
-				</p>
-				
-				<html:submit property="forwardtoReflection" styleClass="button">
-					<fmt:message key="label.edit" />
-				</html:submit>
-			</c:if>
-							
+			<p>							
 			<html:hidden property="doneLearnerProgress" />
-
+			</p>
+			
 		</html:form>
 
 	</div>
@@ -270,9 +280,9 @@
 
 
 
+	
 
 
 
 
 
-