backend/src/controllers/SettingController.ts

@@ -20,14 +20,14 @@ export const index = async (req: Request, res: Response): Promise<Response> => {
 
   // const config = await SettingTicket.findAll();
 
-  return res.status(200).json({ settings });
+  return res.status(200).json({ settings, });
 };
 
 export const ticketSettings = async (
   req: Request,
   res: Response
 ): Promise<Response> => {
-  const { number } = req.params;
+  const { number } = req.params; 
 
   const config = await SettingTicket.findAll({ where: { number } });
 
@@ -40,7 +40,6 @@ export const updateTicketSettings = async (
 ): Promise<Response> => {
   const {
     number,
-    saturdayBusinessTime,
     outBusinessHours,
     ticketExpiration,
     weekend,
@@ -48,7 +47,7 @@ export const updateTicketSettings = async (
     sunday,
     holiday
   } = req.body;
-
+ 
   if (!number) throw new AppError("No number selected", 400);
 
   if (outBusinessHours && Object.keys(outBusinessHours).length > 0) {
@@ -59,14 +58,6 @@ export const updateTicketSettings = async (
     });
   }
 
-  if (saturdayBusinessTime && Object.keys(saturdayBusinessTime).length > 0) {
-    await updateSettingTicket({
-      ...saturdayBusinessTime,
-      key: "saturdayBusinessTime",
-      number
-    });
-  }
-
   if (ticketExpiration && Object.keys(ticketExpiration).length > 0) {
     await updateSettingTicket({
       ...ticketExpiration,

backend/src/database/seeds/20240328181254-add-setting-ticket-saturday-business-time.ts

@@ -1,25 +0,0 @@
-import { QueryInterface } from "sequelize";
-
-module.exports = {
-  up: (queryInterface: QueryInterface) => {
-    return queryInterface.bulkInsert(
-      "SettingTickets",
-      [
-        {
-          message: "",
-          startTime: new Date(),
-          endTime: new Date(),
-          value: "disabled",
-          key: "saturdayBusinessTime",
-          createdAt: new Date(),
-          updatedAt: new Date()
-        } 
-      ],
-      {}
-    );
-  },
-
-  down: (queryInterface: QueryInterface) => {
-    return queryInterface.bulkDelete("SettingTickets", {});
-  }
-};

backend/src/helpers/TicketConfig.ts

@@ -39,7 +39,7 @@ const isHoliday = async (number: string | number) => {
           locale: ptBR
         })
       )
-    );
+    ); 
 
     if (currentDate.fullDate == startTime.fullDate) {
       obj.set = true;
@@ -173,80 +173,8 @@ async function isOutBusinessTime(number: string | number) {
   return obj;
 }
 
-async function isOutBusinessTimeSaturday(number: string | number) {
+export {
-  let obj = { set: false, msg: "" };
+  isWeekend,
-
+  isHoliday,
-  const outBusinessHoursSaturday = await SettingTicket.findOne({
+  isOutBusinessTime
-    where: { key: "saturdayBusinessTime", number }
+};
-  });
-
-  let isWithinRange = false;
-
-  if (
-    true &&
-    outBusinessHoursSaturday
-    // outBusinessHoursSaturday &&
-    // outBusinessHoursSaturday.value == "enabled" &&
-    // outBusinessHoursSaturday?.message?.trim()?.length > 0
-  ) {
-    const ticketDateTimeUpdate = splitDateTime(
-      new Date(
-        _format(new Date(), "yyyy-MM-dd HH:mm:ss", {
-          locale: ptBR
-        })
-      )
-    );
-
-    const startTime = splitDateTime(
-      new Date(
-        _format(
-          new Date(outBusinessHoursSaturday.startTime),
-          "yyyy-MM-dd HH:mm:ss",
-          {
-            locale: ptBR
-          }
-        )
-      )
-    );
-
-    const endTime = splitDateTime(
-      new Date(
-        _format(
-          new Date(outBusinessHoursSaturday.endTime),
-          "yyyy-MM-dd HH:mm:ss",
-          {
-            locale: ptBR
-          }
-        )
-      )
-    );
-
-    const format = "HH:mm:ss";
-    const parsedStartTime = parse(
-      ticketDateTimeUpdate.fullTime,
-      format,
-      new Date()
-    );
-    const parsedEndTime = parse(startTime.fullTime, format, new Date());
-    const parsedTimeToCheck = parse(endTime.fullTime, format, new Date());
-    const timeInterval = { start: parsedStartTime, end: parsedEndTime };
-
-    // If the time range spans across different days, handle the date part
-    if (parsedEndTime < parsedStartTime) {
-      const nextDay = new Date(parsedStartTime);
-      nextDay.setDate(nextDay.getDate() + 1);
-      timeInterval.end = nextDay;
-    }
-
-    isWithinRange = isWithinInterval(parsedTimeToCheck, timeInterval);
-
-    if (!isWithinRange) {
-      obj.set = true;
-      obj.msg = outBusinessHoursSaturday.message;
-    }
-  }
-
-  return obj;
-}
-
-export { isWeekend, isHoliday, isOutBusinessTime, isOutBusinessTimeSaturday };

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -10,7 +10,6 @@ import path from "path";
 import {
   isHoliday,
   isOutBusinessTime,
-  isOutBusinessTimeSaturday,
   isWeekend
 } from "../../helpers/TicketConfig";
 
@@ -1222,13 +1221,6 @@ const outOfService = async (number: string) => {
     objs.push({ type: "holiday", msg: holiday.msg });
   }
 
-  // MESSAGE TO SATURDAY BUSINESS TIME
-  const businessTimeSaturday = await isOutBusinessTimeSaturday(number);
-
-  if (businessTimeSaturday && businessTimeSaturday.set) {
-    objs.push({ type: "saturdayBusinessTime", msg: businessTimeSaturday.msg });
-  }
-
   // MESSAGES TO SATURDAY OR SUNDAY
   const weekend: any = await isWeekend(number);
 

frontend/src/components/ConfigModal/index.js

@@ -77,16 +77,8 @@ const ConfigModal = ({ open, onClose, change }) => {
     const initialState = {
         startTimeBus: new Date(),
         endTimeBus: new Date(),
-
-        startTimeBusSaturday: new Date(),
-        endTimeBusSaturday: new Date(),
-
         messageBus: '',
-        messageBusSaturday: '',
-
         businessTimeEnable: false,
-        businessTimeEnableSaturday: false,
-
         ticketTimeExpiration: new Date(),
         ticketExpirationMsg: '',
         ticketExpirationEnable: false,
@@ -123,16 +115,13 @@ const ConfigModal = ({ open, onClose, change }) => {
                 if (!selectedNumber) return
 
                 const { data } = await api.get(`/settings/ticket/${selectedNumber}`)
-
+ 
                 if (data?.config && data.config.length === 0) {
                     setConfig(initialState)
                     return
                 }
 
                 const outBusinessHours = data.config.find((c) => c.key === "outBusinessHours")
-
-                const saturdayBusinessTime = data.config.find((c) => c.key === "saturdayBusinessTime")
-
                 const ticketExpiration = data.config.find((c) => c.key === "ticketExpiration")
                 const saturday = data.config.find((c) => c.key === "saturday")
                 const sunday = data.config.find((c) => c.key === "sunday")
@@ -145,11 +134,6 @@ const ConfigModal = ({ open, onClose, change }) => {
                     messageBus: outBusinessHours.message,
                     businessTimeEnable: outBusinessHours.value === 'enabled' ? true : false,
 
-                    startTimeBusSaturday: saturdayBusinessTime.startTime,
-                    endTimeBusSaturday: saturdayBusinessTime.endTime,
-                    messageBusSaturday: saturdayBusinessTime.message,
-                    businessTimeEnableSaturday: saturdayBusinessTime.value === 'enabled' ? true : false,
-
                     ticketTimeExpiration: ticketExpiration.startTime,
                     ticketExpirationMsg: ticketExpiration.message,
                     ticketExpirationEnable: ticketExpiration.value === 'enabled' ? true : false,
@@ -181,14 +165,6 @@ const ConfigModal = ({ open, onClose, change }) => {
                 message: values.messageBus,
                 value: values.businessTimeEnable ? 'enabled' : 'disabled'
             },
-
-            saturdayBusinessTime: {
-                startTime: values.startTimeBusSaturday,
-                endTime: values.endTimeBusSaturday,
-                message: values.messageBusSaturday,
-                value: values.businessTimeEnableSaturday ? 'enabled' : 'disabled'
-            },
-
             ticketExpiration: {
                 startTime: values.ticketTimeExpiration,
                 message: values.ticketExpirationMsg,
@@ -229,7 +205,7 @@ const ConfigModal = ({ open, onClose, change }) => {
         onClose()
         // setConfig(initialState)
     }
-  
+
     return (
         <div className={classes.root}>
             <Dialog
@@ -349,61 +325,6 @@ const ConfigModal = ({ open, onClose, change }) => {
                                     </div>
 
 
-                                    <br />
-                                    {/* SABADO INICIO */}
-                                    <div className={classes.multFieldLine}>
-                                        <Field
-                                            component={TimePicker}
-                                            name="startTimeBusSaturday"
-                                            label="Inicio atendimentos"
-                                            ampm={false}
-                                            openTo="hours"
-                                            views={['hours', 'minutes',]}
-                                            format="HH:mm"
-                                        />
-                                        {' '}
-                                        <Field
-                                            component={TimePicker}
-                                            name="endTimeBusSaturday"
-                                            label="Fim atendimento"
-                                            ampm={false}
-                                            openTo="hours"
-                                            views={['hours', 'minutes',]}
-                                            format="HH:mm"
-                                        />
-
-                                        <FormControlLabel
-                                            control={
-                                                <Field
-                                                    as={Switch}
-                                                    color="primary"
-                                                    name="businessTimeEnableSaturday"
-                                                    checked={values.businessTimeEnableSaturday}
-                                                />
-                                            }
-                                            label={'Ativar/Desativar'} />
-                                    </div>
-
-                                    <div>
-                                        <Field
-                                            as={TextField}
-                                            label={'Mensagem fora do horário de atendimento sábado'}
-                                            type="messageBusSaturday"
-                                            multiline
-                                            rows={5}
-                                            fullWidth
-                                            name="messageBusSaturday"
-                                            error={
-                                                touched.messageBusSaturday && Boolean(errors.messageBusSaturday)
-                                            }
-                                            helperText={
-                                                touched.messageBusSaturday && errors.messageBusSaturday
-                                            }
-                                            variant="outlined"
-                                            margin="dense"
-                                        />
-                                    </div>
-                                    {/* SABADO FIM */}
                                     <br />
 
 

frontend/src/pages/Dashboard/PieChart.js

@@ -72,7 +72,7 @@ const PieChart = ({ data = dataExample }) => {
   return (
     <Box width="100%" height="100%" position="relative" display="flex">
       <Box sx={{ position: "absolute" }}>
-        <Title>Tickets encerramento</Title>
+        <Title>Tickets status de encerramento</Title>
       </Box>
       <Box
         component="ul"

frontend/src/pages/Dashboard/index.js

@@ -293,7 +293,7 @@ const Dashboard = () => {
           dispatch({ type: "LOAD_QUERY", payload: data.usersProfile })
 
           const { data: ticketStatusChatEndData } = await api.get("/reports/count/statusChatEnd", {
-            params: { startDate: dateToday, endDate: dateToday },
+            params: { startDate: '2024-03-21', endDate: '2024-03-28' },
           })
 
           setTicketStatusChatEnd(ticketStatusChatEndData.reportStatusChatEnd)