- {(job.inproduction || jobInPostProduction) && (
- <>
-
-
- {t("jobs.fields.production_vars.note")}
-
-
+
+
+
+
+
+ {job.status}
+ {job.inproduction && (
+
+
+ {t("jobs.labels.inproduction")}
+
+
+ )}
+
+
+ {job.ins_co_nm}
+
+ {job.clm_no}
+
+ {job.clm_total}
+ /
+ {job.owner_owing}
+
+
+
+
+
+
+
+
+
+ {job.ownr_ph1 || ""}
+
+
+ {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
+ job.ownr_city || ""
+ } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
+
+
+ {job.ownr_ea || ""}
+
-
-
- )}
-
-
-
-
+
+
+
+
+
+
+
+
+ {`${job.plate_no || t("general.labels.na")} (${`${
+ job.plate_st || t("general.labels.na")
+ }`})`}
+
+
+ {`${job.v_vin || t("general.labels.na")}`}
+
+
+
+
+
+
);
+
+ // return (
+ //
,
+ //
,
+ //
+ // {t("jobs.labels.inproduction")}
+ // ,
+ //
+ // {job.clm_total}
+ // /
+ // {job.owner_owing}
+ // ,
+ // ]}
+ // extra={menuExtra}
+ // >
+ //
+ // {(job.inproduction || jobInPostProduction) && (
+ // <>
+ //
+ //
+ // {t("jobs.fields.production_vars.note")}
+ //
+ //
+ //
+ //
+ //
+ // )}
+
+ //
+ //
+ //
+ // );
}
export default connect(mapStateToProps, mapDispatchToProps)(JobsDetailHeader);
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 46c133059..91fc0d2f1 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -1,6 +1,6 @@
import { SyncOutlined } from "@ant-design/icons";
import { useQuery } from "@apollo/client";
-import { Button, Input, Table } from "antd";
+import { Button, Card, Input, Space, Table } from "antd";
import queryString from "query-string";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
@@ -11,7 +11,6 @@ import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
import { onlyUnique } from "../../utils/arrayHelper";
import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import PhoneFormatter from "../../utils/PhoneFormatter";
import { alphaSort } from "../../utils/sorters";
import AlertComponent from "../alert/alert.component";
import StartChatButton from "../chat-open-button/chat-open-button.component";
@@ -130,14 +129,10 @@ export function JobsList({ bodyshop }) {
dataIndex: "ownr_ph1",
key: "ownr_ph1",
ellipsis: true,
- render: (text, record) => {
- return record.ownr_ph1 ? (
-
- {record.ownr_ph1}
-
-
- ) : null;
- },
+ responsive: ["md"],
+ render: (text, record) => (
+
+ ),
},
{
@@ -160,9 +155,6 @@ export function JobsList({ bodyshop }) {
})) ||
[],
onFilter: (value, record) => value.includes(record.status),
- render: (text, record) => {
- return record.status || t("general.labels.na");
- },
},
{
@@ -188,28 +180,20 @@ export function JobsList({ bodyshop }) {
title: t("vehicles.fields.plate_no"),
dataIndex: "plate_no",
key: "plate_no",
+ responsive: ["md"],
sorter: (a, b) => alphaSort(a.plate_no, b.plate_no),
sortOrder:
state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
- render: (text, record) => {
- return record.plate_no ? record.plate_no : "";
- },
},
{
title: t("jobs.fields.clm_no"),
dataIndex: "clm_no",
key: "clm_no",
ellipsis: true,
+ responsive: ["md"],
sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
sortOrder:
state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
- render: (text, record) => {
- return record.clm_no ? (
-
{record.clm_no}
- ) : (
- t("general.labels.unknown")
- );
- },
},
{
title: t("jobs.fields.ins_co_nm"),
@@ -224,68 +208,65 @@ export function JobsList({ bodyshop }) {
sorter: (a, b) => a.clm_total - b.clm_total,
sortOrder:
state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order,
- render: (text, record) => {
- return record.clm_total ? (
-
{record.clm_total}
- ) : (
- t("general.labels.unknown")
- );
- },
- },
- {
- title: t("jobs.fields.owner_owing"),
- dataIndex: "owner_owing",
- key: "owner_owing",
render: (text, record) => (
-
{record.owner_owing}
+
{record.clm_total}
),
},
+ // {
+ // title: t("jobs.fields.owner_owing"),
+ // dataIndex: "owner_owing",
+ // key: "owner_owing",
+ // responsive: ["md"],
+ // render: (text, record) => (
+ //
{record.owner_owing}
+ // ),
+ // },
];
return (
-
{
- 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/rbac-wrapper/rbac-wrapper.component.jsx b/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx
index 6da4f06a2..107adbb89 100644
--- a/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx
+++ b/client/src/components/rbac-wrapper/rbac-wrapper.component.jsx
@@ -35,7 +35,8 @@ function RbacWrapper({
authLevel ||
(!bodyshop.md_rbac && rbacDefaults[action] <= authLevel)
)
- return {React.cloneElement(children, restProps)}
;
+ return children;
+ //return {React.cloneElement(children, restProps)}
;
return (
noauth || (
diff --git a/client/src/index.js b/client/src/index.js
index 84daa4195..b4bd1b00c 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -42,7 +42,7 @@ ReactDOM.render(
}
+ loading={}
persistor={persistor}
>
@@ -54,7 +54,6 @@ ReactDOM.render(
const onServiceWorkerUpdate = (registration) => {
console.log("onServiceWorkerUpdate", registration);
-
const key = `open${Date.now()}`;
const btn = (