Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r27be1eb0b5945027c2c8f95b8a28b1803762c183 -r113c5a32c6fa73227ff541d4d197b1d6fe43a5b9 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 27be1eb0b5945027c2c8f95b8a28b1803762c183) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 113c5a32c6fa73227ff541d4d197b1d6fe43a5b9) @@ -367,7 +367,7 @@ public LocalDateTime launchTimeLimit(long toolContentId, int userId) { Assessment assessment = getAssessmentByContentId(toolContentId); int learnersStarted = assessmentUserDao.getCountLearnersByContentId(toolContentId, null); - if (learnersStarted == 1 && assessment.getRelativeTimeLimit() == 0 && assessment.getAbsoluteTimeLimit() > 0 + if (learnersStarted > 0 && assessment.getRelativeTimeLimit() == 0 && assessment.getAbsoluteTimeLimit() > 0 && assessment.getAbsoluteTimeLimitFinish() == null) { assessment.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(assessment.getAbsoluteTimeLimit())); assessment.setAbsoluteTimeLimit(0); Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java =================================================================== diff -u -r305246a229ea020cd0677daa6fc7953772f7ed54 -r113c5a32c6fa73227ff541d4d197b1d6fe43a5b9 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 305246a229ea020cd0677daa6fc7953772f7ed54) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 113c5a32c6fa73227ff541d4d197b1d6fe43a5b9) @@ -339,7 +339,7 @@ break; } } - if (learnersStarted == 1 && dokumaran.getRelativeTimeLimit() == 0 && dokumaran.getAbsoluteTimeLimit() > 0 + if (learnersStarted > 0 && dokumaran.getRelativeTimeLimit() == 0 && dokumaran.getAbsoluteTimeLimit() > 0 && dokumaran.getAbsoluteTimeLimitFinish() == null) { dokumaran.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(dokumaran.getAbsoluteTimeLimit())); dokumaran.setAbsoluteTimeLimit(0); @@ -420,7 +420,7 @@ } public List getDokumaranSessionsByToolContentId(long toolContentId) { - return dokumaranSessionDao.getByContentId(toolContentId); + return dokumaranSessionDao.getByContentId(toolContentId); } @Override Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r113c5a32c6fa73227ff541d4d197b1d6fe43a5b9 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision eccd6838790a4369b6788e48fb5ae5851622fe35) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 113c5a32c6fa73227ff541d4d197b1d6fe43a5b9) @@ -393,7 +393,7 @@ public LocalDateTime launchTimeLimit(long toolContentId, int userId) { Scratchie scratchie = getScratchieByContentId(toolContentId); int learnersStarted = scratchieUserDao.countUsersByContentId(toolContentId); - if (learnersStarted == 1 && scratchie.getRelativeTimeLimit() == 0 && scratchie.getAbsoluteTimeLimit() > 0 + if (learnersStarted > 0 && scratchie.getRelativeTimeLimit() == 0 && scratchie.getAbsoluteTimeLimit() > 0 && scratchie.getAbsoluteTimeLimitFinish() == null) { scratchie.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(scratchie.getAbsoluteTimeLimit())); scratchie.setAbsoluteTimeLimit(0); Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java =================================================================== diff -u -reccd6838790a4369b6788e48fb5ae5851622fe35 -r113c5a32c6fa73227ff541d4d197b1d6fe43a5b9 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision eccd6838790a4369b6788e48fb5ae5851622fe35) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision 113c5a32c6fa73227ff541d4d197b1d6fe43a5b9) @@ -216,15 +216,15 @@ break; } } - if (learnersStarted == 1 && whiteboard.getRelativeTimeLimit() == 0 && whiteboard.getAbsoluteTimeLimit() > 0 + if (learnersStarted > 0 && whiteboard.getRelativeTimeLimit() == 0 && whiteboard.getAbsoluteTimeLimit() > 0 && whiteboard.getAbsoluteTimeLimitFinish() == null) { whiteboard.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(whiteboard.getAbsoluteTimeLimit())); whiteboard.setAbsoluteTimeLimit(0); whiteboardDao.update(whiteboard); FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId)); } - + WhiteboardUser user = getUserByIDAndContent(Long.valueOf(userId), toolContentId); if (user != null) { WhiteboardSession session = user.getSession();