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

Merged in feature/IO-2743-Production-Board-GridDND (pull request #1551)

Browse Source 
Feature/IO-2743 Production Board GridDND
This commit is contained in:
Dave Richer
2024-08-01 15:31:32 +00:00
parent 0accf6a18f ff184926fc
commit 82be3853f0
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/production-board-kanban/production-board-kanban.component.jsx
View File

@@ -22,6 +22,7 @@ import ProductionBoardKanbanSettings from "./production-board-kanban.settings.co
import cloneDeep from "lodash/cloneDeep"; import cloneDeep from "lodash/cloneDeep";
import isEqual from "lodash/isEqual"; import isEqual from "lodash/isEqual";
import { defaultKanbanSettings } from "./defaultKanbanSettings.js"; import { defaultKanbanSettings } from "./defaultKanbanSettings.js";
import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop bodyshop: selectBodyshop
@@ -215,6 +216,7 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
} }
/> />
<NoteUpsertModal />
<ProductionListDetailComponent jobs={data} /> <ProductionListDetailComponent jobs={data} />
<Board <Board

33
client/src/components/production-board-kanban/production-board-kanban.settings.component.jsx
View File

@@ -13,35 +13,51 @@ const LayoutSettings = ({ t }) => (
{ {
name: "orientation", name: "orientation",
label: t("production.labels.orientation"), label: t("production.labels.orientation"),
options: [t("production.labels.vertical"), t("production.labels.horizontal")] options: [
{ value: "vertical", label: t("production.labels.vertical") },
{ value: "horizontal", label: t("production.labels.horizontal") }
]
}, },
{ {
name: "cardSize", name: "cardSize",
label: t("production.labels.card_size"), label: t("production.labels.card_size"),
options: [t("production.options.small"), t("production.options.medium"), t("production.options.large")] options: [
{ value: "small", label: t("production.options.small") },
{ value: "medium", label: t("production.options.medium") },
{ value: "large", label: t("production.options.large") }
]
}, },
{ {
name: "compact", name: "compact",
label: t("production.labels.compact"), label: t("production.labels.compact"),
options: [t("production.labels.tall"), t("production.labels.wide")] options: [
{ value: "tall", label: t("production.labels.tall") },
{ value: "wide", label: t("production.labels.wide") }
]
}, },
{ {
name: "cardcolor", name: "cardcolor",
label: t("production.labels.cardcolor"), label: t("production.labels.cardcolor"),
options: [t("production.labels.on"), t("production.labels.off")] options: [
{ value: "on", label: t("production.labels.on") },
{ value: "off", label: t("production.labels.off") }
]
}, },
{ {
name: "kiosk", name: "kiosk",
label: t("production.labels.kiosk_mode"), label: t("production.labels.kiosk_mode"),
options: [t("production.labels.on"), t("production.labels.off")] options: [
{ value: "on", label: t("production.labels.on") },
{ value: "off", label: t("production.labels.off") }
]
} }
].map(({ name, label, options }) => ( ].map(({ name, label, options }) => (
<Col span={4} key={name}> <Col span={4} key={name}>
<Form.Item name={name} label={label}> <Form.Item name={name} label={label}>
<Radio.Group> <Radio.Group>
{options.map((option, idx) => ( {options.map((option) => (
<Radio.Button key={idx} value={idx === 0}> <Radio.Button key={option.value} value={option.value}>
{option} {option.label}
</Radio.Button> </Radio.Button>
))} ))}
</Radio.Group> </Radio.Group>
@@ -51,7 +67,6 @@ const LayoutSettings = ({ t }) => (
</Row> </Row>
</Card> </Card>
); );
const InformationSettings = ({ t }) => ( const InformationSettings = ({ t }) => (
<Card title={t("production.settings.information")} style={{ minWidth: "50vw", marginTop: 10 }}> <Card title={t("production.settings.information")} style={{ minWidth: "50vw", marginTop: 10 }}>
<Row gutter={[16, 16]}> <Row gutter={[16, 16]}>