diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html index 67946fdc0..f5c6f5bcb 100644 --- a/cookbook/templates/meal_plan.html +++ b/cookbook/templates/meal_plan.html @@ -46,7 +46,7 @@
- +
@@ -61,14 +61,19 @@ @@ -101,8 +106,7 @@ -
- +
@@ -116,7 +120,8 @@ -
+
@@ -131,6 +136,27 @@
[[meal_plan]] + +
@@ -149,7 +175,7 @@ plan_entries: [], meal_types: [], meal_plan: {}, - plan_detail: undefined, + plan_detail: {}, recipes: [], recipe_query: '', pseudo_note_list: [ @@ -167,20 +193,18 @@ this.$http.get("{% url 'api:mealplan-list' %}?week=" + week).then((response) => { this.plan_entries = response.data; this.getPlanTypes(); + }).catch((err) => { + this.loading = false; + console.log(err); }) - .catch((err) => { - this.loading = false; - console.log(err); - }) }, getPlanTypes: function () { this.$http.get("{% url 'api:mealtype-list' %}").then((response) => { this.meal_types = response.data; this.buildGrid(); + }).catch((err) => { + console.log(err); }) - .catch((err) => { - console.log(err); - }) }, buildGrid: function () { console.log("BUILD GRID EXECUTED") @@ -216,7 +240,7 @@ console.log(err); }) }, - log: function (date, meal_type, evt) { + dragChanged: function (date, meal_type, evt) { console.log("log") if (evt.added !== undefined) { console.log("added") @@ -231,10 +255,12 @@ plan_entry.created_by = {{ request.user.id }}; this.$http.post(`{% url 'api:mealplan-list' %}`, plan_entry).then((response) => { - console.log("Update success", response) - // TODO update meal plan array with id + console.log("create success", response) + let entry = response.data + this.meal_plan[entry.meal_type].days[entry.date].items = this.meal_plan[entry.meal_type].days[entry.date].items.filter(item => item.id === undefined) + this.meal_plan[entry.meal_type].days[entry.date].items.push(entry) }).catch((err) => { - console.log("update error", err); + console.log("create error", err); }) } else { this.$http.put(`{% url 'api:mealplan-list' %}${plan_entry.id}/`, plan_entry).then((response) => { @@ -246,11 +272,14 @@ } }, deleteEntry: function (entry) { + console.log("delete click") + $('#exampleModal').modal('hide') + this.plan_detail = {} this.$http.delete(`{% url 'api:mealplan-list' %}${entry.id}/`, entry).then((response) => { console.log("delete success", response) this.meal_plan[entry.meal_type].days[entry.date].items = this.meal_plan[entry.meal_type].days[entry.date].items.filter(item => item !== entry) }).catch((err) => { - console.log("update error", err); + console.log("delete error", err); }) }, cloneRecipe: function (recipe) { @@ -274,7 +303,7 @@ if (new_entry.title === '') { new_entry.title = '{% trans 'Title' %}' } - + this.new_note_title = '' this.new_note_text = '' return new_entry
[[d]]