From 6c7d86185af363ec7f4694713579e1de9b6ae555 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 3 Jul 2025 14:34:04 +0200 Subject: [PATCH 01/32] Models --- apps/family/__init__.py | 0 apps/family/admin.py | 3 + apps/family/apps.py | 11 ++ apps/family/migrations/__init__.py | 0 apps/family/models.py | 165 +++++++++++++++++++++++++++++ apps/family/tests.py | 3 + apps/family/views.py | 3 + note_kfet/settings/base.py | 3 +- 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 apps/family/__init__.py create mode 100644 apps/family/admin.py create mode 100644 apps/family/apps.py create mode 100644 apps/family/migrations/__init__.py create mode 100644 apps/family/models.py create mode 100644 apps/family/tests.py create mode 100644 apps/family/views.py diff --git a/apps/family/__init__.py b/apps/family/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/family/admin.py b/apps/family/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/apps/family/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/apps/family/apps.py b/apps/family/apps.py new file mode 100644 index 00000000..47007531 --- /dev/null +++ b/apps/family/apps.py @@ -0,0 +1,11 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + + +from django.utils.translation import gettext_lazy as _ +from django.apps import AppConfig + + +class FamilyConfig(AppConfig): + name = 'family' + verbose_name = _('family') diff --git a/apps/family/migrations/__init__.py b/apps/family/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/family/models.py b/apps/family/models.py new file mode 100644 index 00000000..b3cb9abd --- /dev/null +++ b/apps/family/models.py @@ -0,0 +1,165 @@ +from django.db import models, transaction +from django.utils import timezone +from django.contrib.auth.models import User +from django.utils.translation import gettext_lazy as _ + + +class Family(models.Model): + name = models.CharField( + max_length=255, + verbose_name=_('name'), + unique=True + ) + + description = models.CharField( + max_length=255, + verbose_name=_('description') + ) + + score = models.PositiveIntegerField( + verbose_name=_('score') + ) + + rank = models.PositiveIntegerField( + verbose_name=_('rank'), + ) + + class Meta: + verbose_name = _('Family') + verbose_name_plural = _('Families') + + def __str__(self): + return self.name + + +class FamilyMembership(models.Model): + user = models.OneToOneField( + User, + on_delete=models.PROTECT, + related_name=_('family_memberships'), + verbose_name=_('user'), + ) + + family = models.ForeignKey( + Family, + on_delete=models.PROTECT, + related_name=_('members'), + verbose_name=_('family'), + ) + + year = models.PositiveIntegerField( + verbose_name=_('year'), + default=timezone.now().year, + ) + + class Meta: + verbose_name = _('family membership') + verbose_name_plural = _('family memberships') + + def __str__(self): + return _('Family membership of {user} to {family}').format(user=self.user.username, family=self.family.name, ) + + +class ChallengeCategory(models.Model): + name = models.CharField( + max_length=255, + verbose_name=_('name'), + unique=True, + ) + + class Meta: + verbose_name = _('challenge category') + verbose_name_plural = _('challenge categories') + + def __str__(self): + return self.name + + +class Challenge(models.Model): + name = models.CharField( + max_length=255, + verbose_name=_('name'), + ) + + description = models.CharField( + max_length=255, + verbose_name=_('description'), + ) + + points = models.PositiveIntegerField( + verbose_name=_('points'), + ) + + category = models.ForeignKey( + ChallengeCategory, + verbose_name=_('category'), + on_delete=models.PROTECT + ) + + class Meta: + verbose_name = _('challenge') + verbose_name_plural = _('challenges') + + def __str__(self): + return self.name + + +class Achievement(models.Model): + challenge = models.ForeignKey( + Challenge, + on_delete=models.PROTECT, + + ) + family = models.ForeignKey( + Family, + on_delete=models.PROTECT, + verbose_name=_('family'), + ) + + obtained_at = models.DateTimeField( + verbose_name=_('obtained at'), + default=timezone.now, + ) + + class Meta: + verbose_name = _('achievement') + verbose_name_plural = _('achievements') + + def __str__(self): + return _('Challenge {challenge} carried out by Family {family}').format(challenge=self.challenge.name, family=self.family.name, ) + + @transaction.atomic + def save(self, *args, **kwargs): + """ + When saving, also grants points to the family + """ + self.family = Family.objects.select_for_update().get(pk=self.family_id) + challenge_points = self.challenge.points + is_new = self.pk is None + + super.save(*args, **kwargs) + + # Only grant points when getting a new achievement + if is_new: + self.family.refresh_from_db() + self.family.score += challenge_points + self.family._force_save = True + self.family.save() + + @transaction.atomic + def delete(self, *args, **kwargs): + """ + When deleting, also removes points from the family + """ + # Get the family and challenge before deletion + self.family = Family.objects.select_for_update().get(pk=self.family_id) + challenge_points = self.challenge.points + + # Delete the achievement + super().delete(*args, **kwargs) + + # Remove points from the family + self.family.refresh_from_db() + self.family.score -= challenge_points + self.family._force_save = True + self.family.save() diff --git a/apps/family/tests.py b/apps/family/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/apps/family/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/apps/family/views.py b/apps/family/views.py new file mode 100644 index 00000000..91ea44a2 --- /dev/null +++ b/apps/family/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index 0f3a757c..4b31e359 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -70,6 +70,7 @@ INSTALLED_APPS = [ # Note apps 'api', 'activity', + 'family', 'food', 'logs', 'member', @@ -270,7 +271,7 @@ OAUTH2_PROVIDER = { 'PKCE_REQUIRED': False, # PKCE (fix a breaking change of django-oauth-toolkit 2.0.0) 'OIDC_ENABLED': True, 'OIDC_RSA_PRIVATE_KEY': - os.getenv('OIDC_RSA_PRIVATE_KEY', '/var/secrets/oidc.key'), + os.getenv('OIDC_RSA_PRIVATE_KEY', 'CHANGE_ME_IN_ENV_SETTINGS').replace('\\n', '\n'), # for multilines 'SCOPES': { 'openid': "OpenID Connect scope" }, } From f6ad6197de62a231b0e95b8c0918fa0d467e2187 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Sat, 5 Jul 2025 19:47:35 +0200 Subject: [PATCH 02/32] ListViews et templates --- apps/family/admin.py | 3 - apps/family/migrations/0001_initial.py | 85 +++++++++++++++++++ apps/family/models.py | 37 ++++++++ apps/family/tables.py | 40 +++++++++ .../templates/family/challenge_list.html | 30 +++++++ apps/family/templates/family/family_list.html | 30 +++++++ apps/family/tests.py | 3 - apps/family/urls.py | 12 +++ apps/family/views.py | 64 +++++++++++++- note_kfet/templates/base.html | 7 ++ note_kfet/urls.py | 5 +- 11 files changed, 306 insertions(+), 10 deletions(-) delete mode 100644 apps/family/admin.py create mode 100644 apps/family/migrations/0001_initial.py create mode 100644 apps/family/tables.py create mode 100644 apps/family/templates/family/challenge_list.html create mode 100644 apps/family/templates/family/family_list.html delete mode 100644 apps/family/tests.py create mode 100644 apps/family/urls.py diff --git a/apps/family/admin.py b/apps/family/admin.py deleted file mode 100644 index 8c38f3f3..00000000 --- a/apps/family/admin.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.contrib import admin - -# Register your models here. diff --git a/apps/family/migrations/0001_initial.py b/apps/family/migrations/0001_initial.py new file mode 100644 index 00000000..86c7c135 --- /dev/null +++ b/apps/family/migrations/0001_initial.py @@ -0,0 +1,85 @@ +# Generated by Django 4.2.21 on 2025-07-04 19:05 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='ChallengeCategory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, unique=True, verbose_name='name')), + ], + options={ + 'verbose_name': 'challenge category', + 'verbose_name_plural': 'challenge categories', + }, + ), + migrations.CreateModel( + name='Family', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, unique=True, verbose_name='name')), + ('description', models.CharField(max_length=255, verbose_name='description')), + ('score', models.PositiveIntegerField(verbose_name='score')), + ('rank', models.PositiveIntegerField(verbose_name='rank')), + ], + options={ + 'verbose_name': 'Family', + 'verbose_name_plural': 'Families', + }, + ), + migrations.CreateModel( + name='Challenge', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='name')), + ('description', models.CharField(max_length=255, verbose_name='description')), + ('points', models.PositiveIntegerField(verbose_name='points')), + ('obtained', models.PositiveIntegerField(verbose_name='obtained')), + ('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.challengecategory', verbose_name='category')), + ], + options={ + 'verbose_name': 'challenge', + 'verbose_name_plural': 'challenges', + }, + ), + migrations.CreateModel( + name='Achievement', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('obtained_at', models.DateTimeField(default=django.utils.timezone.now, verbose_name='obtained at')), + ('challenge', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.challenge')), + ('family', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.family', verbose_name='family')), + ], + options={ + 'verbose_name': 'achievement', + 'verbose_name_plural': 'achievements', + }, + ), + migrations.CreateModel( + name='FamilyMembership', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('year', models.PositiveIntegerField(default=2025, verbose_name='year')), + ('family', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='members', to='family.family', verbose_name='family')), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='family_memberships', to=settings.AUTH_USER_MODEL, verbose_name='user')), + ], + options={ + 'verbose_name': 'family membership', + 'verbose_name_plural': 'family memberships', + 'unique_together': {('user', 'year')}, + }, + ), + ] diff --git a/apps/family/models.py b/apps/family/models.py index b3cb9abd..2b10999b 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -1,3 +1,6 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + from django.db import models, transaction from django.utils import timezone from django.contrib.auth.models import User @@ -53,6 +56,7 @@ class FamilyMembership(models.Model): ) class Meta: + unique_together = ('user', 'year',) verbose_name = _('family membership') verbose_name_plural = _('family memberships') @@ -96,6 +100,10 @@ class Challenge(models.Model): on_delete=models.PROTECT ) + obtained = models.PositiveIntegerField( + verbose_name=_('obtained') + ) + class Meta: verbose_name = _('challenge') verbose_name_plural = _('challenges') @@ -128,12 +136,27 @@ class Achievement(models.Model): def __str__(self): return _('Challenge {challenge} carried out by Family {family}').format(challenge=self.challenge.name, family=self.family.name, ) + @classmethod + def update_ranking(cls, *args, **kwargs): + """ + Update ranking when adding or removing points + """ + family_set = cls.objects.select_for_update().all().order_by("-score") + for i in range(family_set.count()): + if i == 0 or family_set[i].score != family_set[i - 1].score: + new_rank = i + 1 + family = family_set[i] + family.rank = new_rank + family._force_save = True + family.save() + @transaction.atomic def save(self, *args, **kwargs): """ When saving, also grants points to the family """ self.family = Family.objects.select_for_update().get(pk=self.family_id) + self.challenge = Challenge.objects.select_for_update().get(pk=self.challenge_id) challenge_points = self.challenge.points is_new = self.pk is None @@ -146,6 +169,13 @@ class Achievement(models.Model): self.family._force_save = True self.family.save() + self.challenge.refresh_from_db() + self.challenge.obtained += 1 + self.challenge._force_save = True + self.challenge.save() + + self.__class__.update_ranking() + @transaction.atomic def delete(self, *args, **kwargs): """ @@ -163,3 +193,10 @@ class Achievement(models.Model): self.family.score -= challenge_points self.family._force_save = True self.family.save() + + self.challenge.refresh_from_db() + self.challenge.obtained -= 1 + self.challenge._force_save = True + self.challenge.save() + + self.__class__.update_ranking() diff --git a/apps/family/tables.py b/apps/family/tables.py new file mode 100644 index 00000000..0e3ffc47 --- /dev/null +++ b/apps/family/tables.py @@ -0,0 +1,40 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +import django_tables2 as tables +from django_tables2 import A + +from .models import Family, Challenge + + +class FamilyTable(tables.Table): + """ + List all families + """ + name = tables.LinkColumn( + "family:family_detail", + args=[A("pk")], + ) + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + model = Family + template_name = 'django_tables2/bootstrap4.html' + fields = ('name', 'score', 'rank',) + order_by = ('rank',) + + +class ChallengeTable(tables.Table): + """ + List all challenges + """ + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + order_by = ('id',) + model = Challenge + template_name = 'django_tables2/bootstrap4.html' + fields = ('name', 'points', 'category',) diff --git a/apps/family/templates/family/challenge_list.html b/apps/family/templates/family/challenge_list.html new file mode 100644 index 00000000..f16f37a7 --- /dev/null +++ b/apps/family/templates/family/challenge_list.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load render_table from django_tables2 %} +{% load i18n %} + +{% block content %} +
+
+
+ + {% trans "Families" %} + + + {% trans "Challenges" %} + +
+
+
+ +<
+

+ {{ title }} +

+ {% render_table table %} +
+{% endblock %} + diff --git a/apps/family/templates/family/family_list.html b/apps/family/templates/family/family_list.html new file mode 100644 index 00000000..38738fcf --- /dev/null +++ b/apps/family/templates/family/family_list.html @@ -0,0 +1,30 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load render_table from django_tables2 %} +{% load i18n %} + +{% block content %} +
+
+
+ + {% trans "Families" %} + + + {% trans "Challenges" %} + +
+
+
+ +<
+

+ {{ title }} +

+ {% render_table table %} +
+{% endblock %} + diff --git a/apps/family/tests.py b/apps/family/tests.py deleted file mode 100644 index 7ce503c2..00000000 --- a/apps/family/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/apps/family/urls.py b/apps/family/urls.py new file mode 100644 index 00000000..99b87d92 --- /dev/null +++ b/apps/family/urls.py @@ -0,0 +1,12 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django.urls import path + +from .views import FamilyListView, ChallengeListView + +app_name = 'family' +urlpatterns = [ + path('list/', FamilyListView.as_view(), name="family_list"), + path('challenge/list/', ChallengeListView.as_view(), name="challenge_list"), +] diff --git a/apps/family/views.py b/apps/family/views.py index 91ea44a2..8d41ccac 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -1,3 +1,63 @@ -from django.shortcuts import render +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later -# Create your views here. +from django.contrib.auth.mixins import LoginRequiredMixin +from django.views.generic import DetailView, UpdateView +from django.utils.translation import gettext_lazy as _ +from django_tables2 import SingleTableView +from permission.views import ProtectQuerysetMixin, ProtectedCreateView + +from .models import Family, Challenge +from .tables import FamilyTable, ChallengeTable + + +class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): + """ + Create family + """ + model = Family + extra_context = {"title": _('Create family')} + + def get_sample_object(self): + return Family( + name="", + description="Sample family", + score=0, + rank=0, + ) + + +class FamilyListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): + """ + List existing Families + """ + model = Family + table_class = FamilyTable + extra_context = {"title": _('Families list')} + + +class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + """ + Display details of a family + """ + model = Family + context_object_name = "family" + extra_context = {"title": _('Family detail')} + + +class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + """ + Update the information of a family. + """ + model = Family + context_object_name = "family" + extra_context = {"title": _('Update family')} + + +class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): + """ + List all challenges + """ + model = Challenge + table_class = ChallengeTable + extra_context = {"title": _('Challenges list')} diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index 1c601c50..9301ee36 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -78,6 +78,13 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'Transfer' %} {% endif %} + {% if user.is_authenticated %} +
  • + {% url 'family:family_list' as url %} + {% trans 'Families' %} +
    • + {% endif %} + {% if "auth.user"|model_list_length >= 2 %}
  • {% url 'member:user_list' as url %} diff --git a/note_kfet/urls.py b/note_kfet/urls.py index fb4b2323..733e3bb7 100644 --- a/note_kfet/urls.py +++ b/note_kfet/urls.py @@ -21,8 +21,9 @@ urlpatterns = [ path('activity/', include('activity.urls')), path('treasury/', include('treasury.urls')), path('wei/', include('wei.urls')), - path('food/',include('food.urls')), - path('wrapped/',include('wrapped.urls')), + path('food/', include('food.urls')), + path('wrapped/', include('wrapped.urls')), + path('family/', include('family.urls')), # Include Django Contrib and Core routers path('i18n/', include('django.conf.urls.i18n')), From c7bd733911569e6989553bc4f67921f72c224837 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Sun, 6 Jul 2025 18:11:09 +0200 Subject: [PATCH 03/32] Models fixed --- apps/family/migrations/0001_initial.py | 30 +++---- apps/family/models.py | 105 ++++++++++++------------- 2 files changed, 59 insertions(+), 76 deletions(-) diff --git a/apps/family/migrations/0001_initial.py b/apps/family/migrations/0001_initial.py index 86c7c135..6a9c2357 100644 --- a/apps/family/migrations/0001_initial.py +++ b/apps/family/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.21 on 2025-07-04 19:05 +# Generated by Django 4.2.21 on 2025-07-06 16:07 from django.conf import settings from django.db import migrations, models @@ -16,14 +16,17 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='ChallengeCategory', + name='Challenge', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, unique=True, verbose_name='name')), + ('name', models.CharField(max_length=255, verbose_name='name')), + ('description', models.CharField(max_length=255, verbose_name='description')), + ('points', models.PositiveIntegerField(verbose_name='points')), + ('obtained', models.PositiveIntegerField(default=0, verbose_name='obtained')), ], options={ - 'verbose_name': 'challenge category', - 'verbose_name_plural': 'challenge categories', + 'verbose_name': 'challenge', + 'verbose_name_plural': 'challenges', }, ), migrations.CreateModel( @@ -32,7 +35,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=255, unique=True, verbose_name='name')), ('description', models.CharField(max_length=255, verbose_name='description')), - ('score', models.PositiveIntegerField(verbose_name='score')), + ('score', models.PositiveIntegerField(default=0, verbose_name='score')), ('rank', models.PositiveIntegerField(verbose_name='rank')), ], options={ @@ -40,21 +43,6 @@ class Migration(migrations.Migration): 'verbose_name_plural': 'Families', }, ), - migrations.CreateModel( - name='Challenge', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, verbose_name='name')), - ('description', models.CharField(max_length=255, verbose_name='description')), - ('points', models.PositiveIntegerField(verbose_name='points')), - ('obtained', models.PositiveIntegerField(verbose_name='obtained')), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='family.challengecategory', verbose_name='category')), - ], - options={ - 'verbose_name': 'challenge', - 'verbose_name_plural': 'challenges', - }, - ), migrations.CreateModel( name='Achievement', fields=[ diff --git a/apps/family/models.py b/apps/family/models.py index 2b10999b..46e8af47 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -11,16 +11,17 @@ class Family(models.Model): name = models.CharField( max_length=255, verbose_name=_('name'), - unique=True + unique=True, ) description = models.CharField( max_length=255, - verbose_name=_('description') + verbose_name=_('description'), ) score = models.PositiveIntegerField( - verbose_name=_('score') + verbose_name=_('score'), + default=0, ) rank = models.PositiveIntegerField( @@ -34,6 +35,36 @@ class Family(models.Model): def __str__(self): return self.name + def update_score(self, *args, **kwargs): + challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self) + points_sum = challenge_set.aggregate(models.Sum("points")) + self.score = points_sum["points__sum"] + self.save() + self.update_ranking() + + @staticmethod + def update_ranking(*args, **kwargs): + """ + Update ranking when adding or removing points + """ + family_set = Family.objects.select_for_update().all().order_by("-score") + for i in range(family_set.count()): + if i == 0 or family_set[i].score != family_set[i - 1].score: + new_rank = i + 1 + family = family_set[i] + family.rank = new_rank + family._force_save = True + family.save() + + def save(self, *args, **kwargs): + if self.rank is None: + last_family = Family.objects.order_by("rank").last() + if last_family is None or last_family.score > self.score: + self.rank = Family.objects.count() + 1 + else: + self.rank = last_family.rank + super().save(*args, **kwargs) + class FamilyMembership(models.Model): user = models.OneToOneField( @@ -64,21 +95,6 @@ class FamilyMembership(models.Model): return _('Family membership of {user} to {family}').format(user=self.user.username, family=self.family.name, ) -class ChallengeCategory(models.Model): - name = models.CharField( - max_length=255, - verbose_name=_('name'), - unique=True, - ) - - class Meta: - verbose_name = _('challenge category') - verbose_name_plural = _('challenge categories') - - def __str__(self): - return self.name - - class Challenge(models.Model): name = models.CharField( max_length=255, @@ -94,15 +110,18 @@ class Challenge(models.Model): verbose_name=_('points'), ) - category = models.ForeignKey( - ChallengeCategory, - verbose_name=_('category'), - on_delete=models.PROTECT + obtained = models.PositiveIntegerField( + verbose_name=_('obtained'), + default=0, ) - obtained = models.PositiveIntegerField( - verbose_name=_('obtained') - ) + @transaction.atomic + def save(self, *args, **kwargs): + super().save(*args, **kwargs) + # Update families who already obtained this challenge + achievements = Achievement.objects.filter(challenge=self) + for achievement in achievements: + achievement.save() class Meta: verbose_name = _('challenge') @@ -136,20 +155,6 @@ class Achievement(models.Model): def __str__(self): return _('Challenge {challenge} carried out by Family {family}').format(challenge=self.challenge.name, family=self.family.name, ) - @classmethod - def update_ranking(cls, *args, **kwargs): - """ - Update ranking when adding or removing points - """ - family_set = cls.objects.select_for_update().all().order_by("-score") - for i in range(family_set.count()): - if i == 0 or family_set[i].score != family_set[i - 1].score: - new_rank = i + 1 - family = family_set[i] - family.rank = new_rank - family._force_save = True - family.save() - @transaction.atomic def save(self, *args, **kwargs): """ @@ -157,25 +162,20 @@ class Achievement(models.Model): """ self.family = Family.objects.select_for_update().get(pk=self.family_id) self.challenge = Challenge.objects.select_for_update().get(pk=self.challenge_id) - challenge_points = self.challenge.points is_new = self.pk is None - super.save(*args, **kwargs) + super().save(*args, **kwargs) - # Only grant points when getting a new achievement + self.family.refresh_from_db() + self.family.update_score() + + # Count only when getting a new achievement if is_new: - self.family.refresh_from_db() - self.family.score += challenge_points - self.family._force_save = True - self.family.save() - self.challenge.refresh_from_db() self.challenge.obtained += 1 self.challenge._force_save = True self.challenge.save() - self.__class__.update_ranking() - @transaction.atomic def delete(self, *args, **kwargs): """ @@ -183,20 +183,15 @@ class Achievement(models.Model): """ # Get the family and challenge before deletion self.family = Family.objects.select_for_update().get(pk=self.family_id) - challenge_points = self.challenge.points # Delete the achievement super().delete(*args, **kwargs) # Remove points from the family self.family.refresh_from_db() - self.family.score -= challenge_points - self.family._force_save = True - self.family.save() + self.family.update_score() self.challenge.refresh_from_db() self.challenge.obtained -= 1 self.challenge._force_save = True self.challenge.save() - - self.__class__.update_ranking() From 6f4fbecdd0d11bb260b541d16fd6fd62328aff25 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Wed, 9 Jul 2025 16:33:05 +0200 Subject: [PATCH 04/32] Challenge detail View --- apps/family/tables.py | 7 ++- .../templates/family/challenge_detail.html | 32 +++++++++++++ .../templates/family/family_detail.html | 5 ++ apps/family/urls.py | 5 +- apps/family/views.py | 48 +++++++++++++++++++ 5 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 apps/family/templates/family/challenge_detail.html create mode 100644 apps/family/templates/family/family_detail.html diff --git a/apps/family/tables.py b/apps/family/tables.py index 0e3ffc47..de00b815 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -30,6 +30,11 @@ class ChallengeTable(tables.Table): """ List all challenges """ + name = tables.LinkColumn( + "family:challenge_detail", + args=[A("pk")], + ) + class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' @@ -37,4 +42,4 @@ class ChallengeTable(tables.Table): order_by = ('id',) model = Challenge template_name = 'django_tables2/bootstrap4.html' - fields = ('name', 'points', 'category',) + fields = ('name', 'description', 'points',) diff --git a/apps/family/templates/family/challenge_detail.html b/apps/family/templates/family/challenge_detail.html new file mode 100644 index 00000000..44addf57 --- /dev/null +++ b/apps/family/templates/family/challenge_detail.html @@ -0,0 +1,32 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} + +{% block content %} +
    +

    + {{ title }} {{ challenge.name }} +

    +
    +
      + {% for field, value in fields %} +
    • {{ field }} : {{ value }}
      • + {% endfor %} +
    • {% trans "Obtained by " %} {{obtained}} + {% if obtained > 1 %} + {% trans "families" %} + {% else %} + {% trans "family" %} + {% endif %} +
      • +
    + + {% trans "Return to the challenge list" %} + + +
    +
    +{% endblock %} diff --git a/apps/family/templates/family/family_detail.html b/apps/family/templates/family/family_detail.html new file mode 100644 index 00000000..b8f9d918 --- /dev/null +++ b/apps/family/templates/family/family_detail.html @@ -0,0 +1,5 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} diff --git a/apps/family/urls.py b/apps/family/urls.py index 99b87d92..622d8b54 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -3,10 +3,13 @@ from django.urls import path -from .views import FamilyListView, ChallengeListView +from .views import FamilyListView, FamilyDetailView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView app_name = 'family' urlpatterns = [ path('list/', FamilyListView.as_view(), name="family_list"), + path('detail//', FamilyDetailView.as_view(), name="family_detail"), path('challenge/list/', ChallengeListView.as_view(), name="challenge_list"), + path('challenge/detail//', ChallengeDetailView.as_view(), name="challenge_detail"), + path('challenge/update//', ChallengeUpdateView.as_view(), name="challenge_update"), ] diff --git a/apps/family/views.py b/apps/family/views.py index 8d41ccac..d8072dbb 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -5,6 +5,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import DetailView, UpdateView from django.utils.translation import gettext_lazy as _ from django_tables2 import SingleTableView +from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin, ProtectedCreateView from .models import Family, Challenge @@ -54,6 +55,21 @@ class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): extra_context = {"title": _('Update family')} +class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): + """ + Create challenge + """ + model = Challenge + extra_context = {"title": _('Create challenge')} + + def get_sample_object(self): + return Challenge( + name="", + description="Sample challenge", + points=0, + ) + + class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ List all challenges @@ -61,3 +77,35 @@ class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVie model = Challenge table_class = ChallengeTable extra_context = {"title": _('Challenges list')} + + +class ChallengeDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + """ + Display details of a challenge + """ + model = Challenge + context_object_name = "challenge" + extra_context = {"title": _('Details of:')} + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + fields = ["name", "description", "points",] + + fields = dict([(field, getattr(self.object, field)) for field in fields]) + + context["fields"] = [( + Challenge._meta.get_field(field).verbose_name.capitalize(), + value) for field, value in fields.items()] + context["obtained"] = getattr(self.object, "obtained") + context["update"] = PermissionBackend.check_perm(self.request, "family.change_challenge") + + return context + +class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): + """ + Update the information of a challenge + """ + model = Challenge + context_object_name = "challenge" + extra_context = {"title": _('Update challenge')} + template_name = 'family/challenge_update.html' From 3ebadf34bc29914fbc2da60501ca28f53b4713d5 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 17 Jul 2025 16:59:57 +0200 Subject: [PATCH 05/32] Challenge Update and Create View --- apps/family/forms.py | 21 +++++++++++++++++++ .../templates/family/challenge_detail.html | 6 +++++- .../templates/family/challenge_update.html | 21 +++++++++++++++++++ apps/family/views.py | 17 +++++++++++++-- 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 apps/family/forms.py create mode 100644 apps/family/templates/family/challenge_update.html diff --git a/apps/family/forms.py b/apps/family/forms.py new file mode 100644 index 00000000..63b47f48 --- /dev/null +++ b/apps/family/forms.py @@ -0,0 +1,21 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django import forms +from django.forms.widgets import NumberInput +from django.utils.translation import gettext_lazy as _ +from note_kfet.inputs import Autocomplete + +from .models import Challenge, FamilyMembership, User + + +class ChallengeUpdateForm(forms.ModelForm): + """ + To update a challenge + """ + class Meta: + model = Challenge + fields = ('name', 'description', 'points',) + widgets = { + "points": NumberInput() + } diff --git a/apps/family/templates/family/challenge_detail.html b/apps/family/templates/family/challenge_detail.html index 44addf57..23cb3f93 100644 --- a/apps/family/templates/family/challenge_detail.html +++ b/apps/family/templates/family/challenge_detail.html @@ -26,7 +26,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Return to the challenge list" %} - + {% if update %} + + {% trans "Update" %} + + {% endif %} {% endblock %} diff --git a/apps/family/templates/family/challenge_update.html b/apps/family/templates/family/challenge_update.html new file mode 100644 index 00000000..27c7bed2 --- /dev/null +++ b/apps/family/templates/family/challenge_update.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} + +{% block content %} +
    +

    + {{ title }} +

    +
    +
    + {% csrf_token %} + {{ form | crispy }} + +
    +
    +
    +{% endblock %} diff --git a/apps/family/views.py b/apps/family/views.py index d8072dbb..4b710681 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -1,15 +1,19 @@ # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +from datetime import date + from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import DetailView, UpdateView from django.utils.translation import gettext_lazy as _ from django_tables2 import SingleTableView from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin, ProtectedCreateView +from django.urls import reverse_lazy -from .models import Family, Challenge -from .tables import FamilyTable, ChallengeTable +from .models import Family, Challenge, FamilyMembership, User +from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable +from .forms import ChallengeUpdateForm class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): @@ -68,6 +72,9 @@ class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): description="Sample challenge", points=0, ) + + def get_success_url(self): + return reverse_lazy('family:challenge_list') class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): @@ -101,6 +108,7 @@ class ChallengeDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): return context + class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ Update the information of a challenge @@ -109,3 +117,8 @@ class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): context_object_name = "challenge" extra_context = {"title": _('Update challenge')} template_name = 'family/challenge_update.html' + form_class = ChallengeUpdateForm + + def get_success_url(self, **kwargs): + self.object.refresh_from_db() + return reverse_lazy('family:challenge_detail', kwargs={'pk': self.object.pk}) \ No newline at end of file From 65dd42fc977b2235697686d0d29ded770dc66351 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 17 Jul 2025 17:07:47 +0200 Subject: [PATCH 06/32] Family views --- apps/family/forms.py | 19 ++++- apps/family/tables.py | 16 ++++- apps/family/templates/family/add_member.html | 60 ++++++++++++++++ apps/family/templates/family/base.html | 72 +++++++++++++++++++ .../templates/family/family_detail.html | 3 +- apps/family/urls.py | 4 +- apps/family/views.py | 61 ++++++++++++++-- 7 files changed, 227 insertions(+), 8 deletions(-) create mode 100644 apps/family/templates/family/add_member.html create mode 100644 apps/family/templates/family/base.html diff --git a/apps/family/forms.py b/apps/family/forms.py index 63b47f48..78c6d25f 100644 --- a/apps/family/forms.py +++ b/apps/family/forms.py @@ -3,7 +3,6 @@ from django import forms from django.forms.widgets import NumberInput -from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import Autocomplete from .models import Challenge, FamilyMembership, User @@ -19,3 +18,21 @@ class ChallengeUpdateForm(forms.ModelForm): widgets = { "points": NumberInput() } + + +class FamilyMembershipForm(forms.ModelForm): + class Meta: + model = FamilyMembership + fields = ('user', ) + + widgets = { + "user": + Autocomplete( + User, + attrs={ + 'api_url': '/api/user/', + 'name_field': 'username', + 'placeholder': 'Nom ...', + }, + ) + } diff --git a/apps/family/tables.py b/apps/family/tables.py index de00b815..4172b975 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -4,7 +4,7 @@ import django_tables2 as tables from django_tables2 import A -from .models import Family, Challenge +from .models import Family, Challenge, FamilyMembership class FamilyTable(tables.Table): @@ -43,3 +43,17 @@ class ChallengeTable(tables.Table): model = Challenge template_name = 'django_tables2/bootstrap4.html' fields = ('name', 'description', 'points',) + + +class FamilyMembershipTable(tables.Table): + """ + List all family memberships. + """ + class Meta: + attrs = { + 'class': 'table table-condensed table-striped', + 'style': 'table-layout: fixed;' + } + template_name = 'django_tables2/bootstrap4.html' + fields = ('user',) + model = FamilyMembership diff --git a/apps/family/templates/family/add_member.html b/apps/family/templates/family/add_member.html new file mode 100644 index 00000000..6f77283d --- /dev/null +++ b/apps/family/templates/family/add_member.html @@ -0,0 +1,60 @@ +{% extends "family/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load crispy_forms_tags i18n pretty_money %} + +{% block profile_content %} +
    +

    + {{ title }} +

    +
    + +
    + {% csrf_token %} + {{ form|crispy }} + +
    +
    +
    +{% endblock %} + +{% block extrajavascript %} + +{% endblock %} \ No newline at end of file diff --git a/apps/family/templates/family/base.html b/apps/family/templates/family/base.html new file mode 100644 index 00000000..56789907 --- /dev/null +++ b/apps/family/templates/family/base.html @@ -0,0 +1,72 @@ +{% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n perms %} + +{# Use a fluid-width container #} +{% block containertype %}container-fluid{% endblock %} + +{% block content %} +
    +
    + {% block profile_info %} +
    +

    + {% if user_object %} + {% trans "Account #" %}{{ user_object.pk }} + {% elif club %} + Club {{ club.name }} + {% endif %} +

    +
    + {% if user_object %} + + + + {% elif club %} + + + + {% endif %} +
    +
    + {% if user_object %} + {% include "member/includes/profile_info.html" %} + {% elif club %} + {% include "member/includes/club_info.html" %} + {% endif %} +
    +
    + {% if can_add_members %} + {% trans "Add member" %} + {% endif %} + {% if ".change_"|has_perm:family %} + + {% trans 'Update Profile' %} + + {% endif %} + {% url 'member:club_detail' club.pk as club_detail_url %} + {% if request.path_info != club_detail_url %} + {% trans 'View Profile' %} + {% endif %} + {% if can_lock_note %} + + {% elif can_unlock_note %} + + {% endif %} +
    +
    + {% endblock %} +
    +
    + {% block profile_content %}{% endblock %} +
    +
    +{% endblock %} \ No newline at end of file diff --git a/apps/family/templates/family/family_detail.html b/apps/family/templates/family/family_detail.html index b8f9d918..1f5f8e56 100644 --- a/apps/family/templates/family/family_detail.html +++ b/apps/family/templates/family/family_detail.html @@ -1,5 +1,6 @@ -{% extends "base.html" %} +{% extends "family/base.html" %} {% comment %} Copyright (C) 2018-2025 by BDE ENS Paris-Saclay SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} + diff --git a/apps/family/urls.py b/apps/family/urls.py index 622d8b54..9a17a481 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -3,12 +3,14 @@ from django.urls import path -from .views import FamilyListView, FamilyDetailView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView +from .views import FamilyListView, FamilyDetailView, FamilyUpdateView, FamilyAddMemberView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView app_name = 'family' urlpatterns = [ path('list/', FamilyListView.as_view(), name="family_list"), path('detail//', FamilyDetailView.as_view(), name="family_detail"), + path('update//', FamilyUpdateView.as_view(), name="family_update"), + path('/add_member', FamilyAddMemberView.as_view(), name="family_add_member"), path('challenge/list/', ChallengeListView.as_view(), name="challenge_list"), path('challenge/detail//', ChallengeDetailView.as_view(), name="challenge_detail"), path('challenge/update//', ChallengeUpdateView.as_view(), name="challenge_update"), diff --git a/apps/family/views.py b/apps/family/views.py index 4b710681..6f6e3d48 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -13,7 +13,7 @@ from django.urls import reverse_lazy from .models import Family, Challenge, FamilyMembership, User from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable -from .forms import ChallengeUpdateForm +from .forms import ChallengeUpdateForm, FamilyMembershipForm class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): @@ -49,6 +49,35 @@ class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context_object_name = "family" extra_context = {"title": _('Family detail')} + def get_context_data(self, **kwargs): + """ + Add members list + """ + context = super().get_context_data(**kwargs) + + family = self.object + + # member list + family_member = FamilyMembership.objects.filter( + family=family, + year=date.today().year, + ).filter(PermissionBackend.filter_queryset(self.request, FamilyMembership, "view"))\ + .order_by("user__username").distinct("user__username") + + membership_table = FamilyMembershipTable(data=family_member) + context['member_list'] = membership_table + + # Check if the user has the right to create a membership, to display the button. + empty_membership = FamilyMembership( + family=family, + user=User.objects.first(), + year=date.today().year, + ) + context["can_add_members"] = PermissionBackend()\ + .has_perm(self.request.user, "family.add_membership", empty_membership) + + return context + class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ @@ -59,6 +88,30 @@ class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): extra_context = {"title": _('Update family')} +class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): + """ + Add a membership to a family + """ + model = FamilyMembership + form_class = FamilyMembershipForm + template_name = 'family/add_member.html' + extra_context = {"title": _("Add a new member to the family")} + + def get_sample_object(self): + if "family_pk" in self.kwargs: + family = Family.objects.get(pk=self.kwargs["family_pk"]) + else: + family = FamilyMembership.objects.get(pk=self.kwargs["pk"]).family + return FamilyMembership( + user=self.request.user, + family=family, + year=date.today().year, + ) + + def get_success_url(self): + return reverse_lazy('family:family_detail', kwargs={'pk': self.object.family.id}) + + class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): """ Create challenge @@ -72,7 +125,7 @@ class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): description="Sample challenge", points=0, ) - + def get_success_url(self): return reverse_lazy('family:challenge_list') @@ -103,7 +156,7 @@ class ChallengeDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context["fields"] = [( Challenge._meta.get_field(field).verbose_name.capitalize(), value) for field, value in fields.items()] - context["obtained"] = getattr(self.object, "obtained") + context["obtained"] = self.object.obtained context["update"] = PermissionBackend.check_perm(self.request, "family.change_challenge") return context @@ -121,4 +174,4 @@ class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): def get_success_url(self, **kwargs): self.object.refresh_from_db() - return reverse_lazy('family:challenge_detail', kwargs={'pk': self.object.pk}) \ No newline at end of file + return reverse_lazy('family:challenge_detail', kwargs={'pk': self.object.pk}) From 249b797d5a1cfc3f7f2ee92c854d23b986f80ffa Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 17 Jul 2025 19:08:34 +0200 Subject: [PATCH 07/32] Base template and picture --- apps/family/forms.py | 8 +- .../migrations/0002_family_display_image.py | 18 +++ apps/family/models.py | 9 ++ apps/family/templates/family/base.html | 40 ++---- .../templates/family/family_detail.html | 10 ++ apps/family/templates/family/family_info.html | 15 +++ .../templates/family/family_update.html | 21 ++++ .../templates/family/picture_update.html | 118 ++++++++++++++++++ apps/family/urls.py | 5 +- apps/family/views.py | 71 ++++++++++- 10 files changed, 279 insertions(+), 36 deletions(-) create mode 100644 apps/family/migrations/0002_family_display_image.py create mode 100644 apps/family/templates/family/family_info.html create mode 100644 apps/family/templates/family/family_update.html create mode 100644 apps/family/templates/family/picture_update.html diff --git a/apps/family/forms.py b/apps/family/forms.py index 78c6d25f..8a36d289 100644 --- a/apps/family/forms.py +++ b/apps/family/forms.py @@ -5,7 +5,7 @@ from django import forms from django.forms.widgets import NumberInput from note_kfet.inputs import Autocomplete -from .models import Challenge, FamilyMembership, User +from .models import Challenge, FamilyMembership, User, Family class ChallengeUpdateForm(forms.ModelForm): @@ -36,3 +36,9 @@ class FamilyMembershipForm(forms.ModelForm): }, ) } + + +class FamilyUpdateForm(forms.ModelForm): + class Meta: + model = Family + fields = ('description', ) \ No newline at end of file diff --git a/apps/family/migrations/0002_family_display_image.py b/apps/family/migrations/0002_family_display_image.py new file mode 100644 index 00000000..d2cf118b --- /dev/null +++ b/apps/family/migrations/0002_family_display_image.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.23 on 2025-07-17 15:28 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('family', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='family', + name='display_image', + field=models.ImageField(default='pic/default.png', max_length=255, upload_to='pic/', verbose_name='display image'), + ), + ] diff --git a/apps/family/models.py b/apps/family/models.py index 46e8af47..1d2d0d34 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -28,6 +28,15 @@ class Family(models.Model): verbose_name=_('rank'), ) + display_image = models.ImageField( + verbose_name=_('display image'), + max_length=255, + blank=False, + null=False, + upload_to='pic/', + default='pic/default.png' + ) + class Meta: verbose_name = _('Family') verbose_name_plural = _('Families') diff --git a/apps/family/templates/family/base.html b/apps/family/templates/family/base.html index 56789907..444dffed 100644 --- a/apps/family/templates/family/base.html +++ b/apps/family/templates/family/base.html @@ -13,29 +13,15 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block profile_info %}

    - {% if user_object %} - {% trans "Account #" %}{{ user_object.pk }} - {% elif club %} - Club {{ club.name }} - {% endif %} + {{ family.name }}

    - {% if user_object %} - - + + - {% elif club %} - - - - {% endif %}
    - {% if user_object %} - {% include "member/includes/profile_info.html" %} - {% elif club %} - {% include "member/includes/club_info.html" %} - {% endif %} + {% include "family/family_info.html" %}
    {% if can_add_members %} @@ -48,19 +34,13 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'Update Profile' %} {% endif %} - {% url 'member:club_detail' club.pk as club_detail_url %} - {% if request.path_info != club_detail_url %} - {% trans 'View Profile' %} - {% endif %} - {% if can_lock_note %} - - {% elif can_unlock_note %} - + {% url 'family:family_detail' family.pk as family_detail_url %} + {% if request.path_info != family_detail_url %} + {% trans 'View Profile' %} {% endif %} + + {% trans "Return to the family list" %} +
    {% endblock %} diff --git a/apps/family/templates/family/family_detail.html b/apps/family/templates/family/family_detail.html index 1f5f8e56..a1db566f 100644 --- a/apps/family/templates/family/family_detail.html +++ b/apps/family/templates/family/family_detail.html @@ -3,4 +3,14 @@ Copyright (C) 2018-2025 by BDE ENS Paris-Saclay SPDX-License-Identifier: GPL-3.0-or-later {% endcomment %} +{% load render_table from django_tables2 %} +{% load i18n perms %} +{% block profile_content %} +
    +
    + {% trans "Family members" %} +
    + {% render_table member_list %} +
    +{% endblock %} \ No newline at end of file diff --git a/apps/family/templates/family/family_info.html b/apps/family/templates/family/family_info.html new file mode 100644 index 00000000..359fe6ef --- /dev/null +++ b/apps/family/templates/family/family_info.html @@ -0,0 +1,15 @@ +{% load i18n pretty_money perms %} + +
    +
    {% trans 'name'|capfirst %}
    +
    {{ family.name }}
    + +
    {% trans 'description'|capfirst %}
    +
    {{ family.description }}
    + +
    {% trans 'score'|capfirst %}
    +
    {{ family.score }}
    + +
    {% trans 'rank'|capfirst %}
    +
    {{ family.rank }}
    +
    diff --git a/apps/family/templates/family/family_update.html b/apps/family/templates/family/family_update.html new file mode 100644 index 00000000..27c7bed2 --- /dev/null +++ b/apps/family/templates/family/family_update.html @@ -0,0 +1,21 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} + +{% block content %} +
    +

    + {{ title }} +

    +
    +
    + {% csrf_token %} + {{ form | crispy }} + +
    +
    +
    +{% endblock %} diff --git a/apps/family/templates/family/picture_update.html b/apps/family/templates/family/picture_update.html new file mode 100644 index 00000000..e5c6749c --- /dev/null +++ b/apps/family/templates/family/picture_update.html @@ -0,0 +1,118 @@ +{% extends "family/base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} + +{% block profile_content %} +
    +

    + {{ title }} +

    +
    +
    +
    + {% csrf_token %} + {{ form |crispy }} + {% if user.note.display_image != "pic/default.png" %} + + {% endif %} +
    +
    + + +
    +
    +{% endblock %} + +{% block extracss %} + +{% endblock %} + +{% block extrajavascript%} + + + +{% endblock %} diff --git a/apps/family/urls.py b/apps/family/urls.py index 9a17a481..e86bc0b5 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -3,14 +3,15 @@ from django.urls import path -from .views import FamilyListView, FamilyDetailView, FamilyUpdateView, FamilyAddMemberView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView +from .views import FamilyListView, FamilyDetailView, FamilyUpdateView, FamilyPictureUpdateView, FamilyAddMemberView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView app_name = 'family' urlpatterns = [ path('list/', FamilyListView.as_view(), name="family_list"), path('detail//', FamilyDetailView.as_view(), name="family_detail"), path('update//', FamilyUpdateView.as_view(), name="family_update"), - path('/add_member', FamilyAddMemberView.as_view(), name="family_add_member"), + path('update_pic//', FamilyPictureUpdateView.as_view(), name="update_pic"), + path('add_member//', FamilyAddMemberView.as_view(), name="family_add_member"), path('challenge/list/', ChallengeListView.as_view(), name="challenge_list"), path('challenge/detail//', ChallengeDetailView.as_view(), name="challenge_detail"), path('challenge/update//', ChallengeUpdateView.as_view(), name="challenge_update"), diff --git a/apps/family/views.py b/apps/family/views.py index 6f6e3d48..75a82e0c 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -3,7 +3,9 @@ from datetime import date +from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin +from django.db import transaction from django.views.generic import DetailView, UpdateView from django.utils.translation import gettext_lazy as _ from django_tables2 import SingleTableView @@ -13,7 +15,9 @@ from django.urls import reverse_lazy from .models import Family, Challenge, FamilyMembership, User from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable -from .forms import ChallengeUpdateForm, FamilyMembershipForm +from .forms import ChallengeUpdateForm, FamilyMembershipForm, FamilyUpdateForm +from member.forms import ImageForm +from member.views import PictureUpdateView class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): @@ -62,9 +66,12 @@ class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): family=family, year=date.today().year, ).filter(PermissionBackend.filter_queryset(self.request, FamilyMembership, "view"))\ - .order_by("user__username").distinct("user__username") + .order_by("user__username") + family_member = family_member.distinct("user__username")\ + if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.postgresql' else family_member - membership_table = FamilyMembershipTable(data=family_member) + membership_table = FamilyMembershipTable(data=family_member, prefix="membership-") + membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1)) context['member_list'] = membership_table # Check if the user has the right to create a membership, to display the button. @@ -85,8 +92,43 @@ class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ model = Family context_object_name = "family" + form_class = FamilyUpdateForm + template_name = 'family/family_update.html' extra_context = {"title": _('Update family')} + def get_success_url(self): + return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk}) + + +class FamilyPictureUpdateView(PictureUpdateView): + """ + Update profile picture of the family + """ + model = Family + extra_context = {"title": _("Update family picture")} + template_name = 'family/picture_update.html' + + def get_success_url(self): + """Redirect to family page after upload""" + return reverse_lazy('family:family_detail', kwargs={'pk': self.object.id}) + + @transaction.atomic + def form_valid(self, form): + """ + Save the image + """ + image = form.cleaned_data['image'] + + if image is None: + image = "pic/default.png" + else: + # Rename as PNG or GIF + extension = image.name.split(".")[-1] + if extension == "gif": + image.name = "{}_pic.gif".format(self.object.pk) + else: + image.name = "{}_pic.png".format(self.object.pk) + class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): """ @@ -108,6 +150,29 @@ class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): year=date.today().year, ) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + form = context['form'] + + family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view"))\ + .get(pk=self.kwargs['family_pk']) + + context['family'] = family + + return context + + @transaction.atomic + def form_valid(self, form): + """ + Create family membership, check that everythinf is good + """ + family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view")) \ + .get(pk=self.kwargs["family_pk"]) + + form.instance.family = family + + return super().form_valid(form) + def get_success_url(self): return reverse_lazy('family:family_detail', kwargs={'pk': self.object.family.id}) From ab9abc852002c83647e704bc2fbf644898bf112f Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 17 Jul 2025 20:07:12 +0200 Subject: [PATCH 08/32] Better list tables --- apps/family/tables.py | 21 ++++++++++--------- .../templates/family/challenge_list.html | 7 +++++++ apps/family/templates/family/family_list.html | 8 +++++++ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/apps/family/tables.py b/apps/family/tables.py index 4172b975..dd3d916c 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -3,6 +3,7 @@ import django_tables2 as tables from django_tables2 import A +from django.urls import reverse from .models import Family, Challenge, FamilyMembership @@ -11,11 +12,6 @@ class FamilyTable(tables.Table): """ List all families """ - name = tables.LinkColumn( - "family:family_detail", - args=[A("pk")], - ) - class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' @@ -24,17 +20,17 @@ class FamilyTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' fields = ('name', 'score', 'rank',) order_by = ('rank',) + row_attrs = { + 'class': 'table-row', + 'data-href': lambda record: reverse('family:family_detail', args=[record.pk]), + 'style': 'cursor:pointer', + } class ChallengeTable(tables.Table): """ List all challenges """ - name = tables.LinkColumn( - "family:challenge_detail", - args=[A("pk")], - ) - class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' @@ -43,6 +39,11 @@ class ChallengeTable(tables.Table): model = Challenge template_name = 'django_tables2/bootstrap4.html' fields = ('name', 'description', 'points',) + row_attrs = { + 'class': 'table-row', + 'data-href': lambda record: reverse('family:challenge_detail', args=[record.pk]), + 'style': 'cursor:pointer', + } class FamilyMembershipTable(tables.Table): diff --git a/apps/family/templates/family/challenge_list.html b/apps/family/templates/family/challenge_list.html index f16f37a7..c84b80ce 100644 --- a/apps/family/templates/family/challenge_list.html +++ b/apps/family/templates/family/challenge_list.html @@ -28,3 +28,10 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endblock %} +{% block extrajavascript %} + +{% endblock %} diff --git a/apps/family/templates/family/family_list.html b/apps/family/templates/family/family_list.html index 38738fcf..b4b28a89 100644 --- a/apps/family/templates/family/family_list.html +++ b/apps/family/templates/family/family_list.html @@ -26,5 +26,13 @@ SPDX-License-Identifier: GPL-3.0-or-later {% render_table table %} + {% endblock %} +{% block extrajavascript %} + +{% endblock %} From e6839a1079da89cb5751f9d501c06d6b18e8e4d6 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 18 Jul 2025 01:26:30 +0200 Subject: [PATCH 09/32] Manage page (no js yet) --- apps/family/forms.py | 14 +- apps/family/static/family/js/achievements.js | 263 ++++++++++++++++++ apps/family/tables.py | 17 +- ...llenge_update.html => challenge_form.html} | 0 .../templates/family/challenge_list.html | 5 +- .../{family_update.html => family_form.html} | 0 apps/family/templates/family/family_list.html | 5 +- apps/family/templates/family/manage.html | 205 ++++++++++++++ apps/family/urls.py | 21 +- apps/family/views.py | 61 +++- 10 files changed, 559 insertions(+), 32 deletions(-) create mode 100644 apps/family/static/family/js/achievements.js rename apps/family/templates/family/{challenge_update.html => challenge_form.html} (100%) rename apps/family/templates/family/{family_update.html => family_form.html} (100%) create mode 100644 apps/family/templates/family/manage.html diff --git a/apps/family/forms.py b/apps/family/forms.py index 8a36d289..dbc26ad3 100644 --- a/apps/family/forms.py +++ b/apps/family/forms.py @@ -8,7 +8,7 @@ from note_kfet.inputs import Autocomplete from .models import Challenge, FamilyMembership, User, Family -class ChallengeUpdateForm(forms.ModelForm): +class ChallengeForm(forms.ModelForm): """ To update a challenge """ @@ -20,6 +20,12 @@ class ChallengeUpdateForm(forms.ModelForm): } +class FamilyForm(forms.ModelForm): + class Meta: + model = Family + fields = ('name', 'description', ) + + class FamilyMembershipForm(forms.ModelForm): class Meta: model = FamilyMembership @@ -36,9 +42,3 @@ class FamilyMembershipForm(forms.ModelForm): }, ) } - - -class FamilyUpdateForm(forms.ModelForm): - class Meta: - model = Family - fields = ('description', ) \ No newline at end of file diff --git a/apps/family/static/family/js/achievements.js b/apps/family/static/family/js/achievements.js new file mode 100644 index 00000000..5794bfe5 --- /dev/null +++ b/apps/family/static/family/js/achievements.js @@ -0,0 +1,263 @@ +// Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +// SPDX-License-Identifier: GPL-3.0-or-later + +// When a transaction is performed, lock the interface to prevent spam clicks. +var LOCK = false + +/** + * Refresh the history table on the consumptions page. + */ +function refreshHistory () { + $('#history').load('/note/consos/ #history') + $('#most_used').load('/note/consos/ #most_used') +} + +$(document).ready(function () { + // If hash of a category in the URL, then select this category + // else select the first one + if (location.hash) { + $("a[href='" + location.hash + "']").tab('show') + } else { + $("a[data-toggle='tab']").first().tab('show') + } + + // When selecting a category, change URL + $(document.body).on('click', "a[data-toggle='tab']", function () { + location.hash = this.getAttribute('href') + }) + + + // Ensure we begin in single consumption. Fix issue with TurboLinks and BootstrapJS + + + document.getElementById("consume_all").addEventListener('click', consumeAll) +}) + +notes = [] +notes_display = [] +buttons = [] + +// When the user searches an alias, we update the auto-completion +autoCompleteNote('note', 'note_list', notes, notes_display, + 'alias', 'note', 'user_note', 'profile_pic', function () { + if (buttons.length > 0 && $('#single_conso').is(':checked')) { + consumeAll() + return false + } + return true + }) + +/** + * Add a transaction from a button. + * @param dest Where the money goes + * @param amount The price of the item + * @param type The type of the transaction (content type id for RecurrentTransaction) + * @param category_id The category identifier + * @param category_name The category name + * @param template_id The identifier of the button + * @param template_name The name of the button + */ +function addConso (dest, amount, type, category_id, category_name, template_id, template_name) { + var button = null + buttons.forEach(function (b) { + if (b.id === template_id) { + b.quantity += 1 + button = b + } + }) + if (button == null) { + button = { + id: template_id, + name: template_name, + dest: dest, + quantity: 1, + amount: amount, + type: type, + category_id: category_id, + category_name: category_name + } + buttons.push(button) + } + + const dc_obj = $('#double_conso') + if (dc_obj.is(':checked') || notes_display.length === 0) { + const list = dc_obj.is(':checked') ? 'consos_list' : 'note_list' + let html = '' + buttons.forEach(function (button) { + html += li('conso_button_' + button.id, button.name + + '' + button.quantity + '') + }) + document.getElementById(list).innerHTML = html + + buttons.forEach((button) => { + document.getElementById(`conso_button_${button.id}`).addEventListener('click', () => { + if (LOCK) { return } + removeNote(button, 'conso_button', buttons, list)() + }) + }) + } else { consumeAll() } +} + +/** + * Reset the page as its initial state. + */ +function reset () { + notes_display.length = 0 + notes.length = 0 + buttons.length = 0 + document.getElementById('note_list').innerHTML = '' + document.getElementById('consos_list').innerHTML = '' + document.getElementById('note').value = '' + document.getElementById('note').dataset.originTitle = '' + $('#note').tooltip('hide') + document.getElementById('profile_pic').src = '/static/member/img/default_picture.png' + document.getElementById('profile_pic_link').href = '#' + refreshHistory() + refreshBalance() + LOCK = false +} + +/** + * Apply all transactions: all notes in `notes` buy each item in `buttons` + */ +function consumeAll () { + if (LOCK) { return } + + LOCK = true + + let error = false + + if (notes_display.length === 0) { + document.getElementById('note').classList.add('is-invalid') + $('#note_list').html(li('', 'Ajoutez des émetteurs.', 'text-danger')) + error = true + } + + if (buttons.length === 0) { + $('#consos_list').html(li('', 'Ajoutez des consommations.', 'text-danger')) + error = true + } + + if (error) { + LOCK = false + return + } + + notes_display.forEach(function (note_display) { + buttons.forEach(function (button) { + consume(note_display.note, note_display.name, button.dest, button.quantity * note_display.quantity, button.amount, + button.name + ' (' + button.category_name + ')', button.type, button.category_id, button.id) + }) + }) +} + +/** + * Create a new transaction from a button through the API. + * @param source The note that paid the item (type: note) + * @param source_alias The alias used for the source (type: str) + * @param dest The note that sold the item (type: int) + * @param quantity The quantity sold (type: int) + * @param amount The price of one item, in cents (type: int) + * @param reason The transaction details (type: str) + * @param type The type of the transaction (content type id for RecurrentTransaction) + * @param category The category id of the button (type: int) + * @param template The button id (type: int) + */ +function consume (source, source_alias, dest, quantity, amount, reason, type, category, template) { + $.post('/api/note/transaction/transaction/', + { + csrfmiddlewaretoken: CSRF_TOKEN, + quantity: quantity, + amount: amount, + reason: reason, + valid: true, + polymorphic_ctype: type, + resourcetype: 'RecurrentTransaction', + source: source.id, + source_alias: source_alias, + destination: dest, + template: template + }) + .done(function () { + if (!isNaN(source.balance)) { + const newBalance = source.balance - quantity * amount + if (newBalance <= -2000) { + addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' + + 'but the emitter note %s is very negative.'), [source_alias, source_alias]), 'danger', 30000) + } else if (newBalance < 0) { + addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' + + 'but the emitter note %s is negative.'), [source_alias, source_alias]), 'warning', 30000) + } + if (source.membership && source.membership.date_end < new Date().toISOString()) { + addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source_alias]), + 'danger', 30000) + } + } + reset() + }).fail(function (e) { + $.post('/api/note/transaction/transaction/', + { + csrfmiddlewaretoken: CSRF_TOKEN, + quantity: quantity, + amount: amount, + reason: reason, + valid: false, + invalidity_reason: 'Solde insuffisant', + polymorphic_ctype: type, + resourcetype: 'RecurrentTransaction', + source: source.id, + source_alias: source_alias, + destination: dest, + template: template + }).done(function () { + reset() + addMsg(gettext("The transaction couldn't be validated because of insufficient balance."), 'danger', 10000) + }).fail(function () { + reset() + errMsg(e.responseJSON) + }) + }) +} + +var searchbar = document.getElementById("search-input") +var search_results = document.getElementById("search-results") + +var old_pattern = null; +var firstMatch = null; +/** + * Updates the button search tab + * @param force Forces the update even if the pattern didn't change + */ +function updateSearch(force = false) { + let pattern = searchbar.value + if (pattern === "") + firstMatch = null; + if ((pattern === old_pattern || pattern === "") && !force) + return; + firstMatch = null; + const re = new RegExp(pattern, "i"); + Array.from(search_results.children).forEach(function(b) { + if (re.test(b.innerText)) { + b.hidden = false; + if (firstMatch === null) { + firstMatch = b; + } + } else + b.hidden = true; + }); +} + +searchbar.addEventListener("input", function (e) { + debounce(updateSearch)() +}); +searchbar.addEventListener("keyup", function (e) { + if (firstMatch && e.key === "Enter") + firstMatch.click() +}); + +function createshiny() { + const list_btn = document.querySelectorAll('.btn-outline-dark') + const shiny_class = list_btn[Math.floor(Math.random() * list_btn.length)].classList + shiny_class.replace('btn-outline-dark', 'btn-outline-dark-shiny') +} +createshiny() diff --git a/apps/family/tables.py b/apps/family/tables.py index dd3d916c..f7eb2a16 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -2,10 +2,9 @@ # SPDX-License-Identifier: GPL-3.0-or-later import django_tables2 as tables -from django_tables2 import A from django.urls import reverse -from .models import Family, Challenge, FamilyMembership +from .models import Family, Challenge, FamilyMembership, Achievement class FamilyTable(tables.Table): @@ -58,3 +57,17 @@ class FamilyMembershipTable(tables.Table): template_name = 'django_tables2/bootstrap4.html' fields = ('user',) model = FamilyMembership + + +class AchievementTable(tables.Table): + """ + List recent achievements. + """ + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + model = Achievement + fields = ('family', 'challenge', 'obtained_at', ) + template_name = 'django_tables2/bootstrap4.html' + orderable = False diff --git a/apps/family/templates/family/challenge_update.html b/apps/family/templates/family/challenge_form.html similarity index 100% rename from apps/family/templates/family/challenge_update.html rename to apps/family/templates/family/challenge_form.html diff --git a/apps/family/templates/family/challenge_list.html b/apps/family/templates/family/challenge_list.html index c84b80ce..2a1502d0 100644 --- a/apps/family/templates/family/challenge_list.html +++ b/apps/family/templates/family/challenge_list.html @@ -16,11 +16,14 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Challenges" %} + + {% trans "Manage" %} + -<
    +

    {{ title }}

    diff --git a/apps/family/templates/family/family_update.html b/apps/family/templates/family/family_form.html similarity index 100% rename from apps/family/templates/family/family_update.html rename to apps/family/templates/family/family_form.html diff --git a/apps/family/templates/family/family_list.html b/apps/family/templates/family/family_list.html index b4b28a89..55feed5e 100644 --- a/apps/family/templates/family/family_list.html +++ b/apps/family/templates/family/family_list.html @@ -16,11 +16,14 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Challenges" %} + + {% trans "Manage" %} +
    -<
    +

    {{ title }}

    diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html new file mode 100644 index 00000000..7c8e0dbf --- /dev/null +++ b/apps/family/templates/family/manage.html @@ -0,0 +1,205 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n static django_tables2 %} + +{% block containertype %}container-fluid{% endblock %} + +{% block content %} +
    +
    +
    + + {% trans "Families" %} + + + {% trans "Challenges" %} + + + {% trans "Manage" %} + +
    +
    +
    + +
    +
    +
    + {# User details column #} +
    +
    + + + +
    + {% trans "Please select a family" %} +
    +
    +
    + + {# Family selection column #} +
    +
    +
    +

    + {% trans "Families" %} +

    +
    +
    +
      +
    +
    + + {# User search with autocompletion #} +
    + +
    +
    +
    + + {# Summary of challenges and validate button #} +
    +
    +
    +

    + {% trans "Challenges" %} +

    +
    +
    +
      +
    +
    +
    + + {% trans "Validate!" %} + +
    +
    +
    +
    + {# Create family/challenge buttons #} +
    +

    +

    + {% trans "Create a family or challenge" %} +

    +

    +
    + {% if can_add_family %} + + {% trans "Add a family" %} + + {% endif %} + {% if can_add_challenge %} + + {% trans "Add a challenge" %} + + {% endif %} +
    +
    +
    + + + {# Buttons column #} +
    + {# Regroup buttons under categories #} + +
    + {# Tabs for list and search #} +
    + +
    + + {# Tabs content #} +
    +
    +
    +
    + {% for challenge in all_challenges %} + + {% endfor %} +
    +
    + +
    +
    + + {# Mode switch #} +
    + + {% trans "Edit" %} + + +
    +
    +
    +
    + + + + + +{# transaction history #} +
    +
    +

    + {% trans "Recent achievements history" %} +

    +
    + {% render_table table %} +
    +{% endblock %} + + + +{% block extrajavascript %} + + +{% endblock %} \ No newline at end of file diff --git a/apps/family/urls.py b/apps/family/urls.py index e86bc0b5..094ed505 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -3,16 +3,19 @@ from django.urls import path -from .views import FamilyListView, FamilyDetailView, FamilyUpdateView, FamilyPictureUpdateView, FamilyAddMemberView, ChallengeListView, ChallengeDetailView, ChallengeUpdateView +from . import views app_name = 'family' urlpatterns = [ - path('list/', FamilyListView.as_view(), name="family_list"), - path('detail//', FamilyDetailView.as_view(), name="family_detail"), - path('update//', FamilyUpdateView.as_view(), name="family_update"), - path('update_pic//', FamilyPictureUpdateView.as_view(), name="update_pic"), - path('add_member//', FamilyAddMemberView.as_view(), name="family_add_member"), - path('challenge/list/', ChallengeListView.as_view(), name="challenge_list"), - path('challenge/detail//', ChallengeDetailView.as_view(), name="challenge_detail"), - path('challenge/update//', ChallengeUpdateView.as_view(), name="challenge_update"), + path('list/', views.FamilyListView.as_view(), name="family_list"), + path('add-family/', views.FamilyCreateView.as_view(), name="add_family"), + path('detail//', views.FamilyDetailView.as_view(), name="family_detail"), + path('update//', views.FamilyUpdateView.as_view(), name="family_update"), + path('update_pic//', views.FamilyPictureUpdateView.as_view(), name="update_pic"), + path('add_member//', views.FamilyAddMemberView.as_view(), name="family_add_member"), + path('challenge/list/', views.ChallengeListView.as_view(), name="challenge_list"), + path('add-challenge/', views.ChallengeCreateView.as_view(), name="add_challenge"), + path('challenge/detail//', views.ChallengeDetailView.as_view(), name="challenge_detail"), + path('challenge/update//', views.ChallengeUpdateView.as_view(), name="challenge_update"), + path('manage/', views.FamilyManageView.as_view(), name="manage"), ] diff --git a/apps/family/views.py b/apps/family/views.py index 75a82e0c..35f073fb 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -12,13 +12,12 @@ from django_tables2 import SingleTableView from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin, ProtectedCreateView from django.urls import reverse_lazy - -from .models import Family, Challenge, FamilyMembership, User -from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable -from .forms import ChallengeUpdateForm, FamilyMembershipForm, FamilyUpdateForm -from member.forms import ImageForm from member.views import PictureUpdateView +from .models import Family, Challenge, FamilyMembership, User, Achievement +from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable +from .forms import ChallengeForm, FamilyMembershipForm, FamilyForm + class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): """ @@ -26,6 +25,7 @@ class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): """ model = Family extra_context = {"title": _('Create family')} + form_class = FamilyForm def get_sample_object(self): return Family( @@ -35,6 +35,10 @@ class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): rank=0, ) + def get_success_url(self): + self.object.refresh_from_db() + return reverse_lazy("family:manage") + class FamilyListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ @@ -92,8 +96,7 @@ class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): """ model = Family context_object_name = "family" - form_class = FamilyUpdateForm - template_name = 'family/family_update.html' + form_class = FamilyForm extra_context = {"title": _('Update family')} def get_success_url(self): @@ -152,11 +155,10 @@ class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - form = context['form'] family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view"))\ .get(pk=self.kwargs['family_pk']) - + context['family'] = family return context @@ -167,7 +169,7 @@ class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): Create family membership, check that everythinf is good """ family = Family.objects.filter(PermissionBackend.filter_queryset(self.request, Family, "view")) \ - .get(pk=self.kwargs["family_pk"]) + .get(pk=self.kwargs["family_pk"]) form.instance.family = family @@ -183,6 +185,7 @@ class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): """ model = Challenge extra_context = {"title": _('Create challenge')} + form_class = ChallengeForm def get_sample_object(self): return Challenge( @@ -234,9 +237,43 @@ class ChallengeUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): model = Challenge context_object_name = "challenge" extra_context = {"title": _('Update challenge')} - template_name = 'family/challenge_update.html' - form_class = ChallengeUpdateForm + form_class = ChallengeForm def get_success_url(self, **kwargs): self.object.refresh_from_db() return reverse_lazy('family:challenge_detail', kwargs={'pk': self.object.pk}) + + +class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): + """ + Manage families and challenges + """ + model = Achievement + template_name = 'family/manage.html' + table_class = AchievementTable + extra_context = {'title': _('Manage families and challenges')} + + def dispatch(self, request, *args, **kwargs): + # Check that the user is authenticated + if not request.user.is_authenticated: + return self.handle_no_permission() + + return super().dispatch(request, *args, **kwargs) + + def get_queryset(self, **kwargs): + # retrieves only Transaction that user has the right to see. + return Achievement.objects.filter( + PermissionBackend.filter_queryset(self.request, Achievement, "view") + ).order_by("-obtained_at").all()[:20] + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + context['all_challenges'] = Challenge.objects.filter( + PermissionBackend.filter_queryset(self.request, Challenge, "view") + ).order_by('name') + + context["can_add_family"] = PermissionBackend.check_perm(self.request, "family.add_family") + context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.add_challenge") + + return context From a72572ded6df20ea03c74227eba1df79c6a6f93f Mon Sep 17 00:00:00 2001 From: ikea Date: Fri, 18 Jul 2025 11:51:27 +0200 Subject: [PATCH 10/32] =?UTF-8?q?Optimisation=20ergonomique=20de=20la=20cr?= =?UTF-8?q?=C3=A9ation=20de=20famille=20et=20chalenge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/family/templates/family/manage.html | 391 +++++++++++------------ 1 file changed, 187 insertions(+), 204 deletions(-) diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 7c8e0dbf..84506884 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -1,205 +1,188 @@ -{% extends "base.html" %} -{% comment %} -Copyright (C) 2018-2025 by BDE ENS Paris-Saclay -SPDX-License-Identifier: GPL-3.0-or-later -{% endcomment %} -{% load i18n static django_tables2 %} - -{% block containertype %}container-fluid{% endblock %} - -{% block content %} -
    -
    -
    - - {% trans "Families" %} - - - {% trans "Challenges" %} - - - {% trans "Manage" %} - -
    -
    -
    - -
    -
    -
    - {# User details column #} -
    -
    - - - -
    - {% trans "Please select a family" %} -
    -
    -
    - - {# Family selection column #} -
    -
    -
    -

    - {% trans "Families" %} -

    -
    -
    -
      -
    -
    - - {# User search with autocompletion #} -
    - -
    -
    -
    - - {# Summary of challenges and validate button #} -
    -
    -
    -

    - {% trans "Challenges" %} -

    -
    -
    -
      -
    -
    -
    - - {% trans "Validate!" %} - -
    -
    -
    -
    - {# Create family/challenge buttons #} -
    -

    -

    - {% trans "Create a family or challenge" %} -

    -

    -
    - {% if can_add_family %} - - {% trans "Add a family" %} - - {% endif %} - {% if can_add_challenge %} - - {% trans "Add a challenge" %} - - {% endif %} -
    -
    -
    - - - {# Buttons column #} -
    - {# Regroup buttons under categories #} - -
    - {# Tabs for list and search #} -
    - -
    - - {# Tabs content #} -
    -
    -
    -
    - {% for challenge in all_challenges %} - - {% endfor %} -
    -
    - -
    -
    - - {# Mode switch #} -
    - - {% trans "Edit" %} - - -
    -
    -
    -
    - - - - - -{# transaction history #} -
    -
    -

    - {% trans "Recent achievements history" %} -

    -
    - {% render_table table %} -
    -{% endblock %} - - - -{% block extrajavascript %} - - +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n static django_tables2 %} + +{% block containertype %}container-fluid{% endblock %} + +{% block content %} +
    +
    +
    + + {% trans "Families" %} + + + {% trans "Challenges" %} + + + {% trans "Manage" %} + +
    +
    +
    + +
    +
    +
    + {# User details column #} +
    +
    + + + +
    + {% trans "Please select a family" %} +
    +
    +
    + + {# Family selection column #} +
    +
    +
    +

    + {% trans "Families" %} +

    +
    +
    +
      +
      + {# User search with autocompletion #} +
      + +
      +
      +
      + + {# Summary of challenges and validate button #} +
      +
      +
      +

      + {% trans "Challenges" %} +

      +
      +
      +
        +
        +
        + + {% trans "Validate!" %} + +
        +
        +
        +
        + + {# Create family/challenge buttons #} +
        +

        + {% trans "Create a family or challenge" %} +

        +
        + {% if can_add_family %} + + {% trans "Add a family" %} + + {% endif %} + {% if can_add_challenge %} + + {% trans "Add a challenge" %} + + {% endif %} +
        +
        +
        + + {# Buttons column #} +
        +
        + {# Tabs for list and search #} +
        + +
        + + {# Tabs content #} +
        +
        +
        +
        + {% for challenge in all_challenges %} + + {% endfor %} +
        +
        + +
        +
        + + {# Mode switch #} +
        + + {% trans "Edit" %} + +
        +
        +
        +
        + +{# transaction history #} +
        +
        +

        + {% trans "Recent achievements history" %} +

        +
        + {% render_table table %} +
        +{% endblock %} + +{% block extrajavascript %} + + {% endblock %} \ No newline at end of file From 57f43a870072fb1699868b2916e3b1822706d0ea Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 18 Jul 2025 13:54:37 +0200 Subject: [PATCH 11/32] API --- apps/family/api/__init__.py | 0 apps/family/api/serializers.py | 46 +++++++++++++++++++++++++ apps/family/api/urls.py | 14 ++++++++ apps/family/api/views.py | 61 ++++++++++++++++++++++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 apps/family/api/__init__.py create mode 100644 apps/family/api/serializers.py create mode 100644 apps/family/api/urls.py create mode 100644 apps/family/api/views.py diff --git a/apps/family/api/__init__.py b/apps/family/api/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/family/api/serializers.py b/apps/family/api/serializers.py new file mode 100644 index 00000000..c902a9c5 --- /dev/null +++ b/apps/family/api/serializers.py @@ -0,0 +1,46 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from rest_framework import serializers + +from ..models import Family, FamilyMembership, Challenge, Achievement + + +class FamilySerializer(serializers.ModelSerializer): + """ + REST API Serializer for Family. + The djangorestframework plugin will analyse the model `Family` and parse all fields in the API. + """ + class Meta: + model = Family + fields = '__all__' + + +class FamilyMembershipSerializer(serializers.ModelSerializer): + """ + REST API Serializer for FamilyMembership. + The djangorestframework plugin will analyse the model `FamilyMembership` and parse all fields in the API. + """ + class Meta: + model = FamilyMembership + fields = '__all__' + + +class ChallengeSerializer(serializers.ModelSerializer): + """ + REST API Serializer for Challenge. + The djangorestframework plugin will analyse the model `Challenge` and parse all fields in the API. + """ + class Meta: + model = Challenge + fields = '__all__' + + +class AchievementSerializer(serializers.ModelSerializer): + """ + REST API Serializer for Achievement. + The djangorestframework plugin will analyse the model `Achievement` and parse all fields in the API. + """ + class Meta: + model = Achievement + fields = '__all__' diff --git a/apps/family/api/urls.py b/apps/family/api/urls.py new file mode 100644 index 00000000..43c49500 --- /dev/null +++ b/apps/family/api/urls.py @@ -0,0 +1,14 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from .views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet + + +def register_family_urls(router, path): + """ + Configure router for Family REST API + """ + router.register(path + 'family', FamilyViewSet) + router.register(path + 'familymembership', FamilyMembershipViewSet) + router.register(path + 'challenge', ChallengeViewSet) + router.register(path + 'achievement', AchievementViewSet) diff --git a/apps/family/api/views.py b/apps/family/api/views.py new file mode 100644 index 00000000..0e228718 --- /dev/null +++ b/apps/family/api/views.py @@ -0,0 +1,61 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from api.viewsets import ReadProtectedModelViewSet +from django_filters.rest_framework import DjangoFilterBackend +from rest_framework.filters import SearchFilter + +from .serializers import FamilySerializer, FamilyMembershipSerializer, ChallengeSerializer, AchievementSerializer +from ..models import Family, FamilyMembership, Challenge, Achievement + + +class FamilyViewSet(ReadProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `Family` objects, serialize it to JSON with the given serializer, + then render it on /api/family/family/ + """ + queryset = Family.object.order_by('id') + serializer_class = FamilySerializer + filter_backends = [DjangoFilterBackend, SearchFilter] + filterset_fields = ['name', ] + search_fields = ['§name', ] + + +class FamilyMembershipViewSet(ReadProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `FamilyMembership` objects, serialize it to JSON with the given serializer, + then render it on /api/family/familymembership/ + """ + queryset = FamilyMembership.object.order_by('id') + serializer_class = FamilyMembershipSerializer + filter_backends = [DjangoFilterBackend, SearchFilter] + filterset_fields = ['name', ] + search_fields = ['§name', ] + + +class ChallengeViewSet(ReadProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `Challenge` objects, serialize it to JSON with the given serializer, + then render it on /api/family/challenge/ + """ + queryset = Challenge.object.order_by('id') + serializer_class = ChallengeSerializer + filter_backends = [DjangoFilterBackend, SearchFilter] + filterset_fields = ['name', ] + search_fields = ['§name', ] + + +class AchievementViewSet(ReadProtectedModelViewSet): + """ + REST API View set. + The djangorestframework plugin will get all `Achievement` objects, serialize it to JSON with the given serializer, + then render it on /api/family/achievement/ + """ + queryset = Achievement.object.order_by('id') + serializer_class = AchievementSerializer + filter_backends = [DjangoFilterBackend, SearchFilter] + filterset_fields = ['name', ] + search_fields = ['§name', ] From 40922843f860ae0ddeef8e120b991539db2f48d5 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 18 Jul 2025 17:08:29 +0200 Subject: [PATCH 12/32] API again --- apps/api/urls.py | 4 ++++ apps/family/api/urls.py | 8 ++++---- apps/family/api/views.py | 16 ++++++++-------- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/apps/api/urls.py b/apps/api/urls.py index c9e0dfa4..4452e4d7 100644 --- a/apps/api/urls.py +++ b/apps/api/urls.py @@ -19,6 +19,10 @@ if "activity" in settings.INSTALLED_APPS: from activity.api.urls import register_activity_urls register_activity_urls(router, 'activity') +if "family" in settings.INSTALLED_APPS: + from family.api.urls import register_family_urls + register_family_urls(router, 'family') + if "food" in settings.INSTALLED_APPS: from food.api.urls import register_food_urls register_food_urls(router, 'food') diff --git a/apps/family/api/urls.py b/apps/family/api/urls.py index 43c49500..b231ef99 100644 --- a/apps/family/api/urls.py +++ b/apps/family/api/urls.py @@ -8,7 +8,7 @@ def register_family_urls(router, path): """ Configure router for Family REST API """ - router.register(path + 'family', FamilyViewSet) - router.register(path + 'familymembership', FamilyMembershipViewSet) - router.register(path + 'challenge', ChallengeViewSet) - router.register(path + 'achievement', AchievementViewSet) + router.register(path + '/family', FamilyViewSet) + router.register(path + '/familymembership', FamilyMembershipViewSet) + router.register(path + '/challenge', ChallengeViewSet) + router.register(path + '/achievement', AchievementViewSet) diff --git a/apps/family/api/views.py b/apps/family/api/views.py index 0e228718..f2fe0208 100644 --- a/apps/family/api/views.py +++ b/apps/family/api/views.py @@ -15,11 +15,11 @@ class FamilyViewSet(ReadProtectedModelViewSet): The djangorestframework plugin will get all `Family` objects, serialize it to JSON with the given serializer, then render it on /api/family/family/ """ - queryset = Family.object.order_by('id') + queryset = Family.objects.order_by('id') serializer_class = FamilySerializer filter_backends = [DjangoFilterBackend, SearchFilter] filterset_fields = ['name', ] - search_fields = ['§name', ] + search_fields = ['$name', ] class FamilyMembershipViewSet(ReadProtectedModelViewSet): @@ -28,11 +28,11 @@ class FamilyMembershipViewSet(ReadProtectedModelViewSet): The djangorestframework plugin will get all `FamilyMembership` objects, serialize it to JSON with the given serializer, then render it on /api/family/familymembership/ """ - queryset = FamilyMembership.object.order_by('id') + queryset = FamilyMembership.objects.order_by('id') serializer_class = FamilyMembershipSerializer filter_backends = [DjangoFilterBackend, SearchFilter] filterset_fields = ['name', ] - search_fields = ['§name', ] + search_fields = ['$name', ] class ChallengeViewSet(ReadProtectedModelViewSet): @@ -41,11 +41,11 @@ class ChallengeViewSet(ReadProtectedModelViewSet): The djangorestframework plugin will get all `Challenge` objects, serialize it to JSON with the given serializer, then render it on /api/family/challenge/ """ - queryset = Challenge.object.order_by('id') + queryset = Challenge.objects.order_by('id') serializer_class = ChallengeSerializer filter_backends = [DjangoFilterBackend, SearchFilter] filterset_fields = ['name', ] - search_fields = ['§name', ] + search_fields = ['$name', ] class AchievementViewSet(ReadProtectedModelViewSet): @@ -54,8 +54,8 @@ class AchievementViewSet(ReadProtectedModelViewSet): The djangorestframework plugin will get all `Achievement` objects, serialize it to JSON with the given serializer, then render it on /api/family/achievement/ """ - queryset = Achievement.object.order_by('id') + queryset = Achievement.objects.order_by('id') serializer_class = AchievementSerializer filter_backends = [DjangoFilterBackend, SearchFilter] filterset_fields = ['name', ] - search_fields = ['§name', ] + search_fields = ['$name', ] From f64138605d20654d993be7d63a2fc0bed4c3d8e8 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 18 Jul 2025 17:09:06 +0200 Subject: [PATCH 13/32] JS for manage page --- apps/family/static/family/js/achievements.js | 358 ++++++++++++++----- apps/family/templates/family/manage.html | 314 ++++++++-------- 2 files changed, 420 insertions(+), 252 deletions(-) diff --git a/apps/family/static/family/js/achievements.js b/apps/family/static/family/js/achievements.js index 5794bfe5..dba07f0d 100644 --- a/apps/family/static/family/js/achievements.js +++ b/apps/family/static/family/js/achievements.js @@ -8,8 +8,7 @@ var LOCK = false * Refresh the history table on the consumptions page. */ function refreshHistory () { - $('#history').load('/note/consos/ #history') - $('#most_used').load('/note/consos/ #most_used') + $('#history').load('/family/manage/ #history') } $(document).ready(function () { @@ -38,18 +37,14 @@ notes_display = [] buttons = [] // When the user searches an alias, we update the auto-completion -autoCompleteNote('note', 'note_list', notes, notes_display, - 'alias', 'note', 'user_note', 'profile_pic', function () { - if (buttons.length > 0 && $('#single_conso').is(':checked')) { - consumeAll() - return false - } +autoCompleteFamily('note', 'note_list', notes, notes_display, + 'note', 'user_note', 'profile_pic', function () { return true }) /** * Add a transaction from a button. - * @param dest Where the money goes + * @param fam Where the money goes * @param amount The price of the item * @param type The type of the transaction (content type id for RecurrentTransaction) * @param category_id The category identifier @@ -57,35 +52,32 @@ autoCompleteNote('note', 'note_list', notes, notes_display, * @param template_id The identifier of the button * @param template_name The name of the button */ -function addConso (dest, amount, type, category_id, category_name, template_id, template_name) { - var button = null +function addChallenge (id, name, amount) { + var challenge = null + /** Ajout de 1 à chaque clic d'un bouton déjà choisi */ buttons.forEach(function (b) { - if (b.id === template_id) { + if (b.id === id) { b.quantity += 1 - button = b + challenge = b } }) - if (button == null) { - button = { - id: template_id, - name: template_name, - dest: dest, + if (challenge == null) { + challenge = { + id: id, + name: name, quantity: 1, amount: amount, - type: type, - category_id: category_id, - category_name: category_name } - buttons.push(button) + buttons.push(challenge) } - const dc_obj = $('#double_conso') - if (dc_obj.is(':checked') || notes_display.length === 0) { - const list = dc_obj.is(':checked') ? 'consos_list' : 'note_list' + const dc_obj = true + + const list = 'consos_list' let html = '' - buttons.forEach(function (button) { - html += li('conso_button_' + button.id, button.name + - '' + button.quantity + '') + buttons.forEach(function (challenge) { + html += li('conso_button_' + challenge.id, challenge.name + + '' + challenge.quantity + '') }) document.getElementById(list).innerHTML = html @@ -95,13 +87,14 @@ function addConso (dest, amount, type, category_id, category_name, template_id, removeNote(button, 'conso_button', buttons, list)() }) }) - } else { consumeAll() } + } /** * Reset the page as its initial state. */ function reset () { + console.log("reset lancée") notes_display.length = 0 notes.length = 0 buttons.length = 0 @@ -113,7 +106,6 @@ function reset () { document.getElementById('profile_pic').src = '/static/member/img/default_picture.png' document.getElementById('profile_pic_link').href = '#' refreshHistory() - refreshBalance() LOCK = false } @@ -121,6 +113,7 @@ function reset () { * Apply all transactions: all notes in `notes` buy each item in `buttons` */ function consumeAll () { + console.log("consumeAll lancée") if (LOCK) { return } LOCK = true @@ -129,12 +122,12 @@ function consumeAll () { if (notes_display.length === 0) { document.getElementById('note').classList.add('is-invalid') - $('#note_list').html(li('', 'Ajoutez des émetteurs.', 'text-danger')) + $('#note_list').html(li('', 'Ajoutez des familles.', 'text-danger')) error = true } if (buttons.length === 0) { - $('#consos_list').html(li('', 'Ajoutez des consommations.', 'text-danger')) + $('#consos_list').html(li('', 'Ajoutez des défis.', 'text-danger')) error = true } @@ -143,79 +136,39 @@ function consumeAll () { return } - notes_display.forEach(function (note_display) { - buttons.forEach(function (button) { - consume(note_display.note, note_display.name, button.dest, button.quantity * note_display.quantity, button.amount, - button.name + ' (' + button.category_name + ')', button.type, button.category_id, button.id) + notes_display.forEach(function (family) { + buttons.forEach(function (challenge) { + grantAchievement(family, challenge) }) }) } /** - * Create a new transaction from a button through the API. - * @param source The note that paid the item (type: note) - * @param source_alias The alias used for the source (type: str) - * @param dest The note that sold the item (type: int) - * @param quantity The quantity sold (type: int) - * @param amount The price of one item, in cents (type: int) - * @param reason The transaction details (type: str) - * @param type The type of the transaction (content type id for RecurrentTransaction) - * @param category The category id of the button (type: int) - * @param template The button id (type: int) + * Create a new achievement through the API. + * @param family The selected family + * @param challenge The selected challenge */ -function consume (source, source_alias, dest, quantity, amount, reason, type, category, template) { - $.post('/api/note/transaction/transaction/', +function grantAchievement (family, challenge) { + console.log("grant lancée",family,challenge) + $.post('/api/family/achievement/', { csrfmiddlewaretoken: CSRF_TOKEN, - quantity: quantity, - amount: amount, - reason: reason, - valid: true, - polymorphic_ctype: type, - resourcetype: 'RecurrentTransaction', - source: source.id, - source_alias: source_alias, - destination: dest, - template: template + family: family.id, + challenge: challenge.id, }) .done(function () { - if (!isNaN(source.balance)) { - const newBalance = source.balance - quantity * amount - if (newBalance <= -2000) { - addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' + - 'but the emitter note %s is very negative.'), [source_alias, source_alias]), 'danger', 30000) - } else if (newBalance < 0) { - addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' + - 'but the emitter note %s is negative.'), [source_alias, source_alias]), 'warning', 30000) - } - if (source.membership && source.membership.date_end < new Date().toISOString()) { - addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source_alias]), - 'danger', 30000) - } - } reset() - }).fail(function (e) { - $.post('/api/note/transaction/transaction/', - { - csrfmiddlewaretoken: CSRF_TOKEN, - quantity: quantity, - amount: amount, - reason: reason, - valid: false, - invalidity_reason: 'Solde insuffisant', - polymorphic_ctype: type, - resourcetype: 'RecurrentTransaction', - source: source.id, - source_alias: source_alias, - destination: dest, - template: template - }).done(function () { - reset() - addMsg(gettext("The transaction couldn't be validated because of insufficient balance."), 'danger', 10000) - }).fail(function () { - reset() + addMsg("Défi validé pour la famille !", 'success', 5000) + }) + .fail(function (e) { + reset() + if (e.responseJSON) { errMsg(e.responseJSON) - }) + } else if (e.responseText) { + errMsg(e.responseText) + } else { + errMsg("Erreur inconnue lors de la création de l'achievement.") + } }) } @@ -261,3 +214,222 @@ function createshiny() { shiny_class.replace('btn-outline-dark', 'btn-outline-dark-shiny') } createshiny() + + + + + +/** + * Query the 20 first matched notes with a given pattern + * @param pattern The pattern that is queried + * @param fun For each found note with the matched alias `alias`, fun(note, alias) is called. + */ +function getMatchedFamilies (pattern, fun) { + $.getJSON('/api/family/family/?format=json&alias=' + pattern + '&search=family', fun) +} + +/** + * Generate a
      • entry with a given id and text + */ +function li (id, text, extra_css) { + return '
      • ' + text + '
        • \n' +} + + +/** + * Génère un champ d'auto-complétion pour rechercher une famille par son nom (version simplifiée sans alias) + * @param field_id L'identifiant du champ texte où le nom est saisi + * @param family_list_id L'identifiant du bloc div où les familles sélectionnées sont affichées + * @param families Un tableau contenant les objets famille sélectionnés + * @param families_display Un tableau contenant les infos des familles sélectionnées : [nom, id, objet famille, quantité] + * @param family_prefix Le préfixe des
      • pour les familles sélectionnées + * @param user_family_field L'identifiant du champ qui affiche la famille survolée (optionnel) + * @param profile_pic_field L'identifiant du champ qui affiche la photo de la famille survolée (optionnel) + * @param family_click Fonction appelée lors du clic sur un nom. Si elle existe et ne retourne pas true, la famille n'est pas affichée. + */ +function autoCompleteFamily(field_id, family_list_id, families, families_display, family_prefix = 'family', user_family_field = null, profile_pic_field = null, family_click = null) { + const field = $('#' + field_id) + console.log("autoCompleteFamily commence") + // Configuration du tooltip + field.tooltip({ + html: true, + placement: 'bottom', + title: 'Chargement...', + trigger: 'manual', + container: field.parent(), + fallbackPlacement: 'clockwise' + }) + + // Masquer le tooltip lors d'un clic ailleurs + $(document).click(function (e) { + if (!e.target.id.startsWith(family_prefix)) { + field.tooltip('hide') + } + }) + + let old_pattern = null + + // Réinitialiser la recherche au clic + field.click(function () { + field.tooltip('hide') + field.removeClass('is-invalid') + field.val('') + old_pattern = '' + }) + + // Sur "Entrée", sélectionner la première famille + field.keypress(function (event) { + if (event.originalEvent.charCode === 13 && families.length > 0) { + const li_obj = field.parent().find('ul li').first() + displayFamily(families[0], families[0].name, user_family_field, profile_pic_field) + li_obj.trigger('click') + } + }) + + // Mise à jour des suggestions lors de la saisie + field.keyup(function (e) { + field.removeClass('is-invalid') + + if (e.originalEvent.charCode === 13) { return } + + const pattern = field.val() + + if (pattern === old_pattern) { return } + old_pattern = pattern + families.length = 0 + + if (pattern === '') { + field.tooltip('hide') + families.length = 0 + return + } + + // Appel à l'API pour récupérer les familles correspondantes + $.getJSON('/api/family/family/?format=json&search=' + pattern, + function (results) { + if (pattern !== $('#' + field_id).val()) { return } + + let matched_html = '
          ' + results.results.forEach(function (family) { + matched_html += li(family_prefix + '_' + family.id, + family.name, + '') + families.push(family) + }) + matched_html += '
        ' + + field.attr('data-original-title', matched_html).tooltip('show') + + results.results.forEach(function (family) { + const family_obj = $('#' + family_prefix + '_' + family.id) + family_obj.hover(function () { + displayFamily(family, family.name, user_family_field, profile_pic_field) + }) + family_obj.click(function () { + var disp = null + families_display.forEach(function (d) { + if (d.id === family.id) { + d.quantity += 1 + disp = d + } + }) + if (disp == null) { + disp = { + name: family.name, + id: family.id, + family: family, + quantity: 1 + } + families_display.push(disp) + } + + if (family_click && !family_click()) { return } + + const family_list = $('#' + family_list_id) + let html = '' + families_display.forEach(function (disp) { + html += li(family_prefix + '_' + disp.id, + disp.name + + '' + + disp.quantity + '', + '') + }) + + family_list.html(html) + field.tooltip('update') + + families_display.forEach(function (disp) { + const line_obj = $('#' + family_prefix + '_' + disp.id) + line_obj.hover(function () { + displayFamily(disp.family, disp.name, user_family_field, profile_pic_field) + }) + line_obj.click(removeFamily(disp, family_prefix, families_display, family_list_id, user_family_field, + profile_pic_field)) + }) + }) + }) + }) + }) +} + +/** + * Affiche le nom et la photo d'une famille + * @param family L'objet famille à afficher + * @param user_family_field L'identifiant du champ où afficher le nom (optionnel) + * @param profile_pic_field L'identifiant du champ où afficher la photo (optionnel) + */ +function displayFamily(family, user_family_field = null, profile_pic_field = null) { + if (!family.display_image) { + family.display_image = '/static/member/img/default_picture.png' + } + if (user_family_field !== null) { + $('#' + user_family_field).removeAttr('class') + $('#' + user_family_field).text(family.name) + if (profile_pic_field != null) { + $('#' + profile_pic_field).attr('src', family.display_image) + // Si tu veux un lien vers la page famille : + $('#' + profile_pic_field + '_link').attr('href', '/family/detail/' + family.id + '/') + } + } +} + + +/** + * Retire une famille de la liste sélectionnée. + * @param d La famille à retirer + * @param family_prefix Le préfixe des
      • + * @param families_display Le tableau des familles sélectionnées + * @param family_list_id L'id du bloc où sont affichées les familles + * @param user_family_field Champ d'affichage (optionnel) + * @param profile_pic_field Champ photo (optionnel) + * @returns une fonction compatible avec les événements jQuery + */ +function removeFamily(d, family_prefix, families_display, family_list_id, user_family_field = null, profile_pic_field = null) { + return function () { + const new_families_display = [] + let html = '' + families_display.forEach(function (disp) { + if (disp.quantity > 1 || disp.id !== d.id) { + disp.quantity -= disp.id === d.id ? 1 : 0 + new_families_display.push(disp) + html += li(family_prefix + '_' + disp.id, disp.name + + '' + disp.quantity + '') + } + }) + + families_display.length = 0 + new_families_display.forEach(function (disp) { + families_display.push(disp) + }) + + $('#' + family_list_id).html(html) + families_display.forEach(function (disp) { + const obj = $('#' + family_prefix + '_' + disp.id) + obj.click(removeFamily(disp, family_prefix, families_display, family_list_id, user_family_field, profile_pic_field)) + obj.hover(function () { + displayFamily(disp.family, user_family_field, profile_pic_field) + }) + }) + } +} \ No newline at end of file diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 84506884..275337fa 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -9,180 +9,176 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %}
        -
        -
        - - {% trans "Families" %} - - - {% trans "Challenges" %} - - - {% trans "Manage" %} - +
        +
        + + {% trans "Families" %} + + + {% trans "Challenges" %} + + + {% trans "Manage" %} + +
        -
        -
        -
        - {# User details column #} -
        -
        - - - -
        - {% trans "Please select a family" %} -
        -
        -
        +
        +
        + {# Family details column #} +
        +
        + + + +
        + {% trans "Please select a family" %} +
        +
        +
        - {# Family selection column #} -
        + {# Family selection column #} +
        +
        +
        +

        + {% trans "Families" %} +

        +
        +
        +
          +
          + {# User search with autocompletion #} +
          + +
          +
          +
          + + {# Summary of challenges and validate button #} +
          +
          +
          +

          + {% trans "Challenges" %} +

          +
          +
          +
            +
            +
            + + {% trans "Validate!" %} + +
            +
            +
            +
            + + {# Create family/challenge buttons #}
            -
            -

            - {% trans "Families" %} -

            -
            -
            -
              -
              - {# User search with autocompletion #} -
              - -
              -
              -
              - - {# Summary of challenges and validate button #} -
              -
              -
              -

              - {% trans "Challenges" %} -

              -
              -
              -
                -
                -
                - - {% trans "Validate!" %} - -
                -
                -
                -
                - - {# Create family/challenge buttons #} -
                -

                - {% trans "Create a family or challenge" %} -

                -
                - {% if can_add_family %} - - {% trans "Add a family" %} - - {% endif %} - {% if can_add_challenge %} - - {% trans "Add a challenge" %} - - {% endif %} -
                -
                -
                - - {# Buttons column #} -
                -
                - {# Tabs for list and search #} -
                - -
                - - {# Tabs content #} -
                -
                -
                -
                - {% for challenge in all_challenges %} - - {% endfor %} -
                -
                - + {% endif %} +
                +
                +
                + + {# Buttons column #} +
                +
                + {# Tabs for list and search #} +
                + +
                + + {# Tabs content #} +
                +
                +
                +
                + {% for challenge in all_challenges %} + + {% endfor %} +
                +
                + +
                +
                + + {# Mode switch #} +
                + + {% trans "Edit" %} + +
                -
                - - {# Mode switch #} -
                - - {% trans "Edit" %} - -
                -
                {# transaction history #} -
                -
                -

                - {% trans "Recent achievements history" %} -

                -
                - {% render_table table %} -
                +
                +
                +

                + {% trans "Recent achievements history" %} +

                +
                + {% render_table table %} +
                {% endblock %} -{% block extrajavascript %} - - + + {% endfor %} + + {% for challenge in all_challenges %} + document.getElementById("search_challenge{{ challenge.id }}").addEventListener("click", function() { + addChallenge({{ challenge.id}}, "{{ challenge.name|escapejs }}", {{ challenge.points }}); + }); + {% endfor %} + {% endblock %} \ No newline at end of file From 67b936ae9895476f55eafb3f7e150e70aa237708 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 18 Jul 2025 21:01:15 +0200 Subject: [PATCH 14/32] Rank calculation optimized --- apps/family/api/urls.py | 8 +++-- apps/family/api/views.py | 30 ++++++++++++++++ apps/family/models.py | 7 ++-- apps/family/static/family/js/achievements.js | 36 ++++++++++++++------ apps/family/urls.py | 3 +- 5 files changed, 67 insertions(+), 17 deletions(-) diff --git a/apps/family/api/urls.py b/apps/family/api/urls.py index b231ef99..e94776d7 100644 --- a/apps/family/api/urls.py +++ b/apps/family/api/urls.py @@ -1,7 +1,7 @@ # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later - -from .views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet +from django.urls import path +from .views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet, BatchAchievementsAPIView def register_family_urls(router, path): @@ -12,3 +12,7 @@ def register_family_urls(router, path): router.register(path + '/familymembership', FamilyMembershipViewSet) router.register(path + '/challenge', ChallengeViewSet) router.register(path + '/achievement', AchievementViewSet) + +urlpatterns = [ + path('achievements/batch/', BatchAchievementsAPIView.as_view(), name='batch_achievements') +] \ No newline at end of file diff --git a/apps/family/api/views.py b/apps/family/api/views.py index f2fe0208..d568c1c6 100644 --- a/apps/family/api/views.py +++ b/apps/family/api/views.py @@ -4,6 +4,14 @@ from api.viewsets import ReadProtectedModelViewSet from django_filters.rest_framework import DjangoFilterBackend from rest_framework.filters import SearchFilter +from rest_framework.views import APIView +from rest_framework.permissions import IsAuthenticated +from rest_framework.response import Response +from rest_framework import status +from django.views.decorators.csrf import csrf_exempt +from django.views.decorators.http import require_POST +from django.http import JsonResponse +import json from .serializers import FamilySerializer, FamilyMembershipSerializer, ChallengeSerializer, AchievementSerializer from ..models import Family, FamilyMembership, Challenge, Achievement @@ -59,3 +67,25 @@ class AchievementViewSet(ReadProtectedModelViewSet): filter_backends = [DjangoFilterBackend, SearchFilter] filterset_fields = ['name', ] search_fields = ['$name', ] + + +class BatchAchievementsAPIView(APIView): + permission_classes = [IsAuthenticated] + def post(self, request, format=None): + print("POST de la view spéciale") + family_ids = request.data.get('families', []) + challenge_ids = request.data.get('challenges', []) + + families = Family.objects.filter(id__in=family_ids) + challenges = Challenge.objects.filter(id__in=challenge_ids) + + for family in families: + for challenge in challenges: + a = Achievement(family=family, challenge=challenge) + a.save(update_score=False) + + for family in families: + family.update_score() + Family.update_ranking() + + return Response({'status': 'ok'}, status=status.HTTP_201_CREATED) \ No newline at end of file diff --git a/apps/family/models.py b/apps/family/models.py index 1d2d0d34..1acc9ba8 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -165,7 +165,7 @@ class Achievement(models.Model): return _('Challenge {challenge} carried out by Family {family}').format(challenge=self.challenge.name, family=self.family.name, ) @transaction.atomic - def save(self, *args, **kwargs): + def save(self, *args, update_score=True, **kwargs): """ When saving, also grants points to the family """ @@ -175,8 +175,9 @@ class Achievement(models.Model): super().save(*args, **kwargs) - self.family.refresh_from_db() - self.family.update_score() + if update_score: + self.family.refresh_from_db() + self.family.update_score() # Count only when getting a new achievement if is_new: diff --git a/apps/family/static/family/js/achievements.js b/apps/family/static/family/js/achievements.js index dba07f0d..db29923d 100644 --- a/apps/family/static/family/js/achievements.js +++ b/apps/family/static/family/js/achievements.js @@ -113,33 +113,47 @@ function reset () { * Apply all transactions: all notes in `notes` buy each item in `buttons` */ function consumeAll () { - console.log("consumeAll lancée") if (LOCK) { return } - LOCK = true let error = false if (notes_display.length === 0) { - document.getElementById('note').classList.add('is-invalid') - $('#note_list').html(li('', 'Ajoutez des familles.', 'text-danger')) + // ... gestion erreur ... error = true } - if (buttons.length === 0) { - $('#consos_list').html(li('', 'Ajoutez des défis.', 'text-danger')) + // ... gestion erreur ... error = true } - if (error) { LOCK = false return } - notes_display.forEach(function (family) { - buttons.forEach(function (challenge) { - grantAchievement(family, challenge) - }) + // Récupérer les IDs des familles et des challenges + const family_ids = notes_display.map(fam => fam.id) + const challenge_ids = buttons.map(chal => chal.id) + + $.ajax({ + url: '/family/api/family/achievements/batch/', + type: 'POST', + data: JSON.stringify({ + families: family_ids, + challenges: challenge_ids + }), + contentType: 'application/json', + headers: { + 'X-CSRFToken': CSRF_TOKEN + }, + success: function () { + reset() + addMsg("Défis validés pour les familles !", 'success', 5000) + }, + error: function (e) { + reset() + addMsg("Erreur lors de la création des achievements.",'danger',5000) + } }) } diff --git a/apps/family/urls.py b/apps/family/urls.py index 094ed505..ee491ecc 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -1,7 +1,7 @@ # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from django.urls import path +from django.urls import path, include from . import views @@ -18,4 +18,5 @@ urlpatterns = [ path('challenge/detail//', views.ChallengeDetailView.as_view(), name="challenge_detail"), path('challenge/update//', views.ChallengeUpdateView.as_view(), name="challenge_update"), path('manage/', views.FamilyManageView.as_view(), name="manage"), + path('api/family/', include('family.api.urls')), ] From 9e700fd3de664799c11d4076ce4069d481ffc210 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Fri, 18 Jul 2025 22:11:43 +0200 Subject: [PATCH 15/32] Achievement delete --- apps/family/api/urls.py | 4 ++- apps/family/api/views.py | 7 ++-- apps/family/tables.py | 23 ++++++++++-- .../family/achievement_confirm_delete.html | 27 ++++++++++++++ .../templates/family/achievement_list.html | 22 ++++++++++++ apps/family/templates/family/manage.html | 19 +++++----- apps/family/urls.py | 2 ++ apps/family/views.py | 35 +++++++++++++++++-- apps/treasury/views.py | 2 +- 9 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 apps/family/templates/family/achievement_confirm_delete.html create mode 100644 apps/family/templates/family/achievement_list.html diff --git a/apps/family/api/urls.py b/apps/family/api/urls.py index e94776d7..35cf1409 100644 --- a/apps/family/api/urls.py +++ b/apps/family/api/urls.py @@ -1,6 +1,7 @@ # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later from django.urls import path + from .views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet, BatchAchievementsAPIView @@ -13,6 +14,7 @@ def register_family_urls(router, path): router.register(path + '/challenge', ChallengeViewSet) router.register(path + '/achievement', AchievementViewSet) + urlpatterns = [ path('achievements/batch/', BatchAchievementsAPIView.as_view(), name='batch_achievements') -] \ No newline at end of file +] diff --git a/apps/family/api/views.py b/apps/family/api/views.py index d568c1c6..50ac0496 100644 --- a/apps/family/api/views.py +++ b/apps/family/api/views.py @@ -8,10 +8,6 @@ from rest_framework.views import APIView from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response from rest_framework import status -from django.views.decorators.csrf import csrf_exempt -from django.views.decorators.http import require_POST -from django.http import JsonResponse -import json from .serializers import FamilySerializer, FamilyMembershipSerializer, ChallengeSerializer, AchievementSerializer from ..models import Family, FamilyMembership, Challenge, Achievement @@ -71,6 +67,7 @@ class AchievementViewSet(ReadProtectedModelViewSet): class BatchAchievementsAPIView(APIView): permission_classes = [IsAuthenticated] + def post(self, request, format=None): print("POST de la view spéciale") family_ids = request.data.get('families', []) @@ -88,4 +85,4 @@ class BatchAchievementsAPIView(APIView): family.update_score() Family.update_ranking() - return Response({'status': 'ok'}, status=status.HTTP_201_CREATED) \ No newline at end of file + return Response({'status': 'ok'}, status=status.HTTP_201_CREATED) diff --git a/apps/family/tables.py b/apps/family/tables.py index f7eb2a16..871dfd35 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -3,6 +3,8 @@ import django_tables2 as tables from django.urls import reverse +from django.utils.translation import gettext_lazy as _ +from django_tables2 import A from .models import Family, Challenge, FamilyMembership, Achievement @@ -63,11 +65,28 @@ class AchievementTable(tables.Table): """ List recent achievements. """ + delete = tables.LinkColumn( + 'family:achievement_delete', + args=[A('id')], + verbose_name=_("Delete"), + text=_("Delete"), + orderable=False, + attrs={ + 'th': { + 'id': 'delete-membership-header' + }, + 'a': { + 'class': 'btn btn-danger', + 'data-type': 'delete-membership' + } + }, + ) + class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' } model = Achievement - fields = ('family', 'challenge', 'obtained_at', ) + fields = ('family', 'challenge', 'challenge__points', 'obtained_at', ) template_name = 'django_tables2/bootstrap4.html' - orderable = False + order_by = ('-obtained_at',) diff --git a/apps/family/templates/family/achievement_confirm_delete.html b/apps/family/templates/family/achievement_confirm_delete.html new file mode 100644 index 00000000..893e0afb --- /dev/null +++ b/apps/family/templates/family/achievement_confirm_delete.html @@ -0,0 +1,27 @@ +{% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} + +{% block content %} +
                +
                +

                {% trans "Delete achievement" %}

                +
                +
                +
                + {% blocktrans %}Are you sure you want to delete this achievement? This action can't be undone.{% endblocktrans %} +
                +
                +
                +
                + {% csrf_token %} + {% trans "Return to achievements list" %} + {% if not object.locked %} + + {% endif %} +
                +
                +
                +{% endblock %} diff --git a/apps/family/templates/family/achievement_list.html b/apps/family/templates/family/achievement_list.html new file mode 100644 index 00000000..fe1fd62f --- /dev/null +++ b/apps/family/templates/family/achievement_list.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} +{% comment %} +Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n django_tables2 %} + +{% block content %} + +
                +
                +

                + {% trans "Recent achievements history" %} +

                + + {% trans "Return to management page" %} + +
                + {% render_table table %} +
                + +{% endblock %} \ No newline at end of file diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 275337fa..0ecac60a 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -143,24 +143,21 @@ SPDX-License-Identifier: GPL-3.0-or-later
                - {# Mode switch #} -
                - - {% trans "Edit" %} - -
                {# transaction history #} -
                -
                -

                +

                + +
                + {% render_table table %}
                - {% render_table table %}
                {% endblock %} diff --git a/apps/family/urls.py b/apps/family/urls.py index ee491ecc..072cbada 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -18,5 +18,7 @@ urlpatterns = [ path('challenge/detail//', views.ChallengeDetailView.as_view(), name="challenge_detail"), path('challenge/update//', views.ChallengeUpdateView.as_view(), name="challenge_update"), path('manage/', views.FamilyManageView.as_view(), name="manage"), + path('achievements/', views.AchievementsView.as_view(), name="achievement_list"), + path('achievement/delete//', views.AchievementDeleteView.as_view(), name="achievement_delete"), path('api/family/', include('family.api.urls')), ] diff --git a/apps/family/views.py b/apps/family/views.py index 35f073fb..6325c445 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -7,6 +7,7 @@ from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.db import transaction from django.views.generic import DetailView, UpdateView +from django.views.generic.edit import DeleteView from django.utils.translation import gettext_lazy as _ from django_tables2 import SingleTableView from permission.backends import PermissionBackend @@ -195,7 +196,7 @@ class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): ) def get_success_url(self): - return reverse_lazy('family:challenge_list') + return reverse_lazy('family:manage') class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): @@ -264,7 +265,7 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView # retrieves only Transaction that user has the right to see. return Achievement.objects.filter( PermissionBackend.filter_queryset(self.request, Achievement, "view") - ).order_by("-obtained_at").all()[:20] + ).order_by("-obtained_at").all() def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -277,3 +278,33 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.add_challenge") return context + + def get_table(self, **kwargs): + table = super().get_table(**kwargs) + table.exclude = ('delete',) + table.orderable = False + return table + + +class AchievementsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): + """ + List all achievements + """ + model = Achievement + table_class = AchievementTable + extra_context = {'title': _('Achievement list')} + + def get_table(self, **kwargs): + table = super().get_table(**kwargs) + table.orderable = True + return table + + +class AchievementDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView): + """ + Delete an Achievement + """ + model = Achievement + + def get_success_url(self): + return reverse_lazy('family:achievement_list') diff --git a/apps/treasury/views.py b/apps/treasury/views.py index eab144c3..eb2fd0d7 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -168,7 +168,7 @@ class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): class InvoiceDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView): """ - Delete a non-validated WEI registration + Delete a non-locked Invoice """ model = Invoice extra_context = {"title": _("Delete invoice")} From ea8fcad8b594b2c9f8f53952e972c6c26624e489 Mon Sep 17 00:00:00 2001 From: ikea Date: Sat, 19 Jul 2025 00:52:10 +0200 Subject: [PATCH 16/32] =?UTF-8?q?Ajout=20des=20d=C3=A9fis=20r=C3=A9alis?= =?UTF-8?q?=C3=A9s=20par=20une=20famille?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/family/tables.py | 13 +++++++++++++ apps/family/templates/family/family_detail.html | 9 +++++++++ apps/family/views.py | 8 +++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/apps/family/tables.py b/apps/family/tables.py index 871dfd35..759de96d 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -90,3 +90,16 @@ class AchievementTable(tables.Table): fields = ('family', 'challenge', 'challenge__points', 'obtained_at', ) template_name = 'django_tables2/bootstrap4.html' order_by = ('-obtained_at',) + +class FamilyAchievementTable(tables.Table): + """ + Table des défis réalisés par une famille spécifique. + """ + class Meta: + model = Achievement + template_name = 'django_tables2/bootstrap4.html' + fields = ('challenge', 'challenge__points', 'obtained_at',) + attrs = { + 'class': 'table table-condensed table-striped table-hover' + } + order_by = ('-obtained_at',) \ No newline at end of file diff --git a/apps/family/templates/family/family_detail.html b/apps/family/templates/family/family_detail.html index a1db566f..dc38edda 100644 --- a/apps/family/templates/family/family_detail.html +++ b/apps/family/templates/family/family_detail.html @@ -13,4 +13,13 @@ SPDX-License-Identifier: GPL-3.0-or-later
                {% render_table member_list %}
                + +
                + +
                +
                + {% trans "Completed challenges" %} +
                + {% render_table achievement_list %} +
                {% endblock %} \ No newline at end of file diff --git a/apps/family/views.py b/apps/family/views.py index 6325c445..33108f32 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -16,7 +16,7 @@ from django.urls import reverse_lazy from member.views import PictureUpdateView from .models import Family, Challenge, FamilyMembership, User, Achievement -from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable +from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable, FamilyAchievementTable from .forms import ChallengeForm, FamilyMembershipForm, FamilyForm @@ -88,6 +88,12 @@ class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context["can_add_members"] = PermissionBackend()\ .has_perm(self.request.user, "family.add_membership", empty_membership) + # Défis réalisé par la famille + achievements = Achievement.objects.filter(family=family) + achievements_table = FamilyAchievementTable(data=achievements, prefix="achievement-") + achievements_table.paginate(per_page=5, page=self.request.GET.get('achievement-page', 1)) + context["achievement_list"] = achievements_table + return context From 4c3b714b56c57cf455e6445830a15980017af5ae Mon Sep 17 00:00:00 2001 From: ikea Date: Sun, 20 Jul 2025 21:31:59 +0200 Subject: [PATCH 17/32] Affiche les familles dans le profil utilisateur avec lien vers la page de la famille --- apps/member/templates/member/includes/profile_info.html | 9 +++++++++ apps/member/views.py | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/apps/member/templates/member/includes/profile_info.html b/apps/member/templates/member/includes/profile_info.html index 3a927c9f..dd184c02 100644 --- a/apps/member/templates/member/includes/profile_info.html +++ b/apps/member/templates/member/includes/profile_info.html @@ -7,6 +7,15 @@
                {% trans 'username'|capfirst %}
                {{ user_object.username }}
                +
                {% trans 'family'|capfirst %}
                +
                + {% for family in families %} + {{ family.name }}{% if not forloop.last %}, {% endif %} + {% empty %} + {% trans 'None' %} + {% endfor %} +
                + {% if user_object.pk == user.pk %}
                {% trans 'password'|capfirst %}
                diff --git a/apps/member/views.py b/apps/member/views.py index 19f9b46f..d2b27291 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -26,6 +26,7 @@ from note_kfet.middlewares import _set_current_request from permission.backends import PermissionBackend from permission.models import Role from permission.views import ProtectQuerysetMixin, ProtectedCreateView +from family.models import Family from django import forms from .forms import UserForm, ProfileForm, ImageForm, ClubForm, MembershipForm, \ @@ -92,6 +93,9 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): if fields_modifiable: context['profile_form'] = profile_form + families = Family.objects.filter(members=user).distinct() + context["families"] = families + return context @transaction.atomic From 2af671d61a466064bcfe61caf87f07804f627d97 Mon Sep 17 00:00:00 2001 From: ikea Date: Sun, 20 Jul 2025 23:27:53 +0200 Subject: [PATCH 18/32] =?UTF-8?q?Fix=20traduction=20.po=20=E2=80=93=20supp?= =?UTF-8?q?ression=20doublons?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locale/fr/LC_MESSAGES/django.po | 8 -------- 1 file changed, 8 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index b62c48bc..76ebb02b 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -4095,14 +4095,6 @@ msgstr "La note est indisponible pour le moment" msgid "Thank you for your understanding -- The Respos Info of BDE" msgstr "Merci de votre compréhension -- Les Respos Info du BDE" -#: note_kfet/templates/base_search.html:15 -msgid "Search by attribute such as name..." -msgstr "Chercher par un attribut tel que le nom..." - -#: note_kfet/templates/base_search.html:23 -msgid "There is no results." -msgstr "Il n'y a pas de résultat." - #: note_kfet/templates/cas/logged.html:8 msgid "" "

                Log In Successful

                You have successfully logged into the Central " From db4d0dd83a981eeaac3dbcf66ef9d2b25e36a0e2 Mon Sep 17 00:00:00 2001 From: ikea Date: Mon, 21 Jul 2025 22:11:20 +0200 Subject: [PATCH 19/32] fix --- .../templates/member/includes/profile_info.html | 12 +++++++----- apps/member/views.py | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/apps/member/templates/member/includes/profile_info.html b/apps/member/templates/member/includes/profile_info.html index dd184c02..3ea525d5 100644 --- a/apps/member/templates/member/includes/profile_info.html +++ b/apps/member/templates/member/includes/profile_info.html @@ -9,11 +9,13 @@
                {% trans 'family'|capfirst %}
                - {% for family in families %} - {{ family.name }}{% if not forloop.last %}, {% endif %} - {% empty %} - {% trans 'None' %} - {% endfor %} + {% if families %} + {% for fam in families %} + {{ fam.name }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% else %} + Aucune + {% endif %}
                {% if user_object.pk == user.pk %} diff --git a/apps/member/views.py b/apps/member/views.py index d2b27291..3c1ebef7 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -93,9 +93,6 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): if fields_modifiable: context['profile_form'] = profile_form - families = Family.objects.filter(members=user).distinct() - context["families"] = families - return context @transaction.atomic @@ -210,6 +207,9 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): modified_note.is_active = True context["can_unlock_note"] = not user.note.is_active and PermissionBackend\ .check_perm(self.request, "note.change_noteuser_is_active", modified_note) + + families = Family.objects.filter(members__user=user).distinct() + context["families"] = families return context From c66cc14576a9e02ee3b228732dad2dde91f17abf Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Tue, 22 Jul 2025 01:30:47 +0200 Subject: [PATCH 20/32] Added valid field and logic for Achievement --- ...ent_valid_alter_familymembership_family.py | 24 +++++++++ apps/family/models.py | 11 ++-- apps/family/tables.py | 26 +++++++-- .../family/achievement_confirm_delete.html | 4 +- .../family/achievement_confirm_validate.html | 28 ++++++++++ .../templates/family/achievement_list.html | 15 +++++- apps/family/urls.py | 17 +++--- apps/family/views.py | 54 +++++++++++++++---- apps/member/views.py | 4 +- 9 files changed, 152 insertions(+), 31 deletions(-) create mode 100644 apps/family/migrations/0003_achievement_valid_alter_familymembership_family.py create mode 100644 apps/family/templates/family/achievement_confirm_validate.html diff --git a/apps/family/migrations/0003_achievement_valid_alter_familymembership_family.py b/apps/family/migrations/0003_achievement_valid_alter_familymembership_family.py new file mode 100644 index 00000000..9121a1ff --- /dev/null +++ b/apps/family/migrations/0003_achievement_valid_alter_familymembership_family.py @@ -0,0 +1,24 @@ +# Generated by Django 5.2.4 on 2025-07-21 21:02 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('family', '0002_family_display_image'), + ] + + operations = [ + migrations.AddField( + model_name='achievement', + name='valid', + field=models.BooleanField(default=False, verbose_name='valid'), + ), + migrations.AlterField( + model_name='familymembership', + name='family', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to='family.family', verbose_name='family'), + ), + ] diff --git a/apps/family/models.py b/apps/family/models.py index 1acc9ba8..708c3929 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -45,9 +45,9 @@ class Family(models.Model): return self.name def update_score(self, *args, **kwargs): - challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self) + challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self, achievement__valid=True) points_sum = challenge_set.aggregate(models.Sum("points")) - self.score = points_sum["points__sum"] + self.score = points_sum["points__sum"] if points_sum["points__sum"] else 0 self.save() self.update_ranking() @@ -86,7 +86,7 @@ class FamilyMembership(models.Model): family = models.ForeignKey( Family, on_delete=models.PROTECT, - related_name=_('members'), + related_name=_('memberships'), verbose_name=_('family'), ) @@ -157,6 +157,11 @@ class Achievement(models.Model): default=timezone.now, ) + valid = models.BooleanField( + verbose_name=_('valid'), + default=False, + ) + class Meta: verbose_name = _('achievement') verbose_name_plural = _('achievements') diff --git a/apps/family/tables.py b/apps/family/tables.py index 759de96d..0a0b773a 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -65,6 +65,23 @@ class AchievementTable(tables.Table): """ List recent achievements. """ + validate = tables.LinkColumn( + 'family:achievement_validate', + args=[A('id')], + verbose_name=_("Validate"), + text=_("Validate"), + orderable=False, + attrs={ + 'th': { + 'id': 'validate-achievement-header' + }, + 'a': { + 'class': 'btn btn-success', + 'data-type': 'validate-achievement' + } + }, + ) + delete = tables.LinkColumn( 'family:achievement_delete', args=[A('id')], @@ -73,11 +90,11 @@ class AchievementTable(tables.Table): orderable=False, attrs={ 'th': { - 'id': 'delete-membership-header' + 'id': 'delete-achievement-header' }, 'a': { 'class': 'btn btn-danger', - 'data-type': 'delete-membership' + 'data-type': 'delete-achievement' } }, ) @@ -87,10 +104,11 @@ class AchievementTable(tables.Table): 'class': 'table table-condensed table-striped table-hover' } model = Achievement - fields = ('family', 'challenge', 'challenge__points', 'obtained_at', ) + fields = ('family', 'challenge', 'challenge__points', 'obtained_at', 'valid') template_name = 'django_tables2/bootstrap4.html' order_by = ('-obtained_at',) + class FamilyAchievementTable(tables.Table): """ Table des défis réalisés par une famille spécifique. @@ -102,4 +120,4 @@ class FamilyAchievementTable(tables.Table): attrs = { 'class': 'table table-condensed table-striped table-hover' } - order_by = ('-obtained_at',) \ No newline at end of file + order_by = ('-obtained_at',) diff --git a/apps/family/templates/family/achievement_confirm_delete.html b/apps/family/templates/family/achievement_confirm_delete.html index 893e0afb..3b378fa5 100644 --- a/apps/family/templates/family/achievement_confirm_delete.html +++ b/apps/family/templates/family/achievement_confirm_delete.html @@ -18,9 +18,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                {% csrf_token %} {% trans "Return to achievements list" %} - {% if not object.locked %} - - {% endif %} +
                diff --git a/apps/family/templates/family/achievement_confirm_validate.html b/apps/family/templates/family/achievement_confirm_validate.html new file mode 100644 index 00000000..e417480a --- /dev/null +++ b/apps/family/templates/family/achievement_confirm_validate.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} +{% comment %} +SPDX-License-Identifier: GPL-3.0-or-later +{% endcomment %} +{% load i18n crispy_forms_tags %} + +{% block content %} +
                +
                +

                {% trans "Validate achievement" %}

                +
                +
                +
                + {% blocktrans %}Are you sure you want to validate this achievement? This action can't be undone.{% endblocktrans %} +
                +
                +
                +
                + {% csrf_token %} + {% trans "Return to achievements list" %} + + {% csrf_token %} + +
                + +
                +
                +{% endblock %} diff --git a/apps/family/templates/family/achievement_list.html b/apps/family/templates/family/achievement_list.html index fe1fd62f..63cd6255 100644 --- a/apps/family/templates/family/achievement_list.html +++ b/apps/family/templates/family/achievement_list.html @@ -10,13 +10,24 @@ SPDX-License-Identifier: GPL-3.0-or-later

                - {% trans "Recent achievements history" %} + {% trans "Invalid achievements history" %}

                {% trans "Return to management page" %}
                - {% render_table table %} + {% render_table invalid %}
                +
                +
                +

                + {% trans "Valid achievements history" %} +

                + + {% trans "Return to management page" %} + +
                + {% render_table valid %} +
                {% endblock %} \ No newline at end of file diff --git a/apps/family/urls.py b/apps/family/urls.py index 072cbada..7d9e9c5b 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -9,16 +9,17 @@ app_name = 'family' urlpatterns = [ path('list/', views.FamilyListView.as_view(), name="family_list"), path('add-family/', views.FamilyCreateView.as_view(), name="add_family"), - path('detail//', views.FamilyDetailView.as_view(), name="family_detail"), - path('update//', views.FamilyUpdateView.as_view(), name="family_update"), - path('update_pic//', views.FamilyPictureUpdateView.as_view(), name="update_pic"), - path('add_member//', views.FamilyAddMemberView.as_view(), name="family_add_member"), + path('/detail/', views.FamilyDetailView.as_view(), name="family_detail"), + path('/update/', views.FamilyUpdateView.as_view(), name="family_update"), + path('/update_pic/', views.FamilyPictureUpdateView.as_view(), name="update_pic"), + path('/add_member/', views.FamilyAddMemberView.as_view(), name="family_add_member"), path('challenge/list/', views.ChallengeListView.as_view(), name="challenge_list"), path('add-challenge/', views.ChallengeCreateView.as_view(), name="add_challenge"), - path('challenge/detail//', views.ChallengeDetailView.as_view(), name="challenge_detail"), - path('challenge/update//', views.ChallengeUpdateView.as_view(), name="challenge_update"), + path('challenge//detail/', views.ChallengeDetailView.as_view(), name="challenge_detail"), + path('challenge//update/', views.ChallengeUpdateView.as_view(), name="challenge_update"), path('manage/', views.FamilyManageView.as_view(), name="manage"), - path('achievements/', views.AchievementsView.as_view(), name="achievement_list"), - path('achievement/delete//', views.AchievementDeleteView.as_view(), name="achievement_delete"), + path('achievement/list/', views.AchievementsView.as_view(), name="achievement_list"), + path('achievement//validate/', views.AchievementValidateView.as_view(), name="achievement_validate"), + path('achievement//delete/', views.AchievementDeleteView.as_view(), name="achievement_delete"), path('api/family/', include('family.api.urls')), ] diff --git a/apps/family/views.py b/apps/family/views.py index 33108f32..a6e886a8 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -4,12 +4,14 @@ from datetime import date from django.conf import settings +from django.shortcuts import redirect from django.contrib.auth.mixins import LoginRequiredMixin from django.db import transaction -from django.views.generic import DetailView, UpdateView +from django.views.generic import DetailView, UpdateView, ListView from django.views.generic.edit import DeleteView +from django.views.generic.base import TemplateView from django.utils.translation import gettext_lazy as _ -from django_tables2 import SingleTableView +from django_tables2 import SingleTableView, MultiTableMixin from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin, ProtectedCreateView from django.urls import reverse_lazy @@ -287,23 +289,57 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView def get_table(self, **kwargs): table = super().get_table(**kwargs) - table.exclude = ('delete',) + table.exclude = ('delete', 'validate',) table.orderable = False return table -class AchievementsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): +class AchievementsView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView): """ List all achievements """ model = Achievement - table_class = AchievementTable + tables = [AchievementTable, AchievementTable, ] extra_context = {'title': _('Achievement list')} - def get_table(self, **kwargs): - table = super().get_table(**kwargs) - table.orderable = True - return table + def get_tables(self, **kwargs): + tables = super().get_tables(**kwargs) + + tables[0].prefix = 'invalid-' + tables[1].prefix = 'valid-' + tables[1].exclude = ('validate', 'delete',) + + return tables + + def get_tables_data(self): + table_valid = self.get_queryset().filter(valid=True) + table_invalid = self.get_queryset().filter(valid=False) + return [table_invalid, table_valid, ] + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + tables = context['tables'] + + context['invalid'] = tables[0] + context['valid'] = tables[1] + return context + + +class AchievementValidateView(ProtectQuerysetMixin, LoginRequiredMixin, TemplateView): + """ + Validate an achievement obtained by a family + """ + template_name = 'family/achievement_confirm_validate.html' + + def post(self, request, pk): + # On récupère l'objet à valider + achievement = Achievement.objects.get(pk=pk) + # On modifie le champ valid + achievement.valid = True + achievement.save() + # On redirige vers la page de détail ou la liste + return redirect(reverse_lazy('family:achievement_list')) class AchievementDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView): diff --git a/apps/member/views.py b/apps/member/views.py index 3c1ebef7..3cf3cd32 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -207,8 +207,8 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): modified_note.is_active = True context["can_unlock_note"] = not user.note.is_active and PermissionBackend\ .check_perm(self.request, "note.change_noteuser_is_active", modified_note) - - families = Family.objects.filter(members__user=user).distinct() + + families = Family.objects.filter(memberships__user=user).distinct() context["families"] = families return context From adc925e4b14bcf911eba217b3f6f492e1f432d73 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Tue, 22 Jul 2025 18:31:55 +0200 Subject: [PATCH 21/32] Tests --- apps/family/api/views.py | 35 +- .../0004_remove_challenge_obtained.py | 17 + apps/family/models.py | 34 +- .../static/family/img/default_picture.png | Bin 0 -> 4054 bytes apps/family/static/family/js/achievements.js | 34 +- apps/family/templates/family/manage.html | 8 +- apps/family/tests/__init__.py | 0 apps/family/tests/test_family.py | 318 ++++++++++++++++++ apps/family/urls.py | 8 +- apps/family/views.py | 35 +- 10 files changed, 403 insertions(+), 86 deletions(-) create mode 100644 apps/family/migrations/0004_remove_challenge_obtained.py create mode 100644 apps/family/static/family/img/default_picture.png create mode 100644 apps/family/tests/__init__.py create mode 100644 apps/family/tests/test_family.py diff --git a/apps/family/api/views.py b/apps/family/api/views.py index 50ac0496..79a719d1 100644 --- a/apps/family/api/views.py +++ b/apps/family/api/views.py @@ -3,7 +3,7 @@ from api.viewsets import ReadProtectedModelViewSet from django_filters.rest_framework import DjangoFilterBackend -from rest_framework.filters import SearchFilter +from api.filters import RegexSafeSearchFilter from rest_framework.views import APIView from rest_framework.permissions import IsAuthenticated from rest_framework.response import Response @@ -21,9 +21,9 @@ class FamilyViewSet(ReadProtectedModelViewSet): """ queryset = Family.objects.order_by('id') serializer_class = FamilySerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] + filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter] + filterset_fields = ['name', 'description', 'score', 'rank', ] + search_fields = ['$name', '$description', ] class FamilyMembershipViewSet(ReadProtectedModelViewSet): @@ -34,9 +34,11 @@ class FamilyMembershipViewSet(ReadProtectedModelViewSet): """ queryset = FamilyMembership.objects.order_by('id') serializer_class = FamilyMembershipSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] + filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter] + filterset_fields = ['user__username', 'user__first_name', 'user__last_name', 'user__email', 'user__note__alias__name', + 'user__note__alias__normalized_name', 'family__name', 'family__description', 'year', ] + search_fields = ['$user__username', '$user__first_name', '$user__last_name', '$user__email', '$user__note__alias__name', + '$user__note__alias__normalized_name', '$family__name', '$family__description', '$year', ] class ChallengeViewSet(ReadProtectedModelViewSet): @@ -47,9 +49,9 @@ class ChallengeViewSet(ReadProtectedModelViewSet): """ queryset = Challenge.objects.order_by('id') serializer_class = ChallengeSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] + filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter] + filterset_fields = ['name', 'description', 'points', ] + search_fields = ['$name', '$description', '$points', ] class AchievementViewSet(ReadProtectedModelViewSet): @@ -60,22 +62,19 @@ class AchievementViewSet(ReadProtectedModelViewSet): """ queryset = Achievement.objects.order_by('id') serializer_class = AchievementSerializer - filter_backends = [DjangoFilterBackend, SearchFilter] - filterset_fields = ['name', ] - search_fields = ['$name', ] + filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter] + filterset_fields = ['family__name', 'family__description', 'challenge__name', 'challenge__description', 'obtained_at', 'valid', ] + search_fields = ['$family__name', '$family__description', '$challenge__name', '$challenge__description', ] class BatchAchievementsAPIView(APIView): permission_classes = [IsAuthenticated] def post(self, request, format=None): - print("POST de la view spéciale") - family_ids = request.data.get('families', []) - challenge_ids = request.data.get('challenges', []) - + family_ids = request.data.get('families') + challenge_ids = request.data.get('challenges') families = Family.objects.filter(id__in=family_ids) challenges = Challenge.objects.filter(id__in=challenge_ids) - for family in families: for challenge in challenges: a = Achievement(family=family, challenge=challenge) diff --git a/apps/family/migrations/0004_remove_challenge_obtained.py b/apps/family/migrations/0004_remove_challenge_obtained.py new file mode 100644 index 00000000..2831bac1 --- /dev/null +++ b/apps/family/migrations/0004_remove_challenge_obtained.py @@ -0,0 +1,17 @@ +# Generated by Django 5.2.4 on 2025-07-22 14:33 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('family', '0003_achievement_valid_alter_familymembership_family'), + ] + + operations = [ + migrations.RemoveField( + model_name='challenge', + name='obtained', + ), + ] diff --git a/apps/family/models.py b/apps/family/models.py index 708c3929..71ccfa08 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -4,6 +4,7 @@ from django.db import models, transaction from django.utils import timezone from django.contrib.auth.models import User +from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -44,6 +45,9 @@ class Family(models.Model): def __str__(self): return self.name + def get_absolute_url(self): + return reverse_lazy('family:family_detail', args=(self.pk,)) + def update_score(self, *args, **kwargs): challenge_set = Challenge.objects.select_for_update().filter(achievement__family=self, achievement__valid=True) points_sum = challenge_set.aggregate(models.Sum("points")) @@ -119,10 +123,16 @@ class Challenge(models.Model): verbose_name=_('points'), ) - obtained = models.PositiveIntegerField( - verbose_name=_('obtained'), - default=0, - ) + @property + def obtained(self): + achievements = Achievement.objects.filter(challenge=self, valid=True) + return achievements.count() + + def __str__(self): + return self.name + + def get_absolute_url(self): + return reverse_lazy('family:challenge_detail', args=(self.pk,)) @transaction.atomic def save(self, *args, **kwargs): @@ -136,9 +146,6 @@ class Challenge(models.Model): verbose_name = _('challenge') verbose_name_plural = _('challenges') - def __str__(self): - return self.name - class Achievement(models.Model): challenge = models.ForeignKey( @@ -176,7 +183,6 @@ class Achievement(models.Model): """ self.family = Family.objects.select_for_update().get(pk=self.family_id) self.challenge = Challenge.objects.select_for_update().get(pk=self.challenge_id) - is_new = self.pk is None super().save(*args, **kwargs) @@ -184,13 +190,6 @@ class Achievement(models.Model): self.family.refresh_from_db() self.family.update_score() - # Count only when getting a new achievement - if is_new: - self.challenge.refresh_from_db() - self.challenge.obtained += 1 - self.challenge._force_save = True - self.challenge.save() - @transaction.atomic def delete(self, *args, **kwargs): """ @@ -205,8 +204,3 @@ class Achievement(models.Model): # Remove points from the family self.family.refresh_from_db() self.family.update_score() - - self.challenge.refresh_from_db() - self.challenge.obtained -= 1 - self.challenge._force_save = True - self.challenge.save() diff --git a/apps/family/static/family/img/default_picture.png b/apps/family/static/family/img/default_picture.png new file mode 100644 index 0000000000000000000000000000000000000000..41a31a1cf5eddf31e98a7e6cd06b4c45f2faee92 GIT binary patch literal 4054 zcmV;{4=M18P);r6Qr3ZkW>p0HXHpgkJ`+&_#u-7oWvMZmynAZVM0ha?OAwkr;#xV{6 zn%X%|TTKH7yJ&>5DK=aeqc<=F7>JA(cV_&%MZoL8i@;03+em<24)o7>jOD=3ft!KG z>?Rv|umGvea9~ehShI#A!7#Y_zrEBf+sG2&79==dQ?|uOoV|dHfro*`bpEIlnq~m! z0t3o+j8R<%16KmG(Z9gUQWJ0kwIA0SfbqaAV5^)yGb+HIz#U|JDUMaMfk7R#|H4+k zyD6vdjD*=6xCfbG(!PLw=-PICuotkZ)o<2P-;}hG5c>o7Q=PzQJ&LrZ53-oq_IEet z_NWm(U4Svbqv&6#ni|vWkAA>o9sFh$GP)WSU>o2(;8pZ5&JfgyOam|IGQQIzh(eu16$>skY`|+f=;MfNUhx?tD`=%?EaDuOkgN+<|_l zoAPNEGWBja=KJV(wy8cnNMc{9HfS5rhGD=YWUa%9j}geeuV=IkNtJuizYCg*X*H6) zB?&?r4i7{&$%SN-Q6JAE{kdM-kfMb2h;U6=|(fO$w-qo@hxZaoJ0o3;@~sk{yB z0(_!vND)F9K?Wi(=6$sdF-oN`@~HK?wjo96s(k*@NM=D>WJ;5>v<)bV<|EdA$X*`% zYAs#XAWsM%X&X{6S|dnLd|SVseoD4pBz z&k7{VOq8=(zDJM-;5sZgsze_m{!G_*fSiscC#xc(wGF5j-vM&2=kpn1aHO^Y_2TnU zXAdOPp;0|n16v~r{i4F>2y(K=a~WaL6F6Agh4`tO3AI$d2Y=$Xz!jq6`pU?;tw>Z+SYGPZj`o15X0a zA;C}vU6Be{2LfMiR_tj%R{~p-z&9c;I0XGK-OAJxz%lrHMC}Ls5GhZf-S#5dt!&4n z!pZ1&P8oU@IILvfYx%;AT~LBM~}_fb~e?Zyr9b1V9tlUHkj@49eC$@D^slWO}b zi~i-v2hlST{m#jwkAdTyc)|@`kxvM;{nnWlyK+G6Jc)kiWYt*oz-NV=ks+&=#vL!upD?y+lW>~^}&?y0GWtv9S?zJ_}jXE5O5RnF7_sp z-DL`L!#D!>Uv_G4(Qivgqgjyr6#eJm4M;^+*KCPw@$PH}ZvwI_*A=5WIloWc@35Uo zFa%i}(e9`pduV5#Z#AxRXv@wy>~O6=I&5d@Xk>SP7kEJ7ylt85@Yp?(l5!(*{LR_8 zd(>Ly=(zRpp|$~e&?!I6QV9)&VbT8xae=(Vfj&h6L$%koSeMR(NOTu;Dde z+mg=P5xtPz0@|}z8<2{|QQ7#j`BAuCW647ZvzJlvGxYCjMYIYDnt4cI{X65|%?E}S_Fgt7 zWVFeL@=SXhNXBpNPV=n=z^-LDF9SOg#-i*7V7lYBCP`1ic|P``g-F(RU)<}c9rfrm z$8AlPspxl}4=uuPZrag~+EI@d6V7{3E;OfkTbQbCfCrW#>27>Yac)Ogd!8l`VSU0- zI1v3ioJ%$0w`4+3q?nI(yIbpcr!7vL24p5kyAxe#CGh$3T-7PvkZdN}?QX5r$eNc? zfRLsl%Tg0kg~}HVgqe19n#)GJCWLnofJe0rD48|DSMit0r2)7T*#{OHPiPyE0=uDq zrz=Zq@mp$a3t*Cic9f;V-8H>h%tOC3%LtBBO7=@F1|gYZwA5BpL61gPZLA^!Pc7W z#tqfxSoAwKk3PVCRz!ebDz&eOe&ECt6=!SYyJhXp&8kUm+^`8hQEXok?c>532Fyag zbF=DdM?PrbaAa*oyPbLU4t_>f=Y+D=q%|QWTJDT_4v#$$$v)rU@Eop~j08&bSb!A6 zWlGOWfx!-s?~?As8Q4*32_8@2T5!Y1FkNB zvBbZJ=@?)Ju)DS)MF=rKKo$&Rpr35OIqisM&Tx5mxxg*#YjYK-D6=GBmK`P=7SGFT7Gm&g1?;&YPTV}Ra zAZr+_$eu~QCz3DN$KEcV%msGQHX?R<0p}9OHf~csJx`=)Ca-SInZPy3;+T;hE=xN& zC4>MO3j9Ia2uG|$5;&|w>Xr9Ez99$M3SL&ph0w78DZp}M7!L7$s1{8~m8?gRYPO4- z)r7Pu3!4MmAT>fp03(5~BbgCXBBUasQ4;#M)$M7F6Hmw}^F{#eD^u5&>LHJWGR-?v z+kiT7Rl;ozlH)2Rq8&jjK*A)Jh0?5OS2V7hPy!^i3!*5mY8y~89hIvKo=^hBMvzVU zK-++lu@R&o3y>l!hR}$+I_?_SJ4gx4);1t8Qo3PSfRw-++6DwhlePgR@}af?^%7Em z%+WR=FkDR|`(_;}ij z_k{&WNh~KWXU3jX!51<0>8A)OKp?JB#4?v>W0AH2MX&&=9~(ikVF6MiF$IW?Ala}0 zDUp~0#72;8Sb&sBOxsQRYa0*=_L5#AbBJepGo|EiE_qwqfFgtzAS;O{X`HJ9FtKl^hE-pCCf=) zU;xtYeMx6@T8bpli}J zS_m~jq92+KZqzoQ3_=Z%7qks93Nap-q-{jXY>R$Ia#P2e4@_la>53LL0+$fx0(4!3 zT$AG^WZQ)i7UO^mk(cl-kTMX%fH#3DWUq~46yyuQV@L{4?K`GPbVbb`OOTL9kQTZD zJ0VqXcR@Dw^>5aGNU?guJ%0s`)i%P&$C>EgRjZ=Ziuzoq*f-t2#nYRWTCbJ zM%u(4AU1*+PKiB079!8bhT(+R17r;e?DsLkCH4RTcwgH9BVAGmkmx_kF~TK<0GY3C zfRQd1Acj!`3lPJofdzziLHqk zC6ZczJP+KbZG@2ysRal~X1`CgjWE(6#Q>QD+@NiQkp?LS2*Bk?As)jhM5+PuF>t=N z5k~x^8Xy1<0*`1LVZ=?!0RobRe7&|2M!cjRAg=)b&^E$|m(&9U;5KaojCiR+fK0*G zMT|PBLV&CQUeq?ih?6P=2v~ACqfV+4AU(AWFyf>t0WwV603%MS5FlNEq1r|maZ-f< z*&XPmZA1d});2(c25kd8a2jy5wh;-i2hape*EYl`m&xc?h)qcs<#WFgG6R9t=wDQ+ z>AXChV1&z6=wD2!>Vh2oU9XJ*v6WxK|q2FmH|C#}u1N6mcmjS>u^gGI=t5v|g$f(i{ z1Aqg7`RI3!DJ(5OX1_*KVa~x`#!a2;S>W414=O?r;J4^I-V~Sq2b@IW?1bDAw4H5= zSJ#v1cPS?TOVD?)DSjP6352q#(RNxw5kg_dCTI^iL zL9|AYuE5E_e}Fr%;4sRkl#KqqN06?_EW?%9rZmGXr3A?T0kEA=M);+bHvj+t07*qo IM6N<$f;wYbJOBUy literal 0 HcmV?d00001 diff --git a/apps/family/static/family/js/achievements.js b/apps/family/static/family/js/achievements.js index db29923d..ebec8689 100644 --- a/apps/family/static/family/js/achievements.js +++ b/apps/family/static/family/js/achievements.js @@ -113,6 +113,7 @@ function reset () { * Apply all transactions: all notes in `notes` buy each item in `buttons` */ function consumeAll () { + console.log("test"); if (LOCK) { return } LOCK = true @@ -130,11 +131,13 @@ function consumeAll () { LOCK = false return } - + console.log("couocu") // Récupérer les IDs des familles et des challenges const family_ids = notes_display.map(fam => fam.id) const challenge_ids = buttons.map(chal => chal.id) + console.log(family_ids) + console.log(challenge_ids) $.ajax({ url: '/family/api/family/achievements/batch/', type: 'POST', @@ -157,34 +160,6 @@ function consumeAll () { }) } -/** - * Create a new achievement through the API. - * @param family The selected family - * @param challenge The selected challenge - */ -function grantAchievement (family, challenge) { - console.log("grant lancée",family,challenge) - $.post('/api/family/achievement/', - { - csrfmiddlewaretoken: CSRF_TOKEN, - family: family.id, - challenge: challenge.id, - }) - .done(function () { - reset() - addMsg("Défi validé pour la famille !", 'success', 5000) - }) - .fail(function (e) { - reset() - if (e.responseJSON) { - errMsg(e.responseJSON) - } else if (e.responseText) { - errMsg(e.responseText) - } else { - errMsg("Erreur inconnue lors de la création de l'achievement.") - } - }) -} var searchbar = document.getElementById("search-input") var search_results = document.getElementById("search-results") @@ -264,7 +239,6 @@ function li (id, text, extra_css) { */ function autoCompleteFamily(field_id, family_list_id, families, families_display, family_prefix = 'family', user_family_field = null, profile_pic_field = null, family_click = null) { const field = $('#' + field_id) - console.log("autoCompleteFamily commence") // Configuration du tooltip field.tooltip({ html: true, diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 0ecac60a..22a4ed90 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -84,12 +84,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                {% if can_add_family %} - + {% trans "Add a family" %} {% endif %} {% if can_add_challenge %} - + {% trans "Add a challenge" %} {% endif %} @@ -147,7 +147,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                -{# transaction history #} +{# achievement history #}
                -
                +
                {% render_table table %}
                diff --git a/apps/family/tests/__init__.py b/apps/family/tests/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/apps/family/tests/test_family.py b/apps/family/tests/test_family.py new file mode 100644 index 00000000..f2b31784 --- /dev/null +++ b/apps/family/tests/test_family.py @@ -0,0 +1,318 @@ +# Copyright (C) 2018-2025 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +import os + +from api.tests import TestAPI +from django.contrib.auth.models import User +from django.core.files.uploadedfile import SimpleUploadedFile +from django.test import TestCase +from rest_framework.test import APITestCase +from django.urls import reverse +from django.utils import timezone + +from ..api.views import FamilyViewSet, FamilyMembershipViewSet, ChallengeViewSet, AchievementViewSet +from ..models import Family, FamilyMembership, Challenge, Achievement + + +class TestFamily(TestCase): + """ + Test family + """ + + def setUp(self): + self.user = User.objects.create_superuser( + username='admintoto', + password='toto1234', + email='toto@example.com', + ) + self.client.force_login(self.user) + + sess = self.client.session + sess['permission_mask'] = 42 + sess.save() + + self.family = Family.objects.create( + name='Test family', + description='', + ) + + self.challenge = Challenge.objects.create( + name='Test challenge', + description='', + points=100, + ) + + self.achievement = Achievement.objects.create( + family=self.family, + challenge=self.challenge, + valid=False, + ) + + def test_family_list(self): + """ + Test display family list + """ + response = self.client.get(reverse("family:family_list")) + self.assertEqual(response.status_code, 200) + + def test_family_create(self): + """ + Test create a family + """ + response = self.client.get(reverse("family:family_create")) + self.assertEqual(response.status_code, 200) + + response = self.client.post(reverse("family:family_create"), data={ + "name": "Family toto", + "description": "A test family", + }) + self.assertTrue(Family.objects.filter(name="Family toto").exists()) + self.assertRedirects(response, reverse("family:manage"), 302, 200) + + def test_family_detail(self): + """ + Test display the detail of a family + """ + response = self.client.get(reverse("family:family_detail", args=(self.family.pk,))) + self.assertEqual(response.status_code, 200) + + def test_family_update(self): + """ + Test update a family + """ + response = self.client.get(reverse("family:family_update", args=(self.family.pk,))) + self.assertEqual(response.status_code, 200) + + response = self.client.post(reverse("family:family_update", args=(self.family.pk,)), data=dict( + name="Toto family updated", + description="A larger description for the test family" + )) + self.assertRedirects(response, self.family.get_absolute_url(), 302, 200) + self.assertTrue(Family.objects.filter(name="Toto family updated").exists()) + + def test_family_update_picture(self): + """ + Test update the picture of a family + """ + response = self.client.get(reverse("family:update_pic", args=(self.family.pk,))) + self.assertEqual(response.status_code, 200) + + old_pic = self.family.display_image + + with open("apps/family/static/family/img/default_picture.png", "rb") as f: + image = SimpleUploadedFile("image.png", f.read(), "image/png") + response = self.client.post(reverse("family:update_pic", args=(self.family.pk,)), dict( + image=image, + x=0, + y=0, + width=200, + height=200, + )) + self.assertRedirects(response, self.family.get_absolute_url(), 302, 200) + + self.family.refresh_from_db() + self.assertTrue(os.path.exists(self.family.display_image.path)) + os.remove(self.family.display_image.path) + + self.family.display_image = old_pic + self.family.save() + + def test_family_add_member(self): + """ + Test add memberships to a family + """ + response = self.client.get(reverse("family:family_add_member", args=(self.family.pk,))) + self.assertEqual(response.status_code, 200) + + user = User.objects.create(username="totototo") + user.profile.registration_valid = True + user.profile.email_confirmed = True + user.profile.save() + user.save() + + response = self.client.post(reverse("family:family_add_member", args=(self.family.pk,)), data=dict( + user=user.pk, + )) + self.assertRedirects(response, self.family.get_absolute_url(), 302, 200) + + self.assertTrue(FamilyMembership.objects.filter(user=user, family=self.family, year=timezone.now().year).exists()) + + def test_challenge_list(self): + """ + Test display challenge list + """ + response = self.client.get(reverse('family:challenge_list')) + self.assertEqual(response.status_code, 200) + + def test_challenge_create(self): + """ + Test create a challenge + """ + response = self.client.get(reverse("family:challenge_create")) + self.assertEqual(response.status_code, 200) + + response = self.client.post(reverse("family:challenge_create"), data={ + "name": "Challenge for toto", + "description": "A test challenge", + "points": 50, + }) + self.assertTrue(Challenge.objects.filter(name="Challenge for toto").exists()) + self.assertRedirects(response, reverse("family:manage"), 302, 200) + + def test_challenge_detail(self): + """ + Test display the detail of a challenge + """ + response = self.client.get(reverse("family:challenge_detail", args=(self.challenge.pk,))) + self.assertEqual(response.status_code, 200) + + def test_challenge_update(self): + """ + Test update a challenge + """ + response = self.client.get(reverse("family:challenge_update", args=(self.challenge.pk,))) + self.assertEqual(response.status_code, 200) + + response = self.client.post(reverse("family:challenge_update", args=(self.challenge.pk,)), data=dict( + name="Challenge updated", + description="Another description", + points=10, + )) + self.assertRedirects(response, self.challenge.get_absolute_url(), 302, 200) + self.assertTrue(Challenge.objects.filter(name="Challenge updated").exists()) + + def test_render_manage_page(self): + """ + Test render manage page + """ + response = self.client.get(reverse("family:manage")) + self.assertEqual(response.status_code, 200) + + def test_validate_achievement(self): + """ + Test validate an achievement + """ + old_family_score = self.family.score + + response = self.client.get(reverse("family:achievement_validate", args=(self.achievement.pk,))) + self.assertEqual(response.status_code, 200) + + response = self.client.post(reverse("family:achievement_validate", args=(self.achievement.pk,))) + self.assertRedirects(response, reverse("family:achievement_list"), 302, 200) + + self.achievement.refresh_from_db() + self.assertIs(self.achievement.valid, True) + + self.family.refresh_from_db() + self.assertEqual(self.family.score, old_family_score + self.achievement.challenge.points) + + def test_delete_achievement(self): + """ + Test delete an achievement + """ + response = self.client.get(reverse("family:achievement_delete", args=(self.achievement.pk,))) + self.assertEqual(response.status_code, 200) + + response = self.client.delete(reverse("family:achievement_delete", args=(self.achievement.pk,))) + self.assertRedirects(response, reverse("family:achievement_list"), 302, 200) + self.assertFalse(Achievement.objects.filter(pk=self.achievement.pk).exists()) + + +class TestBatchAchievements(APITestCase): + def setUp(self): + self.user = User.objects.create_superuser( + username='admintoto', + password='toto1234', + email='toto@example.com', + ) + self.client.force_login(self.user) + + sess = self.client.session + sess['permission_mask'] = 42 + sess.save() + + self.families = [ + Family.objects.create(name=f'Famille {i}', description='') for i in range(2) + ] + self.challenges = [ + Challenge.objects.create(name=f'Challenge {i}', description='', points=50) for i in range(3) + ] + + self.url = reverse("family:api:batch_achievements") + + def test_batch_achievement_creation(self): + family_ids = [f.id for f in self.families] + challenge_ids = [c.id for c in self.challenges] + response = self.client.post( + self.url, + data={ + 'families': family_ids, + 'challenges': challenge_ids + }, + format='json' + ) + + self.assertEqual(response.status_code, 201) + self.assertEqual(response.data['status'], 'ok') + + expected_count = len(family_ids) * len(challenge_ids) + self.assertEqual(Achievement.objects.count(), expected_count) + + # Check that correct couples family/challenge exist + for f in self.families: + for c in self.challenges: + self.assertTrue( + Achievement.objects.filter(family=f, challenge=c).exists() + ) + + +class TestFamilyAPI(TestAPI): + def setUp(self): + super().setUp() + + self.family = Family.objects.create( + name='Test family', + description='', + ) + + self.familymembership = FamilyMembership.objects.create( + user=self.user, + family=self.family, + ) + + self.challenge = Challenge.objects.create( + name='Test challenge', + description='', + points=100, + ) + + self.achievement = Achievement.objects.create( + family=self.family, + challenge=self.challenge, + valid=False, + ) + + def test_family_api(self): + """ + Load Family API page and test all filters and permissions + """ + self.check_viewset(FamilyViewSet, '/api/family/family/') + + def test_familymembership_api(self): + """ + Load FamilyMembership API page and test all filters and permissions + """ + self.check_viewset(FamilyMembershipViewSet, '/api/family/familymembership/') + + def test_challenge_api(self): + """ + Load Challenge API page and test all filters and permissions + """ + self.check_viewset(ChallengeViewSet, '/api/family/challenge/') + + def test_achievement_api(self): + """ + Load Achievement API page and test all filters and permissions + """ + self.check_viewset(AchievementViewSet, '/api/family/achievement/') diff --git a/apps/family/urls.py b/apps/family/urls.py index 7d9e9c5b..edb0d18a 100644 --- a/apps/family/urls.py +++ b/apps/family/urls.py @@ -8,18 +8,18 @@ from . import views app_name = 'family' urlpatterns = [ path('list/', views.FamilyListView.as_view(), name="family_list"), - path('add-family/', views.FamilyCreateView.as_view(), name="add_family"), + path('create/', views.FamilyCreateView.as_view(), name="family_create"), path('/detail/', views.FamilyDetailView.as_view(), name="family_detail"), path('/update/', views.FamilyUpdateView.as_view(), name="family_update"), path('/update_pic/', views.FamilyPictureUpdateView.as_view(), name="update_pic"), path('/add_member/', views.FamilyAddMemberView.as_view(), name="family_add_member"), path('challenge/list/', views.ChallengeListView.as_view(), name="challenge_list"), - path('add-challenge/', views.ChallengeCreateView.as_view(), name="add_challenge"), + path('challenge/create/', views.ChallengeCreateView.as_view(), name="challenge_create"), path('challenge//detail/', views.ChallengeDetailView.as_view(), name="challenge_detail"), path('challenge//update/', views.ChallengeUpdateView.as_view(), name="challenge_update"), path('manage/', views.FamilyManageView.as_view(), name="manage"), - path('achievement/list/', views.AchievementsView.as_view(), name="achievement_list"), + path('achievement/list/', views.AchievementListView.as_view(), name="achievement_list"), path('achievement//validate/', views.AchievementValidateView.as_view(), name="achievement_validate"), path('achievement//delete/', views.AchievementDeleteView.as_view(), name="achievement_delete"), - path('api/family/', include('family.api.urls')), + path('api/family/', include(('family.api.urls', 'family_api'), namespace='api')), ] diff --git a/apps/family/views.py b/apps/family/views.py index a6e886a8..aee6f276 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -8,14 +8,14 @@ from django.shortcuts import redirect from django.contrib.auth.mixins import LoginRequiredMixin from django.db import transaction from django.views.generic import DetailView, UpdateView, ListView -from django.views.generic.edit import DeleteView +from django.views.generic.edit import DeleteView, FormMixin from django.views.generic.base import TemplateView from django.utils.translation import gettext_lazy as _ from django_tables2 import SingleTableView, MultiTableMixin from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin, ProtectedCreateView from django.urls import reverse_lazy -from member.views import PictureUpdateView +from member.forms import ImageForm from .models import Family, Challenge, FamilyMembership, User, Achievement from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable, FamilyAchievementTable @@ -112,17 +112,28 @@ class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk}) -class FamilyPictureUpdateView(PictureUpdateView): +class FamilyPictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, DetailView): """ Update profile picture of the family """ model = Family extra_context = {"title": _("Update family picture")} template_name = 'family/picture_update.html' + form_class = ImageForm + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['form'] = self.form_class(self.request.POST, self.request.FILES) + return context def get_success_url(self): """Redirect to family page after upload""" - return reverse_lazy('family:family_detail', kwargs={'pk': self.object.id}) + return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk}) + + def post(self, request, *args, **kwargs): + form = self.get_form() + self.object = self.get_object() + return self.form_valid(form) if form.is_valid() else self.form_invalid(form) @transaction.atomic def form_valid(self, form): @@ -141,6 +152,11 @@ class FamilyPictureUpdateView(PictureUpdateView): else: image.name = "{}_pic.png".format(self.object.pk) + # Save + self.object.display_image = image + self.object.save() + return super().form_valid(form) + class FamilyAddMemberView(ProtectQuerysetMixin, ProtectedCreateView): """ @@ -282,8 +298,8 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView PermissionBackend.filter_queryset(self.request, Challenge, "view") ).order_by('name') - context["can_add_family"] = PermissionBackend.check_perm(self.request, "family.add_family") - context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.add_challenge") + context["can_add_family"] = PermissionBackend.check_perm(self.request, "family.family_create") + context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.challenge_create") return context @@ -294,7 +310,7 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView return table -class AchievementsView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView): +class AchievementListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView): """ List all achievements """ @@ -333,12 +349,11 @@ class AchievementValidateView(ProtectQuerysetMixin, LoginRequiredMixin, Template template_name = 'family/achievement_confirm_validate.html' def post(self, request, pk): - # On récupère l'objet à valider achievement = Achievement.objects.get(pk=pk) - # On modifie le champ valid + achievement.valid = True achievement.save() - # On redirige vers la page de détail ou la liste + return redirect(reverse_lazy('family:achievement_list')) From 4fa8ef4b56fc9c85a67574f9f583ef64a6488068 Mon Sep 17 00:00:00 2001 From: ikea Date: Wed, 6 Aug 2025 08:20:43 +0200 Subject: [PATCH 22/32] =?UTF-8?q?Ajout=20de=20la=20pop-up=20de=20validatio?= =?UTF-8?q?n=20de=20d=C3=A9fi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/family/tables.py | 2 +- apps/family/templates/family/manage.html | 34 ++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/apps/family/tables.py b/apps/family/tables.py index 0a0b773a..460a2e5c 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -116,7 +116,7 @@ class FamilyAchievementTable(tables.Table): class Meta: model = Achievement template_name = 'django_tables2/bootstrap4.html' - fields = ('challenge', 'challenge__points', 'obtained_at',) + fields = ('challenge', 'challenge__points', 'obtained_at', 'valid') attrs = { 'class': 'table table-condensed table-striped table-hover' } diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 22a4ed90..b284ffff 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -159,6 +159,34 @@ SPDX-License-Identifier: GPL-3.0-or-later {% render_table table %}
                + + + + {% endblock %} @@ -178,4 +206,10 @@ SPDX-License-Identifier: GPL-3.0-or-later }); {% endfor %} + + {% endblock %} \ No newline at end of file From b10b2fb3b650606f305d68c57e2266bfde546642 Mon Sep 17 00:00:00 2001 From: ikea Date: Fri, 8 Aug 2025 16:44:37 +0200 Subject: [PATCH 23/32] Rajout du lien vers la page user dans table --- apps/family/tables.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/apps/family/tables.py b/apps/family/tables.py index 460a2e5c..709ca90c 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -2,12 +2,16 @@ # SPDX-License-Identifier: GPL-3.0-or-later import django_tables2 as tables -from django.urls import reverse +from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ from django_tables2 import A -from .models import Family, Challenge, FamilyMembership, Achievement +from django.urls import reverse, reverse_lazy +from note_kfet.middlewares import get_current_request +from permission.backends import PermissionBackend + +from .models import Achievement, Challenge, Family, FamilyMembership class FamilyTable(tables.Table): """ @@ -51,6 +55,15 @@ class FamilyMembershipTable(tables.Table): """ List all family memberships. """ + + def render_user(self, value): + # Display user's name, clickable if permission is granted + s = value.username + if PermissionBackend.check_perm(get_current_request(), "auth.view_user", value): + s = format_html("{name}", + url=reverse_lazy('member:user_detail', kwargs={"pk": value.pk}), name=s) + return s + class Meta: attrs = { 'class': 'table table-condensed table-striped', From 74f9c53c1822b8028a98275e79328610ea2dd471 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Sat, 9 Aug 2025 15:38:02 +0200 Subject: [PATCH 24/32] Visual improvement on manage page --- apps/family/static/family/js/achievements.js | 23 +------- apps/family/tables.py | 3 +- apps/family/templates/family/manage.html | 58 +++++++++++++++++++- apps/family/views.py | 7 +++ 4 files changed, 66 insertions(+), 25 deletions(-) diff --git a/apps/family/static/family/js/achievements.js b/apps/family/static/family/js/achievements.js index ebec8689..b9774579 100644 --- a/apps/family/static/family/js/achievements.js +++ b/apps/family/static/family/js/achievements.js @@ -57,7 +57,6 @@ function addChallenge (id, name, amount) { /** Ajout de 1 à chaque clic d'un bouton déjà choisi */ buttons.forEach(function (b) { if (b.id === id) { - b.quantity += 1 challenge = b } }) @@ -65,8 +64,6 @@ function addChallenge (id, name, amount) { challenge = { id: id, name: name, - quantity: 1, - amount: amount, } buttons.push(challenge) } @@ -76,8 +73,7 @@ function addChallenge (id, name, amount) { const list = 'consos_list' let html = '' buttons.forEach(function (challenge) { - html += li('conso_button_' + challenge.id, challenge.name + - '' + challenge.quantity + '') + html += li('conso_button_' + challenge.id, challenge.name) }) document.getElementById(list).innerHTML = html @@ -94,7 +90,6 @@ function addChallenge (id, name, amount) { * Reset the page as its initial state. */ function reset () { - console.log("reset lancée") notes_display.length = 0 notes.length = 0 buttons.length = 0 @@ -113,7 +108,6 @@ function reset () { * Apply all transactions: all notes in `notes` buy each item in `buttons` */ function consumeAll () { - console.log("test"); if (LOCK) { return } LOCK = true @@ -131,13 +125,10 @@ function consumeAll () { LOCK = false return } - console.log("couocu") // Récupérer les IDs des familles et des challenges const family_ids = notes_display.map(fam => fam.id) const challenge_ids = buttons.map(chal => chal.id) - console.log(family_ids) - console.log(challenge_ids) $.ajax({ url: '/family/api/family/achievements/batch/', type: 'POST', @@ -318,7 +309,6 @@ function autoCompleteFamily(field_id, family_list_id, families, families_display var disp = null families_display.forEach(function (d) { if (d.id === family.id) { - d.quantity += 1 disp = d } }) @@ -327,7 +317,6 @@ function autoCompleteFamily(field_id, family_list_id, families, families_display name: family.name, id: family.id, family: family, - quantity: 1 } families_display.push(disp) } @@ -338,9 +327,7 @@ function autoCompleteFamily(field_id, family_list_id, families, families_display let html = '' families_display.forEach(function (disp) { html += li(family_prefix + '_' + disp.id, - disp.name + - '' + - disp.quantity + '', + disp.name, '') }) @@ -398,12 +385,6 @@ function removeFamily(d, family_prefix, families_display, family_list_id, user_f const new_families_display = [] let html = '' families_display.forEach(function (disp) { - if (disp.quantity > 1 || disp.id !== d.id) { - disp.quantity -= disp.id === d.id ? 1 : 0 - new_families_display.push(disp) - html += li(family_prefix + '_' + disp.id, disp.name + - '' + disp.quantity + '') - } }) families_display.length = 0 diff --git a/apps/family/tables.py b/apps/family/tables.py index 709ca90c..728058ae 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -5,14 +5,13 @@ import django_tables2 as tables from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ from django_tables2 import A - from django.urls import reverse, reverse_lazy - from note_kfet.middlewares import get_current_request from permission.backends import PermissionBackend from .models import Achievement, Challenge, Family, FamilyMembership + class FamilyTable(tables.Table): """ List all families diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index b284ffff..70419342 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -52,7 +52,12 @@ SPDX-License-Identifier: GPL-3.0-or-later {# User search with autocompletion #}
                - + + {% if user_family %} + + {% endif %}
                @@ -210,6 +215,55 @@ SPDX-License-Identifier: GPL-3.0-or-later document.getElementById("consume_all").addEventListener("click", function () { $('#validationModal').modal('show'); }); + + {% if user_family %} + document.getElementById("select_my_family").addEventListener("click", function () { + // Simulate selecting the user's family + var userFamily = { + id: {{ user_family.id }}, + name: "{{ user_family.name|escapejs }}", + display_image: "{{ user_family.display_image.url|default:'/static/member/img/default_picture.png'|escapejs }}" + }; + + // Check if family is already selected + var alreadySelected = false; + notes_display.forEach(function (d) { + if (d.id === userFamily.id) { + alreadySelected = true; + } + }); + + if (!alreadySelected) { + // Add the family to the selected families + var disp = { + name: userFamily.name, + id: userFamily.id, + family: userFamily, + }; + notes_display.push(disp); + + // Update the display + const family_list = $('#note_list'); + let html = ''; + notes_display.forEach(function (disp) { + html += li('note_' + disp.id, disp.name, ''); + }); + + family_list.html(html); + + // Add click handlers for removal + notes_display.forEach(function (disp) { + const line_obj = $('#note_' + disp.id); + line_obj.hover(function () { + displayFamily(disp.family, disp.name, 'user_note', 'profile_pic'); + }); + line_obj.click(removeFamily(disp, 'note', notes_display, 'note_list', 'user_note', 'profile_pic')); + }); + + // Display the family info + displayFamily(userFamily, userFamily.name, 'user_note', 'profile_pic'); + } + }); + {% endif %} - {% endblock %} \ No newline at end of file diff --git a/apps/family/views.py b/apps/family/views.py index aee6f276..fee0c5ad 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -301,6 +301,13 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView context["can_add_family"] = PermissionBackend.check_perm(self.request, "family.family_create") context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.challenge_create") + # Get the user's family if they have one + try: + user_family_membership = FamilyMembership.objects.get(user=self.request.user) + context["user_family"] = user_family_membership.family + except FamilyMembership.DoesNotExist: + context["user_family"] = None + return context def get_table(self, **kwargs): From 4a9b7c131229c908b3c89d5b29b26197720fd61d Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Mon, 11 Aug 2025 19:09:30 +0200 Subject: [PATCH 25/32] Phone number link --- apps/family/templates/family/manage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 70419342..cd835c3d 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -183,7 +183,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
              • The name of the challenge
              • A photo or video as proof
                • -

                Send it via WhatsApp to: +33 6 30 21 12 44

                +

                Send it via WhatsApp to: +33 6 30 21 12 44

                @@ -266,4 +266,4 @@ SPDX-License-Identifier: GPL-3.0-or-later }); {% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} From 0c259155a861d846655b1d83496c91537e1bb93b Mon Sep 17 00:00:00 2001 From: ikea Date: Tue, 12 Aug 2025 22:39:11 +0200 Subject: [PATCH 26/32] Translation for family --- apps/family/tables.py | 14 + locale/fr/LC_MESSAGES/django.po | 1027 +++++++++++++++++++++-------- locale/fr/LC_MESSAGES/djangojs.po | 30 + 3 files changed, 799 insertions(+), 272 deletions(-) diff --git a/apps/family/tables.py b/apps/family/tables.py index 728058ae..36f257df 100644 --- a/apps/family/tables.py +++ b/apps/family/tables.py @@ -16,6 +16,9 @@ class FamilyTable(tables.Table): """ List all families """ + + description = tables.Column(verbose_name=_("Description")) + class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' @@ -35,6 +38,11 @@ class ChallengeTable(tables.Table): """ List all challenges """ + + name = tables.Column(verbose_name=_("Name")) + description = tables.Column(verbose_name=_("Description")) + points = tables.Column(verbose_name=_("Points")) + class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' @@ -77,6 +85,9 @@ class AchievementTable(tables.Table): """ List recent achievements. """ + + challenge = tables.Column(verbose_name=_("Challenge")) + validate = tables.LinkColumn( 'family:achievement_validate', args=[A('id')], @@ -125,6 +136,9 @@ class FamilyAchievementTable(tables.Table): """ Table des défis réalisés par une famille spécifique. """ + + challenge = tables.Column(verbose_name=_("Challenge")) + class Meta: model = Achievement template_name = 'django_tables2/bootstrap4.html' diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 76ebb02b..1be7fb0f 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-07-15 18:17+0200\n" +"POT-Creation-Date: 2025-08-12 22:55+0200\n" "PO-Revision-Date: 2022-04-11 22:05+0200\n" "Last-Translator: bleizi \n" "Language-Team: French \n" @@ -58,7 +58,9 @@ msgstr "Cette personne est déjà invitée." msgid "You can't invite more than 3 people to this activity." msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." -#: apps/activity/models.py:28 apps/activity/models.py:63 apps/food/models.py:18 +#: apps/activity/models.py:28 apps/activity/models.py:63 +#: apps/family/models.py:14 apps/family/models.py:114 +#: apps/family/templates/family/family_info.html:4 apps/food/models.py:18 #: apps/food/models.py:35 apps/member/models.py:203 #: apps/member/templates/member/includes/club_info.html:4 #: apps/member/templates/member/includes/profile_info.html:4 @@ -100,6 +102,8 @@ msgstr "types d'activité" #: apps/activity/models.py:68 #: apps/activity/templates/activity/includes/activity_info.html:19 +#: apps/family/models.py:20 apps/family/models.py:119 +#: apps/family/templates/family/family_info.html:7 #: apps/note/models/transactions.py:82 apps/permission/models.py:109 #: apps/permission/models.py:188 apps/wei/models.py:97 apps/wei/models.py:161 msgid "description" @@ -120,9 +124,10 @@ msgstr "Lieu où l'activité est organisée, par exemple la Kfet." msgid "type" msgstr "type" -#: apps/activity/models.py:91 apps/logs/models.py:22 apps/member/models.py:325 -#: apps/note/models/notes.py:148 apps/treasury/models.py:294 -#: apps/wei/models.py:190 apps/wei/templates/wei/attribute_bus_1A.html:13 +#: apps/activity/models.py:91 apps/family/models.py:87 apps/logs/models.py:22 +#: apps/member/models.py:325 apps/note/models/notes.py:148 +#: apps/treasury/models.py:294 apps/wei/models.py:190 +#: apps/wei/templates/wei/attribute_bus_1A.html:13 #: apps/wei/templates/wei/survey.html:15 msgid "user" msgstr "utilisateur⋅rice" @@ -159,7 +164,7 @@ msgstr "date de fin" #: apps/activity/models.py:120 #: apps/activity/templates/activity/includes/activity_info.html:50 -#: apps/note/models/transactions.py:149 +#: apps/family/models.py:168 apps/note/models/transactions.py:149 msgid "valid" msgstr "valide" @@ -272,6 +277,7 @@ msgid "The validation of the activity is pending." msgstr "La validation de cette activité est en attente." #: apps/activity/tables.py:45 +#: apps/family/templates/family/picture_update.html:18 #: apps/member/templates/member/picture_update.html:18 #: apps/treasury/tables.py:110 msgid "Remove" @@ -291,14 +297,14 @@ msgstr "Type" #: apps/activity/tables.py:86 apps/member/forms.py:199 #: apps/registration/forms.py:91 apps/treasury/forms.py:131 -#: apps/wei/forms/registration.py:129 +#: apps/wei/forms/registration.py:130 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:88 apps/member/forms.py:204 #: apps/note/templates/note/transaction_form.html:138 #: apps/registration/forms.py:96 apps/treasury/forms.py:133 -#: apps/wei/forms/registration.py:134 +#: apps/wei/forms/registration.py:135 msgid "First name" msgstr "Prénom" @@ -311,6 +317,8 @@ msgid "Balance" msgstr "Solde du compte" #: apps/activity/tables.py:141 apps/activity/tables.py:148 +#: apps/family/tables.py:111 apps/family/tables.py:112 +#: apps/family/templates/family/achievement_confirm_delete.html:21 #: apps/note/tables.py:166 apps/note/tables.py:173 apps/note/tables.py:234 #: apps/note/tables.py:281 apps/treasury/tables.py:39 #: apps/treasury/templates/treasury/invoice_confirm_delete.html:30 @@ -320,6 +328,9 @@ msgstr "Solde du compte" #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:18 #: note_kfet/templates/oauth2_provider/application_detail.html:39 #: note_kfet/templates/oauth2_provider/authorized-token-delete.html:12 +#: static/note_kfet/templates/oauth2_provider/application_confirm_delete.html:18 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:39 +#: static/note_kfet/templates/oauth2_provider/authorized-token-delete.html:12 msgid "Delete" msgstr "Supprimer" @@ -357,7 +368,7 @@ msgstr "Détails de l'activité" #: apps/note/models/transactions.py:261 #: apps/note/templates/note/transaction_form.html:17 #: apps/note/templates/note/transaction_form.html:152 -#: note_kfet/templates/base.html:79 +#: note_kfet/templates/base.html:78 static/note_kfet/templates/base.html:78 msgid "Transfer" msgstr "Virement" @@ -394,6 +405,9 @@ msgid "Entry done!" msgstr "Entrée effectuée !" #: apps/activity/templates/activity/activity_form.html:16 +#: apps/family/templates/family/add_member.html:17 +#: apps/family/templates/family/challenge_form.html:17 +#: apps/family/templates/family/family_form.html:17 #: apps/food/templates/food/food_update.html:17 #: apps/food/templates/food/manage_ingredients.html:48 #: apps/food/templates/food/qrcode.html:18 @@ -474,7 +488,8 @@ msgstr "Inviter" msgid "Create new activity" msgstr "Créer une nouvelle activité" -#: apps/activity/views.py:71 note_kfet/templates/base.html:97 +#: apps/activity/views.py:71 note_kfet/templates/base.html:103 +#: static/note_kfet/templates/base.html:103 msgid "Activities" msgstr "Activités" @@ -527,6 +542,407 @@ msgstr "Entrées pour l'activité « {} »" msgid "API" msgstr "API" +#: apps/family/apps.py:11 apps/family/models.py:94 apps/family/models.py:159 +#: apps/family/templates/family/challenge_detail.html:22 +#: apps/member/templates/member/includes/profile_info.html:10 +#, fuzzy +#| msgid "Family" +msgid "family" +msgstr "Famille" + +#: apps/family/models.py:24 apps/family/templates/family/family_info.html:10 +msgid "score" +msgstr "" + +#: apps/family/models.py:29 apps/family/templates/family/family_info.html:13 +#: apps/permission/models.py:103 +msgid "rank" +msgstr "rang" + +#: apps/family/models.py:33 apps/note/models/notes.py:44 +msgid "display image" +msgstr "image affichée" + +#: apps/family/models.py:42 +msgid "Family" +msgstr "Famille" + +#: apps/family/models.py:43 apps/family/templates/family/challenge_list.html:14 +#: apps/family/templates/family/family_list.html:14 +#: apps/family/templates/family/manage.html:15 +#: apps/family/templates/family/manage.html:47 note_kfet/templates/base.html:84 +#: static/note_kfet/templates/base.html:84 +msgid "Families" +msgstr "Familles" + +#: apps/family/models.py:86 +#, fuzzy +#| msgid "memberships" +msgid "family_memberships" +msgstr "adhésions" + +#: apps/family/models.py:93 apps/member/models.py:356 +msgid "memberships" +msgstr "adhésions" + +#: apps/family/models.py:98 apps/wei/models.py:25 +#: apps/wei/templates/wei/base.html:36 +msgid "year" +msgstr "année" + +#: apps/family/models.py:104 +#, fuzzy +#| msgid "membership" +msgid "family membership" +msgstr "adhésion" + +#: apps/family/models.py:105 +#, fuzzy +#| msgid "memberships" +msgid "family memberships" +msgstr "adhésions" + +#: apps/family/models.py:108 +#, fuzzy, python-brace-format +#| msgid "Membership of {user} for the club {club}" +msgid "Family membership of {user} to {family}" +msgstr "Adhésion de {user} pour le club {club}" + +#: apps/family/models.py:123 apps/family/templates/family/manage.html:132 +#: apps/family/templates/family/manage.html:143 +msgid "points" +msgstr "" + +#: apps/family/models.py:146 +#, fuzzy +#| msgid "Challenge" +msgid "challenge" +msgstr "Defis" + +#: apps/family/models.py:147 +#, fuzzy +#| msgid "Challenges" +msgid "challenges" +msgstr "Defis" + +#: apps/family/models.py:163 +#, fuzzy +#| msgid "obtained_at" +msgid "obtained at" +msgstr "Réalisé le" + +#: apps/family/models.py:173 +msgid "achievement" +msgstr "" + +#: apps/family/models.py:174 +#, fuzzy +#| msgid "Recent achievements history" +msgid "achievements" +msgstr "Historique des derniers succès" + +#: apps/family/models.py:177 +#, python-brace-format +msgid "Challenge {challenge} carried out by Family {family}" +msgstr "" + +#: apps/family/tables.py:20 apps/family/tables.py:43 apps/treasury/models.py:56 +msgid "Description" +msgstr "Description" + +#: apps/family/tables.py:42 apps/family/templates/family/manage.html:55 +#: apps/food/forms.py:171 apps/food/templates/food/qrcode.html:29 +#: apps/food/templates/food/transformedfood_update.html:23 +#: apps/note/templates/note/transaction_form.html:132 +#: apps/treasury/models.py:61 +msgid "Name" +msgstr "Nom" + +#: apps/family/tables.py:44 +msgid "Points" +msgstr "" + +#: apps/family/tables.py:89 apps/family/tables.py:140 +msgid "Challenge" +msgstr "Defis" + +#: apps/family/tables.py:94 apps/family/tables.py:95 +#: apps/family/templates/family/achievement_confirm_validate.html:23 +#: apps/treasury/templates/treasury/sogecredit_detail.html:63 +#: apps/wei/tables.py:60 apps/wei/tables.py:102 +msgid "Validate" +msgstr "Valider" + +#: apps/family/templates/family/achievement_confirm_delete.html:10 +#, fuzzy +#| msgid "Recent achievements history" +msgid "Delete achievement" +msgstr "Historique des derniers succès" + +#: apps/family/templates/family/achievement_confirm_delete.html:14 +#, fuzzy +#| msgid "" +#| "Are you sure you want to delete this invoice? This action can't be undone." +msgid "" +"Are you sure you want to delete this achievement? This action can't be " +"undone." +msgstr "" +"Êtes-vous sûr⋅e de vouloir supprimer cette facture ? Cette action ne pourra " +"pas être annulée." + +#: apps/family/templates/family/achievement_confirm_delete.html:20 +#: apps/family/templates/family/achievement_confirm_validate.html:20 +#, fuzzy +#| msgid "Recent achievements history" +msgid "Return to achievements list" +msgstr "Historique des derniers succès" + +#: apps/family/templates/family/achievement_confirm_validate.html:10 +#, fuzzy +#| msgid "Validate account" +msgid "Validate achievement" +msgstr "Valider le compte" + +#: apps/family/templates/family/achievement_confirm_validate.html:14 +#, fuzzy +#| msgid "" +#| "Are you sure you want to delete this invoice? This action can't be undone." +msgid "" +"Are you sure you want to validate this achievement? This action can't be " +"undone." +msgstr "" +"Êtes-vous sûr⋅e de vouloir supprimer cette facture ? Cette action ne pourra " +"pas être annulée." + +#: apps/family/templates/family/achievement_list.html:13 +#, fuzzy +#| msgid "Recent achievements history" +msgid "Invalid achievements history" +msgstr "Historique des derniers succès" + +#: apps/family/templates/family/achievement_list.html:16 +#: apps/family/templates/family/achievement_list.html:28 +#, fuzzy +#| msgid "Return to activity page" +msgid "Return to management page" +msgstr "Retour à la page de l'activité" + +#: apps/family/templates/family/achievement_list.html:25 +#, fuzzy +#| msgid "Recent achievements history" +msgid "Valid achievements history" +msgstr "Historique des derniers succès" + +#: apps/family/templates/family/base.html:29 +#: apps/member/templates/member/base.html:57 +msgid "Add member" +msgstr "Ajouter un·e membre" + +#: apps/family/templates/family/base.html:34 +#: apps/member/templates/member/base.html:48 +#: apps/member/templates/member/base.html:62 apps/member/views.py:62 +#: apps/registration/templates/registration/future_profile_detail.html:48 +#: apps/wei/templates/wei/weimembership_form.html:117 +msgid "Update Profile" +msgstr "Modifier le profil" + +#: apps/family/templates/family/base.html:39 +#: apps/member/templates/member/base.html:52 +#: apps/member/templates/member/base.html:67 +msgid "View Profile" +msgstr "Voir le profil" + +#: apps/family/templates/family/base.html:42 +#, fuzzy +#| msgid "Return to the food list" +msgid "Return to the family list" +msgstr "Retour à la liste de nourriture" + +#: apps/family/templates/family/challenge_detail.html:18 +#, fuzzy +#| msgid "Managed by BDE" +msgid "Obtained by " +msgstr "Géré par le BDE" + +#: apps/family/templates/family/challenge_detail.html:20 +#, fuzzy +#| msgid "Families" +msgid "families" +msgstr "Familles" + +#: apps/family/templates/family/challenge_detail.html:27 +#, fuzzy +#| msgid "Return to the food list" +msgid "Return to the challenge list" +msgstr "Retour à la liste de nourriture" + +#: apps/family/templates/family/challenge_detail.html:31 +#: apps/food/templates/food/food_detail.html:38 +msgid "Update" +msgstr "Modifier" + +#: apps/family/templates/family/challenge_list.html:17 +#: apps/family/templates/family/family_list.html:17 +#: apps/family/templates/family/manage.html:18 +#: apps/family/templates/family/manage.html:70 +msgid "Challenges" +msgstr "Defis" + +#: apps/family/templates/family/challenge_list.html:20 +#: apps/family/templates/family/family_list.html:20 +#: apps/family/templates/family/manage.html:21 +msgid "Manage" +msgstr "Gestion" + +#: apps/family/templates/family/family_detail.html:12 +#, fuzzy +#| msgid "Club members" +msgid "Family members" +msgstr "Membres du club" + +#: apps/family/templates/family/family_detail.html:21 +#, fuzzy +#| msgid "Challenges" +msgid "Completed challenges" +msgstr "Defis" + +#: apps/family/templates/family/manage.html:37 +#, fuzzy +#| msgid "Please select a note" +msgid "Please select a family" +msgstr "Sélectionnez une note" + +#: apps/family/templates/family/manage.html:58 +#, fuzzy +#| msgid "Select emitter" +msgid "Select my family" +msgstr "Sélection de l'émetteur⋅rice" + +#: apps/family/templates/family/manage.html:78 +msgid "Validate!" +msgstr "Valider" + +#: apps/family/templates/family/manage.html:88 +msgid "Create a family or challenge" +msgstr "Créer une famille ou un challenge" + +#: apps/family/templates/family/manage.html:93 +msgid "Add a family" +msgstr "Ajouter une famille" + +#: apps/family/templates/family/manage.html:98 +msgid "Add a challenge" +msgstr "Ajouter un challenge" + +#: apps/family/templates/family/manage.html:113 +msgid "List" +msgstr "Liste" + +#: apps/family/templates/family/manage.html:118 +#: apps/note/templates/note/conso_form.html:108 +msgid "Search" +msgstr "Recherche" + +#: apps/family/templates/family/manage.html:138 +#, fuzzy +#| msgid "Add a challenge" +msgid "Search challenge..." +msgstr "Ajouter un challenge" + +#: apps/family/templates/family/manage.html:160 +msgid "Recent achievements history" +msgstr "Historique des derniers succès" + +#: apps/family/templates/family/manage.html:173 +#, fuzzy +#| msgid "Challenge" +msgid "Challenge validated" +msgstr "Defis" + +#: apps/family/templates/family/manage.html:189 +msgid "OK" +msgstr "" + +#: apps/family/templates/family/picture_update.html:40 +#: apps/member/templates/member/picture_update.html:40 +msgid "Nevermind" +msgstr "Annuler" + +#: apps/family/templates/family/picture_update.html:41 +#: apps/member/templates/member/picture_update.html:41 +msgid "Crop and upload" +msgstr "Recadrer et envoyer" + +#: apps/family/views.py:30 +#, fuzzy +#| msgid "Create club" +msgid "Create family" +msgstr "Créer un club" + +#: apps/family/views.py:52 +#, fuzzy +#| msgid "Families" +msgid "Families list" +msgstr "Familles" + +#: apps/family/views.py:61 +#, fuzzy +#| msgid "Profile detail" +msgid "Family detail" +msgstr "Détails de l'utilisateur⋅rice" + +#: apps/family/views.py:109 +#, fuzzy +#| msgid "Update a meal" +msgid "Update family" +msgstr "Modifier le plat" + +#: apps/family/views.py:120 +#, fuzzy +#| msgid "Update note picture" +msgid "Update family picture" +msgstr "Modifier la photo de la note" + +#: apps/family/views.py:168 +#, fuzzy +#| msgid "Add new member to the club" +msgid "Add a new member to the family" +msgstr "Ajouter un·e nouvelleau membre au club" + +#: apps/family/views.py:212 +#, fuzzy +#| msgid "Create a family or challenge" +msgid "Create challenge" +msgstr "Créer une famille ou un challenge" + +#: apps/family/views.py:232 +#, fuzzy +#| msgid "Challenges" +msgid "Challenges list" +msgstr "Defis" + +#: apps/family/views.py:241 apps/food/views.py:439 +msgid "Details of:" +msgstr "Détails de :" + +#: apps/family/views.py:264 +#, fuzzy +#| msgid "Add a challenge" +msgid "Update challenge" +msgstr "Ajouter un challenge" + +#: apps/family/views.py:279 +#, fuzzy +#| msgid "Create a family or challenge" +msgid "Manage families and challenges" +msgstr "Créer une famille ou un challenge" + +#: apps/family/views.py:326 +#, fuzzy +#| msgid "Recent achievements history" +msgid "Achievement list" +msgstr "Historique des derniers succès" + #: apps/food/apps.py:11 msgid "food" msgstr "bouffe" @@ -552,13 +968,6 @@ msgstr "Durée de vie (en heure)" msgid "Fully used" msgstr "Entièrement utilisé" -#: apps/food/forms.py:171 apps/food/templates/food/qrcode.html:29 -#: apps/food/templates/food/transformedfood_update.html:23 -#: apps/note/templates/note/transaction_form.html:132 -#: apps/treasury/models.py:61 -msgid "Name" -msgstr "Nom" - #: apps/food/forms.py:181 #, fuzzy #| msgid "QR-code number" @@ -598,7 +1007,7 @@ msgid "order" msgstr "consigne" #: apps/food/models.py:107 apps/food/views.py:35 -#: note_kfet/templates/base.html:72 +#: note_kfet/templates/base.html:72 static/note_kfet/templates/base.html:72 msgid "Food" msgstr "Bouffe" @@ -667,10 +1076,6 @@ msgstr "Contenu dans" msgid "Contain" msgstr "Contient" -#: apps/food/templates/food/food_detail.html:38 -msgid "Update" -msgstr "Modifier" - #: apps/food/templates/food/food_detail.html:43 msgid "Add to a meal" msgstr "Ajouter à un plat" @@ -687,45 +1092,47 @@ msgstr "Retour à la liste de nourriture" msgid "View food" msgstr "Voir l'aliment" -#: apps/food/templates/food/food_list.html:37 +#: apps/food/templates/food/food_list.html:38 #: note_kfet/templates/base_search.html:15 +#: static/note_kfet/templates/base_search.html:15 msgid "Search by attribute such as name..." msgstr "Chercher par un attribut tel que le nom..." -#: apps/food/templates/food/food_list.html:49 +#: apps/food/templates/food/food_list.html:50 #: note_kfet/templates/base_search.html:23 +#: static/note_kfet/templates/base_search.html:23 msgid "There is no results." msgstr "Il n'y a pas de résultat." -#: apps/food/templates/food/food_list.html:58 +#: apps/food/templates/food/food_list.html:59 msgid "Meal served" msgstr "Plat servis" -#: apps/food/templates/food/food_list.html:63 +#: apps/food/templates/food/food_list.html:64 msgid "New meal" msgstr "Nouveau plat" -#: apps/food/templates/food/food_list.html:72 +#: apps/food/templates/food/food_list.html:73 msgid "There is no meal served." msgstr "Il n'y a pas de plat servi." -#: apps/food/templates/food/food_list.html:79 +#: apps/food/templates/food/food_list.html:80 msgid "Free food" msgstr "Open" -#: apps/food/templates/food/food_list.html:86 +#: apps/food/templates/food/food_list.html:87 msgid "There is no free food." msgstr "Il n'y a pas de bouffe en open" -#: apps/food/templates/food/food_list.html:94 +#: apps/food/templates/food/food_list.html:95 msgid "Food of your clubs" msgstr "Bouffe de tes clubs" -#: apps/food/templates/food/food_list.html:100 +#: apps/food/templates/food/food_list.html:101 msgid "Food of club" msgstr "Bouffe du club" -#: apps/food/templates/food/food_list.html:107 +#: apps/food/templates/food/food_list.html:108 msgid "Yours club has not food yet." msgstr "Ton club n'a pas de bouffe pour l'instant" @@ -807,41 +1214,32 @@ msgstr "Ajouter un nouveau QR-code" msgid "Add an aliment" msgstr "Ajouter un nouvel aliment" -#: apps/food/views.py:228 +#: apps/food/views.py:237 msgid "Add a meal" msgstr "Ajouter un plat" -#: apps/food/views.py:259 +#: apps/food/views.py:277 msgid "Manage ingredients of:" msgstr "Gestion des ingrédienrs de :" -#: apps/food/views.py:273 apps/food/views.py:281 +#: apps/food/views.py:291 apps/food/views.py:299 #, python-brace-format msgid "Fully used in {meal}" msgstr "Aliment entièrement utilisé dans : {meal}" -#: apps/food/views.py:320 +#: apps/food/views.py:346 msgid "Add the ingredient:" msgstr "Ajouter l'ingrédient" -#: apps/food/views.py:346 -#, python-brace-format -msgid "Food fully used in : {meal.name}" -msgstr "Aliment entièrement utilisé dans : {meal.name}" - -#: apps/food/views.py:365 +#: apps/food/views.py:391 msgid "Update an aliment" msgstr "Modifier un aliment" -#: apps/food/views.py:413 -msgid "Details of:" -msgstr "Détails de :" - -#: apps/food/views.py:423 apps/treasury/tables.py:149 +#: apps/food/views.py:449 apps/treasury/tables.py:149 msgid "Yes" msgstr "Oui" -#: apps/food/views.py:425 apps/member/models.py:99 apps/treasury/tables.py:149 +#: apps/food/views.py:451 apps/member/models.py:99 apps/treasury/tables.py:149 msgid "No" msgstr "Non" @@ -943,9 +1341,9 @@ msgid "" "href=https://perso.crans.org/club-bde/Charte-anti-VSS.pdf target=_blank> " "available here in pdf" msgstr "" -"Cochez après avoir lu la charte anti-VSS disponible en pdf ici" +"Cochez après avoir lu la charte anti-VSS disponible en " +"pdf ici" #: apps/member/forms.py:62 msgid "You can't register to the note if you come from the future." @@ -963,7 +1361,7 @@ msgstr "Taille maximale : 2 Mo" msgid "This image cannot be loaded." msgstr "Cette image ne peut pas être chargée." -#: apps/member/forms.py:154 apps/member/views.py:117 +#: apps/member/forms.py:154 apps/member/views.py:118 #: apps/registration/forms.py:33 apps/registration/views.py:282 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." @@ -977,12 +1375,12 @@ msgid "Check this case if the Société Générale paid the inscription." msgstr "Cochez cette case si la Société Générale a payé l'inscription." #: apps/member/forms.py:185 apps/registration/forms.py:78 -#: apps/wei/forms/registration.py:116 +#: apps/wei/forms/registration.py:117 msgid "Credit type" msgstr "Type de rechargement" #: apps/member/forms.py:186 apps/registration/forms.py:79 -#: apps/wei/forms/registration.py:117 +#: apps/wei/forms/registration.py:118 msgid "No credit" msgstr "Pas de rechargement" @@ -991,13 +1389,13 @@ msgid "You can credit the note of the user." msgstr "Vous pouvez créditer la note de l'utilisateur⋅rice avant l'adhésion." #: apps/member/forms.py:192 apps/registration/forms.py:84 -#: apps/wei/forms/registration.py:122 +#: apps/wei/forms/registration.py:123 msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:209 apps/note/templates/note/transaction_form.html:144 #: apps/registration/forms.py:101 apps/treasury/forms.py:135 -#: apps/wei/forms/registration.py:139 +#: apps/wei/forms/registration.py:140 msgid "Bank" msgstr "Banque" @@ -1026,14 +1424,14 @@ msgid "hash" msgstr "haché" #: apps/member/models.py:37 -#: apps/member/templates/member/includes/profile_info.html:43 +#: apps/member/templates/member/includes/profile_info.html:54 #: apps/registration/templates/registration/future_profile_detail.html:40 #: apps/wei/templates/wei/weimembership_form.html:44 msgid "phone number" msgstr "numéro de téléphone" #: apps/member/models.py:44 -#: apps/member/templates/member/includes/profile_info.html:37 +#: apps/member/templates/member/includes/profile_info.html:48 #: apps/registration/templates/registration/future_profile_detail.html:34 #: apps/wei/templates/wei/weimembership_form.html:38 msgid "section" @@ -1121,14 +1519,14 @@ msgid "Year of entry to the school (None if not ENS student)" msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)" #: apps/member/models.py:82 -#: apps/member/templates/member/includes/profile_info.html:47 +#: apps/member/templates/member/includes/profile_info.html:58 #: apps/registration/templates/registration/future_profile_detail.html:37 #: apps/wei/templates/wei/weimembership_form.html:41 msgid "address" msgstr "adresse" #: apps/member/models.py:89 -#: apps/member/templates/member/includes/profile_info.html:50 +#: apps/member/templates/member/includes/profile_info.html:61 #: apps/registration/templates/registration/future_profile_detail.html:43 #: apps/wei/templates/wei/weimembership_form.html:47 msgid "paid" @@ -1200,7 +1598,7 @@ msgstr "Activez votre compte Note Kfet" #: apps/member/models.py:209 #: apps/member/templates/member/includes/club_info.html:55 -#: apps/member/templates/member/includes/profile_info.html:40 +#: apps/member/templates/member/includes/profile_info.html:51 #: apps/registration/templates/registration/future_profile_detail.html:22 #: apps/wei/templates/wei/base.html:68 #: apps/wei/templates/wei/weimembership_form.html:20 @@ -1274,10 +1672,6 @@ msgstr "l'adhésion finit le" msgid "membership" msgstr "adhésion" -#: apps/member/models.py:356 -msgid "memberships" -msgstr "adhésions" - #: apps/member/models.py:360 #, python-brace-format msgid "Membership of {user} for the club {club}" @@ -1288,11 +1682,11 @@ msgstr "Adhésion de {user} pour le club {club}" msgid "The role {role} does not apply to the club {club}." msgstr "Le rôle {role} ne s'applique pas au club {club}." -#: apps/member/models.py:388 apps/member/views.py:759 +#: apps/member/models.py:388 apps/member/views.py:763 msgid "User is already a member of the club" msgstr "L'utilisateur·rice est déjà membre du club" -#: apps/member/models.py:400 apps/member/views.py:768 +#: apps/member/models.py:400 apps/member/views.py:772 msgid "User is not a member of the parent club" msgstr "L'utilisateur·rice n'est pas membre du club parent" @@ -1344,22 +1738,6 @@ msgstr "" msgid "Account #" msgstr "Compte n°" -#: apps/member/templates/member/base.html:48 -#: apps/member/templates/member/base.html:62 apps/member/views.py:61 -#: apps/registration/templates/registration/future_profile_detail.html:48 -#: apps/wei/templates/wei/weimembership_form.html:117 -msgid "Update Profile" -msgstr "Modifier le profil" - -#: apps/member/templates/member/base.html:52 -#: apps/member/templates/member/base.html:67 -msgid "View Profile" -msgstr "Voir le profil" - -#: apps/member/templates/member/base.html:57 -msgid "Add member" -msgstr "Ajouter un·e membre" - #: apps/member/templates/member/base.html:72 #: apps/member/templates/member/base.html:93 #: apps/member/templates/member/base.html:114 @@ -1406,8 +1784,8 @@ msgstr "" "seront à nouveau possible." #: apps/member/templates/member/club_alias.html:10 -#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:318 -#: apps/member/views.py:559 +#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:322 +#: apps/member/views.py:563 msgid "Note aliases" msgstr "Alias de la note" @@ -1453,20 +1831,20 @@ msgid "membership fee" msgstr "cotisation pour adhérer" #: apps/member/templates/member/includes/club_info.html:43 -#: apps/member/templates/member/includes/profile_info.html:55 +#: apps/member/templates/member/includes/profile_info.html:66 #: apps/treasury/templates/treasury/sogecredit_detail.html:24 #: apps/wei/templates/wei/base.html:58 msgid "balance" msgstr "solde du compte" #: apps/member/templates/member/includes/club_info.html:47 -#: apps/member/templates/member/includes/profile_info.html:20 +#: apps/member/templates/member/includes/profile_info.html:31 #: apps/note/models/notes.py:287 apps/wei/templates/wei/base.html:64 msgid "aliases" msgstr "alias" #: apps/member/templates/member/includes/club_info.html:51 -#: apps/member/templates/member/includes/profile_info.html:24 +#: apps/member/templates/member/includes/profile_info.html:35 msgid "Manage aliases" msgstr "Gérer les alias" @@ -1477,24 +1855,24 @@ msgstr "Gérer les alias" msgid "username" msgstr "pseudo" -#: apps/member/templates/member/includes/profile_info.html:11 +#: apps/member/templates/member/includes/profile_info.html:22 msgid "password" msgstr "mot de passe" -#: apps/member/templates/member/includes/profile_info.html:15 +#: apps/member/templates/member/includes/profile_info.html:26 msgid "Change password" msgstr "Changer le mot de passe" -#: apps/member/templates/member/includes/profile_info.html:28 +#: apps/member/templates/member/includes/profile_info.html:39 #: apps/note/models/notes.py:244 msgid "friendships" msgstr "amitiés" -#: apps/member/templates/member/includes/profile_info.html:32 +#: apps/member/templates/member/includes/profile_info.html:43 msgid "Manage friendships" msgstr "Gérer les amitiés" -#: apps/member/templates/member/includes/profile_info.html:63 +#: apps/member/templates/member/includes/profile_info.html:74 msgid "API token" msgstr "Accès API" @@ -1542,14 +1920,6 @@ msgstr "Introspection :" msgid "Show my applications" msgstr "Voir mes applications" -#: apps/member/templates/member/picture_update.html:40 -msgid "Nevermind" -msgstr "Annuler" - -#: apps/member/templates/member/picture_update.html:41 -msgid "Crop and upload" -msgstr "Recadrer et envoyer" - #: apps/member/templates/member/profile_detail.html:11 #: apps/registration/templates/registration/future_profile_detail.html:28 #: apps/wei/templates/wei/weimembership_form.html:26 @@ -1595,51 +1965,51 @@ msgstr "Sauvegarder les changements" msgid "Registrations" msgstr "Inscriptions" -#: apps/member/views.py:74 apps/registration/forms.py:23 +#: apps/member/views.py:75 apps/registration/forms.py:23 msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:154 +#: apps/member/views.py:155 msgid "Profile detail" msgstr "Détails de l'utilisateur⋅rice" -#: apps/member/views.py:220 +#: apps/member/views.py:224 msgid "Search user" msgstr "Chercher un·e utilisateur·rice" -#: apps/member/views.py:272 +#: apps/member/views.py:276 msgid "Note friendships" msgstr "Amitiés note" -#: apps/member/views.py:342 +#: apps/member/views.py:346 msgid "Update note picture" msgstr "Modifier la photo de la note" -#: apps/member/views.py:391 +#: apps/member/views.py:395 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: apps/member/views.py:418 +#: apps/member/views.py:422 msgid "Create new club" msgstr "Créer un nouveau club" -#: apps/member/views.py:437 +#: apps/member/views.py:441 msgid "Search club" msgstr "Chercher un club" -#: apps/member/views.py:475 +#: apps/member/views.py:479 msgid "Club detail" msgstr "Détails du club" -#: apps/member/views.py:587 +#: apps/member/views.py:591 msgid "Update club" msgstr "Modifier le club" -#: apps/member/views.py:621 +#: apps/member/views.py:625 msgid "Add new member to the club" msgstr "Ajouter un·e nouvelleau membre au club" -#: apps/member/views.py:750 +#: apps/member/views.py:754 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -1647,19 +2017,19 @@ msgstr "" "Cet⋅te utilisateur⋅rice n'a pas assez d'argent pour rejoindre ce club et ne " "peut pas avoir un solde négatif." -#: apps/member/views.py:772 +#: apps/member/views.py:776 msgid "The membership must start after {:%m-%d-%Y}." msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}." -#: apps/member/views.py:777 +#: apps/member/views.py:781 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:927 +#: apps/member/views.py:931 msgid "Manage roles of an user in the club" msgstr "Gérer les rôles d'un⋅e utilisateur⋅rice dans le club" -#: apps/member/views.py:952 +#: apps/member/views.py:956 msgid "Members of the club" msgstr "Membres du club" @@ -1738,10 +2108,6 @@ msgstr "dernière date de négatif" msgid "last time the balance was negative" msgstr "dernier instant où la note était en négatif" -#: apps/note/models/notes.py:44 -msgid "display image" -msgstr "image affichée" - #: apps/note/models/notes.py:53 apps/note/models/transactions.py:132 msgid "created at" msgstr "créée le" @@ -2016,6 +2382,7 @@ msgstr "Ajouter" #: apps/wei/templates/wei/busteam_detail.html:20 #: apps/wei/templates/wei/busteam_detail.html:42 #: note_kfet/templates/oauth2_provider/application_detail.html:38 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:38 msgid "Edit" msgstr "Éditer" @@ -2050,10 +2417,6 @@ msgstr "Consommer !" msgid "Highlighted buttons" msgstr "Boutons mis en avant" -#: apps/note/templates/note/conso_form.html:108 -msgid "Search" -msgstr "Recherche" - #: apps/note/templates/note/conso_form.html:133 msgid "Search button..." msgstr "Chercher un bouton..." @@ -2079,8 +2442,6 @@ msgstr "Historique des transactions récentes" #: apps/note/templates/note/mails/weekly_report.txt:32 #: apps/registration/templates/registration/mails/email_validation_email.html:40 #: apps/registration/templates/registration/mails/email_validation_email.txt:16 -#: apps/scripts/templates/scripts/food_report.html:48 -#: apps/scripts/templates/scripts/food_report.txt:14 msgid "Mail generated by the Note Kfet on the" msgstr "Mail généré par la Note Kfet le" @@ -2192,7 +2553,8 @@ msgstr "Chercher un bouton" msgid "Update button" msgstr "Modifier le bouton" -#: apps/note/views.py:156 note_kfet/templates/base.html:67 +#: apps/note/views.py:156 note_kfet/templates/base.html:66 +#: static/note_kfet/templates/base.html:66 msgid "Consumptions" msgstr "Consommations" @@ -2214,10 +2576,6 @@ msgstr "Peut {type} {model}.{field} si {query}" msgid "Can {type} {model} in {query}" msgstr "Peut {type} {model} si {query}" -#: apps/permission/models.py:103 -msgid "rank" -msgstr "rang" - #: apps/permission/models.py:113 msgid "permission mask" msgstr "masque de permissions" @@ -2360,27 +2718,30 @@ msgstr "Scopes disponibles" #: apps/permission/templates/permission/scopes.html:42 #: note_kfet/templates/oauth2_provider/application_list.html:24 +#: static/note_kfet/templates/oauth2_provider/application_list.html:24 msgid "No applications defined" msgstr "Pas d'application définie" #: apps/permission/templates/permission/scopes.html:43 #: note_kfet/templates/oauth2_provider/application_list.html:25 +#: static/note_kfet/templates/oauth2_provider/application_list.html:25 msgid "Click here" msgstr "Cliquez ici" #: apps/permission/templates/permission/scopes.html:43 #: note_kfet/templates/oauth2_provider/application_list.html:25 +#: static/note_kfet/templates/oauth2_provider/application_list.html:25 msgid "if you want to register a new one" msgstr "si vous voulez en enregistrer une nouvelle" #: apps/permission/views.py:71 #, python-brace-format msgid "" -"You don't have the permission to update this instance of the model " -"\"{model}\" with these parameters. Please correct your data and retry." +"You don't have the permission to update this instance of the model \"{model}" +"\" with these parameters. Please correct your data and retry." msgstr "" -"Vous n'avez pas la permission de modifier cette instance du modèle « {model} " -"» avec ces paramètres. Merci de les corriger et de réessayer." +"Vous n'avez pas la permission de modifier cette instance du modèle " +"« {model} » avec ces paramètres. Merci de les corriger et de réessayer." #: apps/permission/views.py:75 #, python-brace-format @@ -2391,7 +2752,8 @@ msgstr "" "Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » " "avec ces paramètres. Merci de les corriger et de réessayer." -#: apps/permission/views.py:111 note_kfet/templates/base.html:121 +#: apps/permission/views.py:111 note_kfet/templates/base.html:127 +#: static/note_kfet/templates/base.html:127 msgid "Rights" msgstr "Droits" @@ -2596,7 +2958,8 @@ msgstr "" msgid "Invalidate pre-registration" msgstr "Invalider l'inscription" -#: apps/treasury/apps.py:12 note_kfet/templates/base.html:103 +#: apps/treasury/apps.py:12 note_kfet/templates/base.html:109 +#: static/note_kfet/templates/base.html:109 msgid "Treasury" msgstr "Trésorerie" @@ -2642,10 +3005,6 @@ msgstr "Devis" msgid "Object" msgstr "Objet" -#: apps/treasury/models.py:56 -msgid "Description" -msgstr "Description" - #: apps/treasury/models.py:65 msgid "Address" msgstr "Adresse" @@ -2942,11 +3301,6 @@ msgstr "" "Merci de demander à l'utilisateur·rice de recharger sa note avant de " "supprimer la demande de crédit." -#: apps/treasury/templates/treasury/sogecredit_detail.html:63 -#: apps/wei/tables.py:60 apps/wei/tables.py:102 -msgid "Validate" -msgstr "Valider" - #: apps/treasury/templates/treasury/sogecredit_detail.html:71 msgid "Return to credit list" msgstr "Retour à la liste des crédits" @@ -3012,22 +3366,22 @@ msgstr "Gérer les crédits de la Société générale" #: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48 #: apps/wei/models.py:72 apps/wei/models.py:197 -#: note_kfet/templates/base.html:108 +#: note_kfet/templates/base.html:115 static/note_kfet/templates/base.html:115 msgid "WEI" msgstr "WEI" -#: apps/wei/forms/registration.py:37 +#: apps/wei/forms/registration.py:38 msgid "The selected user is not validated. Please validate its account first" msgstr "" "L'utilisateur·rice sélectionné·e n'est pas validé·e. Merci de d'abord " "valider son compte" -#: apps/wei/forms/registration.py:84 apps/wei/models.py:145 +#: apps/wei/forms/registration.py:85 apps/wei/models.py:145 #: apps/wei/models.py:354 msgid "bus" msgstr "bus" -#: apps/wei/forms/registration.py:85 +#: apps/wei/forms/registration.py:86 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." @@ -3036,11 +3390,11 @@ msgstr "" "vous attribuer un bus et une équipe, en particulier si vous êtes un·e " "électron libre." -#: apps/wei/forms/registration.py:92 +#: apps/wei/forms/registration.py:93 msgid "Team" msgstr "Équipe" -#: apps/wei/forms/registration.py:94 +#: apps/wei/forms/registration.py:95 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" @@ -3048,16 +3402,16 @@ msgstr "" "Laissez ce champ vide si vous ne serez pas dans une équipe (staff, chef de " "bus ou électron libre)" -#: apps/wei/forms/registration.py:100 apps/wei/forms/registration.py:110 +#: apps/wei/forms/registration.py:101 apps/wei/forms/registration.py:111 #: apps/wei/models.py:179 msgid "WEI Roles" msgstr "Rôles au WEI" -#: apps/wei/forms/registration.py:101 +#: apps/wei/forms/registration.py:102 msgid "Select the roles that you are interested in." msgstr "Sélectionnez les rôles qui vous intéressent." -#: apps/wei/forms/registration.py:160 +#: apps/wei/forms/registration.py:161 msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." @@ -3070,10 +3424,6 @@ msgstr "Choisissez un mot :" msgid "Rate between 0 and 5." msgstr "Note entre 0 et 5." -#: apps/wei/models.py:25 apps/wei/templates/wei/base.html:36 -msgid "year" -msgstr "année" - #: apps/wei/models.py:29 apps/wei/templates/wei/base.html:30 #: apps/wrapped/models.py:20 msgid "date start" @@ -3770,7 +4120,8 @@ msgstr "données json" msgid "data in the wrapped and generated by the script generate_wrapped" msgstr "donnée dans le wrapped et générée par le script generate_wrapped" -#: apps/wrapped/models.py:70 note_kfet/templates/base.html:115 +#: apps/wrapped/models.py:70 note_kfet/templates/base.html:121 +#: static/note_kfet/templates/base.html:121 msgid "Wrapped" msgstr "Wrapped" @@ -3803,7 +4154,7 @@ msgid "Copy link" msgstr "Copier le lien" #: apps/wrapped/templates/wrapped/1/wrapped_base.html:16 -#: note_kfet/templates/base.html:15 +#: note_kfet/templates/base.html:14 static/note_kfet/templates/base.html:14 msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." @@ -3925,27 +4276,27 @@ msgstr "Le wrapped est public" msgid "List of wrapped" msgstr "Liste des wrapped" -#: note_kfet/settings/base.py:180 +#: note_kfet/settings/base.py:178 static/note_kfet/settings/base.py:178 msgid "German" msgstr "Allemand" -#: note_kfet/settings/base.py:181 +#: note_kfet/settings/base.py:179 static/note_kfet/settings/base.py:179 msgid "English" msgstr "Anglais" -#: note_kfet/settings/base.py:182 +#: note_kfet/settings/base.py:180 static/note_kfet/settings/base.py:180 msgid "Spanish" msgstr "Espagnol" -#: note_kfet/settings/base.py:183 +#: note_kfet/settings/base.py:181 static/note_kfet/settings/base.py:181 msgid "French" msgstr "Français" -#: note_kfet/templates/400.html:10 +#: note_kfet/templates/400.html:10 static/note_kfet/templates/400.html:10 msgid "Bad request" msgstr "Requête invalide" -#: note_kfet/templates/400.html:14 +#: note_kfet/templates/400.html:14 static/note_kfet/templates/400.html:14 msgid "" "Sorry, your request was bad. Don't know what could be wrong. An email has " "been sent to webmasters with the details of the error. You can now drink a " @@ -3955,23 +4306,25 @@ msgstr "" "Un e-mail a été envoyé aux responsables de la plateforme avec les détails de " "cette erreur. Vous pouvez désormais allez boire un coca." -#: note_kfet/templates/403.html:10 +#: note_kfet/templates/403.html:10 static/note_kfet/templates/403.html:10 msgid "Permission denied" msgstr "Accès refusé" -#: note_kfet/templates/403.html:13 +#: note_kfet/templates/403.html:13 static/note_kfet/templates/403.html:13 msgid "You don't have the right to perform this request." msgstr "Vous n'avez pas la permission d'exécuter cette requête." #: note_kfet/templates/403.html:15 note_kfet/templates/404.html:19 +#: static/note_kfet/templates/403.html:15 +#: static/note_kfet/templates/404.html:19 msgid "Exception message:" msgstr "Message d'erreur :" -#: note_kfet/templates/404.html:10 +#: note_kfet/templates/404.html:10 static/note_kfet/templates/404.html:10 msgid "Page not found" msgstr "Page inexistante" -#: note_kfet/templates/404.html:14 +#: note_kfet/templates/404.html:14 static/note_kfet/templates/404.html:14 #, python-format msgid "" "The requested path %(request_path)s was not found on the server." @@ -3979,11 +4332,11 @@ msgstr "" "Le chemin demandé %(request_path)s n'a pas été trouvé sur le " "serveur." -#: note_kfet/templates/500.html:10 +#: note_kfet/templates/500.html:10 static/note_kfet/templates/500.html:10 msgid "Server error" msgstr "Erreur du serveur" -#: note_kfet/templates/500.html:14 +#: note_kfet/templates/500.html:14 static/note_kfet/templates/500.html:14 msgid "" "Sorry, an error occurred when processing your request. An email has been " "sent to webmasters with the detail of the error, and this will be fixed " @@ -3995,45 +4348,55 @@ msgstr "" "boire une bière, avec modération." #: note_kfet/templates/autocomplete_model.html:15 +#: static/note_kfet/templates/autocomplete_model.html:15 msgid "Reset" msgstr "Réinitialiser" -#: note_kfet/templates/base.html:85 +#: note_kfet/templates/base.html:91 static/note_kfet/templates/base.html:91 msgid "Users" msgstr "Utilisateur·rices" -#: note_kfet/templates/base.html:91 +#: note_kfet/templates/base.html:97 static/note_kfet/templates/base.html:97 msgid "Clubs" msgstr "Clubs" -#: note_kfet/templates/base.html:126 +#: note_kfet/templates/base.html:132 static/note_kfet/templates/base.html:132 msgid "Admin" msgstr "Admin" -#: note_kfet/templates/base.html:140 +#: note_kfet/templates/base.html:146 static/note_kfet/templates/base.html:146 msgid "My account" msgstr "Mon compte" -#: note_kfet/templates/base.html:145 +#: note_kfet/templates/base.html:149 static/note_kfet/templates/base.html:149 msgid "Log out" msgstr "Se déconnecter" -#: note_kfet/templates/base.html:154 +#: note_kfet/templates/base.html:157 #: note_kfet/templates/registration/signup.html:6 #: note_kfet/templates/registration/signup.html:11 #: note_kfet/templates/registration/signup.html:28 +#: static/note_kfet/templates/base.html:157 +#: static/note_kfet/templates/registration/signup.html:6 +#: static/note_kfet/templates/registration/signup.html:11 +#: static/note_kfet/templates/registration/signup.html:28 msgid "Sign up" msgstr "Inscription" -#: note_kfet/templates/base.html:161 +#: note_kfet/templates/base.html:164 #: note_kfet/templates/registration/login.html:6 #: note_kfet/templates/registration/login.html:15 #: note_kfet/templates/registration/login.html:38 #: note_kfet/templates/registration/password_reset_complete.html:15 +#: static/note_kfet/templates/base.html:164 +#: static/note_kfet/templates/registration/login.html:6 +#: static/note_kfet/templates/registration/login.html:15 +#: static/note_kfet/templates/registration/login.html:38 +#: static/note_kfet/templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Se connecter" -#: note_kfet/templates/base.html:175 +#: note_kfet/templates/base.html:178 static/note_kfet/templates/base.html:178 msgid "" "You are not a BDE member anymore. Please renew your membership if you want " "to use the note." @@ -4041,7 +4404,7 @@ msgstr "" "Vous n'êtes plus adhérent·e BDE. Merci de réadhérer si vous voulez profiter " "de la note." -#: note_kfet/templates/base.html:181 +#: note_kfet/templates/base.html:184 static/note_kfet/templates/base.html:184 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -4049,7 +4412,7 @@ msgstr "" "Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail " "et de cliquer sur le lien de validation." -#: note_kfet/templates/base.html:187 +#: note_kfet/templates/base.html:190 static/note_kfet/templates/base.html:190 msgid "" "You declared that you opened a bank account in the Société générale. The " "bank did not validate the creation of the account to the BDE, so the " @@ -4063,103 +4426,61 @@ msgstr "" "vérification peut durer quelques jours. Merci de vous assurer de bien aller " "au bout de vos démarches." -#: note_kfet/templates/base.html:214 +#: note_kfet/templates/base.html:213 static/note_kfet/templates/base.html:213 msgid "Contact us" msgstr "Nous contacter" -#: note_kfet/templates/base.html:216 +#: note_kfet/templates/base.html:215 static/note_kfet/templates/base.html:215 msgid "Technical Support" msgstr "Support technique" -#: note_kfet/templates/base.html:218 +#: note_kfet/templates/base.html:217 static/note_kfet/templates/base.html:217 msgid "Charte Info (FR)" msgstr "Charte Info (FR)" -#: note_kfet/templates/base.html:220 +#: note_kfet/templates/base.html:219 static/note_kfet/templates/base.html:219 msgid "FAQ (FR)" msgstr "FAQ (FR)" -#: note_kfet/templates/base.html:222 -msgid "Managed by BDE" -msgstr "Géré par le BDE" - -#: note_kfet/templates/base.html:224 -msgid "Hosted by Cr@ns" -msgstr "Hébergé par le Cr@ans" - -#: note_kfet/templates/base.html:266 -msgid "The note is not available for now" -msgstr "La note est indisponible pour le moment" - -#: note_kfet/templates/base.html:268 -msgid "Thank you for your understanding -- The Respos Info of BDE" -msgstr "Merci de votre compréhension -- Les Respos Info du BDE" - -#: note_kfet/templates/cas/logged.html:8 -msgid "" -"

                Log In Successful

                You have successfully logged into the Central " -"Authentication Service.
                For security reasons, please Log Out and Exit " -"your web browser when you are done accessing services that require " -"authentication!" -msgstr "" -"

                Connection réussie

                Vous vous êtes bien connecté au Service Central d'Authentification." -"
                Pour des raisons de sécurité, veuillez vous déconnecter et fermer votre navigateur internet " -"une fois que vous aurez fini d'accéder aux services qui requiert une authentification !" - -#: note_kfet/templates/cas/logged.html:14 -msgid "Log me out from all my sessions" -msgstr "Me déconnecter de toutes mes sessions" - -#: note_kfet/templates/cas/logged.html:20 -msgid "Forget the identity provider" -msgstr "Oublier le fournisseur d'identité" - -#: note_kfet/templates/cas/logged.html:24 -msgid "Logout" -msgstr "Déconnexion" - -#: note_kfet/templates/cas/login.html:11 -msgid "Please log in" -msgstr "Veuillez vous connecter" - -#: note_kfet/templates/cas/login.html:23 -msgid "Login" -msgstr "Connexion" - -#: note_kfet/templates/cas/warn.html:14 -msgid "Connect to the service" -msgstr "Connexion au service" - #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:8 +#: static/note_kfet/templates/oauth2_provider/application_confirm_delete.html:8 msgid "Are you sure to delete the application" msgstr "Êtes-vous sûr⋅e de vouloir supprimer l'application" #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:17 #: note_kfet/templates/oauth2_provider/authorize.html:28 +#: static/note_kfet/templates/oauth2_provider/application_confirm_delete.html:17 +#: static/note_kfet/templates/oauth2_provider/authorize.html:28 msgid "Cancel" msgstr "Annuler" #: note_kfet/templates/oauth2_provider/application_detail.html:11 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:11 msgid "Client id" msgstr "ID client" #: note_kfet/templates/oauth2_provider/application_detail.html:14 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:14 msgid "Client secret" msgstr "Secret client" #: note_kfet/templates/oauth2_provider/application_detail.html:17 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:17 msgid "Client type" msgstr "Type de client" #: note_kfet/templates/oauth2_provider/application_detail.html:20 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:20 msgid "Authorization Grant Type" msgstr "Type d'autorisation" #: note_kfet/templates/oauth2_provider/application_detail.html:23 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:23 msgid "Redirect Uris" msgstr "URIs de redirection" #: note_kfet/templates/oauth2_provider/application_detail.html:29 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:29 #, python-format msgid "" "You can go here to generate authorization " @@ -4173,18 +4494,23 @@ msgstr "" #: note_kfet/templates/oauth2_provider/application_detail.html:37 #: note_kfet/templates/oauth2_provider/application_form.html:23 +#: static/note_kfet/templates/oauth2_provider/application_detail.html:37 +#: static/note_kfet/templates/oauth2_provider/application_form.html:23 msgid "Go Back" msgstr "Retour en arrière" #: note_kfet/templates/oauth2_provider/application_form.html:12 +#: static/note_kfet/templates/oauth2_provider/application_form.html:12 msgid "Edit application" msgstr "Modifier l'application" #: note_kfet/templates/oauth2_provider/application_list.html:7 +#: static/note_kfet/templates/oauth2_provider/application_list.html:7 msgid "Your applications" msgstr "Vos applications" #: note_kfet/templates/oauth2_provider/application_list.html:11 +#: static/note_kfet/templates/oauth2_provider/application_list.html:11 msgid "" "You can find on this page the list of the applications that you already " "registered." @@ -4193,60 +4519,76 @@ msgstr "" "déjà enregistrées." #: note_kfet/templates/oauth2_provider/application_list.html:30 +#: static/note_kfet/templates/oauth2_provider/application_list.html:30 msgid "New Application" msgstr "Nouvelle application" #: note_kfet/templates/oauth2_provider/application_list.html:31 +#: static/note_kfet/templates/oauth2_provider/application_list.html:31 msgid "Authorized Tokens" msgstr "Jetons autorisés" #: note_kfet/templates/oauth2_provider/application_registration_form.html:5 +#: static/note_kfet/templates/oauth2_provider/application_registration_form.html:5 msgid "Register a new application" msgstr "Enregistrer une nouvelle application" #: note_kfet/templates/oauth2_provider/authorize.html:9 #: note_kfet/templates/oauth2_provider/authorize.html:29 +#: static/note_kfet/templates/oauth2_provider/authorize.html:9 +#: static/note_kfet/templates/oauth2_provider/authorize.html:29 msgid "Authorize" msgstr "Autoriser" #: note_kfet/templates/oauth2_provider/authorize.html:14 +#: static/note_kfet/templates/oauth2_provider/authorize.html:14 msgid "Application requires following permissions:" msgstr "L'application requiert les permissions suivantes :" #: note_kfet/templates/oauth2_provider/authorize.html:36 #: note_kfet/templates/oauth2_provider/authorized-oob.html:15 +#: static/note_kfet/templates/oauth2_provider/authorize.html:36 +#: static/note_kfet/templates/oauth2_provider/authorized-oob.html:15 msgid "Error:" msgstr "Erreur :" #: note_kfet/templates/oauth2_provider/authorized-oob.html:13 +#: static/note_kfet/templates/oauth2_provider/authorized-oob.html:13 msgid "Success" msgstr "Succès" #: note_kfet/templates/oauth2_provider/authorized-oob.html:21 +#: static/note_kfet/templates/oauth2_provider/authorized-oob.html:21 msgid "Please return to your application and enter this code:" msgstr "Merci de retourner à votre application et entrez ce code :" #: note_kfet/templates/oauth2_provider/authorized-token-delete.html:9 +#: static/note_kfet/templates/oauth2_provider/authorized-token-delete.html:9 msgid "Are you sure you want to delete this token?" msgstr "Êtes-vous sûr⋅e de vouloir supprimer ce jeton ?" #: note_kfet/templates/oauth2_provider/authorized-tokens.html:7 +#: static/note_kfet/templates/oauth2_provider/authorized-tokens.html:7 msgid "Tokens" msgstr "Jetons" #: note_kfet/templates/oauth2_provider/authorized-tokens.html:22 +#: static/note_kfet/templates/oauth2_provider/authorized-tokens.html:22 msgid "There are no authorized tokens yet." msgstr "Il n'y a pas encore de jeton autorisé." #: note_kfet/templates/registration/logged_out.html:13 +#: static/note_kfet/templates/registration/logged_out.html:13 msgid "Thanks for spending some quality time with the Web site today." msgstr "Merci d'avoir utilisé la Note Kfet." #: note_kfet/templates/registration/logged_out.html:14 +#: static/note_kfet/templates/registration/logged_out.html:14 msgid "Log in again" msgstr "Se connecter à nouveau" #: note_kfet/templates/registration/login.html:20 +#: static/note_kfet/templates/registration/login.html:20 #, python-format msgid "" "You are authenticated as %(username)s, but are not authorized to access this " @@ -4258,6 +4600,7 @@ msgstr "" "masque de permissions plus fort ?" #: note_kfet/templates/registration/login.html:30 +#: static/note_kfet/templates/registration/login.html:30 msgid "" "You must be logged with a staff account with the higher mask to access " "Django Admin." @@ -4266,14 +4609,17 @@ msgstr "" "pour accéder à Django Admin." #: note_kfet/templates/registration/login.html:40 +#: static/note_kfet/templates/registration/login.html:40 msgid "Forgotten your password or username?" msgstr "Mot de passe ou pseudo oublié ?" #: note_kfet/templates/registration/password_change_done.html:13 +#: static/note_kfet/templates/registration/password_change_done.html:13 msgid "Your password was changed." msgstr "Votre mot de passe a bien été changé." #: note_kfet/templates/registration/password_change_form.html:14 +#: static/note_kfet/templates/registration/password_change_form.html:14 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -4284,16 +4630,20 @@ msgstr "" #: note_kfet/templates/registration/password_change_form.html:16 #: note_kfet/templates/registration/password_reset_confirm.html:17 +#: static/note_kfet/templates/registration/password_change_form.html:16 +#: static/note_kfet/templates/registration/password_reset_confirm.html:17 msgid "Change my password" msgstr "Changer mon mot de passe" #: note_kfet/templates/registration/password_reset_complete.html:13 +#: static/note_kfet/templates/registration/password_reset_complete.html:13 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Votre mot de passe a été enregistré. Vous pouvez vous connecter dès à " "présent." #: note_kfet/templates/registration/password_reset_confirm.html:14 +#: static/note_kfet/templates/registration/password_reset_confirm.html:14 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -4302,6 +4652,7 @@ msgstr "" "seconde fois." #: note_kfet/templates/registration/password_reset_confirm.html:21 +#: static/note_kfet/templates/registration/password_reset_confirm.html:21 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -4310,6 +4661,7 @@ msgstr "" "déjà utilisé. Faites une nouvelle demande." #: note_kfet/templates/registration/password_reset_done.html:13 +#: static/note_kfet/templates/registration/password_reset_done.html:13 msgid "" "We've emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." @@ -4318,6 +4670,7 @@ msgstr "" "passe." #: note_kfet/templates/registration/password_reset_done.html:14 +#: static/note_kfet/templates/registration/password_reset_done.html:14 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -4326,6 +4679,7 @@ msgstr "" "l'adresse associée à votre compte, et regarder également le dossier spam." #: note_kfet/templates/registration/password_reset_form.html:13 +#: static/note_kfet/templates/registration/password_reset_form.html:13 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -4334,10 +4688,12 @@ msgstr "" "les instructions pour choisir un nouveau mot de passe." #: note_kfet/templates/registration/password_reset_form.html:18 +#: static/note_kfet/templates/registration/password_reset_form.html:18 msgid "Reset my password" msgstr "Réinitialiser mon mot de passe" #: note_kfet/templates/registration/signup.html:15 +#: static/note_kfet/templates/registration/signup.html:15 msgid "" "If you already signed up, your registration is taken into account. The BDE " "must validate your account before your can log in. You have to go to the " @@ -4350,21 +4706,10 @@ msgstr "" "d'adhésion. Vous devez également valider votre adresse email en suivant le " "lien que vous avez reçu." -#~ msgid "caution amount" -#~ msgstr "montant de la caution" - -#~ msgid "caution type" -#~ msgstr "type de caution" - -#~ msgid "Caution amount" -#~ msgstr "Montant de la caution" - -#~ msgid "caution check given" -#~ msgstr "chèque de caution donné" - -#, python-format -#~ msgid "Caution %(name)s" -#~ msgstr "Caution %(name)s" +#, fuzzy +#~| msgid "Invitation" +#~ msgid "Syndication" +#~ msgstr "Invitation" #, fuzzy #~| msgid "There is no results." @@ -4376,6 +4721,11 @@ msgstr "" #~ msgid "Enter a valid value." #~ msgstr "dévalider" +#, fuzzy +#~| msgid "invalidate" +#~ msgid "Enter a valid domain name." +#~ msgstr "dévalider" + #, fuzzy #~| msgid "invalidate" #~ msgid "Enter a valid URL." @@ -4391,20 +4741,10 @@ msgstr "" #~ msgid "Enter a valid email address." #~ msgstr "dévalider" -#, fuzzy -#~| msgid "This activity is not validated yet." -#~ msgid "Enter a valid IPv4 address." -#~ msgstr "Cette activité n'est pas encore validée." - -#, fuzzy -#~| msgid "This activity is not validated yet." -#~ msgid "Enter a valid IPv6 address." -#~ msgstr "Cette activité n'est pas encore validée." - -#, fuzzy -#~| msgid "This activity is not validated yet." -#~ msgid "Enter a valid IPv4 or IPv6 address." -#~ msgstr "Cette activité n'est pas encore validée." +#, fuzzy, python-format +#~| msgid "invalidate" +#~ msgid "Enter a valid %(protocol)s address." +#~ msgstr "dévalider" #, fuzzy #~| msgid "phone number" @@ -4436,6 +4776,11 @@ msgstr "" #~ msgid "%(model_name)s with this %(field_label)s already exists." #~ msgstr "Un modèle de transaction avec un nom similaire existe déjà" +#, fuzzy, python-format +#~| msgid "This activity is not validated yet." +#~ msgid "“%(value)s” value must be a decimal number." +#~ msgstr "Cette activité n'est pas encore validée." + #, fuzzy #~| msgid "phone number" #~ msgid "Decimal number" @@ -4451,6 +4796,11 @@ msgstr "" #~ msgid "Email address" #~ msgstr "adresse" +#, fuzzy, python-format +#~| msgid "This activity is not validated yet." +#~ msgid "“%(value)s” value must be a float." +#~ msgstr "Cette activité n'est pas encore validée." + #, fuzzy #~| msgid "phone number" #~ msgid "Floating point number" @@ -4488,7 +4838,7 @@ msgstr "" #, fuzzy, python-format #~| msgid "A template with this name already exist" -#~ msgid "%(model)s instance with %(field)s %(value)r does not exist." +#~ msgid "%(model)s instance with %(field)s %(value)r is not a valid choice." #~ msgstr "Un modèle de transaction avec un nom similaire existe déjà" #, fuzzy @@ -4561,6 +4911,11 @@ msgstr "" #~ msgid "Wed" #~ msgstr "Wrapped" +#, fuzzy +#~| msgid "add" +#~ msgid "Sun" +#~ msgstr "ajouter" + #, fuzzy #~| msgid "Search" #~ msgid "March" @@ -4596,6 +4951,11 @@ msgstr "" #~ msgid "feb" #~ msgstr "cotisation" +#, fuzzy +#~| msgid "day" +#~ msgid "mar" +#~ msgstr "jour" + #, fuzzy #~| msgid "day" #~ msgid "may" @@ -4606,6 +4966,11 @@ msgstr "" #~ msgid "jun" #~ msgstr "ajouter" +#, fuzzy +#~| msgid "add" +#~ msgid "jul" +#~ msgstr "ajouter" + #, fuzzy #~| msgid "product" #~ msgid "oct" @@ -4675,6 +5040,34 @@ msgstr "" #~ msgstr[0] "année" #~ msgstr[1] "année" +#, fuzzy, python-format +#~| msgid "minute" +#~ msgid "%(num)d month" +#~ msgid_plural "%(num)d months" +#~ msgstr[0] "minute" +#~ msgstr[1] "minute" + +#, fuzzy, python-format +#~| msgid "year" +#~ msgid "%(num)d week" +#~ msgid_plural "%(num)d weeks" +#~ msgstr[0] "année" +#~ msgstr[1] "année" + +#, fuzzy, python-format +#~| msgid "year" +#~ msgid "%(num)d day" +#~ msgid_plural "%(num)d days" +#~ msgstr[0] "année" +#~ msgstr[1] "année" + +#, fuzzy, python-format +#~| msgid "year" +#~ msgid "%(num)d hour" +#~ msgid_plural "%(num)d hours" +#~ msgstr[0] "année" +#~ msgstr[1] "année" + #, fuzzy, python-format #~| msgid "minute" #~ msgid "%(num)d minute" @@ -4702,6 +5095,11 @@ msgstr "" #~ msgid "No week specified" #~ msgstr "Pas de motif spécifié" +#, fuzzy, python-format +#~| msgid "This activity is not validated yet." +#~ msgid "“%(path)s” does not exist" +#~ msgstr "Cette activité n'est pas encore validée." + #, fuzzy #~| msgid "Client secret" #~ msgid "Confidential" @@ -4742,11 +5140,99 @@ msgstr "" #~ msgid "The access token is valid but does not have enough scope." #~ msgstr "L'utilisateur·ice n'a pas assez d'argent." +#, fuzzy +#~| msgid "Client secret" +#~ msgid "Hash client secret" +#~ msgstr "Secret client" + +#, fuzzy +#~| msgid "Redirect Uris" +#~ msgid "Post Logout Redirect Uris" +#~ msgstr "URIs de redirection" + #, fuzzy #~| msgid "Application requires following permissions:" #~ msgid "Application requires the following permissions" #~ msgstr "L'application requiert les permissions suivantes :" +#, fuzzy +#~| msgid "obtained_at" +#~ msgid "Obtained at" +#~ msgstr "Réalisé le" + +#, python-brace-format +#~ msgid "Food fully used in : {meal.name}" +#~ msgstr "Aliment entièrement utilisé dans : {meal.name}" + +#~ msgid "Hosted by Cr@ns" +#~ msgstr "Hébergé par le Cr@ans" + +#~ msgid "The note is not available for now" +#~ msgstr "La note est indisponible pour le moment" + +#~ msgid "Thank you for your understanding -- The Respos Info of BDE" +#~ msgstr "Merci de votre compréhension -- Les Respos Info du BDE" + +#~ msgid "" +#~ "

                Log In Successful

                You have successfully logged into the Central " +#~ "Authentication Service.
                For security reasons, please Log Out and Exit " +#~ "your web browser when you are done accessing services that require " +#~ "authentication!" +#~ msgstr "" +#~ "

                Connection réussie

                Vous vous êtes bien connecté au Service " +#~ "Central d'Authentification.
                Pour des raisons de sécurité, veuillez " +#~ "vous déconnecter et fermer votre navigateur internet une fois que vous " +#~ "aurez fini d'accéder aux services qui requiert une authentification !" + +#~ msgid "Log me out from all my sessions" +#~ msgstr "Me déconnecter de toutes mes sessions" + +#~ msgid "Forget the identity provider" +#~ msgstr "Oublier le fournisseur d'identité" + +#~ msgid "Logout" +#~ msgstr "Déconnexion" + +#~ msgid "Please log in" +#~ msgstr "Veuillez vous connecter" + +#~ msgid "Login" +#~ msgstr "Connexion" + +#~ msgid "Connect to the service" +#~ msgstr "Connexion au service" + +#~ msgid "caution amount" +#~ msgstr "montant de la caution" + +#~ msgid "caution type" +#~ msgstr "type de caution" + +#~ msgid "Caution amount" +#~ msgstr "Montant de la caution" + +#~ msgid "caution check given" +#~ msgstr "chèque de caution donné" + +#, python-format +#~ msgid "Caution %(name)s" +#~ msgstr "Caution %(name)s" + +#, fuzzy +#~| msgid "This activity is not validated yet." +#~ msgid "Enter a valid IPv4 address." +#~ msgstr "Cette activité n'est pas encore validée." + +#, fuzzy +#~| msgid "This activity is not validated yet." +#~ msgid "Enter a valid IPv6 address." +#~ msgstr "Cette activité n'est pas encore validée." + +#, fuzzy +#~| msgid "This activity is not validated yet." +#~ msgid "Enter a valid IPv4 or IPv6 address." +#~ msgstr "Cette activité n'est pas encore validée." + #~ msgid "The BDE membership is included in the WEI registration." #~ msgstr "L'adhésion au BDE est offerte avec l'inscription au WEI." @@ -4828,9 +5314,6 @@ msgstr "" #~ msgid "Add a new meal" #~ msgstr "Ajouter un nouveau plat" -#~ msgid "Update a meal" -#~ msgstr "Modifier le plat" - #, fuzzy #~| msgid "invalidate" #~ msgid "Enter a valid color." diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po index 59989ae6..8305ad04 100644 --- a/locale/fr/LC_MESSAGES/djangojs.po +++ b/locale/fr/LC_MESSAGES/djangojs.po @@ -151,3 +151,33 @@ msgid "An error occured while (in)validating this transaction:" msgstr "" "Une erreur est survenue lors de la validation/dévalidation de cette " "transaction :" + +msgid "Recent achievements history" +msgstr "Historique des derniers succès" + +msgid "Family" +msgstr "Famille" + +msgid "obtained at" +msgstr "Réalisé le" + +msgid "Return to the family list" +msgstr "Retour à la liste des familles" + +msgid "rank" +msgstr "rang" + +msgid "Challenge" +msgstr "Défis" + +msgid "Invalid achievements history" +msgstr "Historique des défis invalides" + +msgid "Valid achievements history" +msgstr "Historique des défis valides" + +msgid "Return to management page" +msgstr "Retour à la page de gestion" + + + From f13a44702ade31a54924d6682ac6b02e46421179 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Wed, 13 Aug 2025 15:21:27 +0200 Subject: [PATCH 27/32] Permmissions --- .../templates/family/challenge_list.html | 2 + .../templates/family/family_detail.html | 4 + apps/family/templates/family/family_list.html | 2 + apps/family/templates/family/manage.html | 9 +- apps/family/views.py | 88 ++++- apps/member/signals.py | 1 - apps/permission/fixtures/initial.json | 337 ++++++++++++++++-- 7 files changed, 417 insertions(+), 26 deletions(-) diff --git a/apps/family/templates/family/challenge_list.html b/apps/family/templates/family/challenge_list.html index 2a1502d0..e7b554a2 100644 --- a/apps/family/templates/family/challenge_list.html +++ b/apps/family/templates/family/challenge_list.html @@ -16,9 +16,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Challenges" %} + {% if can_manage %} {% trans "Manage" %} + {% endif %}
                diff --git a/apps/family/templates/family/family_detail.html b/apps/family/templates/family/family_detail.html index dc38edda..b81fa955 100644 --- a/apps/family/templates/family/family_detail.html +++ b/apps/family/templates/family/family_detail.html @@ -7,6 +7,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% load i18n perms %} {% block profile_content %} +{% if member_list.data %}
                {% trans "Family members" %} @@ -15,11 +16,14 @@ SPDX-License-Identifier: GPL-3.0-or-later
                +{% endif %} +{% if achievement_list.data %}
                {% trans "Completed challenges" %}
                {% render_table achievement_list %}
                +{% endif %} {% endblock %} \ No newline at end of file diff --git a/apps/family/templates/family/family_list.html b/apps/family/templates/family/family_list.html index 55feed5e..f06eba6e 100644 --- a/apps/family/templates/family/family_list.html +++ b/apps/family/templates/family/family_list.html @@ -16,9 +16,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans "Challenges" %} + {% if can_manage %} {% trans "Manage" %} + {% endif %}
                diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index cd835c3d..06df632b 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -26,6 +26,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                + {% if can_add_achievement %}
                {# Family details column #}
                @@ -81,8 +82,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                + {% endif %} {# Create family/challenge buttons #} + {% if can_add_family or can_add_challenge %}

                {% trans "Create a family or challenge" %} @@ -100,10 +103,12 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endif %}

                + {% endif %} {# Buttons column #}
                + {% if can_add_achievement %}
                {# Tabs for list and search #}
                @@ -149,10 +154,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
                + {% endif %}
                {# achievement history #} +{% if table.data %}
                - +{% endif %} {% endblock %} diff --git a/apps/family/views.py b/apps/family/views.py index fee0c5ad..07ecc23c 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -6,6 +6,7 @@ from datetime import date from django.conf import settings from django.shortcuts import redirect from django.contrib.auth.mixins import LoginRequiredMixin +from django.core.exceptions import PermissionDenied from django.db import transaction from django.views.generic import DetailView, UpdateView, ListView from django.views.generic.edit import DeleteView, FormMixin @@ -51,6 +52,24 @@ class FamilyListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): table_class = FamilyTable extra_context = {"title": _('Families list')} + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + fake_family = Family(name="", description="") + fake_challenge = Challenge(name="", description="", points=0) + can_add_family = PermissionBackend.check_perm(self.request, "family.add_family", fake_family) + can_add_challenge = PermissionBackend.check_perm(self.request, "family.add_challenge", fake_challenge) + + if Family.objects.exists() and Challenge.objects.exists(): + fake_achievement = Achievement(family=Family.objects.first(), challenge=Challenge.objects.first(), valid=False) + can_add_achievement = PermissionBackend.check_perm(self.request, "family.add_achievement", fake_achievement) + else: + can_add_achievement = False + + context["can_manage"] = can_add_family or can_add_challenge or can_add_achievement + + return context + class FamilyDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): """ @@ -231,6 +250,24 @@ class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVie table_class = ChallengeTable extra_context = {"title": _('Challenges list')} + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + fake_family = Family(name="", description="") + fake_challenge = Challenge(name="", description="", points=0) + can_add_family = PermissionBackend.check_perm(self.request, "family.add_family", fake_family) + can_add_challenge = PermissionBackend.check_perm(self.request, "family.add_challenge", fake_challenge) + + if Family.objects.exists() and Challenge.objects.exists(): + fake_achievement = Achievement(family=Family.objects.first(), challenge=Challenge.objects.first(), valid=False) + can_add_achievement = PermissionBackend.check_perm(self.request, "family.add_achievement", fake_achievement) + else: + can_add_achievement = False + + context["can_manage"] = can_add_family or can_add_challenge or can_add_achievement + + return context + class ChallengeDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): """ @@ -283,6 +320,11 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView if not request.user.is_authenticated: return self.handle_no_permission() + perm = PermissionBackend.has_model_perm(self.request, Achievement(), "add") + perm = perm or PermissionBackend.has_model_perm(self.request, Challenge(), "add") + perm = perm or PermissionBackend.has_model_perm(self.request, Family(), "add") + if not perm: + raise PermissionDenied(_("You are not able to manage families and challenges.")) return super().dispatch(request, *args, **kwargs) def get_queryset(self, **kwargs): @@ -298,8 +340,9 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView PermissionBackend.filter_queryset(self.request, Challenge, "view") ).order_by('name') - context["can_add_family"] = PermissionBackend.check_perm(self.request, "family.family_create") - context["can_add_challenge"] = PermissionBackend.check_perm(self.request, "family.challenge_create") + context["can_add_family"] = PermissionBackend.has_model_perm(self.request, Family(), "add") + context["can_add_challenge"] = PermissionBackend.has_model_perm(self.request, Challenge(), "add") + context["can_add_achievement"] = PermissionBackend.has_model_perm(self.request, Achievement(), "add") # Get the user's family if they have one try: @@ -316,6 +359,13 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView table.orderable = False return table + def get_table_data(self, **kwargs): + qs = super().get_queryset(**kwargs) + + qs = qs.filter(PermissionBackend.filter_queryset(self.request, Achievement, "view")) + + return qs + class AchievementListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, ListView): """ @@ -325,6 +375,14 @@ class AchievementListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMi tables = [AchievementTable, AchievementTable, ] extra_context = {'title': _('Achievement list')} + def dispatch(self, request, *args, **kwargs): + if not request.user.is_authenticated: + return self.handle_no_permission() + + if not PermissionBackend.has_model_perm(self.request, Achievement(), "change"): + raise PermissionDenied(_("You are not able to see the achievement validation interface.")) + return super().dispatch(request, *args, **kwargs) + def get_tables(self, **kwargs): tables = super().get_tables(**kwargs) @@ -355,6 +413,19 @@ class AchievementValidateView(ProtectQuerysetMixin, LoginRequiredMixin, Template """ template_name = 'family/achievement_confirm_validate.html' + def dispatch(self, request, *args, **kwargs): + if not request.user.is_authenticated: + return self.handle_no_permission() + + fake_achievement = Achievement( + family=Family.objects.first(), + challenge=Challenge.objects.first(), + valid=False, + ) + if not PermissionBackend.check_perm(self.request, "family.change_achievement_valid", fake_achievement): + raise PermissionDenied() + return super().dispatch(request, *args, **kwargs) + def post(self, request, pk): achievement = Achievement.objects.get(pk=pk) @@ -370,5 +441,18 @@ class AchievementDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView """ model = Achievement + def dispatch(self, request, *args, **kwargs): + if not request.user.is_authenticated: + return self.handle_no_permission() + + fake_achievement = Achievement( + family=Family.objects.first(), + challenge=Challenge.objects.first(), + valid=False, + ) + if not PermissionBackend.check_perm(self.request, "family.change_achievement_valid", fake_achievement): + raise PermissionDenied() + return super().dispatch(request, *args, **kwargs) + def get_success_url(self): return reverse_lazy('family:achievement_list') diff --git a/apps/member/signals.py b/apps/member/signals.py index b1b8cd82..f07c8896 100644 --- a/apps/member/signals.py +++ b/apps/member/signals.py @@ -17,7 +17,6 @@ def save_user_profile(instance, created, raw, **_kwargs): def update_wei_registration_fee_on_membership_creation(sender, instance, created, **kwargs): if not hasattr(instance, "_no_signal") and created: - print('update_wei_registration_fee_on_membership_creation') from wei.models import WEIRegistration if instance.club.id == 1 or instance.club.id == 2: registrations = WEIRegistration.objects.filter( diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 248574e1..e642c4e6 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -4430,6 +4430,262 @@ "description": "Modifier le type de caution de mon inscription WEI tant qu'elle n'est pas validée" } }, + { + "model": "permission.permission", + "pk": 311, + "fields": { + "model": [ + "family", + "family" + ], + "query": "{}", + "type": "view", + "mask": 1, + "field": "", + "permanent": false, + "description": "Voir toutes les familles" + } + }, + { + "model": "permission.permission", + "pk": 312, + "fields": { + "model": [ + "family", + "family" + ], + "query": "{}", + "type": "add", + "mask": 2, + "field": "", + "permanent": false, + "description": "Créer une famille" + } + }, + { + "model": "permission.permission", + "pk": 313, + "fields": { + "model": [ + "family", + "family" + ], + "query": "{}", + "type": "change", + "mask": 2, + "field": "", + "permanent": false, + "description": "Modifier n'importe quelle famille" + } + }, + { + "model": "permission.permission", + "pk": 314, + "fields": { + "model": [ + "family", + "family" + ], + "query": "{\"pk\": [\"user\", \"family_memberships\", \"family\", \"pk\"]}", + "type": "change", + "mask": 2, + "field": "", + "permanent": false, + "description": "Modifier ma famille" + } + }, + { + "model": "permission.permission", + "pk": 315, + "fields": { + "model": [ + "family", + "familymembership" + ], + "query": "{}", + "type": "view", + "mask": 2, + "field": "", + "permanent": false, + "description": "Voir les membres de n'importe quelle famille" + } + }, + { + "model": "permission.permission", + "pk": 316, + "fields": { + "model": [ + "family", + "familymembership" + ], + "query": "{\"family\": [\"user\", \"family_memberships\", \"family\"]}", + "type": "view", + "mask": 1, + "field": "", + "permanent": false, + "description": "Voir les membres de ma famille" + } + }, + { + "model": "permission.permission", + "pk": 317, + "fields": { + "model": [ + "family", + "familymembership" + ], + "query": "{}", + "type": "add", + "mask": 2, + "field": "", + "permanent": false, + "description": "Ajouter un membre à n'importe quelle famille" + } + }, + { + "model": "permission.permission", + "pk": 318, + "fields": { + "model": [ + "family", + "familymembership" + ], + "query": "{\"family\": [\"user\", \"family_memberships\", \"family\"]}", + "type": "add", + "mask": 2, + "field": "", + "permanent": false, + "description": "Ajouter un membre à ma famille" + } + }, + { + "model": "permission.permission", + "pk": 319, + "fields": { + "model": [ + "family", + "challenge" + ], + "query": "{}", + "type": "view", + "mask": 1, + "field": "", + "permanent": false, + "description": "Voir tous les défis" + } + }, + { + "model": "permission.permission", + "pk": 320, + "fields": { + "model": [ + "family", + "challenge" + ], + "query": "{}", + "type": "add", + "mask": 2, + "field": "", + "permanent": false, + "description": "Créer un défi" + } + }, + { + "model": "permission.permission", + "pk": 321, + "fields": { + "model": [ + "family", + "challenge" + ], + "query": "{}", + "type": "change", + "mask": 2, + "field": "", + "permanent": false, + "description": "Modifier un défi" + } + }, + { + "model": "permission.permission", + "pk": 322, + "fields": { + "model": [ + "family", + "challenge" + ], + "query": "{}", + "type": "delete", + "mask": 2, + "field": "{}", + "permanent": false, + "description": "Supprimer un défi" + } + }, + { + "model": "permission.permission", + "pk": 323, + "fields": { + "model": [ + "family", + "achievement" + ], + "query": "{}", + "type": "view", + "mask": 1, + "field": "", + "permanent": false, + "description": "Voir tous les succès" + } + }, + { + "model": "permission.permission", + "pk": 324, + "fields": { + "model": [ + "family", + "achievement" + ], + "query": "{}", + "type": "add", + "mask": 2, + "field": "", + "permanent": false, + "description": "Créer un succès" + } + }, + { + "model": "permission.permission", + "pk": 325, + "fields": { + "model": [ + "family", + "achievement" + ], + "query": "{}", + "type": "change", + "mask": 1, + "field": "valid", + "permanent": false, + "description": "Valider un succès" + } + }, + { + "model": "permission.permission", + "pk": 326, + "fields": { + "model": [ + "family", + "achievement" + ], + "query": "{}", + "type": "delete", + "mask": 1, + "field": "", + "permanent": false, + "description": "Supprimer un succès" + } + }, { "model": "permission.role", "pk": 1, @@ -4482,9 +4738,13 @@ 206, 248, 249, - 255, - 256, - 257 + 255, + 256, + 257, + 311, + 316, + 319, + 323 ] } }, @@ -5008,7 +5268,7 @@ 216 ] } - }, + }, { "model": "permission.role", "pk": 23, @@ -5021,7 +5281,7 @@ 32 ] } - }, + }, { "model": "permission.role", "pk": 24, @@ -5030,7 +5290,7 @@ "name": "Staffeur⋅euse (S&L,Respo Tech,...)", "permissions": [] } - }, + }, { "model": "permission.role", "pk": 25, @@ -5056,7 +5316,7 @@ 293 ] } - }, + }, { "model": "permission.role", "pk": 28, @@ -5086,7 +5346,7 @@ 269 ] } - }, + }, { "model": "permission.role", "pk": 30, @@ -5094,15 +5354,15 @@ "for_club": 10, "name": "Respo sorties", "permissions": [ - 49, - 62, - 141, - 241, - 242, + 49, + 62, + 141, + 241, + 242, 243 ] } - }, + }, { "model": "permission.role", "pk": 31, @@ -5114,7 +5374,7 @@ 244 ] } - }, + }, { "model": "permission.role", "pk": 32, @@ -5126,7 +5386,7 @@ 245 ] } - }, + }, { "model": "permission.role", "pk": 33, @@ -5134,15 +5394,48 @@ "for_club": 10, "name": "Respo Jam", "permissions": [ - 247, - 250, - 251, - 252, - 253, + 247, + 250, + 251, + 252, + 253, 254 ] } - }, + }, + { + "model": "permission.role", + "pk": 34, + "fields": { + "for_club": 1, + "name": "Chef·fe de famille", + "permissions": [ + 314, + 318, + 324 + ] + } + }, + { + "model": "permission.role", + "pk": 35, + "fields": { + "for_club": 1, + "name": "Respo familles", + "permissions": [ + 312, + 313, + 315, + 317, + 320, + 321, + 322, + 324, + 325, + 326 + ] + } + }, { "model": "wei.weirole", "pk": 12, From 80f28aa7711cb2df2df5a2b97cded9aeb9475db9 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Wed, 13 Aug 2025 16:02:59 +0200 Subject: [PATCH 28/32] No hard coded phone number in template --- apps/family/templates/family/manage.html | 7 ++++++- apps/family/views.py | 11 +++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index 06df632b..b344bb5b 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -190,7 +190,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
              • The name of the challenge
              • A photo or video as proof
                • -

                Send it via WhatsApp to: +33 6 30 21 12 44

                +

                + Send it via WhatsApp to: + {% for num in phone_numbers %} + {{ num }}{% if not forloop.last %}, {% endif %} + {% endfor %} +

                diff --git a/apps/family/views.py b/apps/family/views.py index 07ecc23c..cdbb7a17 100644 --- a/apps/family/views.py +++ b/apps/family/views.py @@ -17,6 +17,7 @@ from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin, ProtectedCreateView from django.urls import reverse_lazy from member.forms import ImageForm +import phonenumbers from .models import Family, Challenge, FamilyMembership, User, Achievement from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable, FamilyAchievementTable @@ -351,6 +352,16 @@ class FamilyManageView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView except FamilyMembership.DoesNotExist: context["user_family"] = None + phone_numbers = [ + u.profile.phone_number for u in User.objects.filter( + memberships__roles__id=35, + memberships__date_end__gte=date.today(), + profile__phone_number__isnull=False + ).distinct() + ] + formatted_phone_numbers = [phonenumbers.format_number(num, phonenumbers.PhoneNumberFormat.INTERNATIONAL) for num in phone_numbers if num] + context["phone_numbers"] = formatted_phone_numbers + return context def get_table(self, **kwargs): From 61057b71ba46dc3dfe18c4f9901a6c6579768b58 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Wed, 13 Aug 2025 16:42:31 +0200 Subject: [PATCH 29/32] Fuzzy translations --- locale/fr/LC_MESSAGES/django.po | 463 +++++++++----------------------- 1 file changed, 132 insertions(+), 331 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 2e193678..94b609c8 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-12 22:55+0200\n" +"POT-Creation-Date: 2025-08-13 16:21+0200\n" "PO-Revision-Date: 2022-04-11 22:05+0200\n" "Last-Translator: ehouarn \n" "Language-Team: French \n" @@ -326,9 +326,6 @@ msgstr "Solde du compte" #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:18 #: note_kfet/templates/oauth2_provider/application_detail.html:39 #: note_kfet/templates/oauth2_provider/authorized-token-delete.html:12 -#: static/note_kfet/templates/oauth2_provider/application_confirm_delete.html:18 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:39 -#: static/note_kfet/templates/oauth2_provider/authorized-token-delete.html:12 msgid "Delete" msgstr "Supprimer" @@ -366,7 +363,7 @@ msgstr "Détails de l'activité" #: apps/note/models/transactions.py:261 #: apps/note/templates/note/transaction_form.html:17 #: apps/note/templates/note/transaction_form.html:152 -#: note_kfet/templates/base.html:78 static/note_kfet/templates/base.html:78 +#: note_kfet/templates/base.html:79 msgid "Transfer" msgstr "Virement" @@ -486,8 +483,7 @@ msgstr "Inviter" msgid "Create new activity" msgstr "Créer une nouvelle activité" -#: apps/activity/views.py:71 note_kfet/templates/base.html:103 -#: static/note_kfet/templates/base.html:103 +#: apps/activity/views.py:71 note_kfet/templates/base.html:104 msgid "Activities" msgstr "Activités" @@ -543,10 +539,8 @@ msgstr "API" #: apps/family/apps.py:11 apps/family/models.py:94 apps/family/models.py:159 #: apps/family/templates/family/challenge_detail.html:22 #: apps/member/templates/member/includes/profile_info.html:10 -#, fuzzy -#| msgid "Family" msgid "family" -msgstr "Famille" +msgstr "famille" #: apps/family/models.py:24 apps/family/templates/family/family_info.html:10 msgid "score" @@ -568,14 +562,11 @@ msgstr "Famille" #: apps/family/models.py:43 apps/family/templates/family/challenge_list.html:14 #: apps/family/templates/family/family_list.html:14 #: apps/family/templates/family/manage.html:15 -#: apps/family/templates/family/manage.html:47 note_kfet/templates/base.html:84 -#: static/note_kfet/templates/base.html:84 +#: apps/family/templates/family/manage.html:48 note_kfet/templates/base.html:85 msgid "Families" msgstr "Familles" #: apps/family/models.py:86 -#, fuzzy -#| msgid "memberships" msgid "family_memberships" msgstr "adhésions" @@ -589,66 +580,54 @@ msgid "year" msgstr "année" #: apps/family/models.py:104 -#, fuzzy -#| msgid "membership" msgid "family membership" msgstr "adhésion" #: apps/family/models.py:105 -#, fuzzy -#| msgid "memberships" msgid "family memberships" msgstr "adhésions" #: apps/family/models.py:108 -#, fuzzy, python-brace-format +#, python-brace-format #| msgid "Membership of {user} for the club {club}" msgid "Family membership of {user} to {family}" -msgstr "Adhésion de {user} pour le club {club}" +msgstr "Adhésion de {user} à la famille {family}" -#: apps/family/models.py:123 apps/family/templates/family/manage.html:132 -#: apps/family/templates/family/manage.html:143 +#: apps/family/models.py:123 apps/family/templates/family/manage.html:137 +#: apps/family/templates/family/manage.html:148 msgid "points" msgstr "" #: apps/family/models.py:146 -#, fuzzy -#| msgid "Challenge" msgid "challenge" -msgstr "Defis" +msgstr "défi" #: apps/family/models.py:147 -#, fuzzy -#| msgid "Challenges" msgid "challenges" -msgstr "Defis" +msgstr "défis" #: apps/family/models.py:163 -#, fuzzy -#| msgid "obtained_at" msgid "obtained at" -msgstr "Réalisé le" +msgstr "réalisé le" #: apps/family/models.py:173 msgid "achievement" -msgstr "" +msgstr "succès" #: apps/family/models.py:174 -#, fuzzy -#| msgid "Recent achievements history" msgid "achievements" -msgstr "Historique des derniers succès" +msgstr "succès" #: apps/family/models.py:177 #, python-brace-format msgid "Challenge {challenge} carried out by Family {family}" -msgstr "" +msgstr "Défi {challenge} réalisé par la famille {family}" #: apps/family/tables.py:20 apps/family/tables.py:43 apps/treasury/models.py:56 msgid "Description" msgstr "Description" -#: apps/family/tables.py:42 apps/family/templates/family/manage.html:55 +#: apps/family/tables.py:42 apps/family/templates/family/manage.html:56 #: apps/food/forms.py:171 apps/food/templates/food/qrcode.html:29 #: apps/food/templates/food/transformedfood_update.html:23 #: apps/note/templates/note/transaction_form.html:132 @@ -662,20 +641,18 @@ msgstr "" #: apps/family/tables.py:89 apps/family/tables.py:140 msgid "Challenge" -msgstr "Defis" +msgstr "Défi" #: apps/family/tables.py:94 apps/family/tables.py:95 #: apps/family/templates/family/achievement_confirm_validate.html:23 #: apps/treasury/templates/treasury/sogecredit_detail.html:63 -#: apps/wei/tables.py:60 apps/wei/tables.py:102 +#: apps/wei/tables.py:60 apps/wei/tables.py:131 msgid "Validate" msgstr "Valider" #: apps/family/templates/family/achievement_confirm_delete.html:10 -#, fuzzy -#| msgid "Recent achievements history" msgid "Delete achievement" -msgstr "Historique des derniers succès" +msgstr "Supprimer le succès" #: apps/family/templates/family/achievement_confirm_delete.html:14 #, fuzzy @@ -690,16 +667,12 @@ msgstr "" #: apps/family/templates/family/achievement_confirm_delete.html:20 #: apps/family/templates/family/achievement_confirm_validate.html:20 -#, fuzzy -#| msgid "Recent achievements history" msgid "Return to achievements list" -msgstr "Historique des derniers succès" +msgstr "Retour à la liste des succès" #: apps/family/templates/family/achievement_confirm_validate.html:10 -#, fuzzy -#| msgid "Validate account" msgid "Validate achievement" -msgstr "Valider le compte" +msgstr "Valider le succès" #: apps/family/templates/family/achievement_confirm_validate.html:14 #, fuzzy @@ -713,23 +686,17 @@ msgstr "" "pas être annulée." #: apps/family/templates/family/achievement_list.html:13 -#, fuzzy -#| msgid "Recent achievements history" msgid "Invalid achievements history" -msgstr "Historique des derniers succès" +msgstr "Historique des succès non validés" #: apps/family/templates/family/achievement_list.html:16 #: apps/family/templates/family/achievement_list.html:28 -#, fuzzy -#| msgid "Return to activity page" msgid "Return to management page" -msgstr "Retour à la page de l'activité" +msgstr "Retour à la page de gestion" #: apps/family/templates/family/achievement_list.html:25 -#, fuzzy -#| msgid "Recent achievements history" msgid "Valid achievements history" -msgstr "Historique des derniers succès" +msgstr "Historique des succès validés" #: apps/family/templates/family/base.html:29 #: apps/member/templates/member/base.html:57 @@ -751,28 +718,20 @@ msgid "View Profile" msgstr "Voir le profil" #: apps/family/templates/family/base.html:42 -#, fuzzy -#| msgid "Return to the food list" msgid "Return to the family list" -msgstr "Retour à la liste de nourriture" +msgstr "Retour à la liste des familles" #: apps/family/templates/family/challenge_detail.html:18 -#, fuzzy -#| msgid "Managed by BDE" msgid "Obtained by " -msgstr "Géré par le BDE" +msgstr "Obtenu par" #: apps/family/templates/family/challenge_detail.html:20 -#, fuzzy -#| msgid "Families" msgid "families" -msgstr "Familles" +msgstr "familles" #: apps/family/templates/family/challenge_detail.html:27 -#, fuzzy -#| msgid "Return to the food list" msgid "Return to the challenge list" -msgstr "Retour à la liste de nourriture" +msgstr "Retour à la liste des défis" #: apps/family/templates/family/challenge_detail.html:31 #: apps/food/templates/food/food_detail.html:38 @@ -782,84 +741,72 @@ msgstr "Modifier" #: apps/family/templates/family/challenge_list.html:17 #: apps/family/templates/family/family_list.html:17 #: apps/family/templates/family/manage.html:18 -#: apps/family/templates/family/manage.html:70 +#: apps/family/templates/family/manage.html:71 msgid "Challenges" msgstr "Defis" -#: apps/family/templates/family/challenge_list.html:20 -#: apps/family/templates/family/family_list.html:20 +#: apps/family/templates/family/challenge_list.html:21 +#: apps/family/templates/family/family_list.html:21 #: apps/family/templates/family/manage.html:21 msgid "Manage" msgstr "Gestion" -#: apps/family/templates/family/family_detail.html:12 -#, fuzzy -#| msgid "Club members" +#: apps/family/templates/family/family_detail.html:13 msgid "Family members" -msgstr "Membres du club" +msgstr "Membres de la famille" -#: apps/family/templates/family/family_detail.html:21 -#, fuzzy -#| msgid "Challenges" +#: apps/family/templates/family/family_detail.html:24 msgid "Completed challenges" -msgstr "Defis" +msgstr "Défis réalisés" -#: apps/family/templates/family/manage.html:37 -#, fuzzy -#| msgid "Please select a note" +#: apps/family/templates/family/manage.html:38 msgid "Please select a family" -msgstr "Sélectionnez une note" +msgstr "Sélectionnez une famille" -#: apps/family/templates/family/manage.html:58 -#, fuzzy -#| msgid "Select emitter" +#: apps/family/templates/family/manage.html:59 msgid "Select my family" -msgstr "Sélection de l'émetteur⋅rice" +msgstr "Sélectionner ma famille" -#: apps/family/templates/family/manage.html:78 +#: apps/family/templates/family/manage.html:79 msgid "Validate!" msgstr "Valider" -#: apps/family/templates/family/manage.html:88 +#: apps/family/templates/family/manage.html:91 msgid "Create a family or challenge" -msgstr "Créer une famille ou un challenge" +msgstr "Créer une famille ou un défi" -#: apps/family/templates/family/manage.html:93 +#: apps/family/templates/family/manage.html:96 msgid "Add a family" msgstr "Ajouter une famille" -#: apps/family/templates/family/manage.html:98 +#: apps/family/templates/family/manage.html:101 msgid "Add a challenge" -msgstr "Ajouter un challenge" +msgstr "Ajouter un défi" -#: apps/family/templates/family/manage.html:113 +#: apps/family/templates/family/manage.html:118 msgid "List" msgstr "Liste" -#: apps/family/templates/family/manage.html:118 +#: apps/family/templates/family/manage.html:123 #: apps/note/templates/note/conso_form.html:108 msgid "Search" msgstr "Recherche" -#: apps/family/templates/family/manage.html:138 -#, fuzzy -#| msgid "Add a challenge" +#: apps/family/templates/family/manage.html:143 msgid "Search challenge..." -msgstr "Ajouter un challenge" +msgstr "Chercher un défi..." -#: apps/family/templates/family/manage.html:160 +#: apps/family/templates/family/manage.html:167 msgid "Recent achievements history" msgstr "Historique des derniers succès" -#: apps/family/templates/family/manage.html:173 -#, fuzzy -#| msgid "Challenge" +#: apps/family/templates/family/manage.html:180 msgid "Challenge validated" -msgstr "Defis" +msgstr "Défi validé" -#: apps/family/templates/family/manage.html:189 +#: apps/family/templates/family/manage.html:201 msgid "OK" -msgstr "" +msgstr "OK" #: apps/family/templates/family/picture_update.html:40 #: apps/member/templates/member/picture_update.html:40 @@ -871,75 +818,61 @@ msgstr "Annuler" msgid "Crop and upload" msgstr "Recadrer et envoyer" -#: apps/family/views.py:30 -#, fuzzy -#| msgid "Create club" +#: apps/family/views.py:32 msgid "Create family" -msgstr "Créer un club" +msgstr "Créer une famille" -#: apps/family/views.py:52 -#, fuzzy -#| msgid "Families" +#: apps/family/views.py:54 msgid "Families list" -msgstr "Familles" +msgstr "Liste des familles" -#: apps/family/views.py:61 -#, fuzzy -#| msgid "Profile detail" +#: apps/family/views.py:81 msgid "Family detail" -msgstr "Détails de l'utilisateur⋅rice" +msgstr "Détails de la famille" -#: apps/family/views.py:109 -#, fuzzy -#| msgid "Update a meal" +#: apps/family/views.py:129 msgid "Update family" -msgstr "Modifier le plat" +msgstr "Modifier la famille" -#: apps/family/views.py:120 -#, fuzzy -#| msgid "Update note picture" +#: apps/family/views.py:140 msgid "Update family picture" -msgstr "Modifier la photo de la note" +msgstr "Modifier la photo de la famille" -#: apps/family/views.py:168 -#, fuzzy -#| msgid "Add new member to the club" +#: apps/family/views.py:188 msgid "Add a new member to the family" -msgstr "Ajouter un·e nouvelleau membre au club" - -#: apps/family/views.py:212 -#, fuzzy -#| msgid "Create a family or challenge" -msgid "Create challenge" -msgstr "Créer une famille ou un challenge" +msgstr "Ajouter un·e nouvelleau membre à la famille" #: apps/family/views.py:232 -#, fuzzy -#| msgid "Challenges" -msgid "Challenges list" -msgstr "Defis" +msgid "Create challenge" +msgstr "Créer un défi" -#: apps/family/views.py:241 apps/food/views.py:439 +#: apps/family/views.py:252 +msgid "Challenges list" +msgstr "Liste des défis" + +#: apps/family/views.py:279 apps/food/views.py:439 msgid "Details of:" msgstr "Détails de :" -#: apps/family/views.py:264 -#, fuzzy -#| msgid "Add a challenge" +#: apps/family/views.py:302 msgid "Update challenge" -msgstr "Ajouter un challenge" +msgstr "Modifier un défi" -#: apps/family/views.py:279 -#, fuzzy -#| msgid "Create a family or challenge" +#: apps/family/views.py:317 msgid "Manage families and challenges" -msgstr "Créer une famille ou un challenge" +msgstr "Gérer les familles et défis" -#: apps/family/views.py:326 -#, fuzzy -#| msgid "Recent achievements history" +#: apps/family/views.py:328 +msgid "You are not able to manage families and challenges." +msgstr "Vous n'êtes pas autorisé·e à gérer les familles et défis" + +#: apps/family/views.py:387 msgid "Achievement list" -msgstr "Historique des derniers succès" +msgstr "Liste des succès" + +#: apps/family/views.py:394 +msgid "You are not able to see the achievement validation interface." +msgstr "Vous n'êtes pas autorisé·e à voir l'interface de validation de défi." #: apps/food/apps.py:11 msgid "food" @@ -1005,7 +938,7 @@ msgid "order" msgstr "consigne" #: apps/food/models.py:107 apps/food/views.py:35 -#: note_kfet/templates/base.html:72 static/note_kfet/templates/base.html:72 +#: note_kfet/templates/base.html:73 msgid "Food" msgstr "Bouffe" @@ -1092,13 +1025,11 @@ msgstr "Voir l'aliment" #: apps/food/templates/food/food_list.html:38 #: note_kfet/templates/base_search.html:15 -#: static/note_kfet/templates/base_search.html:15 msgid "Search by attribute such as name..." msgstr "Chercher par un attribut tel que le nom..." #: apps/food/templates/food/food_list.html:50 #: note_kfet/templates/base_search.html:23 -#: static/note_kfet/templates/base_search.html:23 msgid "There is no results." msgstr "Il n'y a pas de résultat." @@ -1238,10 +1169,6 @@ msgstr "Aliment entièrement utilisé dans : {meal.name}" msgid "Update an aliment" msgstr "Modifier un aliment" -#: apps/food/views.py:439 -msgid "Details of:" -msgstr "Détails de :" - #: apps/food/views.py:449 apps/treasury/tables.py:149 msgid "Yes" msgstr "Oui" @@ -1348,9 +1275,9 @@ msgid "" "href=https://perso.crans.org/club-bde/Charte-anti-VSS.pdf target=_blank> " "available here in pdf" msgstr "" -"Cochez après avoir lu la charte anti-VSS disponible en " -"pdf ici" +"Cochez après avoir lu la charte anti-VSS disponible en pdf ici" #: apps/member/forms.py:62 msgid "You can't register to the note if you come from the future." @@ -2389,7 +2316,6 @@ msgstr "Ajouter" #: apps/wei/templates/wei/busteam_detail.html:20 #: apps/wei/templates/wei/busteam_detail.html:42 #: note_kfet/templates/oauth2_provider/application_detail.html:38 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:38 msgid "Edit" msgstr "Éditer" @@ -2560,8 +2486,7 @@ msgstr "Chercher un bouton" msgid "Update button" msgstr "Modifier le bouton" -#: apps/note/views.py:156 note_kfet/templates/base.html:66 -#: static/note_kfet/templates/base.html:66 +#: apps/note/views.py:156 note_kfet/templates/base.html:67 msgid "Consumptions" msgstr "Consommations" @@ -2725,30 +2650,27 @@ msgstr "Scopes disponibles" #: apps/permission/templates/permission/scopes.html:42 #: note_kfet/templates/oauth2_provider/application_list.html:24 -#: static/note_kfet/templates/oauth2_provider/application_list.html:24 msgid "No applications defined" msgstr "Pas d'application définie" #: apps/permission/templates/permission/scopes.html:43 #: note_kfet/templates/oauth2_provider/application_list.html:25 -#: static/note_kfet/templates/oauth2_provider/application_list.html:25 msgid "Click here" msgstr "Cliquez ici" #: apps/permission/templates/permission/scopes.html:43 #: note_kfet/templates/oauth2_provider/application_list.html:25 -#: static/note_kfet/templates/oauth2_provider/application_list.html:25 msgid "if you want to register a new one" msgstr "si vous voulez en enregistrer une nouvelle" #: apps/permission/views.py:71 #, python-brace-format msgid "" -"You don't have the permission to update this instance of the model \"{model}" -"\" with these parameters. Please correct your data and retry." +"You don't have the permission to update this instance of the model " +"\"{model}\" with these parameters. Please correct your data and retry." msgstr "" -"Vous n'avez pas la permission de modifier cette instance du modèle " -"« {model} » avec ces paramètres. Merci de les corriger et de réessayer." +"Vous n'avez pas la permission de modifier cette instance du modèle « {model} " +"» avec ces paramètres. Merci de les corriger et de réessayer." #: apps/permission/views.py:75 #, python-brace-format @@ -2759,8 +2681,7 @@ msgstr "" "Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » " "avec ces paramètres. Merci de les corriger et de réessayer." -#: apps/permission/views.py:111 note_kfet/templates/base.html:127 -#: static/note_kfet/templates/base.html:127 +#: apps/permission/views.py:111 note_kfet/templates/base.html:128 msgid "Rights" msgstr "Droits" @@ -2965,8 +2886,7 @@ msgstr "" msgid "Invalidate pre-registration" msgstr "Invalider l'inscription" -#: apps/treasury/apps.py:12 note_kfet/templates/base.html:109 -#: static/note_kfet/templates/base.html:109 +#: apps/treasury/apps.py:12 note_kfet/templates/base.html:110 msgid "Treasury" msgstr "Trésorerie" @@ -3308,11 +3228,6 @@ msgstr "" "Merci de demander à l'utilisateur·rice de recharger sa note avant de " "supprimer la demande de crédit." -#: apps/treasury/templates/treasury/sogecredit_detail.html:63 -#: apps/wei/tables.py:60 apps/wei/tables.py:131 -msgid "Validate" -msgstr "Valider" - #: apps/treasury/templates/treasury/sogecredit_detail.html:71 msgid "Return to credit list" msgstr "Retour à la liste des crédits" @@ -3378,7 +3293,7 @@ msgstr "Gérer les crédits de la Société générale" #: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48 #: apps/wei/models.py:72 apps/wei/models.py:197 -#: note_kfet/templates/base.html:115 static/note_kfet/templates/base.html:115 +#: note_kfet/templates/base.html:116 msgid "WEI" msgstr "WEI" @@ -3431,6 +3346,7 @@ msgid "Choose a word:" msgstr "Choisissez un mot :" #: apps/wei/forms/surveys/wei2025.py:173 +#, python-brace-format msgid "Choose {NB_WORDS} words:" msgstr "Choisissez {NB_WORDS} mots :" @@ -4144,8 +4060,7 @@ msgstr "données json" msgid "data in the wrapped and generated by the script generate_wrapped" msgstr "donnée dans le wrapped et générée par le script generate_wrapped" -#: apps/wrapped/models.py:70 note_kfet/templates/base.html:121 -#: static/note_kfet/templates/base.html:121 +#: apps/wrapped/models.py:70 note_kfet/templates/base.html:122 msgid "Wrapped" msgstr "Wrapped" @@ -4178,7 +4093,7 @@ msgid "Copy link" msgstr "Copier le lien" #: apps/wrapped/templates/wrapped/1/wrapped_base.html:16 -#: note_kfet/templates/base.html:14 static/note_kfet/templates/base.html:14 +#: note_kfet/templates/base.html:15 msgid "The ENS Paris-Saclay BDE note." msgstr "La note du BDE de l'ENS Paris-Saclay." @@ -4300,27 +4215,27 @@ msgstr "Le wrapped est public" msgid "List of wrapped" msgstr "Liste des wrapped" -#: note_kfet/settings/base.py:178 static/note_kfet/settings/base.py:178 +#: note_kfet/settings/base.py:181 msgid "German" msgstr "Allemand" -#: note_kfet/settings/base.py:179 static/note_kfet/settings/base.py:179 +#: note_kfet/settings/base.py:182 msgid "English" msgstr "Anglais" -#: note_kfet/settings/base.py:180 static/note_kfet/settings/base.py:180 +#: note_kfet/settings/base.py:183 msgid "Spanish" msgstr "Espagnol" -#: note_kfet/settings/base.py:181 static/note_kfet/settings/base.py:181 +#: note_kfet/settings/base.py:184 msgid "French" msgstr "Français" -#: note_kfet/templates/400.html:10 static/note_kfet/templates/400.html:10 +#: note_kfet/templates/400.html:10 msgid "Bad request" msgstr "Requête invalide" -#: note_kfet/templates/400.html:14 static/note_kfet/templates/400.html:14 +#: note_kfet/templates/400.html:14 msgid "" "Sorry, your request was bad. Don't know what could be wrong. An email has " "been sent to webmasters with the details of the error. You can now drink a " @@ -4330,25 +4245,23 @@ msgstr "" "Un e-mail a été envoyé aux responsables de la plateforme avec les détails de " "cette erreur. Vous pouvez désormais allez boire un coca." -#: note_kfet/templates/403.html:10 static/note_kfet/templates/403.html:10 +#: note_kfet/templates/403.html:10 msgid "Permission denied" msgstr "Accès refusé" -#: note_kfet/templates/403.html:13 static/note_kfet/templates/403.html:13 +#: note_kfet/templates/403.html:13 msgid "You don't have the right to perform this request." msgstr "Vous n'avez pas la permission d'exécuter cette requête." #: note_kfet/templates/403.html:15 note_kfet/templates/404.html:19 -#: static/note_kfet/templates/403.html:15 -#: static/note_kfet/templates/404.html:19 msgid "Exception message:" msgstr "Message d'erreur :" -#: note_kfet/templates/404.html:10 static/note_kfet/templates/404.html:10 +#: note_kfet/templates/404.html:10 msgid "Page not found" msgstr "Page inexistante" -#: note_kfet/templates/404.html:14 static/note_kfet/templates/404.html:14 +#: note_kfet/templates/404.html:14 #, python-format msgid "" "The requested path %(request_path)s was not found on the server." @@ -4356,11 +4269,11 @@ msgstr "" "Le chemin demandé %(request_path)s n'a pas été trouvé sur le " "serveur." -#: note_kfet/templates/500.html:10 static/note_kfet/templates/500.html:10 +#: note_kfet/templates/500.html:10 msgid "Server error" msgstr "Erreur du serveur" -#: note_kfet/templates/500.html:14 static/note_kfet/templates/500.html:14 +#: note_kfet/templates/500.html:14 msgid "" "Sorry, an error occurred when processing your request. An email has been " "sent to webmasters with the detail of the error, and this will be fixed " @@ -4372,55 +4285,45 @@ msgstr "" "boire une bière, avec modération." #: note_kfet/templates/autocomplete_model.html:15 -#: static/note_kfet/templates/autocomplete_model.html:15 msgid "Reset" msgstr "Réinitialiser" -#: note_kfet/templates/base.html:91 static/note_kfet/templates/base.html:91 +#: note_kfet/templates/base.html:92 msgid "Users" msgstr "Utilisateur·rices" -#: note_kfet/templates/base.html:97 static/note_kfet/templates/base.html:97 +#: note_kfet/templates/base.html:98 msgid "Clubs" msgstr "Clubs" -#: note_kfet/templates/base.html:132 static/note_kfet/templates/base.html:132 +#: note_kfet/templates/base.html:133 msgid "Admin" msgstr "Admin" -#: note_kfet/templates/base.html:146 static/note_kfet/templates/base.html:146 +#: note_kfet/templates/base.html:147 msgid "My account" msgstr "Mon compte" -#: note_kfet/templates/base.html:149 static/note_kfet/templates/base.html:149 +#: note_kfet/templates/base.html:152 msgid "Log out" msgstr "Se déconnecter" -#: note_kfet/templates/base.html:157 +#: note_kfet/templates/base.html:161 #: note_kfet/templates/registration/signup.html:6 #: note_kfet/templates/registration/signup.html:11 #: note_kfet/templates/registration/signup.html:28 -#: static/note_kfet/templates/base.html:157 -#: static/note_kfet/templates/registration/signup.html:6 -#: static/note_kfet/templates/registration/signup.html:11 -#: static/note_kfet/templates/registration/signup.html:28 msgid "Sign up" msgstr "Inscription" -#: note_kfet/templates/base.html:164 +#: note_kfet/templates/base.html:168 #: note_kfet/templates/registration/login.html:6 #: note_kfet/templates/registration/login.html:15 #: note_kfet/templates/registration/login.html:38 #: note_kfet/templates/registration/password_reset_complete.html:15 -#: static/note_kfet/templates/base.html:164 -#: static/note_kfet/templates/registration/login.html:6 -#: static/note_kfet/templates/registration/login.html:15 -#: static/note_kfet/templates/registration/login.html:38 -#: static/note_kfet/templates/registration/password_reset_complete.html:15 msgid "Log in" msgstr "Se connecter" -#: note_kfet/templates/base.html:178 static/note_kfet/templates/base.html:178 +#: note_kfet/templates/base.html:182 msgid "" "You are not a BDE member anymore. Please renew your membership if you want " "to use the note." @@ -4428,7 +4331,7 @@ msgstr "" "Vous n'êtes plus adhérent·e BDE. Merci de réadhérer si vous voulez profiter " "de la note." -#: note_kfet/templates/base.html:184 static/note_kfet/templates/base.html:184 +#: note_kfet/templates/base.html:188 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -4436,7 +4339,7 @@ msgstr "" "Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail " "et de cliquer sur le lien de validation." -#: note_kfet/templates/base.html:190 static/note_kfet/templates/base.html:190 +#: note_kfet/templates/base.html:194 msgid "" "You declared that you opened a bank account in the Société générale. The " "bank did not validate the creation of the account to the BDE, so the " @@ -4450,35 +4353,35 @@ msgstr "" "vérification peut durer quelques jours. Merci de vous assurer de bien aller " "au bout de vos démarches." -#: note_kfet/templates/base.html:213 static/note_kfet/templates/base.html:213 +#: note_kfet/templates/base.html:221 msgid "Contact us" msgstr "Nous contacter" -#: note_kfet/templates/base.html:215 static/note_kfet/templates/base.html:215 +#: note_kfet/templates/base.html:223 msgid "Technical Support" msgstr "Support technique" -#: note_kfet/templates/base.html:217 static/note_kfet/templates/base.html:217 +#: note_kfet/templates/base.html:225 msgid "Charte Info (FR)" msgstr "Charte Info (FR)" -#: note_kfet/templates/base.html:219 static/note_kfet/templates/base.html:219 +#: note_kfet/templates/base.html:227 msgid "FAQ (FR)" msgstr "FAQ (FR)" -#: note_kfet/templates/base.html:222 +#: note_kfet/templates/base.html:229 msgid "Managed by BDE" msgstr "Géré par le BDE" -#: note_kfet/templates/base.html:224 +#: note_kfet/templates/base.html:231 msgid "Hosted by Cr@ns" msgstr "Hébergé par le Cr@ans" -#: note_kfet/templates/base.html:266 +#: note_kfet/templates/base.html:273 msgid "The note is not available for now" msgstr "La note est indisponible pour le moment" -#: note_kfet/templates/base.html:268 +#: note_kfet/templates/base.html:275 msgid "Thank you for your understanding -- The Respos Info of BDE" msgstr "Merci de votre compréhension -- Les Respos Info du BDE" @@ -4519,44 +4422,35 @@ msgid "Connect to the service" msgstr "Connexion au service" #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:8 -#: static/note_kfet/templates/oauth2_provider/application_confirm_delete.html:8 msgid "Are you sure to delete the application" msgstr "Êtes-vous sûr⋅e de vouloir supprimer l'application" #: note_kfet/templates/oauth2_provider/application_confirm_delete.html:17 #: note_kfet/templates/oauth2_provider/authorize.html:28 -#: static/note_kfet/templates/oauth2_provider/application_confirm_delete.html:17 -#: static/note_kfet/templates/oauth2_provider/authorize.html:28 msgid "Cancel" msgstr "Annuler" #: note_kfet/templates/oauth2_provider/application_detail.html:11 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:11 msgid "Client id" msgstr "ID client" #: note_kfet/templates/oauth2_provider/application_detail.html:14 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:14 msgid "Client secret" msgstr "Secret client" #: note_kfet/templates/oauth2_provider/application_detail.html:17 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:17 msgid "Client type" msgstr "Type de client" #: note_kfet/templates/oauth2_provider/application_detail.html:20 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:20 msgid "Authorization Grant Type" msgstr "Type d'autorisation" #: note_kfet/templates/oauth2_provider/application_detail.html:23 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:23 msgid "Redirect Uris" msgstr "URIs de redirection" #: note_kfet/templates/oauth2_provider/application_detail.html:29 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:29 #, python-format msgid "" "You can go here to generate authorization " @@ -4570,23 +4464,18 @@ msgstr "" #: note_kfet/templates/oauth2_provider/application_detail.html:37 #: note_kfet/templates/oauth2_provider/application_form.html:23 -#: static/note_kfet/templates/oauth2_provider/application_detail.html:37 -#: static/note_kfet/templates/oauth2_provider/application_form.html:23 msgid "Go Back" msgstr "Retour en arrière" #: note_kfet/templates/oauth2_provider/application_form.html:12 -#: static/note_kfet/templates/oauth2_provider/application_form.html:12 msgid "Edit application" msgstr "Modifier l'application" #: note_kfet/templates/oauth2_provider/application_list.html:7 -#: static/note_kfet/templates/oauth2_provider/application_list.html:7 msgid "Your applications" msgstr "Vos applications" #: note_kfet/templates/oauth2_provider/application_list.html:11 -#: static/note_kfet/templates/oauth2_provider/application_list.html:11 msgid "" "You can find on this page the list of the applications that you already " "registered." @@ -4595,76 +4484,60 @@ msgstr "" "déjà enregistrées." #: note_kfet/templates/oauth2_provider/application_list.html:30 -#: static/note_kfet/templates/oauth2_provider/application_list.html:30 msgid "New Application" msgstr "Nouvelle application" #: note_kfet/templates/oauth2_provider/application_list.html:31 -#: static/note_kfet/templates/oauth2_provider/application_list.html:31 msgid "Authorized Tokens" msgstr "Jetons autorisés" #: note_kfet/templates/oauth2_provider/application_registration_form.html:5 -#: static/note_kfet/templates/oauth2_provider/application_registration_form.html:5 msgid "Register a new application" msgstr "Enregistrer une nouvelle application" #: note_kfet/templates/oauth2_provider/authorize.html:9 #: note_kfet/templates/oauth2_provider/authorize.html:29 -#: static/note_kfet/templates/oauth2_provider/authorize.html:9 -#: static/note_kfet/templates/oauth2_provider/authorize.html:29 msgid "Authorize" msgstr "Autoriser" #: note_kfet/templates/oauth2_provider/authorize.html:14 -#: static/note_kfet/templates/oauth2_provider/authorize.html:14 msgid "Application requires following permissions:" msgstr "L'application requiert les permissions suivantes :" #: note_kfet/templates/oauth2_provider/authorize.html:36 #: note_kfet/templates/oauth2_provider/authorized-oob.html:15 -#: static/note_kfet/templates/oauth2_provider/authorize.html:36 -#: static/note_kfet/templates/oauth2_provider/authorized-oob.html:15 msgid "Error:" msgstr "Erreur :" #: note_kfet/templates/oauth2_provider/authorized-oob.html:13 -#: static/note_kfet/templates/oauth2_provider/authorized-oob.html:13 msgid "Success" msgstr "Succès" #: note_kfet/templates/oauth2_provider/authorized-oob.html:21 -#: static/note_kfet/templates/oauth2_provider/authorized-oob.html:21 msgid "Please return to your application and enter this code:" msgstr "Merci de retourner à votre application et entrez ce code :" #: note_kfet/templates/oauth2_provider/authorized-token-delete.html:9 -#: static/note_kfet/templates/oauth2_provider/authorized-token-delete.html:9 msgid "Are you sure you want to delete this token?" msgstr "Êtes-vous sûr⋅e de vouloir supprimer ce jeton ?" #: note_kfet/templates/oauth2_provider/authorized-tokens.html:7 -#: static/note_kfet/templates/oauth2_provider/authorized-tokens.html:7 msgid "Tokens" msgstr "Jetons" #: note_kfet/templates/oauth2_provider/authorized-tokens.html:22 -#: static/note_kfet/templates/oauth2_provider/authorized-tokens.html:22 msgid "There are no authorized tokens yet." msgstr "Il n'y a pas encore de jeton autorisé." #: note_kfet/templates/registration/logged_out.html:13 -#: static/note_kfet/templates/registration/logged_out.html:13 msgid "Thanks for spending some quality time with the Web site today." msgstr "Merci d'avoir utilisé la Note Kfet." #: note_kfet/templates/registration/logged_out.html:14 -#: static/note_kfet/templates/registration/logged_out.html:14 msgid "Log in again" msgstr "Se connecter à nouveau" #: note_kfet/templates/registration/login.html:20 -#: static/note_kfet/templates/registration/login.html:20 #, python-format msgid "" "You are authenticated as %(username)s, but are not authorized to access this " @@ -4676,7 +4549,6 @@ msgstr "" "masque de permissions plus fort ?" #: note_kfet/templates/registration/login.html:30 -#: static/note_kfet/templates/registration/login.html:30 msgid "" "You must be logged with a staff account with the higher mask to access " "Django Admin." @@ -4685,17 +4557,14 @@ msgstr "" "pour accéder à Django Admin." #: note_kfet/templates/registration/login.html:40 -#: static/note_kfet/templates/registration/login.html:40 msgid "Forgotten your password or username?" msgstr "Mot de passe ou pseudo oublié ?" #: note_kfet/templates/registration/password_change_done.html:13 -#: static/note_kfet/templates/registration/password_change_done.html:13 msgid "Your password was changed." msgstr "Votre mot de passe a bien été changé." #: note_kfet/templates/registration/password_change_form.html:14 -#: static/note_kfet/templates/registration/password_change_form.html:14 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -4706,20 +4575,16 @@ msgstr "" #: note_kfet/templates/registration/password_change_form.html:16 #: note_kfet/templates/registration/password_reset_confirm.html:17 -#: static/note_kfet/templates/registration/password_change_form.html:16 -#: static/note_kfet/templates/registration/password_reset_confirm.html:17 msgid "Change my password" msgstr "Changer mon mot de passe" #: note_kfet/templates/registration/password_reset_complete.html:13 -#: static/note_kfet/templates/registration/password_reset_complete.html:13 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Votre mot de passe a été enregistré. Vous pouvez vous connecter dès à " "présent." #: note_kfet/templates/registration/password_reset_confirm.html:14 -#: static/note_kfet/templates/registration/password_reset_confirm.html:14 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -4728,7 +4593,6 @@ msgstr "" "seconde fois." #: note_kfet/templates/registration/password_reset_confirm.html:21 -#: static/note_kfet/templates/registration/password_reset_confirm.html:21 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -4737,7 +4601,6 @@ msgstr "" "déjà utilisé. Faites une nouvelle demande." #: note_kfet/templates/registration/password_reset_done.html:13 -#: static/note_kfet/templates/registration/password_reset_done.html:13 msgid "" "We've emailed you instructions for setting your password, if an account " "exists with the email you entered. You should receive them shortly." @@ -4746,7 +4609,6 @@ msgstr "" "passe." #: note_kfet/templates/registration/password_reset_done.html:14 -#: static/note_kfet/templates/registration/password_reset_done.html:14 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -4755,7 +4617,6 @@ msgstr "" "l'adresse associée à votre compte, et regarder également le dossier spam." #: note_kfet/templates/registration/password_reset_form.html:13 -#: static/note_kfet/templates/registration/password_reset_form.html:13 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -4764,12 +4625,10 @@ msgstr "" "les instructions pour choisir un nouveau mot de passe." #: note_kfet/templates/registration/password_reset_form.html:18 -#: static/note_kfet/templates/registration/password_reset_form.html:18 msgid "Reset my password" msgstr "Réinitialiser mon mot de passe" #: note_kfet/templates/registration/signup.html:15 -#: static/note_kfet/templates/registration/signup.html:15 msgid "" "If you already signed up, your registration is taken into account. The BDE " "must validate your account before your can log in. You have to go to the " @@ -5256,64 +5115,6 @@ msgstr "" #~ msgid "Obtained at" #~ msgstr "Réalisé le" -#, python-brace-format -#~ msgid "Food fully used in : {meal.name}" -#~ msgstr "Aliment entièrement utilisé dans : {meal.name}" - -#~ msgid "Hosted by Cr@ns" -#~ msgstr "Hébergé par le Cr@ans" - -#~ msgid "The note is not available for now" -#~ msgstr "La note est indisponible pour le moment" - -#~ msgid "Thank you for your understanding -- The Respos Info of BDE" -#~ msgstr "Merci de votre compréhension -- Les Respos Info du BDE" - -#~ msgid "" -#~ "

                Log In Successful

                You have successfully logged into the Central " -#~ "Authentication Service.
                For security reasons, please Log Out and Exit " -#~ "your web browser when you are done accessing services that require " -#~ "authentication!" -#~ msgstr "" -#~ "

                Connection réussie

                Vous vous êtes bien connecté au Service " -#~ "Central d'Authentification.
                Pour des raisons de sécurité, veuillez " -#~ "vous déconnecter et fermer votre navigateur internet une fois que vous " -#~ "aurez fini d'accéder aux services qui requiert une authentification !" - -#~ msgid "Log me out from all my sessions" -#~ msgstr "Me déconnecter de toutes mes sessions" - -#~ msgid "Forget the identity provider" -#~ msgstr "Oublier le fournisseur d'identité" - -#~ msgid "Logout" -#~ msgstr "Déconnexion" - -#~ msgid "Please log in" -#~ msgstr "Veuillez vous connecter" - -#~ msgid "Login" -#~ msgstr "Connexion" - -#~ msgid "Connect to the service" -#~ msgstr "Connexion au service" - -#~ msgid "caution amount" -#~ msgstr "montant de la caution" - -#~ msgid "caution type" -#~ msgstr "type de caution" - -#~ msgid "Caution amount" -#~ msgstr "Montant de la caution" - -#~ msgid "caution check given" -#~ msgstr "chèque de caution donné" - -#, python-format -#~ msgid "Caution %(name)s" -#~ msgstr "Caution %(name)s" - #, fuzzy #~| msgid "This activity is not validated yet." #~ msgid "Enter a valid IPv4 address." From 4d567cdcc7e22093b6ec197a6a77cc029a249340 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Wed, 13 Aug 2025 23:57:05 +0200 Subject: [PATCH 30/32] Achievement unicity && management pop-up behaviour --- apps/family/api/views.py | 19 ++++-- .../0005_alter_achievement_unique_together.py | 17 ++++++ apps/family/models.py | 1 + apps/family/static/family/js/achievements.js | 29 ++++++---- apps/family/templates/family/manage.html | 34 ++++++----- locale/fr/LC_MESSAGES/django.po | 58 +++++++++++++------ 6 files changed, 111 insertions(+), 47 deletions(-) create mode 100644 apps/family/migrations/0005_alter_achievement_unique_together.py diff --git a/apps/family/api/views.py b/apps/family/api/views.py index 79a719d1..b680e135 100644 --- a/apps/family/api/views.py +++ b/apps/family/api/views.py @@ -75,13 +75,24 @@ class BatchAchievementsAPIView(APIView): challenge_ids = request.data.get('challenges') families = Family.objects.filter(id__in=family_ids) challenges = Challenge.objects.filter(id__in=challenge_ids) + results = [] for family in families: for challenge in challenges: - a = Achievement(family=family, challenge=challenge) - a.save(update_score=False) - + a, created = Achievement.objects.get_or_create(family=family, challenge=challenge) + if created: + results.append({ + 'family': family.name, + 'challenge': challenge.name, + 'status': 'created' + }) + else: + results.append({ + 'family': family.name, + 'challenge': challenge.name, + 'status': 'error', + }) for family in families: family.update_score() Family.update_ranking() - return Response({'status': 'ok'}, status=status.HTTP_201_CREATED) + return Response({'results': results}, status=status.HTTP_201_CREATED) diff --git a/apps/family/migrations/0005_alter_achievement_unique_together.py b/apps/family/migrations/0005_alter_achievement_unique_together.py new file mode 100644 index 00000000..69e659b4 --- /dev/null +++ b/apps/family/migrations/0005_alter_achievement_unique_together.py @@ -0,0 +1,17 @@ +# Generated by Django 5.2.4 on 2025-08-13 20:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('family', '0004_remove_challenge_obtained'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='achievement', + unique_together={('challenge', 'family')}, + ), + ] diff --git a/apps/family/models.py b/apps/family/models.py index 71ccfa08..3ce27748 100644 --- a/apps/family/models.py +++ b/apps/family/models.py @@ -170,6 +170,7 @@ class Achievement(models.Model): ) class Meta: + unique_together = ('challenge', 'family',) verbose_name = _('achievement') verbose_name_plural = _('achievements') diff --git a/apps/family/static/family/js/achievements.js b/apps/family/static/family/js/achievements.js index b9774579..50cd5935 100644 --- a/apps/family/static/family/js/achievements.js +++ b/apps/family/static/family/js/achievements.js @@ -25,11 +25,6 @@ $(document).ready(function () { location.hash = this.getAttribute('href') }) - - // Ensure we begin in single consumption. Fix issue with TurboLinks and BootstrapJS - - - document.getElementById("consume_all").addEventListener('click', consumeAll) }) notes = [] @@ -140,13 +135,25 @@ function consumeAll () { headers: { 'X-CSRFToken': CSRF_TOKEN }, - success: function () { + success: function (data) { reset() - addMsg("Défis validés pour les familles !", 'success', 5000) - }, - error: function (e) { - reset() - addMsg("Erreur lors de la création des achievements.",'danger',5000) + data.results.forEach(function (result) { + if (result.status === 'created') { + addMsg( + interpolate(gettext('Invalid achievement for challenge %s ' + + 'and family %s created.'), [result.challenge, result.family]), + 'success', + 5000 + ) + } else { + addMsg( + interpolate(gettext('An achievement for challenge %s ' + + 'and family %s already exists.'), [result.challenge, result.family]), + 'danger', + 8000 + ) + } + }) } }) } diff --git a/apps/family/templates/family/manage.html b/apps/family/templates/family/manage.html index b344bb5b..596fcb3a 100644 --- a/apps/family/templates/family/manage.html +++ b/apps/family/templates/family/manage.html @@ -177,25 +177,27 @@ SPDX-License-Identifier: GPL-3.0-or-later
                - +
                -

                Are you sure you want to validate this challenge?

                -

                To have your challenge officially validated, please send a message with:

                -
                  -
                • The name of the family
                  • -
                • The name of the challenge
                  • -
                • A photo or video as proof
                  • -
                -

                - Send it via WhatsApp to: - {% for num in phone_numbers %} - {{ num }}{% if not forloop.last %}, {% endif %} - {% endfor %} -

                +

                {% trans "Are you sure you want to validate this challenge?" %}

                +

                {% trans "To have your challenge officially validated, please send a message with:" %}

                +
                  +
                • {% trans "The name of the family" %}
                  • +
                • {% trans "The name of the challenge" %}
                  • +
                • {% trans "A photo or video as proof" %}
                  • +
                +

                + {% trans "Send it via WhatsApp to:" %} + {% if phone_numbers %}" + {% for num in phone_numbers %} + {{ num }}{% if not forloop.last %}, {% endif %} + {% endfor %} + {% endif %} +

                @@ -227,6 +229,10 @@ SPDX-License-Identifier: GPL-3.0-or-later document.getElementById("consume_all").addEventListener("click", function () { $('#validationModal').modal('show'); }); + + $('#validationModal .btn-primary').on('click', function () { + consumeAll(); + }); {% if user_family %} document.getElementById("select_my_family").addEventListener("click", function () { diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 94b609c8..e1e6f079 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-08-13 16:21+0200\n" +"POT-Creation-Date: 2025-08-13 23:48+0200\n" "PO-Revision-Date: 2022-04-11 22:05+0200\n" "Last-Translator: ehouarn \n" "Language-Team: French \n" @@ -589,7 +589,6 @@ msgstr "adhésions" #: apps/family/models.py:108 #, python-brace-format -#| msgid "Membership of {user} for the club {club}" msgid "Family membership of {user} to {family}" msgstr "Adhésion de {user} à la famille {family}" @@ -610,15 +609,15 @@ msgstr "défis" msgid "obtained at" msgstr "réalisé le" -#: apps/family/models.py:173 +#: apps/family/models.py:174 msgid "achievement" msgstr "succès" -#: apps/family/models.py:174 +#: apps/family/models.py:175 msgid "achievements" msgstr "succès" -#: apps/family/models.py:177 +#: apps/family/models.py:178 #, python-brace-format msgid "Challenge {challenge} carried out by Family {family}" msgstr "Défi {challenge} réalisé par la famille {family}" @@ -655,15 +654,12 @@ msgid "Delete achievement" msgstr "Supprimer le succès" #: apps/family/templates/family/achievement_confirm_delete.html:14 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete this invoice? This action can't be undone." msgid "" "Are you sure you want to delete this achievement? This action can't be " "undone." msgstr "" -"Êtes-vous sûr⋅e de vouloir supprimer cette facture ? Cette action ne pourra " -"pas être annulée." +"Êtes-vous sûr⋅e de vouloir supprimer ce succès ? Cette action ne pourra pas " +"être annulée." #: apps/family/templates/family/achievement_confirm_delete.html:20 #: apps/family/templates/family/achievement_confirm_validate.html:20 @@ -675,15 +671,12 @@ msgid "Validate achievement" msgstr "Valider le succès" #: apps/family/templates/family/achievement_confirm_validate.html:14 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete this invoice? This action can't be undone." msgid "" "Are you sure you want to validate this achievement? This action can't be " "undone." msgstr "" -"Êtes-vous sûr⋅e de vouloir supprimer cette facture ? Cette action ne pourra " -"pas être annulée." +"Êtes-vous sûr⋅e de vouloir valider ce succès ? Cette action ne pourra pas " +"être annulée." #: apps/family/templates/family/achievement_list.html:13 msgid "Invalid achievements history" @@ -801,10 +794,36 @@ msgid "Recent achievements history" msgstr "Historique des derniers succès" #: apps/family/templates/family/manage.html:180 -msgid "Challenge validated" -msgstr "Défi validé" +msgid "Confirmation" +msgstr "Confirmation" -#: apps/family/templates/family/manage.html:201 +#: apps/family/templates/family/manage.html:186 +msgid "Are you sure you want to validate this challenge?" +msgstr "Êtes-vous sûr⋅e de vouloir valider ce défi ?" + +#: apps/family/templates/family/manage.html:187 +msgid "" +"To have your challenge officially validated, please send a message with:" +msgstr "" +"Pour que le défi soit officiellement validé, envoyez un message contenant :" + +#: apps/family/templates/family/manage.html:189 +msgid "The name of the family" +msgstr "Le nom de la famille" + +#: apps/family/templates/family/manage.html:190 +msgid "The name of the challenge" +msgstr "Le nom du défi" + +#: apps/family/templates/family/manage.html:191 +msgid "A photo or video as proof" +msgstr "Une preuve photo ou vidéo" + +#: apps/family/templates/family/manage.html:194 +msgid "Send it via WhatsApp to:" +msgstr "Envoyez le via WhasApp au :" + +#: apps/family/templates/family/manage.html:202 msgid "OK" msgstr "OK" @@ -4641,6 +4660,9 @@ msgstr "" "d'adhésion. Vous devez également valider votre adresse email en suivant le " "lien que vous avez reçu." +#~ msgid "Challenge validated" +#~ msgstr "Défi validé" + #~ msgid "Deposit amount" #~ msgstr "Caution" From c25f6ca2c109be5201eb513a8122e4bc9bcd7b28 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 14 Aug 2025 00:34:39 +0200 Subject: [PATCH 31/32] Corrected test --- apps/family/api/views.py | 2 +- apps/family/tests/test_family.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/family/api/views.py b/apps/family/api/views.py index b680e135..603a98ca 100644 --- a/apps/family/api/views.py +++ b/apps/family/api/views.py @@ -89,7 +89,7 @@ class BatchAchievementsAPIView(APIView): results.append({ 'family': family.name, 'challenge': challenge.name, - 'status': 'error', + 'status': 'existed', }) for family in families: family.update_score() diff --git a/apps/family/tests/test_family.py b/apps/family/tests/test_family.py index f2b31784..1dea7937 100644 --- a/apps/family/tests/test_family.py +++ b/apps/family/tests/test_family.py @@ -239,6 +239,12 @@ class TestBatchAchievements(APITestCase): Challenge.objects.create(name=f'Challenge {i}', description='', points=50) for i in range(3) ] + self.achievement = Achievement.objects.create( + family=self.families[0], + challenge=self.challenges[0], + valid=False, + ) + self.url = reverse("family:api:batch_achievements") def test_batch_achievement_creation(self): @@ -254,7 +260,11 @@ class TestBatchAchievements(APITestCase): ) self.assertEqual(response.status_code, 201) - self.assertEqual(response.data['status'], 'ok') + for result in response.data['results']: + if result['family'] == self.families[0].name and result['challenge'] == self.challenges[0].name: + self.assertEqual(result['status'], 'existed') + else: + self.assertEqual(result['status'], 'created') expected_count = len(family_ids) * len(challenge_ids) self.assertEqual(Achievement.objects.count(), expected_count) From 0d69695b00f7425f4559a5855f9ec670987a6350 Mon Sep 17 00:00:00 2001 From: Ehouarn Date: Thu, 28 Aug 2025 11:19:45 +0200 Subject: [PATCH 32/32] Last commit --- note_kfet/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index 4298947a..5bbed6c7 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -82,7 +82,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% if user.is_authenticated %}
              • {% url 'family:family_list' as url %} - {% trans 'Families' %} + {% trans 'Families' %}
                • {% endif %}