diff --git a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx index 82cd14ab3..0a2407a55 100644 --- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx +++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx @@ -1,13 +1,42 @@ -import React from "react"; -import { Dropdown, Button, Table, Space } from "antd"; +import React, { useState } from "react"; +import { Dropdown, Button, Table, Space, Card, Input } from "antd"; import { useTranslation } from "react-i18next"; import { Link } from "react-router-dom"; import ScoreboardRemoveButton from "../scoreboard-remove-button/scorebard-remove-button.component"; import { DateFormatter } from "../../utils/DateFormatter"; import ScoreboardEntryEdit from "../scoreboard-entry-edit/scoreboard-entry-edit.component"; +import OwnerNameDisplay from "../owner-name-display/owner-name-display.component"; export default function ScoreboardJobsList({ scoreBoardlist }) { const { t } = useTranslation(); + const [searchText, setSearchText] = useState(""); + + const jobs = scoreBoardlist + ? searchText === "" + ? scoreBoardlist + : scoreBoardlist.filter( + (sb) => + (sb.job.ro_number || "") + .toString() + .toLowerCase() + .includes(searchText.toLowerCase()) || + (sb.job.ownr_co_nm || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (sb.job.ownr_fn || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (sb.job.ownr_ln || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (sb.job.v_model_desc || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (sb.job.v_make_desc || "") + .toLowerCase() + .includes(searchText.toLowerCase()) + ) + : []; const columns = [ { @@ -20,7 +49,25 @@ export default function ScoreboardJobsList({ scoreBoardlist }) { ), }, + { + title: t("jobs.fields.owner"), + dataIndex: "owner", + key: "owner", + ellipsis: true, + render: (text, record) => , + }, + { + title: t("jobs.fields.vehicle"), + dataIndex: "vehicle", + key: "vehicle", + ellipsis: true, + render: (text, record) => ( + {`${record.job.v_model_yr || ""} ${ + record.job.v_make_desc || "" + } ${record.job.v_model_desc || ""}`} + ), + }, { title: t("scoreboard.fields.date"), dataIndex: "date", @@ -51,17 +98,29 @@ export default function ScoreboardJobsList({ scoreBoardlist }) { ]; const overlay = ( -
+ e.stopPropagation()} + extra={ + { + setSearchText(e.target.value); + }} + value={searchText} + enterButton + onClick={(e) => e.stopPropagation()} + /> + } + > e.stopPropagation()} /> - + ); return ( diff --git a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx index 6c0673ca3..85592044c 100644 --- a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx +++ b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.component.jsx @@ -25,10 +25,6 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) { const values = useMemo(() => { const dateHash = _.groupBy(scoreBoardlist, "date"); - console.log( - "🚀 ~ file: scoreboard-targets-table.component.jsx ~ line 31 ~ values ~ dateHash", - dateHash - ); let ret = { todayBody: 0, @@ -71,10 +67,6 @@ export function ScoreboardTargetsTable({ bodyshop, scoreBoardlist }) { return ret; }, [scoreBoardlist]); - console.log( - "🚀 ~ file: scoreboard-targets-table.component.jsx ~ line 51 ~ values ~ values", - values - ); return (