mirror of
https://gitlab.crans.org/bde/nk20
synced 2025-06-21 01:48:21 +02:00
Compare commits
63 Commits
migration-
...
22aa91593c
Author | SHA1 | Date | |
---|---|---|---|
22aa91593c | |||
33c94d0720 | |||
5040e8e8ea | |||
c5697c4cb4 | |||
e188c5a153 | |||
94e1fdc93a | |||
d1ef367bab | |||
0fbb19c5fd | |||
21cbf2b21a | |||
185a2cabf2 | |||
7552e55c8d | |||
361de9f8b4 | |||
e2426bd6a6 | |||
7fea619a9f | |||
7b5eefcc0a | |||
e4aa16986f | |||
b92e6e4e10 | |||
dd675b3676 | |||
f50849b4f8 | |||
73ff35c232 | |||
a5df98224f | |||
96539d262f | |||
946674f59b | |||
a201d8376a | |||
a21b9275ea | |||
d4e85e8215 | |||
7af2ebba40 | |||
bd94400883 | |||
5558341c8c | |||
35ef82223c | |||
9ccac36831 | |||
2e71ce05a9 | |||
f2cb10b69f | |||
24c4edf2e3 | |||
213e9a8b12 | |||
549f56dc0b | |||
debeb33d46 | |||
6d7076b03e | |||
196df1e775 | |||
b2b1f03b46 | |||
1c5ed2bd3f | |||
a7e87ea639 | |||
6f67d2c629 | |||
4b97ab2e2a | |||
dcfd0167e7 | |||
50a680eed2 | |||
226a2a6357 | |||
48462f2ffc | |||
260513ae3b | |||
210a3cc93c | |||
896095a44c | |||
3f997f94fa | |||
0801ad64ae | |||
64bd5ed546 | |||
4c390dce17 | |||
adacc293f5 | |||
968fa64d37 | |||
a481adbae4 | |||
4de2e987ef | |||
9e6342c929 | |||
74de358953 | |||
dde1baa25c | |||
7a7ee47e0b |
1
.gitignore
vendored
1
.gitignore
vendored
@ -48,7 +48,6 @@ backups/
|
|||||||
env/
|
env/
|
||||||
venv/
|
venv/
|
||||||
db.sqlite3
|
db.sqlite3
|
||||||
shell.nix
|
|
||||||
|
|
||||||
# ansibles customs host
|
# ansibles customs host
|
||||||
ansible/host_vars/*.yaml
|
ansible/host_vars/*.yaml
|
||||||
|
@ -7,21 +7,6 @@ stages:
|
|||||||
variables:
|
variables:
|
||||||
GIT_SUBMODULE_STRATEGY: recursive
|
GIT_SUBMODULE_STRATEGY: recursive
|
||||||
|
|
||||||
# Debian Bullseye
|
|
||||||
py39-django42:
|
|
||||||
stage: test
|
|
||||||
image: debian:bullseye
|
|
||||||
before_script:
|
|
||||||
- >
|
|
||||||
apt-get update &&
|
|
||||||
apt-get install --no-install-recommends -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 py39-django42
|
|
||||||
|
|
||||||
# Ubuntu 22.04
|
# Ubuntu 22.04
|
||||||
py310-django42:
|
py310-django42:
|
||||||
stage: test
|
stage: test
|
||||||
@ -54,8 +39,6 @@ py311-django42:
|
|||||||
python3-bs4 python3-setuptools tox texlive-xetex
|
python3-bs4 python3-setuptools tox texlive-xetex
|
||||||
script: tox -e py311-django42
|
script: tox -e py311-django42
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
linters:
|
linters:
|
||||||
stage: quality-assurance
|
stage: quality-assurance
|
||||||
image: debian:bookworm
|
image: debian:bookworm
|
||||||
|
@ -0,0 +1,24 @@
|
|||||||
|
# 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 = [
|
||||||
|
('note', '0006_trust'),
|
||||||
|
('activity', '0004_opener'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterModelOptions(
|
||||||
|
name='opener',
|
||||||
|
options={'verbose_name': 'Opener', 'verbose_name_plural': 'Openers'},
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name='opener',
|
||||||
|
name='opener',
|
||||||
|
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activity_responsible', to='note.note', verbose_name='Opener'),
|
||||||
|
),
|
||||||
|
]
|
@ -15,29 +15,33 @@ router = routers.DefaultRouter()
|
|||||||
router.register('models', ContentTypeViewSet)
|
router.register('models', ContentTypeViewSet)
|
||||||
router.register('user', UserViewSet)
|
router.register('user', UserViewSet)
|
||||||
|
|
||||||
|
if "activity" in settings.INSTALLED_APPS:
|
||||||
|
from activity.api.urls import register_activity_urls
|
||||||
|
register_activity_urls(router, 'activity')
|
||||||
|
|
||||||
|
if "food" in settings.INSTALLED_APPS:
|
||||||
|
from food.api.urls import register_food_urls
|
||||||
|
register_food_urls(router, 'food')
|
||||||
|
|
||||||
|
if "logs" in settings.INSTALLED_APPS:
|
||||||
|
from logs.api.urls import register_logs_urls
|
||||||
|
register_logs_urls(router, 'logs')
|
||||||
|
|
||||||
if "member" in settings.INSTALLED_APPS:
|
if "member" in settings.INSTALLED_APPS:
|
||||||
from member.api.urls import register_members_urls
|
from member.api.urls import register_members_urls
|
||||||
register_members_urls(router, 'members')
|
register_members_urls(router, 'members')
|
||||||
|
|
||||||
if "member" in settings.INSTALLED_APPS:
|
|
||||||
from activity.api.urls import register_activity_urls
|
|
||||||
register_activity_urls(router, 'activity')
|
|
||||||
|
|
||||||
if "note" in settings.INSTALLED_APPS:
|
if "note" in settings.INSTALLED_APPS:
|
||||||
from note.api.urls import register_note_urls
|
from note.api.urls import register_note_urls
|
||||||
register_note_urls(router, 'note')
|
register_note_urls(router, 'note')
|
||||||
|
|
||||||
if "treasury" in settings.INSTALLED_APPS:
|
|
||||||
from treasury.api.urls import register_treasury_urls
|
|
||||||
register_treasury_urls(router, 'treasury')
|
|
||||||
|
|
||||||
if "permission" in settings.INSTALLED_APPS:
|
if "permission" in settings.INSTALLED_APPS:
|
||||||
from permission.api.urls import register_permission_urls
|
from permission.api.urls import register_permission_urls
|
||||||
register_permission_urls(router, 'permission')
|
register_permission_urls(router, 'permission')
|
||||||
|
|
||||||
if "logs" in settings.INSTALLED_APPS:
|
if "treasury" in settings.INSTALLED_APPS:
|
||||||
from logs.api.urls import register_logs_urls
|
from treasury.api.urls import register_treasury_urls
|
||||||
register_logs_urls(router, 'logs')
|
register_treasury_urls(router, 'treasury')
|
||||||
|
|
||||||
if "wei" in settings.INSTALLED_APPS:
|
if "wei" in settings.INSTALLED_APPS:
|
||||||
from wei.api.urls import register_wei_urls
|
from wei.api.urls import register_wei_urls
|
||||||
|
0
apps/food/__init__.py
Normal file
0
apps/food/__init__.py
Normal file
37
apps/food/admin.py
Normal file
37
apps/food/admin.py
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from django.contrib import admin
|
||||||
|
from django.db import transaction
|
||||||
|
from note_kfet.admin import admin_site
|
||||||
|
|
||||||
|
from .models import Allergen, BasicFood, QRCode, TransformedFood
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(QRCode, site=admin_site)
|
||||||
|
class QRCodeAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(BasicFood, site=admin_site)
|
||||||
|
class BasicFoodAdmin(admin.ModelAdmin):
|
||||||
|
@transaction.atomic
|
||||||
|
def save_related(self, *args, **kwargs):
|
||||||
|
ans = super().save_related(*args, **kwargs)
|
||||||
|
args[1].instance.update()
|
||||||
|
return ans
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(TransformedFood, site=admin_site)
|
||||||
|
class TransformedFoodAdmin(admin.ModelAdmin):
|
||||||
|
exclude = ["allergens", "expiry_date"]
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def save_related(self, request, form, *args, **kwargs):
|
||||||
|
super().save_related(request, form, *args, **kwargs)
|
||||||
|
form.instance.update()
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(Allergen, site=admin_site)
|
||||||
|
class AllergenAdmin(admin.ModelAdmin):
|
||||||
|
pass
|
0
apps/food/api/__init__.py
Normal file
0
apps/food/api/__init__.py
Normal file
50
apps/food/api/serializers.py
Normal file
50
apps/food/api/serializers.py
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from ..models import Allergen, BasicFood, QRCode, TransformedFood
|
||||||
|
|
||||||
|
|
||||||
|
class AllergenSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
REST API Serializer for Allergen.
|
||||||
|
The djangorestframework plugin will analyse the model `Allergen` and parse all fields in the API.
|
||||||
|
"""
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = Allergen
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class BasicFoodSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
REST API Serializer for BasicFood.
|
||||||
|
The djangorestframework plugin will analyse the model `BasicFood` and parse all fields in the API.
|
||||||
|
"""
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = BasicFood
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class QRCodeSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
REST API Serializer for QRCode.
|
||||||
|
The djangorestframework plugin will analyse the model `QRCode` and parse all fields in the API.
|
||||||
|
"""
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = QRCode
|
||||||
|
fields = '__all__'
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFoodSerializer(serializers.ModelSerializer):
|
||||||
|
"""
|
||||||
|
REST API Serializer for TransformedFood.
|
||||||
|
The djangorestframework plugin will analyse the model `TransformedFood` and parse all fields in the API.
|
||||||
|
"""
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = TransformedFood
|
||||||
|
fields = '__all__'
|
14
apps/food/api/urls.py
Normal file
14
apps/food/api/urls.py
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from .views import AllergenViewSet, BasicFoodViewSet, QRCodeViewSet, TransformedFoodViewSet
|
||||||
|
|
||||||
|
|
||||||
|
def register_food_urls(router, path):
|
||||||
|
"""
|
||||||
|
Configure router for Food REST API.
|
||||||
|
"""
|
||||||
|
router.register(path + '/allergen', AllergenViewSet)
|
||||||
|
router.register(path + '/basic_food', BasicFoodViewSet)
|
||||||
|
router.register(path + '/qrcode', QRCodeViewSet)
|
||||||
|
router.register(path + '/transformed_food', TransformedFoodViewSet)
|
61
apps/food/api/views.py
Normal file
61
apps/food/api/views.py
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from api.viewsets import ReadProtectedModelViewSet
|
||||||
|
from django_filters.rest_framework import DjangoFilterBackend
|
||||||
|
from rest_framework.filters import SearchFilter
|
||||||
|
|
||||||
|
from .serializers import AllergenSerializer, BasicFoodSerializer, QRCodeSerializer, TransformedFoodSerializer
|
||||||
|
from ..models import Allergen, BasicFood, QRCode, TransformedFood
|
||||||
|
|
||||||
|
|
||||||
|
class AllergenViewSet(ReadProtectedModelViewSet):
|
||||||
|
"""
|
||||||
|
REST API View set.
|
||||||
|
The djangorestframework plugin will get all `Allergen` objects, serialize it to JSON with the given serializer,
|
||||||
|
then render it on /api/food/allergen/
|
||||||
|
"""
|
||||||
|
queryset = Allergen.objects.order_by('id')
|
||||||
|
serializer_class = AllergenSerializer
|
||||||
|
filter_backends = [DjangoFilterBackend, SearchFilter]
|
||||||
|
filterset_fields = ['name', ]
|
||||||
|
search_fields = ['$name', ]
|
||||||
|
|
||||||
|
|
||||||
|
class BasicFoodViewSet(ReadProtectedModelViewSet):
|
||||||
|
"""
|
||||||
|
REST API View set.
|
||||||
|
The djangorestframework plugin will get all `BasicFood` objects, serialize it to JSON with the given serializer,
|
||||||
|
then render it on /api/food/basic_food/
|
||||||
|
"""
|
||||||
|
queryset = BasicFood.objects.order_by('id')
|
||||||
|
serializer_class = BasicFoodSerializer
|
||||||
|
filter_backends = [DjangoFilterBackend, SearchFilter]
|
||||||
|
filterset_fields = ['name', ]
|
||||||
|
search_fields = ['$name', ]
|
||||||
|
|
||||||
|
|
||||||
|
class QRCodeViewSet(ReadProtectedModelViewSet):
|
||||||
|
"""
|
||||||
|
REST API View set.
|
||||||
|
The djangorestframework plugin will get all `QRCode` objects, serialize it to JSON with the given serializer,
|
||||||
|
then render it on /api/food/qrcode/
|
||||||
|
"""
|
||||||
|
queryset = QRCode.objects.order_by('id')
|
||||||
|
serializer_class = QRCodeSerializer
|
||||||
|
filter_backends = [DjangoFilterBackend, SearchFilter]
|
||||||
|
filterset_fields = ['qr_code_number', ]
|
||||||
|
search_fields = ['$qr_code_number', ]
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFoodViewSet(ReadProtectedModelViewSet):
|
||||||
|
"""
|
||||||
|
REST API View set.
|
||||||
|
The djangorestframework plugin will get all `TransformedFood` objects, serialize it to JSON with the given serializer,
|
||||||
|
then render it on /api/food/transformed_food/
|
||||||
|
"""
|
||||||
|
queryset = TransformedFood.objects.order_by('id')
|
||||||
|
serializer_class = TransformedFoodSerializer
|
||||||
|
filter_backends = [DjangoFilterBackend, SearchFilter]
|
||||||
|
filterset_fields = ['name', ]
|
||||||
|
search_fields = ['$name', ]
|
11
apps/food/apps.py
Normal file
11
apps/food/apps.py
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
from django.apps import AppConfig
|
||||||
|
|
||||||
|
|
||||||
|
class FoodkfetConfig(AppConfig):
|
||||||
|
name = 'food'
|
||||||
|
verbose_name = _('food')
|
114
apps/food/forms.py
Normal file
114
apps/food/forms.py
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
# 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 bootstrap_datepicker_plus.widgets import DateTimePickerInput
|
||||||
|
from note_kfet.inputs import Autocomplete
|
||||||
|
from note_kfet.middlewares import get_current_request
|
||||||
|
from permission.backends import PermissionBackend
|
||||||
|
|
||||||
|
from .models import BasicFood, QRCode, TransformedFood
|
||||||
|
|
||||||
|
|
||||||
|
class AddIngredientForms(forms.ModelForm):
|
||||||
|
"""
|
||||||
|
Form for add an ingredient
|
||||||
|
"""
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.fields['ingredient'].queryset = self.fields['ingredient'].queryset.filter(
|
||||||
|
polymorphic_ctype__model='transformedfood',
|
||||||
|
is_ready=False,
|
||||||
|
is_active=True,
|
||||||
|
was_eaten=False,
|
||||||
|
)
|
||||||
|
# Caution, the logic is inverted here, we flip the logic on saving in AddIngredientView
|
||||||
|
self.fields['is_active'].initial = True
|
||||||
|
self.fields['is_active'].label = _("Fully used")
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = TransformedFood
|
||||||
|
fields = ('ingredient', 'is_active')
|
||||||
|
|
||||||
|
|
||||||
|
class BasicFoodForms(forms.ModelForm):
|
||||||
|
"""
|
||||||
|
Form for add non-transformed food
|
||||||
|
"""
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
|
||||||
|
self.fields['name'].required = True
|
||||||
|
self.fields['owner'].required = True
|
||||||
|
|
||||||
|
# Some example
|
||||||
|
self.fields['name'].widget.attrs.update({"placeholder": _("Pasta METRO 5kg")})
|
||||||
|
clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
|
||||||
|
shuffle(clubs)
|
||||||
|
self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = BasicFood
|
||||||
|
fields = ('name', 'owner', 'date_type', 'expiry_date', 'is_active', 'was_eaten', 'allergens',)
|
||||||
|
widgets = {
|
||||||
|
"owner": Autocomplete(
|
||||||
|
model=Club,
|
||||||
|
attrs={"api_url": "/api/members/club/"},
|
||||||
|
),
|
||||||
|
'expiry_date': DateTimePickerInput(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class QRCodeForms(forms.ModelForm):
|
||||||
|
"""
|
||||||
|
Form for create QRCode
|
||||||
|
"""
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.fields['food_container'].queryset = self.fields['food_container'].queryset.filter(
|
||||||
|
is_active=True,
|
||||||
|
was_eaten=False,
|
||||||
|
polymorphic_ctype__model='transformedfood',
|
||||||
|
)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = QRCode
|
||||||
|
fields = ('food_container',)
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFoodForms(forms.ModelForm):
|
||||||
|
"""
|
||||||
|
Form for add transformed food
|
||||||
|
"""
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
super().__init__(*args, **kwargs)
|
||||||
|
self.fields['name'].widget.attrs.update({"autofocus": "autofocus"})
|
||||||
|
self.fields['name'].required = True
|
||||||
|
self.fields['owner'].required = True
|
||||||
|
self.fields['creation_date'].required = True
|
||||||
|
self.fields['creation_date'].initial = timezone.now
|
||||||
|
self.fields['is_active'].initial = True
|
||||||
|
self.fields['is_ready'].initial = False
|
||||||
|
self.fields['was_eaten'].initial = False
|
||||||
|
|
||||||
|
# Some example
|
||||||
|
self.fields['name'].widget.attrs.update({"placeholder": _("Lasagna")})
|
||||||
|
clubs = list(Club.objects.filter(PermissionBackend.filter_queryset(get_current_request(), Club, "change")).all())
|
||||||
|
shuffle(clubs)
|
||||||
|
self.fields['owner'].widget.attrs["placeholder"] = ", ".join(club.name for club in clubs[:4]) + ", ..."
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = TransformedFood
|
||||||
|
fields = ('name', 'creation_date', 'owner', 'is_active', 'is_ready', 'was_eaten', 'shelf_life')
|
||||||
|
widgets = {
|
||||||
|
"owner": Autocomplete(
|
||||||
|
model=Club,
|
||||||
|
attrs={"api_url": "/api/members/club/"},
|
||||||
|
),
|
||||||
|
'creation_date': DateTimePickerInput(),
|
||||||
|
}
|
84
apps/food/migrations/0001_initial.py
Normal file
84
apps/food/migrations/0001_initial.py
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
# Generated by Django 2.2.28 on 2024-07-05 08:57
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
import django.db.models.deletion
|
||||||
|
import django.utils.timezone
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
initial = True
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('contenttypes', '0002_remove_content_type_name'),
|
||||||
|
('member', '0011_profile_vss_charter_read'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Allergen',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('name', models.CharField(max_length=255, verbose_name='name')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Allergen',
|
||||||
|
'verbose_name_plural': 'Allergens',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='Food',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('name', models.CharField(max_length=255, verbose_name='name')),
|
||||||
|
('expiry_date', models.DateTimeField(verbose_name='expiry date')),
|
||||||
|
('was_eaten', models.BooleanField(default=False, verbose_name='was eaten')),
|
||||||
|
('is_ready', models.BooleanField(default=False, verbose_name='is ready')),
|
||||||
|
('allergens', models.ManyToManyField(blank=True, to='food.Allergen', verbose_name='allergen')),
|
||||||
|
('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='+', to='member.Club', verbose_name='owner')),
|
||||||
|
('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_food.food_set+', to='contenttypes.ContentType')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'foods',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='BasicFood',
|
||||||
|
fields=[
|
||||||
|
('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')),
|
||||||
|
('date_type', models.CharField(choices=[('DLC', 'DLC'), ('DDM', 'DDM')], max_length=255)),
|
||||||
|
('arrival_date', models.DateTimeField(default=django.utils.timezone.now, verbose_name='arrival date')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Basic food',
|
||||||
|
'verbose_name_plural': 'Basic foods',
|
||||||
|
},
|
||||||
|
bases=('food.food',),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='QRCode',
|
||||||
|
fields=[
|
||||||
|
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||||
|
('qr_code_number', models.PositiveIntegerField(unique=True, verbose_name='QR-code number')),
|
||||||
|
('food_container', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='QR_code', to='food.Food', verbose_name='food container')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'QR-code',
|
||||||
|
'verbose_name_plural': 'QR-codes',
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name='TransformedFood',
|
||||||
|
fields=[
|
||||||
|
('food_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='food.Food')),
|
||||||
|
('creation_date', models.DateTimeField(verbose_name='creation date')),
|
||||||
|
('is_active', models.BooleanField(default=True, verbose_name='is active')),
|
||||||
|
('ingredient', models.ManyToManyField(blank=True, related_name='transformed_ingredient_inv', to='food.Food', verbose_name='transformed ingredient')),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
'verbose_name': 'Transformed food',
|
||||||
|
'verbose_name_plural': 'Transformed foods',
|
||||||
|
},
|
||||||
|
bases=('food.food',),
|
||||||
|
),
|
||||||
|
]
|
19
apps/food/migrations/0002_transformedfood_shelf_life.py
Normal file
19
apps/food/migrations/0002_transformedfood_shelf_life.py
Normal file
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
62
apps/food/migrations/0003_create_14_allergens_mandatory.py
Normal file
62
apps/food/migrations/0003_create_14_allergens_mandatory.py
Normal file
@ -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),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
28
apps/food/migrations/0004_auto_20240813_2358.py
Normal file
28
apps/food/migrations/0004_auto_20240813_2358.py
Normal file
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
20
apps/food/migrations/0005_alter_food_polymorphic_ctype.py
Normal file
20
apps/food/migrations/0005_alter_food_polymorphic_ctype.py
Normal file
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
0
apps/food/migrations/__init__.py
Normal file
0
apps/food/migrations/__init__.py
Normal file
226
apps/food/models.py
Normal file
226
apps/food/models.py
Normal file
@ -0,0 +1,226 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from datetime import timedelta
|
||||||
|
|
||||||
|
from django.db import models, transaction
|
||||||
|
from django.utils import timezone
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
from member.models import Club
|
||||||
|
from polymorphic.models import PolymorphicModel
|
||||||
|
|
||||||
|
|
||||||
|
class QRCode(models.Model):
|
||||||
|
"""
|
||||||
|
An QRCode model
|
||||||
|
"""
|
||||||
|
qr_code_number = models.PositiveIntegerField(
|
||||||
|
verbose_name=_("QR-code number"),
|
||||||
|
unique=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
food_container = models.ForeignKey(
|
||||||
|
'Food',
|
||||||
|
on_delete=models.CASCADE,
|
||||||
|
related_name='QR_code',
|
||||||
|
verbose_name=_('food container'),
|
||||||
|
)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _("QR-code")
|
||||||
|
verbose_name_plural = _("QR-codes")
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return _("QR-code number {qr_code_number}").format(qr_code_number=self.qr_code_number)
|
||||||
|
|
||||||
|
|
||||||
|
class Allergen(models.Model):
|
||||||
|
"""
|
||||||
|
A list of allergen and alimentary restrictions
|
||||||
|
"""
|
||||||
|
name = models.CharField(
|
||||||
|
verbose_name=_('name'),
|
||||||
|
max_length=255,
|
||||||
|
)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _('Allergen')
|
||||||
|
verbose_name_plural = _('Allergens')
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
|
||||||
|
class Food(PolymorphicModel):
|
||||||
|
name = models.CharField(
|
||||||
|
verbose_name=_('name'),
|
||||||
|
max_length=255,
|
||||||
|
)
|
||||||
|
|
||||||
|
owner = models.ForeignKey(
|
||||||
|
Club,
|
||||||
|
on_delete=models.PROTECT,
|
||||||
|
related_name='+',
|
||||||
|
verbose_name=_('owner'),
|
||||||
|
)
|
||||||
|
|
||||||
|
allergens = models.ManyToManyField(
|
||||||
|
Allergen,
|
||||||
|
blank=True,
|
||||||
|
verbose_name=_('allergen'),
|
||||||
|
)
|
||||||
|
|
||||||
|
expiry_date = models.DateTimeField(
|
||||||
|
verbose_name=_('expiry date'),
|
||||||
|
null=False,
|
||||||
|
)
|
||||||
|
|
||||||
|
was_eaten = models.BooleanField(
|
||||||
|
default=False,
|
||||||
|
verbose_name=_('was eaten'),
|
||||||
|
)
|
||||||
|
|
||||||
|
# is_ready != is_active : is_ready signifie que la nourriture est prête à être manger,
|
||||||
|
# is_active signifie que la nourriture n'est pas encore archivé
|
||||||
|
# il sert dans les cas où il est plus intéressant que de l'open soit conservé (confiture par ex)
|
||||||
|
|
||||||
|
is_ready = models.BooleanField(
|
||||||
|
default=False,
|
||||||
|
verbose_name=_('is ready'),
|
||||||
|
)
|
||||||
|
|
||||||
|
is_active = models.BooleanField(
|
||||||
|
default=True,
|
||||||
|
verbose_name=_('is active'),
|
||||||
|
)
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return self.name
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
|
||||||
|
return super().save(force_insert, force_update, using, update_fields)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _('food')
|
||||||
|
verbose_name = _('foods')
|
||||||
|
|
||||||
|
|
||||||
|
class BasicFood(Food):
|
||||||
|
"""
|
||||||
|
Food which has been directly buy on supermarket
|
||||||
|
"""
|
||||||
|
date_type = models.CharField(
|
||||||
|
max_length=255,
|
||||||
|
choices=(
|
||||||
|
("DLC", "DLC"),
|
||||||
|
("DDM", "DDM"),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
arrival_date = models.DateTimeField(
|
||||||
|
verbose_name=_('arrival date'),
|
||||||
|
default=timezone.now,
|
||||||
|
)
|
||||||
|
|
||||||
|
# label = models.ImageField(
|
||||||
|
# verbose_name=_('food label'),
|
||||||
|
# max_length=255,
|
||||||
|
# blank=False,
|
||||||
|
# null=False,
|
||||||
|
# upload_to='label/',
|
||||||
|
# )
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def update_allergens(self):
|
||||||
|
# update parents
|
||||||
|
for parent in self.transformed_ingredient_inv.iterator():
|
||||||
|
parent.update_allergens()
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def update_expiry_date(self):
|
||||||
|
# update parents
|
||||||
|
for parent in self.transformed_ingredient_inv.iterator():
|
||||||
|
parent.update_expiry_date()
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def update(self):
|
||||||
|
self.update_allergens()
|
||||||
|
self.update_expiry_date()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _('Basic food')
|
||||||
|
verbose_name_plural = _('Basic foods')
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFood(Food):
|
||||||
|
"""
|
||||||
|
Transformed food are a mix between basic food and meal
|
||||||
|
"""
|
||||||
|
creation_date = models.DateTimeField(
|
||||||
|
verbose_name=_('creation date'),
|
||||||
|
)
|
||||||
|
|
||||||
|
ingredient = models.ManyToManyField(
|
||||||
|
Food,
|
||||||
|
blank=True,
|
||||||
|
symmetrical=False,
|
||||||
|
related_name='transformed_ingredient_inv',
|
||||||
|
verbose_name=_('transformed ingredient'),
|
||||||
|
)
|
||||||
|
|
||||||
|
# Without microbiological analyzes, the storage time is 3 days
|
||||||
|
shelf_life = models.DurationField(
|
||||||
|
verbose_name=_("shelf life"),
|
||||||
|
default=timedelta(days=3),
|
||||||
|
)
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def archive(self):
|
||||||
|
# When a meal are archived, if it was eaten, update ingredient fully used for this meal
|
||||||
|
raise NotImplementedError
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def update_allergens(self):
|
||||||
|
# When allergens are changed, simply update the parents' allergens
|
||||||
|
old_allergens = list(self.allergens.all())
|
||||||
|
self.allergens.clear()
|
||||||
|
for ingredient in self.ingredient.iterator():
|
||||||
|
self.allergens.set(self.allergens.union(ingredient.allergens.all()))
|
||||||
|
|
||||||
|
if old_allergens == list(self.allergens.all()):
|
||||||
|
return
|
||||||
|
super().save()
|
||||||
|
|
||||||
|
# update parents
|
||||||
|
for parent in self.transformed_ingredient_inv.iterator():
|
||||||
|
parent.update_allergens()
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def update_expiry_date(self):
|
||||||
|
# When expiry_date is changed, simply update the parents' expiry_date
|
||||||
|
old_expiry_date = self.expiry_date
|
||||||
|
self.expiry_date = self.creation_date + self.shelf_life
|
||||||
|
for ingredient in self.ingredient.iterator():
|
||||||
|
self.expiry_date = min(self.expiry_date, ingredient.expiry_date)
|
||||||
|
|
||||||
|
if old_expiry_date == self.expiry_date:
|
||||||
|
return
|
||||||
|
super().save()
|
||||||
|
|
||||||
|
# update parents
|
||||||
|
for parent in self.transformed_ingredient_inv.iterator():
|
||||||
|
parent.update_expiry_date()
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def update(self):
|
||||||
|
self.update_allergens()
|
||||||
|
self.update_expiry_date()
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def save(self, *args, **kwargs):
|
||||||
|
super().save(*args, **kwargs)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
verbose_name = _('Transformed food')
|
||||||
|
verbose_name_plural = _('Transformed foods')
|
19
apps/food/tables.py
Normal file
19
apps/food/tables.py
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
import django_tables2 as tables
|
||||||
|
from django_tables2 import A
|
||||||
|
|
||||||
|
from .models import TransformedFood
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFoodTable(tables.Table):
|
||||||
|
name = tables.LinkColumn(
|
||||||
|
'food:food_view',
|
||||||
|
args=[A('pk'), ],
|
||||||
|
)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = TransformedFood
|
||||||
|
template_name = 'django_tables2/bootstrap4.html'
|
||||||
|
fields = ('name', "owner", "allergens", "expiry_date")
|
20
apps/food/templates/food/add_ingredient_form.html
Normal file
20
apps/food/templates/food/add_ingredient_form.html
Normal file
@ -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 %}
|
37
apps/food/templates/food/basicfood_detail.html
Normal file
37
apps/food/templates/food/basicfood_detail.html
Normal file
@ -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 %}
|
20
apps/food/templates/food/basicfood_form.html
Normal file
20
apps/food/templates/food/basicfood_form.html
Normal file
@ -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 %}
|
55
apps/food/templates/food/create_qrcode_form.html
Normal file
55
apps/food/templates/food/create_qrcode_form.html
Normal file
@ -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 %}
|
39
apps/food/templates/food/qrcode_detail.html
Normal file
39
apps/food/templates/food/qrcode_detail.html
Normal file
@ -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 %}
|
51
apps/food/templates/food/transformedfood_detail.html
Normal file
51
apps/food/templates/food/transformedfood_detail.html
Normal file
@ -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 %}
|
20
apps/food/templates/food/transformedfood_form.html
Normal file
20
apps/food/templates/food/transformedfood_form.html
Normal file
@ -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 %}
|
60
apps/food/templates/food/transformedfood_list.html
Normal file
60
apps/food/templates/food/transformedfood_list.html
Normal file
@ -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 %}
|
3
apps/food/tests.py
Normal file
3
apps/food/tests.py
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
21
apps/food/urls.py
Normal file
21
apps/food/urls.py
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
app_name = 'food'
|
||||||
|
|
||||||
|
urlpatterns = [
|
||||||
|
path('', views.TransformedListView.as_view(), name='food_list'),
|
||||||
|
path('<int:slug>', views.QRCodeView.as_view(), name='qrcode_view'),
|
||||||
|
path('detail/<int:pk>', views.FoodView.as_view(), name='food_view'),
|
||||||
|
|
||||||
|
path('<int:slug>/create_qrcode', views.QRCodeCreateView.as_view(), name='qrcode_create'),
|
||||||
|
path('<int:slug>/create_qrcode/basic', views.QRCodeBasicFoodCreateView.as_view(), name='qrcode_basic_create'),
|
||||||
|
path('create/transformed', views.TransformedFoodCreateView.as_view(), name='transformed_create'),
|
||||||
|
path('update/basic/<int:pk>', views.BasicFoodUpdateView.as_view(), name='basic_update'),
|
||||||
|
path('update/transformed/<int:pk>', views.TransformedFoodUpdateView.as_view(), name='transformed_update'),
|
||||||
|
path('add/<int:pk>', views.AddIngredientView.as_view(), name='add_ingredient'),
|
||||||
|
]
|
421
apps/food/views.py
Normal file
421
apps/food/views.py
Normal file
@ -0,0 +1,421 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from django.db import transaction
|
||||||
|
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||||
|
from django.http import HttpResponseRedirect
|
||||||
|
from django_tables2.views import MultiTableMixin
|
||||||
|
from django.urls import reverse
|
||||||
|
from django.utils.translation import gettext_lazy as _
|
||||||
|
from django.utils import timezone
|
||||||
|
from django.views.generic import DetailView, UpdateView
|
||||||
|
from django.views.generic.list import ListView
|
||||||
|
from django.forms import HiddenInput
|
||||||
|
from permission.backends import PermissionBackend
|
||||||
|
from permission.views import ProtectQuerysetMixin, ProtectedCreateView
|
||||||
|
|
||||||
|
from .forms import AddIngredientForms, BasicFoodForms, QRCodeForms, TransformedFoodForms
|
||||||
|
from .models import BasicFood, Food, QRCode, TransformedFood
|
||||||
|
from .tables import TransformedFoodTable
|
||||||
|
|
||||||
|
|
||||||
|
class AddIngredientView(ProtectQuerysetMixin, UpdateView):
|
||||||
|
"""
|
||||||
|
A view to add an ingredient
|
||||||
|
"""
|
||||||
|
model = Food
|
||||||
|
template_name = 'food/add_ingredient_form.html'
|
||||||
|
extra_context = {"title": _("Add the ingredient")}
|
||||||
|
form_class = AddIngredientForms
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context["pk"] = self.kwargs["pk"]
|
||||||
|
return context
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.instance.creater = self.request.user
|
||||||
|
food = Food.objects.get(pk=self.kwargs['pk'])
|
||||||
|
add_ingredient_form = AddIngredientForms(data=self.request.POST)
|
||||||
|
if food.is_ready:
|
||||||
|
form.add_error(None, _("The product is already prepared"))
|
||||||
|
return self.form_invalid(form)
|
||||||
|
if not add_ingredient_form.is_valid():
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
# We flip logic ""fully used = not is_active""
|
||||||
|
food.is_active = not food.is_active
|
||||||
|
# Save the aliment and the allergens associed
|
||||||
|
for transformed_pk in self.request.POST.getlist('ingredient'):
|
||||||
|
transformed = TransformedFood.objects.get(pk=transformed_pk)
|
||||||
|
if not transformed.is_ready:
|
||||||
|
transformed.ingredient.add(food)
|
||||||
|
transformed.update()
|
||||||
|
food.save()
|
||||||
|
|
||||||
|
return HttpResponseRedirect(self.get_success_url())
|
||||||
|
|
||||||
|
def get_success_url(self, **kwargs):
|
||||||
|
return reverse('food:food_list')
|
||||||
|
|
||||||
|
|
||||||
|
class BasicFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
|
||||||
|
"""
|
||||||
|
A view to update a basic food
|
||||||
|
"""
|
||||||
|
model = BasicFood
|
||||||
|
form_class = BasicFoodForms
|
||||||
|
template_name = 'food/basicfood_form.html'
|
||||||
|
extra_context = {"title": _("Update an aliment")}
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.instance.creater = self.request.user
|
||||||
|
basic_food_form = BasicFoodForms(data=self.request.POST)
|
||||||
|
if not basic_food_form.is_valid():
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
ans = super().form_valid(form)
|
||||||
|
form.instance.update()
|
||||||
|
return ans
|
||||||
|
|
||||||
|
def get_success_url(self, **kwargs):
|
||||||
|
self.object.refresh_from_db()
|
||||||
|
return reverse('food:food_view', kwargs={"pk": self.object.pk})
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class FoodView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
|
||||||
|
"""
|
||||||
|
A view to see a food
|
||||||
|
"""
|
||||||
|
model = Food
|
||||||
|
extra_context = {"title": _("Details of:")}
|
||||||
|
context_object_name = "food"
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
|
||||||
|
context["can_update"] = PermissionBackend.check_perm(self.request, "food.change_food")
|
||||||
|
context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class QRCodeBasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
|
||||||
|
#####################################################################
|
||||||
|
# TO DO
|
||||||
|
# - this feature is very pratical for meat or fish, nevertheless we can implement this later
|
||||||
|
# - fix picture save
|
||||||
|
# - implement solution crop and convert image (reuse or recode ImageForm from members apps)
|
||||||
|
#####################################################################
|
||||||
|
"""
|
||||||
|
A view to add a basic food with a qrcode
|
||||||
|
"""
|
||||||
|
model = BasicFood
|
||||||
|
form_class = BasicFoodForms
|
||||||
|
template_name = 'food/basicfood_form.html'
|
||||||
|
extra_context = {"title": _("Add a new basic food with QRCode")}
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.instance.creater = self.request.user
|
||||||
|
basic_food_form = BasicFoodForms(data=self.request.POST)
|
||||||
|
if not basic_food_form.is_valid():
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
# Save the aliment and the allergens associed
|
||||||
|
basic_food = form.save(commit=False)
|
||||||
|
# We assume the date of labeling and the same as the date of arrival
|
||||||
|
basic_food.arrival_date = timezone.now()
|
||||||
|
basic_food.is_ready = False
|
||||||
|
basic_food.is_active = True
|
||||||
|
basic_food.was_eaten = False
|
||||||
|
basic_food._force_save = True
|
||||||
|
basic_food.save()
|
||||||
|
basic_food.refresh_from_db()
|
||||||
|
|
||||||
|
qrcode = QRCode()
|
||||||
|
qrcode.qr_code_number = self.kwargs['slug']
|
||||||
|
qrcode.food_container = basic_food
|
||||||
|
qrcode.save()
|
||||||
|
|
||||||
|
return super().form_valid(form)
|
||||||
|
|
||||||
|
def get_success_url(self, **kwargs):
|
||||||
|
self.object.refresh_from_db()
|
||||||
|
return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']})
|
||||||
|
|
||||||
|
def get_sample_object(self):
|
||||||
|
|
||||||
|
# We choose a club which may work or BDE else
|
||||||
|
owner_id = 1
|
||||||
|
for membership in self.request.user.memberships.all():
|
||||||
|
club_id = membership.club.id
|
||||||
|
food = BasicFood(name="", expiry_date=timezone.now(), owner_id=club_id)
|
||||||
|
if PermissionBackend.check_perm(self.request, "food.add_basicfood", food):
|
||||||
|
owner_id = club_id
|
||||||
|
|
||||||
|
return BasicFood(
|
||||||
|
name="",
|
||||||
|
expiry_date=timezone.now(),
|
||||||
|
owner_id=owner_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
# Some field are hidden on create
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
|
||||||
|
form = context['form']
|
||||||
|
form.fields['is_active'].widget = HiddenInput()
|
||||||
|
form.fields['was_eaten'].widget = HiddenInput()
|
||||||
|
|
||||||
|
copy = self.request.GET.get('copy', None)
|
||||||
|
if copy is not None:
|
||||||
|
basic = BasicFood.objects.get(pk=copy)
|
||||||
|
for field in ['date_type', 'expiry_date', 'name', 'owner']:
|
||||||
|
form.fields[field].initial = getattr(basic, field)
|
||||||
|
for field in ['allergens']:
|
||||||
|
form.fields[field].initial = getattr(basic, field).all()
|
||||||
|
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class QRCodeCreateView(ProtectQuerysetMixin, ProtectedCreateView):
|
||||||
|
"""
|
||||||
|
A view to add a new qrcode
|
||||||
|
"""
|
||||||
|
model = QRCode
|
||||||
|
template_name = 'food/create_qrcode_form.html'
|
||||||
|
form_class = QRCodeForms
|
||||||
|
extra_context = {"title": _("Add a new QRCode")}
|
||||||
|
|
||||||
|
def get(self, *args, **kwargs):
|
||||||
|
qrcode = kwargs["slug"]
|
||||||
|
if self.model.objects.filter(qr_code_number=qrcode).count() > 0:
|
||||||
|
return HttpResponseRedirect(reverse("food:qrcode_view", kwargs=kwargs))
|
||||||
|
else:
|
||||||
|
return super().get(*args, **kwargs)
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
context["slug"] = self.kwargs["slug"]
|
||||||
|
|
||||||
|
context["last_basic"] = BasicFood.objects.order_by('-pk').all()[:10]
|
||||||
|
|
||||||
|
return context
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.instance.creater = self.request.user
|
||||||
|
qrcode_food_form = QRCodeForms(data=self.request.POST)
|
||||||
|
if not qrcode_food_form.is_valid():
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
# Save the qrcode
|
||||||
|
qrcode = form.save(commit=False)
|
||||||
|
qrcode.qr_code_number = self.kwargs["slug"]
|
||||||
|
qrcode._force_save = True
|
||||||
|
qrcode.save()
|
||||||
|
qrcode.refresh_from_db()
|
||||||
|
|
||||||
|
qrcode.food_container.save()
|
||||||
|
|
||||||
|
return super().form_valid(form)
|
||||||
|
|
||||||
|
def get_success_url(self, **kwargs):
|
||||||
|
self.object.refresh_from_db()
|
||||||
|
return reverse('food:qrcode_view', kwargs={"slug": self.kwargs['slug']})
|
||||||
|
|
||||||
|
def get_sample_object(self):
|
||||||
|
return QRCode(
|
||||||
|
qr_code_number=self.kwargs["slug"],
|
||||||
|
food_container_id=1
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class QRCodeView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
|
||||||
|
"""
|
||||||
|
A view to see a qrcode
|
||||||
|
"""
|
||||||
|
model = QRCode
|
||||||
|
extra_context = {"title": _("QRCode")}
|
||||||
|
context_object_name = "qrcode"
|
||||||
|
slug_field = "qr_code_number"
|
||||||
|
|
||||||
|
def get(self, *args, **kwargs):
|
||||||
|
qrcode = kwargs["slug"]
|
||||||
|
if self.model.objects.filter(qr_code_number=qrcode).count() > 0:
|
||||||
|
return super().get(*args, **kwargs)
|
||||||
|
else:
|
||||||
|
return HttpResponseRedirect(reverse("food:qrcode_create", kwargs=kwargs))
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
|
||||||
|
qr_code_number = self.kwargs['slug']
|
||||||
|
qrcode = self.model.objects.get(qr_code_number=qr_code_number)
|
||||||
|
|
||||||
|
model = qrcode.food_container.polymorphic_ctype.model
|
||||||
|
|
||||||
|
if model == "basicfood":
|
||||||
|
context["can_update_basic"] = PermissionBackend.check_perm(self.request, "food.change_basicfood")
|
||||||
|
context["can_view_detail"] = PermissionBackend.check_perm(self.request, "food.view_basicfood")
|
||||||
|
if model == "transformedfood":
|
||||||
|
context["can_update_transformed"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
|
||||||
|
context["can_view_detail"] = PermissionBackend.check_perm(self.request, "food.view_transformedfood")
|
||||||
|
context["can_add_ingredient"] = PermissionBackend.check_perm(self.request, "food.change_transformedfood")
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView):
|
||||||
|
"""
|
||||||
|
A view to add a tranformed food
|
||||||
|
"""
|
||||||
|
model = TransformedFood
|
||||||
|
template_name = 'food/transformedfood_form.html'
|
||||||
|
form_class = TransformedFoodForms
|
||||||
|
extra_context = {"title": _("Add a new meal")}
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.instance.creater = self.request.user
|
||||||
|
transformed_food_form = TransformedFoodForms(data=self.request.POST)
|
||||||
|
if not transformed_food_form.is_valid():
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
# Save the aliment and allergens associated
|
||||||
|
transformed_food = form.save(commit=False)
|
||||||
|
transformed_food.expiry_date = transformed_food.creation_date
|
||||||
|
transformed_food.is_active = True
|
||||||
|
transformed_food.is_ready = False
|
||||||
|
transformed_food.was_eaten = False
|
||||||
|
transformed_food._force_save = True
|
||||||
|
transformed_food.save()
|
||||||
|
transformed_food.refresh_from_db()
|
||||||
|
ans = super().form_valid(form)
|
||||||
|
transformed_food.update()
|
||||||
|
return ans
|
||||||
|
|
||||||
|
def get_success_url(self, **kwargs):
|
||||||
|
self.object.refresh_from_db()
|
||||||
|
return reverse('food:food_view', kwargs={"pk": self.object.pk})
|
||||||
|
|
||||||
|
def get_sample_object(self):
|
||||||
|
# We choose a club which may work or BDE else
|
||||||
|
owner_id = 1
|
||||||
|
for membership in self.request.user.memberships.all():
|
||||||
|
club_id = membership.club.id
|
||||||
|
food = TransformedFood(name="",
|
||||||
|
creation_date=timezone.now(),
|
||||||
|
expiry_date=timezone.now(),
|
||||||
|
owner_id=club_id)
|
||||||
|
if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food):
|
||||||
|
owner_id = club_id
|
||||||
|
break
|
||||||
|
|
||||||
|
return TransformedFood(
|
||||||
|
name="",
|
||||||
|
owner_id=owner_id,
|
||||||
|
creation_date=timezone.now(),
|
||||||
|
expiry_date=timezone.now(),
|
||||||
|
)
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
|
||||||
|
# Some field are hidden on create
|
||||||
|
form = context['form']
|
||||||
|
form.fields['is_active'].widget = HiddenInput()
|
||||||
|
form.fields['is_ready'].widget = HiddenInput()
|
||||||
|
form.fields['was_eaten'].widget = HiddenInput()
|
||||||
|
form.fields['shelf_life'].widget = HiddenInput()
|
||||||
|
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedFoodUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
|
||||||
|
"""
|
||||||
|
A view to update transformed product
|
||||||
|
"""
|
||||||
|
model = TransformedFood
|
||||||
|
template_name = 'food/transformedfood_form.html'
|
||||||
|
form_class = TransformedFoodForms
|
||||||
|
extra_context = {'title': _('Update a meal')}
|
||||||
|
|
||||||
|
@transaction.atomic
|
||||||
|
def form_valid(self, form):
|
||||||
|
form.instance.creater = self.request.user
|
||||||
|
transformedfood_form = TransformedFoodForms(data=self.request.POST)
|
||||||
|
if not transformedfood_form.is_valid():
|
||||||
|
return self.form_invalid(form)
|
||||||
|
|
||||||
|
ans = super().form_valid(form)
|
||||||
|
form.instance.update()
|
||||||
|
return ans
|
||||||
|
|
||||||
|
def get_success_url(self, **kwargs):
|
||||||
|
self.object.refresh_from_db()
|
||||||
|
return reverse('food:food_view', kwargs={"pk": self.object.pk})
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
return context
|
||||||
|
|
||||||
|
|
||||||
|
class TransformedListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView):
|
||||||
|
"""
|
||||||
|
Displays ready TransformedFood
|
||||||
|
"""
|
||||||
|
model = TransformedFood
|
||||||
|
tables = [TransformedFoodTable, TransformedFoodTable, TransformedFoodTable]
|
||||||
|
extra_context = {"title": _("Transformed food")}
|
||||||
|
|
||||||
|
def get_queryset(self, **kwargs):
|
||||||
|
return super().get_queryset(**kwargs).distinct()
|
||||||
|
|
||||||
|
def get_tables(self):
|
||||||
|
tables = super().get_tables()
|
||||||
|
|
||||||
|
tables[0].prefix = "all-"
|
||||||
|
tables[1].prefix = "open-"
|
||||||
|
tables[2].prefix = "served-"
|
||||||
|
return tables
|
||||||
|
|
||||||
|
def get_tables_data(self):
|
||||||
|
# first table = all transformed food, second table = free, third = served
|
||||||
|
return [
|
||||||
|
self.get_queryset().order_by("-creation_date"),
|
||||||
|
TransformedFood.objects.filter(is_ready=True, is_active=True, was_eaten=False, expiry_date__lt=timezone.now())
|
||||||
|
.filter(PermissionBackend.filter_queryset(self.request, TransformedFood, "view"))
|
||||||
|
.distinct()
|
||||||
|
.order_by("-creation_date"),
|
||||||
|
TransformedFood.objects.filter(is_ready=True, is_active=True, was_eaten=False, expiry_date__gte=timezone.now())
|
||||||
|
.filter(PermissionBackend.filter_queryset(self.request, TransformedFood, "view"))
|
||||||
|
.distinct()
|
||||||
|
.order_by("-creation_date")
|
||||||
|
]
|
||||||
|
|
||||||
|
def get_context_data(self, **kwargs):
|
||||||
|
context = super().get_context_data(**kwargs)
|
||||||
|
|
||||||
|
# We choose a club which should work
|
||||||
|
for membership in self.request.user.memberships.all():
|
||||||
|
club_id = membership.club.id
|
||||||
|
food = TransformedFood(
|
||||||
|
name="",
|
||||||
|
owner_id=club_id,
|
||||||
|
creation_date=timezone.now(),
|
||||||
|
expiry_date=timezone.now(),
|
||||||
|
)
|
||||||
|
if PermissionBackend.check_perm(self.request, "food.add_transformedfood", food):
|
||||||
|
context['can_create_meal'] = True
|
||||||
|
break
|
||||||
|
|
||||||
|
tables = context["tables"]
|
||||||
|
for name, table in zip(["table", "open", "served"], tables):
|
||||||
|
context[name] = table
|
||||||
|
return context
|
@ -0,0 +1,25 @@
|
|||||||
|
# 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'),
|
||||||
|
('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'),
|
||||||
|
),
|
||||||
|
]
|
File diff suppressed because it is too large
Load Diff
@ -300,9 +300,13 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
|
|||||||
# join_bde = True
|
# join_bde = True
|
||||||
# join_kfet = True
|
# join_kfet = True
|
||||||
|
|
||||||
if not join_bde:
|
if not (join_bde or any(b for _, b in join_clubs)):
|
||||||
# This software belongs to the BDE.
|
# This software belongs to the BDE.
|
||||||
form.add_error('join_bde', _("You must join the BDE."))
|
form.add_error('join_bde', _("You must join a club."))
|
||||||
|
return super().form_invalid(form)
|
||||||
|
|
||||||
|
if join_kfet and not join_bde:
|
||||||
|
form.add_error('join_bde', _("You must also join the parent club BDE."))
|
||||||
return super().form_invalid(form)
|
return super().form_invalid(form)
|
||||||
|
|
||||||
# Calculate required registration fee
|
# Calculate required registration fee
|
||||||
|
Submodule apps/scripts updated: 472c9c33ce...f580f9b9e9
@ -0,0 +1,19 @@
|
|||||||
|
# Generated by Django 4.2.15 on 2024-08-28 08:00
|
||||||
|
|
||||||
|
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'),
|
||||||
|
),
|
||||||
|
]
|
@ -81,6 +81,11 @@ class WEIChooseBusForm(forms.Form):
|
|||||||
|
|
||||||
|
|
||||||
class WEIMembershipForm(forms.ModelForm):
|
class WEIMembershipForm(forms.ModelForm):
|
||||||
|
caution_check = forms.BooleanField(
|
||||||
|
required=False,
|
||||||
|
label=_("Caution check given"),
|
||||||
|
)
|
||||||
|
|
||||||
roles = forms.ModelMultipleChoiceField(
|
roles = forms.ModelMultipleChoiceField(
|
||||||
queryset=WEIRole.objects,
|
queryset=WEIRole.objects,
|
||||||
label=_("WEI Roles"),
|
label=_("WEI Roles"),
|
||||||
@ -149,6 +154,7 @@ class WEIMembership1AForm(WEIMembershipForm):
|
|||||||
"""
|
"""
|
||||||
Used to confirm registrations of first year members without choosing a bus now.
|
Used to confirm registrations of first year members without choosing a bus now.
|
||||||
"""
|
"""
|
||||||
|
caution_check = None
|
||||||
roles = None
|
roles = None
|
||||||
|
|
||||||
def clean(self):
|
def clean(self):
|
||||||
|
@ -2,11 +2,11 @@
|
|||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
|
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm
|
||||||
from .wei2023 import WEISurvey2023
|
from .wei2024 import WEISurvey2024
|
||||||
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
|
'WEISurvey', 'WEISurveyInformation', 'WEISurveyAlgorithm', 'CurrentSurvey',
|
||||||
]
|
]
|
||||||
|
|
||||||
CurrentSurvey = WEISurvey2023
|
CurrentSurvey = WEISurvey2024
|
||||||
|
372
apps/wei/forms/surveys/wei2024.py
Normal file
372
apps/wei/forms/surveys/wei2024.py
Normal file
@ -0,0 +1,372 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from functools import lru_cache
|
||||||
|
|
||||||
|
from django import forms
|
||||||
|
from django.utils.safestring import mark_safe
|
||||||
|
from django.db import transaction
|
||||||
|
from django.db.models import Q
|
||||||
|
|
||||||
|
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
|
||||||
|
from ...models import WEIMembership
|
||||||
|
|
||||||
|
|
||||||
|
buses_descr = [
|
||||||
|
[
|
||||||
|
"Magi[Kar]p 🐙🎮🎲", "#ef5568", 1,
|
||||||
|
"""Vous l'aurez compris au nom du bus, l'ambiance est aux jeux et à la culture geek ! Ici, vous trouverez une ambiance
|
||||||
|
calme avec une bonne dose d'autodérision et de second degré. Que vous ayez besoin de beaucoup dormir pour tenir la soirée
|
||||||
|
du lendemain, ou que vous souhaitiez faire nuit blanche pour jouer toute la nuit, vous pouvez nous rejoindre. Votre voix
|
||||||
|
n'y survivra peut-être pas à force de chanter. PS : les meilleurs cocktails du WEI sont chez nous, à déguster, pas à
|
||||||
|
siphonner !""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Va[car]me 🎷🍎🔊", "#fd7a28", 3,
|
||||||
|
"""Ici, c'est le bus du bruit. Si vous voulez réveiller les autres bus en musique, apprendre de merveilleuses
|
||||||
|
mélodies au kazoo tout le week-end, ou simplement profiter d'une bonne ambiance musicale, le BDA et la
|
||||||
|
F[ENS]foire sont là pour vous. Vous pourrez également goûter au célèbre cocktail de la fanfare, concocté
|
||||||
|
pour l'occasion par les tout nouveaux "meilleurs artisans v*********** de France" ! Alors que vous soyez artiste
|
||||||
|
dans l'âme ou que vous souhaitiez juste faire le plus grand Vacarme, rejoignez-nous !""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"[Kar]aïbes 🏝️🏴☠️🥥", "#a5cfdd", 3,
|
||||||
|
"""Ahoy, explorateurs du WEI ! Le bus Karaibes t’invite à une traversée sous les tropiques, où l’ambiance est
|
||||||
|
toujours au beau fixe ! ☀️🍹 Ici, c’est soleil, rhum, et bonne humeur assurée : une atmosphère de vacances où
|
||||||
|
l’on se laisse porter par la chaleur humaine et la fête. Que tu sois un pirate en quête de sensations fortes ou
|
||||||
|
un amateur de chill avec un cocktail à la main, tu seras à ta place dans notre bus. Les soirées seront marquées
|
||||||
|
par des rythmes tropicaux qui te feront vibrer jusqu’à l’aube. Prêt à embarquer pour une aventure inoubliable
|
||||||
|
avec les meilleurs matelots du WEI ? On t’attend sur le pont du Karaibes pour lever l’ancre ensemble !""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"[Kar]di [Bus] 🎙️💅", "#e46398", 2.5,
|
||||||
|
"""Bienvenue à bord du Kardi Bus, la seul, l’unique, l’inimitable pépite de ce weekend d’intégration ! Inspiré par les
|
||||||
|
icônes suprêmes de la pop culture telles les Bratz, les Winx et autres Mean Girls, notre bus est un sanctuaire de style,
|
||||||
|
d’audace et de pur plaisir. A nos cotés attends toi à siroter tes meilleurs Cosmo, sex on the Beach et autres cocktails
|
||||||
|
de maxi pétasse tout en papotant entre copains copines ! Si tu rejoins le Kardi Bus, tu entres dans un monde où tu
|
||||||
|
pourras te déhancher sur du Beyoncé, Britney, Aya et autres reines de la pop ! À très vite, les futures stars du Kardi
|
||||||
|
Bus !""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Sparta[bus] 🐺🐒🏉", "#ebdac2", 5,
|
||||||
|
"""Dans notre bus, on vous donne un avant goût des plus grandes assos de l'ENS : les Kyottes et l'Aspique (clubs de rugby
|
||||||
|
féminin et masculin, mais pas que). Bien entendu, qui dit rugby dit les copaings, le pastaga et la Pena Bayona, mais vous
|
||||||
|
verrez par vous même qu'on est ouvert⋅e à toutes propositions quand il s'agit de faire la fête. Pour les casse-cous comme
|
||||||
|
pour les plus calmes, vous trouverez au bus Aspique-Kyottes les 2A+ qui vous feront kiffer votre WEI.""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Zanzo[Bus] 🤯🚸🐒", "#FFFF", 3,
|
||||||
|
"""Dans un entre-trois bien senti entre zinzinerie, enfance et vieillerie, le Zanzo[BUS] est un concentré de fun mêlé à
|
||||||
|
de la dinguerie à gogo. N'hésitez plus et rejoignez-nous pour un WEI toujours plus déjanté !""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Bran[Kar] 🍹🥳", "#6da1ac", 4,
|
||||||
|
"""Si vous ne connaissez pas le Bran[Kar], c’est comme une grande famille qui fait un apéro, qui se bourre un peu la
|
||||||
|
gueule en discutant des heures autour d’une table remplie de bouffe et de super bons cocktails (la plupart des
|
||||||
|
barmen/barwomen du bus sont les barmans de Shakens), sauf qu’on est un bus du Wei (vous comprendrez bien le nom de notre
|
||||||
|
bus en voyant l’état de certain·e·s). Il nous arrive de faire quelques conneries, mais surtout de jouer au Bière-pong en
|
||||||
|
musique !""",
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"Techno [kar]ade 🔊🚩", "#8065a3", 3,
|
||||||
|
"""Avis à tous·tes les gauchos, amoureux·ses de la fête et des manifs : le Techno [kar]ade vous ouvre grand ses bras pour
|
||||||
|
finir en beauté votre première inté. Préparez-vous à vous abreuver de cocktails (savamment élaborés) à la vibration d’un
|
||||||
|
système son fabriqué pour l’occasion. Des sets technos à « Mon père était tellement de gauche » en passant par « Female
|
||||||
|
Body », le car accueillant les meilleures DJs du plateau saura animer le trajet aussi bien que les soirées. Si alcool et
|
||||||
|
musique seront au rendez-vous, les maîtres mots sont sécurité et inclusivité. Qui que vous soyez et quelle que soit votre
|
||||||
|
manière de vous amuser, notre objectif est que vous vous sentiez à l’aise pour rencontrer au mieux les 1A, les 2A et les
|
||||||
|
(nombreux⋅ses) 3A+ qui auront répondu à l’appel. Bref, rejoignez-nous, on est super cools :)"""
|
||||||
|
],
|
||||||
|
[
|
||||||
|
"[Bus]ka-P 🥇🍻🎤", "#7c4768", 4.5,
|
||||||
|
"""Booska-p, c’est le « site N°1 du Rap français ». Le [Bus]ka-p ? Le bus N°1 sur l’ambiance au WEI. Les nuits vont être
|
||||||
|
courtes, les cocktails vont couler à flots : tout sera réuni pour vivre un week-end dont tu te souviendras toute ta vie.
|
||||||
|
Au programme pas un seul temps mort et un maximum de rencontres pour bien commencer ta première année à l’ENS. Et bien
|
||||||
|
entendu, le tout accompagné des meilleurs sons, de Jul à Aya, en passant par ABBA et Sexion d’Assaut. Bref, si tu veux
|
||||||
|
vivre un WEI d’anthologie et faire la fête, de jour comme de nuit, nous t’accueillons avec plaisir !""",
|
||||||
|
],
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def print_bus(i):
|
||||||
|
return f"""<h1 style="color:{buses_descr[i][1]};-webkit-text-stroke: 2px black;font-size: 50px;">{buses_descr[i][0]}</h1><br>
|
||||||
|
<b>Alcoolomètre : {buses_descr[i][2]} / 5 🍻</b><br><br>{buses_descr[i][3]}<br>"""
|
||||||
|
|
||||||
|
|
||||||
|
def print_all_buses():
|
||||||
|
liste = [print_bus(i) for i in range(len(buses_descr))]
|
||||||
|
return "<br><br><br><br>".join(liste)
|
||||||
|
|
||||||
|
|
||||||
|
def get_number_comment(i):
|
||||||
|
if i == 1:
|
||||||
|
return "Même pas en rêve"
|
||||||
|
elif i == 2:
|
||||||
|
return "Pas envie"
|
||||||
|
elif i == 3:
|
||||||
|
return "Mouais..."
|
||||||
|
elif i == 4:
|
||||||
|
return "Pourquoi pas !"
|
||||||
|
elif i == 5:
|
||||||
|
return "Ce bus ou rien !!!"
|
||||||
|
else:
|
||||||
|
return ""
|
||||||
|
|
||||||
|
|
||||||
|
WORDS = {
|
||||||
|
"recap":
|
||||||
|
[
|
||||||
|
"""<b>Chèr⋅e 1A, te voilà arrivé⋅e au moment fatidique du choix de ton bus !<br><br><br>
|
||||||
|
Ton bus est constitué des gens avec qui tu passeras la majorité de ton temps : que ce soit le voyage d'aller et de
|
||||||
|
retour et les différentes activité qu'ils pourront te proposer tout au long du WEI donc choisis le bien !
|
||||||
|
<br><br>Tu trouveras ci-dessous la liste de tous les bus ainsi qu'une description détaillée de ces derniers.
|
||||||
|
Prends ton temps pour étudier chacun d'eux et quand tu te sens prêt⋅e, appuie sur le bouton « J'ai pris connaissance
|
||||||
|
des bus » pour continuer
|
||||||
|
<br>(pas besoin d'apprendre par cœur chaque bus, la description de chaque bus te sera rappeler avant de lui attribuer
|
||||||
|
une note !)</b><br><br><br>""" + print_all_buses(),
|
||||||
|
{
|
||||||
|
"1": "J'ai pris connaissance des différents bus et me sent fin prêt à choisir celui qui me convient le mieux !",
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
||||||
|
WORDS.update({
|
||||||
|
f"bus{id}": [print_bus(id), {i: f"{get_number_comment(i)} ({i}/5)" for i in range(1, 5 + 1)}] for id in range(len(buses_descr))
|
||||||
|
})
|
||||||
|
|
||||||
|
|
||||||
|
class WEISurveyForm2024(forms.Form):
|
||||||
|
"""
|
||||||
|
Survey form for the year 2024.
|
||||||
|
Members score the different buses, 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 = WEISurveyInformation2024(registration)
|
||||||
|
|
||||||
|
question = information.questions[information.step]
|
||||||
|
self.fields[question] = forms.ChoiceField(
|
||||||
|
label=mark_safe(WORDS[question][0]),
|
||||||
|
widget=forms.RadioSelect(),
|
||||||
|
)
|
||||||
|
answers = [(answer, WORDS[question][1][answer]) for answer in WORDS[question][1]]
|
||||||
|
self.fields[question].choices = answers
|
||||||
|
|
||||||
|
|
||||||
|
class WEIBusInformation2024(WEIBusInformation):
|
||||||
|
"""
|
||||||
|
For each question, the bus has ordered answers
|
||||||
|
"""
|
||||||
|
scores: dict
|
||||||
|
|
||||||
|
def __init__(self, bus):
|
||||||
|
self.scores = {}
|
||||||
|
for question in WORDS:
|
||||||
|
self.scores[question] = []
|
||||||
|
super().__init__(bus)
|
||||||
|
|
||||||
|
|
||||||
|
class WEISurveyInformation2024(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.
|
||||||
|
"""
|
||||||
|
|
||||||
|
step = 0
|
||||||
|
questions = list(WORDS.keys())
|
||||||
|
|
||||||
|
def __init__(self, registration):
|
||||||
|
for question in WORDS:
|
||||||
|
setattr(self, str(question), None)
|
||||||
|
super().__init__(registration)
|
||||||
|
|
||||||
|
|
||||||
|
class WEISurvey2024(WEISurvey):
|
||||||
|
"""
|
||||||
|
Survey for the year 2024.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_year(cls):
|
||||||
|
return 2024
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_survey_information_class(cls):
|
||||||
|
return WEISurveyInformation2024
|
||||||
|
|
||||||
|
def get_form_class(self):
|
||||||
|
return WEISurveyForm2024
|
||||||
|
|
||||||
|
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):
|
||||||
|
self.information.step += 1
|
||||||
|
for question in WORDS:
|
||||||
|
if question in form.cleaned_data:
|
||||||
|
answer = form.cleaned_data[question]
|
||||||
|
setattr(self.information, question, answer)
|
||||||
|
self.save()
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_algorithm_class(cls):
|
||||||
|
return WEISurveyAlgorithm2024
|
||||||
|
|
||||||
|
def is_complete(self) -> bool:
|
||||||
|
"""
|
||||||
|
The survey is complete once the bus is chosen.
|
||||||
|
"""
|
||||||
|
for question in WORDS:
|
||||||
|
if not getattr(self.information, question):
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
|
@lru_cache()
|
||||||
|
def score(self, bus):
|
||||||
|
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 = 0
|
||||||
|
for question in WORDS:
|
||||||
|
s += bus_info.scores[question][str(getattr(self.information, question))]
|
||||||
|
return s
|
||||||
|
|
||||||
|
@lru_cache()
|
||||||
|
def scores_per_bus(self):
|
||||||
|
return {bus: self.score(bus) for bus in self.get_algorithm_class().get_buses()}
|
||||||
|
|
||||||
|
@lru_cache()
|
||||||
|
def ordered_buses(self):
|
||||||
|
values = list(self.scores_per_bus().items())
|
||||||
|
values.sort(key=lambda item: -item[1])
|
||||||
|
return values
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def clear_cache(cls):
|
||||||
|
return super().clear_cache()
|
||||||
|
|
||||||
|
|
||||||
|
class WEISurveyAlgorithm2024(WEISurveyAlgorithm):
|
||||||
|
"""
|
||||||
|
The algorithm class for the year 2024.
|
||||||
|
We use Gale-Shapley algorithm to attribute 1y students into buses.
|
||||||
|
"""
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_survey_class(cls):
|
||||||
|
return WEISurvey2024
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def get_bus_information_class(cls):
|
||||||
|
return WEIBusInformation2024
|
||||||
|
|
||||||
|
def run_algorithm(self, display_tqdm=False):
|
||||||
|
"""
|
||||||
|
Gale-Shapley algorithm implementation.
|
||||||
|
We modify it to allow buses to have multiple "weddings".
|
||||||
|
"""
|
||||||
|
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
|
||||||
|
WEISurvey2024.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_score 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(bus)
|
||||||
|
if current_score <= 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()
|
18
apps/wei/migrations/0009_weiregistration_specific_diet.py
Normal file
18
apps/wei/migrations/0009_weiregistration_specific_diet.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 4.2.15 on 2024-08-28 20:47
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('wei', '0008_auto_20240111_1545'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='weiregistration',
|
||||||
|
name='specific_diet',
|
||||||
|
field=models.TextField(blank=True, default='', verbose_name='specific diet'),
|
||||||
|
),
|
||||||
|
]
|
@ -0,0 +1,17 @@
|
|||||||
|
# Generated by Django 4.2.15 on 2024-08-29 20:15
|
||||||
|
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('wei', '0009_weiregistration_specific_diet'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name='weiregistration',
|
||||||
|
name='specific_diet',
|
||||||
|
),
|
||||||
|
]
|
@ -12,7 +12,7 @@
|
|||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
{% render_table bus_repartition_table %}
|
{% render_table bus_repartition_table %}
|
||||||
<hr>
|
<hr>
|
||||||
<a href="{% url 'wei:wei_bus_1A_next' pk=club.pk %}" class="btn btn-block btn-success">{% trans "Start attribution!" %}</a>
|
<a href="{% url 'wei:wei_bus_1A_next' pk=club.pk %}" class="btn btn-block btn-success">{% trans "Start attribution !" %}</a>
|
||||||
<hr>
|
<hr>
|
||||||
{% render_table table %}
|
{% render_table table %}
|
||||||
</div>
|
</div>
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
<dt class="col-xl-6">{% trans 'department'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'department'|capfirst %}</dt>
|
||||||
<dd class="col-xl-6">{{ object.user.profile.get_department_display }}</dd>
|
<dd class="col-xl-6">{{ object.user.profile.get_department_display }}</dd>
|
||||||
|
|
||||||
<dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
|
||||||
<dd class="col-xl-6">{{ object.health_issues|default:"—" }}</dd>
|
<dd class="col-xl-6">{{ object.health_issues|default:"—" }}</dd>
|
||||||
|
|
||||||
<dt class="col-xl-6">{% trans 'suggested bus'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'suggested bus'|capfirst %}</dt>
|
||||||
|
@ -64,7 +64,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
<dt class="col-xl-6">{% trans 'birth date'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'birth date'|capfirst %}</dt>
|
||||||
<dd class="col-xl-6">{{ registration.birth_date }}</dd>
|
<dd class="col-xl-6">{{ registration.birth_date }}</dd>
|
||||||
|
|
||||||
<dt class="col-xl-6">{% trans 'health issues'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'health issues or specific diet'|capfirst %}</dt>
|
||||||
<dd class="col-xl-6">{{ registration.health_issues }}</dd>
|
<dd class="col-xl-6">{{ registration.health_issues }}</dd>
|
||||||
|
|
||||||
<dt class="col-xl-6">{% trans 'emergency contact name'|capfirst %}</dt>
|
<dt class="col-xl-6">{% trans 'emergency contact name'|capfirst %}</dt>
|
||||||
|
@ -6,8 +6,6 @@ from datetime import date, timedelta
|
|||||||
|
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
from django.urls import reverse
|
|
||||||
from note.models import NoteUser
|
|
||||||
|
|
||||||
from ..forms.surveys.wei2023 import WEIBusInformation2023, WEISurvey2023, WORDS, WEISurveyInformation2023
|
from ..forms.surveys.wei2023 import WEIBusInformation2023, WEISurvey2023, WORDS, WEISurveyInformation2023
|
||||||
from ..models import Bus, WEIClub, WEIRegistration
|
from ..models import Bus, WEIClub, WEIRegistration
|
||||||
@ -127,44 +125,3 @@ class TestWEIAlgorithm(TestCase):
|
|||||||
self.assertLessEqual(max_score - score, 25) # Always less than 25 % of tolerance
|
self.assertLessEqual(max_score - score, 25) # Always less than 25 % of tolerance
|
||||||
|
|
||||||
self.assertLessEqual(penalty / 100, 25) # Tolerance of 5 %
|
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, 20 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 = WEISurvey2023(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 = WEISurvey2023(registration)
|
|
||||||
self.assertTrue(survey.is_complete())
|
|
||||||
survey.select_bus(self.buses[0])
|
|
||||||
survey.save()
|
|
||||||
self.assertIsNotNone(survey.information.get_selected_bus())
|
|
||||||
|
172
apps/wei/tests/test_wei_algorithm_2024.py
Normal file
172
apps/wei/tests/test_wei_algorithm_2024.py
Normal file
@ -0,0 +1,172 @@
|
|||||||
|
# Copyright (C) 2018-2024 by BDE ENS Paris-Saclay
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
import random
|
||||||
|
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
|
||||||
|
|
||||||
|
|
||||||
|
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.user = User.objects.create_superuser(
|
||||||
|
username="weiadmin",
|
||||||
|
password="admin",
|
||||||
|
email="admin@example.com",
|
||||||
|
)
|
||||||
|
self.user.save()
|
||||||
|
self.client.force_login(self.user)
|
||||||
|
sess = self.client.session
|
||||||
|
sess["permission_mask"] = 42
|
||||||
|
sess.save()
|
||||||
|
|
||||||
|
self.wei = WEIClub.objects.create(
|
||||||
|
name="WEI 2024",
|
||||||
|
email="wei2024@example.com",
|
||||||
|
parent_club_id=2,
|
||||||
|
membership_fee_paid=12500,
|
||||||
|
membership_fee_unpaid=5500,
|
||||||
|
membership_start='2024-01-01',
|
||||||
|
membership_end='2024-12-31',
|
||||||
|
date_start=date.today() + timedelta(days=2),
|
||||||
|
date_end='2024-12-31',
|
||||||
|
year=2024,
|
||||||
|
)
|
||||||
|
|
||||||
|
self.buses = []
|
||||||
|
for i in range(10):
|
||||||
|
bus = Bus.objects.create(wei=self.wei, name=f"Bus {i}", size=10)
|
||||||
|
self.buses.append(bus)
|
||||||
|
information = WEIBusInformation2024(bus)
|
||||||
|
for question in WORDS:
|
||||||
|
information.scores[question] = {answer: random.randint(1, 5) for answer in WORDS[question][1]}
|
||||||
|
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 = WEISurveyInformation2024(registration)
|
||||||
|
for question in WORDS:
|
||||||
|
options = list(WORDS[question][1].keys())
|
||||||
|
setattr(information, question, random.choice(options))
|
||||||
|
information.step = 20
|
||||||
|
information.save(registration)
|
||||||
|
registration.save()
|
||||||
|
|
||||||
|
# Run algorithm
|
||||||
|
WEISurvey2024.get_algorithm_class()().run_algorithm()
|
||||||
|
|
||||||
|
# Ensure that everyone has its first choice
|
||||||
|
for r in WEIRegistration.objects.filter(wei=self.wei).all():
|
||||||
|
survey = WEISurvey2024(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(95):
|
||||||
|
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 = WEISurveyInformation2024(registration)
|
||||||
|
for question in WORDS:
|
||||||
|
options = list(WORDS[question][1].keys())
|
||||||
|
setattr(information, question, random.choice(options))
|
||||||
|
information.step = 20
|
||||||
|
information.save(registration)
|
||||||
|
registration.save()
|
||||||
|
|
||||||
|
# Run algorithm
|
||||||
|
WEISurvey2024.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 = WEISurvey2024(r)
|
||||||
|
chosen_bus = survey.information.get_selected_bus()
|
||||||
|
buses = survey.ordered_buses()
|
||||||
|
score = min(v for bus, v in buses if bus == chosen_bus)
|
||||||
|
max_score = buses[0][1]
|
||||||
|
penalty += (max_score - score) ** 2
|
||||||
|
|
||||||
|
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())
|
@ -767,7 +767,7 @@ class TestDefaultWEISurvey(TestCase):
|
|||||||
WEISurvey.update_form(None, None)
|
WEISurvey.update_form(None, None)
|
||||||
|
|
||||||
self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
|
self.assertEqual(CurrentSurvey.get_algorithm_class().get_survey_class(), CurrentSurvey)
|
||||||
self.assertEqual(CurrentSurvey.get_year(), 2023)
|
self.assertEqual(CurrentSurvey.get_year(), 2024)
|
||||||
|
|
||||||
|
|
||||||
class TestWeiAPI(TestAPI):
|
class TestWeiAPI(TestAPI):
|
||||||
|
@ -900,6 +900,9 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
form.fields["last_name"].initial = registration.user.last_name
|
form.fields["last_name"].initial = registration.user.last_name
|
||||||
form.fields["first_name"].initial = registration.user.first_name
|
form.fields["first_name"].initial = registration.user.first_name
|
||||||
|
|
||||||
|
if "caution_check" in form.fields:
|
||||||
|
form.fields["caution_check"].initial = registration.caution_check
|
||||||
|
|
||||||
if registration.soge_credit:
|
if registration.soge_credit:
|
||||||
form.fields["credit_type"].disabled = True
|
form.fields["credit_type"].disabled = True
|
||||||
form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
|
form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire")
|
||||||
@ -941,6 +944,9 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, ProtectedCreateView):
|
|||||||
club = registration.wei
|
club = registration.wei
|
||||||
user = registration.user
|
user = registration.user
|
||||||
|
|
||||||
|
if "caution_check" in form.data:
|
||||||
|
registration.caution_check = form.data["caution_check"] == "on"
|
||||||
|
registration.save()
|
||||||
membership = form.instance
|
membership = form.instance
|
||||||
membership.user = user
|
membership.user = user
|
||||||
membership.club = club
|
membership.club = club
|
||||||
|
83
docs/apps/food.rst
Normal file
83
docs/apps/food.rst
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
Application Food
|
||||||
|
================
|
||||||
|
|
||||||
|
L'application ``food`` s'occupe de la traçabilité et permet notamment l'obtention de la liste des allergènes.
|
||||||
|
|
||||||
|
Modèles
|
||||||
|
-------
|
||||||
|
|
||||||
|
L'application comporte 5 modèles : Allergen, QRCode, Food, BasicFood, TransformedFood.
|
||||||
|
|
||||||
|
Food
|
||||||
|
~~~~
|
||||||
|
|
||||||
|
Ce modèle est un PolymorphicModel et ne sert uniquement à créer BasicFood et TransformedFood.
|
||||||
|
|
||||||
|
Le modèle regroupe :
|
||||||
|
|
||||||
|
* Nom du produit
|
||||||
|
* Propriétaire (doit-être un Club)
|
||||||
|
* Allergènes (ManyToManyField)
|
||||||
|
* date d'expiration
|
||||||
|
* a été mangé (booléen)
|
||||||
|
* est prêt (booléen)
|
||||||
|
|
||||||
|
BasicFood
|
||||||
|
~~~~~~~~~
|
||||||
|
|
||||||
|
Les BasicFood correspondent aux produits non modifiés à la Kfet. Ils peuvent correspondre à la fois à des produits achetés en magasin ou à des produits Terre à Terre. Ces produits seront les ingrédients de tous les plats préparés et en conséquent sont les seuls produits à nécessité une saisie manuelle des allergènes.
|
||||||
|
|
||||||
|
Le modèle regroupe :
|
||||||
|
|
||||||
|
* Type de date (DLC = date limite de consommation, DDM = date de durabilité minimale)
|
||||||
|
* Date d'arrivée
|
||||||
|
* Champs de Food
|
||||||
|
|
||||||
|
TransformedFood
|
||||||
|
~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Les TransformedFood correspondent aux produits préparés à la Kfet. Ils peuvent être composés de BasicFood et/ou de TransformedFood. La date d'expiration et les allergènes sont automatiquement mis à jour par update (qui doit être exécuté après modification des ingrédients dans les forms par exemple).
|
||||||
|
|
||||||
|
Le modèle regroupe :
|
||||||
|
|
||||||
|
* Durée de consommation (par défaut 3 jours)
|
||||||
|
* Ingrédients (ManyToManyField vers Food)
|
||||||
|
* Date de création
|
||||||
|
* Champs de Food
|
||||||
|
|
||||||
|
Allergen
|
||||||
|
~~~~~~~~
|
||||||
|
|
||||||
|
Le modèle regroupe :
|
||||||
|
|
||||||
|
* Nom
|
||||||
|
|
||||||
|
QRCode
|
||||||
|
~~~~~~
|
||||||
|
|
||||||
|
Le modèle regroupe :
|
||||||
|
|
||||||
|
* nombre (unique, entier positif)
|
||||||
|
* food (OneToOneField vers Food)
|
||||||
|
|
||||||
|
Création de BasicFood
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Un BasicFood a toujours besoin d'un QRCode (depuis l'interface web). Il convient donc de coller le QRCode puis de le scanner et de compléter le formulaire.
|
||||||
|
|
||||||
|
Création de TransformedFood
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Pour créer un TransformedFood, il suffit d'aller dans l'onglet ``traçabilité`` et de cliquer sur l'onglet.
|
||||||
|
|
||||||
|
Ajouter un ingrédient
|
||||||
|
~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Un ingrédient a forcément un QRCode. Il convient donc de scanner le QRCode de l'ingrédient et de sélectionner le produit auquel il doit être ajouté.
|
||||||
|
|
||||||
|
Remarque : Un produit fini doit avoir un QRCode et inversement.
|
||||||
|
|
||||||
|
Terminer un plat
|
||||||
|
~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Il suffit de coller le QRCode sur le plat, de le scanner et de sélectionner le produit.
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -9,6 +9,7 @@ MAILTO=notekfet2020@lists.crans.org
|
|||||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1 -v 0
|
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1 -v 0
|
||||||
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1 -v 0
|
* * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1 -v 0
|
||||||
00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -v 0
|
00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -v 0
|
||||||
|
00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log -r failure 30 -v 0
|
||||||
# Faire une sauvegarde de la base de données
|
# Faire une sauvegarde de la base de données
|
||||||
00 2 * * * root cd /var/www/note_kfet && apps/scripts/shell/backup_db
|
00 2 * * * root cd /var/www/note_kfet && apps/scripts/shell/backup_db
|
||||||
# Vérifier la cohérence de la base et mailer en cas de problème
|
# Vérifier la cohérence de la base et mailer en cas de problème
|
||||||
|
@ -70,6 +70,7 @@ INSTALLED_APPS = [
|
|||||||
# Note apps
|
# Note apps
|
||||||
'api',
|
'api',
|
||||||
'activity',
|
'activity',
|
||||||
|
'food',
|
||||||
'logs',
|
'logs',
|
||||||
'member',
|
'member',
|
||||||
'note',
|
'note',
|
||||||
@ -224,6 +225,7 @@ MEDIA_URL = '/media/'
|
|||||||
# Use mailer in production to place emails in a queue before sending them to avoid spam
|
# Use mailer in production to place emails in a queue before sending them to avoid spam
|
||||||
EMAIL_BACKEND = 'mailer.backend.DbBackend'
|
EMAIL_BACKEND = 'mailer.backend.DbBackend'
|
||||||
MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
|
||||||
|
MAILER_EMAIL_MAX_BATCH = 10
|
||||||
EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False)
|
EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False)
|
||||||
EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
|
EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
|
||||||
EMAIL_PORT = os.getenv('EMAIL_PORT', 25)
|
EMAIL_PORT = os.getenv('EMAIL_PORT', 25)
|
||||||
@ -239,7 +241,7 @@ DEFAULT_FROM_EMAIL = "NoteKfet2020 <" + SERVER_EMAIL + ">"
|
|||||||
cache_address = os.getenv("CACHE_ADDRESS", "127.0.0.1:11211")
|
cache_address = os.getenv("CACHE_ADDRESS", "127.0.0.1:11211")
|
||||||
CACHES = {
|
CACHES = {
|
||||||
'default': {
|
'default': {
|
||||||
'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
|
'BACKEND': 'django.core.cache.backends.memcached.PyMemcacheCache',
|
||||||
'LOCATION': cache_address,
|
'LOCATION': cache_address,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,10 +66,16 @@ SPDX-License-Identifier: GPL-3.0-or-later
|
|||||||
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-coffee"></i> {% trans 'Consumptions' %}</a>
|
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-coffee"></i> {% trans 'Consumptions' %}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if user.is_authenticated and user|is_member:"Kfet" %}
|
{% if request.user.is_authenticated %}
|
||||||
|
<li class="nav-item">
|
||||||
|
{% url 'food:food_list' as url %}
|
||||||
|
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-cutlery"></i> {% trans 'Food' %}</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
{% if user.is_authenticated %}
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
{% url 'note:transfer' as url %}
|
{% url 'note:transfer' as url %}
|
||||||
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %} </a>
|
<a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if "auth.user"|model_list_length >= 2 %}
|
{% if "auth.user"|model_list_length >= 2 %}
|
||||||
|
@ -21,6 +21,7 @@ urlpatterns = [
|
|||||||
path('activity/', include('activity.urls')),
|
path('activity/', include('activity.urls')),
|
||||||
path('treasury/', include('treasury.urls')),
|
path('treasury/', include('treasury.urls')),
|
||||||
path('wei/', include('wei.urls')),
|
path('wei/', include('wei.urls')),
|
||||||
|
path('food/',include('food.urls')),
|
||||||
|
|
||||||
# Include Django Contrib and Core routers
|
# Include Django Contrib and Core routers
|
||||||
path('i18n/', include('django.conf.urls.i18n')),
|
path('i18n/', include('django.conf.urls.i18n')),
|
||||||
|
34
shell-static.nix
Executable file
34
shell-static.nix
Executable file
@ -0,0 +1,34 @@
|
|||||||
|
# This is a workaround meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
||||||
|
#
|
||||||
|
# The nk20 javascript static location are hardcoded for imperative system.
|
||||||
|
# This make ./manage.py collectstatic hard to use with nixos.
|
||||||
|
#
|
||||||
|
# A workaround is to enter a FHSUserEnv with the static placed under /share/javascript/<static>.
|
||||||
|
# This emulate a debian like system and enable collecting static normally with ./manage.py collectstatics.
|
||||||
|
# The regular shell.nix should be enough for other configurations.
|
||||||
|
#
|
||||||
|
# Warning, you are still supposed to use pip package with a venv !
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
(pkgs.buildFHSUserEnv {
|
||||||
|
name = "pipzone";
|
||||||
|
targetPkgs = pkgs: (with pkgs;
|
||||||
|
let
|
||||||
|
fhs-static = stdenv.mkDerivation {
|
||||||
|
name = "fhs-static";
|
||||||
|
buildCommand = ''
|
||||||
|
mkdir -p $out/share/javascript/bootstrap4
|
||||||
|
mkdir -p $out/share/javascript/jquery
|
||||||
|
ln -s ${python39Packages.xstatic-bootstrap}/lib/python3.9/site-packages/xstatic/pkg/bootstrap/data/* $out/share/javascript/bootstrap4
|
||||||
|
ln -s ${python39Packages.xstatic-jquery}/lib/python3.9/site-packages/xstatic/pkg/jquery/data/* $out/share/javascript/jquery
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
in [
|
||||||
|
fhs-static
|
||||||
|
python39
|
||||||
|
gettext
|
||||||
|
python39Packages.pip
|
||||||
|
python39Packages.virtualenv
|
||||||
|
python39Packages.setuptools
|
||||||
|
]);
|
||||||
|
runScript = "bash";
|
||||||
|
}).env
|
23
shell.nix
Executable file
23
shell.nix
Executable file
@ -0,0 +1,23 @@
|
|||||||
|
# This is meant for use with the nix package manager. If you don't know what it is or don't use it, please ignore this file.
|
||||||
|
#
|
||||||
|
# This shell.nix contains all dependencies require to create a venv and pip install -r requirements.txt.
|
||||||
|
#
|
||||||
|
# Please check shell-static.nix for running ./manage.py collectstatics.
|
||||||
|
{ pkgs ? import <nixpkgs> {} }:
|
||||||
|
pkgs.mkShell {
|
||||||
|
buildInputs = with pkgs; [
|
||||||
|
python39
|
||||||
|
python39Packages.pip
|
||||||
|
python39Packages.setuptools
|
||||||
|
gettext
|
||||||
|
|
||||||
|
];
|
||||||
|
shellHook = ''
|
||||||
|
# Tells pip to put packages into $PIP_PREFIX instead of the usual locations.
|
||||||
|
# See https://pip.pypa.io/en/stable/user_guide/#environment-variables.
|
||||||
|
export PIP_PREFIX=$(pwd)/_build/pip_packages
|
||||||
|
export PYTHONPATH="$PIP_PREFIX/${pkgs.python39.sitePackages}:$PYTHONPATH"
|
||||||
|
export PATH="$PIP_PREFIX/bin:$PATH"
|
||||||
|
unset SOURCE_DATE_EPOCH
|
||||||
|
'';
|
||||||
|
}
|
6
tox.ini
6
tox.ini
@ -1,14 +1,14 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist =
|
envlist =
|
||||||
# Debian Bullseye Python
|
|
||||||
py39-django42
|
|
||||||
|
|
||||||
# Ubuntu 22.04 Python
|
# Ubuntu 22.04 Python
|
||||||
py310-django42
|
py310-django42
|
||||||
|
|
||||||
# Debian Bookworm Python
|
# Debian Bookworm Python
|
||||||
py311-django42
|
py311-django42
|
||||||
|
|
||||||
|
# Ubuntu 24.04 Python
|
||||||
|
py312-django42
|
||||||
|
|
||||||
linters
|
linters
|
||||||
skipsdist = True
|
skipsdist = True
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user