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

address PR comments

Browse Source
This commit is contained in:
Thomas White
2023-08-26 01:52:35 +08:00
parent 312aad55c0
commit d721e7d827
2 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
import React from "react";
import React, {useState} from "react";
import {IResourceComponentsProps, useTranslate} from "@refinedev/core";
import {Create, useForm, useSelect} from "@refinedev/antd";
import {Form, Input, DatePicker, Select, InputNumber} from "antd";
@@ -7,7 +7,6 @@ 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";
@@ -56,10 +55,22 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
});
filamentOptions?.sort((a, b) => a.label.localeCompare(b.label, undefined, {sensitivity: "base"}));
const [used_weight, set_used_weight] = useSavedState("create-used_weight", 0);
const [usedWeight, setUsedWeight] = useState(0);
const selected_filament_id = Form.useWatch('filament_id', form);
const selected_filament = filamentOptions?.find(obj => {return obj.value === selected_filament_id});
const selectedFilamentID = Form.useWatch('filament_id', form);
const selectedFilament = filamentOptions?.find(obj => {
return obj.value === selectedFilamentID;
});
const filamentWeight = selectedFilament?.weight || 0;
const spoolWeight = selectedFilament?.spool_weight || 0;
const weightChange = (weight: number) => {
setUsedWeight(weight);
form.setFieldsValue(
{
used_weight: weight
});
}
return (
<Create
@@ -119,7 +130,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
initialValue={0}
>
<InputNumber
value={used_weight}
value={usedWeight}
/>
</Form.Item>
@@ -135,13 +146,9 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
precision={1}
formatter={numberFormatter}
parser={numberParser}
value={used_weight}
value={usedWeight}
onChange={(value) => {
set_used_weight(value ?? 0);
form.setFieldsValue(
{
used_weight: value ?? 0
});
weightChange(value ?? 0);
}}
/>
</Form.Item>
@@ -157,14 +164,10 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
precision={1}
formatter={numberFormatter}
parser={numberParser}
disabled={!(selected_filament?.weight || 0)}
value={(selected_filament?.weight || 0) ? (selected_filament?.weight || 0) - used_weight : 0}
disabled={!filamentWeight}
value={filamentWeight ? filamentWeight - usedWeight : 0}
onChange={(value) => {
set_used_weight((selected_filament?.weight || 0) - (value ?? 0));
form.setFieldsValue(
{
used_weight: (selected_filament?.weight || 0) - (value ?? 0)
});
weightChange(filamentWeight - (value ?? 0));
}}
/>
</Form.Item>
@@ -180,14 +183,10 @@ export const SpoolCreate: React.FC<IResourceComponentsProps & CreateOrCloneProps
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}
disabled={!(filamentWeight && spoolWeight)}
value={(filamentWeight && spoolWeight) ? filamentWeight - usedWeight + spoolWeight : 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))
});
weightChange(filamentWeight - ((value ?? 0) - spoolWeight));
}}
/>
</Form.Item>