handleOnRowClick(null)}
diff --git a/client/src/components/parts-order-modal/parts-order-modal.container.jsx b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
index 2d8f8c77c..76113a7e0 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -158,7 +158,7 @@ export function PartsOrderModalContainer({
vendorid: bodyshop.inhousevendorid,
invoice_number: "ih",
isinhouse: true,
- date: new dayjs(),
+ date: dayjs(),
total: 0,
billlines: values.parts_order_lines.data.map((p) => {
return {
diff --git a/client/src/components/task-list/task-list.component.jsx b/client/src/components/task-list/task-list.component.jsx
index 7f2b5d75d..b6de88ab1 100644
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -46,7 +46,7 @@ const DueDateRecord = ({dueDate}) => {
* @constructor
*/
const PriorityLabel = ({priority}) => {
- switch(priority) {
+ switch (priority) {
case 1:
return
High
@@ -89,7 +89,7 @@ function TaskListComponent({
toggleDeletedStatus,
relationshipType,
relationshipId,
- onlyMine ,
+ onlyMine,
parentJobId
}) {
const {t} = useTranslation();
@@ -108,7 +108,7 @@ function TaskListComponent({
const history = useNavigate();
const columns = [];
-
+
if (!onlyMine) {
columns.push(
{
@@ -118,14 +118,14 @@ function TaskListComponent({
width: '8%',
sorter: true,
sortOrder: sortcolumn === "assigned_to" && sortorder,
- render: (text, record) => {
- const employee = bodyshop?.employees?.find(e => e.user_email === record.assigned_to);
- return employee ? `${ employee.first_name} ${ employee.last_name}` : t("general.labels.na");
+ render: (text, record) => {
+ const employee = bodyshop?.employees?.find(e => e.user_email === record.assigned_to);
+ return employee ? `${employee.first_name} ${employee.last_name}` : t("general.labels.na");
}
}
);
}
-
+
columns.push(
{
title: t("tasks.fields.job.ro_number"),
@@ -134,7 +134,8 @@ function TaskListComponent({
width: '8%',
render: (text, record) =>
record.job
- ? {record.job.ro_number || t("general.labels.na")}
+ ? {record.job.ro_number || t("general.labels.na")}
: t("general.labels.na")
},
{
@@ -151,7 +152,8 @@ function TaskListComponent({
width: '8%',
render: (text, record) =>
record.parts_order
- ?
+ ?
{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")}
@@ -186,7 +188,7 @@ function TaskListComponent({
sorter: true,
sortOrder: sortcolumn === "due_date" && sortorder,
width: '8%',
- render: (text, record) => ,
+ render: (text, record) => ,
},
{
title: t("tasks.fields.remind_at"),
@@ -195,7 +197,7 @@ function TaskListComponent({
sorter: true,
sortOrder: sortcolumn === "remind_at" && sortorder,
width: '8%',
- render: (text, record) => ,
+ render: (text, record) => ,
},
{
title: t("tasks.fields.priority"),
@@ -267,9 +269,9 @@ function TaskListComponent({
}
history({search: queryString.stringify(search)});
};
-
+
const expandableRow = (record) => {
- return
+ return
{record.description}
};
@@ -289,7 +291,7 @@ function TaskListComponent({
checked={mine === "true"}
onChange={(value) => handleSwitchChange('mine', value)}
/>
-)}
+ )}
}
unCheckedChildren={}
diff --git a/client/src/components/task-list/task-list.container.jsx b/client/src/components/task-list/task-list.container.jsx
index 191b8a8b1..501bad527 100644
--- a/client/src/components/task-list/task-list.container.jsx
+++ b/client/src/components/task-list/task-list.container.jsx
@@ -12,7 +12,16 @@ import TaskListComponent from "./task-list.component.jsx";
import {notification} from "antd";
import {useTranslation} from "react-i18next";
-export default function TaskListContainer({bodyshop, titleTranslation ,query, relationshipType, relationshipId, currentUser, onlyMine, parentJobId}) {
+export default function TaskListContainer({
+ bodyshop,
+ titleTranslation,
+ query,
+ relationshipType,
+ relationshipId,
+ currentUser,
+ onlyMine,
+ parentJobId
+ }) {
const {t} = useTranslation();
const searchParams = queryString.parse(useLocation().search);
const {page, sortcolumn, sortorder, deleted, completed, mine} = searchParams;
@@ -26,7 +35,7 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
[relationshipType]: relationshipId,
deleted: deleted === 'true',
completed: completed === "true",
- assigned_to: mine === "true" ? currentUser.email: undefined, // replace currentUserID with the actual ID of the current user
+ 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: [
@@ -56,7 +65,7 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
window.removeEventListener('taskUpdated', handleTaskUpdated);
};
}, [refetch]);
-
+
/**
* Toggle task completed mutation
*/
@@ -81,8 +90,8 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
// refetch().catch((e) => {
// console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
// });
- 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"),
@@ -115,8 +124,8 @@ export default function TaskListContainer({bodyshop, titleTranslation ,query, r
deleted_at: deleted_at
}
});
- window.dispatchEvent( new CustomEvent('taskUpdated', {
- detail: { message: 'A task has been deleted.' },
+ window.dispatchEvent(new CustomEvent('taskUpdated', {
+ detail: {message: 'A task has been deleted.'},
}));
// refetch().catch((e) => {
// console.error(`Something went wrong fetching tasks: ${e.message || ''}`);
diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
index 5d13901c8..af3f21210 100644
--- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
@@ -56,8 +56,8 @@ export function TaskUpsertModalContainer({
});
const {
- loading: taskLoading,
- error: taskError,
+ loading: taskLoading,
+ error: taskError,
data: taskData
} = useQuery(QUERY_GET_TASK_BY_ID, {
variables: {id: taskId},
@@ -139,7 +139,7 @@ export function TaskUpsertModalContainer({
ReplyTo: {
Email: 'noreply@imex.online'
},
- to: values.assigned_to,
+ to: values.assigned_to,
subject: `A Task has been re-assigned to you on ${bodyshop.shopname} - ${values.title}`,
templateStrings: {
header: values.title,
@@ -189,7 +189,7 @@ export function TaskUpsertModalContainer({
// });
// },
})).data.insert_tasks.returning[0].id;
-
+
if (refetch) await refetch();
form.resetFields();
@@ -255,7 +255,8 @@ export function TaskUpsertModalContainer({
destroyOnClose
>
-
- );
+ />
+
+
+ );
}
export default connect(mapStateToProps, mapDispatchToProps)(JobsDetailPage);
diff --git a/client/src/pages/manage/manage.page.component.jsx b/client/src/pages/manage/manage.page.component.jsx
index d9b310470..476642332 100644
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,4 +1,4 @@
-import { FloatButton, Layout, Spin, Collapse, Button, Space, Tag } from "antd";
+import {Button, Collapse, FloatButton, Layout, Space, Spin, Tag} from "antd";
// import preval from "preval.macro";
import React, {lazy, Suspense, useEffect, useState} from "react";
import {useTranslation} from "react-i18next";
@@ -20,8 +20,8 @@ import PartnerPingComponent from "../../components/partner-ping/partner-ping.com
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 {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";
@@ -106,7 +106,7 @@ const MyTasksPage = lazy(() => import("../tasks/myTasksPageContainer.jsx"));
const AllTasksPage = lazy(() => import("../tasks/allTasksPageContainer.jsx"));
const TaskUpsertModalContainer = lazy(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
-const { Content, Footer } = Layout;
+const {Content, Footer} = Layout;
const mapStateToProps = createStructuredSelector({
conflict: selectInstanceConflict,
@@ -119,8 +119,8 @@ const mapDispatchToProps = (dispatch) => ({
setJoyRideFinished: (steps) => dispatch(setJoyRideFinished(steps))
});
-export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyRideFinished }) {
- const { t } = useTranslation();
+export function Manage({conflict, bodyshop, enableJoyRide, joyRideSteps, setJoyRideFinished}) {
+ const {t} = useTranslation();
const [chatVisible] = useState(false);
const [tours, setTours] = useState([]);
@@ -156,115 +156,115 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
/>
}
>
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- } />
- } />
+ }/>
+ }/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
- }
+ element={
+ }>
+
+ }
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
@@ -426,16 +426,16 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
@@ -443,8 +443,8 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
}>
-
+ }>
+
}
/>
@@ -452,56 +452,56 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
@@ -509,65 +509,65 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
- } />
+ }/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
}>
-
+ }>
+
}
/>
@@ -577,16 +577,16 @@ export function Manage({ conflict, bodyshop, enableJoyRide, joyRideSteps, setJoy
let PageContent;
- if (conflict) PageContent = ;
- else if (bodyshop && bodyshop.sub_status !== "active") PageContent = ;
+ if (conflict) PageContent = ;
+ else if (bodyshop && bodyshop.sub_status !== "active") PageContent = ;
else PageContent = AppRouteTable;
return (
<>
-
-
-
-
+
+
+
+
-
- } showDialog>
+
+ } showDialog>
{PageContent}
-
+