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

Added form list moving to all lists. BOD-242

Browse Source
This commit is contained in:
Patrick Fic
2020-08-10 09:09:53 -07:00
parent 96d4f0372b
commit 3862f7f11f
6 changed files with 93 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/invoice-form/invoice-form.lines.component.jsx
View File

@@ -4,7 +4,7 @@ import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import InvoiceLineSearchSelect from "../invoice-line-search-select/invoice-line-search-select.component"; import InvoiceLineSearchSelect from "../invoice-line-search-select/invoice-line-search-select.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
export default function InvoiceEnterModalLinesComponent({ export default function InvoiceEnterModalLinesComponent({
lineData, lineData,
discount, discount,
@@ -16,7 +16,7 @@ export default function InvoiceEnterModalLinesComponent({
return ( return (
<Form.List name="invoicelines"> <Form.List name="invoicelines">
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div className="invoice-form-lines-wrapper"> <div className="invoice-form-lines-wrapper">
{fields.map((field, index) => ( {fields.map((field, index) => (
@@ -197,6 +197,11 @@ export default function InvoiceEnterModalLinesComponent({
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}

8
client/src/components/parts-order-modal/parts-order-modal.component.jsx
View File

@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
import FormDatePicker from "../form-date-picker/form-date-picker.component"; import FormDatePicker from "../form-date-picker/form-date-picker.component";
import CurrencyInput from "../form-items-formatted/currency-form-item.component"; import CurrencyInput from "../form-items-formatted/currency-form-item.component";
import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component"; import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
export default function PartsOrderModalComponent({ export default function PartsOrderModalComponent({
vendorList, vendorList,
@@ -49,7 +50,7 @@ export default function PartsOrderModalComponent({
{t("parts_orders.labels.inthisorder")} {t("parts_orders.labels.inthisorder")}
<Form.List name={["parts_order_lines", "data"]}> <Form.List name={["parts_order_lines", "data"]}>
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
@@ -101,6 +102,11 @@ export default function PartsOrderModalComponent({
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}

14
client/src/components/shop-info/shop-info.component.jsx
View File

@@ -214,7 +214,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
</Form.Item> </Form.Item>
</LayoutFormRow> </LayoutFormRow>
<Form.List name={["md_messaging_presets"]}> <Form.List name={["md_messaging_presets"]}>
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
@@ -256,6 +256,11 @@ export default function ShopInfoComponent({ form, saveLoading }) {
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}
@@ -276,7 +281,7 @@ export default function ShopInfoComponent({ form, saveLoading }) {
</Form.List> </Form.List>
<Form.List name={["md_notes_presets"]}> <Form.List name={["md_notes_presets"]}>
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
@@ -318,6 +323,11 @@ export default function ShopInfoComponent({ form, saveLoading }) {
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}

34
client/src/components/shop-info/shop-info.orderstatus.component.jsx
View File

@@ -2,6 +2,7 @@ import { DeleteFilled } from "@ant-design/icons";
import { Button, Form, Input, Select, Row, Col } from "antd"; import { Button, Form, Input, Select, Row, Col } from "antd";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
//TODO Fix up styles. //TODO Fix up styles.
export default function ShopInfoOrderStatusComponent({ form }) { export default function ShopInfoOrderStatusComponent({ form }) {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -20,13 +21,14 @@ export default function ShopInfoOrderStatusComponent({ form }) {
<Row> <Row>
<Col span={12}> <Col span={12}>
<Form.List name={["md_order_statuses", "statuses"]}> <Form.List name={["md_order_statuses", "statuses"]}>
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
<Form.Item <Form.Item
key={field.key} key={field.key}
style={{ padding: 0, margin: 2 }}> style={{ padding: 0, margin: 2 }}
>
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Form.Item <Form.Item
style={{ padding: 0, margin: 2 }} style={{ padding: 0, margin: 2 }}
@@ -38,7 +40,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
required: true, required: true,
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]}> ]}
>
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<DeleteFilled <DeleteFilled
@@ -46,16 +49,22 @@ export default function ShopInfoOrderStatusComponent({ form }) {
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}
<Form.Item> <Form.Item>
<Button <Button
type='dashed' type="dashed"
onClick={() => { onClick={() => {
add(); add();
}} }}
style={{ width: "100%" }}> style={{ width: "100%" }}
>
{t("bodyshop.actions.newstatus")} {t("bodyshop.actions.newstatus")}
</Button> </Button>
</Form.Item> </Form.Item>
@@ -73,7 +82,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_order_statuses", "default_bo"]}> name={["md_order_statuses", "default_bo"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -88,7 +98,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_order_statuses", "default_ordered"]}> name={["md_order_statuses", "default_ordered"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -103,7 +114,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_order_statuses", "default_canceled"]}> name={["md_order_statuses", "default_canceled"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -118,7 +130,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_order_statuses", "default_received"]}> name={["md_order_statuses", "default_received"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -133,7 +146,8 @@ export default function ShopInfoOrderStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_order_statuses", "default_returned"]}> name={["md_order_statuses", "default_returned"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>

54
client/src/components/shop-info/shop-info.rostatus.component.jsx
View File

@@ -3,7 +3,7 @@ import { Button, Form, Input, Select, Row, Col } from "antd";
import React, { useState } from "react"; import React, { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import styled from "styled-components"; import styled from "styled-components";
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
const SelectorDiv = styled.div` const SelectorDiv = styled.div`
.ant-form-item .ant-select { .ant-form-item .ant-select {
width: 200px; width: 200px;
@@ -27,13 +27,14 @@ export default function ShopInfoROStatusComponent({ form }) {
<Col span={8}> <Col span={8}>
{t("bodyshop.labels.alljobstatuses")} {t("bodyshop.labels.alljobstatuses")}
<Form.List name={["md_ro_statuses", "statuses"]}> <Form.List name={["md_ro_statuses", "statuses"]}>
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
<Form.Item <Form.Item
key={field.key} key={field.key}
style={{ padding: 0, margin: 2 }}> style={{ padding: 0, margin: 2 }}
>
<div style={{ display: "flex" }}> <div style={{ display: "flex" }}>
<Form.Item <Form.Item
style={{ padding: 0, margin: 2 }} style={{ padding: 0, margin: 2 }}
@@ -45,7 +46,8 @@ export default function ShopInfoROStatusComponent({ form }) {
required: true, required: true,
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]}> ]}
>
<Input onBlur={handleBlur} /> <Input onBlur={handleBlur} />
</Form.Item> </Form.Item>
<DeleteFilled <DeleteFilled
@@ -53,16 +55,22 @@ export default function ShopInfoROStatusComponent({ form }) {
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}
<Form.Item> <Form.Item>
<Button <Button
type='dashed' type="dashed"
onClick={() => { onClick={() => {
add(); add();
}} }}
style={{ width: "100%" }}> style={{ width: "100%" }}
>
{t("bodyshop.actions.newstatus")} {t("bodyshop.actions.newstatus")}
</Button> </Button>
</Form.Item> </Form.Item>
@@ -82,8 +90,9 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
type: "array", type: "array",
}, },
]}> ]}
<Select mode='multiple'> >
<Select mode="multiple">
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx} value={item}> <Select.Option key={idx} value={item}>
{item} {item}
@@ -100,8 +109,9 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
type: "array", type: "array",
}, },
]}> ]}
<Select mode='multiple'> >
<Select mode="multiple">
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx} value={item}> <Select.Option key={idx} value={item}>
{item} {item}
@@ -117,7 +127,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_scheduled"]}> name={["md_ro_statuses", "default_scheduled"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -132,7 +143,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_arrived"]}> name={["md_ro_statuses", "default_arrived"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -147,7 +159,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_exported"]}> name={["md_ro_statuses", "default_exported"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -162,7 +175,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_imported"]}> name={["md_ro_statuses", "default_imported"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -177,7 +191,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_invoiced"]}> name={["md_ro_statuses", "default_invoiced"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -192,7 +207,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_completed"]}> name={["md_ro_statuses", "default_completed"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -207,7 +223,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_delivered"]}> name={["md_ro_statuses", "default_delivered"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>
@@ -222,7 +239,8 @@ export default function ShopInfoROStatusComponent({ form }) {
message: t("general.validation.required"), message: t("general.validation.required"),
}, },
]} ]}
name={["md_ro_statuses", "default_void"]}> name={["md_ro_statuses", "default_void"]}
>
<Select> <Select>
{options.map((item, idx) => ( {options.map((item, idx) => (
<Select.Option key={idx}>{item}</Select.Option> <Select.Option key={idx}>{item}</Select.Option>

8
client/src/components/shop-info/shop-info.scheduling.component.jsx
View File

@@ -3,6 +3,7 @@ import { Button, Col, Form, Input, InputNumber, Row } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
//TODO Fix up styles. //TODO Fix up styles.
import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
export default function ShopInfoSchedulingComponent({ form }) { export default function ShopInfoSchedulingComponent({ form }) {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -12,7 +13,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
<Row> <Row>
<Col span={24}> <Col span={24}>
<Form.List name={["ssbuckets"]}> <Form.List name={["ssbuckets"]}>
{(fields, { add, remove }) => { {(fields, { add, remove, move }) => {
return ( return (
<div> <div>
{fields.map((field, index) => ( {fields.map((field, index) => (
@@ -88,6 +89,11 @@ export default function ShopInfoSchedulingComponent({ form }) {
remove(field.name); remove(field.name);
}} }}
/> />
<FormListMoveArrows
move={move}
index={index}
total={fields.length}
/>
</div> </div>
</Form.Item> </Form.Item>
))} ))}