Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java,v
diff -u -r1.18 -r1.19
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	22 Jul 2005 02:26:08 -0000	1.18
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java	22 Jul 2005 06:25:25 -0000	1.19
@@ -113,6 +113,8 @@
     public static final String SUBMIT_ONLINE_FILE						="submitOnlineFile";
     public static final String LIST_UPLOADED_OFFLINE_FILES				="listUploadedOfflineFiles";
     public static final String LIST_UPLOADED_ONLINE_FILES				="listUploadedOnlineFiles";
+    public static final String LIST_UPLOADED_OFFLINE_FILENAMES			="listUploadedOfflineFileNames";
+    public static final String LIST_UPLOADED_ONLINE_FILENAMES			="listUploadedOnlineFileNames";
     
     
     /**
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaResources.properties,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	20 Jul 2005 07:21:46 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties	22 Jul 2005 06:25:25 -0000	1.11
@@ -30,9 +30,11 @@
 radiobox.questionsSequenced				=Questions Sequenced 
 label.offlineInstructions				=Offline Instructions
 label.onlineInstructions				=Online Instructions
-label.offlineFiles						=Offline Files
-label.onlineFiles						=Online Files
+label.offlineFiles						=Offline Files:
+label.onlineFiles						=Online Files:
 label.upload							=Upload
+label.uploadedOfflineFiles				=Uploaded Offline Files:
+label.uploadedOnlineFiles				=Uploaded Online Files:
 option.on								=ON
 option.off								=OFF
 feedback								=Please address the following issues before submit. <br>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v
diff -u -r1.14 -r1.15
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	22 Jul 2005 02:26:08 -0000	1.14
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	22 Jul 2005 06:25:25 -0000	1.15
@@ -13,7 +13,6 @@
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.LinkedList;
-import java.util.Map;
 import java.util.Random;
 import java.util.TimeZone;
 
@@ -416,7 +415,12 @@
     	LinkedList listUploadedOnlineFiles = (LinkedList) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILES);
     	logger.debug("listUploadedOnlineFiles: " + listUploadedOnlineFiles);
     	
+    	LinkedList listUploadedOfflineFileNames = (LinkedList) request.getSession().getAttribute(LIST_UPLOADED_OFFLINE_FILENAMES);
+    	logger.debug("listUploadedOfflineFileNames: " + listUploadedOfflineFileNames);
+    	LinkedList listUploadedOnlineFileNames = (LinkedList) request.getSession().getAttribute(LIST_UPLOADED_ONLINE_FILENAMES);
+    	logger.debug("listUploadedOnlineFileNames: " + listUploadedOnlineFileNames);
     	
+    	
     	if (isOfflineFile)
     	{
     		/** read uploaded file informtion  - offline file*/
@@ -441,6 +445,9 @@
     	    	listUploadedOfflineFiles.add(offlineFileUuid + "~" + offlineFileName);
     	    	logger.debug("listUploadedOfflineFiles updated: " + listUploadedOfflineFiles);
     	    	request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES,listUploadedOfflineFiles);
+    	    	
+    	    	listUploadedOfflineFileNames.add(offlineFileName);
+    	    	request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES,listUploadedOfflineFileNames);
     	    }
     		catch(FileNotFoundException e)
     		{
@@ -482,6 +489,9 @@
     	    	listUploadedOnlineFiles.add(onlineFileUuid + "~" + onlineFileName);
     	    	logger.debug("listUploadedOnlineFiles updated: " + listUploadedOnlineFiles);
     	    	request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILES,listUploadedOnlineFiles);
+    	    	
+    	    	listUploadedOnlineFileNames.add(onlineFileName);
+    	    	request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES,listUploadedOnlineFileNames);
     	    }
     		catch(FileNotFoundException e)
     		{
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java,v
diff -u -r1.11 -r1.12
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	22 Jul 2005 02:26:08 -0000	1.11
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java	22 Jul 2005 06:25:25 -0000	1.12
@@ -6,9 +6,6 @@
  */
 package org.lamsfoundation.lams.tool.qa.web;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -22,11 +19,8 @@
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionMapping;
-import org.apache.struts.upload.FormFile;
-import org.lamsfoundation.lams.contentrepository.NodeKey;
 import org.lamsfoundation.lams.tool.exception.ToolException;
 import org.lamsfoundation.lams.tool.qa.QaAppConstants;
-import org.lamsfoundation.lams.tool.qa.QaApplicationException;
 import org.lamsfoundation.lams.tool.qa.QaComparator;
 import org.lamsfoundation.lams.tool.qa.QaContent;
 import org.lamsfoundation.lams.tool.qa.QaQueContent;
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/Attic/QAction.java,v
diff -u -r1.10 -r1.11
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	22 Jul 2005 02:26:08 -0000	1.10
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	22 Jul 2005 06:25:25 -0000	1.11
@@ -313,13 +313,19 @@
             QaUtils.addFileToContentRepository(request, qaAuthoringForm, true);
             logger.debug("offline file added to repository successfully.");
             qaAuthoringForm.resetUserAction();
+            request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS);
+            logger.debug("forward back to instructions screen");
+           	return (mapping.findForward(LOAD_QUESTIONS));
         }
         else if (userAction.equalsIgnoreCase(SUBMIT_ONLINE_FILE))
         {
         	logger.debug("will submit online file: " + userAction);
         	QaUtils.addFileToContentRepository(request, qaAuthoringForm, false);
         	logger.debug("online file added to repository successfully.");
         	qaAuthoringForm.resetUserAction();
+        	request.getSession().setAttribute(CHOICE,CHOICE_TYPE_INSTRUCTIONS);
+        	logger.debug("forward back to instructions screen");
+           	return (mapping.findForward(LOAD_QUESTIONS));
         }
         else if (userAction.equalsIgnoreCase(SUBMIT_TAB_DONE))
         {
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java,v
diff -u -r1.17 -r1.18
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	22 Jul 2005 02:26:08 -0000	1.17
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java	22 Jul 2005 06:25:25 -0000	1.18
@@ -106,9 +106,14 @@
   								throws IOException, ServletException, QaApplicationException {
 	
 		Map mapQuestionContent= new TreeMap(new QaComparator());
+		/** these two are for repository access */
 		LinkedList listUploadedOfflineFiles= new LinkedList();
 		LinkedList listUploadedOnlineFiles= new LinkedList();
 		
+		/** these two are for jsp */
+		LinkedList listUploadedOfflineFileNames= new LinkedList();
+		LinkedList listUploadedOnlineFileNames= new LinkedList();
+		
 		QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form;
 		qaAuthoringForm.resetRadioBoxes();
 		
@@ -117,6 +122,8 @@
 		request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILES,listUploadedOfflineFiles);
 		request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILES,listUploadedOnlineFiles);
 		
+		request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES,listUploadedOfflineFileNames);
+		request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES,listUploadedOnlineFileNames);
 		
 		/**
 		 * retrive the service
@@ -343,6 +350,10 @@
 	    	 */
 			mapQuestionContent.put(INITIAL_QUESTION_COUNT,request.getSession().getAttribute(DEFAULT_QUESTION_CONTENT));
 			logger.debug("Map initialized with default contentid to: " + mapQuestionContent);
+
+			/** retrieve uploaded offline file names */
+			
+			
 		}
 		else
 		{
Index: lams_tool_laqa/web/InstructionsContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/Attic/InstructionsContent.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/InstructionsContent.jsp	22 Jul 2005 00:42:07 -0000	1.8
+++ lams_tool_laqa/web/InstructionsContent.jsp	22 Jul 2005 06:25:25 -0000	1.9
@@ -19,23 +19,34 @@
 						  <c:out value="${sessionScope.richTextOfflineInstructions}" escapeXml="false" />						  
 					</FCK:editor>
 					</td> 
+					
 				</tr>
 
 				<tr> 
 					<td>
-          				<fmt:message key="label.offlineFiles" />:
+          				<fmt:message key="label.offlineFiles" />
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOfflineFile"></html:file>
 					 	<html:submit property="submitOfflineFile" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="label.upload"/>
 						</html:submit>
 					</td> 
-				</tr>
 
+				</tr>
+				<tr> 
+					<td>
+          				<fmt:message key="label.uploadedOfflineFiles" />
+          			</td>
+					<td>
+						<c:forEach var='item' items='${sessionScope.listUploadedOfflineFileNames}'>
+				            <li><c:out value='${item}'/></li>
+	         			</c:forEach>
+					</td> 
+				</tr>
           		<tr> 
           			<td>
-          				<fmt:message key="label.onlineInstructions" />:
+          				<fmt:message key="label.onlineInstructions" />
           			</td>
 					<td NOWRAP width=700> <!-- Dave,I found width was necessary to present all the elements of the editor, feel free to change -->
 					<FCK:editor id="richTextOnlineInstructions" basePath="/lams/fckEditor/"
@@ -48,17 +59,28 @@
 				
 				<tr> 
 					<td>
-          				<fmt:message key="label.onlineFiles" />:
+          				<fmt:message key="label.onlineFiles" />
           			</td>
           			<td NOWRAP> 
 						<html:file  property="theOnlineFile"></html:file>
 					 	<html:submit property="submitOnlineFile" styleClass="linkbutton" onmouseover="pviiClassNew(this,'linkbutton')" onmouseout="pviiClassNew(this,'linkbutton')">
 								<bean:message key="label.upload"/>
 						</html:submit>
 					</td> 
-
+				
 				</tr>
+				<tr>
+					<td>
+          				<fmt:message key="label.uploadedOnlineFiles" />
+          			</td>
+					<td>
+						<c:forEach var='item' items='${sessionScope.listUploadedOnlineFileNames}'>
+				            <li><c:out value='${item}'/></li>
+	         			</c:forEach>
+					</td> 
+				</tr>
 				
+				
           		</table>	  	
 			  	<hr>
 				<table>