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

OO-4206: RS when save configuration without duration

parent 11af0a17
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,11 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs { ...@@ -65,7 +65,11 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs {
@Override @Override
public void setDuration(Integer duration) { public void setDuration(Integer duration) {
moduleConfiguration.setStringValue(CONFIG_KEY_DURATION, duration.toString()); if (duration != null) {
moduleConfiguration.setStringValue(CONFIG_KEY_DURATION, duration.toString());
} else {
moduleConfiguration.remove(CONFIG_KEY_DURATION);
}
} }
private Integer integerOrNull(String value) { private Integer integerOrNull(String value) {
...@@ -89,7 +93,11 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs { ...@@ -89,7 +93,11 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs {
@Override @Override
public void setObligation(AssessmentObligation obligation) { public void setObligation(AssessmentObligation obligation) {
moduleConfiguration.setStringValue(CONFIG_KEY_OBLIGATION, obligation.name()); if (obligation != null) {
moduleConfiguration.setStringValue(CONFIG_KEY_OBLIGATION, obligation.name());
} else {
moduleConfiguration.remove(CONFIG_KEY_OBLIGATION);
}
} }
@Override @Override
...@@ -114,7 +122,11 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs { ...@@ -114,7 +122,11 @@ public class ModuleLearningPathConfigs implements LearningPathConfigs {
@Override @Override
public void setFullyAssessedTrigger(FullyAssessedTrigger trigger) { public void setFullyAssessedTrigger(FullyAssessedTrigger trigger) {
moduleConfiguration.setStringValue(CONFIG_KEY_TRIGGER, trigger.name()); if (trigger != null) {
moduleConfiguration.setStringValue(CONFIG_KEY_TRIGGER, trigger.name());
} else {
moduleConfiguration.remove(CONFIG_KEY_TRIGGER);
}
} }
@Override @Override
......
...@@ -220,7 +220,9 @@ public class LearningPathNodeConfigController extends FormBasicController { ...@@ -220,7 +220,9 @@ public class LearningPathNodeConfigController extends FormBasicController {
@Override @Override
protected void formOK(UserRequest ureq) { protected void formOK(UserRequest ureq) {
Integer duration = Integer.valueOf(durationEl.getValue()); Integer duration = StringHelper.containsNonWhitespace(durationEl.getValue())
? Integer.valueOf(durationEl.getValue())
: null;
learningPathConfigs.setDuration(duration); learningPathConfigs.setDuration(duration);
AssessmentObligation obligation = obligationEl.isOneSelected() AssessmentObligation obligation = obligationEl.isOneSelected()
......
...@@ -29,7 +29,7 @@ identity.list.course=im Kurs {0} ...@@ -29,7 +29,7 @@ identity.list.course=im Kurs {0}
identity.list.title=Lernpfad identity.list.title=Lernpfad
my.list.course=im Kurs {0} my.list.course=im Kurs {0}
my.list.title=Mein Lernpfad my.list.title=Mein Lernpfad
no.configurations=In diesen Kursbaustein stehen keine Konfigurationen zum Lernpfad zu Verf\u00FCgung. no.configurations=In diesem Kursbaustein stehen keine Konfigurationen zum Lernpfad zur Verf\u00FCgung.
pane.tab.learning.path=Lernpfad pane.tab.learning.path=Lernpfad
passed.false=$org.olat.course.assessment\:passed.false passed.false=$org.olat.course.assessment\:passed.false
passed.true=$org.olat.course.assessment\:passed.true passed.true=$org.olat.course.assessment\:passed.true
......
...@@ -43,4 +43,10 @@ public class GTALearningPathConfigs extends ModuleLearningPathConfigs { ...@@ -43,4 +43,10 @@ public class GTALearningPathConfigs extends ModuleLearningPathConfigs {
: AssessmentObligation.mandatory; : AssessmentObligation.mandatory;
} }
@Override
public void setObligation(AssessmentObligation obligation) {
boolean valuea = obligation != null && AssessmentObligation.optional.equals(obligation);
moduleConfiguration.setBooleanEntry(MSCourseNode.CONFIG_KEY_OPTIONAL, valuea );
}
} }
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