Un peu de nettoyage, rajout de commentaires

apps/food/views.py

@@ -1,57 +1,35 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-'''
-from crispy_forms.helper import FormHelper
-from django.contrib.auth.mixins import LoginRequiredMixin
-from django.core.exceptions import ValidationError, PermissionDenied
-from django.db.models import Q
-from django.forms import Form
-from django.http import HttpResponse
-from django.shortcuts import redirect
-'''
+
 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
-from django.views.generic.edit import BaseFormView, DeleteView
-from django_tables2 import SingleTableView
-'''
 from permission.views import ProtectQuerysetMixin, ProtectedCreateView
-
 from django.shortcuts import render
 
 from .forms import BasicFoodForms, TransformedFoodForms, AllergenForms
 from .models import BasicFood, TransformedFood, Allergen
 
-def test_basic_foodform(request):
-    return render(request,'food/test.html', {"form": BasicFoodForms()})
-
-def test_transformed_foodform(request):
-    return render(request,'food/transformed_food_form.html', {"form": TransformedFoodForms()})
-
-def test_allergenform(request):
-    return render(request,'food/test.html', {"form": AllergenForms()})
-
 
 class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+#####################################################################
+# TO DO
+# - fix picture save
+# - implement solution crop and convert image (reuse or recode ImageForm from members apps
+# - implement AllergenForms
+# - redirect to another view after the poll is submitted
+#####################################################################
     """
     A view to add a basic food
     """
     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 Allergen(
-            groundnut = "False",
-        )
-        '''
         return BasicFood(
             name="",
             is_DLC=False,
@@ -59,7 +37,6 @@ class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
             expiry_date=timezone.now(),
             label='pic/default.png',
         )
-        '''
     
     @transaction.atomic
     def form_valid(self, form):
@@ -71,6 +48,8 @@ class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
 
         # Save the aliment and the allergens associed
         basic_food = form.save(commit=False)
+        # We assume the date of labeling and the same as the date of arrival
+        basic_food.arrival_date = timezone.now
         basic_food._force_save = True
         basic_food.save()
         basic_food.refresh_from_db()
@@ -78,10 +57,15 @@ class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
 
     def get_success_url(self, **kwargs):
         self.object.refresh_from_db()
+        # TEMPORARY, I create a fonctionnal view before
         # return reverse_lazy('food:basicfood', kwargs={"pk": self.object.pk})
         return '0'
 
 class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+###############################################
+# TO DO
+# -redirect to another view after submit
+###############################################
     """
     A view to add a tranformed food
     """
@@ -105,7 +89,7 @@ class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
 
         # Save the aliment and allergens associated
         transformed_food = form.save(commit=False)
-        # Without microbiologic analysis, the time of conservation is 3 days
+        # Without microbiological analyzes, the storage time is 3 days
         transformed_food.expiry_date = transformed_food.creation_date + timedelta(days = 3)
         transformed_food._force_save =  True
         transformed_food.save()
@@ -115,5 +99,6 @@ class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
 
     def get_success_url(self, **kwargs):
         self.object.refresh_from_db()
+        # TEMPORARY, I create a fonctionnal view before
         # return reverse_lazy('food:tranformed_food', kwargs={"pk": self.object.pk})
         return '1'