From 5da978b0b6c39458e5f76883335f60cf7c2d207e Mon Sep 17 00:00:00 2001 From: GabrielTrettel Date: Thu, 23 Sep 2021 15:33:48 -0300 Subject: [PATCH] Fixing date picker and making it work to get only the date by omitting the time hook --- src/app/components/DatePicker.js | 23 +++++++++++++--------- src/app/components/forms/FormDatePicker.js | 23 ++++++++++++++++------ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/src/app/components/DatePicker.js b/src/app/components/DatePicker.js index 436d648..5c2dff7 100644 --- a/src/app/components/DatePicker.js +++ b/src/app/components/DatePicker.js @@ -48,9 +48,11 @@ export default function DatePicker(props) { if (selectedDate) { if (mode == "date") { setDate(moment(selectedDate)); - props.onDateChange(date); - setMode("time"); - setShow(true); // to show the picker again in time mode + props.onDateChange(moment(selectedDate)); + if (props.onTimeChange) { + setMode("time"); + setShow(true); // to show the picker again in time mode + } } else { if (validateTimeInput(selectedDate)) { setTime(moment(selectedDate)); @@ -74,8 +76,10 @@ export default function DatePicker(props) { if (mode == "date") { setDate(moment(auxDate)); //atualizar a data com a variável auxiliar props.onDateChange(auxDate); - setMode("time"); - setShow(true); // to show the picker again in time mode + if (props.onTimeChange) { + setMode("time"); + setShow(true); // to show the picker again in time mode + } } else { if (validateTimeInput(auxDate)) { setTime(moment(auxDate)); @@ -96,7 +100,7 @@ export default function DatePicker(props) { mode={mode} is24Hour={true} locale={"pt-br"} - minimumDate={new Date(moment().subtract(1, "month"))} + minimumDate={props.minimumDate} maximumDate={new Date(moment())} formatChosenDate={(selectedDate) => { if (mode == "date") { @@ -112,7 +116,7 @@ export default function DatePicker(props) { }; return ( - + setShow(true)}> {props.children} @@ -144,7 +148,6 @@ export default function DatePicker(props) { borderTopColor: "#d3d3d3", borderTopWidth: 1, }} - // onPress={() => console.log("datepicker clicked")} > {}, - onTimeChange: () => {}, + onTimeChange: undefined, + minimumDate: new Date(moment().subtract(1, "month")), + flex: 0, }; const styles = StyleSheet.create({ diff --git a/src/app/components/forms/FormDatePicker.js b/src/app/components/forms/FormDatePicker.js index b75ea0c..2936a32 100644 --- a/src/app/components/forms/FormDatePicker.js +++ b/src/app/components/forms/FormDatePicker.js @@ -53,21 +53,32 @@ function PluvRegisterPicker(props) { ); } -export default function FormDatePicker({ formTypeFace = "events", ...props }) { +export default function FormDatePicker({ formTypeFace = "events", onDateChange, onTimeChange, children, ...props }) { + const RenderFace = () => { + if (children) + return children + else if (formTypeFace == "events") + return EventsDatePicker(props) + else + return PluvRegisterPicker(props) + } + + return ( + - {formTypeFace == "events" - ? EventsDatePicker(props) - : PluvRegisterPicker(props)} + + ); }