You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/06/06 16:52:32 UTC

isis git commit: ISIS-1433: minDate and maxDate for date pickers

Repository: isis
Updated Branches:
  refs/heads/master f8d98e581 -> bcfb18463


ISIS-1433: minDate and maxDate for date pickers


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/bcfb1846
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/bcfb1846
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/bcfb1846

Branch: refs/heads/master
Commit: bcfb184634ef008254be69269aa872e42d57406e
Parents: f8d98e5
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jun 6 17:51:41 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jun 6 17:51:41 2016 +0100

----------------------------------------------------------------------
 .../guides/_ugvw_configuration-properties.adoc  | 20 +++++++++++++++
 .../ScalarPanelTextFieldDatePickerAbstract.java |  5 ++--
 .../scalars/datepicker/DateTimeConfig.java      | 24 ++++++++++++++---
 .../datepicker/TextFieldWithDateTimePicker.java | 27 +++++++++++++++++++-
 .../webapp/WEB-INF/viewer_wicket.properties     |  5 ++--
 5 files changed, 72 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/bcfb1846/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
----------------------------------------------------------------------
diff --git a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
index 23b18f3..f2b15bc 100644
--- a/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
+++ b/adocs/documentation/src/main/asciidoc/guides/_ugvw_configuration-properties.adoc
@@ -43,6 +43,26 @@ If you prefer you can place all configuration properties into `WEB-INF/isis.prop
 | number of pages to bookmark
 
 |`isis.viewer.wicket.` +
+`datePicker.maxDate`
+| ISO format date +
+(`2100-01-01T00:00:00.000Z`)
+|(`1.13.0-SNAPSHOT`), specifies a maximum date after which dates may not be specified.
+
+See link:http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate[datetimepicker reference docs] for
+further details.  The string must be in ISO date format (see link:https://github.com/moment/moment/issues/1407[here]
+for further details).
+
+|`isis.viewer.wicket.` +
+`datePicker.minDate`
+| ISO format date +
+(`1900-01-01T00:00:00.000Z`)
+|(`1.13.0-SNAPSHOT`), specifies a minimum date before which dates may not be specified.
+
+See link:http://eonasdan.github.io/bootstrap-datetimepicker/Options/#mindate[datetimepicker reference docs] for
+further details.  The string must be in ISO date format (see link:https://github.com/moment/moment/issues/1407[here]
+for further details).
+
+|`isis.viewer.wicket.` +
 `disableDependentChoiceAutoSelection`
 | `true`,`false` (`_false_`)
 | For dependent choices, whether to automatically select the first dependent (eg subcategory) when the parameter on which it depends (category) changes.

http://git-wip-us.apache.org/repos/asf/isis/blob/bcfb1846/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 6727752..fef3e39 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -23,6 +23,8 @@ import java.io.Serializable;
 
 import com.google.inject.Inject;
 
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.basic.Label;
@@ -146,6 +148,5 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
     private ObjectAdapter adapterFor(final Object pojo) {
         return getPersistenceSession().adapterFor(pojo);
     }
-    
-    
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/bcfb1846/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
index a626967..c908859 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/DateTimeConfig.java
@@ -77,6 +77,16 @@ public class DateTimeConfig extends AbstractConfig {
      */
     private static final IKey<Boolean> UseCurrent = newKey("useCurrent", true);
 
+    /**
+     * @see <a href="http://eonasdan.github.io/bootstrap-datetimepicker/Options/#mindate">online reference</a>
+     */
+    private static final IKey<String> MinDate = newKey("minDate", null);
+
+    /**
+     * @see <a href="http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate">online reference</a>
+     */
+    private static final IKey<String> MaxDate = newKey("maxDate", null);
+
 
     /**
      * The two-letter code of the language to use for month and day names.
@@ -329,15 +339,21 @@ public class DateTimeConfig extends AbstractConfig {
         return this;
     }
 
-    /**
-     * @param value Whether or not to show week numbers to the left of week rows.
-     * @return this instance for chaining
-     */
     public DateTimeConfig useCurrent(final boolean value) {
         put(UseCurrent, value);
         return this;
     }
 
+    public DateTimeConfig minDate(final String value) {
+        put(MinDate, value);
+        return this;
+    }
+
+    public DateTimeConfig maxDate(final String value) {
+        put(MaxDate, value);
+        return this;
+    }
+
     /**
      * Whether or not to close the datepicker immediately when a date is selected.
      *

http://git-wip-us.apache.org/repos/asf/isis/blob/bcfb1846/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
index c513c49..d00f735 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/datepicker/TextFieldWithDateTimePicker.java
@@ -21,6 +21,9 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.datepicker;
 import de.agilecoders.wicket.core.util.Attributes;
 
 import java.util.Locale;
+
+import org.apache.isis.core.commons.config.IsisConfiguration;
+import org.apache.isis.core.runtime.system.context.IsisContext;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
@@ -46,6 +49,18 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
 
     private static final long serialVersionUID = 1L;
 
+    /**
+     * As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#mindate, in ISO format (per https://github.com/moment/moment/issues/1407).
+     */
+    private static final String KEY_DATE_PICKER_MIN_DATE = "isis.viewer.wicket.datePicker.minDate";
+    private static final String KEY_DATE_PICKER_MIN_DATE_DEFAULT = "1900-01-01T00:00:00.000Z";
+
+    /**
+     * As per http://eonasdan.github.io/bootstrap-datetimepicker/Options/#maxdate, in ISO format (per https://github.com/moment/moment/issues/1407).
+     */
+    private static final String KEY_DATE_PICKER_MAX_DATE = "isis.viewer.wicket.datePicker.maxDate";
+    private static final String KEY_DATE_PICKER_MAX_DATE_DEFAULT = "2100-01-01T00:00:00.000Z";
+
     protected final DateConverter<T> converter;
 
     private final DateTimeConfig config;
@@ -71,9 +86,14 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
         }
 
         config.calendarWeeks(true);
-
         config.useCurrent(false);
 
+        final String datePickerMinDate = getConfiguration().getString(KEY_DATE_PICKER_MIN_DATE, KEY_DATE_PICKER_MIN_DATE_DEFAULT);
+        final String datePickerMaxDate = getConfiguration().getString(KEY_DATE_PICKER_MAX_DATE, KEY_DATE_PICKER_MAX_DATE_DEFAULT);
+
+        config.minDate(datePickerMinDate);
+        config.maxDate(datePickerMaxDate);
+
         this.config = config;
     }
 
@@ -135,4 +155,9 @@ public class TextFieldWithDateTimePicker<T> extends TextField<T> implements ICon
     private CharSequence createScript(final DateTimeConfig config) {
         return $(this).chain("datetimepicker", config).get();
     }
+
+    IsisConfiguration getConfiguration() {
+        return IsisContext.getConfiguration();
+    }
+
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/bcfb1846/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
----------------------------------------------------------------------
diff --git a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
index b3ccc20..e08b33d 100644
--- a/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
+++ b/example/application/simpleapp/webapp/src/main/webapp/WEB-INF/viewer_wicket.properties
@@ -31,14 +31,15 @@
 isis.viewer.wicket.maxTitleLengthInStandaloneTables=0
 isis.viewer.wicket.maxTitleLengthInParentedTables=0
 
+#isis.viewer.wicket.datePicker.minDate=1900-01-01T00:00:00.000Z
+#isis.viewer.wicket.datePicker.maxDate=2100-01-01T00:00:00.000Z
 
 #isis.viewer.wicket.datePattern=dd-MM-yyyy
 #isis.viewer.wicket.dateTimePattern=dd-MM-yyyy HH:mm
-#isis.viewer.wicket.datePickerPattern=DD-MM-YYYY
+
 
 #isis.viewer.wicket.datePattern=dd/MM/yy
 #isis.viewer.wicket.dateTimePattern=dd/MM/yy HH:mm
-#isis.viewer.wicket.datePickerPattern=DD/MM/YY
 
 
 #