From 0f3a0cdc0eaf2ab54f2a395bea83782937ed273f Mon Sep 17 00:00:00 2001 From: adriano Date: Mon, 14 Mar 2022 10:21:50 -0300 Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20do=20useEffect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ChatEnd/ModalChatEnd/index.js | 488 ++++++++---------- 1 file changed, 229 insertions(+), 259 deletions(-) diff --git a/frontend/src/components/ChatEnd/ModalChatEnd/index.js b/frontend/src/components/ChatEnd/ModalChatEnd/index.js index b2346fe..64036ee 100644 --- a/frontend/src/components/ChatEnd/ModalChatEnd/index.js +++ b/frontend/src/components/ChatEnd/ModalChatEnd/index.js @@ -123,7 +123,7 @@ const Modal = (props) => { const [schedulesContact, dispatch] = useReducer(reducer, []); const [currencyHourBefore, setCurrency] = useState(null); - const [currenciesTimeBefore, setCurrenciesTimeBefore] = useState( ); + const [currenciesTimeBefore, setCurrenciesTimeBefore] = useState(null); const handleCancel = (event, reason) => { @@ -159,68 +159,8 @@ const Modal = (props) => { function formatedTimeHour(timer){ return `${timer.getHours().toString().padStart(2, '0')}:${timer.getMinutes().toString().padStart(2, '0')}` } - - const hoursBeforeAvalible = (timer) =>{ - - let hours = [] - let hour = 1 - - if(startDate === dateCurrentFormated()){ - - console.log('HOJE++++') - - while(subHours(timer, hour).getHours()>=6 && - subHours(timer, hour).getHours()>=new Date().getHours() && - subHours(timer, hour).getHours()<=19){ - - console.log('******** TIMER: ', formatedTimeHour(subHours(timer,hour))) - - hours.push( - {value: formatedTimeHour(subHours(timer,hour)), - label: `${hour} HORA ANTES DO HORÁRIO DO AGENDAMENTO`}) - - hour++; - } - - if(hours.length>1){ - console.log('entrou----------------------: ', hours.length) - hours.pop() - setCurrency(hours[0].value) - } - else{ - setCurrency(null) - } - - } - else{ - - while(subHours(timer, hour).getHours()>=6 && subHours(timer, hour).getHours()<=19){ - - console.log('******** another day TIMER: ', formatedTimeHour(subHours(timer,hour))) - - hours.push( - {value: formatedTimeHour(subHours(timer,hour)), - label: `${hour} HORA ANTES DO HORÁRIO DO AGENDAMENTO`}) - - hour++; - } - - if(hours.length>0){ - console.log('entrou----------------------: ', hours.length) - setCurrency(hours[0].value) - } - else{ - setCurrency(null) - } - - } - return {time: hours, hour:hour} - - } - - const handleCloseConfirmationModal = () => { setConfirmModalOpen(false); @@ -243,12 +183,16 @@ const Modal = (props) => { const datePickerValue = (data) => { console.log('datePickerValue: ',(data)); setDatePicker(data) + + } // Get from child 3 const timerPickerValue = (data) => { console.log('timerPickerValue: ',(data)); setTimerPicker(data) + + } const dateCurrentFormated = () => { @@ -285,32 +229,11 @@ const dateCurrentFormated = () => { return - } - // else if(startDate === dateCurrentFormated()){ - // if( - // (new Date(subHours(timerPicker, 1)).getHours() <= new Date().getHours() && - // new Date(subHours(timerPicker, 1)).getMinutes() <= new Date().getMinutes()) || - - // (new Date(subHours(timerPicker, 1)).getHours() == new Date().getHours() && - // new Date(subHours(timerPicker, 1)).getMinutes() <= new Date().getMinutes()) - - // ) - // { - - // alert('Para agendamentos do dia, é necessário que o horário do lembrete seja no mínimo uma hora adiantado!') - - // return - // } - // } - - - + } props.func({ - 'scheduleId': scheduleId, - // 'schedulingDate': startDate+' '+formatedTimeHour(subHours(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:${timerPicker.getSeconds()}`), 1))+':00', - // 'schedulingDate': `${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:${timerPicker.getSeconds()}`, + 'scheduleId': scheduleId, 'schedulingDate': `${startDate} ${currencyHourBefore}:00`, 'schedulingTime': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), 'message': textArea1 @@ -347,20 +270,71 @@ const handleChangeHourBefore = (event) => { }; - - - - - -// Get from child 4 -// const textArea1Value = (data) => { -// console.log('textArea1Value: ',(data)); -// setTextArea1(data) -// } + useEffect(()=>{ - setCurrenciesTimeBefore(hoursBeforeAvalible(timerPicker).time) + const hoursBeforeAvalible = (timer) =>{ + + let hours = [] + let hour = 1 + + if(startDate === dateCurrentFormated()){ + + console.log('HOJE++++') + + while(subHours(timer, hour).getHours()>=6 && + subHours(timer, hour).getHours()>=new Date().getHours() && + subHours(timer, hour).getHours()<=19){ + + console.log('******** TIMER: ', formatedTimeHour(subHours(timer,hour))) + + hours.push( + {value: formatedTimeHour(subHours(timer,hour)), + label: `${hour} HORA ANTES DO HORÁRIO DO AGENDAMENTO`}) + + hour++; + } + + if(hours.length>1){ + console.log('entrou----------------------: ', hours.length) + hours.pop() + setCurrency(hours[0].value) + } + else{ + setCurrency(null) + } + + } + else{ + + while(subHours(timer, hour).getHours()>=6 && subHours(timer, hour).getHours()<=19){ + + console.log('******** another day TIMER: ', formatedTimeHour(subHours(timer,hour))) + + hours.push( + {value: formatedTimeHour(subHours(timer,hour)), + label: `${hour} HORA ANTES DO HORÁRIO DO AGENDAMENTO`}) + + hour++; + } + + if(hours.length>0){ + console.log('entrou----------------------: ', hours.length) + setCurrency(hours[0].value) + } + else{ + setCurrency(null) + } + + } + + + return {time: hours, hour:hour} + + } + + setCurrenciesTimeBefore(hoursBeforeAvalible(timerPicker).time) },[timerPicker, startDate]) @@ -382,7 +356,7 @@ useEffect(()=>{ setTextArea1('Boa noite, '+greetMessageSchedule( formatedTimeHour(new Date(timerPicker), 1))) } -},[currencyHourBefore, startDate]) +},[currencyHourBefore, startDate, timerPicker]) const handleChange = (event) => { @@ -393,186 +367,182 @@ const handleChange = (event) => { - return ( - + return ( - - - + scroll={scroll} + aria-labelledby="scroll-dialog-title" + aria-describedby="scroll-dialog-description" + > - {props.modal_header} - + {props.modal_header} + - - - + + + - - + + - - - Selecione uma opção para encerrar o Atendimento + + + Selecione uma opção para encerrar o Atendimento + + { + return {'value': obj.id, 'label': obj.name} + })}/> + + + + + + + {scheduleId==='2' && + + + + Lembrete de retorno + + - { - return {'value': obj.id, 'label': obj.name} - })}/> + - - - - - - {scheduleId==='2' && - - - - Lembrete de retorno - - - - - - - - + + + - - - {currencyHourBefore && - - - {currenciesTimeBefore.map((option) => ( - - {option.label} - - ))} - + + + {currencyHourBefore && + + + {currenciesTimeBefore.map((option) => ( + + {option.label} + + ))} + + + } + + + + + + + - } + } + + {schedulesContact.length>0 && - - - - - - } + - {schedulesContact.length>0 && - - - - - - handleDeleteSchedule(selectedSchedule.id)} - > - Deseja realmente deletar esse Agendamento? - - Agendamentos - - - - - - - Data - - - Hora - - - Deletar - - - - - - <> - {schedulesContact.map((scheduleData, index) => ( - - {scheduleData.schedulingDate.split(' ')[0]} - {scheduleData.schedulingTime.split(' ')[1]} - - - { - setSelectedSchedule(scheduleData); - setConfirmModalOpen(true); - - }} - > - - + handleDeleteSchedule(selectedSchedule.id)} + > + Deseja realmente deletar esse Agendamento? + + Agendamentos + +
+ + + + + Data + + + Hora + + + Deletar - - ))} - - -
-
-
} - - -
-
- - - -
- -
- -
-
- + + + + <> + {schedulesContact.map((scheduleData, index) => ( + + {scheduleData.schedulingDate.split(' ')[0]} + {scheduleData.schedulingTime.split(' ')[1]} + + + { + setSelectedSchedule(scheduleData); + setConfirmModalOpen(true); + + }} + > + + + + + + ))} + + + + + } + + + + + + + +
+ +
+ +
+ ); }