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

OO-4207: Option to calculate the learning progress is not permanently persisted

parent 8c01813a
No related branches found
No related tags found
No related merge requests found
...@@ -202,19 +202,6 @@ public class NodeAccessSettingsController extends FormBasicController { ...@@ -202,19 +202,6 @@ public class NodeAccessSettingsController extends FormBasicController {
boolean changedToDurationType = CompletionType.duration.equals(completionType) boolean changedToDurationType = CompletionType.duration.equals(completionType)
&& !CompletionType.duration.equals(courseConfig.getCompletionType()); && !CompletionType.duration.equals(courseConfig.getCompletionType());
if (changedToDurationType) {
doConfirmCompletionTypeDuration(ureq);
} else {
if(CourseFactory.isCourseEditSessionOpen(courseEntry.getOlatResource().getResourceableId())) {
showWarning("error.course.locked");
initCompletionTypeFromConfig();
return;
}
saveCompletionTypeAndCloseEditSession(completionType);
}
}
private void doConfirmCompletionTypeDuration(UserRequest ureq) {
OLATResourceable courseOres = courseEntry.getOlatResource(); OLATResourceable courseOres = courseEntry.getOlatResource();
if(CourseFactory.isCourseEditSessionOpen(courseOres.getResourceableId())) { if(CourseFactory.isCourseEditSessionOpen(courseOres.getResourceableId())) {
showWarning("error.course.locked"); showWarning("error.course.locked");
...@@ -223,6 +210,14 @@ public class NodeAccessSettingsController extends FormBasicController { ...@@ -223,6 +210,14 @@ public class NodeAccessSettingsController extends FormBasicController {
} }
CourseFactory.openCourseEditSession(courseOres.getResourceableId()); CourseFactory.openCourseEditSession(courseOres.getResourceableId());
if (changedToDurationType) {
doConfirmCompletionTypeDuration(ureq);
} else {
saveCompletionTypeAndCloseEditSession(completionType);
}
}
private void doConfirmCompletionTypeDuration(UserRequest ureq) {
durationConfirmationCtrl = new DurationConfirmationController(ureq, getWindowControl()); durationConfirmationCtrl = new DurationConfirmationController(ureq, getWindowControl());
listenTo(durationConfirmationCtrl); listenTo(durationConfirmationCtrl);
...@@ -232,7 +227,6 @@ public class NodeAccessSettingsController extends FormBasicController { ...@@ -232,7 +227,6 @@ public class NodeAccessSettingsController extends FormBasicController {
listenTo(cmc); listenTo(cmc);
} }
private void doSetCompletionTypeDuration(Integer duration) { private void doSetCompletionTypeDuration(Integer duration) {
ICourse course = CourseFactory.loadCourse(courseEntry); ICourse course = CourseFactory.loadCourse(courseEntry);
...@@ -267,6 +261,7 @@ public class NodeAccessSettingsController extends FormBasicController { ...@@ -267,6 +261,7 @@ public class NodeAccessSettingsController extends FormBasicController {
courseConfig.setCompletionType(completionType); courseConfig.setCompletionType(completionType);
logActivity(completionType); logActivity(completionType);
} }
CourseFactory.setCourseConfig(courseEntry.getOlatResource().getResourceableId(), courseConfig);
CourseFactory.closeCourseEditSession(courseEntry.getOlatResource().getResourceableId(), false); CourseFactory.closeCourseEditSession(courseEntry.getOlatResource().getResourceableId(), false);
} }
......
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