Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
===================================================================
diff -u -r484640af4db34eeea896eb26485c1b0d5eaea9d2 -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 484640af4db34eeea896eb26485c1b0d5eaea9d2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -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
===================================================================
diff -u -rcf64c7ef2a5b0d6dd1edc1b20f742e1b4523559c -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision cf64c7ef2a5b0d6dd1edc1b20f742e1b4523559c)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -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.
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -r484640af4db34eeea896eb26485c1b0d5eaea9d2 -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 484640af4db34eeea896eb26485c1b0d5eaea9d2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -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
===================================================================
diff -u -r484640af4db34eeea896eb26485c1b0d5eaea9d2 -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 484640af4db34eeea896eb26485c1b0d5eaea9d2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -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
===================================================================
diff -u -r484640af4db34eeea896eb26485c1b0d5eaea9d2 -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 484640af4db34eeea896eb26485c1b0d5eaea9d2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -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
===================================================================
diff -u -r484640af4db34eeea896eb26485c1b0d5eaea9d2 -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 484640af4db34eeea896eb26485c1b0d5eaea9d2)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -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
===================================================================
diff -u -ra4b9dfe6935887930d266eedb191089ea52914cc -rde690d7969a8415be5f56e4e026c336b2855396c
--- lams_tool_laqa/web/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision a4b9dfe6935887930d266eedb191089ea52914cc)
+++ lams_tool_laqa/web/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision de690d7969a8415be5f56e4e026c336b2855396c)
@@ -19,23 +19,34 @@
+
|
- :
+
|
|
-
+
+
+ |
+
+ |
+
+
+
+
+ |
+
|
- :
+
|
|
- :
+
|
|
-
+
|
+
+ |
+
+ |
+
+
+
+
+ |
+
+