From 43b3d31724a3c684ea722798fc3647b791e6fc75 Mon Sep 17 00:00:00 2001 From: adriano Date: Thu, 17 Mar 2022 08:58:22 -0300 Subject: [PATCH] =?UTF-8?q?Remo=C3=A7=C3=A3o=20do=20agendamento=20e=20refa?= =?UTF-8?q?tora=C3=A7=C3=A3o=20do=20c=C3=B3digo=20para=20o=20lembrete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/controllers/TicketController.ts | 2 +- .../20220221193811-create-scheduling-data.ts | 2 +- .../components/ChatEnd/ModalChatEnd/index.js | 235 +++++------------- .../components/TicketActionButtons/index.js | 3 +- 4 files changed, 68 insertions(+), 174 deletions(-) diff --git a/backend/src/controllers/TicketController.ts b/backend/src/controllers/TicketController.ts index 639de72..d4274d1 100644 --- a/backend/src/controllers/TicketController.ts +++ b/backend/src/controllers/TicketController.ts @@ -139,7 +139,7 @@ export const update = async ( req: Request, res: Response ): Promise = } /////////////////////////////// - // agendamento + // lembrete const scheduleData = JSON.parse(schedulingNotifyData) if( scheduleData.scheduleId === '2'){ diff --git a/backend/src/database/seeds/20220221193811-create-scheduling-data.ts b/backend/src/database/seeds/20220221193811-create-scheduling-data.ts index f218004..de1fc6e 100644 --- a/backend/src/database/seeds/20220221193811-create-scheduling-data.ts +++ b/backend/src/database/seeds/20220221193811-create-scheduling-data.ts @@ -11,7 +11,7 @@ module.exports = { updatedAt: new Date() }, { - name: "AGENDAMENTO À CONFIRMAR", + name: "LEMBRETE", createdAt: new Date(), updatedAt: new Date() } diff --git a/frontend/src/components/ChatEnd/ModalChatEnd/index.js b/frontend/src/components/ChatEnd/ModalChatEnd/index.js index 64036ee..0b2fb27 100644 --- a/frontend/src/components/ChatEnd/ModalChatEnd/index.js +++ b/frontend/src/components/ChatEnd/ModalChatEnd/index.js @@ -9,12 +9,11 @@ import DialogTitle from '@mui/material/DialogTitle'; import PropTypes from 'prop-types'; import Box from '@mui/material/Box'; import SelectField from "../../Report/SelectField"; -import TextFieldSelectHourBefore from '@mui/material/TextField'; -import MenuItem from '@mui/material/MenuItem'; + import DatePicker from '../../Report/DatePicker' import TimerPickerSelect from '../TimerPickerSelect' import TextareaAutosize from '@mui/material/TextareaAutosize'; -import { subHours } from "date-fns"; +// import { subHours } from "date-fns"; @@ -121,9 +120,7 @@ const Modal = (props) => { const [data] = useState(props.schedules) const [schedulesContact, dispatch] = useReducer(reducer, []); - - const [currencyHourBefore, setCurrency] = useState(null); - const [currenciesTimeBefore, setCurrenciesTimeBefore] = useState(null); + const handleCancel = (event, reason) => { @@ -148,17 +145,20 @@ const Modal = (props) => { toastError(err); } })(); - }, [props]); - - - - function greetMessageSchedule(scheduleDate){ - return `podemos confirmar sua consulta agendada para hoje às ${scheduleDate}?` - } + }, [props]); + function formatedTimeHour(timer){ return `${timer.getHours().toString().padStart(2, '0')}:${timer.getMinutes().toString().padStart(2, '0')}` } + + function formatedFullCurrentDate(){ + let dateCurrent = new Date() + let day = dateCurrent.getDate().toString().padStart(2, '0'); + let month = (dateCurrent.getMonth()+1).toString().padStart(2, '0'); + let year = dateCurrent.getFullYear(); + return `${year}-${month}-${day}`; + } @@ -171,7 +171,7 @@ const Modal = (props) => { const handleDeleteSchedule = async (scheduleId) => { try { await api.delete(`/schedule/${scheduleId}`); - toast.success(("Agendamento deletado com sucesso!")); + toast.success(("Lembrete deletado com sucesso!")); dispatch({ type: "DELETE_SCHEDULE", payload: scheduleId }); } catch (err) { toastError(err); @@ -195,50 +195,55 @@ const timerPickerValue = (data) => { } -const dateCurrentFormated = () => { - - let date = new Date() - let day = date.getDate().toString().padStart(2, '0'); - let month = (date.getMonth()+1).toString().padStart(2, '0'); - let year = date.getFullYear(); - - return `${year}-${month}-${day}` - -} + const handleChatEnd = (event, reason) => { - + + let dataSendServer = {'scheduleId': scheduleId} if (reason && reason === "backdropClick") return; - if (scheduleId === '1'){ - } - else if(textArea1 && textArea1.trim().length<10){ - alert('Mensagem muito curta!\nMínimo 10 caracteres.') - return - } - else if((new Date(timerPicker).getHours() > 20 && new Date(timerPicker).getMinutes() > 0) || - (new Date(timerPicker).getHours() < 7)){ - alert('Horário comercial inválido!\n Selecione um horário de lembrete válido entre às 07:00 e 20:00') - return - } - else if(!currencyHourBefore){ + if (scheduleId === '2'){ - alert('Para agendamentos do dia corrente, essa funcionalidade atende a agendeamentos com no mínimo 2 horas adiantado a partir da hora atual!') + console.log('Entrou! textArea1: ', textArea1) + - return + if(textArea1 && textArea1.trim().length<5){ + alert('Mensagem muito curta!') + return + } + else if(!textArea1){ + alert('Defina uma mensagem para enviar para o cliente!') + return + } + else if(formatedFullCurrentDate()===startDate){ + + if((new Date(timerPicker).getHours() < new Date().getHours() && new Date(timerPicker).getMinutes() <= new Date().getMinutes()) || + (new Date(timerPicker).getHours() === new Date().getHours() && new Date(timerPicker).getMinutes() <= new Date().getMinutes()) || + (new Date(timerPicker).getHours() < new Date().getHours() && new Date(timerPicker).getMinutes() >= new Date().getMinutes()) || + (new Date(timerPicker).getHours() < new Date().getHours)){ + alert('Horário menor ou igual horário atual!') + return + } + + } + else if((new Date(timerPicker).getHours() > 20 && new Date(timerPicker).getMinutes() > 0) || + (new Date(timerPicker).getHours() < 6)){ + alert('Horário comercial inválido!\n Selecione um horário de lembrete válido entre às 06:00 e 20:00') + return + } + + dataSendServer = { + 'scheduleId': scheduleId, + 'schedulingDate': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), + 'schedulingTime': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), + 'message': textArea1 + } } - - - props.func({ - 'scheduleId': scheduleId, - 'schedulingDate': `${startDate} ${currencyHourBefore}:00`, - 'schedulingTime': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), - 'message': textArea1 - }); - + + props.func(dataSendServer) setOpen(false); }; @@ -261,104 +266,9 @@ const textFieldSelect = (data) => { setScheduling(data) } - -const handleChangeHourBefore = (event) => { - - console.log('textFihandleChangeHourBefore: ',event.target.value); - - setCurrency(event.target.value); - -}; - + -useEffect(()=>{ - - 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]) - - -useEffect(()=>{ - - console.log('CURRENCY HOUR BEFORE: ', `${startDate} ${currencyHourBefore}:00`) - - let auxDate = new Date(`${startDate} ${currencyHourBefore}:00`) - - if (parseInt(auxDate.getHours()) > 11 && parseInt(auxDate.getHours()) < 18){ - - setTextArea1('Boa tarde, '+greetMessageSchedule( formatedTimeHour(new Date(timerPicker), 1))) - } - else if(parseInt(auxDate.getHours()) < 12){ - setTextArea1('Bom dia, '+greetMessageSchedule( formatedTimeHour(new Date(timerPicker), 1))) - } - else if(parseInt(auxDate.getHours()) > 17){ - setTextArea1('Boa noite, '+greetMessageSchedule( formatedTimeHour(new Date(timerPicker), 1))) - } - -},[currencyHourBefore, startDate, timerPicker]) - - const handleChange = (event) => { setTextArea1(event.target.value); @@ -423,38 +333,18 @@ const handleChange = (event) => { - Lembrete de retorno + Lembrete - + - + - - - {currencyHourBefore && - - - {currenciesTimeBefore.map((option) => ( - - {option.label} - - ))} - - - } - + { onClose={handleCloseConfirmationModal} onConfirm={() => handleDeleteSchedule(selectedSchedule.id)} > - Deseja realmente deletar esse Agendamento? + Deseja realmente deletar esse Lembrete? - Agendamentos + Lembrete @@ -497,6 +387,9 @@ const handleChange = (event) => { Hora + + Mensagem + Deletar @@ -509,6 +402,8 @@ const handleChange = (event) => { {scheduleData.schedulingDate.split(' ')[0]} {scheduleData.schedulingTime.split(' ')[1]} + {scheduleData.message} + { handleUpdateTicketStatus(null, "closed", user?.id, data) - } - + } }