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

add option to use measured or remaining weight

Browse Source
This commit is contained in:
Thomas White
2023-08-20 12:00:29 +08:00
parent 2fcfc3814f
commit eea74b8a43
3 changed files with 161 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/public/locales/en/common.json
View File

@@ -133,8 +133,10 @@
"filament_name": "Filament",
"filament": "Filament",
"material": "Material",
"weight_to_use": "Weight",
"used_weight": "Used Weight",
"remaining_weight": "Remaining Weight",
"measured_weight": "Measured Weight",
"used_length": "Used Length",
"remaining_length": "Remaining Length",
"location": "Location",
@@ -146,7 +148,10 @@
"archived": "Archived"
},
"fields_help": {
"weight_to_use": "Select what weight value to enter. Measured weight is only avalable if the spool weight is set for the selected filament",
"used_weight": "How much filament has been used from the spool. A new spool should have 0g used.",
"remaining_weight": "How much filament is left on the spool. For a new spool this should match the spool weight.",
"measured_weight": "How much the filament and spool weigh.",
"location": "Where the spool is located if you have multiple locations where you store your spools.",
"lot_nr": "Manufacturer's lot number. Can be used to ensure a print has consistent color if multiple spools are used."
},

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

@@ -1,7 +1,7 @@
import React from "react";
import { IResourceComponentsProps, useTranslate } from "@refinedev/core";
import { Create, useForm, useSelect } from "@refinedev/antd";
import { Form, Input, DatePicker, Select, InputNumber } from "antd";
import { Form, Input, DatePicker, Select, InputNumber, Radio } from "antd";
import dayjs from "dayjs";
import TextArea from "antd/es/input/TextArea";
import { IFilament } from "../filaments/model";
@@ -15,7 +15,7 @@ interface CreateOrCloneProps {
export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps> = (props) => {
const t = useTranslate();
const { formProps, saveButtonProps, formLoading } = useForm<ISpool>();
const { form, formProps, saveButtonProps, formLoading } = useForm<ISpool>();
if (props.mode === "clone" && formProps.initialValues) {
// Clear out the values that we don't want to clone
@@ -49,10 +49,121 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
return {
label: label,
value: item.id,
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 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;
}
return (
<Create
title={props.mode === "create" ? t("spool.titles.create") : t("spool.titles.clone")}
@@ -104,6 +215,18 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
typeof option?.label === "string" && option?.label.toLowerCase().includes(input.toLowerCase())
}
/>
</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}
>
<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>
</Form.Item>
<Form.Item
label={t("spool.fields.used_weight")}
@@ -111,11 +234,35 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
name={["used_weight"]}
rules={[
{
required: true,
required: handle_weight()[0],
},
]}
>
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} />
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} disabled={!handle_weight()[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],
},
]}
>
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} disabled={!handle_weight()[1]} />
</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],
},
]}
>
<InputNumber min={0} addonAfter="g" precision={1} formatter={numberFormatter} parser={numberParser} disabled={!handle_weight()[2]} />
</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(