admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Formatting issues

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-08 22:25:07 -04:00
parent df0f8ef9dc
commit 33c282051b
34 changed files with 1805 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/App/App.jsx
View File

@@ -147,8 +147,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
/>
}
>
{
import.meta.env.PRODUCT_FRUITS_DISABLED !== 'true' && (
<ProductFruits
workspaceCode={InstanceRenderMgr({
imex: null,
@@ -162,8 +160,6 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
username: currentUser.email
}}
/>
)
}
<Routes>
<Route

28
client/src/components/bills-list-table/bills-list-table.component.jsx
View File

@@ -18,19 +18,25 @@ import {FaTasks} from "react-icons/fa";
const mapStateToProps = createStructuredSelector({
jobRO: selectJobReadOnly,
bodyshop: selectBodyshop,
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({
setBillEnterContext: (context) => dispatch(setModalContext({
setBillEnterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "billEnter"
})),
setReconciliationContext: (context) => dispatch(setModalContext({
})
),
setReconciliationContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "reconciliation"
})),
setTaskUpsertContext: (context) => dispatch(setModalContext({context, modal: 'taskUpsert'})),
})
),
setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
});
export function BillsListTableComponent({
@@ -41,7 +47,7 @@ export function BillsListTableComponent({
handleOnRowClick,
setBillEnterContext,
setReconciliationContext,
setTaskUpsertContext,
setTaskUpsertContext
}) {
const { t } = useTranslation();
@@ -56,7 +62,6 @@ export function BillsListTableComponent({
const bills = billsQuery.data ? billsQuery.data.bills : [];
const { refetch } = billsQuery;
const recordActions = (record, showView = false) => (
<Space wrap>
{showView && (
@@ -64,14 +69,17 @@ export function BillsListTableComponent({
<EditFilled />
</Button>
)}
<Button title={t('tasks.buttons.create')} onClick={() => {
<Button
title={t("tasks.buttons.create")}
onClick={() => {
setTaskUpsertContext({
context: {
jobid: job.id,
billid: record.id
}
});
}}>
}}
>
<FaTasks />
</Button>
<BillDeleteButton bill={record} jobid={job.id} />

85
client/src/components/header/header.component.jsx
View File

@@ -31,23 +31,14 @@ import {Layout, Menu, Switch, Tooltip} from "antd";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { BsKanban } from "react-icons/bs";
import {
FaCalendarAlt,
FaCarCrash,
FaCreditCard,
FaFileInvoiceDollar,
FaTasks
} from "react-icons/fa";
import { FaCalendarAlt, FaCarCrash, FaCreditCard, FaFileInvoiceDollar, FaTasks } from "react-icons/fa";
import { GiPayMoney, GiPlayerTime, GiSettingsKnobs } from "react-icons/gi";
import { IoBusinessOutline } from "react-icons/io5";
import { RiSurveyLine } from "react-icons/ri";
import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import {
selectRecentItems,
selectSelectedHeader
} from "../../redux/application/application.selectors";
import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
import { setModalContext } from "../../redux/modals/modals.actions";
import { signOutStart } from "../../redux/user/user.actions";
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
@@ -64,28 +55,43 @@ const mapStateToProps = createStructuredSelector({
});
const mapDispatchToProps = (dispatch) => ({
setBillEnterContext: (context) => dispatch(setModalContext({
setBillEnterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "billEnter"
})),
setTimeTicketContext: (context) => dispatch(setModalContext({
})
),
setTimeTicketContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "timeTicket"
})),
})
),
setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" })),
setReportCenterContext: (context) => dispatch(setModalContext({
setReportCenterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "reportCenter"
})),
})
),
signOutStart: () => dispatch(signOutStart()),
setCardPaymentContext: (context) => dispatch(setModalContext({
setCardPaymentContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "cardPayment"
})),
setTaskUpsertContext: (context) => dispatch(setModalContext({
})
),
setTaskUpsertContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: 'taskUpsert'
})),
modal: "taskUpsert"
})
)
});
function Header({
@@ -100,7 +106,7 @@ function Header({
setReportCenterContext,
recentItems,
setCardPaymentContext,
setTaskUpsertContext,
setTaskUpsertContext
}) {
const {
treatments: { ImEXPay, DmsAp, Simple_Inventory }
@@ -258,8 +264,7 @@ function Header({
const accountingExportChildren = [
{
key: "receivables",
label: <Link
to="/manage/accounting/receivables">{t("menus.header.accounting-receivables")}</Link>
label: <Link to="/manage/accounting/receivables">{t("menus.header.accounting-receivables")}</Link>
}
];
@@ -429,14 +434,12 @@ function Header({
{
key: "contracts",
icon: <FileFilled />,
label: <Link
to="/manage/courtesycars/contracts">{t("menus.header.courtesycars-contracts")}</Link>
label: <Link to="/manage/courtesycars/contracts">{t("menus.header.courtesycars-contracts")}</Link>
},
{
key: "newcontract",
icon: <FileAddFilled />,
label: <Link
to="/manage/courtesycars/contracts/new">{t("menus.header.courtesycars-newcontract")}</Link>
label: <Link to="/manage/courtesycars/contracts/new">{t("menus.header.courtesycars-newcontract")}</Link>
}
]
}
@@ -472,36 +475,36 @@ function Header({
]
: []),
{
key: 'tasks',
id: 'tasks',
key: "tasks",
id: "tasks",
icon: <FaTasks />,
label: t('menus.header.tasks'),
label: t("menus.header.tasks"),
children: [
{
key: 'createTask',
key: "createTask",
icon: <PlusCircleOutlined />,
label: t('menus.header.create_task'),
label: t("menus.header.create_task"),
onClick: () => {
setTaskUpsertContext({
actions: {},
context: {},
context: {}
});
},
}
},
{
key: 'mytasks',
key: "mytasks",
icon: <FaTasks />,
label: <Link to="/manage/tasks/mytasks">{t('menus.header.my_tasks')}</Link>,
label: <Link to="/manage/tasks/mytasks">{t("menus.header.my_tasks")}</Link>
},
{
key: 'all_tasks',
key: "all_tasks",
icon: <FaTasks />,
label: <Link to="/manage/tasks/alltasks">{t('menus.header.all_tasks')}</Link>,
label: <Link to="/manage/tasks/alltasks">{t("menus.header.all_tasks")}</Link>
}
]
},
{
key: 'shopsubmenu',
key: "shopsubmenu",
icon: <SettingOutlined />,
label: t("menus.header.shop"),
children: [

14
client/src/components/job-detail-lines/job-lines-expander.component.jsx
View File

@@ -115,8 +115,7 @@ export function JobLinesExpander({jobline, jobid, bodyshop, currentUser}) {
key: line.id,
children: (
<Space split={<Divider type="vertical" />} wrap>
<Link
to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>{line.parts_dispatch.number}</Link>
<Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>{line.parts_dispatch.number}</Link>
{bodyshop.employees.find((e) => e.id === line.parts_dispatch.employeeid)?.first_name}
<Space>
{t("parts_dispatch_lines.fields.accepted_at")}
@@ -133,10 +132,15 @@ export function JobLinesExpander({jobline, jobid, bodyshop, currentUser}) {
/>
</Col>
<Col md={24} lg={24}>
<TaskListContainer currentUser={currentUser} bodyshop={bodyshop} parentJobId={jobid}
relationshipType={'joblineid'} relationshipId={jobline.id}
<TaskListContainer
currentUser={currentUser}
bodyshop={bodyshop}
parentJobId={jobid}
relationshipType={"joblineid"}
relationshipId={jobline.id}
query={QUERY_JOBLINE_TASKS_PAGINATED}
titleTranslation='tasks.titles.job_tasks'/>
titleTranslation="tasks.titles.job_tasks"
/>
</Col>
</Row>
);

9
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -54,7 +54,7 @@ const mapDispatchToProps = (dispatch) => ({
setJobLineEditContext: (context) => dispatch(setModalContext({ context: context, modal: "jobLineEdit" })),
setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" })),
setTaskUpsertContext: (context) => dispatch(setModalContext({context, modal: 'taskUpsert'})),
setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
});
export function JobLinesComponent({
@@ -334,14 +334,17 @@ export function JobLinesComponent({
>
<EditFilled />
</Button>
<Button title={t('tasks.buttons.create')} onClick={() => {
<Button
title={t("tasks.buttons.create")}
onClick={() => {
setTaskUpsertContext({
context: {
jobid: job.id,
joblineid: record.id
}
});
}}>
}}
>
<FaTasks />
</Button>
<Button

25
client/src/components/job-search-select/job-search-select.component.jsx
View File

@@ -4,38 +4,23 @@ import { Select, Space, Spin, Tag } from "antd";
import _ from "lodash";
import React, { forwardRef, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import {
SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE,
SEARCH_JOBS_FOR_AUTOCOMPLETE
} from "../../graphql/jobs.queries";
import { SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE, SEARCH_JOBS_FOR_AUTOCOMPLETE } from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
const { Option } = Select;
const JobSearchSelect = (
{
disabled,
convertedOnly = false,
notInvoiced = false,
notExported = true,
clm_no = false,
...restProps
},
{ disabled, convertedOnly = false, notInvoiced = false, notExported = true, clm_no = false, ...restProps },
ref
) => {
const { t } = useTranslation();
const [theOptions, setTheOptions] = useState([]);
const [callSearch, { loading, error, data }] = useLazyQuery(SEARCH_JOBS_FOR_AUTOCOMPLETE, {});
const [
callIdSearch,
{
loading: idLoading,
error: idError,
data: idData
}
] = useLazyQuery(SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE);
const [callIdSearch, { loading: idLoading, error: idError, data: idData }] = useLazyQuery(
SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE
);
const executeSearch = (v) => {
if (v && v.variables?.search !== "" && v.variables.search.length >= 2) callSearch(v);

1
client/src/components/job-totals-table/job-totals.table.totals.component.jsx
View File

@@ -21,7 +21,6 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
const { t } = useTranslation();
const data = useMemo(() => {
return [
{
key: t("jobs.labels.subtotal"),

67
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
View File

@@ -1,28 +1,13 @@
import { DownCircleFilled } from "@ant-design/icons";
import { useApolloClient, useMutation } from "@apollo/client";
import {
Button,
Card,
Dropdown,
Form,
Input,
Modal,
notification,
Popconfirm,
Popover,
Select,
Space
} from "antd";
import { Button, Card, Dropdown, Form, Input, Modal, notification, Popconfirm, Popover, Select, Space } from "antd";
import React, { useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { Link, useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import { auth, logImEXEvent } from "../../firebase/firebase.utils";
import {
CANCEL_APPOINTMENTS_BY_JOB_ID,
INSERT_MANUAL_APPT
} from "../../graphql/appointments.queries";
import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
import { DELETE_JOB, UPDATE_JOB, VOID_JOB } from "../../graphql/jobs.queries";
import { insertAuditTrail } from "../../redux/application/application.actions";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
@@ -44,8 +29,7 @@ import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time
import dayjs from "../../utils/day";
import { useSplitTreatments } from "@splitsoftware/splitio-react";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import JobsDetailHeaderActionsToggleProduction
from "./jobs-detail-header-actions.toggle-production";
import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -55,32 +39,50 @@ const mapStateToProps = createStructuredSelector({
const mapDispatchToProps = (dispatch) => ({
setScheduleContext: (context) => dispatch(setModalContext({ context: context, modal: "schedule" })),
setBillEnterContext: (context) => dispatch(setModalContext({
setBillEnterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "billEnter"
})),
})
),
setPaymentContext: (context) => dispatch(setModalContext({ context: context, modal: "payment" })),
setJobCostingContext: (context) => dispatch(setModalContext({
setJobCostingContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "jobCosting"
})),
setTimeTicketContext: (context) => dispatch(setModalContext({
})
),
setTimeTicketContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "timeTicket"
})),
setCardPaymentContext: (context) => dispatch(setModalContext({
})
),
setCardPaymentContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "cardPayment"
})),
insertAuditTrail: ({jobid, operation, type}) => dispatch(insertAuditTrail({
})
),
insertAuditTrail: ({ jobid, operation, type }) =>
dispatch(
insertAuditTrail({
jobid,
operation,
type
})),
setTimeTicketTaskContext: (context) => dispatch(setModalContext({
})
),
setTimeTicketTaskContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "timeTicketTask"
})),
})
),
setEmailOptions: (e) => dispatch(setEmailOptions(e)),
openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
setMessage: (text) => dispatch(setMessage(text))
@@ -680,8 +682,7 @@ export function JobsDetailHeaderActions({
{
key: "checklist",
disabled: !job.converted,
label: <Link
to={`/manage/jobs/${job.id}/checklist`}>{t("jobs.actions.viewchecklist")}</Link>
label: <Link to={`/manage/jobs/${job.id}/checklist`}>{t("jobs.actions.viewchecklist")}</Link>
}
],
rome: "USE_IMEX",

7
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -1,9 +1,4 @@
import {
BranchesOutlined,
ExclamationCircleFilled,
PauseCircleOutlined,
SyncOutlined
} from "@ant-design/icons";
import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, SyncOutlined } from "@ant-design/icons";
import { useQuery } from "@apollo/client";
import { Button, Card, Grid, Input, Space, Table, Tooltip } from "antd";
import queryString from "query-string";

38
client/src/components/parts-order-list-table/parts-order-list-table.component.jsx
View File

@@ -19,12 +19,10 @@ import {DateFormatter} from "../../utils/DateFormatter";
import { alphaSort } from "../../utils/sorters";
import { TemplateList } from "../../utils/TemplateConstants";
import DataLabel from "../data-label/data-label.component";
import PartsOrderBackorderEta
from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
import PartsOrderBackorderEta from "../parts-order-backorder-eta/parts-order-backorder-eta.component";
import PartsOrderCmReceived from "../parts-order-cm-received/parts-order-cm-received.component";
import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-line.component";
import PartsOrderLineBackorderButton
from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
import PrintWrapper from "../print-wrapper/print-wrapper.component";
import FeatureWrapperComponent from "../feature-wrapper/feature-wrapper.component";
@@ -32,19 +30,25 @@ import {FaTasks} from "react-icons/fa";
const mapStateToProps = createStructuredSelector({
jobRO: selectJobReadOnly,
bodyshop: selectBodyshop,
bodyshop: selectBodyshop
});
const mapDispatchToProps = (dispatch) => ({
setBillEnterContext: (context) => dispatch(setModalContext({
setBillEnterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "billEnter"
})),
setPartsReceiveContext: (context) => dispatch(setModalContext({
})
),
setPartsReceiveContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "partsReceive"
})),
setTaskUpsertContext: (context) => dispatch(setModalContext({context, modal: 'taskUpsert'})),
})
),
setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
});
export function PartsOrderListTableComponent({
@@ -55,7 +59,7 @@ export function PartsOrderListTableComponent({
billsQuery,
handleOnRowClick,
setPartsReceiveContext,
setTaskUpsertContext,
setTaskUpsertContext
}) {
const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
.filter((screen) => !!screen[1])
@@ -87,7 +91,7 @@ export function PartsOrderListTableComponent({
const { refetch } = billsQuery;
const recordActions = (record, showView = false) => (
<Space direction='horizontal' wrap>
<Space direction="horizontal" wrap>
{showView && (
<Button onClick={() => handleOnRowClick(record)}>
<EyeFilled />
@@ -119,14 +123,17 @@ export function PartsOrderListTableComponent({
>
{t("parts_orders.actions.receive")}
</Button>
<Button title={t('tasks.buttons.create')} onClick={() => {
<Button
title={t("tasks.buttons.create")}
onClick={() => {
setTaskUpsertContext({
context: {
jobid: job.id,
partsorderid: record.id
}
});
}}>
}}
>
<FaTasks />
</Button>
<Popconfirm
@@ -388,8 +395,7 @@ export function PartsOrderListTableComponent({
return (
<div>
<PageHeader title={record && `${record.vendor.name} - ${record.order_number}`}
extra={recordActions(record)}/>
<PageHeader title={record && `${record.vendor.name} - ${record.order_number}`} extra={recordActions(record)} />
<Table
scroll={{
x: true //y: "50rem"

203
client/src/components/task-list/task-list.component.jsx
View File

@@ -16,8 +16,8 @@ import {
SyncOutlined
} from "@ant-design/icons";
import { DateFormatter } from "../../utils/DateFormatter.jsx";
import {connect} from 'react-redux';
import {setModalContext} from '../../redux/modals/modals.actions';
import { connect } from "react-redux";
import { setModalContext } from "../../redux/modals/modals.actions";
/**
* Task List Component
@@ -33,11 +33,11 @@ const DueDateRecord = ({dueDate}) => {
const isBeforeToday = dueDateDayjs.isBefore(dayjs());
return (
<div title={relativeDueDate} style={{color: isBeforeToday ? 'red' : 'black'}}>
<div title={relativeDueDate} style={{ color: isBeforeToday ? "red" : "black" }}>
<DateFormatter>{dueDate}</DateFormatter>
</div>
);
}
};
/**
* Priority Label Component
@@ -48,27 +48,35 @@ const DueDateRecord = ({dueDate}) => {
const PriorityLabel = ({ priority }) => {
switch (priority) {
case 1:
return <div>
High <ExclamationCircleFilled style={{marginLeft: '5px', color: 'red'}}/>
</div>;
return (
<div>
High <ExclamationCircleFilled style={{ marginLeft: "5px", color: "red" }} />
</div>
);
case 2:
return <div>
Medium <ExclamationCircleFilled style={{marginLeft: '5px', color: 'yellow'}}/>
</div>;
return (
<div>
Medium <ExclamationCircleFilled style={{ marginLeft: "5px", color: "yellow" }} />
</div>
);
case 3:
return <div>
Low <ExclamationCircleFilled style={{marginLeft: '5px', color: 'green'}}/>
</div>;
return (
<div>
Low <ExclamationCircleFilled style={{ marginLeft: "5px", color: "green" }} />
</div>
);
default:
return <div>
None <ExclamationCircleFilled style={{marginLeft: '5px', color: 'black'}}/>
</div>;
}
return (
<div>
None <ExclamationCircleFilled style={{ marginLeft: "5px", color: "black" }} />
</div>
);
}
};
const mapDispatchToProps = (dispatch) => ({
// Existing dispatch props...
setTaskUpsertContext: (context) => dispatch(setModalContext({context, modal: 'taskUpsert'})),
setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
});
const mapStateToProps = (state) => ({
@@ -91,56 +99,46 @@ function TaskListComponent({
relationshipId,
onlyMine,
parentJobId,
showRo = true,
showRo = true
}) {
const { t } = useTranslation();
const search = queryString.parse(useLocation().search);
// Extract Query Params
const {
page,
sortcolumn,
sortorder,
deleted,
completed,
mine
} = search;
const { page, sortcolumn, sortorder, deleted, completed, mine } = search;
const history = useNavigate();
const columns = [];
if (!onlyMine) {
columns.push(
{
columns.push({
title: t("tasks.fields.assigned_to"),
dataIndex: "assigned_to",
key: "assigned_to",
width: '8%',
width: "8%",
sorter: true,
sortOrder: sortcolumn === "assigned_to" && sortorder,
render: (text, record) => {
const employee = bodyshop?.employees?.find(e => e.user_email === record.assigned_to);
const employee = bodyshop?.employees?.find((e) => e.user_email === record.assigned_to);
return employee ? `${employee.first_name} ${employee.last_name}` : t("general.labels.na");
}
}
);
});
}
if (showRo) {
columns.push(
{
columns.push({
title: t("tasks.fields.job.ro_number"),
dataIndex: ["job", "ro_number"],
key: "job.ro_number",
width: '8%',
width: "8%",
render: (text, record) =>
record.job
? <Link
to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number || t("general.labels.na")}</Link>
: t("general.labels.na")
}
);
record.job ? (
<Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number || t("general.labels.na")}</Link>
) : (
t("general.labels.na")
)
});
}
columns.push(
@@ -148,44 +146,47 @@ function TaskListComponent({
title: t("tasks.fields.jobline"),
dataIndex: ["jobline", "id"],
key: "jobline.id",
width: '8%',
render: (text, record) => record?.jobline?.line_desc || ''
width: "8%",
render: (text, record) => record?.jobline?.line_desc || ""
},
{
title: t("tasks.fields.parts_order"),
dataIndex: ["parts_order", "id"],
key: "part_order.id",
width: '8%',
width: "8%",
render: (text, record) =>
record.parts_order
? <Link
to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
record.parts_order ? (
<Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
{record.parts_order.order_number && record.parts_order.vendor && record.parts_order.vendor.name
? `${record.parts_order.order_number} - ${record.parts_order.vendor.name}`
: t("general.labels.na")}
</Link>
: ''
) : (
""
)
},
{
title: t("tasks.fields.bill"),
dataIndex: ["bill", "id"],
key: "bill.id",
width: '8%',
width: "8%",
render: (text, record) =>
record.bill
? <Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
record.bill ? (
<Link to={`/manage/jobs/${record.job.id}?billid=${record.bill.id}&tab=partssublet`}>
{record.bill.invoice_number && record.bill.vendor && record.bill.vendor.name
? `${record.bill.invoice_number} - ${record.bill.vendor.name}`
: t("general.labels.na")}
</Link>
: ''
) : (
""
)
},
{
title: t("tasks.fields.title"),
dataIndex: "title",
key: "title",
sorter: true,
sortOrder: sortcolumn === "title" && sortorder,
sortOrder: sortcolumn === "title" && sortorder
},
{
title: t("tasks.fields.due_date"),
@@ -193,8 +194,8 @@ function TaskListComponent({
key: "due_date",
sorter: true,
sortOrder: sortcolumn === "due_date" && sortorder,
width: '8%',
render: (text, record) => <DueDateRecord dueDate={record.due_date}/>,
width: "8%",
render: (text, record) => <DueDateRecord dueDate={record.due_date} />
},
{
title: t("tasks.fields.remind_at"),
@@ -202,8 +203,8 @@ function TaskListComponent({
key: "remind_at",
sorter: true,
sortOrder: sortcolumn === "remind_at" && sortorder,
width: '8%',
render: (text, record) => <DueDateRecord dueDate={record.remind_at}/>,
width: "8%",
render: (text, record) => <DueDateRecord dueDate={record.remind_at} />
},
{
title: t("tasks.fields.priority"),
@@ -211,42 +212,44 @@ function TaskListComponent({
key: "priority",
sorter: true,
sortOrder: sortcolumn === "priority" && sortorder,
width: '8%',
render: (text, record) => <PriorityLabel priority={record.priority}
/>
width: "8%",
render: (text, record) => <PriorityLabel priority={record.priority} />
},
{
title: t("tasks.fields.actions"),
key: "toggleCompleted",
width: '5%',
width: "5%",
render: (text, record) => (
<Space direction='horizontal'>
<Button title={t('tasks.buttons.edit')} onClick={() => {
<Space direction="horizontal">
<Button
title={t("tasks.buttons.edit")}
onClick={() => {
setTaskUpsertContext({
context: {
existingTask: record,
},
existingTask: record
}
});
}}>
}}
>
<EditFilled />
</Button>
<Button title={t('tasks.buttons.complete')}
onClick={() => toggleCompletedStatus(record.id, record.completed)}>
{record.completed ? <CheckCircleOutlined/> :
<CheckCircleFilled/>}
<Button
title={t("tasks.buttons.complete")}
onClick={() => toggleCompletedStatus(record.id, record.completed)}
>
{record.completed ? <CheckCircleOutlined /> : <CheckCircleFilled />}
</Button>
<Button title={t('tasks.buttons.delete')}
onClick={() => toggleDeletedStatus(record.id, record.deleted)}>
<Button title={t("tasks.buttons.delete")} onClick={() => toggleDeletedStatus(record.id, record.deleted)}>
{record.deleted ? <DeleteFilled /> : <DeleteOutlined />}
</Button>
</Space>
),
)
}
);
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: {text: ""},
filteredInfo: { text: "" }
});
const handleCreateTask = useCallback(() => {
@@ -254,8 +257,8 @@ function TaskListComponent({
actions: {},
context: {
jobid: parentJobId,
[relationshipType]: relationshipId,
},
[relationshipType]: relationshipId
}
});
}, [parentJobId, relationshipId, relationshipType, setTaskUpsertContext]);
@@ -267,19 +270,24 @@ function TaskListComponent({
history({ search: queryString.stringify(search) });
};
const handleSwitchChange = useCallback((param, value) => {
const handleSwitchChange = useCallback(
(param, value) => {
if (value) {
search[param] = "true";
} else {
delete search[param];
}
history({ search: queryString.stringify(search) });
}, [history, search]);
},
[history, search]
);
const expandableRow = (record) => {
return <Card title={t('tasks.fields.description')} size='small'>
return (
<Card title={t("tasks.fields.description")} size="small">
{record.description}
</Card>
);
};
/**
@@ -288,35 +296,35 @@ function TaskListComponent({
*/
const tasksExtra = useCallback(() => {
return (
<Space direction='horizontal'>
<Space direction="horizontal">
{!onlyMine && (
<Switch
checkedChildren={t('tasks.buttons.myTasks')}
unCheckedChildren={t('tasks.buttons.allTasks')}
title={t('tasks.titles.mine')}
checkedChildren={t("tasks.buttons.myTasks")}
unCheckedChildren={t("tasks.buttons.allTasks")}
title={t("tasks.titles.mine")}
checked={mine === "true"}
onChange={(value) => handleSwitchChange('mine', value)}
onChange={(value) => handleSwitchChange("mine", value)}
/>
)}
<Switch
checkedChildren={<CheckCircleFilled />}
unCheckedChildren={<CheckCircleOutlined />}
title={t('tasks.titles.completed')}
title={t("tasks.titles.completed")}
checked={completed === "true"}
onChange={(value) => handleSwitchChange('completed', value)}
onChange={(value) => handleSwitchChange("completed", value)}
/>
<Switch
checkedChildren={<DeleteOutlined />}
unCheckedChildren={<DeleteFilled />}
title={t('tasks.titles.deleted')}
title={t("tasks.titles.deleted")}
checked={deleted === "true"}
onChange={(value) => handleSwitchChange('deleted', value)}
onChange={(value) => handleSwitchChange("deleted", value)}
/>
<Button title={t('tasks.buttons.create')} onClick={handleCreateTask}>
<PlusCircleFilled/>{t('tasks.buttons.create')}
<Button title={t("tasks.buttons.create")} onClick={handleCreateTask}>
<PlusCircleFilled />
{t("tasks.buttons.create")}
</Button>
<Button title={t('tasks.buttons.refresh')}
onClick={() => refetch()}>
<Button title={t("tasks.buttons.refresh")} onClick={() => refetch()}>
<SyncOutlined />
</Button>
</Space>
@@ -324,10 +332,7 @@ function TaskListComponent({
}, [refetch, deleted, completed, mine, onlyMine, t, handleSwitchChange, handleCreateTask]);
return (
<Card
title={titleTranslation}
extra={tasksExtra()}
>
<Card title={titleTranslation} extra={tasksExtra()}>
<Table
loading={loading}
pagination={{
@@ -335,7 +340,7 @@ function TaskListComponent({
current: parseInt(page || 1),
total: total,
responsive: true,
showQuickJumper: true,
showQuickJumper: true
}}
columns={columns}
rowKey="id"
@@ -344,7 +349,7 @@ function TaskListComponent({
onChange={handleTableChange}
expandable={{
expandedRowRender: expandableRow,
rowExpandable: record => record.description,
rowExpandable: (record) => record.description
}}
/>
</Card>

80
client/src/components/task-list/task-list.container.jsx
View File

@@ -1,10 +1,7 @@
import queryString from "query-string";
import { useLocation } from "react-router-dom";
import { useMutation, useQuery } from "@apollo/client";
import {
MUTATION_TOGGLE_TASK_COMPLETED,
MUTATION_TOGGLE_TASK_DELETED,
} from "../../graphql/tasks.queries.js";
import { MUTATION_TOGGLE_TASK_COMPLETED, MUTATION_TOGGLE_TASK_DELETED } from "../../graphql/tasks.queries.js";
import { pageLimit } from "../../utils/config.js";
import AlertComponent from "../alert/alert.component.jsx";
import React, { useEffect } from "react";
@@ -30,44 +27,37 @@ export default function TaskListContainer({
const searchParams = queryString.parse(useLocation().search);
const { page, sortcolumn, sortorder, deleted, completed, mine } = searchParams;
const dispatch = useDispatch();
const {loading, error, data, refetch} = useQuery(
query,
{
const { loading, error, data, refetch } = useQuery(query, {
fetchPolicy: "network-only",
nextFetchPolicy: "network-only",
variables: {
bodyshop: bodyshop.id,
[relationshipType]: relationshipId,
deleted: deleted === 'true',
deleted: deleted === "true",
completed: completed === "true",
assigned_to: mine === "true" ? currentUser.email : undefined, // replace currentUserID with the actual ID of the current user
offset: page ? (page - 1) * pageLimit : 0,
limit: pageLimit,
order: [
{
[sortcolumn || "created_at"]: sortorder
? sortorder === "descend"
? "desc"
: "asc"
: "desc",
},
],
},
[sortcolumn || "created_at"]: sortorder ? (sortorder === "descend" ? "desc" : "asc") : "desc"
}
);
]
}
});
/**
* Refetch tasks when a task is updated
*/
useEffect(() => {
const handleTaskUpdated = async (event) => {
await refetch().catch(e => `Something went wrong fetching tasks: ${e.message || ''}`);
await refetch().catch((e) => `Something went wrong fetching tasks: ${e.message || ""}`);
};
window.addEventListener('taskUpdated', handleTaskUpdated);
window.addEventListener("taskUpdated", handleTaskUpdated);
// Clean up the event listener when the component is unmounted.
return () => {
window.removeEventListener('taskUpdated', handleTaskUpdated);
window.removeEventListener("taskUpdated", handleTaskUpdated);
};
}, [refetch]);
@@ -97,27 +87,25 @@ export default function TaskListContainer({
dispatch(
insertAuditTrail({
jobid: toggledTask.data.update_tasks_by_pk.jobid,
operation: toggledTask?.data?.update_tasks_by_pk?.completed ? AuditTrailMapping.tasksCompleted(
toggledTask.data.update_tasks_by_pk.title,
currentUser.email
) : AuditTrailMapping.tasksUncompleted(
toggledTask.data.update_tasks_by_pk.title,
currentUser.email
),
operation: toggledTask?.data?.update_tasks_by_pk?.completed
? AuditTrailMapping.tasksCompleted(toggledTask.data.update_tasks_by_pk.title, currentUser.email)
: AuditTrailMapping.tasksUncompleted(toggledTask.data.update_tasks_by_pk.title, currentUser.email),
type: toggledTask?.data?.update_tasks_by_pk?.completed ? "tasksCompleted" : "tasksUncompleted"
})
)
);
}
window.dispatchEvent(new CustomEvent('taskUpdated', {
detail: {message: 'A task has been completed.'},
}));
window.dispatchEvent(
new CustomEvent("taskUpdated", {
detail: { message: "A task has been completed." }
})
);
notification["success"]({
message: t("tasks.successes.completed"),
message: t("tasks.successes.completed")
});
} catch (err) {
notification["error"]({
message: t("tasks.failures.completed"),
message: t("tasks.failures.completed")
});
}
};
@@ -148,32 +136,28 @@ export default function TaskListContainer({
dispatch(
insertAuditTrail({
jobid: toggledTask.data.update_tasks_by_pk.jobid,
operation: toggledTask?.data?.update_tasks_by_pk?.deleted ? AuditTrailMapping.tasksDeleted(
toggledTask.data.update_tasks_by_pk.title,
currentUser.email
) : AuditTrailMapping.tasksUndeleted(
toggledTask.data.update_tasks_by_pk.title,
currentUser.email
),
operation: toggledTask?.data?.update_tasks_by_pk?.deleted
? AuditTrailMapping.tasksDeleted(toggledTask.data.update_tasks_by_pk.title, currentUser.email)
: AuditTrailMapping.tasksUndeleted(toggledTask.data.update_tasks_by_pk.title, currentUser.email),
type: toggledTask?.data?.update_tasks_by_pk?.deleted ? "tasksDeleted" : "tasksUndeleted"
})
)
);
}
window.dispatchEvent(new CustomEvent('taskUpdated', {
detail: {message: 'A task has been deleted.'},
}));
window.dispatchEvent(
new CustomEvent("taskUpdated", {
detail: { message: "A task has been deleted." }
})
);
notification["success"]({
message: t("tasks.successes.deleted"),
message: t("tasks.successes.deleted")
});
} catch (err) {
console.dir(err);
notification["error"]({
message: t("tasks.failures.deleted"),
message: t("tasks.failures.deleted")
});
}
};
if (error) return <AlertComponent message={error.message} type="error" />;

116
client/src/components/task-upsert-modal/task-upsert-modal.component.jsx
View File

@@ -4,7 +4,7 @@ import {useTranslation} from "react-i18next";
import { FormDatePicker } from "../form-date-picker/form-date-picker.component.jsx";
import { createStructuredSelector } from "reselect";
import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
import dayjs from '../../utils/day';
import dayjs from "../../utils/day";
import { connect } from "react-redux";
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component.jsx";
@@ -12,16 +12,12 @@ import JobSearchSelectComponent from "../job-search-select/job-search-select.com
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({});
export default connect(
mapStateToProps,
mapDispatchToProps
)(TaskUpsertModalComponent);
export default connect(mapStateToProps, mapDispatchToProps)(TaskUpsertModalComponent);
export function TaskUpsertModalComponent({
form,
@@ -31,19 +27,18 @@ export function TaskUpsertModalComponent({
setSelectedJobId,
selectedJobDetails,
loading,
error,
error
}) {
const { t } = useTranslation();
const datePickerPresets = [
{label: t('tasks.date_presets.today'), value: dayjs()},
{label: t('tasks.date_presets.tomorrow'), value: dayjs().add(1, 'day')},
{label: t('tasks.date_presets.next_week'), value: dayjs().add(1, 'week')},
{label: t('tasks.date_presets.two_weeks'), value: dayjs().add(2, 'weeks')},
{label: t('tasks.date_presets.three_weeks'), value: dayjs().add(3, 'weeks')},
{label: t('tasks.date_presets.one_month'), value: dayjs().add(1, 'month')},
{label: t('tasks.date_presets.three_months'), value: dayjs().add(3, 'month')},
{ label: t("tasks.date_presets.today"), value: dayjs() },
{ label: t("tasks.date_presets.tomorrow"), value: dayjs().add(1, "day") },
{ label: t("tasks.date_presets.next_week"), value: dayjs().add(1, "week") },
{ label: t("tasks.date_presets.two_weeks"), value: dayjs().add(2, "weeks") },
{ label: t("tasks.date_presets.three_weeks"), value: dayjs().add(3, "weeks") },
{ label: t("tasks.date_presets.one_month"), value: dayjs().add(1, "month") },
{ label: t("tasks.date_presets.three_months"), value: dayjs().add(3, "month") }
];
const clearRelations = () => {
@@ -52,7 +47,7 @@ export function TaskUpsertModalComponent({
partsorderid: null,
joblineid: null
});
}
};
/**
* Change the selected job id
@@ -64,7 +59,6 @@ export function TaskUpsertModalComponent({
clearRelations();
};
if (loading || error) return <LoadingSkeleton active />;
return (
@@ -76,24 +70,20 @@ export function TaskUpsertModalComponent({
name="title"
rules={[
{
required: true,
},
required: true
}
]}
>
<Input placeholder={t("tasks.fields.title")} />
</Form.Item>
</Col>
<Col span={4}>
<Form.Item
label={t("tasks.fields.priority")}
name="priority"
initialValue={3}
>
<Form.Item label={t("tasks.fields.priority")} name="priority" initialValue={3}>
<Select
options={[
{ value: 3, label: t("tasks.fields.priorities.low") },
{ value: 2, label: t("tasks.fields.priorities.medium") },
{value: 1, label: t("tasks.fields.priorities.high")},
{ value: 1, label: t("tasks.fields.priorities.high") }
]}
/>
</Form.Item>
@@ -106,8 +96,8 @@ export function TaskUpsertModalComponent({
initialValue={false}
rules={[
{
required: true,
},
required: true
}
]}
>
<Switch />
@@ -122,23 +112,27 @@ export function TaskUpsertModalComponent({
label={t("tasks.fields.jobid")}
rules={[
{
required: true,
},
required: true
}
]}
>
<JobSearchSelectComponent placeholder={t('tasks.placeholders.jobid')}
onSelect={changeJobId} onClear={changeJobId} autoFocus={false}/>
<JobSearchSelectComponent
placeholder={t("tasks.placeholders.jobid")}
onSelect={changeJobId}
onClear={changeJobId}
autoFocus={false}
/>
</Form.Item>
</Col>
</Row>
<Row gutter={[16, 16]}>
<Col span={8}>
<Form.Item
label={t("tasks.fields.joblineid")}
name="joblineid"
<Form.Item label={t("tasks.fields.joblineid")} name="joblineid">
<Select
allowClear
placeholder={t("tasks.placeholders.joblineid")}
disabled={!selectedJobDetails || !selectedJobId}
>
<Select allowClear placeholder={t("tasks.placeholders.joblineid")}
disabled={!selectedJobDetails || !selectedJobId}>
{selectedJobDetails?.joblines?.map((jobline) => (
<Select.Option key={jobline.id} value={jobline.id}>
{jobline.line_desc}
@@ -148,12 +142,12 @@ export function TaskUpsertModalComponent({
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label={t("tasks.fields.partsorderid")}
name="partsorderid"
<Form.Item label={t("tasks.fields.partsorderid")} name="partsorderid">
<Select
allowClear
placeholder={t("tasks.placeholders.partsorderid")}
disabled={!selectedJobDetails || !selectedJobId}
>
<Select allowClear placeholder={t("tasks.placeholders.partsorderid")}
disabled={!selectedJobDetails || !selectedJobId}>
{selectedJobDetails?.parts_orders?.map((partsOrder) => (
<Select.Option key={partsOrder.id} value={partsOrder.id}>
{partsOrder.order_number} - {partsOrder.vendor.name}
@@ -163,12 +157,12 @@ export function TaskUpsertModalComponent({
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label={t("tasks.fields.billid")}
name="billid"
<Form.Item label={t("tasks.fields.billid")} name="billid">
<Select
allowClear
placeholder={t("tasks.placeholders.billid")}
disabled={!selectedJobDetails || !selectedJobId}
>
<Select allowClear placeholder={t("tasks.placeholders.billid")}
disabled={!selectedJobDetails || !selectedJobId}>
{selectedJobDetails?.bills?.map((bill) => (
<Select.Option key={bill.id} value={bill.id}>
{bill.invoice_number} - {bill.vendor.name}
@@ -186,12 +180,14 @@ export function TaskUpsertModalComponent({
initialValue={currentUser.email}
rules={[
{
required: true,
},
required: true
}
]}
>
<Select placeholder={t("tasks.placeholders.assigned_to")}>
{bodyshop.employees.filter(x => x.active).map((employee) => (
{bodyshop.employees
.filter((x) => x.active)
.map((employee) => (
<Select.Option key={employee.id} value={employee.user_email}>
{employee.first_name} {employee.last_name}
</Select.Option>
@@ -200,32 +196,20 @@ export function TaskUpsertModalComponent({
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label={t("tasks.fields.due_date")}
name="due_date"
>
<Form.Item label={t("tasks.fields.due_date")} name="due_date">
<FormDatePicker format="MM/DD/YYYY" presets={datePickerPresets} />
</Form.Item>
</Col>
<Col span={8}>
<Form.Item
label={t("tasks.fields.remind_at")}
name="remind_at"
>
<Form.Item label={t("tasks.fields.remind_at")} name="remind_at">
<FormDatePicker format="MM/DD/YYYY" presets={datePickerPresets} />
</Form.Item>
</Col>
</Row>
<Row gutter={[16, 16]}>
<Col span={24}>
<Form.Item
label={t("tasks.fields.description")}
name="description"
>
<Input.TextArea
rows={8}
placeholder={t("tasks.fields.description")}
/>
<Form.Item label={t("tasks.fields.description")} name="description">
<Input.TextArea rows={8} placeholder={t("tasks.fields.description")} />
</Form.Item>
</Col>
</Row>

119
client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
View File

@@ -4,11 +4,7 @@ import React, {useEffect, useState} from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import {
MUTATION_INSERT_NEW_TASK,
MUTATION_UPDATE_TASK,
QUERY_GET_TASK_BY_ID
} from "../../graphql/tasks.queries";
import { MUTATION_INSERT_NEW_TASK, MUTATION_UPDATE_TASK, QUERY_GET_TASK_BY_ID } from "../../graphql/tasks.queries";
import { QUERY_GET_TASKS_JOB_DETAILS_BY_ID } from "../../graphql/jobs.queries.js";
import { toggleModalVisible } from "../../redux/modals/modals.actions";
import { selectTaskUpsert } from "../../redux/modals/modals.selectors";
@@ -17,14 +13,14 @@ import TaskUpsertModalComponent from "./task-upsert-modal.component";
import { replaceUndefinedWithNull } from "../../utils/undefinedtonull.js";
import { useNavigate } from "react-router-dom";
import axios from "axios";
import dayjs from '../../utils/day';
import dayjs from "../../utils/day";
import { insertAuditTrail } from "../../redux/application/application.actions.js";
import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser,
bodyshop: selectBodyshop,
taskUpsert: selectTaskUpsert,
taskUpsert: selectTaskUpsert
});
const mapDispatchToProps = (dispatch) => ({
toggleModalVisible: () => dispatch(toggleModalVisible("taskUpsert")),
@@ -32,13 +28,7 @@ const mapDispatchToProps = (dispatch) => ({
dispatch(insertAuditTrail({ jobid, billid, operation, type }))
});
export function TaskUpsertModalContainer({
bodyshop,
currentUser,
taskUpsert,
toggleModalVisible,
insertAuditTrail
}) {
export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, toggleModalVisible, insertAuditTrail }) {
const { t } = useTranslation();
const history = useNavigate();
const [insertTask] = useMutation(MUTATION_INSERT_NEW_TASK);
@@ -51,13 +41,9 @@ export function TaskUpsertModalContainer({
const [selectedJobDetails, setSelectedJobDetails] = useState(null);
const [jobIdState, setJobIdState] = useState(null);
const {
loading,
error,
data
} = useQuery(QUERY_GET_TASKS_JOB_DETAILS_BY_ID, {
const { loading, error, data } = useQuery(QUERY_GET_TASKS_JOB_DETAILS_BY_ID, {
variables: { id: jobIdState },
skip: !jobIdState,
skip: !jobIdState
});
const {
@@ -66,7 +52,7 @@ export function TaskUpsertModalContainer({
data: taskData
} = useQuery(QUERY_GET_TASK_BY_ID, {
variables: { id: taskId },
skip: !taskId,
skip: !taskId
});
// Use Effect to hydrate existing task if only a taskid is provided
@@ -109,16 +95,15 @@ export function TaskUpsertModalContainer({
};
}, [jobid, existingTask, form, open, joblineid, billid, partsorderid]);
/**
* Remove the taskid from the URL
*/
const removeTaskIdFromUrl = () => {
const urlParams = new URLSearchParams(window.location.search);
if (!urlParams.has('taskid')) return;
urlParams.delete('taskid');
if (!urlParams.has("taskid")) return;
urlParams.delete("taskid");
history(`${window.location.pathname}?${urlParams}`);
}
};
/**
* Handle existing task
@@ -132,7 +117,7 @@ export function TaskUpsertModalContainer({
variables: {
taskId: existingTask.id,
task: replaceUndefinedWithNull(values)
},
}
});
if (!taskData.errors) {
@@ -140,40 +125,43 @@ export function TaskUpsertModalContainer({
insertAuditTrail({
jobid: oldTask.jobid,
operation: AuditTrailMapping.tasksUpdated(
oldTask.title,
currentUser.email
),
operation: AuditTrailMapping.tasksUpdated(oldTask.title, currentUser.email),
type: "tasksUpdated"
});
}
if (isAssignedToDirty) {
// TODO This is being moved serverside
axios.post("/sendemail", {
axios
.post("/sendemail", {
from: {
name: bodyshop.shopname,
address: bodyshop.email,
address: bodyshop.email
},
ReplyTo: {
Email: 'noreply@imex.online'
Email: "noreply@imex.online"
},
to: values.assigned_to,
subject: `A Task has been re-assigned to you on ${bodyshop.shopname} - ${values.title}`,
templateStrings: {
header: values.title,
subHeader: `Assigned by ${currentUser.email} ${values.due_at ? `| Due on ${dayjs(values.due_at).format('MM/DD/YYYY')}` : ''}`,
subHeader: `Assigned by ${currentUser.email} ${values.due_at ? `| Due on ${dayjs(values.due_at).format("MM/DD/YYYY")}` : ""}`,
body: `<a href="${window.location.protocol}//${window.location.host}/manage/tasks/alltasks?taskid=${existingTask.id}">Please sign in to your account to view the task details.</a>`
}
}).catch(e => console.error(`Something went wrong sending email to Assigned party on Task creation. ${e.message || ''}`));
})
.catch((e) =>
console.error(`Something went wrong sending email to Assigned party on Task creation. ${e.message || ""}`)
);
}
window.dispatchEvent(new CustomEvent('taskUpdated', {
detail: {message: 'A task has been created or edited.'},
}));
window.dispatchEvent(
new CustomEvent("taskUpdated", {
detail: { message: "A task has been created or edited." }
})
);
notification["success"]({
message: t("tasks.successes.updated"),
message: t("tasks.successes.updated")
});
if (refetch) await refetch();
@@ -189,9 +177,9 @@ export function TaskUpsertModalContainer({
...values,
created_by: currentUser.email,
bodyshopid: bodyshop.id
},
],
},
}
]
}
});
const newTask = newTaskData?.data?.insert_tasks?.returning[0];
@@ -200,10 +188,7 @@ export function TaskUpsertModalContainer({
if (!newTaskData.errors) {
insertAuditTrail({
jobid: newTask.jobid,
operation: AuditTrailMapping.tasksCreated(
newTask.title,
currentUser.email
),
operation: AuditTrailMapping.tasksCreated(newTask.title, currentUser.email),
type: "tasksCreated"
});
}
@@ -215,30 +200,36 @@ export function TaskUpsertModalContainer({
// send notification to the assigned user
// TODO: This is being moved serverside
axios.post("/sendemail", {
axios
.post("/sendemail", {
from: {
name: bodyshop.shopname,
address: bodyshop.email,
address: bodyshop.email
},
replyTo: {
Email: 'noreply@imex.online'
Email: "noreply@imex.online"
},
to: values.assigned_to,
subject: `A new Task has been assigned to you on ${bodyshop.shopname} - ${values.title}`,
templateName: 'taskAssigned',
templateName: "taskAssigned",
templateStrings: {
header: values.title,
subHeader: `Assigned by ${currentUser.email} ${values.due_at ? `| Due on ${dayjs(values.due_at).format('MM/DD/YYYY')}` : ''}`,
subHeader: `Assigned by ${currentUser.email} ${values.due_at ? `| Due on ${dayjs(values.due_at).format("MM/DD/YYYY")}` : ""}`,
body: `<a href="${window.location.protocol}//${window.location.host}/manage/tasks/alltasks?taskid=${newTaskID}">Please sign to your account to view the task details.</a>`
}
}).catch(e => console.error(`Something went wrong sending email to Assigned party on Task edit. ${e.message || ''}`));
})
.catch((e) =>
console.error(`Something went wrong sending email to Assigned party on Task edit. ${e.message || ""}`)
);
window.dispatchEvent(new CustomEvent('taskUpdated', {
detail: {message: 'A task has been created or edited.'},
}));
window.dispatchEvent(
new CustomEvent("taskUpdated", {
detail: { message: "A task has been created or edited." }
})
);
notification["success"]({
message: t("tasks.successes.created"),
message: t("tasks.successes.created")
});
};
@@ -273,18 +264,18 @@ export function TaskUpsertModalContainer({
destroyOnClose
>
<Form form={form} onFinish={handleFinish} layout="vertical">
<TaskUpsertModalComponent form={form} loading={loading || (taskId && taskLoading)}
error={error} data={data}
<TaskUpsertModalComponent
form={form}
loading={loading || (taskId && taskLoading)}
error={error}
data={data}
selectedJobId={selectedJobId}
setSelectedJobId={setSelectedJobId}
selectedJobDetails={selectedJobDetails}/>
selectedJobDetails={selectedJobDetails}
/>
</Form>
</Modal>
);
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(TaskUpsertModalContainer);
export default connect(mapStateToProps, mapDispatchToProps)(TaskUpsertModalContainer);

94
client/src/graphql/tasks.queries.js
View File

@@ -1,6 +1,5 @@
import { gql } from "@apollo/client";
const PARTIAL_TASK_FIELDS = gql`
fragment TaskFields on tasks {
id
@@ -70,7 +69,8 @@ export const QUERY_GET_TASK_BY_ID = gql`
tasks_by_pk(id: $id) {
...TaskFields
}
}`;
}
`;
export const QUERY_ALL_TASKS_PAGINATED = gql`
${PARTIAL_TASK_FIELDS}
@@ -88,9 +88,9 @@ export const QUERY_ALL_TASKS_PAGINATED = gql`
limit: $limit
order_by: $order
where: {
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -98,9 +98,9 @@ export const QUERY_ALL_TASKS_PAGINATED = gql`
}
tasks_aggregate(
where: {
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -129,10 +129,10 @@ export const QUERY_JOBLINE_TASKS_PAGINATED = gql`
limit: $limit
order_by: $order
where: {
joblineid: {_eq: $joblineid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
joblineid: { _eq: $joblineid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -140,10 +140,10 @@ export const QUERY_JOBLINE_TASKS_PAGINATED = gql`
}
tasks_aggregate(
where: {
joblineid: {_eq: $joblineid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
joblineid: { _eq: $joblineid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -172,10 +172,10 @@ export const QUERY_PARTSORDER_TASKS_PAGINATED = gql`
limit: $limit
order_by: $order
where: {
partsorderid: {_eq: $partsorderid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
partsorderid: { _eq: $partsorderid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -183,10 +183,10 @@ export const QUERY_PARTSORDER_TASKS_PAGINATED = gql`
}
tasks_aggregate(
where: {
partsorderid: {_eq: $partsorderid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
partsorderid: { _eq: $partsorderid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -215,10 +215,10 @@ export const QUERY_BILL_TASKS_PAGINATED = gql`
limit: $limit
order_by: $order
where: {
billid: {_eq: $billid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
billid: { _eq: $billid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -226,10 +226,10 @@ export const QUERY_BILL_TASKS_PAGINATED = gql`
}
tasks_aggregate(
where: {
billid: {_eq: $billid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
billid: { _eq: $billid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -258,10 +258,10 @@ export const QUERY_JOB_TASKS_PAGINATED = gql`
limit: $limit
order_by: $order
where: {
jobid: {_eq: $jobid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
jobid: { _eq: $jobid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -269,10 +269,10 @@ export const QUERY_JOB_TASKS_PAGINATED = gql`
}
tasks_aggregate(
where: {
jobid: {_eq: $jobid},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: {_eq: $assigned_to},
jobid: { _eq: $jobid }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
assigned_to: { _eq: $assigned_to }
completed: { _eq: $completed }
}
) {
@@ -299,9 +299,9 @@ export const QUERY_MY_TASKS_PAGINATED = gql`
limit: $limit
order_by: $order
where: {
assigned_to: {_eq: $user},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: { _eq: $user }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
completed: { _eq: $completed }
}
) {
@@ -309,9 +309,9 @@ export const QUERY_MY_TASKS_PAGINATED = gql`
}
tasks_aggregate(
where: {
assigned_to: {_eq: $user},
bodyshopid: {_eq: $bodyshop},
deleted: {_eq: $deleted},
assigned_to: { _eq: $user }
bodyshopid: { _eq: $bodyshop }
deleted: { _eq: $deleted }
completed: { _eq: $completed }
}
) {
@@ -414,4 +414,4 @@ export const MUTATION_UPDATE_TASK = gql`
}
}
}
`
`;

86
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -20,38 +20,28 @@ import {FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks} from "react-icons/fa";
import { connect } from "react-redux";
import { useLocation, useNavigate } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import FormFieldsChanged
from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import JobAuditTrail from "../../components/job-audit-trail/job-audit-trail.component";
import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
import JobLineUpsertModalContainer
from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
import JobReconciliationModal
from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal/job-lines-upsert-modal.container";
import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
import JobsChangeStatus from "../../components/jobs-change-status/jobs-change-status.component";
import JobsConvertButton from "../../components/jobs-convert-button/jobs-convert-button.component";
import JobsDetailDatesComponent
from "../../components/jobs-detail-dates/jobs-detail-dates.component";
import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
import JobsDetailGeneral from "../../components/jobs-detail-general/jobs-detail-general.component";
import JobsDetailHeaderActions
from "../../components/jobs-detail-header-actions/jobs-detail-header-actions.component";
import JobsDetailHeaderActions from "../../components/jobs-detail-header-actions/jobs-detail-header-actions.component";
import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component";
import JobsDetailLaborContainer
from "../../components/jobs-detail-labor/jobs-detail-labor.container";
import JobsDetailLaborContainer from "../../components/jobs-detail-labor/jobs-detail-labor.container";
import JobsDetailPliContainer from "../../components/jobs-detail-pli/jobs-detail-pli.container";
import JobsDetailRates from "../../components/jobs-detail-rates/jobs-detail-rates.component";
import JobsDetailTotals from "../../components/jobs-detail-totals/jobs-detail-totals.component";
import JobsDocumentsGalleryContainer
from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
import JobsDocumentsLocalGallery
from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
import JobsDocumentsGalleryContainer from "../../components/jobs-documents-gallery/jobs-documents-gallery.container";
import JobsDocumentsLocalGallery from "../../components/jobs-documents-local-gallery/jobs-documents-local-gallery.container";
import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
import NoteUpsertModalComponent
from "../../components/note-upsert-modal/note-upsert-modal.container";
import ScheduleJobModalContainer
from "../../components/schedule-job-modal/schedule-job-modal.container";
import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
import { insertAuditTrail } from "../../redux/application/application.actions";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { setModalContext } from "../../redux/modals/modals.actions";
@@ -59,8 +49,7 @@ import {selectBodyshop, selectCurrentUser} from "../../redux/user/user.selectors
import AuditTrailMapping from "../../utils/AuditTrailMappings";
import UndefinedToNull from "../../utils/undefinedtonull";
import _ from "lodash";
import JobProfileDataWarning
from "../../components/job-profile-data-warning/job-profile-data-warning.component";
import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
import { DateTimeFormat } from "../../utils/DateFormatter";
import InstanceRenderManager from "../../utils/instanceRenderMgr";
import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
@@ -73,15 +62,21 @@ const mapStateToProps = createStructuredSelector({
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
setPrintCenterContext: (context) => dispatch(setModalContext({
setPrintCenterContext: (context) =>
dispatch(
setModalContext({
context: context,
modal: "printCenter"
})),
insertAuditTrail: ({jobid, operation, type}) => dispatch(insertAuditTrail({
})
),
insertAuditTrail: ({ jobid, operation, type }) =>
dispatch(
insertAuditTrail({
jobid,
operation,
type
}))
})
)
});
export function JobsDetailPage({
@@ -111,13 +106,13 @@ export function JobsDetailPage({
useEffect(() => {
const handleTaskUpdated = async (event) => {
await refetch().catch(e => `Something went wrong fetching tasks: ${e.message || ''}`);
await refetch().catch((e) => `Something went wrong fetching tasks: ${e.message || ""}`);
};
window.addEventListener('taskUpdated', handleTaskUpdated);
window.addEventListener("taskUpdated", handleTaskUpdated);
// Clean up the event listener when the component is unmounted.
return () => {
window.removeEventListener('taskUpdated', handleTaskUpdated);
window.removeEventListener("taskUpdated", handleTaskUpdated);
};
}, [refetch]);
@@ -272,8 +267,7 @@ export function JobsDetailPage({
<PrinterFilled />
{t("jobs.actions.printCenter")}
</Button>
<JobsConvertButton job={job} refetch={refetch}
parentFormIsFieldsTouched={form.isFieldsTouched}/>
<JobsConvertButton job={job} refetch={refetch} parentFormIsFieldsTouched={form.isFieldsTouched} />
<JobsDetailHeaderActions key="actions" job={job} refetch={refetch} />
<Button type="primary" loading={loading} disabled={jobRO} onClick={() => form.submit()}>
{t("general.actions.save")}
@@ -321,8 +315,7 @@ export function JobsDetailPage({
icon: <BarsOutlined />,
label: t("menus.jobsdetail.repairdata"),
forceRender: true,
children: <JobsLinesContainer job={job} joblines={job.joblines} refetch={refetch}
form={form}/>
children: <JobsLinesContainer job={job} joblines={job.joblines} refetch={refetch} form={form} />
},
{
key: "rates",
@@ -403,17 +396,26 @@ export function JobsDetailPage({
children: <JobAuditTrail jobId={job.id} />
},
{
key: 'tasks',
key: "tasks",
icon: <FaTasks />,
label: <Space direction='horizontal'>
{t("jobs.labels.tasks")}{job.tasks_aggregate.aggregate.count > 0 &&
<Badge count={job.tasks_aggregate.aggregate.count}/>}
</Space>,
children: <TaskListContainer currentUser={currentUser} bodyshop={bodyshop}
relationshipType={'jobid'} relationshipId={job.id}
label: (
<Space direction="horizontal">
{t("jobs.labels.tasks")}
{job.tasks_aggregate.aggregate.count > 0 && <Badge count={job.tasks_aggregate.aggregate.count} />}
</Space>
),
children: (
<TaskListContainer
currentUser={currentUser}
bodyshop={bodyshop}
relationshipType={"jobid"}
relationshipId={job.id}
query={QUERY_JOB_TASKS_PAGINATED}
titleTranslation='tasks.titles.job_tasks' showRo={false}/>
},
titleTranslation="tasks.titles.job_tasks"
showRo={false}
/>
)
}
]}
/>
</Form>

30
client/src/pages/manage/manage.page.component.jsx
View File

@@ -17,26 +17,21 @@ import TestComponent from "../../components/_test/test.page";
import HeaderContainer from "../../components/header/header.container";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
import PrintCenterModalContainer
from "../../components/print-center-modal/print-center-modal.container";
import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
import { requestForToken } from "../../firebase/firebase.utils";
import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";
import UpdateAlert from "../../components/update-alert/update-alert.component";
import { setJoyRideFinished } from "../../redux/application/application.actions.js";
import {
selectEnableJoyRide,
selectJoyRideSteps
} from "../../redux/application/application.selectors.js";
import { selectEnableJoyRide, selectJoyRideSteps } from "../../redux/application/application.selectors.js";
import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
import "./manage.page.styles.scss";
const JobsPage = lazy(() => import("../jobs/jobs.page"));
const CardPaymentModalContainer = lazy(() =>
import("../../components/card-payment-modal/card-payment-modal.container.")
const CardPaymentModalContainer = lazy(
() => import("../../components/card-payment-modal/card-payment-modal.container.")
);
const JobsDetailPage = lazy(() => import("../jobs-detail/jobs-detail.page.container"));
@@ -64,8 +59,8 @@ const JobCostingModal = lazy(() => import("../../components/job-costing-modal/jo
const ReportCenterModal = lazy(() => import("../../components/report-center-modal/report-center-modal.container"));
const BillEnterModalContainer = lazy(() => import("../../components/bill-enter-modal/bill-enter-modal.container"));
const TimeTicketModalContainer = lazy(() => import("../../components/time-ticket-modal/time-ticket-modal.container"));
const TimeTicketModalTask = lazy(() =>
import("../../components/time-ticket-task-modal/time-ticket-task-modal.container")
const TimeTicketModalTask = lazy(
() => import("../../components/time-ticket-task-modal/time-ticket-task-modal.container")
);
const PaymentModalContainer = lazy(() => import("../../components/payment-modal/payment-modal.container"));
const ProductionListPage = lazy(() => import("../production-list/production-list.container"));
@@ -260,18 +255,20 @@ export function Manage({conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyR
}
/>
<Route
path='/tasks/mytasks'
path="/tasks/mytasks"
element={
<Suspense fallback={<Spin />}>
<MyTasksPage />
</Suspense>}
</Suspense>
}
/>
<Route
path='/tasks/alltasks'
path="/tasks/alltasks"
element={
<Suspense fallback={<Spin />}>
<AllTasksPage />
</Suspense>}
</Suspense>
}
/>
<Route
path="/inventory/"
@@ -647,8 +644,7 @@ export function Manage({conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyR
Get Tours
</Button>
{tours.map((tour) => (
<Tag key={tour.id}
onClick={() => window.productFruits.api.tours.tryStartTour(tour.id)}>
<Tag key={tour.id} onClick={() => window.productFruits.api.tours.tryStartTour(tour.id)}>
{tour.name}
</Tag>
))}

35
client/src/pages/tasks/allTasksPageContainer.jsx
View File

@@ -14,13 +14,13 @@ import {useLocation} from "react-router-dom";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
setTaskUpsertContext: (context) => dispatch(setModalContext({context, modal: 'taskUpsert'})),
setTaskUpsertContext: (context) => dispatch(setModalContext({ context, modal: "taskUpsert" }))
});
export function MyTasksPageContainer({
@@ -31,45 +31,40 @@ export function MyTasksPageContainer({
setTaskUpsertContext
}) {
const { t } = useTranslation();
const searchParams = queryString.parse((useLocation().search));
const searchParams = queryString.parse(useLocation().search);
useEffect(() => {
document.title = t("titles.all_tasks", {
app: InstanceRenderManager({
imex: '$t(titles.imexonline)',
rome: '$t(titles.romeonline)',
promanager: '$t(titles.promanager)'
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)",
promanager: "$t(titles.promanager)"
})
});
setSelectedHeader("all_tasks");
setBreadcrumbs([
{
link: "/manage/tasks/alltasks",
label: t("titles.bc.all_tasks"),
},]);
label: t("titles.bc.all_tasks")
}
]);
}, [t, setBreadcrumbs, setSelectedHeader]);
// This takes care of the ability to deep link a task from the URL (Dispatches the modal)
useEffect(() => {
// Check for a query string in the URL
const urlParams = new URLSearchParams(searchParams);
const taskId = urlParams.get('taskid');
const taskId = urlParams.get("taskid");
if (taskId) {
setTaskUpsertContext({
context: {
taskId,
},
taskId
}
});
urlParams.delete('taskid');
urlParams.delete("taskid");
}
}, [setTaskUpsertContext]);
return (
<TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser}
bodyshop={bodyshop}/>
);
return <TasksPageComponent type={TaskPageTypes.ALL_TASKS} currentUser={currentUser} bodyshop={bodyshop} />;
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(MyTasksPageContainer);
export default connect(mapStateToProps, mapDispatchToProps)(MyTasksPageContainer);

25
client/src/pages/tasks/myTasksPageContainer.jsx
View File

@@ -11,12 +11,12 @@ import TaskPageTypes from "./taskPageTypes.jsx";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
currentUser: selectCurrentUser,
currentUser: selectCurrentUser
});
const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
});
export function MyTasksPageContainer({ bodyshop, currentUser, setBreadcrumbs, setSelectedHeader }) {
@@ -24,26 +24,21 @@ export function MyTasksPageContainer({bodyshop, currentUser, setBreadcrumbs, set
useEffect(() => {
document.title = t("titles.my_tasks", {
app: InstanceRenderManager({
imex: '$t(titles.imexonline)',
rome: '$t(titles.romeonline)',
promanager: '$t(titles.promanager)'
imex: "$t(titles.imexonline)",
rome: "$t(titles.romeonline)",
promanager: "$t(titles.promanager)"
})
});
setSelectedHeader("my_tasks");
setBreadcrumbs([
{
link: "/manage/tasks/mytasks",
label: t("titles.bc.my_tasks"),
},]);
label: t("titles.bc.my_tasks")
}
]);
}, [t, setBreadcrumbs, setSelectedHeader]);
return (
<TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser}
bodyshop={bodyshop}/>
);
return <TasksPageComponent type={TaskPageTypes.MY_TASKS} currentUser={currentUser} bodyshop={bodyshop} />;
}
export default connect(
mapStateToProps,
mapDispatchToProps
)(MyTasksPageContainer);
export default connect(mapStateToProps, mapDispatchToProps)(MyTasksPageContainer);

4
client/src/pages/tasks/taskPageTypes.jsx
View File

@@ -1,6 +1,6 @@
export const TaskPageTypes = {
MY_TASKS: 'myTasks',
ALL_TASKS: 'allTasks',
MY_TASKS: "myTasks",
ALL_TASKS: "allTasks"
};
export default TaskPageTypes;

29
client/src/pages/tasks/tasks.page.component.jsx
View File

@@ -6,16 +6,27 @@ import taskPageTypes from "./taskPageTypes.jsx";
export default function TasksPageComponent({ bodyshop, currentUser, type }) {
switch (type) {
case taskPageTypes.MY_TASKS:
return <TaskListContainer onlyMine={true} relationshipId={currentUser.email}
relationshipType={'user'} query={QUERY_MY_TASKS_PAGINATED}
bodyshop={bodyshop} titleTranslation={'tasks.titles.my_tasks'}
currentUser={currentUser}/>
return (
<TaskListContainer
onlyMine={true}
relationshipId={currentUser.email}
relationshipType={"user"}
query={QUERY_MY_TASKS_PAGINATED}
bodyshop={bodyshop}
titleTranslation={"tasks.titles.my_tasks"}
currentUser={currentUser}
/>
);
case taskPageTypes.ALL_TASKS:
return <TaskListContainer query={QUERY_ALL_TASKS_PAGINATED} bodyshop={bodyshop}
titleTranslation={'tasks.titles.all_tasks'}
currentUser={currentUser}/>
return (
<TaskListContainer
query={QUERY_ALL_TASKS_PAGINATED}
bodyshop={bodyshop}
titleTranslation={"tasks.titles.all_tasks"}
currentUser={currentUser}
/>
);
default:
return <></>
return <></>;
}
}

2
client/src/redux/modals/modals.reducer.js
View File

@@ -13,7 +13,7 @@ const INITIAL_STATE = {
billEnter: { ...baseModal },
courtesyCarReturn: { ...baseModal },
noteUpsert: { ...baseModal },
taskUpsert: {...baseModal, },
taskUpsert: { ...baseModal },
schedule: { ...baseModal },
partsOrder: { ...baseModal },
timeTicket: { ...baseModal },

22
client/src/utils/AuditTrailMappings.js
View File

@@ -41,32 +41,36 @@ const AuditTrailMapping = {
jobsuspend: (status) => i18n.t("audit_trail.messages.jobsuspend", { status }),
jobvoid: () => i18n.t("audit_trail.messages.jobvoid"),
// Tasks Entries
tasksCreated: (title, createdBy) => i18n.t("audit_trail.messages.tasks_created", {
tasksCreated: (title, createdBy) =>
i18n.t("audit_trail.messages.tasks_created", {
title,
createdBy
}),
tasksUpdated: (title, updatedBy) => i18n.t("audit_trail.messages.tasks_updated", {
tasksUpdated: (title, updatedBy) =>
i18n.t("audit_trail.messages.tasks_updated", {
title,
updatedBy
}),
tasksDeleted: (title, deletedBy) => i18n.t("audit_trail.messages.tasks_deleted", {
tasksDeleted: (title, deletedBy) =>
i18n.t("audit_trail.messages.tasks_deleted", {
title,
deletedBy
}),
tasksUndeleted: (title, undeletedBy) => i18n.t("audit_trail.messages.tasks_undeleted", {
tasksUndeleted: (title, undeletedBy) =>
i18n.t("audit_trail.messages.tasks_undeleted", {
title,
undeletedBy
}),
tasksCompleted: (title, completedBy) => i18n.t("audit_trail.messages.tasks_completed", {
tasksCompleted: (title, completedBy) =>
i18n.t("audit_trail.messages.tasks_completed", {
title,
completedBy
}),
tasksUncompleted: (title, uncompletedBy) => i18n.t("audit_trail.messages.tasks_uncompleted", {
tasksUncompleted: (title, uncompletedBy) =>
i18n.t("audit_trail.messages.tasks_uncompleted", {
title,
uncompletedBy
}),
})
};
export default AuditTrailMapping;

2
client/src/utils/undefinedtonull.js
View File

@@ -29,7 +29,7 @@ export function replaceUndefinedWithNull(obj, keys) {
return Object.fromEntries(
Object.entries(obj).map(([key, value]) => {
if (keys) {
return [key, (keys.includes(key) && value === undefined) ? null : value];
return [key, keys.includes(key) && value === undefined ? null : value];
} else {
return [key, value === undefined ? null : value];
}

16
package-lock.json generated
View File

@@ -56,6 +56,7 @@
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"concurrently": "^8.2.2",
"prettier": "^3.2.5",
"source-map-explorer": "^2.5.2"
},
"engines": {
@@ -5900,6 +5901,21 @@
"node": ">= 0.8.0"
}
},
"node_modules/prettier": {
"version": "3.2.5",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
"integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
"dev": true,
"bin": {
"prettier": "bin/prettier.cjs"
},
"engines": {
"node": ">=14"
},
"funding": {
"url": "https://github.com/prettier/prettier?sponsor=1"
}
},
"node_modules/process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",

1
package.json
View File

@@ -66,6 +66,7 @@
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"concurrently": "^8.2.2",
"prettier": "^3.2.5",
"source-map-explorer": "^2.5.2"
}
}

25
server/email/generateTemplate.js
View File

@@ -13,21 +13,21 @@ const {header, end, start} = require("./html");
const defaultFooter = () => {
return RenderInstanceManager({
imex: 'ImEX Online Collision Repair Management System',
rome: 'Rome Technologies',
promanager: 'ProManager',
imex: "ImEX Online Collision Repair Management System",
rome: "Rome Technologies",
promanager: "ProManager"
});
};
const now = () => moment().format('MM/DD/YYYY @ hh:mm a');
const now = () => moment().format("MM/DD/YYYY @ hh:mm a");
const generateEmailTemplate = (strings) => {
return `
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">`
+ header
+ start
+ `
return (
`
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">` +
header +
start +
`
<table class="row">
<tbody>
<tr>
@@ -101,8 +101,9 @@ const generateEmailTemplate = (strings) => {
</th>
</tr>
</tbody>
</table>`
+ end
</table>` +
end
);
};
module.exports = generateEmailTemplate;

2
server/email/sendemail.js
View File

@@ -11,7 +11,7 @@ const logger = require("../utils/logger");
const client = require("../graphql-client/graphql-client").client;
const queries = require("../graphql-client/queries");
const { isObject } = require("lodash");
const generateEmailTemplate = require('./generateTemplate');
const generateEmailTemplate = require("./generateTemplate");
const ses = new aws.SES({
// The key apiVersion is no longer supported in v3, and can be removed.