Added parts only filtering as separate button to Job Lines list. BOD-217

This commit is contained in:
Patrick Fic
2020-08-03 14:01:50 -07:00
parent 75b1ed44e8
commit 8e681a806c
5 changed files with 41 additions and 2 deletions

View File

@@ -9775,6 +9775,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>filterpartsonly</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>gotojob</name> <name>gotojob</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

View File

@@ -1,4 +1,4 @@
import { SyncOutlined } from "@ant-design/icons"; import { SyncOutlined, FilterFilled } from "@ant-design/icons";
import { Button, Dropdown, Input, Menu, Table } from "antd"; import { Button, Dropdown, Input, Menu, Table } from "antd";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
@@ -35,6 +35,7 @@ export function JobLinesComponent({
}) { }) {
const [state, setState] = useState({ const [state, setState] = useState({
sortedInfo: {}, sortedInfo: {},
filteredInfo: {},
}); });
const { t } = useTranslation(); const { t } = useTranslation();
@@ -88,6 +89,7 @@ export function JobLinesComponent({
title: t("joblines.fields.part_type"), title: t("joblines.fields.part_type"),
dataIndex: "part_type", dataIndex: "part_type",
key: "part_type", key: "part_type",
filteredValue: state.filteredInfo.part_type || null,
sorter: (a, b) => alphaSort(a.part_type, b.part_type), sorter: (a, b) => alphaSort(a.part_type, b.part_type),
sortOrder: sortOrder:
state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order, state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order,
@@ -265,6 +267,7 @@ export function JobLinesComponent({
]; ];
const handleTableChange = (pagination, filters, sorter) => { const handleTableChange = (pagination, filters, sorter) => {
console.log("filters", filters);
setState({ ...state, filteredInfo: filters, sortedInfo: sorter }); setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
}; };
@@ -283,7 +286,7 @@ export function JobLinesComponent({
<Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item> <Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item>
</Menu> </Menu>
); );
console.log("state", state);
return ( return (
<div> <div>
<PartsOrderModalContainer /> <PartsOrderModalContainer />
@@ -319,6 +322,18 @@ export function JobLinesComponent({
> >
{t("parts.actions.order")} {t("parts.actions.order")}
</Button> </Button>
<Button
onClick={() => {
setState({
...state,
filteredInfo: {
part_type: ["PAN,PAL,PAA,PAS,PASL"],
},
});
}}
>
<FilterFilled /> {t("jobs.actions.filterpartsonly")}
</Button>
<Dropdown overlay={markMenu} trigger={["click"]}> <Dropdown overlay={markMenu} trigger={["click"]}>
<Button>{t("jobs.actions.mark")}</Button> <Button>{t("jobs.actions.mark")}</Button>
</Dropdown> </Dropdown>

View File

@@ -639,6 +639,7 @@
"convert": "Convert", "convert": "Convert",
"export": "Export", "export": "Export",
"exportselected": "Export Selected", "exportselected": "Export Selected",
"filterpartsonly": "Filter Parts Only",
"gotojob": "Go to Job", "gotojob": "Go to Job",
"intake": "Intake", "intake": "Intake",
"manualnew": "Create New Job Manually", "manualnew": "Create New Job Manually",

View File

@@ -639,6 +639,7 @@
"convert": "Convertir", "convert": "Convertir",
"export": "", "export": "",
"exportselected": "", "exportselected": "",
"filterpartsonly": "",
"gotojob": "", "gotojob": "",
"intake": "", "intake": "",
"manualnew": "", "manualnew": "",

View File

@@ -639,6 +639,7 @@
"convert": "Convertir", "convert": "Convertir",
"export": "", "export": "",
"exportselected": "", "exportselected": "",
"filterpartsonly": "",
"gotojob": "", "gotojob": "",
"intake": "", "intake": "",
"manualnew": "", "manualnew": "",