From 7b5968401bee47e834491b810678cf5a07d9b1bd Mon Sep 17 00:00:00 2001 From: Chirag Chhatrala <60499540+chiragchhatrala@users.noreply.github.com> Date: Tue, 7 Feb 2023 18:10:46 +0530 Subject: [PATCH] Prefill with today fixes (#87) --- resources/js/components/forms/DateInput.vue | 4 ++-- resources/js/components/open/forms/OpenForm.vue | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/js/components/forms/DateInput.vue b/resources/js/components/forms/DateInput.vue index b0a5871..16785fe 100644 --- a/resources/js/components/forms/DateInput.vue +++ b/resources/js/components/forms/DateInput.vue @@ -94,7 +94,7 @@ export default { this.compVal = null } }, - immediate: true + immediate: false }, toDate: { handler(val) { @@ -107,7 +107,7 @@ export default { this.compVal = null } }, - immediate: true + immediate: false } }, diff --git a/resources/js/components/open/forms/OpenForm.vue b/resources/js/components/open/forms/OpenForm.vue index 118649a..a21fc0f 100644 --- a/resources/js/components/open/forms/OpenForm.vue +++ b/resources/js/components/open/forms/OpenForm.vue @@ -350,9 +350,13 @@ export default { formData[field.id] = urlPrefill.getAll(field.id + '[]') } else if (field.type === 'date' && field.prefill_today === true) { // For Prefill with 'today' const dateObj = new Date() - const currentDate = dateObj.getFullYear() + '-' + + let currentDate = dateObj.getFullYear() + '-' + String(dateObj.getMonth() + 1).padStart(2, '0') + '-' + String(dateObj.getDate()).padStart(2, '0') + if(field.with_time === true){ + currentDate += 'T' + String(dateObj.getHours()).padStart(2, '0') + ':' + + String(dateObj.getMinutes()).padStart(2, '0'); + } formData[field.id] = currentDate } else { // Default prefill if any formData[field.id] = field.prefill