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

Merge OpenOLAT 11.4 to OpenOLAT default branch with f1413e9463d2e7ce496b25090e23f3620bd4db6b

parents a4dd6884 55fd74eb
No related branches found
No related tags found
No related merge requests found
...@@ -228,13 +228,19 @@ public class IQ12EditForm extends FormBasicController { ...@@ -228,13 +228,19 @@ public class IQ12EditForm extends FormBasicController {
showResultsDateDependentButton.setEnabled(false); showResultsDateDependentButton.setEnabled(false);
} }
Date startDate = (Date) modConfig.get(IQEditController.CONFIG_KEY_RESULTS_START_DATE); Date startDate = null;
if(modConfig.get(IQEditController.CONFIG_KEY_RESULTS_START_DATE) instanceof Date) {
startDate = (Date)modConfig.get(IQEditController.CONFIG_KEY_RESULTS_START_DATE);
}
startDateElement = uifactory.addDateChooser("qti_form_start_date", "qti.form.date.start", null, formLayout); startDateElement = uifactory.addDateChooser("qti_form_start_date", "qti.form.date.start", null, formLayout);
startDateElement.setDateChooserTimeEnabled(true); startDateElement.setDateChooserTimeEnabled(true);
startDateElement.setDate(startDate); startDateElement.setDate(startDate);
startDateElement.setMandatory(true); startDateElement.setMandatory(true);
Date endDate = (Date) modConfig.get(IQEditController.CONFIG_KEY_RESULTS_END_DATE); Date endDate = null;
if(modConfig.get(IQEditController.CONFIG_KEY_RESULTS_END_DATE) instanceof Date) {
endDate = (Date) modConfig.get(IQEditController.CONFIG_KEY_RESULTS_END_DATE);
}
endDateElement = uifactory.addDateChooser("qti_form_end_date", "qti.form.date.end", null, formLayout); endDateElement = uifactory.addDateChooser("qti_form_end_date", "qti.form.date.end", null, formLayout);
endDateElement.setDateChooserTimeEnabled(true); endDateElement.setDateChooserTimeEnabled(true);
endDateElement.setDate(endDate); endDateElement.setDate(endDate);
...@@ -265,7 +271,11 @@ public class IQ12EditForm extends FormBasicController { ...@@ -265,7 +271,11 @@ public class IQ12EditForm extends FormBasicController {
confSummary = AssessmentInstance.QMD_ENTRY_SUMMARY_COMPACT; confSummary = AssessmentInstance.QMD_ENTRY_SUMMARY_COMPACT;
} }
if (isAssessment || isSelfTest) { if (isAssessment || isSelfTest) {
summary.select(confSummary, true); for(String summaryKey:summaryKeys) {
if(summaryKey.equals(confSummary)) {
summary.select(summaryKey, true);
}
}
} else { } else {
summary.setEnabled(false); summary.setEnabled(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