diff --git a/apps/food/admin.py b/apps/food/admin.py deleted file mode 100644 index 89f042e1..00000000 --- a/apps/food/admin.py +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from django.contrib import admin -from django.db import transaction -from note_kfet.admin import admin_site - -from .models import Allergen, BasicFood, QRCode, TransformedFood - - -@admin.register(QRCode, site=admin_site) -class QRCodeAdmin(admin.ModelAdmin): - pass - - -@admin.register(BasicFood, site=admin_site) -class BasicFoodAdmin(admin.ModelAdmin): - @transaction.atomic - def save_related(self, *args, **kwargs): - ans = super().save_related(*args, **kwargs) - args[1].instance.update() - return ans - - -@admin.register(TransformedFood, site=admin_site) -class TransformedFoodAdmin(admin.ModelAdmin): - exclude = ["allergens", "expiry_date"] - - @transaction.atomic - def save_related(self, request, form, *args, **kwargs): - super().save_related(request, form, *args, **kwargs) - form.instance.update() - - -@admin.register(Allergen, site=admin_site) -class AllergenAdmin(admin.ModelAdmin): - pass diff --git a/apps/food/api/__init__.py b/apps/food/api/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/food/api/serializers.py b/apps/food/api/serializers.py deleted file mode 100644 index acac2ba9..00000000 --- a/apps/food/api/serializers.py +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from rest_framework import serializers - -from ..models import Allergen, BasicFood, QRCode, TransformedFood - - -class AllergenSerializer(serializers.ModelSerializer): - """ - REST API Serializer for Allergen. - The djangorestframework plugin will analyse the model `Allergen` and parse all fields in the API. - """ - - class Meta: - model = Allergen - fields = '__all__' - - -class BasicFoodSerializer(serializers.ModelSerializer): - """ - REST API Serializer for BasicFood. - The djangorestframework plugin will analyse the model `BasicFood` and parse all fields in the API. - """ - - class Meta: - model = BasicFood - fields = '__all__' - - -class QRCodeSerializer(serializers.ModelSerializer): - """ - REST API Serializer for QRCode. - The djangorestframework plugin will analyse the model `QRCode` and parse all fields in the API. - """ - - class Meta: - model = QRCode - fields = '__all__' - - -class TransformedFoodSerializer(serializers.ModelSerializer): - """ - REST API Serializer for TransformedFood. - The djangorestframework plugin will analyse the model `TransformedFood` and parse all fields in the API. - """ - - class Meta: - model = TransformedFood - fields = '__all__' diff --git a/apps/food/api/urls.py b/apps/food/api/urls.py deleted file mode 100644 index 23c67bdd..00000000 --- a/apps/food/api/urls.py +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from .views import AllergenViewSet, BasicFoodViewSet, QRCodeViewSet, TransformedFoodViewSet - - -def register_food_urls(router, path): - """ - Configure router for Food REST API. - """ - router.register(path + '/allergen', AllergenViewSet) - router.register(path + '/basic_food', BasicFoodViewSet) - router.register(path + '/qrcode', QRCodeViewSet) - router.register(path + '/transformed_food', TransformedFoodViewSet) diff --git a/apps/food/api/views.py b/apps/food/api/views.py deleted file mode 100644 index af616074..00000000 --- a/apps/food/api/views.py +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from api.viewsets import ReadProtectedModelViewSet -from django_filters.rest_framework import DjangoFilterBackend -from rest_framework.filters import SearchFilter - -from .serializers import AllergenSerializer, BasicFoodSerializer, QRCodeSerializer, TransformedFoodSerializer -from ..models import Allergen, BasicFood, QRCode, TransformedFood - - -class AllergenViewSet(ReadProtectedModelViewSet): - """ - REST API View set. - The djangorestframework plugin will get all `Allergen` objects, serialize it to JSON with the given serializer, - then render it on /api/food/allergen/ - """ - queryset = Allergen.objects.order_by('id') - serializer_class = AllergenSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] - - -class BasicFoodViewSet(ReadProtectedModelViewSet): - """ - REST API View set. - The djangorestframework plugin will get all `BasicFood` objects, serialize it to JSON with the given serializer, - then render it on /api/food/basic_food/ - """ - queryset = BasicFood.objects.order_by('id') - serializer_class = BasicFoodSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] - - -class QRCodeViewSet(ReadProtectedModelViewSet): - """ - REST API View set. - The djangorestframework plugin will get all `QRCode` objects, serialize it to JSON with the given serializer, - then render it on /api/food/qrcode/ - """ - queryset = QRCode.objects.order_by('id') - serializer_class = QRCodeSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['qr_code_number', ] - search_fields = ['$qr_code_number', ] - - -class TransformedFoodViewSet(ReadProtectedModelViewSet): - """ - REST API View set. - The djangorestframework plugin will get all `TransformedFood` objects, serialize it to JSON with the given serializer, - then render it on /api/food/transformed_food/ - """ - queryset = TransformedFood.objects.order_by('id') - serializer_class = TransformedFoodSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] diff --git a/apps/food/forms.py b/apps/food/forms.py deleted file mode 100644 index af468c7f..00000000 --- a/apps/food/forms.py +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from random import shuffle - -from django import forms -from django.utils.translation import gettext_lazy as _ -from django.utils import timezone -from member.models import Club -from bootstrap_datepicker_plus.widgets import DateTimePickerInput -from note_kfet.inputs import Autocomplete -from note_kfet.middlewares import get_current_request -from permission.backends import PermissionBackend - -from .models import BasicFood, QRCode, TransformedFood - - -class AddIngredientForms(forms.ModelForm): - """ - Form for add an ingredient - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields['ingredient'].queryset = self.fields['ingredient'].queryset.filter( - polymorphic_ctype__model='transformedfood', - is_ready=False, - is_active=True, - was_eaten=False, - ) - # Caution, the logic is inverted here, we flip the logic on saving in AddIngredientView - self.fields['is_active'].initial = True - self.fields['is_active'].label = _("Fully used") - - class Meta: - model = TransformedFood - fields = ('ingredient', 'is_active') - - -class BasicFoodForms(forms.ModelForm): - """ - Form for add non-transformed food - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields['name'].widget.attrs.update({"autofocus": "autofocus"}) - self.fields['name'].required = True - self.fields['owner'].required = True - - # Some example - self.fields['name'].widget.attrs.update({"placeholder": _("Pasta METRO 5kg")}) - clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all()) - shuffle(clubs) - self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..." - - class Meta: - model = BasicFood - fields = ('name', 'owner', 'date_type', 'expiry_date', 'is_active', 'was_eaten', 'allergens',) - widgets = { - "owner": Autocomplete( - model=Club, - attrs={"api_url": "/api/members/club/"}, - ), - 'expiry_date': DateTimePickerInput(), - } - - -class QRCodeForms(forms.ModelForm): - """ - Form for create QRCode - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields['food_container'].queryset = self.fields['food_container'].queryset.filter( - is_active=True, - was_eaten=False, - polymorphic_ctype__model='transformedfood', - ) - - class Meta: - model = QRCode - fields = ('food_container',) - - -class TransformedFoodForms(forms.ModelForm): - """ - Form for add transformed food - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields['name'].widget.attrs.update({"autofocus": "autofocus"}) - self.fields['name'].required = True - self.fields['owner'].required = True - self.fields['creation_date'].required = True - self.fields['creation_date'].initial = timezone.now - self.fields['is_active'].initial = True - self.fields['is_ready'].initial = False - self.fields['was_eaten'].initial = False - - # Some example - self.fields['name'].widget.attrs.update({"placeholder": _("Lasagna")}) - clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all()) - shuffle(clubs) - self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..." - - class Meta: - model = TransformedFood - fields = ('name', 'creation_date', 'owner', 'is_active', 'is_ready', 'was_eaten', 'shelf_life') - widgets = { - "owner": Autocomplete( - model=Club, - attrs={"api_url": "/api/members/club/"}, - ), - 'creation_date': DateTimePickerInput(), - } diff --git a/apps/food/migrations/0001_initial.py b/apps/food/migrations/0001_initial.py deleted file mode 100644 index 011d0f3f..00000000 --- a/apps/food/migrations/0001_initial.py +++ /dev/null @@ -1,84 +0,0 @@ -# Generated by Django 2.2.28 on 2024-07-05 08:57 - -from django.db import migrations, models -import django.db.models.deletion -import django.utils.timezone - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), - ('member', '0011_profile_vss_charter_read'), - ] - - operations = [ - migrations.CreateModel( - name='Allergen', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='name')), - ], - options={ - 'verbose_name': 'Allergen', - 'verbose_name_plural': 'Allergens', - }, - ), - migrations.CreateModel( - name='Food', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='name')), - ('expiry_date', models.DateTimeField(verbose_name='expiry date')), - ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')), - ('is_ready', models.BooleanField(default=False, verbose_name='is ready')), - ('allergens', models.ManyToManyField(blank=True, to='food.Allergen', verbose_name='allergen')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')), - ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_food.food_set+', to='contenttypes.ContentType')), - ], - options={ - 'verbose_name': 'foods', - }, - ), - migrations.CreateModel( - name='BasicFood', - fields=[ - ('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')), - ('date_type', models.CharField(choices=[('DLC', 'DLC'), ('DDM', 'DDM')], max_length=255)), - ('arrival_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='arrival date')), - ], - options={ - 'verbose_name': 'Basic food', - 'verbose_name_plural': 'Basic foods', - }, - bases=('food.food',), - ), - migrations.CreateModel( - name='QRCode', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('qr_code_number', models.PositiveIntegerField(unique=True, verbose_name='QR-code number')), - ('food_container', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.Food', verbose_name='food container')), - ], - options={ - 'verbose_name': 'QR-code', - 'verbose_name_plural': 'QR-codes', - }, - ), - migrations.CreateModel( - name='TransformedFood', - fields=[ - ('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')), - ('creation_date', models.DateTimeField(verbose_name='creation date')), - ('is_active', models.BooleanField(default=True, verbose_name='is active')), - ('ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.Food', verbose_name='transformed ingredient')), - ], - options={ - 'verbose_name': 'Transformed food', - 'verbose_name_plural': 'Transformed foods', - }, - bases=('food.food',), - ), - ] diff --git a/apps/food/migrations/0002_transformedfood_shelf_life.py b/apps/food/migrations/0002_transformedfood_shelf_life.py deleted file mode 100644 index 46673643..00000000 --- a/apps/food/migrations/0002_transformedfood_shelf_life.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.2.28 on 2024-07-06 20:37 - -import datetime -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('food', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='transformedfood', - name='shelf_life', - field=models.DurationField(default=datetime.timedelta(days=3), verbose_name='shelf life'), - ), - ] diff --git a/apps/food/migrations/0003_create_14_allergens_mandatory.py b/apps/food/migrations/0003_create_14_allergens_mandatory.py deleted file mode 100644 index 236eaea4..00000000 --- a/apps/food/migrations/0003_create_14_allergens_mandatory.py +++ /dev/null @@ -1,62 +0,0 @@ -from django.db import migrations - -def create_14_mandatory_allergens(apps, schema_editor): - """ - There are 14 mandatory allergens, they are pre-injected - """ - - Allergen = apps.get_model("food", "allergen") - - Allergen.objects.get_or_create( - name="Gluten", - ) - Allergen.objects.get_or_create( - name="Fruits à coques", - ) - Allergen.objects.get_or_create( - name="Crustacés", - ) - Allergen.objects.get_or_create( - name="Céléri", - ) - Allergen.objects.get_or_create( - name="Oeufs", - ) - Allergen.objects.get_or_create( - name="Moutarde", - ) - Allergen.objects.get_or_create( - name="Poissons", - ) - Allergen.objects.get_or_create( - name="Soja", - ) - Allergen.objects.get_or_create( - name="Lait", - ) - Allergen.objects.get_or_create( - name="Sulfites", - ) - Allergen.objects.get_or_create( - name="Sésame", - ) - Allergen.objects.get_or_create( - name="Lupin", - ) - Allergen.objects.get_or_create( - name="Arachides", - ) - Allergen.objects.get_or_create( - name="Mollusques", - ) - -class Migration(migrations.Migration): - dependencies = [ - ('food', '0002_transformedfood_shelf_life'), - ] - - operations = [ - migrations.RunPython(create_14_mandatory_allergens), - ] - - diff --git a/apps/food/migrations/0004_auto_20240813_2358.py b/apps/food/migrations/0004_auto_20240813_2358.py deleted file mode 100644 index d7fdf200..00000000 --- a/apps/food/migrations/0004_auto_20240813_2358.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 2.2.28 on 2024-08-13 21:58 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('food', '0003_create_14_allergens_mandatory'), - ] - - operations = [ - migrations.RemoveField( - model_name='transformedfood', - name='is_active', - ), - migrations.AddField( - model_name='food', - name='is_active', - field=models.BooleanField(default=True, verbose_name='is active'), - ), - migrations.AlterField( - model_name='qrcode', - name='food_container', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='QR_code', to='food.Food', verbose_name='food container'), - ), - ] diff --git a/apps/food/migrations/0005_alter_food_polymorphic_ctype.py b/apps/food/migrations/0005_alter_food_polymorphic_ctype.py deleted file mode 100644 index 5473bffc..00000000 --- a/apps/food/migrations/0005_alter_food_polymorphic_ctype.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 4.2.15 on 2024-08-28 08:00 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), - ('food', '0004_auto_20240813_2358'), - ] - - operations = [ - migrations.AlterField( - model_name='food', - name='polymorphic_ctype', - field=models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_%(app_label)s.%(class)s_set+', to='contenttypes.contenttype'), - ), - ] diff --git a/apps/food/migrations/__init__.py b/apps/food/migrations/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/food/models.py b/apps/food/models.py deleted file mode 100644 index 199dcdd7..00000000 --- a/apps/food/models.py +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from datetime import timedelta - -from django.db import models, transaction -from django.utils import timezone -from django.utils.translation import gettext_lazy as _ -from member.models import Club -from polymorphic.models import PolymorphicModel - - -class QRCode(models.Model): - """ - An QRCode model - """ - qr_code_number = models.PositiveIntegerField( - verbose_name=_("QR-code number"), - unique=True, - ) - - food_container = models.ForeignKey( - 'Food', - on_delete=models.CASCADE, - related_name='QR_code', - verbose_name=_('food container'), - ) - - class Meta: - verbose_name = _("QR-code") - verbose_name_plural = _("QR-codes") - - def __str__(self): - return _("QR-code number {qr_code_number}").format(qr_code_number=self.qr_code_number) - - -class Allergen(models.Model): - """ - A list of allergen and alimentary restrictions - """ - name = models.CharField( - verbose_name=_('name'), - max_length=255, - ) - - class Meta: - verbose_name = _('Allergen') - verbose_name_plural = _('Allergens') - - def __str__(self): - return self.name - - -class Food(PolymorphicModel): - name = models.CharField( - verbose_name=_('name'), - max_length=255, - ) - - owner = models.ForeignKey( - Club, - on_delete=models.PROTECT, - related_name='+', - verbose_name=_('owner'), - ) - - allergens = models.ManyToManyField( - Allergen, - blank=True, - verbose_name=_('allergen'), - ) - - expiry_date = models.DateTimeField( - verbose_name=_('expiry date'), - null=False, - ) - - was_eaten = models.BooleanField( - default=False, - verbose_name=_('was eaten'), - ) - - # is_ready != is_active : is_ready signifie que la nourriture est prête à être manger, - # is_active signifie que la nourriture n'est pas encore archivé - # il sert dans les cas où il est plus intéressant que de l'open soit conservé (confiture par ex) - - is_ready = models.BooleanField( - default=False, - verbose_name=_('is ready'), - ) - - is_active = models.BooleanField( - default=True, - verbose_name=_('is active'), - ) - - def __str__(self): - return self.name - - @transaction.atomic - def save(self, force_insert=False, force_update=False, using=None, update_fields=None): - return super().save(force_insert, force_update, using, update_fields) - - class Meta: - verbose_name = _('food') - verbose_name = _('foods') - - -class BasicFood(Food): - """ - Food which has been directly buy on supermarket - """ - date_type = models.CharField( - max_length=255, - choices=( - ("DLC", "DLC"), - ("DDM", "DDM"), - ) - ) - - arrival_date = models.DateTimeField( - verbose_name=_('arrival date'), - default=timezone.now, - ) - - # label = models.ImageField( - # verbose_name=_('food label'), - # max_length=255, - # blank=False, - # null=False, - # upload_to='label/', - # ) - - @transaction.atomic - def update_allergens(self): - # update parents - for parent in self.transformed_ingredient_inv.iterator(): - parent.update_allergens() - - @transaction.atomic - def update_expiry_date(self): - # update parents - for parent in self.transformed_ingredient_inv.iterator(): - parent.update_expiry_date() - - @transaction.atomic - def update(self): - self.update_allergens() - self.update_expiry_date() - - class Meta: - verbose_name = _('Basic food') - verbose_name_plural = _('Basic foods') - - -class TransformedFood(Food): - """ - Transformed food are a mix between basic food and meal - """ - creation_date = models.DateTimeField( - verbose_name=_('creation date'), - ) - - ingredient = models.ManyToManyField( - Food, - blank=True, - symmetrical=False, - related_name='transformed_ingredient_inv', - verbose_name=_('transformed ingredient'), - ) - - # Without microbiological analyzes, the storage time is 3 days - shelf_life = models.DurationField( - verbose_name=_("shelf life"), - default=timedelta(days=3), - ) - - @transaction.atomic - def archive(self): - # When a meal are archived, if it was eaten, update ingredient fully used for this meal - raise NotImplementedError - - @transaction.atomic - def update_allergens(self): - # When allergens are changed, simply update the parents' allergens - old_allergens = list(self.allergens.all()) - self.allergens.clear() - for ingredient in self.ingredient.iterator(): - self.allergens.set(self.allergens.union(ingredient.allergens.all())) - - if old_allergens == list(self.allergens.all()): - return - super().save() - - # update parents - for parent in self.transformed_ingredient_inv.iterator(): - parent.update_allergens() - - @transaction.atomic - def update_expiry_date(self): - # When expiry_date is changed, simply update the parents' expiry_date - old_expiry_date = self.expiry_date - self.expiry_date = self.creation_date + self.shelf_life - for ingredient in self.ingredient.iterator(): - self.expiry_date = min(self.expiry_date, ingredient.expiry_date) - - if old_expiry_date == self.expiry_date: - return - super().save() - - # update parents - for parent in self.transformed_ingredient_inv.iterator(): - parent.update_expiry_date() - - @transaction.atomic - def update(self): - self.update_allergens() - self.update_expiry_date() - - @transaction.atomic - def save(self, *args, **kwargs): - super().save(*args, **kwargs) - - class Meta: - verbose_name = _('Transformed food') - verbose_name_plural = _('Transformed foods') diff --git a/apps/food/tables.py b/apps/food/tables.py deleted file mode 100644 index 4ab15879..00000000 --- a/apps/food/tables.py +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -import django_tables2 as tables -from django_tables2 import A - -from .models import TransformedFood - - -class TransformedFoodTable(tables.Table): - name = tables.LinkColumn( - 'food:food_view', - args=[A('pk'), ], - ) - - class Meta: - model = TransformedFood - template_name = 'django_tables2/bootstrap4.html' - fields = ('name', "owner", "allergens", "expiry_date") diff --git a/apps/food/templates/food/add_ingredient_form.html b/apps/food/templates/food/add_ingredient_form.html deleted file mode 100644 index 395928e4..00000000 --- a/apps/food/templates/food/add_ingredient_form.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} -

-
-
- {% csrf_token %} - {{ form|crispy }} - -
-
-
-{% endblock %} diff --git a/apps/food/templates/food/basicfood_detail.html b/apps/food/templates/food/basicfood_detail.html deleted file mode 100644 index 846fadba..00000000 --- a/apps/food/templates/food/basicfood_detail.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} {{ food.name }} -

-
- - {% if can_update %} - {% trans 'Update' %} - {% endif %} - {% if can_add_ingredient %} - - {% trans 'Add to a meal' %} - - {% endif %} -
-
-{% endblock %} diff --git a/apps/food/templates/food/basicfood_form.html b/apps/food/templates/food/basicfood_form.html deleted file mode 100644 index 6fe6f06f..00000000 --- a/apps/food/templates/food/basicfood_form.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} -

-
-
- {% csrf_token %} - {{ form | crispy }} - -
-
-
-{% endblock %} diff --git a/apps/food/templates/food/create_qrcode_form.html b/apps/food/templates/food/create_qrcode_form.html deleted file mode 100644 index 456b9970..00000000 --- a/apps/food/templates/food/create_qrcode_form.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load render_table from django_tables2 %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} -

-
- - {% trans 'New basic food' %} - -
- {% csrf_token %} - {{ form|crispy }} - -
-
-

{% trans "Copy constructor" %}

- - - - - - - - - - - {% for basic in last_basic %} - - - - - - - {% endfor %} - -
- {% trans "Name" %} - - {% trans "Owner" %} - - {% trans "Arrival date" %} - - {% trans "Expiry date" %} -
{{ basic.name }}{{ basic.owner }}{{ basic.arrival_date }}{{ basic.expiry_date }}
-
-
-
-{% endblock %} diff --git a/apps/food/templates/food/qrcode_detail.html b/apps/food/templates/food/qrcode_detail.html deleted file mode 100644 index 6e3e8110..00000000 --- a/apps/food/templates/food/qrcode_detail.html +++ /dev/null @@ -1,39 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} {% trans 'number' %} {{ qrcode.qr_code_number }} -

-
- - {% if qrcode.food_container.polymorphic_ctype.model == 'basicfood' and can_update_basic %} - - {% trans 'Update' %} - - {% elif can_update_transformed %} - - {% trans 'Update' %} - - {% endif %} - {% if can_view_detail %} - - {% trans 'View details' %} - - {% endif %} - {% if can_add_ingredient %} - - {% trans 'Add to a meal' %} - - {% endif %} -
-
-{% endblock %} diff --git a/apps/food/templates/food/transformedfood_detail.html b/apps/food/templates/food/transformedfood_detail.html deleted file mode 100644 index ca32bc06..00000000 --- a/apps/food/templates/food/transformedfood_detail.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} {{ food.name }} -

-
- - {% if can_update %} - - {% trans 'Update' %} - - {% endif %} - {% if can_add_ingredient %} - - {% trans 'Add to a meal' %} - - {% endif %} -
-
-{% endblock %} diff --git a/apps/food/templates/food/transformedfood_form.html b/apps/food/templates/food/transformedfood_form.html deleted file mode 100644 index 395928e4..00000000 --- a/apps/food/templates/food/transformedfood_form.html +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n crispy_forms_tags %} - -{% block content %} -
-

- {{ title }} -

-
-
- {% csrf_token %} - {{ form|crispy }} - -
-
-
-{% endblock %} diff --git a/apps/food/templates/food/transformedfood_list.html b/apps/food/templates/food/transformedfood_list.html deleted file mode 100644 index 4416cdb7..00000000 --- a/apps/food/templates/food/transformedfood_list.html +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "base.html" %} -{% comment %} -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load render_table from django_tables2 %} -{% load i18n %} - -{% block content %} -
-

- {% trans "Meal served" %} -

- {% if can_create_meal %} -
- - {% trans 'New meal' %} - -
- {% endif %} - {% if served.data %} - {% render_table served %} - {% else %} -
-
- {% trans "There is no meal served." %} -
-
- {% endif %} -
- -
-

- {% trans "Open" %} -

- {% if open.data %} - {% render_table open %} - {% else %} -
-
- {% trans "There is no free meal." %} -
-
- {% endif %} -
- -
-

- {% trans "All meals" %} -

- {% if table.data %} - {% render_table table %} - {% else %} -
-
- {% trans "There is no meal." %} -
-
- {% endif %} -
-{% endblock %} diff --git a/apps/food/tests.py b/apps/food/tests.py deleted file mode 100644 index a79ca8be..00000000 --- a/apps/food/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -# from django.test import TestCase - -# Create your tests here. diff --git a/apps/food/urls.py b/apps/food/urls.py deleted file mode 100644 index 59063cfe..00000000 --- a/apps/food/urls.py +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from django.urls import path - -from . import views - -app_name = 'food' - -urlpatterns = [ - path('', views.TransformedListView.as_view(), name='food_list'), - path('', views.QRCodeView.as_view(), name='qrcode_view'), - path('detail/', views.FoodView.as_view(), name='food_view'), - - path('/create_qrcode', views.QRCodeCreateView.as_view(), name='qrcode_create'), - path('/create_qrcode/basic', views.QRCodeBasicFoodCreateView.as_view(), name='qrcode_basic_create'), - path('create/transformed', views.TransformedFoodCreateView.as_view(), name='transformed_create'), - path('update/basic/', views.BasicFoodUpdateView.as_view(), name='basic_update'), - path('update/transformed/', views.TransformedFoodUpdateView.as_view(), name='transformed_update'), - path('add/', views.AddIngredientView.as_view(), name='add_ingredient'), -] diff --git a/apps/food/views.py b/apps/food/views.py deleted file mode 100644 index 8c63530c..00000000 --- a/apps/food/views.py +++ /dev/null @@ -1,421 +0,0 @@ -# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -from django.db import transaction -from django.contrib.auth.mixins import LoginRequiredMixin -from django.http import HttpResponseRedirect -from django_tables2.views import MultiTableMixin -from django.urls import reverse -from django.utils.translation import gettext_lazy as _ -from django.utils import timezone -from django.views.generic import DetailView, UpdateView -from django.views.generic.list import ListView -from django.forms import HiddenInput -from permission.backends import PermissionBackend -from permission.views import ProtectQuerysetMixin, ProtectedCreateView - -from .forms import AddIngredientForms, BasicFoodForms, QRCodeForms, TransformedFoodForms -from .models import BasicFood, Food, QRCode, TransformedFood -from .tables import TransformedFoodTable - - -class AddIngredientView(ProtectQuerysetMixin, UpdateView): - """ - A view to add an ingredient - """ - model = Food - template_name = 'food/add_ingredient_form.html' - extra_context = {"title": _("Add the ingredient")} - form_class = AddIngredientForms - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context["pk"] = self.kwargs["pk"] - return context - - @transaction.atomic - def form_valid(self, form): - form.instance.creater = self.request.user - food = Food.objects.get(pk=self.kwargs['pk']) - add_ingredient_form = AddIngredientForms(data=self.request.POST) - if food.is_ready: - form.add_error(None, _("The product is already prepared")) - return self.form_invalid(form) - if not add_ingredient_form.is_valid(): - return self.form_invalid(form) - - # We flip logic ""fully used = not is_active"" - food.is_active = not food.is_active - # Save the aliment and the allergens associed - for transformed_pk in self.request.POST.getlist('ingredient'): - transformed = TransformedFood.objects.get(pk=transformed_pk) - if not transformed.is_ready: - transformed.ingredient.add(food) - transformed.update() - food.save() - - return HttpResponseRedirect(self.get_success_url()) - - def get_success_url(self, **kwargs): - return reverse('food:food_list') - - -class BasicFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): - """ - A view to update a basic food - """ - model = BasicFood - form_class = BasicFoodForms - template_name = 'food/basicfood_form.html' - extra_context = {"title": _("Update an aliment")} - - @transaction.atomic - def form_valid(self, form): - form.instance.creater = self.request.user - basic_food_form = BasicFoodForms(data=self.request.POST) - if not basic_food_form.is_valid(): - return self.form_invalid(form) - - ans = super().form_valid(form) - form.instance.update() - return ans - - def get_success_url(self, **kwargs): - self.object.refresh_from_db() - return reverse('food:food_view', kwargs={"pk": self.object.pk}) - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - return context - - -class FoodView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): - """ - A view to see a food - """ - model = Food - extra_context = {"title": _("Details of:")} - context_object_name = "food" - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - - context["can_update"] = PermissionBackend.check_perm(self.request, "food.change_food") - context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood") - return context - - -class QRCodeBasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView): - ##################################################################### - # TO DO - # - this feature is very pratical for meat or fish, nevertheless we can implement this later - # - fix picture save - # - implement solution crop and convert image (reuse or recode ImageForm from members apps) - ##################################################################### - """ - A view to add a basic food with a qrcode - """ - model = BasicFood - form_class = BasicFoodForms - template_name = 'food/basicfood_form.html' - extra_context = {"title": _("Add a new basic food with QRCode")} - - @transaction.atomic - def form_valid(self, form): - form.instance.creater = self.request.user - basic_food_form = BasicFoodForms(data=self.request.POST) - if not basic_food_form.is_valid(): - return self.form_invalid(form) - - # 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.is_ready = False - basic_food.is_active = True - basic_food.was_eaten = False - basic_food._force_save = True - basic_food.save() - basic_food.refresh_from_db() - - qrcode = QRCode() - qrcode.qr_code_number = self.kwargs['slug'] - qrcode.food_container = basic_food - qrcode.save() - - return super().form_valid(form) - - def get_success_url(self, **kwargs): - self.object.refresh_from_db() - return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']}) - - def get_sample_object(self): - - # We choose a club which may work or BDE else - owner_id = 1 - for membership in self.request.user.memberships.all(): - club_id = membership.club.id - food = BasicFood(name="", expiry_date=timezone.now(), owner_id=club_id) - if PermissionBackend.check_perm(self.request, "food.add_basicfood", food): - owner_id = club_id - - return BasicFood( - name="", - expiry_date=timezone.now(), - owner_id=owner_id, - ) - - def get_context_data(self, **kwargs): - # Some field are hidden on create - context = super().get_context_data(**kwargs) - - form = context['form'] - form.fields['is_active'].widget = HiddenInput() - form.fields['was_eaten'].widget = HiddenInput() - - copy = self.request.GET.get('copy', None) - if copy is not None: - basic = BasicFood.objects.get(pk=copy) - for field in ['date_type', 'expiry_date', 'name', 'owner']: - form.fields[field].initial = getattr(basic, field) - for field in ['allergens']: - form.fields[field].initial = getattr(basic, field).all() - - return context - - -class QRCodeCreateView(ProtectQuerysetMixin, ProtectedCreateView): - """ - A view to add a new qrcode - """ - model = QRCode - template_name = 'food/create_qrcode_form.html' - form_class = QRCodeForms - extra_context = {"title": _("Add a new QRCode")} - - def get(self, *args, **kwargs): - qrcode = kwargs["slug"] - if self.model.objects.filter(qr_code_number=qrcode).count() > 0: - return HttpResponseRedirect(reverse("food:qrcode_view", kwargs=kwargs)) - else: - return super().get(*args, **kwargs) - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context["slug"] = self.kwargs["slug"] - - context["last_basic"] = BasicFood.objects.order_by('-pk').all()[:10] - - return context - - @transaction.atomic - def form_valid(self, form): - form.instance.creater = self.request.user - qrcode_food_form = QRCodeForms(data=self.request.POST) - if not qrcode_food_form.is_valid(): - return self.form_invalid(form) - - # Save the qrcode - qrcode = form.save(commit=False) - qrcode.qr_code_number = self.kwargs["slug"] - qrcode._force_save = True - qrcode.save() - qrcode.refresh_from_db() - - qrcode.food_container.save() - - return super().form_valid(form) - - def get_success_url(self, **kwargs): - self.object.refresh_from_db() - return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']}) - - def get_sample_object(self): - return QRCode( - qr_code_number=self.kwargs["slug"], - food_container_id=1 - ) - - -class QRCodeView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): - """ - A view to see a qrcode - """ - model = QRCode - extra_context = {"title": _("QRCode")} - context_object_name = "qrcode" - slug_field = "qr_code_number" - - def get(self, *args, **kwargs): - qrcode = kwargs["slug"] - if self.model.objects.filter(qr_code_number=qrcode).count() > 0: - return super().get(*args, **kwargs) - else: - return HttpResponseRedirect(reverse("food:qrcode_create", kwargs=kwargs)) - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - - qr_code_number = self.kwargs['slug'] - qrcode = self.model.objects.get(qr_code_number=qr_code_number) - - model = qrcode.food_container.polymorphic_ctype.model - - if model == "basicfood": - context["can_update_basic"] = PermissionBackend.check_perm(self.request, "food.change_basicfood") - context["can_view_detail"] = PermissionBackend.check_perm(self.request, "food.view_basicfood") - if model == "transformedfood": - context["can_update_transformed"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood") - context["can_view_detail"] = PermissionBackend.check_perm(self.request, "food.view_transformedfood") - context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood") - return context - - -class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView): - """ - A view to add a tranformed food - """ - model = TransformedFood - template_name = 'food/transformedfood_form.html' - form_class = TransformedFoodForms - extra_context = {"title": _("Add a new meal")} - - @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) - transformed_food.expiry_date = transformed_food.creation_date - transformed_food.is_active = True - transformed_food.is_ready = False - transformed_food.was_eaten = False - transformed_food._force_save = True - transformed_food.save() - transformed_food.refresh_from_db() - ans = super().form_valid(form) - transformed_food.update() - return ans - - def get_success_url(self, **kwargs): - self.object.refresh_from_db() - return reverse('food:food_view', kwargs={"pk": self.object.pk}) - - def get_sample_object(self): - # We choose a club which may work or BDE else - owner_id = 1 - for membership in self.request.user.memberships.all(): - club_id = membership.club.id - food = TransformedFood(name="", - creation_date=timezone.now(), - expiry_date=timezone.now(), - owner_id=club_id) - if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food): - owner_id = club_id - break - - return TransformedFood( - name="", - owner_id=owner_id, - creation_date=timezone.now(), - expiry_date=timezone.now(), - ) - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - - # Some field are hidden on create - form = context['form'] - form.fields['is_active'].widget = HiddenInput() - form.fields['is_ready'].widget = HiddenInput() - form.fields['was_eaten'].widget = HiddenInput() - form.fields['shelf_life'].widget = HiddenInput() - - return context - - -class TransformedFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): - """ - A view to update transformed product - """ - model = TransformedFood - template_name = 'food/transformedfood_form.html' - form_class = TransformedFoodForms - extra_context = {'title': _('Update a meal')} - - @transaction.atomic - def form_valid(self, form): - form.instance.creater = self.request.user - transformedfood_form = TransformedFoodForms(data=self.request.POST) - if not transformedfood_form.is_valid(): - return self.form_invalid(form) - - ans = super().form_valid(form) - form.instance.update() - return ans - - def get_success_url(self, **kwargs): - self.object.refresh_from_db() - return reverse('food:food_view', kwargs={"pk": self.object.pk}) - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - return context - - -class TransformedListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView): - """ - Displays ready TransformedFood - """ - model = TransformedFood - tables = [TransformedFoodTable, TransformedFoodTable, TransformedFoodTable] - extra_context = {"title": _("Transformed food")} - - def get_queryset(self, **kwargs): - return super().get_queryset(**kwargs).distinct() - - def get_tables(self): - tables = super().get_tables() - - tables[0].prefix = "all-" - tables[1].prefix = "open-" - tables[2].prefix = "served-" - return tables - - def get_tables_data(self): - # first table = all transformed food, second table = free, third = served - return [ - self.get_queryset().order_by("-creation_date"), - TransformedFood.objects.filter(is_ready=True, is_active=True, was_eaten=False, expiry_date__lt=timezone.now()) - .filter(PermissionBackend.filter_queryset(self.request, TransformedFood, "view")) - .distinct() - .order_by("-creation_date"), - TransformedFood.objects.filter(is_ready=True, is_active=True, was_eaten=False, expiry_date__gte=timezone.now()) - .filter(PermissionBackend.filter_queryset(self.request, TransformedFood, "view")) - .distinct() - .order_by("-creation_date") - ] - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - - # We choose a club which should work - for membership in self.request.user.memberships.all(): - club_id = membership.club.id - food = TransformedFood( - name="", - owner_id=club_id, - creation_date=timezone.now(), - expiry_date=timezone.now(), - ) - if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food): - context['can_create_meal'] = True - break - - tables = context["tables"] - for name, table in zip(["table", "open", "served"], tables): - context[name] = table - return context