more plan basics working
This commit is contained in:
parent
a136a18a8e
commit
2e255aba0d
@ -4,9 +4,12 @@ from cookbook.models import MealPlan, MealType
|
|||||||
|
|
||||||
|
|
||||||
class MealPlanSerializer(serializers.ModelSerializer):
|
class MealPlanSerializer(serializers.ModelSerializer):
|
||||||
|
recipe_name = serializers.ReadOnlyField(source='recipe.name')
|
||||||
|
meal_type_name = serializers.ReadOnlyField(source='meal_type.name')
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = MealPlan
|
model = MealPlan
|
||||||
fields = '__all__'
|
fields = ('id', 'title', 'recipe', 'date', 'meal_type', 'recipe_name', 'meal_type_name')
|
||||||
|
|
||||||
|
|
||||||
class MealTypeSerializer(serializers.ModelSerializer):
|
class MealTypeSerializer(serializers.ModelSerializer):
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
:empty-insert-threshold="10">
|
:empty-insert-threshold="10">
|
||||||
<div class="list-group-item" v-for="(element, index) in d.items" :key="element.id">
|
<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.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>
|
</div>
|
||||||
</draggable>
|
</draggable>
|
||||||
</td>
|
</td>
|
||||||
@ -74,10 +74,17 @@
|
|||||||
</table>
|
</table>
|
||||||
|
|
||||||
<div class="row" v-if="plan_detail !== undefined">
|
<div class="row" v-if="plan_detail !== undefined">
|
||||||
[[plan_detail.date]]
|
<h2>[[plan_detail.meal_type_name]] - [[plan_detail.date]]</h2>
|
||||||
[[plan_detail.title]]
|
<br/>
|
||||||
|
[[plan_detail.note]]
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<br/>
|
||||||
|
<hr/>
|
||||||
|
<br/>
|
||||||
|
[[plan_entries]]
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
@ -65,7 +65,6 @@ MIDDLEWARE = [
|
|||||||
'django.middleware.security.SecurityMiddleware',
|
'django.middleware.security.SecurityMiddleware',
|
||||||
'whitenoise.middleware.WhiteNoiseMiddleware',
|
'whitenoise.middleware.WhiteNoiseMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'corsheaders.middleware.CorsMiddleware',
|
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
|
Loading…
Reference in New Issue
Block a user