Index: lams_tool_lamc/db/sql/activity_insert.sql
===================================================================
diff -u -r80a1f85da1de7f647aeee20ecbeffd25e4173573 -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec
--- lams_tool_lamc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 80a1f85da1de7f647aeee20ecbeffd25e4173573)
+++ lams_tool_lamc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
@@ -73,7 +73,7 @@
, NULL
, NULL
, NULL
-, '/tool/laqa11/images/icon_questionanswer.swf'
+, '/tool/lamc11/images/icon_questionanswer.swf'
, NULL
, NULL
, NULL
Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
===================================================================
diff -u -rbb83942110559f64ba9533b04ff6aba89d145c26 -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec
--- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision bb83942110559f64ba9533b04ff6aba89d145c26)
+++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
@@ -109,3 +109,5 @@
REFERENCES lams.tl_lamc11_content (uid)
)TYPE=InnoDB;
+
+
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
diff -u -r9310fe30da9974d1f174319efc054e3bde9eed84 -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 9310fe30da9974d1f174319efc054e3bde9eed84)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
@@ -1324,6 +1324,42 @@
* Call controller service to complete the qa session
* @see org.lamsfoundation.lams.tool.ToolSessionManager#leaveToolSession(java.lang.Long)
*/
+ public String leaveToolSession(Long toolSessionId,User user) throws DataMissingException, ToolException
+ {
+ logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId);
+ //logger.debug("start of leaveToolSession with learner:" + learnerId);
+
+ if (toolSessionId == null)
+ {
+ logger.debug("toolSessionId is null");
+ throw new DataMissingException("toolSessionId is missing");
+ }
+
+ /*
+ if (learnerId == null)
+ {
+ logger.debug("learnerId is null");
+ throw new DataMissingException("learnerId is missing");
+ }
+ */
+
+ try
+ {
+ /*
+ String nextUrl=learnerService.completeToolSession(toolSessionId,learner);
+ logger.debug(logger + " " + this.getClass().getName() + " " + "nextUrl: " + nextUrl);
+ return nextUrl;
+ */
+ return "nextUrl";
+ }
+ catch(DataAccessException e)
+ {
+ throw new ToolException("Exception occured when user is leaving tool session: " + e);
+ }
+
+ }
+
+
public String leaveToolSession(Long toolSessionId,Long learnerId) throws DataMissingException, ToolException
{
logger.debug("start of leaveToolSession with toolSessionId:" + toolSessionId);
@@ -1335,11 +1371,13 @@
throw new DataMissingException("toolSessionId is missing");
}
+
if (learnerId == null)
{
logger.debug("learnerId is null");
throw new DataMissingException("learnerId is missing");
}
+
try
{
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java
===================================================================
diff -u -r3c0610afe854d95fd8153fc895c00b71d01a7e86 -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java (.../McLearningStarterAction.java) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
@@ -182,13 +182,7 @@
*/
setupAttributes(request, mcContent);
- Map mapLeanerFeedbackIncorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId());
- request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_INCORRECT, mapLeanerFeedbackIncorrect);
- Map mapLeanerFeedbackCorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId());
- request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect);
-
-
/*
* fetch question content from content
*/
@@ -342,15 +336,13 @@
Map mapLeanerAssessmentResults= new TreeMap(new McComparator());
request.getSession().setAttribute(MAP_LEARNER_ASSESSMENT_RESULTS, mapLeanerAssessmentResults);
- Map mapLeanerFeedbackIncorrect= new TreeMap(new McComparator());
+ Map mapLeanerFeedbackIncorrect=AuthoringUtil.buildInCorrectFeedbackMap(request, mcContent.getMcContentId());
request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_INCORRECT, mapLeanerFeedbackIncorrect);
+ logger.debug("MAP_LEARNER_FEEDBACK_INCORRECT: " + mapLeanerFeedbackIncorrect);
-
-
-
-
- Map mapLeanerFeedbackCorrect= new TreeMap(new McComparator());
+ Map mapLeanerFeedbackCorrect=AuthoringUtil.buildCorrectFeedbackMap(request, mcContent.getMcContentId());
request.getSession().setAttribute(MAP_LEARNER_FEEDBACK_CORRECT, mapLeanerFeedbackCorrect);
+ logger.debug("MAP_LEARNER_FEEDBACK_CORRECT: " + mapLeanerFeedbackCorrect);
/* .. till here */
}
Index: lams_tool_lamc/web/IndividualLearnerResults.jsp
===================================================================
diff -u -r3c0610afe854d95fd8153fc895c00b71d01a7e86 -r3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec
--- lams_tool_lamc/web/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 3c0610afe854d95fd8153fc895c00b71d01a7e86)
+++ lams_tool_lamc/web/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 3df81dc2e2e2f813fca6da1baf53c3e5ab43cfec)
@@ -66,7 +66,7 @@
-
+
|
@@ -78,31 +78,57 @@
-
-
-
-
-
-
-
-
- |
-
- |
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
- |
- |
+
-
-
- |
+ |
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|