IO-986 IO-987 Minor bug fixes.

This commit is contained in:
Patrick Fic
2021-05-05 08:31:00 -07:00
parent 78d3085a09
commit c2d4dabca3
7 changed files with 56 additions and 20 deletions

View File

@@ -28886,6 +28886,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>window_tag_sublet</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>
<name>work_authorization</name>
<definition_loaded>false</definition_loaded>

View File

@@ -307,12 +307,14 @@ export function JobLinesComponent({
};
const handleMark = (e) => {
if (e.key === "clear") setSelectedLines([]);
setSelectedLines([
...selectedLines,
...jobLines.filter((item) => item.part_type === e.key),
]);
if (e.key === "clear") {
setSelectedLines([]);
} else {
setSelectedLines([
...selectedLines,
...jobLines.filter((item) => item.part_type === e.key),
]);
}
};
const markMenu = (
@@ -321,6 +323,7 @@ export function JobLinesComponent({
<Menu.Item key="PAN">{t("joblines.fields.part_types.PAN")}</Menu.Item>
<Menu.Item key="PAL">{t("joblines.fields.part_types.PAL")}</Menu.Item>
<Menu.Item key="PAS">{t("joblines.fields.part_types.PAS")}</Menu.Item>
<Menu.Divider />
<Menu.Item key="clear">{t("general.labels.clear")}</Menu.Item>
</Menu>
);

View File

@@ -7,7 +7,6 @@ import {
Input,
InputNumber,
PageHeader,
Select,
Space,
Switch,
} from "antd";
@@ -159,19 +158,21 @@ export default function VendorsFormComponent({
<Form.Item label={t("vendors.fields.due_date")} name="due_date">
<InputNumber />
</Form.Item>
<Form.Item
label={t("vendors.fields.cost_center")}
rules={[
{ required: true, message: t("general.validation.required") },
]}
name="cost_center"
>
<Select style={{ width: "150px" }}>
{responsibilityCenters.costs.map((item) => (
<Select.Option key={item.name}>{item.name}</Select.Option>
))}
</Select>
</Form.Item>
{
// <Form.Item
// label={t("vendors.fields.cost_center")}
// rules={[
// { required: true, message: t("general.validation.required") },
// ]}
// name="cost_center"
// >
// <Select style={{ width: "150px" }}>
// {responsibilityCenters.costs.map((item) => (
// <Select.Option key={item.name}>{item.name}</Select.Option>
// ))}
// </Select>
// </Form.Item>
}
</LayoutFormRow>
<Divider align="left">{t("vendors.labels.preferredmakes")}</Divider>
<Form.List name="favorite">

View File

@@ -1727,6 +1727,7 @@
"vehicle_check_in": "Vehicle Intake",
"vehicle_delivery_check": "Vehicle Delivery Checklist",
"window_tag": "Window Tag",
"window_tag_sublet": "Window Tag - Sublet",
"work_authorization": "Work Authorization",
"worksheet_by_line_number": "Worksheet by Line Number",
"worksheet_sorted_by_operation": "Worksheet by Operation",

View File

@@ -1727,6 +1727,7 @@
"vehicle_check_in": "",
"vehicle_delivery_check": "",
"window_tag": "",
"window_tag_sublet": "",
"work_authorization": "",
"worksheet_by_line_number": "",
"worksheet_sorted_by_operation": "",

View File

@@ -1727,6 +1727,7 @@
"vehicle_check_in": "",
"vehicle_delivery_check": "",
"window_tag": "",
"window_tag_sublet": "",
"work_authorization": "",
"worksheet_by_line_number": "",
"worksheet_sorted_by_operation": "",

View File

@@ -280,6 +280,14 @@ export const TemplateList = (type, context) => {
disabled: false,
group: "post",
},
window_tag_sublet: {
title: i18n.t("printcenter.jobs.window_tag_sublet"),
description: "Window Tag Sublet",
key: "window_tag_sublet",
subject: i18n.t("printcenter.jobs.window_tag_sublet"),
disabled: false,
group: "ro",
},
}
: {}),
...(!type || type === "job_special"