{{ title }}
-
+
{% trans "Transfer" %}
diff --git a/apps/activity/tests/test_activities.py b/apps/activity/tests/test_activities.py
new file mode 100644
index 00000000..99eb2ffb
--- /dev/null
+++ b/apps/activity/tests/test_activities.py
@@ -0,0 +1,175 @@
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from datetime import timedelta
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.urls import reverse
+from django.utils import timezone
+from activity.models import Activity, ActivityType, Guest, Entry
+from member.models import Club
+
+
+class TestActivities(TestCase):
+ """
+ Test activities
+ """
+ fixtures = ('initial',)
+
+ def setUp(self):
+ self.user = User.objects.create_superuser(
+ username="admintoto",
+ password="tototototo",
+ email="toto@example.com"
+ )
+ self.client.force_login(self.user)
+
+ sess = self.client.session
+ sess["permission_mask"] = 42
+ sess.save()
+
+ self.activity = Activity.objects.create(
+ name="Activity",
+ description="This is a test activity\non two very very long lines\nbecause this is very important.",
+ location="Earth",
+ activity_type=ActivityType.objects.get(name="Pot"),
+ creater=self.user,
+ organizer=Club.objects.get(name="Kfet"),
+ attendees_club=Club.objects.get(name="Kfet"),
+ date_start=timezone.now(),
+ date_end=timezone.now() + timedelta(days=2),
+ valid=True,
+ )
+
+ self.guest = Guest.objects.create(
+ activity=self.activity,
+ inviter=self.user.note,
+ last_name="GUEST",
+ first_name="Guest",
+ )
+
+ def test_activity_list(self):
+ """
+ Display the list of all activities
+ """
+ response = self.client.get(reverse("activity:activity_list"))
+ self.assertEqual(response.status_code, 200)
+
+ def test_activity_create(self):
+ """
+ Create a new activity
+ """
+ response = self.client.get(reverse("activity:activity_create"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("activity:activity_create"), data=dict(
+ name="Activity created",
+ description="This activity was successfully created.",
+ location="Earth",
+ activity_type=ActivityType.objects.get(name="Soirée de club").id,
+ creater=self.user.id,
+ organizer=Club.objects.get(name="Kfet").id,
+ attendees_club=Club.objects.get(name="Kfet").id,
+ date_start="{:%Y-%m-%d %H:%M}".format(timezone.now()),
+ date_end="{:%Y-%m-%d %H:%M}".format(timezone.now() + timedelta(days=2)),
+ valid=True,
+ ))
+ self.assertTrue(Activity.objects.filter(name="Activity created").exists())
+ activity = Activity.objects.get(name="Activity created")
+ self.assertRedirects(response, reverse("activity:activity_detail", args=(activity.pk,)), 302, 200)
+
+ def test_activity_detail(self):
+ """
+ Display the detail of an activity
+ """
+ response = self.client.get(reverse("activity:activity_detail", args=(self.activity.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ def test_activity_update(self):
+ """
+ Update an activity
+ """
+ response = self.client.get(reverse("activity:activity_update", args=(self.activity.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("activity:activity_update", args=(self.activity.pk,)), data=dict(
+ name=str(self.activity) + " updated",
+ description="This activity was successfully updated.",
+ location="Earth",
+ activity_type=ActivityType.objects.get(name="Autre").id,
+ creater=self.user.id,
+ organizer=Club.objects.get(name="Kfet").id,
+ attendees_club=Club.objects.get(name="Kfet").id,
+ date_start="{:%Y-%m-%d %H:%M}".format(timezone.now()),
+ date_end="{:%Y-%m-%d %H:%M}".format(timezone.now() + timedelta(days=2)),
+ valid=True,
+ ))
+ self.assertTrue(Activity.objects.filter(name="Activity updated").exists())
+ self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)
+
+ def test_activity_entry(self):
+ """
+ Create some entries
+ """
+ self.activity.open = True
+ self.activity.save()
+
+ response = self.client.get(reverse("activity:activity_entry", args=(self.activity.pk,)))
+ self.assertEqual(response.status_code, 200)
+ response = self.client.get(reverse("activity:activity_entry", args=(self.activity.pk,)) + "?search=guest")
+ self.assertEqual(response.status_code, 200)
+ response = self.client.get(reverse("activity:activity_entry", args=(self.activity.pk,)) + "?search=admin")
+ self.assertEqual(response.status_code, 200)
+
+ # User entry
+ response = self.client.post("/api/activity/entry/", data=dict(
+ activity=self.activity.id,
+ note=self.user.note.id,
+ guest="",
+ ))
+ self.assertEqual(response.status_code, 201) # 201 = Created
+ self.assertTrue(Entry.objects.filter(note=self.user.note, guest=None, activity=self.activity).exists())
+
+ # Guest entry
+ response = self.client.post("/api/activity/entry/", data=dict(
+ activity=self.activity.id,
+ note=self.user.note.id,
+ guest=self.guest.id,
+ ))
+ self.assertEqual(response.status_code, 201) # 201 = Created
+ self.assertTrue(Entry.objects.filter(note=self.user.note, guest=self.guest.id, activity=self.activity).exists())
+
+ def test_activity_invite(self):
+ """
+ Try to invite people to an activity
+ """
+ response = self.client.get(reverse("activity:activity_invite", args=(self.activity.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ # The activity is started, can't invite
+ response = self.client.post(reverse("activity:activity_invite", args=(self.activity.pk,)), data=dict(
+ activity=self.activity.id,
+ inviter=self.user.note.id,
+ last_name="GUEST2",
+ first_name="Guest",
+ ))
+ self.assertEqual(response.status_code, 200)
+
+ self.activity.date_start += timedelta(days=1)
+ self.activity.save()
+
+ response = self.client.post(reverse("activity:activity_invite", args=(self.activity.pk,)), data=dict(
+ activity=self.activity.id,
+ inviter=self.user.note.id,
+ last_name="GUEST2",
+ first_name="Guest",
+ ))
+ self.assertRedirects(response, reverse("activity:activity_detail", args=(self.activity.pk,)), 302, 200)
+
+ def test_activity_ics(self):
+ """
+ Render the ICS calendar
+ """
+ response = self.client.get(reverse("activity:calendar_ics"))
+ self.assertEqual(response.status_code, 200)
diff --git a/apps/activity/urls.py b/apps/activity/urls.py
index f074e8f7..155229d4 100644
--- a/apps/activity/urls.py
+++ b/apps/activity/urls.py
@@ -14,4 +14,5 @@ urlpatterns = [
path('/entry/', views.ActivityEntryView.as_view(), name='activity_entry'),
path('/update/', views.ActivityUpdateView.as_view(), name='activity_update'),
path('new/', views.ActivityCreateView.as_view(), name='activity_create'),
+ path('calendar.ics', views.CalendarView.as_view(), name='calendar_ics'),
]
diff --git a/apps/activity/views.py b/apps/activity/views.py
index fd218db5..7de31b0c 100644
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -1,14 +1,18 @@
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
+from hashlib import md5
+
from django.conf import settings
from django.contrib.auth.mixins import LoginRequiredMixin
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import PermissionDenied
from django.db.models import F, Q
+from django.http import HttpResponse
from django.urls import reverse_lazy
from django.utils import timezone
from django.utils.translation import gettext_lazy as _
+from django.views import View
from django.views.generic import DetailView, TemplateView, UpdateView
from django_tables2.views import SingleTableView
from note.models import Alias, NoteSpecial, NoteUser
@@ -190,10 +194,10 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
if pattern[0] != "^":
pattern = "^" + pattern
guest_qs = guest_qs.filter(
- Q(first_name__regex=pattern)
- | Q(last_name__regex=pattern)
- | Q(inviter__alias__name__regex=pattern)
- | Q(inviter__alias__normalized_name__regex=Alias.normalize(pattern))
+ Q(first_name__iregex=pattern)
+ | Q(last_name__iregex=pattern)
+ | Q(inviter__alias__name__iregex=pattern)
+ | Q(inviter__alias__normalized_name__iregex=Alias.normalize(pattern))
)
else:
guest_qs = guest_qs.none()
@@ -226,21 +230,19 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
if "search" in self.request.GET and self.request.GET["search"]:
pattern = self.request.GET["search"]
note_qs = note_qs.filter(
- Q(note__noteuser__user__first_name__regex=pattern)
- | Q(note__noteuser__user__last_name__regex=pattern)
- | Q(name__regex=pattern)
- | Q(normalized_name__regex=Alias.normalize(pattern))
+ Q(note__noteuser__user__first_name__iregex=pattern)
+ | Q(note__noteuser__user__last_name__iregex=pattern)
+ | Q(name__iregex=pattern)
+ | Q(normalized_name__iregex=Alias.normalize(pattern))
)
else:
note_qs = note_qs.none()
- if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql':
- note_qs = note_qs.distinct('note__pk')[:20]
- else:
- # SQLite doesn't support distinct fields. For compatibility reason (in dev mode), the note list will only
- # have distinct aliases rather than distinct notes with a SQLite DB, but it can fill the result page.
- # In production mode, please use PostgreSQL.
- note_qs = note_qs.distinct()[:20]
+ # SQLite doesn't support distinct fields. For compatibility reason (in dev mode), the note list will only
+ # have distinct aliases rather than distinct notes with a SQLite DB, but it can fill the result page.
+ # In production mode, please use PostgreSQL.
+ note_qs = note_qs.distinct('note__pk')[:20]\
+ if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql' else note_qs.distinct()[:20]
return note_qs
def get_context_data(self, **kwargs):
@@ -281,3 +283,60 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView):
Entry(activity=a, note=self.request.user.note,))]
return context
+
+
+class CalendarView(View):
+ """
+ Render an ICS calendar with all valid activities.
+ """
+
+ def multilines(self, string, maxlength, offset=0):
+ newstring = string[:maxlength - offset]
+ string = string[maxlength - offset:]
+ while string:
+ newstring += "\r\n "
+ newstring += string[:maxlength - 1]
+ string = string[maxlength - 1:]
+ return newstring
+
+ def get(self, request, *args, **kwargs):
+ ics = """BEGIN:VCALENDAR
+VERSION: 2.0
+PRODID:Note Kfet 2020
+X-WR-CALNAME:Kfet Calendar
+NAME:Kfet Calendar
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Europe/Berlin
+X-LIC-LOCATION:Europe/Berlin
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+END:STANDARD
+END:VTIMEZONE
+"""
+ for activity in Activity.objects.filter(valid=True).order_by("-date_start").all():
+ ics += f"""BEGIN:VEVENT
+DTSTAMP:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}Z
+UID:{md5((activity.name + "$" + str(activity.id) + str(activity.date_start)).encode("UTF-8")).hexdigest()}
+SUMMARY;CHARSET=UTF-8:{self.multilines(activity.name, 75, 22)}
+DTSTART;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_start)}
+DTEND;TZID=Europe/Berlin:{"{:%Y%m%dT%H%M%S}".format(activity.date_end)}
+LOCATION:{self.multilines(activity.location, 75, 9) if activity.location else "Kfet"}
+DESCRIPTION;CHARSET=UTF-8:""" + self.multilines(activity.description.replace("\n", "\\n"), 75, 26) + """
+ -- {activity.organizer.name}
+END:VEVENT
+"""
+ ics += "END:VCALENDAR"
+ ics = ics.replace("\r", "").replace("\n", "\r\n")
+ return HttpResponse(ics, content_type="text/calendar; charset=UTF-8")
diff --git a/apps/api/serializers.py b/apps/api/serializers.py
index 1f658217..d59bdc43 100644
--- a/apps/api/serializers.py
+++ b/apps/api/serializers.py
@@ -6,6 +6,7 @@ from django.contrib.contenttypes.models import ContentType
from django.contrib.auth.models import User
from rest_framework.serializers import ModelSerializer
+
class UserSerializer(ModelSerializer):
"""
REST API Serializer for Users.
diff --git a/apps/api/urls.py b/apps/api/urls.py
index 4addbdf1..7131c657 100644
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -4,6 +4,7 @@
from django.conf import settings
from django.conf.urls import url, include
from rest_framework import routers
+
from .viewsets import ContentTypeViewSet, UserViewSet
# Routers provide an easy way of automatically determining the URL conf.
diff --git a/apps/api/viewsets.py b/apps/api/viewsets.py
index 825082c0..fa2fc941 100644
--- a/apps/api/viewsets.py
+++ b/apps/api/viewsets.py
@@ -6,11 +6,8 @@ from django_filters.rest_framework import DjangoFilterBackend
from django.db.models import Q
from django.conf import settings
from django.contrib.auth.models import User
-
from rest_framework.viewsets import ReadOnlyModelViewSet, ModelViewSet
-
from permission.backends import PermissionBackend
-
from note_kfet.middlewares import get_current_session
from note.models import Alias
@@ -29,7 +26,7 @@ class ReadProtectedModelViewSet(ModelViewSet):
def get_queryset(self):
user = self.request.user
get_current_session().setdefault("permission_mask", 42)
- return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
+ return self.queryset.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
class ReadOnlyProtectedModelViewSet(ReadOnlyModelViewSet):
@@ -44,8 +41,7 @@ class ReadOnlyProtectedModelViewSet(ReadOnlyModelViewSet):
def get_queryset(self):
user = self.request.user
get_current_session().setdefault("permission_mask", 42)
- return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
-
+ return self.queryset.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct()
class UserViewSet(ReadProtectedModelViewSet):
@@ -67,29 +63,37 @@ class UserViewSet(ReadProtectedModelViewSet):
if "search" in self.request.GET:
pattern = self.request.GET["search"]
-
- # We match first a user by its username, then if an alias is matched without normalization
- # And finally if the normalized pattern matches a normalized alias.
+
+ # Filter with different rules
+ # We use union-all to keep each filter rule sorted in result
queryset = queryset.filter(
- username__iregex="^" + pattern).union(
- queryset.filter(
- Q(note__alias__name__iregex="^" + pattern)
- & ~Q(username__iregex="^" + pattern)), all=True).union(
- queryset.filter(
- Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
- & ~Q(note__alias__name__iregex="^" + pattern)
- & ~Q(username__iregex="^" + pattern)), all=True).union(
- queryset.filter(
- Q(note__alias__normalized_name__iregex="^" + pattern.lower())
- & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
- & ~Q(note__alias__name__iregex="^" + pattern)
- & ~Q(username__iregex="^" + pattern)), all=True).union(
- queryset.filter(
- (Q(last_name__iregex="^" + pattern) | Q(first_name__iregex="^" + pattern))
- & ~Q(note__alias__normalized_name__iregex="^" + pattern.lower())
- & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
- & ~Q(note__alias__name__iregex="^" + pattern)
- & ~Q(username__iregex="^" + pattern)), all=True)
+ # Match without normalization
+ note__alias__name__iregex="^" + pattern
+ ).union(
+ queryset.filter(
+ # Match with normalization
+ Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
+ & ~Q(note__alias__name__iregex="^" + pattern)
+ ),
+ all=True,
+ ).union(
+ queryset.filter(
+ # Match on lower pattern
+ Q(note__alias__normalized_name__iregex="^" + pattern.lower())
+ & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
+ & ~Q(note__alias__name__iregex="^" + pattern)
+ ),
+ all=True,
+ ).union(
+ queryset.filter(
+ # Match on firstname or lastname
+ (Q(last_name__iregex="^" + pattern) | Q(first_name__iregex="^" + pattern))
+ & ~Q(note__alias__normalized_name__iregex="^" + pattern.lower())
+ & ~Q(note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
+ & ~Q(note__alias__name__iregex="^" + pattern)
+ ),
+ all=True,
+ )
queryset = queryset if settings.DATABASES[queryset.db]["ENGINE"] == 'django.db.backends.postgresql' \
else queryset.order_by("username")
diff --git a/apps/logs/migrations/0001_initial.py b/apps/logs/migrations/0001_initial.py
new file mode 100644
index 00000000..e517edfb
--- /dev/null
+++ b/apps/logs/migrations/0001_initial.py
@@ -0,0 +1,37 @@
+# Generated by Django 2.2.16 on 2020-09-04 21:41
+
+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),
+ ('contenttypes', '0002_remove_content_type_name'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Changelog',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('ip', models.GenericIPAddressField(blank=True, null=True, verbose_name='IP Address')),
+ ('instance_pk', models.CharField(max_length=255, verbose_name='identifier')),
+ ('previous', models.TextField(null=True, verbose_name='previous data')),
+ ('data', models.TextField(null=True, verbose_name='new data')),
+ ('action', models.CharField(choices=[('create', 'create'), ('edit', 'edit'), ('delete', 'delete')], default='edit', max_length=16, verbose_name='action')),
+ ('timestamp', models.DateTimeField(default=django.utils.timezone.now, verbose_name='timestamp')),
+ ('model', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='contenttypes.ContentType', verbose_name='model')),
+ ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='user')),
+ ],
+ options={
+ 'verbose_name': 'changelog',
+ 'verbose_name_plural': 'changelogs',
+ },
+ ),
+ ]
diff --git a/apps/logs/migrations/0002_replace_null_by_blank.py b/apps/logs/migrations/0002_replace_null_by_blank.py
new file mode 100644
index 00000000..65fc4b14
--- /dev/null
+++ b/apps/logs/migrations/0002_replace_null_by_blank.py
@@ -0,0 +1,17 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('logs', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.RunSQL(
+ "UPDATE logs_changelog SET previous = '' WHERE previous IS NULL;"
+ ),
+ migrations.RunSQL(
+ "UPDATE logs_changelog SET data = '' WHERE data IS NULL;"
+ ),
+ ]
diff --git a/apps/logs/migrations/0003_remove_null_tag_on_charfields.py b/apps/logs/migrations/0003_remove_null_tag_on_charfields.py
new file mode 100644
index 00000000..a6e3a581
--- /dev/null
+++ b/apps/logs/migrations/0003_remove_null_tag_on_charfields.py
@@ -0,0 +1,23 @@
+# Generated by Django 2.2.16 on 2020-09-06 19:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('logs', '0002_replace_null_by_blank'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='changelog',
+ name='data',
+ field=models.TextField(blank=True, default='', verbose_name='new data'),
+ ),
+ migrations.AlterField(
+ model_name='changelog',
+ name='previous',
+ field=models.TextField(blank=True, default='', verbose_name='previous data'),
+ ),
+ ]
diff --git a/apps/logs/models.py b/apps/logs/models.py
index e558ea82..0077af72 100644
--- a/apps/logs/models.py
+++ b/apps/logs/models.py
@@ -44,12 +44,14 @@ class Changelog(models.Model):
)
previous = models.TextField(
- null=True,
+ blank=True,
+ default="",
verbose_name=_('previous data'),
)
data = models.TextField(
- null=True,
+ blank=True,
+ default="",
verbose_name=_('new data'),
)
@@ -80,3 +82,7 @@ class Changelog(models.Model):
class Meta:
verbose_name = _("changelog")
verbose_name_plural = _("changelogs")
+
+ def __str__(self):
+ return _("Changelog of type \"{action}\" for model {model} at {timestamp}").format(
+ action=self.get_action_display(), model=str(self.model), timestamp=str(self.timestamp))
diff --git a/apps/logs/signals.py b/apps/logs/signals.py
index 2d443d13..b0b4d2c2 100644
--- a/apps/logs/signals.py
+++ b/apps/logs/signals.py
@@ -50,10 +50,7 @@ def save_object(sender, instance, **kwargs):
in order to store each modification made
"""
# noinspection PyProtectedMember
- if instance._meta.label_lower in EXCLUDED:
- return
-
- if hasattr(instance, "_no_log"):
+ if instance._meta.label_lower in EXCLUDED or hasattr(instance, "_no_signal"):
return
# noinspection PyProtectedMember
@@ -102,7 +99,7 @@ def save_object(sender, instance, **kwargs):
model = instance.__class__
fields = changed_fields
- previous_json = JSONRenderer().render(CustomSerializer(previous).data).decode("UTF-8") if previous else None
+ previous_json = JSONRenderer().render(CustomSerializer(previous).data).decode("UTF-8") if previous else ""
instance_json = JSONRenderer().render(CustomSerializer(instance).data).decode("UTF-8")
Changelog.objects.create(user=user,
@@ -120,10 +117,7 @@ def delete_object(sender, instance, **kwargs):
Each time a model is deleted, an entry in the table `Changelog` is added in the database
"""
# noinspection PyProtectedMember
- if instance._meta.label_lower in EXCLUDED:
- return
-
- if hasattr(instance, "_no_log"):
+ if instance._meta.label_lower in EXCLUDED or hasattr(instance, "_no_signal"):
return
# Si un utilisateur est connecté, on récupère l'utilisateur courant ainsi que son adresse IP
@@ -155,6 +149,6 @@ def delete_object(sender, instance, **kwargs):
model=ContentType.objects.get_for_model(instance),
instance_pk=instance.pk,
previous=instance_json,
- data=None,
+ data="",
action="delete"
).save()
diff --git a/apps/member/admin.py b/apps/member/admin.py
index 4cc2d0bf..7936f564 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -31,9 +31,7 @@ class CustomUserAdmin(UserAdmin):
"""
When creating a new user don't show profile one the first step
"""
- if not obj:
- return list()
- return super().get_inline_instances(request, obj)
+ return super().get_inline_instances(request, obj) if obj else []
@admin.register(Club, site=admin_site)
diff --git a/apps/member/fixtures/initial.json b/apps/member/fixtures/initial.json
deleted file mode 100644
index e27eb72d..00000000
--- a/apps/member/fixtures/initial.json
+++ /dev/null
@@ -1,31 +0,0 @@
-[
- {
- "model": "member.club",
- "pk": 1,
- "fields": {
- "name": "BDE",
- "email": "tresorerie.bde@example.com",
- "require_memberships": true,
- "membership_fee_paid": 500,
- "membership_fee_unpaid": 500,
- "membership_duration": 396,
- "membership_start": "2019-08-31",
- "membership_end": "2020-09-30"
- }
- },
- {
- "model": "member.club",
- "pk": 2,
- "fields": {
- "name": "Kfet",
- "email": "tresorerie.bde@example.com",
- "parent_club": 1,
- "require_memberships": true,
- "membership_fee_paid": 3500,
- "membership_fee_unpaid": 3500,
- "membership_duration": 396,
- "membership_start": "2019-08-31",
- "membership_end": "2020-09-30"
- }
- }
-]
diff --git a/apps/member/forms.py b/apps/member/forms.py
index a5d571b6..20de91b7 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -1,7 +1,11 @@
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later
+import io
+
+from PIL import Image, ImageSequence
from django import forms
+from django.conf import settings
from django.contrib.auth.forms import AuthenticationForm
from django.contrib.auth.models import User
from django.forms import CheckboxSelectMultiple
@@ -16,7 +20,7 @@ from .models import Profile, Club, Membership
class CustomAuthenticationForm(AuthenticationForm):
permission_mask = forms.ModelChoiceField(
- label="Masque de permissions",
+ label=_("Permission mask"),
queryset=PermissionMask.objects.order_by("rank"),
empty_label=None,
)
@@ -77,6 +81,54 @@ class ImageForm(forms.Form):
width = forms.FloatField(widget=forms.HiddenInput())
height = forms.FloatField(widget=forms.HiddenInput())
+ def clean(self):
+ """
+ Load image and crop
+
+ In the future, when Pillow will support APNG we will be able to
+ simplify this code to save only PNG/APNG.
+ """
+ cleaned_data = super().clean()
+
+ # Image size is limited by Django DATA_UPLOAD_MAX_MEMORY_SIZE
+ image = cleaned_data.get('image')
+ if image:
+ # Let Pillow detect and load image
+ # If it is an animation, then there will be multiple frames
+ try:
+ im = Image.open(image)
+ except OSError:
+ # Rare case in which Django consider the upload file as an image
+ # but Pil is unable to load it
+ raise forms.ValidationError(_('This image cannot be loaded.'))
+
+ # Crop each frame
+ x = cleaned_data.get('x', 0)
+ y = cleaned_data.get('y', 0)
+ w = cleaned_data.get('width', 200)
+ h = cleaned_data.get('height', 200)
+ frames = []
+ for frame in ImageSequence.Iterator(im):
+ frame = frame.crop((x, y, x + w, y + h))
+ frame = frame.resize(
+ (settings.PIC_WIDTH, settings.PIC_RATIO * settings.PIC_WIDTH),
+ Image.ANTIALIAS,
+ )
+ frames.append(frame)
+
+ # Save
+ om = frames.pop(0) # Get first frame
+ om.info = im.info # Copy metadata
+ image.file = io.BytesIO()
+ if len(frames) > 1:
+ # Save as GIF
+ om.save(image.file, "GIF", save_all=True, append_images=list(frames), loop=0)
+ else:
+ # Save as PNG
+ om.save(image.file, "PNG")
+
+ return cleaned_data
+
class ClubForm(forms.ModelForm):
def clean(self):
diff --git a/apps/member/migrations/0001_initial.py b/apps/member/migrations/0001_initial.py
new file mode 100644
index 00000000..be357568
--- /dev/null
+++ b/apps/member/migrations/0001_initial.py
@@ -0,0 +1,76 @@
+# Generated by Django 2.2.16 on 2020-09-04 21:41
+
+import datetime
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Club',
+ 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')),
+ ('email', models.EmailField(max_length=254, verbose_name='email')),
+ ('require_memberships', models.BooleanField(default=True, help_text="Uncheck if this club don't require memberships.", verbose_name='require memberships')),
+ ('membership_fee_paid', models.PositiveIntegerField(default=0, verbose_name='membership fee (paid students)')),
+ ('membership_fee_unpaid', models.PositiveIntegerField(default=0, verbose_name='membership fee (unpaid students)')),
+ ('membership_duration', models.PositiveIntegerField(blank=True, help_text='The longest time (in days) a membership can last (NULL = infinite).', null=True, verbose_name='membership duration')),
+ ('membership_start', models.DateField(blank=True, help_text='Date from which the members can renew their membership.', null=True, verbose_name='membership start')),
+ ('membership_end', models.DateField(blank=True, help_text='Maximal date of a membership, after which members must renew it.', null=True, verbose_name='membership end')),
+ ],
+ options={
+ 'verbose_name': 'club',
+ 'verbose_name_plural': 'clubs',
+ },
+ ),
+ migrations.CreateModel(
+ name='Profile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('phone_number', phonenumber_field.modelfields.PhoneNumberField(blank=True, max_length=50, null=True, region=None, verbose_name='phone number')),
+ ('section', models.CharField(blank=True, help_text='e.g. "1A0", "9A♥", "SAPHIRE"', max_length=255, null=True, verbose_name='section')),
+ ('department', models.CharField(choices=[('A0', 'Informatics (A0)'), ('A1', 'Mathematics (A1)'), ('A2', 'Physics (A2)'), ("A'2", "Applied physics (A'2)"), ('A2', "Chemistry (A''2)"), ('A3', 'Biology (A3)'), ('B1234', 'SAPHIRE (B1234)'), ('B1', 'Mechanics (B1)'), ('B2', 'Civil engineering (B2)'), ('B3', 'Mechanical engineering (B3)'), ('B4', 'EEA (B4)'), ('C', 'Design (C)'), ('D2', 'Economy-management (D2)'), ('D3', 'Social sciences (D3)'), ('E', 'English (E)'), ('EXT', 'External (EXT)')], max_length=8, verbose_name='department')),
+ ('promotion', models.PositiveSmallIntegerField(default=2020, help_text='Year of entry to the school (None if not ENS student)', null=True, verbose_name='promotion')),
+ ('address', models.CharField(blank=True, max_length=255, null=True, verbose_name='address')),
+ ('paid', models.BooleanField(default=False, help_text='Tells if the user receive a salary.', verbose_name='paid')),
+ ('ml_events_registration', models.CharField(blank=True, choices=[(None, 'No'), ('fr', 'Yes (receive them in french)'), ('en', 'Yes (receive them in english)')], default=None, max_length=2, null=True, verbose_name='Register on the mailing list to stay informed of the events of the campus (1 mail/week)')),
+ ('ml_sport_registration', models.BooleanField(default=False, verbose_name='Register on the mailing list to stay informed of the sport events of the campus (1 mail/week)')),
+ ('ml_art_registration', models.BooleanField(default=False, verbose_name='Register on the mailing list to stay informed of the art events of the campus (1 mail/week)')),
+ ('report_frequency', models.PositiveSmallIntegerField(default=0, verbose_name='report frequency (in days)')),
+ ('last_report', models.DateTimeField(default=django.utils.timezone.now, verbose_name='last report date')),
+ ('email_confirmed', models.BooleanField(default=False, verbose_name='email confirmed')),
+ ('registration_valid', models.BooleanField(default=False, verbose_name='registration valid')),
+ ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'verbose_name': 'user profile',
+ 'verbose_name_plural': 'user profile',
+ },
+ ),
+ migrations.CreateModel(
+ name='Membership',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('date_start', models.DateField(default=datetime.date.today, verbose_name='membership starts on')),
+ ('date_end', models.DateField(null=True, verbose_name='membership ends on')),
+ ('fee', models.PositiveIntegerField(verbose_name='fee')),
+ ('club', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='member.Club', verbose_name='club')),
+ ],
+ options={
+ 'verbose_name': 'membership',
+ 'verbose_name_plural': 'memberships',
+ },
+ ),
+ ]
diff --git a/apps/member/migrations/0002_auto_20200904_2341.py b/apps/member/migrations/0002_auto_20200904_2341.py
new file mode 100644
index 00000000..3dd9d045
--- /dev/null
+++ b/apps/member/migrations/0002_auto_20200904_2341.py
@@ -0,0 +1,42 @@
+# Generated by Django 2.2.16 on 2020-09-04 21:41
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('permission', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('member', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='membership',
+ name='roles',
+ field=models.ManyToManyField(to='permission.Role', verbose_name='roles'),
+ ),
+ migrations.AddField(
+ model_name='membership',
+ name='user',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to=settings.AUTH_USER_MODEL, verbose_name='user'),
+ ),
+ migrations.AddField(
+ model_name='club',
+ name='parent_club',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='member.Club', verbose_name='parent club'),
+ ),
+ migrations.AddIndex(
+ model_name='profile',
+ index=models.Index(fields=['user'], name='member_prof_user_id_30c316_idx'),
+ ),
+ migrations.AddIndex(
+ model_name='membership',
+ index=models.Index(fields=['user'], name='member_memb_user_id_945dbc_idx'),
+ ),
+ ]
diff --git a/apps/member/migrations/0003_create_bde_and_kfet.py b/apps/member/migrations/0003_create_bde_and_kfet.py
new file mode 100644
index 00000000..5f218040
--- /dev/null
+++ b/apps/member/migrations/0003_create_bde_and_kfet.py
@@ -0,0 +1,57 @@
+from django.db import migrations
+
+
+def create_bde_and_kfet(apps, schema_editor):
+ """
+ The clubs BDE and Kfet are pre-injected.
+ """
+ Club = apps.get_model("member", "club")
+ NoteClub = apps.get_model("note", "noteclub")
+ ContentType = apps.get_model('contenttypes', 'ContentType')
+ polymorphic_ctype_id = ContentType.objects.get_for_model(NoteClub).id
+
+ Club.objects.get_or_create(
+ id=1,
+ name="BDE",
+ email="tresorerie.bde@example.com",
+ require_memberships=True,
+ membership_fee_paid=500,
+ membership_fee_unpaid=500,
+ membership_duration=396,
+ membership_start="2020-08-01",
+ membership_end="2021-09-30",
+ )
+ Club.objects.get_or_create(
+ id=2,
+ name="Kfet",
+ parent_club_id=1,
+ email="tresorerie.bde@example.com",
+ require_memberships=True,
+ membership_fee_paid=3500,
+ membership_fee_unpaid=3500,
+ membership_duration=396,
+ membership_start="2020-08-01",
+ membership_end="2021-09-30",
+ )
+
+ NoteClub.objects.get_or_create(
+ id=5,
+ club_id=1,
+ polymorphic_ctype_id=polymorphic_ctype_id,
+ )
+ NoteClub.objects.get_or_create(
+ id=6,
+ club_id=2,
+ polymorphic_ctype_id=polymorphic_ctype_id,
+ )
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('member', '0002_auto_20200904_2341'),
+ ('note', '0002_create_special_notes'),
+ ]
+
+ operations = [
+ migrations.RunPython(create_bde_and_kfet),
+ ]
diff --git a/apps/member/migrations/0004_replace_null_by_blank.py b/apps/member/migrations/0004_replace_null_by_blank.py
new file mode 100644
index 00000000..a53e3801
--- /dev/null
+++ b/apps/member/migrations/0004_replace_null_by_blank.py
@@ -0,0 +1,20 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('member', '0003_create_bde_and_kfet'),
+ ]
+
+ operations = [
+ migrations.RunSQL(
+ "UPDATE member_profile SET address = '' WHERE address IS NULL;",
+ ),
+ migrations.RunSQL(
+ "UPDATE member_profile SET ml_events_registration = '' WHERE ml_events_registration IS NULL;",
+ ),
+ migrations.RunSQL(
+ "UPDATE member_profile SET section = '' WHERE section IS NULL;",
+ ),
+ ]
diff --git a/apps/member/migrations/0005_remove_null_tag_on_charfields.py b/apps/member/migrations/0005_remove_null_tag_on_charfields.py
new file mode 100644
index 00000000..11b9f37b
--- /dev/null
+++ b/apps/member/migrations/0005_remove_null_tag_on_charfields.py
@@ -0,0 +1,28 @@
+# Generated by Django 2.2.16 on 2020-09-06 19:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('member', '0004_replace_null_by_blank'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='profile',
+ name='address',
+ field=models.CharField(blank=True, default='', max_length=255, verbose_name='address'),
+ ),
+ migrations.AlterField(
+ model_name='profile',
+ name='ml_events_registration',
+ field=models.CharField(blank=True, choices=[('', 'No'), ('fr', 'Yes (receive them in french)'), ('en', 'Yes (receive them in english)')], default='', max_length=2, verbose_name='Register on the mailing list to stay informed of the events of the campus (1 mail/week)'),
+ ),
+ migrations.AlterField(
+ model_name='profile',
+ name='section',
+ field=models.CharField(blank=True, default='', help_text='e.g. "1A0", "9A♥", "SAPHIRE"', max_length=255, verbose_name='section'),
+ ),
+ ]
diff --git a/apps/member/models.py b/apps/member/models.py
index b17f1f09..c7467120 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -46,7 +46,7 @@ class Profile(models.Model):
help_text=_('e.g. "1A0", "9A♥", "SAPHIRE"'),
max_length=255,
blank=True,
- null=True,
+ default="",
)
department = models.CharField(
@@ -83,7 +83,7 @@ class Profile(models.Model):
verbose_name=_('address'),
max_length=255,
blank=True,
- null=True,
+ default="",
)
paid = models.BooleanField(
@@ -94,11 +94,10 @@ class Profile(models.Model):
ml_events_registration = models.CharField(
blank=True,
- null=True,
- default=None,
+ default='',
max_length=2,
choices=[
- (None, _("No")),
+ ('', _("No")),
('fr', _("Yes (receive them in french)")),
('en', _("Yes (receive them in english)")),
],
@@ -172,19 +171,21 @@ class Profile(models.Model):
def send_email_validation_link(self):
subject = "[Note Kfet] " + str(_("Activate your Note Kfet account"))
+ token = email_validation_token.make_token(self.user)
+ uid = urlsafe_base64_encode(force_bytes(self.user_id))
message = loader.render_to_string('registration/mails/email_validation_email.txt',
{
'user': self.user,
'domain': os.getenv("NOTE_URL", "note.example.com"),
- 'token': email_validation_token.make_token(self.user),
- 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
+ 'token': token,
+ 'uid': uid,
})
html = loader.render_to_string('registration/mails/email_validation_email.html',
{
'user': self.user,
'domain': os.getenv("NOTE_URL", "note.example.com"),
- 'token': email_validation_token.make_token(self.user),
- 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)),
+ 'token': token,
+ 'uid': uid,
})
self.user.email_user(subject, message, html_message=html)
@@ -339,43 +340,85 @@ class Membership(models.Model):
return self.date_start.toordinal() <= datetime.datetime.now().toordinal()
def renew(self):
- if Membership.objects.filter(
+ """
+ If the current membership comes to expiration, create a new membership that starts immediately after this one.
+ """
+ if not Membership.objects.filter(
user=self.user,
club=self.club,
date_start__gte=self.club.membership_start,
).exists():
- # Membership is already renewed
- return
- new_membership = Membership(
+ # Membership is not renewed yet
+ new_membership = Membership(
+ user=self.user,
+ club=self.club,
+ date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start),
+ )
+ if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
+ new_membership._force_renew_parent = True
+ if hasattr(self, '_soge') and self._soge:
+ new_membership._soge = True
+ if hasattr(self, '_force_save') and self._force_save:
+ new_membership._force_save = True
+ new_membership.save()
+ new_membership.roles.set(self.roles.all())
+ new_membership.save()
+
+ def renew_parent(self):
+ """
+ Ensure that the parent membership is renewed, and renew/create it if needed.
+ """
+ parent_membership = Membership.objects.filter(
user=self.user,
- club=self.club,
- date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start),
- )
- if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
- new_membership._force_renew_parent = True
- if hasattr(self, '_soge') and self._soge:
- new_membership._soge = True
- if hasattr(self, '_force_save') and self._force_save:
- new_membership._force_save = True
- new_membership.save()
- new_membership.roles.set(self.roles.all())
- new_membership.save()
+ club=self.club.parent_club,
+ ).order_by("-date_start")
+ if parent_membership.exists():
+ # Renew the previous membership of the parent club
+ parent_membership = parent_membership.first()
+ parent_membership._force_renew_parent = True
+ if hasattr(self, '_soge'):
+ parent_membership._soge = True
+ if hasattr(self, '_force_save'):
+ parent_membership._force_save = True
+ parent_membership.renew()
+ else:
+ # Create a new membership in the parent club
+ parent_membership = Membership(
+ user=self.user,
+ club=self.club.parent_club,
+ date_start=self.date_start,
+ )
+ parent_membership._force_renew_parent = True
+ if hasattr(self, '_soge'):
+ parent_membership._soge = True
+ if hasattr(self, '_force_save'):
+ parent_membership._force_save = True
+ parent_membership.save()
+ parent_membership.refresh_from_db()
+
+ if self.club.parent_club.name == "BDE":
+ parent_membership.roles.set(
+ Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all())
+ elif self.club.parent_club.name == "Kfet":
+ parent_membership.roles.set(
+ Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all())
+ else:
+ parent_membership.roles.set(Role.objects.filter(name="Membre de club").all())
+ parent_membership.save()
def save(self, *args, **kwargs):
"""
Calculate fee and end date before saving the membership and creating the transaction if needed.
"""
-
- if self.pk:
+ created = not self.pk
+ if not created:
for role in self.roles.all():
club = role.for_club
if club is not None:
if club.pk != self.club_id:
raise ValidationError(_('The role {role} does not apply to the club {club}.')
.format(role=role.name, club=club.name))
-
- created = not self.pk
- if created:
+ else:
if Membership.objects.filter(
user=self.user,
club=self.club,
@@ -384,7 +427,7 @@ class Membership(models.Model):
).exists():
raise ValidationError(_('User is already a member of the club'))
- if self.club.parent_club is not None and not self.pk:
+ if self.club.parent_club is not None:
# Check that the user is already a member of the parent club if the membership is created
if not Membership.objects.filter(
user=self.user,
@@ -392,56 +435,15 @@ class Membership(models.Model):
date_start__gte=self.club.parent_club.membership_start,
).exists():
if hasattr(self, '_force_renew_parent') and self._force_renew_parent:
- parent_membership = Membership.objects.filter(
- user=self.user,
- club=self.club.parent_club,
- ).order_by("-date_start")
- if parent_membership.exists():
- # Renew the previous membership of the parent club
- parent_membership = parent_membership.first()
- parent_membership._force_renew_parent = True
- if hasattr(self, '_soge'):
- parent_membership._soge = True
- if hasattr(self, '_force_save'):
- parent_membership._force_save = True
- parent_membership.renew()
- else:
- # Create a new membership in the parent club
- parent_membership = Membership(
- user=self.user,
- club=self.club.parent_club,
- date_start=self.date_start,
- )
- parent_membership._force_renew_parent = True
- if hasattr(self, '_soge'):
- parent_membership._soge = True
- if hasattr(self, '_force_save'):
- parent_membership._force_save = True
- parent_membership.save()
- parent_membership.refresh_from_db()
-
- if self.club.parent_club.name == "BDE":
- parent_membership.roles.set(
- Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all())
- elif self.club.parent_club.name == "Kfet":
- parent_membership.roles.set(
- Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all())
- else:
- parent_membership.roles.set(Role.objects.filter(name="Membre de club").all())
- parent_membership.save()
+ self.renew_parent()
else:
raise ValidationError(_('User is not a member of the parent club')
+ ' ' + self.club.parent_club.name)
- if self.user.profile.paid:
- self.fee = self.club.membership_fee_paid
- else:
- self.fee = self.club.membership_fee_unpaid
+ self.fee = self.club.membership_fee_paid if self.user.profile.paid else self.club.membership_fee_unpaid
- if self.club.membership_duration is not None:
- self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration)
- else:
- self.date_end = self.date_start + datetime.timedelta(days=424242)
+ self.date_end = self.date_start + datetime.timedelta(days=self.club.membership_duration) \
+ if self.club.membership_duration is not None else self.date_start + datetime.timedelta(days=424242)
if self.club.membership_end is not None and self.date_end > self.club.membership_end:
self.date_end = self.club.membership_end
diff --git a/apps/member/signals.py b/apps/member/signals.py
index 70162b37..d590f446 100644
--- a/apps/member/signals.py
+++ b/apps/member/signals.py
@@ -6,11 +6,7 @@ def save_user_profile(instance, created, raw, **_kwargs):
"""
Hook to create and save a profile when an user is updated if it is not registered with the signup form
"""
- if raw:
- # When provisionning data, do not try to autocreate
- return
-
- if created and instance.is_active:
+ if not raw and created and instance.is_active and not hasattr(instance, "_no_signal"):
from .models import Profile
Profile.objects.get_or_create(user=instance)
if instance.is_superuser:
diff --git a/media/pic/default.png b/apps/member/static/member/img/default_picture.png
similarity index 100%
rename from media/pic/default.png
rename to apps/member/static/member/img/default_picture.png
diff --git a/apps/member/static/member/js/alias.js b/apps/member/static/member/js/alias.js
index 2d652dde..444e1bcf 100644
--- a/apps/member/static/member/js/alias.js
+++ b/apps/member/static/member/js/alias.js
@@ -2,22 +2,22 @@
* On form submit, create a new alias
*/
function create_alias (e) {
- // Do not submit HTML form
- e.preventDefault();
+ // Do not submit HTML form
+ e.preventDefault()
- // Get data and send to API
- const formData = new FormData(e.target);
- $.post("/api/note/alias/", {
- "csrfmiddlewaretoken": formData.get("csrfmiddlewaretoken"),
- "name": formData.get("name"),
- "note": formData.get("note")
- }).done(function () {
- // Reload table
- $("#alias_table").load(location.pathname + " #alias_table");
- addMsg("Alias ajouté", "success");
- }).fail(function (xhr, _textStatus, _error) {
- errMsg(xhr.responseJSON);
- });
+ // Get data and send to API
+ const formData = new FormData(e.target)
+ $.post('/api/note/alias/', {
+ csrfmiddlewaretoken: formData.get('csrfmiddlewaretoken'),
+ name: formData.get('name'),
+ note: formData.get('note')
+ }).done(function () {
+ // Reload table
+ $('#alias_table').load(location.pathname + ' #alias_table')
+ addMsg('Alias ajouté', 'success')
+ }).fail(function (xhr, _textStatus, _error) {
+ errMsg(xhr.responseJSON)
+ })
}
/**
@@ -25,19 +25,19 @@ function create_alias (e) {
* @param Integer button_id Alias id to remove
*/
function delete_button (button_id) {
- $.ajax({
- url: "/api/note/alias/" + button_id + "/",
- method: "DELETE",
- headers: { "X-CSRFTOKEN": CSRF_TOKEN }
- }).done(function () {
- addMsg('Alias supprimé', 'success');
- $("#alias_table").load(location.pathname + " #alias_table");
- }).fail(function (xhr, _textStatus, _error) {
- errMsg(xhr.responseJSON);
- });
+ $.ajax({
+ url: '/api/note/alias/' + button_id + '/',
+ method: 'DELETE',
+ headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
+ }).done(function () {
+ addMsg('Alias supprimé', 'success')
+ $('#alias_table').load(location.pathname + ' #alias_table')
+ }).fail(function (xhr, _textStatus, _error) {
+ errMsg(xhr.responseJSON)
+ })
}
$(document).ready(function () {
- // Attach event
- document.getElementById("form_alias").addEventListener("submit", create_alias);
-})
\ No newline at end of file
+ // Attach event
+ document.getElementById('form_alias').addEventListener('submit', create_alias)
+})
diff --git a/apps/member/templates/member/includes/club_info.html b/apps/member/templates/member/includes/club_info.html
index 92c7b569..51f0ef03 100644
--- a/apps/member/templates/member/includes/club_info.html
+++ b/apps/member/templates/member/includes/club_info.html
@@ -48,10 +48,10 @@
- {% trans 'Manage aliases' %} ({{ user_object.note.alias_set.all|length }})
+ {% trans 'Manage aliases' %} ({{ club.note.alias_set.all|length }})
{% trans 'email'|capfirst %}
{{ club.email }}
-
\ No newline at end of file
+
diff --git a/apps/member/templates/member/manage_auth_tokens.html b/apps/member/templates/member/manage_auth_tokens.html
index 473286c1..014686f1 100644
--- a/apps/member/templates/member/manage_auth_tokens.html
+++ b/apps/member/templates/member/manage_auth_tokens.html
@@ -1,4 +1,4 @@
-{% extends "member/base.html" %}
+{% extends "base.html" %}
{% comment %}
SPDX-License-Identifier: GPL-3.0-or-later
{% endcomment %}
diff --git a/apps/member/templates/member/picture_update.html b/apps/member/templates/member/picture_update.html
index 7c9128ce..51d05f91 100644
--- a/apps/member/templates/member/picture_update.html
+++ b/apps/member/templates/member/picture_update.html
@@ -32,8 +32,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
-
-
+
+
- 
diff --git a/apps/note/templates/note/mails/weekly_report.html b/apps/note/templates/note/mails/weekly_report.html
index 871e09c2..6ed768a3 100644
--- a/apps/note/templates/note/mails/weekly_report.html
+++ b/apps/note/templates/note/mails/weekly_report.html
@@ -1,5 +1,7 @@
{% load pretty_money %}
+{% load getenv %}
{% load render_table from django_tables2 %}
+{% load static %}
{% load i18n %}
@@ -8,13 +10,8 @@
[Note Kfet] Rapport de la Note Kfet
-
-
+
+
@@ -27,7 +24,7 @@
Ensuite, un rapport vous est envoyé à la fréquence demandée seulement si vous avez consommé
depuis le dernier rapport.
Pour arrêter de recevoir des rapports, il vous suffit de modifier votre profil Note et de
- mettre la fréquence des rapports à 0 ou -1.
+ mettre la fréquence des rapports à 0.
Pour toutes suggestions par rapport à ce service, contactez
notekfet2020@lists.crans.org.
{# Preview note profile (picture, username and balance) #}
-
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 120bb1ee..c419f9a5 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -1103,7 +1103,7 @@
"treasury",
"sogecredit"
],
- "query": "{\"credit_transaction\": null}",
+ "query": "{}",
"type": "add",
"mask": 1,
"field": "",
@@ -2567,6 +2567,118 @@
"description": "(Dé)bloquer sa propre note et modifier la raison"
}
},
+ {
+ "model": "permission.permission",
+ "pk": 165,
+ "fields": {
+ "model": [
+ "auth",
+ "user"
+ ],
+ "query": "{}",
+ "type": "change",
+ "mask": 1,
+ "field": "password",
+ "permanent": true,
+ "description": "Changer son mot de passe"
+ }
+ },
+ {
+ "model": "permission.permission",
+ "pk": 166,
+ "fields": {
+ "model": [
+ "note",
+ "transaction"
+ ],
+ "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}}, {\"valid\": false}]",
+ "type": "add",
+ "mask": 2,
+ "field": "",
+ "permanent": false,
+ "description": "Créer une transaction quelconque tant que la source reste au-dessus de -50 €"
+ }
+ },
+ {
+ "model": "permission.permission",
+ "pk": 167,
+ "fields": {
+ "model": [
+ "note",
+ "transaction"
+ ],
+ "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]",
+ "type": "change",
+ "mask": 2,
+ "field": "valid",
+ "permanent": false,
+ "description": "Modifier le statut de validation d'une transaction si c'est possible"
+ }
+ },
+ {
+ "model": "permission.permission",
+ "pk": 168,
+ "fields": {
+ "model": [
+ "note",
+ "transaction"
+ ],
+ "query": "[\"OR\", {\"source__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": true}, {\"destination__balance__gte\": {\"F\": [\"SUB\", [\"MUL\", [\"F\", \"amount\"], [\"F\", \"quantity\"]], 5000]}, \"valid\": false}]",
+ "type": "change",
+ "mask": 2,
+ "field": "invalidity_reason",
+ "permanent": false,
+ "description": "Modifier la raison d'invalidité d'une transaction si c'est possible"
+ }
+ },
+ {
+ "model": "permission.permission",
+ "pk": 169,
+ "fields": {
+ "model": [
+ "note",
+ "noteclub"
+ ],
+ "query": "{\"club\": [\"club\"]}",
+ "type": "change",
+ "mask": 1,
+ "field": "display_image",
+ "permanent": false,
+ "description": "Changer l'image de la note de son club"
+ }
+ },
+ {
+ "model": "permission.permission",
+ "pk": 170,
+ "fields": {
+ "model": [
+ "note",
+ "alias"
+ ],
+ "query": "{\"note__is_active\": true}",
+ "type": "add",
+ "mask": 1,
+ "field": "",
+ "permanent": false,
+ "description": "Ajouter n'importe quel alias à une note non bloquée"
+ }
+ },
+ {
+ "model": "permission.permission",
+ "pk": 171,
+ "fields": {
+ "model": [
+ "note",
+ "alias"
+ ],
+ "query": "{\"note__is_active\": true}",
+ "type": "delete",
+ "mask": 3,
+ "field": "",
+ "permanent": false,
+ "description": "Supprimer n'importe quel alias à une note non bloquée"
+ }
+ },
{
"model": "permission.role",
"pk": 1,
@@ -2591,7 +2703,8 @@
52,
126,
161,
- 162
+ 162,
+ 165
]
}
},
@@ -2661,7 +2774,8 @@
47,
49,
50,
- 141
+ 141,
+ 169
]
}
},
@@ -2696,8 +2810,14 @@
62,
127,
133,
+ 135,
+ 136,
141,
- 142
+ 142,
+ 150,
+ 166,
+ 167,
+ 168
]
}
},
@@ -2711,8 +2831,7 @@
24,
25,
26,
- 27,
- 33
+ 27
]
}
},
@@ -2763,7 +2882,9 @@
150,
151,
163,
- 164
+ 164,
+ 170,
+ 171
]
}
},
@@ -2932,7 +3053,14 @@
161,
162,
163,
- 164
+ 164,
+ 165,
+ 166,
+ 167,
+ 168,
+ 169,
+ 170,
+ 171
]
}
},
@@ -2944,7 +3072,6 @@
"name": "GC Kfet",
"permissions": [
32,
- 33,
56,
58,
55,
@@ -2959,7 +3086,13 @@
29,
30,
31,
- 143
+ 70,
+ 143,
+ 166,
+ 167,
+ 168,
+ 170,
+ 171
]
}
},
diff --git a/apps/permission/migrations/0001_initial.py b/apps/permission/migrations/0001_initial.py
new file mode 100644
index 00000000..c82aa032
--- /dev/null
+++ b/apps/permission/migrations/0001_initial.py
@@ -0,0 +1,71 @@
+# Generated by Django 2.2.16 on 2020-09-04 21:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('member', '0001_initial'),
+ ('contenttypes', '0002_remove_content_type_name'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Permission',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('query', models.TextField(verbose_name='query')),
+ ('type', models.CharField(choices=[('add', 'add'), ('view', 'view'), ('change', 'change'), ('delete', 'delete')], max_length=15, verbose_name='type')),
+ ('field', models.CharField(blank=True, max_length=255, verbose_name='field')),
+ ('permanent', models.BooleanField(default=False, help_text='Tells if the permission should be granted even if the membership of the user is expired.', verbose_name='permanent')),
+ ('description', models.CharField(blank=True, max_length=255, verbose_name='description')),
+ ],
+ options={
+ 'verbose_name': 'permission',
+ 'verbose_name_plural': 'permissions',
+ },
+ ),
+ migrations.CreateModel(
+ name='PermissionMask',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('rank', models.PositiveSmallIntegerField(unique=True, verbose_name='rank')),
+ ('description', models.CharField(max_length=255, unique=True, verbose_name='description')),
+ ],
+ options={
+ 'verbose_name': 'permission mask',
+ 'verbose_name_plural': 'permission masks',
+ },
+ ),
+ migrations.CreateModel(
+ name='Role',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255, verbose_name='name')),
+ ('for_club', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, to='member.Club', verbose_name='for club')),
+ ('permissions', models.ManyToManyField(to='permission.Permission', verbose_name='permissions')),
+ ],
+ options={
+ 'verbose_name': 'role permissions',
+ 'verbose_name_plural': 'role permissions',
+ },
+ ),
+ migrations.AddField(
+ model_name='permission',
+ name='mask',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='permissions', to='permission.PermissionMask', verbose_name='mask'),
+ ),
+ migrations.AddField(
+ model_name='permission',
+ name='model',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='contenttypes.ContentType', verbose_name='model'),
+ ),
+ migrations.AlterUniqueTogether(
+ name='permission',
+ unique_together={('model', 'query', 'type', 'field')},
+ ),
+ ]
diff --git a/apps/permission/models.py b/apps/permission/models.py
index 3d395a75..ff348404 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -57,8 +57,8 @@ class InstancedPermission:
# Force insertion, no data verification, no trigger
obj._force_save = True
- # We don't want log anything
- obj._no_log = True
+ # We don't want to trigger any signal (log, ...)
+ obj._no_signal = True
Model.save(obj, force_insert=True)
ret = self.model.model_class().objects.filter(self.query & Q(pk=0)).exists()
# Delete testing object
diff --git a/apps/permission/signals.py b/apps/permission/signals.py
index 112247eb..e738545a 100644
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -28,7 +28,7 @@ def pre_save_object(sender, instance, **kwargs):
if instance._meta.label_lower in EXCLUDED:
return
- if hasattr(instance, "_force_save"):
+ if hasattr(instance, "_force_save") or hasattr(instance, "_no_signal"):
return
user = get_current_authenticated_user()
@@ -82,7 +82,8 @@ def pre_delete_object(instance, **kwargs):
if instance._meta.label_lower in EXCLUDED:
return
- if hasattr(instance, "_force_delete") or hasattr(instance, "pk") and instance.pk == 0:
+ if hasattr(instance, "_force_delete") or hasattr(instance, "pk") and instance.pk == 0 \
+ or hasattr(instance, "_no_signal"):
# Don't check permissions on force-deleted objects
return
diff --git a/apps/permission/tests/test_permission_queries.py b/apps/permission/tests/test_permission_queries.py
index e0af9cf0..fdd530a5 100644
--- a/apps/permission/tests/test_permission_queries.py
+++ b/apps/permission/tests/test_permission_queries.py
@@ -2,6 +2,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later
from datetime import date
+from json.decoder import JSONDecodeError
from django.contrib.auth.models import User
from django.core.exceptions import FieldError
@@ -56,29 +57,28 @@ class PermissionQueryTestCase(TestCase):
We use a random user with a random WEIClub (to use permissions for the WEI) in a random team in a random bus.
"""
for perm in Permission.objects.all():
- instanced = perm.about(
- user=User.objects.get(),
- club=WEIClub.objects.get(),
- membership=Membership.objects.get(),
- User=User,
- Club=Club,
- Membership=Membership,
- Note=Note,
- NoteUser=NoteUser,
- NoteClub=NoteClub,
- NoteSpecial=NoteSpecial,
- F=F,
- Q=Q,
- now=timezone.now(),
- today=date.today(),
- )
try:
+ instanced = perm.about(
+ user=User.objects.get(),
+ club=WEIClub.objects.get(),
+ membership=Membership.objects.get(),
+ User=User,
+ Club=Club,
+ Membership=Membership,
+ Note=Note,
+ NoteUser=NoteUser,
+ NoteClub=NoteClub,
+ NoteSpecial=NoteSpecial,
+ F=F,
+ Q=Q,
+ now=timezone.now(),
+ today=date.today(),
+ )
instanced.update_query()
query = instanced.query
model = perm.model.model_class()
model.objects.filter(query).all()
- # print("Good query for permission", perm)
- except (FieldError, AttributeError, ValueError, TypeError):
+ except (FieldError, AttributeError, ValueError, TypeError, JSONDecodeError):
print("Query error for permission", perm)
print("Query:", perm.query)
if instanced.query:
diff --git a/apps/permission/tests/test_rights_page.py b/apps/permission/tests/test_rights_page.py
new file mode 100644
index 00000000..da80bf09
--- /dev/null
+++ b/apps/permission/tests/test_rights_page.py
@@ -0,0 +1,44 @@
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib.auth.models import User
+from django.test import TestCase
+from django.urls import reverse
+from member.models import Membership, Club
+from permission.models import Role
+
+
+class TestRightsPage(TestCase):
+ """
+ Display the rights page.
+ """
+ fixtures = ("initial",)
+
+ def test_anonymous_rights_page(self):
+ """
+ Check that we can properly see the rights page even if we are not connected.
+ We can't nethertheless see the club managers.
+ """
+ response = self.client.get(reverse("permission:rights"))
+ self.assertEqual(response.status_code, 200)
+ self.assertFalse("special_memberships_table" in response.context)
+ self.assertFalse("superusers" in response.context)
+
+ def test_authenticated_rights_page(self):
+ """
+ Connect to the note and check that the club mangers are also displayed.
+ """
+ user = User.objects.create_superuser(
+ username="ploptoto",
+ password="totototo",
+ email="toto@example.com",
+ )
+ self.client.force_login(user)
+ membership = Membership.objects.create(user=user, club=Club.objects.get(name="BDE"))
+ membership.roles.add(Role.objects.get(name="Respo info"))
+ membership.save()
+
+ response = self.client.get(reverse("permission:rights"))
+ self.assertEqual(response.status_code, 200)
+ self.assertIsNotNone(response.context["special_memberships_table"])
+ self.assertIsNotNone(response.context["superusers"])
diff --git a/apps/permission/views.py b/apps/permission/views.py
index 70aa7184..343152f5 100644
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -8,6 +8,7 @@ from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied
from django.db.models import Q
from django.forms import HiddenInput
+from django.http import Http404
from django.utils.translation import gettext_lazy as _
from django.views.generic import UpdateView, TemplateView, CreateView
from member.models import Membership
@@ -24,9 +25,20 @@ class ProtectQuerysetMixin:
Display 404 error if the user can't see an object, remove the fields the user can't
update on an update form (useful if the user can't change only specified fields).
"""
- def get_queryset(self, **kwargs):
+ def get_queryset(self, filter_permissions=True, **kwargs):
qs = super().get_queryset(**kwargs)
- return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")).distinct()
+ return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")).distinct()\
+ if filter_permissions else qs
+
+ def get_object(self, queryset=None):
+ try:
+ return super().get_object(queryset)
+ except Http404 as e:
+ try:
+ super().get_object(self.get_queryset(filter_permissions=False))
+ raise PermissionDenied()
+ except Http404:
+ raise e
def get_form(self, form_class=None):
form = super().get_form(form_class)
diff --git a/apps/registration/static/registration/css/login.css b/apps/registration/static/registration/css/login.css
index b789b2f7..b1bac970 100644
--- a/apps/registration/static/registration/css/login.css
+++ b/apps/registration/static/registration/css/login.css
@@ -16,4 +16,8 @@ Font-Awesome attribution is already done inside SVG files
#login-form select {
-moz-appearance: none;
cursor: pointer;
-}
\ No newline at end of file
+}
+
+#login-form .asteriskField {
+ display: none;
+}
diff --git a/apps/registration/templates/registration/email_validation_complete.html b/apps/registration/templates/registration/email_validation_complete.html
index dca26470..11a84fe9 100644
--- a/apps/registration/templates/registration/email_validation_complete.html
+++ b/apps/registration/templates/registration/email_validation_complete.html
@@ -5,14 +5,29 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% load i18n %}
{% block content %}
- {% if validlink %}
- {% trans "Your email have successfully been validated." %}
+
+
{% endblock %}
diff --git a/apps/registration/templates/registration/email_validation_email_sent.html b/apps/registration/templates/registration/email_validation_email_sent.html
index 627c864b..f6db4cac 100644
--- a/apps/registration/templates/registration/email_validation_email_sent.html
+++ b/apps/registration/templates/registration/email_validation_email_sent.html
@@ -5,13 +5,17 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% load i18n %}
{% block content %}
-+ {{ title }} +
+
+ {% if validlink %}
+
++ {% trans "Your email have successfully been validated." %} +
{% if user_object.profile.registration_valid %} +{% blocktrans %}You can now log in.{% endblocktrans %} +
{% else %} +{% trans "You must pay now your membership in the Kfet to complete your registration." %} +
{% endif %} - {% else %} - {% trans "The link was invalid. The token may have expired. Please send us an email to activate your account." %} - {% endif %} + {% else %} ++ {% trans "The link was invalid. The token may have expired. Please send us an email to activate your account." %} +
+ {% endif %} +{% trans "Account activation" %}
- -- {% trans "An email has been sent. Please click on the link to activate your account." %} -
- -- {% trans "You must also go to the Kfet to pay your membership. The WEI registration includes the BDE membership." %} -
-{% endblock %} \ No newline at end of file +
+
+{% endblock %}
diff --git a/apps/registration/templates/registration/mails/email_validation_email.html b/apps/registration/templates/registration/mails/email_validation_email.html
index 0d5b41f5..40d246c9 100644
--- a/apps/registration/templates/registration/mails/email_validation_email.html
+++ b/apps/registration/templates/registration/mails/email_validation_email.html
@@ -27,7 +27,7 @@
+ {% trans "Account activation" %} +
+
+
++ {% trans "An email has been sent. Please click on the link to activate your account." %} +
++ {% trans "You must also go to the Kfet to pay your membership." %} +
+- {% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet. Note that the WEI registration includes the Kfet membership." %} + {% trans "After that, you'll have to wait that someone validates your account before you can log in. You will need to pay your membership in the Kfet." %}
@@ -38,4 +38,4 @@
{% trans "The Note Kfet team." %}
{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}
-
-
+
{% trans "Invoice" %}s
diff --git a/apps/treasury/templates/treasury/invoice_sample.tex b/apps/treasury/templates/treasury/invoice_sample.tex
index 4e6342b0..b008aac3 100644
--- a/apps/treasury/templates/treasury/invoice_sample.tex
+++ b/apps/treasury/templates/treasury/invoice_sample.tex
@@ -1,19 +1,13 @@
{% load escape_tex %}
+\documentclass[a4paper,11pt]{article}
-\nonstopmode
-\documentclass[11pt]{article}
-
-\usepackage[french]{babel}
-\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
-\usepackage[a4paper]{geometry}
-\usepackage{units}
-\usepackage{bera}
+\usepackage{fontspec}
+\usepackage{geometry}
\usepackage{graphicx}
\usepackage{fancyhdr}
\usepackage{fp}
-\usepackage{transparent}
\usepackage{eso-pic}
+\usepackage{ifthen}
\def\TVA{0} % Taux de la TVA
@@ -58,7 +52,7 @@
\parbox[b][\paperheight]{\paperwidth}{%
\vfill
\centering
- {\transparent{0.1}\includegraphics[width=\textwidth]{../../static/img/{{ obj.bde }}}}%
+ \includegraphics[width=\textwidth]{../../apps/treasury/static/img/{{ obj.bde }}_bg.jpg}
\vfill
}
}
diff --git a/apps/treasury/templates/treasury/remittance_list.html b/apps/treasury/templates/treasury/remittance_list.html
index c400f18f..8ced1ad0 100644
--- a/apps/treasury/templates/treasury/remittance_list.html
+++ b/apps/treasury/templates/treasury/remittance_list.html
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block content %}
-
+
{% trans "Invoice" %}s
diff --git a/apps/treasury/templates/treasury/sogecredit_list.html b/apps/treasury/templates/treasury/sogecredit_list.html
index c3862811..c561da72 100644
--- a/apps/treasury/templates/treasury/sogecredit_list.html
+++ b/apps/treasury/templates/treasury/sogecredit_list.html
@@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block content %}
-
+
{% trans "Invoice" %}s
@@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
@@ -59,9 +59,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
function reloadTable() {
let pattern = searchbar_obj.val();
- if (pattern === old_pattern || pattern === "")
- return;
-
$("#credits_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + (
invalid_only_obj.is(':checked') ? "&valid=false" : "") + " #credits_table");
diff --git a/apps/treasury/tests/__init__.py b/apps/treasury/tests/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/apps/treasury/tests/test_treasury.py b/apps/treasury/tests/test_treasury.py
new file mode 100644
index 00000000..505453b9
--- /dev/null
+++ b/apps/treasury/tests/test_treasury.py
@@ -0,0 +1,401 @@
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib.auth.models import User
+from django.core.exceptions import ValidationError
+from django.db.models import Q
+from django.test import TestCase
+from django.urls import reverse
+from member.models import Membership, Club
+from note.models import SpecialTransaction, NoteSpecial, Transaction
+from treasury.models import Invoice, Product, Remittance, RemittanceType, SogeCredit
+
+
+class TestInvoices(TestCase):
+ """
+ Check that invoices can be created and rendered properly.
+ """
+ def setUp(self) -> None:
+ self.user = User.objects.create_superuser(
+ username="admintoto",
+ password="totototo",
+ email="admin@example.com",
+ )
+ self.client.force_login(self.user)
+ sess = self.client.session
+ sess["permission_mask"] = 42
+ sess.save()
+
+ self.invoice = Invoice.objects.create(
+ id=1,
+ object="Object",
+ description="Description",
+ name="Me",
+ address="Earth",
+ acquitted=False,
+ )
+ self.product = Product.objects.create(
+ invoice=self.invoice,
+ designation="Product",
+ quantity=3,
+ amount=3.14,
+ )
+
+ def test_admin_page(self):
+ """
+ Display the invoice admin page.
+ """
+ response = self.client.get(reverse("admin:index") + "treasury/invoice/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_invoices_list(self):
+ """
+ Display the list of invoices.
+ """
+ response = self.client.get(reverse("treasury:invoice_list"))
+ self.assertEqual(response.status_code, 200)
+
+ def test_invoice_create(self):
+ """
+ Try to create a new invoice.
+ """
+ response = self.client.get(reverse("treasury:invoice_create"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("treasury:invoice_create"), data={
+ "id": 42,
+ "object": "Same object",
+ "description": "Longer description",
+ "name": "Me and others",
+ "address": "Alwways earth",
+ "acquitted": True,
+ "products-0-designation": "Designation",
+ "products-0-quantity": 1,
+ "products-0-amount": 42,
+ "products-TOTAL_FORMS": 1,
+ "products-INITIAL_FORMS": 0,
+ "products-MIN_NUM_FORMS": 0,
+ "products-MAX_NUM_FORMS": 1000,
+ })
+ self.assertRedirects(response, reverse("treasury:invoice_list"), 302, 200)
+ self.assertTrue(Invoice.objects.filter(object="Same object", id=42).exists())
+ self.assertTrue(Product.objects.filter(designation="Designation", invoice_id=42).exists())
+ self.assertTrue(Invoice.objects.get(id=42).tex)
+
+ def test_invoice_update(self):
+ """
+ Try to update an invoice.
+ """
+ response = self.client.get(reverse("treasury:invoice_update", args=(self.invoice.id,)))
+ self.assertEqual(response.status_code, 200)
+
+ data = {
+ "object": "Same object",
+ "description": "Longer description",
+ "name": "Me and others",
+ "address": "Always earth",
+ "acquitted": True,
+ "locked": True,
+ "products-0-designation": "Designation",
+ "products-0-quantity": 1,
+ "products-0-amount": 4200,
+ "products-1-designation": "Second designation",
+ "products-1-quantity": 5,
+ "products-1-amount": -1800,
+ "products-TOTAL_FORMS": 2,
+ "products-INITIAL_FORMS": 0,
+ "products-MIN_NUM_FORMS": 0,
+ "products-MAX_NUM_FORMS": 1000,
+ }
+
+ response = self.client.post(reverse("treasury:invoice_update", args=(self.invoice.id,)), data=data)
+ self.assertRedirects(response, reverse("treasury:invoice_list"), 302, 200)
+ self.invoice.refresh_from_db()
+ self.assertTrue(Invoice.objects.filter(pk=1, object="Same object", locked=True).exists())
+ self.assertTrue(Product.objects.filter(designation="Second designation", invoice_id=1).exists())
+
+ # Resend the same data, but the invoice is locked.
+ response = self.client.get(reverse("treasury:invoice_update", args=(self.invoice.id,)))
+ self.assertTrue(response.status_code, 200)
+ response = self.client.post(reverse("treasury:invoice_update", args=(self.invoice.id,)), data=data)
+ self.assertTrue(response.status_code, 200)
+
+ def test_delete_invoice(self):
+ """
+ Try to delete an invoice.
+ """
+ response = self.client.get(reverse("treasury:invoice_delete", args=(self.invoice.id,)))
+ self.assertEqual(response.status_code, 200)
+
+ # Can't delete a locked invoice
+ self.invoice.locked = True
+ self.invoice.save()
+ response = self.client.delete(reverse("treasury:invoice_delete", args=(self.invoice.id,)))
+ self.assertEqual(response.status_code, 403)
+ self.assertTrue(Invoice.objects.filter(pk=self.invoice.id).exists())
+
+ # Unlock invoice and truly delete it.
+ self.invoice.locked = False
+ self.invoice._force_save = True
+ self.invoice.save()
+ response = self.client.delete(reverse("treasury:invoice_delete", args=(self.invoice.id,)))
+ self.assertRedirects(response, reverse("treasury:invoice_list"), 302, 200)
+ self.assertFalse(Invoice.objects.filter(pk=self.invoice.id).exists())
+
+ def test_invoice_render_pdf(self):
+ """
+ Generate the PDF file of an invoice.
+ """
+ response = self.client.get(reverse("treasury:invoice_render", args=(self.invoice.id,)))
+ self.assertEqual(response.status_code, 200)
+
+ def test_invoice_api(self):
+ """
+ Load some API pages
+ """
+ response = self.client.get("/api/treasury/invoice/")
+ self.assertEqual(response.status_code, 200)
+ response = self.client.get("/api/treasury/product/")
+ self.assertEqual(response.status_code, 200)
+
+
+class TestRemittances(TestCase):
+ """
+ Create some credits and close remittances.
+ """
+
+ fixtures = ('initial',)
+
+ def setUp(self) -> None:
+ self.user = User.objects.create_superuser(
+ username="admintoto",
+ password="totototo",
+ email="admin@example.com",
+ )
+ self.client.force_login(self.user)
+ sess = self.client.session
+ sess["permission_mask"] = 42
+ sess.save()
+
+ self.credit = SpecialTransaction.objects.create(
+ source=NoteSpecial.objects.get(special_type="Chèque"),
+ destination=self.user.note,
+ amount=4200,
+ reason="Credit",
+ last_name="TOTO",
+ first_name="Toto",
+ bank="Société générale",
+ )
+
+ self.second_credit = SpecialTransaction.objects.create(
+ source=self.user.note,
+ destination=NoteSpecial.objects.get(special_type="Chèque"),
+ amount=424200,
+ reason="Second credit",
+ last_name="TOTO",
+ first_name="Toto",
+ bank="Société générale",
+ )
+
+ self.remittance = Remittance.objects.create(
+ remittance_type=RemittanceType.objects.get(),
+ comment="Test remittance",
+ closed=False,
+ )
+ self.credit.specialtransactionproxy.remittance = self.remittance
+ self.credit.specialtransactionproxy.save()
+
+ def test_admin_page(self):
+ """
+ Load the admin page.
+ """
+ response = self.client.get(reverse("admin:index") + "treasury/remittance/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_remittances_list(self):
+ """
+ Display the remittance list.
+ :return:
+ """
+ response = self.client.get(reverse("treasury:remittance_list"))
+ self.assertEqual(response.status_code, 200)
+
+ def test_remittance_create(self):
+ """
+ Create a new Remittance.
+ """
+ response = self.client.get(reverse("treasury:remittance_create"))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("treasury:remittance_create"), data=dict(
+ remittance_type=RemittanceType.objects.get().pk,
+ comment="Created remittance",
+ ))
+ self.assertRedirects(response, reverse("treasury:remittance_list"), 302, 200)
+ self.assertTrue(Remittance.objects.filter(comment="Created remittance").exists())
+
+ def test_remittance_update(self):
+ """
+ Update an existing remittance.
+ """
+ response = self.client.get(reverse("treasury:remittance_update", args=(self.remittance.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("treasury:remittance_update", args=(self.remittance.pk,)), data=dict(
+ comment="Updated remittance",
+ ))
+ self.assertRedirects(response, reverse("treasury:remittance_list"), 302, 200)
+ self.assertTrue(Remittance.objects.filter(comment="Updated remittance").exists())
+
+ def test_remittance_close(self):
+ """
+ Try to close an open remittance.
+ """
+ response = self.client.get(reverse("treasury:remittance_update", args=(self.remittance.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("treasury:remittance_update", args=(self.remittance.pk,)), data=dict(
+ comment="Closed remittance",
+ close=True,
+ ))
+ self.assertRedirects(response, reverse("treasury:remittance_list"), 302, 200)
+ self.assertTrue(Remittance.objects.filter(comment="Closed remittance", closed=True).exists())
+
+ def test_remittance_link_transaction(self):
+ """
+ Link a transaction to an open remittance.
+ """
+ response = self.client.get(reverse("treasury:link_transaction", args=(self.credit.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("treasury:link_transaction", args=(self.credit.pk,)), data=dict(
+ remittance=self.remittance.pk,
+ last_name="Last Name",
+ first_name="First Name",
+ bank="Bank",
+ ))
+ self.assertRedirects(response, reverse("treasury:remittance_list"), 302, 200)
+ self.credit.refresh_from_db()
+ self.assertEqual(self.credit.last_name, "Last Name")
+ self.assertEqual(self.remittance.transactions.count(), 1)
+
+ response = self.client.get(reverse("treasury:unlink_transaction", args=(self.credit.pk,)))
+ self.assertRedirects(response, reverse("treasury:remittance_list"), 302, 200)
+
+ def test_invoice_api(self):
+ """
+ Load some API pages
+ """
+ response = self.client.get("/api/treasury/remittance_type/")
+ self.assertEqual(response.status_code, 200)
+ response = self.client.get("/api/treasury/remittance/")
+ self.assertEqual(response.status_code, 200)
+
+
+class TestSogeCredits(TestCase):
+ """
+ Check that credits from the Société générale are working correctly.
+ """
+
+ fixtures = ('initial',)
+
+ def setUp(self) -> None:
+ self.user = User.objects.create_superuser(
+ username="admintoto",
+ password="totototo",
+ email="admin@example.com",
+ )
+ self.client.force_login(self.user)
+ sess = self.client.session
+ sess["permission_mask"] = 42
+ sess.save()
+
+ self.kfet = Club.objects.get(name="Kfet")
+ self.bde = self.kfet.parent_club
+
+ self.kfet_membership = Membership(
+ user=self.user,
+ club=self.kfet,
+ )
+ self.kfet_membership._force_renew_parent = True
+ self.kfet_membership._soge = True
+ self.kfet_membership.save()
+
+ def test_admin_page(self):
+ """
+ Render the admin page.
+ """
+ response = self.client.get(reverse("admin:index") + "treasury/sogecredit/")
+ self.assertEqual(response.status_code, 200)
+
+ def test_sogecredit_list(self):
+ """
+ Display the list of all credits.
+ """
+ response = self.client.get(reverse("treasury:soge_credits"))
+ self.assertEqual(response.status_code, 200)
+ response = self.client.get(reverse("treasury:soge_credits") + "?search=toto&valid=")
+ self.assertEqual(response.status_code, 200)
+
+ def test_validate_soge_credit(self):
+ """
+ Try to validate a credit.
+ """
+ soge_credit = SogeCredit.objects.get(user=self.user)
+
+ response = self.client.get(reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ response = self.client.post(reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)), data=dict(
+ validate=True,
+ ))
+ self.assertRedirects(response, reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)), 302, 200)
+ soge_credit.refresh_from_db()
+ self.assertTrue(soge_credit.valid)
+ self.user.note.refresh_from_db()
+ self.assertEqual(
+ Transaction.objects.filter(Q(source=self.user.note) | Q(destination=self.user.note)).count(), 3)
+ self.assertTrue(self.user.profile.soge)
+
+ def test_delete_soge_credit(self):
+ """
+ Try to invalidate a credit.
+ """
+ soge_credit = SogeCredit.objects.get(user=self.user)
+
+ response = self.client.get(reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)))
+ self.assertEqual(response.status_code, 200)
+
+ try:
+ self.client.post(reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)), data=dict(delete=True))
+ raise AssertionError("It is not possible to delete the soge credit until the note is not credited.")
+ except ValidationError:
+ pass
+
+ SpecialTransaction.objects.create(
+ source=NoteSpecial.objects.get(special_type="Carte bancaire"),
+ destination=self.user.note,
+ amount=self.bde.membership_fee_paid + self.kfet.membership_fee_paid,
+ quantity=1,
+ reason="Registration is not complete, pliz pay",
+ last_name="TOTO",
+ first_name="Toto",
+ )
+
+ response = self.client.post(reverse("treasury:manage_soge_credit", args=(soge_credit.pk,)),
+ data=dict(delete=True))
+ # 403 because no SogeCredit exists anymore, then a PermissionDenied is raised
+ self.assertRedirects(response, reverse("treasury:soge_credits"), 302, 403)
+ self.assertFalse(SogeCredit.objects.filter(pk=soge_credit.pk))
+ self.user.note.refresh_from_db()
+ self.assertEqual(self.user.note.balance, 0)
+ self.assertEqual(
+ Transaction.objects.filter(Q(source=self.user.note) | Q(destination=self.user.note)).count(), 4)
+ self.assertFalse(self.user.profile.soge)
+
+ def test_invoice_api(self):
+ """
+ Load some API pages
+ """
+ response = self.client.get("/api/treasury/soge_credit/")
+ self.assertEqual(response.status_code, 200)
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index c2265289..ecefc5cf 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -60,6 +60,11 @@ class InvoiceCreateView(ProtectQuerysetMixin, ProtectedCreateView):
return context
+ def get_form(self, form_class=None):
+ form = super().get_form(form_class)
+ del form.fields["locked"]
+ return form
+
def form_valid(self, form):
ret = super().form_valid(form)
@@ -134,6 +139,11 @@ class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
return context
+ def get_form(self, form_class=None):
+ form = super().get_form(form_class)
+ del form.fields["id"]
+ return form
+
def form_valid(self, form):
ret = super().form_valid(form)
@@ -165,6 +175,11 @@ class InvoiceDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView):
model = Invoice
extra_context = {"title": _("Delete invoice")}
+ def delete(self, request, *args, **kwargs):
+ if self.get_object().locked:
+ raise PermissionDenied(_("This invoice is locked and can't be deleted."))
+ return super().delete(request, *args, **kwargs)
+
def get_success_url(self):
return reverse_lazy('treasury:invoice_list')
@@ -194,7 +209,7 @@ class InvoiceRenderView(LoginRequiredMixin, View):
# The file has to be rendered twice
for ignored in range(2):
error = subprocess.Popen(
- ["pdflatex", "invoice-{}.tex".format(pk)],
+ ["/usr/bin/xelatex", "-interaction=nonstopmode", "invoice-{}.tex".format(pk)],
cwd=tmp_dir,
stdin=open(os.devnull, "r"),
stderr=open(os.devnull, "wb"),
@@ -202,7 +217,9 @@ class InvoiceRenderView(LoginRequiredMixin, View):
).wait()
if error:
- raise IOError("An error attempted while generating a invoice (code=" + str(error) + ")")
+ with open("{}/invoice-{:d}.log".format(tmp_dir, pk), "r") as f:
+ log = f.read()
+ raise IOError("An error attempted while generating a invoice (code=" + str(error) + ")\n\n" + log)
# Display the generated pdf as a HTTP Response
pdf = open("{}/invoice-{}.pdf".format(tmp_dir, pk), 'rb').read()
@@ -387,7 +404,7 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi
if not request.user.is_authenticated:
return self.handle_no_permission()
- if not self.get_queryset().exists():
+ if not super().get_queryset().exists():
raise PermissionDenied(_("You are not able to see the treasury interface."))
return super().dispatch(request, *args, **kwargs)
@@ -408,11 +425,8 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi
| Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern))
)
- if "valid" in self.request.GET:
- q = Q(credit_transaction=None)
- if not self.request.GET["valid"]:
- q = ~q
- qs = qs.filter(q)
+ if "valid" not in self.request.GET or not self.request.GET["valid"]:
+ qs = qs.filter(credit_transaction__valid=False)
return qs[:20]
diff --git a/apps/wei/management/commands/extract_ml_registrations.py b/apps/wei/management/commands/extract_ml_registrations.py
deleted file mode 100644
index 9bc82418..00000000
--- a/apps/wei/management/commands/extract_ml_registrations.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-from datetime import date
-
-from django.core.management import BaseCommand
-from django.db.models import Q
-from member.models import Membership, Club
-from wei.models import WEIClub
-
-
-class Command(BaseCommand):
- help = "Get mailing list registrations from the last wei. " \
- "Usage: manage.py extract_ml_registrations -t {events,art,sport}. " \
- "You can write this into a file with a pipe, then paste the document into your mail manager."
-
- def add_arguments(self, parser):
- parser.add_argument('--type', '-t', choices=["members", "clubs", "events", "art", "sport"], default="members",
- help='Select the type of the mailing list (default members)')
- parser.add_argument('--year', '-y', type=int, default=None,
- help='Select the year of the concerned WEI. Default: last year')
-
- def handle(self, *args, **options):
- ###########################################################
- # WARNING #
- ###########################################################
- #
- # This code is obsolete.
- # TODO: Improve the mailing list extraction system, and link it automatically with Mailman.
-
- if options["type"] == "members":
- for membership in Membership.objects.filter(
- club__name="BDE",
- date_start__lte=date.today(),
- date_end__gte=date.today(),
- ).all():
- self.stdout.write(membership.user.email)
- return
-
- if options["type"] == "clubs":
- for club in Club.objects.all():
- self.stdout.write(club.email)
- return
-
- if options["year"] is None:
- wei = WEIClub.objects.order_by('-year').first()
- else:
- wei = WEIClub.objects.filter(year=options["year"])
- if wei.exists():
- wei = wei.get()
- else:
- wei = WEIClub.objects.order_by('-year').first()
- self.stderr.write(self.style.WARNING("Warning: there was no WEI in year " + str(options["year"]) + ". "
- + "Assuming the last WEI (year " + str(wei.year) + ")"))
- q = Q(ml_events_registration=True) if options["type"] == "events" else Q(ml_art_registration=True)\
- if options["type"] == "art" else Q(ml_sport_registration=True)
- registrations = wei.users.filter(q)
- for registration in registrations.all():
- self.stdout.write(registration.user.email)
diff --git a/apps/wei/migrations/0001_initial.py b/apps/wei/migrations/0001_initial.py
new file mode 100644
index 00000000..0ad73fab
--- /dev/null
+++ b/apps/wei/migrations/0001_initial.py
@@ -0,0 +1,120 @@
+# Generated by Django 2.2.16 on 2020-09-04 21:41
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+ initial = True
+
+ dependencies = [
+ ('permission', '0001_initial'),
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('member', '0001_initial'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Bus',
+ 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.TextField(blank=True, default='', verbose_name='description')),
+ ('information_json', models.TextField(default='{}', help_text='Information about the survey for new members, encoded in JSON', verbose_name='survey information')),
+ ],
+ options={
+ 'verbose_name': 'Bus',
+ 'verbose_name_plural': 'Buses',
+ },
+ ),
+ migrations.CreateModel(
+ name='BusTeam',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255, verbose_name='name')),
+ ('color', models.PositiveIntegerField(help_text='The color of the T-Shirt, stored with its number equivalent', verbose_name='color')),
+ ('description', models.TextField(blank=True, default='', verbose_name='description')),
+ ('bus', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='teams', to='wei.Bus', verbose_name='bus')),
+ ],
+ options={
+ 'verbose_name': 'Bus team',
+ 'verbose_name_plural': 'Bus teams',
+ 'unique_together': {('bus', 'name')},
+ },
+ ),
+ migrations.CreateModel(
+ name='WEIClub',
+ fields=[
+ ('club_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='member.Club')),
+ ('year', models.PositiveIntegerField(default=2020, unique=True, verbose_name='year')),
+ ('date_start', models.DateField(verbose_name='date start')),
+ ('date_end', models.DateField(verbose_name='date end')),
+ ],
+ options={
+ 'verbose_name': 'WEI',
+ 'verbose_name_plural': 'WEI',
+ },
+ bases=('member.club',),
+ ),
+ migrations.CreateModel(
+ name='WEIRole',
+ fields=[
+ ('role_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='permission.Role')),
+ ],
+ options={
+ 'verbose_name': 'WEI Role',
+ 'verbose_name_plural': 'WEI Roles',
+ },
+ bases=('permission.role',),
+ ),
+ migrations.CreateModel(
+ name='WEIRegistration',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('soge_credit', models.BooleanField(default=False, verbose_name='Credit from Société générale')),
+ ('caution_check', models.BooleanField(default=False, verbose_name='Caution check given')),
+ ('birth_date', models.DateField(verbose_name='birth date')),
+ ('gender', models.CharField(choices=[('male', 'Male'), ('female', 'Female'), ('nonbinary', 'Non binary')], max_length=16, verbose_name='gender')),
+ ('clothing_cut', models.CharField(choices=[('male', 'Male'), ('female', 'Female')], max_length=16, verbose_name='clothing cut')),
+ ('clothing_size', models.CharField(choices=[('XS', 'XS'), ('S', 'S'), ('M', 'M'), ('L', 'L'), ('XL', 'XL'), ('XXL', 'XXL')], max_length=4, verbose_name='clothing size')),
+ ('health_issues', models.TextField(blank=True, default='', verbose_name='health issues')),
+ ('emergency_contact_name', models.CharField(max_length=255, verbose_name='emergency contact name')),
+ ('emergency_contact_phone', phonenumber_field.modelfields.PhoneNumberField(max_length=32, region=None, verbose_name='emergency contact phone')),
+ ('first_year', models.BooleanField(default=False, help_text='Tells if the user is new in the school.', verbose_name='first year')),
+ ('information_json', models.TextField(default='{}', help_text='Information about the registration (buses for old members, survey fot the new members), encoded in JSON', verbose_name='registration information')),
+ ('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='wei', to=settings.AUTH_USER_MODEL, verbose_name='user')),
+ ('wei', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='users', to='wei.WEIClub', verbose_name='WEI')),
+ ],
+ options={
+ 'verbose_name': 'WEI User',
+ 'verbose_name_plural': 'WEI Users',
+ 'unique_together': {('user', 'wei')},
+ },
+ ),
+ migrations.CreateModel(
+ name='WEIMembership',
+ fields=[
+ ('membership_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='member.Membership')),
+ ('bus', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to='wei.Bus', verbose_name='bus')),
+ ('registration', models.OneToOneField(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='membership', to='wei.WEIRegistration', verbose_name='WEI registration')),
+ ('team', models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='memberships', to='wei.BusTeam', verbose_name='team')),
+ ],
+ options={
+ 'verbose_name': 'WEI membership',
+ 'verbose_name_plural': 'WEI memberships',
+ },
+ bases=('member.membership',),
+ ),
+ migrations.AddField(
+ model_name='bus',
+ name='wei',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='buses', to='wei.WEIClub', verbose_name='WEI'),
+ ),
+ migrations.AlterUniqueTogether(
+ name='bus',
+ unique_together={('wei', 'name')},
+ ),
+ ]
diff --git a/apps/wei/templates/wei/weilist_sample.tex b/apps/wei/templates/wei/weilist_sample.tex
index 1ab3b76d..f1b7fbd4 100644
--- a/apps/wei/templates/wei/weilist_sample.tex
+++ b/apps/wei/templates/wei/weilist_sample.tex
@@ -1,15 +1,11 @@
-\documentclass[landscape,10pt]{article}
-
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage[french]{babel}
+\documentclass[a4paper,landscape,10pt]{article}
+\usepackage{fontspec}
\usepackage[margin=1.5cm]{geometry}
-\usepackage{lmodern}
\begin{document}
\begin{center}
-\huge{Liste des inscrits \og {{ wei.name }} \fg{}}
+\huge{Liste des inscrits « {{ wei.name }} »}
{% if bus %}
\LARGE{Bus {{ bus.name|safe }}}
diff --git a/apps/wei/tests/test_wei_registration.py b/apps/wei/tests/test_wei_registration.py
index 1e9036f0..6d294bdd 100644
--- a/apps/wei/tests/test_wei_registration.py
+++ b/apps/wei/tests/test_wei_registration.py
@@ -690,7 +690,7 @@ class TestWEIRegistration(TestCase):
"""
with open("/dev/null", "wb") as devnull:
return subprocess.call(
- ["which", "pdflatex"],
+ ["/usr/bin/which", "xelatex"],
stdout=devnull,
stderr=devnull,
) == 0
diff --git a/apps/wei/views.py b/apps/wei/views.py
index 358cb14a..8246bebf 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -1103,14 +1103,16 @@ class MemberListRenderView(LoginRequiredMixin, View):
with open(os.devnull, "wb") as devnull:
error = subprocess.Popen(
- ["pdflatex", "{}/wei-list.tex".format(tmp_dir)],
+ ["/usr/bin/xelatex", "-interaction=nonstopmode", "{}/wei-list.tex".format(tmp_dir)],
cwd=tmp_dir,
stderr=devnull,
stdout=devnull,
).wait()
if error:
- raise IOError("An error attempted while generating a WEI list (code=" + str(error) + ")")
+ with open("{}/wei-list.log".format(tmp_dir), "r") as f:
+ log = f.read()
+ raise IOError("An error attempted while generating a WEI list (code=" + str(error) + ")\n\n" + log)
# Display the generated pdf as a HTTP Response
with open("{}/wei-list.pdf".format(tmp_dir), 'rb') as f:
diff --git a/entrypoint.sh b/entrypoint.sh
index ab33fbe8..dfd68977 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -14,7 +14,6 @@ fi
# Set up Django project
python3 manage.py collectstatic --noinput
python3 manage.py compilemessages
-python3 manage.py makemigrations
python3 manage.py migrate
if [ "$1" ]; then
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 1f5c0403..3891a934 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-02 23:17+0200\n"
+"POT-Creation-Date: 2020-09-07 19:43+0200\n"
"PO-Revision-Date: 2020-09-03 23:47+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -18,42 +18,42 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.3\n"
-#: apps/activity/apps.py:10 apps/activity/models.py:145
-#: apps/activity/models.py:161
+#: apps/activity/apps.py:10 apps/activity/models.py:150
+#: apps/activity/models.py:166
msgid "activity"
msgstr "Veranstaltung"
-#: apps/activity/forms.py:35 apps/activity/models.py:130
+#: apps/activity/forms.py:35 apps/activity/models.py:131
msgid "The end date must be after the start date."
msgstr "Das Abschlussdatum muss nach das Anfangsdatum sein."
-#: apps/activity/forms.py:76 apps/activity/models.py:257
+#: apps/activity/forms.py:76 apps/activity/models.py:268
msgid "You can't invite someone once the activity is started."
msgstr ""
"Sie dürfen nicht jemandem einladen wenn die Veranstaltung angefangen hat."
-#: apps/activity/forms.py:79 apps/activity/models.py:260
+#: apps/activity/forms.py:79 apps/activity/models.py:271
msgid "This activity is not validated yet."
msgstr "Diese Veranstaltung ist noch nicht bestätigt."
-#: apps/activity/forms.py:89 apps/activity/models.py:268
+#: apps/activity/forms.py:89 apps/activity/models.py:279
msgid "This person has been already invited 5 times this year."
msgstr "Diese Person wurde schon 5 mal dieses Jahr eingeladen."
-#: apps/activity/forms.py:93 apps/activity/models.py:272
+#: apps/activity/forms.py:93 apps/activity/models.py:283
msgid "This person is already invited."
msgstr "Diese Person wurde schon eingeladen."
-#: apps/activity/forms.py:97 apps/activity/models.py:276
+#: apps/activity/forms.py:97 apps/activity/models.py:287
msgid "You can't invite more than 3 people to this activity."
msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen."
-#: apps/activity/models.py:27 apps/activity/models.py:62
-#: apps/member/models.py:198
+#: apps/activity/models.py:28 apps/activity/models.py:63
+#: apps/member/models.py:199
#: apps/member/templates/member/includes/club_info.html:4
#: apps/member/templates/member/includes/profile_info.html:4
-#: apps/note/models/notes.py:247 apps/note/models/transactions.py:26
-#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:302
+#: apps/note/models/notes.py:253 apps/note/models/transactions.py:26
+#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:296
#: apps/permission/models.py:329
#: apps/registration/templates/registration/future_profile_detail.html:16
#: apps/wei/models.py:66 apps/wei/models.py:118
@@ -62,161 +62,171 @@ msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen."
msgid "name"
msgstr "Name"
-#: apps/activity/models.py:32
+#: apps/activity/models.py:33
msgid "manage entries"
msgstr "Einträge verwalten"
-#: apps/activity/models.py:33
+#: apps/activity/models.py:34
msgid "Enable the support of entries for this activity."
msgstr "Aktivieren Sie die Eintrittmöglichkeit für diese Aktivität."
-#: apps/activity/models.py:38
+#: apps/activity/models.py:39
#: apps/activity/templates/activity/includes/activity_info.html:42
msgid "can invite"
msgstr "Darf einladen"
-#: apps/activity/models.py:43
+#: apps/activity/models.py:44
#: apps/activity/templates/activity/includes/activity_info.html:46
msgid "guest entry fee"
msgstr "Gasteintrittspreis"
-#: apps/activity/models.py:48
+#: apps/activity/models.py:49
msgid "activity type"
msgstr "Veranstaltungart"
-#: apps/activity/models.py:49
+#: apps/activity/models.py:50
msgid "activity types"
msgstr "Vearnstaltungarte"
-#: apps/activity/models.py:67
+#: apps/activity/models.py:68
#: apps/activity/templates/activity/includes/activity_info.html:19
#: apps/note/models/transactions.py:81 apps/permission/models.py:110
#: apps/permission/models.py:189 apps/wei/models.py:72 apps/wei/models.py:129
msgid "description"
msgstr "Beschreibung"
-#: apps/activity/models.py:71
+#: apps/activity/models.py:72
msgid "location"
msgstr "Ort"
-#: apps/activity/models.py:75
+#: apps/activity/models.py:76
msgid "Place where the activity is organized, eg. Kfet."
msgstr "Wo findet die Veranstaltung statt ? (z.B Kfet)"
-#: apps/activity/models.py:82
+#: apps/activity/models.py:83
#: apps/activity/templates/activity/includes/activity_info.html:22
-#: apps/note/models/notes.py:223 apps/note/models/transactions.py:66
+#: apps/note/models/notes.py:229 apps/note/models/transactions.py:66
#: apps/permission/models.py:164
msgid "type"
msgstr "Type"
-#: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:303
-#: apps/note/models/notes.py:138 apps/treasury/models.py:267
+#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:304
+#: apps/note/models/notes.py:144 apps/treasury/models.py:276
#: apps/treasury/templates/treasury/sogecredit_detail.html:14
#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
msgid "user"
msgstr "User"
-#: apps/activity/models.py:95
+#: apps/activity/models.py:96
#: apps/activity/templates/activity/includes/activity_info.html:36
msgid "organizer"
msgstr "Veranstalter"
-#: apps/activity/models.py:96
+#: apps/activity/models.py:97
msgid "Club that organizes the activity. The entry fees will go to this club."
msgstr ""
"Die Veranstaltung wurde von einem Club organisert. Die Eintrittsbeiträge "
"gehen an diesen Club."
-#: apps/activity/models.py:103
+#: apps/activity/models.py:104
#: apps/activity/templates/activity/includes/activity_info.html:39
msgid "attendees club"
msgstr "Teilnehmer"
-#: apps/activity/models.py:104
+#: apps/activity/models.py:105
msgid "Club that is authorized to join the activity. Mostly the Kfet club."
msgstr "Club die an die Veranstaltung teilnehmen können."
-#: apps/activity/models.py:108
+#: apps/activity/models.py:109
#: apps/activity/templates/activity/includes/activity_info.html:25
msgid "start date"
msgstr "Anfangsdatum"
-#: apps/activity/models.py:112
+#: apps/activity/models.py:113
#: apps/activity/templates/activity/includes/activity_info.html:28
msgid "end date"
msgstr "Abschlussdatum"
-#: apps/activity/models.py:117
+#: apps/activity/models.py:118
#: apps/activity/templates/activity/includes/activity_info.html:50
-#: apps/note/models/transactions.py:146
+#: apps/note/models/transactions.py:149
msgid "valid"
msgstr "gültig"
-#: apps/activity/models.py:122
+#: apps/activity/models.py:123
#: apps/activity/templates/activity/includes/activity_info.html:65
msgid "open"
msgstr "geöffnet"
-#: apps/activity/models.py:146
+#: apps/activity/models.py:151
msgid "activities"
msgstr "Veranstaltungen"
-#: apps/activity/models.py:166
+#: apps/activity/models.py:171
msgid "entry time"
msgstr "Eintrittzeit"
-#: apps/activity/models.py:172 apps/note/apps.py:14
+#: apps/activity/models.py:177 apps/note/apps.py:14
#: apps/note/models/notes.py:78
msgid "note"
msgstr "Note"
-#: apps/activity/models.py:183
+#: apps/activity/models.py:188
#: apps/activity/templates/activity/activity_entry.html:46
msgid "entry"
msgstr "Eintritt"
-#: apps/activity/models.py:184
+#: apps/activity/models.py:189
#: apps/activity/templates/activity/activity_entry.html:46
msgid "entries"
msgstr "Eintritte"
-#: apps/activity/models.py:190
+#: apps/activity/models.py:192
+#, python-brace-format
+msgid "Entry for {guest}, invited by {note} to the activity {activity}"
+msgstr "Eintritt für {guest}, von {note} zur Vanstaltung {activity} eingeladen"
+
+#: apps/activity/models.py:194
+#, python-brace-format
+msgid "Entry for {note} to the activity {activity}"
+msgstr "Eintritt von {note} zur Veranstaltung {activity}"
+
+#: apps/activity/models.py:201
msgid "Already entered on "
msgstr "Schon eingetretten "
-#: apps/activity/models.py:190 apps/activity/tables.py:54
+#: apps/activity/models.py:201 apps/activity/tables.py:54
msgid "{:%Y-%m-%d %H:%M:%S}"
msgstr "{:%Y-%m-%d %H:%M:%S}"
-#: apps/activity/models.py:198
+#: apps/activity/models.py:209
msgid "The balance is negative."
msgstr "Kontostand ist im Rot."
-#: apps/activity/models.py:228
+#: apps/activity/models.py:239
msgid "last name"
msgstr "Nachname"
-#: apps/activity/models.py:233
+#: apps/activity/models.py:244
#: apps/member/templates/member/includes/profile_info.html:4
#: apps/registration/templates/registration/future_profile_detail.html:16
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "first name"
msgstr "Vorname"
-#: apps/activity/models.py:240
+#: apps/activity/models.py:251
msgid "inviter"
msgstr "Einlader"
-#: apps/activity/models.py:284
+#: apps/activity/models.py:295
msgid "guest"
msgstr "Gast"
-#: apps/activity/models.py:285
+#: apps/activity/models.py:296
msgid "guests"
msgstr "Gäste"
-#: apps/activity/models.py:297
+#: apps/activity/models.py:308
msgid "Invitation"
msgstr "Einladung"
@@ -240,19 +250,19 @@ msgstr "Eingetreten um "
msgid "remove"
msgstr "entfernen"
-#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:186
+#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:192
msgid "Type"
msgstr "Type"
-#: apps/activity/tables.py:82 apps/member/forms.py:131
-#: apps/registration/forms.py:81 apps/treasury/forms.py:135
+#: apps/activity/tables.py:82 apps/member/forms.py:183
+#: apps/registration/forms.py:81 apps/treasury/forms.py:129
#: apps/wei/forms/registration.py:96
msgid "Last name"
msgstr "Nachname"
-#: apps/activity/tables.py:84 apps/member/forms.py:136
+#: apps/activity/tables.py:84 apps/member/forms.py:188
#: apps/note/templates/note/transaction_form.html:134
-#: apps/registration/forms.py:86 apps/treasury/forms.py:137
+#: apps/registration/forms.py:86 apps/treasury/forms.py:131
#: apps/wei/forms/registration.py:101
msgid "First name"
msgstr "Vorname"
@@ -270,21 +280,21 @@ msgid "Guests list"
msgstr "Gastliste"
#: apps/activity/templates/activity/activity_entry.html:14
-#: apps/note/models/transactions.py:259
+#: apps/note/models/transactions.py:253
#: apps/note/templates/note/transaction_form.html:16
#: apps/note/templates/note/transaction_form.html:148
-#: note_kfet/templates/base.html:68
+#: note_kfet/templates/base.html:70
msgid "Transfer"
msgstr "Überweisen"
#: apps/activity/templates/activity/activity_entry.html:18
-#: apps/note/models/transactions.py:318
+#: apps/note/models/transactions.py:312
#: apps/note/templates/note/transaction_form.html:21
msgid "Credit"
msgstr "Kredit"
#: apps/activity/templates/activity/activity_entry.html:21
-#: apps/note/models/transactions.py:318
+#: apps/note/models/transactions.py:312
#: apps/note/templates/note/transaction_form.html:25
msgid "Debit"
msgstr "Soll"
@@ -302,7 +312,7 @@ msgstr "Zurück zur Veranstaltungseite"
#: apps/member/templates/member/add_members.html:32
#: apps/member/templates/member/club_form.html:16
#: apps/note/templates/note/transactiontemplate_form.html:18
-#: apps/treasury/forms.py:93 apps/treasury/forms.py:147
+#: apps/treasury/forms.py:87 apps/treasury/forms.py:141
#: apps/treasury/templates/treasury/invoice_form.html:74
#: apps/wei/templates/wei/bus_form.html:17
#: apps/wei/templates/wei/busteam_form.html:17
@@ -356,7 +366,7 @@ msgid "validate"
msgstr "validate"
#: apps/activity/templates/activity/includes/activity_info.html:71
-#: apps/logs/models.py:62 apps/note/tables.py:162
+#: apps/logs/models.py:64 apps/note/tables.py:195
msgid "edit"
msgstr "bearbeiten"
@@ -364,39 +374,39 @@ msgstr "bearbeiten"
msgid "Invite"
msgstr "Einladen"
-#: apps/activity/views.py:29
+#: apps/activity/views.py:33
msgid "Create new activity"
msgstr "Neue Veranstaltung schaffen"
-#: apps/activity/views.py:59 note_kfet/templates/base.html:86
+#: apps/activity/views.py:63 note_kfet/templates/base.html:88
msgid "Activities"
msgstr "Veranstaltungen"
-#: apps/activity/views.py:87
+#: apps/activity/views.py:91
msgid "Activity detail"
msgstr "Veranstaltunginfo"
-#: apps/activity/views.py:107
+#: apps/activity/views.py:111
msgid "Update activity"
msgstr "Veranstaltung bearbeiten"
-#: apps/activity/views.py:134
+#: apps/activity/views.py:138
msgid "Invite guest to the activity \"{}\""
msgstr "Gast zur Veranstaltung \"{}\" einladen"
-#: apps/activity/views.py:168
+#: apps/activity/views.py:172
msgid "You are not allowed to display the entry interface for this activity."
msgstr "Sie haben nicht das Recht diese Seite zu benuzten."
-#: apps/activity/views.py:171
+#: apps/activity/views.py:175
msgid "This activity does not support activity entries."
msgstr "Diese Veranstaltung braucht nicht Eintritt."
-#: apps/activity/views.py:174
+#: apps/activity/views.py:178
msgid "This activity is closed."
msgstr "Diese Veranstaltung ist geschlossen."
-#: apps/activity/views.py:272
+#: apps/activity/views.py:274
msgid "Entry for activity \"{}\""
msgstr "Eintritt zur Veranstaltung \"{}\""
@@ -420,59 +430,64 @@ msgstr "Model"
msgid "identifier"
msgstr "Kennzeichnung"
-#: apps/logs/models.py:48
+#: apps/logs/models.py:49
msgid "previous data"
msgstr "ehemalige Daten"
-#: apps/logs/models.py:53
+#: apps/logs/models.py:55
msgid "new data"
msgstr "neue Daten"
-#: apps/logs/models.py:61
+#: apps/logs/models.py:63
msgid "create"
msgstr "schaffen"
-#: apps/logs/models.py:63 apps/note/tables.py:132 apps/note/tables.py:168
+#: apps/logs/models.py:65 apps/note/tables.py:165 apps/note/tables.py:201
#: apps/permission/models.py:127 apps/treasury/tables.py:38
#: apps/wei/tables.py:75
msgid "delete"
msgstr "entfernen"
-#: apps/logs/models.py:66
+#: apps/logs/models.py:68
msgid "action"
msgstr "Aktion"
-#: apps/logs/models.py:74
+#: apps/logs/models.py:76
msgid "timestamp"
msgstr "Zeitstempel"
-#: apps/logs/models.py:78
+#: apps/logs/models.py:80
msgid "Logs cannot be destroyed."
msgstr "Logs können nicht entfernen sein."
-#: apps/logs/models.py:81
+#: apps/logs/models.py:83
msgid "changelog"
msgstr "Changelog"
-#: apps/logs/models.py:82
+#: apps/logs/models.py:84
msgid "changelogs"
msgstr "Changelogs"
-#: apps/member/admin.py:52 apps/member/models.py:225
+#: apps/logs/models.py:87
+#, python-brace-format
+msgid "Changelog of type \"{action}\" for model {model} at {timestamp}"
+msgstr "Changelog \"{action}\" für Model {model} an {timestamp}"
+
+#: apps/member/admin.py:50 apps/member/models.py:226
#: apps/member/templates/member/includes/club_info.html:34
msgid "membership fee (paid students)"
msgstr "Mitgliedschaftpreis (bezahlte Studenten)"
-#: apps/member/admin.py:53 apps/member/models.py:230
+#: apps/member/admin.py:51 apps/member/models.py:231
#: apps/member/templates/member/includes/club_info.html:37
msgid "membership fee (unpaid students)"
msgstr "Mitgliedschaftpreis (unbezahlte Studenten)"
-#: apps/member/admin.py:67 apps/member/models.py:314
+#: apps/member/admin.py:65 apps/member/models.py:315
msgid "roles"
msgstr "Rollen"
-#: apps/member/admin.py:68 apps/member/models.py:328
+#: apps/member/admin.py:66 apps/member/models.py:329
msgid "fee"
msgstr "Preis"
@@ -480,69 +495,77 @@ msgstr "Preis"
msgid "member"
msgstr "Mitglied"
-#: apps/member/forms.py:41
+#: apps/member/forms.py:23
+msgid "Permission mask"
+msgstr "Berechtigungsmaske"
+
+#: apps/member/forms.py:45
msgid "Report frequency"
msgstr "Bericht Frequenz"
-#: apps/member/forms.py:43
+#: apps/member/forms.py:47
msgid "Last report date"
msgstr "Letzen Bericht Datum"
-#: apps/member/forms.py:48
+#: apps/member/forms.py:52
msgid "You can't register to the note if you come from the future."
msgstr "Sie dürfen nicht einloggen wenn sie aus der Zukunft kommen."
-#: apps/member/forms.py:73
+#: apps/member/forms.py:77
msgid "select an image"
msgstr "Wählen sie ein Bild aus"
-#: apps/member/forms.py:74
+#: apps/member/forms.py:78
msgid "Maximal size: 2MB"
msgstr "Maximal Größe: 2MB"
-#: apps/member/forms.py:87 apps/member/views.py:101
-#: apps/registration/forms.py:33
+#: apps/member/forms.py:103
+msgid "This image cannot be loaded."
+msgstr "Dieses Bild kann nicht geladen werden."
+
+#: apps/member/forms.py:139 apps/member/views.py:98
+#: apps/registration/forms.py:33 apps/registration/views.py:237
msgid "An alias with a similar name already exists."
msgstr "Ein ähnliches Alias ist schon benutzt."
-#: apps/member/forms.py:110 apps/registration/forms.py:61
+#: apps/member/forms.py:162 apps/registration/forms.py:61
msgid "Inscription paid by Société Générale"
msgstr "Mitgliedschaft von der Société Générale bezahlt"
-#: apps/member/forms.py:112 apps/registration/forms.py:63
+#: apps/member/forms.py:164 apps/registration/forms.py:63
msgid "Check this case is the Société Générale paid the inscription."
msgstr "Die Société Générale die Mitgliedschaft bezahlt."
-#: apps/member/forms.py:117 apps/registration/forms.py:68
+#: apps/member/forms.py:169 apps/registration/forms.py:68
#: apps/wei/forms/registration.py:83
msgid "Credit type"
msgstr "Kredittype"
-#: apps/member/forms.py:118 apps/registration/forms.py:69
+#: apps/member/forms.py:170 apps/registration/forms.py:69
#: apps/wei/forms/registration.py:84
msgid "No credit"
msgstr "Kein Kredit"
-#: apps/member/forms.py:120
+#: apps/member/forms.py:172
msgid "You can credit the note of the user."
msgstr "Sie dûrfen diese Note kreditieren."
-#: apps/member/forms.py:124 apps/registration/forms.py:74
+#: apps/member/forms.py:176 apps/registration/forms.py:74
#: apps/wei/forms/registration.py:89
msgid "Credit amount"
msgstr "Kreditanzahl"
-#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140
-#: apps/registration/forms.py:91 apps/treasury/forms.py:139
+#: apps/member/forms.py:193 apps/note/templates/note/transaction_form.html:140
+#: apps/registration/forms.py:91 apps/treasury/forms.py:133
#: apps/wei/forms/registration.py:106
msgid "Bank"
msgstr "Bank"
-#: apps/member/forms.py:168
+#: apps/member/forms.py:220
msgid "User"
msgstr "User"
-#: apps/member/forms.py:182
+#: apps/member/forms.py:234
msgid "Roles"
msgstr "Rollen"
@@ -658,19 +681,19 @@ msgstr "bezahlt"
msgid "Tells if the user receive a salary."
msgstr "User ist bezahlt."
-#: apps/member/models.py:101 apps/treasury/tables.py:146
+#: apps/member/models.py:100 apps/treasury/tables.py:146
msgid "No"
msgstr "Nein"
-#: apps/member/models.py:102
+#: apps/member/models.py:101
msgid "Yes (receive them in french)"
msgstr "Ja (auf Fränzosich)"
-#: apps/member/models.py:103
+#: apps/member/models.py:102
msgid "Yes (receive them in english)"
msgstr "Ja (auf English)"
-#: apps/member/models.py:105
+#: apps/member/models.py:104
msgid ""
"Register on the mailing list to stay informed of the events of the campus (1 "
"mail/week)"
@@ -678,7 +701,7 @@ msgstr ""
"Melden Sie sich auf der Mailingliste an, um über die Ereignisse des Campus "
"informiert zu bleiben (1 Mail / Woche)"
-#: apps/member/models.py:110
+#: apps/member/models.py:109
msgid ""
"Register on the mailing list to stay informed of the sport events of the "
"campus (1 mail/week)"
@@ -686,7 +709,7 @@ msgstr ""
"Melden Sie sich auf der Mailingliste an, um über die Sportereignisse des "
"Campus informiert zu bleiben (1 Mail / Woche)"
-#: apps/member/models.py:115
+#: apps/member/models.py:114
msgid ""
"Register on the mailing list to stay informed of the art events of the "
"campus (1 mail/week)"
@@ -694,31 +717,31 @@ msgstr ""
"Melden Sie sich auf der Mailingliste an, um über die Kunstereignisse des "
"Campus informiert zu bleiben (1 Mail / Woche)"
-#: apps/member/models.py:119
+#: apps/member/models.py:118
msgid "report frequency (in days)"
msgstr "Bericht Frequenz (Tagen)"
-#: apps/member/models.py:124
+#: apps/member/models.py:123
msgid "last report date"
msgstr "letzen Bericht Datum"
-#: apps/member/models.py:129
+#: apps/member/models.py:128
msgid "email confirmed"
msgstr "email bestätigt"
-#: apps/member/models.py:134
+#: apps/member/models.py:133
msgid "registration valid"
msgstr "Anmeldung gültig"
-#: apps/member/models.py:163 apps/member/models.py:164
+#: apps/member/models.py:162 apps/member/models.py:163
msgid "user profile"
msgstr "Userprofile"
-#: apps/member/models.py:174
+#: apps/member/models.py:173
msgid "Activate your Note Kfet account"
msgstr "Ihre Note Kfet Konto bestätigen"
-#: apps/member/models.py:203
+#: apps/member/models.py:204
#: apps/member/templates/member/includes/club_info.html:55
#: apps/member/templates/member/includes/profile_info.html:31
#: apps/registration/templates/registration/future_profile_detail.html:22
@@ -727,88 +750,88 @@ msgstr "Ihre Note Kfet Konto bestätigen"
msgid "email"
msgstr "Email"
-#: apps/member/models.py:210
+#: apps/member/models.py:211
msgid "parent club"
msgstr "Urclub"
-#: apps/member/models.py:219
+#: apps/member/models.py:220
msgid "require memberships"
msgstr "erfordern Mitgliedschaft"
-#: apps/member/models.py:220
+#: apps/member/models.py:221
msgid "Uncheck if this club don't require memberships."
msgstr ""
"Deaktivieren Sie diese Option, wenn für diesen Club keine Mitgliedschaft "
"erforderlich ist."
-#: apps/member/models.py:236
+#: apps/member/models.py:237
#: apps/member/templates/member/includes/club_info.html:26
msgid "membership duration"
msgstr "Mitgliedscahftzeit"
-#: apps/member/models.py:237
+#: apps/member/models.py:238
msgid "The longest time (in days) a membership can last (NULL = infinite)."
msgstr "Wie lang am höchsten eine Mitgliedschaft dauern kann."
-#: apps/member/models.py:244
+#: apps/member/models.py:245
#: apps/member/templates/member/includes/club_info.html:16
msgid "membership start"
msgstr "Mitgliedschaftanfangsdatum"
-#: apps/member/models.py:245
+#: apps/member/models.py:246
msgid "Date from which the members can renew their membership."
msgstr "Ab wann kann man sein Mitgliedschaft erneuern."
-#: apps/member/models.py:251
+#: apps/member/models.py:252
#: apps/member/templates/member/includes/club_info.html:21
msgid "membership end"
msgstr "Mitgliedschaftenddatum"
-#: apps/member/models.py:252
+#: apps/member/models.py:253
msgid "Maximal date of a membership, after which members must renew it."
msgstr ""
"Maximales Datum einer Mitgliedschaft, nach dem Mitglieder es erneuern müssen."
-#: apps/member/models.py:284 apps/member/models.py:309
-#: apps/note/models/notes.py:179
+#: apps/member/models.py:285 apps/member/models.py:310
+#: apps/note/models/notes.py:185
msgid "club"
msgstr "Club"
-#: apps/member/models.py:285
+#: apps/member/models.py:286
msgid "clubs"
msgstr "Clubs"
-#: apps/member/models.py:319
+#: apps/member/models.py:320
msgid "membership starts on"
msgstr "Mitgliedschaft fängt an"
-#: apps/member/models.py:323
+#: apps/member/models.py:324
msgid "membership ends on"
msgstr "Mitgliedschaft endet am"
-#: apps/member/models.py:374
+#: apps/member/models.py:419
#, python-brace-format
msgid "The role {role} does not apply to the club {club}."
msgstr "Die Rolle {role} ist nicht erlaubt für das Club {club}."
-#: apps/member/models.py:385 apps/member/views.py:676
+#: apps/member/models.py:428 apps/member/views.py:628
msgid "User is already a member of the club"
msgstr "User ist schon ein Mitglied dieser club"
-#: apps/member/models.py:433
+#: apps/member/models.py:440
msgid "User is not a member of the parent club"
msgstr "User ist noch nicht Mitglied des Urclubs"
-#: apps/member/models.py:486
+#: apps/member/models.py:488
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr "Mitgliedschaft von {user} für das Club {club}"
-#: apps/member/models.py:489
+#: apps/member/models.py:491 apps/note/models/transactions.py:353
msgid "membership"
msgstr "Mitgliedschaft"
-#: apps/member/models.py:490
+#: apps/member/models.py:492
msgid "memberships"
msgstr "Mitgliedschaften"
@@ -842,7 +865,7 @@ msgid "Account #"
msgstr "Konto #"
#: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:59
+#: apps/member/templates/member/base.html:62 apps/member/views.py:57
#: apps/registration/templates/registration/future_profile_detail.html:48
#: apps/wei/templates/wei/weimembership_form.html:117
msgid "Update Profile"
@@ -886,7 +909,7 @@ msgstr ""
"zu aufschliessen."
#: apps/member/templates/member/base.html:110
-#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95
+#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:89
msgid "Close"
msgstr "Schluss"
@@ -902,8 +925,8 @@ msgstr ""
"erlaubt."
#: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:240
-#: apps/member/views.py:450
+#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:236
+#: apps/member/views.py:433
msgid "Note aliases"
msgstr "Note Aliases"
@@ -967,7 +990,7 @@ msgstr "Kontostand"
#: apps/member/templates/member/includes/club_info.html:47
#: apps/member/templates/member/includes/profile_info.html:20
-#: apps/note/models/notes.py:270 apps/wei/templates/wei/base.html:66
+#: apps/note/models/notes.py:276 apps/wei/templates/wei/base.html:66
msgid "aliases"
msgstr "Aliases"
@@ -1006,6 +1029,14 @@ msgstr "Neue"
msgid "Regenerate token"
msgstr "Token erneuern"
+#: apps/member/templates/member/picture_update.html:35
+msgid "Nevermind"
+msgstr "Vergessen"
+
+#: apps/member/templates/member/picture_update.html:36
+msgid "Crop and upload"
+msgstr "Beschneiden und hochladen"
+
#: apps/member/templates/member/profile_detail.html:11
#: apps/registration/templates/registration/future_profile_detail.html:28
#: apps/wei/templates/wei/weimembership_form.html:26
@@ -1030,47 +1061,47 @@ msgstr "Speichern"
msgid "Registrations"
msgstr "Anmeldung"
-#: apps/member/views.py:72 apps/registration/forms.py:23
+#: apps/member/views.py:70 apps/registration/forms.py:23
msgid "This address must be valid."
msgstr "Diese Adresse muss gültig sein."
-#: apps/member/views.py:138
+#: apps/member/views.py:135
msgid "Profile detail"
msgstr "Profile detail"
-#: apps/member/views.py:201
+#: apps/member/views.py:195
msgid "Search user"
msgstr "User finden"
-#: apps/member/views.py:260
+#: apps/member/views.py:256
msgid "Update note picture"
msgstr "Notebild ändern"
-#: apps/member/views.py:318
+#: apps/member/views.py:301
msgid "Manage auth token"
msgstr "Auth token bearbeiten"
-#: apps/member/views.py:346
+#: apps/member/views.py:328
msgid "Create new club"
msgstr "Neue Club"
-#: apps/member/views.py:364
+#: apps/member/views.py:347
msgid "Search club"
msgstr "Club finden"
-#: apps/member/views.py:397
+#: apps/member/views.py:380
msgid "Club detail"
msgstr "Club Details"
-#: apps/member/views.py:473
+#: apps/member/views.py:456
msgid "Update club"
msgstr "Club bearbeiten"
-#: apps/member/views.py:507
+#: apps/member/views.py:490
msgid "Add new member to the club"
msgstr "Neue Mitglieder"
-#: apps/member/views.py:667 apps/wei/views.py:922
+#: apps/member/views.py:619 apps/wei/views.py:922
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@@ -1078,44 +1109,44 @@ msgstr ""
"Diese User hat nicht genug Geld um Mitglied zu werden, und darf nich im Rot "
"sein."
-#: apps/member/views.py:680
+#: apps/member/views.py:632
msgid "The membership must start after {:%m-%d-%Y}."
msgstr "Die Mitgliedschaft muss nach {:%m-%d-Y} anfängen."
-#: apps/member/views.py:685
+#: apps/member/views.py:637
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "Die Mitgliedschaft muss vor {:%m-%d-Y} anfängen."
-#: apps/member/views.py:701 apps/member/views.py:703 apps/member/views.py:705
-#: apps/registration/views.py:292 apps/registration/views.py:294
-#: apps/registration/views.py:296 apps/wei/views.py:927 apps/wei/views.py:931
+#: apps/member/views.py:644 apps/member/views.py:646 apps/member/views.py:648
+#: apps/registration/views.py:287 apps/registration/views.py:289
+#: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931
msgid "This field is required."
msgstr "Dies ist ein Pflichtfeld."
-#: apps/member/views.py:789
+#: apps/member/views.py:783
msgid "Manage roles of an user in the club"
msgstr "Rollen in diesen Club bearbeiten"
-#: apps/member/views.py:814
+#: apps/member/views.py:808
msgid "Members of the club"
msgstr "Mitlglieder dieses Club"
-#: apps/note/admin.py:129 apps/note/models/transactions.py:106
+#: apps/note/admin.py:129 apps/note/models/transactions.py:109
msgid "source"
msgstr "Sender"
#: apps/note/admin.py:137 apps/note/admin.py:205
-#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:119
+#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:122
msgid "destination"
msgstr "Empfänger"
#: apps/note/admin.py:210 apps/note/models/transactions.py:60
-#: apps/note/models/transactions.py:137
+#: apps/note/models/transactions.py:140
msgid "amount"
msgstr "Anzahl"
-#: apps/note/api/serializers.py:178 apps/note/api/serializers.py:184
-#: apps/note/models/transactions.py:224
+#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
+#: apps/note/models/transactions.py:226
msgid ""
"The transaction can't be saved since the source note or the destination note "
"is not active."
@@ -1175,7 +1206,7 @@ msgstr "letztes mal im Rot"
msgid "display image"
msgstr "Bild"
-#: apps/note/models/notes.py:54 apps/note/models/transactions.py:129
+#: apps/note/models/notes.py:54 apps/note/models/transactions.py:132
msgid "created at"
msgstr "erschafft am"
@@ -1207,68 +1238,68 @@ msgstr "The note is blocked by the the BDE and can't be manually reactivated."
msgid "notes"
msgstr "Notes"
-#: apps/note/models/notes.py:122
+#: apps/note/models/notes.py:128
msgid "This alias is already taken."
msgstr "Dieses Alias ist schon benutzt."
-#: apps/note/models/notes.py:142
+#: apps/note/models/notes.py:148
msgid "one's note"
msgstr "Jemand Note"
-#: apps/note/models/notes.py:143
+#: apps/note/models/notes.py:149
msgid "users note"
msgstr "User Note"
-#: apps/note/models/notes.py:149
+#: apps/note/models/notes.py:155
#, python-format
msgid "%(user)s's note"
msgstr "%(user)s's note"
-#: apps/note/models/notes.py:183
+#: apps/note/models/notes.py:189
msgid "club note"
msgstr "Club Note"
-#: apps/note/models/notes.py:184
+#: apps/note/models/notes.py:190
msgid "clubs notes"
msgstr "Club Notes"
-#: apps/note/models/notes.py:190
+#: apps/note/models/notes.py:196
#, python-format
msgid "Note of %(club)s club"
msgstr "%(club)s Note"
-#: apps/note/models/notes.py:229
+#: apps/note/models/notes.py:235
msgid "special note"
msgstr "Sondernote"
-#: apps/note/models/notes.py:230
+#: apps/note/models/notes.py:236
msgid "special notes"
msgstr "Sondernoten"
-#: apps/note/models/notes.py:253
+#: apps/note/models/notes.py:259
msgid "Invalid alias"
msgstr "Unerlaublt Alias"
-#: apps/note/models/notes.py:269
+#: apps/note/models/notes.py:275
msgid "alias"
msgstr "Alias"
-#: apps/note/models/notes.py:293
+#: apps/note/models/notes.py:299
msgid "Alias is too long."
msgstr "Alias ist zu lang."
-#: apps/note/models/notes.py:296
+#: apps/note/models/notes.py:302
msgid ""
"This alias contains only complex character. Please use a more simple alias."
msgstr ""
"Dieser Alias enthält nur komplexe Zeichen. Bitte verwenden Sie einen "
"einfacheren Alias."
-#: apps/note/models/notes.py:300
+#: apps/note/models/notes.py:306
msgid "An alias with a similar name already exists: {} "
msgstr "Ein Alias mit einem ähnlichen Namen existiert bereits: {} "
-#: apps/note/models/notes.py:313
+#: apps/note/models/notes.py:319
msgid "You can't delete your main alias."
msgstr "Sie können Ihren Hauptalias nicht löschen."
@@ -1300,33 +1331,33 @@ msgstr "Transaktionsvorlage"
msgid "transaction templates"
msgstr "Transaktionsvorlagen"
-#: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125
-#: apps/note/tables.py:33 apps/note/tables.py:42
+#: apps/note/models/transactions.py:115 apps/note/models/transactions.py:128
+#: apps/note/tables.py:34 apps/note/tables.py:44
msgid "used alias"
msgstr "benutzte Aliasen"
-#: apps/note/models/transactions.py:133
+#: apps/note/models/transactions.py:136
msgid "quantity"
msgstr "Anzahl"
-#: apps/note/models/transactions.py:141
+#: apps/note/models/transactions.py:144
msgid "reason"
msgstr "Grund"
-#: apps/note/models/transactions.py:151 apps/note/tables.py:107
+#: apps/note/models/transactions.py:154 apps/note/tables.py:140
msgid "invalidity reason"
msgstr "Ungültigkeit Grund"
-#: apps/note/models/transactions.py:159
+#: apps/note/models/transactions.py:161
msgid "transaction"
msgstr "Transaktion"
-#: apps/note/models/transactions.py:160
+#: apps/note/models/transactions.py:162
#: apps/treasury/templates/treasury/sogecredit_detail.html:22
msgid "transactions"
msgstr "Transaktionen"
-#: apps/note/models/transactions.py:182
+#: apps/note/models/transactions.py:184
#, python-brace-format
msgid ""
"You can't update the {field} on a Transaction. Please invalidate it and "
@@ -1335,7 +1366,7 @@ msgstr ""
"Sie können das {field} einer Transaktion nicht aktualisieren. Bitte machen "
"Sie es ungültig und erstellen Sie eine andere."
-#: apps/note/models/transactions.py:202
+#: apps/note/models/transactions.py:204
msgid ""
"The note balances must be between - 92 233 720 368 547 758.08 € and 92 233 "
"720 368 547 758.07 €."
@@ -1343,34 +1374,34 @@ msgstr ""
"Die Notenguthaben müssen zwischen - 92 233 720 368 547 758,08 € und 92 233 "
"720 368 547 758,07 € liegen."
-#: apps/note/models/transactions.py:279
+#: apps/note/models/transactions.py:273
msgid ""
"The destination of this transaction must equal to the destination of the "
"template."
msgstr ""
"Der Empfänger dieser Transaktion muss dem Empfänger der Vorlage entsprechen."
-#: apps/note/models/transactions.py:288
+#: apps/note/models/transactions.py:282
msgid "Template"
msgstr "Vorlage"
-#: apps/note/models/transactions.py:291
+#: apps/note/models/transactions.py:285
msgid "recurrent transaction"
msgstr "wiederkehrende Transaktion"
-#: apps/note/models/transactions.py:292
+#: apps/note/models/transactions.py:286
msgid "recurrent transactions"
msgstr "wiederkehrende Transaktionen"
-#: apps/note/models/transactions.py:307
+#: apps/note/models/transactions.py:301
msgid "first_name"
msgstr "Vorname"
-#: apps/note/models/transactions.py:312
+#: apps/note/models/transactions.py:306
msgid "bank"
msgstr "Bank"
-#: apps/note/models/transactions.py:329
+#: apps/note/models/transactions.py:323
msgid ""
"A special transaction is only possible between a Note associated to a "
"payment method and a User or a Club"
@@ -1378,35 +1409,35 @@ msgstr ""
"Eine Sondertransaktion ist nur zwischen einer Note, die einer "
"Zahlungsmethode zugeordnet ist, und einem User oder einem Club möglich"
-#: apps/note/models/transactions.py:337
+#: apps/note/models/transactions.py:331
msgid "Special transaction"
msgstr "Sondertransaktion"
-#: apps/note/models/transactions.py:338
+#: apps/note/models/transactions.py:332
msgid "Special transactions"
msgstr "Sondertranskationen"
-#: apps/note/models/transactions.py:354 apps/note/models/transactions.py:359
+#: apps/note/models/transactions.py:348
msgid "membership transaction"
msgstr "Mitgliedschafttransaktion"
-#: apps/note/models/transactions.py:355 apps/treasury/models.py:273
+#: apps/note/models/transactions.py:349 apps/treasury/models.py:282
msgid "membership transactions"
msgstr "Mitgliedschaftttransaktionen"
-#: apps/note/tables.py:61
+#: apps/note/tables.py:94
msgid "Click to invalidate"
msgstr "Klicken Sie zum Ungültigmachen"
-#: apps/note/tables.py:61
+#: apps/note/tables.py:94
msgid "Click to validate"
msgstr "Klicken Sie zum gültigmachen"
-#: apps/note/tables.py:105
+#: apps/note/tables.py:138
msgid "No reason specified"
msgstr "Kein Grund gegeben"
-#: apps/note/tables.py:136 apps/note/tables.py:170 apps/treasury/tables.py:39
+#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
#: apps/treasury/templates/treasury/sogecredit_detail.html:59
#: apps/wei/tables.py:76 apps/wei/tables.py:103
@@ -1414,7 +1445,7 @@ msgstr "Kein Grund gegeben"
msgid "Delete"
msgstr "Löschen"
-#: apps/note/tables.py:164 apps/note/templates/note/conso_form.html:132
+#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
#: apps/wei/tables.py:47 apps/wei/tables.py:48
#: apps/wei/templates/wei/base.html:89
#: apps/wei/templates/wei/bus_detail.html:20
@@ -1462,7 +1493,8 @@ msgstr "Verlauf der letzten Transaktionen"
#: apps/note/templates/note/mails/negative_balance.txt:25
#: apps/note/templates/note/mails/negative_notes_report.html:46
#: apps/note/templates/note/mails/negative_notes_report.txt:13
-#: apps/note/templates/note/mails/weekly_report.html:54
+#: apps/note/templates/note/mails/weekly_report.html:51
+#: apps/note/templates/note/mails/weekly_report.txt:32
#: apps/registration/templates/registration/mails/email_validation_email.html:40
#: apps/registration/templates/registration/mails/email_validation_email.txt:16
msgid "Mail generated by the Note Kfet on the"
@@ -1487,7 +1519,7 @@ msgid "Action"
msgstr "Aktion"
#: apps/note/templates/note/transaction_form.html:112
-#: apps/treasury/forms.py:141 apps/treasury/tables.py:67
+#: apps/treasury/forms.py:135 apps/treasury/tables.py:67
#: apps/treasury/tables.py:135
#: apps/treasury/templates/treasury/remittance_form.html:23
msgid "Amount"
@@ -1562,7 +1594,7 @@ msgstr "Tatsen finden"
msgid "Update button"
msgstr "Tatse bearbeiten"
-#: apps/note/views.py:151 note_kfet/templates/base.html:62
+#: apps/note/views.py:151 note_kfet/templates/base.html:64
msgid "Consumptions"
msgstr "Verbräuche"
@@ -1671,7 +1703,7 @@ msgstr ""
"Sie haben nicht die Berechtigung, eine Instanz von model {app_label}. "
"{model_name} hinzufügen."
-#: apps/permission/signals.py:101
+#: apps/permission/signals.py:102
#, python-brace-format
msgid ""
"You don't have the permission to delete this instance of model {app_label}."
@@ -1740,7 +1772,7 @@ msgstr ""
"diesen Parametern zu erstellen. Bitte korrigieren Sie Ihre Daten und "
"versuchen Sie es erneut."
-#: apps/permission/views.py:96 note_kfet/templates/base.html:104
+#: apps/permission/views.py:96 note_kfet/templates/base.html:106
msgid "Rights"
msgstr "Rechten"
@@ -1777,23 +1809,23 @@ msgstr "BDE Mitglieder werden"
msgid "Join Kfet Club"
msgstr "Kfet Mitglieder werden"
-#: apps/registration/templates/registration/email_validation_complete.html:9
+#: apps/registration/templates/registration/email_validation_complete.html:15
msgid "Your email have successfully been validated."
msgstr "Ihre E-Mail wurde erfolgreich validiert."
-#: apps/registration/templates/registration/email_validation_complete.html:11
+#: apps/registration/templates/registration/email_validation_complete.html:19
#, python-format
msgid "You can now log in."
msgstr "Sie können sich jetz anmelden ."
-#: apps/registration/templates/registration/email_validation_complete.html:13
+#: apps/registration/templates/registration/email_validation_complete.html:23
msgid ""
"You must pay now your membership in the Kfet to complete your registration."
msgstr ""
"Sie müssen jetzt Ihre Mitgliedschaft im Kfet bezahlen, um Ihre Registrierung "
"abzuschließen."
-#: apps/registration/templates/registration/email_validation_complete.html:16
+#: apps/registration/templates/registration/email_validation_complete.html:28
msgid ""
"The link was invalid. The token may have expired. Please send us an email to "
"activate your account."
@@ -1801,24 +1833,20 @@ msgstr ""
"Der Link war ungültig. Das Token ist möglicherweise abgelaufen. Bitte senden "
"Sie uns eine E-Mail, um Ihr Konto zu aktivieren."
-#: apps/registration/templates/registration/email_validation_email_sent.html:8
+#: apps/registration/templates/registration/email_validation_email_sent.html:10
msgid "Account activation"
msgstr "Kontoaktivierung"
-#: apps/registration/templates/registration/email_validation_email_sent.html:11
+#: apps/registration/templates/registration/email_validation_email_sent.html:14
msgid ""
"An email has been sent. Please click on the link to activate your account."
msgstr ""
"Eine E-Mail wurde gesendet. Bitte klicken Sie auf den Link, um Ihr Konto zu "
"aktivieren."
-#: apps/registration/templates/registration/email_validation_email_sent.html:15
-msgid ""
-"You must also go to the Kfet to pay your membership. The WEI registration "
-"includes the BDE membership."
-msgstr ""
-"Sie müssen auch zum Kfet gehen, um Ihre Mitgliedschaft zu bezahlen. Die WEI-"
-"Registrierung beinhaltet die BDE-Mitgliedschaft."
+#: apps/registration/templates/registration/email_validation_email_sent.html:17
+msgid "You must also go to the Kfet to pay your membership."
+msgstr "Sie müssen auch zum Kfet gehen, um Ihre Mitgliedschaft zu bezahlen."
#: apps/registration/templates/registration/future_profile_detail.html:49
#: apps/wei/templates/wei/weiregistration_confirm_delete.html:11
@@ -1866,12 +1894,10 @@ msgstr ""
#: apps/registration/templates/registration/mails/email_validation_email.txt:11
msgid ""
"After that, you'll have to wait that someone validates your account before "
-"you can log in. You will need to pay your membership in the Kfet. Note that "
-"the WEI registration includes the Kfet membership."
+"you can log in. You will need to pay your membership in the Kfet."
msgstr ""
"Danach müssen Sie warten, bis jemand Ihr Konto validiert, bevor Sie sich "
-"anmelden können. Sie müssen Ihre Mitgliedschaft im Kfet bezahlen. Beachten "
-"Sie, dass die WEI-Registrierung die Kfet-Mitgliedschaft enthält."
+"anmelden können. Sie müssen Ihre Mitgliedschaft im Kfet bezahlen."
#: apps/registration/templates/registration/mails/email_validation_email.html:34
#: apps/registration/templates/registration/mails/email_validation_email.txt:13
@@ -1911,47 +1937,47 @@ msgstr "E-Mail-Validierungslink erneut senden"
msgid "Pre-registered users list"
msgstr "Vorregistrierte Userliste"
-#: apps/registration/views.py:190
+#: apps/registration/views.py:187
msgid "Unregistered users"
msgstr "Unregistrierte Users"
-#: apps/registration/views.py:203
+#: apps/registration/views.py:200
msgid "Registration detail"
msgstr "Registrierung Detailen"
-#: apps/registration/views.py:258
+#: apps/registration/views.py:256
msgid "You must join the BDE."
msgstr "Sie müssen die BDE beitreten."
#: apps/registration/views.py:280
-msgid "You must join BDE club before joining Kfet club."
-msgstr ""
-"Sie müssen dem BDE-Club beitreten, bevor Sie dem Kfet-Club beitreten können."
-
-#: apps/registration/views.py:285
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
"Der eingegebene Betrag reicht für die Mitgliedschaft nicht aus, sollte "
"mindestens {} betragen"
-#: apps/registration/views.py:360
+#: apps/registration/views.py:355
msgid "Invalidate pre-registration"
msgstr "Ungültige Vorregistrierung"
-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:92
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:94
msgid "Treasury"
msgstr "Quaestor"
-#: apps/treasury/forms.py:104
+#: apps/treasury/forms.py:24 apps/treasury/models.py:89
+#: apps/treasury/templates/treasury/invoice_form.html:22
+msgid "This invoice is locked and can no longer be edited."
+msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden."
+
+#: apps/treasury/forms.py:98
msgid "Remittance is already closed."
msgstr "Überweisung ist bereits geschlossen."
-#: apps/treasury/forms.py:109
+#: apps/treasury/forms.py:103
msgid "You can't change the type of the remittance."
msgstr "Sie können die Art der Überweisung nicht ändern."
-#: apps/treasury/forms.py:129 apps/treasury/models.py:252
+#: apps/treasury/forms.py:123 apps/treasury/models.py:258
#: apps/treasury/tables.py:97 apps/treasury/tables.py:105
#: apps/treasury/templates/treasury/invoice_list.html:16
#: apps/treasury/templates/treasury/remittance_list.html:16
@@ -1959,7 +1985,7 @@ msgstr "Sie können die Art der Überweisung nicht ändern."
msgid "Remittance"
msgstr "Überweisung"
-#: apps/treasury/forms.py:130
+#: apps/treasury/forms.py:124
msgid "No attached remittance"
msgstr "Keine beigefügte Überweisung"
@@ -1983,7 +2009,7 @@ msgstr "Beschreibung"
msgid "Address"
msgstr "Adresse"
-#: apps/treasury/models.py:60 apps/treasury/models.py:180
+#: apps/treasury/models.py:60 apps/treasury/models.py:186
msgid "Date"
msgstr "Datum"
@@ -2003,12 +2029,7 @@ msgstr "Eine Rechnung kann nicht bearbeitet werden, wenn sie gesperrt ist."
msgid "tex source"
msgstr "Tex Quelle"
-#: apps/treasury/models.py:89
-#: apps/treasury/templates/treasury/invoice_form.html:22
-msgid "This invoice is locked and can no longer be edited."
-msgstr "Diese Rechnung ist gesperrt und kann nicht mehr bearbeitet werden."
-
-#: apps/treasury/models.py:109 apps/treasury/models.py:122
+#: apps/treasury/models.py:109 apps/treasury/models.py:125
msgid "invoice"
msgstr "Rechnung"
@@ -2016,67 +2037,72 @@ msgstr "Rechnung"
msgid "invoices"
msgstr "Rechnungen"
-#: apps/treasury/models.py:127
+#: apps/treasury/models.py:113
+#, python-brace-format
+msgid "Invoice #{id}"
+msgstr "Rechnung #{id}"
+
+#: apps/treasury/models.py:130
msgid "Designation"
msgstr "Bezeichnung"
-#: apps/treasury/models.py:131
+#: apps/treasury/models.py:134
msgid "Quantity"
msgstr "Qualität"
-#: apps/treasury/models.py:135
+#: apps/treasury/models.py:138
msgid "Unit price"
msgstr "Einzelpreis"
-#: apps/treasury/models.py:151
+#: apps/treasury/models.py:154
msgid "product"
msgstr "Produkt"
-#: apps/treasury/models.py:152
+#: apps/treasury/models.py:155
msgid "products"
msgstr "Produkten"
-#: apps/treasury/models.py:169
+#: apps/treasury/models.py:175
msgid "remittance type"
msgstr "Überweisungstyp"
-#: apps/treasury/models.py:170
+#: apps/treasury/models.py:176
msgid "remittance types"
msgstr "Überweisungstypen"
-#: apps/treasury/models.py:191
+#: apps/treasury/models.py:197
msgid "Comment"
msgstr "Kommentar"
-#: apps/treasury/models.py:196
+#: apps/treasury/models.py:202
msgid "Closed"
msgstr "Geschlossen"
-#: apps/treasury/models.py:200
+#: apps/treasury/models.py:206
msgid "remittance"
msgstr "Überweisung"
-#: apps/treasury/models.py:201
+#: apps/treasury/models.py:207
msgid "remittances"
msgstr "Überweisungen"
-#: apps/treasury/models.py:233
+#: apps/treasury/models.py:239
msgid "Remittance #{:d}: {}"
msgstr "Überweisung #{:d}:{}"
-#: apps/treasury/models.py:256
+#: apps/treasury/models.py:262
msgid "special transaction proxy"
msgstr "spezielle Transaktion Proxy"
-#: apps/treasury/models.py:257
+#: apps/treasury/models.py:263
msgid "special transaction proxies"
msgstr "spezielle Transaktion Proxies"
-#: apps/treasury/models.py:279
+#: apps/treasury/models.py:288
msgid "credit transaction"
msgstr "Kredit Transaktion"
-#: apps/treasury/models.py:343
+#: apps/treasury/models.py:352
msgid ""
"This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit."
@@ -2084,15 +2110,20 @@ msgstr ""
"Dieser Benutzer hat nicht genug Geld, um die Mitgliedschaften mit seiner "
"Note zu bezahlen."
-#: apps/treasury/models.py:355
+#: apps/treasury/models.py:364
#: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale"
msgstr "Kredit von der Société générale"
-#: apps/treasury/models.py:356
+#: apps/treasury/models.py:365
msgid "Credits from the Société générale"
msgstr "Krediten von der Société générale"
+#: apps/treasury/models.py:368
+#, python-brace-format
+msgid "Soge credit for {user}"
+msgstr "Kredit von der Société générale für {user}"
+
#: apps/treasury/tables.py:20
msgid "Invoice #{:d}"
msgstr "Rechnung #{:d}"
@@ -2117,11 +2148,12 @@ msgid "Yes"
msgstr "Ja"
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:10
-#: apps/treasury/views.py:166
+#: apps/treasury/views.py:176
msgid "Delete invoice"
msgstr "Rechnung löschen"
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:15
+#: apps/treasury/views.py:180
msgid "This invoice is locked and can't be deleted."
msgstr "Eine Rechnung kann nicht gelöscht werden, wenn sie gesperrt ist."
@@ -2291,46 +2323,46 @@ msgstr ""
msgid "Create new invoice"
msgstr "Neue Rechnung"
-#: apps/treasury/views.py:89
+#: apps/treasury/views.py:94
msgid "Invoices list"
msgstr "Rechnunglist"
-#: apps/treasury/views.py:104 apps/treasury/views.py:265
-#: apps/treasury/views.py:391
+#: apps/treasury/views.py:109 apps/treasury/views.py:282
+#: apps/treasury/views.py:408
msgid "You are not able to see the treasury interface."
msgstr "Sie können die Quaestor-App nicht sehen."
-#: apps/treasury/views.py:114
+#: apps/treasury/views.py:119
msgid "Update an invoice"
msgstr "Rechnung bearbeiten"
-#: apps/treasury/views.py:226
+#: apps/treasury/views.py:243
msgid "Create a new remittance"
msgstr "Neue Überweisung"
-#: apps/treasury/views.py:253
+#: apps/treasury/views.py:270
msgid "Remittances list"
msgstr "Überweisungliste"
-#: apps/treasury/views.py:316
+#: apps/treasury/views.py:333
msgid "Update a remittance"
msgstr "Überweisung bearbeiten"
-#: apps/treasury/views.py:339
+#: apps/treasury/views.py:356
msgid "Attach a transaction to a remittance"
msgstr "Fügen Sie einer Überweisung eine Transaktion hinzu"
-#: apps/treasury/views.py:383
+#: apps/treasury/views.py:400
msgid "List of credits from the Société générale"
msgstr "Kreditliste von Société générale"
-#: apps/treasury/views.py:426
+#: apps/treasury/views.py:443
msgid "Manage credits from the Société générale"
msgstr "Krediten von der Société générale handeln"
#: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
#: apps/wei/models.py:61 apps/wei/models.py:167
-#: note_kfet/templates/base.html:98
+#: note_kfet/templates/base.html:100
msgid "WEI"
msgstr "WEI"
@@ -2934,23 +2966,46 @@ msgstr ""
msgid "Reset"
msgstr "Reset"
-#: note_kfet/templates/base.html:13
+#: note_kfet/templates/base.html:14
msgid "The ENS Paris-Saclay BDE note."
msgstr "Die BDE ENS-Paris-Saclay Note."
-#: note_kfet/templates/base.html:74
+#: note_kfet/templates/base.html:76
msgid "Users"
msgstr "Users"
-#: note_kfet/templates/base.html:80
+#: note_kfet/templates/base.html:82
msgid "Clubs"
-msgstr "CLubs"
+msgstr "Clubs"
-#: note_kfet/templates/base.html:109
+#: note_kfet/templates/base.html:111
msgid "Admin"
msgstr "Admin"
-#: note_kfet/templates/base.html:153
+#: note_kfet/templates/base.html:125
+msgid "My account"
+msgstr "Mein Konto"
+
+#: note_kfet/templates/base.html:128
+msgid "Log out"
+msgstr "Abmelden"
+
+#: note_kfet/templates/base.html:136
+#: note_kfet/templates/registration/signup.html:6
+#: note_kfet/templates/registration/signup.html:11
+#: note_kfet/templates/registration/signup.html:27
+msgid "Sign up"
+msgstr "Registrieren"
+
+#: note_kfet/templates/base.html:143
+#: note_kfet/templates/registration/login.html:6
+#: note_kfet/templates/registration/login.html:15
+#: note_kfet/templates/registration/login.html:38
+#: note_kfet/templates/registration/password_reset_complete.html:15
+msgid "Log in"
+msgstr "Anmelden"
+
+#: note_kfet/templates/base.html:155
msgid ""
"Your e-mail address is not validated. Please check your mail inbox and click "
"on the validation link."
@@ -2958,6 +3013,10 @@ msgstr ""
"Ihre E-Mail-Adresse ist nicht validiert. Bitte überprüfen Sie Ihren "
"Posteingang und klicken Sie auf den Validierungslink."
+#: note_kfet/templates/base.html:172
+msgid "Contact us"
+msgstr "Kontakt"
+
#: note_kfet/templates/base_search.html:15
msgid "Search by attribute such as name…"
msgstr "Suche nach Attributen wie Name…"
@@ -2990,13 +3049,6 @@ msgstr ""
msgid "Log in again"
msgstr "Nochmal anmelden"
-#: note_kfet/templates/registration/login.html:6
-#: note_kfet/templates/registration/login.html:15
-#: note_kfet/templates/registration/login.html:38
-#: note_kfet/templates/registration/password_reset_complete.html:15
-msgid "Log in"
-msgstr "Anmelden"
-
#: note_kfet/templates/registration/login.html:20
#, python-format
msgid ""
@@ -3088,12 +3140,6 @@ msgstr ""
msgid "Reset my password"
msgstr "Mein Passwort zurücksetzen"
-#: note_kfet/templates/registration/signup.html:6
-#: note_kfet/templates/registration/signup.html:11
-#: note_kfet/templates/registration/signup.html:27
-msgid "Sign up"
-msgstr "Registrieren"
-
#: note_kfet/templates/registration/signup.html:15
msgid ""
"If you already signed up, your registration is taken into account. The BDE "
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 96feaac7..5e6e2740 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-09-02 23:17+0200\n"
+"POT-Creation-Date: 2020-09-07 19:43+0200\n"
"PO-Revision-Date: 2020-09-02 23:18+0200\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -18,42 +18,42 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 2.3\n"
-#: apps/activity/apps.py:10 apps/activity/models.py:145
-#: apps/activity/models.py:161
+#: apps/activity/apps.py:10 apps/activity/models.py:150
+#: apps/activity/models.py:166
msgid "activity"
msgstr "activité"
-#: apps/activity/forms.py:35 apps/activity/models.py:130
+#: apps/activity/forms.py:35 apps/activity/models.py:131
msgid "The end date must be after the start date."
msgstr "La date de fin doit être après celle de début."
-#: apps/activity/forms.py:76 apps/activity/models.py:257
+#: apps/activity/forms.py:76 apps/activity/models.py:268
msgid "You can't invite someone once the activity is started."
msgstr ""
"Vous ne pouvez pas inviter quelqu'un une fois que l'activité a démarré."
-#: apps/activity/forms.py:79 apps/activity/models.py:260
+#: apps/activity/forms.py:79 apps/activity/models.py:271
msgid "This activity is not validated yet."
msgstr "Cette activité n'est pas encore validée."
-#: apps/activity/forms.py:89 apps/activity/models.py:268
+#: apps/activity/forms.py:89 apps/activity/models.py:279
msgid "This person has been already invited 5 times this year."
msgstr "Cette personne a déjà été invitée 5 fois cette année."
-#: apps/activity/forms.py:93 apps/activity/models.py:272
+#: apps/activity/forms.py:93 apps/activity/models.py:283
msgid "This person is already invited."
msgstr "Cette personne est déjà invitée."
-#: apps/activity/forms.py:97 apps/activity/models.py:276
+#: apps/activity/forms.py:97 apps/activity/models.py:287
msgid "You can't invite more than 3 people to this activity."
msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
-#: apps/activity/models.py:27 apps/activity/models.py:62
-#: apps/member/models.py:198
+#: apps/activity/models.py:28 apps/activity/models.py:63
+#: apps/member/models.py:199
#: apps/member/templates/member/includes/club_info.html:4
#: apps/member/templates/member/includes/profile_info.html:4
-#: apps/note/models/notes.py:247 apps/note/models/transactions.py:26
-#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:302
+#: apps/note/models/notes.py:253 apps/note/models/transactions.py:26
+#: apps/note/models/transactions.py:46 apps/note/models/transactions.py:296
#: apps/permission/models.py:329
#: apps/registration/templates/registration/future_profile_detail.html:16
#: apps/wei/models.py:66 apps/wei/models.py:118
@@ -62,161 +62,171 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
msgid "name"
msgstr "nom"
-#: apps/activity/models.py:32
+#: apps/activity/models.py:33
msgid "manage entries"
msgstr "gérer les entrées"
-#: apps/activity/models.py:33
+#: apps/activity/models.py:34
msgid "Enable the support of entries for this activity."
msgstr "Activer le support des entrées pour cette activité."
-#: apps/activity/models.py:38
+#: apps/activity/models.py:39
#: apps/activity/templates/activity/includes/activity_info.html:42
msgid "can invite"
msgstr "peut inviter"
-#: apps/activity/models.py:43
+#: apps/activity/models.py:44
#: apps/activity/templates/activity/includes/activity_info.html:46
msgid "guest entry fee"
msgstr "cotisation de l'entrée invité"
-#: apps/activity/models.py:48
+#: apps/activity/models.py:49
msgid "activity type"
msgstr "type d'activité"
-#: apps/activity/models.py:49
+#: apps/activity/models.py:50
msgid "activity types"
msgstr "types d'activité"
-#: apps/activity/models.py:67
+#: apps/activity/models.py:68
#: apps/activity/templates/activity/includes/activity_info.html:19
#: apps/note/models/transactions.py:81 apps/permission/models.py:110
#: apps/permission/models.py:189 apps/wei/models.py:72 apps/wei/models.py:129
msgid "description"
msgstr "description"
-#: apps/activity/models.py:71
+#: apps/activity/models.py:72
msgid "location"
msgstr "lieu"
-#: apps/activity/models.py:75
+#: apps/activity/models.py:76
msgid "Place where the activity is organized, eg. Kfet."
msgstr "Lieu où l'activité est organisée, par exemple la Kfet."
-#: apps/activity/models.py:82
+#: apps/activity/models.py:83
#: apps/activity/templates/activity/includes/activity_info.html:22
-#: apps/note/models/notes.py:223 apps/note/models/transactions.py:66
+#: apps/note/models/notes.py:229 apps/note/models/transactions.py:66
#: apps/permission/models.py:164
msgid "type"
msgstr "type"
-#: apps/activity/models.py:88 apps/logs/models.py:22 apps/member/models.py:303
-#: apps/note/models/notes.py:138 apps/treasury/models.py:267
+#: apps/activity/models.py:89 apps/logs/models.py:22 apps/member/models.py:304
+#: apps/note/models/notes.py:144 apps/treasury/models.py:276
#: apps/treasury/templates/treasury/sogecredit_detail.html:14
#: apps/wei/models.py:160 apps/wei/templates/wei/survey.html:15
msgid "user"
msgstr "utilisateur"
-#: apps/activity/models.py:95
+#: apps/activity/models.py:96
#: apps/activity/templates/activity/includes/activity_info.html:36
msgid "organizer"
msgstr "organisateur"
-#: apps/activity/models.py:96
+#: apps/activity/models.py:97
msgid "Club that organizes the activity. The entry fees will go to this club."
msgstr ""
"Le club qui organise l'activité. Les coûts d'invitation iront pour ce club."
-#: apps/activity/models.py:103
+#: apps/activity/models.py:104
#: apps/activity/templates/activity/includes/activity_info.html:39
msgid "attendees club"
msgstr "club attendu"
-#: apps/activity/models.py:104
+#: apps/activity/models.py:105
msgid "Club that is authorized to join the activity. Mostly the Kfet club."
msgstr ""
"Club qui est autorisé à rejoindre l'activité. Très souvent le club Kfet."
-#: apps/activity/models.py:108
+#: apps/activity/models.py:109
#: apps/activity/templates/activity/includes/activity_info.html:25
msgid "start date"
msgstr "date de début"
-#: apps/activity/models.py:112
+#: apps/activity/models.py:113
#: apps/activity/templates/activity/includes/activity_info.html:28
msgid "end date"
msgstr "date de fin"
-#: apps/activity/models.py:117
+#: apps/activity/models.py:118
#: apps/activity/templates/activity/includes/activity_info.html:50
-#: apps/note/models/transactions.py:146
+#: apps/note/models/transactions.py:149
msgid "valid"
msgstr "valide"
-#: apps/activity/models.py:122
+#: apps/activity/models.py:123
#: apps/activity/templates/activity/includes/activity_info.html:65
msgid "open"
msgstr "ouvrir"
-#: apps/activity/models.py:146
+#: apps/activity/models.py:151
msgid "activities"
msgstr "activités"
-#: apps/activity/models.py:166
+#: apps/activity/models.py:171
msgid "entry time"
msgstr "heure d'entrée"
-#: apps/activity/models.py:172 apps/note/apps.py:14
+#: apps/activity/models.py:177 apps/note/apps.py:14
#: apps/note/models/notes.py:78
msgid "note"
msgstr "note"
-#: apps/activity/models.py:183
+#: apps/activity/models.py:188
#: apps/activity/templates/activity/activity_entry.html:46
msgid "entry"
msgstr "entrée"
-#: apps/activity/models.py:184
+#: apps/activity/models.py:189
#: apps/activity/templates/activity/activity_entry.html:46
msgid "entries"
msgstr "entrées"
-#: apps/activity/models.py:190
+#: apps/activity/models.py:192
+#, python-brace-format
+msgid "Entry for {guest}, invited by {note} to the activity {activity}"
+msgstr "Entrée pour {guest}, invité par {note} à l'activité {activity}"
+
+#: apps/activity/models.py:194
+#, python-brace-format
+msgid "Entry for {note} to the activity {activity}"
+msgstr "Entrée de la note {note} pour l'activité « {activity} »"
+
+#: apps/activity/models.py:201
msgid "Already entered on "
msgstr "Déjà rentré le "
-#: apps/activity/models.py:190 apps/activity/tables.py:54
+#: apps/activity/models.py:201 apps/activity/tables.py:54
msgid "{:%Y-%m-%d %H:%M:%S}"
msgstr "{:%d/%m/%Y %H:%M:%S}"
-#: apps/activity/models.py:198
+#: apps/activity/models.py:209
msgid "The balance is negative."
msgstr "La note est en négatif."
-#: apps/activity/models.py:228
+#: apps/activity/models.py:239
msgid "last name"
msgstr "nom de famille"
-#: apps/activity/models.py:233
+#: apps/activity/models.py:244
#: apps/member/templates/member/includes/profile_info.html:4
#: apps/registration/templates/registration/future_profile_detail.html:16
#: apps/wei/templates/wei/weimembership_form.html:14
msgid "first name"
msgstr "prénom"
-#: apps/activity/models.py:240
+#: apps/activity/models.py:251
msgid "inviter"
msgstr "hôte"
-#: apps/activity/models.py:284
+#: apps/activity/models.py:295
msgid "guest"
msgstr "invité"
-#: apps/activity/models.py:285
+#: apps/activity/models.py:296
msgid "guests"
msgstr "invités"
-#: apps/activity/models.py:297
+#: apps/activity/models.py:308
msgid "Invitation"
msgstr "Invitation"
@@ -240,19 +250,19 @@ msgstr "Entré le "
msgid "remove"
msgstr "supprimer"
-#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:186
+#: apps/activity/tables.py:80 apps/note/forms.py:68 apps/treasury/models.py:192
msgid "Type"
msgstr "Type"
-#: apps/activity/tables.py:82 apps/member/forms.py:131
-#: apps/registration/forms.py:81 apps/treasury/forms.py:135
+#: apps/activity/tables.py:82 apps/member/forms.py:183
+#: apps/registration/forms.py:81 apps/treasury/forms.py:129
#: apps/wei/forms/registration.py:96
msgid "Last name"
msgstr "Nom de famille"
-#: apps/activity/tables.py:84 apps/member/forms.py:136
+#: apps/activity/tables.py:84 apps/member/forms.py:188
#: apps/note/templates/note/transaction_form.html:134
-#: apps/registration/forms.py:86 apps/treasury/forms.py:137
+#: apps/registration/forms.py:86 apps/treasury/forms.py:131
#: apps/wei/forms/registration.py:101
msgid "First name"
msgstr "Prénom"
@@ -270,21 +280,21 @@ msgid "Guests list"
msgstr "Liste des invités"
#: apps/activity/templates/activity/activity_entry.html:14
-#: apps/note/models/transactions.py:259
+#: apps/note/models/transactions.py:253
#: apps/note/templates/note/transaction_form.html:16
#: apps/note/templates/note/transaction_form.html:148
-#: note_kfet/templates/base.html:68
+#: note_kfet/templates/base.html:70
msgid "Transfer"
msgstr "Virement"
#: apps/activity/templates/activity/activity_entry.html:18
-#: apps/note/models/transactions.py:318
+#: apps/note/models/transactions.py:312
#: apps/note/templates/note/transaction_form.html:21
msgid "Credit"
msgstr "Crédit"
#: apps/activity/templates/activity/activity_entry.html:21
-#: apps/note/models/transactions.py:318
+#: apps/note/models/transactions.py:312
#: apps/note/templates/note/transaction_form.html:25
msgid "Debit"
msgstr "Débit"
@@ -302,7 +312,7 @@ msgstr "Retour à la page de l'activité"
#: apps/member/templates/member/add_members.html:32
#: apps/member/templates/member/club_form.html:16
#: apps/note/templates/note/transactiontemplate_form.html:18
-#: apps/treasury/forms.py:93 apps/treasury/forms.py:147
+#: apps/treasury/forms.py:87 apps/treasury/forms.py:141
#: apps/treasury/templates/treasury/invoice_form.html:74
#: apps/wei/templates/wei/bus_form.html:17
#: apps/wei/templates/wei/busteam_form.html:17
@@ -356,7 +366,7 @@ msgid "validate"
msgstr "valider"
#: apps/activity/templates/activity/includes/activity_info.html:71
-#: apps/logs/models.py:62 apps/note/tables.py:162
+#: apps/logs/models.py:64 apps/note/tables.py:195
msgid "edit"
msgstr "modifier"
@@ -364,41 +374,41 @@ msgstr "modifier"
msgid "Invite"
msgstr "Inviter"
-#: apps/activity/views.py:29
+#: apps/activity/views.py:33
msgid "Create new activity"
msgstr "Créer une nouvelle activité"
-#: apps/activity/views.py:59 note_kfet/templates/base.html:86
+#: apps/activity/views.py:63 note_kfet/templates/base.html:88
msgid "Activities"
msgstr "Activités"
-#: apps/activity/views.py:87
+#: apps/activity/views.py:91
msgid "Activity detail"
msgstr "Détails de l'activité"
-#: apps/activity/views.py:107
+#: apps/activity/views.py:111
msgid "Update activity"
msgstr "Modifier l'activité"
-#: apps/activity/views.py:134
+#: apps/activity/views.py:138
msgid "Invite guest to the activity \"{}\""
msgstr "Invitation pour l'activité « {} »"
-#: apps/activity/views.py:168
+#: apps/activity/views.py:172
msgid "You are not allowed to display the entry interface for this activity."
msgstr ""
"Vous n'êtes pas autorisé à afficher l'interface des entrées pour cette "
"activité."
-#: apps/activity/views.py:171
+#: apps/activity/views.py:175
msgid "This activity does not support activity entries."
msgstr "Cette activité ne requiert pas d'entrées."
-#: apps/activity/views.py:174
+#: apps/activity/views.py:178
msgid "This activity is closed."
msgstr "Cette activité est fermée."
-#: apps/activity/views.py:272
+#: apps/activity/views.py:274
msgid "Entry for activity \"{}\""
msgstr "Entrées pour l'activité « {} »"
@@ -422,59 +432,64 @@ msgstr "modèle"
msgid "identifier"
msgstr "identifiant"
-#: apps/logs/models.py:48
+#: apps/logs/models.py:49
msgid "previous data"
msgstr "données précédentes"
-#: apps/logs/models.py:53
+#: apps/logs/models.py:55
msgid "new data"
msgstr "ouvelles données"
-#: apps/logs/models.py:61
+#: apps/logs/models.py:63
msgid "create"
msgstr "créer"
-#: apps/logs/models.py:63 apps/note/tables.py:132 apps/note/tables.py:168
+#: apps/logs/models.py:65 apps/note/tables.py:165 apps/note/tables.py:201
#: apps/permission/models.py:127 apps/treasury/tables.py:38
#: apps/wei/tables.py:75
msgid "delete"
msgstr "supprimer"
-#: apps/logs/models.py:66
+#: apps/logs/models.py:68
msgid "action"
msgstr "action"
-#: apps/logs/models.py:74
+#: apps/logs/models.py:76
msgid "timestamp"
msgstr "date"
-#: apps/logs/models.py:78
+#: apps/logs/models.py:80
msgid "Logs cannot be destroyed."
msgstr "Les logs ne peuvent pas être détruits."
-#: apps/logs/models.py:81
+#: apps/logs/models.py:83
msgid "changelog"
msgstr "journal de modification"
-#: apps/logs/models.py:82
+#: apps/logs/models.py:84
msgid "changelogs"
msgstr "journaux de modifications"
-#: apps/member/admin.py:52 apps/member/models.py:225
+#: apps/logs/models.py:87
+#, python-brace-format
+msgid "Changelog of type \"{action}\" for model {model} at {timestamp}"
+msgstr "Changelog de type « {action} » pour le modèle {model} à {timestamp}"
+
+#: apps/member/admin.py:50 apps/member/models.py:226
#: apps/member/templates/member/includes/club_info.html:34
msgid "membership fee (paid students)"
msgstr "cotisation pour adhérer (normalien élève)"
-#: apps/member/admin.py:53 apps/member/models.py:230
+#: apps/member/admin.py:51 apps/member/models.py:231
#: apps/member/templates/member/includes/club_info.html:37
msgid "membership fee (unpaid students)"
msgstr "cotisation pour adhérer (normalien étudiant)"
-#: apps/member/admin.py:67 apps/member/models.py:314
+#: apps/member/admin.py:65 apps/member/models.py:315
msgid "roles"
msgstr "rôles"
-#: apps/member/admin.py:68 apps/member/models.py:328
+#: apps/member/admin.py:66 apps/member/models.py:329
msgid "fee"
msgstr "cotisation"
@@ -482,69 +497,77 @@ msgstr "cotisation"
msgid "member"
msgstr "adhérent"
-#: apps/member/forms.py:41
+#: apps/member/forms.py:23
+msgid "Permission mask"
+msgstr "Masque de permissions"
+
+#: apps/member/forms.py:45
msgid "Report frequency"
msgstr "Fréquence des rapports (en jours)"
-#: apps/member/forms.py:43
+#: apps/member/forms.py:47
msgid "Last report date"
msgstr "Date de dernier rapport"
-#: apps/member/forms.py:48
+#: apps/member/forms.py:52
msgid "You can't register to the note if you come from the future."
msgstr "Vous ne pouvez pas vous inscrire à la note si vous venez du futur."
-#: apps/member/forms.py:73
+#: apps/member/forms.py:77
msgid "select an image"
msgstr "choisissez une image"
-#: apps/member/forms.py:74
+#: apps/member/forms.py:78
msgid "Maximal size: 2MB"
msgstr "Taille maximale : 2 Mo"
-#: apps/member/forms.py:87 apps/member/views.py:101
-#: apps/registration/forms.py:33
+#: apps/member/forms.py:103
+msgid "This image cannot be loaded."
+msgstr "Cette image ne peut pas être chargée."
+
+#: apps/member/forms.py:139 apps/member/views.py:98
+#: apps/registration/forms.py:33 apps/registration/views.py:237
msgid "An alias with a similar name already exists."
msgstr "Un alias avec un nom similaire existe déjà."
-#: apps/member/forms.py:110 apps/registration/forms.py:61
+#: apps/member/forms.py:162 apps/registration/forms.py:61
msgid "Inscription paid by Société Générale"
msgstr "Inscription payée par la Société générale"
-#: apps/member/forms.py:112 apps/registration/forms.py:63
+#: apps/member/forms.py:164 apps/registration/forms.py:63
msgid "Check this case is the Société Générale paid the inscription."
msgstr "Cochez cette case si la Société Générale a payé l'inscription."
-#: apps/member/forms.py:117 apps/registration/forms.py:68
+#: apps/member/forms.py:169 apps/registration/forms.py:68
#: apps/wei/forms/registration.py:83
msgid "Credit type"
msgstr "Type de rechargement"
-#: apps/member/forms.py:118 apps/registration/forms.py:69
+#: apps/member/forms.py:170 apps/registration/forms.py:69
#: apps/wei/forms/registration.py:84
msgid "No credit"
msgstr "Pas de rechargement"
-#: apps/member/forms.py:120
+#: apps/member/forms.py:172
msgid "You can credit the note of the user."
msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
-#: apps/member/forms.py:124 apps/registration/forms.py:74
+#: apps/member/forms.py:176 apps/registration/forms.py:74
#: apps/wei/forms/registration.py:89
msgid "Credit amount"
msgstr "Montant à créditer"
-#: apps/member/forms.py:141 apps/note/templates/note/transaction_form.html:140
-#: apps/registration/forms.py:91 apps/treasury/forms.py:139
+#: apps/member/forms.py:193 apps/note/templates/note/transaction_form.html:140
+#: apps/registration/forms.py:91 apps/treasury/forms.py:133
#: apps/wei/forms/registration.py:106
msgid "Bank"
msgstr "Banque"
-#: apps/member/forms.py:168
+#: apps/member/forms.py:220
msgid "User"
msgstr "Utilisateur"
-#: apps/member/forms.py:182
+#: apps/member/forms.py:234
msgid "Roles"
msgstr "Rôles"
@@ -660,19 +683,19 @@ msgstr "payé"
msgid "Tells if the user receive a salary."
msgstr "Indique si l'utilisateur perçoit un salaire."
-#: apps/member/models.py:101 apps/treasury/tables.py:146
+#: apps/member/models.py:100 apps/treasury/tables.py:146
msgid "No"
msgstr "Non"
-#: apps/member/models.py:102
+#: apps/member/models.py:101
msgid "Yes (receive them in french)"
msgstr "Oui (les recevoir en français)"
-#: apps/member/models.py:103
+#: apps/member/models.py:102
msgid "Yes (receive them in english)"
msgstr "Oui (les recevoir en anglais)"
-#: apps/member/models.py:105
+#: apps/member/models.py:104
msgid ""
"Register on the mailing list to stay informed of the events of the campus (1 "
"mail/week)"
@@ -680,7 +703,7 @@ msgstr ""
"S'inscrire sur la liste de diffusion pour rester informé des événements sur "
"le campus (1 mail par semaine)"
-#: apps/member/models.py:110
+#: apps/member/models.py:109
msgid ""
"Register on the mailing list to stay informed of the sport events of the "
"campus (1 mail/week)"
@@ -688,7 +711,7 @@ msgstr ""
"S'inscrire sur la liste de diffusion pour rester informé des actualités "
"sportives sur le campus (1 mail par semaine)"
-#: apps/member/models.py:115
+#: apps/member/models.py:114
msgid ""
"Register on the mailing list to stay informed of the art events of the "
"campus (1 mail/week)"
@@ -696,31 +719,31 @@ msgstr ""
"S'inscrire sur la liste de diffusion pour rester informé des actualités "
"artistiques sur le campus (1 mail par semaine)"
-#: apps/member/models.py:119
+#: apps/member/models.py:118
msgid "report frequency (in days)"
msgstr "fréquence des rapports (en jours)"
-#: apps/member/models.py:124
+#: apps/member/models.py:123
msgid "last report date"
msgstr "date de dernier rapport"
-#: apps/member/models.py:129
+#: apps/member/models.py:128
msgid "email confirmed"
msgstr "adresse email confirmée"
-#: apps/member/models.py:134
+#: apps/member/models.py:133
msgid "registration valid"
msgstr "inscription valide"
-#: apps/member/models.py:163 apps/member/models.py:164
+#: apps/member/models.py:162 apps/member/models.py:163
msgid "user profile"
msgstr "profil utilisateur"
-#: apps/member/models.py:174
+#: apps/member/models.py:173
msgid "Activate your Note Kfet account"
msgstr "Activez votre compte Note Kfet"
-#: apps/member/models.py:203
+#: apps/member/models.py:204
#: apps/member/templates/member/includes/club_info.html:55
#: apps/member/templates/member/includes/profile_info.html:31
#: apps/registration/templates/registration/future_profile_detail.html:22
@@ -729,88 +752,88 @@ msgstr "Activez votre compte Note Kfet"
msgid "email"
msgstr "courriel"
-#: apps/member/models.py:210
+#: apps/member/models.py:211
msgid "parent club"
msgstr "club parent"
-#: apps/member/models.py:219
+#: apps/member/models.py:220
msgid "require memberships"
msgstr "nécessite des adhésions"
-#: apps/member/models.py:220
+#: apps/member/models.py:221
msgid "Uncheck if this club don't require memberships."
msgstr "Décochez si ce club n'utilise pas d'adhésions."
-#: apps/member/models.py:236
+#: apps/member/models.py:237
#: apps/member/templates/member/includes/club_info.html:26
msgid "membership duration"
msgstr "durée de l'adhésion"
-#: apps/member/models.py:237
+#: apps/member/models.py:238
msgid "The longest time (in days) a membership can last (NULL = infinite)."
msgstr "La durée maximale (en jours) d'une adhésion (NULL = infinie)."
-#: apps/member/models.py:244
+#: apps/member/models.py:245
#: apps/member/templates/member/includes/club_info.html:16
msgid "membership start"
msgstr "début de l'adhésion"
-#: apps/member/models.py:245
+#: apps/member/models.py:246
msgid "Date from which the members can renew their membership."
msgstr ""
"Date à partir de laquelle les adhérents peuvent renouveler leur adhésion."
-#: apps/member/models.py:251
+#: apps/member/models.py:252
#: apps/member/templates/member/includes/club_info.html:21
msgid "membership end"
msgstr "fin de l'adhésion"
-#: apps/member/models.py:252
+#: apps/member/models.py:253
msgid "Maximal date of a membership, after which members must renew it."
msgstr ""
"Date maximale d'une fin d'adhésion, après laquelle les adhérents doivent la "
"renouveler."
-#: apps/member/models.py:284 apps/member/models.py:309
-#: apps/note/models/notes.py:179
+#: apps/member/models.py:285 apps/member/models.py:310
+#: apps/note/models/notes.py:185
msgid "club"
msgstr "club"
-#: apps/member/models.py:285
+#: apps/member/models.py:286
msgid "clubs"
msgstr "clubs"
-#: apps/member/models.py:319
+#: apps/member/models.py:320
msgid "membership starts on"
msgstr "l'adhésion commence le"
-#: apps/member/models.py:323
+#: apps/member/models.py:324
msgid "membership ends on"
msgstr "l'adhésion finit le"
-#: apps/member/models.py:374
+#: apps/member/models.py:419
#, python-brace-format
msgid "The role {role} does not apply to the club {club}."
msgstr "Le rôle {role} ne s'applique pas au club {club}."
-#: apps/member/models.py:385 apps/member/views.py:676
+#: apps/member/models.py:428 apps/member/views.py:628
msgid "User is already a member of the club"
msgstr "L'utilisateur est déjà membre du club"
-#: apps/member/models.py:433
+#: apps/member/models.py:440
msgid "User is not a member of the parent club"
msgstr "L'utilisateur n'est pas membre du club parent"
-#: apps/member/models.py:486
+#: apps/member/models.py:488
#, python-brace-format
msgid "Membership of {user} for the club {club}"
msgstr "Adhésion de {user} pour le club {club}"
-#: apps/member/models.py:489
+#: apps/member/models.py:491 apps/note/models/transactions.py:353
msgid "membership"
msgstr "adhésion"
-#: apps/member/models.py:490
+#: apps/member/models.py:492
msgid "memberships"
msgstr "adhésions"
@@ -844,7 +867,7 @@ msgid "Account #"
msgstr "Compte n°"
#: apps/member/templates/member/base.html:48
-#: apps/member/templates/member/base.html:62 apps/member/views.py:59
+#: apps/member/templates/member/base.html:62 apps/member/views.py:57
#: apps/registration/templates/registration/future_profile_detail.html:48
#: apps/wei/templates/wei/weimembership_form.html:117
msgid "Update Profile"
@@ -888,7 +911,7 @@ msgstr ""
"déverrouiller lui-même."
#: apps/member/templates/member/base.html:110
-#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:95
+#: apps/member/templates/member/base.html:137 apps/treasury/forms.py:89
msgid "Close"
msgstr "Fermer"
@@ -904,8 +927,8 @@ msgstr ""
"à nouveau possible."
#: apps/member/templates/member/club_alias.html:10
-#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:240
-#: apps/member/views.py:450
+#: apps/member/templates/member/profile_alias.html:10 apps/member/views.py:236
+#: apps/member/views.py:433
msgid "Note aliases"
msgstr "Alias de la note"
@@ -969,7 +992,7 @@ msgstr "solde du compte"
#: apps/member/templates/member/includes/club_info.html:47
#: apps/member/templates/member/includes/profile_info.html:20
-#: apps/note/models/notes.py:270 apps/wei/templates/wei/base.html:66
+#: apps/note/models/notes.py:276 apps/wei/templates/wei/base.html:66
msgid "aliases"
msgstr "alias"
@@ -1008,6 +1031,14 @@ msgstr "Créé le"
msgid "Regenerate token"
msgstr "Regénérer le jeton"
+#: apps/member/templates/member/picture_update.html:35
+msgid "Nevermind"
+msgstr "Annuler"
+
+#: apps/member/templates/member/picture_update.html:36
+msgid "Crop and upload"
+msgstr "Recadrer et envoyer"
+
#: apps/member/templates/member/profile_detail.html:11
#: apps/registration/templates/registration/future_profile_detail.html:28
#: apps/wei/templates/wei/weimembership_form.html:26
@@ -1032,47 +1063,47 @@ msgstr "Sauvegarder les changements"
msgid "Registrations"
msgstr "Inscriptions"
-#: apps/member/views.py:72 apps/registration/forms.py:23
+#: apps/member/views.py:70 apps/registration/forms.py:23
msgid "This address must be valid."
msgstr "Cette adresse doit être valide."
-#: apps/member/views.py:138
+#: apps/member/views.py:135
msgid "Profile detail"
msgstr "Détails de l'utilisateur"
-#: apps/member/views.py:201
+#: apps/member/views.py:195
msgid "Search user"
msgstr "Chercher un utilisateur"
-#: apps/member/views.py:260
+#: apps/member/views.py:256
msgid "Update note picture"
msgstr "Modifier la photo de la note"
-#: apps/member/views.py:318
+#: apps/member/views.py:301
msgid "Manage auth token"
msgstr "Gérer les jetons d'authentification"
-#: apps/member/views.py:346
+#: apps/member/views.py:328
msgid "Create new club"
msgstr "Créer un nouveau club"
-#: apps/member/views.py:364
+#: apps/member/views.py:347
msgid "Search club"
msgstr "Chercher un club"
-#: apps/member/views.py:397
+#: apps/member/views.py:380
msgid "Club detail"
msgstr "Détails du club"
-#: apps/member/views.py:473
+#: apps/member/views.py:456
msgid "Update club"
msgstr "Modifier le club"
-#: apps/member/views.py:507
+#: apps/member/views.py:490
msgid "Add new member to the club"
msgstr "Ajouter un nouveau membre au club"
-#: apps/member/views.py:667 apps/wei/views.py:922
+#: apps/member/views.py:619 apps/wei/views.py:922
msgid ""
"This user don't have enough money to join this club, and can't have a "
"negative balance."
@@ -1080,44 +1111,44 @@ msgstr ""
"Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
"avoir un solde négatif."
-#: apps/member/views.py:680
+#: apps/member/views.py:632
msgid "The membership must start after {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
-#: apps/member/views.py:685
+#: apps/member/views.py:637
msgid "The membership must begin before {:%m-%d-%Y}."
msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
-#: apps/member/views.py:701 apps/member/views.py:703 apps/member/views.py:705
-#: apps/registration/views.py:292 apps/registration/views.py:294
-#: apps/registration/views.py:296 apps/wei/views.py:927 apps/wei/views.py:931
+#: apps/member/views.py:644 apps/member/views.py:646 apps/member/views.py:648
+#: apps/registration/views.py:287 apps/registration/views.py:289
+#: apps/registration/views.py:291 apps/wei/views.py:927 apps/wei/views.py:931
msgid "This field is required."
msgstr "Ce champ est requis."
-#: apps/member/views.py:789
+#: apps/member/views.py:783
msgid "Manage roles of an user in the club"
msgstr "Gérer les rôles d'un utilisateur dans le club"
-#: apps/member/views.py:814
+#: apps/member/views.py:808
msgid "Members of the club"
msgstr "Membres du club"
-#: apps/note/admin.py:129 apps/note/models/transactions.py:106
+#: apps/note/admin.py:129 apps/note/models/transactions.py:109
msgid "source"
msgstr "source"
#: apps/note/admin.py:137 apps/note/admin.py:205
-#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:119
+#: apps/note/models/transactions.py:56 apps/note/models/transactions.py:122
msgid "destination"
msgstr "destination"
#: apps/note/admin.py:210 apps/note/models/transactions.py:60
-#: apps/note/models/transactions.py:137
+#: apps/note/models/transactions.py:140
msgid "amount"
msgstr "montant"
-#: apps/note/api/serializers.py:178 apps/note/api/serializers.py:184
-#: apps/note/models/transactions.py:224
+#: apps/note/api/serializers.py:183 apps/note/api/serializers.py:189
+#: apps/note/models/transactions.py:226
msgid ""
"The transaction can't be saved since the source note or the destination note "
"is not active."
@@ -1177,7 +1208,7 @@ msgstr "dernier instant où la note était en négatif"
msgid "display image"
msgstr "image affichée"
-#: apps/note/models/notes.py:54 apps/note/models/transactions.py:129
+#: apps/note/models/notes.py:54 apps/note/models/transactions.py:132
msgid "created at"
msgstr "créée le"
@@ -1210,68 +1241,68 @@ msgstr ""
msgid "notes"
msgstr "notes"
-#: apps/note/models/notes.py:122
+#: apps/note/models/notes.py:128
msgid "This alias is already taken."
msgstr "Cet alias est déjà pris."
-#: apps/note/models/notes.py:142
+#: apps/note/models/notes.py:148
msgid "one's note"
msgstr "note d'un utilisateur"
-#: apps/note/models/notes.py:143
+#: apps/note/models/notes.py:149
msgid "users note"
msgstr "notes des utilisateurs"
-#: apps/note/models/notes.py:149
+#: apps/note/models/notes.py:155
#, python-format
msgid "%(user)s's note"
msgstr "Note de %(user)s"
-#: apps/note/models/notes.py:183
+#: apps/note/models/notes.py:189
msgid "club note"
msgstr "note d'un club"
-#: apps/note/models/notes.py:184
+#: apps/note/models/notes.py:190
msgid "clubs notes"
msgstr "notes des clubs"
-#: apps/note/models/notes.py:190
+#: apps/note/models/notes.py:196
#, python-format
msgid "Note of %(club)s club"
msgstr "Note du club %(club)s"
-#: apps/note/models/notes.py:229
+#: apps/note/models/notes.py:235
msgid "special note"
msgstr "note spéciale"
-#: apps/note/models/notes.py:230
+#: apps/note/models/notes.py:236
msgid "special notes"
msgstr "notes spéciales"
-#: apps/note/models/notes.py:253
+#: apps/note/models/notes.py:259
msgid "Invalid alias"
msgstr "Alias invalide"
-#: apps/note/models/notes.py:269
+#: apps/note/models/notes.py:275
msgid "alias"
msgstr "alias"
-#: apps/note/models/notes.py:293
+#: apps/note/models/notes.py:299
msgid "Alias is too long."
msgstr "L'alias est trop long."
-#: apps/note/models/notes.py:296
+#: apps/note/models/notes.py:302
msgid ""
"This alias contains only complex character. Please use a more simple alias."
msgstr ""
"Cet alias ne contient que des caractères complexes. Merci d'utiliser un "
"alias plus simple."
-#: apps/note/models/notes.py:300
+#: apps/note/models/notes.py:306
msgid "An alias with a similar name already exists: {} "
msgstr "Un alias avec un nom similaire existe déjà : {} "
-#: apps/note/models/notes.py:313
+#: apps/note/models/notes.py:319
msgid "You can't delete your main alias."
msgstr "Vous ne pouvez pas supprimer votre alias principal."
@@ -1303,33 +1334,33 @@ msgstr "modèle de transaction"
msgid "transaction templates"
msgstr "modèles de transaction"
-#: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125
-#: apps/note/tables.py:33 apps/note/tables.py:42
+#: apps/note/models/transactions.py:115 apps/note/models/transactions.py:128
+#: apps/note/tables.py:34 apps/note/tables.py:44
msgid "used alias"
msgstr "alias utilisé"
-#: apps/note/models/transactions.py:133
+#: apps/note/models/transactions.py:136
msgid "quantity"
msgstr "quantité"
-#: apps/note/models/transactions.py:141
+#: apps/note/models/transactions.py:144
msgid "reason"
msgstr "raison"
-#: apps/note/models/transactions.py:151 apps/note/tables.py:107
+#: apps/note/models/transactions.py:154 apps/note/tables.py:140
msgid "invalidity reason"
msgstr "motif d'invalidité"
-#: apps/note/models/transactions.py:159
+#: apps/note/models/transactions.py:161
msgid "transaction"
msgstr "transaction"
-#: apps/note/models/transactions.py:160
+#: apps/note/models/transactions.py:162
#: apps/treasury/templates/treasury/sogecredit_detail.html:22
msgid "transactions"
msgstr "transactions"
-#: apps/note/models/transactions.py:182
+#: apps/note/models/transactions.py:184
#, python-brace-format
msgid ""
"You can't update the {field} on a Transaction. Please invalidate it and "
@@ -1338,7 +1369,7 @@ msgstr ""
"Vous ne pouvez pas mettre à jour le champ {field} dans une transaction. "
"Merci de l'invalider et d'en créer une autre."
-#: apps/note/models/transactions.py:202
+#: apps/note/models/transactions.py:204
msgid ""
"The note balances must be between - 92 233 720 368 547 758.08 € and 92 233 "
"720 368 547 758.07 €."
@@ -1347,7 +1378,7 @@ msgstr ""
"€ et 92 233 720 368 547 758.07 €. Ne cherchez pas à capitaliser l'argent du "
"BDE."
-#: apps/note/models/transactions.py:279
+#: apps/note/models/transactions.py:273
msgid ""
"The destination of this transaction must equal to the destination of the "
"template."
@@ -1355,27 +1386,27 @@ msgstr ""
"Le destinataire de cette transaction doit être identique à celui du bouton "
"utilisé."
-#: apps/note/models/transactions.py:288
+#: apps/note/models/transactions.py:282
msgid "Template"
msgstr "Bouton"
-#: apps/note/models/transactions.py:291
+#: apps/note/models/transactions.py:285
msgid "recurrent transaction"
msgstr "transaction issue de bouton"
-#: apps/note/models/transactions.py:292
+#: apps/note/models/transactions.py:286
msgid "recurrent transactions"
msgstr "transactions issues de boutons"
-#: apps/note/models/transactions.py:307
+#: apps/note/models/transactions.py:301
msgid "first_name"
msgstr "prénom"
-#: apps/note/models/transactions.py:312
+#: apps/note/models/transactions.py:306
msgid "bank"
msgstr "banque"
-#: apps/note/models/transactions.py:329
+#: apps/note/models/transactions.py:323
msgid ""
"A special transaction is only possible between a Note associated to a "
"payment method and a User or a Club"
@@ -1383,35 +1414,35 @@ msgstr ""
"Une transaction spéciale n'est possible que entre une note associée à un "
"mode de paiement et un utilisateur ou un club"
-#: apps/note/models/transactions.py:337
+#: apps/note/models/transactions.py:331
msgid "Special transaction"
msgstr "Transaction de crédit/retrait"
-#: apps/note/models/transactions.py:338
+#: apps/note/models/transactions.py:332
msgid "Special transactions"
msgstr "Transactions de crédit/retrait"
-#: apps/note/models/transactions.py:354 apps/note/models/transactions.py:359
+#: apps/note/models/transactions.py:348
msgid "membership transaction"
msgstr "transaction d'adhésion"
-#: apps/note/models/transactions.py:355 apps/treasury/models.py:273
+#: apps/note/models/transactions.py:349 apps/treasury/models.py:282
msgid "membership transactions"
msgstr "transactions d'adhésion"
-#: apps/note/tables.py:61
+#: apps/note/tables.py:94
msgid "Click to invalidate"
msgstr "Cliquez pour dévalider"
-#: apps/note/tables.py:61
+#: apps/note/tables.py:94
msgid "Click to validate"
msgstr "Cliquez pour valider"
-#: apps/note/tables.py:105
+#: apps/note/tables.py:138
msgid "No reason specified"
msgstr "Pas de motif spécifié"
-#: apps/note/tables.py:136 apps/note/tables.py:170 apps/treasury/tables.py:39
+#: apps/note/tables.py:169 apps/note/tables.py:203 apps/treasury/tables.py:39
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:30
#: apps/treasury/templates/treasury/sogecredit_detail.html:59
#: apps/wei/tables.py:76 apps/wei/tables.py:103
@@ -1419,7 +1450,7 @@ msgstr "Pas de motif spécifié"
msgid "Delete"
msgstr "Supprimer"
-#: apps/note/tables.py:164 apps/note/templates/note/conso_form.html:132
+#: apps/note/tables.py:197 apps/note/templates/note/conso_form.html:132
#: apps/wei/tables.py:47 apps/wei/tables.py:48
#: apps/wei/templates/wei/base.html:89
#: apps/wei/templates/wei/bus_detail.html:20
@@ -1467,7 +1498,8 @@ msgstr "Historique des transactions récentes"
#: apps/note/templates/note/mails/negative_balance.txt:25
#: apps/note/templates/note/mails/negative_notes_report.html:46
#: apps/note/templates/note/mails/negative_notes_report.txt:13
-#: apps/note/templates/note/mails/weekly_report.html:54
+#: apps/note/templates/note/mails/weekly_report.html:51
+#: apps/note/templates/note/mails/weekly_report.txt:32
#: apps/registration/templates/registration/mails/email_validation_email.html:40
#: apps/registration/templates/registration/mails/email_validation_email.txt:16
msgid "Mail generated by the Note Kfet on the"
@@ -1492,7 +1524,7 @@ msgid "Action"
msgstr "Action"
#: apps/note/templates/note/transaction_form.html:112
-#: apps/treasury/forms.py:141 apps/treasury/tables.py:67
+#: apps/treasury/forms.py:135 apps/treasury/tables.py:67
#: apps/treasury/tables.py:135
#: apps/treasury/templates/treasury/remittance_form.html:23
msgid "Amount"
@@ -1567,7 +1599,7 @@ msgstr "Chercher un bouton"
msgid "Update button"
msgstr "Modifier le bouton"
-#: apps/note/views.py:151 note_kfet/templates/base.html:62
+#: apps/note/views.py:151 note_kfet/templates/base.html:64
msgid "Consumptions"
msgstr "Consommations"
@@ -1678,7 +1710,7 @@ msgstr ""
"Vous n'avez pas la permission d'ajouter une instance du modèle {app_label}."
"{model_name}."
-#: apps/permission/signals.py:101
+#: apps/permission/signals.py:102
#, python-brace-format
msgid ""
"You don't have the permission to delete this instance of model {app_label}."
@@ -1746,7 +1778,7 @@ msgstr ""
"Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » "
"avec ces paramètres. Merci de les corriger et de réessayer."
-#: apps/permission/views.py:96 note_kfet/templates/base.html:104
+#: apps/permission/views.py:96 note_kfet/templates/base.html:106
msgid "Rights"
msgstr "Droits"
@@ -1783,23 +1815,23 @@ msgstr "Adhérer au club BDE"
msgid "Join Kfet Club"
msgstr "Adhérer au club Kfet"
-#: apps/registration/templates/registration/email_validation_complete.html:9
+#: apps/registration/templates/registration/email_validation_complete.html:15
msgid "Your email have successfully been validated."
msgstr "Votre adresse e-mail a bien été validée."
-#: apps/registration/templates/registration/email_validation_complete.html:11
+#: apps/registration/templates/registration/email_validation_complete.html:19
#, python-format
msgid "You can now log in."
msgstr "Vous pouvez désormais vous connecter."
-#: apps/registration/templates/registration/email_validation_complete.html:13
+#: apps/registration/templates/registration/email_validation_complete.html:23
msgid ""
"You must pay now your membership in the Kfet to complete your registration."
msgstr ""
"Vous devez désormais payer votre adhésion à la Kfet pour compléter votre "
"inscription."
-#: apps/registration/templates/registration/email_validation_complete.html:16
+#: apps/registration/templates/registration/email_validation_complete.html:28
msgid ""
"The link was invalid. The token may have expired. Please send us an email to "
"activate your account."
@@ -1807,24 +1839,20 @@ msgstr ""
"Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter "
"pour activer votre compte."
-#: apps/registration/templates/registration/email_validation_email_sent.html:8
+#: apps/registration/templates/registration/email_validation_email_sent.html:10
msgid "Account activation"
msgstr "Activation du compte"
-#: apps/registration/templates/registration/email_validation_email_sent.html:11
+#: apps/registration/templates/registration/email_validation_email_sent.html:14
msgid ""
"An email has been sent. Please click on the link to activate your account."
msgstr ""
"Un email vient de vous être envoyé. Merci de cliquer sur le lien de "
"validation pour activer votre compte."
-#: apps/registration/templates/registration/email_validation_email_sent.html:15
-msgid ""
-"You must also go to the Kfet to pay your membership. The WEI registration "
-"includes the BDE membership."
-msgstr ""
-"Vous devrez également vous rendre à la Kfet pour payer votre adhésion. "
-"L'inscription au WEI inclut l'adhésion au BDE."
+#: apps/registration/templates/registration/email_validation_email_sent.html:17
+msgid "You must also go to the Kfet to pay your membership."
+msgstr "Vous devrez également vous rendre à la Kfet pour payer votre adhésion."
#: apps/registration/templates/registration/future_profile_detail.html:49
#: apps/wei/templates/wei/weiregistration_confirm_delete.html:11
@@ -1870,12 +1898,10 @@ msgstr "Ce lien n'est valide que pendant quelques jours."
#: apps/registration/templates/registration/mails/email_validation_email.txt:11
msgid ""
"After that, you'll have to wait that someone validates your account before "
-"you can log in. You will need to pay your membership in the Kfet. Note that "
-"the WEI registration includes the Kfet membership."
+"you can log in. You will need to pay your membership in the Kfet."
msgstr ""
"Après cela, vous devrez attendre que quelqu'un valide votre compte avant de "
-"pouvoir vous connecter. Vous devrez payer votre adhésion à la Kfet. Notez "
-"que l'adhésion Kfet est incluse dans l'inscription au WEI."
+"pouvoir vous connecter. Vous devrez payer votre adhésion à la Kfet."
#: apps/registration/templates/registration/mails/email_validation_email.html:34
#: apps/registration/templates/registration/mails/email_validation_email.txt:13
@@ -1915,46 +1941,47 @@ msgstr "Renvoyer le lien de validation"
msgid "Pre-registered users list"
msgstr "Liste des utilisateurs en attente d'inscription"
-#: apps/registration/views.py:190
+#: apps/registration/views.py:187
msgid "Unregistered users"
msgstr "Utilisateurs en attente d'inscription"
-#: apps/registration/views.py:203
+#: apps/registration/views.py:200
msgid "Registration detail"
msgstr "Détails de l'inscription"
-#: apps/registration/views.py:258
+#: apps/registration/views.py:256
msgid "You must join the BDE."
msgstr "Vous devez adhérer au BDE."
#: apps/registration/views.py:280
-msgid "You must join BDE club before joining Kfet club."
-msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet."
-
-#: apps/registration/views.py:285
msgid ""
"The entered amount is not enough for the memberships, should be at least {}"
msgstr ""
"Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
"{}"
-#: apps/registration/views.py:360
+#: apps/registration/views.py:355
msgid "Invalidate pre-registration"
msgstr "Invalider l'inscription"
-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:92
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:94
msgid "Treasury"
msgstr "Trésorerie"
-#: apps/treasury/forms.py:104
+#: apps/treasury/forms.py:24 apps/treasury/models.py:89
+#: apps/treasury/templates/treasury/invoice_form.html:22
+msgid "This invoice is locked and can no longer be edited."
+msgstr "Cette facture est verrouillée et ne peut plus être éditée."
+
+#: apps/treasury/forms.py:98
msgid "Remittance is already closed."
msgstr "La remise est déjà fermée."
-#: apps/treasury/forms.py:109
+#: apps/treasury/forms.py:103
msgid "You can't change the type of the remittance."
msgstr "Vous ne pouvez pas changer le type de la remise."
-#: apps/treasury/forms.py:129 apps/treasury/models.py:252
+#: apps/treasury/forms.py:123 apps/treasury/models.py:258
#: apps/treasury/tables.py:97 apps/treasury/tables.py:105
#: apps/treasury/templates/treasury/invoice_list.html:16
#: apps/treasury/templates/treasury/remittance_list.html:16
@@ -1962,7 +1989,7 @@ msgstr "Vous ne pouvez pas changer le type de la remise."
msgid "Remittance"
msgstr "Remise"
-#: apps/treasury/forms.py:130
+#: apps/treasury/forms.py:124
msgid "No attached remittance"
msgstr "Pas de remise associée"
@@ -1986,7 +2013,7 @@ msgstr "Description"
msgid "Address"
msgstr "Adresse"
-#: apps/treasury/models.py:60 apps/treasury/models.py:180
+#: apps/treasury/models.py:60 apps/treasury/models.py:186
msgid "Date"
msgstr "Date"
@@ -2006,12 +2033,7 @@ msgstr "Une facture ne peut plus être modifiée si elle est verrouillée."
msgid "tex source"
msgstr "fichier TeX source"
-#: apps/treasury/models.py:89
-#: apps/treasury/templates/treasury/invoice_form.html:22
-msgid "This invoice is locked and can no longer be edited."
-msgstr "Cette facture est verrouillée et ne peut plus être éditée."
-
-#: apps/treasury/models.py:109 apps/treasury/models.py:122
+#: apps/treasury/models.py:109 apps/treasury/models.py:125
msgid "invoice"
msgstr "facture"
@@ -2019,67 +2041,72 @@ msgstr "facture"
msgid "invoices"
msgstr "factures"
-#: apps/treasury/models.py:127
+#: apps/treasury/models.py:113
+#, python-brace-format
+msgid "Invoice #{id}"
+msgstr "Facture n°{id}"
+
+#: apps/treasury/models.py:130
msgid "Designation"
msgstr "Désignation"
-#: apps/treasury/models.py:131
+#: apps/treasury/models.py:134
msgid "Quantity"
msgstr "Quantité"
-#: apps/treasury/models.py:135
+#: apps/treasury/models.py:138
msgid "Unit price"
msgstr "Prix unitaire"
-#: apps/treasury/models.py:151
+#: apps/treasury/models.py:154
msgid "product"
msgstr "produit"
-#: apps/treasury/models.py:152
+#: apps/treasury/models.py:155
msgid "products"
msgstr "produits"
-#: apps/treasury/models.py:169
+#: apps/treasury/models.py:175
msgid "remittance type"
msgstr "type de remise"
-#: apps/treasury/models.py:170
+#: apps/treasury/models.py:176
msgid "remittance types"
msgstr "types de remises"
-#: apps/treasury/models.py:191
+#: apps/treasury/models.py:197
msgid "Comment"
msgstr "Commentaire"
-#: apps/treasury/models.py:196
+#: apps/treasury/models.py:202
msgid "Closed"
msgstr "Fermée"
-#: apps/treasury/models.py:200
+#: apps/treasury/models.py:206
msgid "remittance"
msgstr "remise"
-#: apps/treasury/models.py:201
+#: apps/treasury/models.py:207
msgid "remittances"
msgstr "remises"
-#: apps/treasury/models.py:233
+#: apps/treasury/models.py:239
msgid "Remittance #{:d}: {}"
msgstr "Remise n°{:d} : {}"
-#: apps/treasury/models.py:256
+#: apps/treasury/models.py:262
msgid "special transaction proxy"
msgstr "proxy de transaction spéciale"
-#: apps/treasury/models.py:257
+#: apps/treasury/models.py:263
msgid "special transaction proxies"
msgstr "proxys de transactions spéciales"
-#: apps/treasury/models.py:279
+#: apps/treasury/models.py:288
msgid "credit transaction"
msgstr "transaction de crédit"
-#: apps/treasury/models.py:343
+#: apps/treasury/models.py:352
msgid ""
"This user doesn't have enough money to pay the memberships with its note. "
"Please ask her/him to credit the note before invalidating this credit."
@@ -2087,15 +2114,20 @@ msgstr ""
"Cet utilisateur n'a pas assez d'argent pour payer les adhésions avec sa "
"note. Merci de lui demander de recharger sa note avant d'invalider ce crédit."
-#: apps/treasury/models.py:355
+#: apps/treasury/models.py:364
#: apps/treasury/templates/treasury/sogecredit_detail.html:10
msgid "Credit from the Société générale"
msgstr "Crédit de la Société générale"
-#: apps/treasury/models.py:356
+#: apps/treasury/models.py:365
msgid "Credits from the Société générale"
msgstr "Crédits de la Société générale"
+#: apps/treasury/models.py:368
+#, python-brace-format
+msgid "Soge credit for {user}"
+msgstr "Crédit de la société générale pour l'utilisateur {user}"
+
#: apps/treasury/tables.py:20
msgid "Invoice #{:d}"
msgstr "Facture n°{:d}"
@@ -2120,11 +2152,12 @@ msgid "Yes"
msgstr "Oui"
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:10
-#: apps/treasury/views.py:166
+#: apps/treasury/views.py:176
msgid "Delete invoice"
msgstr "Supprimer la facture"
#: apps/treasury/templates/treasury/invoice_confirm_delete.html:15
+#: apps/treasury/views.py:180
msgid "This invoice is locked and can't be deleted."
msgstr "Cette facture est verrouillée et ne peut pas être supprimée."
@@ -2292,46 +2325,46 @@ msgstr ""
msgid "Create new invoice"
msgstr "Créer une nouvelle facture"
-#: apps/treasury/views.py:89
+#: apps/treasury/views.py:94
msgid "Invoices list"
msgstr "Liste des factures"
-#: apps/treasury/views.py:104 apps/treasury/views.py:265
-#: apps/treasury/views.py:391
+#: apps/treasury/views.py:109 apps/treasury/views.py:282
+#: apps/treasury/views.py:408
msgid "You are not able to see the treasury interface."
msgstr "Vous n'êtes pas autorisé à voir l'interface de trésorerie."
-#: apps/treasury/views.py:114
+#: apps/treasury/views.py:119
msgid "Update an invoice"
msgstr "Modifier la facture"
-#: apps/treasury/views.py:226
+#: apps/treasury/views.py:243
msgid "Create a new remittance"
msgstr "Créer une nouvelle remise"
-#: apps/treasury/views.py:253
+#: apps/treasury/views.py:270
msgid "Remittances list"
msgstr "Liste des remises"
-#: apps/treasury/views.py:316
+#: apps/treasury/views.py:333
msgid "Update a remittance"
msgstr "Modifier la remise"
-#: apps/treasury/views.py:339
+#: apps/treasury/views.py:356
msgid "Attach a transaction to a remittance"
msgstr "Joindre une transaction à une remise"
-#: apps/treasury/views.py:383
+#: apps/treasury/views.py:400
msgid "List of credits from the Société générale"
msgstr "Liste des crédits de la Société générale"
-#: apps/treasury/views.py:426
+#: apps/treasury/views.py:443
msgid "Manage credits from the Société générale"
msgstr "Gérer les crédits de la Société générale"
#: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
#: apps/wei/models.py:61 apps/wei/models.py:167
-#: note_kfet/templates/base.html:98
+#: note_kfet/templates/base.html:100
msgid "WEI"
msgstr "WEI"
@@ -2935,23 +2968,46 @@ msgstr ""
msgid "Reset"
msgstr "Réinitialiser"
-#: note_kfet/templates/base.html:13
+#: note_kfet/templates/base.html:14
msgid "The ENS Paris-Saclay BDE note."
msgstr "La note du BDE de l'ENS Paris-Saclay."
-#: note_kfet/templates/base.html:74
+#: note_kfet/templates/base.html:76
msgid "Users"
msgstr "Utilisateurs"
-#: note_kfet/templates/base.html:80
+#: note_kfet/templates/base.html:82
msgid "Clubs"
msgstr "Clubs"
-#: note_kfet/templates/base.html:109
+#: note_kfet/templates/base.html:111
msgid "Admin"
msgstr "Admin"
-#: note_kfet/templates/base.html:153
+#: note_kfet/templates/base.html:125
+msgid "My account"
+msgstr "Mon compte"
+
+#: note_kfet/templates/base.html:128
+msgid "Log out"
+msgstr "Se déconnecter"
+
+#: note_kfet/templates/base.html:136
+#: note_kfet/templates/registration/signup.html:6
+#: note_kfet/templates/registration/signup.html:11
+#: note_kfet/templates/registration/signup.html:27
+msgid "Sign up"
+msgstr "Inscription"
+
+#: note_kfet/templates/base.html:143
+#: note_kfet/templates/registration/login.html:6
+#: note_kfet/templates/registration/login.html:15
+#: note_kfet/templates/registration/login.html:38
+#: note_kfet/templates/registration/password_reset_complete.html:15
+msgid "Log in"
+msgstr "Se connecter"
+
+#: note_kfet/templates/base.html:155
msgid ""
"Your e-mail address is not validated. Please check your mail inbox and click "
"on the validation link."
@@ -2959,6 +3015,10 @@ msgstr ""
"Votre adresse e-mail n'est pas validée. Merci de vérifier votre boîte mail "
"et de cliquer sur le lien de validation."
+#: note_kfet/templates/base.html:172
+msgid "Contact us"
+msgstr "Nous contacter"
+
#: note_kfet/templates/base_search.html:15
msgid "Search by attribute such as name…"
msgstr "Chercher par un attribut tel que le nom …"
@@ -2990,13 +3050,6 @@ msgstr "Merci d'avoir utilisé la Note Kfet."
msgid "Log in again"
msgstr "Se connecter à nouveau"
-#: note_kfet/templates/registration/login.html:6
-#: note_kfet/templates/registration/login.html:15
-#: note_kfet/templates/registration/login.html:38
-#: note_kfet/templates/registration/password_reset_complete.html:15
-msgid "Log in"
-msgstr "Se connecter"
-
#: note_kfet/templates/registration/login.html:20
#, python-format
msgid ""
@@ -3088,12 +3141,6 @@ msgstr ""
msgid "Reset my password"
msgstr "Réinitialiser mon mot de passe"
-#: note_kfet/templates/registration/signup.html:6
-#: note_kfet/templates/registration/signup.html:11
-#: note_kfet/templates/registration/signup.html:27
-msgid "Sign up"
-msgstr "Inscription"
-
#: note_kfet/templates/registration/signup.html:15
msgid ""
"If you already signed up, your registration is taken into account. The BDE "
@@ -3106,914 +3153,3 @@ msgstr ""
"vous connecter. Vous devez vous rendre à la Kfet et payer les frais "
"d'adhésion. Vous devez également valider votre adresse email en suivant le "
"lien que vous avez reçu."
-
-#~ msgid "Enter a valid color."
-#~ msgstr "Entrer une couleur valide."
-
-#~ msgid "i18n text"
-#~ msgstr "i18n text"
-
-#~ msgid "i18n legend"
-#~ msgstr "i18n legend"
-
-#~ msgid "Enter a valid value."
-#~ msgstr "Entrer une valeur correcte."
-
-#~ msgid "Messages"
-#~ msgstr "Messages"
-
-#~ msgid "Site Maps"
-#~ msgstr "Plan du site"
-
-#~ msgid "Static Files"
-#~ msgstr "Fichiers statiques"
-
-#~ msgid "Syndication"
-#~ msgstr "Invitation"
-
-#~ msgid "That page number is not an integer"
-#~ msgstr "Ce numéro de page n'est pas entier"
-
-#~ msgid "That page number is less than 1"
-#~ msgstr "Ce numéro de page est inférieur à 1"
-
-#~ msgid "That page contains no results"
-#~ msgstr "Il n'y a pas de résultat"
-
-#~ msgid "Enter a valid URL."
-#~ msgstr "Entrer une URL valide."
-
-#~ msgid "Enter a valid integer."
-#~ msgstr "Entrer un entier valid."
-
-#~ msgid "Enter a valid email address."
-#~ msgstr "Entrer une adresse mail valide."
-
-#~ msgid ""
-#~ "Enter a valid 'slug' consisting of letters, numbers, underscores or "
-#~ "hyphens."
-#~ msgstr ""
-#~ "Entrer un 'slug' valide, constitué de lettres, chiffres, tirets ou tirets "
-#~ "bas."
-
-#~ msgid ""
-#~ "Enter a valid 'slug' consisting of Unicode letters, numbers, underscores, "
-#~ "or hyphens."
-#~ msgstr ""
-#~ "Entrer un 'slug' valide, constitué de caractère unicode, chiffres, tirets "
-#~ "ou underscores."
-
-#~ msgid "Enter a valid IPv4 address."
-#~ msgstr "Entrer une adresse IPv4 valide."
-
-#~ msgid "Enter a valid IPv6 address."
-#~ msgstr "Entrer une adresse IPv6 valide."
-
-#~ msgid "Enter a valid IPv4 or IPv6 address."
-#~ msgstr "Entrer une adresse IPv4 ou IPv6 valide."
-
-#~ msgid "Enter only digits separated by commas."
-#~ msgstr "Entrer seulement des chiffres séparés par des virgules."
-
-#~ msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-#~ msgstr ""
-#~ "Vérifier que cette valeur est %(limit_value)s (actuellement "
-#~ "%(show_value)s)."
-
-#~ msgid "Ensure this value is less than or equal to %(limit_value)s."
-#~ msgstr "Vérifier que cette valeur est plus petite que %(limit_value)s."
-
-#~ msgid "Ensure this value is greater than or equal to %(limit_value)s."
-#~ msgstr "Vérifier que cette valeur est plus grande que %(limit_value)s."
-
-#~ msgid ""
-#~ "Ensure this value has at least %(limit_value)d character (it has "
-#~ "%(show_value)d)."
-#~ msgid_plural ""
-#~ "Ensure this value has at least %(limit_value)d characters (it has "
-#~ "%(show_value)d)."
-#~ msgstr[0] ""
-#~ "Vérifier que cette valeur a au moins %(limit_value)d caractère "
-#~ "(actuellement %(show_value)d)."
-#~ msgstr[1] ""
-#~ "Assurer vous que cette valeur a au moins %(limit_value)d caractères "
-#~ "(actuellement %(show_value)d)."
-
-#~ msgid ""
-#~ "Ensure this value has at most %(limit_value)d character (it has "
-#~ "%(show_value)d)."
-#~ msgid_plural ""
-#~ "Ensure this value has at most %(limit_value)d characters (it has "
-#~ "%(show_value)d)."
-#~ msgstr[0] ""
-#~ "Vérifier que cette valeur a au plus %(limit_value)d caractère "
-#~ "(actuellement %(show_value)d)."
-#~ msgstr[1] ""
-#~ "Assurer vous que cette valeur a au plus %(limit_value)d caractères "
-#~ "(actuellement %(show_value)d)."
-
-#~ msgid "Enter a number."
-#~ msgstr "Numéro de téléphone."
-
-#~ msgid "Ensure that there are no more than %(max)s digit in total."
-#~ msgid_plural "Ensure that there are no more than %(max)s digits in total."
-#~ msgstr[0] "Vérifier qu'il n'y a pas plus de %(max)s chiffre au total."
-#~ msgstr[1] "Vérifier qu'il n'y a pas plus de %(max)s chiffres au total."
-
-#~ msgid "Ensure that there are no more than %(max)s decimal place."
-#~ msgid_plural "Ensure that there are no more than %(max)s decimal places."
-#~ msgstr[0] "Vérifier qu'il y n'as pas plus de %(max)s chiffre décimal."
-#~ msgstr[1] "Vérifier qu'il y n'as pas plus de %(max)s chiffres décimaux."
-
-#~ msgid ""
-#~ "Ensure that there are no more than %(max)s digit before the decimal point."
-#~ msgid_plural ""
-#~ "Ensure that there are no more than %(max)s digits before the decimal "
-#~ "point."
-#~ msgstr[0] ""
-#~ "Vérifier qu'il y n'as pas plus d'%(max)s chiffre avant la virgule."
-#~ msgstr[1] ""
-#~ "Vérifier qu'il y n'as pas plus de %(max)s chiffres avant la virgule."
-
-#~ msgid ""
-#~ "File extension '%(extension)s' is not allowed. Allowed extensions are: "
-#~ "'%(allowed_extensions)s'."
-#~ msgstr ""
-#~ "Les fichiers d'extension '%(extension)s' ne sont pas autorisé. Les "
-#~ "extension autorisées sont: \"%(allowed_extensions)s'."
-
-#~ msgid "Null characters are not allowed."
-#~ msgstr "Les caractères nuls ne sont pas autorisés."
-
-#~ msgid "and"
-#~ msgstr "et"
-
-#~ msgid "%(model_name)s with this %(field_labels)s already exists."
-#~ msgstr "Un %(model_name)s avec ce %(field_labels)s existe déjà."
-
-#~ msgid "Value %(value)r is not a valid choice."
-#~ msgstr "Le choix %(value)r n'est pas possible."
-
-#~ msgid "This field cannot be null."
-#~ msgstr "Ce champ est requis."
-
-#~ msgid "This field cannot be blank."
-#~ msgstr "Ce champ est requis."
-
-#~ msgid "%(model_name)s with this %(field_label)s already exists."
-#~ msgstr "Un %(model_name)s avec ce %(field_label)s existe déjà."
-
-#~ msgid ""
-#~ "%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s."
-#~ msgstr ""
-#~ "%(field_label)s doit être unique pour %(date_field_label)s "
-#~ "%(lookup_type)s."
-
-#~ msgid "Field of type: %(field_type)s"
-#~ msgstr "Champ du type %(field_type)s"
-
-#~ msgid "Integer"
-#~ msgstr "Nombre entier"
-
-#~ msgid "'%(value)s' value must be an integer."
-#~ msgstr "'%(value)s' doit être un nombre entier."
-
-#~ msgid "Big (8 byte) integer"
-#~ msgstr "Gros nombre entier (8 octets)"
-
-#~ msgid "'%(value)s' value must be either True or False."
-#~ msgstr "'%(value)s' doit être Vrai ou Faux."
-
-#~ msgid "'%(value)s' value must be either True, False, or None."
-#~ msgstr "'%(value)s' doit être Vrai, Faux, ou None."
-
-#~ msgid "Boolean (Either True or False)"
-#~ msgstr "Booléen (Vrai ou Faux)"
-
-#~ msgid "String (up to %(max_length)s)"
-#~ msgstr "Chaîne de caractère (maximum %(max_length)s caractères)"
-
-#~ msgid "Comma-separated integers"
-#~ msgstr "Liste d'entier séparer par des virgules"
-
-#~ msgid ""
-#~ "'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD "
-#~ "format."
-#~ msgstr "'%(value)s n'est pas formaté correctement (AAAA-MM-JJ)."
-
-#~ msgid ""
-#~ "'%(value)s' value has the correct format (YYYY-MM-DD) but it is an "
-#~ "invalid date."
-#~ msgstr ""
-#~ "'%(value)s possède le format date requis (AAAA-MM-JJ) mais n'est pas une "
-#~ "date valide."
-
-#~ msgid "Date (without time)"
-#~ msgstr "Date (sans horaire)"
-
-#~ msgid ""
-#~ "'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:"
-#~ "ss[.uuuuuu]][TZ] format."
-#~ msgstr ""
-#~ "'%(value)s' n'est pas formatée correctement (AAAA-MM-JJ HH:MM[:ss[."
-#~ "uuuuuu]][TZ])."
-
-#~ msgid ""
-#~ "'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
-#~ "[TZ]) but it is an invalid date/time."
-#~ msgstr ""
-#~ "'%(value)s' est formaté correctement, mais n'est pas une date/horaire "
-#~ "valide."
-
-#~ msgid "Date (with time)"
-#~ msgstr "Date (avec horaire)"
-
-#~ msgid "'%(value)s' value must be a decimal number."
-#~ msgstr "'%(value)s doit être un nombre décimal."
-
-#~ msgid "Decimal number"
-#~ msgstr "Nombre décimal"
-
-#~ msgid ""
-#~ "'%(value)s' value has an invalid format. It must be in [DD] [HH:[MM:]]ss[."
-#~ "uuuuuu] format."
-#~ msgstr ""
-#~ "'%(value)s' n'est pas formatée correctement (AAAA-MM-JJ HH:MM[:ss[."
-#~ "uuuuuu]][TZ])."
-
-#~ msgid "Duration"
-#~ msgstr "Durée"
-
-#~ msgid "Email address"
-#~ msgstr "Courriel"
-
-#~ msgid "File path"
-#~ msgstr "Chemin du fichier"
-
-#~ msgid "'%(value)s' value must be a float."
-#~ msgstr "'%(value)s doit être un nombre décimal."
-
-#~ msgid "Floating point number"
-#~ msgstr "Nombre décimal"
-
-#~ msgid "IPv4 address"
-#~ msgstr "Adresse IPv4"
-
-#~ msgid "IP address"
-#~ msgstr "Adresse IP"
-
-#~ msgid "'%(value)s' value must be either None, True or False."
-#~ msgstr "'%(value)s' doit être Vrai, Faux, ou None."
-
-#~ msgid "Boolean (Either True, False or None)"
-#~ msgstr "Booléen (Vrai ou Faux)"
-
-#~ msgid "Positive integer"
-#~ msgstr "Nombre entier positif"
-
-#~ msgid "Positive small integer"
-#~ msgstr "Nombre entier positif petit"
-
-#~ msgid "Slug (up to %(max_length)s)"
-#~ msgstr "Slug (maximum %(max_length)s caractères)"
-
-#~ msgid "Small integer"
-#~ msgstr "Petit entier"
-
-#~ msgid "Text"
-#~ msgstr "Texte"
-
-#~ msgid ""
-#~ "'%(value)s' value has an invalid format. It must be in HH:MM[:ss[."
-#~ "uuuuuu]] format."
-#~ msgstr "'%(value)s' n'est pas formatée correctement (HH:MM[:ss[.uuuuuu]])."
-
-#~ msgid ""
-#~ "'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is "
-#~ "an invalid time."
-#~ msgstr ""
-#~ "'%(value)s' est formaté correctement, mais n'est pas un horaire valide."
-
-#~ msgid "Time"
-#~ msgstr "Temps"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "Raw binary data"
-#~ msgstr "Donnée binaire brute"
-
-#~ msgid "'%(value)s' is not a valid UUID."
-#~ msgstr "'%(value)s' n'est pas un UUID valide."
-
-#~ msgid "Universally unique identifier"
-#~ msgstr "Identifiant unique universel"
-
-#~ msgid "File"
-#~ msgstr "Fichier"
-
-#~ msgid "Image"
-#~ msgstr "Image"
-
-#~ msgid "%(model)s instance with %(field)s %(value)r does not exist."
-#~ msgstr ""
-#~ "l'objet %(model)s avec les champs %(field)s %(value)r n'existe pas."
-
-#~ msgid "Foreign Key (type determined by related field)"
-#~ msgstr "Relations plusieurs-à-un (type déterminé par le champ relié)"
-
-#~ msgid "One-to-one relationship"
-#~ msgstr "Relation un-à-un"
-
-#~ msgid "%(from)s-%(to)s relationship"
-#~ msgstr "Relation %(from)s-%(to)s"
-
-#~ msgid "%(from)s-%(to)s relationships"
-#~ msgstr "Relations %(from)s-%(to)s"
-
-#~ msgid "Many-to-many relationship"
-#~ msgstr "Relation plusieurs-à-plusieurs"
-
-#~ msgid ":?.!"
-#~ msgstr ":?.!"
-
-#~ msgid "Enter a whole number."
-#~ msgstr "Entrer un numéro complet."
-
-#~ msgid "Enter a valid date."
-#~ msgstr "Entrer une date valide."
-
-#~ msgid "Enter a valid time."
-#~ msgstr "Entrer un horaire valide."
-
-#~ msgid "Enter a valid date/time."
-#~ msgstr "Entrer une date et un horaire valide."
-
-#~ msgid "Enter a valid duration."
-#~ msgstr "Entrer une durée valide."
-
-#~ msgid "The number of days must be between {min_days} and {max_days}."
-#~ msgstr ""
-#~ "Le nombre de jours doit être compris entre {min_days} et {max_days}."
-
-#~ msgid "No file was submitted. Check the encoding type on the form."
-#~ msgstr "Aucun fichier n'as été ajouté. Vérifier l'encodage du formulaire."
-
-#~ msgid "No file was submitted."
-#~ msgstr "Aucun fichier n'as été ajouté."
-
-#~ msgid "The submitted file is empty."
-#~ msgstr "Le fichier ajouté est vide."
-
-#~ msgid ""
-#~ "Ensure this filename has at most %(max)d character (it has %(length)d)."
-#~ msgid_plural ""
-#~ "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-#~ msgstr[0] ""
-#~ "Vérifier que le nom du fichier a au plus %(max)d caractère (actuellement "
-#~ "%(length)d)."
-#~ msgstr[1] ""
-#~ "Vérifier que le nom du fichier a au plus %(max)d caractères (actuellement "
-#~ "%(length)d)."
-
-#~ msgid "Please either submit a file or check the clear checkbox, not both."
-#~ msgstr "Veuillez ajouter un fichier ou cocher la case envoi vide."
-
-#~ msgid ""
-#~ "Upload a valid image. The file you uploaded was either not an image or a "
-#~ "corrupted image."
-#~ msgstr "Veuillez choisir une image valide."
-
-#~ msgid ""
-#~ "Select a valid choice. %(value)s is not one of the available choices."
-#~ msgstr "Faites un choix valide. %(value)s n'est pas autorisé."
-
-#~ msgid "Enter a list of values."
-#~ msgstr "Entrer une liste de valeurs."
-
-#~ msgid "Enter a complete value."
-#~ msgstr "Entrer une valeur complète."
-
-#~ msgid "Enter a valid UUID."
-#~ msgstr "Entrer un UUID valid."
-
-#~ msgid ":"
-#~ msgstr ":"
-
-#~ msgid "(Hidden field %(name)s) %(error)s"
-#~ msgstr "(Champ caché %(name)s) %(error)s"
-
-#~ msgid "ManagementForm data is missing or has been tampered with"
-#~ msgstr "Les données ManagementForm sont manquantes ou falsifiées"
-
-#~ msgid "Please submit %d or fewer forms."
-#~ msgid_plural "Please submit %d or fewer forms."
-#~ msgstr[0] "Veuillez remplir %d formulaire ou moins."
-#~ msgstr[1] "Veuillez remplir %d formulaires ou moins."
-
-#~ msgid "Please submit %d or more forms."
-#~ msgid_plural "Please submit %d or more forms."
-#~ msgstr[0] "Veuillez remplir %d formulaire ou plus."
-#~ msgstr[1] "Veuillez remplir %d formulaires ou plus."
-
-#~ msgid "Order"
-#~ msgstr "Ordre"
-
-#~ msgid "Please correct the duplicate data for %(field)s."
-#~ msgstr "Veuillez corriger les données dupliquées pour %(field)s."
-
-#~ msgid ""
-#~ "Please correct the duplicate data for %(field)s, which must be unique."
-#~ msgstr "Veuillez rendre uniques les valeurs des champs %(field)s."
-
-#~ msgid ""
-#~ "Please correct the duplicate data for %(field_name)s which must be unique "
-#~ "for the %(lookup)s in %(date_field)s."
-#~ msgstr ""
-#~ "Veuillez rendre unique les valeurs des champs %(field_name)s pour les "
-#~ "%(lookup)s dans %(date_field)s."
-
-#~ msgid "Please correct the duplicate values below."
-#~ msgstr "Veuillez rendre uniques les valeurs ci-dessous."
-
-#~ msgid "The inline value did not match the parent instance."
-#~ msgstr "La valeur renseignée ne correspond pas à l'objet parent."
-
-#~ msgid ""
-#~ "Select a valid choice. That choice is not one of the available choices."
-#~ msgstr "Faites un choix possible."
-
-#~ msgid "\"%(pk)s\" is not a valid value."
-#~ msgstr "\"%(pk)s\" n'est pas une valeur autorisée."
-
-#~ msgid ""
-#~ "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; "
-#~ "it may be ambiguous or it may not exist."
-#~ msgstr ""
-#~ "%(datetime)s n'a pas pu être interprété dans la zone "
-#~ "%(current_timezone)s, La valeur est ambigüe ou impossible."
-
-#~ msgid "Clear"
-#~ msgstr "Vider"
-
-#~ msgid "Currently"
-#~ msgstr "Activité en cours"
-
-#~ msgid "Change"
-#~ msgstr "Modifier"
-
-#~ msgid "Unknown"
-#~ msgstr "Inconnu"
-
-#~ msgid "yes,no,maybe"
-#~ msgstr "oui, non, peut-être"
-
-#~ msgid "%(size)d byte"
-#~ msgid_plural "%(size)d bytes"
-#~ msgstr[0] "%(size)d octet"
-#~ msgstr[1] "%(size)d octets"
-
-#~ msgid "%s KB"
-#~ msgstr "%s Ko"
-
-#~ msgid "%s MB"
-#~ msgstr "%s Mo"
-
-#~ msgid "%s GB"
-#~ msgstr "%s Go"
-
-#~ msgid "%s TB"
-#~ msgstr "%s To"
-
-#~ msgid "%s PB"
-#~ msgstr "%s Po"
-
-#~ msgid "p.m."
-#~ msgstr "p.m."
-
-#~ msgid "a.m."
-#~ msgstr "a.m."
-
-#~ msgid "PM"
-#~ msgstr "PM"
-
-#~ msgid "AM"
-#~ msgstr "AM"
-
-#~ msgid "midnight"
-#~ msgstr "minuit"
-
-#~ msgid "noon"
-#~ msgstr "midi"
-
-#~ msgid "Monday"
-#~ msgstr "Lundi"
-
-#~ msgid "Tuesday"
-#~ msgstr "Mardi"
-
-#~ msgid "Wednesday"
-#~ msgstr "Mercredi"
-
-#~ msgid "Thursday"
-#~ msgstr "Jeudi"
-
-#~ msgid "Friday"
-#~ msgstr "Vendredi"
-
-#~ msgid "Saturday"
-#~ msgstr "Samedi"
-
-#~ msgid "Sunday"
-#~ msgstr "Dimanche"
-
-#~ msgid "Mon"
-#~ msgstr "Lun"
-
-#~ msgid "Tue"
-#~ msgstr "Mar"
-
-#~ msgid "Wed"
-#~ msgstr "Mer"
-
-#~ msgid "Thu"
-#~ msgstr "Jeu"
-
-#~ msgid "Fri"
-#~ msgstr "Ven"
-
-#~ msgid "Sat"
-#~ msgstr "Sam"
-
-#~ msgid "Sun"
-#~ msgstr "Dim"
-
-#~ msgid "January"
-#~ msgstr "Janvier"
-
-#~ msgid "February"
-#~ msgstr "Février"
-
-#~ msgid "March"
-#~ msgstr "Mars"
-
-#~ msgid "April"
-#~ msgstr "Avril"
-
-#~ msgid "May"
-#~ msgstr "Mai"
-
-#~ msgid "June"
-#~ msgstr "Juin"
-
-#~ msgid "July"
-#~ msgstr "Juillet"
-
-#~ msgid "August"
-#~ msgstr "Août"
-
-#~ msgid "September"
-#~ msgstr "Septembre"
-
-#~ msgid "October"
-#~ msgstr "Octobre"
-
-#~ msgid "November"
-#~ msgstr "Novembre"
-
-#~ msgid "December"
-#~ msgstr "Décembre"
-
-#~ msgid "jan"
-#~ msgstr "jan"
-
-#~ msgid "feb"
-#~ msgstr "fev"
-
-#~ msgid "mar"
-#~ msgstr "mar"
-
-#~ msgid "apr"
-#~ msgstr "avr"
-
-#~ msgid "may"
-#~ msgstr "mai"
-
-#~ msgid "jun"
-#~ msgstr "jun"
-
-#~ msgid "jul"
-#~ msgstr "jui"
-
-#~ msgid "aug"
-#~ msgstr "aou"
-
-#~ msgid "sep"
-#~ msgstr "sep"
-
-#~ msgid "oct"
-#~ msgstr "oct"
-
-#~ msgid "nov"
-#~ msgstr "nov"
-
-#~ msgid "dec"
-#~ msgstr "dec"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Jan."
-#~ msgstr "[abbrev. month] Jan."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Feb."
-#~ msgstr "[abbrev. month] Fév."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "March"
-#~ msgstr "[abbrev. month] Mars"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "April"
-#~ msgstr "[abbrev. month] Avril"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "May"
-#~ msgstr "[abbrev. month] Mai"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "June"
-#~ msgstr "[abbrev. month] Juin"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "July"
-#~ msgstr "[abbrev. month] Jui"
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Aug."
-#~ msgstr "[abbrev. month] Août."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Sept."
-#~ msgstr "[abbrev. month] Sep."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Oct."
-#~ msgstr "[abbrev. month] Oct."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Nov."
-#~ msgstr "[abbrev. month] Nov."
-
-#~ msgctxt "abbrev. month"
-#~ msgid "Dec."
-#~ msgstr "[abbrev. month] Dec."
-
-#~ msgctxt "alt. month"
-#~ msgid "January"
-#~ msgstr "[alt. month] Janvier"
-
-#~ msgctxt "alt. month"
-#~ msgid "February"
-#~ msgstr "[alt. month] Février"
-
-#~ msgctxt "alt. month"
-#~ msgid "March"
-#~ msgstr "[alt. month] Mars"
-
-#~ msgctxt "alt. month"
-#~ msgid "April"
-#~ msgstr "[alt. month] Avril"
-
-#~ msgctxt "alt. month"
-#~ msgid "May"
-#~ msgstr "[alt. month] Mai"
-
-#~ msgctxt "alt. month"
-#~ msgid "June"
-#~ msgstr "[alt. month] Juin"
-
-#~ msgctxt "alt. month"
-#~ msgid "July"
-#~ msgstr "[alt. month] Juillet"
-
-#~ msgctxt "alt. month"
-#~ msgid "August"
-#~ msgstr "[alt. month] Août"
-
-#~ msgctxt "alt. month"
-#~ msgid "September"
-#~ msgstr "[alt. month] Septembre"
-
-#~ msgctxt "alt. month"
-#~ msgid "October"
-#~ msgstr "[alt. month] Octobre"
-
-#~ msgctxt "alt. month"
-#~ msgid "November"
-#~ msgstr "[alt. month] Novembre"
-
-#~ msgctxt "alt. month"
-#~ msgid "December"
-#~ msgstr "[alt. month] Décembre"
-
-#~ msgid "This is not a valid IPv6 address."
-#~ msgstr "Adresse IPv6 non valide."
-
-#~ msgctxt "String to return when truncating text"
-#~ msgid "%(truncated_text)s…"
-#~ msgstr "[String to return when truncating text] %(truncated_text)s…"
-
-#~ msgid "or"
-#~ msgstr "ou"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d year"
-#~ msgid_plural "%d years"
-#~ msgstr[0] "%d année"
-#~ msgstr[1] "%d années"
-
-#~ msgid "%d month"
-#~ msgid_plural "%d months"
-#~ msgstr[0] "%d mois"
-#~ msgstr[1] "%d mois"
-
-#~ msgid "%d week"
-#~ msgid_plural "%d weeks"
-#~ msgstr[0] "%d semaine"
-#~ msgstr[1] "%d semaines"
-
-#~ msgid "%d day"
-#~ msgid_plural "%d days"
-#~ msgstr[0] "%d jour"
-#~ msgstr[1] "%d jours"
-
-#~ msgid "%d hour"
-#~ msgid_plural "%d hours"
-#~ msgstr[0] "%d heure"
-#~ msgstr[1] "%d heures"
-
-#~ msgid "%d minute"
-#~ msgid_plural "%d minutes"
-#~ msgstr[0] "%d minute"
-#~ msgstr[1] "%d minutes"
-
-#~ msgid "0 minutes"
-#~ msgstr "0 minutes"
-
-#~ msgid "Forbidden"
-#~ msgstr "Interdit"
-
-#~ msgid "CSRF verification failed. Request aborted."
-#~ msgstr "Echec de la vérification CSRF. Requête interrompue."
-
-#~ msgid ""
-#~ "You are seeing this message because this HTTPS site requires a 'Referer "
-#~ "header' to be sent by your Web browser, but none was sent. This header is "
-#~ "required for security reasons, to ensure that your browser is not being "
-#~ "hijacked by third parties."
-#~ msgstr ""
-#~ "Vous voyez ce message car ce site HTTPS nécessite l'envoi d'un \"en-tête "
-#~ "référent\" par votre navigateur. Cet en-tête est necessaire pour des "
-#~ "raisons de sécurité, pour confirmer que votre navigateur n'est pas "
-#~ "compromis par un tiers."
-
-#~ msgid ""
-#~ "If you have configured your browser to disable 'Referer' headers, please "
-#~ "re-enable them, at least for this site, or for HTTPS connections, or for "
-#~ "'same-origin' requests."
-#~ msgstr ""
-#~ "Si vous avez configurer votre navigateur pour désactiver les \"en-tête "
-#~ "référent\", veuillez les réactiver, au moins pour ce site, ou pour les "
-#~ "requêtes HTTPS, ou les requête de même origine."
-
-#~ msgid ""
-#~ "If you are using the tag "
-#~ "or including the 'Referrer-Policy: no-referrer' header, please remove "
-#~ "them. The CSRF protection requires the 'Referer' header to do strict "
-#~ "referer checking. If you're concerned about privacy, use alternatives "
-#~ "like for links to third-party sites."
-#~ msgstr ""
-#~ "Si vous utiliser le tag "
-#~ "ou incluez l'en-tête 'Referrer-Policy: no-referrer', veuillez les "
-#~ "retirer. La protection CSRF nécessite que l'en-tête référent fasse une "
-#~ "vérification stricte. Si vous avez des préoccupations pour votre vie "
-#~ "privée, vous pouvez utiliser des alternatives comme pour les liens vers des sites tiers."
-
-#~ msgid ""
-#~ "You are seeing this message because this site requires a CSRF cookie when "
-#~ "submitting forms. This cookie is required for security reasons, to ensure "
-#~ "that your browser is not being hijacked by third parties."
-#~ msgstr ""
-#~ "Vous voyez ce message car ce site nécessite un cookie CSRF pour l'envoi "
-#~ "de formulaire. Ce cookie est demandé pour des raisons de sécurité, pour "
-#~ "s'assurer que votre navigateur n'est pas compromis par un tiers."
-
-#~ msgid ""
-#~ "If you have configured your browser to disable cookies, please re-enable "
-#~ "them, at least for this site, or for 'same-origin' requests."
-#~ msgstr ""
-#~ "Si vous avez configuré votre navigateur pour désactiver les cookies, "
-#~ "veuillez les réactiver, au moins pour ce site, ou pour les requêtes de "
-#~ "même origine."
-
-#~ msgid "More information is available with DEBUG=True."
-#~ msgstr "Plus d'informations disponible avec DEBUG=True."
-
-#~ msgid "No year specified"
-#~ msgstr "Pas d'année spécifiée"
-
-#~ msgid "Date out of range"
-#~ msgstr "Date impossible"
-
-#~ msgid "No month specified"
-#~ msgstr "Pas de mois spécifié"
-
-#~ msgid "No day specified"
-#~ msgstr "Pas de jours spécifié"
-
-#~ msgid "No week specified"
-#~ msgstr "Pas de semaine spécifiée"
-
-#~ msgid "No %(verbose_name_plural)s available"
-#~ msgstr "%(verbose_name_plural)s non disponible"
-
-#~ msgid ""
-#~ "Future %(verbose_name_plural)s not available because %(class_name)s."
-#~ "allow_future is False."
-#~ msgstr ""
-#~ "Le futur %(verbose_name_plural)s n'est pas possible car %(class_name)s."
-#~ "allow_future = False."
-
-#~ msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
-#~ msgstr "Date '%(datestr)s' au format non valide '%(format)s'."
-
-#~ msgid "No %(verbose_name)s found matching the query"
-#~ msgstr "Aucun %(verbose_name)s trouvé pour cette requête"
-
-#~ msgid "Page is not 'last', nor can it be converted to an int."
-#~ msgstr ""
-#~ "La page spécifié n'est pas la dernière (last) et ne peux pas être "
-#~ "convertie en nombre entier."
-
-#~ msgid "Invalid page (%(page_number)s): %(message)s"
-#~ msgstr "Le numéro de page %(page_number)s est non valide: %(message)s"
-
-#~ msgid "Empty list and '%(class_name)s.allow_empty' is False."
-#~ msgstr "Liste vide et '%(class_name)s.allow_empty = False."
-
-#~ msgid "Directory indexes are not allowed here."
-#~ msgstr "L'index de Dossier n'est pas autorisé ici."
-
-#~ msgid "\"%(path)s\" does not exist"
-#~ msgstr "\"%(path)s\" n'existe pas"
-
-#~ msgid "Index of %(directory)s"
-#~ msgstr "Contenu de %(directory)s"
-
-#~ msgid "Django: the Web framework for perfectionists with deadlines."
-#~ msgstr ""
-#~ "Django: Le cadriciel Web pour les perfectionniste avec des dates limites."
-
-#~ msgid ""
-#~ "View release notes for Django "
-#~ "%(version)s"
-#~ msgstr ""
-#~ "Visiter les Notes de versions\" pour "
-#~ "Django %(version)s"
-
-#~ msgid "The install worked successfully! Congratulations!"
-#~ msgstr "L'installation a réussie! Félicitation!"
-
-#~ msgid ""
-#~ "You are seeing this page because DEBUG=True is in your settings file and you have not configured "
-#~ "any URLs."
-#~ msgstr ""
-#~ "Vous voyez cette page car DEBUG=True est renseigné dans vos paramètres et vous n'avez pas "
-#~ "configuré d'URLs."
-
-#~ msgid "Django Documentation"
-#~ msgstr "Documentation Django"
-
-#~ msgid "Topics, references, & how-to's"
-#~ msgstr "Sujet, references & how-to"
-
-#~ msgid "Tutorial: A Polling App"
-#~ msgstr "Tutoriel: Une application de sondage"
-
-#~ msgid "Get started with Django"
-#~ msgstr "Débuter avec Django"
-
-#~ msgid "Django Community"
-#~ msgstr "Communauté Django"
-
-#~ msgid "Connect, get help, or contribute"
-#~ msgstr "Prendre contact, obtenir de l'aide ou contribuer"
diff --git a/note.cron b/note.cron
index f3e18d90..078856ea 100644
--- a/note.cron
+++ b/note.cron
@@ -1,22 +1,22 @@
-# Attention, il faut *copier* ce fichier dans /etc/cron.d, owner root:root et droits 644
+# {{ ansible_managed }}
# Les cronjobs dont a besoin la Note Kfet
# m h dom mon dow user command
# Envoyer les mails en attente
- * * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail >> /var/www/note_kfet/cron_mail.log
- * * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred >> /var/www/note_kfet/cron_mail_deferred.log
- 00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 >> /var/www/note_kfet/cron_mail_purge.log
+ * * * * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail -c 1
+ * * * * * root cd /var/www/note_kfet && env/bin/python manage.py retry_deferred -c 1
+ 00 0 * * * root cd /var/www/note_kfet && env/bin/python manage.py purge_mail_log 7 -c 1
# Faire une sauvegarde de la base de données
00 2 * * * root cd /var/www/note_kfet && apps/scripts/shell/backup_db
# Vérifier la cohérence de la base et mailer en cas de problème
00 4 * * * root cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all --mail
# Mettre à jour le wiki (modification sans (dé)validation, activités passées)
-#30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --comment refresh
+ 30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --human --comment refresh --wiki
# Spammer les gens en négatif
00 5 * * 2 root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --spam
# Envoyer le rapport mensuel aux trésoriers et respos info
00 8 6 * * root cd /var/www/note_kfet && env/bin/python manage.py send_mail_to_negative_balances --report
# Envoyer les rapports aux gens
55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports
-# Envoyer les rapports aux gens
+# Mettre à jour les boutons mis en avant
00 9 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons
diff --git a/note_kfet/static/js/autocomplete_model.js b/note_kfet/static/js/autocomplete_model.js
index c4f9405b..f7aafbc6 100644
--- a/note_kfet/static/js/autocomplete_model.js
+++ b/note_kfet/static/js/autocomplete_model.js
@@ -1,57 +1,53 @@
$(document).ready(function () {
- $(".autocomplete").keyup(function(e) {
- let target = $("#" + e.target.id);
- let prefix = target.attr("id");
- let api_url = target.attr("api_url");
- let api_url_suffix = target.attr("api_url_suffix");
- if (!api_url_suffix)
- api_url_suffix = "";
- let name_field = target.attr("name_field");
- if (!name_field)
- name_field = "name";
- let input = target.val();
- target.addClass("is-invalid");
- target.removeClass("is-valid");
- $("#" + prefix + "_reset").removeClass("d-none");
+ $('.autocomplete').keyup(function (e) {
+ const target = $('#' + e.target.id)
+ const prefix = target.attr('id')
+ const api_url = target.attr('api_url')
+ let api_url_suffix = target.attr('api_url_suffix')
+ if (!api_url_suffix) { api_url_suffix = '' }
+ let name_field = target.attr('name_field')
+ if (!name_field) { name_field = 'name' }
+ const input = target.val()
+ target.addClass('is-invalid')
+ target.removeClass('is-valid')
+ $('#' + prefix + '_reset').removeClass('d-none')
- $.getJSON(api_url + (api_url.includes("?") ? "&" : "?") + "format=json&search=^" + input + api_url_suffix, function(objects) {
- let html = "";
+ $.getJSON(api_url + (api_url.includes('?') ? '&' : '?') + 'format=json&search=^' + input + api_url_suffix, function (objects) {
+ let html = ''
- objects.results.forEach(function (obj) {
- html += li(prefix + "_" + obj.id, obj[name_field]);
- });
+ objects.results.forEach(function (obj) {
+ html += li(prefix + '_' + obj.id, obj[name_field])
+ })
- let results_list = $("#" + prefix + "_list");
- results_list.html(html);
+ const results_list = $('#' + prefix + '_list')
+ results_list.html(html)
- objects.results.forEach(function (obj) {
- $("#" + prefix + "_" + obj.id).click(function() {
- target.val(obj[name_field]);
- $("#" + prefix + "_pk").val(obj.id);
+ objects.results.forEach(function (obj) {
+ $('#' + prefix + '_' + obj.id).click(function () {
+ target.val(obj[name_field])
+ $('#' + prefix + '_pk').val(obj.id)
- results_list.html("");
- target.removeClass("is-invalid");
- target.addClass("is-valid");
+ results_list.html('')
+ target.removeClass('is-invalid')
+ target.addClass('is-valid')
- if (typeof autocompleted != 'undefined')
- autocompleted(obj, prefix)
- });
+ if (typeof autocompleted !== 'undefined') { autocompleted(obj, prefix) }
+ })
- if (input === obj[name_field])
- $("#" + prefix + "_pk").val(obj.id);
- });
+ if (input === obj[name_field]) { $('#' + prefix + '_pk').val(obj.id) }
+ })
- if (results_list.children().length === 1 && e.originalEvent.keyCode >= 32) {
- results_list.children().first().trigger("click");
- }
- });
- });
+ if (results_list.children().length === 1 && e.originalEvent.keyCode >= 32) {
+ results_list.children().first().trigger('click')
+ }
+ })
+ })
- $(".autocomplete-reset").click(function() {
- let name = $(this).attr("id").replace("_reset", "");
- $("#" + name + "_pk").val("");
- $("#" + name).val("");
- $("#" + name + "_list").html("");
- $(this).addClass("d-none");
- });
-});
\ No newline at end of file
+ $('.autocomplete-reset').click(function () {
+ const name = $(this).attr('id').replace('_reset', '')
+ $('#' + name + '_pk').val('')
+ $('#' + name).val('')
+ $('#' + name + '_list').html('')
+ $(this).addClass('d-none')
+ })
+})
diff --git a/note_kfet/static/js/base.js b/note_kfet/static/js/base.js
index a20c72bc..87a99f64 100644
--- a/note_kfet/static/js/base.js
+++ b/note_kfet/static/js/base.js
@@ -1,18 +1,16 @@
// Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
// SPDX-License-Identifier: GPL-3.0-or-later
-
/**
* Convert balance in cents to a human readable amount
* @param value the balance, in cents
* @returns {string}
*/
function pretty_money (value) {
- if (value % 100 === 0)
- return (value < 0 ? "- " : "") + Math.floor(Math.abs(value) / 100) + " €";
- else
- return (value < 0 ? "- " : "") + Math.floor(Math.abs(value) / 100) + "."
- + (Math.abs(value) % 100 < 10 ? "0" : "") + (Math.abs(value) % 100) + " €";
+ if (value % 100 === 0) { return (value < 0 ? '- ' : '') + Math.floor(Math.abs(value) / 100) + ' €' } else {
+ return (value < 0 ? '- ' : '') + Math.floor(Math.abs(value) / 100) + '.' +
+ (Math.abs(value) % 100 < 10 ? '0' : '') + (Math.abs(value) % 100) + ' €'
+ }
}
/**
@@ -22,19 +20,19 @@ function pretty_money (value) {
* @param timeout The delay (in millis) after that the message is auto-closed. If negative, then it is ignored.
*/
function addMsg (msg, alert_type, timeout = -1) {
- let msgDiv = $("#messages");
- let html = msgDiv.html();
- let id = Math.floor(10000 * Math.random() + 1);
- html += " entry with a given id and text
*/
function li (id, text, extra_css) {
- return " " + text + " \n";
+ return '' + text + ' \n'
}
/**
@@ -95,24 +93,13 @@ function li (id, text, extra_css) {
* @param note The concerned note.
*/
function displayStyle (note) {
- if (!note)
- return "";
- let balance = note.balance;
- var css = "";
- if (balance < -5000)
- css += " text-danger bg-dark";
- else if (balance < -1000)
- css += " text-danger";
- else if (balance < 0)
- css += " text-warning";
- else if (!note.email_confirmed)
- css += " text-white bg-primary";
- else if (!note.is_active || (note.membership && note.membership.date_end < new Date().toISOString()))
- css += "text-white bg-info";
- return css;
+ if (!note) { return '' }
+ const balance = note.balance
+ var css = ''
+ if (balance < -5000) { css += ' text-danger bg-dark' } else if (balance < -1000) { css += ' text-danger' } else if (balance < 0) { css += ' text-warning' } else if (!note.email_confirmed) { css += ' text-white bg-primary' } else if (!note.is_active || (note.membership && note.membership.date_end < new Date().toISOString())) { css += 'text-white bg-info' }
+ return css
}
-
/**
* Render note name and picture
* @param note The note to render
@@ -121,23 +108,22 @@ function displayStyle (note) {
* @param profile_pic_field
*/
function displayNote (note, alias, user_note_field = null, profile_pic_field = null) {
- if (!note.display_image) {
- note.display_image = '/media/pic/default.png';
- }
- let img = note.display_image;
- if (alias !== note.name && note.name)
- alias += " (aka. " + note.name + ")";
- if (user_note_field !== null) {
- $("#" + user_note_field).removeAttr('class');
- $("#" + user_note_field).addClass(displayStyle(note));
- $("#" + user_note_field).text(alias + (note.balance == null ? "" : (" :\n" + pretty_money(note.balance))));
- if (profile_pic_field != null) {
- $("#" + profile_pic_field).attr('src', img);
- $("#" + profile_pic_field + "_link").attr('href', note.resourcetype === "NoteUser" ?
- "/accounts/user/" + note.user : note.resourcetype === "NoteClub" ?
- "/accounts/club/" + note.club : "#");
- }
+ if (!note.display_image) {
+ note.display_image = '/static/member/img/default_picture.png'
+ }
+ const img = note.display_image
+ if (alias !== note.name && note.name) { alias += ' (aka. ' + note.name + ')' }
+ if (user_note_field !== null) {
+ $('#' + user_note_field).removeAttr('class')
+ $('#' + user_note_field).addClass(displayStyle(note))
+ $('#' + user_note_field).text(alias + (note.balance == null ? '' : (' :\n' + pretty_money(note.balance))))
+ if (profile_pic_field != null) {
+ $('#' + profile_pic_field).attr('src', img)
+ $('#' + profile_pic_field + '_link').attr('href', note.resourcetype === 'NoteUser'
+ ? '/accounts/user/' + note.user : note.resourcetype === 'NoteClub'
+ ? '/accounts/club/' + note.club : '#')
}
+ }
}
/**
@@ -152,35 +138,34 @@ function displayNote (note, alias, user_note_field = null, profile_pic_field = n
* (useful in consumptions, put null if not used)
* @returns an anonymous function to be compatible with jQuery events
*/
-function removeNote (d, note_prefix = "note", notes_display, note_list_id, user_note_field = null, profile_pic_field = null) {
- return (function () {
- let new_notes_display = [];
- let html = "";
- notes_display.forEach(function (disp) {
- if (disp.quantity > 1 || disp.id !== d.id) {
- disp.quantity -= disp.id === d.id ? 1 : 0;
- new_notes_display.push(disp);
- html += li(note_prefix + "_" + disp.id, disp.name
- + "" + disp.quantity + "",
- displayStyle(disp.note));
- }
- });
+function removeNote (d, note_prefix = 'note', notes_display, note_list_id, user_note_field = null, profile_pic_field = null) {
+ return function () {
+ const new_notes_display = []
+ let html = ''
+ notes_display.forEach(function (disp) {
+ if (disp.quantity > 1 || disp.id !== d.id) {
+ disp.quantity -= disp.id === d.id ? 1 : 0
+ new_notes_display.push(disp)
+ html += li(note_prefix + '_' + disp.id, disp.name +
+ '' + disp.quantity + '',
+ displayStyle(disp.note))
+ }
+ })
- notes_display.length = 0;
- new_notes_display.forEach(function (disp) {
- notes_display.push(disp);
- });
+ notes_display.length = 0
+ new_notes_display.forEach(function (disp) {
+ notes_display.push(disp)
+ })
- $("#" + note_list_id).html(html);
- notes_display.forEach(function (disp) {
- let obj = $("#" + note_prefix + "_" + disp.id);
- obj.click(removeNote(disp, note_prefix, notes_display, note_list_id, user_note_field, profile_pic_field));
- obj.hover(function () {
- if (disp.note)
- displayNote(disp.note, disp.name, user_note_field, profile_pic_field);
- });
- });
- });
+ $('#' + note_list_id).html(html)
+ notes_display.forEach(function (disp) {
+ const obj = $('#' + note_prefix + '_' + disp.id)
+ obj.click(removeNote(disp, note_prefix, notes_display, note_list_id, user_note_field, profile_pic_field))
+ obj.hover(function () {
+ if (disp.note) { displayNote(disp.note, disp.name, user_note_field, profile_pic_field) }
+ })
+ })
+ }
}
/**
@@ -199,203 +184,193 @@ function removeNote (d, note_prefix = "note", notes_display, note_list_id, user_
* the associated note is not displayed.
* Useful for a consumption if the item is selected before.
*/
-function autoCompleteNote (field_id, note_list_id, notes, notes_display, alias_prefix = "alias",
- note_prefix = "note", user_note_field = null, profile_pic_field = null, alias_click = null) {
- let field = $("#" + field_id);
+function autoCompleteNote (field_id, note_list_id, notes, notes_display, alias_prefix = 'alias',
+ note_prefix = 'note', user_note_field = null, profile_pic_field = null, alias_click = null) {
+ const field = $('#' + field_id)
- // Configure tooltip
- field.tooltip({
- html: true,
- placement: 'bottom',
- title: 'Loading...',
- trigger: 'manual',
- container: field.parent(),
- fallbackPlacement: 'clockwise'
- });
+ // Configure tooltip
+ field.tooltip({
+ html: true,
+ placement: 'bottom',
+ title: 'Loading...',
+ trigger: 'manual',
+ container: field.parent(),
+ fallbackPlacement: 'clockwise'
+ })
- // When the user clicks elsewhere, we hide the tooltip
- $(document).click(function(e) {
- if (!e.target.id.startsWith(alias_prefix)) {
- field.tooltip("hide");
- }
- });
+ // When the user clicks elsewhere, we hide the tooltip
+ $(document).click(function (e) {
+ if (!e.target.id.startsWith(alias_prefix)) {
+ field.tooltip('hide')
+ }
+ })
- let old_pattern = null;
+ let old_pattern = null
- // Clear search on click
- field.click(function () {
- field.tooltip('hide');
- field.removeClass('is-invalid');
- field.val("");
- old_pattern = "";
- });
+ // Clear search on click
+ field.click(function () {
+ field.tooltip('hide')
+ field.removeClass('is-invalid')
+ field.val('')
+ old_pattern = ''
+ })
- // When the user type "Enter", the first alias is clicked
- field.keypress(function (event) {
- if (event.originalEvent.charCode === 13 && notes.length > 0) {
- let li_obj = field.parent().find("ul li").first();
- displayNote(notes[0], li_obj.text(), user_note_field, profile_pic_field);
- li_obj.trigger("click");
- }
- });
+ // When the user type "Enter", the first alias is clicked
+ field.keypress(function (event) {
+ if (event.originalEvent.charCode === 13 && notes.length > 0) {
+ const li_obj = field.parent().find('ul li').first()
+ displayNote(notes[0], li_obj.text(), user_note_field, profile_pic_field)
+ li_obj.trigger('click')
+ }
+ })
- // When the user type something, the matched aliases are refreshed
- field.keyup(function (e) {
- field.removeClass('is-invalid');
+ // When the user type something, the matched aliases are refreshed
+ field.keyup(function (e) {
+ field.removeClass('is-invalid')
- if (e.originalEvent.charCode === 13)
- return;
+ if (e.originalEvent.charCode === 13) { return }
- let pattern = field.val();
+ const pattern = field.val()
- // If the pattern is not modified, we don't query the API
- if (pattern === old_pattern)
- return;
- old_pattern = pattern;
- notes.length = 0;
+ // If the pattern is not modified, we don't query the API
+ if (pattern === old_pattern) { return }
+ old_pattern = pattern
+ notes.length = 0
- // get matched Alias with note associated
- if (pattern === "") {
- field.tooltip('hide');
- notes.length = 0;
- return;
- }
+ // get matched Alias with note associated
+ if (pattern === '') {
+ field.tooltip('hide')
+ notes.length = 0
+ return
+ }
- $.getJSON("/api/note/consumer/?format=json&alias=" + pattern + "&search=user|club",
- function (consumers) {
- // The response arrived too late, we stop the request
- if (pattern !== $("#" + field_id).val())
- return;
+ $.getJSON('/api/note/consumer/?format=json&alias=' + pattern + '&search=user|club',
+ function (consumers) {
+ // The response arrived too late, we stop the request
+ if (pattern !== $('#' + field_id).val()) { return }
- // Build tooltip content
- let aliases_matched_html = ' after the last list item:
- row.append(' ' + delButtonHTML + ' ');
- } else {
- // Otherwise, just insert the remove button as the
- // last child element of the form's container:
- row.append(delButtonHTML);
- }
+ var delButtonHTML = '' + options.deleteText + ''
+ if (options.deleteContainerClass) {
+ // If we have a specific container for the remove button,
+ // place it as the last child of that container:
+ row.find('[class*="' + options.deleteContainerClass + '"]').append(delButtonHTML)
+ } else if (row.is('TR')) {
+ // If the forms are laid out in table rows, insert
+ // the remove button into the last table cell:
+ row.children('td:last').append(delButtonHTML)
+ } else if (row.is('UL') || row.is('OL')) {
+ // If they're laid out as an ordered/unordered list,
+ // insert an after the last list item:
+ row.append(' ' + delButtonHTML + ' ')
+ } else {
+ // Otherwise, just insert the remove button as the
+ // last child element of the form's container:
+ row.append(delButtonHTML)
+ }
- // Check if we're under the minimum number of forms - not to display delete link at rendering
- if (!showDeleteLinks()){
- row.find('a.' + delCssSelector).hide();
- }
+ // Check if we're under the minimum number of forms - not to display delete link at rendering
+ if (!showDeleteLinks()) {
+ row.find('a.' + delCssSelector).hide()
+ }
- row.find('a.' + delCssSelector).click(function() {
- var row = $(this).parents('.' + options.formCssClass),
- del = row.find('input:hidden[id $= "-DELETE"]'),
- buttonRow = row.siblings("a." + addCssSelector + ', .' + options.formCssClass + '-add'),
- forms;
- if (del.length) {
- // We're dealing with an inline formset.
- // Rather than remove this form from the DOM, we'll mark it as deleted
- // and hide it, then let Django handle the deleting:
- del.val('on');
- row.hide();
- forms = $('.' + options.formCssClass).not(':hidden');
- } else {
- row.remove();
- // Update the TOTAL_FORMS count:
- forms = $('.' + options.formCssClass).not('.formset-custom-template');
- totalForms.val(forms.length);
- }
- for (var i=0, formCount=forms.length; i' + addButtonHTML + ' ' + addButtonHTML + '
-
{% endif %}
- " +
- ""
- + msg + "
\n";
- msgDiv.html(html);
+ const msgDiv = $('#messages')
+ let html = msgDiv.html()
+ const id = Math.floor(10000 * Math.random() + 1)
+ html += '' +
+ '' +
+ msg + '
\n'
+ msgDiv.html(html)
- if (timeout > 0) {
- setTimeout(function () {
- $("#close-message-" + id).click();
- }, timeout);
- }
+ if (timeout > 0) {
+ setTimeout(function () {
+ $('#close-message-' + id).click()
+ }, timeout)
+ }
}
/**
@@ -43,34 +41,34 @@ function addMsg (msg, alert_type, timeout = -1) {
* @param timeout The delay (in millis) after that the message is auto-closed. If negative, then it is ignored.
*/
function errMsg (errs_obj, timeout = -1) {
- for (const err_msg of Object.values(errs_obj)) {
- addMsg(err_msg, 'danger', timeout);
- }
+ for (const err_msg of Object.values(errs_obj)) {
+ addMsg(err_msg, 'danger', timeout)
+ }
}
var reloadWithTurbolinks = (function () {
- var scrollPosition;
+ var scrollPosition
- function reload () {
- scrollPosition = [window.scrollX, window.scrollY];
- Turbolinks.visit(window.location.toString(), { action: 'replace' })
+ function reload () {
+ scrollPosition = [window.scrollX, window.scrollY]
+ Turbolinks.visit(window.location.toString(), { action: 'replace' })
+ }
+
+ document.addEventListener('turbolinks:load', function () {
+ if (scrollPosition) {
+ window.scrollTo.apply(window, scrollPosition)
+ scrollPosition = null
}
+ })
- document.addEventListener('turbolinks:load', function () {
- if (scrollPosition) {
- window.scrollTo.apply(window, scrollPosition);
- scrollPosition = null
- }
- });
-
- return reload;
-})();
+ return reload
+})()
/**
* Reload the balance of the user on the right top corner
*/
function refreshBalance () {
- $("#user_balance").load("/ #user_balance");
+ $('#user_balance').load('/ #user_balance')
}
/**
@@ -79,15 +77,15 @@ function refreshBalance () {
* @param fun For each found note with the matched alias `alias`, fun(note, alias) is called.
*/
function getMatchedNotes (pattern, fun) {
- $.getJSON("/api/note/alias/?format=json&alias=" + pattern + "&search=user|club", fun);
+ $.getJSON('/api/note/alias/?format=json&alias=' + pattern + '&search=user|club', fun)
}
/**
* Generate a - ';
- consumers.results.forEach(function (consumer) {
- let note = consumer.note;
- note.email_confirmed = consumer.email_confirmed;
- if (consumer.hasOwnProperty("membership") && consumer.membership)
- note.membership = consumer.membership;
- else
- note.membership = undefined;
- let extra_css = displayStyle(note);
- aliases_matched_html += li(alias_prefix + '_' + consumer.id,
- consumer.name,
- extra_css);
- notes.push(note);
- });
- aliases_matched_html += '
- '
+ consumers.results.forEach(function (consumer) {
+ const note = consumer.note
+ note.email_confirmed = consumer.email_confirmed
+ if (consumer.hasOwnProperty('membership') && consumer.membership) { note.membership = consumer.membership } else { note.membership = undefined }
+ const extra_css = displayStyle(note)
+ aliases_matched_html += li(alias_prefix + '_' + consumer.id,
+ consumer.name,
+ extra_css)
+ notes.push(note)
+ })
+ aliases_matched_html += '
-
- Attention : la Note Kfet 2020 est en phase de beta. Des fonctionnalités pourront être rajoutées d'ici à la version
- finale, et des bugs peuvent survenir. Pour tout problème, merci d'envoyer un mail à l'adresse
-
- notekfet2020@lists.crans.org,
- ou bien levez une issue sur le dépôt Gitlab,
- ou encore posez un commentaire sur le pad.
- - Certaines données ont été anonymisées afin de limiter les fuites de données, et peuvent ne pas correspondre avec vos données réelles. -
{% block content %}
- - Certaines données ont été anonymisées afin de limiter les fuites de données, et peuvent ne pas correspondre avec vos données réelles. -
Default content...
@@ -178,7 +169,7 @@ SPDX-License-Identifier: GPL-3.0-or-later class="form-inline"> Nous contacter — + class="text-muted">{% trans "Contact us" %} — {% csrf_token %}