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}