[EC-31576] Fixed -Added MinDate functionality in date picker and date field issu…

dist/js/field.js.LICENSE.txt

@@ -88,6 +88,15 @@
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
+/**
+ * @license
+ * Lodash <https://lodash.com/>
+ * Copyright JS Foundation and other contributors <https://js.foundation/>
+ * Released under MIT license <https://lodash.com/license>
+ * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
+ * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+ */
+
 /**
  * @license
  * Lodash <https://lodash.com/>
@@ -100,9 +109,9 @@
 /**
  * filesize
  *
- * @copyright 2023 Jason Mulligan <[email protected]>
+ * @copyright 2024 Jason Mulligan <[email protected]>
  * @license BSD-3-Clause
- * @version 10.1.0
+ * @version 10.1.2
  */
 
 /**!

package.json

@@ -33,6 +33,7 @@
     "filesize": "^10.0.5",
     "flatpickr": "^4.6.13",
     "liquor-tree": "^0.2.70",
+    "loadsh": "^0.0.4",
     "luxon": "^3.2.1",
     "md5": "^2.3.0",
     "mitt": "^3.0.0",

resources/js/components/date-time/DateTimePicker.vue

@@ -73,6 +73,14 @@ export default {
       type: Number,
       default: 0,
     },
+    maxDate:{
+      type: String,
+      default: null
+    },
+    minDate:{
+      type: String,
+      default: null
+    },
   },
 
   data: () => ({ flatpickr: null }),
@@ -118,7 +126,12 @@ export default {
           }
         }
       };
-
+      if (this.maxDate !== null) {
+        options.maxDate = this.maxDate;
+      }
+      if (this.minDate !== null) {
+        options.minDate = this.minDate;
+      }
       this.flatpickr = flatpickr(this.$refs.datePicker, options);
       if (!this.enableMinutes) {
         this.$nextTick(() => {

resources/js/components/date-time/FormField.vue

@@ -31,6 +31,8 @@
             :enable-minutes="enableMinutes"
             :enable-time="enableTime"
             :disabled="isReadonly"
+            :maxDate="maxDate"
+            :minDate="minDate"
         />
 
         <a
@@ -99,18 +101,23 @@ export default {
      * Update the field's internal value when it's value changes
      */
     handleChange(value) {
-     if(this.field.setDefaultMinuteZero == true && value !== ''){
-       let date = new Date(value);
-       if (!isNaN(date) && date instanceof Date) {
-         let onlyDate = date.getFullYear()+'-'+ ('0' + (date.getMonth()+1)).slice(-2) +'-'+ ('0' + date.getDate()).slice(-2) +" "+('0' + date.getHours()).slice(-2)+":00"+":00";
-         this.value = onlyDate;
-         this.$refs.dateTimePicker.getUpdatedValue(onlyDate);
-       } else {
-         this.value = '';
-       }
-     }else{
-       this.value = value;
-     }
+      if (this.field.setDefaultMinuteZero == true && value !== '') {
+        let date = new Date(value);
+        if ((!isNaN(date) && date instanceof Date)) {
+          let onlyDate = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + date.getDate()).slice(-2) + " " + ('0' + date.getHours()).slice(-2) + ":00" + ":00";
+          if (this.field.maxDate) {
+            onlyDate = date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + date.getDate()).slice(-2) + "";
+          }
+          this.value = onlyDate;
+          this.$refs.dateTimePicker.getUpdatedValue(onlyDate);
+        } else {
+          if (!value instanceof Event) {
+            this.value = '';
+          }
+        }
+      } else {
+        this.value = value;
+      }
     },
   },
 
@@ -157,6 +164,12 @@ export default {
     defaultMinute() {
       return this.field.defaultMinute || 0
     },
+    maxDate(){
+      return this.field.maxDate || null
+    },
+    minDate(){
+      return this.field.minDate || null
+    },
   },
 
 }

resources/js/components/multiselect/FormField.vue

@@ -87,6 +87,7 @@ import Multiselect from '@vueform/multiselect';
 import {VueDraggableNext} from 'vue-draggable-next'
 import debounce from 'lodash/debounce';
 import R64Field from '../../mixins/R64Field'
+import _ from "loadsh";
 
 export default {
   components: { Multiselect, draggable : VueDraggableNext},
@@ -217,6 +218,15 @@ export default {
           this.value = this.getValueFromOptions(this.field.value);
         }
       }
+
+      if(_.isEmpty(this.value) && this.field.defaultValue) {
+        if(this.isMultiselect) {
+          this.value = this.options && this.options.length > 0 ?[ _.find(this.options, {value: this.field.defaultValue})] : [];
+        } else {
+          this.value = this.field.defaultValue;
+        }
+      }
+
     },
 
     fill(formData) {

resources/js/components/simple-repetable/FormField.vue

@@ -19,7 +19,7 @@
         </div>
 
         <draggable v-model="fieldsWithValues"
-                   :sort="true"
+                   :sort="field.canDraggable ? true : false"
                    class="dragArea list-group w-full"
                    :scroll-sensitivity="400"
         >

resources/js/mixins/HasOptions.js

@@ -1,10 +1,11 @@
+import { isObject } from "lodash";
 export default {
     methods: {
         /**
          * Just determins if the option could potentially have an option.
          */
         hasOptionHint(option) {
-            return typeof option === 'object';
+            return isObject(option);
         },
 
         /**

src/DateTime.php

@@ -101,4 +101,12 @@ public function pickerDisplayFormat($value)
     {
         return $this->withMeta([__FUNCTION__ => $value]);
     }
+    public function maxDate($value)
+    {
+        return $this->withMeta([__FUNCTION__ => $value]);
+    }
+    public function minDate($value)
+    {
+        return $this->withMeta([__FUNCTION__ => $value]);
+    }
 }

src/Multiselect.php

@@ -396,4 +396,10 @@ public function canClear($bool = true)
     {
         return $this->withMeta(['canClear' => $bool]);
     }
+
+    /** Setting Default Value */
+    public function defaultValue($value = "")
+    {
+        return $this->withMeta(['defaultValue' => $value]);
+    }
 }