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

Merge branch 'release/2024-01-26' into feature/IO-1828-Front-End-Package-Updates

Browse Source 
# Conflicts:
#	client/src/pages/jobs-detail/jobs-detail.page.component.jsx
#	package-lock.json
#	package.json
This commit is contained in:
Dave Richer
2024-01-26 16:28:18 -05:00
parent 29d5465afc afdcfb7bf6
commit ae98566bbd
56 changed files with 51532 additions and 2645 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,6 +55,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
import AuditTrailMapping from "../../utils/AuditTrailMappings";
import UndefinedToNull from "../../utils/undefinedtonull";
import { DateTimeFormat } from "./../../utils/DateFormatter";
import JobLifecycleComponent from "../../components/job-lifecycle/job-lifecycle.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -305,6 +306,12 @@ export function JobsDetailPage({
label: t("menus.jobsdetail.labor"),
children: <JobsDetailLaborContainer job={job} jobId={job.id} />,
},
{
key: 'lifecycle',
icon: <BarsOutlined />,
label: t('menus.jobsdetail.lifecycle'),
children: <span><BarsOutlined />{t('menus.jobsdetail.lifecycle')}</span>
},
{
key: "dates",
icon: <CalendarFilled />,