Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralLearnerFlowDTO.java,v
diff -u -r1.12 -r1.13
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	20 Sep 2006 22:09:49 -0000	1.12
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java	10 Oct 2006 16:16:51 -0000	1.13
@@ -63,6 +63,8 @@
     
     protected String currentAnswer;
     
+    protected String remainingQuestionCount;
+    
     protected String teacherViewOnly;
     
     protected String notebookEntriesVisible;
@@ -99,7 +101,9 @@
     
     protected String currentMonitoredToolSession;
     
+    protected String initialScreen;
     
+    
     /**
      * @return Returns the currentMonitoredToolSession.
      */
@@ -229,6 +233,7 @@
 	public String toString() {
         return new ToStringBuilder(this)
             .append("activityOffline: ", activityOffline)
+            .append("remainingQuestionCount: ", remainingQuestionCount)
             .append("totalQuestionCount : ", totalQuestionCount)
             .append("activityInstructions: ", activityInstructions)
             .append("teacherViewOnly: ", teacherViewOnly)
@@ -524,4 +529,28 @@
     public void setTeacherViewOnly(String teacherViewOnly) {
         this.teacherViewOnly = teacherViewOnly;
     }
+    /**
+     * @return Returns the remainingQuestionCount.
+     */
+    public String getRemainingQuestionCount() {
+        return remainingQuestionCount;
+    }
+    /**
+     * @param remainingQuestionCount The remainingQuestionCount to set.
+     */
+    public void setRemainingQuestionCount(String remainingQuestionCount) {
+        this.remainingQuestionCount = remainingQuestionCount;
+    }
+    /**
+     * @return Returns the initialScreen.
+     */
+    public String getInitialScreen() {
+        return initialScreen;
+    }
+    /**
+     * @param initialScreen The initialScreen to set.
+     */
+    public void setInitialScreen(String initialScreen) {
+        this.initialScreen = initialScreen;
+    }
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java,v
diff -u -r1.34 -r1.35
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	20 Sep 2006 15:15:41 -0000	1.34
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	10 Oct 2006 16:16:51 -0000	1.35
@@ -282,6 +282,15 @@
 		return qaQueUsr;
 	}
 
+    protected String getRemainingQuestionCount(int currentQuestionIndex, String totalQuestionCount)
+    {
+    	logger.debug("totalQuestionCount: " + totalQuestionCount);
+    	int remainingQuestionCount=new Long(totalQuestionCount).intValue() - currentQuestionIndex +1;
+    	logger.debug("remainingQuestionCount: " + remainingQuestionCount);
+
+    	return new Integer(remainingQuestionCount).toString();
+    }
+
     
     /**
 	 * feedBackAnswersProgress(HttpServletRequest request, int currentQuestionIndex)
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java,v
diff -u -r1.25 -r1.26
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	23 Sep 2006 15:11:01 -0000	1.25
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	10 Oct 2006 16:16:51 -0000	1.26
@@ -330,6 +330,7 @@
 	    logger.debug("using TOOL_CONTENT_ID: " + qaContent.getQaContentId());
 	    generalLearnerFlowDTO.setToolContentID(qaContent.getQaContentId().toString());
 	    
+	    
 	    	    
 	    /*
 	     * The content we retrieved above must have been created before in Authoring time. 
@@ -410,7 +411,9 @@
     	
     	generalLearnerFlowDTO.setTotalQuestionCount(new Integer(mapQuestions.size()));
     	qaLearningForm.setTotalQuestionCount(new Integer(mapQuestions.size()).toString());
+        generalLearnerFlowDTO.setRemainingQuestionCount(new Integer(mapQuestions.size()).toString());
     	
+    	
 	    request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
 		logger.debug("GENERAL_LEARNER_FLOW_DTO: " +  request.getAttribute(GENERAL_LEARNER_FLOW_DTO));
         logger.debug("forwarding to: " + LOAD_LEARNER);
@@ -645,6 +648,11 @@
         logger.debug("userFeedback: " + userFeedback);
         generalLearnerFlowDTO.setUserFeedback(userFeedback);
         
+        String remQCount=learningUtil.getRemainingQuestionCount(intCurrentQuestionIndex,totalQuestionCount);
+        logger.debug("remQCount: " + remQCount);
+        generalLearnerFlowDTO.setRemainingQuestionCount(remQCount);
+        
+        
         qaLearningForm.resetUserActions(); /*resets all except submitAnswersContent */
         
 	    sessionMap.put(MAP_SEQUENTIAL_ANSWERS_KEY, mapSequentialAnswers);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v
diff -u -r1.62 -r1.63
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	23 Sep 2006 15:11:01 -0000	1.62
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	10 Oct 2006 16:16:51 -0000	1.63
@@ -392,9 +392,13 @@
     	
     	String userFeedback= feedBackType + generalLearnerFlowDTO.getTotalQuestionCount() + QUESTIONS;
     	
-    	request.getSession().setAttribute(USER_FEEDBACK, userFeedback);
+    	//request.getSession().setAttribute(USER_FEEDBACK, userFeedback);
     	generalLearnerFlowDTO.setUserFeedback(userFeedback);
     	
+    	logger.debug("remaining question count: " + generalLearnerFlowDTO.getTotalQuestionCount().toString());
+    	generalLearnerFlowDTO.setRemainingQuestionCount(generalLearnerFlowDTO.getTotalQuestionCount().toString());
+    	generalLearnerFlowDTO.setInitialScreen(new Boolean(true).toString());
+    	
     	request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO);
     	/* Is the request for a preview by the author?
     	Preview The tool must be able to show the specified content as if it was running in a lesson. 
Index: lams_tool_laqa/web/learning/AnswersContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/AnswersContent.jsp,v
diff -u -r1.19 -r1.20
--- lams_tool_laqa/web/learning/AnswersContent.jsp	28 Sep 2006 23:30:58 -0000	1.19
+++ lams_tool_laqa/web/learning/AnswersContent.jsp	10 Oct 2006 16:17:27 -0000	1.20
@@ -90,17 +90,32 @@
 					<c:out value="${generalLearnerFlowDTO.activityInstructions}" escapeXml="false"/> 
 				</td></tr>
 	
-				<tr> <td NOWRAP>
-					 <c:out value="${generalLearnerFlowDTO.userFeedback}" escapeXml="true"/> 
-				</td></tr>
 			
 				<c:choose> 
 				  <c:when test="${generalLearnerFlowDTO.questionListingMode == 'questionListingModeSequential'}" > 
+		
+				  		<c:if test="${generalLearnerFlowDTO.initialScreen == 'true'}"> 							  		
+						  	<tr> <td NOWRAP>
+			 					<bean:message key="label.feedback.seq"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> &nbsp
+			 					<bean:message key="label.questions.simple"/>
+							</td></tr>
+						</c:if> 									
+				  		<c:if test="${generalLearnerFlowDTO.initialScreen != 'true'}"> 							  		
+						  	<tr> <td NOWRAP>				  		
+			 					<bean:message key="label.questions.remaining"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> 
+							</td></tr>			 					
+						</c:if> 													  		
+				  
 						<jsp:include page="/learning/SequentialAnswersContent.jsp" /> 
-					  </c:when> 
+				  </c:when> 
 
-					  <c:otherwise>
-						  	<jsp:include page="/learning/CombinedAnswersContent.jsp" /> 
+				  <c:otherwise>
+					  	<tr> <td NOWRAP>
+		 					<bean:message key="label.feedback.combined"/> &nbsp <c:out value="${generalLearnerFlowDTO.remainingQuestionCount}"/> &nbsp
+		 					<bean:message key="label.questions.simple"/>
+						</td></tr>
+				  
+					  	<jsp:include page="/learning/CombinedAnswersContent.jsp" /> 
 				  </c:otherwise>
 				</c:choose> 
 			</c:if>