Alteração para consultas nos campos usuario, dataInicio, dataFim. Atenção: Houve um bug nesse até esse commit que está impedindo que o whatssap seja lido pelo qrcode

pull/1/head
adriano 2022-01-25 18:54:46 -03:00
parent 39453e791d
commit 1b4347d585
4 changed files with 43 additions and 29 deletions

View File

@ -9,7 +9,7 @@ const reportRoutes = express.Router();
//reportRoutes.get("/reports/:userId", /*isAuth,*/ ReportController.reportUser);
reportRoutes.get("/reports", /*isAuth,*/ ReportController.reportUserByDateStartDateEnd);
reportRoutes.get("/reports", /*isAuth,*/ ReportController.reportUserByDateStartDateEnd);
//reportRoutes.get("/reports", /*isAuth,*/ ReportController.reportAll);

View File

@ -7,31 +7,44 @@ import Queue from "../../models/Queue";
import Message from "../../models/Message";
import { userInfo } from "os";
import { Op } from "sequelize";
import { Op, where } from "sequelize";
import { Sequelize } from "sequelize";
import moment from 'moment';
import { startOfDay, endOfDay, parseISO, getDate} from "date-fns";
import { string } from "yup/lib/locale";
//Report by user, startDate, endDate
const ShowTicketReport = async (id: string | number, startDate: string, endDate: string): Promise<Ticket[]> => {
let where_clause = {}
const ticket = await Ticket.findAll({
where: {
userid: id,
//createdAt: {
// [Op.between]: [+new Date('2022-01-24').toISOString(), +new Date().toISOString()]
//},
if(id=='0'){
where_clause = {
createdAt: {
[Op.gte]: startDate+' 00:00:00.000000',
[Op.lte]: endDate +' 23:59:59.999999'
}
},
}
}
else{
where_clause = {
userid: id,
createdAt: {
[Op.gte]: startDate+' 00:00:00.000000',
[Op.lte]: endDate +' 23:59:59.999999'
},
}
}
},
const ticket = await Ticket.findAll({
attributes: ['id', 'status', 'createdAt', 'updatedAt'],
where: where_clause ,
attributes: ['id', 'status', 'createdAt', 'updatedAt'],
include: [
{
model: Message,

View File

@ -8,15 +8,11 @@ import React from 'react';
const MTable = (props) => {
const [selectedRow, setSelectedRow] = useState(null);
console.log('rederizou....................: ',props.data)
const [selectedRow, setSelectedRow] = useState(null);
const dataLoad = props.data.map((dt) => { return { ...dt }});
const columnsLoad = props.columns.map((column) => { return { ...column }});
console.log('dataLoad....................: ',dataLoad)
console.log('columnsLoad....................: ',columnsLoad)
const columnsLoad = props.columns.map((column) => { return { ...column }});
useEffect(() => {
@ -29,7 +25,8 @@ const MTable = (props) => {
<MaterialTable
title='Relatorio'
columns={columnsLoad}
data={dataLoad}
data={dataLoad}
onRowClick={(evt, selectedRow) => {
@ -47,7 +44,9 @@ const MTable = (props) => {
options={{
search: true,
selection: false,
paging: false,
paging: false,
padding: 'dense',
//loadingType: 'linear',
searchFieldStyle: {
width: 300,
},

View File

@ -176,14 +176,15 @@ const Report = () => {
const [query, dispatchQ] = useReducer(reducerQ, [])
useEffect(() => {
dispatch({ type: "RESET" });
dispatch({ type: "RESET" });
dispatchQ({ type: "RESET" })
setPageNumber(1);
}, [searchParam]);
useEffect(() => {
setLoading(true);
setLoading(true);
const delayDebounceFn = setTimeout(() => {
const fetchUsers = async () => {
@ -191,7 +192,7 @@ const Report = () => {
const { data } = await api.get("/users/", {
params: { searchParam, pageNumber },
});
dispatch({ type: "LOAD_USERS", payload: data.users });
setHasMore(data.hasMore);
setLoading(false);
@ -216,10 +217,10 @@ const Report = () => {
const fetchQueries = async () => {
try {
const dataQuery = await api.get("/reports/", {params: {userId, startDate, endDate },});
console.log('fffffffffffffffffffff query: ', dataQuery.data)
dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data });
/*const dataQuery = await api.get("/reports/", {params: {userId, startDate, endDate },});
dispatchQ({ type: "RESET" })
dispatchQ({ type: "LOAD_QUERY", payload: dataQuery.data }); */
setLoading(false);
@ -272,8 +273,9 @@ console.log('XXXXXXXXX: ', query)
return (
<MainContainer>
<Box sx={{ display: 'grid', gridTemplateColumns: 'repeat(3, 1fr)' }}>
<Item><SelectField func={textFieldSelectUser} currencies={users.map((obj)=>{