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

- reapply proper prettier formatting.

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-04-03 14:09:09 -04:00
parent e51f72ff98
commit ab031c01de
26 changed files with 10734 additions and 10641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@ const DueDateRecord = ({dueDate}) => {
* @constructor
*/
const PriorityLabel = ({priority}) => {
switch(priority) {
switch (priority) {
case 1:
return <div>
High <ExclamationCircleFilled style={{marginLeft: '5px', color: 'red'}}/>
@@ -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
? <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number || t("general.labels.na")}</Link>
? <Link
to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number || t("general.labels.na")}</Link>
: t("general.labels.na")
},
{
@@ -151,7 +152,8 @@ function TaskListComponent({
width: '8%',
render: (text, record) =>
record.parts_order
? <Link to={`/manage/jobs/${record.job.id}?partsorderid=${record.parts_order.id}&tab=partssublet`}>
? <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")}
@@ -186,7 +188,7 @@ function TaskListComponent({
sorter: true,
sortOrder: sortcolumn === "due_date" && sortorder,
width: '8%',
render: (text, record) => <DueDateRecord dueDate={record.due_date} />,
render: (text, record) => <DueDateRecord dueDate={record.due_date}/>,
},
{
title: t("tasks.fields.remind_at"),
@@ -195,7 +197,7 @@ function TaskListComponent({
sorter: true,
sortOrder: sortcolumn === "remind_at" && sortorder,
width: '8%',
render: (text, record) => <DueDateRecord dueDate={record.remind_at} />,
render: (text, record) => <DueDateRecord dueDate={record.remind_at}/>,
},
{
title: t("tasks.fields.priority"),
@@ -267,9 +269,9 @@ function TaskListComponent({
}
history({search: queryString.stringify(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>
};
@@ -289,7 +291,7 @@ function TaskListComponent({
checked={mine === "true"}
onChange={(value) => handleSwitchChange('mine', value)}
/>
)}
)}
<Switch
checkedChildren={<CheckCircleFilled/>}
unCheckedChildren={<CheckCircleOutlined/>}

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

@@ -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 || ''}`);