Compare commits
2 commits
b3ef2853b6
...
b6af65e915
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b6af65e915 | ||
|
|
11a8698a6f |
|
|
@ -1,9 +1,22 @@
|
||||||
from django.forms import ModelForm, ValidationError, modelformset_factory, BooleanField
|
from django.forms import ModelForm, ValidationError, modelformset_factory, BooleanField
|
||||||
from .models import Recipe, Version, Ingredient
|
from .models import Recipe, Version, Ingredient
|
||||||
|
|
||||||
|
class RecipeForm(ModelForm):
|
||||||
|
class Meta:
|
||||||
|
model = Recipe
|
||||||
|
fields = ['title', 'slug']
|
||||||
|
|
||||||
class VersionForm(ModelForm):
|
class VersionForm(ModelForm):
|
||||||
recipe_id: int
|
recipe_id: int
|
||||||
|
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
placeholder = None
|
||||||
|
if 'author_placeholder' in kwargs:
|
||||||
|
placeholder = kwargs.pop('author_placeholder')
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
if placeholder:
|
||||||
|
self.fields['author'].widget.attrs.update({'placeholder': placeholder})
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Version
|
model = Version
|
||||||
fields = ['label', 'slug', 'body', 'author']
|
fields = ['label', 'slug', 'body', 'author']
|
||||||
|
|
|
||||||
41
recipes/templates/add-recipe.html
Normal file
41
recipes/templates/add-recipe.html
Normal file
|
|
@ -0,0 +1,41 @@
|
||||||
|
{% extends "base_main.html" %}
|
||||||
|
{% block title %}{{ recipe.title }}{% endblock %}
|
||||||
|
{% block main %}
|
||||||
|
<form action="" method="post" id="add-version-form">
|
||||||
|
{%csrf_token %}
|
||||||
|
{{ recipe_form.as_div }}
|
||||||
|
<table>
|
||||||
|
{{ version_form.as_table }}
|
||||||
|
</table>
|
||||||
|
{{ ingredients_formset.management_form }}
|
||||||
|
{% for ingredient_form in ingredients_formset %}
|
||||||
|
{{ ingredient_form.as_div }}
|
||||||
|
{% endfor %}
|
||||||
|
<button id="add-ingredient" type="button">Add Ingredient</button>
|
||||||
|
<input type="submit" value="Submit">
|
||||||
|
</form>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
let firstIngredientDiv = document.querySelector("input[id^=id_ingredient][id$=text]").parentElement;
|
||||||
|
let addIngredientButton = document.querySelector("#add-ingredient");
|
||||||
|
let form = document.querySelector("#add-version-form");
|
||||||
|
let totalIngredientFormsInput = document.querySelector("#id_ingredient-TOTAL_FORMS");
|
||||||
|
|
||||||
|
addIngredientButton.addEventListener('click', addIngredient);
|
||||||
|
|
||||||
|
function addIngredient(e) {
|
||||||
|
let nextIngredientIndex = document.querySelectorAll("input[id^=id_ingredient][id$=text]").length
|
||||||
|
e.preventDefault();
|
||||||
|
|
||||||
|
let newIngredientDiv = firstIngredientDiv.cloneNode(true);
|
||||||
|
let formRegex = new RegExp('ingredient-(\\d){1}-', 'g');
|
||||||
|
|
||||||
|
newIngredientDiv.innerHTML = newIngredientDiv.innerHTML.replace(formRegex, `ingredient-${nextIngredientIndex}-`);
|
||||||
|
|
||||||
|
form.insertBefore(newIngredientDiv, addIngredientButton);
|
||||||
|
totalIngredientFormsInput.setAttribute('value', `${nextIngredientIndex + 1}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
</script>
|
||||||
|
|
||||||
|
{% endblock %}
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
{% block main %}
|
{% block main %}
|
||||||
<h1>Recipes</h1>
|
<h1>Recipes</h1>
|
||||||
{% if perms.recipes.add_recipe %}
|
{% if perms.recipes.add_recipe %}
|
||||||
<p><a href="#">Add recipe</a></p>
|
<p><a href="{% url 'add-recipe' %}">Add recipe</a></p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if perms.recipes.view_recipe %}
|
{% if perms.recipes.view_recipe %}
|
||||||
<ul>
|
<ul>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ from . import views
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
path('', views.recipes, name='recipes'),
|
path('', views.recipes, name='recipes'),
|
||||||
|
path('add-recipe/', views.add_recipe, name='add-recipe'),
|
||||||
path('<slug:slug_recipe>/add-version/', views.add_version, name='add-version'),
|
path('<slug:slug_recipe>/add-version/', views.add_version, name='add-version'),
|
||||||
path('<slug:slug_recipe>/<slug:slug_version>/edit-version/', views.edit_version, name='edit-version'),
|
path('<slug:slug_recipe>/<slug:slug_version>/edit-version/', views.edit_version, name='edit-version'),
|
||||||
path('<slug:slug_recipe>/<slug:slug_version>/', views.version, name='version'),
|
path('<slug:slug_recipe>/<slug:slug_version>/', views.version, name='version'),
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
from django.shortcuts import render, get_object_or_404
|
from django.shortcuts import render, get_object_or_404
|
||||||
from .models import Recipe, Version, Ingredient
|
from .models import Recipe, Version, Ingredient
|
||||||
from .forms import VersionForm, IngredientFormSet
|
from .forms import RecipeForm, VersionForm, IngredientFormSet
|
||||||
from django.contrib.auth.decorators import login_required, permission_required
|
from django.contrib.auth.decorators import login_required, permission_required
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.http.response import HttpResponseRedirect
|
from django.http.response import HttpResponseRedirect
|
||||||
|
|
@ -36,8 +36,36 @@ def recipe(request, slug):
|
||||||
else:
|
else:
|
||||||
return render(request, 'recipe.html', context={'recipe': recipe, 'versions': versions})
|
return render(request, 'recipe.html', context={'recipe': recipe, 'versions': versions})
|
||||||
|
|
||||||
|
RECIPE_FORM_PREFIX = 'recipe'
|
||||||
VERSION_FORM_PREFIX = 'version'
|
VERSION_FORM_PREFIX = 'version'
|
||||||
INGREDIENTS_FORMSET_PREFIX = 'ingredient'
|
INGREDIENTS_FORMSET_PREFIX = 'ingredient' # TODO refactor author_placeholder argument
|
||||||
|
|
||||||
|
@login_required
|
||||||
|
def add_recipe(request):
|
||||||
|
if request.method == 'POST':
|
||||||
|
recipe_form = RecipeForm(request.POST, prefix=RECIPE_FORM_PREFIX)
|
||||||
|
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
|
||||||
|
ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
|
||||||
|
|
||||||
|
if recipe_form.is_valid() and version_form.is_valid() and ingredients_formset.is_valid():
|
||||||
|
recipe = recipe_form.save(commit=True)
|
||||||
|
|
||||||
|
version = version_form.save(commit=False)
|
||||||
|
version.user = request.user
|
||||||
|
version.recipe = recipe
|
||||||
|
version.save()
|
||||||
|
|
||||||
|
for ingredient in ingredients_formset.save(commit=False):
|
||||||
|
ingredient.version = version
|
||||||
|
ingredient.save()
|
||||||
|
|
||||||
|
return HttpResponseRedirect(reverse('recipe', kwargs={'slug': recipe.slug}))
|
||||||
|
else:
|
||||||
|
recipe_form = RecipeForm(prefix=RECIPE_FORM_PREFIX)
|
||||||
|
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
|
||||||
|
ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
|
||||||
|
|
||||||
|
return render(request, 'add-recipe.html', {'recipe_form': recipe_form, 'version_form': version_form, 'ingredients_formset': ingredients_formset})
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('recipes.add_recipe')
|
@permission_required('recipes.add_recipe')
|
||||||
|
|
@ -49,7 +77,7 @@ def add_version(request, slug_recipe):
|
||||||
version_initial = {}
|
version_initial = {}
|
||||||
|
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, initial=version_initial)
|
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
|
||||||
ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
|
ingredients_formset = IngredientFormSet(request.POST, queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
|
||||||
version_form.recipe_id = recipe.id # type: ignore
|
version_form.recipe_id = recipe.id # type: ignore
|
||||||
|
|
||||||
|
|
@ -66,8 +94,7 @@ def add_version(request, slug_recipe):
|
||||||
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
|
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial)
|
version_form = VersionForm(prefix=VERSION_FORM_PREFIX, initial=version_initial, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
|
||||||
version_form.fields['author'].widget.attrs['placeholder'] = request.user.first_name if request.user.first_name else request.user.username
|
|
||||||
ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
|
ingredients_formset = IngredientFormSet(queryset=Ingredient.objects.none(), prefix=INGREDIENTS_FORMSET_PREFIX)
|
||||||
|
|
||||||
return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
|
return render(request, 'add-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
|
||||||
|
|
@ -79,7 +106,7 @@ def edit_version(request, slug_recipe, slug_version):
|
||||||
version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
|
version = get_object_or_404(Version, recipe=recipe, slug=slug_version)
|
||||||
|
|
||||||
if request.method == 'POST': # TODO refactor with add_version
|
if request.method == 'POST': # TODO refactor with add_version
|
||||||
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, instance=version)
|
version_form = VersionForm(request.POST, prefix=VERSION_FORM_PREFIX, instance=version, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
|
||||||
ingredients_formset = IngredientFormSet(request.POST, queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
|
ingredients_formset = IngredientFormSet(request.POST, queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
|
||||||
version_form.recipe_id = recipe.id # type: ignore
|
version_form.recipe_id = recipe.id # type: ignore
|
||||||
|
|
||||||
|
|
@ -97,7 +124,7 @@ def edit_version(request, slug_recipe, slug_version):
|
||||||
|
|
||||||
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
|
return HttpResponseRedirect(reverse('version', kwargs={'slug_recipe': version.recipe.slug, 'slug_version': version.slug}))
|
||||||
else:
|
else:
|
||||||
version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX)
|
version_form = VersionForm(instance=version, prefix=VERSION_FORM_PREFIX, author_placeholder=request.user.first_name if request.user.first_name else request.user.username)
|
||||||
ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
|
ingredients_formset = IngredientFormSet(queryset=version.ingredients.all(), prefix=INGREDIENTS_FORMSET_PREFIX) # type: ignore
|
||||||
|
|
||||||
return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
|
return render(request, 'edit-version.html', {'version_form': version_form, 'ingredients_formset': ingredients_formset})
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue