From ced2f79829f213af330b81d873a9ef1b15a894aa Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 2 Sep 2019 09:51:37 +0200
Subject: [PATCH] OO-4150: fix rs if appeal before roll call
---
.../lecture/ui/ParticipantLectureBlocksController.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java b/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java
index 97f1f84707a..107ce10b984 100644
--- a/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java
+++ b/src/main/java/org/olat/modules/lecture/ui/ParticipantLectureBlocksController.java
@@ -208,7 +208,8 @@ public class ParticipantLectureBlocksController extends FormBasicController {
List<LectureBlockAndRollCallRow> rows = new ArrayList<>(rollCalls.size());
for(LectureBlockAndRollCall rollCall:rollCalls) {
LectureBlockAndRollCallRow row = new LectureBlockAndRollCallRow(rollCall);
- if(appealEnabled && !LectureBlockStatus.cancelled.equals(row.getRow().getStatus()) && rollCall.isCompulsory()) {
+ if(appealEnabled && !LectureBlockStatus.cancelled.equals(row.getRow().getStatus())
+ && rollCall.isCompulsory()) {
int lectures = row.getRow().getEffectiveLecturesNumber();
if(lectures <= 0) {
@@ -397,6 +398,10 @@ public class ParticipantLectureBlocksController extends FormBasicController {
LectureBlock lectureBlock = lectureService.getLectureBlock(row.getLectureBlockRef());
LectureBlockRollCall rollCall = lectureService.getRollCall(row.getRollCallRef());
+ if(rollCall == null) {
+ rollCall = lectureService.getOrCreateRollCall(assessedIdentity, lectureBlock, null, null, null);
+ }
+
String before = lectureService.toAuditXml(rollCall);
rollCall.setAppealDate(new Date());
rollCall.setAppealStatus(LectureBlockAppealStatus.pending);
--
GitLab