+{% endblock %}
diff --git a/apps/food/urls.py b/apps/food/urls.py
index aff8b8b5..b81bc8fa 100644
--- a/apps/food/urls.py
+++ b/apps/food/urls.py
@@ -11,6 +11,7 @@ urlpatterns = [
path('test_basic_food_form',views.test_basic_foodform),
path('test_transformed_food_form', views.test_transformed_foodform),
path('test_allergen_form', views.test_allergenform),
- path('0', views.Basic_foodCreateView.as_view(), name = 'basic_food'),
+ path('0', views.BasicFoodCreateView.as_view(), name = 'basic_food'),
+ path('1', views.TransformedFoodCreateView.as_view(), name = 'transformed_food'),
]
diff --git a/apps/food/views.py b/apps/food/views.py
index 43161b0d..1768fd38 100644
--- a/apps/food/views.py
+++ b/apps/food/views.py
@@ -13,6 +13,7 @@ from django.urls import reverse_lazy
from django.db import transaction
from django.utils.translation import gettext_lazy as _
from django.utils import timezone
+from datetime import timedelta
'''
from django.views.generic import UpdateView, DetailView
from django.views.generic.base import View, TemplateView
@@ -23,41 +24,96 @@ from permission.views import ProtectQuerysetMixin, ProtectedCreateView
from django.shortcuts import render
-from .forms import Basic_foodForms, Transformed_foodForms, AllergenForms
-from .models import Basic_food
+from .forms import BasicFoodForms, TransformedFoodForms, AllergenForms
+from .models import BasicFood, TransformedFood, Allergen
def test_basic_foodform(request):
- return render(request,'food/test.html', {"form": Basic_foodForms()})
+ return render(request,'food/test.html', {"form": BasicFoodForms()})
def test_transformed_foodform(request):
- return render(request,'food/test.html', {"form": Transformed_foodForms()})
+ return render(request,'food/transformed_food_form.html', {"form": TransformedFoodForms()})
def test_allergenform(request):
return render(request,'food/test.html', {"form": AllergenForms()})
-class Basic_foodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
"""
A view to add a basic food
"""
- model = Basic_food
- form_class = Basic_foodForms
+ model = BasicFood
+ form_class = BasicFoodForms
+ template_name = 'food/basic_food_form.html'
+ second_form = AllergenForms
extra_context = {"title": _("Add a new aliment")}
def get_sample_object(self):
- return Basic_food(
+ return Allergen(
+ groundnut = "False",
+ )
+ '''
+ return BasicFood(
name="",
is_DLC=False,
is_DDM=False,
expiry_date=timezone.now(),
label='pic/default.png',
)
+ '''
@transaction.atomic
def form_valid(self, form):
form.instance.creater = self.request.user
+ basic_food_form = BasicFoodForms(data=self.request.POST)
+ allergen_form = AllergenForms(data=self.request.POST)
+ if not basic_food_form.is_valid() or not allergen_form.is_valid():
+ return self.form_invalid(form)
+
+ # Save the aliment and the allergens associed
+ basic_food = form.save(commit=False)
+ basic_food._force_save = True
+ basic_food.save()
+ basic_food.refresh_from_db()
return super().form_valid(form)
def get_success_url(self, **kwargs):
- self.objects.refresh_from_db()
- return reverse_lazy('food:basic_food', kwargs={"pk": self.object.pk})
+ self.object.refresh_from_db()
+ # return reverse_lazy('food:basicfood', kwargs={"pk": self.object.pk})
+ return '0'
+
+class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+ """
+ A view to add a tranformed food
+ """
+ model = TransformedFood
+ template_name = 'food/transformed_food_form.html'
+ form_class = TransformedFoodForms
+ extra_context = {"title": _("Add a new meal")}
+
+ def get_sample_object(self):
+ return TransformedFood(
+ name="",
+ creation_date=timezone.now(),
+ )
+
+ @transaction.atomic
+ def form_valid(self, form):
+ form.instance.creater = self.request.user
+ transformed_food_form = TransformedFoodForms(data=self.request.POST)
+ if not transformed_food_form.is_valid():
+ return self.form_invalid(form)
+
+ # Save the aliment and allergens associated
+ transformed_food = form.save(commit=False)
+ # Without microbiologic analysis, the time of conservation is 3 days
+ transformed_food.expiry_date = transformed_food.creation_date + timedelta(days = 3)
+ transformed_food._force_save = True
+ transformed_food.save()
+ transformed_food.refresh_from_db()
+ return super().form_valid(form)
+
+
+ def get_success_url(self, **kwargs):
+ self.object.refresh_from_db()
+ # return reverse_lazy('food:tranformed_food', kwargs={"pk": self.object.pk})
+ return '1'