From b220cd643116f28eba9bc106b2f122459654ec2d Mon Sep 17 00:00:00 2001
From: Asdoos <andi.riess@gmail.com>
Date: Tue, 18 Jun 2024 11:08:22 +0200
Subject: [PATCH] feat: Show nutrition on recipe print (#3740)

Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>
---
 .../Recipe/RecipeDialogPrintPreferences.vue   |  7 +++
 .../Domain/Recipe/RecipeNutrition.vue         | 55 ++-----------------
 .../Domain/Recipe/RecipePrintView.vue         | 46 +++++++++++++++-
 frontend/composables/recipes/index.ts         |  1 +
 .../recipes/use-recipe-nutrition.ts           | 47 ++++++++++++++++
 frontend/composables/use-users/preferences.ts |  1 +
 6 files changed, 105 insertions(+), 52 deletions(-)
 create mode 100644 frontend/composables/recipes/use-recipe-nutrition.ts

diff --git a/frontend/components/Domain/Recipe/RecipeDialogPrintPreferences.vue b/frontend/components/Domain/Recipe/RecipeDialogPrintPreferences.vue
index 82f6b4aac986..31bcab3f8f54 100644
--- a/frontend/components/Domain/Recipe/RecipeDialogPrintPreferences.vue
+++ b/frontend/components/Domain/Recipe/RecipeDialogPrintPreferences.vue
@@ -31,6 +31,13 @@
               <v-switch v-model="preferences.showNotes" hide-details :label="$tc('recipe.notes')" />
             </v-row>
           </v-col>
+          <v-col cols="auto" align-self="start">
+            <v-row no-gutters>
+              <v-switch v-model="preferences.showNutrition" hide-details :label="$tc('recipe.nutrition')" />
+            </v-row>
+            <v-row no-gutters>
+            </v-row>
+          </v-col>
         </v-row>
       </v-container>
       <v-card
diff --git a/frontend/components/Domain/Recipe/RecipeNutrition.vue b/frontend/components/Domain/Recipe/RecipeNutrition.vue
index f53ea29bd866..aefc6cde7fa1 100644
--- a/frontend/components/Domain/Recipe/RecipeNutrition.vue
+++ b/frontend/components/Domain/Recipe/RecipeNutrition.vue
@@ -8,14 +8,8 @@
       <v-card-text v-if="edit">
         <div v-for="(item, key, index) in value" :key="index">
           <v-text-field
-            dense
-            :value="value[key]"
-            :label="labels[key].label"
-            :suffix="labels[key].suffix"
-            type="number"
-            autocomplete="off"
-            @input="updateValue(key, $event)"
-          ></v-text-field>
+dense :value="value[key]" :label="labels[key].label" :suffix="labels[key].suffix" type="number"
+            autocomplete="off" @input="updateValue(key, $event)"></v-text-field>
         </div>
       </v-card-text>
       <v-list v-if="showViewer" dense class="mt-0 pt-0">
@@ -34,17 +28,10 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, useContext } from "@nuxtjs/composition-api";
+import { computed, defineComponent } from "@nuxtjs/composition-api";
+import { useNutritionLabels } from "~/composables/recipes";
 import { Nutrition } from "~/lib/api/types/recipe";
-
-type NutritionLabelType = {
-  [key: string]: {
-    label: string;
-    suffix: string;
-    value?: string;
-  };
-};
-
+import { NutritionLabelType } from "~/composables/recipes/use-recipe-nutrition";
 export default defineComponent({
   props: {
     value: {
@@ -57,37 +44,7 @@ export default defineComponent({
     },
   },
   setup(props, context) {
-    const { i18n } = useContext();
-    const labels = <NutritionLabelType>{
-      calories: {
-        label: i18n.tc("recipe.calories"),
-        suffix: i18n.tc("recipe.calories-suffix"),
-      },
-      fatContent: {
-        label: i18n.tc("recipe.fat-content"),
-        suffix: i18n.tc("recipe.grams"),
-      },
-      fiberContent: {
-        label: i18n.tc("recipe.fiber-content"),
-        suffix: i18n.tc("recipe.grams"),
-      },
-      proteinContent: {
-        label: i18n.tc("recipe.protein-content"),
-        suffix: i18n.tc("recipe.grams"),
-      },
-      sodiumContent: {
-        label: i18n.tc("recipe.sodium-content"),
-        suffix: i18n.tc("recipe.milligrams"),
-      },
-      sugarContent: {
-        label: i18n.tc("recipe.sugar-content"),
-        suffix: i18n.tc("recipe.grams"),
-      },
-      carbohydrateContent: {
-        label: i18n.tc("recipe.carbohydrate-content"),
-        suffix: i18n.tc("recipe.grams"),
-      },
-    };
+    const { labels } = useNutritionLabels();
     const valueNotNull = computed(() => {
       let key: keyof Nutrition;
       for (key in props.value) {
diff --git a/frontend/components/Domain/Recipe/RecipePrintView.vue b/frontend/components/Domain/Recipe/RecipePrintView.vue
index 1d3529a6da5b..ce15704dfb50 100644
--- a/frontend/components/Domain/Recipe/RecipePrintView.vue
+++ b/frontend/components/Domain/Recipe/RecipePrintView.vue
@@ -83,19 +83,42 @@
         </div>
       </section>
     </div>
+
+    <!-- Nutrition -->
+    <div v-if="preferences.showNutrition">
+      <v-card-title class="headline pl-0"> {{ $t("recipe.nutrition") }} </v-card-title>
+
+
+      <section>
+        <div class="print-section">
+          <table class="nutrition-table">
+            <tbody>
+              <tr v-for="(value, key) in recipe.nutrition" :key="key">
+                <template v-if="value">
+                  <td>{{ labels[key].label }}</td>
+                  <td>{{ value || '-' }}</td>
+                </template>
+              </tr>
+            </tbody>
+          </table>
+      </div>
+    </section>
+    </div>
+
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent, computed } from "@nuxtjs/composition-api";
+import { computed, defineComponent } from "@nuxtjs/composition-api";
 import RecipeTimeCard from "~/components/Domain/Recipe/RecipeTimeCard.vue";
 import { useStaticRoutes } from "~/composables/api";
-import { Recipe, RecipeIngredient, RecipeStep } from "~/lib/api/types/recipe";
+import { Recipe, RecipeIngredient, RecipeStep} from "~/lib/api/types/recipe";
 import { NoUndefinedField } from "~/lib/api/types/non-generated";
 import { ImagePosition, useUserPrintPreferences } from "~/composables/use-users/preferences";
-import { parseIngredientText } from "~/composables/recipes";
+import { parseIngredientText, useNutritionLabels } from "~/composables/recipes";
 import { usePageState } from "~/composables/recipe-page/shared-state";
 
+
 type IngredientSection = {
   sectionName: string;
   ingredients: RecipeIngredient[];
@@ -129,6 +152,10 @@ export default defineComponent({
     const preferences = useUserPrintPreferences();
     const { recipeImage } = useStaticRoutes();
     const { imageKey } = usePageState(props.recipe.slug);
+    const {labels} = useNutritionLabels();
+
+
+
 
     const recipeImageUrl = computed(() => {
       return recipeImage(props.recipe.id, props.recipe.image, imageKey.value);
@@ -221,6 +248,7 @@ export default defineComponent({
     }
 
     return {
+      labels,
       hasNotes,
       imageKey,
       ImagePosition,
@@ -290,4 +318,16 @@ li {
   list-style-type: none;
   margin-bottom: 0.25rem;
 }
+
+.nutrition-table {
+  width: 25%;
+  border-collapse: collapse;
+}
+
+.nutrition-table td {
+  padding: 2px;
+  text-align: left;
+  font-size: 14px;
+}
+
 </style>
diff --git a/frontend/composables/recipes/index.ts b/frontend/composables/recipes/index.ts
index 651d9d7b484d..c29e234308ec 100644
--- a/frontend/composables/recipes/index.ts
+++ b/frontend/composables/recipes/index.ts
@@ -2,4 +2,5 @@ export { useFraction } from "./use-fraction";
 export { useRecipe } from "./use-recipe";
 export { useRecipes, recentRecipes, allRecipes, useLazyRecipes } from "./use-recipes";
 export { parseIngredientText, useParsedIngredientText } from "./use-recipe-ingredients";
+export { useNutritionLabels } from "./use-recipe-nutrition";
 export { useTools } from "./use-recipe-tools";
diff --git a/frontend/composables/recipes/use-recipe-nutrition.ts b/frontend/composables/recipes/use-recipe-nutrition.ts
new file mode 100644
index 000000000000..a1e53b7502c5
--- /dev/null
+++ b/frontend/composables/recipes/use-recipe-nutrition.ts
@@ -0,0 +1,47 @@
+import { useContext } from "@nuxtjs/composition-api";
+
+
+export interface NutritionLabelType {
+  [key: string]: {
+    label: string;
+    suffix: string;
+    value?: string;
+  };
+};
+
+
+export function useNutritionLabels() {
+  const { i18n } = useContext();
+  const labels = <NutritionLabelType>{
+    calories: {
+      label: i18n.tc("recipe.calories"),
+      suffix: i18n.tc("recipe.calories-suffix"),
+    },
+    fatContent: {
+      label: i18n.tc("recipe.fat-content"),
+      suffix: i18n.tc("recipe.grams"),
+    },
+    fiberContent: {
+      label: i18n.tc("recipe.fiber-content"),
+      suffix: i18n.tc("recipe.grams"),
+    },
+    proteinContent: {
+      label: i18n.tc("recipe.protein-content"),
+      suffix: i18n.tc("recipe.grams"),
+    },
+    sodiumContent: {
+      label: i18n.tc("recipe.sodium-content"),
+      suffix: i18n.tc("recipe.milligrams"),
+    },
+    sugarContent: {
+      label: i18n.tc("recipe.sugar-content"),
+      suffix: i18n.tc("recipe.grams"),
+    },
+    carbohydrateContent: {
+      label: i18n.tc("recipe.carbohydrate-content"),
+      suffix: i18n.tc("recipe.grams"),
+    },
+  };
+
+  return { labels }
+}
diff --git a/frontend/composables/use-users/preferences.ts b/frontend/composables/use-users/preferences.ts
index da25f9d4ff09..9fee99c97e98 100644
--- a/frontend/composables/use-users/preferences.ts
+++ b/frontend/composables/use-users/preferences.ts
@@ -6,6 +6,7 @@ export interface UserPrintPreferences {
   imagePosition: string;
   showDescription: boolean;
   showNotes: boolean;
+  showNutrition: boolean;
 }
 
 export interface UserSearchQuery {