From 9de076f060d14576ad48bb019736221ac633fe24 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Fri, 6 Jan 2023 09:56:23 -0800
Subject: [PATCH] IO-2132 Updated approach to ATS summary.

---
 bodyshop_translations.babel                   |  2 +-
 .../schedule-ats-summary.component.jsx        | 35 ++++++++++++-------
 .../schedule-calendar.component.jsx           |  7 ++--
 .../redux/application/application.sagas.js    | 15 --------
 client/src/translations/en_us/common.json     |  2 +-
 5 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1f8f8bb05..412419163 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
diff --git a/client/src/components/schedule-ats-summary/schedule-ats-summary.component.jsx b/client/src/components/schedule-ats-summary/schedule-ats-summary.component.jsx
index 2e01783fe..6362e12e3 100644
--- a/client/src/components/schedule-ats-summary/schedule-ats-summary.component.jsx
+++ b/client/src/components/schedule-ats-summary/schedule-ats-summary.component.jsx
@@ -1,11 +1,9 @@
 import { Space } from "antd";
-import React from "react";
+import React, { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { selectScheduleLoad } from "../../redux/application/application.selectors";
-import queryString from "query-string";
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   scheduleLoad: selectScheduleLoad,
@@ -14,20 +12,33 @@ const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-export function ScheduleAtsSummary({ scheduleLoad }) {
+export function ScheduleAtsSummary({ scheduleLoad, appointments }) {
   const { t } = useTranslation();
-  const search = queryString.parse(useLocation().search);
 
-  if (
-    (search.view === undefined || search.view === "week") &&
-    scheduleLoad.atsSummary &&
-    Object.keys(scheduleLoad.atsSummary).length > 0
-  )
+  const atsSummary = useMemo(() => {
+    let atsSummary = {};
+    if (!appointments || appointments.length === 0) {
+      return {};
+    }
+    appointments
+      .filter((a) => a.isintake)
+      .forEach((a) => {
+        if (!a.job.alt_transport) return;
+        if (!atsSummary[a.job.alt_transport]) {
+          atsSummary[a.job.alt_transport] = 1;
+        } else {
+          atsSummary[a.job.alt_transport] = atsSummary[a.job.alt_transport] + 1;
+        }
+      });
+    return atsSummary;
+  }, [appointments]);
+
+  if (Object.keys(atsSummary).length > 0)
     return (
       <Space wrap>
         {t("schedule.labels.atssummary")}
-        {Object.keys(scheduleLoad.atsSummary).map((key) => (
-          <span key={key}>{`${key}: ${scheduleLoad.atsSummary[key]}`}</span>
+        {Object.keys(atsSummary).map((key) => (
+          <span key={key}>{`${key}: ${atsSummary[key]}`}</span>
         ))}
       </Space>
     );
diff --git a/client/src/components/schedule-calendar/schedule-calendar.component.jsx b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
index e1f545de9..27830beff 100644
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -3,7 +3,7 @@ import { Button, Card, Checkbox, Col, PageHeader, Row, Space } from "antd";
 import { t } from "i18next";
 import React, { useMemo } from "react";
 import useLocalStorage from "../../utils/useLocalStorage";
-import ScheduleAtsSummary  from "../schedule-ats-summary/schedule-ats-summary.component";
+import ScheduleAtsSummary from "../schedule-ats-summary/schedule-ats-summary.component";
 import ScheduleCalendarWrapperComponent from "../schedule-calendar-wrapper/scheduler-calendar-wrapper.component";
 import ScheduleModal from "../schedule-job-modal/schedule-job-modal.container";
 import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component";
@@ -11,7 +11,6 @@ import ScheduleProductionList from "../schedule-production-list/schedule-product
 import ScheduleVerifyIntegrity from "../schedule-verify-integrity/schedule-verify-integrity.component";
 
 export default function ScheduleCalendarComponent({ data, refetch }) {
-  
   const [filter, setFilter] = useLocalStorage("filter_events", {
     intake: true,
     manual: true,
@@ -37,7 +36,7 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
         <PageHeader
           extra={
             <Space wrap>
-            <ScheduleAtsSummary/>
+              <ScheduleAtsSummary appointments={filteredData} />
               <Checkbox
                 checked={filter?.intake}
                 onChange={(e) => {
@@ -73,8 +72,6 @@ export default function ScheduleCalendarComponent({ data, refetch }) {
               <ScheduleProductionList />
 
               <ScheduleManualEvent />
-
-              
             </Space>
           }
         />
diff --git a/client/src/redux/application/application.sagas.js b/client/src/redux/application/application.sagas.js
index e24b3330d..72a6806a0 100644
--- a/client/src/redux/application/application.sagas.js
+++ b/client/src/redux/application/application.sagas.js
@@ -172,21 +172,6 @@ export function* calculateScheduleLoad({ payload: end }) {
       }
     }
 
-    //Calculate weekly ATS summary.
-    const startOfWeek = moment(end).startOf("week");
-    const endOfWeek = moment(end).endOf("week");
-    load.atsSummary = {};
-    arrJobs
-      .filter((j) => moment(j.scheduled_in).isBetween(startOfWeek, endOfWeek))
-      .forEach((j) => {
-        if (!load.atsSummary[j.alt_transport]) {
-          load.atsSummary[j.alt_transport] = 1;
-        } else {
-          load.atsSummary[j.alt_transport] =
-            load.atsSummary[j.alt_transport] + 1;
-        }
-      });
-
     yield put(setProblemJobs(problemJobs));
     yield put(scheduleLoadSuccess(load));
   } catch (error) {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 406b8b11b..fe220d576 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2501,7 +2501,7 @@
 		},
 		"schedule": {
 			"labels": {
-				"atssummary": "Weekly ATS Summary",
+				"atssummary": "ATS Summary",
 				"employeevacation": "Employee Vacations",
 				"intake": "Intake Events",
 				"manual": "Manual Events",