Merge branch 'handle-min-max-in-datetimefield' into 'master'

Handle min & max in DateTimeField

See merge request !1704

aleksis/core/frontend/components/generic/forms/DateTimeField.vue

@@ -49,22 +49,12 @@ export default {
       required: false,
       default: undefined,
     },
-    minDate: {
+    min: {
       type: String,
       required: false,
       default: undefined,
     },
-    maxDate: {
-      type: String,
-      required: false,
-      default: undefined,
-    },
-    minTime: {
-      type: String,
-      required: false,
-      default: undefined,
-    },
-    maxTime: {
+    max: {
       type: String,
       required: false,
       default: undefined,
@@ -111,6 +101,32 @@ export default {
         this.dateTime = newDateTime.toISO();
       },
     },
+    minDT() {
+      return this.$parseISODate(this.min);
+    },
+    minDate() {
+      return this.minDT.toISODate();
+    },
+    minTime() {
+      if (this.dateTime.hasSame(this.minDT, "day")) {
+        return this.minDT.toFormat("HH:mm");
+      } else {
+        return undefined;
+      }
+    },
+    maxDT() {
+      return this.$parseISODate(this.max);
+    },
+    maxDate() {
+      return this.maxDT.toISODate();
+    },
+    maxTime() {
+      if (this.dateTime.hasSame(this.maxDT, "day")) {
+        return this.maxDT.toFormat("HH:mm");
+      } else {
+        return undefined;
+      }
+    },
   },
   watch: {
     value(newValue) {