OO-4825: deactivate and reassign assignments during invalidation process

src/main/java/org/olat/course/nodes/iq/ConfirmReopenAssessmentEntriesController.java

+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.course.nodes.iq;
 
 import org.olat.core.gui.UserRequest;

src/main/java/org/olat/ims/qti21/ui/ConfirmAssessmentTestSessionInvalidationController.java

@@ -159,7 +159,7 @@ public class ConfirmAssessmentTestSessionInvalidationController extends FormBasi
 		if(gradingService.isGradingEnabled(session.getTestEntry(), null)) {
 			AssessmentEntry assessmentEntry = courseAssessmentService.getAssessmentEntry(courseNode, assessedUserCourseEnv);
 			GradingAssignment assignment = gradingService.getGradingAssignment(session.getTestEntry(), assessmentEntry);
-			if(assignment != null && session.getKey().equals(assessmentEntry.getAssessmentId()) && gradingService.hasRecordedTime(assignment)) {
+			if(assignment != null && session.getKey().equals(assessmentEntry.getAssessmentId())) {
 				return assignment;
 			}
 		}
@@ -193,8 +193,10 @@ public class ConfirmAssessmentTestSessionInvalidationController extends FormBasi
 		session.setCancelled(true);
 		session = qtiService.updateAssessmentTestSession(session);
 		dbInstance.commit();
+		
+		AssessmentTestSession promotedSession = null;
 		if(updateEntryResults) {
-			AssessmentTestSession promotedSession = getNextLastSession();
+			promotedSession = getNextLastSession();
 			if(promotedSession != null) {
 				if(courseNode == null) {
 					qtiService.updateAssessmentEntry(promotedSession);
@@ -209,7 +211,11 @@ public class ConfirmAssessmentTestSessionInvalidationController extends FormBasi
 			if(assignmentStatus == GradingAssignmentStatus.assigned
 					|| assignmentStatus == GradingAssignmentStatus.inProcess
 					|| assignmentStatus == GradingAssignmentStatus.done) {
-				gradingService.reopenAssignment(runningAssignment);
+				if(promotedSession != null) {
+					gradingService.reopenAssignment(runningAssignment);
+				} else {
+					gradingService.deactivateAssignment(runningAssignment);
+				}
 			}
 		}
 		

src/main/java/org/olat/ims/qti21/ui/ConfirmAssessmentTestSessionRevalidationController.java

@@ -137,13 +137,13 @@ public class ConfirmAssessmentTestSessionRevalidationController extends FormBasi
 
 	@Override
 	protected void formOK(UserRequest ureq) {
-		doInvalidateSession(ureq, canUpdateAssessmentEntry);
+		doValidateSession(ureq, canUpdateAssessmentEntry);
 	}
 	
 	@Override
 	protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
 		if(revalidateButton == source) {
-			doInvalidateSession(ureq, false);
+			doValidateSession(ureq, false);
 		}
 		super.formInnerEvent(ureq, source, event);
 	}
@@ -159,17 +159,18 @@ public class ConfirmAssessmentTestSessionRevalidationController extends FormBasi
 		if(gradingService.isGradingEnabled(session.getTestEntry(), null)) {
 			AssessmentEntry assessmentEntry = courseAssessmentService.getAssessmentEntry(courseNode, assessedUserCourseEnv);
 			GradingAssignment assignment = gradingService.getGradingAssignment(session.getTestEntry(), assessmentEntry);
-			if(assignment != null && session.getKey().equals(assessmentEntry.getAssessmentId()) && gradingService.hasRecordedTime(assignment)) {
+			if(assignment != null && session.getKey().equals(assessmentEntry.getAssessmentId())) {
 				return assignment;
 			}
 		}
 		return null;
 	}
 	
-	private void doInvalidateSession(UserRequest ureq, boolean updateEntryResults) {
+	private void doValidateSession(UserRequest ureq, boolean updateEntryResults) {
 		session.setCancelled(false);
 		session = qtiService.updateAssessmentTestSession(session);
 		dbInstance.commit();
+		
 		if(updateEntryResults) {
 			if(courseNode == null) {
 				qtiService.updateAssessmentEntry(session);
@@ -184,6 +185,13 @@ public class ConfirmAssessmentTestSessionRevalidationController extends FormBasi
 					|| assignmentStatus == GradingAssignmentStatus.inProcess
 					|| assignmentStatus == GradingAssignmentStatus.done) {
 				gradingService.reopenAssignment(runningAssignment);
+			} else if(assignmentStatus == GradingAssignmentStatus.deactivated
+					|| assignmentStatus == GradingAssignmentStatus.unassigned) {
+				dbInstance.commit();// if the assessment was updated before
+				AssessmentEntry assessmentEntry = gradingService
+						.loadFullAssessmentEntry(runningAssignment.getAssessmentEntry());
+				RepositoryEntry referenceEntry = session.getTestEntry();
+				gradingService.assignGrader(referenceEntry, assessmentEntry, true);
 			}
 		}
 		

src/main/java/org/olat/ims/qti21/ui/ConfirmReopenAssessmentEntryController.java

+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.ims.qti21.ui;
 
 import org.olat.core.gui.UserRequest;

src/main/java/org/olat/ims/qti21/ui/_i18n/LocalStrings_de.properties

@@ -294,7 +294,7 @@ upload.explanation=Datei auf lokalem Computer f\u00FCr \u00DCbertragung w\u00E4h
 validate.xml.signature=Testquittung validieren
 validate.xml.signature.file=XML Datei
 validate.xml.signature.ok=Testquittung und Datei konnte erfolgreich validiert werden.
-warning.assignment.done=Die Korrektur dieses Tests ist bereits abgeschlossen. Wird diese Test-Session als ung\u00FCltig markiert (annulliert) wird, so gehen alle bestehenden Korrekturen verloren.
+warning.assignment.done=Die Korrektur dieses Tests ist bereits abgeschlossen. Wird diese Test-Session als ung\u00FCltig markiert (annulliert), so gehen alle bestehenden Korrekturen verloren.
 warning.assignment.inProcess=Dieser Test befindet sich bereits in Korrektur. Wird diese Test-Session als ung\u00FCltig markiert (annulliert), so gehen alle Korrekturen verloren.
 warning.download.log=Es gibt leider kein Logdatei f\u00FCr diesen Test.
 warning.reset.assessmenttest.data=Die Test-Resultate wurden von einem Administrator oder Kursbesitzer zur\u00FCckgesetzt. Sie k\u00F6nnen den Test nicht fortsetzen und m\u00FCssen ihn erneut starten.