From 2e255aba0de4f28604590906813f466074ade824 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 4 Jun 2020 19:46:35 +0200
Subject: [PATCH] more plan basics working

---
 cookbook/serializer.py            |  5 ++++-
 cookbook/templates/meal_plan.html | 13 ++++++++++---
 recipes/settings.py               |  1 -
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 8244c2472..0f9d4b631 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -4,9 +4,12 @@ from cookbook.models import MealPlan, MealType
 
 
 class MealPlanSerializer(serializers.ModelSerializer):
+    recipe_name = serializers.ReadOnlyField(source='recipe.name')
+    meal_type_name = serializers.ReadOnlyField(source='meal_type.name')
+
     class Meta:
         model = MealPlan
-        fields = '__all__'
+        fields = ('id', 'title', 'recipe', 'date', 'meal_type', 'recipe_name', 'meal_type_name')
 
 
 class MealTypeSerializer(serializers.ModelSerializer):
diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html
index 04ed8f5d2..b8c051793 100644
--- a/cookbook/templates/meal_plan.html
+++ b/cookbook/templates/meal_plan.html
@@ -65,7 +65,7 @@
                                :empty-insert-threshold="10">
                         <div class="list-group-item" v-for="(element, index) in d.items" :key="element.id">
                             <a href="#" v-if="element.title !== ''" @click="plan_detail = element">[[element.title]]</a>
-                            <a href="#" v-if="element.title === ''" @click="plan_detail = element">[[element.recipe]]</a>
+                            <a href="#" v-if="element.title === ''" @click="plan_detail = element">[[element.recipe_name]]</a>
                         </div>
                     </draggable>
                 </td>
@@ -74,10 +74,17 @@
         </table>
 
         <div class="row" v-if="plan_detail !== undefined">
-            [[plan_detail.date]]
-            [[plan_detail.title]]
+            <h2>[[plan_detail.meal_type_name]] - [[plan_detail.date]]</h2>
+            <br/>
+            [[plan_detail.note]]
         </div>
 
+
+        <br/>
+        <hr/>
+        <br/>
+        [[plan_entries]]
+
     </div>
 
 
diff --git a/recipes/settings.py b/recipes/settings.py
index ffb9cf9ef..26bd6d8f4 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -65,7 +65,6 @@ MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'corsheaders.middleware.CorsMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',