mirror of https://gitlab.crans.org/bde/nk20
Compare commits
34 Commits
0430a39e75
...
aea8d80d8d
Author | SHA1 | Date |
---|---|---|
aeltheos | aea8d80d8d | |
quark | bd94400883 | |
quark | 5558341c8c | |
quark | 35ef82223c | |
korenstin | 9ccac36831 | |
quark | 2e71ce05a9 | |
quark | f2cb10b69f | |
quark | 213e9a8b12 | |
quark | 549f56dc0b | |
quark | debeb33d46 | |
quark | 6d7076b03e | |
quark | 196df1e775 | |
quark | b2b1f03b46 | |
quark | 1c5ed2bd3f | |
korenstin | a7e87ea639 | |
korenstin | 6f67d2c629 | |
korenstin | 4b97ab2e2a | |
korenstin | dcfd0167e7 | |
korenstin | 50a680eed2 | |
korenstin | 226a2a6357 | |
korenstin | 48462f2ffc | |
korenstin | 260513ae3b | |
korenstin | 210a3cc93c | |
quark | 896095a44c | |
quark | 3f997f94fa | |
quark | 0801ad64ae | |
quark | 64bd5ed546 | |
quark | 4c390dce17 | |
quark | adacc293f5 | |
quark | 968fa64d37 | |
quark | a481adbae4 | |
quark | 4de2e987ef | |
quark | 9e6342c929 | |
quark | 74de358953 |
|
@ -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,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,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__'
|
|
@ -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)
|
|
@ -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', ]
|
|
@ -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')
|
|
@ -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(),
|
||||||
|
}
|
|
@ -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',),
|
||||||
|
),
|
||||||
|
]
|
|
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -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),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
|
@ -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'),
|
||||||
|
),
|
||||||
|
]
|
|
@ -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')
|
|
@ -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")
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -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 %}
|
|
@ -0,0 +1,3 @@
|
||||||
|
# from django.test import TestCase
|
||||||
|
|
||||||
|
# Create your tests here.
|
|
@ -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'),
|
||||||
|
]
|
|
@ -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
|
|
@ -3304,6 +3304,454 @@
|
||||||
"description": "Voir le tableau des ouvreur⋅ses"
|
"description": "Voir le tableau des ouvreur⋅ses"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 211,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir tout les plats"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 212,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"owner\": [\"club\"]}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir tout les plats de son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 213,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_ready\": true, \"is_active\": true, \"was_eaten\": false}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 1,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir les plats préparés actifs servis"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 214,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"qrcode"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "add",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Initialiser un QR code de traçabilité"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 215,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{\"owner\": [\"club\"]}",
|
||||||
|
"type": "add",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Créer un nouvel ingrédient pour son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 216,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "add",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Créer un nouvel ingrédient"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 217,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir toute la bouffe"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 218,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir toute la bouffe active"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 219,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true, \"owner\": [\"club\"]}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir la bouffe active de son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 220,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Modifier de la bouffe"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 221,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true, \"was_eaten\": false}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "allergens",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Modifier les allergènes de la bouffe existante"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 222,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true, \"was_eaten\": false, \"owner\": [\"club\"]}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "allergens",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Modifier les allergènes de la bouffe appartenant à son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 223,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "add",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Créer un plat"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 224,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"owner\": [\"club\"]}",
|
||||||
|
"type": "add",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Créer un plat pour son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 225,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Modifier tout les plats"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 226,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "was_eaten",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Indiquer si un plat a été mangé"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 227,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true, \"owner\": [\"club\"]}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "is_ready",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Indiquer si un plat de son club est prêt"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 228,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "is_active",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Archiver un plat"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 229,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"basicfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "is_active",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Archiver de la bouffe"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 230,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir tout les plats actifs"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 231,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"qrcode"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir tous les QR codes"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 232,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"qrcode"
|
||||||
|
],
|
||||||
|
"query": "{\"food_container__is_active\": true}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir tous les QR codes actifs"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 233,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"qrcode"
|
||||||
|
],
|
||||||
|
"query": "{\"food_container__owner\": [\"club\"], \"food_container__is_active\": true}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir tous les QR codes actifs de son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk" : 234,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"transformedfood"
|
||||||
|
],
|
||||||
|
"query": "{\"owner\": [\"club\"], \"is_active\": true}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "ingredients",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Changer les ingrédients d'un plat actif de son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 235,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"food"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir bouffe"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 236,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"food"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir bouffe active"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 237,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"food"
|
||||||
|
],
|
||||||
|
"query": "{\"is_active\": true, \"owner\": [\"club\"]}",
|
||||||
|
"type": "view",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Voir bouffe active de son club"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.permission",
|
||||||
|
"pk": 238,
|
||||||
|
"fields": {
|
||||||
|
"model": [
|
||||||
|
"food",
|
||||||
|
"food"
|
||||||
|
],
|
||||||
|
"query": "{}",
|
||||||
|
"type": "change",
|
||||||
|
"mask": 3,
|
||||||
|
"field": "",
|
||||||
|
"permanent": false,
|
||||||
|
"description": "Modifier bouffe"
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"model": "permission.role",
|
"model": "permission.role",
|
||||||
"pk": 1,
|
"pk": 1,
|
||||||
|
@ -3391,7 +3839,8 @@
|
||||||
157,
|
157,
|
||||||
158,
|
158,
|
||||||
159,
|
159,
|
||||||
160
|
160,
|
||||||
|
213
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -3417,7 +3866,17 @@
|
||||||
49,
|
49,
|
||||||
50,
|
50,
|
||||||
141,
|
141,
|
||||||
169
|
169,
|
||||||
|
212,
|
||||||
|
214,
|
||||||
|
215,
|
||||||
|
219,
|
||||||
|
222,
|
||||||
|
224,
|
||||||
|
227,
|
||||||
|
233,
|
||||||
|
234,
|
||||||
|
237
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -3591,7 +4050,21 @@
|
||||||
166,
|
166,
|
||||||
167,
|
167,
|
||||||
168,
|
168,
|
||||||
182
|
182,
|
||||||
|
212,
|
||||||
|
214,
|
||||||
|
215,
|
||||||
|
218,
|
||||||
|
221,
|
||||||
|
224,
|
||||||
|
226,
|
||||||
|
227,
|
||||||
|
228,
|
||||||
|
229,
|
||||||
|
230,
|
||||||
|
232,
|
||||||
|
234,
|
||||||
|
236
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -3799,7 +4272,8 @@
|
||||||
168,
|
168,
|
||||||
176,
|
176,
|
||||||
177,
|
177,
|
||||||
197
|
197,
|
||||||
|
211
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -3817,6 +4291,27 @@
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"model": "permission.role",
|
||||||
|
"pk": 22,
|
||||||
|
"fields": {
|
||||||
|
"for_club": 2,
|
||||||
|
"name": "Respo Bouffe",
|
||||||
|
"permissions": [
|
||||||
|
137,
|
||||||
|
211,
|
||||||
|
214,
|
||||||
|
216,
|
||||||
|
217,
|
||||||
|
220,
|
||||||
|
223,
|
||||||
|
225,
|
||||||
|
231,
|
||||||
|
235,
|
||||||
|
238
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"model": "wei.weirole",
|
"model": "wei.weirole",
|
||||||
"pk": 12,
|
"pk": 12,
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 472c9c33cea3a9c277033f2108fd81304fb62097
|
Subproject commit f580f9b9e9beee76605975fdbc3a2014769e3c61
|
|
@ -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
|
@ -70,6 +70,7 @@ INSTALLED_APPS = [
|
||||||
# Note apps
|
# Note apps
|
||||||
'api',
|
'api',
|
||||||
'activity',
|
'activity',
|
||||||
|
'food',
|
||||||
'logs',
|
'logs',
|
||||||
'member',
|
'member',
|
||||||
'note',
|
'note',
|
||||||
|
@ -239,7 +240,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 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 and user|is_member:"Kfet" %}
|
{% if user.is_authenticated and user|is_member:"Kfet" %}
|
||||||
<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')),
|
||||||
|
|
Loading…
Reference in New Issue