Further work on totals testing. Almost accurate now.

This commit is contained in:
Patrick Fic
2020-04-09 15:29:30 -07:00
parent ad5d371547
commit 4e70c6a9b6
14 changed files with 297 additions and 107 deletions

View File

@@ -8,17 +8,20 @@ import PhoneFormatter from "../../utils/PhoneFormatter";
import { alphaSort } from "../../utils/sorters";
import StartChatButton from "../chat-open-button/chat-open-button.component";
import { useHistory } from "react-router-dom";
import queryString from "query-string";
export default withRouter(function JobsList({
searchTextState,
refetch,
loading,
jobs,
selectedJob
searchParams,
}) {
const { selected } = searchParams;
const [state, setState] = useState({
sortedInfo: {},
filteredInfo: { text: "" }
filteredInfo: { text: "" },
});
const { t } = useTranslation();
@@ -42,7 +45,7 @@ export default withRouter(function JobsList({
<Link to={"/manage/jobs/" + record.id}>
{record.ro_number ? record.ro_number : record.est_number}
</Link>
)
),
},
{
title: t("jobs.fields.owner"),
@@ -61,7 +64,7 @@ export default withRouter(function JobsList({
) : (
<span>{`${record.ownr_fn} ${record.ownr_ln}`}</span>
);
}
},
},
{
title: t("jobs.fields.ownr_ph1"),
@@ -76,7 +79,7 @@ export default withRouter(function JobsList({
<StartChatButton phone={record.ownr_ph1} />
</span>
) : null;
}
},
},
{
title: t("jobs.fields.status"),
@@ -89,7 +92,7 @@ export default withRouter(function JobsList({
state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
render: (text, record) => {
return record.status || t("general.labels.na");
}
},
},
{
@@ -101,14 +104,16 @@ export default withRouter(function JobsList({
render: (text, record) => {
return record.vehicleid ? (
<Link to={"/manage/vehicles/" + record.vehicleid}>
{`${record.v_model_yr || ""} ${record.v_make_desc ||
""} ${record.v_model_desc || ""}`}
{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
record.v_model_desc || ""
}`}
</Link>
) : (
<span>{`${record.v_model_yr || ""} ${record.v_make_desc ||
""} ${record.v_model_desc || ""}`}</span>
<span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
record.v_model_desc || ""
}`}</span>
);
}
},
},
{
title: t("vehicles.fields.plate_no"),
@@ -121,7 +126,7 @@ export default withRouter(function JobsList({
state.sortedInfo.columnKey === "plate_no" && state.sortedInfo.order,
render: (text, record) => {
return record.plate_no ? record.plate_no : "";
}
},
},
{
title: t("jobs.fields.clm_no"),
@@ -138,7 +143,7 @@ export default withRouter(function JobsList({
) : (
t("general.labels.unknown")
);
}
},
},
{
title: t("jobs.fields.clm_total"),
@@ -154,7 +159,7 @@ export default withRouter(function JobsList({
) : (
t("general.labels.unknown")
);
}
},
},
{
title: t("jobs.fields.owner_owing"),
@@ -167,18 +172,24 @@ export default withRouter(function JobsList({
) : (
t("general.labels.unknown")
);
}
}
},
},
];
const handleTableChange = (pagination, filters, sorter) => {
setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
};
const handleOnRowClick = record => {
const handleOnRowClick = (record) => {
if (record) {
if (record.id) {
history.push({ search: `selected=${record.id}` });
console.log("searchParams", searchParams);
history.push({
search: queryString.stringify({
...searchParams,
selected: record.id,
}),
});
}
}
};
@@ -195,7 +206,7 @@ export default withRouter(function JobsList({
</Button>
<Input.Search
placeholder={t("general.labels.search")}
onChange={e => {
onChange={(e) => {
setSearchText(e.target.value);
}}
enterButton
@@ -205,26 +216,26 @@ export default withRouter(function JobsList({
}}
size="small"
pagination={{ position: "top" }}
columns={columns.map(item => ({ ...item }))}
columns={columns.map((item) => ({ ...item }))}
rowKey="id"
dataSource={jobs}
rowSelection={{
onSelect: record => {
onSelect: (record) => {
handleOnRowClick(record);
},
selectedRowKeys: [selectedJob],
type: "radio"
selectedRowKeys: [selected],
type: "radio",
}}
onChange={handleTableChange}
onRow={(record, rowIndex) => {
return {
onClick: event => {
onClick: (event) => {
handleOnRowClick(record);
}, // click row
onDoubleClick: event => {}, // double click row
onContextMenu: event => {}, // right button click row
onMouseEnter: event => {}, // mouse enter row
onMouseLeave: event => {} // mouse leave row
onDoubleClick: (event) => {}, // double click row
onContextMenu: (event) => {}, // right button click row
onMouseEnter: (event) => {}, // mouse enter row
onMouseLeave: (event) => {}, // mouse leave row
};
}}
/>