Merge branch 'feature/IO-1722-job-size-color' of https://bitbucket.org/snaptsoft/bodyshop into feature/IO-1722-job-size-color

This commit is contained in:
swtmply
2023-05-04 01:27:24 +08:00
3 changed files with 5 additions and 3 deletions

View File

@@ -1,7 +1,9 @@
import { Col, List, Space, Typography } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
const CardColorLegend = ({ bodyshop, cardSettings }) => {
const { t } = useTranslation();
const data = bodyshop.ssbuckets.map((size) => ({
label: size.label,
color: size.color?.hex ?? "white",
@@ -9,7 +11,7 @@ const CardColorLegend = ({ bodyshop, cardSettings }) => {
return (
<Col>
<Typography>Legend:</Typography>
<Typography>{t("production.labels.legend")}</Typography>
<List
grid={{
gutter: 16,

View File

@@ -106,7 +106,7 @@ export default function ProductionBoardKanbanCardSettings({
</Form.Item>
<Form.Item
valuePropName="checked"
label={"Card Colors"}
label={t("production.labels.cardcolor")}
name="cardcolor"
>
<Switch />

View File

@@ -279,7 +279,7 @@ export default function ShopInfoSchedulingComponent({ form }) {
</Form.Item>
<Form.Item
label={"Job Color"} // TODO add translation
label={t("bodyshop.fields.ssbuckets.color")}
key={`${index}color`}
name={[field.name, "color"]}
>