From 1e855799f87cdf07abd16008bed03591315a2734 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 29 Aug 2024 14:59:14 -0700 Subject: [PATCH 1/2] IO-2894 Modify Shift Memo Signed-off-by: Allan Carr --- .../tech-job-print-tickets.component.jsx | 8 +++++--- .../time-ticket-list/time-ticket-list.component.jsx | 2 +- .../time-ticket-modal/time-ticket-modal.component.jsx | 8 +++----- .../time-ticket-shift-active.component.jsx | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx b/client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx index 3802c4fb5..3f060089f 100644 --- a/client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx +++ b/client/src/components/tech-job-print-tickets/tech-job-print-tickets.component.jsx @@ -1,5 +1,4 @@ import { Button, Card, DatePicker, Form, Popover, Radio, Space } from "antd"; -import dayjs from "../../utils/day"; import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -7,10 +6,12 @@ import { createStructuredSelector } from "reselect"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { selectTechnician } from "../../redux/tech/tech.selectors"; import DatePIckerRanges from "../../utils/DatePickerRanges"; +import dayjs from "../../utils/day"; import { GenerateDocument } from "../../utils/RenderTemplate"; import { TemplateList } from "../../utils/TemplateConstants"; const mapStateToProps = createStructuredSelector({ + bodyshop: selectTechnician, technician: selectTechnician }); const mapDispatchToProps = (dispatch) => ({ @@ -18,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({ }); export default connect(mapStateToProps, mapDispatchToProps)(TechJobPrintTickets); -export function TechJobPrintTickets({ technician, event, attendacePrint }) { +export function TechJobPrintTickets({ bodyshop, technician, event, attendacePrint }) { const { t } = useTranslation(); const [loading, setLoading] = useState(false); @@ -57,7 +58,8 @@ export function TechJobPrintTickets({ technician, event, attendacePrint }) { subject: attendacePrint === true ? Templates.attendance_employee.subject : Templates.timetickets_employee.subject }, - values.sendby // === "email" ? "e" : "p" + values.sendby, + bodyshop ); } catch (error) { console.log(error); diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx index 6385aa787..03fa28cba 100644 --- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx +++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx @@ -165,7 +165,7 @@ export function TimeTicketList({ key: "memo", sorter: (a, b) => alphaSort(a.memo, b.memo), sortOrder: state.sortedInfo.columnKey === "memo" && state.sortedInfo.order, - render: (text, record) => (record.clockon || record.clockoff ? t(record.memo) : record.memo) + render: (text, record) => (record.memo.startsWith("timetickets.labels") ? t(record.memo) : record.memo) }, ...(Enhanced_Payroll.treatment === "on" ? [ diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index 7a86d0d56..841bee38b 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -1,4 +1,5 @@ import { useLazyQuery } from "@apollo/client"; +import { useSplitTreatments } from "@splitsoftware/splitio-react"; import { Form, Input, InputNumber, Select, Switch } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; @@ -7,8 +8,7 @@ import { createStructuredSelector } from "reselect"; import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries"; import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors"; import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component"; -import FormDateTimePicker from "../form-date-time-picker/form-date-time-picker.component"; -import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component"; +import { default as DateTimePicker, default as FormDateTimePicker } from "../form-date-time-picker/form-date-time-picker.component"; import JobSearchSelect from "../job-search-select/job-search-select.component"; import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component"; import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility"; @@ -16,7 +16,6 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component"; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component"; import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component"; import TimeTicketList from "../time-ticket-list/time-ticket-list.component"; -import { useSplitTreatments } from "@splitsoftware/splitio-react"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -71,9 +70,8 @@ export function TimeTicketModalComponent({ const MemoInput = ({ value, ...props }) => { return ( ); }; diff --git a/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx b/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx index dc67bae09..ba93d27b4 100644 --- a/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx +++ b/client/src/components/time-ticket-shift-active/time-ticket-shift-active.component.jsx @@ -39,7 +39,7 @@ export default function TimeTicketShiftActive({ timetickets, refetch, isTechCons renderItem={(ticket) => ( Date: Thu, 29 Aug 2024 15:00:21 -0700 Subject: [PATCH 2/2] IO-2894 Prettier code Signed-off-by: Allan Carr --- .../time-ticket-modal.component.jsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx index 841bee38b..1b286f24b 100644 --- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx +++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx @@ -8,7 +8,10 @@ import { createStructuredSelector } from "reselect"; import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries"; import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors"; import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component"; -import { default as DateTimePicker, default as FormDateTimePicker } from "../form-date-time-picker/form-date-time-picker.component"; +import { + default as DateTimePicker, + default as FormDateTimePicker +} from "../form-date-time-picker/form-date-time-picker.component"; import JobSearchSelect from "../job-search-select/job-search-select.component"; import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component"; import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility"; @@ -68,12 +71,7 @@ export function TimeTicketModalComponent({ }; const MemoInput = ({ value, ...props }) => { - return ( - - ); + return ; }; return (