Alteração em node redundante do banco de dados Schedules e alteração no código com referência a esse nome

pull/1/head
adriano 2022-03-22 23:59:01 -03:00
parent 7020d15c70
commit 9e8c9be17d
20 changed files with 599 additions and 61 deletions

View File

@ -24,7 +24,7 @@ export const reportScheduleNotifyByDateStartDateEnd = async (req: Request, res:
const data_query = await ListSchedulingNotifyContactService(contactNumber, startDate, endDate); const data_query = await ListSchedulingNotifyContactService(contactNumber, startDate, endDate);
console.group('DATA QUERY SCHEDULE:\n',data_query) // console.group('DATA QUERY SCHEDULE:\n',data_query)
return res.status(200).json(data_query); return res.status(200).json(data_query);

View File

@ -33,7 +33,7 @@ interface TicketData {
} }
import ListScheduleService from "../services/ScheduleService/ListScheduleService"; import ListStatusChatEndService from "../services/StatusChatEndService/ListStatusChatEndService";
export const index = async (req: Request, res: Response): Promise<Response> => { export const index = async (req: Request, res: Response): Promise<Response> => {
const { const {
@ -93,19 +93,14 @@ export const show = async (req: Request, res: Response): Promise<Response> => {
const contact = await ShowTicketService(ticketId); const contact = await ShowTicketService(ticketId);
const { schedules, count, hasMore } = await ListScheduleService({ searchParam: "", pageNumber: "1" }); const { statusChatEnd, count, hasMore } = await ListStatusChatEndService({ searchParam: "", pageNumber: "1" });
////////////////// //////////////////
const schedulesContact = await ListSchedulingNotifyContactService(contact.contact.number); const schedulesContact = await ListSchedulingNotifyContactService(contact.contact.number);
///////////////// /////////////////
// console.log('############### schedulesContact: ', schedulesContact)
// console.log('############### contact.contact.number: ',contact.contact.number)
// return res.status(200).json(contact); return res.status(200).json({contact, statusChatEnd, schedulesContact});
return res.status(200).json({contact, schedules, schedulesContact});
}; };
@ -143,11 +138,11 @@ export const update = async ( req: Request, res: Response ): Promise<Response> =
// lembrete // lembrete
const scheduleData = JSON.parse(schedulingNotifyData) const scheduleData = JSON.parse(schedulingNotifyData)
if( scheduleData.scheduleId === '2'){ if( scheduleData.statusChatEndId === '2'){
const schedulingNotifyCreate = await CreateSchedulingNotifyService( const schedulingNotifyCreate = await CreateSchedulingNotifyService(
{ {
ticketId: scheduleData.ticketId, ticketId: scheduleData.ticketId,
scheduleId: scheduleData.scheduleId, statusChatEndId: scheduleData.statusChatEndId,
schedulingDate: scheduleData.schedulingDate, schedulingDate: scheduleData.schedulingDate,
schedulingTime: scheduleData.schedulingTime, schedulingTime: scheduleData.schedulingTime,
message: scheduleData.message message: scheduleData.message

View File

@ -12,7 +12,7 @@ import UserQueue from "../models/UserQueue";
import QuickAnswer from "../models/QuickAnswer"; import QuickAnswer from "../models/QuickAnswer";
import SchedulingNotify from "../models/SchedulingNotify"; import SchedulingNotify from "../models/SchedulingNotify";
import Schedule from "../models/Schedule"; import StatusChatEnd from "../models/StatusChatEnd";
// eslint-disable-next-line // eslint-disable-next-line
@ -35,7 +35,7 @@ const models = [
QuickAnswer, QuickAnswer,
SchedulingNotify, SchedulingNotify,
Schedule, StatusChatEnd,
]; ];
sequelize.addModels(models); sequelize.addModels(models);

View File

@ -0,0 +1,11 @@
import { QueryInterface, DataTypes } from "sequelize";
module.exports = {
up: (queryInterface: QueryInterface) => {
return queryInterface.renameTable("Schedules", "StatusChatEnd");
},
down: (queryInterface: QueryInterface) => {
return queryInterface.renameTable("StatusChatEnd", "Schedules");
}
};

View File

@ -0,0 +1,11 @@
import { QueryInterface, DataTypes } from "sequelize";
module.exports = {
up: (queryInterface: QueryInterface) => {
return queryInterface.renameColumn("SchedulingNotifies", "scheduleId", "statusChatEndId");
},
down: (queryInterface: QueryInterface) => {
return queryInterface.renameColumn("SchedulingNotifies", "statusChatEndId", "scheduleId");
}
};

View File

@ -0,0 +1,11 @@
import { QueryInterface, DataTypes } from "sequelize";
module.exports = {
up: (queryInterface: QueryInterface) => {
return queryInterface.renameTable("StatusChatEnd", "StatusChatEnds");
},
down: (queryInterface: QueryInterface) => {
return queryInterface.renameTable("StatusChatEnds", "StatusChatEnd");
}
};

View File

@ -0,0 +1,23 @@
import { QueryInterface, DataTypes } from "sequelize";
module.exports = {
up: (queryInterface: QueryInterface) => {
return queryInterface.changeColumn("SchedulingNotifies", "statusChatEndId", {
type: DataTypes.INTEGER,
references: { model: "StatusChatEnds", key: "id" },
onUpdate: "CASCADE",
onDelete: "CASCADE",
allowNull: false
});
},
down: (queryInterface: QueryInterface) => {
return queryInterface.changeColumn("SchedulingNotifies", "statusChatEndId", {
type: DataTypes.INTEGER,
references: { model: "Schedules", key: "id" },
onUpdate: "CASCADE",
onDelete: "CASCADE",
allowNull: false
});
}
};

View File

@ -3,7 +3,7 @@ import { QueryInterface } from "sequelize";
module.exports = { module.exports = {
up: (queryInterface: QueryInterface) => { up: (queryInterface: QueryInterface) => {
return queryInterface.bulkInsert( return queryInterface.bulkInsert(
"Schedules", "StatusChatEnd",
[ [
{ {
name: "SEM RETORNO DO CLIENTE", name: "SEM RETORNO DO CLIENTE",
@ -21,6 +21,6 @@ module.exports = {
}, },
down: (queryInterface: QueryInterface) => { down: (queryInterface: QueryInterface) => {
return queryInterface.bulkDelete("Schedules", {}); return queryInterface.bulkDelete("StatusChatEnd", {});
} }
}; };

View File

@ -10,7 +10,7 @@ import {
BelongsTo BelongsTo
} from "sequelize-typescript"; } from "sequelize-typescript";
import Schedule from "./Schedule"; import StatusChatEnd from "./StatusChatEnd";
import Ticket from "./Ticket"; import Ticket from "./Ticket";
@Table @Table
@ -20,12 +20,12 @@ import {
@Column @Column
id: number; id: number;
@ForeignKey(() => Schedule) @ForeignKey(() => StatusChatEnd)
@Column @Column
scheduleId: number; statusChatEndId: number;
@BelongsTo(() => Schedule) @BelongsTo(() => StatusChatEnd)
schedule: Schedule; statusChatEnd: StatusChatEnd;
@ForeignKey(() => Ticket) @ForeignKey(() => Ticket)

View File

@ -12,7 +12,7 @@ import {
import SchedulingNotify from "./SchedulingNotify"; import SchedulingNotify from "./SchedulingNotify";
@Table @Table
class Schedule extends Model<Schedule> { class StatusChatEnd extends Model<StatusChatEnd> {
@PrimaryKey @PrimaryKey
@AutoIncrement @AutoIncrement
@Column @Column
@ -31,5 +31,5 @@ import {
SchedulingNotifies: SchedulingNotify[]; SchedulingNotifies: SchedulingNotify[];
} }
export default Schedule; export default StatusChatEnd;

View File

@ -4,27 +4,19 @@ import SchedulingNotify from "../../models/SchedulingNotify";
interface Request { interface Request {
ticketId: string, ticketId: string,
scheduleId: string, statusChatEndId: string,
schedulingDate: string, schedulingDate: string,
schedulingTime: string, schedulingTime: string,
message: string message: string
} }
const CreateSchedulingNotifyService = async ( const CreateSchedulingNotifyService = async ({ ticketId, statusChatEndId, schedulingDate, schedulingTime, message }: Request): Promise<SchedulingNotify> => {
{
ticketId,
scheduleId,
schedulingDate,
schedulingTime,
message
}: Request): Promise<SchedulingNotify> => {
const schedulingNotify = await SchedulingNotify.create( const schedulingNotify = await SchedulingNotify.create(
{ {
ticketId, ticketId,
scheduleId, statusChatEndId,
schedulingDate, schedulingDate,
schedulingTime, schedulingTime,
message message

View File

@ -112,7 +112,7 @@ const ListSchedulingNotifyContactService = async (contactNumber: string = '', st
raw: true, raw: true,
where: where_clause_notify, where: where_clause_notify,
attributes:['id', [Sequelize.fn("DATE_FORMAT",Sequelize.col("schedulingDate"),"%d/%m/%Y %H:%i:%s"),"schedulingDate"], attributes:['id', 'ticketId', [Sequelize.fn("DATE_FORMAT",Sequelize.col("schedulingDate"),"%d/%m/%Y %H:%i:%s"),"schedulingDate"],
[Sequelize.fn("DATE_FORMAT",Sequelize.col("schedulingTime"),"%d/%m/%Y %H:%i:%s"),"schedulingTime"], 'message'], [Sequelize.fn("DATE_FORMAT",Sequelize.col("schedulingTime"),"%d/%m/%Y %H:%i:%s"),"schedulingTime"], 'message'],
include: [ include: [

View File

@ -1,5 +1,5 @@
import { Sequelize } from "sequelize"; import { Sequelize } from "sequelize";
import Schedule from "../../models/Schedule"; import StatusChatEnd from "../../models/StatusChatEnd";
interface Request { interface Request {
searchParam?: string; searchParam?: string;
@ -7,7 +7,7 @@ interface Request {
} }
interface Response { interface Response {
schedules: Schedule[]; statusChatEnd: StatusChatEnd[];
count: number; count: number;
hasMore: boolean; hasMore: boolean;
} }
@ -23,7 +23,7 @@ interface Request {
const limit = 20; const limit = 20;
const offset = limit * (+pageNumber - 1); const offset = limit * (+pageNumber - 1);
const { count, rows: schedules } = await Schedule.findAndCountAll({ const { count, rows: statusChatEnd } = await StatusChatEnd.findAndCountAll({
where: whereCondition, where: whereCondition,
attributes: ['id', 'name'], attributes: ['id', 'name'],
limit, limit,
@ -31,10 +31,10 @@ interface Request {
order: [["id", "ASC"]] order: [["id", "ASC"]]
}); });
const hasMore = count > offset + schedules.length; const hasMore = count > offset + statusChatEnd.length;
return { return {
schedules, statusChatEnd,
count, count,
hasMore hasMore
}; };

View File

@ -1,4 +1,4 @@
import { subHours, subMinutes } from "date-fns"; import { subHours, subMinutes, subSeconds } from "date-fns";
import { Op } from "sequelize"; import { Op } from "sequelize";
import Contact from "../../models/Contact"; import Contact from "../../models/Contact";
import Ticket from "../../models/Ticket"; import Ticket from "../../models/Ticket";

View File

@ -112,14 +112,12 @@ const Modal = (props) => {
const [open, setOpen] = useState(true); const [open, setOpen] = useState(true);
const [scroll, /*setScroll*/] = useState('body'); const [scroll, /*setScroll*/] = useState('body');
const [scheduleId, setScheduling] = useState(null) const [statusChatEndId, setStatusChatEnd] = useState(null)
const [startDate, setDatePicker] = useState(new Date()) const [startDate, setDatePicker] = useState(new Date())
const [timerPicker, setTimerPicker] = useState(new Date()) const [timerPicker, setTimerPicker] = useState(new Date())
const [textArea1, setTextArea1] = useState() const [textArea1, setTextArea1] = useState()
const [data] = useState(props.schedules)
const [schedulesContact, dispatch] = useReducer(reducer, []); const [schedulesContact, dispatch] = useReducer(reducer, []);
@ -200,12 +198,12 @@ const timerPickerValue = (data) => {
const handleChatEnd = (event, reason) => { const handleChatEnd = (event, reason) => {
let dataSendServer = {'scheduleId': scheduleId} let dataSendServer = {'statusChatEndId': statusChatEndId}
if (reason && reason === "backdropClick") if (reason && reason === "backdropClick")
return; return;
if (scheduleId === '2'){ if (statusChatEndId === '2'){
console.log('Entrou! textArea1: ', textArea1) console.log('Entrou! textArea1: ', textArea1)
@ -236,7 +234,7 @@ const timerPickerValue = (data) => {
} }
dataSendServer = { dataSendServer = {
'scheduleId': scheduleId, 'statusChatEndId': statusChatEndId,
'schedulingDate': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), 'schedulingDate': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)),
'schedulingTime': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)), 'schedulingTime': startDate+' '+formatedTimeHour(new Date(`${startDate} ${timerPicker.getHours()}:${timerPicker.getMinutes()}:00`)),
'message': textArea1 'message': textArea1
@ -264,7 +262,7 @@ const timerPickerValue = (data) => {
// Get from child 1 // Get from child 1
const textFieldSelect = (data) => { const textFieldSelect = (data) => {
console.log('textFieldSelect: ',data); console.log('textFieldSelect: ',data);
setScheduling(data) setStatusChatEnd(data)
} }
@ -321,7 +319,7 @@ const handleChange = (event) => {
<SelectField func={textFieldSelect} <SelectField func={textFieldSelect}
emptyField={false} emptyField={false}
header={'Opções de encerramento do atendimento'} header={'Opções de encerramento do atendimento'}
currencies={data.map((obj)=>{ currencies={props.statusChatEnd.map((obj)=>{
return {'value': obj.id, 'label': obj.name} return {'value': obj.id, 'label': obj.name}
})}/> })}/>
@ -330,7 +328,7 @@ const handleChange = (event) => {
</Box> </Box>
{scheduleId==='2' && {statusChatEndId==='2' &&
<Item> <Item>

View File

@ -0,0 +1,450 @@
import React, { useState, useEffect, useRef, useReducer } from 'react';
import Button from '@mui/material/Button';
import Dialog from '@mui/material/Dialog';
import DialogActions from '@mui/material/DialogActions';
import DialogContent from '@mui/material/DialogContent';
import DialogContentText from '@mui/material/DialogContentText';
import DialogTitle from '@mui/material/DialogTitle';
import PropTypes from 'prop-types';
import Box from '@mui/material/Box';
import SelectField from "../Report/SelectField";
import DatePicker from './DatePicker2'
import TimerPickerSelect from '../ChatEnd/TimerPickerSelect'
import TextareaAutosize from '@mui/material/TextareaAutosize';
// import { subHours } from "date-fns";
import {
IconButton,
Paper,
Table,
TableBody,
TableCell,
TableHead,
TableRow,
} from "@material-ui/core";
import { DeleteOutline } from "@material-ui/icons";
import { toast } from "react-toastify";
import api from "../../services/api";
import toastError from "../../errors/toastError";
import ConfirmationModal from "../ConfirmationModal";
const reducer = (state, action) => {
if (action.type === "LOAD_SCHEDULES") {
const schedulesContact = action.payload;
const newSchedules= [];
schedulesContact.forEach((schedule) => {
const scheduleIndex = state.findIndex((s) => s.id === schedule.id);
if (scheduleIndex !== -1) {
state[scheduleIndex] = schedule;
} else {
newSchedules.push(schedule);
}
});
return [...state, ...newSchedules];
}
if (action.type === "DELETE_SCHEDULE") {
const scheduleId = action.payload;
const scheduleIndex = state.findIndex((q) => q.id === scheduleId);
if (scheduleIndex !== -1) {
state.splice(scheduleIndex, 1);
}
return [...state];
}
if (action.type === "RESET") {
return [];
}
};
const Item = (props) => {
const { sx, ...other } = props;
return (
<Box
sx={{
bgcolor: (theme) => (theme.palette.mode === 'dark' ? '#101010' : '#fff'),
color: (theme) => (theme.palette.mode === 'dark' ? 'grey.300' : 'grey.800'),
border: '1px solid',
borderColor: (theme) =>
theme.palette.mode === 'dark' ? 'grey.800' : 'grey.300',
p: 1,
m: 1,
borderRadius: 2,
fontSize: '0.875rem',
fontWeight: '700',
...sx,
}}
{...other}
/>
);
}
Item.propTypes = {
sx: PropTypes.oneOfType([
PropTypes.arrayOf(
PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool]),
),
PropTypes.func,
PropTypes.object,
]),
};
const Modal = (props) => {
const [selectedSchedule, setSelectedSchedule] = useState(null);
const [confirmModalOpen, setConfirmModalOpen] = useState(false);
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 [timerPicker, setTimerPicker] = useState(new Date())
const [textArea1, setTextArea1] = useState()
const [schedulesContact, dispatch] = useReducer(reducer, []);
const handleCancel = (event, reason) => {
if (reason && reason === "backdropClick")
return;
setOpen(false);
};
useEffect(() => {
(async () => {
try {
const { data } = await api.get("/tickets/" + props.ticketId);
dispatch({ type: "LOAD_SCHEDULES", payload: data.schedulesContact });
} catch (err) {
toastError(err);
}
})();
}, [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}`;
}
const handleCloseConfirmationModal = () => {
setConfirmModalOpen(false);
setSelectedSchedule(null);
};
const handleDeleteSchedule = async (scheduleId) => {
try {
await api.delete(`/schedule/${scheduleId}`);
toast.success(("Lembrete deletado com sucesso!"));
dispatch({ type: "DELETE_SCHEDULE", payload: scheduleId });
} catch (err) {
toastError(err);
}
setSelectedSchedule(null);
};
// Get from child 2
const datePickerValue = (data) => {
console.log('datePickerValue: ',(data));
setDatePicker(data)
}
// Get from child 3
const timerPickerValue = (data) => {
console.log('timerPickerValue: ',(data));
setTimerPicker(data)
}
const handleChatEnd = (event, reason) => {
let dataSendServer = {'statusChatEndId': statusChatEndId}
if (reason && reason === "backdropClick")
return;
if (statusChatEndId === '2'){
console.log('Entrou! textArea1: ', textArea1)
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 = {
'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
}
}
props.func(dataSendServer)
setOpen(false);
};
const descriptionElementRef = useRef(null);
useEffect(() => {
if (open) {
const { current: descriptionElement } = descriptionElementRef;
if (descriptionElement !== null) {
descriptionElement.focus();
}
}
}, [open]);
// Get from child 1
const textFieldSelect = (data) => {
console.log('textFieldSelect: ',data);
setStatusChatEnd(data)
}
const handleChange = (event) => {
setTextArea1(event.target.value);
};
return (
<Dialog
open={open}
onClose={handleCancel}
// fullWidth={true}
// maxWidth={true}
disableEscapeKeyDown
scroll={scroll}
aria-labelledby="scroll-dialog-title"
aria-describedby="scroll-dialog-description"
>
<DialogTitle id="scroll-dialog-title">{props.modal_header}</DialogTitle>
<DialogContent dividers={scroll === 'body'}>
<DialogContentText
id="scroll-dialog-description"
ref={descriptionElementRef}
tabIndex={-1}
>
</DialogContentText>
<Box
sx={{
width: 500,
height: '100%',
// backgroundColor: 'primary.dark',
// '&:hover': {backgroundColor: 'primary.main', opacity: [0.9, 0.8, 0.7],},
}}>
<Box sx={{
display: 'grid',
}}>
<Item>
<span>Selecione uma opção para encerrar o Atendimento</span>
<SelectField func={textFieldSelect}
emptyField={false}
header={'Opções de encerramento do atendimento'}
currencies={props.statusChatEnd.map((obj)=>{
return {'value': obj.id, 'label': obj.name}
})}/>
</Item>
</Box>
{statusChatEndId==='2' &&
<Item>
<span>Lembrete</span>
<Box sx={{ display: 'grid', gridTemplateColumns: 'repeat(2, 1fr)' }}>
<Item><DatePicker
func={datePickerValue}
minDate={true}
startEmpty={false}
title={'Data do lembrete'}/>
</Item>
<Item><TimerPickerSelect func={timerPickerValue} title={'Hora do lembrete'}/></Item>
</Box>
<Box sx={{display: 'flex', flexDirection: 'column' }}>
<Item>
<TextareaAutosize
aria-label="minimum height"
minRows={3}
value={textArea1}
placeholder={'Mensagem de envio para cliente'}
onChange={ handleChange}
style={{ width: '100%' }}
/>
</Item>
</Box>
</Item>
}
{schedulesContact.length>0 && !props.update &&
<Item>
<ConfirmationModal
title={selectedSchedule && `Deletar lembrete do dia ${selectedSchedule.schedulingTime.split(' ')[0]} ${selectedSchedule.schedulingTime.split(' ')[1]} ?`}
open={confirmModalOpen}
onClose={handleCloseConfirmationModal}
onConfirm={() => handleDeleteSchedule(selectedSchedule.id)}
>
<span>Deseja realmente deletar esse Lembrete? </span>
</ConfirmationModal>
<span>Lembretes</span>
<Paper variant="outlined">
<Table size="small">
<TableHead>
<TableRow>
<TableCell align="center">
Data
</TableCell>
<TableCell align="center">
Hora
</TableCell>
<TableCell align="center">
Mensagem
</TableCell>
<TableCell align="center">
Deletar
</TableCell>
</TableRow>
</TableHead>
<TableBody>
<>
{schedulesContact.map((scheduleData, index) => (
<TableRow key={scheduleData.id}>
<TableCell align="center">{scheduleData.schedulingDate.split(' ')[0]}</TableCell>
<TableCell align="center">{scheduleData.schedulingTime.split(' ')[1]}</TableCell>
<TableCell align="center">{scheduleData.message}</TableCell>
<TableCell align="center">
<IconButton
size="small"
onClick={() => {
setSelectedSchedule(scheduleData);
setConfirmModalOpen(true);
}}
>
<DeleteOutline />
</IconButton>
</TableCell>
</TableRow>
))}
</>
</TableBody>
</Table>
</Paper>
</Item>}
</Box>
</DialogContent>
<DialogActions>
<div style={{marginRight:'50px'}}>
<Button onClick={handleCancel}>Cancelar</Button>
</div>
<Button onClick={handleChatEnd}>Ok</Button>
</DialogActions>
</Dialog>
);
}
export default Modal

View File

@ -83,7 +83,7 @@ const Ticket = () => {
const [contact, setContact] = useState({}); const [contact, setContact] = useState({});
const [ticket, setTicket] = useState({}); const [ticket, setTicket] = useState({});
const [schedule, setSchedule] = useState({}) const [statusChatEnd, setStatusChatEnd] = useState({})
useEffect(() => { useEffect(() => {
setLoading(true); setLoading(true);
@ -101,7 +101,7 @@ const Ticket = () => {
setContact(data.contact.contact); setContact(data.contact.contact);
setTicket(data.contact); setTicket(data.contact);
setSchedule(data.schedules) setStatusChatEnd(data.statusChatEnd)
setLoading(false); setLoading(false);
} catch (err) { } catch (err) {
@ -172,7 +172,7 @@ const Ticket = () => {
/> />
</div> </div>
<div className={classes.ticketActionButtons}> <div className={classes.ticketActionButtons}>
<TicketActionButtons ticket={ticket} schedule={schedule}/> <TicketActionButtons ticket={ticket} statusChatEnd={statusChatEnd}/>
</div> </div>
</TicketHeader> </TicketHeader>
<ReplyMessageProvider> <ReplyMessageProvider>

View File

@ -27,7 +27,7 @@ const useStyles = makeStyles(theme => ({
}, },
})); }));
const TicketActionButtons = ({ ticket, schedule }) => { const TicketActionButtons = ({ ticket, statusChatEnd }) => {
const classes = useStyles(); const classes = useStyles();
const history = useHistory(); const history = useHistory();
const [anchorEl, setAnchorEl] = useState(null); const [anchorEl, setAnchorEl] = useState(null);
@ -63,7 +63,7 @@ const TicketActionButtons = ({ ticket, schedule }) => {
render(<Modal render(<Modal
modal_header={'Finalização de Atendimento'} modal_header={'Finalização de Atendimento'}
func={chatEndVal} func={chatEndVal}
schedules={schedule} statusChatEnd={statusChatEnd}
ticketId={ticket.id} ticketId={ticket.id}
/>) />)

View File

@ -23,6 +23,13 @@ import Delete from '@material-ui/icons/Delete';
import Edit from '@material-ui/icons/Edit'; import Edit from '@material-ui/icons/Edit';
import Save from '@material-ui/icons/Save'; import Save from '@material-ui/icons/Save';
import Dialog from '@mui/material/Dialog';
import { render } from '@testing-library/react';
// import Modal from "../../../..ChatEnd/ModalChatEnd";
import Modal from "../../components/ModalUpdateScheduleReminder";
import { import {
IconButton, IconButton,
Paper, Paper,
@ -85,7 +92,7 @@ const reducerQ = (state, action) =>{
const reducer = (state, action) => { const reducer = (state, action) => {
if (action.type === "LOAD_USERS") { if (action.type === "LOAD_SCHEDULES") {
const users = action.payload; const users = action.payload;
const newUsers = []; const newUsers = [];
@ -181,6 +188,8 @@ const SchedulesReminder = () => {
const [confirmModalOpen, setConfirmModalOpen] = useState(false); const [confirmModalOpen, setConfirmModalOpen] = useState(false);
const [dataRows, setData] = useState([]); const [dataRows, setData] = useState([]);
const [statusEndChat, setStatusEndChat] = useState(null)
useEffect(() => { useEffect(() => {
dispatch({ type: "RESET" }); dispatch({ type: "RESET" });
@ -200,7 +209,7 @@ const SchedulesReminder = () => {
params: { searchParam, pageNumber }, params: { searchParam, pageNumber },
}); });
dispatch({ type: "LOAD_USERS", payload: data.users }); dispatch({ type: "LOAD_SCHEDULES", payload: data.users });
//setHasMore(data.hasMore); //setHasMore(data.hasMore);
//setLoading(false); //setLoading(false);
} catch (err) { } catch (err) {
@ -233,6 +242,8 @@ const SchedulesReminder = () => {
dispatchQ({ type: "RESET" }) dispatchQ({ type: "RESET" })
dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data }); dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data });
// setStatusEndChat(dataQuery.data.statusEndChat)
//setLoading(false); //setLoading(false);
} catch (err) { } catch (err) {
@ -307,6 +318,39 @@ const handleDeleteSchedule = async (scheduleId) => {
setSelectedSchedule(null); setSelectedSchedule(null);
}; };
const chatEndVal = (data) => {
if(data){
console.log('DATA SCHECULE: ', data)
// data = {...data, 'ticketId': ticket.id}
// console.log('ChatEnd: ',(data));
// handleUpdateTicketStatus(null, "closed", user?.id, data)
}
}
const handleModal = (rowData) => {
render(<Modal
modal_header={'Editar Lembrete/Agendamentos'}
func={chatEndVal}
statusChatEnd={statusEndChat}
ticketId={rowData.ticketId}
update={true}
schedulingDate={rowData.schedulingDate}
schedulingTime={rowData.schedulingTime}
message={rowData.message}
/>)
};
return ( return (
@ -386,7 +430,10 @@ const handleDeleteSchedule = async (scheduleId) => {
{ {
icon: Edit, icon: Edit,
tooltip: 'Editar', tooltip: 'Editar',
onClick: (event, rowData) => console.log("You saved ",rowData) onClick: (event, rowData) => {
console.log("You saved ",rowData)
handleModal(rowData)
}
}, },
{ {
icon: Delete, icon: Delete,