Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -rec160e8c6dc2160cae9be746014c90a1239b5e0b -r1b565d87beccff1a25d22f88f940fcdb1332900b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml (.../assessmentApplicationContext.xml) (revision 1b565d87beccff1a25d22f88f940fcdb1332900b)
@@ -132,6 +132,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
===================================================================
diff -u -re34e1727461fdfa0d6b5328a681faf26f81b391f -r1b565d87beccff1a25d22f88f940fcdb1332900b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision e34e1727461fdfa0d6b5328a681faf26f81b391f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 1b565d87beccff1a25d22f88f940fcdb1332900b)
@@ -868,6 +868,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
===================================================================
diff -u -rec160e8c6dc2160cae9be746014c90a1239b5e0b -r1b565d87beccff1a25d22f88f940fcdb1332900b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision ec160e8c6dc2160cae9be746014c90a1239b5e0b)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision 1b565d87beccff1a25d22f88f940fcdb1332900b)
@@ -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
===================================================================
diff -u -rf072611d35d74c65dd3585d31174029bb4d07fcb -r1b565d87beccff1a25d22f88f940fcdb1332900b
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (.../LearningAction.java) (revision f072611d35d74c65dd3585d31174029bb4d07fcb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (.../LearningAction.java) (revision 1b565d87beccff1a25d22f88f940fcdb1332900b)
@@ -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