tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change to hidden field and dummy inputs

Browse Source
This commit is contained in:
Thomas White
2023-08-21 02:40:07 +08:00
parent eea74b8a43
commit 312aad55c0
2 changed files with 73 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

209
client/src/pages/spools/create.tsx
View File

@@ -1,12 +1,13 @@
import React from "react";
import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Create, useForm, useSelect } from "@refinedev/antd";
import { Form, Input, DatePicker, Select, InputNumber, Radio } from "antd";
import { Form, Input, DatePicker, Select, InputNumber } from "antd";
import dayjs from "dayjs";
import TextArea from "antd/es/input/TextArea";
import { IFilament } from "../filaments/model";
import { ISpool } from "./model";
import { numberFormatter, numberParser } from "../../utils/parsing";
import { useSavedState } from "../../utils/saveload";
interface CreateOrCloneProps {
mode: "create" | "clone";
@@ -49,120 +50,16 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
return {
label: label,
value: item.id,
weight: item.weight,
spool_weight: item.spool_weight
weight: item.weight,
spool_weight: item.spool_weight
};
});
filamentOptions?.sort((a, b) => a.label.localeCompare(b.label, undefined, { sensitivity: "base" }));
const selected_filament = Form.useWatch('filament_id', form);
const weight_to_use = Form.useWatch('weight_to_use', form);
const used_weight = Form.useWatch('used_weight', form);
const remaining_weight = Form.useWatch('remaining_weight', form);
const measured_weight = Form.useWatch('measured_weight', form);
const [used_weight, set_used_weight] = useSavedState("create-used_weight", 0);
const handle_weight = () => {
if (selected_filament)
{
let filament_weight = filamentOptions.find(obj => {return obj.value === selected_filament}).weight;
let spool_weight = filamentOptions.find(obj => {return obj.value === selected_filament}).spool_weight || 0;
if (weight_to_use == 1)
{
form.setFieldsValue(
{
remaining_weight: filament_weight - (used_weight || 0),
measured_weight: filament_weight - (used_weight || 0) + spool_weight
});
return [true, false, false];
}
else if (weight_to_use == 2)
{
form.setFieldsValue(
{
used_weight: filament_weight - (remaining_weight || 0),
measured_weight: (remaining_weight || 0) + spool_weight
});
return [false, true, false];
}
else if (weight_to_use == 3)
{
form.setFieldsValue(
{
used_weight: filament_weight - ((measured_weight || 0) - spool_weight),
remaining_weight: (measured_weight || 0) - spool_weight
});
return [false, false, true];
}
// if (weight_to_use == 0)
// {
// if (used_weight > 0)
// {
// weight_to_use = 1;
// form.setFieldsValue(
// {
// remaining_weight: filament_weight-used_weight
// });
// return [true, false];
// }
// else if (remaining_weight > 0)
// {
// form.setFieldsValue(
// {
// used_weight: filament_weight-remaining_weight
// });
// weight_to_use = 2;
// return [false, true];
// }
// else
// {
// weight_to_use = 0;
// return [true, true];
// }
// }
// else if (weight_to_use == 1)
// {
// if (used_weight > 0)
// {
// form.setFieldsValue(
// {
// remaining_weight: filament_weight-used_weight
// });
// return [true, false];
// }
// else
// {
// weight_to_use = 0;
// return [true, true];
// }
// }
// else if (weight_to_use == 2)
// {
// if (used_weight > 0)
// {
// form.setFieldsValue(
// {
// used_weight: filament_weight-remaining_weight
// });
// return [false, true];
// }
// else
// {
// weight_to_use = 0;
// return [true, true];
// }
// }
}
return [false, false, false];
}
const has_spool_weight = () => {
if (selected_filament)
{
return filamentOptions.find(obj => {return obj.value === selected_filament}).spool_weight
}
return false;
}
const selected_filament_id = Form.useWatch('filament_id', form);
const selected_filament = filamentOptions?.find(obj => {return obj.value === selected_filament_id});
return (
<Create
@@ -216,53 +113,83 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
}
/>
</Form.Item>
<Form.Item
label={t("spool.fields.weight_to_use")}
help={t("spool.fields_help.weight_to_use")}
name={["weight_to_use"]}
initialValue={1}
<Form.Item
hidden={true}
name={["used_weight"]}
initialValue={0}
>
<Radio.Group>
<Radio.Button value={1}>{t("spool.fields.used_weight")}</Radio.Button>
<Radio.Button value={2}>{t("spool.fields.remaining_weight")}</Radio.Button>
<Radio.Button value={3} disabled={!has_spool_weight()}>{t("spool.fields.measured_weight")}</Radio.Button>
</Radio.Group>
<InputNumber
value={used_weight}
/>
</Form.Item>
<Form.Item
label={t("spool.fields.used_weight")}
help={t("spool.fields_help.used_weight")}
name={["used_weight"]}
rules={[
{
required: handle_weight()[0],
},
]}
// name={["used_weight"]}
initialValue={0}
>
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} disabled={!handle_weight()[0]} />
<InputNumber
min={0}
addonAfter="g"
precision={1}
formatter={numberFormatter}
parser={numberParser}
value={used_weight}
onChange={(value) => {
set_used_weight(value ?? 0);
form.setFieldsValue(
{
used_weight: value ?? 0
});
}}
/>
</Form.Item>
<Form.Item
label={t("spool.fields.remaining_weight")}
help={t("spool.fields_help.remaining_weight")}
name={["remaining_weight"]}
rules={[
{
required: handle_weight()[1],
},
]}
// name={["remaining_weight"]}
initialValue={0}
>
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} disabled={!handle_weight()[1]} />
<InputNumber
min={0}
addonAfter="g"
precision={1}
formatter={numberFormatter}
parser={numberParser}
disabled={!(selected_filament?.weight || 0)}
value={(selected_filament?.weight || 0) ? (selected_filament?.weight || 0) - used_weight : 0}
onChange={(value) => {
set_used_weight((selected_filament?.weight || 0) - (value ?? 0));
form.setFieldsValue(
{
used_weight: (selected_filament?.weight || 0) - (value ?? 0)
});
}}
/>
</Form.Item>
<Form.Item
label={t("spool.fields.measured_weight")}
help={t("spool.fields_help.measured_weight")}
name={["measured_weight"]}
rules={[
{
required: handle_weight()[2],
},
]}
// name={["measured_weight"]}
initialValue={0}
>
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} disabled={!handle_weight()[2]} />
<InputNumber
min={0}
addonAfter="g"
precision={1}
formatter={numberFormatter}
parser={numberParser}
disabled={!((selected_filament?.weight || 0) && (selected_filament?.spool_weight || 0))}
value={((selected_filament?.weight || 0) && (selected_filament?.spool_weight || 0)) ? (selected_filament?.weight || 0) - used_weight + (selected_filament?.spool_weight || 0) : 0}
onChange={(value) => {
set_used_weight((selected_filament?.weight || 0) - ((value ?? 0) - (selected_filament?.spool_weight || 0)));
form.setFieldsValue(
{
used_weight: (selected_filament?.weight || 0) - ((value ?? 0) - (selected_filament?.spool_weight || 0))
});
}}
/>
</Form.Item>
<Form.Item
label={t("spool.fields.location")}

10
spoolman/api/v1/spool.py
View File

@@ -158,11 +158,11 @@ async def create( # noqa: ANN201
db: Annotated[AsyncSession, Depends(get_db_session)],
body: SpoolParameters,
):
#if body.remaining_weight is not None and body.used_weight is not None:
# return JSONResponse(
# status_code=400,
# content={"message": "Only specify either remaining_weight or used_weight."},
# )
if body.remaining_weight is not None and body.used_weight is not None:
return JSONResponse(
status_code=400,
content={"message": "Only specify either remaining_weight or used_weight."},
)
try:
db_item = await spool.create(