Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
===================================================================
diff -u -r3c0610afe854d95fd8153fc895c00b71d01a7e86 -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -98,9 +98,9 @@
public static final String LOAD_LEARNER ="loadLearner";
public static final String INDIVIDUAL_REPORT ="individualReport";
public static final String VIEW_SUMMARY ="viewSummary";
+ public static final String REDO_QUESTIONS ="redoQuestions";
+
-
-
public static final String ALL_INSTRUCTIONS ="allInstructions";
public static final String EDIT_OPTS_CONTENT ="editOptsContent";
public static final String ADD_OPTS_CONTENT ="addOptsContent";
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
===================================================================
diff -u -r80a1f85da1de7f647aeee20ecbeffd25e4173573 -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision 80a1f85da1de7f647aeee20ecbeffd25e4173573)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -22,8 +22,9 @@
label.individual.results.withoutRetries =Results for Multiple Choice without Retries
label.mark =Mark:
label.you.answered =You answered:
-label.redo.question =Redo Question
+label.redo.questions =Redo Questions
label.view.summary =View Summary
+label.view.answers =View Answers
button.basic =Basic
@@ -84,6 +85,9 @@
option.incorrect =Incorrect
label.feedback.incorrect =Feedback if answered incorrectly:
label.feedback.correct =Feedback if answered correctly:
+label.learner.redo =Are you sure you want to answer the questions again?
+label.learner.bestMark =Your best mark so far is
+label.outof =out of
feedback =Please address the following issues before submit.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
===================================================================
diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -2122,16 +2122,26 @@
else if (mcLearningForm.getContinueOptions() != null)
{
logger.debug("requested continue options...");
+ mcLearningForm.resetCommands();
return continueOptions(request, mcLearningForm, mapping);
}
else if (mcLearningForm.getOptionCheckBoxSelected() != null)
{
logger.debug("requested selectOptionsCheckBox...");
+ mcLearningForm.resetCommands();
LearningUtil.selectOptionsCheckBox(request,mcLearningForm, mcLearningForm.getQuestionIndex());
}
else if (mcLearningForm.getRedoQuestions() != null)
{
logger.debug("requested redoQuestions...");
+ mcLearningForm.resetCommands();
+ return (mapping.findForward(REDO_QUESTIONS));
+ //return redoQuestions(request, mcLearningForm, mapping);
+ }
+ else if (mcLearningForm.getRedoQuestionsOk() != null)
+ {
+ logger.debug("requested redoQuestionsOk, user is sure to redo the questions.");
+ mcLearningForm.resetCommands();
return redoQuestions(request, mcLearningForm, mapping);
}
else if (mcLearningForm.getViewSummary() != null)
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java
===================================================================
diff -u -r690cf7460e6899ac1279fc823d9819a2060744b1 -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java (.../McLearningForm.java) (revision 690cf7460e6899ac1279fc823d9819a2060744b1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningForm.java (.../McLearningForm.java) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -20,13 +20,18 @@
protected String continueOptionsCombined;
protected String redoQuestions;
protected String viewSummary;
-
+ protected String viewAnswers;
+ protected String redoQuestionsOk;
+
public void resetCommands()
{
this.setContinueOptions(null);
this.setContinueOptionsCombined(null);
this.setRedoQuestions( null);
this.setViewSummary(null);
+ this.setViewAnswers(null);
+ this.setRedoQuestionsOk(null);
+
}
public void resetParameters()
@@ -148,4 +153,28 @@
public void setOptionValue(String optionValue) {
this.optionValue = optionValue;
}
+ /**
+ * @return Returns the viewAnswers.
+ */
+ public String getViewAnswers() {
+ return viewAnswers;
+ }
+ /**
+ * @param viewAnswers The viewAnswers to set.
+ */
+ public void setViewAnswers(String viewAnswers) {
+ this.viewAnswers = viewAnswers;
+ }
+ /**
+ * @return Returns the redoQuestionsOk.
+ */
+ public String getRedoQuestionsOk() {
+ return redoQuestionsOk;
+ }
+ /**
+ * @param redoQuestionsOk The redoQuestionsOk to set.
+ */
+ public void setRedoQuestionsOk(String redoQuestionsOk) {
+ this.redoQuestionsOk = redoQuestionsOk;
+ }
}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -131,6 +131,7 @@
* By now, the passed tool session id MUST exist in the db through the calling of:
* public void createToolSession(Long toolSessionId, Long toolContentId) by the container.
*
+ *
* make sure this session exists in tool's session table by now.
*/
Index: lams_tool_lamc/web/IndividualLearnerResults.jsp
===================================================================
diff -u -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/web/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
+++ lams_tool_lamc/web/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -63,11 +63,9 @@
- 
+
+
|
-
-
- |
@@ -98,18 +96,32 @@
-
-
+
+ |
-
+
+
+
+ 
+
+
+
+
+
+
+
+ 
+
+
+
-
+
|
- |
+ |
@@ -149,7 +161,7 @@
-
+
Fisheye: Tag cad6df7d203a1565dbbedf61b9088288ed13c19c refers to a dead (removed) revision in file `lams_tool_lamc/web/IndividualReport.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/web/RedoQuestions.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/RedoQuestions.jsp (revision 0)
+++ lams_tool_lamc/web/RedoQuestions.jsp (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -0,0 +1,73 @@
+<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %>
+<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %>
+<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %>
+
+
+
+
+ |
+
+ |
+
+
+
+
+ |
+
+ |
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+
+ |
+
+ |
+
+
+
+ |
+
+ |
+
+
+
+
+ |
+ 1
+ 2
+ |
+
+
+
+ |
+
+ |
+
+
+
+
+ |
+
+
+
+
+
+
+
+ |
+
+
+
+
+
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r80a1f85da1de7f647aeee20ecbeffd25e4173573 -rcad6df7d203a1565dbbedf61b9088288ed13c19c
--- lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 80a1f85da1de7f647aeee20ecbeffd25e4173573)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision cad6df7d203a1565dbbedf61b9088288ed13c19c)
@@ -142,6 +142,12 @@
/>
+
+
+
+
+
+
+
+
\ No newline at end of file
| |