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

Upsize global search bar.

Browse Source
This commit is contained in:
Patrick Fic
2021-06-28 17:22:41 -07:00
parent 4b7bbe686a
commit 1e547f1815
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
client/src/components/breadcrumbs/breadcrumbs.component.jsx
View File

@@ -1,5 +1,5 @@
import { HomeFilled } from "@ant-design/icons"; import { HomeFilled } from "@ant-design/icons";
import { Breadcrumb } from "antd"; import { Breadcrumb, Row, Col } from "antd";
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
@@ -14,27 +14,29 @@ const mapStateToProps = createStructuredSelector({
export function BreadCrumbs({ breadcrumbs }) { export function BreadCrumbs({ breadcrumbs }) {
return ( return (
<div className="breadcrumb-container imex-flex-row"> <Row className="breadcrumb-container">
<Breadcrumb separator=">" style={{ flex: 1 }}> <Col xs={24} sm={24} md={16}>
<Breadcrumb.Item> <Breadcrumb separator=">">
<Link to={`/manage`}> <Breadcrumb.Item>
<HomeFilled /> <Link to={`/manage`}>
</Link> <HomeFilled />
</Breadcrumb.Item> </Link>
{breadcrumbs.map((item) => </Breadcrumb.Item>
item.link ? ( {breadcrumbs.map((item) =>
<Breadcrumb.Item key={item.label}> item.link ? (
<Link to={item.link}>{item.label} </Link> <Breadcrumb.Item key={item.label}>
</Breadcrumb.Item> <Link to={item.link}>{item.label} </Link>
) : ( </Breadcrumb.Item>
<Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item> ) : (
) <Breadcrumb.Item key={item.label}>{item.label}</Breadcrumb.Item>
)} )
</Breadcrumb> )}
<div> </Breadcrumb>
</Col>
<Col xs={24} sm={24} md={8}>
<GlobalSearch /> <GlobalSearch />
</div> </Col>
</div> </Row>
); );
} }
export default connect(mapStateToProps, null)(BreadCrumbs); export default connect(mapStateToProps, null)(BreadCrumbs);

14
client/src/components/global-search/global-search.component.jsx
View File

@@ -37,7 +37,7 @@ export default function GlobalSearch() {
value: job.ro_number, value: job.ro_number,
label: ( label: (
<Link to={`/manage/jobs/${job.id}`}> <Link to={`/manage/jobs/${job.id}`}>
<Space wrap split={<Divider type="vertical" />}> <Space size="small" split={<Divider type="vertical" />}>
<strong>{job.ro_number || t("general.labels.na")}</strong> <strong>{job.ro_number || t("general.labels.na")}</strong>
<span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${ <span>{`${job.ownr_fn || ""} ${job.ownr_ln || ""} ${
job.ownr_co_nm || "" job.ownr_co_nm || ""
@@ -62,7 +62,7 @@ export default function GlobalSearch() {
}`, }`,
label: ( label: (
<Link to={`/manage/owners/${owner.id}`}> <Link to={`/manage/owners/${owner.id}`}>
<Space wrap split={<Divider type="vertical" />}> <Space size="small" split={<Divider type="vertical" />}>
<span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${ <span>{`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${
owner.ownr_co_nm || "" owner.ownr_co_nm || ""
}`}</span> }`}</span>
@@ -85,7 +85,7 @@ export default function GlobalSearch() {
} ${vehicle.v_model_desc || ""}`, } ${vehicle.v_model_desc || ""}`,
label: ( label: (
<Link to={`/manage/vehicles/${vehicle.id}`}> <Link to={`/manage/vehicles/${vehicle.id}`}>
<Space wrap split={<Divider type="vertical" />}> <Space size="small" split={<Divider type="vertical" />}>
<span> <span>
{`${vehicle.v_model_yr || ""} ${ {`${vehicle.v_model_yr || ""} ${
vehicle.v_make_desc || "" vehicle.v_make_desc || ""
@@ -107,7 +107,7 @@ export default function GlobalSearch() {
value: `${payment.job.ro_number} ${payment.payer} ${payment.amount}`, value: `${payment.job.ro_number} ${payment.payer} ${payment.amount}`,
label: ( label: (
<Link to={`/manage/jobs/${payment.job.id}`}> <Link to={`/manage/jobs/${payment.job.id}`}>
<Space wrap split={<Divider type="vertical" />}> <Space size="small" split={<Divider type="vertical" />}>
<span>{payment.job.ro_number}</span> <span>{payment.job.ro_number}</span>
<span>{payment.job.memo}</span> <span>{payment.job.memo}</span>
<span>{payment.job.amount}</span> <span>{payment.job.amount}</span>
@@ -126,7 +126,7 @@ export default function GlobalSearch() {
value: `${bill.invoice_number} - ${bill.vendor.name}`, value: `${bill.invoice_number} - ${bill.vendor.name}`,
label: ( label: (
<Link to={`/manage/bills?billid=${bill.id}`}> <Link to={`/manage/bills?billid=${bill.id}`}>
<Space wrap split={<Divider type="vertical" />}> <Space size="small" split={<Divider type="vertical" />}>
<span>{bill.invoice_number}</span> <span>{bill.invoice_number}</span>
<span>{bill.vendor.name}</span> <span>{bill.vendor.name}</span>
<span>{bill.date}</span> <span>{bill.date}</span>
@@ -146,7 +146,7 @@ export default function GlobalSearch() {
}`, }`,
label: ( label: (
<Link to={`/manage/phonebook?phonebookentry=${pb.id}`}> <Link to={`/manage/phonebook?phonebookentry=${pb.id}`}>
<Space wrap split={<Divider type="vertical" />}> <Space size="small" split={<Divider type="vertical" />}>
<span>{`${pb.firstname || ""} ${pb.lastname || ""} ${ <span>{`${pb.firstname || ""} ${pb.lastname || ""} ${
pb.company || "" pb.company || ""
}`}</span> }`}</span>
@@ -165,8 +165,6 @@ export default function GlobalSearch() {
return ( return (
<AutoComplete <AutoComplete
key="globalsearch"
dropdownMatchSelectWidth={"false"}
options={options} options={options}
onSearch={handleSearch} onSearch={handleSearch}
allowClear allowClear

3
client/src/redux/application/application.sagas.js
View File

@@ -17,7 +17,7 @@ export function* onCalculateScheduleLoad() {
} }
export function* calculateScheduleLoad({ payload: end }) { export function* calculateScheduleLoad({ payload: end }) {
//REMINDER: Moment.js is not immutable. Today WILL change when adjusted. //REMINDER: Moment.js is not immutable. Today WILL change when adjusted.
const today = moment(new Date()).startOf("day"); const today = moment().startOf("day");
const state = yield select(); const state = yield select();
const buckets = state.user.bodyshop.ssbuckets; const buckets = state.user.bodyshop.ssbuckets;
@@ -42,6 +42,7 @@ export function* calculateScheduleLoad({ payload: end }) {
}); });
prodJobs.forEach((item) => { prodJobs.forEach((item) => {
//Add all of the jobs currently in production to the buckets so that we have a starting point.
const bucketId = CheckJobBucket(buckets, item); const bucketId = CheckJobBucket(buckets, item);
if (bucketId) { if (bucketId) {
load.productionTotal[bucketId].count = load.productionTotal[bucketId].count =