mirror of
				https://gitlab.crans.org/bde/nk20
				synced 2025-10-30 23:39:54 +01:00 
			
		
		
		
	Compare commits
	
		
			73 Commits
		
	
	
		
			phone_inpu
			...
			app_downlo
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 04001202f2 | ||
|  | af36d1427a | ||
|  | 75a59e0a7a | ||
|  | af39bf7068 | ||
|  | 4c40566513 | ||
|  | 7c45b59298 | ||
|  | 418268db27 | ||
|  | 73045586a3 | ||
|  | 22d668a75c | ||
|  | 5dfa12fad2 | ||
|  | 5af69f719d | ||
|  | 4f6b1d5b6c | ||
|  | d4cb464169 | ||
|  | 27a1f36183 | ||
|  | 83c8b9a3d0 | ||
|  | cb3b34f874 | ||
|  | 0962a3735e | ||
|  | 9907cfbd86 | ||
|  | ad90887691 | ||
|  | 47d2476b51 | ||
|  | 5d8720cf46 | ||
|  | 8700144dea | ||
|  | d17ab26f2f | ||
|  | 297f289d7e | ||
|  | 034ad9a4ce | ||
|  | 897d37f74d | ||
|  | 42fb0aa2d6 | ||
|  | 4bc43ec3cb | ||
|  | 00737da69f | ||
|  | 6eb192b823 | ||
|  | bcd6444ff2 | ||
|  | 2a638e7b32 | ||
|  | bb06206a9b | ||
|  | 55be3c9836 | ||
|  | 2ac19ab7be | ||
|  | 7d359dec13 | ||
|  | 1015a5dba1 | ||
|  | 8f9f650826 | ||
|  | 99a90867cc | ||
|  | 0d69695b00 | ||
|  | c25f6ca2c1 | ||
|  | 4d567cdcc7 | ||
|  | 61057b71ba | ||
|  | 80f28aa771 | ||
|  | f13a44702a | ||
|  | 85b857976a | ||
|  | 0c259155a8 | ||
|  | 4a9b7c1312 | ||
|  | 74f9c53c18 | ||
|  | b10b2fb3b6 | ||
|  | 4fa8ef4b56 | ||
|  | adc925e4b1 | ||
|  | c66cc14576 | ||
|  | db4d0dd83a | ||
|  | 2af671d61a | ||
|  | 4c3b714b56 | ||
|  | ea8fcad8b5 | ||
|  | 9e700fd3de | ||
|  | 67b936ae98 | ||
|  | ac56700705 | ||
|  | f64138605d | ||
|  | 40922843f8 | ||
|  | 57f43a8700 | ||
|  | a72572ded6 | ||
|  | e6839a1079 | ||
|  | ab9abc8520 | ||
|  | 249b797d5a | ||
|  | 65dd42fc97 | ||
|  | 3ebadf34bc | ||
|  | 6f4fbecdd0 | ||
|  | c7bd733911 | ||
|  | f6ad6197de | ||
|  | 6c7d86185a | 
| @@ -37,6 +37,11 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     <div id="guests_table"> | ||||
|         {% render_table guests %} | ||||
|     </div> | ||||
|     <div class="card-footer text-center"> | ||||
|         <button class="btn btn-block btn-primary mb-3" onclick="window.location.href='?_export=1&table=guests'"> | ||||
|             {% trans "Export to CSV" %} | ||||
|         </button> | ||||
|     </div> | ||||
| </div> | ||||
| {% endif %} | ||||
| {% endblock %} | ||||
|   | ||||
| @@ -1,4 +1,4 @@ | ||||
| {% extends "base.html" %} | ||||
| {% extends "base_search.html" %} | ||||
| {% comment %} | ||||
| SPDX-License-Identifier: GPL-3.0-or-later | ||||
| {% endcomment %} | ||||
| @@ -44,6 +44,8 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     <h3 class="card-header text-center"> | ||||
|         {% trans "All activities" %} | ||||
|     </h3> | ||||
|     {% render_table table %} | ||||
|     {% render_table all %} | ||||
| </div> | ||||
|  | ||||
| {{ block.super }} | ||||
| {% endblock %} | ||||
|   | ||||
| @@ -1,7 +1,7 @@ | ||||
| {% comment %} | ||||
| SPDX-License-Identifier: GPL-3.0-or-later | ||||
| {% endcomment %} | ||||
| {% load i18n perms pretty_money %} | ||||
| {% load i18n perms pretty_money dict_get %} | ||||
| {% url 'activity:activity_detail' activity.pk as activity_detail_url %} | ||||
|  | ||||
| <div id="activity_info" class="card bg-light shadow mb-3"> | ||||
| @@ -53,6 +53,12 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|             <dt class="col-xl-6">{% trans 'opened'|capfirst %}</dt> | ||||
|             <dd class="col-xl-6">{{ activity.open|yesno }}</dd> | ||||
|         </dl> | ||||
|         {% if show_entries|dict_get:activity %} | ||||
|             <h2 class="text-center"> | ||||
|                 {{ entries_count|dict_get:activity }} | ||||
|                 {% if entries_count|dict_get:activity >= 2 %}{% trans "entries" %}{% else %}{% trans "entry" %}{% endif %} | ||||
|             </h2> | ||||
|         {% endif %} | ||||
|     </div> | ||||
|  | ||||
|     <div class="card-footer text-center"> | ||||
|   | ||||
							
								
								
									
										0
									
								
								apps/activity/templatetags/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								apps/activity/templatetags/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										12
									
								
								apps/activity/templatetags/dict_get.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										12
									
								
								apps/activity/templatetags/dict_get.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,12 @@ | ||||
| # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| from django import template | ||||
|  | ||||
|  | ||||
| def dict_get(d, key): | ||||
|     return d.get(key) | ||||
|  | ||||
|  | ||||
| register = template.Library() | ||||
| register.filter('dict_get', dict_get) | ||||
| @@ -67,32 +67,65 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin | ||||
|     tables = [ | ||||
|         lambda data: ActivityTable(data, prefix="all-"), | ||||
|         lambda data: ActivityTable(data, prefix="upcoming-"), | ||||
|         lambda data: ActivityTable(data, prefix="search-"), | ||||
|     ] | ||||
|     extra_context = {"title": _("Activities")} | ||||
|  | ||||
|     def get_queryset(self, **kwargs): | ||||
|         return super().get_queryset(**kwargs).distinct() | ||||
|         """ | ||||
|         Filter the user list with the given pattern. | ||||
|         """ | ||||
|         return super().get_queryset().distinct() | ||||
|  | ||||
|     def get_tables_data(self): | ||||
|         # first table = all activities, second table = upcoming | ||||
|         # first table = all activities, second table = upcoming, third table = search | ||||
|  | ||||
|         # table search | ||||
|         qs = self.get_queryset().order_by('-date_start') | ||||
|         if "search" in self.request.GET and self.request.GET['search']: | ||||
|             pattern = self.request.GET['search'] | ||||
|  | ||||
|             # check regex | ||||
|             valid_regex = is_regex(pattern) | ||||
|             suffix = '__iregex' if valid_regex else '__istartswith' | ||||
|             prefix = '^' if valid_regex else '' | ||||
|             qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern}) | ||||
|                            | Q(**{f'organizer__name{suffix}': prefix + pattern}) | ||||
|                            | Q(**{f'organizer__note__alias__name{suffix}': prefix + pattern})) | ||||
|         else: | ||||
|             qs = qs.none() | ||||
|         search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Activity, 'view')) | ||||
|  | ||||
|         return [ | ||||
|             self.get_queryset().order_by("-date_start"), | ||||
|             Activity.objects.filter(date_end__gt=timezone.now()) | ||||
|                             .filter(PermissionBackend.filter_queryset(self.request, Activity, "view")) | ||||
|                             .distinct() | ||||
|                             .order_by("date_start") | ||||
|                             .order_by("date_start"), | ||||
|             search_table, | ||||
|         ] | ||||
|  | ||||
|     def get_context_data(self, **kwargs): | ||||
|         context = super().get_context_data(**kwargs) | ||||
|  | ||||
|         tables = context["tables"] | ||||
|         for name, table in zip(["table", "upcoming"], tables): | ||||
|         for name, table in zip(["all", "upcoming", "table"], tables): | ||||
|             context[name] = table | ||||
|  | ||||
|         started_activities = self.get_queryset().filter(open=True, valid=True).distinct().all() | ||||
|         context["started_activities"] = started_activities | ||||
|  | ||||
|         entries_count = {} | ||||
|         show_entries = {} | ||||
|         for activity in started_activities: | ||||
|             if activity.activity_type.manage_entries: | ||||
|                 entries = Entry.objects.filter(activity=activity) | ||||
|                 entries_count[activity] = entries.count() | ||||
|  | ||||
|                 show_entries[activity] = True | ||||
|         context["entries_count"] = entries_count | ||||
|         context["show_entries"] = show_entries | ||||
|  | ||||
|         return context | ||||
|  | ||||
|  | ||||
| @@ -103,12 +136,19 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix | ||||
|     model = Activity | ||||
|     context_object_name = "activity" | ||||
|     extra_context = {"title": _("Activity detail")} | ||||
|     export_formats = ["csv"] | ||||
|  | ||||
|     tables = [ | ||||
|         lambda data: GuestTable(data, prefix="guests-"), | ||||
|         lambda data: OpenerTable(data, prefix="opener-"), | ||||
|         GuestTable, | ||||
|         OpenerTable, | ||||
|     ] | ||||
|  | ||||
|     def get_tables(self): | ||||
|         tables = super().get_tables() | ||||
|         tables[0].prefix = "guests" | ||||
|         tables[1].prefix = "opener" | ||||
|         return tables | ||||
|  | ||||
|     def get_tables_data(self): | ||||
|         return [ | ||||
|             Guest.objects.filter(activity=self.object) | ||||
| @@ -117,6 +157,51 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix | ||||
|                               .filter(PermissionBackend.filter_queryset(self.request, Opener, "view")), | ||||
|         ] | ||||
|  | ||||
|     def render_to_response(self, context, **response_kwargs): | ||||
|         """ | ||||
|         Gère l'export CSV manuel pour MultiTableMixin. | ||||
|         """ | ||||
|         if "_export" in self.request.GET: | ||||
|             import tablib | ||||
|             table_name = self.request.GET.get("table") | ||||
|             if table_name: | ||||
|                 tables = self.get_tables() | ||||
|                 data_list = self.get_tables_data() | ||||
|  | ||||
|                 for t, d in zip(tables, data_list): | ||||
|                     if t.prefix == table_name: | ||||
|                         # Préparer le CSV | ||||
|                         dataset = tablib.Dataset() | ||||
|                         columns = list(t.base_columns)  # noms des colonnes | ||||
|                         dataset.headers = columns | ||||
|  | ||||
|                         for row in d: | ||||
|                             values = [] | ||||
|                             for col in columns: | ||||
|                                 try: | ||||
|                                     val = getattr(row, col, "") | ||||
|                                     # Gestion spéciale pour la colonne 'entry' | ||||
|                                     if col == "entry": | ||||
|                                         if getattr(row, "has_entry", False): | ||||
|                                             val = timezone.localtime(row.entry.time).strftime("%Y-%m-%d %H:%M:%S") | ||||
|                                         else: | ||||
|                                             val = "" | ||||
|                                     values.append(str(val) if val is not None else "") | ||||
|                                 except Exception:  # RelatedObjectDoesNotExist ou autre | ||||
|                                     values.append("") | ||||
|                             dataset.append(values) | ||||
|  | ||||
|                         csv_bytes = dataset.export("csv") | ||||
|                         if isinstance(csv_bytes, str): | ||||
|                             csv_bytes = csv_bytes.encode("utf-8") | ||||
|  | ||||
|                         response = HttpResponse(csv_bytes, content_type="text/csv") | ||||
|                         response["Content-Disposition"] = f'attachment; filename="{table_name}.csv"' | ||||
|                         return response | ||||
|  | ||||
|         # Sinon rendu normal | ||||
|         return super().render_to_response(context, **response_kwargs) | ||||
|  | ||||
|     def get_context_data(self, **kwargs): | ||||
|         context = super().get_context_data() | ||||
|  | ||||
| @@ -137,6 +222,14 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMix | ||||
|                 "placeholder": "" | ||||
|             } | ||||
|         } | ||||
|         if self.object.activity_type.manage_entries: | ||||
|             entries = Entry.objects.filter(activity=self.object) | ||||
|             context["entries_count"] = {self.object: entries.count()} | ||||
|  | ||||
|             context["show_entries"] = {self.object: timezone.now() > timezone.localtime(self.object.date_start)} | ||||
|         else: | ||||
|             context["entries_count"] = {self.object: 0} | ||||
|             context["show_entries"] = {self.object: False} | ||||
|  | ||||
|         return context | ||||
|  | ||||
|   | ||||
| @@ -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') | ||||
|   | ||||
							
								
								
									
										0
									
								
								apps/family/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								apps/family/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										0
									
								
								apps/family/api/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								apps/family/api/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										46
									
								
								apps/family/api/serializers.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										46
									
								
								apps/family/api/serializers.py
									
									
									
									
									
										Normal file
									
								
							| @@ -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__' | ||||
							
								
								
									
										20
									
								
								apps/family/api/urls.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								apps/family/api/urls.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,20 @@ | ||||
| # 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 | ||||
|  | ||||
|  | ||||
| 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) | ||||
|  | ||||
|  | ||||
| urlpatterns = [ | ||||
|     path('achievements/batch/', BatchAchievementsAPIView.as_view(), name='batch_achievements') | ||||
| ] | ||||
							
								
								
									
										98
									
								
								apps/family/api/views.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										98
									
								
								apps/family/api/views.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,98 @@ | ||||
| # 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 api.filters import RegexSafeSearchFilter | ||||
| from rest_framework.views import APIView | ||||
| from rest_framework.permissions import IsAuthenticated | ||||
| from rest_framework.response import Response | ||||
| from rest_framework import status | ||||
|  | ||||
| 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.objects.order_by('id') | ||||
|     serializer_class = FamilySerializer | ||||
|     filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter] | ||||
|     filterset_fields = ['name', 'description', 'score', 'rank', ] | ||||
|     search_fields = ['$name', '$description', ] | ||||
|  | ||||
|  | ||||
| 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.objects.order_by('id') | ||||
|     serializer_class = FamilyMembershipSerializer | ||||
|     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): | ||||
|     """ | ||||
|     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.objects.order_by('id') | ||||
|     serializer_class = ChallengeSerializer | ||||
|     filter_backends = [DjangoFilterBackend, RegexSafeSearchFilter] | ||||
|     filterset_fields = ['name', 'description', 'points', ] | ||||
|     search_fields = ['$name', '$description', '$points', ] | ||||
|  | ||||
|  | ||||
| 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.objects.order_by('id') | ||||
|     serializer_class = AchievementSerializer | ||||
|     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): | ||||
|         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) | ||||
|         results = [] | ||||
|         for family in families: | ||||
|             for challenge in challenges: | ||||
|                 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': 'existed', | ||||
|                     }) | ||||
|         for family in families: | ||||
|             family.update_score() | ||||
|         Family.update_ranking() | ||||
|  | ||||
|         return Response({'results': results}, status=status.HTTP_201_CREATED) | ||||
							
								
								
									
										11
									
								
								apps/family/apps.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										11
									
								
								apps/family/apps.py
									
									
									
									
									
										Normal file
									
								
							| @@ -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') | ||||
							
								
								
									
										44
									
								
								apps/family/forms.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										44
									
								
								apps/family/forms.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,44 @@ | ||||
| # 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 note_kfet.inputs import Autocomplete | ||||
|  | ||||
| from .models import Challenge, FamilyMembership, User, Family | ||||
|  | ||||
|  | ||||
| class ChallengeForm(forms.ModelForm): | ||||
|     """ | ||||
|     To update a challenge | ||||
|     """ | ||||
|     class Meta: | ||||
|         model = Challenge | ||||
|         fields = ('name', 'description', 'points',) | ||||
|         widgets = { | ||||
|             "points": NumberInput() | ||||
|         } | ||||
|  | ||||
|  | ||||
| class FamilyForm(forms.ModelForm): | ||||
|     class Meta: | ||||
|         model = Family | ||||
|         fields = ('name', 'description', ) | ||||
|  | ||||
|  | ||||
| class FamilyMembershipForm(forms.ModelForm): | ||||
|     class Meta: | ||||
|         model = FamilyMembership | ||||
|         fields = ('user', ) | ||||
|  | ||||
|         widgets = { | ||||
|             "user": | ||||
|                 Autocomplete( | ||||
|                     User, | ||||
|                     attrs={ | ||||
|                         'api_url': '/api/user/', | ||||
|                         'name_field': 'username', | ||||
|                         'placeholder': 'Nom ...', | ||||
|                     }, | ||||
|                 ) | ||||
|         } | ||||
							
								
								
									
										73
									
								
								apps/family/migrations/0001_initial.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										73
									
								
								apps/family/migrations/0001_initial.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,73 @@ | ||||
| # Generated by Django 4.2.21 on 2025-07-06 16:07 | ||||
|  | ||||
| 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='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(default=0, verbose_name='obtained')), | ||||
|             ], | ||||
|             options={ | ||||
|                 'verbose_name': 'challenge', | ||||
|                 'verbose_name_plural': 'challenges', | ||||
|             }, | ||||
|         ), | ||||
|         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(default=0, verbose_name='score')), | ||||
|                 ('rank', models.PositiveIntegerField(verbose_name='rank')), | ||||
|             ], | ||||
|             options={ | ||||
|                 'verbose_name': 'Family', | ||||
|                 'verbose_name_plural': 'Families', | ||||
|             }, | ||||
|         ), | ||||
|         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')}, | ||||
|             }, | ||||
|         ), | ||||
|     ] | ||||
							
								
								
									
										18
									
								
								apps/family/migrations/0002_family_display_image.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								apps/family/migrations/0002_family_display_image.py
									
									
									
									
									
										Normal file
									
								
							| @@ -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'), | ||||
|         ), | ||||
|     ] | ||||
| @@ -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'), | ||||
|         ), | ||||
|     ] | ||||
							
								
								
									
										17
									
								
								apps/family/migrations/0004_remove_challenge_obtained.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								apps/family/migrations/0004_remove_challenge_obtained.py
									
									
									
									
									
										Normal file
									
								
							| @@ -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', | ||||
|         ), | ||||
|     ] | ||||
| @@ -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')}, | ||||
|         ), | ||||
|     ] | ||||
							
								
								
									
										0
									
								
								apps/family/migrations/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								apps/family/migrations/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										207
									
								
								apps/family/models.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										207
									
								
								apps/family/models.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,207 @@ | ||||
| # 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 | ||||
| from django.urls import reverse_lazy | ||||
| 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'), | ||||
|         default=0, | ||||
|     ) | ||||
|  | ||||
|     rank = models.PositiveIntegerField( | ||||
|         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') | ||||
|  | ||||
|     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")) | ||||
|         self.score = points_sum["points__sum"] if points_sum["points__sum"] else 0 | ||||
|         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( | ||||
|         User, | ||||
|         on_delete=models.PROTECT, | ||||
|         related_name=_('family_memberships'), | ||||
|         verbose_name=_('user'), | ||||
|     ) | ||||
|  | ||||
|     family = models.ForeignKey( | ||||
|         Family, | ||||
|         on_delete=models.PROTECT, | ||||
|         related_name=_('memberships'), | ||||
|         verbose_name=_('family'), | ||||
|     ) | ||||
|  | ||||
|     year = models.PositiveIntegerField( | ||||
|         verbose_name=_('year'), | ||||
|         default=timezone.now().year, | ||||
|     ) | ||||
|  | ||||
|     class Meta: | ||||
|         unique_together = ('user', 'year',) | ||||
|         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 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'), | ||||
|     ) | ||||
|  | ||||
|     @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): | ||||
|         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') | ||||
|         verbose_name_plural = _('challenges') | ||||
|  | ||||
|  | ||||
| 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, | ||||
|     ) | ||||
|  | ||||
|     valid = models.BooleanField( | ||||
|         verbose_name=_('valid'), | ||||
|         default=False, | ||||
|     ) | ||||
|  | ||||
|     class Meta: | ||||
|         unique_together = ('challenge', 'family',) | ||||
|         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, update_score=True, **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) | ||||
|  | ||||
|         super().save(*args, **kwargs) | ||||
|  | ||||
|         if update_score: | ||||
|             self.family.refresh_from_db() | ||||
|             self.family.update_score() | ||||
|  | ||||
|     @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) | ||||
|  | ||||
|         # Delete the achievement | ||||
|         super().delete(*args, **kwargs) | ||||
|  | ||||
|         # Remove points from the family | ||||
|         self.family.refresh_from_db() | ||||
|         self.family.update_score() | ||||
							
								
								
									
										
											BIN
										
									
								
								apps/family/static/family/img/default_picture.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								apps/family/static/family/img/default_picture.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 4.0 KiB | 
							
								
								
									
										411
									
								
								apps/family/static/family/js/achievements.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										411
									
								
								apps/family/static/family/js/achievements.js
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,411 @@ | ||||
| // 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('/family/manage/ #history') | ||||
| } | ||||
|  | ||||
| $(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') | ||||
|   }) | ||||
|  | ||||
| }) | ||||
|  | ||||
| notes = [] | ||||
| notes_display = [] | ||||
| buttons = [] | ||||
|  | ||||
| // When the user searches an alias, we update the auto-completion | ||||
| autoCompleteFamily('note', 'note_list', notes, notes_display, | ||||
|   'note', 'user_note', 'profile_pic', function () { | ||||
|     return true | ||||
|   }) | ||||
|  | ||||
| /** | ||||
|  * Add a transaction from a button. | ||||
|  * @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 | ||||
|  * @param category_name The category name | ||||
|  * @param template_id The identifier of the button | ||||
|  * @param template_name The name of  the button | ||||
|  */ | ||||
| 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 === id) { | ||||
|       challenge = b | ||||
|     } | ||||
|   }) | ||||
|   if (challenge == null) { | ||||
|     challenge = { | ||||
|       id: id, | ||||
|       name: name, | ||||
|     } | ||||
|     buttons.push(challenge) | ||||
|   } | ||||
|  | ||||
|   const dc_obj = true | ||||
|    | ||||
|     const list = 'consos_list' | ||||
|     let html = '' | ||||
|     buttons.forEach(function (challenge) { | ||||
|       html += li('conso_button_' + challenge.id, challenge.name) | ||||
|     }) | ||||
|     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)() | ||||
|       }) | ||||
|     }) | ||||
|  | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * 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() | ||||
|   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) { | ||||
|     // ... gestion erreur ... | ||||
|     error = true | ||||
|   } | ||||
|   if (buttons.length === 0) { | ||||
|     // ... gestion erreur ... | ||||
|     error = true | ||||
|   } | ||||
|   if (error) { | ||||
|     LOCK = false | ||||
|     return | ||||
|   } | ||||
|   // 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 (data) { | ||||
|       reset() | ||||
|       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 | ||||
|           ) | ||||
|         } | ||||
|       }) | ||||
|     } | ||||
|   }) | ||||
| } | ||||
|  | ||||
|  | ||||
| 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() | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
|  | ||||
| /** | ||||
|  * 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 <li> entry with a given id and text | ||||
|  */ | ||||
| function li (id, text, extra_css) { | ||||
|   return '<li class="list-group-item py-1 px-2 d-flex justify-content-between align-items-center text-truncate ' + | ||||
|         (extra_css || '') + '"' + ' id="' + id + '">' + text + '</li>\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 <li> 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) | ||||
|   // 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 = '<ul class="list-group list-group-flush">' | ||||
|         results.results.forEach(function (family) { | ||||
|           matched_html += li(family_prefix + '_' + family.id, | ||||
|             family.name, | ||||
|             '') | ||||
|           families.push(family) | ||||
|         }) | ||||
|         matched_html += '</ul>' | ||||
|  | ||||
|         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) { | ||||
|                 disp = d | ||||
|               } | ||||
|             }) | ||||
|             if (disp == null) { | ||||
|               disp = { | ||||
|                 name: family.name, | ||||
|                 id: family.id, | ||||
|                 family: family, | ||||
|               } | ||||
|               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, | ||||
|                 '') | ||||
|             }) | ||||
|  | ||||
|             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 <li> | ||||
|  * @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) { | ||||
|     }) | ||||
|  | ||||
|     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) | ||||
|       }) | ||||
|     }) | ||||
|   } | ||||
| } | ||||
							
								
								
									
										149
									
								
								apps/family/tables.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										149
									
								
								apps/family/tables.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,149 @@ | ||||
| # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| 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 | ||||
|     """ | ||||
|  | ||||
|     description = tables.Column(verbose_name=_("Description")) | ||||
|  | ||||
|     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',) | ||||
|         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.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' | ||||
|         } | ||||
|         order_by = ('id',) | ||||
|         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): | ||||
|     """ | ||||
|     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("<a href='{url}'>{name}</a>", | ||||
|                             url=reverse_lazy('member:user_detail', kwargs={"pk": value.pk}), name=s) | ||||
|         return s | ||||
|  | ||||
|     class Meta: | ||||
|         attrs = { | ||||
|             'class': 'table table-condensed table-striped', | ||||
|             'style': 'table-layout: fixed;' | ||||
|         } | ||||
|         template_name = 'django_tables2/bootstrap4.html' | ||||
|         fields = ('user',) | ||||
|         model = FamilyMembership | ||||
|  | ||||
|  | ||||
| class AchievementTable(tables.Table): | ||||
|     """ | ||||
|     List recent achievements. | ||||
|     """ | ||||
|  | ||||
|     challenge = tables.Column(verbose_name=_("Challenge")) | ||||
|  | ||||
|     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')], | ||||
|         verbose_name=_("Delete"), | ||||
|         text=_("Delete"), | ||||
|         orderable=False, | ||||
|         attrs={ | ||||
|             'th': { | ||||
|                 'id': 'delete-achievement-header' | ||||
|             }, | ||||
|             'a': { | ||||
|                 'class': 'btn btn-danger', | ||||
|                 'data-type': 'delete-achievement' | ||||
|             } | ||||
|         }, | ||||
|     ) | ||||
|  | ||||
|     class Meta: | ||||
|         attrs = { | ||||
|             'class': 'table table-condensed table-striped table-hover' | ||||
|         } | ||||
|         model = Achievement | ||||
|         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. | ||||
|     """ | ||||
|  | ||||
|     challenge = tables.Column(verbose_name=_("Challenge")) | ||||
|  | ||||
|     class Meta: | ||||
|         model = Achievement | ||||
|         template_name = 'django_tables2/bootstrap4.html' | ||||
|         fields = ('challenge', 'challenge__points', 'obtained_at', 'valid') | ||||
|         attrs = { | ||||
|             'class': 'table table-condensed table-striped table-hover' | ||||
|         } | ||||
|         order_by = ('-obtained_at',) | ||||
							
								
								
									
										25
									
								
								apps/family/templates/family/achievement_confirm_delete.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								apps/family/templates/family/achievement_confirm_delete.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | ||||
| {% extends "base.html" %} | ||||
| {% comment %} | ||||
| SPDX-License-Identifier: GPL-3.0-or-later | ||||
| {% endcomment %} | ||||
| {% load i18n crispy_forms_tags %} | ||||
|  | ||||
| {% block content %} | ||||
|     <div class="card bg-light"> | ||||
|         <div class="card-header text-center"> | ||||
|             <h4>{% trans "Delete achievement" %}</h4> | ||||
|         </div> | ||||
|             <div class="card-body"> | ||||
|                 <div class="alert alert-warning"> | ||||
|                     {% blocktrans %}Are you sure you want to delete this achievement? This action can't be undone.{% endblocktrans %} | ||||
|                 </div> | ||||
|             </div> | ||||
|         <div class="card-footer text-center"> | ||||
|             <form method="post"> | ||||
|                 {% csrf_token %} | ||||
|                 <a class="btn btn-primary" href="{% url 'family:achievement_list' %}">{% trans "Return to achievements list" %}</a> | ||||
|                 <button class="btn btn-danger" type="submit">{% trans "Delete" %}</button> | ||||
|             </form> | ||||
|         </div> | ||||
|     </div> | ||||
| {% endblock %} | ||||
| @@ -0,0 +1,28 @@ | ||||
| {% extends "base.html" %} | ||||
| {% comment %} | ||||
| SPDX-License-Identifier: GPL-3.0-or-later | ||||
| {% endcomment %} | ||||
| {% load i18n crispy_forms_tags %} | ||||
|  | ||||
| {% block content %} | ||||
|     <div class="card bg-light"> | ||||
|         <div class="card-header text-center"> | ||||
|             <h4>{% trans "Validate achievement" %}</h4> | ||||
|         </div> | ||||
|             <div class="card-body"> | ||||
|                 <div class="alert alert-warning"> | ||||
|                     {% blocktrans %}Are you sure you want to validate this achievement? This action can't be undone.{% endblocktrans %} | ||||
|                 </div> | ||||
|             </div> | ||||
|         <div class="card-footer text-center"> | ||||
|             <form method="post"> | ||||
|                 {% csrf_token %} | ||||
|                 <a class="btn btn-primary" href="{% url 'family:achievement_list' %}">{% trans "Return to achievements list" %}</a> | ||||
|                 <form method="post" action="{% url 'family:achievement_validate' pk %}"> | ||||
|                     {% csrf_token %} | ||||
|                     <button type="submit" class="btn btn-success">{% trans "Validate" %}</button> | ||||
|                 </form> | ||||
|             </form> | ||||
|         </div> | ||||
|     </div> | ||||
| {% endblock %} | ||||
							
								
								
									
										33
									
								
								apps/family/templates/family/achievement_list.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								apps/family/templates/family/achievement_list.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,33 @@ | ||||
| {% 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 %} | ||||
|  | ||||
| <div class="card mb-4" id="history"> | ||||
|     <div class="card-header"> | ||||
|         <p class="card-text font-weight-bold"> | ||||
|             {% trans "Invalid achievements history" %} | ||||
|         </p> | ||||
|         <a class="btn btn-sm btn-primary mx-2" href="{% url "family:manage" %}"> | ||||
|             {% trans "Return to management page" %} | ||||
|         </a> | ||||
|     </div> | ||||
|     {% render_table invalid %} | ||||
| </div> | ||||
|  | ||||
| <div class="card mb-4" id="history"> | ||||
|     <div class="card-header"> | ||||
|         <p class="card-text font-weight-bold"> | ||||
|             {% trans "Valid achievements history" %} | ||||
|         </p> | ||||
|         <a class="btn btn-sm btn-primary mx-2" href="{% url "family:manage" %}"> | ||||
|             {% trans "Return to management page" %} | ||||
|         </a> | ||||
|     </div> | ||||
|     {% render_table valid %} | ||||
| </div> | ||||
| {% endblock %} | ||||
							
								
								
									
										60
									
								
								apps/family/templates/family/add_member.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										60
									
								
								apps/family/templates/family/add_member.html
									
									
									
									
									
										Normal file
									
								
							| @@ -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 %} | ||||
| <div class="card bg-light"> | ||||
|     <h3 class="card-header text-center"> | ||||
|         {{ title }} | ||||
|     </h3> | ||||
|     <div class="card-body"> | ||||
|          | ||||
|         <form method="post" action=""> | ||||
|             {% csrf_token %} | ||||
|             {{ form|crispy }} | ||||
|             <button class="btn btn-primary" type="submit">{% trans "Submit" %}</button> | ||||
|         </form> | ||||
|     </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block extrajavascript %} | ||||
| <script> | ||||
|     function autocompleted(user) { | ||||
|         $("#id_last_name").val(user.last_name); | ||||
|         $("#id_first_name").val(user.first_name); | ||||
|         $.getJSON("/api/members/profile/" + user.id + "/", function (profile) { | ||||
|             let fee = profile.paid ? "{{ club.membership_fee_paid }}" : "{{ club.membership_fee_unpaid }}"; | ||||
|             $("#id_credit_amount").val((Number(fee) / 100).toFixed(2)); | ||||
|         }); | ||||
|     } | ||||
|  | ||||
|     soge_field = $("#id_soge"); | ||||
|  | ||||
|     function fillFields() { | ||||
|         let checked = soge_field.is(':checked'); | ||||
|         if (!checked) { | ||||
|             $("input").attr('disabled', false); | ||||
|             $("#id_user").attr('disabled', true); | ||||
|             $("select").attr('disabled', false); | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|         let credit_type = $("#id_credit_type"); | ||||
|         credit_type.attr('disabled', true); | ||||
|         credit_type.val(4); | ||||
|  | ||||
|         let credit_amount = $("#id_credit_amount"); | ||||
|         credit_amount.attr('disabled', true); | ||||
|         credit_amount.val('{{ total_fee }}'); | ||||
|  | ||||
|         let bank = $("#id_bank"); | ||||
|         bank.attr('disabled', true); | ||||
|         bank.val('Société générale'); | ||||
|     } | ||||
|  | ||||
|     soge_field.change(fillFields); | ||||
| </script> | ||||
| {% endblock %} | ||||
							
								
								
									
										52
									
								
								apps/family/templates/family/base.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										52
									
								
								apps/family/templates/family/base.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,52 @@ | ||||
| {% 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 %} | ||||
| <div class="row mt-4"> | ||||
|     <div class="col-xl-4"> | ||||
|         {% block profile_info %} | ||||
|         <div class="card bg-light" id="card-infos"> | ||||
|             <h4 class="card-header text-center"> | ||||
|                 {{ family.name }} | ||||
|             </h4> | ||||
|             <div class="text-center"> | ||||
|                 <a href="{% url 'family:update_pic' family.pk  %}"> | ||||
|                     <img src="{{ family.display_image.url }}" class="img-thumbnail mt-2"> | ||||
|                 </a> | ||||
|             </div> | ||||
|             <div class="card-body" id="profile_infos"> | ||||
|                 {% include "family/family_info.html" %} | ||||
|             </div> | ||||
|             <div class="card-footer"> | ||||
|                 {% if can_add_members %} | ||||
|                 <a class="btn btn-sm btn-success" href="{% url 'family:family_add_member' family_pk=family.pk %}" | ||||
|                    data-turbolinks="false"> {% trans "Add member" %}</a> | ||||
|                 {% endif %} | ||||
|                 {% if ".change_"|has_perm:family %} | ||||
|                 <a class="btn btn-sm btn-secondary" href="{% url 'family:family_update' pk=family.pk %}" | ||||
|                    data-turbolinks="false"> | ||||
|                     <i class="fa fa-edit"></i> {% trans 'Update Profile' %} | ||||
|                 </a> | ||||
|                 {% endif %} | ||||
|                 {% url 'family:family_detail' family.pk as family_detail_url %} | ||||
|                 {% if request.path_info != family_detail_url %} | ||||
|                 <a class="btn btn-sm btn-primary" href="{{ family_detail_url }}">{% trans 'View Profile' %}</a> | ||||
|                 {% endif %} | ||||
|                 <a class="btn btn-sm btn-primary" href="{% url "family:family_list" %}"> | ||||
|                     {% trans "Return to the family list" %} | ||||
|                   </a> | ||||
|             </div> | ||||
|         </div> | ||||
|         {% endblock %} | ||||
|     </div> | ||||
|     <div class="col-xl-8"> | ||||
|         {% block profile_content %}{% endblock %} | ||||
|     </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
							
								
								
									
										36
									
								
								apps/family/templates/family/challenge_detail.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								apps/family/templates/family/challenge_detail.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,36 @@ | ||||
| {% extends "base.html" %} | ||||
| {% comment %} | ||||
| Copyright (C) by BDE ENS Paris-Saclay | ||||
| SPDX-License-Identifier: GPL-3.0-or-later | ||||
| {% endcomment %} | ||||
| {% load i18n crispy_forms_tags %} | ||||
|  | ||||
| {% block content %} | ||||
| <div class="card bg-white mb-3"> | ||||
|   <h3 class="card-header text-center"> | ||||
|     {{ title }} {{ challenge.name }} | ||||
|   </h3> | ||||
|   <div class="card-body"> | ||||
|     <ul> | ||||
|       {% for field, value in fields %} | ||||
|       <li> {{ field }} : {{ value }}</li> | ||||
|       {% endfor %} | ||||
|       <li> {% trans "Obtained by " %} {{obtained}} | ||||
|         {% if obtained > 1 %} | ||||
|           {% trans "families" %} | ||||
|         {% else %} | ||||
|           {% trans "family" %} | ||||
|         {% endif %} | ||||
|       </li> | ||||
|     </ul> | ||||
|       <a class="btn btn-sm btn-primary" href="{% url "family:challenge_list" %}"> | ||||
|         {% trans "Return to the challenge list" %} | ||||
|       </a> | ||||
|       {% if update %} | ||||
|       <a class="btn btn-sm btn-secondary" href="{% url "family:challenge_update" pk=challenge.pk %}"> | ||||
|         {% trans "Update" %} | ||||
|       </a> | ||||
|       {% endif %} | ||||
|   </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
							
								
								
									
										21
									
								
								apps/family/templates/family/challenge_form.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								apps/family/templates/family/challenge_form.html
									
									
									
									
									
										Normal file
									
								
							| @@ -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 %} | ||||
| <div class="card bg-white mb-3"> | ||||
|   <h3 class="card-header text-center"> | ||||
|     {{ title }} | ||||
|   </h3> | ||||
|   <div class="card-body" id="form"> | ||||
|     <form method="post"> | ||||
|       {% csrf_token %} | ||||
|       {{ form | crispy }} | ||||
|       <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button> | ||||
|     </form> | ||||
|   </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
							
								
								
									
										42
									
								
								apps/family/templates/family/challenge_list.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								apps/family/templates/family/challenge_list.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | ||||
| {% 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 %} | ||||
| <div class="row"> | ||||
|     <div class="col-xl-12"> | ||||
|         <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0"> | ||||
|             <a href="{% url "family:family_list" %}" class="btn btn-sm btn-outline-primary"> | ||||
|                 {% trans "Families" %} | ||||
|             </a> | ||||
|             <a href="#" class="btn btn-sm btn-outline-primary active"> | ||||
|                 {% trans "Challenges" %} | ||||
|             </a> | ||||
|             {% if can_manage %} | ||||
|             <a href="{% url "family:manage" %}" class="btn btn-sm btn-outline-primary"> | ||||
|                 {% trans "Manage" %} | ||||
|             </a> | ||||
|             {% endif %} | ||||
|         </div> | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| <div class="card bg-white mb-3"> | ||||
|     <h3 class="card-header text-center"> | ||||
|         {{ title }} | ||||
|     </h3> | ||||
|     {% render_table table %} | ||||
| </div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block extrajavascript %} | ||||
| <script type="text/javascript"> | ||||
|     $(".table-row").click(function () { | ||||
|             window.document.location = $(this).data("href"); | ||||
|         }); | ||||
| </script> | ||||
| {% endblock %} | ||||
							
								
								
									
										29
									
								
								apps/family/templates/family/family_detail.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										29
									
								
								apps/family/templates/family/family_detail.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,29 @@ | ||||
| {% extends "family/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 perms %} | ||||
|  | ||||
| {% block profile_content %} | ||||
| {% if member_list.data %} | ||||
| <div class="card"> | ||||
|     <div class="card-header position-relative" id="clubListHeading"> | ||||
|         <i class="fa fa-users"></i> {% trans "Family members" %} | ||||
|     </div> | ||||
|     {% render_table member_list %} | ||||
| </div> | ||||
|  | ||||
| <div class="my-4"></div> | ||||
| {% endif %} | ||||
|  | ||||
| {% if achievement_list.data %} | ||||
| <div class="card"> | ||||
|     <div class="card-header position-relative"> | ||||
|         <i class="fa fa-trophy"></i> {% trans "Completed challenges" %} | ||||
|     </div> | ||||
|     {% render_table achievement_list %} | ||||
| </div> | ||||
| {% endif %} | ||||
| {% endblock %} | ||||
							
								
								
									
										21
									
								
								apps/family/templates/family/family_form.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								apps/family/templates/family/family_form.html
									
									
									
									
									
										Normal file
									
								
							| @@ -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 %} | ||||
| <div class="card bg-white mb-3"> | ||||
|   <h3 class="card-header text-center"> | ||||
|     {{ title }} | ||||
|   </h3> | ||||
|   <div class="card-body" id="form"> | ||||
|     <form method="post"> | ||||
|       {% csrf_token %} | ||||
|       {{ form | crispy }} | ||||
|       <button class="btn btn-primary" type="submit">{% trans "Submit"%}</button> | ||||
|     </form> | ||||
|   </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
							
								
								
									
										15
									
								
								apps/family/templates/family/family_info.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								apps/family/templates/family/family_info.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,15 @@ | ||||
| {% load i18n pretty_money perms %} | ||||
|  | ||||
| <dl class="row"> | ||||
|     <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6">{{ family.name }}</dd> | ||||
|  | ||||
|     <dt class="col-xl-6">{% trans 'description'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6">{{ family.description }}</dd> | ||||
|  | ||||
|     <dt class="col-xl-6">{% trans 'score'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6">{{ family.score }}</dd> | ||||
|  | ||||
|     <dt class="col-xl-6">{% trans 'rank'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6">{{ family.rank }}</dd> | ||||
| </dl> | ||||
							
								
								
									
										43
									
								
								apps/family/templates/family/family_list.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										43
									
								
								apps/family/templates/family/family_list.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,43 @@ | ||||
| {% 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 %} | ||||
| <div class="row"> | ||||
|     <div class="col-xl-12"> | ||||
|         <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0"> | ||||
|             <a href="#" class="btn btn-sm btn-outline-primary active"> | ||||
|                 {% trans "Families" %} | ||||
|             </a> | ||||
|             <a href="{% url "family:challenge_list" %}" class="btn btn-sm btn-outline-primary"> | ||||
|                 {% trans "Challenges" %} | ||||
|             </a> | ||||
|             {% if can_manage %} | ||||
|             <a href="{% url "family:manage" %}" class="btn btn-sm btn-outline-primary"> | ||||
|                 {% trans "Manage" %} | ||||
|             </a> | ||||
|             {% endif %} | ||||
|         </div> | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| <div class="card bg-white mb-3"> | ||||
|     <h3 class="card-header text-center"> | ||||
|         {{ title }} | ||||
|     </h3> | ||||
|     {% render_table table %} | ||||
| </div> | ||||
|  | ||||
| {% endblock %} | ||||
|  | ||||
| {% block extrajavascript %} | ||||
| <script type="text/javascript"> | ||||
|     $(".table-row").click(function () { | ||||
|             window.document.location = $(this).data("href"); | ||||
|         }); | ||||
| </script> | ||||
| {% endblock %} | ||||
							
								
								
									
										287
									
								
								apps/family/templates/family/manage.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										287
									
								
								apps/family/templates/family/manage.html
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,287 @@ | ||||
| {% 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 %} | ||||
| <div class="row"> | ||||
|     <div class="col-xl-12"> | ||||
|         <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0"> | ||||
|             <a href="{% url "family:family_list" %}" class="btn btn-sm btn-outline-primary"> | ||||
|                 {% trans "Families" %} | ||||
|             </a> | ||||
|             <a href="{% url "family:challenge_list" %}" class="btn btn-sm btn-outline-primary"> | ||||
|                 {% trans "Challenges" %} | ||||
|             </a> | ||||
|             <a href="#" class="btn btn-sm btn-outline-primary active"> | ||||
|                 {% trans "Manage" %} | ||||
|             </a> | ||||
|         </div> | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| <div class="row mb-3"> | ||||
|     <div class='col-sm-5 col-xl-6' id="infos_div"> | ||||
|         {% if can_add_achievement %} | ||||
|         <div class="row justify-content-center justify-content-md-end"> | ||||
|             {# Family details column #} | ||||
|             <div class="col picture-col"> | ||||
|                 <div class="card bg-light mb-4 text-center"> | ||||
|                     <a id="profile_pic_link" href="#"> | ||||
|                         <img src="{% static "member/img/default_picture.png" %}" id="profile_pic" alt="" class="card-img-top d-none d-sm-block"> | ||||
|                     </a> | ||||
|                     <div class="card-body text-center text-break p-2"> | ||||
|                         <span id="user_note"><i class="small">{% trans "Please select a family" %}</i></span> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|  | ||||
|             {# Family selection column #} | ||||
|             <div class="col-xl" id="user_select_div"> | ||||
|                 <div class="card bg-light border-success mb-4"> | ||||
|                     <div class="card-header"> | ||||
|                         <p class="card-text font-weight-bold"> | ||||
|                             {% trans "Families" %} | ||||
|                         </p> | ||||
|                     </div> | ||||
|                     <div class="card-body p-0" style="min-height:125px;"> | ||||
|                         <ul class="list-group list-group-flush" id="note_list"></ul> | ||||
|                     </div> | ||||
|                     {# User search with autocompletion #} | ||||
|                     <div class="card-footer"> | ||||
|                         <input class="form-control mx-auto d-block mb-2" placeholder="{% trans "Name" %}" type="text" id="note" autofocus /> | ||||
|                         {% if user_family %} | ||||
|                         <button class="btn btn-sm btn-secondary btn-block" id="select_my_family"> | ||||
|                             {% trans "Select my family" %} ({{ user_family.name }}) | ||||
|                         </button> | ||||
|                         {% endif %} | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|  | ||||
|             {# Summary of challenges and validate button #} | ||||
|             <div class="col-xl-5" id="consos_list_div"> | ||||
|                 <div class="card bg-light border-info mb-4"> | ||||
|                     <div class="card-header"> | ||||
|                         <p class="card-text font-weight-bold"> | ||||
|                             {% trans "Challenges" %} | ||||
|                         </p> | ||||
|                     </div> | ||||
|                     <div class="card-body p-0" style="min-height:125px;"> | ||||
|                         <ul class="list-group list-group-flush" id="consos_list"></ul> | ||||
|                     </div> | ||||
|                     <div class="card-footer text-center"> | ||||
|                         <span id="consume_all" class="btn btn-primary"> | ||||
|                             {% trans "Validate!" %} | ||||
|                         </span> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|         </div> | ||||
|         {% endif %} | ||||
|  | ||||
|         {# Create family/challenge buttons #} | ||||
|         {% if can_add_family or can_add_challenge %} | ||||
|         <div class="card bg-light border-success mb-4"> | ||||
|           <h3 class="card-header font-weight-bold text-center"> | ||||
|               {% trans "Create a family or challenge" %} | ||||
|           </h3> | ||||
|         <div class="card-body text-center"> | ||||
|             {% if can_add_family %} | ||||
|             <a class="btn btn-sm btn-primary mx-2" href="{% url "family:family_create" %}"> | ||||
|                 {% trans "Add a family" %} | ||||
|             </a> | ||||
|             {% endif %} | ||||
|             {% if can_add_challenge %} | ||||
|             <a class="btn btn-sm btn-primary mx-2" href="{% url "family:challenge_create" %}"> | ||||
|                 {% trans "Add a challenge" %} | ||||
|             </a> | ||||
|             {% endif %} | ||||
|         </div> | ||||
|         </div> | ||||
|         {% endif %} | ||||
|     </div> | ||||
|  | ||||
|     {# Buttons column #} | ||||
|     <div class="col"> | ||||
|         {% if can_add_achievement %} | ||||
|         <div class="card bg-light border-primary text-center mb-4"> | ||||
|             {# Tabs for list and search #} | ||||
|             <div class="card-header"> | ||||
|                 <ul class="nav nav-tabs nav-fill card-header-tabs"> | ||||
|                     <li class="nav-item"> | ||||
|                         <a class="nav-link font-weight-bold" data-toggle="tab" href="#list"> | ||||
|                             {% trans "List" %} | ||||
|                         </a> | ||||
|                     </li> | ||||
|                     <li class="nav-item"> | ||||
|                         <a class="nav-link font-weight-bold" data-toggle="tab" href="#search"> | ||||
|                             {% trans "Search" %} | ||||
|                         </a> | ||||
|                     </li> | ||||
|                 </ul> | ||||
|             </div> | ||||
|  | ||||
|             {# Tabs content #} | ||||
|             <div class="card-body"> | ||||
|                 <div class="tab-content"> | ||||
|                     <div class="tab-pane" id="list"> | ||||
|                         <div class="d-inline-flex flex-wrap justify-content-center"> | ||||
|                             {% for challenge in all_challenges %} | ||||
|                                     <button class="btn btn-outline-dark rounded-0 flex-fill" | ||||
|                                             id="challenge{{ challenge.id }}" name="button" value="{{ challenge.name }}"> | ||||
|                                         {{ challenge.name }} ({{ challenge.points }} {% trans "points" %}) | ||||
|                                     </button> | ||||
|                             {% endfor %} | ||||
|                         </div> | ||||
|                     </div> | ||||
|                     <div class="tab-pane" id="search"> | ||||
|                         <input class="form-control mx-auto d-block mb-3" placeholder="{% trans "Search challenge..." %}" type="search" id="search-input"/> | ||||
|                         <div class="d-inline-flex flex-wrap justify-content-center" id="search-results"> | ||||
|                             {% for challenge in all_challenges %} | ||||
|                                     <button class="btn btn-outline-dark rounded-0 flex-fill" hidden | ||||
|                                             id="search_challenge{{ challenge.id }}" name="button" value="{{ challenge.name }}"> | ||||
|                                             {{ challenge.name }} ({{ challenge.points }} {% trans "points" %}) | ||||
|                                     </button> | ||||
|                             {% endfor %} | ||||
|                         </div> | ||||
|                     </div> | ||||
|                 </div> | ||||
|             </div> | ||||
|  | ||||
|         </div> | ||||
|         {% endif %} | ||||
|     </div> | ||||
| </div> | ||||
|  | ||||
| {# achievement history #} | ||||
| {% if table.data %} | ||||
|     <div class="card"> | ||||
|         <div class="card-header position-relative" id="historyListHeading"> | ||||
|             <a class="stretched-link font-weight-bold"  | ||||
|                 href="{% url 'family:achievement_list' %}" > | ||||
|                 {% trans "Recent achievements history" %} | ||||
|             </a> | ||||
|         </div> | ||||
|         <div id="history"> | ||||
|             {% render_table table %} | ||||
|         </div> | ||||
|     </div> | ||||
|  | ||||
|         <!-- Popup de validation --> | ||||
|     <div class="modal fade" id="validationModal" tabindex="-1" role="dialog" aria-labelledby="validationModalLabel" aria-hidden="true"> | ||||
|     <div class="modal-dialog modal-dialog-centered" role="document"> | ||||
|         <div class="modal-content border-success"> | ||||
|         <div class="modal-header bg-success text-white"> | ||||
|             <h5 class="modal-title" id="validationModalLabel">{% trans "Confirmation" %}</h5> | ||||
|             <button type="button" class="close text-white" data-dismiss="modal" aria-label="Close"> | ||||
|             <span aria-hidden="true">×</span> | ||||
|             </button> | ||||
|         </div> | ||||
|         <div class="modal-body"> | ||||
|                 <p><strong>{% trans "Are you sure you want to validate this challenge?" %}</strong></p> | ||||
|                 <p>{% trans "To have your challenge officially validated, please send a message with:" %}</p> | ||||
|                 <ul> | ||||
|                 <li>{% trans "The name of the family" %}</li> | ||||
|                 <li>{% trans "The name of the challenge" %}</li> | ||||
|                 <li>{% trans "A photo or video as proof" %}</li> | ||||
|                 </ul> | ||||
|                 <p> | ||||
|                 <strong>{% trans "Send it via WhatsApp to:" %}</strong> | ||||
|                 {% if phone_numbers %}" | ||||
|                 {% for num in phone_numbers %} | ||||
|                     <a href="https://wa.me/{{ num }}" target="_blank">{{ num }}</a>{% if not forloop.last %}, {% endif %} | ||||
|                 {% endfor %} | ||||
|                 {% endif %} | ||||
|                 </p> | ||||
|         </div> | ||||
|         <div class="modal-footer"> | ||||
|             <button type="button" class="btn btn-primary" data-dismiss="modal">{% trans "OK" %}</button> | ||||
|         </div> | ||||
|         </div> | ||||
|     </div> | ||||
|     </div> | ||||
| {% endif %} | ||||
| {% endblock %} | ||||
|  | ||||
|  | ||||
|  | ||||
| {% block extrajavascript %} | ||||
|     <script type="text/javascript" src="{% static "family/js/achievements.js" %}"></script> | ||||
|     <script type="text/javascript"> | ||||
|         {% for challenge in all_challenges %} | ||||
|         document.getElementById("challenge{{ challenge.id }}").addEventListener("click", function() { | ||||
|             addChallenge({{ challenge.id}}, "{{ challenge.name|escapejs }}", {{ challenge.points }}); | ||||
|         }); | ||||
|         {% endfor %} | ||||
|      | ||||
|         {% for challenge in all_challenges %} | ||||
|             document.getElementById("search_challenge{{ challenge.id }}").addEventListener("click", function() { | ||||
|                 addChallenge({{ challenge.id}}, "{{ challenge.name|escapejs }}", {{ challenge.points }}); | ||||
|             }); | ||||
|         {% endfor %}  | ||||
|     </script> | ||||
|     <script> | ||||
|         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 () { | ||||
|             // 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 %} | ||||
|     </script> | ||||
| {% endblock %} | ||||
							
								
								
									
										118
									
								
								apps/family/templates/family/picture_update.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										118
									
								
								apps/family/templates/family/picture_update.html
									
									
									
									
									
										Normal file
									
								
							| @@ -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 %} | ||||
| <div class="card bg-light"> | ||||
|   <h3 class="card-header text-center"> | ||||
|     {{ title }} | ||||
|   </h3> | ||||
|   <div class="card-body"> | ||||
|     <div class="text-center"> | ||||
|       <form method="post" enctype="multipart/form-data" id="formUpload"> | ||||
|         {% csrf_token %} | ||||
|         {{ form |crispy }} | ||||
|         {% if user.note.display_image != "pic/default.png" %} | ||||
|           <input type="submit" class="btn btn-primary" value="{% trans "Remove" %}"> | ||||
|         {% endif %} | ||||
|       </form> | ||||
|     </div> | ||||
|     <!-- MODAL TO CROP THE IMAGE --> | ||||
|     <div class="modal fade" id="modalCrop" data-backdrop="static"> | ||||
|       <div class="modal-dialog"> | ||||
|         <div class="modal-content"> | ||||
|             <div class="modal-body-wrapper" style="width: 500px; height: 500px; padding: 16px;"> | ||||
|               <div class="modal-body" style="width: 100%; height: 100%; padding: 0"> | ||||
|                 <img src="" id="modal-image" style="display: block; max-width: 100%;"> | ||||
|               </div> | ||||
|             </div> | ||||
|           <div class="modal-footer"> | ||||
|             <div class="btn-group pull-left" role="group"> | ||||
|               <button type="button" class="btn btn-default" id="js-zoom-in"> | ||||
|                 <span class="glyphicon glyphicon-zoom-in"></span> | ||||
|               </button> | ||||
|               <button type="button" class="btn btn-default js-zoom-out"> | ||||
|                 <span class="glyphicon glyphicon-zoom-out"></span> | ||||
|               </button> | ||||
|             </div> | ||||
|             <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Nevermind" %}</button> | ||||
|             <button type="button" class="btn btn-primary js-crop-and-upload">{% trans "Crop and upload" %}</button> | ||||
|           </div> | ||||
|         </div> | ||||
|       </div> | ||||
|     </div> | ||||
|   </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block extracss %} | ||||
| <link href="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.css" rel="stylesheet"> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block extrajavascript%} | ||||
| <script src="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.6/cropper.min.js"></script> | ||||
| <script src="https://cdn.jsdelivr.net/npm/jquery-cropper@1.0.1/dist/jquery-cropper.min.js"></script> | ||||
| <script> | ||||
|   $(function () { | ||||
|  | ||||
|     /* SCRIPT TO OPEN THE MODAL WITH THE PREVIEW */ | ||||
|     $("#id_image").change(function (e) { | ||||
|       if (this.files && this.files[0]) { | ||||
|         // Check the image size | ||||
|         if (this.files[0].size > 2*1024*1024) { | ||||
|           alert("Ce fichier est trop volumineux.") | ||||
| 	} else { | ||||
|           // Read the selected image file | ||||
|           var reader = new FileReader(); | ||||
|           reader.onload = function (e) { | ||||
|             $("#modal-image").attr("src", e.target.result); | ||||
|             $("#modalCrop").modal("show"); | ||||
|           } | ||||
|           reader.readAsDataURL(this.files[0]); | ||||
|         } | ||||
|       } | ||||
|     }); | ||||
|  | ||||
|     /* SCRIPTS TO HANDLE THE CROPPER BOX */ | ||||
|     var $image = $("#modal-image"); | ||||
|     var cropBoxData; | ||||
|     var canvasData; | ||||
|     $("#modalCrop").on("shown.bs.modal", function () { | ||||
|       $image.cropper({ | ||||
|         viewMode: 1, | ||||
|         aspectRatio: 1 / 1, | ||||
|         minCropBoxWidth: 200, | ||||
|         minCropBoxHeight: 200, | ||||
|         ready: function () { | ||||
|           $image.cropper("setCanvasData", canvasData); | ||||
|           $image.cropper("setCropBoxData", cropBoxData); | ||||
|         } | ||||
|       }); | ||||
|     }).on("hidden.bs.modal", function () { | ||||
|       cropBoxData = $image.cropper("getCropBoxData"); | ||||
|       canvasData = $image.cropper("getCanvasData"); | ||||
|       $image.cropper("destroy"); | ||||
|     }); | ||||
|  | ||||
|     $(".js-zoom-in").click(function () { | ||||
|       $image.cropper("zoom", 0.1); | ||||
|     }); | ||||
|  | ||||
|     $(".js-zoom-out").click(function () { | ||||
|       $image.cropper("zoom", -0.1); | ||||
|     }); | ||||
|  | ||||
|     /* SCRIPT TO COLLECT THE DATA AND POST TO THE SERVER */ | ||||
|     $(".js-crop-and-upload").click(function () { | ||||
|       var cropData = $image.cropper("getData"); | ||||
|       $("#id_x").val(cropData["x"]); | ||||
|       $("#id_y").val(cropData["y"]); | ||||
|       $("#id_height").val(cropData["height"]); | ||||
|       $("#id_width").val(cropData["width"]); | ||||
|       $("#formUpload").submit(); | ||||
|     }); | ||||
|   }); | ||||
| </script> | ||||
| {% endblock %} | ||||
							
								
								
									
										0
									
								
								apps/family/tests/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								apps/family/tests/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
								
								
									
										328
									
								
								apps/family/tests/test_family.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										328
									
								
								apps/family/tests/test_family.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,328 @@ | ||||
| # 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.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): | ||||
|         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) | ||||
|         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) | ||||
|  | ||||
|         # 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/') | ||||
							
								
								
									
										25
									
								
								apps/family/urls.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										25
									
								
								apps/family/urls.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,25 @@ | ||||
| # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| from django.urls import path, include | ||||
|  | ||||
| from . import views | ||||
|  | ||||
| app_name = 'family' | ||||
| urlpatterns = [ | ||||
|     path('list/', views.FamilyListView.as_view(), name="family_list"), | ||||
|     path('create/', views.FamilyCreateView.as_view(), name="family_create"), | ||||
|     path('<int:pk>/detail/', views.FamilyDetailView.as_view(), name="family_detail"), | ||||
|     path('<int:pk>/update/', views.FamilyUpdateView.as_view(), name="family_update"), | ||||
|     path('<int:pk>/update_pic/', views.FamilyPictureUpdateView.as_view(), name="update_pic"), | ||||
|     path('<int:family_pk>/add_member/', views.FamilyAddMemberView.as_view(), name="family_add_member"), | ||||
|     path('challenge/list/', views.ChallengeListView.as_view(), name="challenge_list"), | ||||
|     path('challenge/create/', views.ChallengeCreateView.as_view(), name="challenge_create"), | ||||
|     path('challenge/<int:pk>/detail/', views.ChallengeDetailView.as_view(), name="challenge_detail"), | ||||
|     path('challenge/<int:pk>/update/', views.ChallengeUpdateView.as_view(), name="challenge_update"), | ||||
|     path('manage/', views.FamilyManageView.as_view(), name="manage"), | ||||
|     path('achievement/list/', views.AchievementListView.as_view(), name="achievement_list"), | ||||
|     path('achievement/<int:pk>/validate/', views.AchievementValidateView.as_view(), name="achievement_validate"), | ||||
|     path('achievement/<int:pk>/delete/', views.AchievementDeleteView.as_view(), name="achievement_delete"), | ||||
|     path('api/family/', include(('family.api.urls', 'family_api'), namespace='api')), | ||||
| ] | ||||
							
								
								
									
										469
									
								
								apps/family/views.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										469
									
								
								apps/family/views.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,469 @@ | ||||
| # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| 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 | ||||
| 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.forms import ImageForm | ||||
| import phonenumbers | ||||
|  | ||||
| from .models import Family, Challenge, FamilyMembership, User, Achievement | ||||
| from .tables import FamilyTable, ChallengeTable, FamilyMembershipTable, AchievementTable, FamilyAchievementTable | ||||
| from .forms import ChallengeForm, FamilyMembershipForm, FamilyForm | ||||
|  | ||||
|  | ||||
| class FamilyCreateView(ProtectQuerysetMixin, ProtectedCreateView): | ||||
|     """ | ||||
|     Create family | ||||
|     """ | ||||
|     model = Family | ||||
|     extra_context = {"title": _('Create family')} | ||||
|     form_class = FamilyForm | ||||
|  | ||||
|     def get_sample_object(self): | ||||
|         return Family( | ||||
|             name="", | ||||
|             description="Sample family", | ||||
|             score=0, | ||||
|             rank=0, | ||||
|         ) | ||||
|  | ||||
|     def get_success_url(self): | ||||
|         self.object.refresh_from_db() | ||||
|         return reverse_lazy("family:manage") | ||||
|  | ||||
|  | ||||
| class FamilyListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): | ||||
|     """ | ||||
|     List existing Families | ||||
|     """ | ||||
|     model = Family | ||||
|     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): | ||||
|     """ | ||||
|     Display details of a family | ||||
|     """ | ||||
|     model = Family | ||||
|     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") | ||||
|         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, 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. | ||||
|         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) | ||||
|  | ||||
|         # 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 | ||||
|  | ||||
|  | ||||
| class FamilyUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): | ||||
|     """ | ||||
|     Update the information of a family. | ||||
|     """ | ||||
|     model = Family | ||||
|     context_object_name = "family" | ||||
|     form_class = FamilyForm | ||||
|     extra_context = {"title": _('Update family')} | ||||
|  | ||||
|     def get_success_url(self): | ||||
|         return reverse_lazy('family:family_detail', kwargs={'pk': self.object.pk}) | ||||
|  | ||||
|  | ||||
| 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.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): | ||||
|         """ | ||||
|         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) | ||||
|  | ||||
|         # Save | ||||
|         self.object.display_image = image | ||||
|         self.object.save() | ||||
|         return super().form_valid(form) | ||||
|  | ||||
|  | ||||
| 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_context_data(self, **kwargs): | ||||
|         context = super().get_context_data(**kwargs) | ||||
|  | ||||
|         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}) | ||||
|  | ||||
|  | ||||
| class ChallengeCreateView(ProtectQuerysetMixin, ProtectedCreateView): | ||||
|     """ | ||||
|     Create challenge | ||||
|     """ | ||||
|     model = Challenge | ||||
|     extra_context = {"title": _('Create challenge')} | ||||
|     form_class = ChallengeForm | ||||
|  | ||||
|     def get_sample_object(self): | ||||
|         return Challenge( | ||||
|             name="", | ||||
|             description="Sample challenge", | ||||
|             points=0, | ||||
|         ) | ||||
|  | ||||
|     def get_success_url(self): | ||||
|         return reverse_lazy('family:manage') | ||||
|  | ||||
|  | ||||
| class ChallengeListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): | ||||
|     """ | ||||
|     List all challenges | ||||
|     """ | ||||
|     model = Challenge | ||||
|     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): | ||||
|     """ | ||||
|     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"] = 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')} | ||||
|     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() | ||||
|  | ||||
|         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): | ||||
|         # 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() | ||||
|  | ||||
|     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.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: | ||||
|             user_family_membership = FamilyMembership.objects.get(user=self.request.user) | ||||
|             context["user_family"] = user_family_membership.family | ||||
|         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): | ||||
|         table = super().get_table(**kwargs) | ||||
|         table.exclude = ('delete', 'validate',) | ||||
|         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): | ||||
|     """ | ||||
|     List all achievements | ||||
|     """ | ||||
|     model = Achievement | ||||
|     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) | ||||
|  | ||||
|         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 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) | ||||
|  | ||||
|         achievement.valid = True | ||||
|         achievement.save() | ||||
|  | ||||
|         return redirect(reverse_lazy('family:achievement_list')) | ||||
|  | ||||
|  | ||||
| class AchievementDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView): | ||||
|     """ | ||||
|     Delete an Achievement | ||||
|     """ | ||||
|     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') | ||||
| @@ -2,6 +2,7 @@ | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| import django_tables2 as tables | ||||
| from django.utils.translation import gettext_lazy as _ | ||||
|  | ||||
| from .models import Food | ||||
|  | ||||
| @@ -10,10 +11,25 @@ class FoodTable(tables.Table): | ||||
|     """ | ||||
|     List all foods. | ||||
|     """ | ||||
|     qr_code_numbers = tables.Column(empty_values=(), verbose_name=_("QR Codes"), orderable=False) | ||||
|  | ||||
|     date = tables.Column(empty_values=(), verbose_name=_("Arrival/creation date"), orderable=False) | ||||
|  | ||||
|     def render_date(self, record): | ||||
|         if record.__class__.__name__ == "BasicFood": | ||||
|             return record.arrival_date.strftime("%d/%m/%Y %H:%M") | ||||
|         elif record.__class__.__name__ == "TransformedFood": | ||||
|             return record.creation_date.strftime("%d/%m/%Y %H:%M") | ||||
|         else: | ||||
|             return "--" | ||||
|  | ||||
|     def render_qr_code_numbers(self, record): | ||||
|         return ", ".join(str(q.qr_code_number) for q in record.QR_code.all()) | ||||
|  | ||||
|     class Meta: | ||||
|         model = Food | ||||
|         template_name = 'django_tables2/bootstrap4.html' | ||||
|         fields = ('name', 'owner', 'allergens', 'expiry_date') | ||||
|         fields = ('name', 'owner', 'qr_code_numbers', 'allergens', 'date', 'expiry_date') | ||||
|         row_attrs = { | ||||
|             'class': 'table-row', | ||||
|             'data-href': lambda record: 'detail/' + str(record.pk), | ||||
|   | ||||
| @@ -34,6 +34,12 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     </div> | ||||
|   </div> | ||||
|   <div class="card-body"> | ||||
|     <div class="form-check"> | ||||
|       <label for="stock_only" class="form-check-label"> | ||||
|           <input id="stock_only" name="stock_only" type="checkbox" class="checkboxinput form-check-input" checked> | ||||
|           {% trans "Filter with only food in stock" %} | ||||
|       </label> | ||||
|     </div> | ||||
|       <input id="searchbar" type="text" class="form-control" | ||||
|           placeholder="{% trans "Search by attribute such as name..." %}"> | ||||
|   </div> | ||||
| @@ -114,7 +120,26 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|   {% endif %} | ||||
| </div> | ||||
|  | ||||
| <script type="text/javascript"> | ||||
|  | ||||
|     let old_pattern = null; | ||||
|     let searchbar_obj = $("#searchbar"); | ||||
|     let stock_only_obj = $("#stock_only"); | ||||
|  | ||||
|     function reloadTable() { | ||||
|         let pattern = searchbar_obj.val(); | ||||
|  | ||||
|         $("#dynamic-table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + ( | ||||
|             stock_only_obj.is(':checked') ? "" : "&stock=1") + " #dynamic-table"); | ||||
|     } | ||||
|  | ||||
|     searchbar_obj.keyup(reloadTable); | ||||
|     stock_only_obj.change(reloadTable); | ||||
|  | ||||
|     $(document).on("click", ".table-row", function () { | ||||
|         window.document.location = $(this).data("href"); | ||||
|     }); | ||||
| </script> | ||||
| <script> | ||||
|   document.addEventListener('DOMContentLoaded', function() { | ||||
|       document.getElementById('goButton').addEventListener('click', function(event) { | ||||
|   | ||||
| @@ -65,16 +65,24 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li | ||||
|             suffix = '__iregex' if valid_regex else '__istartswith' | ||||
|             prefix = '^' if valid_regex else '' | ||||
|             qs = qs.filter(Q(**{f'name{suffix}': prefix + pattern}) | ||||
|                            | Q(**{f'owner__name{suffix}': prefix + pattern})) | ||||
|                            | Q(**{f'owner__name{suffix}': prefix + pattern}) | ||||
|                            | Q(**{f'owner__note__alias__name{suffix}': prefix + pattern})) | ||||
|         else: | ||||
|             qs = qs.none() | ||||
|         if "stock" not in self.request.GET or not self.request.GET["stock"] == '1': | ||||
|             qs = qs.filter(end_of_life='') | ||||
|  | ||||
|         search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view')) | ||||
|         # table open | ||||
|         open_table = self.get_queryset().order_by('expiry_date').filter( | ||||
|         open_table = self.get_queryset().filter( | ||||
|             Q(polymorphic_ctype__model='transformedfood') | ||||
|             | Q(polymorphic_ctype__model='basicfood', basicfood__date_type='DLC')).filter( | ||||
|                 expiry_date__lt=timezone.now(), end_of_life='').filter( | ||||
|                     PermissionBackend.filter_queryset(self.request, Food, 'view')) | ||||
|         open_table = open_table.union(self.get_queryset().filter( | ||||
|             Q(end_of_life='', order__iexact='open') | ||||
|         ).filter( | ||||
|             PermissionBackend.filter_queryset(self.request, Food, 'view'))).order_by('expiry_date') | ||||
|         # table served | ||||
|         served_table = self.get_queryset().order_by('-pk').filter( | ||||
|             end_of_life='', is_ready=True).exclude( | ||||
| @@ -95,6 +103,7 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li | ||||
|                 owner=club, end_of_life='').filter( | ||||
|                     PermissionBackend.filter_queryset(self.request, Food, 'view') | ||||
|             )) | ||||
|  | ||||
|         return [search_table, open_table, served_table] + club_table | ||||
|  | ||||
|     def get_context_data(self, **kwargs): | ||||
| @@ -218,7 +227,7 @@ class BasicFoodCreateView(ProtectQuerysetMixin, ProtectedCreateView): | ||||
|         copy = self.request.GET.get('copy', None) | ||||
|         if copy is not None: | ||||
|             food = BasicFood.objects.get(pk=copy) | ||||
|             print(context['form'].fields) | ||||
|  | ||||
|             for field in context['form'].fields: | ||||
|                 if field == 'allergens': | ||||
|                     context['form'].fields[field].initial = getattr(food, field).all() | ||||
|   | ||||
| @@ -417,7 +417,7 @@ class Membership(models.Model): | ||||
|         A membership is valid if today is between the start and the end date. | ||||
|         """ | ||||
|         if self.date_end is not None: | ||||
|             return self.date_start.toordinal() <= datetime.datetime.now().toordinal() < self.date_end.toordinal() | ||||
|             return self.date_start.toordinal() <= datetime.datetime.now().toordinal() <= self.date_end.toordinal() | ||||
|         else: | ||||
|             return self.date_start.toordinal() <= datetime.datetime.now().toordinal() | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,8 @@ | ||||
| # Copyright (C) 2018-2025 by BDE ENS Paris-Saclay | ||||
| # SPDX-License-Identifier: GPL-3.0-or-later | ||||
|  | ||||
| from django.conf import settings | ||||
|  | ||||
|  | ||||
| def save_user_profile(instance, created, raw, **_kwargs): | ||||
|     """ | ||||
| @@ -16,7 +18,7 @@ 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: | ||||
|     if not hasattr(instance, "_no_signal") and 'wei' in settings.INSTALLED_APPS and created: | ||||
|         from wei.models import WEIRegistration | ||||
|         if instance.club.id == 1 or instance.club.id == 2: | ||||
|             registrations = WEIRegistration.objects.filter( | ||||
| @@ -29,8 +31,8 @@ def update_wei_registration_fee_on_membership_creation(sender, instance, created | ||||
|  | ||||
|  | ||||
| def update_wei_registration_fee_on_club_change(sender, instance, **kwargs): | ||||
|     if not hasattr(instance, "_no_signal") and 'wei' in settings.INSTALLED_APPS and (instance.id == 1 or instance.id == 2): | ||||
|         from wei.models import WEIRegistration | ||||
|     if not hasattr(instance, "_no_signal") and (instance.id == 1 or instance.id == 2): | ||||
|         registrations = WEIRegistration.objects.filter( | ||||
|             wei__year=instance.membership_start.year, | ||||
|         ) | ||||
|   | ||||
| @@ -92,6 +92,20 @@ class MembershipTable(tables.Table): | ||||
|         } | ||||
|     ) | ||||
|  | ||||
|     user_email = tables.Column( | ||||
|         verbose_name="Email", | ||||
|         accessor="user.email", | ||||
|         orderable=False, | ||||
|         visible=False, | ||||
|     ) | ||||
|  | ||||
|     user_full_name = tables.Column( | ||||
|         verbose_name=_("Full name"), | ||||
|         accessor="user.get_full_name", | ||||
|         orderable=False, | ||||
|         visible=False, | ||||
|     ) | ||||
|  | ||||
|     def render_user(self, value): | ||||
|         # If the user has the right, link the displayed user with the page of its detail. | ||||
|         s = value.username | ||||
| @@ -149,6 +163,16 @@ class MembershipTable(tables.Table): | ||||
|                             + "'>" + s + "</a>") | ||||
|         return s | ||||
|  | ||||
|     def value_user(self, record): | ||||
|         return record.user.username if record.user else "" | ||||
|  | ||||
|     def value_club(self, record): | ||||
|         return record.club.name if record.club else "" | ||||
|  | ||||
|     def value_roles(self, record): | ||||
|         roles = record.roles.all() | ||||
|         return ", ".join(str(role) for role in roles) | ||||
|  | ||||
|     class Meta: | ||||
|         attrs = { | ||||
|             'class': 'table table-condensed table-striped', | ||||
|   | ||||
| @@ -36,8 +36,14 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|             {% trans "There is no membership found with this pattern." %} | ||||
|         </div> | ||||
|         {% endif %} | ||||
|         <div class="card-footer text-center"> | ||||
|             <button class="btn btn-block btn-primary mb-3" onclick="window.location.href='?_export=csv'"> | ||||
|                 {% trans "Export to CSV" %} | ||||
|             </button> | ||||
|         </div> | ||||
|     </div> | ||||
|      | ||||
| </div> | ||||
| {% endblock %} | ||||
|  | ||||
| {% block extrajavascript %} | ||||
|   | ||||
| @@ -7,6 +7,19 @@ | ||||
|     <dt class="col-xl-6">{% trans 'username'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6">{{ user_object.username }}</dd> | ||||
|  | ||||
|     {% if family_app_installed %} | ||||
|     <dt class="col-xl-6">{% trans 'family'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6"> | ||||
|         {% if families %} | ||||
|             {% for fam in families %} | ||||
|             <a href="{% url 'family:family_detail' fam.pk %}">{{ fam.name }}</a>{% if not forloop.last %}, {% endif %} | ||||
|             {% endfor %} | ||||
|         {% else %} | ||||
|             <span class="text-muted">Aucune</span> | ||||
|         {% endif %} | ||||
|     </dd> | ||||
|     {% endif %} | ||||
|  | ||||
|     {% if user_object.pk == user.pk %} | ||||
|     <dt class="col-xl-6">{% trans 'password'|capfirst %}</dt> | ||||
|     <dd class="col-xl-6"> | ||||
|   | ||||
| @@ -29,8 +29,8 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     const input = document.querySelector("input[name='phone_number']"); | ||||
|     const form = document.querySelector("#profile-form"); | ||||
|  | ||||
|     if (!input || !form) { | ||||
|         console.error("Input phone_number ou form introuvable."); | ||||
|     if (!input || !form || input.type === "hidden" || input.disabled || input.readOnly) { | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     const iti = window.intlTelInput(input, { | ||||
|   | ||||
| @@ -17,6 +17,7 @@ from django.utils.translation import gettext_lazy as _ | ||||
| from django.views.generic import DetailView, UpdateView, TemplateView | ||||
| from django.views.generic.edit import FormMixin | ||||
| from django_tables2.views import MultiTableMixin, SingleTableMixin, SingleTableView | ||||
| from django_tables2.export.views import ExportMixin | ||||
| from rest_framework.authtoken.models import Token | ||||
| from api.viewsets import is_regex | ||||
| from note.models import Alias, NoteClub, NoteUser, Trust | ||||
| @@ -26,6 +27,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, \ | ||||
| @@ -206,6 +208,10 @@ 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) | ||||
|         if 'family' in settings.INSTALLED_APPS: | ||||
|             context["family_app_installed"] = True | ||||
|             families = Family.objects.filter(memberships__user=user).distinct() | ||||
|             context["families"] = families | ||||
|  | ||||
|         return context | ||||
|  | ||||
| @@ -945,11 +951,12 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): | ||||
|         return reverse_lazy('member:user_detail', kwargs={'pk': self.object.user.id}) | ||||
|  | ||||
|  | ||||
| class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): | ||||
| class ClubMembersListView(ExportMixin, ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): | ||||
|     model = Membership | ||||
|     table_class = MembershipTable | ||||
|     template_name = "member/club_members.html" | ||||
|     extra_context = {"title": _("Members of the club")} | ||||
|     export_formats = ["csv"] | ||||
|  | ||||
|     def get_queryset(self, **kwargs): | ||||
|         qs = super().get_queryset().filter(club_id=self.kwargs["pk"]) | ||||
| @@ -981,6 +988,14 @@ class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV | ||||
|  | ||||
|         return qs.distinct() | ||||
|  | ||||
|     def get_export_filename(self, export_format): | ||||
|         return "members.csv" | ||||
|  | ||||
|     def get_export_content_type(self, export_format): | ||||
|         if export_format == "csv": | ||||
|             return "text/csv" | ||||
|         return super().get_export_content_type(export_format) | ||||
|  | ||||
|     def get_context_data(self, **kwargs): | ||||
|         context = super().get_context_data(**kwargs) | ||||
|         club = Club.objects.filter( | ||||
|   | ||||
| @@ -228,7 +228,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca | ||||
|           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()) { | ||||
|         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) | ||||
|         } | ||||
|   | ||||
| @@ -67,6 +67,8 @@ $(document).ready(function () { | ||||
|  | ||||
|       last.quantity = 1 | ||||
|        | ||||
|        | ||||
|  | ||||
|       if (last.note.club) { | ||||
|         $('#last_name').val(last.note.name) | ||||
|         $('#first_name').val(last.note.name) | ||||
| @@ -111,6 +113,7 @@ $(document).ready(function () { | ||||
|     dest.removeClass('d-none') | ||||
|     $('#dest_note_list').removeClass('d-none') | ||||
|     $('#debit_type').addClass('d-none') | ||||
|     $('#reason').val('') | ||||
|    | ||||
|     $('#source_note_label').text(select_emitters_label) | ||||
|     $('#dest_note_label').text(select_receveirs_label) | ||||
| @@ -134,6 +137,7 @@ $(document).ready(function () { | ||||
|     dest.val('') | ||||
|     dest.tooltip('hide') | ||||
|     $('#debit_type').addClass('d-none') | ||||
|     $('#reason').val('Rechargement note') | ||||
|  | ||||
|     $('#source_note_label').text(transfer_type_label) | ||||
|     $('#dest_note_label').text(select_receveir_label) | ||||
| @@ -162,6 +166,7 @@ $(document).ready(function () { | ||||
|     dest.addClass('d-none') | ||||
|     dest.tooltip('hide') | ||||
|     $('#debit_type').removeClass('d-none') | ||||
|     $('#reason').val('') | ||||
|  | ||||
|     $('#source_note_label').text(select_emitter_label) | ||||
|     $('#dest_note_label').text(transfer_type_label) | ||||
| @@ -305,10 +310,10 @@ $('#btn_transfer').click(function () { | ||||
|             destination: dest.note.id, | ||||
|             destination_alias: dest.name | ||||
|           }).done(function () { | ||||
|           if (source.note.membership && source.note.membership.date_end < new Date().toISOString()) { | ||||
|           if (source.note.membership && source.note.membership.date_end <= new Date().toISOString()) { | ||||
|             addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source.name]), 'danger', 30000) | ||||
|           } | ||||
|           if (dest.note.membership && dest.note.membership.date_end < new Date().toISOString()) { | ||||
|           if (dest.note.membership && dest.note.membership.date_end <= new Date().toISOString()) { | ||||
|             addMsg(interpolate(gettext('Warning, the destination note %s is no more a BDE member.'), [dest.name]), 'danger', 30000) | ||||
|           } | ||||
|  | ||||
| @@ -409,7 +414,7 @@ $('#btn_transfer').click(function () { | ||||
|         bank: $('#bank').val() | ||||
|       }).done(function () { | ||||
|       addMsg(gettext('Credit/debit succeed!'), 'success', 10000) | ||||
|       if (user_note.membership && user_note.membership.date_end < new Date().toISOString()) { addMsg(gettext('Warning, the emitter note %s is no more a BDE member.'), 'danger', 10000) } | ||||
|       if (user_note.membership && user_note.membership.date_end <= new Date().toISOString()) { addMsg(gettext('Warning, the emitter note %s is no more a BDE member.'), 'danger', 10000) } | ||||
|       reset() | ||||
|     }).fail(function (err) { | ||||
|       const errObj = JSON.parse(err.responseText) | ||||
|   | ||||
| @@ -4430,6 +4430,294 @@ | ||||
|             "description": "Modifier le type de caution de mon inscription WEI tant qu'elle n'est pas validée" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.permission", | ||||
|         "pk": 298, | ||||
|         "fields": { | ||||
|             "model": [ | ||||
|                 "wei", | ||||
|                 "bus" | ||||
|             ], | ||||
|             "query": "{\"pk\": [\"membership\", \"weimembership\", \"bus\", \"pk\"], \"wei__date_end__gte\": [\"today\"]}", | ||||
|             "type": "change", | ||||
|             "mask": 2, | ||||
|             "field": "information_json", | ||||
|             "permanent": false, | ||||
|             "description": "Modifier les informations du bus" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "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.permission", | ||||
|         "pk": 330, | ||||
|         "fields": { | ||||
|             "model": [ | ||||
|                 "auth", | ||||
|                 "user" | ||||
|             ], | ||||
|             "query": "{\"memberships__club\": [\"club\"]}", | ||||
|             "type": "view", | ||||
|             "mask": 2, | ||||
|             "field": "email", | ||||
|             "permanent": false, | ||||
|             "description": "Voir l'adresse mail des membres de son club" | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "model": "permission.role", | ||||
|         "pk": 1, | ||||
| @@ -4484,7 +4772,11 @@ | ||||
|                 249, | ||||
|                 255, | ||||
|                 256, | ||||
| 		257 | ||||
|                 257, | ||||
|                 311, | ||||
|                 316, | ||||
|                 319, | ||||
|                 323 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
| @@ -4573,7 +4865,11 @@ | ||||
|                 221, | ||||
|                 247, | ||||
|                 258, | ||||
|                 259 | ||||
|                 259, | ||||
|                 260, | ||||
|                 263, | ||||
|                 265, | ||||
|                 330 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
| @@ -4585,7 +4881,6 @@ | ||||
|             "name": "Pr\u00e9sident\u22c5e de club", | ||||
|             "permissions": [ | ||||
|                 62, | ||||
|                 135, | ||||
|                 142 | ||||
|             ] | ||||
|         } | ||||
| @@ -4862,7 +5157,8 @@ | ||||
|                 289, | ||||
|                 290, | ||||
|                 291, | ||||
|                 293 | ||||
|                 293, | ||||
|                 298 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
| @@ -4922,6 +5218,7 @@ | ||||
|             "permissions": [ | ||||
|                 37, | ||||
|                 41, | ||||
|                 42, | ||||
|                 53, | ||||
|                 54, | ||||
|                 55, | ||||
| @@ -4973,7 +5270,9 @@ | ||||
|                 168, | ||||
|                 176, | ||||
|                 177, | ||||
|                 197 | ||||
|                 197, | ||||
|                 311, | ||||
|                 319 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
| @@ -5053,7 +5352,8 @@ | ||||
|                 289, | ||||
|                 290, | ||||
|                 291, | ||||
|                 293 | ||||
|                 293, | ||||
|                 298 | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
| @@ -5143,6 +5443,39 @@ | ||||
|             ] | ||||
|         } | ||||
|     }, | ||||
|     { | ||||
|         "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, | ||||
|   | ||||
							
								
								
									
										18
									
								
								apps/treasury/migrations/0011_sogecredit_valid.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								apps/treasury/migrations/0011_sogecredit_valid.py
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,18 @@ | ||||
| # Generated by Django 5.2.6 on 2025-09-28 20:12 | ||||
|  | ||||
| from django.db import migrations, models | ||||
|  | ||||
|  | ||||
| class Migration(migrations.Migration): | ||||
|  | ||||
|     dependencies = [ | ||||
|         ('treasury', '0010_alter_invoice_bde'), | ||||
|     ] | ||||
|  | ||||
|     operations = [ | ||||
|         migrations.AddField( | ||||
|             model_name='sogecredit', | ||||
|             name='valid', | ||||
|             field=models.BooleanField(blank=True, default=False, verbose_name='Valid'), | ||||
|         ), | ||||
|     ] | ||||
| @@ -308,6 +308,12 @@ class SogeCredit(models.Model): | ||||
|         null=True, | ||||
|     ) | ||||
|  | ||||
|     valid = models.BooleanField( | ||||
|         default=False, | ||||
|         verbose_name=_("Valid"), | ||||
|         blank=True, | ||||
|     ) | ||||
|  | ||||
|     class Meta: | ||||
|         verbose_name = _("Credit from the Société générale") | ||||
|         verbose_name_plural = _("Credits from the Société générale") | ||||
| @@ -332,7 +338,7 @@ class SogeCredit(models.Model): | ||||
|                 last_name=self.user.last_name, | ||||
|                 first_name=self.user.first_name, | ||||
|                 bank="Société générale", | ||||
|                 valid=False, | ||||
|                 valid=True, | ||||
|             ) | ||||
|             credit_transaction._force_save = True | ||||
|             credit_transaction.save() | ||||
| @@ -346,12 +352,12 @@ class SogeCredit(models.Model): | ||||
|         return super().save(*args, **kwargs) | ||||
|  | ||||
|     @property | ||||
|     def valid(self): | ||||
|     def valid_legacy(self): | ||||
|         return self.credit_transaction and self.credit_transaction.valid | ||||
|  | ||||
|     @property | ||||
|     def amount(self): | ||||
|         if self.valid: | ||||
|         if self.valid_legacy: | ||||
|             return self.credit_transaction.total | ||||
|         amount = 0 | ||||
|         transactions_wei = self.transactions.filter(membership__club__weiclub__isnull=False) | ||||
| @@ -397,7 +403,7 @@ class SogeCredit(models.Model): | ||||
|                         self.transactions.add(m.transaction) | ||||
|  | ||||
|         for tr in self.transactions.all(): | ||||
|             tr.valid = False | ||||
|             tr.valid = True | ||||
|             tr.save() | ||||
|  | ||||
|     def invalidate(self): | ||||
| @@ -422,6 +428,7 @@ class SogeCredit(models.Model): | ||||
|         self.invalidate() | ||||
|         # Refresh credit amount | ||||
|         self.save() | ||||
|         self.valid = True | ||||
|         self.credit_transaction.valid = True | ||||
|         self.credit_transaction._force_save = True | ||||
|         self.credit_transaction.save() | ||||
|   | ||||
										
											Binary file not shown.
										
									
								
							| Before Width: | Height: | Size: 284 KiB After Width: | Height: | Size: 104 KiB | 
| @@ -56,6 +56,7 @@ class InvoiceTable(tables.Table): | ||||
|         model = Invoice | ||||
|         template_name = 'django_tables2/bootstrap4.html' | ||||
|         fields = ('id', 'name', 'object', 'acquitted', 'invoice',) | ||||
|         order_by = ('-id',) | ||||
|  | ||||
|  | ||||
| class RemittanceTable(tables.Table): | ||||
|   | ||||
| @@ -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")} | ||||
| @@ -417,7 +417,7 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi | ||||
|                 ) | ||||
|  | ||||
|         if "valid" not in self.request.GET or not self.request.GET["valid"]: | ||||
|             qs = qs.filter(credit_transaction__valid=False) | ||||
|             qs = qs.filter(valid=False) | ||||
|  | ||||
|         return qs | ||||
|  | ||||
|   | ||||
| @@ -17,7 +17,7 @@ from ...models import WEIMembership, Bus | ||||
|  | ||||
| WORDS = { | ||||
|     'list': [ | ||||
|         'Fiesta', 'Graillance', 'Move it move it', 'Calme', 'Nert et geek', 'Jeux de rôles et danse rock', | ||||
|         'Fiesta', 'Graillance', 'Move it move it', 'Calme', 'Nerd et geek', 'Jeux de rôles et danse rock', | ||||
|         'Strass et paillettes', 'Spectaculaire', 'Splendide', 'Flow inégalable', 'Rap', 'Battles légendaires', | ||||
|         'Techno', 'Alcool', 'Kiffeur·euse', 'Rugby', 'Médiéval', 'Festif', | ||||
|         'Stylé', 'Chipie', 'Rétro', 'Vache', 'Farfadet', 'Fanfare', | ||||
| @@ -27,41 +27,41 @@ WORDS = { | ||||
|             """Sur une échelle allant de 0 (= 0 alcool ou très peu) à 5 (= la fontaine de jouvence alcoolique), | ||||
|             quel niveau de consommation d’alcool souhaiterais-tu ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: 4, | ||||
|                 47: 1, | ||||
|                 48: 3, | ||||
|                 45: 3.5, | ||||
|                 44: 4, | ||||
|                 46: 5, | ||||
|                 43: 3, | ||||
|                 49: 3 | ||||
|             } | ||||
|         ], | ||||
|         "voie_post_bac": [ | ||||
|             """Si la DA du bus de ton choix correspondait à une voie post-bac, laquelle serait-elle ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "Double licence cuisine/arts du cirque option burger", | ||||
|                 47: "BTS Exploration de donjon", | ||||
|                 48: "Ecole des stars en herbe", | ||||
|                 45: "Déscolarisation précoce", | ||||
|                 44: "Rattrapage pour excès de kiff", | ||||
|                 46: "Double cursus STAPS / Licence d’histoire", | ||||
|                 43: "Recherche active d’un sugar daddy/d’un sugar mommy", | ||||
|                 49: "Licence de musicologie" | ||||
|             } | ||||
|         ], | ||||
|         "boite": [ | ||||
|             """Tu es seul·e sur une île déserte et devant toi il y a une sombre boîte de taille raisonnable. | ||||
|             Qu’y a-t-il à l’intérieur ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "Un burgouzz de valouzz", | ||||
|                 47: "Un ocarina (pour me téléporter hors de ce bourbier)", | ||||
|                 48: "Des paillettes, un micro de karaoké et une enceinte bluetooth", | ||||
|                 45: "Un kebab", | ||||
|                 44: "Une 86 et un caisson pour taper du pied", | ||||
|                 46: "Une épée, un ballon et une tireuse", | ||||
|                 43: "Des lunettes de soleil", | ||||
|                 49: "Mon instrument de musique" | ||||
|             } | ||||
|         ], | ||||
|         "tardif": [ | ||||
| @@ -69,42 +69,42 @@ WORDS = { | ||||
|             qu’après tout, il n’y a plus personne sur la plage à cette heure-ci. Tu n’habites pas loin mais t’enchaînes | ||||
|             demain avec une journée similaire avec un autre groupe d’amis parce que t’es trop #busy. Que fais-tu ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "On veut se déchaîner toute la nuit !!", | ||||
|                 47: "Je prends une glace et chill un moment avant d’aller dormir", | ||||
|                 48: "J’enfile mes boogie shoes pour enflammer le dancefloor avec elleux et lancer un concours de slay, le perdant finit la bouteille de rhum", | ||||
|                 45: "La fête continuuuuue", | ||||
|                 44: "Soirée sangria plage → boîte → lever de soleil sur la plage", | ||||
|                 46: "Minuit ? C’est l’heure du genepi. On commence les alcools forts !!", | ||||
|                 43: "T’enchaînes direct (faut pas les priver de ta présence)", | ||||
|                 49: "On continue en mode chill (soirée potins)" | ||||
|             } | ||||
|         ], | ||||
|         "cohesion": [ | ||||
|             """C’est la rentrée de Seconde et tu découvres ta classe, tes camarades et ta prof principale!!! | ||||
|             qui vous propose une activité de cohésion. Laquelle est-elle ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "Un relais cubi en ventriglisse", | ||||
|                 47: "Un jeu de rôle", | ||||
|                 48: "Organiser la soirée de l’année dans le lycée. Le thème : SLAY (Spotlight, Love, Amaze/All-night, Yeah), paillettes, disco", | ||||
|                 45: "La prof de français propose un slam parce qu'elle pense que c'est du rap littéraire qui fera plaisir aux élèves", | ||||
|                 44: "P’tit escape game + apéro", | ||||
|                 46: "Joute avec des boucliers Gilbert", | ||||
|                 43: "Tournage d’un clip de confessions nocturnes de Diam’s", | ||||
|                 49: "Je sais pas j’ai raté mon BAFA" | ||||
|             } | ||||
|         ], | ||||
|         "artiste": [ | ||||
|             """C’est l’été et la saison des festivals a commencé. Tu regardes la programmation du festival | ||||
|             pas loin de chez toi et tu découvres avec joie la présence d’un·e artiste. De qui s’agit-il ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "Moto-Moto (il chantera son fameux tube “je les aime grosses, je les aime bombées”)", | ||||
|                 47: "Hatsune Miku", | ||||
|                 48: "Rihanna", | ||||
|                 45: "Vald", | ||||
|                 44: "Qui connaît vraiment les noms des artistes de tech ?", | ||||
|                 46: "Perceval", | ||||
|                 43: "Fatal bazooka", | ||||
|                 49: "Måneskin" | ||||
|             } | ||||
|         ], | ||||
|         "annonce_noel": [ | ||||
| @@ -112,61 +112,103 @@ WORDS = { | ||||
|             D’un coup, tu te lèves, tapotes de manière pompeuse sur ton verre avec un de tes couverts. | ||||
|             Qu’annonces-tu ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: """« Chère famille. Je sais bien que nous avions dit : pas de politique à table. | ||||
|                     Je ne peux toutefois me retenir de vous annoncer une grande nouvelle… | ||||
|                     j’ai décidé de quitter la ville pour consacrer ma vie au culte du Roi Julian. | ||||
|                     A moi la jungle luxuriante, là où le soleil chaud caresse les palmiers, | ||||
|                     où les lémuriens dansent avec frénésie et où chaque repas est une ode au burger sauvage. | ||||
|                     Longue vie à Sa Majesté le Roi Julian ! »""", | ||||
|                 47: "« J’ai perdu »", | ||||
|                 48: "« Mes chers parents je pars, j’arrête l’ENS pour devenir DJ slay à Ibiza »", | ||||
|                 45: "J’interromps le repas pour rapper les 6min de bande organisée", | ||||
|                 44: "« Digestif ? Pétanque ? Les deux ? »", | ||||
|                 46: "« Montjoie St Denis à bas la Macronie »", | ||||
|                 43: "« Je suis enceinte » (c’est faux j’ai juste besoin d’attention)", | ||||
|                 49: """Discours de remerciement : | ||||
|                     je lance un powerpoint de 65 slides et sors une feuille A4 blanche (je fais semblant de lire mon discours dessus)""" | ||||
|             } | ||||
|         ], | ||||
|         "vacances": [ | ||||
|             """Les vacances sont là et t’aimerais bien partir quelque part, mais où ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "A Madagascar, à bord d’un bus conduit par des pingouins", | ||||
|                 47: "Dans ma chambre", | ||||
|                 48: "Rio de Janeiro", | ||||
|                 45: "N'importe où tant qu'on peut sortir tous les soirs", | ||||
|                 44: "Tu suis les plans du club ski ou de piratens", | ||||
|                 46: "Carcassonne", | ||||
|                 43: "Coachella", | ||||
|                 49: "Dans les montagnes de la république populaire d’Auvergne-Rhônes-Alpes pour profiter de la fraîcheur, de la nature et de mes ami·e·s" | ||||
|             } | ||||
|         ], | ||||
|         "loisir": [ | ||||
|             """T’as fini ta journée de cours et tu t’apprêtes à profiter d’une activité/hobby/loisir de ton choix. | ||||
|             Laquelle est-ce ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: "Cueillir des noix de coco", | ||||
|                 47: "Essayer de travailler puis chill avec des potes autour d’un jeu en buvant du thé", | ||||
|                 48: "Repet du nouveau spectacle de mon club, before (potins) puis sortie avec les potes jusqu’au bout de la night", | ||||
|                 45: "Zoner avec les copaings jusqu’à pas d’heure", | ||||
|                 44: "Go Kfet pour se faire traquenard jusqu’à 3h du mat", | ||||
|                 46: "Déterminer ce qui est le plus solide entre mon crâne et une ecocup", | ||||
|                 43: "Revoir pour la 6e fois gossip girl au fond de ton lit", | ||||
|                 49: "Jouer de mon instrument préféré avec les copains/copines pour préparer le prochain concert #solidays" | ||||
|             } | ||||
|         ], | ||||
|         "plan": [ | ||||
|             """Tu reçois un message sur la conversation de groupe que tu partages avec tes potes : | ||||
|             vous êtes chaud·e·s pour vous retrouver. Quel plan t’attire le plus ?""", | ||||
|             { | ||||
|                 42: "", | ||||
|                 47: "", | ||||
|                 48: "", | ||||
|                 45: "", | ||||
|                 44: "", | ||||
|                 46: "", | ||||
|                 43: "", | ||||
|                 49: "" | ||||
|                 42: """Après-midi piscine, puis before arrosé de mojito, | ||||
|                     avant d’aller s’éclater en pot avec toute la savane et de finir sur un after spécial pina colada""", | ||||
|                 47: """(matin) : Ptit jeu de rôle | ||||
|                     (repas) : le traditionnel poké-tacos | ||||
|                     (juste après le repas) : combat avec des épées en mousse avec les copains! | ||||
|                     (16h00) : pause thé | ||||
|                     (fin d’après midi) : initiation à la danse rock | ||||
|                     (soirée) : découverte d’un jeu de société avec des règles obscures | ||||
|                     """, | ||||
|                 48: "Soirée champagne and chic : spectacle et dîner au moulin rouge puis soirée sur les champs", | ||||
|                 45: "Se regrouper pour une soirée, même si il n’est encore que 10h", | ||||
|                 44: "P’tit poké qui termine en koin koin avec after poker", | ||||
|                 46: "Une dégustation de bière, un rugby et toute autre activité joviale", | ||||
|                 43: "Un brunch de pour papoter puis friperies", | ||||
|                 49: "Soirée raclette !" | ||||
|             } | ||||
|         ] | ||||
|     } | ||||
|     }, | ||||
|     'stats': [ | ||||
|         { | ||||
|             "question": """Le WEI est structuré par bus, et au sein de chaque bus, par équipes. | ||||
|                          Pour toi, être dans une équipe où tout le monde reste sobre (primo-entrants comme encadrants) c'est :""", | ||||
|             "answers": [ | ||||
|                 (1, "Inenvisageable"), | ||||
|                 (2, "À contre cœur"), | ||||
|                 (3, "Pourquoi pas"), | ||||
|                 (4, "Souhaitable"), | ||||
|                 (5, "Nécessaire"), | ||||
|             ], | ||||
|             "help_text": "(De toute façon aucun alcool n'est consommé pendant les trajets du bus, ni aller, ni retour.)", | ||||
|         }, | ||||
|         { | ||||
|             "question": "Faire partie d'un bus qui n'apporte pas de boisson alcoolisée pour ses membres, pour toi c'est :", | ||||
|             "answers": [ | ||||
|                 (1, "Inenvisageable"), | ||||
|                 (2, "À contre cœur"), | ||||
|                 (3, "Pourquoi pas"), | ||||
|                 (4, "Souhaitable"), | ||||
|                 (5, "Nécessaire"), | ||||
|             ], | ||||
|             "help_text": """(Tout les bus apportent de l'alcool cette année, cette question sert à l'organisation pour l'année prochaine. | ||||
|                          De plus il y aura de toute façon de l'alcool commun au WEI et aucun alcool n'est consommé pendant les trajets en bus.)""", | ||||
|         }, | ||||
|     ] | ||||
| } | ||||
|  | ||||
| IMAGES = { | ||||
|     "vacances": { | ||||
|         49: "/static/wei/img/logo_auvergne_rhone_alpes.jpg", | ||||
|     } | ||||
| } | ||||
|  | ||||
| NB_WORDS = 5 | ||||
| @@ -219,7 +261,7 @@ class WEISurveyForm2025(forms.Form): | ||||
|             all_preferred_words = WORDS['list'] | ||||
|             rng.shuffle(all_preferred_words) | ||||
|             self.fields["words"].choices = [(w, w) for w in all_preferred_words] | ||||
|         else: | ||||
|         elif information.step <= len(WORDS['questions']): | ||||
|             questions = list(WORDS['questions'].items()) | ||||
|             idx = information.step - 1 | ||||
|             if idx < len(questions): | ||||
| @@ -235,6 +277,15 @@ class WEISurveyForm2025(forms.Form): | ||||
|                     widget=OptionalImageRadioSelect(images=IMAGES.get(q, {})), | ||||
|                     required=True, | ||||
|                 ) | ||||
|         elif information.step == len(WORDS['questions']) + 1: | ||||
|             for i, v in enumerate(WORDS['stats']): | ||||
|                 self.fields[f'stat_{i}'] = forms.ChoiceField( | ||||
|                     label=v['question'], | ||||
|                     choices=v['answers'], | ||||
|                     widget=forms.RadioSelect(), | ||||
|                     required=False, | ||||
|                     help_text=_(v.get('help_text', '')) | ||||
|                 ) | ||||
|  | ||||
|     def clean_words(self): | ||||
|         data = self.cleaned_data['words'] | ||||
| @@ -361,7 +412,7 @@ class WEISurvey2025(WEISurvey): | ||||
|                 setattr(self.information, "word" + str(i), word) | ||||
|             self.information.step += 1 | ||||
|             self.save() | ||||
|         else: | ||||
|         elif 1 <= self.information.step <= len(WORDS['questions']): | ||||
|             questions = list(WORDS['questions'].keys()) | ||||
|             idx = self.information.step - 1 | ||||
|             if idx < len(questions): | ||||
| @@ -369,6 +420,13 @@ class WEISurvey2025(WEISurvey): | ||||
|                 setattr(self.information, q, form.cleaned_data[q]) | ||||
|                 self.information.step += 1 | ||||
|                 self.save() | ||||
|         else: | ||||
|             for i, __ in enumerate(WORDS['stats']): | ||||
|                 ans = form.cleaned_data.get(f'stat_{i}') | ||||
|                 if ans is not None: | ||||
|                     setattr(self.information, f'stat_{i}', ans) | ||||
|             self.information.step += 1 | ||||
|             self.save() | ||||
|  | ||||
|     @classmethod | ||||
|     def get_algorithm_class(cls): | ||||
| @@ -378,7 +436,7 @@ class WEISurvey2025(WEISurvey): | ||||
|         """ | ||||
|         The survey is complete once the bus is chosen. | ||||
|         """ | ||||
|         return self.information.step > len(WORDS['questions']) | ||||
|         return self.information.step > len(WORDS['questions']) + 1 | ||||
|  | ||||
|     @classmethod | ||||
|     @lru_cache() | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								apps/wei/static/wei/img/logo_auvergne_rhone_alpes.jpg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								apps/wei/static/wei/img/logo_auvergne_rhone_alpes.jpg
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 34 KiB | 
| @@ -37,11 +37,13 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|         </a> | ||||
|         {% endif %} | ||||
|         {% else %} | ||||
|         {% if registration.validated %} | ||||
|         <a class="btn btn-warning" href="{% url "wei:wei_update_registration" pk=my_registration.pk %}" | ||||
|             data-turbolinks="false"> | ||||
|             {% trans "Update my registration" %} | ||||
|         </a> | ||||
|         {% if not not_first_year %} | ||||
|         {% endif %} | ||||
|         {% if my_registration.first_year %} | ||||
|         {% if not survey_complete %} | ||||
|         <a class="btn btn-warning" href="{% url "wei:wei_survey" pk=my_registration.pk %}" data-turbolinks="false"> | ||||
|             {% trans "Continue survey" %} | ||||
|   | ||||
| @@ -28,8 +28,8 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     const input = document.querySelector("input[name='emergency_contact_phone']"); | ||||
|     const form = document.querySelector("#registration-form"); | ||||
|  | ||||
|     if (!input || !form) { | ||||
|         console.error("Input phone_number ou form introuvable."); | ||||
|     if (!input || !form || input.type === "hidden" || input.disabled || input.readOnly) { | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     const iti = window.intlTelInput(input, { | ||||
|   | ||||
| @@ -53,9 +53,11 @@ class TestWEIAlgorithm(TestCase): | ||||
|                 birth_date='2000-01-01', | ||||
|             ) | ||||
|             information = WEISurveyInformation2025(registration) | ||||
|             for j in range(1, 21): | ||||
|             for j in range(1, 1 + NB_WORDS): | ||||
|                 setattr(information, f'word{j}', random.choice(WORDS['list'])) | ||||
|             information.step = 20 | ||||
|             for q in WORDS['questions']: | ||||
|                 setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys()))) | ||||
|             information.step = len(WORDS['questions']) + 2 | ||||
|             information.save(registration) | ||||
|             registration.save() | ||||
|  | ||||
| @@ -87,7 +89,7 @@ class TestWEIAlgorithm(TestCase): | ||||
|                 setattr(information, f'word{j}', random.choice(WORDS['list'])) | ||||
|             for q in WORDS['questions']: | ||||
|                 setattr(information, q, random.choice(list(WORDS['questions'][q][1].keys()))) | ||||
|             information.step = len(WORDS['questions']) + 1 | ||||
|             information.step = len(WORDS['questions']) + 2 | ||||
|             information.save(registration) | ||||
|             registration.save() | ||||
|             survey = WEISurvey2025(registration) | ||||
|   | ||||
| @@ -680,7 +680,7 @@ class TestWEIRegistration(TestCase): | ||||
|             self.assertTrue(soge_credit.exists()) | ||||
|             soge_credit = soge_credit.get() | ||||
|             self.assertTrue(membership.transaction in soge_credit.transactions.all()) | ||||
|             self.assertFalse(membership.transaction.valid) | ||||
|             self.assertTrue(membership.transaction.valid) | ||||
|  | ||||
|         # Check that if the WEI is started, we can't update a wei | ||||
|         self.wei.date_start = date(2000, 1, 1) | ||||
|   | ||||
| @@ -214,6 +214,8 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, D | ||||
|  | ||||
|         context["not_first_year"] = WEIMembership.objects.filter(user=self.request.user).exists() | ||||
|  | ||||
|         context["registration_validated"] = WEIMembership.objects.filter(registration=my_registration).exists() if my_registration else False | ||||
|  | ||||
|         qs = WEIMembership.objects.filter(club=club, registration__first_year=True, bus__isnull=True) | ||||
|         context["can_validate_1a"] = PermissionBackend.check_perm( | ||||
|             self.request, "wei.change_weimembership_bus", qs.first()) if qs.exists() else False | ||||
|   | ||||
| @@ -4366,6 +4366,14 @@ msgstr "" | ||||
| msgid "Forgotten your password or username?" | ||||
| msgstr "Passwort oder Username vergessen?" | ||||
|  | ||||
| #: note_kfet/templates/registration/login.html:44 | ||||
| msgid "Download on the AppStore" | ||||
| msgstr "Im AppStore herunterladen" | ||||
|  | ||||
| #: note_kfet/templates/registration/login.html:48 | ||||
| msgid "Get it on Google Play" | ||||
| msgstr "Bei Google Play herunterladen" | ||||
|  | ||||
| #: note_kfet/templates/registration/password_change_done.html:13 | ||||
| msgid "Your password was changed." | ||||
| msgstr "Ihr Passwort wurde geändert." | ||||
|   | ||||
| @@ -4281,6 +4281,14 @@ msgstr "" | ||||
| msgid "Forgotten your password or username?" | ||||
| msgstr "¿ Contraseña o nombre de usuario olvidado ?" | ||||
|  | ||||
| #: note_kfet/templates/registration/login.html:44 | ||||
| msgid "Download on the AppStore" | ||||
| msgstr "Descargar en la AppStore" | ||||
|  | ||||
| #: note_kfet/templates/registration/login.html:48 | ||||
| msgid "Get it on Google Play" | ||||
| msgstr "Descargar en Google Play" | ||||
|  | ||||
| #: note_kfet/templates/registration/password_change_done.html:13 | ||||
| msgid "Your password was changed." | ||||
| msgstr "Su contraseña fue cambiada con éxito." | ||||
|   | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -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" | ||||
|  | ||||
|  | ||||
|  | ||||
|   | ||||
| @@ -72,6 +72,7 @@ INSTALLED_APPS = [ | ||||
|     # Note apps | ||||
|     'api', | ||||
|     'activity', | ||||
|     'family', | ||||
|     'food', | ||||
|     'logs', | ||||
|     'member', | ||||
|   | ||||
							
								
								
									
										50
									
								
								note_kfet/static/img/appstore_badge_fr.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										50
									
								
								note_kfet/static/img/appstore_badge_fr.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,50 @@ | ||||
| <svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="126.50751" height="40" viewBox="0 0 126.50751 40"> | ||||
|   <title>Download_on_the_App_Store_Badge_FR_RGB_blk_100517</title> | ||||
|   <g> | ||||
|     <g> | ||||
|       <path d="M116.97821,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H116.97821c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50641,13.50641,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.50709,13.50709,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76753,6.76753,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/> | ||||
|       <path d="M8.44482,39.125c-.30467,0-.602-.0039-.90428-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37138,12.37138,0,0,1,.16552-1.87207,5.75577,5.75577,0,0,1,.54347-1.6621A5.37365,5.37365,0,0,1,2.61182,2.61768,5.56562,5.56562,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58579,12.58579,0,0,1,7.543.88721L8.44532.875h109.612l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59375,5.59375,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/> | ||||
|     </g> | ||||
|     <g> | ||||
|       <g id="_Group_" data-name="<Group>"> | ||||
|         <g id="_Group_2" data-name="<Group>"> | ||||
|           <g id="_Group_3" data-name="<Group>"> | ||||
|             <path id="_Path_" data-name="<Path>" d="M24.7718,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914A10.962,10.962,0,0,0,27.691,24.69985,4.78205,4.78205,0,0,1,24.7718,20.30068Z" style="fill: #fff"/> | ||||
|             <path id="_Path_2" data-name="<Path>" d="M22.04017,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.04017,12.21089Z" style="fill: #fff"/> | ||||
|           </g> | ||||
|         </g> | ||||
|       </g> | ||||
|       <g id="_Group_4" data-name="<Group>"> | ||||
|         <g> | ||||
|           <path d="M35.65528,14.70166V9.57813h-1.877V8.73486h4.67676v.84326H36.582v5.12354Z" style="fill: #fff"/> | ||||
|           <path d="M42.76466,13.48584a1.828,1.828,0,0,1-1.95117,1.30273,2.04531,2.04531,0,0,1-2.08008-2.32422,2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27v.31006H39.63868v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117H41.9131a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,39.63868,12.03467ZM40.2754,9.4458l1.03809-1.42236h1.042L41.19337,9.4458Z" style="fill: #fff"/> | ||||
|           <path d="M44.05274,8.44092h.88867v6.26074h-.88867Z" style="fill: #fff"/> | ||||
|           <path d="M50.208,13.48584a1.828,1.828,0,0,1-1.95117,1.30273,2.04531,2.04531,0,0,1-2.08008-2.32422,2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27v.31006H47.082v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,47.082,12.03467Zm.63672-2.58887,1.03809-1.42236h1.042L48.63673,9.4458Z" style="fill: #fff"/> | ||||
|           <path d="M54.40333,11.67041a1.00546,1.00546,0,0,0-1.06348-.76465c-.74414,0-1.19922.57031-1.19922,1.52979,0,.97607.459,1.55908,1.19922,1.55908a.97873.97873,0,0,0,1.06348-.74023h.86426a1.762,1.762,0,0,1-1.92285,1.53418,2.06791,2.06791,0,0,1-2.11328-2.353,2.05305,2.05305,0,0,1,2.1084-2.32373,1.77731,1.77731,0,0,1,1.92773,1.55859Z" style="fill: #fff"/> | ||||
|           <path d="M56.44728,8.44092h.88086v2.48145h.07031a1.3856,1.3856,0,0,1,1.373-.80664,1.48339,1.48339,0,0,1,1.55078,1.67871v2.90723h-.88965v-2.688c0-.71924-.335-1.0835-.96289-1.0835a1.05194,1.05194,0,0,0-1.13379,1.1416v2.62988h-.88867Z" style="fill: #fff"/> | ||||
|           <path d="M61.43946,13.42822c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031V11.625c0-.47559-.31445-.74414-.92188-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76514.562,1.76514,1.51318v3.07666h-.855v-.63281H64.293a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,61.43946,13.42822Zm2.89453-.38477V12.667l-1.09961.07031c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,64.334,13.04346Z" style="fill: #fff"/> | ||||
|           <path d="M66.60987,10.19873h.85547v.69043h.06641a1.22092,1.22092,0,0,1,1.21582-.76514,1.86836,1.86836,0,0,1,.39648.03711v.877a2.43442,2.43442,0,0,0-.49609-.05371A1.05507,1.05507,0,0,0,67.49855,12.043v2.65869h-.88867Z" style="fill: #fff"/> | ||||
|           <path d="M69.96144,15.15234h.90918c.0752.32666.45117.5376,1.05078.5376.74023,0,1.17871-.35156,1.17871-.94678v-.86426H73.0337a1.51433,1.51433,0,0,1-1.38965.75635c-1.14941,0-1.86035-.88867-1.86035-2.23682,0-1.373.71875-2.27441,1.86914-2.27441a1.56045,1.56045,0,0,1,1.41406.79395h.07031v-.71924h.85156v4.54c0,1.02979-.80664,1.68311-2.08008,1.68311C70.7837,16.42188,70.05616,15.91748,69.96144,15.15234Zm3.15527-2.7583c0-.897-.46387-1.47168-1.2207-1.47168-.76465,0-1.19434.57471-1.19434,1.47168,0,.89746.42969,1.47217,1.19434,1.47217C72.65773,13.86621,73.11671,13.2959,73.11671,12.394Z" style="fill: #fff"/> | ||||
|           <path d="M79.21241,13.48584a1.828,1.828,0,0,1-1.95117,1.30273,2.04531,2.04531,0,0,1-2.08008-2.32422,2.07685,2.07685,0,0,1,2.07617-2.35254c1.25293,0,2.00879.856,2.00879,2.27v.31006H76.08644v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,76.08644,12.03467Z" style="fill: #fff"/> | ||||
|           <path d="M80.45948,10.19873H81.315v.69043h.06641a1.22092,1.22092,0,0,1,1.21582-.76514,1.86836,1.86836,0,0,1,.39648.03711v.877a2.43442,2.43442,0,0,0-.49609-.05371A1.05507,1.05507,0,0,0,81.34815,12.043v2.65869h-.88867Z" style="fill: #fff"/> | ||||
|           <path d="M86.19581,12.44824c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.44092h.88867v6.26074h-.85156v-.71143H89.479a1.56284,1.56284,0,0,1-1.41406.78564C86.91944,14.77588,86.19581,13.87451,86.19581,12.44824Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C87.56886,10.92236,87.11378,11.501,87.11378,12.44824Z" style="fill: #fff"/> | ||||
|           <path d="M91.60206,13.42822c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031V11.625c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,91.60206,13.42822Zm2.89453-.38477V12.667L93.397,12.7373c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,94.49659,13.04346Z" style="fill: #fff"/> | ||||
|           <path d="M96.773,10.19873h.85547v.71533h.06641a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00977c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428H96.773Z" style="fill: #fff"/> | ||||
|           <path d="M103.61769,10.11182c1.0127,0,1.6748.47119,1.76172,1.26514h-.85254c-.082-.33057-.40527-.5415-.90918-.5415-.49609,0-.873.23535-.873.58691,0,.269.22754.43848.71582.55029l.748.17334c.85645.19873,1.25781.56689,1.25781,1.22852,0,.84766-.79,1.41406-1.86523,1.41406-1.07129,0-1.76953-.48389-1.84863-1.28174h.88965a.91365.91365,0,0,0,.97949.562c.55371,0,.94727-.248.94727-.60791,0-.26855-.21094-.44238-.66211-.5498l-.78516-.18213c-.85645-.20264-1.25293-.58691-1.25293-1.25684C101.86866,10.67383,102.60011,10.11182,103.61769,10.11182Z" style="fill: #fff"/> | ||||
|         </g> | ||||
|       </g> | ||||
|     </g> | ||||
|     <g> | ||||
|       <path d="M35.19825,18.06689h1.85938V30.48535H35.19825Z" style="fill: #fff"/> | ||||
|       <path d="M39.29786,22.61084l1.01563-4.54395h1.80664l-1.23047,4.54395Z" style="fill: #fff"/> | ||||
|       <path d="M49.14649,27.12891H44.4131l-1.13672,3.35645H41.27149l4.4834-12.41846h2.083l4.4834,12.41846H50.28224Zm-4.24316-1.54883h3.752l-1.84961-5.44775h-.05176Z" style="fill: #fff"/> | ||||
|       <path d="M62.00294,25.959c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.43115h1.79883V22.937h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C60.48829,21.33643,62.00294,23.15283,62.00294,25.959Zm-1.91016,0c0-1.8335-.94727-3.03857-2.39258-3.03857-1.41992,0-2.375,1.23047-2.375,3.03857,0,1.82422.95508,3.0459,2.375,3.0459C59.14552,29.00488,60.09278,27.80859,60.09278,25.959Z" style="fill: #fff"/> | ||||
|       <path d="M71.9673,25.959c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438H63.43946V21.43115H65.2378V22.937H65.272a3.21162,3.21162,0,0,1,2.88281-1.60059C70.45265,21.33643,71.9673,23.15283,71.9673,25.959Zm-1.91016,0c0-1.8335-.94727-3.03857-2.39258-3.03857-1.41992,0-2.375,1.23047-2.375,3.03857,0,1.82422.95508,3.0459,2.375,3.0459C69.10987,29.00488,70.05714,27.80859,70.05714,25.959Z" style="fill: #fff"/> | ||||
|       <path d="M78.55323,27.02539c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.38818C78.03663,24.271,76.978,23.20459,76.978,21.47412c0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426H84.104c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.62646,3.60645,3.44287,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/> | ||||
|       <path d="M90.19,19.28857v2.14258h1.72168v1.47168H90.19v4.9917c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.90283H87.00636V21.43115h1.31641V19.28857Z" style="fill: #fff"/> | ||||
|       <path d="M92.90773,25.959c0-2.84912,1.67773-4.63916,4.29395-4.63916,2.625,0,4.29492,1.79,4.29492,4.63916,0,2.85645-1.66113,4.63867-4.29492,4.63867C94.56886,30.59766,92.90773,28.81543,92.90773,25.959Zm6.69531,0c0-1.95459-.89551-3.10791-2.40137-3.10791s-2.40039,1.16211-2.40039,3.10791c0,1.96191.89453,3.10645,2.40039,3.10645S99.603,27.9209,99.603,25.959Z" style="fill: #fff"/> | ||||
|       <path d="M103.02882,21.43115h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934V23.144a2.59794,2.59794,0,0,0-.835-.1123,1.8728,1.8728,0,0,0-1.93652,2.0835v5.37012h-1.8584Z" style="fill: #fff"/> | ||||
|       <path d="M116.22608,27.82617c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.84033,1.64355-4.68213,4.19043-4.68213,2.50488,0,4.08008,1.7207,4.08008,4.46631v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344ZM109.94386,25.124h4.52637a2.17744,2.17744,0,0,0-2.2207-2.29834A2.29214,2.29214,0,0,0,109.94386,25.124Z" style="fill: #fff"/> | ||||
|     </g> | ||||
|   </g> | ||||
| </svg> | ||||
| After Width: | Height: | Size: 12 KiB | 
							
								
								
									
										49
									
								
								note_kfet/static/img/playstore_badge_fr.svg
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								note_kfet/static/img/playstore_badge_fr.svg
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,49 @@ | ||||
| <?xml version="1.0" encoding="UTF-8"?> | ||||
| <svg id="artwork" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 135 40"> | ||||
|   <!-- Generator: Adobe Illustrator 29.5.1, SVG Export Plug-In . SVG Version: 2.1.0 Build 141)  --> | ||||
|   <defs> | ||||
|     <style> | ||||
|       .st0 { | ||||
|         fill: #4285f4; | ||||
|       } | ||||
|  | ||||
|       .st1 { | ||||
|         fill: #a6a6a6; | ||||
|       } | ||||
|  | ||||
|       .st2 { | ||||
|         fill: #34a853; | ||||
|       } | ||||
|  | ||||
|       .st3 { | ||||
|         fill: #fbbc04; | ||||
|       } | ||||
|  | ||||
|       .st4, .st5 { | ||||
|         fill: #fff; | ||||
|       } | ||||
|  | ||||
|       .st6 { | ||||
|         fill: #ea4335; | ||||
|       } | ||||
|  | ||||
|       .st5 { | ||||
|         font-family: GoogleSans-Medium, 'Google Sans'; | ||||
|         font-size: 8.7px; | ||||
|         font-weight: 500; | ||||
|       } | ||||
|     </style> | ||||
|   </defs> | ||||
|   <g> | ||||
|     <rect width="135" height="40" rx="5" ry="5"/> | ||||
|     <path class="st1" d="M130,.8c2.316,0,4.2,1.884,4.2,4.2v30c0,2.316-1.884,4.2-4.2,4.2H5c-2.316,0-4.2-1.884-4.2-4.2V5C.8,2.684,2.684.8,5,.8h125M130,0H5C2.25,0,0,2.25,0,5v30c0,2.75,2.25,5,5,5h125c2.75,0,5-2.25,5-5V5C135,2.25,132.75,0,130,0h0Z"/> | ||||
|     <path class="st4" d="M68.136,21.752c-2.352,0-4.269,1.788-4.269,4.253,0,2.449,1.917,4.253,4.269,4.253s4.269-1.804,4.269-4.253c0-2.465-1.917-4.253-4.269-4.253ZM68.136,28.583c-1.289,0-2.4-1.063-2.4-2.578,0-1.531,1.112-2.578,2.4-2.578s2.4,1.047,2.4,2.578c0,1.514-1.112,2.578-2.4,2.578ZM58.822,21.752c-2.352,0-4.269,1.788-4.269,4.253,0,2.449,1.917,4.253,4.269,4.253s4.269-1.804,4.269-4.253c0-2.465-1.917-4.253-4.269-4.253ZM58.822,28.583c-1.289,0-2.4-1.063-2.4-2.578,0-1.531,1.112-2.578,2.4-2.578s2.4,1.047,2.4,2.578c0,1.514-1.112,2.578-2.4,2.578ZM47.744,23.057v1.804h4.318c-.129,1.015-.467,1.756-.983,2.272-.628.628-1.611,1.321-3.335,1.321-2.658,0-4.736-2.143-4.736-4.801s2.078-4.801,4.736-4.801c1.434,0,2.481.564,3.254,1.289l1.273-1.273c-1.079-1.031-2.513-1.82-4.527-1.82-3.641,0-6.702,2.964-6.702,6.605s3.061,6.605,6.702,6.605c1.965,0,3.448-.644,4.608-1.853,1.192-1.192,1.563-2.868,1.563-4.221,0-.419-.032-.805-.097-1.128h-6.074ZM93.052,24.458c-.354-.95-1.434-2.707-3.641-2.707-2.191,0-4.011,1.724-4.011,4.253,0,2.384,1.804,4.253,4.221,4.253,1.949,0,3.077-1.192,3.544-1.885l-1.45-.967c-.483.709-1.144,1.176-2.094,1.176s-1.627-.435-2.062-1.289l5.687-2.352-.193-.483ZM87.252,25.876c-.048-1.643,1.273-2.481,2.223-2.481.741,0,1.369.37,1.579.902l-3.802,1.579ZM82.628,30h1.869v-12.502h-1.869v12.502ZM79.567,22.702h-.064c-.419-.499-1.224-.951-2.239-.951-2.127,0-4.076,1.869-4.076,4.269,0,2.384,1.949,4.237,4.076,4.237,1.015,0,1.82-.451,2.239-.967h.064v.612c0,1.627-.87,2.497-2.272,2.497-1.144,0-1.853-.822-2.143-1.514l-1.627.677c.467,1.128,1.708,2.513,3.77,2.513,2.191,0,4.044-1.289,4.044-4.43v-7.636h-1.772v.693ZM77.425,28.583c-1.289,0-2.368-1.079-2.368-2.562,0-1.498,1.079-2.594,2.368-2.594,1.273,0,2.272,1.096,2.272,2.594,0,1.482-.999,2.562-2.272,2.562ZM101.806,17.499h-4.471v12.501h1.866v-4.736h2.605c2.068,0,4.101-1.497,4.101-3.883s-2.033-3.882-4.101-3.882ZM101.854,23.524h-2.654v-4.285h2.654c1.395,0,2.187,1.155,2.187,2.143,0,.969-.792,2.143-2.187,2.143ZM113.386,21.729c-1.351,0-2.75.595-3.329,1.914l1.657.692c.354-.692,1.013-.917,1.705-.917.965,0,1.946.579,1.962,1.608v.129c-.338-.193-1.061-.483-1.946-.483-1.785,0-3.603.981-3.603,2.815,0,1.673,1.463,2.75,3.104,2.75,1.254,0,1.946-.563,2.38-1.222h.064v.965h1.801v-4.793c0-2.22-1.657-3.458-3.796-3.458ZM113.16,28.58c-.611,0-1.464-.305-1.464-1.061,0-.965,1.061-1.335,1.978-1.335.82,0,1.206.177,1.705.418-.145,1.158-1.142,1.978-2.219,1.978ZM123.743,22.002l-2.139,5.42h-.064l-2.219-5.42h-2.01l3.329,7.575-1.898,4.214h1.946l5.131-11.789h-2.075ZM106.936,30h1.866v-12.501h-1.866v12.501Z"/> | ||||
|     <g> | ||||
|       <path class="st6" d="M20.717,19.424l-10.647,11.3s.001.005.002.007c.327,1.227,1.447,2.13,2.777,2.13.531,0,1.031-.144,1.459-.396l.034-.02,11.984-6.915-5.609-6.106Z"/> | ||||
|       <path class="st3" d="M31.488,17.5l-.01-.007-5.174-3-5.829,5.187,5.849,5.848,5.146-2.969c.902-.487,1.515-1.438,1.515-2.535,0-1.09-.604-2.036-1.498-2.525Z"/> | ||||
|       <path class="st0" d="M10.07,9.277c-.064.236-.098.484-.098.74v19.968c0,.256.033.504.098.739l11.013-11.011-11.013-10.436Z"/> | ||||
|       <path class="st2" d="M20.796,20.001l5.51-5.509-11.97-6.94c-.435-.261-.943-.411-1.486-.411-1.33,0-2.452.905-2.779,2.134,0,0,0,.002,0,.003l10.726,10.724Z"/> | ||||
|     </g> | ||||
|   </g> | ||||
|   <text class="st5" transform="translate(41.08 13.134)"><tspan x="0" y="0">DISPONIBLE SUR</tspan></text> | ||||
| </svg> | ||||
| After Width: | Height: | Size: 4.2 KiB | 
| @@ -83,6 +83,13 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|                             <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-exchange"></i> {% trans 'Transfer' %}</a> | ||||
|                         </li> | ||||
|                     {% endif %} | ||||
|                     {% if user.is_authenticated %} | ||||
|                         <li class="nav-item"> | ||||
|                             {% url 'family:family_list' as url %} | ||||
|                             <a class="nav-link {% if request.path_info == url %}active{% endif %}" href="{{ url }}"><i class="fa fa-home"></i> {% trans 'Families' %}</a> | ||||
|                         </li> | ||||
|                     {% endif %} | ||||
|  | ||||
|                     {% if "auth.user"|model_list_length >= 2 %} | ||||
|                         <li class="nav-item"> | ||||
|                             {% url 'member:user_list' as url %} | ||||
|   | ||||
| @@ -39,6 +39,17 @@ SPDX-License-Identifier: GPL-2.0-or-later | ||||
|             <a href="{% url 'password_reset' %}" | ||||
|                 class="badge badge-light">{% trans 'Forgotten your password or username?' %}</a> | ||||
|         </form> | ||||
|  | ||||
|         <div class="text-center mt-4"> | ||||
|             <a href="https://apps.apple.com/fr/app/la-note-kfet/id6754661723" class="d-inline-block mx-1" aria-label="{% trans 'Download on the AppStore' %}" style="cursor: pointer;"> | ||||
|                 <img src="/static/img/appstore_badge_fr.svg" | ||||
|                      alt="{% trans 'Download on the AppStore' %}" style="height: 50px;"> | ||||
|             </a> | ||||
|             <a href="https://play.google.com/store/apps/details?id=org.crans.bde.note&hl=fr" class="d-inline-block mx-1" aria-label="{% trans 'Get it on Google Play' %}" style="cursor: pointer;"> | ||||
|                 <img src="/static/img/playstore_badge_fr.svg" | ||||
|                      alt="{% trans 'Get it on Google Play' %}" style="height: 50px;"> | ||||
|             </a> | ||||
|         </div> | ||||
|     </div> | ||||
| </div> | ||||
| {% endblock %} | ||||
| @@ -39,8 +39,8 @@ SPDX-License-Identifier: GPL-3.0-or-later | ||||
|     const input = document.querySelector("input[name='phone_number']"); | ||||
|     const form = document.querySelector("#profile_form"); | ||||
|  | ||||
|     if (!input || !form) { | ||||
|         console.error("Input phone_number ou form introuvable."); | ||||
|     if (!input || !form || input.type === "hidden" || input.disabled || input.readOnly) { | ||||
|         return; | ||||
|     } | ||||
|  | ||||
|     const iti = window.intlTelInput(input, { | ||||
|   | ||||
| @@ -23,6 +23,7 @@ urlpatterns = [ | ||||
|     path('wei/', include('wei.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')), | ||||
|   | ||||
| @@ -12,10 +12,11 @@ django-filter~=25.1 | ||||
| django-mailer~=2.3.2 | ||||
| django-oauth-toolkit~=3.0.1 | ||||
| django-phonenumber-field~=8.1.0 | ||||
| django-polymorphic~=3.1.0 | ||||
| django-polymorphic~=4.1.0 | ||||
| djangorestframework~=3.16.0 | ||||
| django-rest-polymorphic~=0.1.10 | ||||
| django-tables2~=2.7.5 | ||||
| python-memcached~=1.62 | ||||
| phonenumbers~=9.0.8 | ||||
| tablib~=3.8.0 | ||||
| Pillow>=11.3.0 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user