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

OO-4441: fix rs unassign unassigned assignment

parent 4dba9f70
No related branches found
No related tags found
No related merge requests found
......@@ -883,16 +883,21 @@ public class GradingAssignmentsListController extends FormBasicController implem
private void doUnassign(UserRequest ureq, List<GradingAssignmentRow> rows) {
List<GradingAssignment> assignments = rows.stream()
.filter(GradingAssignmentRow::hasGrader)
.map(GradingAssignmentRow::getAssignment)
.collect(Collectors.toList());
confirmUnassignGraderCtrl = new ConfirmUnassignGraderController(ureq, getWindowControl(), assignments);
listenTo(confirmUnassignGraderCtrl);
String gradersNames = getGradersNames(rows);
String title = translate("confirm.unassign.grader.title", new String[] { gradersNames });
cmc = new CloseableModalController(getWindowControl(), "close", confirmUnassignGraderCtrl.getInitialComponent(), true, title);
listenTo(cmc);
cmc.activate();
if(assignments.isEmpty()) {
showWarning("warning.atleastone.assignment.with.grader");
} else {
confirmUnassignGraderCtrl = new ConfirmUnassignGraderController(ureq, getWindowControl(), assignments);
listenTo(confirmUnassignGraderCtrl);
String gradersNames = getGradersNames(rows);
String title = translate("confirm.unassign.grader.title", new String[] { gradersNames });
cmc = new CloseableModalController(getWindowControl(), "close", confirmUnassignGraderCtrl.getInitialComponent(), true, title);
listenTo(cmc);
cmc.activate();
}
}
private void doBatchExtendDeadline(UserRequest ureq) {
......
......@@ -177,4 +177,5 @@ user.assigned.tests=Zugewiesene Tests
warning.assignement.deactivated=Der Test war zur\u00FCckgesetzt und kann nicht mehr korrigiert werden.
warning.atleastone=Bitte w\u00E4hlen Sie mindestens ein Korrektur.
warning.atleastone.assignment=Bitte w\u00E4hlen Sie mindestens eine zugewiese Korrektur.
warning.atleastone.assignment.with.grader=Bitte w\u00E4hlen Sie mindestens eine zugewiese Korrektur mit einem Korrektor.
working.days=Arbeitstage (Montag - Freitag)
......@@ -174,4 +174,5 @@ user.assigned.tests=Assigned tests
warning.assignement.deactivated=The test was reseted and cannot be corrected anymore.
warning.atleastone=Please, choose at least one assignment.
warning.atleastone.assignment=Please, choose at least one assignment.
warning.atleastone.assignment.with.grader=Please, choose at least one assignment with a grader.
working.days=working days (monday - friday)
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