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

Finalized read only job. Logic to detmerine what is read only outstanding. BOD-409

Browse Source
This commit is contained in:
Patrick Fic
2020-09-28 14:45:31 -07:00
parent 3ee003000d
commit cb412f377e
6 changed files with 107 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,6 @@ import Icon, {
DollarCircleOutlined,
FileImageFilled,
ToolFilled,
CheckSquareFilled,
} from "@ant-design/icons";
import { Form, notification, Tabs } from "antd";
import Axios from "axios";
@@ -13,20 +12,15 @@ import moment from "moment";
import queryString from "query-string";
import React, { lazy, Suspense, useState } from "react";
import { useTranslation } from "react-i18next";
import {
FaHardHat,
FaHistory,
FaRegStickyNote,
FaShieldAlt,
} from "react-icons/fa";
import { FaHardHat, FaRegStickyNote, FaShieldAlt } from "react-icons/fa";
import { connect } from "react-redux";
import { useHistory, useLocation } from "react-router-dom";
import { createStructuredSelector } from "reselect";
import FormFieldsChanged from "../../components/form-fields-changed-alert/form-fields-changed-alert.component";
import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
import { selectBodyshop } from "../../redux/user/user.selectors";
import JobsDetailChecklists from "../../components/jobs-detail-checklists/jobs-detail-checklists.component";
//import JobsDetailChecklists from "../../components/jobs-detail-checklists/jobs-detail-checklists.component";
import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
const JobsLinesContainer = lazy(() =>
import("../../components/job-detail-lines/job-lines.container")
@@ -66,9 +60,9 @@ const JobLineUpsertModalContainer = lazy(() =>
const JobsDetailPliContainer = lazy(() =>
import("../../components/jobs-detail-pli/jobs-detail-pli.container")
);
const JobsDetailAuditContainer = lazy(() =>
import("../../components/audit-trail-list/audit-trail-list.container")
);
// const JobsDetailAuditContainer = lazy(() =>
// import("../../components/audit-trail-list/audit-trail-list.container")
// );
const JobsDetailLaborContainer = lazy(() =>
import("../../components/jobs-detail-labor/jobs-detail-labor.container")
);
@@ -268,29 +262,30 @@ export function JobsDetailPage({
>
<JobNotesContainer jobId={job.id} />
</Tabs.TabPane>
<Tabs.TabPane
tab={
<span>
<Icon component={FaHistory} />
{t("jobs.labels.audit")}
</span>
}
key="audit"
>
<JobsDetailAuditContainer recordId={job.id} />
</Tabs.TabPane>
<Tabs.TabPane
tab={
<span>
<CheckSquareFilled />
{t("jobs.labels.checklists")}
</span>
}
key="checklists"
>
<JobsDetailChecklists job={job} />
</Tabs.TabPane>
{
// <Tabs.TabPane
// tab={
// <span>
// <Icon component={FaHistory} />
// {t("jobs.labels.audit")}
// </span>
// }
// key="audit"
// >
// <JobsDetailAuditContainer recordId={job.id} />
// </Tabs.TabPane>
// <Tabs.TabPane
// tab={
// <span>
// <CheckSquareFilled />
// {t("jobs.labels.checklists")}
// </span>
// }
// key="checklists"
// >
// <JobsDetailChecklists job={job} />
// </Tabs.TabPane>
}
</Tabs>
</Form>
</Suspense>