Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml,v
diff -u -r1.16.2.8 -r1.16.2.9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 20 Jun 2016 16:20:30 -0000 1.16.2.8
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 20 Jul 2016 14:58:04 -0000 1.16.2.9
@@ -133,6 +133,7 @@
PROPAGATION_REQUIRED,-java.lang.Exception
PROPAGATION_REQUIRED,-java.lang.Exception
PROPAGATION_REQUIRED,-java.lang.Exception
+ PROPAGATION_REQUIRED,-java.lang.Exception
PROPAGATION_REQUIRED,-java.lang.Exception
PROPAGATION_REQUIRED,-java.lang.Exception
PROPAGATION_REQUIRED,-java.lang.Exception
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.48.2.30 -r1.48.2.31
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 20 Jun 2016 16:20:30 -0000 1.48.2.30
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 20 Jul 2016 14:58:03 -0000 1.48.2.31
@@ -865,6 +865,13 @@
}
return nextUrl;
}
+
+ @Override
+ public void unsetSessionFinished(Long toolSessionId, Long userId) {
+ AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId, toolSessionId);
+ user.setSessionFinished(false);
+ assessmentUserDao.saveObject(user);
+ }
@Override
public List getSessionDtos(Long contentId) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java,v
diff -u -r1.26.2.11 -r1.26.2.12
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java 20 Jun 2016 16:20:30 -0000 1.26.2.11
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java 20 Jul 2016 14:58:03 -0000 1.26.2.12
@@ -321,6 +321,14 @@
* @return
*/
String finishToolSession(Long toolSessionId, Long userId) throws AssessmentApplicationException;
+
+ /**
+ * Set userFinished to false
+ *
+ * @param toolSessionId
+ * @param userId
+ */
+ void unsetSessionFinished(Long toolSessionId, Long userId);
/**
* Returns sessionDtos containing only session ids and session names.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.42.2.14 -r1.42.2.15
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java 6 Jul 2016 12:56:24 -0000 1.42.2.14
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java 20 Jul 2016 14:58:04 -0000 1.42.2.15
@@ -553,6 +553,7 @@
Assessment assessment = (Assessment) sessionMap.get(AssessmentConstants.ATTR_ASSESSMENT);
Long toolSessionId = (Long) sessionMap.get(AssessmentConstants.ATTR_TOOL_SESSION_ID);
AssessmentUser assessmentUser = (AssessmentUser) sessionMap.get(AssessmentConstants.ATTR_USER);
+ service.unsetSessionFinished(toolSessionId, assessmentUser.getUserId());
//set attempt started: create a new one + mark previous as not being the latest any longer
List> pagedQuestions = (List>) sessionMap