From 7f8587922da221fa8531583153ad75c75b6bb90d Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Sun, 17 Aug 2025 10:36:46 +0200 Subject: [PATCH] decimal places setting --- vue3/src/components/display/PropertyView.vue | 5 +++-- vue3/src/components/settings/CosmeticSettings.vue | 2 +- vue3/src/utils/number_utils.ts | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/vue3/src/components/display/PropertyView.vue b/vue3/src/components/display/PropertyView.vue index 92bd4ffa1..f80bab40a 100644 --- a/vue3/src/components/display/PropertyView.vue +++ b/vue3/src/components/display/PropertyView.vue @@ -22,8 +22,8 @@ {{ p.name }} - {{ $n(p.propertyAmountPerServing) }} {{ p.unit }} - {{ $n(p.propertyAmountTotal) }} {{ p.unit }} + {{ $n(roundDecimals(p.propertyAmountPerServing)) }} {{ p.unit }} + {{ $n(roundDecimals(p.propertyAmountTotal)) }} {{ p.unit }} @@ -86,6 +86,7 @@ import {ApiApi, PropertyType, Recipe} from "@/openapi"; import VClosableCardTitle from "@/components/dialogs/VClosableCardTitle.vue"; import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue"; import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore"; +import {roundDecimals} from "@/utils/number_utils.ts"; type PropertyWrapper = { id: number, diff --git a/vue3/src/components/settings/CosmeticSettings.vue b/vue3/src/components/settings/CosmeticSettings.vue index 6525d22e7..97fad215e 100644 --- a/vue3/src/components/settings/CosmeticSettings.vue +++ b/vue3/src/components/settings/CosmeticSettings.vue @@ -27,7 +27,7 @@ - + diff --git a/vue3/src/utils/number_utils.ts b/vue3/src/utils/number_utils.ts index 598e2a8c3..b33a59a0e 100644 --- a/vue3/src/utils/number_utils.ts +++ b/vue3/src/utils/number_utils.ts @@ -1,9 +1,11 @@ +import {useUserPreferenceStore} from "@/stores/UserPreferenceStore.ts"; + /** * round to the number of decimals specified in user preferences * @param num number to round */ export function roundDecimals(num: number) { - let decimals = 2 //TODO get user preference + let decimals = useUserPreferenceStore().userSettings.ingredientDecimals return Number(num.toFixed(decimals)) }