Skip to content
Snippets Groups Projects
Commit f3886107 authored by uhensler's avatar uhensler
Browse files

OO-4398: Remove option "set manually" to calculate the passed of a structure node

parent 29d915e2
No related branches found
No related tags found
No related merge requests found
......@@ -151,13 +151,11 @@ public class EditScoreCalculationEasyForm extends FormBasicController {
String[] failedTypeKeys = new String[]{
FailedEvaluationType.failedAsNotPassed.name(),
FailedEvaluationType.failedAsNotPassedAfterEndDate.name(),
FailedEvaluationType.manual.name()
FailedEvaluationType.failedAsNotPassedAfterEndDate.name()
};
String[] failedTypeValues = new String[]{
translate(FailedEvaluationType.failedAsNotPassed.name()),
translate(FailedEvaluationType.failedAsNotPassedAfterEndDate.name()),
translate(FailedEvaluationType.manual.name())
translate(FailedEvaluationType.failedAsNotPassedAfterEndDate.name())
};
failedType = uifactory.addDropdownSingleselect("scform.failedtype", formLayout, failedTypeKeys, failedTypeValues, null);
......
......@@ -49,8 +49,8 @@ import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.translator.Translator;
import org.olat.core.util.Util;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
import org.olat.course.condition.Condition;
import org.olat.course.condition.interpreter.ConditionErrorMessage;
import org.olat.course.condition.interpreter.ConditionExpression;
......@@ -219,13 +219,11 @@ class EditScoreCalculationExpertForm extends FormBasicController {
String[] failedTypeKeys = new String[]{
FailedEvaluationType.failedAsNotPassed.name(),
FailedEvaluationType.failedAsNotPassedAfterEndDate.name(),
FailedEvaluationType.manual.name()
FailedEvaluationType.failedAsNotPassedAfterEndDate.name()
};
String[] failedTypeValues = new String[]{
translate(FailedEvaluationType.failedAsNotPassed.name()),
translate(FailedEvaluationType.failedAsNotPassedAfterEndDate.name()),
translate(FailedEvaluationType.manual.name())
translate(FailedEvaluationType.failedAsNotPassedAfterEndDate.name())
};
failedType = uifactory.addDropdownSingleselect("scform.failedtype", formLayout, failedTypeKeys, failedTypeValues, null);
......
......@@ -23,7 +23,6 @@ form.peekview.max.reached=Sie haben das Maximum von {0} Kursbausteinen erreicht,
form.save=Speichern
form.self=eigene HTML-Seite
form.system=automatische \u00DCbersicht
manual=Nicht bestanden wird manuell eingegeben.
pane.tab.deliveryOptions=$org.olat.core.gui.control.generic.iframe\:option.delivery
pane.tab.highscore=HighScore
pane.tab.st_config=\u00DCbersicht
......
......@@ -23,7 +23,6 @@ form.peekview.max.reached=You have reached the maximum of {0} course elements th
form.save=Save
form.self=Your HTML page
form.system=Automatic overview
manual=Set manually
pane.tab.deliveryOptions=$org.olat.core.gui.control.generic.iframe\:option.delivery
pane.tab.highscore=HighScore
pane.tab.st_config=Overview
......
......@@ -37,7 +37,6 @@ selectedPeekviewChildren=Afficher dans l'aper\u00E7u (choisir maximalement {0} )
folder.displayname=Dossier de stockage
failedAsNotPassedAfterEndDate=Pas r\u00E9ussi comme non r\u00E9ussi mais seulement apr\u00E8s la date de fin du cours
form.save=enregistrer
manual=Sauver manuellement
form.peekview.error.mandatory.child=Il faut au moins s\u00E9lectionner au moins un \u00E9l\u00E9ment de cours pour la vue g\u00E9n\u00E9rale automatique avec aper\u00E7u.
form.system=Aper\u00E7u automatique
pane.tab.deliveryOptions=$org.olat.core.gui.control.generic.iframe\:option.delivery
......
......@@ -20,7 +20,6 @@ form.peekview.max.reached=Ha raggiunto il numero massimo di {0} elementi di cors
form.save=Salvare
form.self=propria pagina HTML
form.system=visione d'insieme automatica
manual=Impostare manualmente
pane.tab.deliveryOptions=$org.olat.core.gui.control.generic.iframe\:option.delivery
pane.tab.highscore=Punteggio
pane.tab.st_config=Visione d'insieme
......
......@@ -23,7 +23,6 @@ form.peekview.max.reached=Autores de t\u00F3pico t\u00EAm que aceitar os partici
form.save=Salvar
form.self=Sua p\u00E1gina HTML
form.system=Vis\u00E3o geral autom\u00E1tica
manual=Definir manualmente
pane.tab.deliveryOptions=$org.olat.core.gui.control.generic.iframe\:option.delivery
pane.tab.highscore=HighScore (Pontua\u00E7\u00E3o Alta)
pane.tab.st_config=Vis\u00E3o geral
......
......@@ -64,8 +64,6 @@ public class ConditionPassedEvaluator implements PassedEvaluator {
if(lifecycle != null && lifecycle.getValidTo() != null && lifecycle.getValidTo().compareTo(new Date()) < 0) {
passed = Boolean.FALSE;
}
} else if(failedType == FailedEvaluationType.manual) {
passed = currentEvaluation.getPassed();
}
}
}
......
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