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

OO-4206: Learning path elements need always a fully assessed trigger

parent 3dbefb76
No related branches found
No related tags found
No related merge requests found
...@@ -57,13 +57,12 @@ public class LearningPathNodeConfigController extends FormBasicController { ...@@ -57,13 +57,12 @@ public class LearningPathNodeConfigController extends FormBasicController {
public static final String CONFIG_DEFAULT_OBLIGATION = AssessmentObligation.mandatory.name(); public static final String CONFIG_DEFAULT_OBLIGATION = AssessmentObligation.mandatory.name();
public static final String CONFIG_KEY_START = "start.date"; public static final String CONFIG_KEY_START = "start.date";
public static final String CONFIG_KEY_TRIGGER = "fully.assessed.trigger"; public static final String CONFIG_KEY_TRIGGER = "fully.assessed.trigger";
public static final String CONFIG_VALUE_TRIGGER_NONE = "none";
public static final String CONFIG_VALUE_TRIGGER_NODE_VISITED = "nodeVisited"; public static final String CONFIG_VALUE_TRIGGER_NODE_VISITED = "nodeVisited";
public static final String CONFIG_VALUE_TRIGGER_CONFIRMED = "confirmed"; public static final String CONFIG_VALUE_TRIGGER_CONFIRMED = "confirmed";
public static final String CONFIG_VALUE_TRIGGER_STATUS_DONE = "statusDone"; public static final String CONFIG_VALUE_TRIGGER_STATUS_DONE = "statusDone";
public static final String CONFIG_VALUE_TRIGGER_SCORE = "score"; public static final String CONFIG_VALUE_TRIGGER_SCORE = "score";
public static final String CONFIG_VALUE_TRIGGER_PASSED = "passed"; public static final String CONFIG_VALUE_TRIGGER_PASSED = "passed";
public static final String CONFIG_DEFAULT_TRIGGER = CONFIG_VALUE_TRIGGER_NONE; public static final String CONFIG_DEFAULT_TRIGGER = CONFIG_VALUE_TRIGGER_CONFIRMED;
public static final String CONFIG_KEY_SCORE_CUT_VALUE = "scoreCutValue"; public static final String CONFIG_KEY_SCORE_CUT_VALUE = "scoreCutValue";
private TextElement durationEl; private TextElement durationEl;
...@@ -125,7 +124,6 @@ public class LearningPathNodeConfigController extends FormBasicController { ...@@ -125,7 +124,6 @@ public class LearningPathNodeConfigController extends FormBasicController {
private KeyValues getTriggerKV() { private KeyValues getTriggerKV() {
KeyValues triggerKV = new KeyValues(); KeyValues triggerKV = new KeyValues();
triggerKV.add(entry(CONFIG_VALUE_TRIGGER_NONE, translate("config.trigger.none")));
if (ctrlConfig.isTriggerNodeVisited()) { if (ctrlConfig.isTriggerNodeVisited()) {
triggerKV.add(entry(CONFIG_VALUE_TRIGGER_NODE_VISITED, translate("config.trigger.visited"))); triggerKV.add(entry(CONFIG_VALUE_TRIGGER_NODE_VISITED, translate("config.trigger.visited")));
} }
......
...@@ -11,8 +11,7 @@ config.obligation.optional=Freiwillig ...@@ -11,8 +11,7 @@ config.obligation.optional=Freiwillig
config.score.cut=Punkteminimum config.score.cut=Punkteminimum
config.start.date=Freigabedatum config.start.date=Freigabedatum
config.trigger=Abschluss config.trigger=Abschluss
config.trigger.confirmed=Best\u00E4tigt config.trigger.confirmed=Best\u00E4tigung durch den Benutzer
config.trigger.none=Ohne Abschluss
config.trigger.passed=Bestanden config.trigger.passed=Bestanden
config.trigger.score=Punkte config.trigger.score=Punkte
config.trigger.status.done=Durchf\u00FChrung erledigt config.trigger.status.done=Durchf\u00FChrung erledigt
......
...@@ -12,8 +12,7 @@ config.obligation.optional=Optional ...@@ -12,8 +12,7 @@ config.obligation.optional=Optional
config.score.cut=Minimal score config.score.cut=Minimal score
config.start.date=Release date config.start.date=Release date
config.trigger=Completion config.trigger=Completion
config.trigger.confirmed=Confirmed config.trigger.confirmed=Confirmed by user
config.trigger.none=No completion
config.trigger.passed=Passed config.trigger.passed=Passed
config.trigger.score=Score config.trigger.score=Score
config.trigger.status.done=Execution done config.trigger.status.done=Execution done
......
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