Skip to content
Snippets Groups Projects
Commit 1f3ba701 authored by srosse's avatar srosse
Browse files

OO-3741: set end of default time for access rule at the end of the day

parent 2bf23ed5
No related branches found
No related tags found
No related merge requests found
...@@ -73,5 +73,12 @@ public interface DateChooser extends TextElement { ...@@ -73,5 +73,12 @@ public interface DateChooser extends TextElement {
* @param dateChooser A date chooser * @param dateChooser A date chooser
*/ */
public void setDefaultValue(DateChooser dateChooser); public void setDefaultValue(DateChooser dateChooser);
/**
* This will set the default time to 23:59 instead of 00:00
*
* @param endOfDay
*/
public void setDefaultTimeAtEndOfDay(boolean endOfDay);
} }
\ No newline at end of file
...@@ -61,6 +61,7 @@ public class JSDateChooser extends TextElementImpl implements DateChooser { ...@@ -61,6 +61,7 @@ public class JSDateChooser extends TextElementImpl implements DateChooser {
private Locale locale; private Locale locale;
private boolean dateChooserTimeEnabled; private boolean dateChooserTimeEnabled;
private boolean defaultTimeAtEndOfDay;
private String forValidDateErrorKey; private String forValidDateErrorKey;
private boolean checkForValidDate; private boolean checkForValidDate;
private int minute; private int minute;
...@@ -238,6 +239,15 @@ public class JSDateChooser extends TextElementImpl implements DateChooser { ...@@ -238,6 +239,15 @@ public class JSDateChooser extends TextElementImpl implements DateChooser {
this.dateChooserTimeEnabled = dateChooserTimeEnabled; this.dateChooserTimeEnabled = dateChooserTimeEnabled;
} }
public boolean isDefaultTimeAtEndOfDay() {
return defaultTimeAtEndOfDay;
}
@Override
public void setDefaultTimeAtEndOfDay(boolean defaultTimeAtEndOfDay) {
this.defaultTimeAtEndOfDay = defaultTimeAtEndOfDay;
}
/* (non-Javadoc) /* (non-Javadoc)
* @see org.olat.core.gui.components.form.flexible.impl.elements.DateChooser#getDateChooserDateFormat() * @see org.olat.core.gui.components.form.flexible.impl.elements.DateChooser#getDateChooserDateFormat()
*/ */
......
...@@ -93,6 +93,10 @@ class JSDateChooserComponent extends FormBaseComponentImpl { ...@@ -93,6 +93,10 @@ class JSDateChooserComponent extends FormBaseComponentImpl {
public boolean isDateChooserTimeEnabled() { public boolean isDateChooserTimeEnabled() {
return element.isDateChooserTimeEnabled(); return element.isDateChooserTimeEnabled();
} }
public boolean isDefaultTimeAtEndOfDay() {
return element.isDefaultTimeAtEndOfDay();
}
public Translator getElementTranslator() { public Translator getElementTranslator() {
return element.getTranslator(); return element.getTranslator();
......
...@@ -132,7 +132,12 @@ class JSDateChooserRenderer extends DefaultComponentRenderer { ...@@ -132,7 +132,12 @@ class JSDateChooserRenderer extends DefaultComponentRenderer {
int hour, minute; int hour, minute;
Date currentDate = jsdcc.getDate(); Date currentDate = jsdcc.getDate();
if(currentDate == null) { if(currentDate == null) {
hour = minute = 0; if(jsdcc.isDefaultTimeAtEndOfDay()) {
hour = 23;
minute = 59;
} else {
hour = minute = 0;
}
} else { } else {
Calendar cal = Calendar.getInstance(); Calendar cal = Calendar.getInstance();
cal.setTime(currentDate); cal.setTime(currentDate);
......
...@@ -1180,6 +1180,7 @@ public class ConditionConfigEasyController extends FormBasicController implement ...@@ -1180,6 +1180,7 @@ public class ConditionConfigEasyController extends FormBasicController implement
toDate.setExampleKey("form.easy.example.edate", null); toDate.setExampleKey("form.easy.example.edate", null);
toDate.setDateChooserTimeEnabled(true); toDate.setDateChooserTimeEnabled(true);
toDate.setDisplaySize(toDate.getExampleDateString().length()); toDate.setDisplaySize(toDate.getExampleDateString().length());
toDate.setDefaultTimeAtEndOfDay(true);
dateSubContainer.add(toDate); dateSubContainer.add(toDate);
dateSwitch = uifactory.addCheckboxesHorizontal("dateSwitch", null, formLayout, new String[] { "ison" }, new String[] { translate("form.easy.dateSwitch") }); dateSwitch = uifactory.addCheckboxesHorizontal("dateSwitch", null, formLayout, new String[] { "ison" }, new String[] { translate("form.easy.dateSwitch") });
......
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