[OPENMEETINGS-1610] time picker should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/4df306f7 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/4df306f7 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/4df306f7 Branch: refs/heads/3.2.x Commit: 4df306f75ea8bd33dd9a328de12640f4e2789e99 Parents: 935f2ff Author: Maxim Solodovnik <[email protected]> Authored: Sun Apr 2 14:31:10 2017 +0000 Committer: Maxim Solodovnik <[email protected]> Committed: Sun Apr 2 14:31:10 2017 +0000 ---------------------------------------------------------------------- .../openmeetings/web/common/OmDateTimePicker.java | 14 +++++++++----- .../web/user/calendar/AppointmentDialog.java | 8 +++++++- 2 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4df306f7/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java index 1ea0411..6e7cf9e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java @@ -28,7 +28,6 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.IModel; import com.googlecode.wicket.jquery.core.Options; -import com.googlecode.wicket.kendo.ui.KendoCultureHeaderItem; import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker; import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker; import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker; @@ -37,22 +36,27 @@ public class OmDateTimePicker extends DateTimePicker { private static final long serialVersionUID = 1L; public OmDateTimePicker(String id, IModel<LocalDateTime> model) { - super(id, model); + super(id, model, WebSession.get().getLocale()); } @Override protected DatePicker newDatePicker(String id, IModel<LocalDate> model, Locale locale, String datePattern, Options options) { - return new DatePicker(id, model, WebSession.get().getLocale()); + DatePicker dp = super.newDatePicker(id, model, locale, datePattern, options); + dp.setLabel(getLabel()); + return dp; } @Override protected TimePicker newTimePicker(String id, IModel<LocalTime> model, Locale locale, String timePattern, Options options) { - return new TimePicker(id, model, WebSession.get().getLocale()); + TimePicker tp = super.newTimePicker(id, model, locale, timePattern, options); + tp.setLabel(getLabel()); + return tp; } @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale())); + //FIXME TODO this is remain here until localized AM/PM will be correctly handled + //response.render(KendoCultureHeaderItem.of(WebSession.get().getLocale())); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/4df306f7/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java index 976a206..bb7e55a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java @@ -375,7 +375,6 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { add(feedback.setOutputMarkupId(true)); //General add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString(572)))); - add(start.setRequired(true), end.setRequired(true)); add(ownerPanel.add(owner)); boolean showGroups = AuthLevelUtil.hasAdminLevel(getRights()); add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() { @@ -476,6 +475,13 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> { add(cals.setNullValid(true).setLabel(Model.of("calendar")).setOutputMarkupId(true)); } + @Override + protected void onInitialize() { + super.onInitialize(); + add(start.setLabel(Model.of(getString("570"))).setRequired(true) + , end.setLabel(Model.of(getString("571"))).setRequired(true)); + } + private List<Room> getRoomList() { //FIXME need to be reviewed List<Room> result = new ArrayList<>();
