diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 72fd0bbc5..f042dd60f 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -9,7 +9,7 @@ class MealPlanSerializer(serializers.ModelSerializer): class Meta: model = MealPlan - fields = ('id', 'title', 'recipe', 'date', 'meal_type', 'created_by', 'recipe_name', 'meal_type_name') + fields = ('id', 'title', 'recipe', 'note', 'date', 'meal_type', 'created_by', 'recipe_name', 'meal_type_name') class MealTypeSerializer(serializers.ModelSerializer): diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index f5c6f5bcb..50c9d8412 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -46,40 +46,48 @@
- - - - - - - - - - - - + + +
[[d]]
- [[mp.name]] -
- -
-
-
- [[element.title]] - [[element.recipe_name]] - [[element.name]] +
+
+ + + + + + + + + + + + - - -
[[d]]
+ [[mp.name]] +
+ + - - - -
+ +
+
+ +
@@ -141,17 +149,18 @@ @@ -296,7 +305,7 @@ let new_entry = { id: Math.round(Math.random() * 1000) + 10000, title: this.new_note_title, - text: this.new_note_text, + note: this.new_note_text, is_note: true, }