From 74c3be6690c0a5a37a364f3665b4e1aeef98c9a7 Mon Sep 17 00:00:00 2001 From: adriano Date: Thu, 24 Mar 2022 19:16:31 -0300 Subject: [PATCH] =?UTF-8?q?Cria=C3=A7=C3=A3o=20do=20Delete=20e=20Update=20?= =?UTF-8?q?completo=20do=20recurso=20Lembrete?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/SchedulingNotifyController.ts | 30 ++- .../controllers/StatusChatEndController.ts | 12 ++ backend/src/routes/SchedulingNotifyRoutes.ts | 2 + backend/src/routes/index.ts | 5 +- backend/src/routes/statusChatEndRoutes.ts | 10 + .../CreateSchedulingNotifyService.ts | 85 +++++++-- .../components/ChatEnd/ModalChatEnd/index.js | 5 +- .../DatePicker2/index.js | 15 +- .../TimerPickerSelect2/index.js | 93 ++++++++++ .../ModalUpdateScheduleReminder/index.js | 104 +++-------- .../components/Report/SelectField/index.js | 10 +- frontend/src/pages/SchedulesReminder/index.js | 172 +++++++++++------- 12 files changed, 381 insertions(+), 162 deletions(-) create mode 100644 backend/src/controllers/StatusChatEndController.ts create mode 100644 backend/src/routes/statusChatEndRoutes.ts create mode 100644 frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js diff --git a/backend/src/controllers/SchedulingNotifyController.ts b/backend/src/controllers/SchedulingNotifyController.ts index 921e663..6c490ff 100644 --- a/backend/src/controllers/SchedulingNotifyController.ts +++ b/backend/src/controllers/SchedulingNotifyController.ts @@ -3,7 +3,7 @@ import AppError from "../errors/AppError"; import DeleteSchedulingNotifyService from "../services/SchedulingNotifyServices/DeleteSchedulingNotifyService"; import ListSchedulingNotifyContactService from "../services/SchedulingNotifyServices/ListSchedulingNotifyContactService"; - +import CreateSchedulingNotifyService from "../services/SchedulingNotifyServices/CreateSchedulingNotifyService"; // const test = await ListSchedulingNotifyContactService('5517988310949','2022-03-18','2022-03-19'); // const test = await ListSchedulingNotifyContactService('','2022-03-18','2022-03-19'); @@ -11,12 +11,17 @@ import ListSchedulingNotifyContactService from "../services/SchedulingNotifySer // console.log('$$$$$$$$$$$$$$$$$$$$$$$$$$ test:\n', test) + + + + type IndexQuery = { contactNumber: string; startDate: string; endDate: string; }; + export const reportScheduleNotifyByDateStartDateEnd = async (req: Request, res: Response): Promise => { @@ -30,6 +35,29 @@ export const reportScheduleNotifyByDateStartDateEnd = async (req: Request, res: }; + +export const createOrUpdateScheduleNotify = async (req: Request, res: Response): Promise => { + + const scheduleData = req.body; + + console.log(' +++++++++++ scheduleData: ', scheduleData) + + const schedulingNotifyCreate = await CreateSchedulingNotifyService( + { + schedulingNotifyId: scheduleData.schedulingNotifyId, + ticketId: scheduleData.ticketId, + statusChatEndId: scheduleData.statusChatEndId, + schedulingDate: scheduleData.schedulingDate, + schedulingTime: scheduleData.schedulingTime, + message: scheduleData.message + } + ) + console.group(':::::::::::::::::: DATA schedulingNotifyCreate:\n',schedulingNotifyCreate) + + return res.status(200).json(schedulingNotifyCreate); + +}; + export const remove = async ( req: Request, res: Response ): Promise => { console.log('EEEEEEEEEEEEEEEEEEEEEEEEEEE') diff --git a/backend/src/controllers/StatusChatEndController.ts b/backend/src/controllers/StatusChatEndController.ts new file mode 100644 index 0000000..a7ee259 --- /dev/null +++ b/backend/src/controllers/StatusChatEndController.ts @@ -0,0 +1,12 @@ +import { Request, Response } from "express"; +import AppError from "../errors/AppError"; + +import ListStatusChatEndService from "../services/StatusChatEndService/ListStatusChatEndService"; + +export const show = async (req: Request, res: Response): Promise => { + + const { statusChatEnd, count, hasMore } = await ListStatusChatEndService({ searchParam: "", pageNumber: "1" }); + + return res.status(200).json(statusChatEnd); +}; + \ No newline at end of file diff --git a/backend/src/routes/SchedulingNotifyRoutes.ts b/backend/src/routes/SchedulingNotifyRoutes.ts index affa282..ab0a203 100644 --- a/backend/src/routes/SchedulingNotifyRoutes.ts +++ b/backend/src/routes/SchedulingNotifyRoutes.ts @@ -7,6 +7,8 @@ const schedulingNotifiyRoutes = Router(); schedulingNotifiyRoutes.delete("/schedule/:scheduleId", isAuth, SchedulingNotifyController.remove); +schedulingNotifiyRoutes.post("/schedule", isAuth, SchedulingNotifyController.createOrUpdateScheduleNotify); + schedulingNotifiyRoutes.get("/schedules", isAuth, SchedulingNotifyController.reportScheduleNotifyByDateStartDateEnd); export default schedulingNotifiyRoutes; diff --git a/backend/src/routes/index.ts b/backend/src/routes/index.ts index 98bcf6b..e52ded1 100644 --- a/backend/src/routes/index.ts +++ b/backend/src/routes/index.ts @@ -12,6 +12,7 @@ import queueRoutes from "./queueRoutes"; import quickAnswerRoutes from "./quickAnswerRoutes"; import reportRoutes from "./reportRoutes"; import schedulingNotifiyRoutes from "./SchedulingNotifyRoutes"; +import statusChatEndRoutes from "./statusChatEndRoutes"; const routes = Router(); @@ -27,8 +28,8 @@ routes.use(whatsappSessionRoutes); routes.use(queueRoutes); routes.use(quickAnswerRoutes); -routes.use(schedulingNotifiyRoutes) +routes.use(schedulingNotifiyRoutes); routes.use(reportRoutes); - +routes.use(statusChatEndRoutes); export default routes; diff --git a/backend/src/routes/statusChatEndRoutes.ts b/backend/src/routes/statusChatEndRoutes.ts new file mode 100644 index 0000000..9eff396 --- /dev/null +++ b/backend/src/routes/statusChatEndRoutes.ts @@ -0,0 +1,10 @@ +import { Router } from "express"; +import isAuth from "../middleware/isAuth"; + +import * as StatusChatEnd from "../controllers/StatusChatEndController"; + +const statusChatEndRoutes = Router(); + +statusChatEndRoutes.get("/statusChatEnd", isAuth, StatusChatEnd.show); + +export default statusChatEndRoutes; \ No newline at end of file diff --git a/backend/src/services/SchedulingNotifyServices/CreateSchedulingNotifyService.ts b/backend/src/services/SchedulingNotifyServices/CreateSchedulingNotifyService.ts index 76518fb..a06365e 100644 --- a/backend/src/services/SchedulingNotifyServices/CreateSchedulingNotifyService.ts +++ b/backend/src/services/SchedulingNotifyServices/CreateSchedulingNotifyService.ts @@ -3,27 +3,88 @@ import SchedulingNotify from "../../models/SchedulingNotify"; interface Request { + schedulingNotifyId?: string, ticketId: string, statusChatEndId: string, schedulingDate: string, schedulingTime: string, message: string -} - - -const CreateSchedulingNotifyService = async ({ ticketId, statusChatEndId, schedulingDate, schedulingTime, message }: Request): Promise => { +} - const schedulingNotify = await SchedulingNotify.create( - { - ticketId, - statusChatEndId, - schedulingDate, - schedulingTime, - message + +const CreateSchedulingNotifyService = async ({ + schedulingNotifyId = '', + ticketId, + statusChatEndId, + schedulingDate, + schedulingTime, + message +}: Request): Promise => { + + let schedulingNotify = null; + + if(schedulingNotifyId){ + + console.log('000000000000000000000000000 ATUALIZOU!') - }) + schedulingNotify = await SchedulingNotify.findOne({ where: { id: schedulingNotifyId } }); + + if(schedulingNotify){ + + try{ + + await schedulingNotify.update({ statusChatEndId, schedulingDate, schedulingTime, message}); + + }catch(err){ + + throw new AppError("ERR_NO_SCHEDULING_NOTIFY_FOUND", 404); + + } + + + //await scheduleNotify.reload({attributes: ["id", "name"]}); + } + + } + + if(!schedulingNotify){ + + console.log('111111111111111111111111111 criou!') + + schedulingNotify = await SchedulingNotify.create( + { + ticketId, + statusChatEndId, + schedulingDate, + schedulingTime, + message + + }) + + } + return schedulingNotify } + + + + + +// const CreateSchedulingNotifyService = async ({ ticketId, statusChatEndId, schedulingDate, schedulingTime, message }: Request): Promise => { + +// const schedulingNotify = await SchedulingNotify.create( +// { +// ticketId, +// statusChatEndId, +// schedulingDate, +// schedulingTime, +// message + +// }) + +// return schedulingNotify +// } + export default CreateSchedulingNotifyService \ No newline at end of file diff --git a/frontend/src/components/ChatEnd/ModalChatEnd/index.js b/frontend/src/components/ChatEnd/ModalChatEnd/index.js index 3851d2f..1f76e06 100644 --- a/frontend/src/components/ChatEnd/ModalChatEnd/index.js +++ b/frontend/src/components/ChatEnd/ModalChatEnd/index.js @@ -318,6 +318,7 @@ const handleChange = (event) => { { return {'value': obj.id, 'label': obj.name} @@ -360,7 +361,7 @@ const handleChange = (event) => { } - {schedulesContact.length>0 && + {/* {schedulesContact.length>0 && @@ -423,7 +424,7 @@ const handleChange = (event) => { - } + } */} diff --git a/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js b/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js index 9002b42..9de3619 100644 --- a/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js +++ b/frontend/src/components/ModalUpdateScheduleReminder/DatePicker2/index.js @@ -21,12 +21,21 @@ function formatDateDatePicker(data){ String(new Date(data).getDate()).padStart(2,'0') } + +function formatDate(strDate){ + const date = strDate.split(' ')[0].split('/') + const time = strDate.split(' ')[1] + return `${date[2]}-${date[1]}-${date[0]} ${time}` +} + + function ResponsiveDatePickers(props) { - const [selectedDate, handleDateChange] = useState(null); - // props.func(formatDateDatePicker(selectedDate)); + console.log('schedulingDate schedulingDate schedulingDate: ', formatDate(props.schedulingDate)) - useEffect(()=>{ + const [selectedDate, handleDateChange] = useState(new Date(formatDate(props.schedulingDate))); + + useEffect(()=>{ if( !selectedDate ){ props.func(''); diff --git a/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js b/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js new file mode 100644 index 0000000..f02731d --- /dev/null +++ b/frontend/src/components/ModalUpdateScheduleReminder/TimerPickerSelect2/index.js @@ -0,0 +1,93 @@ + + + +// import React, { useState } from "react"; +// import { DateTimePicker, KeyboardDateTimePicker } from "@material-ui/pickers"; + +// function InlineDateTimePickerDemo(props) { +// const [selectedDate, handleDateChange] = useState(new Date("2018-01-01T00:00:00.000Z")); + +// return ( +// <> +// + +// +// +// ); +// } + +// export default InlineDateTimePickerDemo; + + + +import React, { Fragment, useState, useEffect } from "react"; +// import TextField from '@mui/material/TextField'; +import DateFnsUtils from '@date-io/date-fns'; + +import { + TimePicker, + MuiPickersUtilsProvider, +} from '@material-ui/pickers'; + + +import ptBrLocale from "date-fns/locale/pt-BR"; + + +function formatDate(strDate){ + const date = strDate.split(' ')[0].split('/') + const time = strDate.split(' ')[1] + return `${date[2]}-${date[1]}-${date[0]} ${time}` +} + + +const ResponsiveTimePickers = (props) => { + + const [value, setValue] = useState(new Date(new Date(formatDate(props.schedulingDate)))); + + // props.func(value); + + useEffect(()=>{ + + props.func(value); + + }, [value, props]) + + return ( + + + + + { + setValue(newValue); + }} + // Ativar se necessario + // renderInput={(params) => } + + /> + + + + + ); +} + +export default ResponsiveTimePickers diff --git a/frontend/src/components/ModalUpdateScheduleReminder/index.js b/frontend/src/components/ModalUpdateScheduleReminder/index.js index 4b36f61..865689e 100644 --- a/frontend/src/components/ModalUpdateScheduleReminder/index.js +++ b/frontend/src/components/ModalUpdateScheduleReminder/index.js @@ -11,7 +11,7 @@ import Box from '@mui/material/Box'; import SelectField from "../Report/SelectField"; import DatePicker from './DatePicker2' -import TimerPickerSelect from '../ChatEnd/TimerPickerSelect' +import TimerPickerSelect from './TimerPickerSelect2' import TextareaAutosize from '@mui/material/TextareaAutosize'; // import { subHours } from "date-fns"; @@ -112,9 +112,9 @@ const Modal = (props) => { const [open, setOpen] = useState(true); const [scroll, /*setScroll*/] = useState('body'); const [statusChatEndId, setStatusChatEnd] = useState(null) - const [startDate, setDatePicker] = useState(props.schedulingTime ? new Date(props.schedulingTime) : new Date()) + const [startDate, setDatePicker] = useState(props.rowData.schedulingTime ? new Date(props.rowData.schedulingTime) : new Date()) const [timerPicker, setTimerPicker] = useState(new Date()) - const [textArea1, setTextArea1] = useState() + const [textArea1, setTextArea1] = useState(props.rowData.message) const [schedulesContact, dispatch] = useReducer(reducer, []); @@ -135,7 +135,7 @@ const Modal = (props) => { (async () => { try { - const { data } = await api.get("/tickets/" + props.ticketId); + const { data } = await api.get("/tickets/" + props.rowData.ticketId); dispatch({ type: "LOAD_SCHEDULES", payload: data.schedulesContact }); @@ -233,15 +233,30 @@ const timerPickerValue = (data) => { } dataSendServer = { + 'schedulingNotifyId': props.rowData.id, 'statusChatEndId': statusChatEndId, 'schedulingDate': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), 'schedulingTime': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), 'message': textArea1 } + + const formatDateTimeBrazil = (dateTime) => { + let date = dateTime.split(' ')[0] + let time = dateTime.split(' ')[1] + date = date.split('-') + return `${date[2]}/${date[1]}/${date[0]} ${time}` + } + + + props.rowData['schedulingDate'] = formatDateTimeBrazil(`${dataSendServer['schedulingDate']}:00`) + props.rowData['schedulingTime'] = formatDateTimeBrazil(`${dataSendServer['schedulingTime']}:00`) + props.rowData['message'] = textArea1 + + } - props.func(dataSendServer) + props.func(dataSendServer, props.rowData) setOpen(false); }; @@ -317,6 +332,7 @@ const handleChange = (event) => { { return {'value': obj.id, 'label': obj.name} @@ -337,12 +353,17 @@ const handleChange = (event) => { - + + + @@ -365,72 +386,7 @@ const handleChange = (event) => { } - - {schedulesContact.length>0 && !props.update && - - - - - - handleDeleteSchedule(selectedSchedule.id)} - > - Deseja realmente deletar esse Lembrete? - - Lembretes - - - - - - - Data - - - Hora - - - Mensagem - - - Deletar - - - - - - <> - {schedulesContact.map((scheduleData, index) => ( - - {scheduleData.schedulingDate.split(' ')[0]} - {scheduleData.schedulingTime.split(' ')[1]} - {scheduleData.message} - - - - { - setSelectedSchedule(scheduleData); - setConfirmModalOpen(true); - - }} - > - - - - - - ))} - - -
- - } - + diff --git a/frontend/src/components/Report/SelectField/index.js b/frontend/src/components/Report/SelectField/index.js index 5dd4cdc..df5dec5 100644 --- a/frontend/src/components/Report/SelectField/index.js +++ b/frontend/src/components/Report/SelectField/index.js @@ -7,9 +7,15 @@ import TextField from '@mui/material/TextField'; const SelectTextFields = (props) => { - const [currency, setCurrency] = useState(props.emptyField ? '0' : '1'); + // const [currency, setCurrency] = useState(props.emptyField ? '0' : '1'); - if(props.emptyField){ + console.log(':::::::::::::::::::::: props.textBoxFieldSelected: ', props.textBoxFieldSelected) + + const [currency, setCurrency] = useState(props.textBoxFieldSelected ? props.textBoxFieldSelected: '0'); + + // const [currency, setCurrency] = useState(props.textBoxFieldSelected); + + if(!props.textBoxFieldSelected){ props.currencies.push({ 'value': 0, 'label': ''}) } diff --git a/frontend/src/pages/SchedulesReminder/index.js b/frontend/src/pages/SchedulesReminder/index.js index 1f03d1d..547193b 100644 --- a/frontend/src/pages/SchedulesReminder/index.js +++ b/frontend/src/pages/SchedulesReminder/index.js @@ -90,28 +90,28 @@ const reducerQ = (state, action) =>{ -const reducer = (state, action) => { +// const reducer = (state, action) => { - if (action.type === "LOAD_SCHEDULES") { - const users = action.payload; - const newUsers = []; +// if (action.type === "LOAD_STATUS_CHAT_END") { +// const users = action.payload; +// const newUsers = []; - users.forEach((user) => { - const userIndex = state.findIndex((u) => u.id === user.id); - if (userIndex !== -1) { - state[userIndex] = user; - } else { - newUsers.push(user); - } - }); +// users.forEach((user) => { +// const userIndex = state.findIndex((u) => u.id === user.id); +// if (userIndex !== -1) { +// state[userIndex] = user; +// } else { +// newUsers.push(user); +// } +// }); - return [...state, ...newUsers]; - } +// return [...state, ...newUsers]; +// } - if (action.type === "RESET") { - return []; - } -}; +// if (action.type === "RESET") { +// return []; +// } +// }; @@ -150,17 +150,17 @@ Item.propTypes = { -let columnsData = [ +// let columnsData = [ - { title: 'Foto', field: 'ticket.contact.profilePicUrl', render: rowData => }, +// { title: 'Foto', field: 'ticket.contact.profilePicUrl', render: rowData => }, - { title: 'Nome', field: 'ticket.contact.name' }, - { title: 'Contato', field: 'ticket.contact.number' }, - { title: 'schedulingTime', field: 'schedulingTime' }, - { title: 'schedulingDate', field: 'schedulingDate' }, - { title: 'message', field: 'message' }, +// { title: 'Nome', field: 'ticket.contact.name' }, +// { title: 'Contato', field: 'ticket.contact.number' }, +// { title: 'schedulingTime', field: 'schedulingTime' }, +// { title: 'schedulingDate', field: 'schedulingDate' }, +// { title: 'message', field: 'message' }, - ]; +// ]; @@ -171,10 +171,10 @@ const SchedulesReminder = () => { //-------- const [searchParam] = useState(""); - //const [loading, setLoading] = useState(false); + const [loading, setLoading] = useState(null); //const [hasMore, setHasMore] = useState(false); const [pageNumber, setPageNumber] = useState(1); - const [users, dispatch] = useReducer(reducer, []); + // const [users, dispatch] = useReducer(reducer, []); //const [columns, setColums] = useState([]) const [startDate, setDatePicker1] = useState(new Date()) const [endDate, setDatePicker2] = useState(new Date()) @@ -192,45 +192,47 @@ const SchedulesReminder = () => { useEffect(() => { - dispatch({ type: "RESET" }); + // dispatch({ type: "RESET" }); dispatchQ({ type: "RESET" }) setPageNumber(1); }, [searchParam]); + + //natalia useEffect(() => { - //setLoading(true); + // setLoading(true); const delayDebounceFn = setTimeout(() => { - const fetchUsers = async () => { + const fetchStatusChatEnd = async () => { try { - const { data } = await api.get("/users/", { + const statusChatEndLoad = await api.get("/statusChatEnd", { params: { searchParam, pageNumber }, }); - dispatch({ type: "LOAD_SCHEDULES", payload: data.users }); + // dispatch({ type: "LOAD_STATUS_CHAT_END", payload: statusChatEndLoad.data }); + + console.log(':::::::::::::: statusChatEndLoad: ', statusChatEndLoad.data) + + setStatusEndChat(statusChatEndLoad.data) //setHasMore(data.hasMore); - //setLoading(false); + // setLoading(false); } catch (err) { console.log(err); } }; - fetchUsers(); + fetchStatusChatEnd(); }, 500); return () => clearTimeout(delayDebounceFn); }, [searchParam, pageNumber]); - useEffect(() => { - setData(query) - - }, [query]) useEffect(() => { - //setLoading(true); + setLoading(true); const delayDebounceFn = setTimeout(() => { @@ -241,10 +243,7 @@ const SchedulesReminder = () => { dispatchQ({ type: "RESET" }) dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data }); - - // setStatusEndChat(dataQuery.data.statusEndChat) - - //setLoading(false); + setLoading(false); } catch (err) { console.log(err); @@ -257,6 +256,17 @@ const SchedulesReminder = () => { return () => clearTimeout(delayDebounceFn); }, [contactNumber, startDate, endDate]); + + + + useEffect(() => { + + if(!loading){ + console.log('carregando table...') + setData(query) + } + + }, [loading]) // Get from child 1 @@ -291,6 +301,7 @@ const handleClear = () => { const handleCloseConfirmationModal = () => { setConfirmModalOpen(false); + console.log('cancelou NULL 1') setSelectedSchedule(null); }; @@ -315,22 +326,45 @@ const handleDeleteSchedule = async (scheduleId) => { } catch (err) { toastError(err); } + console.log('cancelou NULL 2') + setSelectedSchedule(null); +}; + + + +const handleUpdateSchedule = async (scheduleData, rowsDataNew) => { + try { + await api.post("/schedule", scheduleData); + toast.success(("Lembrete atualizado com sucesso!")); + ////////////////// + + const dataUpdate = [...dataRows]; + const index = rowsDataNew.tableData['id']; + dataUpdate[index] = rowsDataNew; + setData([...dataUpdate]); + + ///////////////// + + + } catch (err) { + toastError(err); + } + //console.log('cancelou NULL 3') setSelectedSchedule(null); }; -const chatEndVal = (data) => { +const chatEndVal = (data, rowsDataNew) => { if(data){ console.log('DATA SCHECULE: ', data) + + console.log(':::::::::::::::::::: ChatEnd2: ',(data)); + console.log(':::::::::::::::::::: Rows data fro child: ',(rowsDataNew)); - // data = {...data, 'ticketId': ticket.id} + handleUpdateSchedule(data, rowsDataNew) - // console.log('ChatEnd: ',(data)); - - // handleUpdateTicketStatus(null, "closed", user?.id, data) - } } @@ -341,12 +375,9 @@ const handleModal = (rowData) => { render() }; @@ -403,13 +434,8 @@ const handleModal = (rowData) => { display: 'grid', }}> - - - {/* */} + + { }, + + { title: 'Nome', field: 'ticket.contact.name' }, + { title: 'Contato', field: 'ticket.contact.number' }, + { title: 'schedulingTime', field: 'schedulingTime' }, + { title: 'schedulingDate', field: 'schedulingDate' }, + { title: 'message', field: 'message' }, + + ] + } data={dataRows} // icons={tableIcons} @@ -431,9 +469,11 @@ const handleModal = (rowData) => { icon: Edit, tooltip: 'Editar', onClick: (event, rowData) => { - console.log("You saved ",rowData) - handleModal(rowData) + console.log("You want edit data ",rowData) + setSelectedSchedule(rowData); + handleModal(rowData) } + }, { icon: Delete,