Skip to content
Snippets Groups Projects
Commit a3828ed9 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 11.4 to OpenOLAT default branch with d5c8e69787c006beb6519125b5be745006c2b10e

parents 60bf3287 ae8655fd
No related branches found
No related tags found
No related merge requests found
......@@ -183,3 +183,4 @@ aa02a5383a846d9b76620693f1713cc1f7a5c3b7 OpenOLAT 11.3.0
11781a2f2cd56895272e83be82eb020904555163 OpenOLAT 11.3.3
6ddf882c14682ac0c62235d8ae96c24ecf19eb21 OpenOLAT 11.4.0
97971d985617dda850fa7316a6256882ba8fa9c9 OpenOLAT 11.4.1
ddfe863807617f21f6d75216bed144c791f5cab1 OpenOLAT 11.4.2
......@@ -417,6 +417,10 @@ public class StepsMainRunController extends FormBasicController implements Gener
addNextStep((StepFormController) nextChildCreator.createController(null, getWindowControl()), nextStep);
}
} else if (lastEvent == StepsEvent.ACTIVATE_PREVIOUS) {
if(currentStepIndex <= 0) {
return;// the case is possible with FireFox and users who use the keyboard and the enter key.
}
stepPages.pop();
steps.pop();
currentStepIndex--;
......
......@@ -57,6 +57,7 @@ import org.olat.course.CourseModule;
import org.olat.course.DisposedCourseRestartController;
import org.olat.course.assessment.AssessmentHelper;
import org.olat.course.assessment.AssessmentManager;
import org.olat.course.assessment.manager.AssessmentNotificationsHandler;
import org.olat.course.auditing.UserNodeAuditManager;
import org.olat.course.highscore.ui.HighScoreRunController;
import org.olat.course.nodes.AssessableCourseNode;
......@@ -129,6 +130,8 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
private QTI21Service qtiService;
@Autowired
private CourseModule courseModule;
@Autowired
private AssessmentNotificationsHandler assessmentNotificationsHandler;
public QTI21AssessmentRunController(UserRequest ureq, WindowControl wControl,
UserCourseEnvironment userCourseEnv, QTICourseNode courseNode) {
......@@ -645,7 +648,10 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
@Override
public void submit(Float score, Boolean pass, Long assessmentId) {
if(anonym) return;
if(anonym) {
assessmentNotificationsHandler.markPublisherNews(getIdentity(), userCourseEnv.getCourseEnvironment().getCourseResourceableId());
return;
}
if(courseNode instanceof IQTESTCourseNode) {
Boolean visibility;
......@@ -664,6 +670,8 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
if(increment) {
ThreadLocalUserActivityLogger.log(QTI21LoggingAction.QTI_CLOSE_IN_COURSE, getClass());
}
assessmentNotificationsHandler.markPublisherNews(getIdentity(), userCourseEnv.getCourseEnvironment().getCourseResourceableId());
} else if(courseNode instanceof SelfAssessableCourseNode) {
boolean increment = incrementAttempts.getAndSet(false);
if(increment) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment