From eea2a758b00c0849e05612076654972e95f2b62c Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 15 Jan 2025 17:14:08 -0800 Subject: [PATCH] IO-3063 LOU on Schedule PopOver Signed-off-by: Allan Carr --- .../job-at-change/schedule-event.component.jsx | 11 ++++++----- client/src/graphql/appointments.queries.js | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/client/src/components/job-at-change/schedule-event.component.jsx b/client/src/components/job-at-change/schedule-event.component.jsx index bdf5f1a85..8b1bc769f 100644 --- a/client/src/components/job-at-change/schedule-event.component.jsx +++ b/client/src/components/job-at-change/schedule-event.component.jsx @@ -1,30 +1,30 @@ import { AlertFilled } from "@ant-design/icons"; +import { useMutation } from "@apollo/client"; import { Button, Divider, Dropdown, Form, Input, notification, Popover, Select, Space } from "antd"; import parsePhoneNumber from "libphonenumber-js"; -import dayjs from "../../utils/day"; import queryString from "query-string"; import React, { useContext, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { Link, useLocation, useNavigate } from "react-router-dom"; import { createStructuredSelector } from "reselect"; +import SocketContext from "../../contexts/SocketIO/socketContext.jsx"; +import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries"; import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions"; import { setModalContext } from "../../redux/modals/modals.actions"; import { selectBodyshop } from "../../redux/user/user.selectors"; import CurrencyFormatter from "../../utils/CurrencyFormatter"; +import dayjs from "../../utils/day"; import { GenerateDocument } from "../../utils/RenderTemplate"; import { TemplateList } from "../../utils/TemplateConstants"; import ChatOpenButton from "../chat-open-button/chat-open-button.component"; import DataLabel from "../data-label/data-label.component"; import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; +import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component"; import ScheduleManualEvent from "../schedule-manual-event/schedule-manual-event.component"; import ScheduleAtChange from "./job-at-change.component"; import ScheduleEventColor from "./schedule-event.color.component"; import ScheduleEventNote from "./schedule-event.note.component"; -import { useMutation } from "@apollo/client"; -import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries"; -import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component"; -import SocketContext from "../../contexts/SocketIO/socketContext.jsx"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop @@ -127,6 +127,7 @@ export function ScheduleEventComponent({ + {(event.job && event.job.loss_of_use) || ""} {(event.job && event.job.alt_transport) || ""} diff --git a/client/src/graphql/appointments.queries.js b/client/src/graphql/appointments.queries.js index 80c4c93b3..863e9ce8b 100644 --- a/client/src/graphql/appointments.queries.js +++ b/client/src/graphql/appointments.queries.js @@ -49,6 +49,7 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql` est_ct_fn est_ct_ln comment + loss_of_use labhrs: joblines_aggregate(where: { mod_lbr_ty: { _neq: "LAR" }, removed: { _eq: false } }) { aggregate { sum {