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.21 -r1.22
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 20 Jun 2016 16:12:55 -0000 1.21
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml 18 Jul 2016 16:15:11 -0000 1.22
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java,v
diff -u -r1.77 -r1.78
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 18 Jul 2016 15:02:58 -0000 1.77
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java 18 Jul 2016 16:15:11 -0000 1.78
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java,v
diff -u -r1.37 -r1.38
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java 20 Jun 2016 16:12:55 -0000 1.37
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java 18 Jul 2016 16:15:11 -0000 1.38
@@ -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.56 -r1.57
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java 6 Jul 2016 12:54:16 -0000 1.56
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java 18 Jul 2016 16:15:11 -0000 1.57
@@ -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