Fix: Meal plans were not being created due to an error in the form - …

…now resolved
vkleer · Sep 27, 2022 · bbebbab · bbebbab
1 parent 5855ac3
commit bbebbab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/mealplanner/templates/create_meal_plan.html b/mealplanner/templates/create_meal_plan.html
@@ -3,7 +3,7 @@
 {% load crispy_forms_tags %}
 
 {% block header_title %}
-    Create meal plan {{ meal_plan.date|date:"d/m/Y" }}
+    Create meal plan
 {% endblock header_title %}
 {% block header_text %}
     Create your new meal plan, or click cancel to go back.
@@ -17,9 +17,13 @@ <h5>Please pick your meals:</h5>
                     <hr>
                     {% csrf_token %}
                     {{ formset.management_form }}
+                    <p class="fw-bold">Meal plan date:</p>
                     {{ form | crispy }}
+                    {{ form | crispy }}
+                    {{ form | crispy }}
+                    <hr>
                     {% for form in formset %}
-                    <p><strong>Meal {{ forloop.counter }}:</strong></p>
+                    <p class="fw-bold">Meal {{ forloop.counter }}:</p>
                         {{ form | crispy }}
                         <hr>
                     {% endfor %}
@@ -31,7 +35,6 @@ <h5>Please pick your meals:</h5>
         </div>
     </div>
     <script>
-        hideFormSelect();
         delFormDelBtns();
     </script>
 {% endblock content %}
diff --git a/mealplanner/views.py b/mealplanner/views.py
@@ -75,9 +75,15 @@ def post(self, request, meal_plan_date):
             meal_plan = MealPlan(meal_planner=meal_planner, date=date)
             meal_plan.save()
             formset = MealOptionFormSet(request.POST, instance=meal_plan)
+        else:
+            messages.warning(request, "Form could not be validated - meal plan won't be created.")
+            return redirect(reverse('meal_planner'))
         if formset.is_valid():
             formset.save()
-            messages.success(request, 'Meal plan created succesfully.')
+            messages.success(request, "Successfully created new meal plan.")
+            return redirect(reverse('meal_planner'))
+        else:
+            messages.warning(request, "Formset could not be validated - meal plan won't be created.")
             return redirect(reverse('meal_planner'))
 
 
@@ -110,7 +116,7 @@ class DeleteMealPlan(generic.View):
     def post(self, request, meal_plan_id):
         meal_plan = MealPlan.objects.get(id=meal_plan_id)
         meal_plan.delete()
-        messages.info(
+        messages.success(
             request,
             'Meal plan deleted succesfully.'
         )

diff --git a/static/js/meal-planner.js b/static/js/meal-planner.js
@@ -41,11 +41,6 @@ function getCalendarCells() {
     }
 }
 
-function hideFormSelect() {
-    dateSel = document.getElementById('id_date');
-    dateSel.setAttribute('hidden', '');
-}
-
 function delFormDelBtns() {
     delBtns = document.getElementsByClassName('mb-3');
     for (i = 0; i < delBtns.length; i++) {