adriano.andrade
/
projeto-hit
mirror of https://github.com/AdrianoRobson/projeto-hit.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/dashboardUpdate' into otimizacao_relatorio_csv

pull/20/head
adriano 2022-08-18 12:19:42 -03:00
parent fe66707827 76bc672314
commit dc46e0cfc9
2 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
frontend/src/pages/Dashboard/index.js
View File

@ -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"
>
<Typography component="h3" variant="h6" color="primary" paragraph>
{i18n.t("dashboard.messages.inAttendance.title")}
Aguardando
</Typography>
<Grid item>
<Typography component="h1" variant="h4">
{open}
{ticketsStatus.pending}
</Typography>
</Grid>
</Paper>
@ -378,16 +372,19 @@ const Dashboard = () => {
style={{ overflow: "hidden" }}
variant="outlined"
>
<Typography component="h3" variant="h6" color="primary" paragraph>
{i18n.t("dashboard.messages.waiting.title")}
<Typography component="h3" variant="h6" color="primary" style={{marginBottom:"0"}} paragraph>
Em Atendimento
</Typography>
<Typography paragraph style={{fontSize: "12px", margin:"0px"}}>Hoje/Todo Periodo</Typography>
<Grid item>
<Typography component="h1" variant="h4">
{pending}
{ticketsStatus.open}/{ticketsStatus.openAll}
</Typography>
</Grid>
</Paper>
</Grid>
<Grid item xs={12} sm={6} md={6} lg={4}>
<Paper
className={classes.customFixedHeightPaper}
@ -395,11 +392,11 @@ const Dashboard = () => {
variant="outlined"
>
<Typography component="h3" variant="h6" color="primary" paragraph>
{i18n.t("dashboard.messages.closed.title")}
Fechados
</Typography>
<Grid item>
<Typography component="h1" variant="h4">
{closed}
{ticketsStatus.closed}
</Typography>
</Grid>
</Paper>

32
frontend/src/pages/Report/index.js
View File

@ -667,24 +667,32 @@ const Report = () => {
{reportOption === '1' &&
<div>
<Button style={{display: "none"}}
{/* <Button style={{ display: "none" }}
variant="contained"
color="primary"
onClick={(e) => {
handleCSVMessages()
}}
>
{"CSV ALL"}
</Button>
> */}
<div>
<CSVLink
data={dataCSV}
headers={columns}
filename={'Relatorio_detalhado_atendimento_atendentes.csv'}
target={'_blank'}
ref={csvLink} />
</div>
{/* <Button
variant="contained"
color="primary"
onClick={(e) => {
handleCSVMessages()
}}
>
{"CSV ALL"}
</Button> */}
<div>
<CSVLink
data={dataCSV}
headers={columns}
filename={'Relatorio_detalhado_atendimento_atendentes.csv'}
target={'_blank'}
ref={csvLink} />
</div>
</div>
}