Un peu de nettoyage, rajout de commentaires

.gitlab-ci.yml

@@ -7,10 +7,25 @@ stages:
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
 
-# Ubuntu 22.04
+# Debian Buster
-py310-django50:
+py37-django22:
   stage: test
-  image: ubuntu:22.04
+  image: debian:buster-backports
+  before_script:
+    - >
+        apt-get update &&
+        apt-get install --no-install-recommends -t buster-backports -y
+        python3-django python3-django-crispy-forms
+        python3-django-extensions python3-django-filters python3-django-polymorphic
+        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 py37-django22
+
+# Ubuntu 20.04
+py38-django22:
+  stage: test
+  image: ubuntu:20.04
   before_script:
     # Fix tzdata prompt
     - ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && echo Europe/Paris > /etc/timezone
@@ -22,12 +37,12 @@ py310-django50:
         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-django50
+  script: tox -e py38-django22
 
-# Debian Bookworm
+# Debian Bullseye
-py311-django50:
+py39-django22:
   stage: test
-  image: debian:bookworm
+  image: debian:bullseye
   before_script:
     - >
         apt-get update &&
@@ -37,11 +52,11 @@ py311-django50:
         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-django50
+  script: tox -e py39-django22
 
 linters:
   stage: quality-assurance
-  image: debian:bullseye
+  image: debian:buster-backports
   before_script:
     - apt-get update && apt-get install -y tox
   script: tox -e linters

apps/activity/forms.py

@@ -1,8 +1,6 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
-
 from datetime import timedelta
 from random import shuffle
 
@@ -12,7 +10,7 @@ from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from member.models import Club
 from note.models import Note, NoteUser
-from note_kfet.inputs import Autocomplete
+from note_kfet.inputs import Autocomplete, DateTimePickerInput
 from note_kfet.middlewares import get_current_request
 from permission.backends import PermissionBackend
 

apps/activity/templates/activity/activity_form.html

@@ -17,9 +17,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
     </form>
   </div>
 </div>
-{% endblock %}
-
-{% block extrajavascript %}
 <script>
   var date_end = document.getElementById("id_date_end");
   var date_start = document.getElementById("id_date_start");

apps/api/urls.py

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from django.conf import settings
-from django.urls import include, re_path
+from django.conf.urls import url, include
 from rest_framework import routers
 
 from .views import UserInformationView
@@ -47,7 +47,7 @@ app_name = 'api'
 # Wire up our API using automatic URL routing.
 # Additionally, we include login URLs for the browsable API.
 urlpatterns = [
-    re_path('^', include(router.urls)),
+    url('^', include(router.urls)),
-    re_path('^me/', UserInformationView.as_view()),
+    url('^me/', UserInformationView.as_view()),
-    re_path('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
+    url('^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
 ]

apps/food/admin.py

@@ -0,0 +1,32 @@
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib import admin
+from note_kfet.admin import admin_site
+
+from .models import QR_code, BasicFood, TransformedFood, Allergen
+
+
+@admin.register(QR_code, site = admin_site)
+class QR_codeAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
+    """
+
+@admin.register(BasicFood, site = admin_site)
+class Basic_foodAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
+    """
+
+@admin.register(TransformedFood, site = admin_site)
+class Transformed_foodAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
+    """
+
+@admin.register(Allergen, site = admin_site)
+class AllergenAdmin(admin.ModelAdmin):
+    """
+    TEMPORARY
+    """

apps/food/apps.py

@@ -0,0 +1,10 @@
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+
+from django.apps import AppConfig
+
+
+class FoodkfetConfig(AppConfig):
+    name = 'food'
+    verbose_name = _('food')

apps/food/forms.py

@@ -0,0 +1,92 @@
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from random import shuffle
+
+from django import forms
+from django.utils.translation import gettext_lazy as _
+from django.utils import timezone
+from member.models import Club
+from note_kfet.inputs import Autocomplete, DatePickerInput, DateTimePickerInput
+from note_kfet.middlewares import get_current_request
+from permission.backends import PermissionBackend
+
+from .models import QR_code, Allergen, BasicFood, TransformedFood
+
+
+class BasicFoodForms(forms.ModelForm):
+    """
+    Form for add non-transformed food
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
+        self.fields['name'].required = True
+        self.fields['owner'].required = True
+        self.fields['label'].help_text = _('The lot number must be contained in the picture')
+
+        # Some example
+        self.fields['name'].widget.attrs.update({"placeholder": _("pasta")})
+        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]) + ", ..."
+    def clean_dlm_or_dlc(self):
+        is_dlc = self.cleaned_data["is_DLC"]
+        is_ddm = self.cleaned_data["is_DDM"]
+        if is_dlc and is_ddm:
+            self.add_error("is_ddm", _("the product cannot be a DLC and a DDM"))
+        return is_ddm
+
+    class Meta:
+        model = BasicFood
+        fields = ('name', 'owner', 'is_DLC', 'is_DDM', 'expiry_date', 'label')        
+        widgets = {
+            "owner": Autocomplete(
+                model = Club,
+                attrs = {"api_url": "/api/members/club/"},
+            ),
+            'expiry_date': DatePickerInput(),
+        }
+
+
+
+class TransformedFoodForms(forms.ModelForm):
+    """
+    Form for add transformed food
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
+        self.fields['name'].required = True
+        self.fields['owner'].required = True
+        self.fields['creation_date'].required = True
+        self.fields['creation_date'].initial = timezone.now
+        self.fields['is_active'].initial = True
+
+        # Some example
+        self.fields['name'].widget.attrs.update({"placeholder": _("lasagna")})
+        clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
+        shuffle(clubs)
+        self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
+
+    
+    class Meta:
+        model = TransformedFood
+        fields = ('name', 'creation_date', 'owner', 'is_active',)
+        widgets = {
+            "owner": Autocomplete(
+                model = Club,
+                attrs = {"api_url": "/api/members/club/"},
+            ),
+            'creation_date': DateTimePickerInput(),
+        }
+class AllergenForms(forms.ModelForm):
+    """
+    Form for allergen
+    """
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+    
+    class Meta:
+        model = Allergen
+        exclude = ['basic_food', 'transformed_food']

apps/food/migrations/0001_initial.py

@@ -0,0 +1,97 @@
+# Generated by Django 2.2.28 on 2024-05-25 20:32
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('member', '0011_profile_vss_charter_read'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BasicFood',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='name')),
+                ('is_DLC', models.BooleanField(default=False, verbose_name='is DLC')),
+                ('is_DDM', models.BooleanField(default=False, verbose_name='is DDM')),
+                ('arrival_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='arrival date')),
+                ('expiry_date', models.DateTimeField(blank=True, null=True, verbose_name='expiry date')),
+                ('label', models.ImageField(max_length=255, upload_to='label/', verbose_name='food label')),
+                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
+            ],
+            options={
+                'verbose_name': 'Basic food',
+                'verbose_name_plural': 'Basic foods',
+            },
+        ),
+        migrations.CreateModel(
+            name='TransformedFood',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255, verbose_name='name')),
+                ('creation_date', models.DateTimeField(verbose_name='creation date')),
+                ('expiry_date', models.DateTimeField(verbose_name='expiry date')),
+                ('is_active', models.BooleanField(default=True, verbose_name='is active')),
+                ('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
+                ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
+                ('transformed_ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.TransformedFood', verbose_name='transformed ingredient')),
+            ],
+            options={
+                'verbose_name': 'Transformed food',
+                'verbose_name_plural': 'Transformed foods',
+            },
+        ),
+        migrations.CreateModel(
+            name='QR_code',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('qr_code_number', models.PositiveIntegerField(verbose_name='QR-code number')),
+                ('basic_food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.BasicFood', verbose_name='basic food')),
+                ('transformed_food_container', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.TransformedFood', verbose_name='transformed food container')),
+            ],
+            options={
+                'verbose_name': 'QR-code',
+                'verbose_name_plural': 'QR-codes',
+            },
+        ),
+        migrations.AddField(
+            model_name='basicfood',
+            name='transformed_food',
+            field=models.ManyToManyField(blank=True, related_name='BasicFood', to='food.TransformedFood', verbose_name='transformed food'),
+        ),
+        migrations.CreateModel(
+            name='Allergen',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('gluten', models.BooleanField(default=False, verbose_name='gluten')),
+                ('nut', models.BooleanField(default=False, verbose_name='nut')),
+                ('crustecean', models.BooleanField(default=False, verbose_name='crustacean')),
+                ('celery', models.BooleanField(default=False, verbose_name='celery')),
+                ('egg', models.BooleanField(default=False, verbose_name='egg')),
+                ('mustard', models.BooleanField(default=False, verbose_name='mustard')),
+                ('fish', models.BooleanField(default=False, verbose_name='fish')),
+                ('soy', models.BooleanField(default=False, verbose_name='soy')),
+                ('milk', models.BooleanField(default=False, verbose_name='milk')),
+                ('sulphite', models.BooleanField(default=False, verbose_name='sulphite')),
+                ('lupine', models.BooleanField(default=False, verbose_name='lupine')),
+                ('mollusc', models.BooleanField(default=False, verbose_name='mollusc')),
+                ('groundnut', models.BooleanField(default=False, verbose_name='groundnut')),
+                ('sesame', models.BooleanField(default=False, verbose_name='sesame')),
+                ('alcohol', models.BooleanField(default=False, verbose_name='alcohol')),
+                ('basic_food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Allergen', to='food.BasicFood', verbose_name='basic food')),
+                ('transformed_food', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='Allergen', to='food.TransformedFood', verbose_name='transformed food')),
+            ],
+            options={
+                'verbose_name': 'Allergen',
+                'verbose_name_plural': 'Allergens',
+            },
+        ),
+    ]

apps/food/models.py

@@ -0,0 +1,289 @@
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from datetime import date
+
+from django.conf import settings
+from django.contrib.auth.models import User
+from django.core.exceptions import ValidationError
+from django.core.validators import MinValueValidator
+from django.db import models, transaction
+from django.db.models import Q
+from django.utils import timezone
+from django.utils.translation import gettext_lazy as _
+from member.models import Club
+
+#################################################################
+# TO DO
+# - link allergen with one food (basic or transformed) with check
+# - check on basic food
+# - check on transformed food
+#################################################################
+
+class QR_code(models.Model):
+    """
+    An QR_code model
+    """
+    qr_code_number = models.PositiveIntegerField(
+        verbose_name=_("QR-code number"),
+    )
+
+    transformed_food_container = models.ForeignKey(
+        'TransformedFood',
+        on_delete = models.PROTECT,
+        related_name = 'QR_code',
+        null = True,
+        blank = True,
+        verbose_name = _('transformed food container'),
+    )
+    
+    basic_food = models.ForeignKey(
+        'BasicFood',
+        on_delete = models.PROTECT,
+        related_name = 'QR_code',
+        null = True,
+        blank = True,
+        verbose_name = _('basic food'),
+    )
+
+    class Meta:
+        verbose_name = _("QR-code")
+        verbose_name_plural = _("QR-codes")
+
+    def __str__(self):
+        return _("QR-code number {qr_code_number}").format(qr_code_number=self.qr_code_number)
+
+class Allergen(models.Model):
+    """
+    A list of allergen and alimentary restrictions
+    """
+
+    gluten = models.BooleanField(
+        default = False,
+        verbose_name = _('gluten'),
+    )
+
+    nut = models.BooleanField(
+        default = False,
+        verbose_name = _('nut'),
+    )
+
+    crustecean = models.BooleanField(
+        default = False,
+        verbose_name = _('crustacean'),
+    )
+
+    celery = models.BooleanField(
+        default = False,
+        verbose_name = _('celery'),
+    )
+
+    egg = models.BooleanField(
+        default = False,
+        verbose_name = _('egg'),
+    )
+
+    mustard = models.BooleanField(
+        default = False,
+        verbose_name = _('mustard'),
+    )
+
+    fish = models.BooleanField(
+        default = False,
+        verbose_name = _('fish'),
+    )
+
+    soy = models.BooleanField(
+        default = False,
+        verbose_name = _('soy'),
+    )
+
+    milk = models.BooleanField(
+        default = False,
+        verbose_name = _('milk'),
+    )
+
+    sulphite = models.BooleanField(
+        default = False,
+        verbose_name = _('sulphite'),
+    )
+
+    lupine = models.BooleanField(
+        default = False,
+        verbose_name = _('lupine'),
+    )
+
+    mollusc = models.BooleanField(
+        default = False,
+        verbose_name = _('mollusc'),
+    )
+
+    groundnut = models.BooleanField(
+        default = False,
+        verbose_name = _('groundnut'),
+    )
+
+    sesame = models.BooleanField(
+        default = False,
+        verbose_name = _('sesame'),
+    )
+
+    alcohol = models.BooleanField(
+        default = False,
+        verbose_name = _('alcohol'),
+    )
+
+    transformed_food = models.ForeignKey(
+        'TransformedFood',
+        on_delete = models.CASCADE,
+        related_name = 'Allergen',
+        blank = True,
+        null = True,
+        verbose_name = _('transformed food'),
+    )
+
+    basic_food = models.ForeignKey(
+        'BasicFood',
+        on_delete = models.CASCADE,
+        related_name = 'Allergen',
+        blank = True,
+        null = True,
+        verbose_name = _('basic food'),
+    )
+
+    class Meta:
+        verbose_name = _('Allergen')
+        verbose_name_plural = _('Allergens')
+
+    def __str__(self):
+        return _('Allergens of #{id}').format(id=self.id)
+
+        
+
+
+class BasicFood(models.Model):
+    """
+    Food which has been directly buy on supermarket
+    """
+    name = models.CharField(
+        verbose_name=_('name'),
+        max_length=255,
+    )
+
+    is_DLC = models.BooleanField(
+        verbose_name=_("is DLC"),
+        default=False,
+    )
+
+    is_DDM = models.BooleanField(
+        verbose_name=_("is DDM"),
+        default=False,
+    )
+
+    arrival_date = models.DateTimeField(
+        verbose_name=_('arrival date'),
+        default=timezone.now,
+    )
+    
+    expiry_date = models.DateTimeField(
+        verbose_name=_('expiry date'),
+        blank=True,
+        null = True,
+    )
+    
+    owner = models.ForeignKey(
+        Club,
+        on_delete=models.PROTECT,
+        related_name= '+',
+        verbose_name=_('owner'),
+    )
+
+    label = models.ImageField(
+        verbose_name=_('food label'),
+        max_length=255,
+        blank=False,
+        null=False,
+        upload_to='label/',
+    )
+
+    was_eaten = models.BooleanField(
+        verbose_name=_('was eaten'),
+        default = False,
+    )
+
+    transformed_food = models.ManyToManyField(
+        'TransformedFood',
+        related_name= 'BasicFood',
+        blank = True,
+        verbose_name = _('transformed food'),
+    )
+
+
+    class Meta:
+        verbose_name=_('Basic food')
+        verbose_name_plural=_('Basic foods')
+
+    def __str__(self):
+        return  self.name
+
+    @transaction.atomic 
+    def save(self, force_insert=False, force_update=False, using= None, update_fields=None):
+        # Check if is_DLC and is DDM are not both True
+        if self.is_DLC and self.is_DDM:
+            raise ValidationError("The product cannot be a DLC and a DDM")
+        return super().save(force_insert, force_update, using, update_fields)
+
+
+class TransformedFood(models.Model):
+    """
+    Transformed food  are a mix between basic food and meal
+    """
+    name = models.CharField(
+        max_length = 255,
+        verbose_name =_('name'),
+    )
+
+    creation_date = models.DateTimeField(
+        verbose_name =_('creation date'),
+    )
+
+    expiry_date = models.DateTimeField(
+        verbose_name =_('expiry date'),
+    )
+
+    owner = models.ForeignKey(
+        Club,
+        on_delete = models.PROTECT,
+        related_name = '+',
+        verbose_name =_('owner'),
+    )
+    
+    transformed_ingredient = models.ManyToManyField(
+        "self",
+        blank = True,
+        symmetrical = False,
+        related_name = 'transformed_ingredient_inv',
+        verbose_name = _('transformed ingredient'),
+    )
+    
+    is_active = models.BooleanField(
+        default = True,
+        verbose_name = _('is active'),
+    )
+
+    was_eaten = models.BooleanField(
+        default = False,
+        verbose_name = _('was eaten'),
+    )
+
+
+    class Meta:
+        verbose_name = _('Transformed food')
+        verbose_name_plural = _('Transformed foods')
+
+    def __str__(self):
+        return self.name
+
+    @transaction.atomic
+    def save(self, force_insert=False, force_update=False, using= None, update_fields=None):
+        return super().save(force_insert, force_update, using, update_fields)

apps/food/templates/food/basic_food_form.html

@@ -0,0 +1,22 @@
+{% 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">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+  <div class="card-body">
+    <form method="post">
+      {% csrf_token %}
+      {{ form|crispy }}
+      {{ allergenform|crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/food/templates/food/transformed_food_form.html

@@ -0,0 +1,21 @@
+{% 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">
+    HTML not finished <br>
+    {{ title }}
+  </h3>
+  <div class="card-body">
+    <form method="post">
+      {%  csrf_token %}
+      {{ form|crispy }}
+      <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button>
+    </form>
+  </div>
+</div>
+{% endblock %}

apps/food/tests.py

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

apps/food/urls.py

@@ -0,0 +1,19 @@
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.urls import path
+
+from . import views
+
+###############################
+# TO DO
+# - name url correctly, thinking about the scheme of the app
+###############################
+
+app_name = 'food'
+
+urlpatterns = [
+    path('0', views.BasicFoodCreateView.as_view(), name = 'basic_food'),
+    path('1', views.TransformedFoodCreateView.as_view(), name = 'transformed_food'),
+]
+

apps/food/views.py

@@ -0,0 +1,104 @@
+# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.urls import reverse_lazy
+from django.db import transaction
+from django.utils.translation import gettext_lazy as _
+from django.utils import timezone
+from datetime import timedelta
+from permission.views import ProtectQuerysetMixin, ProtectedCreateView
+from django.shortcuts import render
+
+from .forms import BasicFoodForms, TransformedFoodForms, AllergenForms
+from .models import BasicFood, TransformedFood, Allergen
+
+
+class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+#####################################################################
+# TO DO
+# - fix picture save
+# - implement solution crop and convert image (reuse or recode ImageForm from members apps
+# - implement AllergenForms
+# - redirect to another view after the poll is submitted
+#####################################################################
+    """
+    A view to add a basic food
+    """
+    model = BasicFood
+    form_class = BasicFoodForms
+    template_name = 'food/basic_food_form.html'
+    extra_context = {"title": _("Add a new aliment")}
+    
+    def get_sample_object(self):
+        return BasicFood(
+            name="",
+            is_DLC=False,
+            is_DDM=False,
+            expiry_date=timezone.now(),
+            label='pic/default.png',
+        )
+    
+    @transaction.atomic
+    def form_valid(self, form):
+        form.instance.creater = self.request.user
+        basic_food_form = BasicFoodForms(data=self.request.POST)
+        allergen_form = AllergenForms(data=self.request.POST)
+        if not basic_food_form.is_valid() or not allergen_form.is_valid():
+            return self.form_invalid(form)
+
+        # Save the aliment and the allergens associed
+        basic_food = form.save(commit=False)
+        # We assume the date of labeling and the same as the date of arrival
+        basic_food.arrival_date = timezone.now
+        basic_food._force_save = True
+        basic_food.save()
+        basic_food.refresh_from_db()
+        return super().form_valid(form)
+
+    def get_success_url(self, **kwargs):
+        self.object.refresh_from_db()
+        # TEMPORARY, I create a fonctionnal view before
+        # return reverse_lazy('food:basicfood', kwargs={"pk": self.object.pk})
+        return '0'
+
+class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
+###############################################
+# TO DO
+# -redirect to another view after submit
+###############################################
+    """
+    A view to add a tranformed food
+    """
+    model = TransformedFood
+    template_name = 'food/transformed_food_form.html'
+    form_class = TransformedFoodForms
+    extra_context = {"title": _("Add a new meal")}
+    
+    def get_sample_object(self):
+        return TransformedFood(
+            name="",
+            creation_date=timezone.now(),
+        )
+    
+    @transaction.atomic
+    def form_valid(self, form):
+        form.instance.creater = self.request.user
+        transformed_food_form = TransformedFoodForms(data=self.request.POST)
+        if not transformed_food_form.is_valid():
+            return self.form_invalid(form)
+
+        # Save the aliment and allergens associated
+        transformed_food = form.save(commit=False)
+        # Without microbiological analyzes, the storage time is 3 days
+        transformed_food.expiry_date = transformed_food.creation_date + timedelta(days = 3)
+        transformed_food._force_save =  True
+        transformed_food.save()
+        transformed_food.refresh_from_db()
+        return super().form_valid(form)
+
+
+    def get_success_url(self, **kwargs):
+        self.object.refresh_from_db()
+        # TEMPORARY, I create a fonctionnal view before
+        # return reverse_lazy('food:tranformed_food', kwargs={"pk": self.object.pk})
+        return '1'

apps/member/forms.py

@@ -3,7 +3,6 @@
 
 import io
 
-from bootstrap_datepicker_plus.widgets import DatePickerInput
 from PIL import Image, ImageSequence
 from django import forms
 from django.conf import settings
@@ -14,7 +13,7 @@ from django.forms import CheckboxSelectMultiple
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, Alias
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
 from permission.models import PermissionMask, Role
 
 from .models import Profile, Club, Membership
@@ -33,7 +32,7 @@ class UserForm(forms.ModelForm):
         # Django usernames can only contain letters, numbers, @, ., +, - and _.
         # We want to allow users to have uncommon and unpractical usernames:
         # That is their problem, and we have normalized aliases for us.
-        return super()._get_validation_exclusions() | {"username"}
+        return super()._get_validation_exclusions() + ["username"]
 
     class Meta:
         model = User

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="consumer")
+    router.register(path + '/consumer', ConsumerViewSet)
 
     router.register(path + '/transaction/category', TemplateCategoryViewSet)
     router.register(path + '/transaction/transaction', TransactionViewSet)

apps/note/api/views.py

@@ -179,10 +179,19 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
             # We match first an alias if it is matched without normalization,
             # then if the normalized pattern matches a normalized alias.
             queryset = queryset.filter(
-                Q(**{f'name{suffix}': alias_prefix + alias})
+                **{f'name{suffix}': alias_prefix + alias}
-                | Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+            ).union(
-                | Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+                queryset.filter(
-            )
+                    Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
+                ),
+                all=True).union(
+                queryset.filter(
+                    Q(**{f'normalized_name{suffix}': alias_prefix + alias.lower()})
+                    & ~Q(**{f'normalized_name{suffix}': alias_prefix + Alias.normalize(alias)})
+                    & ~Q(**{f'name{suffix}': alias_prefix + alias})
+                ),
+                all=True)
 
         queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
             else queryset.order_by("name")

apps/note/forms.py

@@ -1,15 +1,13 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
 from datetime import datetime
 
-from bootstrap_datepicker_plus.widgets import DateTimePickerInput
 from django import forms
 from django.contrib.contenttypes.models import ContentType
 from django.forms import CheckboxSelectMultiple
 from django.utils.timezone import make_aware
 from django.utils.translation import gettext_lazy as _
-from note_kfet.inputs import Autocomplete, AmountInput
+from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput
 
 from .models import TransactionTemplate, NoteClub, Alias
 

apps/note/migrations/0002_create_special_notes.py

@@ -18,7 +18,6 @@ def create_special_notes(apps, schema_editor):
 class Migration(migrations.Migration):
     dependencies = [
         ('note', '0001_initial'),
-        ('logs', '0001_initial'),
     ]
 
     operations = [

apps/note/migrations/0007_alter_note_polymorphic_ctype_and_more.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.0.7 on 2024-07-11 09:24
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('note', '0006_trust'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='note',
-            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'),
-        ),
-        migrations.AlterField(
-            model_name='transaction',
-            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/note/templates/note/amount_input.html

@@ -9,7 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
            name="{{ widget.name }}"
            {# Other attributes are loaded  #}
            {% for name, value in widget.attrs.items %}
-                {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
+                {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
             {% endfor %}>
     <div class="input-group-append">
         <span class="input-group-text">€</span>

apps/treasury/migrations/0009_alter_sogecredit_transactions.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.0.7 on 2024-07-11 09:24
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('note', '0007_alter_note_polymorphic_ctype_and_more'),
-        ('treasury', '0008_auto_20240322_0045'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='sogecredit',
-            name='transactions',
-            field=models.ManyToManyField(blank=True, related_name='+', to='note.membershiptransaction', verbose_name='membership transactions'),
-        ),
-    ]

apps/wei/forms/registration.py

@@ -1,14 +1,13 @@
 # Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-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
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial, NoteUser
-from note_kfet.inputs import AmountInput, Autocomplete, ColorWidget
+from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget
 
 from ..models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership, WEIRole
 

apps/wei/tests/test_wei_registration.py

@@ -439,7 +439,7 @@ class TestWEIRegistration(TestCase):
             emergency_contact_phone='+33123456789',
         ))
         self.assertEqual(response.status_code, 200)
-        self.assertTrue("This user can't be in her/his first year since he/she has already participated to a WEI."
+        self.assertTrue("This user can't be in her/his first year since he/she has already participated to a WEI."
                         in str(response.context["form"].errors))
 
         # Check that if the WEI is started, we can't register anyone
@@ -635,7 +635,7 @@ class TestWEIRegistration(TestCase):
         ))
         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))
+        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="GC WEI").id],

locale/fr/LC_MESSAGES/django.po

@@ -3388,10 +3388,6 @@ msgstr "Support technique"
 msgid "FAQ (FR)"
 msgstr "FAQ (FR)"
 
-#: note_kfet/templates/base.html:200
-msgid "Charte Info (FR)"
-msgstr "Charte Info (FR)"
-
 #: note_kfet/templates/base_search.html:15
 msgid "Search by attribute such as name…"
 msgstr "Chercher par un attribut tel que le nom …"

note_kfet/admin.py

@@ -25,13 +25,19 @@ admin_site.register(Site, SiteAdmin)
 
 # Add external apps model
 if "oauth2_provider" in settings.INSTALLED_APPS:
-    from oauth2_provider.admin import ApplicationAdmin, GrantAdmin, AccessTokenAdmin, RefreshTokenAdmin
+    from oauth2_provider.admin import Application, ApplicationAdmin, Grant, \
-    from oauth2_provider.models import Application, Grant, AccessToken, RefreshToken
+        GrantAdmin, AccessToken, AccessTokenAdmin, RefreshToken, RefreshTokenAdmin
     admin_site.register(Application, ApplicationAdmin)
     admin_site.register(Grant, GrantAdmin)
     admin_site.register(AccessToken, AccessTokenAdmin)
     admin_site.register(RefreshToken, RefreshTokenAdmin)
 
+if "django_htcpcp_tea" in settings.INSTALLED_APPS:
+    from django_htcpcp_tea.admin import *
+    from django_htcpcp_tea.models import *
+    admin_site.register(Pot, PotAdmin)
+    admin_site.register(TeaType, TeaTypeAdmin)
+    admin_site.register(Addition, AdditionAdmin)
 
 if "mailer" in settings.INSTALLED_APPS:
     from mailer.admin import *
@@ -44,3 +50,9 @@ if "rest_framework" in settings.INSTALLED_APPS:
     from rest_framework.authtoken.admin import *
     from rest_framework.authtoken.models import *
     admin_site.register(Token, TokenAdmin)
+
+if "cas_server" in settings.INSTALLED_APPS:
+    from cas_server.admin import *
+    from cas_server.models import *
+    admin_site.register(ServicePattern, ServicePatternAdmin)
+    admin_site.register(FederatedIendityProvider, FederatedIendityProviderAdmin)

note_kfet/fixtures/initial.json

@@ -4,7 +4,7 @@
         "pk": 1,
         "fields": {
             "domain": "note.crans.org",
-            "name": "La Note Kfet 🍪"
+            "name": "La Note Kfet \ud83c\udf7b"
         }
     }
 ]

note_kfet/settings/base.py

@@ -41,7 +41,7 @@ INSTALLED_APPS = [
     'bootstrap_datepicker_plus',
     'colorfield',
     'crispy_forms',
-    'crispy_bootstrap4',
+    'django_htcpcp_tea',
     'django_tables2',
     'mailer',
     'phonenumber_field',
@@ -77,6 +77,7 @@ INSTALLED_APPS = [
     'scripts',
     'treasury',
     'wei',
+    'food',
 ]
 
 MIDDLEWARE = [
@@ -90,6 +91,7 @@ MIDDLEWARE = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'django.middleware.locale.LocaleMiddleware',
     'django.contrib.sites.middleware.CurrentSiteMiddleware',
+    'django_htcpcp_tea.middleware.HTCPCPTeaMiddleware',
     'note_kfet.middlewares.SessionMiddleware',
     'note_kfet.middlewares.LoginByIPMiddleware',
     'note_kfet.middlewares.TurbolinksMiddleware',
@@ -294,6 +296,3 @@ 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'
-
-# Default field for primary key
-DEFAULT_AUTO_FIELD = "django.db.models.AutoField"

note_kfet/templates/autocomplete_model.html

@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
    {% if widget.value != None and widget.value != "" %}value="{{ widget.value }}"{% endif %}
    name="{{ widget.name }}_name" autocomplete="off"
     {% for name, value in widget.attrs.items %}
-        {% if value != False %}{{ name }}{% if value != True %}="{{ value|stringformat:'s' }}"{% endif %}{% endif %}
+        {% ifnotequal value False %}{{ name }}{% ifnotequal value True %}="{{ value|stringformat:'s' }}"{% endifnotequal %}{% endifnotequal %}
     {% endfor %}
     aria-describedby="{{widget.attrs.id}}_tooltip">
     {% if widget.resetable %}

note_kfet/templates/base.html

@@ -126,12 +126,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 %}
@@ -197,8 +194,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                            class="text-muted">{% trans "Contact us" %}</a> &mdash;
                         <a href="mailto:{{ "SUPPORT_EMAIL" | getenv }}"
                            class="text-muted">{% trans "Technical Support" %}</a> &mdash;
-                        <a href="https://perso.crans.org/club-bde/charte_informatique.pdf"
-                           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;
                     </span>

note_kfet/urls.py

@@ -21,6 +21,7 @@ urlpatterns = [
     path('activity/', include('activity.urls')),
     path('treasury/', include('treasury.urls')),
     path('wei/', include('wei.urls')),
+    path('food/',include('food.urls')),
 
     # Include Django Contrib and Core routers
     path('i18n/', include('django.conf.urls.i18n')),
@@ -30,6 +31,9 @@ urlpatterns = [
     path('accounts/', include('django.contrib.auth.urls')),
     path('api/', include('api.urls')),
     path('permission/', include('permission.urls')),
+
+    # Make coffee
+    path('coffee/', include('django_htcpcp_tea.urls')),
 ]
 
 # During development, serve static and media files
@@ -43,6 +47,11 @@ if "oauth2_provider" in settings.INSTALLED_APPS:
         path('o/', include('oauth2_provider.urls', namespace='oauth2_provider'))
     )
 
+if "cas_server" in settings.INSTALLED_APPS:
+    urlpatterns.append(
+        path('cas/', include('cas_server.urls', namespace='cas_server'))
+    )
+
 if "debug_toolbar" in settings.INSTALLED_APPS:
     import debug_toolbar
     urlpatterns = [

requirements.txt

@@ -1,17 +1,19 @@
-beautifulsoup4~=4.12.3
+beautifulsoup4~=4.7.1
-crispy-bootstrap4~=2024.1
+Django~=2.2.15
-Django~=5.0.7
+django-bootstrap-datepicker-plus~=3.0.5
-django-bootstrap-datepicker-plus~=5.0.5
+django-cas-server~=1.2.0
-django-colorfield~=0.11.0
+django-colorfield~=0.3.2
-django-crispy-forms~=2.2
+django-crispy-forms~=1.7.2
-django-extensions~=3.2.3
+django-extensions>=2.1.4
-django-filter~=24.2
+django-filter~=2.1
-django-mailer~=2.3.2
+django-htcpcp-tea~=0.3.1
-django-oauth-toolkit~=2.4.0
+django-mailer~=2.0.1
-django-phonenumber-field~=8.0.0
+django-oauth-toolkit~=1.3.3
-django-polymorphic~=3.1.0
+django-phonenumber-field~=5.0.0
-django-rest-polymorphic~=0.1.10
+django-polymorphic>=2.0.3,<3.0.0
-django-tables2~=2.7.0
+djangorestframework>=3.9.0,<3.13.0
-djangorestframework~=3.15.2
+django-rest-polymorphic~=0.1.9
-phonenumbers~=8.13.40
+django-tables2~=2.3.1
+python-memcached~=1.59
+phonenumbers~=8.9.10
 Pillow>=5.4.1

tox.ini

@@ -1,10 +1,13 @@
 [tox]
 envlist =
+    # Debian Buster Python
+    py37-django22
+
     # Ubuntu 20.04 Python
-    py310-django50
+    py38-django22
 
     # Debian Bullseye Python
-    py311-django50
+    py39-django22
 
     linters
 skipsdist = True