meal_date to suggested_date
This commit is contained in:
parent
b598db1e70
commit
0bcd05acc9
5 changed files with 10 additions and 10 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="fields">
|
<div class="fields">
|
||||||
<date-picker @date-selected="selectDate" :date="meal.meal_date" />
|
<date-picker @date-selected="selectDate" :date="meal.suggested_date" />
|
||||||
<div class="persons-list">
|
<div class="persons-list">
|
||||||
Cooked by <person-list :people="meal.chefs" @remove-person="(p) => removePerson('chefs', p)" @add-person="(p) => addPerson('chefs', p)" />
|
Cooked by <person-list :people="meal.chefs" @remove-person="(p) => removePerson('chefs', p)" @add-person="(p) => addPerson('chefs', p)" />
|
||||||
for <person-list :people="meal.consumers" @remove-person="(p) => removePerson('consumers', p)" @add-person="(p) => addPerson('consumers', p)" />,
|
for <person-list :people="meal.consumers" @remove-person="(p) => removePerson('consumers', p)" @add-person="(p) => addPerson('consumers', p)" />,
|
||||||
|
|
@ -56,7 +56,7 @@ export default {
|
||||||
return {
|
return {
|
||||||
meal: {
|
meal: {
|
||||||
id: -1,
|
id: -1,
|
||||||
meal_date: new Date(),
|
suggested_date: new Date(),
|
||||||
recipes: [],
|
recipes: [],
|
||||||
extra_ingredients: [],
|
extra_ingredients: [],
|
||||||
chefs: [],
|
chefs: [],
|
||||||
|
|
@ -87,7 +87,7 @@ export default {
|
||||||
this.meal.recipes.push(recipe);
|
this.meal.recipes.push(recipe);
|
||||||
},
|
},
|
||||||
selectDate(date) {
|
selectDate(date) {
|
||||||
this.meal.meal_date = date;
|
this.meal.suggested_date = date;
|
||||||
},
|
},
|
||||||
removeRecipe(recipe) {
|
removeRecipe(recipe) {
|
||||||
this.meal.recipes = this.meal.recipes.filter(r => r.id !== recipe.id);
|
this.meal.recipes = this.meal.recipes.filter(r => r.id !== recipe.id);
|
||||||
|
|
|
||||||
|
|
@ -54,10 +54,10 @@ export default {
|
||||||
props: ['meal'],
|
props: ['meal'],
|
||||||
computed: {
|
computed: {
|
||||||
date() {
|
date() {
|
||||||
return this.meal.meal_date.toLocaleDateString('en-au', { month: 'numeric', day: 'numeric' })
|
return this.meal.suggested_date.toLocaleDateString('en-au', { month: 'numeric', day: 'numeric' })
|
||||||
},
|
},
|
||||||
dayOfWeek() {
|
dayOfWeek() {
|
||||||
return this.meal.meal_date.toLocaleDateString('en-au', { weekday: 'long' })
|
return this.meal.suggested_date.toLocaleDateString('en-au', { weekday: 'long' })
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<!-- Emit meal-selected event on checked and meal-unselected on unchecked -->
|
<!-- Emit meal-selected event on checked and meal-unselected on unchecked -->
|
||||||
<input type="checkbox" :id="meal.id" :checked="isChecked(meal)" @change="mealCheckChanged" :disabled="!!meal.purchase_date" />
|
<input type="checkbox" :id="meal.id" :checked="isChecked(meal)" @change="mealCheckChanged" :disabled="!!meal.purchase_date" />
|
||||||
<label :for="meal.id" :style="getImageStyling(meal)">
|
<label :for="meal.id" :style="getImageStyling(meal)">
|
||||||
{{ formatDate(meal.meal_date) }}
|
{{ formatDate(meal.suggested_date) }}
|
||||||
</label>
|
</label>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
||||||
|
|
@ -24,10 +24,10 @@
|
||||||
<span v-else-if="source.recipe">
|
<span v-else-if="source.recipe">
|
||||||
{{ formatQuantity(source.ingredient.quantity) }} {{ source.ingredient.unit }}
|
{{ formatQuantity(source.ingredient.quantity) }} {{ source.ingredient.unit }}
|
||||||
in <router-link :to="`/recipes/${ source.recipe.id }/`">{{ source.recipe.name }}</router-link>
|
in <router-link :to="`/recipes/${ source.recipe.id }/`">{{ source.recipe.name }}</router-link>
|
||||||
for <router-link :to="`/meals/${ source.meal.id }/`">{{ source.meal.meal_date.toLocaleDateString("en-AU", { weekday: 'long', month: 'long', day: 'numeric' }) }}</router-link>
|
for <router-link :to="`/meals/${ source.meal.id }/`">{{ source.meal.suggested_date.toLocaleDateString("en-AU", { weekday: 'long', month: 'long', day: 'numeric' }) }}</router-link>
|
||||||
</span>
|
</span>
|
||||||
<span v-else-if="source.meal">
|
<span v-else-if="source.meal">
|
||||||
{{ source.ingredient.line }} for <router-link :to="`/meals/${ source.meal.id }/`">{{ source.meal.meal_date.toLocaleDateString("en-AU", { weekday: 'long', month: 'long', day: 'numeric' }) }}</router-link>
|
{{ source.ingredient.line }} for <router-link :to="`/meals/${ source.meal.id }/`">{{ source.meal.suggested_date.toLocaleDateString("en-AU", { weekday: 'long', month: 'long', day: 'numeric' }) }}</router-link>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
</p>
|
</p>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
const BASE_URL = window.location.href.replace(/^(http:\/\/[^/:]+).*/, "$1:8000")
|
const BASE_URL = window.location.href.replace(/^(http:\/\/[^/:]+).*/, "$1:8000")
|
||||||
|
|
||||||
const datesToFix = {
|
const datesToFix = {
|
||||||
Meal: { fields: [ "meal_date", "purchase_date" ] },
|
Meal: { fields: [ "suggested_date", "purchase_date" ] },
|
||||||
ShoppingList: { fields: [ "created_date", "purchased_date" ], dependants: l => ({ ShoppingListResult: l.results, ShoppingListRequest: l.requests }) },
|
ShoppingList: { fields: [ "created_date", "purchased_date" ], dependants: l => ({ ShoppingListResult: l.results, ShoppingListRequest: l.requests }) },
|
||||||
ShoppingListResult: { fields: [ "found_date", "created_date" ], },
|
ShoppingListResult: { fields: [ "found_date", "created_date" ], },
|
||||||
ShoppingListRequest: { fields: [ "created_date" ], dependants: r => ({ Meal: r.meal }) },
|
ShoppingListRequest: { fields: [ "created_date" ], dependants: r => ({ Meal: r.meal }) },
|
||||||
|
|
@ -48,7 +48,7 @@ export default {
|
||||||
const meals = await response.json();
|
const meals = await response.json();
|
||||||
fixDates(meals, "Meal");
|
fixDates(meals, "Meal");
|
||||||
|
|
||||||
return meals.sort((a, b) => a.meal_date - b.meal_date);
|
return meals.sort((a, b) => a.suggested_date - b.suggested_date);
|
||||||
},
|
},
|
||||||
async getMeal(id) {
|
async getMeal(id) {
|
||||||
var response = await fetch(BASE_URL + `/meals/${encodeURIComponent(id)}`);
|
var response = await fetch(BASE_URL + `/meals/${encodeURIComponent(id)}`);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue