Upload New File

.env_example

@@ -21,6 +21,3 @@ EMAIL_PASSWORD=CHANGE_ME
 # Wiki configuration
 WIKI_USER=NoteKfet2020
 WIKI_PASSWORD=
-
-# OIDC
-OIDC_RSA_PRIVATE_KEY=CHANGE_ME

.gitlab-ci.yml

@@ -8,7 +8,7 @@ variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
 # Ubuntu 22.04
-py310-django52:
+py310-django42:
   stage: test
   image: ubuntu:22.04
   before_script:
@@ -22,10 +22,10 @@ py310-django52:
         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py310-django52
+  script: tox -e py310-django42
 
 # Debian Bookworm
-py311-django52:
+py311-django42:
   stage: test
   image: debian:bookworm
   before_script:
@@ -37,7 +37,7 @@ py311-django52:
         python3-djangorestframework python3-django-oauth-toolkit python3-psycopg2 python3-pil
         python3-babel python3-lockfile python3-pip python3-phonenumbers python3-memcache
         python3-bs4 python3-setuptools tox texlive-xetex
-  script: tox -e py311-django52
+  script: tox -e py311-django42
 
 linters:
   stage: quality-assurance

README.md

@@ -61,8 +61,8 @@ Bien que cela permette de créer une instance sur toutes les distributions,
 6. (Optionnel) **Création d'une clé privée OpenID Connect**
 
 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et copier la clé dans .env dans le champ
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
-`OIDC_RSA_PRIVATE_KEY`.
+emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
 
 7.  Enjoy :
 
@@ -237,8 +237,8 @@ Sinon vous pouvez suivre les étapes décrites ci-dessous.
 7. **Création d'une clé privée OpenID Connect**
 
 Pour activer le support d'OpenID Connect, il faut générer une clé privée, par
-exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner le champ
+exemple avec openssl (`openssl genrsa -out oidc.key 4096`), et renseigner son
-`OIDC_RSA_PRIVATE_KEY` dans le .env (par défaut `/var/secrets/oidc.key`).
+emplacement dans `OIDC_RSA_PRIVATE_KEY` (par défaut `/var/secrets/oidc.key`).
 
 8.  *Enjoy \o/*
 

apps/activity/migrations/0007_alter_guest_activity.py

@@ -1,19 +0,0 @@
-# Generated by Django 4.2.20 on 2025-05-08 19:07
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('activity', '0006_guest_school'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='guest',
-            name='activity',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='activity.activity'),
-        ),
-    ]

apps/activity/models.py

@@ -201,8 +201,7 @@ class Entry(models.Model):
     def save(self, *args, **kwargs):
         qs = Entry.objects.filter(~Q(pk=self.pk), activity=self.activity, note=self.note, guest=self.guest)
         if qs.exists():
-            raise ValidationError(_("Already entered on ")
+            raise ValidationError(_("Already entered on ") + _("{:%Y-%m-%d %H:%M:%S}").format(qs.get().time, ))
-                                  + _("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(qs.get().time), ))
 
         if self.guest:
             self.note = self.guest.inviter
@@ -234,7 +233,7 @@ class Guest(models.Model):
     """
     activity = models.ForeignKey(
         Activity,
-        on_delete=models.CASCADE,
+        on_delete=models.PROTECT,
         related_name='+',
     )
 

apps/activity/tables.py

@@ -55,7 +55,7 @@ class GuestTable(tables.Table):
 
     def render_entry(self, record):
         if record.has_entry:
-            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(timezone.localtime(record.entry.time))))
+            return str(_("Entered on ") + str(_("{:%Y-%m-%d %H:%M:%S}").format(record.entry.time, )))
         return mark_safe('<button id="{id}" class="btn btn-danger btn-sm" onclick="remove_guest(this.id)"> '
                          '{delete_trans}</button>'.format(id=record.id, delete_trans=_("remove").capitalize()))
 

apps/activity/templates/activity/activity_detail.html

@@ -95,23 +95,5 @@ SPDX-License-Identifier: GPL-3.0-or-later
             errMsg(xhr.responseJSON);
         });
     });
-    $("#delete_activity").click(function () {
-        if (!confirm("{% trans 'Are you sure you want to delete this activity?' %}")) {
-            return;
-        }
-
-        $.ajax({
-            url: "/api/activity/activity/{{ activity.pk }}/",
-            type: "DELETE",
-            headers: {
-                "X-CSRFTOKEN": CSRF_TOKEN
-            }
-        }).done(function () {
-            addMsg("{% trans 'Activity deleted' %}", "success");
-            window.location.href = "/activity/";  // Redirige vers la liste des activités
-        }).fail(function (xhr) {
-            errMsg(xhr.responseJSON);
-        });
-    });
 </script>
 {% endblock %}

apps/activity/templates/activity/includes/activity_info.html

@@ -70,10 +70,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
             {% if ".change_"|has_perm:activity %}
                 <a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_update' pk=activity.pk %}" data-turbolinks="false"> {% trans "edit"|capfirst %}</a>
             {% endif %}
-            {% if not activity.valid and ".delete_"|has_perm:activity %}
+            {% if activity.activity_type.can_invite and not activity_started %}
-                <a class="btn btn-danger btn-sm my-1" id="delete_activity"> {% trans "delete"|capfirst %} </a>
-            {% endif %}
-            {% if activity.activity_type.can_invite and not activity_started and activity.valid %}
                 <a class="btn btn-primary btn-sm my-1" href="{% url 'activity:activity_invite' pk=activity.pk %}" data-turbolinks="false"> {% trans "Invite" %}</a>
             {% endif %}
         {% endif %}

apps/activity/urls.py

@@ -15,5 +15,4 @@ urlpatterns = [
     path('<int:pk>/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
     path('new/', views.ActivityCreateView.as_view(), name='activity_create'),
     path('calendar.ics', views.CalendarView.as_view(), name='calendar_ics'),
-    path('<int:pk>/delete', views.ActivityDeleteView.as_view(), name='delete_activity'),
 ]

apps/activity/views.py

@@ -9,7 +9,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
 from django.db.models import F, Q
-from django.http import HttpResponse, JsonResponse
+from django.http import HttpResponse
 from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.decorators import method_decorator
@@ -153,34 +153,6 @@ class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
 
 
-class ActivityDeleteView(View):
-    """
-    Deletes an Activity
-    """
-    def delete(self, request, pk):
-        try:
-            activity = Activity.objects.get(pk=pk)
-            activity.delete()
-            return JsonResponse({"message": "Activity deleted"})
-        except Activity.DoesNotExist:
-            return JsonResponse({"error": "Activity not found"}, status=404)
-
-    def dispatch(self, *args, **kwargs):
-        """
-        Don't display the delete button if the user has no right to delete.
-        """
-        if not self.request.user.is_authenticated:
-            return self.handle_no_permission()
-
-        activity = Activity.objects.get(pk=self.kwargs["pk"])
-        if not PermissionBackend.check_perm(self.request, "activity.delete_activity", activity):
-            raise PermissionDenied(_("You are not allowed to delete this activity."))
-
-        if activity.valid:
-            raise PermissionDenied(_("This activity is valid."))
-        return super().dispatch(*args, **kwargs)
-
-
 class ActivityInviteView(ProtectQuerysetMixin, ProtectedCreateView):
     """
     Invite a Guest, The rules to invites someone are defined in `forms:activity.GuestForm`

apps/food/admin.py

@@ -2,58 +2,36 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.contrib import admin
-from polymorphic.admin import PolymorphicChildModelAdmin, PolymorphicParentModelAdmin
+from django.db import transaction
 from note_kfet.admin import admin_site
 
-from .models import Allergen, Food, BasicFood, TransformedFood, QRCode
+from .models import Allergen, BasicFood, QRCode, TransformedFood
-
-
-@admin.register(Allergen, site=admin_site)
-class AllergenAdmin(admin.ModelAdmin):
-    """
-    Admin customisation for Allergen
-    """
-    ordering = ['name']
-
-
-@admin.register(Food, site=admin_site)
-class FoodAdmin(PolymorphicParentModelAdmin):
-    """
-    Admin customisation for Food
-    """
-    child_models = (Food, BasicFood, TransformedFood)
-    list_display = ('name', 'expiry_date', 'owner', 'is_ready')
-    list_filter = ('is_ready', 'end_of_life')
-    search_fields = ['name']
-    ordering = ['expiry_date', 'name']
-
-
-@admin.register(BasicFood, site=admin_site)
-class BasicFood(PolymorphicChildModelAdmin):
-    """
-    Admin customisation for BasicFood
-    """
-    list_display = ('name', 'expiry_date', 'date_type', 'owner', 'is_ready')
-    list_filter = ('is_ready', 'date_type', 'end_of_life')
-    search_fields = ['name']
-    ordering = ['expiry_date', 'name']
-
-
-@admin.register(TransformedFood, site=admin_site)
-class TransformedFood(PolymorphicChildModelAdmin):
-    """
-    Admin customisation for TransformedFood
-    """
-    list_display = ('name', 'expiry_date', 'shelf_life', 'owner', 'is_ready')
-    list_filter = ('is_ready', 'end_of_life', 'shelf_life')
-    search_fields = ['name']
-    ordering = ['expiry_date', 'name']
 
 
 @admin.register(QRCode, site=admin_site)
 class QRCodeAdmin(admin.ModelAdmin):
-    """
+    pass
-    Admin customisation for QRCode
+
-    """
+
-    list_diplay = ('qr_code_number', 'food_container')
+@admin.register(BasicFood, site=admin_site)
-    search_fields = ['food_container__name']
+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

apps/food/api/serializers.py

@@ -3,7 +3,7 @@
 
 from rest_framework import serializers
 
-from ..models import Allergen, Food, BasicFood, TransformedFood, QRCode
+from ..models import Allergen, BasicFood, QRCode, TransformedFood
 
 
 class AllergenSerializer(serializers.ModelSerializer):
@@ -11,46 +11,40 @@ 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 FoodSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Food.
-    The djangorestframework plugin will analyse the model `Food` and parse all fields in the API.
-    """
-    class Meta:
-        model = Food
-        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 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__'
-
-
 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__'

apps/food/api/urls.py

@@ -1,7 +1,7 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .views import AllergenViewSet, FoodViewSet, BasicFoodViewSet, TransformedFoodViewSet, QRCodeViewSet
+from .views import AllergenViewSet, BasicFoodViewSet, QRCodeViewSet, TransformedFoodViewSet
 
 
 def register_food_urls(router, path):
@@ -9,7 +9,6 @@ def register_food_urls(router, path):
     Configure router for Food REST API.
     """
     router.register(path + '/allergen', AllergenViewSet)
-    router.register(path + '/food', FoodViewSet)
+    router.register(path + '/basic_food', BasicFoodViewSet)
-    router.register(path + '/basicfood', BasicFoodViewSet)
-    router.register(path + '/transformedfood', TransformedFoodViewSet)
     router.register(path + '/qrcode', QRCodeViewSet)
+    router.register(path + '/transformed_food', TransformedFoodViewSet)

apps/food/api/views.py

@@ -5,8 +5,8 @@ from api.viewsets import ReadProtectedModelViewSet
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.filters import SearchFilter
 
-from .serializers import AllergenSerializer, FoodSerializer, BasicFoodSerializer, TransformedFoodSerializer, QRCodeSerializer
+from .serializers import AllergenSerializer, BasicFoodSerializer, QRCodeSerializer, TransformedFoodSerializer
-from ..models import Allergen, Food, BasicFood, TransformedFood, QRCode
+from ..models import Allergen, BasicFood, QRCode, TransformedFood
 
 
 class AllergenViewSet(ReadProtectedModelViewSet):
@@ -22,24 +22,11 @@ class AllergenViewSet(ReadProtectedModelViewSet):
     search_fields = ['$name', ]
 
 
-class FoodViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `Food` objects, serialize it to JSON with the given serializer,
-    then render it on /api/food/food/
-    """
-    queryset = Food.objects.order_by('id')
-    serializer_class = FoodSerializer
-    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/basicfood/
+    then render it on /api/food/basic_food/
     """
     queryset = BasicFood.objects.order_by('id')
     serializer_class = BasicFoodSerializer
@@ -48,19 +35,6 @@ class BasicFoodViewSet(ReadProtectedModelViewSet):
     search_fields = ['$name', ]
 
 
-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/transformedfood/
-    """
-    queryset = TransformedFood.objects.order_by('id')
-    serializer_class = TransformedFoodSerializer
-    filter_backends = [DjangoFilterBackend, SearchFilter]
-    filterset_fields = ['name', ]
-    search_fields = ['$name', ]
-
-
 class QRCodeViewSet(ReadProtectedModelViewSet):
     """
     REST API View set.
@@ -72,3 +46,16 @@ class QRCodeViewSet(ReadProtectedModelViewSet):
     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', ]

apps/food/fixtures/initial.json

@@ -1,100 +0,0 @@
-[
-    {
-	"model": "food.allergen",
-	"pk": 1,
-	"fields": {
-	    "name": "Lait"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 2,
-	"fields": {
-	    "name": "Oeufs"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 3,
-	"fields": {
-	    "name": "Gluten"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 4,
-	"fields": {
-	    "name": "Fruits à coques"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 5,
-	"fields": {
-	    "name": "Arachides"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 6,
-	"fields": {
-	    "name": "Sésame"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 7,
-	"fields": {
-	    "name": "Soja"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 8,
-	"fields": {
-	    "name": "Céleri"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 9,
-	"fields": {
-	    "name": "Lupin"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 10,
-	"fields": {
-	    "name": "Moutarde"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 11,
-	"fields": {
-	    "name": "Sulfites"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 12,
-	"fields": {
-	    "name": "Crustacés"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 13,
-	"fields": {
-	    "name": "Mollusques"
-	}
-    },
-    {
-	"model": "food.allergen",
-	"pk": 14,
-	"fields": {
-	    "name": "Poissons"
-	}
-    }
-]

apps/food/forms.py

@@ -3,41 +3,42 @@
 
 from random import shuffle
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
-from django.forms.widgets import NumberInput
 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 Food, BasicFood, TransformedFood, QRCode
+from .models import BasicFood, QRCode, TransformedFood
 
 
-class QRCodeForms(forms.ModelForm):
+class AddIngredientForms(forms.ModelForm):
     """
-    Form for create QRCode for container
+    Form for add an ingredient
     """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.fields['food_container'].queryset = self.fields['food_container'].queryset.filter(
+        self.fields['ingredient'].queryset = self.fields['ingredient'].queryset.filter(
-            end_of_life__isnull=True,
             polymorphic_ctype__model='transformedfood',
-        ).filter(PermissionBackend.filter_queryset(
+            is_ready=False,
-            get_current_request(),
+            is_active=True,
-            TransformedFood,
+            was_eaten=False,
-            "view",
+        )
-        ))
+        # 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 = QRCode
+        model = TransformedFood
-        fields = ('food_container',)
+        fields = ('ingredient', 'is_active')
 
 
 class BasicFoodForms(forms.ModelForm):
     """
-    Form for add basicfood
+    Form for add non-transformed food
     """
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -50,138 +51,64 @@ class BasicFoodForms(forms.ModelForm):
         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]) + ", ..."
-        self.fields['order'].widget.attrs["placeholder"] = _("Specific order given to GCKs")
 
     class Meta:
         model = BasicFood
-        fields = ('name', 'owner', 'date_type', 'expiry_date', 'allergens', 'order',)
+        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(),
+            '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 transformedfood
+    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]) + ", ..."
-        self.fields['order'].widget.attrs["placeholder"] = _("Specific order given to GCKs")
 
     class Meta:
         model = TransformedFood
-        fields = ('name', 'owner', 'order',)
+        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(),
         }
-
-
-class BasicFoodUpdateForms(forms.ModelForm):
-    """
-    Form for update basicfood object
-    """
-    class Meta:
-        model = BasicFood
-        fields = ('name', 'owner', 'date_type', 'expiry_date', 'end_of_life', 'is_ready', 'order', 'allergens')
-        widgets = {
-            "owner": Autocomplete(
-                model=Club,
-                attrs={"api_url": "/api/members/club/"},
-            ),
-            "expiry_date": DateTimePickerInput(),
-        }
-
-
-class TransformedFoodUpdateForms(forms.ModelForm):
-    """
-    Form for update transformedfood object
-    """
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.fields['shelf_life'].label = _('Shelf life (in hours)')
-
-    class Meta:
-        model = TransformedFood
-        fields = ('name', 'owner', 'end_of_life', 'is_ready', 'order', 'shelf_life')
-        widgets = {
-            "owner": Autocomplete(
-                model=Club,
-                attrs={"api_url": "/api/members/club/"},
-            ),
-            "expiry_date": DateTimePickerInput(),
-            "shelf_life": NumberInput(),
-        }
-
-
-class AddIngredientForms(forms.ModelForm):
-    """
-    Form for add an ingredient
-    """
-    fully_used = forms.BooleanField()
-    fully_used.initial = True
-    fully_used.required = False
-    fully_used.label = _("Fully used")
-
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        # TODO find a better way to get pk (be not url scheme dependant)
-        pk = get_current_request().path.split('/')[-1]
-        self.fields['ingredients'].queryset = self.fields['ingredients'].queryset.filter(
-            polymorphic_ctype__model="transformedfood",
-            is_ready=False,
-            end_of_life='',
-        ).filter(PermissionBackend.filter_queryset(get_current_request(), Food, "change")).exclude(pk=pk)
-
-    class Meta:
-        model = TransformedFood
-        fields = ('ingredients',)
-
-
-class ManageIngredientsForm(forms.Form):
-    """
-    Form to manage ingredient
-    """
-    fully_used = forms.BooleanField()
-    fully_used.initial = True
-    fully_used.required = True
-    fully_used.label = _('Fully used')
-
-    name = forms.CharField()
-    name.widget = Autocomplete(
-        model=Food,
-        resetable=True,
-        attrs={"api_url": "/api/food/food",
-               "class": "autocomplete"},
-    )
-    name.label = _('Name')
-
-    qrcode = forms.IntegerField()
-    qrcode.widget = Autocomplete(
-        model=QRCode,
-        resetable=True,
-        attrs={"api_url": "/api/food/qrcode/",
-               "name_field": "qr_code_number",
-               "class": "autocomplete"},
-    )
-    qrcode.label = _('QR code number')
-
-
-ManageIngredientsFormSet = forms.formset_factory(
-    ManageIngredientsForm,
-    extra=1,
-)

apps/food/migrations/0001_initial.py

@@ -1,199 +1,84 @@
-# Generated by Django 4.2.20 on 2025-04-17 21:43
+# Generated by Django 2.2.28 on 2024-07-05 08:57
 
-import datetime
 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"),
+        ('contenttypes', '0002_remove_content_type_name'),
-        ("member", "0013_auto_20240801_1436"),
+        ('member', '0011_profile_vss_charter_read'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name="Allergen",
+            name='Allergen',
             fields=[
-                (
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                    "id",
+                ('name', models.CharField(max_length=255, verbose_name='name')),
-                    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': 'Allergen',
-                "verbose_name_plural": "Allergens",
+                'verbose_name_plural': 'Allergens',
             },
         ),
         migrations.CreateModel(
-            name="Food",
+            name='Food',
             fields=[
-                (
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                    "id",
+                ('name', models.CharField(max_length=255, verbose_name='name')),
-                    models.AutoField(
+                ('expiry_date', models.DateTimeField(verbose_name='expiry date')),
-                        auto_created=True,
+                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
-                        primary_key=True,
+                ('is_ready', models.BooleanField(default=False, verbose_name='is ready')),
-                        serialize=False,
+                ('allergens', models.ManyToManyField(blank=True, to='food.Allergen', verbose_name='allergen')),
-                        verbose_name="ID",
+                ('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')),
-                ),
-                ("name", models.CharField(max_length=255, verbose_name="name")),
-                ("expiry_date", models.DateTimeField(verbose_name="expiry date")),
-                (
-                    "end_of_life",
-                    models.CharField(max_length=255, verbose_name="end of life"),
-                ),
-                (
-                    "is_ready",
-                    models.BooleanField(max_length=255, verbose_name="is ready"),
-                ),
-                ("order", models.CharField(max_length=255, verbose_name="order")),
-                (
-                    "allergens",
-                    models.ManyToManyField(
-                        blank=True, to="food.allergen", verbose_name="allergens"
-                    ),
-                ),
-                (
-                    "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_%(app_label)s.%(class)s_set+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "Food",
+                'verbose_name': 'foods',
-                "verbose_name_plural": "Foods",
             },
         ),
         migrations.CreateModel(
-            name="BasicFood",
+            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')),
-                    "food_ptr",
+                ('date_type', models.CharField(choices=[('DLC', 'DLC'), ('DDM', 'DDM')], max_length=255)),
-                    models.OneToOneField(
+                ('arrival_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='arrival date')),
-                        auto_created=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="food.food",
-                    ),
-                ),
-                (
-                    "arrival_date",
-                    models.DateTimeField(
-                        default=django.utils.timezone.now, verbose_name="arrival date"
-                    ),
-                ),
-                (
-                    "date_type",
-                    models.CharField(
-                        choices=[("DLC", "DLC"), ("DDM", "DDM")], max_length=255
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "Basic food",
+                'verbose_name': 'Basic food',
-                "verbose_name_plural": "Basic foods",
+                'verbose_name_plural': 'Basic foods',
             },
-            bases=("food.food",),
+            bases=('food.food',),
         ),
         migrations.CreateModel(
-            name="QRCode",
+            name='QRCode',
             fields=[
-                (
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                    "id",
+                ('qr_code_number', models.PositiveIntegerField(unique=True, verbose_name='QR-code number')),
-                    models.AutoField(
+                ('food_container', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.Food', verbose_name='food container')),
-                        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.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="QR_code",
-                        to="food.food",
-                        verbose_name="food container",
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "QR-code",
+                'verbose_name': 'QR-code',
-                "verbose_name_plural": "QR-codes",
+                'verbose_name_plural': 'QR-codes',
             },
         ),
         migrations.CreateModel(
-            name="TransformedFood",
+            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')),
-                    "food_ptr",
+                ('creation_date', models.DateTimeField(verbose_name='creation date')),
-                    models.OneToOneField(
+                ('is_active', models.BooleanField(default=True, verbose_name='is active')),
-                        auto_created=True,
+                ('ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.Food', verbose_name='transformed ingredient')),
-                        on_delete=django.db.models.deletion.CASCADE,
-                        parent_link=True,
-                        primary_key=True,
-                        serialize=False,
-                        to="food.food",
-                    ),
-                ),
-                (
-                    "creation_date",
-                    models.DateTimeField(
-                        default=django.utils.timezone.now, verbose_name="creation date"
-                    ),
-                ),
-                (
-                    "shelf_life",
-                    models.DurationField(
-                        default=datetime.timedelta(days=3), verbose_name="shelf life"
-                    ),
-                ),
-                (
-                    "ingredients",
-                    models.ManyToManyField(
-                        blank=True,
-                        related_name="transformed_ingredient_inv",
-                        to="food.food",
-                        verbose_name="transformed ingredient",
-                    ),
-                ),
             ],
             options={
-                "verbose_name": "Transformed food",
+                'verbose_name': 'Transformed food',
-                "verbose_name_plural": "Transformed foods",
+                'verbose_name_plural': 'Transformed foods',
             },
-            bases=("food.food",),
+            bases=('food.food',),
         ),
     ]

apps/food/migrations/0002_transformedfood_shelf_life.py

@@ -0,0 +1,19 @@
+# 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'),
+        ),
+    ]

apps/food/migrations/0003_create_14_allergens_mandatory.py

@@ -0,0 +1,62 @@
+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),
+    ]
+    
+    

apps/food/migrations/0004_auto_20240813_2358.py

@@ -0,0 +1,28 @@
+# 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'),
+        ),
+    ]

apps/food/migrations/0005_alter_food_polymorphic_ctype.py

@@ -0,0 +1,20 @@
+# 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'),
+        ),
+    ]

apps/food/models.py

@@ -6,13 +6,37 @@ from datetime import timedelta
 from django.db import models, transaction
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from polymorphic.models import PolymorphicModel
 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):
     """
-    Allergen and alimentary restrictions
+    A list of allergen and alimentary restrictions
     """
     name = models.CharField(
         verbose_name=_('name'),
@@ -20,19 +44,16 @@ class Allergen(models.Model):
     )
 
     class Meta:
-        verbose_name = _("Allergen")
+        verbose_name = _('Allergen')
-        verbose_name_plural = _("Allergens")
+        verbose_name_plural = _('Allergens')
 
     def __str__(self):
         return self.name
 
 
 class Food(PolymorphicModel):
-    """
-    Describe any type of food
-    """
     name = models.CharField(
-        verbose_name=_("name"),
+        verbose_name=_('name'),
         max_length=255,
     )
 
@@ -46,7 +67,7 @@ class Food(PolymorphicModel):
     allergens = models.ManyToManyField(
         Allergen,
         blank=True,
-        verbose_name=_('allergens'),
+        verbose_name=_('allergen'),
     )
 
     expiry_date = models.DateTimeField(
@@ -54,69 +75,41 @@ class Food(PolymorphicModel):
         null=False,
     )
 
-    end_of_life = models.CharField(
+    was_eaten = models.BooleanField(
-        blank=True,
+        default=False,
-        verbose_name=_('end of life'),
+        verbose_name=_('was eaten'),
-        max_length=255,
     )
 
+    # 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'),
-        max_length=255,
     )
 
-    order = models.CharField(
+    is_active = models.BooleanField(
-        blank=True,
+        default=True,
-        verbose_name=_('order'),
+        verbose_name=_('is active'),
-        max_length=255,
     )
 
     def __str__(self):
         return self.name
 
     @transaction.atomic
-    def update_allergens(self):
+    def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
-        # update parents
+        return super().save(force_insert, force_update, using, update_fields)
-        for parent in self.transformed_ingredient_inv.iterator():
-            old_allergens = list(parent.allergens.all()).copy()
-            parent.allergens.clear()
-            for child in parent.ingredients.iterator():
-                if child.pk != self.pk:
-                    parent.allergens.set(parent.allergens.union(child.allergens.all()))
-            parent.allergens.set(parent.allergens.union(self.allergens.all()))
-            if old_allergens != list(parent.allergens.all()):
-                parent.save(old_allergens=old_allergens)
-
-    def update_expiry_date(self):
-        # update parents
-        for parent in self.transformed_ingredient_inv.iterator():
-            old_expiry_date = parent.expiry_date
-            parent.expiry_date = parent.shelf_life + parent.creation_date
-            for child in parent.ingredients.iterator():
-                if (child.pk != self.pk
-                    and not (child.polymorphic_ctype.model == 'basicfood'
-                             and child.date_type == 'DDM')):
-                    parent.expiry_date = min(parent.expiry_date, child.expiry_date)
-
-            if self.polymorphic_ctype.model == 'basicfood' and self.date_type == 'DLC':
-                parent.expiry_date = min(parent.expiry_date, self.expiry_date)
-            if old_expiry_date != parent.expiry_date:
-                parent.save()
 
     class Meta:
-        verbose_name = _('Food')
+        verbose_name = _('food')
-        verbose_name_plural = _('Foods')
+        verbose_name = _('foods')
 
 
 class BasicFood(Food):
     """
-    A basic food is a food directly buy and stored
+    Food which has been directly buy on supermarket
     """
-    arrival_date = models.DateTimeField(
-        default=timezone.now,
-        verbose_name=_('arrival date'),
-    )
-
     date_type = models.CharField(
         max_length=255,
         choices=(
@@ -125,70 +118,50 @@ class BasicFood(Food):
         )
     )
 
+    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 save(self, force_insert=False, force_update=False, using=None, update_fields=None, **kwargs):
+    def update_allergens(self):
-        created = self.pk is None
+        # update parents
-        if not created:
+        for parent in self.transformed_ingredient_inv.iterator():
-            # Check if important fields are updated
+            parent.update_allergens()
-            old_food = Food.objects.select_for_update().get(pk=self.pk)
-            if not hasattr(self, "_force_save"):
-                # Allergens
 
-                if ('old_allergens' in kwargs
+    @transaction.atomic
-                        and list(self.allergens.all()) != kwargs['old_allergens']):
+    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()
-
-                # Expiry date
-                if ((self.expiry_date != old_food.expiry_date
-                        and self.date_type == 'DLC')
-                        or old_food.date_type != self.date_type):
         self.update_expiry_date()
 
-        return super().save(force_insert, force_update, using, update_fields)
-
-    @staticmethod
-    def get_lastests_objects(number, distinct_field, order_by_field):
-        """
-        Get the last object with distinct field and ranked with order_by
-        This methods exist because we can't distinct with one field and
-        order with another
-        """
-        foods = BasicFood.objects.order_by(order_by_field).all()
-        field = []
-        for food in foods:
-            if getattr(food, distinct_field) in field:
-                continue
-            else:
-                field.append(getattr(food, distinct_field))
-                number -= 1
-                yield food
-            if not number:
-                return
-
     class Meta:
         verbose_name = _('Basic food')
         verbose_name_plural = _('Basic foods')
 
-    def __str__(self):
-        return self.name
-
 
 class TransformedFood(Food):
     """
-    A transformed food is a food with ingredients
+    Transformed food  are a mix between basic food and meal
     """
     creation_date = models.DateTimeField(
-        default=timezone.now,
         verbose_name=_('creation date'),
     )
 
-    # Without microbiological analyzes, the storage time is 3 days
+    ingredient = models.ManyToManyField(
-    shelf_life = models.DurationField(
-        default=timedelta(days=3),
-        verbose_name=_('shelf life'),
-    )
-
-    ingredients = models.ManyToManyField(
         Food,
         blank=True,
         symmetrical=False,
@@ -196,91 +169,58 @@ class TransformedFood(Food):
         verbose_name=_('transformed ingredient'),
     )
 
-    def check_cycle(self, ingredients, origin, checked):
+    # Without microbiological analyzes, the storage time is 3 days
-        for ingredient in ingredients:
+    shelf_life = models.DurationField(
-            if ingredient == origin:
+        verbose_name=_("shelf life"),
-                # We break the cycle
+        default=timedelta(days=3),
-                self.ingredients.remove(ingredient)
+    )
-            if ingredient.polymorphic_ctype.model == 'transformedfood' and ingredient not in checked:
-                ingredient.check_cycle(ingredient.ingredients.all(), origin, checked)
-                checked.append(ingredient)
 
     @transaction.atomic
-    def save(self, force_insert=False, force_update=False, using=None, update_fields=None, **kwargs):
+    def archive(self):
-        created = self.pk is None
+        # When a meal are archived, if it was eaten, update ingredient fully used for this meal
-        if not created:
+        raise NotImplementedError
-            # Check if important fields are updated
-            update = {'allergens': False, 'expiry_date': False}
-            old_food = Food.objects.select_for_update().get(pk=self.pk)
-            if not hasattr(self, "_force_save"):
-                # Allergens
-                # Unfortunately with the many-to-many relation we can't access
-                # to old allergens
-                if ('old_allergens' in kwargs
-                        and list(self.allergens.all()) != kwargs['old_allergens']):
-                    update['allergens'] = True
 
-                # Expiry date
+    @transaction.atomic
-                update['expiry_date'] = (self.shelf_life != old_food.shelf_life
+    def update_allergens(self):
-                                         or self.creation_date != old_food.creation_date)
+        # When allergens are changed, simply update the parents' allergens
-                if update['expiry_date']:
+        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
-                # Unfortunately with the set method ingredients are already save,
+        for ingredient in self.ingredient.iterator():
-                # we check cycle after if possible
+            self.expiry_date = min(self.expiry_date, ingredient.expiry_date)
-                if ('old_ingredients' in kwargs
-                        and list(self.ingredients.all()) != list(kwargs['old_ingredients'])):
-                    update['allergens'] = True
-                    update['expiry_date'] = True
 
-                    # it's preferable to keep a queryset but we allow list too
+        if old_expiry_date == self.expiry_date:
-                    if type(kwargs['old_ingredients']) is list:
+            return
-                        kwargs['old_ingredients'] = Food.objects.filter(
+        super().save()
-                            pk__in=[food.pk for food in kwargs['old_ingredients']])
+
-                    self.check_cycle(self.ingredients.all().difference(kwargs['old_ingredients']), self, [])
+        # update parents
-                if update['allergens']:
+        for parent in self.transformed_ingredient_inv.iterator():
+            parent.update_expiry_date()
+
+    @transaction.atomic
+    def update(self):
         self.update_allergens()
-                if update['expiry_date']:
         self.update_expiry_date()
 
-        if created:
+    @transaction.atomic
-            self.expiry_date = self.shelf_life + self.creation_date
+    def save(self, *args, **kwargs):
-
+        super().save(*args, **kwargs)
-            # We save here because we need pk for many-to-many relation
-            super().save(force_insert, force_update, using, update_fields)
-
-            for child in self.ingredients.iterator():
-                self.allergens.set(self.allergens.union(child.allergens.all()))
-                if not (child.polymorphic_ctype.model == 'basicfood' and child.date_type == 'DDM'):
-                    self.expiry_date = min(self.expiry_date, child.expiry_date)
-        return super().save(force_insert, force_update, using, update_fields)
 
     class Meta:
         verbose_name = _('Transformed food')
         verbose_name_plural = _('Transformed foods')
-
-    def __str__(self):
-        return self.name
-
-
-class QRCode(models.Model):
-    """
-    QR-code for register food
-    """
-    qr_code_number = models.PositiveIntegerField(
-        unique=True,
-        verbose_name=_('qr code number'),
-    )
-
-    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') + ' ' + str(self.qr_code_number)

apps/food/tables.py

@@ -2,20 +2,18 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 import django_tables2 as tables
+from django_tables2 import A
 
-from .models import Food
+from .models import TransformedFood
 
 
-class FoodTable(tables.Table):
+class TransformedFoodTable(tables.Table):
-    """
+    name = tables.LinkColumn(
-    List all foods.
+        'food:food_view',
-    """
+        args=[A('pk'), ],
+    )
+
     class Meta:
-        model = Food
+        model = TransformedFood
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ('name', 'owner', 'allergens', 'expiry_date')
+        fields = ('name', "owner", "allergens", "expiry_date")
-        row_attrs = {
-            'class': 'table-row',
-            'data-href': lambda record: 'detail/' + str(record.pk),
-            'style': 'cursor:pointer',
-        }

apps/food/templates/food/add_ingredient_form.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <form method="post">
+      {%  csrf_token %}
+      {{ form|crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/basicfood_detail.html

@@ -0,0 +1,37 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }} {{ food.name }}
+  </h3>
+  <div class="card-body">
+    <ul>
+      <li><p>{% trans 'Owner' %} : {{ food.owner }}</p></li>
+      <li><p>{% trans 'Arrival date' %} : {{ food.arrival_date }}</p></li>
+      <li><p>{% trans 'Expiry date' %} : {{ food.expiry_date }} ({{ food.date_type }})</p></li>
+      <li>{% trans 'Allergens' %} :</li>
+      <ul>
+      {% for allergen in food.allergens.iterator %}
+        <li>{{ allergen.name }}</li>
+      {% endfor %}
+      </ul>
+	<p>
+	<li><p>{% trans 'Active' %} : {{ food.is_active }}<p></li>
+	<li><p>{% trans 'Eaten' %} : {{ food.was_eaten }}<p></li>
+    </ul>
+    {% if can_update %}
+	<a class="btn btn-sm btn-warning" href="{% url "food:basic_update" pk=food.pk %}">{% trans 'Update' %}</a>
+    {% endif %}
+    {% if can_add_ingredient %}
+    	<a class="btn btn-sm btn-success" href="{% url "food:add_ingredient" pk=food.pk %}">
+		{% trans 'Add to a meal' %}
+	</a>
+    {% endif %}
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/basicfood_form.html

@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
 SPDX-License-Identifier: GPL-3.0-or-later
 {% endcomment %}
 {% load i18n crispy_forms_tags %}

apps/food/templates/food/create_qrcode_form.html

@@ -0,0 +1,55 @@
+{% 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 %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <a class="btn btn-sm btn-success" href="{% url "food:qrcode_basic_create" slug=slug %}">
+      {% trans 'New basic food' %}
+    </a>
+    <form method="post">
+      {%  csrf_token %}
+      {{ form|crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
+    </form>
+    <div class="card-body" id="profile_infos">
+      <h4>{% trans "Copy constructor" %}</h4>
+      <table class="table">
+        <thead>
+          <tr>
+            <th class="orderable">
+              {% trans "Name" %}
+            </th>
+            <th class="orderable">
+              {% trans "Owner" %}
+            </th>
+            <th class="orderable">
+              {% trans "Arrival date" %}
+            </th>
+            <th class="orderable">
+              {% trans "Expiry date" %}
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          {% for basic in last_basic %}
+            <tr>
+              <td><a href="{% url "food:qrcode_basic_create" slug=slug %}?copy={{ basic.pk }}">{{ basic.name }}</a></td>
+              <td>{{ basic.owner }}</td>
+              <td>{{ basic.arrival_date }}</td>
+              <td>{{ basic.expiry_date }}</td>
+            </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/food_detail.html

@@ -1,56 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }} {{ food.name }}
-  </h3>
-  <div class="card-body">
-    <ul>
-      {% if QR_code %}
-      <li> {{QR_code}} </li>
-      {% endif %}
-      {% for field, value in fields %}
-      <li> {{ field }} : {{ value }}</li>
-      {% endfor %}
-      {% if meals %}
-      <li> {% trans "Contained in" %} :
-      {% for meal in meals %}
-      <a href="{% url "food:transformedfood_view" pk=meal.pk %}">{{ meal.name }}</a>{% if not forloop.last %},{% endif %}
-      {% endfor %}
-      </li>
-      {% endif %}
-      {% if foods %}
-      <li> {% trans "Contain" %} :
-      {% for food in foods %}
-        <a href="{% url "food:food_view" pk=food.pk %}">{{ food.name }}</a>{% if not forloop.last %},{% endif %}
-      {% endfor %}
-      </li>
-      {% endif %}
-    </ul>
-      {% if update %}
-        <a class="btn btn-sm btn-secondary" href="{% url "food:food_update" pk=food.pk %}">
-          {% trans "Update" %}
-        </a>
-      {% endif %}
-      {% if add_ingredient %}
-        <a class="btn btn-sm btn-primary" href="{% url "food:add_ingredient" pk=food.pk %}">
-          {% trans "Add to a meal" %}
-        </a>
-      {% endif %}
-      {% if manage_ingredients %}
-        <a class="btn btn-sm btn-secondary" href="{% url "food:manage_ingredients" pk=food.pk %}">
-          {% trans "Manage ingredients" %}
-        </a>
-      {% endif %}
-        <a class="btn btn-sm btn-primary" href="{% url "food:food_list" %}">
-          {% trans "Return to the food list" %}
-        </a>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/food_list.html

@@ -1,132 +0,0 @@
-{% extends "base_search.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load render_table from django_tables2 %}
-{% load i18n %}
-
-{% block content %}
-<div class="card bg-light">
-  <h3 class="card-header text-center">
-      {{ title }}
-  </h3>
-  <div class="card-body">
-    <style>
-      input[type=number]::-webkit-inner-spin-button,
-      input[type=number]::-webkit-outer-spin-button {
-          -webkit-appearance: none;
-          margin: 0;
-      }
-      input[type=number] {
-          appearance: textfield;
-          padding: 6px;
-          border: 1px solid #ccc;
-          border-radius: 4px;
-          width: 100px;
-      }
-    </style>
-    <div class="d-flex align-items-center" style="max-width: 300px;">
-      <form method="get" action="{% url 'food:redirect_view' %}" class="d-flex w-100">
-        <input type="number" name="slug" placeholder="QR-code" required class="form-control form-control-sm" style="max-width: 120px;">
-        <button type="submit" class="btn btn-sm btn-primary">{% trans "View food" %}</button>
-      </form>
-    </div>
-  </div>
-  <div class="card-body">
-      <input id="searchbar" type="text" class="form-control"
-          placeholder="{% trans "Search by attribute such as name..." %}">
-  </div>
-
-  {% block extra_inside_card %}
-  {% endblock %}
-
-  <div id="dynamic-table">
-      {% if table.data %}
-      {% render_table table %}
-      {% else %}
-      <div class="card-body">
-          <div class="alert alert-warning">
-              {% trans "There is no results." %}
-          </div>
-      </div>
-      {% endif %}
-  </div>
-</div>
-<br>
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Meal served" %}
-  </h3>
-  {% if can_add_meal %}
-  <div class="card-footer">
-    <a class="btn btn-sm btn-primary" href="{% url 'food:transformedfood_create' %}">
-      {% trans "New meal" %}
-    </a>
-  </div>
-  {% endif %}
-  {% if served.data %}
-  {% render_table served %}
-  {% else %}
-  <div class="card-body">
-    <div class="alert alert-warning">
-      {% trans "There is no meal served." %}
-    </div>
-  </div>
-</div>
-  {% endif %}
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Free food" %}
-  </h3>
-  {% if open.data %}
-  {% render_table open %}
-  {% else %}
-  <div class="card-body">
-    <div class="alert alert-warning">
-      {% trans "There is no free food." %}
-    </div>
-  </div>
-  {% endif %}
-</div>
-{% if club_tables %}
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Food of your clubs" %}
-  </h3>
-</div>
-  {% for table in club_tables %}
-<div class="card bg-light mb-3">
-  <h3 class="card-header text-center">
-    {% trans "Food of club" %} {{ table.prefix }} 
-  </h3>
-  {% if table.data %}
-    {% render_table table %}
-  {% else %}
-  <div class="card-body">
-    <div class="alert alert-warning">
-      {% trans "Yours club has not food yet." %}
-    </div>
-  </div>
-  {% endif %}
-</div>
-  {% endfor %}
-  {% endif %}
-</div>
-
-
-<script>
-  document.addEventListener('DOMContentLoaded', function() {
-      document.getElementById('goButton').addEventListener('click', function(event) {
-          event.preventDefault();
-          const slug = document.getElementById('slugInput').value;
-          if (slug && !isNaN(slug)) {
-              window.location.href = `/food/${slug}/`;
-          } else {
-              alert("Veuillez entrer un nombre valide.");
-          }
-      });
-  });
-  </script>
-
-{% endblock %}

apps/food/templates/food/manage_ingredients.html

@@ -1,116 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form"></div>
-  <form method="post" action="">
-    {% csrf_token %}
-    <table class="table table-condensed table-striped">
-      {# Fill initial data #}
-      {% for display, form in formset %}
-      {% if forloop.first %}
-      <thead>
-	<tr>
-	  <th>{{ form.name.label }}</th>
-	  <th>{{ form.qrcode.label }}</th>
-	  <th>{{ form.fully_used.label }}</th>
-	</tr>
-      </thead>
-      <tbody id="form_body">
-	{% endif %}
-	{% if display %}
-	<tr class="row-formset ingredients">
-	{% else %}
-	<tr class="row-formset ingredients" style="display: none">
-	{% endif %}
-	  <td>{{ form.name }}</td>
-	  <td>{{ form.qrcode }}</td>
-	  <td>{{ form.fully_used }}</td>
-	</tr>
-      {% endfor %}
-      </tbody>
-    </table>
-
-    {# Display buttons to add and remove ingredients #}
-    <div class="card-body">
-      <div class="btn-group btn-block" role="group">
-	<button type="button" id="add_more" class="btn btn-success">{% trans "Add ingredient" %}</button>
-	<button type="button" id="remove_one" class="btn btn-danger">{% trans "Remove ingredient" %}</button>
-      </div>
-    <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </div>
-  </form>
-</div>
-
-{% endblock %}
-{% block extrajavascript %} 
-<script>
-/* script that handles add and remove lines */
-
-const foods = {{ ingredients | safe }};
-
-function set_ingredient_id () {
-	let ingredients = document.getElementsByClassName('ingredients');
-	for (var i = 0; i < ingredients.length; i++) {
-		ingredients[i].id = 'ingredients-' + parseInt(i);
-	};
-}
-set_ingredient_id();
-
-function prepopulate () {
-	for (var i = 0; i < {{ ingredients_count }}; i++) {
-		let prefix = 'id_form-' + parseInt(i) + '-';
-		document.getElementById(prefix + 'name_pk').value = parseInt(foods[i]['food_pk']);
-		document.getElementById(prefix + 'name').value = foods[i]['food_name'];
-		document.getElementById(prefix + 'qrcode_pk').value = parseInt(foods[i]['qr_pk']);
-		if (foods[i]['qr_number'] === '') {
-			document.getElementById(prefix + 'qrcode').value = '';
-		}
-		else {
-		document.getElementById(prefix + 'qrcode').value = parseInt(foods[i]['qr_number']);
-		};
-		document.getElementById(prefix + 'fully_used').checked = Boolean(foods[i]['fully_used']);
-	};
-}
-prepopulate();
-
-function delete_form_data (form_id) {
-	let prefix = "id_form-" + parseInt(form_id) + "-";
-	document.getElementById(prefix + "name_pk").value = "";
-	document.getElementById(prefix + "name").value = "";
-	document.getElementById(prefix + "qrcode_pk").value = "";
-	document.getElementById(prefix + "qrcode").value = "";
-	document.getElementById(prefix + "fully_used").checked = true;
-}
-var form_count = {{ ingredients_count }} + 1;
-
-$('#add_more').click(function () {
-	let ingredient_form = document.getElementById('ingredients-' + parseInt(form_count));
-	if (ingredient_form === null) {
-		addMsg(gettext("You can't add more ingredient"), "danger",  5000);
-		return;};
-	ingredient_form.style = "display: true";
-	form_count += 1;
-});
-  
-$('#remove_one').click(function () {
-	let ingredient_form = document.getElementById('ingredients-' + parseInt(form_count - 1));
-	if (ingredient_form === null) {
-		return;};
-	ingredient_form.style = "display: none";
-	delete_form_data(form_count - 1);
-	form_count -= 1;
-});
-
-addMsg(gettext("Add ingredient with their name or their qrcode, if two different priority is given to qrcode"), "warning"); 
-
-</script>
-{% endblock %}

apps/food/templates/food/qrcode.html

@@ -1,52 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-{% load render_table from django_tables2 %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-    <div class="card-body">
-    <h4>
-      {% trans "Copy constructor" %}
-      <a class="btn btn-secondary" href="{% url "food:basicfood_create" slug=slug %}">{% trans "New food" %}</a>
-    </h4>
-      <table class="table">
-	<thead>
-	  <tr>
-	    <th class="orderable">
-	      {% trans "Name" %}
-	    </th>
-	    <th class="orderable">
-	      {% trans "Owner" %}
-	    </th>
-	    <th class="orderable">
-	      {% trans "Expiry date" %}
-	    </th>
-	  </tr>
-	</thead>
-	<tbody>
-	  {% for food in last_items %}
-	    <tr>
-		    <td><a href="{% url "food:basicfood_create" slug=slug %}?copy={{ food.pk }}">{{ food.name }}</a></td>
-	      <td>{{ food.owner }}</td>
-	      <td>{{ food.expiry_date }}</td>
-	    </tr>
-	  {% endfor %}
-	</tbody>
-      </table>
-    </div>
-  </div>
-</div>
-{% endblock %}

apps/food/templates/food/qrcode_detail.html

@@ -0,0 +1,39 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+    <h3 class="card-header text-center">
+	{{ title }} {% trans 'number' %} {{ qrcode.qr_code_number }}
+    </h3>
+	<div class="card-body">
+	    <ul>
+		<li><p>{% trans 'Name' %} : {{ qrcode.food_container.name }}</p></li>
+		<li><p>{% trans 'Owner' %} : {{ qrcode.food_container.owner }}</p></li>
+		<li><p>{% trans 'Expiry date' %} : {{ qrcode.food_container.expiry_date  }}</p></li>
+	    </ul>
+	{% if qrcode.food_container.polymorphic_ctype.model == 'basicfood' and can_update_basic %}
+	    <a class="btn btn-sm btn-warning" href="{% url "food:basic_update" pk=qrcode.food_container.pk %}" data-turbolinks="false">
+		{% trans 'Update' %}
+	    </a>
+	{% elif can_update_transformed %}
+	    <a class="btn btn-sm btn-warning" href="{% url "food:transformed_update" pk=qrcode.food_container.pk %}">
+		{% trans 'Update' %}
+	    </a>
+	{% endif %}
+	{% if can_view_detail %}
+	    <a class="btn btn-sm btn-primary" href="{% url "food:food_view" pk=qrcode.food_container.pk %}">
+		{% trans 'View details' %}
+	    </a>
+	{% endif %}
+	{% if can_add_ingredient %}
+	    <a class="btn btn-sm btn-success" href="{% url "food:add_ingredient" pk=qrcode.food_container.pk %}">
+		{% trans 'Add to a meal' %}
+	    </a>
+	{% endif %}
+	</div>
+</div>
+{% endblock %}

apps/food/templates/food/transformedfood_detail.html

@@ -0,0 +1,51 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+    <h3 class="card-header text-center">
+	{{ title }} {{ food.name }}
+    </h3>
+	<div class="card-body">
+	    <ul>
+		<li><p>{% trans 'Owner' %} : {{ food.owner }}</p></li>
+		{% if can_see_ready %}
+		<li><p>{% trans 'Ready' %} : {{ food.is_ready }}</p></li>
+		{% endif %}
+		<li><p>{% trans 'Creation date' %} : {{ food.creation_date }}</p></li>
+		<li><p>{% trans 'Expiry date' %} : {{ food.expiry_date }}</p></li>
+		<li>{% trans 'Allergens' %} :</li>
+		<ul>
+		    {% for allergen in food.allergens.iterator %}
+		    <li>{{ allergen.name }}</li>
+		    {% endfor %}
+	        </ul>
+		<p>
+		<li>{% trans 'Ingredients' %} :</li>
+		<ul>
+		    {% for ingredient in food.ingredient.iterator %}
+		    <li><a href="{% url "food:food_view" pk=ingredient.pk %}">{{ ingredient.name }}</a></li>
+		    {% endfor %}
+		</ul>
+		<p>
+		<li><p>{% trans 'Shelf life' %} : {{ food.shelf_life }}</p></li>
+		<li><p>{% trans 'Ready' %} : {{ food.is_ready }}</p></li>
+		<li><p>{% trans 'Active' %} : {{ food.is_active }}</p></li>
+		<li><p>{% trans 'Eaten' %} : {{ food.was_eaten }}</p></li>
+	    </ul>
+	    {% if can_update %}
+	        <a class="btn btn-sm btn-warning" href="{% url "food:transformed_update" pk=food.pk %}">
+		    {% trans 'Update' %}
+		</a>
+	    {% endif %}
+	    {% if can_add_ingredient %}
+	        <a class="btn btn-sm btn-success" href="{% url "food:add_ingredient" pk=food.pk %}">
+		    {% trans 'Add to a meal' %}
+		</a>
+	    {% endif %}
+    </div>
+</div>
+{% endblock %}

apps/food/templates/food/transformedfood_form.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load i18n crispy_forms_tags %}
+
+{% block content %}
+<div class="card bg-white mb-3">
+  <h3 class="card-header text-center">
+    {{ title }}
+  </h3>
+  <div class="card-body" id="form">
+    <form method="post">
+      {%  csrf_token %}
+      {{ form|crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/transformedfood_list.html

@@ -0,0 +1,60 @@
+{% extends "base.html" %}
+{% comment %}
+SPDX-License-Identifier: GPL-3.0-or-later
+{% endcomment %}
+{% load render_table from django_tables2 %}
+{% load i18n %}
+
+{% block content %}
+<div class="card bg-light mb-3">
+    <h3 class="card-header text-center">
+	{% trans "Meal served" %}
+    </h3>
+    {% if can_create_meal %}
+    <div class="card-footer">
+	<a class="btn btn-sm btn-success" href="{% url 'food:transformed_create' %}" data-turbolinks="false">
+	    {% trans 'New meal' %}
+	</a>
+    </div>
+    {% endif %}
+    {% if served.data %}
+    {% render_table served %}
+    {% else %}
+    <div class="card-body">
+	<div class="alert alert-warning">
+	    {% trans "There is no meal served." %}
+	</div>
+    </div>
+    {% endif %}
+</div>
+
+<div class="card bg-light mb-3">
+    <h3 class="card-header text-center">
+	{% trans "Open" %}
+    </h3>
+    {% if open.data %}
+    {% render_table open %}
+    {% else %}
+    <div class="card-body">
+	<div class="alert alert-warning">
+	    {% trans "There is no free meal." %}
+	</div>
+    </div>
+    {% endif %}
+</div>
+
+<div class="card bg-light mb-3">
+    <h3 class="card-header text-center">
+        {% trans "All meals" %}
+    </h3>
+    {% if table.data %}
+    {% render_table table %}
+    {% else %}
+    <div class="card-body">
+        <div class="alert alert-warning">
+            {% trans "There is no meal." %}
+        </div>
+    </div>
+    {% endif %}
+</div>
+{% endblock %}

apps/food/templates/food/transformedfood_update.html

@@ -1,87 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <table class="table table-condensed table-striped">
-        {# Fill initial data #}
-        {% for ingredient_form in formset %}
-        {% if forloop.first %}
-        <thead>
-          <tr>
-	    <th>{% trans "Name" %}</th>
-	    <th>{% trans "QR-code number" %}</th>
-	    <th>{% trans "Fully used" %}<th>
-          </tr>
-        </thead>
-        <tbody id="form_body">
-        {% endif %}
-        <tr class="row-formset">
-		{{ ingredient_form | crispy }}
-          <td>{{ ingredient_form.name }}</td>
-	  <td>{{ ingredient_form.qrcode }}</td>
-	  <td>{{ ingredient_form.fully_used }}</td>
-        </tr>
-        {% endfor %}
-        </tbody>
-      </table>
-      {# Display buttons to add and remove products #}
-      <div class="card-body">
-        <div class="btn-group btn-block" role="group">
-          <button type="button" id="add_more" class="btn btn-success">{% trans "Add ingredient" %}</button>
-	  <button type="button" id="remove_one" class="btn btn-danger">{% trans "Remove ingredient" %}</button>
-        </div>
-        <button type="submit" class="btn btn-block btn-primary">{% trans "Submit" %}</button>
-      </div>
-    </form>
-  </div>
-</div>
-
-{# Hidden div that store an empty product form, to be copied into new forms #}
-<div id="empty_form" style="display: none;">
-    <table class='no_error'>
-        <tbody id="for_real">
-            <tr class="row-formset">
-                <td>{{ formset.empty_form.name }}</td>
-		<td>{{ formset.empty_form.qrcode }}</td>
-		<td>{{ formset.empty_form.fully_used }}</td>
-            </tr>
-        </tbody>
-    </table>
-</div>
-{% endblock %}
-{% block extrajavascript %}
-<script>
-    /* script that handles add and remove lines */
-    IDS = {};
-
-    $("#id_form-TOTAL_FORMS").val($(".row-formset").length - 1);
-
-    $('#add_more').click(function () {
-        let form_idx = $('#id_form-TOTAL_FORMS').val();
-        $('#form_body').append($('#for_real').html().replace(/__prefix__/g, form_idx));
-        $('#id_form-TOTAL_FORMS').val(parseInt(form_idx) + 1);
-        $('#id_form-' + parseInt(form_idx) + '-id').val(IDS[parseInt(form_idx)]);
-    });
-
-    $('#remove_one').click(function () {
-        let form_idx = $('#id_form-TOTAL_FORMS').val();
-        if (form_idx > 0) {
-            IDS[parseInt(form_idx) - 1] = $('#id_form-' + (parseInt(form_idx) - 1) + '-id').val();
-            $('#form_body tr:last-child').remove();
-            $('#id_form-TOTAL_FORMS').val(parseInt(form_idx) - 1);
-        }
-    });
-</script>
-{% endblock %}

apps/food/tests.py

@@ -0,0 +1,3 @@
+# from django.test import TestCase
+
+# Create your tests here.

apps/food/tests/test_food.py

@@ -1,170 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from api.tests import TestAPI
-from django.contrib.auth.models import User
-from django.test import TestCase
-from django.urls import reverse
-from django.utils import timezone
-
-from ..api.views import AllergenViewSet, BasicFoodViewSet, TransformedFoodViewSet, QRCodeViewSet
-from ..models import Allergen, BasicFood, TransformedFood, QRCode
-
-
-class TestFood(TestCase):
-    """
-    Test food
-    """
-    fixtures = ('initial',)
-
-    def setUp(self):
-        self.user = User.objects.create_superuser(
-            username='admintoto',
-            password='toto1234',
-            email='toto@example.com'
-        )
-        self.client.force_login(self.user)
-
-        sess = self.client.session
-        sess['permission_mask'] = 42
-        sess.save()
-
-        self.allergen = Allergen.objects.create(
-            name='allergen',
-        )
-
-        self.basicfood = BasicFood.objects.create(
-            name='basicfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-            date_type='DLC',
-        )
-
-        self.transformedfood = TransformedFood.objects.create(
-            name='transformedfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-        )
-
-        self.qrcode = QRCode.objects.create(
-            qr_code_number=1,
-            food_container=self.basicfood,
-        )
-
-        def test_food_list(self):
-            """
-            Display food list
-            """
-            response = self.client.get(reverse('food:food_list'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_qrcode_create(self):
-            """
-            Display QRCode creation
-            """
-            response = self.client.get(reverse('food:qrcode_create'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_basicfood_create(self):
-            """
-            Display BasicFood creation
-            """
-            response = self.client.get(reverse('food:basicfood_create'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_transformedfood_create(self):
-            """
-            Display TransformedFood creation
-            """
-            response = self.client.get(reverse('food:transformedfood_create'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_food_create(self):
-            """
-            Display Food update
-            """
-            response = self.client.get(reverse('food:food_update'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_food_view(self):
-            """
-            Display Food detail
-            """
-            response = self.client.get(reverse('food:food_view'))
-            self.assertEqual(response.status_code, 302)
-
-        def test_basicfood_view(self):
-            """
-            Display BasicFood detail
-            """
-            response = self.client.get(reverse('food:basicfood_view'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_transformedfood_view(self):
-            """
-            Display TransformedFood detail
-            """
-            response = self.client.get(reverse('food:transformedfood_view'))
-            self.assertEqual(response.status_code, 200)
-
-        def test_add_ingredient(self):
-            """
-            Display add ingredient view
-            """
-            response = self.client.get(reverse('food:add_ingredient'))
-            self.assertEqual(response.status_code, 200)
-
-
-class TestFoodAPI(TestAPI):
-    def setUp(self) -> None:
-        super().setUP()
-
-        self.allergen = Allergen.objects.create(
-            name='name',
-        )
-
-        self.basicfood = BasicFood.objects.create(
-            name='basicfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-            date_type='DLC',
-        )
-
-        self.transformedfood = TransformedFood.objects.create(
-            name='transformedfood',
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=False,
-        )
-
-        self.qrcode = QRCode.objects.create(
-            qr_code_number=1,
-            food_container=self.basicfood,
-        )
-
-        def test_allergen_api(self):
-            """
-            Load Allergen API page and test all filters and permissions
-            """
-            self.check_viewset(AllergenViewSet, '/api/food/allergen/')
-
-        def test_basicfood_api(self):
-            """
-            Load BasicFood API page and test all filters and permissions
-            """
-            self.check_viewset(BasicFoodViewSet, '/api/food/basicfood/')
-
-        def test_transformedfood_api(self):
-            """
-            Load TransformedFood API page and test all filters and permissions
-            """
-            self.check_viewset(TransformedFoodViewSet, '/api/food/transformedfood/')
-
-        def test_qrcode_api(self):
-            """
-            Load QRCode API page and test all filters and permissions
-            """
-            self.check_viewset(QRCodeViewSet, '/api/food/qrcode/')

apps/food/urls.py

@@ -8,15 +8,14 @@ from . import views
 app_name = 'food'
 
 urlpatterns = [
-    path('', views.FoodListView.as_view(), name='food_list'),
+    path('', views.TransformedListView.as_view(), name='food_list'),
-    path('<int:slug>', views.QRCodeCreateView.as_view(), name='qrcode_create'),
+    path('<int:slug>', views.QRCodeView.as_view(), name='qrcode_view'),
-    path('<int:slug>/add/basic', views.BasicFoodCreateView.as_view(), name='basicfood_create'),
+    path('detail/<int:pk>', views.FoodView.as_view(), name='food_view'),
-    path('add/transformed', views.TransformedFoodCreateView.as_view(), name='transformedfood_create'),
+
-    path('update/<int:pk>', views.FoodUpdateView.as_view(), name='food_update'),
+    path('<int:slug>/create_qrcode', views.QRCodeCreateView.as_view(), name='qrcode_create'),
-    path('update/ingredients/<int:pk>', views.ManageIngredientsView.as_view(), name='manage_ingredients'),
+    path('<int:slug>/create_qrcode/basic', views.QRCodeBasicFoodCreateView.as_view(), name='qrcode_basic_create'),
-    path('detail/<int:pk>', views.FoodDetailView.as_view(), name='food_view'),
+    path('create/transformed', views.TransformedFoodCreateView.as_view(), name='transformed_create'),
-    path('detail/basic/<int:pk>', views.BasicFoodDetailView.as_view(), name='basicfood_view'),
+    path('update/basic/<int:pk>', views.BasicFoodUpdateView.as_view(), name='basic_update'),
-    path('detail/transformed/<int:pk>', views.TransformedFoodDetailView.as_view(), name='transformedfood_view'),
+    path('update/transformed/<int:pk>', views.TransformedFoodUpdateView.as_view(), name='transformed_update'),
-    path('add/ingredient/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
+    path('add/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
-    path('redirect/', views.QRCodeRedirectView.as_view(), name='redirect_view'),
 ]

apps/food/utils.py

@@ -1,53 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from django.utils.translation import gettext_lazy as _
-
-seconds = (_('second'), _('seconds'))
-minutes = (_('minute'), _('minutes'))
-hours = (_('hour'), _('hours'))
-days = (_('day'), _('days'))
-weeks = (_('week'), _('weeks'))
-
-
-def plural(x):
-    if x == 1:
-        return 0
-    return 1
-
-
-def pretty_duration(duration):
-    """
-    I receive datetime.timedelta object
-    You receive string object
-    """
-    text = []
-    sec = duration.seconds
-    d = duration.days
-
-    if d >= 7:
-        w = d // 7
-        text.append(str(w) + ' ' + weeks[plural(w)])
-        d -= w * 7
-    if d > 0:
-        text.append(str(d) + ' ' + days[plural(d)])
-
-    if sec >= 3600:
-        h = sec // 3600
-        text.append(str(h) + ' ' + hours[plural(h)])
-        sec -= h * 3600
-
-    if sec >= 60:
-        m = sec // 60
-        text.append(str(m) + ' ' + minutes[plural(m)])
-        sec -= m * 60
-
-    if sec > 0:
-        text.append(str(sec) + ' ' + seconds[plural(sec)])
-
-    if len(text) == 0:
-        return ''
-    if len(text) == 1:
-        return text[0]
-    if len(text) >= 2:
-        return ', '.join(t for t in text[:-1]) + ' ' + _('and') + ' ' + text[-1]

apps/food/views.py

@@ -1,523 +1,421 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from datetime import timedelta
-
-from api.viewsets import is_regex
-from django_tables2.views import MultiTableMixin
 from django.db import transaction
-from django.db.models import Q
+from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponseRedirect, Http404
+from django.http import HttpResponseRedirect
-from django.views.generic import DetailView, UpdateView, CreateView
+from django_tables2.views import MultiTableMixin
-from django.views.generic.list import ListView
+from django.urls import reverse
-from django.views.generic.base import RedirectView
-from django.urls import reverse_lazy
-from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
-from member.models import Club, Membership
+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, LoginRequiredMixin
+from permission.views import ProtectQuerysetMixin, ProtectedCreateView
 
-from .models import Food, BasicFood, TransformedFood, QRCode
+from .forms import AddIngredientForms, BasicFoodForms, QRCodeForms, TransformedFoodForms
-from .forms import QRCodeForms, BasicFoodForms, TransformedFoodForms, \
+from .models import BasicFood, Food, QRCode, TransformedFood
-    ManageIngredientsForm, ManageIngredientsFormSet, AddIngredientForms, \
+from .tables import TransformedFoodTable
-    BasicFoodUpdateForms, TransformedFoodUpdateForms
-from .tables import FoodTable
-from .utils import pretty_duration
 
 
-class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
+class AddIngredientView(ProtectQuerysetMixin, UpdateView):
     """
-    Display Food
+    A view to add an ingredient
     """
     model = Food
-    tables = [FoodTable, FoodTable, FoodTable, ]
+    template_name = 'food/add_ingredient_form.html'
-    extra_context = {"title": _('Food')}
+    extra_context = {"title": _("Add the ingredient")}
-    template_name = 'food/food_list.html'
+    form_class = AddIngredientForms
 
-    def get_queryset(self, **kwargs):
+    def get_context_data(self, **kwargs):
-        return super().get_queryset(**kwargs).distinct()
+        context = super().get_context_data(**kwargs)
+        context["pk"] = self.kwargs["pk"]
+        return context
 
-    def get_tables(self):
+    @transaction.atomic
-        bureau_role_pk = 4
+    def form_valid(self, form):
-        clubs = Club.objects.filter(membership__in=Membership.objects.filter(
+        form.instance.creater = self.request.user
-            user=self.request.user, roles=bureau_role_pk).filter(
+        food = Food.objects.get(pk=self.kwargs['pk'])
-                date_end__gte=timezone.now()))
+        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)
 
-        tables = [FoodTable] * (clubs.count() + 3)
+        # We flip logic ""fully used = not is_active""
-        self.tables = tables
+        food.is_active = not food.is_active
-        tables = super().get_tables()
+        # Save the aliment and the allergens associed
-        tables[0].prefix = 'search-'
+        for transformed_pk in self.request.POST.getlist('ingredient'):
-        tables[1].prefix = 'open-'
+            transformed = TransformedFood.objects.get(pk=transformed_pk)
-        tables[2].prefix = 'served-'
+            if not transformed.is_ready:
-        for i in range(clubs.count()):
+                transformed.ingredient.add(food)
-            tables[i + 3].prefix = clubs[i].name
+                transformed.update()
-        return tables
+        food.save()
 
-    def get_tables_data(self):
+        return HttpResponseRedirect(self.get_success_url())
-        # table search
-        qs = self.get_queryset().order_by('name')
-        if "search" in self.request.GET and self.request.GET['search']:
-            pattern = self.request.GET['search']
 
-            # check regex
+    def get_success_url(self, **kwargs):
-            valid_regex = is_regex(pattern)
+        return reverse('food:food_list')
-            suffix = '__iregex' if valid_regex else '__istartswith'
+
-            prefix = '^' if valid_regex else ''
+
-            qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern})
+class BasicFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-                           | Q(**{f'owner__name{suffix}': prefix + pattern}))
+    """
-        else:
+    A view to update a basic food
-            qs = qs.none()
+    """
-        search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view'))
+    model = BasicFood
-        # table open
+    form_class = BasicFoodForms
-        open_table = self.get_queryset().order_by('expiry_date').filter(
+    template_name = 'food/basicfood_form.html'
-            Q(polymorphic_ctype__model='transformedfood')
+    extra_context = {"title": _("Update an aliment")}
-            | Q(polymorphic_ctype__model='basicfood', basicfood__date_type='DLC')).filter(
+
-                expiry_date__lt=timezone.now(), end_of_life='').filter(
+    @transaction.atomic
-                    PermissionBackend.filter_queryset(self.request, Food, 'view'))
+    def form_valid(self, form):
-        # table served
+        form.instance.creater = self.request.user
-        served_table = self.get_queryset().order_by('-pk').filter(
+        basic_food_form = BasicFoodForms(data=self.request.POST)
-            end_of_life='', is_ready=True).exclude(
+        if not basic_food_form.is_valid():
-                Q(polymorphic_ctype__model='basicfood',
+            return self.form_invalid(form)
-                  basicfood__date_type='DLC',
+
-                  expiry_date__lte=timezone.now(),)
+        ans = super().form_valid(form)
-                | Q(polymorphic_ctype__model='transformedfood',
+        form.instance.update()
-                    expiry_date__lte=timezone.now(),
+        return ans
-                    ))
+
-        # tables club
+    def get_success_url(self, **kwargs):
-        bureau_role_pk = 4
+        self.object.refresh_from_db()
-        clubs = Club.objects.filter(membership__in=Membership.objects.filter(
+        return reverse('food:food_view', kwargs={"pk": self.object.pk})
-            user=self.request.user, roles=bureau_role_pk).filter(
+
-                date_end__gte=timezone.now()))
+    def get_context_data(self, **kwargs):
-        club_table = []
+        context = super().get_context_data(**kwargs)
-        for club in clubs:
+        return context
-            club_table.append(self.get_queryset().order_by('expiry_date').filter(
+
-                owner=club, end_of_life='').filter(
+
-                    PermissionBackend.filter_queryset(self.request, Food, 'view')
+class FoodView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
-            ))
+    """
-        return [search_table, open_table, served_table] + club_table
+    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)
 
-        tables = context['tables']
+        context["can_update"] = PermissionBackend.check_perm(self.request, "food.change_food")
-        # for extends base_search.html we need to name 'search_table' in 'table'
+        context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
-        for name, table in zip(['table', 'open', 'served'], tables):
-            context[name] = table
-        context['club_tables'] = tables[3:]
-
-        context['can_add_meal'] = PermissionBackend.check_perm(self.request, 'food.transformedfood_add')
         return context
 
 
-class QRCodeCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
+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 qrcode
+    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/qrcode.html'
+    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:
-            pk = self.model.objects.get(qr_code_number=qrcode).food_container.pk
+            return HttpResponseRedirect(reverse("food:qrcode_view", kwargs=kwargs))
-            return HttpResponseRedirect(reverse_lazy("food:food_view", kwargs={"pk": pk}))
         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.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_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['slug'] = self.kwargs['slug']
-
-        # get last 10 BasicFood objects with distincts 'name' ordered by '-pk'
-        # we can't use .distinct and .order_by with differents columns hence the generator
-        context['last_items'] = [food for food in BasicFood.get_lastests_objects(10, 'name', '-pk')]
-        return context
-
     def get_success_url(self, **kwargs):
         self.object.refresh_from_db()
-        return reverse_lazy('food:food_view', kwargs={'pk': self.object.food_container.pk})
+        return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']})
 
     def get_sample_object(self):
         return QRCode(
-            qr_code_number=self.kwargs['slug'],
+            qr_code_number=self.kwargs["slug"],
-            food_container_id=1,
+            food_container_id=1
         )
 
 
-class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+class QRCodeView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
-    A view to add basicfood
+    A view to see a qrcode
     """
-    model = BasicFood
+    model = QRCode
-    form_class = BasicFoodForms
+    extra_context = {"title": _("QRCode")}
-    extra_context = {"title": _("Add an aliment")}
+    context_object_name = "qrcode"
-    template_name = "food/food_update.html"
+    slug_field = "qr_code_number"
 
-    def get_sample_object(self):
+    def get(self, *args, **kwargs):
-        # We choose a club which may work or BDE else
+        qrcode = kwargs["slug"]
-        food = BasicFood(
+        if self.model.objects.filter(qr_code_number=qrcode).count() > 0:
-            name="",
+            return super().get(*args, **kwargs)
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=True,
-            arrival_date=timezone.now(),
-            date_type='DLC',
-        )
-
-        for membership in self.request.user.memberships.all():
-            club_id = membership.club.id
-            food.owner_id = club_id
-            if PermissionBackend.check_perm(self.request, "food.add_basicfood", food):
-                return food
-
-        return food
-
-    @transaction.atomic
-    def form_valid(self, form):
-        if QRCode.objects.filter(qr_code_number=self.kwargs['slug']).count() > 0:
-            return HttpResponseRedirect(reverse_lazy('food:qrcode_create', kwargs={'slug': self.kwargs['slug']}))
-        food_form = BasicFoodForms(data=self.request.POST)
-        if not food_form.is_valid():
-            return self.form_invalid(form)
-
-        food = form.save(commit=False)
-        food.is_ready = False
-        food.save()
-        food.refresh_from_db()
-
-        qrcode = QRCode()
-        qrcode.qr_code_number = self.kwargs['slug']
-        qrcode.food_container = food
-        qrcode.save()
-
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse_lazy('food:basicfood_view', kwargs={"pk": self.object.pk})
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-
-        copy = self.request.GET.get('copy', None)
-        if copy is not None:
-            food = BasicFood.objects.get(pk=copy)
-            print(context['form'].fields)
-            for field in context['form'].fields:
-                if field == 'allergens':
-                    context['form'].fields[field].initial = getattr(food, field).all()
         else:
-                    context['form'].fields[field].initial = getattr(food, field)
+            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 transformedfood
+    A view to add a tranformed food
     """
     model = TransformedFood
+    template_name = 'food/transformedfood_form.html'
     form_class = TransformedFoodForms
-    extra_context = {"title": _("Add a meal")}
+    extra_context = {"title": _("Add a new meal")}
-    template_name = "food/food_update.html"
-
-    def get_sample_object(self):
-        # We choose a club which may work or BDE else
-        food = TransformedFood(
-            name="",
-            owner_id=1,
-            expiry_date=timezone.now(),
-            is_ready=True,
-        )
-
-        for membership in self.request.user.memberships.all():
-            club_id = membership.club.id
-            food.owner_id = club_id
-            if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food):
-                return food
-
-        return food
-
-    @transaction.atomic
-    def form_valid(self, form):
-        form.instance.expiry_date = timezone.now() + timedelta(days=3)
-        form.instance.is_ready = False
-        return super().form_valid(form)
-
-    def get_success_url(self, **kwargs):
-        self.object.refresh_from_db()
-        return reverse_lazy('food:transformedfood_view', kwargs={"pk": self.object.pk})
-
-
-MAX_FORMS = 100
-
-
-class ManageIngredientsView(LoginRequiredMixin, UpdateView):
-    """
-    A view to manage ingredient for a transformed food
-    """
-    model = TransformedFood
-    fields = ['ingredients']
-    extra_context = {"title": _("Manage ingredients of:")}
-    template_name = 'food/manage_ingredients.html'
-
-    @transaction.atomic
-    def form_valid(self, form):
-        old_ingredients = list(self.object.ingredients.all()).copy()
-        old_allergens = list(self.object.allergens.all()).copy()
-        self.object.ingredients.clear()
-        for i in range(self.object.ingredients.all().count() + 1 + MAX_FORMS):
-            prefix = 'form-' + str(i) + '-'
-            if form.data[prefix + 'qrcode'] not in ['0', '']:
-                ingredient = QRCode.objects.get(pk=form.data[prefix + 'qrcode']).food_container
-                self.object.ingredients.add(ingredient)
-                if (prefix + 'fully_used') in form.data and form.data[prefix + 'fully_used'] == 'on':
-                    ingredient.end_of_life = _('Fully used in {meal}'.format(
-                        meal=self.object.name))
-                    ingredient.save()
-
-            elif form.data[prefix + 'name'] != '':
-                ingredient = Food.objects.get(pk=form.data[prefix + 'name'])
-                self.object.ingredients.add(ingredient)
-                if (prefix + 'fully_used') in form.data and form.data[prefix + 'fully_used'] == 'on':
-                    ingredient.end_of_life = _('Fully used in {meal}'.format(
-                        meal=self.object.name))
-                    ingredient.save()
-        # We recalculate new expiry date and allergens
-        self.object.expiry_date = self.object.creation_date + self.object.shelf_life
-        self.object.allergens.clear()
-
-        for ingredient in self.object.ingredients.iterator():
-            if not (ingredient.polymorphic_ctype.model == 'basicfood' and ingredient.date_type == 'DDM'):
-                self.object.expiry_date = min(self.object.expiry_date, ingredient.expiry_date)
-            self.object.allergens.set(self.object.allergens.union(ingredient.allergens.all()))
-
-        self.object.save(old_ingredients=old_ingredients, old_allergens=old_allergens)
-        return HttpResponseRedirect(self.get_success_url())
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['title'] += ' ' + self.object.name
-        formset = ManageIngredientsFormSet()
-        ingredients = self.object.ingredients.all()
-        formset.extra += ingredients.count() + MAX_FORMS
-        context['form'] = ManageIngredientsForm()
-        context['ingredients_count'] = ingredients.count()
-        display = [True] * (1 + ingredients.count()) + [False] * (formset.extra - ingredients.count() - 1)
-        context['formset'] = zip(display, formset)
-        context['ingredients'] = []
-        for ingredient in ingredients:
-            qr = QRCode.objects.filter(food_container=ingredient)
-
-            context['ingredients'].append({
-                'food_pk': ingredient.pk,
-                'food_name': ingredient.name,
-                'qr_pk': '' if qr.count() == 0 else qr[0].pk,
-                'qr_number': '' if qr.count() == 0 else qr[0].qr_code_number,
-                'fully_used': 'true' if ingredient.end_of_life else '',
-            })
-        return context
-
-    def get_success_url(self, **kwargs):
-        return reverse_lazy('food:transformedfood_view', kwargs={"pk": self.object.pk})
-
-
-class AddIngredientView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to add ingredient to a meal
-    """
-    model = Food
-    extra_context = {"title": _("Add the ingredient:")}
-    form_class = AddIngredientForms
-    template_name = 'food/food_update.html'
-
-    def get_context_data(self, *args, **kwargs):
-        context = super().get_context_data(*args, **kwargs)
-        context['title'] += ' ' + self.object.name
-        return context
-
-    @transaction.atomic
-    def form_valid(self, form):
-        meals = TransformedFood.objects.filter(pk__in=form.data.getlist('ingredients')).all()
-        if not meals:
-            return HttpResponseRedirect(reverse_lazy('food:food_view', kwargs={"pk": self.object.pk}))
-        for meal in meals:
-            old_ingredients = list(meal.ingredients.all()).copy()
-            old_allergens = list(meal.allergens.all()).copy()
-            meal.ingredients.add(self.object.pk)
-            # update allergen and expiry date if necessary
-            if not (self.object.polymorphic_ctype.model == 'basicfood'
-                    and self.object.date_type == 'DDM'):
-                meal.expiry_date = min(meal.expiry_date, self.object.expiry_date)
-            meal.allergens.set(meal.allergens.union(self.object.allergens.all()))
-            meal.save(old_ingredients=old_ingredients, old_allergens=old_allergens)
-            if 'fully_used' in form.data:
-                if not self.object.end_of_life:
-                    self.object.end_of_life = _(f'Food fully used in : {meal.name}')
-                else:
-                    self.object.end_of_life += ', ' + meal.name
-        if 'fully_used' in form.data:
-            self.object.is_ready = False
-        self.object.save()
-        # We redirect only the first parent
-        parent_pk = meals[0].pk
-        return HttpResponseRedirect(self.get_success_url(parent_pk=parent_pk))
-
-    def get_success_url(self, **kwargs):
-        return reverse_lazy('food:transformedfood_view', kwargs={"pk": kwargs['parent_pk']})
-
-
-class FoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    A view to update Food
-    """
-    model = Food
-    extra_context = {"title": _("Update an aliment")}
-    template_name = 'food/food_update.html'
 
     @transaction.atomic
     def form_valid(self, form):
         form.instance.creater = self.request.user
-        food = Food.objects.get(pk=self.kwargs['pk'])
+        transformed_food_form = TransformedFoodForms(data=self.request.POST)
-        old_allergens = list(food.allergens.all()).copy()
+        if not transformed_food_form.is_valid():
-
-        if food.polymorphic_ctype.model == 'transformedfood':
-            old_ingredients = food.ingredients.all()
-            form.instance.shelf_life = timedelta(
-                seconds=int(form.data['shelf_life']) * 60 * 60)
-
-        food_form = self.get_form_class()(data=self.request.POST)
-        if not 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)
-        if food.polymorphic_ctype.model == 'transformedfood':
+        transformed_food.update()
-            form.instance.save(old_ingredients=old_ingredients)
-        else:
-            form.instance.save(old_allergens=old_allergens)
         return ans
 
-    def get_form_class(self, **kwargs):
-        food = Food.objects.get(pk=self.kwargs['pk'])
-        if food.polymorphic_ctype.model == 'basicfood':
-            return BasicFoodUpdateForms
-        else:
-            return TransformedFoodUpdateForms
-
-    def get_form(self, **kwargs):
-        form = super().get_form(**kwargs)
-        if 'shelf_life' in form.initial:
-            hours = form.initial['shelf_life'].days * 24 + form.initial['shelf_life'].seconds // 3600
-            form.initial['shelf_life'] = hours
-        return form
-
     def get_success_url(self, **kwargs):
         self.object.refresh_from_db()
-        return reverse_lazy('food:food_view', kwargs={"pk": self.object.pk})
+        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
 
-class FoodDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
+        return TransformedFood(
-    """
+            name="",
-    A view to see a food
+            owner_id=owner_id,
-    """
+            creation_date=timezone.now(),
-    model = Food
+            expiry_date=timezone.now(),
-    extra_context = {"title": _('Details of:')}
+        )
-    context_object_name = "food"
-    template_name = "food/food_detail.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        fields = ["name", "owner", "expiry_date", "allergens", "is_ready", "end_of_life", "order"]
 
-        fields = dict([(field, getattr(self.object, field)) for field in fields])
+        # Some field are hidden on create
-        if fields["is_ready"]:
+        form = context['form']
-            fields["is_ready"] = _("Yes")
+        form.fields['is_active'].widget = HiddenInput()
-        else:
+        form.fields['is_ready'].widget = HiddenInput()
-            fields["is_ready"] = _("No")
+        form.fields['was_eaten'].widget = HiddenInput()
-        fields["allergens"] = ", ".join(
+        form.fields['shelf_life'].widget = HiddenInput()
-            allergen.name for allergen in fields["allergens"].all())
 
-        context["fields"] = [(
-            Food._meta.get_field(field).verbose_name.capitalize(),
-            value) for field, value in fields.items()]
-        if self.object.QR_code.exists():
-            context["QR_code"] = self.object.QR_code.first()
-        context["meals"] = self.object.transformed_ingredient_inv.all()
-        context["update"] = PermissionBackend.check_perm(self.request, "food.change_food")
-        context["add_ingredient"] = (self.object.end_of_life == '' and PermissionBackend.check_perm(self.request, "food.change_transformedfood"))
         return context
 
-    def get(self, *args, **kwargs):
-        if Food.objects.filter(pk=kwargs['pk']).count() != 1:
-            return Http404
-        model = Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model
-        if 'stop_redirect' in kwargs and kwargs['stop_redirect']:
-            return super().get(*args, **kwargs)
-        kwargs = {'pk': kwargs['pk']}
-        if model == 'basicfood':
-            return HttpResponseRedirect(reverse_lazy("food:basicfood_view", kwargs=kwargs))
-        return HttpResponseRedirect(reverse_lazy("food:transformedfood_view", kwargs=kwargs))
 
+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})
 
-class BasicFoodDetailView(FoodDetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        fields = ['arrival_date', 'date_type']
-        for field in fields:
-            context["fields"].append((
-                BasicFood._meta.get_field(field).verbose_name.capitalize(),
-                getattr(self.object, field)
-            ))
         return context
 
-    def get(self, *args, **kwargs):
-        if Food.objects.filter(pk=kwargs['pk']).count() == 1:
-            kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'basicfood')
-        return super().get(*args, **kwargs)
 
+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")
+        ]
 
-class TransformedFoodDetailView(FoodDetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["fields"].append((
+
-            TransformedFood._meta.get_field("creation_date").verbose_name.capitalize(),
+        # We choose a club which should work
-            self.object.creation_date
+        for membership in self.request.user.memberships.all():
-        ))
+            club_id = membership.club.id
-        context["fields"].append((
+            food = TransformedFood(
-            TransformedFood._meta.get_field("shelf_life").verbose_name.capitalize(),
+                name="",
-            pretty_duration(self.object.shelf_life)
+                owner_id=club_id,
-        ))
+                creation_date=timezone.now(),
-        context["foods"] = self.object.ingredients.all()
+                expiry_date=timezone.now(),
-        context["manage_ingredients"] = True
+            )
+            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
-
-    def get(self, *args, **kwargs):
-        if Food.objects.filter(pk=kwargs['pk']).count() == 1:
-            kwargs['stop_redirect'] = (Food.objects.get(pk=kwargs['pk']).polymorphic_ctype.model == 'transformedfood')
-        return super().get(*args, **kwargs)
-
-
-class QRCodeRedirectView(RedirectView):
-    """
-    Redirects to the QR code creation page from Food List
-    """
-    def get_redirect_url(self, *args, **kwargs):
-        slug = self.request.GET.get('slug')
-        if slug:
-            return reverse_lazy('food:qrcode_create', kwargs={'slug': slug})
-        return reverse_lazy('food:list')

apps/member/apps.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.db.models.signals import post_save
 from django.utils.translation import gettext_lazy as _
 
-from .signals import save_user_profile, update_wei_registration_fee_on_membership_creation, update_wei_registration_fee_on_club_change
+from .signals import save_user_profile
 
 
 class MemberConfig(AppConfig):
@@ -17,16 +17,7 @@ class MemberConfig(AppConfig):
         """
         Define app internal signals to interact with other apps
         """
-        from .models import Membership, Club
         post_save.connect(
             save_user_profile,
             sender=settings.AUTH_USER_MODEL,
         )
-        post_save.connect(
-            update_wei_registration_fee_on_membership_creation,
-            sender=Membership
-        )
-        post_save.connect(
-            update_wei_registration_fee_on_club_change,
-            sender=Club
-        )

apps/member/migrations/0014_create_bda.py

@@ -1,46 +0,0 @@
-from django.db import migrations
-
-def create_bda(apps, schema_editor):
-    """
-    The club BDA is now pre-injected.
-    """
-    Club = apps.get_model("member", "club")
-    NoteClub = apps.get_model("note", "noteclub")
-    Alias = apps.get_model("note", "alias")
-    ContentType = apps.get_model('contenttypes', 'ContentType')
-    polymorphic_ctype_id = ContentType.objects.get_for_model(NoteClub).id
-    
-    Club.objects.get_or_create(
-        id=10,
-        name="BDA",
-        email="bda.ensparissaclay@gmail.com",
-        require_memberships=True,
-        membership_fee_paid=750,
-        membership_fee_unpaid=750,
-        membership_duration=396,
-        membership_start="2024-08-01",
-        membership_end="2025-09-30",
-    )
-    NoteClub.objects.get_or_create(
-        id=1937,
-        club_id=10,
-        polymorphic_ctype_id=polymorphic_ctype_id,
-    )
-    Alias.objects.get_or_create(
-        id=1937,
-        note_id=1937,
-        name="BDA",
-        normalized_name="bda",
-    )
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0013_auto_20240801_1436'),
-    ]
-    
-    operations = [
-        migrations.RunPython(create_bda),
-    ]
-

apps/member/migrations/0015_alter_profile_promotion.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-02 13:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0014_create_bda'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='profile',
-            name='promotion',
-            field=models.PositiveSmallIntegerField(default=2025, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion'),
-        ),
-    ]

apps/member/models.py

@@ -438,6 +438,8 @@ class Membership(models.Model):
             )
             if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
                 new_membership._force_renew_parent = True
+            if hasattr(self, '_soge') and self._soge:
+                new_membership._soge = True
             if hasattr(self, '_force_save') and self._force_save:
                 new_membership._force_save = True
             new_membership.save()
@@ -456,6 +458,8 @@ class Membership(models.Model):
             # Renew the previous membership of the parent club
             parent_membership = parent_membership.first()
             parent_membership._force_renew_parent = True
+            if hasattr(self, '_soge'):
+                parent_membership._soge = True
             if hasattr(self, '_force_save'):
                 parent_membership._force_save = True
             parent_membership.renew()
@@ -467,6 +471,8 @@ class Membership(models.Model):
                 date_start=self.date_start,
             )
             parent_membership._force_renew_parent = True
+            if hasattr(self, '_soge'):
+                parent_membership._soge = True
             if hasattr(self, '_force_save'):
                 parent_membership._force_save = True
             parent_membership.save()

apps/member/signals.py

@@ -13,27 +13,3 @@ def save_user_profile(instance, created, raw, **_kwargs):
             instance.profile.email_confirmed = True
             instance.profile.registration_valid = True
         instance.profile.save()
-
-
-def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs):
-    if not hasattr(instance, "_no_signal") and created:
-        from wei.models import WEIRegistration
-        if instance.club.id == 1 or instance.club.id == 2:
-            registrations = WEIRegistration.objects.filter(
-                user=instance.user,
-                wei__year=instance.date_start.year,
-            )
-            for r in registrations:
-                r._force_save = True
-                r.save()
-
-
-def update_wei_registration_fee_on_club_change(sender, instance, **kwargs):
-    from wei.models import WEIRegistration
-    if not hasattr(instance, "_no_signal") and (instance.id == 1 or instance.id == 2):
-        registrations = WEIRegistration.objects.filter(
-            wei__year=instance.membership_start.year,
-        )
-        for r in registrations:
-            r._force_save = True
-            r.save()

apps/member/tests/test_login.py

@@ -44,7 +44,7 @@ class TemplateLoggedInTests(TestCase):
         self.assertRedirects(response, settings.LOGIN_REDIRECT_URL, 302, 302)
 
     def test_logout(self):
-        response = self.client.post(reverse("logout"))
+        response = self.client.get(reverse("logout"))
         self.assertEqual(response.status_code, 200)
 
     def test_admin_index(self):

apps/note/api/urls.py

@@ -13,7 +13,7 @@ def register_note_urls(router, path):
     router.register(path + '/note', NotePolymorphicViewSet)
     router.register(path + '/alias', AliasViewSet)
     router.register(path + '/trust', TrustViewSet)
-    router.register(path + '/consumer', ConsumerViewSet, basename='alias2')
+    router.register(path + '/consumer', ConsumerViewSet)
 
     router.register(path + '/transaction/category', TemplateCategoryViewSet)
     router.register(path + '/transaction/transaction', TransactionViewSet)

apps/permission/scopes.py

@@ -1,10 +1,8 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from oauth2_provider.oauth2_validators import OAuth2Validator
 from oauth2_provider.scopes import BaseScopes
 from member.models import Club
-from note.models import Alias
 from note_kfet.middlewares import get_current_request
 
 from .backends import PermissionBackend
@@ -18,58 +16,26 @@ class PermissionScopes(BaseScopes):
     and can be useful to make queries through the API with limited privileges.
     """
 
-    def get_all_scopes(self, **kwargs):
+    def get_all_scopes(self):
-        scopes = {}
+        return {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
-        if 'scopes' in kwargs:
-            for scope in kwargs['scopes']:
-                if scope == 'openid':
-                    scopes['openid'] = "OpenID Connect"
-                else:
-                    p = Permission.objects.get(id=scope.split('_')[0])
-                    club = Club.objects.get(id=scope.split('_')[1])
-                    scopes[scope] = f"{p.description} (club {club.name})"
-            return scopes
-
-        scopes = {f"{p.id}_{club.id}": f"{p.description} (club {club.name})"
                 for p in Permission.objects.all() for club in Club.objects.all()}
-        scopes['openid'] = "OpenID Connect"
-        return scopes
 
     def get_available_scopes(self, application=None, request=None, *args, **kwargs):
         if not application:
             return []
-        scopes = [f"{p.id}_{p.membership.club.id}"
+        return [f"{p.id}_{p.membership.club.id}"
                 for t in Permission.PERMISSION_TYPES
                 for p in PermissionBackend.get_raw_permissions(get_current_request(), t[0])]
-        scopes.append('openid')
-        return scopes
 
     def get_default_scopes(self, application=None, request=None, *args, **kwargs):
         if not application:
             return []
-        scopes = [f"{p.id}_{p.membership.club.id}"
+        return [f"{p.id}_{p.membership.club.id}"
                 for p in PermissionBackend.get_raw_permissions(get_current_request(), 'view')]
-        scopes.append('openid')
-        return scopes
 
 
 class PermissionOAuth2Validator(OAuth2Validator):
-    oidc_claim_scope = OAuth2Validator.oidc_claim_scope
+    oidc_claim_scope = None  # fix breaking change of django-oauth-toolkit 2.0.0
-    oidc_claim_scope.update({"name": 'openid',
-                             "normalized_name": 'openid',
-                             "email": 'openid',
-                             })
-
-    def get_additional_claims(self, request):
-        return {
-            "name": request.user.username,
-            "normalized_name": Alias.normalize(request.user.username),
-            "email": request.user.email,
-        }
-
-    def get_discovery_claims(self, request):
-        claims = super().get_discovery_claims(self)
-        return claims + ["name", "normalized_name", "email"]
 
     def validate_scopes(self, client_id, scopes, client, request, *args, **kwargs):
         """
@@ -88,8 +54,6 @@ class PermissionOAuth2Validator(OAuth2Validator):
                 if scope in scopes:
                     valid_scopes.add(scope)
 
-        if 'openid' in scopes:
-            valid_scopes.add('openid')
-
         request.scopes = valid_scopes
+
         return valid_scopes

apps/permission/signals.py

@@ -13,14 +13,12 @@ EXCLUDED = [
     'cas_server.serviceticket',
     'cas_server.user',
     'cas_server.userattributes',
-    'constance.constance',
     'contenttypes.contenttype',
     'logs.changelog',
     'migrations.migration',
     'oauth2_provider.accesstoken',
     'oauth2_provider.grant',
     'oauth2_provider.refreshtoken',
-    'oauth2_provider.idtoken',
     'sessions.session',
 ]
 

apps/permission/tests/test_permission_denied.py

@@ -10,7 +10,7 @@ from django.utils import timezone
 from django.utils.crypto import get_random_string
 from activity.models import Activity
 from member.models import Club, Membership
-from note.models import NoteUser, NoteClub
+from note.models import NoteUser
 from wei.models import WEIClub, Bus, WEIRegistration
 
 
@@ -122,13 +122,10 @@ class TestPermissionDenied(TestCase):
 
     def test_validate_weiregistration(self):
         wei = WEIClub.objects.create(
-            name="WEI Test",
             membership_start=date.today(),
             date_start=date.today() + timedelta(days=1),
             date_end=date.today() + timedelta(days=1),
-            parent_club=Club.objects.get(name="Kfet"),
         )
-        NoteClub.objects.create(club=wei)
         registration = WEIRegistration.objects.create(wei=wei, user=self.user, birth_date="2000-01-01")
         response = self.client.get(reverse("wei:validate_registration", kwargs=dict(pk=registration.pk)))
         self.assertEqual(response.status_code, 403)

apps/permission/views.py

@@ -164,24 +164,14 @@ class ScopesView(LoginRequiredMixin, TemplateView):
         from oauth2_provider.models import Application
         from .scopes import PermissionScopes
 
-        oidc = False
+        scopes = PermissionScopes()
         context["scopes"] = {}
+        all_scopes = scopes.get_all_scopes()
         for app in Application.objects.filter(user=self.request.user).all():
-            available_scopes = PermissionScopes().get_available_scopes(app)
+            available_scopes = scopes.get_available_scopes(app)
             context["scopes"][app] = OrderedDict()
-            all_scopes = PermissionScopes().get_all_scopes(scopes=available_scopes)
+            items = [(k, v) for (k, v) in all_scopes.items() if k in available_scopes]
-            scopes = {}
-            for scope in available_scopes:
-                scopes[scope] = all_scopes[scope]
-            # remove OIDC scope for sort
-            if 'openid' in scopes:
-                del scopes['openid']
-                oidc = True
-            items = [(k, v) for (k, v) in scopes.items()]
             items.sort(key=lambda x: (int(x[0].split("_")[1]), int(x[0].split("_")[0])))
-            # add oidc if necessary
-            if oidc:
-                items.append(('openid', PermissionScopes().get_all_scopes(scopes=['openid'])['openid']))
             for k, v in items:
                 context["scopes"][app][k] = v
 

apps/treasury/migrations/0010_alter_invoice_bde.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.20 on 2025-04-14 20:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('treasury', '0009_alter_sogecredit_transactions'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='invoice',
-            name='bde',
-            field=models.CharField(choices=[('Diolistos', 'Diol[list]os'), ('RavePartlist', 'RavePart[list]'), ('SecretStorlist', 'SecretStor[list]'), ('TotalistSpies', 'Tota[list]Spies'), ('Saperlistpopette', 'Saper[list]popette'), ('Finalist', 'Fina[list]'), ('Listorique', '[List]orique'), ('Satellist', 'Satel[list]'), ('Monopolist', 'Monopo[list]'), ('Kataclist', 'Katac[list]')], default='Diolistos', max_length=32, verbose_name='BDE'),
-        ),
-    ]

apps/treasury/models.py

@@ -29,7 +29,7 @@ class Invoice(models.Model):
         max_length=32,
         default='Diolistos',
         choices=(
-            ('Diolistos', 'Diol[list]os'),
+            ('Diolistos', 'Dio[list]os')
             ('RavePartlist', 'RavePart[list]'),
             ('SecretStorlist', 'SecretStor[list]'),
             ('TotalistSpies', 'Tota[list]Spies'),
@@ -353,11 +353,13 @@ class SogeCredit(models.Model):
     def amount(self):
         if self.valid:
             return self.credit_transaction.total
-        amount = 0
+        amount = sum(transaction.total for transaction in self.transactions.all())
-        transactions_wei = self.transactions.filter(membership__club__weiclub__isnull=False)
+        if 'wei' in settings.INSTALLED_APPS:
-        amount += sum(max(transaction.total - transaction.membership.club.weiclub.fee_soge_credit, 0) for transaction in transactions_wei)
+            from wei.models import WEIMembership
-        transactions_not_wei = self.transactions.filter(membership__club__weiclub__isnull=True)
+            if not WEIMembership.objects\
-        amount += sum(transaction.total for transaction in transactions_not_wei)
+                    .filter(club__weiclub__year=self.credit_transaction.created_at.year, user=self.user).exists():
+                # 80 € for people that don't go to WEI
+                amount += 8000
         return amount
 
     def update_transactions(self):
@@ -439,7 +441,7 @@ class SogeCredit(models.Model):
         With Great Power Comes Great Responsibility...
         """
 
-        total_fee = self.amount
+        total_fee = sum(transaction.total for transaction in self.transactions.all() if not transaction.valid)
         if self.user.note.balance < total_fee:
             raise ValidationError(_("This user doesn't have enough money to pay the memberships with its note. "
                                     "Please ask her/him to credit the note before invalidating this credit."))

apps/wei/api/views.py

@@ -77,7 +77,7 @@ class WEIRegistrationViewSet(ReadProtectedModelViewSet):
     filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter]
     filterset_fields = ['user', 'user__username', 'user__first_name', 'user__last_name', 'user__email',
                         'user__note__alias__name', 'user__note__alias__normalized_name', 'wei', 'wei__name',
-                        'wei__email', 'wei__year', 'soge_credit', 'deposit_given', 'birth_date', 'gender',
+                        'wei__email', 'wei__year', 'soge_credit', 'caution_check', 'birth_date', 'gender',
                         'clothing_cut', 'clothing_size', 'first_year', 'emergency_contact_name',
                         'emergency_contact_phone', ]
     search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email',

apps/wei/forms/__init__.py

@@ -1,8 +1,7 @@
 # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .registration import WEIForm, WEIRegistrationForm, WEIMembership1AForm, \
+from .registration import WEIForm, WEIRegistrationForm, WEIMembership1AForm, WEIMembershipForm, BusForm, BusTeamForm
-    WEIMembershipForm, BusForm, BusTeamForm
 from .surveys import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, CurrentSurvey
 
 __all__ = [

apps/wei/forms/registration.py

@@ -5,7 +5,7 @@ from bootstrap_datepicker_plus.widgets import DatePickerInput
 from django import forms
 from django.contrib.auth.models import User
 from django.db.models import Q
-from django.forms import CheckboxSelectMultiple, RadioSelect
+from django.forms import CheckboxSelectMultiple
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
 from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
@@ -24,8 +24,6 @@ class WEIForm(forms.ModelForm):
             "membership_end": DatePickerInput(),
             "date_start": DatePickerInput(),
             "date_end": DatePickerInput(),
-            "deposit_amount": AmountInput(),
-            "fee_soge_credit": AmountInput(),
         }
 
 
@@ -41,11 +39,7 @@ class WEIRegistrationForm(forms.ModelForm):
 
     class Meta:
         model = WEIRegistration
-        fields = [
+        exclude = ('wei', 'clothing_cut')
-            'user', 'soge_credit', 'birth_date', 'gender', 'clothing_size',
-            'health_issues', 'emergency_contact_name', 'emergency_contact_phone',
-            'first_year', 'information_json', 'deposit_given', 'deposit_type'
-        ]
         widgets = {
             "user": Autocomplete(
                 User,
@@ -55,14 +49,8 @@ class WEIRegistrationForm(forms.ModelForm):
                     'placeholder': 'Nom ...',
                 },
             ),
-            "birth_date": DatePickerInput(options={
+            "birth_date": DatePickerInput(options={'minDate': '1900-01-01',
-                'minDate': '1900-01-01',
+                                                   'maxDate': '2100-01-01'}),
-                'maxDate': '2100-01-01'
-            }),
-            "deposit_given": forms.CheckboxInput(
-                attrs={'class': 'form-check-input'},
-            ),
-            "deposit_type": forms.RadioSelect(),
         }
 
 
@@ -84,17 +72,22 @@ class WEIChooseBusForm(forms.Form):
     )
 
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")),
+        queryset=WEIRole.objects.filter(~Q(name="1A")),
         label=_("WEI Roles"),
         help_text=_("Select the roles that you are interested in."),
-        initial=WEIRole.objects.filter(Q(name="Adhérent⋅e WEI") | Q(name="\u00c9lectron libre")).all(),
+        initial=WEIRole.objects.filter(name="Adhérent⋅e WEI").all(),
         widget=CheckboxSelectMultiple(),
     )
 
 
 class WEIMembershipForm(forms.ModelForm):
+    caution_check = forms.BooleanField(
+        required=False,
+        label=_("Caution check given"),
+    )
+
     roles = forms.ModelMultipleChoiceField(
-        queryset=WEIRole.objects.filter(~Q(name="GC WEI")),
+        queryset=WEIRole.objects,
         label=_("WEI Roles"),
         widget=CheckboxSelectMultiple(),
     )
@@ -128,19 +121,6 @@ class WEIMembershipForm(forms.ModelForm):
         required=False,
     )
 
-    def __init__(self, *args, wei=None, **kwargs):
-        super().__init__(*args, **kwargs)
-        if 'bus' in self.fields:
-            if wei is not None:
-                self.fields['bus'].queryset = Bus.objects.filter(wei=wei)
-            else:
-                self.fields['bus'].queryset = Bus.objects.none()
-        if 'team' in self.fields:
-            if wei is not None:
-                self.fields['team'].queryset = BusTeam.objects.filter(bus__wei=wei)
-            else:
-                self.fields['team'].queryset = BusTeam.objects.none()
-
     def clean(self):
         cleaned_data = super().clean()
         if 'team' in cleaned_data and cleaned_data["team"] is not None \
@@ -152,8 +132,21 @@ class WEIMembershipForm(forms.ModelForm):
         model = WEIMembership
         fields = ('roles', 'bus', 'team',)
         widgets = {
-            "bus": RadioSelect(),
+            "bus": Autocomplete(
-            "team": RadioSelect(),
+                Bus,
+                attrs={
+                    'api_url': '/api/wei/bus/',
+                    'placeholder': 'Bus ...',
+                }
+            ),
+            "team": Autocomplete(
+                BusTeam,
+                attrs={
+                    'api_url': '/api/wei/team/',
+                    'placeholder': 'Équipe ...',
+                },
+                resetable=True,
+            ),
         }
 
 
@@ -161,7 +154,7 @@ class WEIMembership1AForm(WEIMembershipForm):
     """
     Used to confirm registrations of first year members without choosing a bus now.
     """
-    deposit_given = None
+    caution_check = None
     roles = None
 
     def clean(self):

apps/wei/forms/surveys/__init__.py

@@ -2,11 +2,11 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
-from .wei2025 import WEISurvey2025
+from .wei2024 import WEISurvey2024
 
 
 __all__ = [
     'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
 ]
 
-CurrentSurvey = WEISurvey2025
+CurrentSurvey = WEISurvey2024

apps/wei/forms/surveys/base.py

@@ -121,13 +121,6 @@ class WEISurveyAlgorithm:
         """
         raise NotImplementedError
 
-    @classmethod
-    def get_bus_information_form(cls):
-        """
-        The class of the form to update the bus information.
-        """
-        raise NotImplementedError
-
 
 class WEISurvey:
     """

apps/wei/forms/surveys/wei2025.py

@@ -1,622 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import time
-import json
-from functools import lru_cache
-from random import Random
-
-from django import forms
-from django.db import transaction
-from django.db.models import Q
-from django.utils.translation import gettext_lazy as _
-from django.utils.safestring import mark_safe
-
-from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
-from ...models import WEIMembership, Bus
-
-WORDS = {
-    'list': [
-        'Fiesta', 'Graillance', 'Move it move it', 'Calme', 'Nerd et geek', 'Jeux de rôles et danse rock',
-        'Strass et paillettes', 'Spectaculaire', 'Splendide', 'Flow inégalable', 'Rap', 'Battles légendaires',
-        'Techno', 'Alcool', 'Kiffeur·euse', 'Rugby', 'Médiéval', 'Festif',
-        'Stylé', 'Chipie', 'Rétro', 'Vache', 'Farfadet', 'Fanfare',
-    ],
-    'questions': {
-        "alcool": [
-            """Sur une échelle allant de 0 (= 0 alcool ou très peu) à 5 (= la fontaine de jouvence alcoolique),
-            quel niveau de consommation d’alcool souhaiterais-tu ?""",
-            {
-                42: 4,
-                47: 1,
-                48: 3,
-                45: 3.5,
-                44: 4,
-                46: 5,
-                43: 3,
-                49: 3
-            }
-        ],
-        "voie_post_bac": [
-            """Si la DA du bus de ton choix correspondait à une voie post-bac, laquelle serait-elle ?""",
-            {
-                42: "Double licence cuisine/arts du cirque option burger",
-                47: "BTS Exploration de donjon",
-                48: "Ecole des stars en herbe",
-                45: "Déscolarisation précoce",
-                44: "Rattrapage pour excès de kiff",
-                46: "Double cursus STAPS / Licence d’histoire",
-                43: "Recherche active d’un sugar daddy/d’un sugar mommy",
-                49: "Licence de musicologie"
-            }
-        ],
-        "boite": [
-            """Tu es seul·e sur une île déserte et devant toi il y a une sombre boîte de taille raisonnable.
-            Qu’y a-t-il à l’intérieur ?""",
-            {
-                42: "Un burgouzz de valouzz",
-                47: "Un ocarina (pour me téléporter hors de ce bourbier)",
-                48: "Des paillettes, un micro de karaoké et une enceinte bluetooth",
-                45: "Un kebab",
-                44: "Une 86 et un caisson pour taper du pied",
-                46: "Une épée, un ballon et une tireuse",
-                43: "Des lunettes de soleil",
-                49: "Mon instrument de musique"
-            }
-        ],
-        "tardif": [
-            """Il est 00h, tu as passé la journée à la plage avec tes copains et iels te proposent de prolonger parce
-            qu’après tout, il n’y a plus personne sur la plage à cette heure-ci. Tu n’habites pas loin mais t’enchaînes
-            demain avec une journée similaire avec un autre groupe d’amis parce que t’es trop #busy. Que fais-tu ?""",
-            {
-                42: "On veut se déchaîner toute la nuit !!",
-                47: "Je prends une glace et chill un moment avant d’aller dormir",
-                48: "J’enfile mes boogie shoes pour enflammer le dancefloor avec elleux et lancer un concours de slay, le perdant finit la bouteille de rhum",
-                45: "La fête continuuuuue",
-                44: "Soirée sangria plage → boîte → lever de soleil sur la plage",
-                46: "Minuit ? C’est l’heure du genepi. On commence les alcools forts !!",
-                43: "T’enchaînes direct (faut pas les priver de ta présence)",
-                49: "On continue en mode chill (soirée potins)"
-            }
-        ],
-        "cohesion": [
-            """C’est la rentrée de Seconde et tu découvres ta classe, tes camarades et ta prof principale!!!
-            qui vous propose une activité de cohésion. Laquelle est-elle ?""",
-            {
-                42: "Un relais cubi en ventriglisse",
-                47: "Un jeu de rôle",
-                48: "Organiser la soirée de l’année dans le lycée. Le thème : SLAY (Spotlight, Love, Amaze/All-night, Yeah), paillettes, disco",
-                45: "La prof de français propose un slam parce qu'elle pense que c'est du rap littéraire qui fera plaisir aux élèves",
-                44: "P’tit escape game + apéro",
-                46: "Joute avec des boucliers Gilbert",
-                43: "Tournage d’un clip de confessions nocturnes de Diam’s",
-                49: "Je sais pas j’ai raté mon BAFA"
-            }
-        ],
-        "artiste": [
-            """C’est l’été et la saison des festivals a commencé. Tu regardes la programmation du festival
-            pas loin de chez toi et tu découvres avec joie la présence d’un·e artiste. De qui s’agit-il ?""",
-            {
-                42: "Moto-Moto (il chantera son fameux tube “je les aime grosses, je les aime bombées”)",
-                47: "Hatsune Miku",
-                48: "Rihanna",
-                45: "Vald",
-                44: "Qui connaît vraiment les noms des artistes de tech ?",
-                46: "Perceval",
-                43: "Fatal bazooka",
-                49: "Måneskin"
-            }
-        ],
-        "annonce_noel": [
-            """C’est Noël et tu revois toute ta famille, oncles, tantes, cousin·e·s, grands-parents, la totale.
-            D’un coup, tu te lèves, tapotes de manière pompeuse sur ton verre avec un de tes couverts.
-            Qu’annonces-tu ?""",
-            {
-                42: """« Chère famille. Je sais bien que nous avions dit : pas de politique à table.
-                    Je ne peux toutefois me retenir de vous annoncer une grande nouvelle…
-                    j’ai décidé de quitter la ville pour consacrer ma vie au culte du Roi Julian.
-                    A moi la jungle luxuriante, là où le soleil chaud caresse les palmiers,
-                    où les lémuriens dansent avec frénésie et où chaque repas est une ode au burger sauvage.
-                    Longue vie à Sa Majesté le Roi Julian ! »""",
-                47: "« J’ai perdu »",
-                48: "« Mes chers parents je pars, j’arrête l’ENS pour devenir DJ slay à Ibiza »",
-                45: "J’interromps le repas pour rapper les 6min de bande organisée",
-                44: "« Digestif ? Pétanque ? Les deux ? »",
-                46: "« Montjoie St Denis à bas la Macronie »",
-                43: "« Je suis enceinte » (c’est faux j’ai juste besoin d’attention)",
-                49: """Discours de remerciement :
-                    je lance un powerpoint de 65 slides et sors une feuille A4 blanche (je fais semblant de lire mon discours dessus)"""
-            }
-        ],
-        "vacances": [
-            """Les vacances sont là et t’aimerais bien partir quelque part, mais où ?""",
-            {
-                42: "A Madagascar, à bord d’un bus conduit par des pingouins",
-                47: "Dans ma chambre",
-                48: "Rio de Janeiro",
-                45: "N'importe où tant qu'on peut sortir tous les soirs",
-                44: "Tu suis les plans du club ski ou de piratens",
-                46: "Carcassonne",
-                43: "Coachella",
-                49: "Dans les montagnes de la république populaire d’Auvergne-Rhônes-Alpes pour profiter de la fraîcheur, de la nature et de mes ami·e·s"
-            }
-        ],
-        "loisir": [
-            """T’as fini ta journée de cours et tu t’apprêtes à profiter d’une activité/hobby/loisir de ton choix.
-            Laquelle est-ce ?""",
-            {
-                42: "Cueillir des noix de coco",
-                47: "Essayer de travailler puis chill avec des potes autour d’un jeu en buvant du thé",
-                48: "Repet du nouveau spectacle de mon club, before (potins) puis sortie avec les potes jusqu’au bout de la night",
-                45: "Zoner avec les copaings jusqu’à pas d’heure",
-                44: "Go Kfet pour se faire traquenard jusqu’à 3h du mat",
-                46: "Déterminer ce qui est le plus solide entre mon crâne et une ecocup",
-                43: "Revoir pour la 6e fois gossip girl au fond de ton lit",
-                49: "Jouer de mon instrument préféré avec les copains/copines pour préparer le prochain concert #solidays"
-            }
-        ],
-        "plan": [
-            """Tu reçois un message sur la conversation de groupe que tu partages avec tes potes :
-            vous êtes chaud·e·s pour vous retrouver. Quel plan t’attire le plus ?""",
-            {
-                42: """Après-midi piscine, puis before arrosé de mojito,
-                    avant d’aller s’éclater en pot avec toute la savane et de finir sur un after spécial pina colada""",
-                47: """(matin) : Ptit jeu de rôle
-                    (repas) : le traditionnel poké-tacos
-                    (juste après le repas) : combat avec des épées en mousse avec les copains!
-                    (16h00) : pause thé
-                    (fin d’après midi) : initiation à la danse rock
-                    (soirée) : découverte d’un jeu de société avec des règles obscures
-                    """,
-                48: "Soirée champagne and chic : spectacle et dîner au moulin rouge puis soirée sur les champs",
-                45: "Se regrouper pour une soirée, même si il n’est encore que 10h",
-                44: "P’tit poké qui termine en koin koin avec after poker",
-                46: "Une dégustation de bière, un rugby et toute autre activité joviale",
-                43: "Un brunch de pour papoter puis friperies",
-                49: "Soirée raclette !"
-            }
-        ]
-    },
-    'stats': [
-        {
-            "question": """Le WEI est structuré par bus, et au sein de chaque bus, par équipes.
-                         Pour toi, être dans une équipe où tout le monde reste sobre (primo-entrants comme encadrants) c'est :""",
-            "answers": [
-                (1, "Inenvisageable"),
-                (2, "À contre cœur"),
-                (3, "Pourquoi pas"),
-                (4, "Souhaitable"),
-                (5, "Nécessaire"),
-            ],
-            "help_text": "(De toute façon aucun alcool n'est consommé pendant les trajets du bus, ni aller, ni retour.)",
-        },
-        {
-            "question": "Faire partie d'un bus qui n'apporte pas de boisson alcoolisée pour ses membres, pour toi c'est :",
-            "answers": [
-                (1, "Inenvisageable"),
-                (2, "À contre cœur"),
-                (3, "Pourquoi pas"),
-                (4, "Souhaitable"),
-                (5, "Nécessaire"),
-            ],
-            "help_text": """(Tout les bus apportent de l'alcool cette année, cette question sert à l'organisation pour l'année prochaine.
-                         De plus il y aura de toute façon de l'alcool commun au WEI et aucun alcool n'est consommé pendant les trajets en bus.)""",
-        },
-    ]
-}
-
-IMAGES = {
-    "vacances": {
-        49: "/static/wei/img/logo_auvergne_rhone_alpes.jpg",
-    }
-}
-
-NB_WORDS = 5
-
-
-class OptionalImageRadioSelect(forms.RadioSelect):
-    def __init__(self, images=None, *args, **kwargs):
-        self.images = images or {}
-        super().__init__(*args, **kwargs)
-
-    def create_option(self, name, value, label, selected, index, subindex=None, attrs=None):
-        option = super().create_option(name, value, label, selected, index, subindex=subindex, attrs=attrs)
-        img_url = self.images.get(value)
-        if img_url:
-            option['label'] = mark_safe(f'{label} <img src="{img_url}" style="height:32px;vertical-align:middle;">')
-        else:
-            option['label'] = label
-        return option
-
-
-class WEISurveyForm2025(forms.Form):
-    """
-    Survey form for the year 2025.
-    Members choose 20 words, from which we calculate the best associated bus.
-    """
-
-    def set_registration(self, registration):
-        """
-        Filter the bus selector with the buses of the current WEI.
-        """
-        information = WEISurveyInformation2025(registration)
-        if not information.seed:
-            information.seed = int(1000 * time.time())
-            information.save(registration)
-            registration._force_save = True
-            registration.save()
-
-        rng = Random((information.step + 1) * information.seed)
-
-        if information.step == 0:
-            self.fields["words"] = forms.MultipleChoiceField(
-                label=_(f"Select {NB_WORDS} words that describe the WEI experience you want to have."),
-                choices=[(w, w) for w in WORDS['list']],
-                widget=forms.CheckboxSelectMultiple(),
-                required=True,
-            )
-            if self.is_valid():
-                return
-
-            all_preferred_words = WORDS['list']
-            rng.shuffle(all_preferred_words)
-            self.fields["words"].choices = [(w, w) for w in all_preferred_words]
-        elif information.step <= len(WORDS['questions']):
-            questions = list(WORDS['questions'].items())
-            idx = information.step - 1
-            if idx < len(questions):
-                q, (desc, answers) = questions[idx]
-                if q == 'alcool':
-                    choices = [(i / 2, str(i / 2)) for i in range(11)]
-                else:
-                    choices = [(k, v) for k, v in answers.items()]
-                    rng.shuffle(choices)
-                self.fields[q] = forms.ChoiceField(
-                    label=desc,
-                    choices=choices,
-                    widget=OptionalImageRadioSelect(images=IMAGES.get(q, {})),
-                    required=True,
-                )
-        elif information.step == len(WORDS['questions']) + 1:
-            for i, v in enumerate(WORDS['stats']):
-                self.fields[f'stat_{i}'] = forms.ChoiceField(
-                    label=v['question'],
-                    choices=v['answers'],
-                    widget=forms.RadioSelect(),
-                    required=False,
-                    help_text=_(v.get('help_text', ''))
-                )
-
-    def clean_words(self):
-        data = self.cleaned_data['words']
-        if len(data) != NB_WORDS:
-            raise forms.ValidationError(_(f"Please choose exactly {NB_WORDS} words"))
-        return data
-
-
-class WEIBusInformation2025(WEIBusInformation):
-    """
-    For each word, the bus has a score
-    """
-    scores: dict
-
-    def __init__(self, bus):
-        self.scores = {}
-        super().__init__(bus)
-
-
-class BusInformationForm2025(forms.ModelForm):
-    class Meta:
-        model = Bus
-        fields = ['information_json']
-        widgets = {
-            'information_json': forms.HiddenInput(),
-        }
-
-    def __init__(self, *args, words=None, **kwargs):
-        super().__init__(*args, **kwargs)
-
-        initial_scores = {}
-        if self.instance and self.instance.information_json:
-            try:
-                info = json.loads(self.instance.information_json)
-                initial_scores = info.get("scores", {})
-            except (json.JSONDecodeError, TypeError, AttributeError):
-                initial_scores = {}
-        if words is None:
-            words = WORDS['list']
-        self.words = words
-
-        choices = [(i, str(i)) for i in range(6)]  # [(0, '0'), (1, '1'), ..., (5, '5')]
-        for word in words:
-            self.fields[word] = forms.TypedChoiceField(
-                label=word,
-                choices=choices,
-                coerce=int,
-                initial=initial_scores.get(word, 0) if word in initial_scores else None,
-                required=True,
-                widget=forms.RadioSelect,
-                help_text=_("Rate between 0 and 5."),
-            )
-
-    def clean(self):
-        cleaned_data = super().clean()
-        scores = {}
-        for word in self.words:
-            value = cleaned_data.get(word)
-            if value is not None:
-                scores[word] = value
-        # On encode en JSON
-        cleaned_data['information_json'] = json.dumps({"scores": scores})
-        return cleaned_data
-
-
-class WEISurveyInformation2025(WEISurveyInformation):
-    """
-    We store the id of the selected bus. We store only the name, but is not used in the selection:
-    that's only for humans that try to read data.
-    """
-    # Random seed that is stored at the first time to ensure that words are generated only once
-    seed = 0
-    step = 0
-
-    def __init__(self, registration):
-        for i in range(1, NB_WORDS + 1):
-            setattr(self, "word" + str(i), None)
-        for q in WORDS['questions']:
-            setattr(self, q, None)
-        super().__init__(registration)
-
-    def reset(self, registration):
-        """
-        Réinitialise complètement le questionnaire : step, seed, mots choisis et réponses aux questions.
-        """
-        self.step = 0
-        self.seed = 0
-        for i in range(1, NB_WORDS + 1):
-            setattr(self, f"word{i}", None)
-        for q in WORDS['questions']:
-            setattr(self, q, None)
-        self.save(registration)
-        registration._force_save = True
-        registration.save()
-
-
-class WEISurvey2025(WEISurvey):
-    """
-    Survey for the year 2025.
-    """
-
-    @classmethod
-    def get_year(cls):
-        return 2025
-
-    @classmethod
-    def get_survey_information_class(cls):
-        return WEISurveyInformation2025
-
-    def get_form_class(self):
-        return WEISurveyForm2025
-
-    def update_form(self, form):
-        """
-        Filter the bus selector with the buses of the WEI.
-        """
-        form.set_registration(self.registration)
-
-    @transaction.atomic
-    def form_valid(self, form):
-        if self.information.step == 0:
-            words = form.cleaned_data['words']
-            for i, word in enumerate(words, 1):
-                setattr(self.information, "word" + str(i), word)
-            self.information.step += 1
-            self.save()
-        elif 1 <= self.information.step <= len(WORDS['questions']):
-            questions = list(WORDS['questions'].keys())
-            idx = self.information.step - 1
-            if idx < len(questions):
-                q = questions[idx]
-                setattr(self.information, q, form.cleaned_data[q])
-                self.information.step += 1
-                self.save()
-        else:
-            for i, __ in enumerate(WORDS['stats']):
-                ans = form.cleaned_data.get(f'stat_{i}')
-                if ans is not None:
-                    setattr(self.information, f'stat_{i}', ans)
-            self.information.step += 1
-            self.save()
-
-    @classmethod
-    def get_algorithm_class(cls):
-        return WEISurveyAlgorithm2025
-
-    def is_complete(self) -> bool:
-        """
-        The survey is complete once the bus is chosen.
-        """
-        return self.information.step > len(WORDS['questions']) + 1
-
-    @classmethod
-    @lru_cache()
-    def word_mean(cls, word):
-        """
-        Calculate the mid-score given by all buses.
-        """
-        buses = cls.get_algorithm_class().get_buses()
-        return sum([cls.get_algorithm_class().get_bus_information(bus).scores[word] for bus in buses]) / buses.count()
-
-    @lru_cache()
-    def score_questions(self, bus):
-        """
-        The score given by the answers to the questions
-        """
-        if not self.is_complete():
-            raise ValueError("Survey is not ended, can't calculate score")
-        s = sum(1 for q in WORDS['questions'] if q != 'alcool' and getattr(self.information, q) == bus.pk)
-        if 'alcool' in WORDS['questions'] and bus.pk in WORDS['questions']['alcool'][1] and hasattr(self.information, 'alcool'):
-            s -= abs(float(self.information.alcool) - float(WORDS['questions']['alcool'][1][bus.pk]))
-        return s
-
-    @lru_cache()
-    def score_words(self, bus):
-        """
-        The score given by the choice of words
-        """
-        if not self.is_complete():
-            raise ValueError("Survey is not ended, can't calculate score")
-
-        bus_info = self.get_algorithm_class().get_bus_information(bus)
-        # Score is the given score by the bus subtracted to the mid-score of the buses.
-        s = sum(bus_info.scores[getattr(self.information, 'word' + str(i))]
-                - self.word_mean(getattr(self.information, 'word' + str(i))) for i in range(1, 1 + NB_WORDS)) / self.get_algorithm_class().get_buses().count()
-        return s
-
-    @lru_cache()
-    def scores_per_bus(self):
-        return {bus: (self.score_questions(bus), self.score_words(bus)) for bus in self.get_algorithm_class().get_buses()}
-
-    @lru_cache()
-    def ordered_buses(self):
-        """
-        Order the buses by the score_questions of the survey.
-        """
-        values = list(self.scores_per_bus().items())
-        values.sort(key=lambda item: -item[1][0])
-        return values
-
-    @classmethod
-    def clear_cache(cls):
-        cls.word_mean.cache_clear()
-        return super().clear_cache()
-
-
-class WEISurveyAlgorithm2025(WEISurveyAlgorithm):
-    """
-    The algorithm class for the year 2025.
-    We use Gale-Shapley algorithm to attribute 1y students into buses.
-    """
-
-    @classmethod
-    def get_survey_class(cls):
-        return WEISurvey2025
-
-    @classmethod
-    def get_bus_information_class(cls):
-        return WEIBusInformation2025
-
-    @classmethod
-    def get_bus_information_form(cls):
-        return BusInformationForm2025
-
-    @classmethod
-    def get_buses(cls):
-
-        if not hasattr(cls, '_buses'):
-            cls._buses = Bus.objects.filter(wei__year=cls.get_survey_class().get_year(), size__gt=0).all().exclude(name='Staff')
-        return cls._buses
-
-    def run_algorithm(self, display_tqdm=False):
-        """
-        Gale-Shapley algorithm implementation.
-        We modify it to allow buses to have multiple "weddings".
-        We use lexigographical order on both scores
-        """
-        surveys = list(self.get_survey_class()(r) for r in self.get_registrations())  # All surveys
-        surveys = [s for s in surveys if s.is_complete()]  # Don't consider invalid surveys
-        # Don't manage hardcoded people
-        surveys = [s for s in surveys if not hasattr(s.information, 'hardcoded') or not s.information.hardcoded]
-
-        # Reset previous algorithm run
-        for survey in surveys:
-            survey.free()
-            survey.save()
-
-        non_men = [s for s in surveys if s.registration.gender != 'male']
-        men = [s for s in surveys if s.registration.gender == 'male']
-
-        quotas = {}
-        registrations = self.get_registrations()
-        non_men_total = registrations.filter(~Q(gender='male')).count()
-        for bus in self.get_buses():
-            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
-            # Remove hardcoded people
-            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
-                                                       registration__information_json__icontains="hardcoded").count()
-            quotas[bus] = 4 + int(non_men_total / registrations.count() * free_seats)
-
-        tqdm_obj = None
-        if display_tqdm:
-            from tqdm import tqdm
-            tqdm_obj = tqdm(total=len(non_men), desc="Non-hommes")
-
-        # Repartition for non men people first
-        self.make_repartition(non_men, quotas, tqdm_obj=tqdm_obj)
-
-        quotas = {}
-        for bus in self.get_buses():
-            free_seats = bus.size - WEIMembership.objects.filter(bus=bus, registration__first_year=False).count()
-            free_seats -= sum(1 for s in non_men if s.information.selected_bus_pk == bus.pk)
-            # Remove hardcoded people
-            free_seats -= WEIMembership.objects.filter(bus=bus, registration__first_year=True,
-                                                       registration__information_json__icontains="hardcoded").count()
-            quotas[bus] = free_seats
-
-        if display_tqdm:
-            tqdm_obj.close()
-
-            from tqdm import tqdm
-            tqdm_obj = tqdm(total=len(men), desc="Hommes")
-
-        self.make_repartition(men, quotas, tqdm_obj=tqdm_obj)
-
-        if display_tqdm:
-            tqdm_obj.close()
-
-        # Clear cache information after running algorithm
-        WEISurvey2025.clear_cache()
-
-    def make_repartition(self, surveys, quotas=None, tqdm_obj=None):
-        free_surveys = surveys.copy()  # Remaining surveys
-        while free_surveys:  # Some students are not affected
-            survey = free_surveys[0]
-            buses = survey.ordered_buses()  # Preferences of the student
-            for bus, current_scores in buses:
-                if self.get_bus_information(bus).has_free_seats(surveys, quotas):
-                    # Selected bus has free places. Put student in the bus
-                    survey.select_bus(bus)
-                    survey.save()
-                    free_surveys.remove(survey)
-                    break
-                else:
-                    # Current bus has not enough places. Remove the least preferred student from the bus if existing
-                    least_preferred_survey = None
-                    least_score = -1
-                    # Find the least student in the bus that has a lower score than the current student
-                    for survey2 in surveys:
-                        if not survey2.information.valid or survey2.information.get_selected_bus() != bus:
-                            continue
-                        score2 = survey2.score_words(bus)
-                        if current_scores[1] <= score2:  # Ignore better students
-                            continue
-                        if least_preferred_survey is None or score2 < least_score:
-                            least_preferred_survey = survey2
-                            least_score = score2
-
-                    if least_preferred_survey is not None:
-                        # Remove the least student from the bus and put the current student in.
-                        # If it does not exist, choose the next bus.
-                        least_preferred_survey.free()
-                        least_preferred_survey.save()
-                        free_surveys.append(least_preferred_survey)
-                        survey.select_bus(bus)
-                        survey.save()
-                        free_surveys.remove(survey)
-                        break
-            else:
-                raise ValueError(f"User {survey.registration.user} has no free seat")
-
-            if tqdm_obj is not None:
-                tqdm_obj.n = len(surveys) - len(free_surveys)
-                tqdm_obj.refresh()

apps/wei/migrations/0011_alter_weiclub_year.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.21 on 2025-05-25 12:23
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0010_remove_weiregistration_specific_diet'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiclub',
-            name='year',
-            field=models.PositiveIntegerField(default=2025, unique=True, verbose_name='year'),
-        ),
-    ]

apps/wei/migrations/0012_bus_club.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.21 on 2025-05-29 16:16
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('member', '0014_create_bda'),
-        ('wei', '0011_alter_weiclub_year'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='bus',
-            name='club',
-            field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='bus', to='member.club', verbose_name='club'),
-        ),
-    ]

apps/wei/migrations/0013_weiclub_caution_amount_weiregistration_caution_type.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.21 on 2025-06-01 21:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0012_bus_club'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='weiclub',
-            name='caution_amount',
-            field=models.PositiveIntegerField(default=0, verbose_name='caution amount'),
-        ),
-        migrations.AddField(
-            model_name='weiregistration',
-            name='caution_type',
-            field=models.CharField(choices=[('check', 'Check'), ('note', 'Note transaction')], default='check', max_length=16, verbose_name='caution type'),
-        ),
-    ]

apps/wei/migrations/0014_weiclub_fee_soge_credit.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.23 on 2025-07-15 14:05
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0013_weiclub_caution_amount_weiregistration_caution_type'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='weiclub',
-            name='fee_soge_credit',
-            field=models.PositiveIntegerField(default=2000, verbose_name='fee soge credit'),
-        ),
-    ]

apps/wei/migrations/0015_remove_weiclub_caution_amount_and_more.py

@@ -1,40 +0,0 @@
-# Generated by Django 4.2.23 on 2025-07-15 16:03
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0014_weiclub_fee_soge_credit'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='weiclub',
-            name='caution_amount',
-        ),
-        migrations.RemoveField(
-            model_name='weiregistration',
-            name='caution_check',
-        ),
-        migrations.RemoveField(
-            model_name='weiregistration',
-            name='caution_type',
-        ),
-        migrations.AddField(
-            model_name='weiclub',
-            name='deposit_amount',
-            field=models.PositiveIntegerField(default=0, verbose_name='deposit amount'),
-        ),
-        migrations.AddField(
-            model_name='weiregistration',
-            name='deposit_check',
-            field=models.BooleanField(default=False, verbose_name='Deposit check given'),
-        ),
-        migrations.AddField(
-            model_name='weiregistration',
-            name='deposit_type',
-            field=models.CharField(choices=[('check', 'Check'), ('note', 'Note transaction')], default='check', max_length=16, verbose_name='deposit type'),
-        ),
-    ]

apps/wei/migrations/0016_weiregistration_fee_alter_weiclub_fee_soge_credit.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.2.4 on 2025-07-19 12:17
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0015_remove_weiclub_caution_amount_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='weiregistration',
-            name='fee',
-            field=models.PositiveIntegerField(blank=True, default=0, verbose_name='fee'),
-        ),
-        migrations.AlterField(
-            model_name='weiclub',
-            name='fee_soge_credit',
-            field=models.PositiveIntegerField(default=2000, verbose_name='membership fee (soge credit)'),
-        ),
-    ]

apps/wei/migrations/0017_alter_weiclub_fee_soge_credit.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-02 13:43
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0016_weiregistration_fee_alter_weiclub_fee_soge_credit'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='weiclub',
-            name='fee_soge_credit',
-            field=models.PositiveIntegerField(default=0, verbose_name='membership fee (soge credit)'),
-        ),
-    ]

apps/wei/migrations/0018_remove_weiregistration_deposit_check_and_more.py

@@ -1,22 +0,0 @@
-# Generated by Django 5.2.4 on 2025-08-02 17:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('wei', '0017_alter_weiclub_fee_soge_credit'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='weiregistration',
-            name='deposit_check',
-        ),
-        migrations.AddField(
-            model_name='weiregistration',
-            name='deposit_given',
-            field=models.BooleanField(default=False, verbose_name='Deposit given'),
-        ),
-    ]

apps/wei/models.py

@@ -33,16 +33,6 @@ class WEIClub(Club):
         verbose_name=_("date end"),
     )
 
-    deposit_amount = models.PositiveIntegerField(
-        verbose_name=_("deposit amount"),
-        default=0,
-    )
-
-    fee_soge_credit = models.PositiveIntegerField(
-        verbose_name=_("membership fee (soge credit)"),
-        default=0,
-    )
-
     class Meta:
         verbose_name = _("WEI")
         verbose_name_plural = _("WEI")
@@ -82,15 +72,6 @@ class Bus(models.Model):
         default=50,
     )
 
-    club = models.OneToOneField(
-        Club,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name="bus",
-        verbose_name=_("club"),
-    )
-
     description = models.TextField(
         blank=True,
         default="",
@@ -202,19 +183,9 @@ class WEIRegistration(models.Model):
         verbose_name=_("Credit from Société générale"),
     )
 
-    deposit_given = models.BooleanField(
+    caution_check = models.BooleanField(
         default=False,
-        verbose_name=_("Deposit given")
+        verbose_name=_("Caution check given")
-    )
-
-    deposit_type = models.CharField(
-        max_length=16,
-        choices=(
-            ('check', _("Check")),
-            ('note', _("Note transaction")),
-        ),
-        default='check',
-        verbose_name=_("deposit type"),
     )
 
     birth_date = models.DateField(
@@ -285,12 +256,6 @@ class WEIRegistration(models.Model):
                     "encoded in JSON"),
     )
 
-    fee = models.PositiveIntegerField(
-        default=0,
-        verbose_name=_('fee'),
-        blank=True,
-    )
-
     class Meta:
         unique_together = ('user', 'wei',)
         verbose_name = _("WEI User")
@@ -315,25 +280,7 @@ class WEIRegistration(models.Model):
         self.information_json = json.dumps(information, indent=2)
 
     @property
-    def is_validated(self):
+    def fee(self):
-        try:
-            return self.membership is not None
-        except AttributeError:
-            return False
-
-    @property
-    def validation_status(self):
-        """
-        Define an order to have easier access to validatable registrations
-        """
-        if self.fee + (self.wei.deposit_amount if self.deposit_type == 'note' else 0) > self.user.note.balance:
-            return 2
-        elif self.first_year:
-            return 1
-        else:
-            return 0
-
-    def calculate_fee(self):
         bde = Club.objects.get(pk=1)
         kfet = Club.objects.get(pk=2)
 
@@ -348,8 +295,7 @@ class WEIRegistration(models.Model):
             date_start__gte=bde.membership_start,
         ).exists()
 
-        fee = self.wei.fee_soge_credit if self.soge_credit \
+        fee = self.wei.membership_fee_paid if self.user.profile.paid \
-            else self.wei.membership_fee_paid if self.user.profile.paid \
             else self.wei.membership_fee_unpaid
         if not kfet_member:
             fee += kfet.membership_fee_paid if self.user.profile.paid \
@@ -360,9 +306,12 @@ class WEIRegistration(models.Model):
 
         return fee
 
-    def save(self, *args, **kwargs):
+    @property
-        self.fee = self.calculate_fee()
+    def is_validated(self):
-        super().save(*args, **kwargs)
+        try:
+            return self.membership is not None
+        except AttributeError:
+            return False
 
 
 class WEIMembership(Membership):

apps/wei/tables.py

@@ -58,8 +58,8 @@ class WEIRegistrationTable(tables.Table):
 
     validate = tables.Column(
         verbose_name=_("Validate"),
-        orderable=True,
+        orderable=False,
-        accessor='validate_status',
+        accessor=A('pk'),
         attrs={
             'th': {
                 'id': 'validate-membership-header'
@@ -71,7 +71,7 @@ class WEIRegistrationTable(tables.Table):
         'wei:wei_delete_registration',
         args=[A('pk')],
         orderable=False,
-        verbose_name=_("Delete"),
+        verbose_name=_("delete"),
         text=_("Delete"),
         attrs={
             'th': {
@@ -84,35 +84,6 @@ class WEIRegistrationTable(tables.Table):
         },
     )
 
-    def render_deposit_type(self, record):
-        if record.first_year:
-            return format_html("∅")
-        if record.deposit_type == 'check':
-            # TODO Install Font Awesome 6 to acces more icons (and keep compaibility with current used v4)
-            return format_html("""
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="1.5em" height="1.5em"
-        fill="currentColor" style="position: relative; left: -0.15em;">
-            <path d="
-                M128 128C92.7 128 64 156.7 64 192L64 448C64 483.3 92.7 512 128 512L512 512
-                C547.3 512 576 483.3 576 448L576 192C576 156.7 547.3 128 512 128L128 128z
-                M360 352L488 352C501.3 352 512 362.7 512 376C512 389.3 501.3 400 488 400L360 400
-                C346.7 400 336 389.3 336 376C336 362.7 346.7 352 360 352z
-                M336 264C336 250.7 346.7 240 360 240L488 240C501.3 240 512 250.7 512 264
-                C512 277.3 501.3 288 488 288L360 288C346.7 288 336 277.3 336 264z
-                M212 208C223 208 232 217 232 228L232 232L240 232C251 232 260 241 260 252
-                C260 263 251 272 240 272L192.5 272C185.6 272 180 277.6 180 284.5
-                C180 290.6 184.4 295.8 190.4 296.8L232.1 303.8C257.4 308 276 329.9 276 355.6
-                C276 381.7 257 403.3 232 407.4L232 412.1C232 423.1 223 432.1 212 432.1
-                C201 432.1 192 423.1 192 412.1L192 408.1L168 408.1C157 408.1 148 399.1 148 388.1
-                C148 377.1 157 368.1 168 368.1L223.5 368.1C230.4 368.1 236 362.5 236 355.6
-                C236 349.5 231.6 344.3 225.6 343.3L183.9 336.3C158.5 332 140 310.1 140 284.5
-                C140 255.7 163.2 232.3 192 232L192 228C192 217 201 208 212 208z
-            " />
-        </svg>
-    """)
-        if record.deposit_type == 'note':
-            return format_html("<i class=\"fa fa-exchange\"></i>")
-
     def render_validate(self, record):
         hasperm = PermissionBackend.check_perm(
             get_current_request(), "wei.add_weimembership", WEIMembership(
@@ -129,11 +100,10 @@ class WEIRegistrationTable(tables.Table):
 
         url = reverse_lazy('wei:validate_registration', args=(record.pk,))
         text = _('Validate')
-        status = record.validation_status
+        if record.fee > record.user.note.balance and not record.soge_credit:
-        if status == 2:
             btn_class = 'btn-secondary'
             tooltip = _("The user does not have enough money.")
-        elif status == 1:
+        elif record.first_year:
             btn_class = 'btn-info'
             tooltip = _("The user is in first year. You may validate the credit, the algorithm will run later.")
         else:
@@ -151,11 +121,10 @@ class WEIRegistrationTable(tables.Table):
         attrs = {
             'class': 'table table-condensed table-striped table-hover'
         }
-        order_by = ('validate', 'user',)
         model = WEIRegistration
         template_name = 'django_tables2/bootstrap4.html'
-        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'deposit_given',
+        fields = ('user', 'user__first_name', 'user__last_name', 'first_year', 'caution_check',
-                  'deposit_type', 'edit', 'validate', 'delete',)
+                  'edit', 'validate', 'delete',)
         row_attrs = {
             'class': 'table-row',
             'id': lambda record: "row-" + str(record.pk),
@@ -165,8 +134,8 @@ class WEIRegistrationTable(tables.Table):
 
 class WEIMembershipTable(tables.Table):
     user = tables.LinkColumn(
-        'wei:wei_update_membership',
+        'wei:wei_update_registration',
-        args=[A('pk')],
+        args=[A('registration__pk')],
     )
 
     year = tables.Column(
@@ -187,35 +156,6 @@ class WEIMembershipTable(tables.Table):
     def render_year(self, record):
         return str(record.user.profile.ens_year) + "A"
 
-    def render_registration__deposit_type(self, record):
-        if record.registration.first_year:
-            return format_html("∅")
-        if record.registration.deposit_type == 'check':
-            # TODO Install Font Awesome 6 to acces more icons (and keep compaibility with current used v4)
-            return format_html("""
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 640" width="1.5em" height="1.5em"
-        fill="currentColor" style="position: relative; left: -0.15em;">
-            <path d="
-                M128 128C92.7 128 64 156.7 64 192L64 448C64 483.3 92.7 512 128 512L512 512
-                C547.3 512 576 483.3 576 448L576 192C576 156.7 547.3 128 512 128L128 128z
-                M360 352L488 352C501.3 352 512 362.7 512 376C512 389.3 501.3 400 488 400L360 400
-                C346.7 400 336 389.3 336 376C336 362.7 346.7 352 360 352z
-                M336 264C336 250.7 346.7 240 360 240L488 240C501.3 240 512 250.7 512 264
-                C512 277.3 501.3 288 488 288L360 288C346.7 288 336 277.3 336 264z
-                M212 208C223 208 232 217 232 228L232 232L240 232C251 232 260 241 260 252
-                C260 263 251 272 240 272L192.5 272C185.6 272 180 277.6 180 284.5
-                C180 290.6 184.4 295.8 190.4 296.8L232.1 303.8C257.4 308 276 329.9 276 355.6
-                C276 381.7 257 403.3 232 407.4L232 412.1C232 423.1 223 432.1 212 432.1
-                C201 432.1 192 423.1 192 412.1L192 408.1L168 408.1C157 408.1 148 399.1 148 388.1
-                C148 377.1 157 368.1 168 368.1L223.5 368.1C230.4 368.1 236 362.5 236 355.6
-                C236 349.5 231.6 344.3 225.6 343.3L183.9 336.3C158.5 332 140 310.1 140 284.5
-                C140 255.7 163.2 232.3 192 232L192 228C192 217 201 208 212 208z
-            " />
-        </svg>
-    """)
-        if record.registration.deposit_type == 'note':
-            return format_html("<i class=\"fa fa-exchange\"></i>")
-
     class Meta:
         attrs = {
             'class': 'table table-condensed table-striped table-hover'
@@ -223,7 +163,7 @@ class WEIMembershipTable(tables.Table):
         model = WEIMembership
         template_name = 'django_tables2/bootstrap4.html'
         fields = ('user', 'user__last_name', 'user__first_name', 'registration__gender', 'user__profile__department',
-                  'year', 'bus', 'team', 'registration__deposit_given', 'registration__deposit_type')
+                  'year', 'bus', 'team', 'registration__caution_check', )
         row_attrs = {
             'class': 'table-row',
             'id': lambda record: "row-" + str(record.pk),

apps/wei/templates/wei/base.html

@@ -40,20 +40,22 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     <dt class="col-xl-6">{% trans 'membership fee'|capfirst %}</dt>
                     <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}</dd>
                     {% else %}
-
+                    {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %}
                     <dt class="col-xl-6">{% trans 'WEI fee (paid students)'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.membership_fee_paid|pretty_money }}
+                    <dd class="col-xl-6">{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }}
+                        <i class="fa fa-question-circle"
+                            title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
+                    {% endwith %}
 
+                    {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %}
                     <dt class="col-xl-6">{% trans 'WEI fee (unpaid students)'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.membership_fee_unpaid|pretty_money }}
+                    <dd class="col-xl-6">{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }}
+                        <i class="fa fa-question-circle"
+                            title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
+                    {% endwith %}
                     {% endif %}
                     {% endif %}
 
-                    {% if club.deposit_amount > 0 %}
-                    <dt class="col-xl-6">{% trans 'deposit amount'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ club.deposit_amount|pretty_money }}</dd>
-                    {% endif %}
-
                     {% if "note.view_note"|has_perm:club.note %}
                     <dt class="col-xl-6">{% trans 'balance'|capfirst %}</dt>
                     <dd class="col-xl-6">{{ club.note.balance | pretty_money }}</dd>

apps/wei/templates/wei/bus_detail.html

@@ -16,14 +16,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </div>
 
     <div class="card-footer text-center">
-        {% if object.club %}
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'member:club_detail' pk=object.club.pk %}"
-            data-turbolinks="false">{% trans "View club" %}</a>
-        {% endif %}
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:update_bus' pk=object.pk %}"
             data-turbolinks="false">{% trans "Edit" %}</a>
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:update_bus_info' pk=object.pk %}"
-            data-turbolinks="false">{% trans "Edit information for survey" %}</a>
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:add_team' pk=object.pk %}"
             data-turbolinks="false">{% trans "Add team" %}</a>
     </div>

apps/wei/templates/wei/busteam_detail.html

@@ -18,8 +18,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <div class="card-footer text-center">
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:update_bus' pk=bus.pk %}"
             data-turbolinks="false">{% trans "Edit" %}</a>
-        <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:manage_bus' pk=bus.pk %}"
-            data-turbolinks="false">{% trans "View" %}</a>
         <a class="btn btn-primary btn-sm my-1" href="{% url 'wei:add_team' pk=bus.pk %}"
             data-turbolinks="false">{% trans "Add team" %}</a>
     </div>

apps/wei/templates/wei/busteam_form.html

@@ -13,17 +13,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <div class="card-body">
         <form method="post">
             {% csrf_token %}
-            {{ form.media }} 
             {{ form|crispy }}
             <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button>
         </form>
     </div>
 </div>
-<script>
-    document.addEventListener("DOMContentLoaded", function () {
-        if (window.jscolor && jscolor.install) {
-            jscolor.install();
-        }
-    });
-</script>
 {% endblock %}

apps/wei/templates/wei/weiclub_detail.html

@@ -31,29 +31,15 @@ SPDX-License-Identifier: GPL-3.0-or-later
         <a class="btn btn-success" href="{% url "wei:wei_register_1A_myself" wei_pk=club.pk %}" data-turbolinks="false">
             {% trans "Register to the WEI! – 1A" %}
         </a>
-        {% else %}
-        <a class="btn btn-success" href="{% url "wei:wei_register_2A_myself" wei_pk=club.pk %}" data-turbolinks="false">
-            {% trans "Register to the WEI! – 2A+" %}
-        </a>
         {% endif %}
+        <a class="btn btn-success" href="{% url "wei:wei_register_2A_myself" wei_pk=club.pk %}" data-turbolinks="false">
+            {% trans "Register to the WEI! – 2A+" %}</a>
         {% else %}
-        {% if registration.validated %}
         <a class="btn btn-warning" href="{% url "wei:wei_update_registration" pk=my_registration.pk %}"
             data-turbolinks="false">
             {% trans "Update my registration" %}
         </a>
         {% endif %}
-        {% if my_registration.first_year %}
-        {% if not survey_complete %}
-        <a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}" data-turbolinks="false">
-            {% trans "Continue survey" %}
-        </a>
-        {% endif %}
-        <a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}?reset=true" data-turbolinks="false">
-            {% trans "Restart survey" %}
-        </a>
-        {% endif %}
-        {% endif %}
     </div>
     {% endif %}
 </div>
@@ -81,6 +67,20 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </div>
 {% endif %}
 
+{% if history_list.data %}
+<div class="card bg-white mb-3">
+    <div class="card-header position-relative" id="historyListHeading">
+        <a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:club.note %}
+            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
+            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
+        </a>
+    </div>
+    <div id="history_list">
+        {% render_table history_list %}
+    </div>
+</div>
+{% endif %}
+
 {% if pre_registrations.data %}
 <div class="card bg-white mb-3">
     <div class="card-header position-relative" id="historyListHeading">
@@ -95,24 +95,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
 </div>
 {% endif %}
 
-{% if can_validate_1a %}
+    {% if can_validate_1a %}
         <a href="{% url 'wei:wei_1A_list' pk=object.pk %}" class="btn btn-block btn-info">{% trans "Attribute buses" %}</a>
-{% endif %}
+    {% endif %}
-
-{% if history_list.data %}
-<div class="card bg-white mt-3">
-    <div class="card-header position-relative" id="historyListHeading">
-        <a class="stretched-link font-weight-bold text-decoration-none" {% if "note.view_note"|has_perm:club.note %}
-            href="{% url 'note:transactions' pk=club.note.pk %}" {% endif %}>
-            <i class="fa fa-euro"></i> {% trans "Transaction history" %}
-        </a>
-    </div>
-    <div id="history_list">
-        {% render_table history_list %}
-    </div>
-</div>
-{% endif %}
-
 {% endblock %}
 
 {% block extrajavascript %}

apps/wei/templates/wei/weimembership_form.html

@@ -95,8 +95,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <dd class="col-xl-6"><em>{% trans "The algorithm didn't run." %}</em></dd>
                     {% endif %}
                 {% else %}
-                    <dt class="col-xl-6">{% trans 'Deposit check given'|capfirst %}</dt>
+                    <dt class="col-xl-6">{% trans 'caution check given'|capfirst %}</dt>
-                    <dd class="col-xl-6">{{ registration.deposit_given|yesno }}</dd>
+                    <dd class="col-xl-6">{{ registration.caution_check|yesno }}</dd>
 
                     {% with information=registration.information %}
                         <dt class="col-xl-6">{% trans 'preferred bus'|capfirst %}</dt>
@@ -137,41 +137,33 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 {% if registration.soge_credit %}
                     <div class="alert alert-warning">
                         {% blocktrans trimmed %}
-                            The WEI will partially be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
+                            The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet.
                             The membership transaction will be created but will be invalid. You will have to validate it once the bank
                             validated the creation of the account, or to change the payment method.
                         {% endblocktrans %}
                     </div>
-                {% endif %}
-                <div class="alert {% if registration.validation_status == 2 %}alert-danger{% else %}alert-success{% endif %}">
-                    <h5>{% trans "Required payments:" %}</h5>
-                    <ul>
-                        <li>{% blocktrans trimmed with amount=fee|pretty_money %}
-                            Membership fees: {{ amount }}
-                        {% endblocktrans %}</li>
-                        {% if not registration.first_year %}
-                        {% if registration.deposit_type == 'note' %}
-                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
-                                Deposit (by Note transaction): {{ amount }}
-                            {% endblocktrans %}</li>
                 {% else %}
-                            <li>{% blocktrans trimmed with amount=club.deposit_amount|pretty_money %}
+                    {% if registration.user.note.balance < fee %}
-                                Deposit (by check): {{ amount }}
-                            {% endblocktrans %}</li>
-                        {% endif %}
-                        {% endif %}
-                        <li><strong>{% blocktrans trimmed with total=total_needed|pretty_money %}
-                            Total needed: {{ total }}
-                        {% endblocktrans %}</strong></li>
-                    </ul>
-                    <p>{% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
-                        Current balance: {{ balance }}
-                    {% endblocktrans %}</p>
-                    </div>
-
-                {% if not registration.deposit_given and not registration.first_year and registration.caution_type == 'check' %}
                         <div class="alert alert-danger">
-                        {% trans "The user didn't give her/his caution." %}
+                            {% with pretty_fee=fee|pretty_money %}
+                            {% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %}
+                                The note don't have enough money ({{ balance }}, {{ pretty_fee }} required).
+                                The registration may fail if you don't credit the note now.
+                            {% endblocktrans %}
+                            {% endwith %}
+                        </div>
+                    {% else %}
+                        <div class="alert alert-success">
+                            {% blocktrans trimmed with pretty_fee=fee|pretty_money %}
+                                The note has enough money ({{ pretty_fee }} required), the registration is possible.
+                            {% endblocktrans %}
+                        </div>
+                    {% endif %}
+                {% endif %}
+
+                {% if not registration.caution_check and not registration.first_year %}
+                    <div class="alert alert-danger">
+                        {% trans "The user didn't give her/his caution check." %}
                     </div>
                 {% endif %}
 
@@ -208,26 +200,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
             }
         }
     </script>
-    <script>
-        $(document).ready(function () {
-            function refreshTeams() {
-                let buses = [];
-                $("input[name='bus']:checked").each(function (ignored) {
-                    buses.push($(this).parent().text().trim());
-                });
-                $("input[name='team']").each(function () {
-                    let label = $(this).parent();
-                    $(this).parent().addClass('d-none');
-                    buses.forEach(function (bus) {
-                        if (label.text().includes(bus))
-                            label.removeClass('d-none');
-                    });
-                });
-            }
-    
-            $("input[name='bus']").change(refreshTeams);
-    
-            refreshTeams();
-        });
-    </script>
 {% endblock %}

apps/wei/templates/wei/weimembership_update.html

@@ -1,46 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n crispy_forms_tags %}
-
-{% block content %}
-<div class="card bg-white mb-3">
-  <h3 class="card-header text-center">
-    {{ title }}
-  </h3>
-  <div class="card-body" id="form">
-    <form method="post">
-      {% csrf_token %}
-      {{ form | crispy }}
-      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}
-
-{% block extrajavascript %}
-    <script>
-        $(document).ready(function () {
-            function refreshTeams() {
-                let buses = [];
-                $("input[name='bus']:checked").each(function (ignored) {
-                    buses.push($(this).parent().text().trim());
-                });
-                $("input[name='team']").each(function () {
-                    let label = $(this).parent();
-                    $(this).parent().addClass('d-none');
-                    buses.forEach(function (bus) {
-                        if (label.text().includes(bus))
-                            label.removeClass('d-none');
-                    });
-                });
-            }
-    
-            $("input[name='bus']").change(refreshTeams);
-    
-            refreshTeams();
-        });
-    </script>
-{% endblock %}

apps/wei/tests/test_wei_algorithm_2024.py

@@ -6,6 +6,8 @@ from datetime import date, timedelta
 
 from django.contrib.auth.models import User
 from django.test import TestCase
+from django.urls import reverse
+from note.models import NoteUser
 
 from ..forms.surveys.wei2024 import WEIBusInformation2024, WEISurvey2024, WORDS, WEISurveyInformation2024
 from ..models import Bus, WEIClub, WEIRegistration
@@ -127,3 +129,44 @@ class TestWEIAlgorithm(TestCase):
             self.assertLessEqual(max_score - score, 25)  # Always less than 25 % of tolerance
 
         self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %
+
+    def test_register_1a(self):
+        """
+        Test register a first year member to the WEI and complete the survey
+        """
+        response = self.client.get(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)))
+        self.assertEqual(response.status_code, 200)
+
+        user = User.objects.create(username="toto", email="toto@example.com")
+        NoteUser.objects.create(user=user)
+        response = self.client.post(reverse("wei:wei_register_1A", kwargs=dict(wei_pk=self.wei.pk)), dict(
+            user=user.id,
+            soge_credit=True,
+            birth_date=date(2000, 1, 1),
+            gender='nonbinary',
+            clothing_cut='female',
+            clothing_size='XS',
+            health_issues='I am a bot',
+            emergency_contact_name='NoteKfet2020',
+            emergency_contact_phone='+33123456789',
+        ))
+        qs = WEIRegistration.objects.filter(user_id=user.id)
+        self.assertTrue(qs.exists())
+        registration = qs.get()
+        self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302, 200)
+        for question in WORDS:
+            # Fill 1A Survey, 10 pages
+            # be careful if questionnary form change (number of page, type of answer...)
+            response = self.client.post(reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), {
+                question: "1"
+            })
+            registration.refresh_from_db()
+            survey = WEISurvey2024(registration)
+            self.assertRedirects(response, reverse("wei:wei_survey", kwargs=dict(pk=registration.pk)), 302,
+                                 302 if survey.is_complete() else 200)
+            self.assertIsNotNone(getattr(survey.information, question), "Survey page " + question + " failed")
+        survey = WEISurvey2024(registration)
+        self.assertTrue(survey.is_complete())
+        survey.select_bus(self.buses[0])
+        survey.save()
+        self.assertIsNotNone(survey.information.get_selected_bus())

apps/wei/tests/test_wei_algorithm_2025.py

@@ -1,129 +0,0 @@
-# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-import random
-
-from django.contrib.auth.models import User
-from django.test import TestCase
-
-from ..forms.surveys.wei2025 import WEIBusInformation2025, WEISurvey2025, WORDS, NB_WORDS, WEISurveyInformation2025
-from ..models import Bus, WEIClub, WEIRegistration
-
-
-class TestWEIAlgorithm(TestCase):
-    """
-    Run some tests to ensure that the WEI algorithm is working well.
-    """
-    fixtures = ('initial',)
-
-    def setUp(self):
-        """
-        Create some test data, with one WEI and 10 buses with random score attributions.
-        """
-        self.wei = WEIClub.objects.create(
-            name="WEI 2025",
-            email="wei2025@example.com",
-            date_start='2025-09-12',
-            date_end='2025-09-14',
-            year=2025,
-            membership_start='2025-06-01'
-        )
-
-        self.buses = []
-        for i in range(8):
-            bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
-            self.buses.append(bus)
-            information = WEIBusInformation2025(bus)
-            for word in WORDS['list']:
-                information.scores[word] = random.randint(0, 6)
-            information.save()
-            bus.save()
-
-    def test_survey_algorithm_small(self):
-        """
-        There are only a few people in each bus, ensure that each person has its best bus
-        """
-        # Add a few users
-        for i in range(10):
-            user = User.objects.create(username=f"user{i}")
-            registration = WEIRegistration.objects.create(
-                user=user,
-                wei=self.wei,
-                first_year=True,
-                birth_date='2000-01-01',
-            )
-            information = WEISurveyInformation2025(registration)
-            for j in range(1, 1 + NB_WORDS):
-                setattr(information, f'word{j}', random.choice(WORDS['list']))
-            for q in WORDS['questions']:
-                setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
-            information.step = len(WORDS['questions']) + 2
-            information.save(registration)
-            registration.save()
-
-        # Run algorithm
-        WEISurvey2025.get_algorithm_class()().run_algorithm()
-
-        # Ensure that everyone has its first choice
-        for r in WEIRegistration.objects.filter(wei=self.wei).all():
-            survey = WEISurvey2025(r)
-            preferred_bus = survey.ordered_buses()[0][0]
-            chosen_bus = survey.information.get_selected_bus()
-            self.assertEqual(preferred_bus, chosen_bus)
-
-    def test_survey_algorithm_full(self):
-        """
-        Buses are full of first year people, ensure that they are happy
-        """
-        # Add a lot of users
-        for i in range(80):
-            user = User.objects.create(username=f"user{i}")
-            registration = WEIRegistration.objects.create(
-                user=user,
-                wei=self.wei,
-                first_year=True,
-                birth_date='2000-01-01',
-            )
-            information = WEISurveyInformation2025(registration)
-            for j in range(1, 1 + NB_WORDS):
-                setattr(information, f'word{j}', random.choice(WORDS['list']))
-            for q in WORDS['questions']:
-                setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys())))
-            information.step = len(WORDS['questions']) + 2
-            information.save(registration)
-            registration.save()
-            survey = WEISurvey2025(registration)
-
-        # Run algorithm
-        WEISurvey2025.get_algorithm_class()().run_algorithm()
-
-        penalty = 0
-        # Ensure that everyone seems to be happy
-        # We attribute a penalty for each user that didn't have its first choice
-        # The penalty is the square of the distance between the score of the preferred bus
-        # and the score of the attributed bus
-        # We consider it acceptable if the mean of this distance is lower than 5 %
-        for r in WEIRegistration.objects.filter(wei=self.wei).all():
-            survey = WEISurvey2025(r)
-            chosen_bus = survey.information.get_selected_bus()
-            buses = survey.ordered_buses()
-            self.assertIn(chosen_bus, [x[0] for x in buses])
-            score_questions, score_words = next(scores for bus, scores in buses if bus == chosen_bus)
-            max_score_questions = max(buses[i][1][0] for i in range(len(buses)))
-            max_score_words = max(buses[i][1][1] for i in range(len(buses)))
-            penalty += (max_score_words - score_words) ** 2
-            penalty += (max_score_questions - score_questions) ** 2
-        self.assertLessEqual(penalty / 100, 25)  # Tolerance of 5 %
-
-        # There shouldn't be users who would prefer to switch buses
-        for r1 in WEIRegistration.objects.filter(wei=self.wei).all():
-            survey1 = WEISurvey2025(r1)
-            bus1 = survey1.information.get_selected_bus()
-            for r2 in WEIRegistration.objects.filter(wei=self.wei, pk__gt=r1.pk):
-                survey2 = WEISurvey2025(r2)
-                bus2 = survey2.information.get_selected_bus()
-
-                prefer_switch_bus_words = survey1.score_words(bus2) > survey1.score_words(bus1) and survey2.score_words(bus1) > survey2.score_words(bus2)
-                prefer_switch_bus_questions = survey1.score_questions(bus2) > survey1.score_questions(bus1) and\
-                    survey2.score_questions(bus1) > survey2.score_questions(bus2)
-                self.assertFalse(prefer_switch_bus_words and prefer_switch_bus_questions)

apps/wei/tests/test_wei_registration.py

@@ -101,7 +101,7 @@ class TestWEIRegistration(TestCase):
             user_id=self.user.id,
             wei_id=self.wei.id,
             soge_credit=True,
-            deposit_given=True,
+            caution_check=True,
             birth_date=date(2000, 1, 1),
             gender="nonbinary",
             clothing_cut="male",
@@ -121,13 +121,11 @@ class TestWEIRegistration(TestCase):
             email="gc.wei@example.com",
             membership_fee_paid=12500,
             membership_fee_unpaid=5500,
-            fee_soge_credit=2000,
             membership_start=str(self.year + 1) + "-08-01",
             membership_end=str(self.year + 1) + "-09-30",
             year=self.year + 1,
             date_start=str(self.year + 1) + "-09-01",
             date_end=str(self.year + 1) + "-09-03",
-            deposit_amount=12000,
         ))
         qs = WEIClub.objects.filter(name="Create WEI Test", year=self.year + 1)
         self.assertTrue(qs.exists())
@@ -158,12 +156,10 @@ class TestWEIRegistration(TestCase):
             email="wei-updated@example.com",
             membership_fee_paid=0,
             membership_fee_unpaid=0,
-            fee_soge_credit=0,
             membership_start="2000-08-01",
             membership_end="2000-09-30",
             date_start="2000-09-01",
             date_end="2000-09-03",
-            deposit_amount=12000,
         ))
         qs = WEIClub.objects.filter(name="Update WEI Test", id=self.wei.id)
         self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=self.wei.pk)), 302, 200)
@@ -322,7 +318,6 @@ class TestWEIRegistration(TestCase):
             bus=[],
             team=[],
             roles=[],
-            deposit_type='check'
         ))
         self.assertEqual(response.status_code, 200)
         self.assertFalse(response.context["membership_form"].is_valid())
@@ -339,8 +334,7 @@ class TestWEIRegistration(TestCase):
             emergency_contact_phone='+33123456789',
             bus=[self.bus.id],
             team=[self.team.id],
-            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A") & ~Q(name="GC WEI")).all()],
+            roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
-            deposit_type='check'
         ))
         qs = WEIRegistration.objects.filter(user_id=user.id)
         self.assertTrue(qs.exists())
@@ -360,7 +354,6 @@ class TestWEIRegistration(TestCase):
             bus=[self.bus.id],
             team=[self.team.id],
             roles=[role.id for role in WEIRole.objects.filter(~Q(name="1A")).all()],
-            deposit_type='check'
         ))
         self.assertEqual(response.status_code, 200)
         self.assertTrue("This user is already registered to this WEI." in str(response.context["form"].errors))
@@ -513,12 +506,11 @@ class TestWEIRegistration(TestCase):
                 team=[self.team.id],
                 roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
                 information_json=self.registration.information_json,
-                deposit_type='check'
             )
         )
         qs = WEIRegistration.objects.filter(user_id=self.user.id, soge_credit=False, clothing_size="M")
         self.assertTrue(qs.exists())
-        self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=qs.get().wei.pk)), 302, 200)
+        self.assertRedirects(response, reverse("wei:validate_registration", kwargs=dict(pk=qs.get().pk)), 302, 200)
 
         # Check the page when the registration is already validated
         membership = WEIMembership(
@@ -568,12 +560,11 @@ class TestWEIRegistration(TestCase):
                 team=[self.team.id],
                 roles=[role.id for role in WEIRole.objects.filter(name="Adhérent⋅e WEI").all()],
                 information_json=self.registration.information_json,
-                deposit_type='check'
             )
         )
         qs = WEIRegistration.objects.filter(user_id=self.user.id, clothing_size="L")
         self.assertTrue(qs.exists())
-        self.assertRedirects(response, reverse("wei:wei_detail", kwargs=dict(pk=qs.get().wei.pk)), 302, 200)
+        self.assertRedirects(response, reverse("wei:validate_registration", kwargs=dict(pk=qs.get().pk)), 302, 200)
 
         # Test invalid form
         response = self.client.post(
@@ -592,7 +583,6 @@ class TestWEIRegistration(TestCase):
                 team=[],
                 roles=[],
                 information_json=self.registration.information_json,
-                deposit_type='check'
             )
         )
         self.assertFalse(response.context["membership_form"].is_valid())
@@ -634,7 +624,7 @@ class TestWEIRegistration(TestCase):
         second_bus = Bus.objects.create(wei=self.wei, name="Second bus")
         second_team = BusTeam.objects.create(bus=second_bus, name="Second team", color=42)
         response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
-            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
+            roles=[WEIRole.objects.get(name="GC WEI").id],
             bus=self.bus.pk,
             team=second_team.pk,
             credit_type=4,  # Bank transfer
@@ -642,14 +632,13 @@ class TestWEIRegistration(TestCase):
             last_name="admin",
             first_name="admin",
             bank="Société générale",
-            deposit_given=True,
         ))
         self.assertEqual(response.status_code, 200)
         self.assertFalse(response.context["form"].is_valid())
         self.assertTrue("This team doesn't belong to the given bus." in str(response.context["form"].errors))
 
         response = self.client.post(reverse("wei:validate_registration", kwargs=dict(pk=self.registration.pk)), dict(
-            roles=[WEIRole.objects.get(name="Adhérent⋅e WEI").id],
+            roles=[WEIRole.objects.get(name="GC WEI").id],
             bus=self.bus.pk,
             team=self.team.pk,
             credit_type=4,  # Bank transfer
@@ -657,10 +646,8 @@ class TestWEIRegistration(TestCase):
             last_name="admin",
             first_name="admin",
             bank="Société générale",
-            deposit_given=True,
         ))
         self.assertRedirects(response, reverse("wei:wei_registrations", kwargs=dict(pk=self.registration.wei.pk)), 302, 200)
-
         # Check if the membership is successfully created
         membership = WEIMembership.objects.filter(user_id=self.user.id, club=self.wei)
         self.assertTrue(membership.exists())
@@ -680,7 +667,11 @@ class TestWEIRegistration(TestCase):
             self.assertTrue(soge_credit.exists())
             soge_credit = soge_credit.get()
             self.assertTrue(membership.transaction in soge_credit.transactions.all())
+            self.assertTrue(kfet_membership.transaction in soge_credit.transactions.all())
+            self.assertTrue(bde_membership.transaction in soge_credit.transactions.all())
             self.assertFalse(membership.transaction.valid)
+            self.assertFalse(kfet_membership.transaction.valid)
+            self.assertFalse(bde_membership.transaction.valid)
 
         # Check that if the WEI is started, we can't update a wei
         self.wei.date_start = date(2000, 1, 1)
@@ -776,7 +767,7 @@ class TestDefaultWEISurvey(TestCase):
         WEISurvey.update_form(None, None)
 
         self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
-        self.assertEqual(CurrentSurvey.get_year(), 2025)
+        self.assertEqual(CurrentSurvey.get_year(), 2024)
 
 
 class TestWeiAPI(TestAPI):
@@ -813,7 +804,7 @@ class TestWeiAPI(TestAPI):
             user_id=self.user.id,
             wei_id=self.wei.id,
             soge_credit=True,
-            deposit_given=True,
+            caution_check=True,
             birth_date=date(2000, 1, 1),
             gender="nonbinary",
             clothing_cut="male",

apps/wei/urls.py

@@ -4,10 +4,10 @@
 from django.urls import path
 
 from .views import CurrentWEIDetailView, WEI1AListView, WEIListView, WEICreateView, WEIDetailView, WEIUpdateView, \
-    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, BusInformationUpdateView, \
+    WEIRegistrationsView, WEIMembershipsView, MemberListRenderView, \
     BusCreateView, BusManageView, BusUpdateView, BusTeamCreateView, BusTeamManageView, BusTeamUpdateView, \
     WEIAttributeBus1AView, WEIAttributeBus1ANextView, WEIRegister1AView, WEIRegister2AView, WEIUpdateRegistrationView, \
-    WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView, WEIUpdateMembershipView
+    WEIDeleteRegistrationView, WEIValidateRegistrationView, WEISurveyView, WEISurveyEndView, WEIClosedView
 
 app_name = 'wei'
 urlpatterns = [
@@ -42,7 +42,4 @@ urlpatterns = [
     path('detail/<int:pk>/closed/', WEIClosedView.as_view(), name="wei_closed"),
     path('bus-1A/<int:pk>/', WEIAttributeBus1AView.as_view(), name="wei_bus_1A"),
     path('bus-1A/next/<int:pk>/', WEIAttributeBus1ANextView.as_view(), name="wei_bus_1A_next"),
-    path('update-bus-info/<int:pk>/', BusInformationUpdateView.as_view(), name="update_bus_info"),
-
-    path('edit_membership/<int:pk>/', WEIUpdateMembershipView.as_view(), name="wei_update_membership"),
 ]

apps/wei/views.py

@@ -4,18 +4,16 @@
 import os
 import shutil
 import subprocess
-from datetime import date
+from datetime import date, timedelta
 from tempfile import mkdtemp
 
 from django.conf import settings
-from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
 from django.db import transaction
-from django.db.models import Q, Count, Case, When, Value, IntegerField, F
+from django.db.models import Q, Count
 from django.db.models.functions.text import Lower
-from django import forms
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
@@ -27,7 +25,7 @@ from django.views.generic.edit import BaseFormView, DeleteView
 from django_tables2 import SingleTableView, MultiTableMixin
 from api.viewsets import is_regex
 from member.models import Membership, Club
-from note.models import Transaction, NoteClub, Alias, SpecialTransaction
+from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial
 from note.tables import HistoryTable
 from note_kfet.settings import BASE_DIR
 from permission.backends import PermissionBackend
@@ -133,23 +131,6 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
             membership=None,
             wei=club
         )
-        # Annotate the query to be able to sort registrations on validate status
-        pre_registrations = pre_registrations.annotate(
-            deposit=Case(
-                When(deposit_type='note', then=F('wei__deposit_amount')),
-                default=Value(0),
-                output_field=IntegerField()
-            )
-        ).annotate(
-            total_fee=F('fee') + F('deposit')
-        ).annotate(
-            validate_status=Case(
-                When(total_fee__gt=F('user__note__balance'), then=Value(2)),
-                When(first_year=True, then=Value(1)),
-                default=Value(0),
-                output_field=IntegerField(),
-            )
-        )
         buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request, Bus, "view")) \
             .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name")
         return [club_transactions, club_member, pre_registrations, buses, ]
@@ -166,7 +147,6 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
         my_registration = WEIRegistration.objects.filter(wei=club, user=self.request.user)
         if my_registration.exists():
             my_registration = my_registration.get()
-            context["survey_complete"] = CurrentSurvey(my_registration).is_complete()
         else:
             my_registration = None
         context["my_registration"] = my_registration
@@ -214,8 +194,6 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D
 
         context["not_first_year"] = WEIMembership.objects.filter(user=self.request.user).exists()
 
-        context["registration_validated"] = WEIMembership.objects.filter(registration=my_registration).exists() if my_registration else False
-
         qs = WEIMembership.objects.filter(club=club, registration__first_year=True, bus__isnull=True)
         context["can_validate_1a"] = PermissionBackend.check_perm(
             self.request, "wei.change_weimembership_bus", qs.first()) if qs.exists() else False
@@ -280,23 +258,6 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
 
     def get_queryset(self, **kwargs):
         qs = super().get_queryset(**kwargs).filter(wei=self.club, membership=None).distinct()
-        # Annotate the query to be able to sort registrations on validate status
-        qs = qs.annotate(
-            deposit=Case(
-                When(deposit_type='note', then=F('wei__deposit_amount')),
-                default=Value(0),
-                output_field=IntegerField()
-            )
-        ).annotate(
-            total_fee=F('fee') + F('deposit')
-        ).annotate(
-            validate_status=Case(
-                When(total_fee__gt=F('user__note__balance'), then=Value(2)),
-                When(first_year=True, then=Value(1)),
-                default=Value(0),
-                output_field=IntegerField(),
-            )
-        )
 
         pattern = self.request.GET.get("search", "")
 
@@ -480,10 +441,6 @@ class BusTeamCreateView(ProtectQuerysetMixin, ProtectedCreateView):
         self.object.refresh_from_db()
         return reverse_lazy("wei:manage_bus_team", kwargs={"pk": self.object.pk})
 
-    def get_template_names(self):
-        names = super().get_template_names()
-        return names
-
 
 class BusTeamUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
@@ -516,10 +473,6 @@ class BusTeamUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         self.object.refresh_from_db()
         return reverse_lazy("wei:manage_bus_team", kwargs={"pk": self.object.pk})
 
-    def get_template_names(self):
-        names = super().get_template_names()
-        return names
-
 
 class BusTeamManageView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
@@ -593,19 +546,9 @@ class WEIRegister1AView(ProtectQuerysetMixin, ProtectedCreateView):
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].initial = self.request.user
-
-        # Cacher les champs pendant l'inscription initiale
-        if "first_year" in form.fields:
         del form.fields["first_year"]
-        if "deposit_given" in form.fields:
+        del form.fields["caution_check"]
-            del form.fields["deposit_given"]
-        if "information_json" in form.fields:
         del form.fields["information_json"]
-        if "deposit_type" in form.fields:
-            del form.fields["deposit_type"]
-
-        if "soge_credit" in form.fields:
-            form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
         return form
 
     @transaction.atomic
@@ -697,27 +640,14 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].initial = self.request.user
-        if "soge_credit" in form.fields:
-            form.fields["soge_credit"].help_text = _('Check if you will open a Société Générale account')
-
         if "myself" in self.request.path and self.request.user.profile.soge:
             form.fields["soge_credit"].disabled = True
             form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
 
-        # Cacher les champs pendant l'inscription initiale
+        del form.fields["caution_check"]
-        if "first_year" in form.fields:
         del form.fields["first_year"]
-        if "deposit_given" in form.fields:
-            del form.fields["deposit_given"]
-        if "information_json" in form.fields:
         del form.fields["information_json"]
 
-        # S'assurer que le champ deposit_type est obligatoire
-        if "deposit_type" in form.fields:
-            form.fields["deposit_type"].required = True
-            form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
-            form.fields["deposit_type"].widget = forms.RadioSelect(choices=form.fields["deposit_type"].choices)
-
         return form
 
     @transaction.atomic
@@ -743,9 +673,6 @@ class WEIRegister2AView(ProtectQuerysetMixin, ProtectedCreateView):
         information["preferred_roles_pk"] = [role.pk for role in choose_bus_form.cleaned_data["roles"]]
         information["preferred_roles_name"] = [role.name for role in choose_bus_form.cleaned_data["roles"]]
         form.instance.information = information
-
-        # Sauvegarder le type de caution
-        form.instance.deposit_type = form.cleaned_data["deposit_type"]
         form.instance.save()
 
         if 'treasury' in settings.INSTALLED_APPS:
@@ -775,7 +702,6 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
         # We can't update a registration once the WEI is started and before the membership start date
         if today >= wei.date_start or today < wei.membership_start:
             return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
-        # Store the validate parameter in the view's state
         return super().dispatch(request, *args, **kwargs)
 
     def get_context_data(self, **kwargs):
@@ -801,37 +727,23 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"])
             context["membership_form"] = choose_bus_form
 
+        if not self.object.soge_credit and self.object.user.profile.soge:
+            form = context["form"]
+            form.fields["soge_credit"].disabled = True
+            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
+
         return context
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.fields["user"].disabled = True
         # The auto-json-format may cause issues with the default field remove
-        if "information_json" in form.fields:
+        if not PermissionBackend.check_perm(self.request, 'wei.change_weiregistration_information_json', self.object):
             del form.fields["information_json"]
-        # Masquer le champ deposit_given pour tout le monde dans le formulaire de modification
-        if "deposit_given" in form.fields:
-            form.fields["deposit_given"].help_text = _("Tick if the deposit check has been given")
-            if self.object.first_year or self.object.deposit_type == 'note':
-                del form.fields["deposit_given"]
-
-        # S'assurer que le champ deposit_type est obligatoire pour les 2A+
-        if "deposit_type" in form.fields:
-            if self.object.first_year:
-                del form.fields["deposit_type"]
-            else:
-                form.fields["deposit_type"].required = True
-                form.fields["deposit_type"].help_text = _("Choose how you want to pay the deposit")
-
-        if self.object.user.profile.soge:
-            form.fields["soge_credit"].disabled = True
-            form.fields["soge_credit"].help_text = _("You already opened an account in the Société générale.")
-
         return form
 
     def get_membership_form(self, data=None, instance=None):
-        registration = self.get_object()
+        membership_form = WEIMembershipForm(data if data else None, instance=instance)
-        membership_form = WEIMembershipForm(data if data else None, instance=instance, wei=registration.wei)
         del membership_form.fields["credit_type"]
         del membership_form.fields["credit_amount"]
         del membership_form.fields["first_name"]
@@ -847,30 +759,10 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
     def form_valid(self, form):
         # If the membership is already validated, then we update the bus and the team (and the roles)
         if form.instance.is_validated:
-            try:
+            membership_form = self.get_membership_form(self.request.POST, form.instance.membership)
-                membership = form.instance.membership
-                if membership is None:
-                    raise ValueError(_("No membership found for this registration"))
-
-                membership_form = self.get_membership_form(self.request.POST, instance=membership)
             if not membership_form.is_valid():
                 return self.form_invalid(form)
-
-                # Vérifier que l'utilisateur a la permission de modifier le membership
-                # On vérifie d'abord si l'utilisateur a la permission générale de modification
-                if not self.request.user.has_perm("wei.change_weimembership"):
-                    raise PermissionDenied(_("You don't have the permission to update memberships"))
-
-                # On vérifie ensuite les permissions spécifiques pour chaque champ modifié
-                for field_name in membership_form.changed_data:
-                    perm = f"wei.change_weimembership_{field_name}"
-                    if not self.request.user.has_perm(perm):
-                        raise PermissionDenied(_("You don't have the permission to update the field %(field)s") % {'field': field_name})
-
             membership_form.save()
-            except (WEIMembership.DoesNotExist, ValueError, PermissionDenied) as e:
-                form.add_error(None, str(e))
-                return self.form_invalid(form)
         # If it is not validated and if this is an old member, then we update the choices
         elif not form.instance.first_year and PermissionBackend.check_perm(
                 self.request, "wei.change_weiregistration_information_json", self.object):
@@ -885,9 +777,6 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             information["preferred_roles_pk"] = [role.pk for role in choose_bus_form.cleaned_data["roles"]]
             information["preferred_roles_name"] = [role.name for role in choose_bus_form.cleaned_data["roles"]]
             form.instance.information = information
-
-            if "deposit_type" in form.cleaned_data:
-                form.instance.deposit_type = form.cleaned_data["deposit_type"]
             form.instance.save()
 
         return super().form_valid(form)
@@ -898,6 +787,15 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
             survey = CurrentSurvey(self.object)
             if not survey.is_complete():
                 return reverse_lazy("wei:wei_survey", kwargs={"pk": self.object.pk})
+        if PermissionBackend.check_perm(self.request, "wei.add_weimembership", WEIMembership(
+            club=self.object.wei,
+            user=self.object.user,
+            date_start=date.today(),
+            date_end=date.today(),
+            fee=0,
+            registration=self.object,
+        )):
+            return reverse_lazy("wei:validate_registration", kwargs={"pk": self.object.pk})
         return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.wei.pk})
 
 
@@ -938,23 +836,18 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
     extra_context = {"title": _("Validate WEI registration")}
 
     def get_sample_object(self):
-        """
-        Return a sample object for permission checking
-        """
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
         return WEIMembership(
-            user=registration.user,
             club=registration.wei,
-            date_start=registration.wei.date_start,
+            user=registration.user,
-            fee=registration.wei.membership_fee_paid if registration.user.profile.paid else registration.wei.membership_fee_unpaid,
+            date_start=date.today(),
-            # Add any fields needed for proper permission checking
+            date_end=date.today() + timedelta(days=1),
+            fee=0,
             registration=registration,
         )
 
     def dispatch(self, request, *args, **kwargs):
-        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
+        wei = WEIRegistration.objects.get(pk=self.kwargs["pk"]).wei
-
-        wei = registration.wei
         today = date.today()
         # We can't validate anyone once the WEI is started and before the membership start date
         if today >= wei.date_start or today < wei.membership_start:
@@ -985,61 +878,39 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
             date_start__gte=bde.membership_start,
         ).exists()
 
-        fee = registration.fee
+        context["fee"] = registration.fee
-        context["fee"] = fee
-
-        # Calculer le montant total nécessaire (frais + caution si transaction)
-        total_needed = fee
-        if registration.deposit_type == 'note':
-            total_needed += registration.wei.deposit_amount
-        context["total_needed"] = total_needed
 
         form = context["form"]
         if registration.soge_credit:
-            form.fields["credit_amount"].initial = fee
+            form.fields["credit_amount"].initial = registration.fee
         else:
-            form.fields["credit_amount"].initial = max(0, fee - registration.user.note.balance)
+            form.fields["credit_amount"].initial = max(0, registration.fee - registration.user.note.balance)
 
         return context
 
     def get_form_class(self):
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
-        if registration.first_year and 'selected_bus_pk' not in registration.information:
+        if registration.first_year and 'sleected_bus_pk' not in registration.information:
             return WEIMembership1AForm
         return WEIMembershipForm
 
-    def get_form_kwargs(self):
-        kwargs = super().get_form_kwargs()
-        registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
-        wei = registration.wei
-        kwargs['wei'] = wei
-        return kwargs
-
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         registration = WEIRegistration.objects.get(pk=self.kwargs["pk"])
         form.fields["last_name"].initial = registration.user.last_name
         form.fields["first_name"].initial = registration.user.first_name
 
-        # Ajouter le champ deposit_given uniquement pour les non-première année et le rendre obligatoire
+        if "caution_check" in form.fields:
-        if not registration.first_year:
+            form.fields["caution_check"].initial = registration.caution_check
-            if registration.deposit_type == 'check':
+
-                form.fields["deposit_given"] = forms.BooleanField(
+        if registration.soge_credit:
-                    required=True,
+            form.fields["credit_type"].disabled = True
-                    disabled=True,
+            form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
-                    initial=registration.deposit_given,
+            form.fields["credit_amount"].disabled = True
-                    label=_("Deposit check given"),
+            form.fields["last_name"].disabled = True
-                    help_text=_("Only treasurers can validate this field")
+            form.fields["first_name"].disabled = True
-                )
+            form.fields["bank"].disabled = True
-            else:
+            form.fields["bank"].initial = "Société générale"
-                form.fields["deposit_given"] = forms.BooleanField(
-                    required=True,
-                    initial=False,
-                    label=_("Create deposit transaction"),
-                    help_text=_("A transaction of %(amount).2f€ will be created from the user's Note account") % {
-                        'amount': registration.wei.deposit_amount / 100
-                    }
-                )
 
         if 'bus' in form.fields:
             # For 2A+ and hardcoded 1A
@@ -1073,8 +944,8 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         club = registration.wei
         user = registration.user
 
-        if "deposit_given" in form.data:
+        if "caution_check" in form.data:
-            registration.deposit_given = form.data["deposit_given"] == "on"
+            registration.caution_check = form.data["caution_check"] == "on"
             registration.save()
         membership = form.instance
         membership.user = user
@@ -1085,8 +956,6 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         membership._force_renew_parent = True
 
         fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid
-        if registration.soge_credit:
-            fee = registration.wei.fee_soge_credit
 
         kfet = club.parent_club
         bde = kfet.parent_club
@@ -1113,33 +982,23 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         first_name = form.cleaned_data["first_name"]
         bank = form.cleaned_data["bank"]
 
-        if credit_type is None:
+        if credit_type is None or registration.soge_credit:
             credit_amount = 0
 
-        # Calculer le montant total nécessaire (frais + caution si transaction)
+        if not registration.soge_credit and user.note.balance + credit_amount < fee:
-        total_needed = fee
+            # Users must have money before registering to the WEI.
-        if registration.deposit_type == 'note':
-            total_needed += club.deposit_amount
-
-        # Vérifier que l'utilisateur a assez d'argent pour tout payer
-        if user.note.balance + credit_amount < total_needed:
             form.add_error('credit_type',
-                           _("This user doesn't have enough money to join this club and pay the deposit. "
+                           _("This user don't have enough money to join this club, and can't have a negative balance."))
-                               "Current balance: %(balance)d€, credit: %(credit)d€, needed: %(needed)d€") % {
+            return super().form_invalid(form)
-                               'balance': user.note.balance,
-                               'credit': credit_amount,
-                               'needed': total_needed}
-                           )
-            return self.form_invalid(form)
 
         if credit_amount:
             if not last_name:
                 form.add_error('last_name', _("This field is required."))
-                return self.form_invalid(form)
+                return super().form_invalid(form)
 
             if not first_name:
                 form.add_error('first_name', _("This field is required."))
-                return self.form_invalid(form)
+                return super().form_invalid(form)
 
             # Credit note before adding the membership
             SpecialTransaction.objects.create(
@@ -1169,74 +1028,13 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
         membership.refresh_from_db()
         membership.roles.add(WEIRole.objects.get(name="Adhérent⋅e WEI"))
 
-        # Créer la transaction de caution si nécessaire
-        if registration.deposit_type == 'note':
-            from note.models import Transaction
-            Transaction.objects.create(
-                source=user.note,
-                destination=club.note,
-                quantity=1,
-                amount=club.deposit_amount,
-                reason=_("Deposit %(name)s") % {'name': club.name},
-                valid=True,
-            )
-
         return super().form_valid(form)
 
-    def form_invalid(self, form):
-        registration = getattr(form.instance, "registration", None)
-        if registration is not None:
-            registration.deposit_given = False
-            registration.save()
-        return super().form_invalid(form)
-
     def get_success_url(self):
         self.object.refresh_from_db()
         return reverse_lazy("wei:wei_registrations", kwargs={"pk": self.object.club.pk})
 
 
-class WEIUpdateMembershipView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    """
-    Update a membership for the WEI
-    """
-    model = WEIMembership
-    context_object_name = "membership"
-    template_name = "wei/weimembership_update.html"
-    extra_context = {"title": _("Update WEI Membership")}
-
-    def dispatch(self, request, *args, **kwargs):
-        wei = self.get_object().registration.wei
-        today = date.today()
-        # We can't update a registration once the WEI is started and before the membership start date
-        if today >= wei.date_start or today < wei.membership_start:
-            return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
-        # Store the validate parameter in the view's state
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_form(self):
-        form = WEIMembershipForm(
-            self.request.POST or None,
-            self.request.FILES or None,
-            instance=self.object,
-            wei=self.object.registration.wei,
-        )
-
-        form.fields["roles"].initial = self.object.roles.all()
-        form.fields["bus"].initial = self.object.bus
-        form.fields["team"].initial = self.object.team
-
-        del form.fields["credit_type"]
-        del form.fields["credit_amount"]
-        del form.fields["first_name"]
-        del form.fields["last_name"]
-        del form.fields["bank"]
-
-        return form
-
-    def get_success_url(self):
-        return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.registration.wei.pk})
-
-
 class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
     """
     Display the survey for the WEI for first year members.
@@ -1259,10 +1057,6 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
 
         if not self.survey:
             self.survey = CurrentSurvey(obj)
-
-        if request.GET.get("reset") == "true":
-            info = self.survey.information
-            info.reset(obj)
         # If the survey is complete, then display the end page.
         if self.survey.is_complete():
             return redirect(reverse_lazy('wei:wei_survey_end', args=(self.survey.registration.pk,)))
@@ -1453,7 +1247,6 @@ class WEI1AListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableView):
     def get_queryset(self, filter_permissions=True, **kwargs):
         qs = super().get_queryset(filter_permissions, **kwargs)
         qs = qs.filter(first_year=True, membership__isnull=False)
-        qs = qs.filter(wei=self.club)
         qs = qs.order_by('-membership__bus')
         return qs
 
@@ -1496,48 +1289,8 @@ class WEIAttributeBus1ANextView(LoginRequiredMixin, RedirectView):
         if not wei.exists():
             raise Http404
         wei = wei.get()
-
+        qs = WEIRegistration.objects.filter(wei=wei, membership__isnull=False, membership__bus__isnull=True)
-        # On cherche d'abord les 1A qui ont une inscription validée (membership) mais pas de bus
+        qs = qs.filter(information_json__contains='selected_bus_pk')  # not perfect, but works...
-        qs = WEIRegistration.objects.filter(
+        if qs.exists():
-            wei=wei,
+            return reverse_lazy('wei:wei_bus_1A', args=(qs.first().pk, ))
-            first_year=True,
+        return reverse_lazy('wei:wei_1A_list', args=(wei.pk, ))
-            membership__isnull=False,
-            membership__bus__isnull=True
-        )
-
-        # Parmi eux, on prend ceux qui ont répondu au questionnaire (ont un bus préféré)
-        qs = qs.filter(information_json__contains='selected_bus_pk')
-
-        if not qs.exists():
-            # Si on ne trouve personne, on affiche un message et on retourne à la liste
-            messages.info(self.request, _("No first year student without a bus found. Either all of them have a bus, or none has filled the survey yet."))
-            return reverse_lazy('wei:wei_1A_list', args=(wei.pk,))
-
-        # On redirige vers la page d'attribution pour le premier étudiant trouvé
-        return reverse_lazy('wei:wei_bus_1A', args=(qs.first().pk,))
-
-
-class BusInformationUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
-    model = Bus
-
-    def get_form_class(self):
-        return CurrentSurvey.get_algorithm_class().get_bus_information_form()
-
-    def dispatch(self, request, *args, **kwargs):
-        wei = self.get_object().wei
-        today = date.today()
-        # We can't update a bus once the WEI is started
-        if today >= wei.date_start:
-            return redirect(reverse_lazy('wei:wei_closed', args=(wei.pk,)))
-        return super().dispatch(request, *args, **kwargs)
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context["club"] = self.object.wei
-        context["information"] = CurrentSurvey.get_algorithm_class().get_bus_information(self.object)
-        self.object.save()
-        return context
-
-    def get_success_url(self):
-        self.object.refresh_from_db()
-        return reverse_lazy("wei:manage_bus", kwargs={"pk": self.object.pk})

docs/apps/food.rst

@@ -19,9 +19,8 @@ Le modèle regroupe :
 * Propriétaire (doit-être un Club)
 * Allergènes (ManyToManyField)
 * date d'expiration
-* fin de vie
+* a été mangé (booléen)
 * est prêt (booléen)
-* consigne (pour les GCKs)
 
 BasicFood
 ~~~~~~~~~
@@ -41,7 +40,7 @@ Les TransformedFood correspondent aux produits préparés à la Kfet. Ils peuven
 
 Le modèle regroupe :
 
-* Durée de conservation (par défaut 3 jours)
+* Durée de consommation (par défaut 3 jours)
 * Ingrédients (ManyToManyField vers Food)
 * Date de création
 * Champs de Food

docs/apps/index.rst

@@ -12,7 +12,6 @@ Applications de la Note Kfet 2020
    ../api/index
    registration
    logs
-   food
    treasury
    wei
    wrapped
@@ -67,8 +66,6 @@ Applications facultatives
     Serveur central d'authentification, permet d'utiliser son compte de la NoteKfet2020 pour se connecter à d'autre application ayant intégrer un client.
 * `Scripts <https://gitlab.crans.org/bde/nk20-scripts>`_
      Ensemble de commande `./manage.py` pour la gestion de la note: import de données, verification d'intégrité, etc...
-* `Food <food>`_ :
-    Gestion de la nourriture dans Kfet pour les clubs.
 * `Treasury <treasury>`_ :
     Interface de gestion pour les trésorièr⋅es, émission de factures, remises de chèque, statistiques...
 * `WEI <wei>`_ :

docs/faq.rst

@@ -183,7 +183,6 @@ Contributeur⋅rices
    * korenst1
    * nicomarg
    * PAC
-   * Quark
    * ÿnérant
 
 

docs/scripts.rst

@@ -136,7 +136,7 @@ de diffusion utiles.
    Faîtes attention, donc où la sortie est stockée.
 
 
-Il prend 4 options :
+Il prend 2 options :
 
 * ``--type``, qui prend en argument ``members`` (défaut), ``clubs``, ``events``, ``art``,
   ``sport``, qui permet respectivement de sortir la liste des adresses mails des adhérent⋅es
@@ -149,10 +149,7 @@ Il prend 4 options :
   pour la ML Adhérents, pour exporter les mails des adhérents au BDE pendant n'importe 
   laquelle des ``n+1`` dernières années. 
 
-* ``--email``, qui prend en argument une chaine de caractère contenant une adresse email.
+Le script sort sur la sortie standard la liste des adresses mails à inscrire.
-  
-Si aucun email n'est renseigné, le script sort sur la sortie standard la liste des adresses mails à inscrire.
-Dans le cas contraire, la liste est envoyée à l'adresse passée en argument.
 
 Attention : il y a parfois certains cas particuliers à prendre en compte, il n'est
 malheureusement pas aussi simple que de simplement supposer que ces listes sont exhaustives.

note.cron

@@ -28,5 +28,4 @@ MAILTO=notekfet2020@lists.crans.org
  00  6     *   *   *     root   cd /var/www/note_kfet && env/bin/python manage.py cleartokens -v 0
 # Envoyer la liste des abonnés à la NL BDA
  00  10     *   *   0     root   cd /var/www/note_kfet && env/bin/python manage.py extract_ml_registrations -t art -e "bda.ensparissaclay@gmail.com"
-# Envoyer la liste de la bouffe au club et aux GCKs
+ 
- 00  8     *   *   1     root   cd /var/www/note_kfet && env/bin/python manage.py send_mail_for_food --report --club

note_kfet/admin.py

@@ -56,8 +56,3 @@ if "cas_server" in settings.INSTALLED_APPS:
     from cas_server.models import *
     admin_site.register(ServicePattern, ServicePatternAdmin)
     admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)
-
-if "constance" in settings.INSTALLED_APPS:
-    from constance.admin import *
-    from constance.models import *
-    admin_site.register([Config], ConstanceAdmin)

note_kfet/inputs.py

@@ -63,16 +63,8 @@ class ColorWidget(Widget):
     def format_value(self, value):
         if value is None:
             value = 0xFFFFFF
-        if isinstance(value, str):
-            return value  # Assume it's already a hex string like "#FFAA33"
-        try:
         return "#{:06X}".format(value)
-        except Exception:
-            return "#FFFFFF"
-
 
     def value_from_datadict(self, data, files, name):
         val = super().value_from_datadict(data, files, name)
-        if val:
         return int(val[1:], 16)
-        return None

note_kfet/settings/base.py

@@ -39,9 +39,7 @@ SECURE_HSTS_PRELOAD = True
 INSTALLED_APPS = [
     # External apps
     'bootstrap_datepicker_plus',
-    'cas_server',
     'colorfield',
-    'constance',
     'crispy_bootstrap4',
     'crispy_forms',
 #    'django_htcpcp_tea',
@@ -113,7 +111,6 @@ TEMPLATES = [
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
-                'constance.context_processors.config',
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
@@ -273,7 +270,7 @@ OAUTH2_PROVIDER = {
     'PKCE_REQUIRED': False, # PKCE (fix a breaking change of django-oauth-toolkit 2.0.0)
     'OIDC_ENABLED': True,
     'OIDC_RSA_PRIVATE_KEY':
-        os.getenv('OIDC_RSA_PRIVATE_KEY', 'CHANGE_ME_IN_ENV_SETTINGS').replace('\\n', '\n'), # for multilines
+        os.getenv('OIDC_RSA_PRIVATE_KEY', '/var/secrets/oidc.key'),
     'SCOPES': { 'openid': "OpenID Connect scope" },
 }
 
@@ -310,30 +307,6 @@ PHONENUMBER_DEFAULT_REGION = 'FR'
 
 # We add custom information to CAS, in order to give a normalized name to other services
 CAS_AUTH_CLASS = 'member.auth.CustomAuthUser'
-CAS_LOGIN_TEMPLATE = 'cas/login.html'
-CAS_LOGOUT_TEMPLATE = 'cas/logout.html'
-CAS_WARN_TEMPLATE = 'cas/warn.html'
-CAS_LOGGED_TEMPLATE = 'cas/logged.html'
 
 # Default field for primary key
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
-
-# Constance settings
-CONSTANCE_ADDITIONAL_FIELDS = {
-    'banner_type': ['django.forms.fields.ChoiceField', {
-        'widget': 'django.forms.Select',
-        'choices': (('info', 'Info'), ('success', 'Success'), ('warning', 'Warning'), ('danger', 'Danger'))
-    }],
-}
-CONSTANCE_CONFIG = {
-    'BANNER_MESSAGE': ('', 'Some message', str),
-    'BANNER_TYPE': ('info', 'Banner type', 'banner_type'),
-    'MAINTENANCE': (False, 'check for mainteance mode', bool),
-    'MAINTENANCE_MESSAGE': ('', 'Some maintenance message', str),
-}
-CONSTANCE_CONFIG_FIELDSETS = {
-    'Maintenance': ('MAINTENANCE_MESSAGE', 'MAINTENANCE'),
-    'Banner': ('BANNER_MESSAGE', 'BANNER_TYPE'),
-}
-CONSTANCE_BACKEND = 'constance.backends.database.DatabaseBackend'
-CONSTANCE_SUPERUSER_ONLY = True

note_kfet/templates/base.html

@@ -5,7 +5,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
 <!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %}
 <html lang="{{ LANGUAGE_CODE|default:"en" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %} class="position-relative h-100">
-{% if not config.MAINTENANCE %}
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
@@ -139,12 +138,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
                                 <a class="dropdown-item" href="{% url 'member:user_detail' pk=request.user.pk %}">
                                     <i class="fa fa-user"></i> {% trans "My account" %}
                                 </a>
-				<form method="post" action="{% url 'logout' %}">
+                                <a class="dropdown-item" href="{% url 'logout' %}">
-				    {% csrf_token %}
-				    <button class="dropdown-item" type=submit">
                                     <i class="fa fa-sign-out"></i> {% trans "Log out" %}
-				    </button>
+                                </a>
-                                </form>
                             </div>
                         </li>
                     {% else %}
@@ -192,11 +188,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     {% endblocktrans %}
                 </div>
             {% endif %}
-	    {% if config.BANNER_MESSAGE and user.is_authenticated %}
+            {# TODO Add banners #}
-	    <div class="alert alert-{{ config.BANNER_TYPE }}">
-	      {{ config.BANNER_MESSAGE }}
-	    </div>
-	    {% endif %}
         </div>
         {% block content %}
             <p>Default content...</p>
@@ -218,10 +210,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                            class="text-muted">{% trans "Charte Info (FR)" %}</a> &mdash;
                         <a href="https://note.crans.org/doc/faq/"
                            class="text-muted">{% trans "FAQ (FR)" %}</a> &mdash;
-		   	<a href="https://bde.ens-cachan.fr"
-			   class="text-muted">{% trans "Managed by BDE" %}</a> &mdash;
-		   	<a href="https://crans.org"
-			   class="text-muted">{% trans "Hosted by Cr@ns" %}</a> &mdash;
                     </span>
                     {% csrf_token %}
                     <select title="language" name="language"
@@ -258,15 +246,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 {% block extrajavascript %}{% endblock %}
 </body>
-{% endif %}
-{% if config.MAINTENANCE %}
-<body>
-  <div style="text-align:center">
-    <br />
-    {% trans "The note is not available for now" %}<br /><br />
-    {{ config.MAINTENANCE_MESSAGE }}<br /><br />
-    {% trans "Thank you for your understanding -- The Respos Info of BDE" %}
-  </div>
-</body>
-{% endif %}
 </html>

note_kfet/templates/cas/logged.html

@@ -1,28 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS-Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-{% block content %}
-<div class="alert alert-success" role="alert">{% blocktrans %}<h3>Log In Successful</h3>You have successfully logged into the Central Authentication Service.<br/>For security reasons, please Log Out and Exit your web browser when you are done accessing services that require authentication!{% endblocktrans %}</div>
-<div class="card bg-light mx-auto" style="max-width:30rem;">
-  <div class="card-body">
-    <form class="form-signin" method="get" action="logout">
-      <div class="checkbox">
-	<label>
-	  <input type="checkbox" name="all" value="1">{% trans "Log me out from all my sessions" %}
-	</label>
-      </div>
-      {% if settings.CAS_FEDERATE and request.COOKIES.remember_provider %}
-      <div class="checkbox">
-	<label>
-	  <input type="checkbox" name="forget_provider" value="1">{% trans "Forget the identity provider" %}
-	</label>
-      </div>
-      {% endif %}
-      <button class="btn btn-danger btn-block btn-lg" type="submit">{% trans "Logout" %}</button>
-    </form>
-  </div>
-</div>
-{% endblock %}

note_kfet/templates/cas/login.html

@@ -1,42 +0,0 @@
-{% extends "base.html" %}
-{% comment %}
-Copyright (C) by BDE ENS-Paris-Saclay
-SPDX-License-Identifier: GPL-3.0-or-later
-{% endcomment %}
-{% load i18n %}
-
-{% block ante_messages %}
-  {% if auto_submit %}<noscript>{% endif %}
-  <div class="card-header text-center">
-    <h2 class="form-signin-heading">{% trans "Please log in" %}</h2>
-  </div>
-  {% if auto_submit %}</noscript>{% endif %}
-{% endblock %}
-
-{% block content %}
-  <div class="card bg-light mx-auto" style="max-width: 30rem;">
-    <div class="card-body">
-	<form class="form-signin" method="post" id="login_form"{% if post_url %} action="{{post_url}}"{% endif %}>
-	  {% csrf_token %}
-	  {% include "cas_server/bs4/form.html" %}
-	  {% if auto_submit %}<noscript>{% endif %}
-	  <button class="btn btn-primary btn-block btn-lg" type="submit">{% trans "Login" %}</button>
-	  {% if auto_submit %}</noscript>{% endif %}
-	</div>
-      </form>
-    </div>
-  </div>
-{% endblock %}
-
-{% block javascript_inline %}
-jQuery(function( $ ){
-  $("#id_warn").click(function(e){
-    if($("#id_warn").is(':checked')){
-      createCookie("warn", "on", 10 * 365);
-    } else {
-      eraseCookie("warn");
-    }
-  });
-});
-{% if auto_submit %}document.getElementById('login_form').submit(); // SUBMIT FORM{% endif %}
-{% endblock %}