diff --git a/frontend/src/pages/Dashboard/index.js b/frontend/src/pages/Dashboard/index.js index 30bdb24..8e1918b 100644 --- a/frontend/src/pages/Dashboard/index.js +++ b/frontend/src/pages/Dashboard/index.js @@ -207,9 +207,7 @@ const Dashboard = () => { const classes = useStyles(); const [usersOnlineInfo, dispatch] = useReducer(reducer, []); const [ticketStatusChange, setStatus] = useState(); - const [open, setOpen] = useState(0); - const [closed, setClosed] = useState(0); - const [pending, setPending] = useState(0); + const [ticketsStatus, setTicktsStatus] = useState({ open: 0, openAll: 0, pending: 0, closed: 0 }); const { user } = useContext(AuthContext); @@ -296,25 +294,21 @@ const Dashboard = () => { params: { status: "closed", date: dateToday }, }); const _pending = await api.get("/tickets/count", { - params: { status: "pending", date: dateToday }, + params: { status: "pending" }, }); - - const _openAll = await api.get("/tickets/count", { params: { status: "open" }, }); - - const _pendingAll = await api.get("/tickets/count", { - params: { status: "pending"}, + setTicktsStatus({ + open: _open.data.count, + openAll: _openAll.data.count, + closed: _closed.data.count, + pending: _pending.data.count, }); - - console.log('EM ATENDIMENTO TOTAL _openAll: ',_openAll.data) - console.log('AGUARDANDO TOTAL _pendingAll: ',_pendingAll.data) - - setOpen(_open.data.count); - setClosed(_closed.data.count); - setPending(_pending.data.count); + // setOpen(_open.data.count); + // setClosed(_closed.data.count); + // setPending(_pending.data.count); } catch (err) { console.log(err); } @@ -363,11 +357,11 @@ const Dashboard = () => { variant="outlined" > - {i18n.t("dashboard.messages.inAttendance.title")} + Aguardando - {open} + {ticketsStatus.pending} @@ -378,16 +372,19 @@ const Dashboard = () => { style={{ overflow: "hidden" }} variant="outlined" > - - {i18n.t("dashboard.messages.waiting.title")} + + Em Atendimento + Hoje/Todo Periodo + - {pending} + {ticketsStatus.open}/{ticketsStatus.openAll} + { variant="outlined" > - {i18n.t("dashboard.messages.closed.title")} + Fechados - {closed} + {ticketsStatus.closed} diff --git a/frontend/src/pages/Report/index.js b/frontend/src/pages/Report/index.js index 8476a78..c3cc642 100644 --- a/frontend/src/pages/Report/index.js +++ b/frontend/src/pages/Report/index.js @@ -18,7 +18,7 @@ import MaterialTable from 'material-table'; import LogoutIcon from '@material-ui/icons/CancelOutlined'; - + import { CSVLink } from "react-csv"; @@ -474,10 +474,10 @@ const Report = () => { setProfile('user') } - }, [reportOption]) - + }, [reportOption]) - const handleCSVMessages = () => { + + const handleCSVMessages = () => { const fetchQueries = async () => { @@ -485,7 +485,7 @@ const Report = () => { const dataQuery = await api.get("/reports/messages", { params: { userId, startDate, endDate }, }); - console.log('dataQuery messages: ', dataQuery.data) + console.log('dataQuery messages: ', dataQuery.data) if (dataQuery.data.length > 0) { @@ -498,11 +498,11 @@ const Report = () => { else { dataCSVFormat[i].fromMe = 'Cliente' } - } + } setDataCSV(dataCSVFormat) - setIsMount(false); - } + setIsMount(false); + } } catch (err) { console.log(err); @@ -536,10 +536,10 @@ const Report = () => { const socket = openSocket(process.env.REACT_APP_BACKEND_URL); - socket.on("onlineStatus", (data) => { + socket.on("onlineStatus", (data) => { let date = new Date().toLocaleDateString('pt-BR').split('/') - let dateToday = `${date[2]}-${date[1]}-${date[0]}` + let dateToday = `${date[2]}-${date[1]}-${date[0]}` if (data.action === "logout" || (data.action === "update" && ((`${startDate}` === `${endDate}`) && (`${endDate}` === `${dateToday}`) && (`${startDate}` === `${dateToday}`)))) { @@ -551,7 +551,7 @@ const Report = () => { } else if (data.action === "delete") { dispatchQ({ type: "DELETE_USER_STATUS", payload: data.userOnlineTime }); - } + } }); @@ -599,8 +599,8 @@ const Report = () => { // ))) // } - setData(query.map((column) => { return { ...column } })) - + setData(query.map((column) => { return { ...column } })) + }, [query]) @@ -632,7 +632,7 @@ const Report = () => { // ' | clientHeight: ', clientHeight, // ' | scrollHeight - (scrollTop + 1): ', scrollHeight - (scrollTop + 1)) - if (scrollHeight - (scrollTop + 1) < clientHeight) { + if (scrollHeight - (scrollTop + 1) < clientHeight) { loadMore(); @@ -667,30 +667,38 @@ const Report = () => { {reportOption === '1' &&
- + > */} -
- -
+ {/* */} + +
+ +
} - +