diff --git a/client/public/locales/cs/common.json b/client/public/locales/cs/common.json index c384cef..cc4313b 100644 --- a/client/public/locales/cs/common.json +++ b/client/public/locales/cs/common.json @@ -399,10 +399,6 @@ "round_prices": { "label": "Zaokrouhlené ceny", "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í" diff --git a/client/public/locales/de/common.json b/client/public/locales/de/common.json index 0cb571d..b39d18f 100644 --- a/client/public/locales/de/common.json +++ b/client/public/locales/de/common.json @@ -367,10 +367,6 @@ "round_prices": { "label": "Gerundeter Preis", "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": { diff --git a/client/public/locales/en/common.json b/client/public/locales/en/common.json index b308bf4..88ff2ae 100644 --- a/client/public/locales/en/common.json +++ b/client/public/locales/en/common.json @@ -322,10 +322,6 @@ "round_prices": { "label": "Round prices", "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": { @@ -400,4 +396,4 @@ "no_location": "No Location", "no_locations_help": "This page lets you organize your spools in locations, add some spools to get started!" } -} \ No newline at end of file +} diff --git a/client/public/locales/es/common.json b/client/public/locales/es/common.json index 91f56ad..18e22b9 100644 --- a/client/public/locales/es/common.json +++ b/client/public/locales/es/common.json @@ -365,10 +365,6 @@ "label": "URL base", "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": { "label": "Redondear precios", "tooltip": "Redondear precios al número entero más cercano." diff --git a/client/public/locales/nl/common.json b/client/public/locales/nl/common.json index 20be315..caac356 100644 --- a/client/public/locales/nl/common.json +++ b/client/public/locales/nl/common.json @@ -365,12 +365,7 @@ "round_prices": { "label": "Afgeronde prijzen", "tooltip": "Rond prijzen af op het dichtstbijzijnde gehele getal." - }, - "show_spool_count": { - "label": "Spoelaantal weergeven", - "tooltip": "Toon het aantal spoelen per locatie." } - }, "extra_fields": { "tab": "Extra velden", diff --git a/client/src/pages/locations/components/location.tsx b/client/src/pages/locations/components/location.tsx index 73248bd..b52d297 100644 --- a/client/src/pages/locations/components/location.tsx +++ b/client/src/pages/locations/components/location.tsx @@ -140,7 +140,6 @@ export function Location({ const titleStyle = { color: canEditTitle ? undefined : token.colorTextTertiary, }; - const showSpoolCount = JSON.parse(useGetSetting("show_spool_count").data?.value ?? "false"); const spoolCountStyle = { color: token.colorTextQuaternary, }; @@ -174,11 +173,9 @@ export function Location({ setEditTitle(true); }} style={titleStyle} - > + > {displayTitle} - {showSpoolCount && ( - {" "}({spools.length}) - )} + { ({spools.length})} )} {showDelete && } size="small" type="text" onClick={onDelete} />} diff --git a/client/src/pages/settings/generalSettings.tsx b/client/src/pages/settings/generalSettings.tsx index 4b4c313..1162d60 100644 --- a/client/src/pages/settings/generalSettings.tsx +++ b/client/src/pages/settings/generalSettings.tsx @@ -8,7 +8,6 @@ export function GeneralSettings() { const setBaseUrl = useSetSetting("base_url"); const setCurrency = useSetSetting("currency"); const setRoundPrices = useSetSetting("round_prices"); - const setShowSpoolCount = useSetSetting("show_spool_count"); const [form] = Form.useForm(); const [messageApi, contextHolder] = message.useMessage(); const t = useTranslate(); @@ -20,7 +19,6 @@ export function GeneralSettings() { currency: JSON.parse(settings.data.currency.value), base_url: JSON.parse(settings.data.base_url.value), round_prices: JSON.parse(settings.data.round_prices.value), - show_spool_count: JSON.parse(settings.data.show_spool_count.value), }); } }, [settings.data, form]); @@ -33,7 +31,7 @@ export function GeneralSettings() { }, [setCurrency.isSuccess, messageApi, t]); // 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 if (settings.data?.currency.value !== JSON.stringify(values.currency)) { setCurrency.mutate(values.currency); @@ -47,85 +45,72 @@ export function GeneralSettings() { if (settings.data?.round_prices.value !== JSON.stringify(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 (<> -