From 3d69fa84ef0d51a4d4fc0df2a1e9976f92a44cf5 Mon Sep 17 00:00:00 2001 From: adriano Date: Fri, 17 Jun 2022 19:48:05 -0300 Subject: [PATCH] =?UTF-8?q?Cria=C3=A7=C3=A3o=20do=20recurso=20de=20restri?= =?UTF-8?q?=C3=A7=C3=A3o=20para=20o=20admin=20n=C3=A3o=20editar=20a=20fila?= =?UTF-8?q?=20nem=20a=20conex=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TicketServices/ListTicketsService.ts | 18 +++++++++++++++++- frontend/src/rules.js | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/backend/src/services/TicketServices/ListTicketsService.ts b/backend/src/services/TicketServices/ListTicketsService.ts index d035792..d4fc1a6 100644 --- a/backend/src/services/TicketServices/ListTicketsService.ts +++ b/backend/src/services/TicketServices/ListTicketsService.ts @@ -1,5 +1,6 @@ import { Op, fn, where, col, Filterable, Includeable } from "sequelize"; -import { startOfDay, endOfDay, parseISO } from "date-fns"; +import { startOfDay, endOfDay, parseISO, format } from "date-fns"; +import ptBR from 'date-fns/locale/pt-BR'; import Ticket from "../../models/Ticket"; import Contact from "../../models/Contact"; @@ -7,6 +8,10 @@ import Message from "../../models/Message"; import Queue from "../../models/Queue"; import ShowUserService from "../UserServices/ShowUserService"; +import { splitDateTime } from "../../helpers/SplitDateTime"; +const dateToday = splitDateTime(new Date(format(new Date(), 'yyyy-MM-dd HH:mm:ss', { locale: ptBR }))) + + interface Request { searchParam?: string; pageNumber?: string; @@ -64,6 +69,17 @@ const ListTicketsService = async ({ ...whereCondition, status }; + + if (unlimited) { + whereCondition = { + ...whereCondition, + createdAt: { + [Op.gte]: dateToday.fullDate + ' 00:00:00.000000', + [Op.lte]: dateToday.fullDate + ' 23:59:59.999999' + } + } + } + } if (searchParam) { diff --git a/frontend/src/rules.js b/frontend/src/rules.js index ee543ed..fec35f1 100644 --- a/frontend/src/rules.js +++ b/frontend/src/rules.js @@ -5,7 +5,7 @@ const rules = { admin: { static: [ - "show-icon-edit-whatsapp", + //"show-icon-edit-whatsapp", "drawer-admin-items:view", "tickets-manager:showall",