From 44d316cafcb3392f2749dc729b20918ca85197a7 Mon Sep 17 00:00:00 2001 From: merelendor Date: Tue, 23 Jan 2024 20:45:01 +0300 Subject: [PATCH] QUESTIONNAIRE: hotfix for date format placement for birthdate and assignment date --- actions/questionnaireActions.js | 8 ++++---- components/CalendarDatePicker/index.js | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/actions/questionnaireActions.js b/actions/questionnaireActions.js index 20f2064..d7432b9 100644 --- a/actions/questionnaireActions.js +++ b/actions/questionnaireActions.js @@ -159,7 +159,7 @@ export const getQuestionnaire = ({ dispatch, id }) => { if(moment(questionnaire.head_person.assignment_date).isValid()) { - questionnaire.head_person.assignment_date = moment.utc(moment.utc(questionnaire.head_person.assignment_date).format('YYYY-MM-DD')); + questionnaire.head_person.assignment_date = moment.utc(moment.utc(questionnaire.head_person.assignment_date)).format('YYYY-MM-DD'); } } @@ -167,7 +167,7 @@ export const getQuestionnaire = ({ dispatch, id }) => { if(moment(questionnaire.head_person.credentials_dateend).isValid()) { - questionnaire.head_person.credentials_dateend = moment.utc(moment.utc(questionnaire.head_person.credentials_dateend).format('YYYY-MM-DD')); + questionnaire.head_person.credentials_dateend = moment.utc(moment.utc(questionnaire.head_person.credentials_dateend)).format('YYYY-MM-DD'); } } @@ -187,7 +187,7 @@ export const getQuestionnaire = ({ dispatch, id }) => { if(moment(questionnaire.signatory_person.assignment_date).isValid()) { - questionnaire.signatory_person.assignment_date = moment.utc(moment.utc(questionnaire.signatory_person.assignment_date).format('YYYY-MM-DD')); + questionnaire.signatory_person.assignment_date = moment.utc(moment.utc(questionnaire.signatory_person.assignment_date)).format('DD.MM.YYYY'); } } @@ -195,7 +195,7 @@ export const getQuestionnaire = ({ dispatch, id }) => { if(moment(questionnaire.signatory_person.credentials_dateend).isValid()) { - questionnaire.signatory_person.credentials_dateend = moment.utc(moment.utc(questionnaire.signatory_person.credentials_dateend).format('YYYY-MM-DD')); + questionnaire.signatory_person.credentials_dateend = moment.utc(moment.utc(questionnaire.signatory_person.credentials_dateend)).format('YYYY-MM-DD'); } } diff --git a/components/CalendarDatePicker/index.js b/components/CalendarDatePicker/index.js index effd2e3..baa3a0b 100644 --- a/components/CalendarDatePicker/index.js +++ b/components/CalendarDatePicker/index.js @@ -139,6 +139,8 @@ export default class CalendarDatePicker extends React.Component const { id, placeholder, value, min, max, disabled, plain, style, required, className } = this.props; const { readonly, input_value } = this.state; +// console.log("CalendarDatePicker", { value }); + if(disabled) { return (