diff --git a/client/src/components/production-list-columns/production-list-columns.status.component.jsx b/client/src/components/production-list-columns/production-list-columns.status.component.jsx
index 498825fda..7349f6b63 100644
--- a/client/src/components/production-list-columns/production-list-columns.status.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.status.component.jsx
@@ -38,7 +38,7 @@ export function ProductionListColumnStatus({ record, bodyshop }) {
style={{ maxHeight: "200px", overflowY: "auto" }}
onClick={handleSetStatus}
>
- {bodyshop.md_ro_statuses.statuses.map((item) => (
+ {bodyshop.md_ro_statuses.production_statuses.map((item) => (
{item}
))}
diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
index fadd6e39e..1c1da88f1 100644
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx
@@ -1,4 +1,4 @@
-import { Form, Select } from "antd";
+import { Divider, Form, Select } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -7,6 +7,7 @@ import { selectTechnician } from "../../redux/tech/tech.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
import JobSearchSelect from "../job-search-select/job-search-select.component";
import JobsDetailLaborContainer from "../jobs-detail-labor/jobs-detail-labor.container";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
@@ -18,39 +19,41 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
const emps = bodyshop.employees.filter((e) => e.id === technician.id)[0];
return (
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
prevValues.jobid !== curValues.jobid
diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
index 6aa69f208..7e1e166ed 100644
--- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
+++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx
@@ -1,7 +1,7 @@
+import { useMutation } from "@apollo/client";
import { Button, Card, Form, notification } from "antd";
import axios from "axios";
import React, { useState } from "react";
-import { useMutation } from "@apollo/client";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -60,20 +60,23 @@ export function TechClockInContainer({ technician, bodyshop }) {
message: t("timetickets.successes.clockedin"),
});
}
+ form.resetFields();
setLoading(false);
};
return (
-
-
-
-
-
+ form.submit()} loading={loading}>
+ {t("timetickets.actions.clockin")}
+
+ }
+ >
+
+
);
}
export default connect(mapStateToProps, null)(TechClockInContainer);
diff --git a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
index 23a213f0b..c2e9a4298 100644
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
@@ -1,6 +1,6 @@
import { PrinterFilled } from "@ant-design/icons";
import { useQuery } from "@apollo/client";
-import { Button, Drawer, Grid, PageHeader, Tabs, Tag } from "antd";
+import { Button, Divider, Drawer, Grid, PageHeader, Tabs, Tag } from "antd";
import queryString from "query-string";
import React from "react";
import { useTranslation } from "react-i18next";
@@ -10,6 +10,7 @@ import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
import { setModalContext } from "../../redux/modals/modals.actions";
import AlertComponent from "../alert/alert.component";
import JobLinesContainer from "../job-detail-lines/job-lines.container";
+import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
import JobsDocumentsGalleryContainer from "../jobs-documents-gallery/jobs-documents-gallery.container";
import JobNotesContainer from "../jobs-notes/jobs-notes.container";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
@@ -78,20 +79,8 @@ export function JobDetailCards({ setPrintCenterContext }) {
{error ? : null}
{data ? (
,
- ,
-
- {t("jobs.labels.inproduction")}
- ,
- ]}
- title={t("jobs.fields.ro_number") || t("general.labels.na")}
- subTitle={data.jobs_by_pk.status}
+ onBack={() => window.history.back()}
+ title={data.jobs_by_pk.ro_number || t("general.labels.na")}
extra={
}
>
+
+
{
- return (
-
-
- {
- setSearchText(e.target.value);
- }}
- value={searchText}
- enterButton
- />
-
- );
- }}
- rowSelection={{
- onSelect: (record) => {
- handleOnRowClick(record);
- },
- selectedRowKeys: [selected],
- type: "radio",
- }}
- onChange={handleTableChange}
- onRow={(record, rowIndex) => {
- return {
- onClick: (event) => {
+
+
+ {
+ setSearchText(e.target.value);
+ }}
+ value={searchText}
+ enterButton
+ />
+
+ }
+ >
+ {
handleOnRowClick(record);
},
- };
- }}
- />
+ selectedRowKeys: [selected],
+ type: "radio",
+ }}
+ onChange={handleTableChange}
+ onRow={(record, rowIndex) => {
+ return {
+ onClick: (event) => {
+ handleOnRowClick(record);
+ },
+ };
+ }}
+ />
+
);
}
diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index e3421b112..3ec7425cc 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -54,11 +54,8 @@ export default function TimeTicketList({
key: "employee",
sorter: (a, b) => alphaSort(a.employee.last_name, b.employee.last_name),
sortOrder: state.sortedInfo.columnKey === "vin" && state.sortedInfo.order,
- render: (text, record) => (
- {`${record.employee.first_name} ${record.employee.last_name}`}
- ),
+ render: (text, record) =>
+ `${record.employee.first_name} ${record.employee.last_name}`,
},
{
title: t("timetickets.fields.cost_center"),
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index f553d75c5..0da0fd21a 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -84,6 +84,7 @@ export const QUERY_BODYSHOP = gql`
jobsizelimit
employees {
id
+ active
first_name
last_name
employee_number
@@ -165,6 +166,7 @@ export const UPDATE_SHOP = gql`
employees {
id
first_name
+ active
last_name
employee_number
rates
diff --git a/client/src/pages/tech-job-clock/tech-job-clock.component.jsx b/client/src/pages/tech-job-clock/tech-job-clock.component.jsx
index db792b98a..092510b02 100644
--- a/client/src/pages/tech-job-clock/tech-job-clock.component.jsx
+++ b/client/src/pages/tech-job-clock/tech-job-clock.component.jsx
@@ -1,3 +1,4 @@
+import { Divider } from "antd";
import React from "react";
import TechClockInFormContainer from "../../components/tech-job-clock-in-form/tech-job-clock-in-form.container";
import TechClockedInList from "../../components/tech-job-clocked-in-list/tech-job-clocked-in-list.component";
@@ -6,6 +7,7 @@ export default function TechClockComponent() {
return (
);