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

remove show spool count option from settings

Browse Source
This commit is contained in:
JakobGue
2026-01-04 00:54:19 +01:00
parent 572a5eea27
commit 185c8b07e0
8 changed files with 66 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/public/locales/cs/common.json
View File

@@ -399,10 +399,6 @@
"round_prices": { "round_prices": {
"label": "Zaokrouhlené ceny", "label": "Zaokrouhlené ceny",
"tooltip": "Zaokrouhlete ceny na nejbližší celé číslo." "tooltip": "Zaokrouhlete ceny na nejbližší celé číslo."
},
"show_spool_count": {
"label": "Zobrazit počet cívek",
"tooltip": "Zobrazit počet cívek pro každé umístění."
} }
}, },
"settings": "Nastavení" "settings": "Nastavení"

4
client/public/locales/de/common.json
View File

@@ -367,10 +367,6 @@
"round_prices": { "round_prices": {
"label": "Gerundeter Preis", "label": "Gerundeter Preis",
"tooltip": "Rundet die Preise auf die nächsthöhere ganze Zahl." "tooltip": "Rundet die Preise auf die nächsthöhere ganze Zahl."
},
"show_spool_count": {
"label": "Spulenanzahl anzeigen",
"tooltip": "Zeigt die Anzahl der Spulen am jeweiligen Ort an."
} }
}, },
"extra_fields": { "extra_fields": {

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

@@ -322,10 +322,6 @@
"round_prices": { "round_prices": {
"label": "Round prices", "label": "Round prices",
"tooltip": "Round prices to the nearest whole number." "tooltip": "Round prices to the nearest whole number."
},
"show_spool_count": {
"label": "Show Spool Count",
"tooltip": "Show the number of spools for each location."
} }
}, },
"extra_fields": { "extra_fields": {

4
client/public/locales/es/common.json
View File

@@ -365,10 +365,6 @@
"label": "URL base", "label": "URL base",
"tooltip": "La URL base que se utilizará al generar funciones como códigos QR." "tooltip": "La URL base que se utilizará al generar funciones como códigos QR."
}, },
"show_spool_count": {
"label": "Mostrar cantidad de bobinas",
"tooltip": "Mostrar el número de bobinas para cada ubicación."
},
"round_prices": { "round_prices": {
"label": "Redondear precios", "label": "Redondear precios",
"tooltip": "Redondear precios al número entero más cercano." "tooltip": "Redondear precios al número entero más cercano."

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

@@ -365,12 +365,7 @@
"round_prices": { "round_prices": {
"label": "Afgeronde prijzen", "label": "Afgeronde prijzen",
"tooltip": "Rond prijzen af op het dichtstbijzijnde gehele getal." "tooltip": "Rond prijzen af op het dichtstbijzijnde gehele getal."
},
"show_spool_count": {
"label": "Spoelaantal weergeven",
"tooltip": "Toon het aantal spoelen per locatie."
} }
}, },
"extra_fields": { "extra_fields": {
"tab": "Extra velden", "tab": "Extra velden",

7
client/src/pages/locations/components/location.tsx
View File

@@ -140,7 +140,6 @@ export function Location({
const titleStyle = { const titleStyle = {
color: canEditTitle ? undefined : token.colorTextTertiary, color: canEditTitle ? undefined : token.colorTextTertiary,
}; };
const showSpoolCount = JSON.parse(useGetSetting("show_spool_count").data?.value ?? "false");
const spoolCountStyle = { const spoolCountStyle = {
color: token.colorTextQuaternary, color: token.colorTextQuaternary,
}; };
@@ -174,11 +173,9 @@ export function Location({
setEditTitle(true); setEditTitle(true);
}} }}
style={titleStyle} style={titleStyle}
> >
{displayTitle} {displayTitle}
{showSpoolCount && ( {<span style={spoolCountStyle}> ({spools.length})</span>}
<span style={spoolCountStyle}>{" "}({spools.length})</span>
)}
</span> </span>
)} )}
{showDelete && <Button icon={<DeleteOutlined />} size="small" type="text" onClick={onDelete} />} {showDelete && <Button icon={<DeleteOutlined />} size="small" type="text" onClick={onDelete} />}

141
client/src/pages/settings/generalSettings.tsx
View File

@@ -8,7 +8,6 @@ export function GeneralSettings() {
const setBaseUrl = useSetSetting("base_url"); const setBaseUrl = useSetSetting("base_url");
const setCurrency = useSetSetting("currency"); const setCurrency = useSetSetting("currency");
const setRoundPrices = useSetSetting("round_prices"); const setRoundPrices = useSetSetting("round_prices");
const setShowSpoolCount = useSetSetting("show_spool_count");
const [form] = Form.useForm(); const [form] = Form.useForm();
const [messageApi, contextHolder] = message.useMessage(); const [messageApi, contextHolder] = message.useMessage();
const t = useTranslate(); const t = useTranslate();
@@ -20,7 +19,6 @@ export function GeneralSettings() {
currency: JSON.parse(settings.data.currency.value), currency: JSON.parse(settings.data.currency.value),
base_url: JSON.parse(settings.data.base_url.value), base_url: JSON.parse(settings.data.base_url.value),
round_prices: JSON.parse(settings.data.round_prices.value), round_prices: JSON.parse(settings.data.round_prices.value),
show_spool_count: JSON.parse(settings.data.show_spool_count.value),
}); });
} }
}, [settings.data, form]); }, [settings.data, form]);
@@ -33,7 +31,7 @@ export function GeneralSettings() {
}, [setCurrency.isSuccess, messageApi, t]); }, [setCurrency.isSuccess, messageApi, t]);
// Handle form submit // Handle form submit
const onFinish = (values: { currency: string; base_url: string, round_prices: boolean, show_spool_count: boolean }) => { const onFinish = (values: { currency: string; base_url: string; round_prices: boolean }) => {
// Check if the currency has changed // Check if the currency has changed
if (settings.data?.currency.value !== JSON.stringify(values.currency)) { if (settings.data?.currency.value !== JSON.stringify(values.currency)) {
setCurrency.mutate(values.currency); setCurrency.mutate(values.currency);
@@ -47,85 +45,72 @@ export function GeneralSettings() {
if (settings.data?.round_prices.value !== JSON.stringify(values.round_prices)) { if (settings.data?.round_prices.value !== JSON.stringify(values.round_prices)) {
setRoundPrices.mutate(values.round_prices); setRoundPrices.mutate(values.round_prices);
} }
// Check if the setting to show spool count has changed
if (settings.data?.show_spool_count.value !== JSON.stringify(values.show_spool_count)) {
setShowSpoolCount.mutate(values.show_spool_count);
}
}; };
return (<> return (
<Form <>
form={form} <Form
labelCol={{ span: 8 }} form={form}
wrapperCol={{ span: 16 }} labelCol={{ span: 8 }}
initialValues={{ wrapperCol={{ span: 16 }}
currency: settings.data?.currency.value, initialValues={{
round_prices: settings.data?.round_prices.value, currency: settings.data?.currency.value,
base_url: settings.data?.base_url.value, round_prices: settings.data?.round_prices.value,
show_spool_count: settings.data?.show_spool_count.value, base_url: settings.data?.base_url.value,
}} }}
onFinish={onFinish} onFinish={onFinish}
style={{ style={{
maxWidth: "600px", maxWidth: "600px",
margin: "0 auto", margin: "0 auto",
}} }}
>
<Form.Item
label={t("settings.general.currency.label")}
name="currency"
rules={[
{
required: true,
},
{
pattern: /^[A-Z]{3}$/,
},
]}
> >
<Input /> <Form.Item
</Form.Item> label={t("settings.general.currency.label")}
name="currency"
rules={[
{
required: true,
},
{
pattern: /^[A-Z]{3}$/,
},
]}
>
<Input />
</Form.Item>
<Form.Item <Form.Item
label={t("settings.general.base_url.label")} label={t("settings.general.base_url.label")}
tooltip={t("settings.general.base_url.tooltip")} tooltip={t("settings.general.base_url.tooltip")}
name="base_url" name="base_url"
rules={[ rules={[
{ {
required: false, required: false,
}, },
{ {
pattern: /^https?:\/\/.+(?<!\/)$/, pattern: /^https?:\/\/.+(?<!\/)$/,
}, },
]} ]}
> >
<Input placeholder="https://example.com:8000" /> <Input placeholder="https://example.com:8000" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("settings.general.round_prices.label")} label={t("settings.general.round_prices.label")}
tooltip={t("settings.general.round_prices.tooltip")} tooltip={t("settings.general.round_prices.tooltip")}
name="round_prices" name="round_prices"
valuePropName="checked" valuePropName="checked"
> >
<Checkbox /> <Checkbox />
</Form.Item> </Form.Item>
<Form.Item <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
label={t("settings.general.show_spool_count.label")} <Button type="primary" htmlType="submit" loading={settings.isFetching || setCurrency.isLoading}>
tooltip={t("settings.general.show_spool_count.tooltip")} {t("buttons.save")}
name="show_spool_count" </Button>
valuePropName="checked" </Form.Item>
> </Form>
<Checkbox /> {contextHolder}
</Form.Item> </>
);
<Form.Item wrapperCol={{ offset: 8, span: 16 }}>
<Button type="primary" htmlType="submit" loading={settings.isFetching || setCurrency.isLoading}>
{t("buttons.save")}
</Button>
</Form.Item>
</Form>
{contextHolder}
</>);
} }

1
spoolman/settings.py
View File

@@ -63,7 +63,6 @@ def parse_setting(key: str) -> SettingDefinition:
register_setting("currency", SettingType.STRING, json.dumps("EUR")) register_setting("currency", SettingType.STRING, json.dumps("EUR"))
register_setting("round_prices", SettingType.BOOLEAN, json.dumps(obj=False)) register_setting("round_prices", SettingType.BOOLEAN, json.dumps(obj=False))
register_setting("show_spool_count", SettingType.BOOLEAN, json.dumps(obj=False))
register_setting("print_presets", SettingType.ARRAY, json.dumps([])) register_setting("print_presets", SettingType.ARRAY, json.dumps([]))
register_setting("extra_fields_vendor", SettingType.ARRAY, json.dumps([])) register_setting("extra_fields_vendor", SettingType.ARRAY, json.dumps([]))