From efc2b6b0b0bed0687a88cd2c4faabd5b3b19c57b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 21:44:16 +0200 Subject: [PATCH 001/319] Send mail to users when the note balance is negative --- apps/member/models.py | 13 ++++-- apps/note/models/notes.py | 23 ++++++++++ apps/note/models/transactions.py | 2 +- apps/scripts | 2 +- locale/de/LC_MESSAGES/django.po | 12 ++--- locale/fr/LC_MESSAGES/django.po | 12 ++--- static/js/transfer.js | 4 +- templates/note/mails/negative_balance.html | 44 +++++++++++++++++++ templates/note/mails/negative_balance.txt | 23 ++++++++++ .../note/mails/negative_notes_report.html | 41 +++++++++++++++++ .../note/mails/negative_notes_report.txt | 12 +++++ .../mails/email_validation_email.html | 40 ++++++++++++++--- .../mails/email_validation_email.txt | 16 +++++++ 13 files changed, 218 insertions(+), 26 deletions(-) create mode 100644 templates/note/mails/negative_balance.html create mode 100644 templates/note/mails/negative_balance.txt create mode 100644 templates/note/mails/negative_notes_report.html create mode 100644 templates/note/mails/negative_notes_report.txt create mode 100644 templates/registration/mails/email_validation_email.txt diff --git a/apps/member/models.py b/apps/member/models.py index efd8bf8c..ffe50201 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -131,15 +131,22 @@ class Profile(models.Model): return reverse('user_detail', args=(self.pk,)) def send_email_validation_link(self): - subject = _("Activate your Note Kfet account") - message = loader.render_to_string('registration/mails/email_validation_email.html', + subject = "[Note Kfet]" + _("Activate your Note Kfet account") + 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)), }) - self.user.email_user(subject, message) + html = 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)), + }) + self.user.email_user(subject, message, html_message=html) class Club(models.Model): diff --git a/apps/note/models/notes.py b/apps/note/models/notes.py index 99818602..9274dff6 100644 --- a/apps/note/models/notes.py +++ b/apps/note/models/notes.py @@ -7,6 +7,7 @@ from django.conf import settings from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.db import models +from django.template.loader import render_to_string from django.utils import timezone from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel @@ -67,6 +68,13 @@ class Note(PolymorphicModel): pretty.short_description = _('Note') + @property + def last_negative_duration(self): + if self.balance >= 0 or self.last_negative is None: + return None + delta = timezone.now() - self.last_negative + return "{:d} jours".format(delta.days) + def save(self, *args, **kwargs): """ Save note with it's alias (called in polymorphic children) @@ -128,6 +136,21 @@ class NoteUser(Note): def pretty(self): return _("%(user)s's note") % {'user': str(self.user)} + def save(self, *args, **kwargs): + if self.pk and self.balance < 0: + old_note = NoteUser.objects.get(pk=self.pk) + if old_note.balance >= 0: + # Passage en négatif + self.last_negative = timezone.now() + self.send_mail_negative_balance() + super().save(*args, **kwargs) + + def send_mail_negative_balance(self): + plain_text = render_to_string("note/mails/negative_balance.txt", dict(note=self)) + html = render_to_string("note/mails/negative_balance.html", dict(note=self)) + self.user.email_user("[Note Kfet] Passage en négatif (compte n°{:d})" + .format(self.user.pk), plain_text, html_message=html) + class NoteClub(Note): """ diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index f504d8e1..6eab05ee 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -7,7 +7,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel -from .notes import Note, NoteClub, NoteSpecial +from .notes import Note, NoteClub, NoteSpecial, NoteUser from ..templatetags.pretty_money import pretty_money """ diff --git a/apps/scripts b/apps/scripts index dce51ad2..4b37f828 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit dce51ad26134d396d7cbfca7c63bd2ed391dd969 +Subproject commit 4b37f8286f493b1a28bd0faa0052ee3967fe543e diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index bec7e726..d28ecb34 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -2128,33 +2128,33 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" -#: templates/registration/mails/email_validation_email.html:3 +#: templates/registration/mails/email_validation_email.txt:3 msgid "Hi" msgstr "" -#: templates/registration/mails/email_validation_email.html:5 +#: templates/registration/mails/email_validation_email.txt:5 msgid "" "You recently registered on the Note Kfet. Please click on the link below to " "confirm your registration." msgstr "" -#: templates/registration/mails/email_validation_email.html:9 +#: templates/registration/mails/email_validation_email.txt:9 msgid "" "This link is only valid for a couple of days, after that you will need to " "contact us to validate your email." msgstr "" -#: templates/registration/mails/email_validation_email.html:11 +#: 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." msgstr "" -#: templates/registration/mails/email_validation_email.html:13 +#: templates/registration/mails/email_validation_email.txt:13 msgid "Thanks" msgstr "" -#: templates/registration/mails/email_validation_email.html:15 +#: templates/registration/mails/email_validation_email.txt:15 msgid "The Note Kfet team." msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 54c70c71..9df44fec 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2197,11 +2197,11 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Mot de passe ou pseudo oublié ?" -#: templates/registration/mails/email_validation_email.html:3 +#: templates/registration/mails/email_validation_email.txt:3 msgid "Hi" msgstr "Bonjour" -#: templates/registration/mails/email_validation_email.html:5 +#: templates/registration/mails/email_validation_email.txt:5 msgid "" "You recently registered on the Note Kfet. Please click on the link below to " "confirm your registration." @@ -2209,7 +2209,7 @@ msgstr "" "Vous vous êtes inscrits récemment sur la Note Kfet. Merci de cliquer sur le " "lien ci-dessous pour confirmer votre adresse email." -#: templates/registration/mails/email_validation_email.html:9 +#: templates/registration/mails/email_validation_email.txt:9 msgid "" "This link is only valid for a couple of days, after that you will need to " "contact us to validate your email." @@ -2217,7 +2217,7 @@ msgstr "" "Ce lien n'est valide que pendant quelques jours. Après cela, vous devrez " "nous contacter pour valider votre email." -#: templates/registration/mails/email_validation_email.html:11 +#: 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." @@ -2225,11 +2225,11 @@ 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." -#: templates/registration/mails/email_validation_email.html:13 +#: templates/registration/mails/email_validation_email.txt:13 msgid "Thanks" msgstr "Merci" -#: templates/registration/mails/email_validation_email.html:15 +#: templates/registration/mails/email_validation_email.txt:15 msgid "The Note Kfet team." msgstr "L'équipe de la Note Kfet." diff --git a/static/js/transfer.js b/static/js/transfer.js index 5b577066..ddaccc2d 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -333,9 +333,9 @@ $("#btn_transfer").click(function() { "polymorphic_ctype": SPECIAL_TRANSFER_POLYMORPHIC_CTYPE, "resourcetype": "SpecialTransaction", "source": source_id, - "source_alias": sources_notes_display[0].name, + "source_alias": sources_notes_display.length ? sources_notes_display[0].name : null, "destination": dest_id, - "destination_alias": dests_notes_display[0].name, + "destination_alias": dests_notes_display.length ? dests_notes_display[0].name : null, "last_name": $("#last_name").val(), "first_name": $("#first_name").val(), "bank": $("#bank").val() diff --git a/templates/note/mails/negative_balance.html b/templates/note/mails/negative_balance.html new file mode 100644 index 00000000..30e38cc8 --- /dev/null +++ b/templates/note/mails/negative_balance.html @@ -0,0 +1,44 @@ +{% load pretty_money %} + + + + + + Passage en négatif (compte n°{{ note.user.pk }}) + + +

+ Bonjour {{ note.user.first_name }} {{ note.user.last_name }}, +

+ +

+ Ce mail t'a été envoyé parce que le solde de ta Note Kfet {{ note }} est négatif ! +

+ +

+ Ton solde actuel est de {{ note.balance|pretty_money }}. +

+ +

+ Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde + est inférieur à 0 € depuis plus de 24h. +

+ +

+ Si tu ne comprends pas ton solde, tu peux consulter ton historique + sur ton compte. +

+ +

+ Tu peux venir recharger ta note rapidement à la Kfet, ou envoyer un mail à + la trésorerie du BdE (tresorerie.bde@lists.crans.org) + pour payer par virement bancaire. +

+ +-- +

+ Le BDE
+ Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} +

+ + \ No newline at end of file diff --git a/templates/note/mails/negative_balance.txt b/templates/note/mails/negative_balance.txt new file mode 100644 index 00000000..b49caf73 --- /dev/null +++ b/templates/note/mails/negative_balance.txt @@ -0,0 +1,23 @@ +{% load pretty_money %} + +Bonjour {{ note.user.first_name }} {{ note.user.last_name }}, + +Ce mail t'a été envoyé parce que le solde de ta Note Kfet +{{ note }} est négatif ! + +Ton solde actuel est de {{ note.balance|pretty_money }}. + +Par ailleurs, le BDE ne sert pas d'alcool aux adhérents dont le solde +est inférieur à 0 € depuis plus de 24h. + +Si tu ne comprends pas ton solde, tu peux consulter ton historique +sur ton compte {% url "member:user_detail" pk=note.user.pk %} + +Tu peux venir recharger ta note rapidement à la Kfet, ou envoyer un mail à +la trésorerie du BdE (tresorerie.bde@lists.crans.org) pour payer par +virement bancaire. + +-- +Le BDE + +Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} \ No newline at end of file diff --git a/templates/note/mails/negative_notes_report.html b/templates/note/mails/negative_notes_report.html new file mode 100644 index 00000000..c895b903 --- /dev/null +++ b/templates/note/mails/negative_notes_report.html @@ -0,0 +1,41 @@ +{% load pretty_money %} + + + + + + [Note Kfet] Liste des négatifs + + + + + + + + + + + + + + + {% for note in notes %} + + + + + + + + + {% endfor %} + +
NomPrénomPseudoEmailSoldeDurée
{{ note.user.last_name }}{{ note.user.first_name }}{{ note.user.username }}{{ note.user.email }}{{ note.balance|pretty_money }}{{ note.last_negative_duration }}
+ +-- +

+ Le BDE
+ Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} +

+ + \ No newline at end of file diff --git a/templates/note/mails/negative_notes_report.txt b/templates/note/mails/negative_notes_report.txt new file mode 100644 index 00000000..b7fa1f23 --- /dev/null +++ b/templates/note/mails/negative_notes_report.txt @@ -0,0 +1,12 @@ +{% load pretty_money %} + + Nom | Prénom | Pseudo | Email | Solde | Durée +---------------------+------------+-----------------+-----------------------------------+----------+----------- +{% for note in notes %} +{{ note.user.last_name }} | {{ note.user.first_name }} | {{ note.user.username }} | {{ note.user.email }} | {{ note.balance|pretty_money }} | {{ note.last_negative_duration }} +{% endfor %} + +-- +Le BDE + +Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} \ No newline at end of file diff --git a/templates/registration/mails/email_validation_email.html b/templates/registration/mails/email_validation_email.html index 577c1220..0d3afc0e 100644 --- a/templates/registration/mails/email_validation_email.html +++ b/templates/registration/mails/email_validation_email.html @@ -1,15 +1,41 @@ {% load i18n %} -{% trans "Hi" %} {{ user.username }}, + + + + + Passage en négatif (compte n°{{ note.user.pk }}) + + -{% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %} +

+ {% trans "Hi" %} {{ user.username }}, +

-https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} +

+ {% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %} +

-{% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %} +

+ + https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} + +

-{% 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." %} +

+ {% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %} +

-{% trans "Thanks" %}, +

+ {% 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." %} +

-{% trans "The Note Kfet team." %} +

+ {% trans "Thanks" %}, +

+ +-- +

+ {% trans "The Note Kfet team." %} + Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} +

\ No newline at end of file diff --git a/templates/registration/mails/email_validation_email.txt b/templates/registration/mails/email_validation_email.txt new file mode 100644 index 00000000..69f2d642 --- /dev/null +++ b/templates/registration/mails/email_validation_email.txt @@ -0,0 +1,16 @@ +{% load i18n %} + +{% trans "Hi" %} {{ user.username }}, + +{% trans "You recently registered on the Note Kfet. Please click on the link below to confirm your registration." %} + +https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=token %} + +{% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %} + +{% 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." %} + +{% trans "Thanks" %}, + +{% trans "The Note Kfet team." %} +Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} \ No newline at end of file From cadf98101389d1785340ce613b34103171247c0b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 21:48:18 +0200 Subject: [PATCH 002/319] =?UTF-8?q?passer=20en=20n=C3=A9gatif=20->=20?= =?UTF-8?q?=C3=AAtre=20en=20n=C3=A9gatif?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/consos.js | 6 ++++-- static/js/transfer.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/static/js/consos.js b/static/js/consos.js index f0fd3458..7a295b78 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -194,10 +194,12 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat if (!isNaN(source.balance)) { let newBalance = source.balance - quantity * amount; if (newBalance <= -5000) - addMsg("Attention, la note émettrice " + source_alias + " passe en négatif sévère.", + addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + + "succès, mais la note émettrice " + source_alias + " est en négatif sévère.", "danger", 10000); else if (newBalance < 0) - addMsg("Attention, la note émettrice " + source_alias + " passe en négatif.", + addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + + "succès, mais la note émettrice " + source_alias + " est en négatif.", "warning", 10000); } reset(); diff --git a/static/js/transfer.js b/static/js/transfer.js index ddaccc2d..65184fd9 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -247,7 +247,7 @@ $("#btn_transfer").click(function() { addMsg("Le transfert de " + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name + " vers la note " + dest.name + " a été fait avec succès, " + - "mais la note émettrice passe en négatif sévère.", "danger", 10000); + "mais la note émettrice est en négatif sévère.", "danger", 10000); reset(); return; } @@ -255,7 +255,7 @@ $("#btn_transfer").click(function() { addMsg("Le transfert de " + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name + " vers la note " + dest.name + " a été fait avec succès, " + - "mais la note émettrice passe en négatif.", "warning", 10000); + "mais la note émettrice est en négatif.", "warning", 10000); reset(); return; } From 8434841ec5e320387f5bf4bd988b7557068636b6 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 22:28:28 +0200 Subject: [PATCH 003/319] Fix one permission --- apps/permission/fixtures/initial.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 5a3001da..3ac709a2 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2207,7 +2207,7 @@ "auth", "user" ], - "query": "{\"memberships__club\": [\"club\"], \"memberships__date__start__lte\": [\"today\"], \"memberships__date__end__gte\": [\"today\"]}", + "query": "{\"memberships__club\": [\"club\"], \"memberships__date_start__lte\": [\"today\"], \"memberships__date_end__gte\": [\"today\"]}", "type": "view", "mask": 3, "field": "", From c0cdb13130e4d1fbd29aa168cd233352a7176a1e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 22:30:34 +0200 Subject: [PATCH 004/319] Can't concatenate string and proxy --- apps/member/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/member/models.py b/apps/member/models.py index ffe50201..6ba4fb5f 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -131,7 +131,7 @@ class Profile(models.Model): return reverse('user_detail', args=(self.pk,)) def send_email_validation_link(self): - subject = "[Note Kfet]" + _("Activate your Note Kfet account") + subject = "[Note Kfet]" + str(_("Activate your Note Kfet account")) message = loader.render_to_string('registration/mails/email_validation_email.txt', { 'user': self.user, From 5ccbad8359f8f0aa3a6fc3e3fd11d1c05726664e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 23:03:10 +0200 Subject: [PATCH 005/319] Fix transfer form reset --- static/js/transfer.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/static/js/transfer.js b/static/js/transfer.js index 65184fd9..45d5508a 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -16,11 +16,13 @@ function reset(refresh=true) { $("#dest_note_list").html(""); let source_field = $("#source_note"); source_field.val(""); - source_field.trigger("keyup"); + let event = jQuery.Event("keyup"); + event.originalEvent = {charCode: 97}; + source_field.trigger(event); source_field.removeClass('is-invalid'); let dest_field = $("#dest_note"); dest_field.val(""); - dest_field.trigger("keyup"); + dest_field.trigger(event); dest_field.removeClass('is-invalid'); let amount_field = $("#amount"); amount_field.val(""); From 37dc535d6d5d2de5e1c639044ee7d212fef23828 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 23:05:14 +0200 Subject: [PATCH 006/319] Display only one user --- apps/member/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/member/views.py b/apps/member/views.py index 30fbb139..d065b2b6 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -131,7 +131,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): """ We can't display information of a not registered user. """ - return super().get_queryset().filter(profile__registration_valid=True) + return super().get_queryset().filter(profile__registration_valid=True).distinct() def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) From b706efe463b5ec78309c6ef4c9a3b99bac6f41f0 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sat, 1 Aug 2020 23:26:11 +0200 Subject: [PATCH 007/319] 2A+ can change their selected bus or team if the registration is not validated --- apps/permission/fixtures/initial.json | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 3ac709a2..d87af102 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2247,6 +2247,22 @@ "description": "Créer une note d'utilisateur" } }, + { + "model": "permission.permission", + "pk": 144, + "fields": { + "model": [ + "wei", + "weiregistration" + ], + "query": "[\"AND\", {\"user\": [\"user\"], \"wei__membership_start__lte\": [\"today\"], \"wei__membership_end__gte\": [\"today\"], \"first_year\": false, \"membership\": null}]", + "type": "change", + "mask": 1, + "field": "information_json", + "permanent": false, + "description": "Modifier mes préférences en terme de bus et d'équipe si mon inscription n'est pas validée et que je suis en 2A+" + } + }, { "model": "permission.role", "pk": 1, @@ -2300,7 +2316,8 @@ 99, 101, 108, - 109 + 109, + 144 ] } }, @@ -2569,7 +2586,8 @@ 140, 141, 142, - 143 + 143, + 144 ] } }, From 0ae61f3643aaab4cae6fbf4e978d9e89f227cb39 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 08:47:23 +0200 Subject: [PATCH 008/319] BDE memberships can start on 1st august --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 4b37f828..1f300c3b 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 4b37f8286f493b1a28bd0faa0052ee3967fe543e +Subproject commit 1f300c3b7bac0b7a31c1a252a83ba68a8268d33d From 2f018f8c9dfbe007e4e628836a115ba081a5d1fb Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 08:57:16 +0200 Subject: [PATCH 009/319] Always query distinct objects --- apps/member/views.py | 2 +- apps/note/views.py | 8 ++++++-- apps/permission/views.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index d065b2b6..30fbb139 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -131,7 +131,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): """ We can't display information of a not registered user. """ - return super().get_queryset().filter(profile__registration_valid=True).distinct() + return super().get_queryset().filter(profile__registration_valid=True) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) diff --git a/apps/note/views.py b/apps/note/views.py index 61b86e92..ef9da668 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -33,7 +33,9 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl extra_context = {"title": _("Transfer money")} def get_queryset(self, **kwargs): - return super().get_queryset(**kwargs).order_by("-created_at").all()[:20] + return Transaction.objects.filter( + PermissionBackend.filter_queryset(self.request.user, Transaction, "view") + ).order_by("-created_at").all()[:20] def get_context_data(self, **kwargs): """ @@ -139,7 +141,9 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): table_class = HistoryTable def get_queryset(self, **kwargs): - return super().get_queryset(**kwargs).order_by("-created_at")[:20] + return Transaction.objects.filter( + PermissionBackend.filter_queryset(self.request.user, Transaction, "view") + ).order_by("-created_at").all()[:20] def get_context_data(self, **kwargs): """ diff --git a/apps/permission/views.py b/apps/permission/views.py index 83deddac..9132e5f0 100644 --- a/apps/permission/views.py +++ b/apps/permission/views.py @@ -20,7 +20,7 @@ class ProtectQuerysetMixin: """ def get_queryset(self, **kwargs): qs = super().get_queryset(**kwargs) - return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")) + return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")).distinct() def get_form(self, form_class=None): form = super().get_form(form_class) From f148c8dacb6f01d6cc993250eb7dee931bd59813 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 09:20:21 +0200 Subject: [PATCH 010/319] Better autocomplete field --- static/js/autocomplete_model.js | 7 ++++++- static/js/base.js | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/static/js/autocomplete_model.js b/static/js/autocomplete_model.js index aa1d220c..6e135ad1 100644 --- a/static/js/autocomplete_model.js +++ b/static/js/autocomplete_model.js @@ -18,7 +18,8 @@ $(document).ready(function () { html += li(prefix + "_" + obj.id, obj[name_field]); }); - $("#" + prefix + "_list").html(html); + let results_list = $("#" + prefix + "_list"); + results_list.html(html); objects.results.forEach(function (obj) { $("#" + prefix + "_" + obj.id).click(function() { @@ -32,6 +33,10 @@ $(document).ready(function () { 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"); + } }); }); }); \ No newline at end of file diff --git a/static/js/base.js b/static/js/base.js index fdad58d7..f485635b 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -86,8 +86,8 @@ function getMatchedNotes(pattern, fun) { * Generate a
  • entry with a given id and text */ function li(id, text, extra_css) { - return "
  • " + text + "
    • \n"; + return "
  • " + text + "
    • \n"; } /** From 8497dbb25c5480b11a865732e5e1ffb6232fad9b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 09:30:18 +0200 Subject: [PATCH 011/319] Club members can see the club --- apps/permission/fixtures/initial.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index d87af102..0fd675c3 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -353,7 +353,7 @@ ], "query": "{\"pk\": [\"club\", \"pk\"]}", "type": "view", - "mask": 3, + "mask": 1, "field": "", "permanent": false, "description": "Voir les informations d'un club" @@ -2282,6 +2282,7 @@ 11, 12, 13, + 22, 48, 52, 126 @@ -2306,6 +2307,7 @@ 15, 16, 17, + 22, 78, 79, 83, @@ -2327,7 +2329,9 @@ "fields": { "for_club": null, "name": "Membre de club", - "permissions": [] + "permissions": [ + 22 + ] } }, { @@ -2337,7 +2341,6 @@ "for_club": null, "name": "Bureau de club", "permissions": [ - 22, 47, 49, 50, From 8de7ba14bd0eaf3ca665ce84cfc14e347a3b2c7d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 09:35:32 +0200 Subject: [PATCH 012/319] Add permission for secretaries --- apps/permission/fixtures/initial.json | 38 +++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 0fd675c3..09bf4675 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2263,6 +2263,22 @@ "description": "Modifier mes préférences en terme de bus et d'équipe si mon inscription n'est pas validée et que je suis en 2A+" } }, + { + "model": "permission.permission", + "pk": 145, + "fields": { + "model": [ + "note", + "noteclub" + ], + "query": "{}", + "type": "view", + "mask": 1, + "field": "", + "permanent": false, + "description": "Voir toutes les notes de club" + } + }, { "model": "permission.role", "pk": 1, @@ -2760,6 +2776,28 @@ ] } }, + { + "model": "permission.role", + "pk": 19, + "fields": { + "for_club": 1, + "name": "Secrétaire BDE", + "permissions": [ + 54, + 55, + 56, + 57, + 58, + 135, + 136, + 137, + 138, + 139, + 140, + 145 + ] + } + }, { "model": "wei.weirole", "pk": 12, From 7742358b8f2d11bae9b02810d17111fdbec18c9e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 09:49:45 +0200 Subject: [PATCH 013/319] Secretaries can view and add memberships --- apps/permission/fixtures/initial.json | 45 +++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 09bf4675..2b9b086c 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2279,6 +2279,38 @@ "description": "Voir toutes les notes de club" } }, + { + "model": "permission.permission", + "pk": 146, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{}", + "type": "view", + "mask": 3, + "field": "", + "permanent": false, + "description": "Voir tous les adhérents du club" + } + }, + { + "model": "permission.permission", + "pk": 147, + "fields": { + "model": [ + "member", + "membership" + ], + "query": "{}", + "type": "add", + "mask": 3, + "field": "", + "permanent": false, + "description": "Ajouter un membre à n'importe quel club" + } + }, { "model": "permission.role", "pk": 1, @@ -2456,7 +2488,9 @@ 137, 138, 139, - 143 + 143, + 146, + 147 ] } }, @@ -2606,7 +2640,10 @@ 141, 142, 143, - 144 + 144, + 145, + 146, + 147 ] } }, @@ -2794,7 +2831,9 @@ 138, 139, 140, - 145 + 145, + 146, + 147 ] } }, From f870af139e92b17ba59f4d12f4f02d9bf8147a5d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 09:51:39 +0200 Subject: [PATCH 014/319] Typos --- apps/permission/fixtures/initial.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 2b9b086c..bbe2e7e9 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -68,7 +68,7 @@ "mask": 1, "field": "", "permanent": true, - "description": "Vioir sa propre note d'utilisateur" + "description": "Voir sa propre note d'utilisateur" } }, { @@ -868,7 +868,7 @@ "mask": 3, "field": "", "permanent": false, - "description": "Modifier n'import quel utilisateur" + "description": "Modifier n'importe quel utilisateur" } }, { From 58fe8914cfd5a0dfca76e92bde4e638b1ff827c2 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 2 Aug 2020 22:39:30 +0200 Subject: [PATCH 015/319] :bug: Fix infinite loop in permission check --- apps/permission/models.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/permission/models.py b/apps/permission/models.py index d2ac2195..bf7dabfa 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -45,12 +45,11 @@ class InstancedPermission: else: oldpk = obj.pk # Ensure previous models are deleted - count = 0 - while count < 1000: + for ignored in range(1000): if self.model.model_class().objects.filter(pk=obj.pk).exists(): # If the object exists, that means that one permission is currently checked. # We wait before the other permission, at most 1 second. - sleep(1) + sleep(0.001) continue break for o in self.model.model_class().objects.filter(pk=obj.pk).all(): From 0e3c4fcaf6dea06590259447c977c15001d2cdec Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 10:03:51 +0200 Subject: [PATCH 016/319] Warn users when a transaction has no source or no destination --- static/js/base.js | 3 +++ static/js/consos.js | 16 ++++++++++++++++ static/js/transfer.js | 20 ++++++++++---------- templates/note/conso_form.html | 4 ++-- 4 files changed, 31 insertions(+), 12 deletions(-) diff --git a/static/js/base.js b/static/js/base.js index f485635b..cf67759b 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -217,6 +217,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr // Clear search on click field.click(function () { field.tooltip('hide'); + field.removeClass('is-invalid'); field.val(""); }); @@ -233,6 +234,8 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr // When the user type something, the matched aliases are refreshed field.keyup(function (e) { + field.removeClass('is-invalid'); + if (e.originalEvent.charCode === 13) return; diff --git a/static/js/consos.js b/static/js/consos.js index 7a295b78..3b6b5bc5 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -154,6 +154,22 @@ function reset() { * Apply all transactions: all notes in `notes` buy each item in `buttons` */ function consumeAll() { + let error = false; + + if (notes_display.length === 0) { + $("#note").addClass('is-invalid'); + $("#note_list").html(li("", "Ajoutez des émetteurs.", "text-danger")); + error = true; + } + + if (buttons.length === 0) { + $("#consos_list").html(li("", "Ajoutez des consommations.", "text-danger")); + error = true; + } + + if (error) + return; + notes_display.forEach(function(note_display) { buttons.forEach(function(button) { consume(note_display.note, note_display.name, button.dest, button.quantity * note_display.quantity, button.amount, diff --git a/static/js/transfer.js b/static/js/transfer.js index 45d5508a..70cf10dc 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -219,6 +219,16 @@ $("#btn_transfer").click(function() { error = true; } + if (!sources_notes_display.length && !$("#type_credit").is(':checked')) { + $("#source_note").addClass('is-invalid'); + error = true; + } + + if (!dests_notes_display.length && !$("#type_debit").is(':checked')) { + $("#dest_note").addClass('is-invalid'); + error = true; + } + if (error) return; @@ -300,11 +310,6 @@ $("#btn_transfer").click(function() { let given_reason = reason; let source_id, dest_id; if ($("#type_credit").is(':checked')) { - if (!dests_notes_display.length) { - $("#dest_note").addClass('is-invalid'); - return; - } - user_note = dests_notes_display[0].note.id; source_id = special_note; dest_id = user_note; @@ -313,11 +318,6 @@ $("#btn_transfer").click(function() { reason += " (" + given_reason + ")"; } else { - if (!sources_notes_display.length) { - $("#source_note").addClass('is-invalid'); - return; - } - user_note = sources_notes_display[0].note.id; source_id = user_note; dest_id = special_note; diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html index e6335c6e..a63f7ffe 100644 --- a/templates/note/conso_form.html +++ b/templates/note/conso_form.html @@ -53,9 +53,9 @@
    - + {% trans "Consume!" %} - +
    From 0e8174aacdf5b25bf493c48f23f33f9ed775540b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 10:50:55 +0200 Subject: [PATCH 017/319] :bug: Fix objects with pk 0 --- apps/permission/models.py | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/apps/permission/models.py b/apps/permission/models.py index bf7dabfa..235977bb 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -4,12 +4,15 @@ import functools import json import operator +from copy import copy from time import sleep from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError +from django.core.mail import mail_admins from django.db import models from django.db.models import F, Q, Model +from django.forms import model_to_dict from django.utils.translation import gettext_lazy as _ @@ -38,35 +41,40 @@ class InstancedPermission: if permission_type == self.type: self.update_query() - # Don't increase indexes, if the primary key is an AutoField - if not hasattr(obj, "pk") or not obj.pk: - obj.pk = 0 - oldpk = None - else: - oldpk = obj.pk + obj = copy(obj) + obj.pk = 0 # Ensure previous models are deleted for ignored in range(1000): - if self.model.model_class().objects.filter(pk=obj.pk).exists(): + if self.model.model_class().objects.filter(pk=0).exists(): # If the object exists, that means that one permission is currently checked. # We wait before the other permission, at most 1 second. sleep(0.001) continue break - for o in self.model.model_class().objects.filter(pk=obj.pk).all(): + for o in self.model.model_class().objects.filter(pk=0).all(): o._force_delete = True Model.delete(o) + # An object with pk 0 wouldn't deleted. That's not normal, we alert admins. + msg = "Lors de la vérification d'une permission d'ajout, un objet de clé primaire nulle était "\ + "encore présent.\n"\ + "Type de permission : " + self.type + "\n"\ + "Modèle : " + str(self.model) + "\n"\ + "Objet trouvé : " + str(model_to_dict(o)) + "\n\n"\ + "--\nLe BDE" + mail_admins("[Note Kfet] Un objet a été supprimé de force", msg) + # Force insertion, no data verification, no trigger obj._force_save = True Model.save(obj, force_insert=True) # We don't want log anything obj._no_log = True - ret = self.model.model_class().objects.filter(self.query & Q(pk=obj.pk)).exists() + ret = self.model.model_class().objects.filter(self.query & Q(pk=0)).exists() # Delete testing object obj._force_delete = True Model.delete(obj) - # If the primary key was specified, we restore it - obj.pk = oldpk + with open("/tmp/log", "w") as f: + f.write(str(obj) + ", " + str(obj.pk) + ", " + str(self.model.model_class().objects.filter(pk=0).exists())) return ret if permission_type == self.type: From 6c8843e5fc5cb1ff0a227fd8292721ad981f443c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 10:54:52 +0200 Subject: [PATCH 018/319] :bug: Reset transfer form even if the note has not enough money --- static/js/transfer.js | 1 + 1 file changed, 1 insertion(+) diff --git a/static/js/transfer.js b/static/js/transfer.js index 70cf10dc..feca4a0d 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -296,6 +296,7 @@ $("#btn_transfer").click(function() { addMsg("Le transfert de " + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name + " vers la note " + dest.name + " a échoué : Solde insuffisant", "danger", 10000); + reset(); }).fail(function (err) { addMsg("Le transfert de " + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name From 94086505e68965dd7508ca2a8767d50ca640c487 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 11:16:01 +0200 Subject: [PATCH 019/319] Fix note balances --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 1f300c3b..f41a5a32 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 1f300c3b7bac0b7a31c1a252a83ba68a8268d33d +Subproject commit f41a5a32f7417a874b497640373ea3911eb1e133 From f8a4087e56f45a282471a1ab9e89ea08a741e2e9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 11:32:37 +0200 Subject: [PATCH 020/319] :bug: Display full registration table when the search bar is empty --- apps/registration/views.py | 2 -- apps/wei/views.py | 14 ++++++-------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/apps/registration/views.py b/apps/registration/views.py index 804c9fa9..f4574b0f 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -179,8 +179,6 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi | Q(profile__section__iregex=pattern) | Q(username__iregex="^" + pattern) ) - else: - qs = qs.none() return qs[:20] diff --git a/apps/wei/views.py b/apps/wei/views.py index 2210a347..fb0f7b32 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -236,14 +236,12 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable pattern = self.request.GET.get("search", "") if not pattern: - return qs.none() - - qs = qs.filter( - Q(user__first_name__iregex=pattern) - | Q(user__last_name__iregex=pattern) - | Q(user__note__alias__name__iregex="^" + pattern) - | Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern)) - ) + qs = qs.filter( + Q(user__first_name__iregex=pattern) + | Q(user__last_name__iregex=pattern) + | Q(user__note__alias__name__iregex="^" + pattern) + | Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern)) + ) return qs[:20] From 66defee3ea84145039d202ec6aeeede54884cca8 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 11:41:06 +0200 Subject: [PATCH 021/319] :bug: Display the invalidity reason of an invalid transaction even if we can't validate it --- apps/note/tables.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index 0048a0a5..505e8dfa 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -68,12 +68,8 @@ class HistoryTable(tables.Table): "note.change_transaction_invalidity_reason", record) else None, "onmouseover": lambda record: '$("#invalidity_reason_' + str(record.id) + '").show();$("#invalidity_reason_' - + str(record.id) + '").focus();' - if PermissionBackend.check_perm(get_current_authenticated_user(), - "note.change_transaction_invalidity_reason", record) else None, - "onmouseout": lambda record: '$("#invalidity_reason_' + str(record.id) + '").hide()' - if PermissionBackend.check_perm(get_current_authenticated_user(), - "note.change_transaction_invalidity_reason", record) else None, + + str(record.id) + '").focus();', + "onmouseout": lambda record: '$("#invalidity_reason_' + str(record.id) + '").hide()', } } ) @@ -101,15 +97,18 @@ class HistoryTable(tables.Table): """ When the validation status is hovered, an input field is displayed to let the user specify an invalidity reason """ + has_perm = PermissionBackend\ + .check_perm(get_current_authenticated_user(), "note.change_transaction_invalidity_reason", record) + val = "✔" if value else "✖" - if not PermissionBackend\ - .check_perm(get_current_authenticated_user(), "note.change_transaction_invalidity_reason", record): + + if value and not has_perm: return val val += "" return format_html(val) From fbf3a0bcf6d92ab60f6014963c4cff2fee2352d9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 12:35:51 +0200 Subject: [PATCH 022/319] :bug: A new user can't take an existing alias as username --- apps/member/models.py | 2 +- apps/registration/forms.py | 8 +- locale/de/LC_MESSAGES/django.po | 473 +++++++++-------- locale/fr/LC_MESSAGES/django.po | 492 +++++++++--------- .../email_validation_email_sent.html | 10 +- .../mails/email_validation_email.html | 2 +- .../mails/email_validation_email.txt | 2 +- 7 files changed, 525 insertions(+), 464 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 6ba4fb5f..5d6544af 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -139,7 +139,7 @@ class Profile(models.Model): 'token': email_validation_token.make_token(self.user), 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)), }) - html = loader.render_to_string('registration/mails/email_validation_email.txt', + html = loader.render_to_string('registration/mails/email_validation_email.html', { 'user': self.user, 'domain': os.getenv("NOTE_URL", "note.example.com"), diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 46559487..3ba791a0 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -5,7 +5,7 @@ from django import forms from django.contrib.auth.forms import UserCreationForm from django.contrib.auth.models import User from django.utils.translation import gettext_lazy as _ -from note.models import NoteSpecial +from note.models import NoteSpecial, Alias from note_kfet.inputs import AmountInput @@ -22,6 +22,12 @@ class SignUpForm(UserCreationForm): self.fields['email'].required = True self.fields['email'].help_text = _("This address must be valid.") + def clean_username(self): + value = self.cleaned_data["username"] + if Alias.objects.filter(normalized_name=Alias.normalize(value)).exists(): + self.add_error("username", _("An alias with a similar name already exists.")) + return value + class Meta: model = User fields = ('first_name', 'last_name', 'username', 'email', ) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index d28ecb34..b094a5ac 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-01 15:06+0200\n" +"POT-Creation-Date: 2020-08-03 12:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,35 +18,35 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:102 -#: apps/activity/models.py:117 +#: apps/activity/apps.py:10 apps/activity/models.py:106 +#: apps/activity/models.py:121 msgid "activity" msgstr "" -#: apps/activity/forms.py:45 apps/activity/models.py:213 +#: apps/activity/forms.py:45 apps/activity/models.py:217 msgid "You can't invite someone once the activity is started." msgstr "" -#: apps/activity/forms.py:48 apps/activity/models.py:216 +#: apps/activity/forms.py:48 apps/activity/models.py:220 msgid "This activity is not validated yet." msgstr "" -#: apps/activity/forms.py:58 apps/activity/models.py:224 +#: apps/activity/forms.py:58 apps/activity/models.py:228 msgid "This person has been already invited 5 times this year." msgstr "" -#: apps/activity/forms.py:62 apps/activity/models.py:228 +#: apps/activity/forms.py:62 apps/activity/models.py:232 msgid "This person is already invited." msgstr "" -#: apps/activity/forms.py:66 apps/activity/models.py:232 +#: apps/activity/forms.py:66 apps/activity/models.py:236 msgid "You can't invite more than 3 people to this activity." msgstr "" -#: apps/activity/models.py:23 apps/activity/models.py:48 -#: apps/member/models.py:151 apps/note/models/notes.py:188 +#: apps/activity/models.py:24 apps/activity/models.py:49 +#: apps/member/models.py:158 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:263 apps/permission/models.py:332 +#: apps/note/models/transactions.py:263 apps/permission/models.py:339 #: apps/wei/models.py:65 apps/wei/models.py:117 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -54,123 +54,123 @@ msgstr "" msgid "name" msgstr "" -#: apps/activity/models.py:27 templates/activity/activity_detail.html:39 +#: apps/activity/models.py:28 templates/activity/activity_detail.html:39 msgid "can invite" msgstr "" -#: apps/activity/models.py:30 templates/activity/activity_detail.html:43 +#: apps/activity/models.py:31 templates/activity/activity_detail.html:43 msgid "guest entry fee" msgstr "" -#: apps/activity/models.py:34 +#: apps/activity/models.py:35 msgid "activity type" msgstr "" -#: apps/activity/models.py:35 +#: apps/activity/models.py:36 msgid "activity types" msgstr "" -#: apps/activity/models.py:53 apps/note/models/transactions.py:81 -#: apps/permission/models.py:113 apps/permission/models.py:192 +#: apps/activity/models.py:54 apps/note/models/transactions.py:81 +#: apps/permission/models.py:120 apps/permission/models.py:199 #: apps/wei/models.py:71 apps/wei/models.py:128 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "" -#: apps/activity/models.py:60 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:66 apps/permission/models.py:167 +#: apps/activity/models.py:61 apps/note/models/notes.py:188 +#: apps/note/models/transactions.py:66 apps/permission/models.py:174 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" -#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:259 -#: apps/note/models/notes.py:117 apps/treasury/models.py:221 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:266 +#: apps/note/models/notes.py:126 apps/treasury/models.py:222 #: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" msgstr "" -#: apps/activity/models.py:73 templates/activity/activity_detail.html:33 +#: apps/activity/models.py:74 templates/activity/activity_detail.html:33 msgid "organizer" msgstr "" -#: apps/activity/models.py:80 templates/activity/activity_detail.html:36 +#: apps/activity/models.py:81 templates/activity/activity_detail.html:36 msgid "attendees club" msgstr "" -#: apps/activity/models.py:84 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:85 templates/activity/activity_detail.html:22 msgid "start date" msgstr "" -#: apps/activity/models.py:88 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:89 templates/activity/activity_detail.html:25 msgid "end date" msgstr "" -#: apps/activity/models.py:93 apps/note/models/transactions.py:146 +#: apps/activity/models.py:94 apps/note/models/transactions.py:146 #: templates/activity/activity_detail.html:47 msgid "valid" msgstr "" -#: apps/activity/models.py:98 templates/activity/activity_detail.html:61 +#: apps/activity/models.py:99 templates/activity/activity_detail.html:61 msgid "open" msgstr "" -#: apps/activity/models.py:103 +#: apps/activity/models.py:107 msgid "activities" msgstr "" -#: apps/activity/models.py:122 +#: apps/activity/models.py:126 msgid "entry time" msgstr "" -#: apps/activity/models.py:128 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/activity/models.py:132 apps/note/apps.py:14 +#: apps/note/models/notes.py:60 msgid "note" msgstr "" -#: apps/activity/models.py:139 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:143 templates/activity/activity_entry.html:38 msgid "entry" msgstr "" -#: apps/activity/models.py:140 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:144 templates/activity/activity_entry.html:38 msgid "entries" msgstr "" -#: apps/activity/models.py:146 +#: apps/activity/models.py:150 msgid "Already entered on " msgstr "" -#: apps/activity/models.py:146 apps/activity/tables.py:54 +#: apps/activity/models.py:150 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "" -#: apps/activity/models.py:154 +#: apps/activity/models.py:158 msgid "The balance is negative." msgstr "" -#: apps/activity/models.py:184 +#: apps/activity/models.py:188 msgid "last name" msgstr "" -#: apps/activity/models.py:189 templates/member/profile_info.html:14 +#: apps/activity/models.py:193 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weimembership_form.html:18 msgid "first name" msgstr "" -#: apps/activity/models.py:196 +#: apps/activity/models.py:200 msgid "inviter" msgstr "" -#: apps/activity/models.py:237 +#: apps/activity/models.py:244 msgid "guest" msgstr "" -#: apps/activity/models.py:238 +#: apps/activity/models.py:245 msgid "guests" msgstr "" -#: apps/activity/models.py:250 +#: apps/activity/models.py:257 msgid "Invitation" msgstr "" @@ -182,26 +182,26 @@ msgstr "" msgid "remove" msgstr "" -#: apps/activity/tables.py:75 apps/treasury/models.py:140 +#: apps/activity/tables.py:75 apps/treasury/models.py:141 msgid "Type" msgstr "" #: apps/activity/tables.py:77 apps/member/forms.py:102 -#: apps/registration/forms.py:64 apps/treasury/forms.py:120 +#: apps/registration/forms.py:70 apps/treasury/forms.py:120 msgid "Last name" msgstr "" #: apps/activity/tables.py:79 apps/member/forms.py:107 -#: apps/registration/forms.py:69 apps/treasury/forms.py:122 +#: apps/registration/forms.py:75 apps/treasury/forms.py:122 #: templates/note/transaction_form.html:129 msgid "First name" msgstr "" -#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +#: apps/activity/tables.py:81 apps/note/models/notes.py:69 msgid "Note" msgstr "" -#: apps/activity/tables.py:83 apps/member/tables.py:42 +#: apps/activity/tables.py:83 apps/member/tables.py:43 msgid "Balance" msgstr "" @@ -209,7 +209,7 @@ msgstr "" msgid "Create new activity" msgstr "" -#: apps/activity/views.py:41 templates/base.html:121 +#: apps/activity/views.py:41 templates/base.html:114 msgid "Activities" msgstr "" @@ -237,75 +237,75 @@ msgstr "" msgid "Logs" msgstr "" -#: apps/logs/models.py:27 +#: apps/logs/models.py:28 msgid "IP Address" msgstr "" -#: apps/logs/models.py:35 apps/permission/models.py:137 +#: apps/logs/models.py:36 apps/permission/models.py:144 msgid "model" msgstr "" -#: apps/logs/models.py:42 +#: apps/logs/models.py:43 msgid "identifier" msgstr "" -#: apps/logs/models.py:47 +#: apps/logs/models.py:48 msgid "previous data" msgstr "" -#: apps/logs/models.py:52 +#: apps/logs/models.py:53 msgid "new data" msgstr "" -#: apps/logs/models.py:60 +#: apps/logs/models.py:61 msgid "create" msgstr "" -#: apps/logs/models.py:61 apps/note/tables.py:161 +#: apps/logs/models.py:62 apps/note/tables.py:160 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166 -#: apps/permission/models.py:130 apps/wei/tables.py:65 +#: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 +#: apps/permission/models.py:137 apps/wei/tables.py:65 msgid "delete" msgstr "" -#: apps/logs/models.py:65 +#: apps/logs/models.py:66 msgid "action" msgstr "" -#: apps/logs/models.py:73 +#: apps/logs/models.py:74 msgid "timestamp" msgstr "" -#: apps/logs/models.py:77 +#: apps/logs/models.py:78 msgid "Logs cannot be destroyed." msgstr "" -#: apps/logs/models.py:80 +#: apps/logs/models.py:81 msgid "changelog" msgstr "" -#: apps/logs/models.py:81 +#: apps/logs/models.py:82 msgid "changelogs" msgstr "" -#: apps/member/admin.py:53 apps/member/models.py:178 +#: apps/member/admin.py:52 apps/member/models.py:185 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "" -#: apps/member/admin.py:54 apps/member/models.py:183 +#: apps/member/admin.py:53 apps/member/models.py:190 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/admin.py:68 apps/member/models.py:270 +#: apps/member/admin.py:67 apps/member/models.py:277 msgid "roles" msgstr "" -#: apps/member/admin.py:69 apps/member/models.py:284 +#: apps/member/admin.py:68 apps/member/models.py:291 msgid "fee" msgstr "" @@ -314,22 +314,23 @@ msgid "member" msgstr "" #: apps/member/forms.py:58 apps/member/views.py:82 +#: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/forms.py:81 apps/registration/forms.py:44 +#: apps/member/forms.py:81 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "" -#: apps/member/forms.py:83 apps/registration/forms.py:46 +#: apps/member/forms.py:83 apps/registration/forms.py:52 msgid "Check this case is the Société Générale paid the inscription." msgstr "" -#: apps/member/forms.py:88 apps/registration/forms.py:51 +#: apps/member/forms.py:88 apps/registration/forms.py:57 msgid "Credit type" msgstr "" -#: apps/member/forms.py:89 apps/registration/forms.py:52 +#: apps/member/forms.py:89 apps/registration/forms.py:58 msgid "No credit" msgstr "" @@ -337,20 +338,20 @@ msgstr "" msgid "You can credit the note of the user." msgstr "" -#: apps/member/forms.py:95 apps/registration/forms.py:57 +#: apps/member/forms.py:95 apps/registration/forms.py:63 msgid "Credit amount" msgstr "" -#: apps/member/forms.py:112 apps/registration/forms.py:74 +#: apps/member/forms.py:112 apps/registration/forms.py:80 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:135 msgid "Bank" msgstr "" -#: apps/member/forms.py:138 +#: apps/member/forms.py:139 msgid "User" msgstr "" -#: apps/member/forms.py:152 +#: apps/member/forms.py:153 msgid "Roles" msgstr "" @@ -478,94 +479,94 @@ msgstr "" msgid "Activate your Note Kfet account" msgstr "" -#: apps/member/models.py:156 templates/member/club_info.html:57 +#: apps/member/models.py:163 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "" -#: apps/member/models.py:163 +#: apps/member/models.py:170 msgid "parent club" msgstr "" -#: apps/member/models.py:172 +#: apps/member/models.py:179 msgid "require memberships" msgstr "" -#: apps/member/models.py:173 +#: apps/member/models.py:180 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:189 templates/member/club_info.html:33 +#: apps/member/models.py:196 templates/member/club_info.html:33 msgid "membership duration" msgstr "" -#: apps/member/models.py:190 +#: apps/member/models.py:197 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:197 templates/member/club_info.html:23 +#: apps/member/models.py:204 templates/member/club_info.html:23 msgid "membership start" msgstr "" -#: apps/member/models.py:198 +#: apps/member/models.py:205 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:205 templates/member/club_info.html:28 +#: apps/member/models.py:212 templates/member/club_info.html:28 msgid "membership end" msgstr "" -#: apps/member/models.py:206 +#: apps/member/models.py:213 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:240 apps/member/models.py:265 -#: apps/note/models/notes.py:139 +#: apps/member/models.py:247 apps/member/models.py:272 +#: apps/note/models/notes.py:163 msgid "club" msgstr "" -#: apps/member/models.py:241 +#: apps/member/models.py:248 msgid "clubs" msgstr "" -#: apps/member/models.py:275 +#: apps/member/models.py:282 msgid "membership starts on" msgstr "" -#: apps/member/models.py:279 +#: apps/member/models.py:286 msgid "membership ends on" msgstr "" -#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:797 +#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:795 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:310 +#: apps/member/models.py:317 #, python-brace-format msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:321 apps/member/views.py:544 +#: apps/member/models.py:328 apps/member/views.py:544 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:372 +#: apps/member/models.py:379 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:375 +#: apps/member/models.py:382 msgid "membership" msgstr "" -#: apps/member/models.py:376 +#: apps/member/models.py:383 msgid "memberships" msgstr "" -#: apps/member/tables.py:113 +#: apps/member/tables.py:114 msgid "Renew" msgstr "" @@ -619,7 +620,7 @@ msgstr "" msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:530 apps/wei/views.py:788 +#: apps/member/views.py:530 apps/wei/views.py:786 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -634,8 +635,8 @@ msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" #: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574 -#: apps/registration/views.py:292 apps/registration/views.py:294 -#: apps/registration/views.py:296 +#: apps/registration/views.py:290 apps/registration/views.py:292 +#: apps/registration/views.py:294 msgid "This field is required." msgstr "" @@ -647,16 +648,16 @@ msgstr "" msgid "Members of the club" msgstr "" -#: apps/note/admin.py:134 apps/note/models/transactions.py:106 +#: apps/note/admin.py:133 apps/note/models/transactions.py:106 msgid "source" msgstr "" -#: apps/note/admin.py:142 apps/note/admin.py:192 +#: apps/note/admin.py:141 apps/note/admin.py:191 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119 msgid "destination" msgstr "" -#: apps/note/admin.py:197 apps/note/models/transactions.py:59 +#: apps/note/admin.py:196 apps/note/models/transactions.py:59 #: apps/note/models/transactions.py:137 msgid "amount" msgstr "" @@ -669,104 +670,104 @@ msgstr "" msgid "Maximal size: 2MB" msgstr "" -#: apps/note/models/notes.py:27 +#: apps/note/models/notes.py:29 msgid "account balance" msgstr "" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:30 msgid "in centimes, money credited for this instance" msgstr "" -#: apps/note/models/notes.py:32 +#: apps/note/models/notes.py:34 msgid "last negative date" msgstr "" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:35 msgid "last time the balance was negative" msgstr "" -#: apps/note/models/notes.py:38 +#: apps/note/models/notes.py:40 msgid "active" msgstr "" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:43 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" -#: apps/note/models/notes.py:45 +#: apps/note/models/notes.py:47 msgid "display image" msgstr "" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:129 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:129 msgid "created at" msgstr "" -#: apps/note/models/notes.py:59 +#: apps/note/models/notes.py:61 msgid "notes" msgstr "" -#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 +#: apps/note/models/notes.py:86 apps/note/models/notes.py:110 msgid "This alias is already taken." msgstr "" -#: apps/note/models/notes.py:121 +#: apps/note/models/notes.py:130 msgid "one's note" msgstr "" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:131 msgid "users note" msgstr "" -#: apps/note/models/notes.py:128 +#: apps/note/models/notes.py:137 #, python-format msgid "%(user)s's note" msgstr "" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:167 msgid "club note" msgstr "" -#: apps/note/models/notes.py:144 +#: apps/note/models/notes.py:168 msgid "clubs notes" msgstr "" -#: apps/note/models/notes.py:150 +#: apps/note/models/notes.py:174 #, python-format msgid "Note of %(club)s club" msgstr "" -#: apps/note/models/notes.py:170 +#: apps/note/models/notes.py:194 msgid "special note" msgstr "" -#: apps/note/models/notes.py:171 +#: apps/note/models/notes.py:195 msgid "special notes" msgstr "" -#: apps/note/models/notes.py:194 +#: apps/note/models/notes.py:218 msgid "Invalid alias" msgstr "" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:234 msgid "alias" msgstr "" -#: apps/note/models/notes.py:211 templates/member/club_info.html:54 +#: apps/note/models/notes.py:235 templates/member/club_info.html:54 #: templates/member/profile_info.html:38 templates/wei/weiclub_info.html:48 msgid "aliases" msgstr "" -#: apps/note/models/notes.py:233 +#: apps/note/models/notes.py:257 msgid "Alias is too long." msgstr "" -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:262 msgid "An alias with a similar name already exists: {} " msgstr "" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:275 msgid "You can't delete your main alias." msgstr "" @@ -815,7 +816,7 @@ msgstr "" msgid "reason" msgstr "" -#: apps/note/models/transactions.py:151 apps/note/tables.py:113 +#: apps/note/models/transactions.py:151 apps/note/tables.py:112 msgid "invalidity reason" msgstr "" @@ -873,7 +874,7 @@ msgstr "" msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:308 apps/treasury/models.py:227 +#: apps/note/models/transactions.py:308 apps/treasury/models.py:228 msgid "membership transactions" msgstr "" @@ -885,17 +886,17 @@ msgstr "" msgid "Click to validate" msgstr "" -#: apps/note/tables.py:111 +#: apps/note/tables.py:110 msgid "No reason specified" msgstr "" -#: apps/note/tables.py:140 apps/note/tables.py:168 apps/wei/tables.py:66 +#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:66 #: templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "" -#: apps/note/tables.py:163 apps/wei/tables.py:42 apps/wei/tables.py:43 +#: apps/note/tables.py:162 apps/wei/tables.py:42 apps/wei/tables.py:43 #: templates/member/club_info.html:67 templates/note/conso_form.html:128 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 @@ -906,95 +907,95 @@ msgstr "" msgid "Transfer money" msgstr "" -#: apps/note/views.py:67 +#: apps/note/views.py:69 msgid "Create new button" msgstr "" -#: apps/note/views.py:76 +#: apps/note/views.py:78 msgid "Search button" msgstr "" -#: apps/note/views.py:99 +#: apps/note/views.py:101 msgid "Update button" msgstr "" -#: apps/note/views.py:136 templates/base.html:94 +#: apps/note/views.py:138 templates/base.html:94 msgid "Consumptions" msgstr "" -#: apps/permission/models.py:92 +#: apps/permission/models.py:99 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:94 +#: apps/permission/models.py:101 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:107 +#: apps/permission/models.py:114 msgid "rank" msgstr "" -#: apps/permission/models.py:120 +#: apps/permission/models.py:127 msgid "permission mask" msgstr "" -#: apps/permission/models.py:121 +#: apps/permission/models.py:128 msgid "permission masks" msgstr "" -#: apps/permission/models.py:127 +#: apps/permission/models.py:134 msgid "add" msgstr "" -#: apps/permission/models.py:128 +#: apps/permission/models.py:135 msgid "view" msgstr "" -#: apps/permission/models.py:129 +#: apps/permission/models.py:136 msgid "change" msgstr "" -#: apps/permission/models.py:161 +#: apps/permission/models.py:168 msgid "query" msgstr "" -#: apps/permission/models.py:174 +#: apps/permission/models.py:181 msgid "mask" msgstr "" -#: apps/permission/models.py:180 +#: apps/permission/models.py:187 msgid "field" msgstr "" -#: apps/permission/models.py:185 +#: apps/permission/models.py:192 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." msgstr "" -#: apps/permission/models.py:186 templates/permission/all_rights.html:26 +#: apps/permission/models.py:193 templates/permission/all_rights.html:26 msgid "permanent" msgstr "" -#: apps/permission/models.py:197 +#: apps/permission/models.py:204 msgid "permission" msgstr "" -#: apps/permission/models.py:198 apps/permission/models.py:337 +#: apps/permission/models.py:205 apps/permission/models.py:344 msgid "permissions" msgstr "" -#: apps/permission/models.py:203 +#: apps/permission/models.py:210 msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/permission/models.py:342 +#: apps/permission/models.py:349 msgid "for club" msgstr "" -#: apps/permission/models.py:352 apps/permission/models.py:353 +#: apps/permission/models.py:359 apps/permission/models.py:360 msgid "role permissions" msgstr "" @@ -1019,7 +1020,7 @@ msgid "" "{model_name}." msgstr "" -#: apps/permission/views.py:44 templates/base.html:136 +#: apps/permission/views.py:44 templates/base.html:129 msgid "Rights" msgstr "" @@ -1031,21 +1032,21 @@ msgstr "" msgid "registration" msgstr "" -#: apps/registration/forms.py:32 +#: apps/registration/forms.py:38 msgid "Register to the WEI" msgstr "" -#: apps/registration/forms.py:34 +#: apps/registration/forms.py:40 msgid "" "Check this case if you want to register to the WEI. If you hesitate, you " "will be able to register later, after validating your account in the Kfet." msgstr "" -#: apps/registration/forms.py:79 +#: apps/registration/forms.py:85 msgid "Join BDE Club" msgstr "" -#: apps/registration/forms.py:86 +#: apps/registration/forms.py:92 msgid "Join Kfet Club" msgstr "" @@ -1077,32 +1078,32 @@ msgstr "" msgid "Pre-registered users list" msgstr "" -#: apps/registration/views.py:190 +#: apps/registration/views.py:188 msgid "Unregistered users" msgstr "" -#: apps/registration/views.py:203 +#: apps/registration/views.py:201 msgid "Registration detail" msgstr "" -#: apps/registration/views.py:258 +#: apps/registration/views.py:256 msgid "You must join the BDE." msgstr "" -#: apps/registration/views.py:280 +#: apps/registration/views.py:278 msgid "You must join BDE club before joining Kfet club." msgstr "" -#: apps/registration/views.py:285 +#: apps/registration/views.py:283 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" -#: apps/registration/views.py:360 +#: apps/registration/views.py:358 msgid "Invalidate pre-registration" msgstr "" -#: apps/treasury/apps.py:12 templates/base.html:126 +#: apps/treasury/apps.py:12 templates/base.html:119 msgid "Treasury" msgstr "" @@ -1136,128 +1137,128 @@ msgstr "" msgid "Amount" msgstr "" -#: apps/treasury/models.py:20 +#: apps/treasury/models.py:21 msgid "Invoice identifier" msgstr "" -#: apps/treasury/models.py:34 +#: apps/treasury/models.py:35 msgid "BDE" msgstr "" -#: apps/treasury/models.py:39 +#: apps/treasury/models.py:40 msgid "Object" msgstr "" -#: apps/treasury/models.py:43 +#: apps/treasury/models.py:44 msgid "Description" msgstr "" -#: apps/treasury/models.py:48 templates/note/transaction_form.html:123 +#: apps/treasury/models.py:49 templates/note/transaction_form.html:123 msgid "Name" msgstr "" -#: apps/treasury/models.py:52 +#: apps/treasury/models.py:53 msgid "Address" msgstr "" -#: apps/treasury/models.py:57 +#: apps/treasury/models.py:58 msgid "Place" msgstr "" -#: apps/treasury/models.py:61 +#: apps/treasury/models.py:62 msgid "Acquitted" msgstr "" -#: apps/treasury/models.py:65 +#: apps/treasury/models.py:66 msgid "invoice" msgstr "" -#: apps/treasury/models.py:66 +#: apps/treasury/models.py:67 msgid "invoices" msgstr "" -#: apps/treasury/models.py:81 +#: apps/treasury/models.py:82 msgid "Designation" msgstr "" -#: apps/treasury/models.py:85 +#: apps/treasury/models.py:86 msgid "Quantity" msgstr "" -#: apps/treasury/models.py:89 +#: apps/treasury/models.py:90 msgid "Unit price" msgstr "" -#: apps/treasury/models.py:105 +#: apps/treasury/models.py:106 msgid "product" msgstr "" -#: apps/treasury/models.py:106 +#: apps/treasury/models.py:107 msgid "products" msgstr "" -#: apps/treasury/models.py:123 +#: apps/treasury/models.py:124 msgid "remittance type" msgstr "" -#: apps/treasury/models.py:124 +#: apps/treasury/models.py:125 msgid "remittance types" msgstr "" -#: apps/treasury/models.py:134 +#: apps/treasury/models.py:135 msgid "Date" msgstr "" -#: apps/treasury/models.py:145 +#: apps/treasury/models.py:146 msgid "Comment" msgstr "" -#: apps/treasury/models.py:150 +#: apps/treasury/models.py:151 msgid "Closed" msgstr "" -#: apps/treasury/models.py:154 +#: apps/treasury/models.py:155 msgid "remittance" msgstr "" -#: apps/treasury/models.py:155 +#: apps/treasury/models.py:156 msgid "remittances" msgstr "" -#: apps/treasury/models.py:187 +#: apps/treasury/models.py:188 msgid "Remittance #{:d}: {}" msgstr "" -#: apps/treasury/models.py:206 apps/treasury/tables.py:76 +#: apps/treasury/models.py:207 apps/treasury/tables.py:76 #: apps/treasury/tables.py:84 templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 #: templates/treasury/sogecredit_list.html:13 msgid "Remittance" msgstr "" -#: apps/treasury/models.py:210 +#: apps/treasury/models.py:211 msgid "special transaction proxy" msgstr "" -#: apps/treasury/models.py:211 +#: apps/treasury/models.py:212 msgid "special transaction proxies" msgstr "" -#: apps/treasury/models.py:233 +#: apps/treasury/models.py:234 msgid "credit transaction" msgstr "" -#: apps/treasury/models.py:296 +#: apps/treasury/models.py:297 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." msgstr "" -#: apps/treasury/models.py:308 templates/treasury/sogecredit_detail.html:10 +#: apps/treasury/models.py:309 templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "" -#: apps/treasury/models.py:309 +#: apps/treasury/models.py:310 msgid "Credits from the Société générale" msgstr "" @@ -1337,7 +1338,7 @@ msgid "Manage credits from the Société générale" msgstr "" #: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49 -#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:131 +#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:124 msgid "WEI" msgstr "" @@ -1577,89 +1578,89 @@ msgstr "" msgid "View registrations to the WEI" msgstr "" -#: apps/wei/views.py:253 +#: apps/wei/views.py:251 msgid "Find WEI Registration" msgstr "" -#: apps/wei/views.py:264 +#: apps/wei/views.py:262 msgid "Update the WEI" msgstr "" -#: apps/wei/views.py:285 +#: apps/wei/views.py:283 msgid "Create new bus" msgstr "" -#: apps/wei/views.py:316 +#: apps/wei/views.py:314 msgid "Update bus" msgstr "" -#: apps/wei/views.py:346 +#: apps/wei/views.py:344 msgid "Manage bus" msgstr "" -#: apps/wei/views.py:373 +#: apps/wei/views.py:371 msgid "Create new team" msgstr "" -#: apps/wei/views.py:405 +#: apps/wei/views.py:403 msgid "Update team" msgstr "" -#: apps/wei/views.py:436 +#: apps/wei/views.py:434 msgid "Manage WEI team" msgstr "" -#: apps/wei/views.py:458 +#: apps/wei/views.py:456 msgid "Register first year student to the WEI" msgstr "" -#: apps/wei/views.py:470 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:468 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "" -#: apps/wei/views.py:491 apps/wei/views.py:561 +#: apps/wei/views.py:489 apps/wei/views.py:559 msgid "This user is already registered to this WEI." msgstr "" -#: apps/wei/views.py:496 +#: apps/wei/views.py:494 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." msgstr "" -#: apps/wei/views.py:513 +#: apps/wei/views.py:511 msgid "Register old student to the WEI" msgstr "" -#: apps/wei/views.py:525 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:523 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "" -#: apps/wei/views.py:543 apps/wei/views.py:631 +#: apps/wei/views.py:541 apps/wei/views.py:629 msgid "You already opened an account in the Société générale." msgstr "" -#: apps/wei/views.py:591 +#: apps/wei/views.py:589 msgid "Update WEI Registration" msgstr "" -#: apps/wei/views.py:681 +#: apps/wei/views.py:679 msgid "Delete WEI registration" msgstr "" -#: apps/wei/views.py:692 +#: apps/wei/views.py:690 msgid "You don't have the right to delete this WEI registration." msgstr "" -#: apps/wei/views.py:711 +#: apps/wei/views.py:709 msgid "Validate WEI registration" msgstr "" -#: apps/wei/views.py:792 +#: apps/wei/views.py:790 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:829 apps/wei/views.py:882 apps/wei/views.py:892 +#: apps/wei/views.py:827 apps/wei/views.py:880 apps/wei/views.py:890 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1790,15 +1791,11 @@ msgstr "" msgid "Clubs" msgstr "" -#: templates/base.html:115 -msgid "Registrations" -msgstr "" - -#: templates/base.html:141 +#: templates/base.html:134 msgid "Admin" msgstr "" -#: templates/base.html:180 +#: templates/base.html:173 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -1936,10 +1933,14 @@ msgstr "" msgid "Save Changes" msgstr "" -#: templates/member/user_list.html:16 +#: templates/member/user_list.html:17 msgid "There is no user with this pattern." msgstr "" +#: templates/member/user_list.html:26 +msgid "Registrations" +msgstr "" + #: templates/note/conso_form.html:28 msgid "Consum" msgstr "" @@ -2073,6 +2074,21 @@ msgid "" "activate your account." msgstr "" +#: templates/registration/email_validation_email_sent.html:4 +msgid "Account activation" +msgstr "" + +#: templates/registration/email_validation_email_sent.html:7 +msgid "" +"An email has been sent. Please click on the link to activate your account." +msgstr "" + +#: templates/registration/email_validation_email_sent.html:11 +msgid "" +"You must also go to the Kfet to pay your membership. The WEI registration " +"includes the BDE membership." +msgstr "" + #: templates/registration/future_profile_detail.html:49 #: templates/wei/weiregistration_confirm_delete.html:12 msgid "Delete registration" @@ -2128,32 +2144,39 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "" +#: templates/registration/mails/email_validation_email.html:12 #: templates/registration/mails/email_validation_email.txt:3 msgid "Hi" msgstr "" +#: templates/registration/mails/email_validation_email.html:16 #: templates/registration/mails/email_validation_email.txt:5 msgid "" "You recently registered on the Note Kfet. Please click on the link below to " "confirm your registration." msgstr "" +#: templates/registration/mails/email_validation_email.html:26 #: templates/registration/mails/email_validation_email.txt:9 msgid "" "This link is only valid for a couple of days, after that you will need to " "contact us to validate your email." msgstr "" +#: templates/registration/mails/email_validation_email.html:30 #: 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." +"you can log in. You will need to pay your membership in the Kfet. Note that " +"the WEI registration includes the Kfet membership." msgstr "" +#: templates/registration/mails/email_validation_email.html:34 #: templates/registration/mails/email_validation_email.txt:13 msgid "Thanks" msgstr "" +#: templates/registration/mails/email_validation_email.html:39 #: templates/registration/mails/email_validation_email.txt:15 msgid "The Note Kfet team." msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 9df44fec..511b3efb 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-01 15:06+0200\n" +"POT-Creation-Date: 2020-08-03 12:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,36 +18,36 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:102 -#: apps/activity/models.py:117 +#: apps/activity/apps.py:10 apps/activity/models.py:106 +#: apps/activity/models.py:121 msgid "activity" msgstr "activité" -#: apps/activity/forms.py:45 apps/activity/models.py:213 +#: apps/activity/forms.py:45 apps/activity/models.py:217 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:48 apps/activity/models.py:216 +#: apps/activity/forms.py:48 apps/activity/models.py:220 msgid "This activity is not validated yet." msgstr "Cette activité n'est pas encore validée." -#: apps/activity/forms.py:58 apps/activity/models.py:224 +#: apps/activity/forms.py:58 apps/activity/models.py:228 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:62 apps/activity/models.py:228 +#: apps/activity/forms.py:62 apps/activity/models.py:232 msgid "This person is already invited." msgstr "Cette personne est déjà invitée." -#: apps/activity/forms.py:66 apps/activity/models.py:232 +#: apps/activity/forms.py:66 apps/activity/models.py:236 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:23 apps/activity/models.py:48 -#: apps/member/models.py:151 apps/note/models/notes.py:188 +#: apps/activity/models.py:24 apps/activity/models.py:49 +#: apps/member/models.py:158 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:263 apps/permission/models.py:332 +#: apps/note/models/transactions.py:263 apps/permission/models.py:339 #: apps/wei/models.py:65 apps/wei/models.py:117 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -55,123 +55,123 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." msgid "name" msgstr "nom" -#: apps/activity/models.py:27 templates/activity/activity_detail.html:39 +#: apps/activity/models.py:28 templates/activity/activity_detail.html:39 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:30 templates/activity/activity_detail.html:43 +#: apps/activity/models.py:31 templates/activity/activity_detail.html:43 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: apps/activity/models.py:34 +#: apps/activity/models.py:35 msgid "activity type" msgstr "type d'activité" -#: apps/activity/models.py:35 +#: apps/activity/models.py:36 msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:53 apps/note/models/transactions.py:81 -#: apps/permission/models.py:113 apps/permission/models.py:192 +#: apps/activity/models.py:54 apps/note/models/transactions.py:81 +#: apps/permission/models.py:120 apps/permission/models.py:199 #: apps/wei/models.py:71 apps/wei/models.py:128 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "description" -#: apps/activity/models.py:60 apps/note/models/notes.py:164 -#: apps/note/models/transactions.py:66 apps/permission/models.py:167 +#: apps/activity/models.py:61 apps/note/models/notes.py:188 +#: apps/note/models/transactions.py:66 apps/permission/models.py:174 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" -#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:259 -#: apps/note/models/notes.py:117 apps/treasury/models.py:221 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:266 +#: apps/note/models/notes.py:126 apps/treasury/models.py:222 #: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" msgstr "utilisateur" -#: apps/activity/models.py:73 templates/activity/activity_detail.html:33 +#: apps/activity/models.py:74 templates/activity/activity_detail.html:33 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:80 templates/activity/activity_detail.html:36 +#: apps/activity/models.py:81 templates/activity/activity_detail.html:36 msgid "attendees club" msgstr "club attendu" -#: apps/activity/models.py:84 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:85 templates/activity/activity_detail.html:22 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:88 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:89 templates/activity/activity_detail.html:25 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:93 apps/note/models/transactions.py:146 +#: apps/activity/models.py:94 apps/note/models/transactions.py:146 #: templates/activity/activity_detail.html:47 msgid "valid" msgstr "valide" -#: apps/activity/models.py:98 templates/activity/activity_detail.html:61 +#: apps/activity/models.py:99 templates/activity/activity_detail.html:61 msgid "open" msgstr "ouvrir" -#: apps/activity/models.py:103 +#: apps/activity/models.py:107 msgid "activities" msgstr "activités" -#: apps/activity/models.py:122 +#: apps/activity/models.py:126 msgid "entry time" msgstr "heure d'entrée" -#: apps/activity/models.py:128 apps/note/apps.py:14 -#: apps/note/models/notes.py:58 +#: apps/activity/models.py:132 apps/note/apps.py:14 +#: apps/note/models/notes.py:60 msgid "note" msgstr "note" -#: apps/activity/models.py:139 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:143 templates/activity/activity_entry.html:38 msgid "entry" msgstr "entrée" -#: apps/activity/models.py:140 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:144 templates/activity/activity_entry.html:38 msgid "entries" msgstr "entrées" -#: apps/activity/models.py:146 +#: apps/activity/models.py:150 msgid "Already entered on " msgstr "Déjà rentré le " -#: apps/activity/models.py:146 apps/activity/tables.py:54 +#: apps/activity/models.py:150 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%d/%m/%Y %H:%M:%S}" -#: apps/activity/models.py:154 +#: apps/activity/models.py:158 msgid "The balance is negative." msgstr "La note est en négatif." -#: apps/activity/models.py:184 +#: apps/activity/models.py:188 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:189 templates/member/profile_info.html:14 +#: apps/activity/models.py:193 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weimembership_form.html:18 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:196 +#: apps/activity/models.py:200 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:237 +#: apps/activity/models.py:244 msgid "guest" msgstr "invité" -#: apps/activity/models.py:238 +#: apps/activity/models.py:245 msgid "guests" msgstr "invités" -#: apps/activity/models.py:250 +#: apps/activity/models.py:257 msgid "Invitation" msgstr "Invitation" @@ -183,26 +183,26 @@ msgstr "Entré le " msgid "remove" msgstr "supprimer" -#: apps/activity/tables.py:75 apps/treasury/models.py:140 +#: apps/activity/tables.py:75 apps/treasury/models.py:141 msgid "Type" msgstr "Type" #: apps/activity/tables.py:77 apps/member/forms.py:102 -#: apps/registration/forms.py:64 apps/treasury/forms.py:120 +#: apps/registration/forms.py:70 apps/treasury/forms.py:120 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:79 apps/member/forms.py:107 -#: apps/registration/forms.py:69 apps/treasury/forms.py:122 +#: apps/registration/forms.py:75 apps/treasury/forms.py:122 #: templates/note/transaction_form.html:129 msgid "First name" msgstr "Prénom" -#: apps/activity/tables.py:81 apps/note/models/notes.py:67 +#: apps/activity/tables.py:81 apps/note/models/notes.py:69 msgid "Note" msgstr "Note" -#: apps/activity/tables.py:83 apps/member/tables.py:42 +#: apps/activity/tables.py:83 apps/member/tables.py:43 msgid "Balance" msgstr "Solde du compte" @@ -210,7 +210,7 @@ msgstr "Solde du compte" msgid "Create new activity" msgstr "Créer une nouvelle activité" -#: apps/activity/views.py:41 templates/base.html:121 +#: apps/activity/views.py:41 templates/base.html:114 msgid "Activities" msgstr "Activités" @@ -238,75 +238,75 @@ msgstr "API" msgid "Logs" msgstr "Logs" -#: apps/logs/models.py:27 +#: apps/logs/models.py:28 msgid "IP Address" msgstr "Adresse IP" -#: apps/logs/models.py:35 apps/permission/models.py:137 +#: apps/logs/models.py:36 apps/permission/models.py:144 msgid "model" msgstr "Modèle" -#: apps/logs/models.py:42 +#: apps/logs/models.py:43 msgid "identifier" msgstr "Identifiant" -#: apps/logs/models.py:47 +#: apps/logs/models.py:48 msgid "previous data" msgstr "Données précédentes" -#: apps/logs/models.py:52 +#: apps/logs/models.py:53 msgid "new data" msgstr "Nouvelles données" -#: apps/logs/models.py:60 +#: apps/logs/models.py:61 msgid "create" msgstr "Créer" -#: apps/logs/models.py:61 apps/note/tables.py:161 +#: apps/logs/models.py:62 apps/note/tables.py:160 #: templates/activity/activity_detail.html:67 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166 -#: apps/permission/models.py:130 apps/wei/tables.py:65 +#: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 +#: apps/permission/models.py:137 apps/wei/tables.py:65 msgid "delete" msgstr "Supprimer" -#: apps/logs/models.py:65 +#: apps/logs/models.py:66 msgid "action" msgstr "Action" -#: apps/logs/models.py:73 +#: apps/logs/models.py:74 msgid "timestamp" msgstr "Date" -#: apps/logs/models.py:77 +#: apps/logs/models.py:78 msgid "Logs cannot be destroyed." msgstr "Les logs ne peuvent pas être détruits." -#: apps/logs/models.py:80 +#: apps/logs/models.py:81 msgid "changelog" msgstr "journal de modification" -#: apps/logs/models.py:81 +#: apps/logs/models.py:82 msgid "changelogs" msgstr "journaux de modifications" -#: apps/member/admin.py:53 apps/member/models.py:178 +#: apps/member/admin.py:52 apps/member/models.py:185 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/admin.py:54 apps/member/models.py:183 +#: apps/member/admin.py:53 apps/member/models.py:190 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:68 apps/member/models.py:270 +#: apps/member/admin.py:67 apps/member/models.py:277 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:69 apps/member/models.py:284 +#: apps/member/admin.py:68 apps/member/models.py:291 msgid "fee" msgstr "cotisation" @@ -315,22 +315,23 @@ msgid "member" msgstr "adhérent" #: apps/member/forms.py:58 apps/member/views.py:82 +#: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:81 apps/registration/forms.py:44 +#: apps/member/forms.py:81 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:83 apps/registration/forms.py:46 +#: apps/member/forms.py:83 apps/registration/forms.py:52 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:88 apps/registration/forms.py:51 +#: apps/member/forms.py:88 apps/registration/forms.py:57 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:89 apps/registration/forms.py:52 +#: apps/member/forms.py:89 apps/registration/forms.py:58 msgid "No credit" msgstr "Pas de rechargement" @@ -338,20 +339,20 @@ msgstr "Pas de rechargement" 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:95 apps/registration/forms.py:57 +#: apps/member/forms.py:95 apps/registration/forms.py:63 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:112 apps/registration/forms.py:74 +#: apps/member/forms.py:112 apps/registration/forms.py:80 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:135 msgid "Bank" msgstr "Banque" -#: apps/member/forms.py:138 +#: apps/member/forms.py:139 msgid "User" msgstr "Utilisateur" -#: apps/member/forms.py:152 +#: apps/member/forms.py:153 msgid "Roles" msgstr "Rôles" @@ -479,47 +480,47 @@ msgstr "profil utilisateur" msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" -#: apps/member/models.py:156 templates/member/club_info.html:57 +#: apps/member/models.py:163 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "courriel" -#: apps/member/models.py:163 +#: apps/member/models.py:170 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:172 +#: apps/member/models.py:179 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:173 +#: apps/member/models.py:180 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:189 templates/member/club_info.html:33 +#: apps/member/models.py:196 templates/member/club_info.html:33 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:190 +#: apps/member/models.py:197 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:197 templates/member/club_info.html:23 +#: apps/member/models.py:204 templates/member/club_info.html:23 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:198 +#: apps/member/models.py:205 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:205 templates/member/club_info.html:28 +#: apps/member/models.py:212 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:206 +#: apps/member/models.py:213 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -527,50 +528,50 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:240 apps/member/models.py:265 -#: apps/note/models/notes.py:139 +#: apps/member/models.py:247 apps/member/models.py:272 +#: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:241 +#: apps/member/models.py:248 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:275 +#: apps/member/models.py:282 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:279 +#: apps/member/models.py:286 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:797 +#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:795 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:310 +#: apps/member/models.py:317 #, 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:321 apps/member/views.py:544 +#: apps/member/models.py:328 apps/member/views.py:544 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:372 +#: apps/member/models.py:379 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:375 +#: apps/member/models.py:382 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:376 +#: apps/member/models.py:383 msgid "memberships" msgstr "adhésions" -#: apps/member/tables.py:113 +#: apps/member/tables.py:114 msgid "Renew" msgstr "Renouveler" @@ -624,7 +625,7 @@ msgstr "Modifier le club" msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:530 apps/wei/views.py:788 +#: apps/member/views.py:530 apps/wei/views.py:786 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -641,8 +642,8 @@ msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." #: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574 -#: apps/registration/views.py:292 apps/registration/views.py:294 -#: apps/registration/views.py:296 +#: apps/registration/views.py:290 apps/registration/views.py:292 +#: apps/registration/views.py:294 msgid "This field is required." msgstr "Ce champ est requis." @@ -654,16 +655,16 @@ msgstr "Gérer les rôles d'un utilisateur dans le club" msgid "Members of the club" msgstr "Membres du club" -#: apps/note/admin.py:134 apps/note/models/transactions.py:106 +#: apps/note/admin.py:133 apps/note/models/transactions.py:106 msgid "source" msgstr "source" -#: apps/note/admin.py:142 apps/note/admin.py:192 +#: apps/note/admin.py:141 apps/note/admin.py:191 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119 msgid "destination" msgstr "destination" -#: apps/note/admin.py:197 apps/note/models/transactions.py:59 +#: apps/note/admin.py:196 apps/note/models/transactions.py:59 #: apps/note/models/transactions.py:137 msgid "amount" msgstr "montant" @@ -676,105 +677,105 @@ msgstr "Choisissez une image" msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" -#: apps/note/models/notes.py:27 +#: apps/note/models/notes.py:29 msgid "account balance" msgstr "solde du compte" -#: apps/note/models/notes.py:28 +#: apps/note/models/notes.py:30 msgid "in centimes, money credited for this instance" msgstr "en centimes, argent crédité pour cette instance" -#: apps/note/models/notes.py:32 +#: apps/note/models/notes.py:34 msgid "last negative date" msgstr "dernier date de négatif" -#: apps/note/models/notes.py:33 +#: apps/note/models/notes.py:35 msgid "last time the balance was negative" msgstr "dernier instant où la note était en négatif" -#: apps/note/models/notes.py:38 +#: apps/note/models/notes.py:40 msgid "active" msgstr "actif" -#: apps/note/models/notes.py:41 +#: apps/note/models/notes.py:43 msgid "" "Designates whether this note should be treated as active. Unselect this " "instead of deleting notes." msgstr "" "Indique si la note est active. Désactiver cela plutôt que supprimer la note." -#: apps/note/models/notes.py:45 +#: apps/note/models/notes.py:47 msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:53 apps/note/models/transactions.py:129 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:129 msgid "created at" msgstr "créée le" -#: apps/note/models/notes.py:59 +#: apps/note/models/notes.py:61 msgid "notes" msgstr "notes" -#: apps/note/models/notes.py:77 apps/note/models/notes.py:101 +#: apps/note/models/notes.py:86 apps/note/models/notes.py:110 msgid "This alias is already taken." msgstr "Cet alias est déjà pris." -#: apps/note/models/notes.py:121 +#: apps/note/models/notes.py:130 msgid "one's note" msgstr "note d'un utilisateur" -#: apps/note/models/notes.py:122 +#: apps/note/models/notes.py:131 msgid "users note" msgstr "notes des utilisateurs" -#: apps/note/models/notes.py:128 +#: apps/note/models/notes.py:137 #, python-format msgid "%(user)s's note" msgstr "Note de %(user)s" -#: apps/note/models/notes.py:143 +#: apps/note/models/notes.py:167 msgid "club note" msgstr "note d'un club" -#: apps/note/models/notes.py:144 +#: apps/note/models/notes.py:168 msgid "clubs notes" msgstr "notes des clubs" -#: apps/note/models/notes.py:150 +#: apps/note/models/notes.py:174 #, python-format msgid "Note of %(club)s club" msgstr "Note du club %(club)s" -#: apps/note/models/notes.py:170 +#: apps/note/models/notes.py:194 msgid "special note" msgstr "note spéciale" -#: apps/note/models/notes.py:171 +#: apps/note/models/notes.py:195 msgid "special notes" msgstr "notes spéciales" -#: apps/note/models/notes.py:194 +#: apps/note/models/notes.py:218 msgid "Invalid alias" msgstr "Alias invalide" -#: apps/note/models/notes.py:210 +#: apps/note/models/notes.py:234 msgid "alias" msgstr "alias" -#: apps/note/models/notes.py:211 templates/member/club_info.html:54 +#: apps/note/models/notes.py:235 templates/member/club_info.html:54 #: templates/member/profile_info.html:38 templates/wei/weiclub_info.html:48 msgid "aliases" msgstr "alias" -#: apps/note/models/notes.py:233 +#: apps/note/models/notes.py:257 msgid "Alias is too long." msgstr "L'alias est trop long." -#: apps/note/models/notes.py:238 +#: apps/note/models/notes.py:262 msgid "An alias with a similar name already exists: {} " msgstr "Un alias avec un nom similaire existe déjà : {}" -#: apps/note/models/notes.py:251 +#: apps/note/models/notes.py:275 msgid "You can't delete your main alias." msgstr "Vous ne pouvez pas supprimer votre alias principal." @@ -823,7 +824,7 @@ msgstr "quantité" msgid "reason" msgstr "raison" -#: apps/note/models/transactions.py:151 apps/note/tables.py:113 +#: apps/note/models/transactions.py:151 apps/note/tables.py:112 msgid "invalidity reason" msgstr "Motif d'invalidité" @@ -885,7 +886,7 @@ msgstr "" msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:308 apps/treasury/models.py:227 +#: apps/note/models/transactions.py:308 apps/treasury/models.py:228 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -897,17 +898,17 @@ msgstr "Cliquez pour dévalider" msgid "Click to validate" msgstr "Cliquez pour valider" -#: apps/note/tables.py:111 +#: apps/note/tables.py:110 msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/tables.py:140 apps/note/tables.py:168 apps/wei/tables.py:66 +#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:66 #: templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "Supprimer" -#: apps/note/tables.py:163 apps/wei/tables.py:42 apps/wei/tables.py:43 +#: apps/note/tables.py:162 apps/wei/tables.py:42 apps/wei/tables.py:43 #: templates/member/club_info.html:67 templates/note/conso_form.html:128 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 @@ -918,69 +919,69 @@ msgstr "Éditer" msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:67 +#: apps/note/views.py:69 msgid "Create new button" msgstr "Créer un nouveau bouton" -#: apps/note/views.py:76 +#: apps/note/views.py:78 msgid "Search button" msgstr "Chercher un bouton" -#: apps/note/views.py:99 +#: apps/note/views.py:101 msgid "Update button" msgstr "Modifier le bouton" -#: apps/note/views.py:136 templates/base.html:94 +#: apps/note/views.py:138 templates/base.html:94 msgid "Consumptions" msgstr "Consommations" -#: apps/permission/models.py:92 +#: apps/permission/models.py:99 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "Can {type} {model}.{field} in {query}" -#: apps/permission/models.py:94 +#: apps/permission/models.py:101 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "Can {type} {model} in {query}" -#: apps/permission/models.py:107 +#: apps/permission/models.py:114 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:120 +#: apps/permission/models.py:127 msgid "permission mask" msgstr "masque de permissions" -#: apps/permission/models.py:121 +#: apps/permission/models.py:128 msgid "permission masks" msgstr "masques de permissions" -#: apps/permission/models.py:127 +#: apps/permission/models.py:134 msgid "add" msgstr "ajouter" -#: apps/permission/models.py:128 +#: apps/permission/models.py:135 msgid "view" msgstr "voir" -#: apps/permission/models.py:129 +#: apps/permission/models.py:136 msgid "change" msgstr "modifier" -#: apps/permission/models.py:161 +#: apps/permission/models.py:168 msgid "query" msgstr "requête" -#: apps/permission/models.py:174 +#: apps/permission/models.py:181 msgid "mask" msgstr "masque" -#: apps/permission/models.py:180 +#: apps/permission/models.py:187 msgid "field" msgstr "champ" -#: apps/permission/models.py:185 +#: apps/permission/models.py:192 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." @@ -988,29 +989,29 @@ msgstr "" "Indique si la permission doit être attribuée même si l'adhésion de " "l'utilisateur est expirée." -#: apps/permission/models.py:186 templates/permission/all_rights.html:26 +#: apps/permission/models.py:193 templates/permission/all_rights.html:26 msgid "permanent" msgstr "permanent" -#: apps/permission/models.py:197 +#: apps/permission/models.py:204 msgid "permission" msgstr "permission" -#: apps/permission/models.py:198 apps/permission/models.py:337 +#: apps/permission/models.py:205 apps/permission/models.py:344 msgid "permissions" msgstr "permissions" -#: apps/permission/models.py:203 +#: apps/permission/models.py:210 msgid "Specifying field applies only to view and change permission types." msgstr "" "Spécifie le champ concerné, ne fonctionne que pour les permissions view et " "change." -#: apps/permission/models.py:342 +#: apps/permission/models.py:349 msgid "for club" msgstr "s'applique au club" -#: apps/permission/models.py:352 apps/permission/models.py:353 +#: apps/permission/models.py:359 apps/permission/models.py:360 msgid "role permissions" msgstr "Permissions par rôles" @@ -1041,7 +1042,7 @@ msgstr "" "Vous n'avez pas la permission de supprimer cette instance du modèle " "{app_label}.{model_name}." -#: apps/permission/views.py:44 templates/base.html:136 +#: apps/permission/views.py:44 templates/base.html:129 msgid "Rights" msgstr "Droits" @@ -1053,11 +1054,11 @@ msgstr "Tous les droits" msgid "registration" msgstr "inscription" -#: apps/registration/forms.py:32 +#: apps/registration/forms.py:38 msgid "Register to the WEI" msgstr "S'inscrire au WEI" -#: apps/registration/forms.py:34 +#: apps/registration/forms.py:40 msgid "" "Check this case if you want to register to the WEI. If you hesitate, you " "will be able to register later, after validating your account in the Kfet." @@ -1066,11 +1067,11 @@ msgstr "" "pourrez toujours vous inscrire plus tard, après avoir validé votre compte à " "la Kfet." -#: apps/registration/forms.py:79 +#: apps/registration/forms.py:85 msgid "Join BDE Club" msgstr "Adhérer au club BDE" -#: apps/registration/forms.py:86 +#: apps/registration/forms.py:92 msgid "Join Kfet Club" msgstr "Adhérer au club Kfet" @@ -1102,34 +1103,34 @@ 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:188 msgid "Unregistered users" msgstr "Utilisateurs en attente d'inscription" -#: apps/registration/views.py:203 +#: apps/registration/views.py:201 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 +#: apps/registration/views.py:278 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 +#: apps/registration/views.py:283 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:358 msgid "Invalidate pre-registration" msgstr "Invalider l'inscription" -#: apps/treasury/apps.py:12 templates/base.html:126 +#: apps/treasury/apps.py:12 templates/base.html:119 msgid "Treasury" msgstr "Trésorerie" @@ -1163,118 +1164,118 @@ msgstr "Vous ne pouvez pas changer le type de la remise." msgid "Amount" msgstr "Montant" -#: apps/treasury/models.py:20 +#: apps/treasury/models.py:21 msgid "Invoice identifier" msgstr "Numéro de facture" -#: apps/treasury/models.py:34 +#: apps/treasury/models.py:35 msgid "BDE" msgstr "BDE" -#: apps/treasury/models.py:39 +#: apps/treasury/models.py:40 msgid "Object" msgstr "Objet" -#: apps/treasury/models.py:43 +#: apps/treasury/models.py:44 msgid "Description" msgstr "Description" -#: apps/treasury/models.py:48 templates/note/transaction_form.html:123 +#: apps/treasury/models.py:49 templates/note/transaction_form.html:123 msgid "Name" msgstr "Nom" -#: apps/treasury/models.py:52 +#: apps/treasury/models.py:53 msgid "Address" msgstr "Adresse" -#: apps/treasury/models.py:57 +#: apps/treasury/models.py:58 msgid "Place" msgstr "Lieu" -#: apps/treasury/models.py:61 +#: apps/treasury/models.py:62 msgid "Acquitted" msgstr "Acquittée" -#: apps/treasury/models.py:65 +#: apps/treasury/models.py:66 msgid "invoice" msgstr "facture" -#: apps/treasury/models.py:66 +#: apps/treasury/models.py:67 msgid "invoices" msgstr "factures" -#: apps/treasury/models.py:81 +#: apps/treasury/models.py:82 msgid "Designation" msgstr "Désignation" -#: apps/treasury/models.py:85 +#: apps/treasury/models.py:86 msgid "Quantity" msgstr "Quantité" -#: apps/treasury/models.py:89 +#: apps/treasury/models.py:90 msgid "Unit price" msgstr "Prix unitaire" -#: apps/treasury/models.py:105 +#: apps/treasury/models.py:106 msgid "product" msgstr "produit" -#: apps/treasury/models.py:106 +#: apps/treasury/models.py:107 msgid "products" msgstr "produits" -#: apps/treasury/models.py:123 +#: apps/treasury/models.py:124 msgid "remittance type" msgstr "type de remise" -#: apps/treasury/models.py:124 +#: apps/treasury/models.py:125 msgid "remittance types" msgstr "types de remises" -#: apps/treasury/models.py:134 +#: apps/treasury/models.py:135 msgid "Date" msgstr "Date" -#: apps/treasury/models.py:145 +#: apps/treasury/models.py:146 msgid "Comment" msgstr "Commentaire" -#: apps/treasury/models.py:150 +#: apps/treasury/models.py:151 msgid "Closed" msgstr "Fermée" -#: apps/treasury/models.py:154 +#: apps/treasury/models.py:155 msgid "remittance" msgstr "remise" -#: apps/treasury/models.py:155 +#: apps/treasury/models.py:156 msgid "remittances" msgstr "remises" -#: apps/treasury/models.py:187 +#: apps/treasury/models.py:188 msgid "Remittance #{:d}: {}" msgstr "Remise n°{:d} : {}" -#: apps/treasury/models.py:206 apps/treasury/tables.py:76 +#: apps/treasury/models.py:207 apps/treasury/tables.py:76 #: apps/treasury/tables.py:84 templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 #: templates/treasury/sogecredit_list.html:13 msgid "Remittance" msgstr "Remise" -#: apps/treasury/models.py:210 +#: apps/treasury/models.py:211 msgid "special transaction proxy" msgstr "Proxy de transaction spéciale" -#: apps/treasury/models.py:211 +#: apps/treasury/models.py:212 msgid "special transaction proxies" msgstr "Proxys de transactions spéciales" -#: apps/treasury/models.py:233 +#: apps/treasury/models.py:234 msgid "credit transaction" msgstr "transaction de crédit" -#: apps/treasury/models.py:296 +#: apps/treasury/models.py:297 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." @@ -1282,11 +1283,11 @@ 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:308 templates/treasury/sogecredit_detail.html:10 +#: apps/treasury/models.py:309 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:309 +#: apps/treasury/models.py:310 msgid "Credits from the Société générale" msgstr "Crédits de la Société générale" @@ -1366,7 +1367,7 @@ 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:48 apps/wei/models.py:49 -#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:131 +#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:124 msgid "WEI" msgstr "WEI" @@ -1621,51 +1622,51 @@ msgstr "Trouver une adhésion au WEI" msgid "View registrations to the WEI" msgstr "Voir les inscriptions au WEI" -#: apps/wei/views.py:253 +#: apps/wei/views.py:251 msgid "Find WEI Registration" msgstr "Trouver une inscription au WEI" -#: apps/wei/views.py:264 +#: apps/wei/views.py:262 msgid "Update the WEI" msgstr "Modifier le WEI" -#: apps/wei/views.py:285 +#: apps/wei/views.py:283 msgid "Create new bus" msgstr "Ajouter un nouveau bus" -#: apps/wei/views.py:316 +#: apps/wei/views.py:314 msgid "Update bus" msgstr "Modifier le bus" -#: apps/wei/views.py:346 +#: apps/wei/views.py:344 msgid "Manage bus" msgstr "Gérer le bus" -#: apps/wei/views.py:373 +#: apps/wei/views.py:371 msgid "Create new team" msgstr "Créer une nouvelle équipe" -#: apps/wei/views.py:405 +#: apps/wei/views.py:403 msgid "Update team" msgstr "Modifier l'équipe" -#: apps/wei/views.py:436 +#: apps/wei/views.py:434 msgid "Manage WEI team" msgstr "Gérer l'équipe WEI" -#: apps/wei/views.py:458 +#: apps/wei/views.py:456 msgid "Register first year student to the WEI" msgstr "Inscrire un 1A au WEI" -#: apps/wei/views.py:470 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:468 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/views.py:491 apps/wei/views.py:561 +#: apps/wei/views.py:489 apps/wei/views.py:559 msgid "This user is already registered to this WEI." msgstr "Cette personne est déjà inscrite au WEI." -#: apps/wei/views.py:496 +#: apps/wei/views.py:494 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." @@ -1673,39 +1674,39 @@ msgstr "" "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà " "participé à un WEI." -#: apps/wei/views.py:513 +#: apps/wei/views.py:511 msgid "Register old student to the WEI" msgstr "Inscrire un 2A+ au WEI" -#: apps/wei/views.py:525 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:523 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/views.py:543 apps/wei/views.py:631 +#: apps/wei/views.py:541 apps/wei/views.py:629 msgid "You already opened an account in the Société générale." msgstr "Vous avez déjà ouvert un compte auprès de la société générale." -#: apps/wei/views.py:591 +#: apps/wei/views.py:589 msgid "Update WEI Registration" msgstr "Modifier l'inscription WEI" -#: apps/wei/views.py:681 +#: apps/wei/views.py:679 msgid "Delete WEI registration" msgstr "Supprimer l'inscription WEI" -#: apps/wei/views.py:692 +#: apps/wei/views.py:690 msgid "You don't have the right to delete this WEI registration." msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI." -#: apps/wei/views.py:711 +#: apps/wei/views.py:709 msgid "Validate WEI registration" msgstr "Valider l'inscription WEI" -#: apps/wei/views.py:792 +#: apps/wei/views.py:790 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:829 apps/wei/views.py:882 apps/wei/views.py:892 +#: apps/wei/views.py:827 apps/wei/views.py:880 apps/wei/views.py:890 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1845,15 +1846,11 @@ msgstr "Utilisateurs" msgid "Clubs" msgstr "Clubs" -#: templates/base.html:115 -msgid "Registrations" -msgstr "Inscriptions" - -#: templates/base.html:141 +#: templates/base.html:134 msgid "Admin" msgstr "Admin" -#: templates/base.html:180 +#: templates/base.html:173 msgid "" "Your e-mail address is not validated. Please check your mail inbox and click " "on the validation link." @@ -1996,10 +1993,14 @@ msgstr "Voir mes adhésions" msgid "Save Changes" msgstr "Sauvegarder les changements" -#: templates/member/user_list.html:16 +#: templates/member/user_list.html:17 msgid "There is no user with this pattern." msgstr "Il n'y a pas d'utilisateur trouvé avec cette entrée." +#: templates/member/user_list.html:26 +msgid "Registrations" +msgstr "Inscriptions" + #: templates/note/conso_form.html:28 msgid "Consum" msgstr "Consommer" @@ -2137,6 +2138,25 @@ msgstr "" "Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter " "pour activer votre compte." +#: templates/registration/email_validation_email_sent.html:4 +msgid "Account activation" +msgstr "Activation du compte" + +#: templates/registration/email_validation_email_sent.html:7 +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." + +#: templates/registration/email_validation_email_sent.html:11 +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." + #: templates/registration/future_profile_detail.html:49 #: templates/wei/weiregistration_confirm_delete.html:12 msgid "Delete registration" @@ -2197,10 +2217,12 @@ msgstr "" msgid "Forgotten your password or username?" msgstr "Mot de passe ou pseudo oublié ?" +#: templates/registration/mails/email_validation_email.html:12 #: templates/registration/mails/email_validation_email.txt:3 msgid "Hi" msgstr "Bonjour" +#: templates/registration/mails/email_validation_email.html:16 #: templates/registration/mails/email_validation_email.txt:5 msgid "" "You recently registered on the Note Kfet. Please click on the link below to " @@ -2209,26 +2231,30 @@ msgstr "" "Vous vous êtes inscrits récemment sur la Note Kfet. Merci de cliquer sur le " "lien ci-dessous pour confirmer votre adresse email." +#: templates/registration/mails/email_validation_email.html:26 #: templates/registration/mails/email_validation_email.txt:9 msgid "" "This link is only valid for a couple of days, after that you will need to " "contact us to validate your email." -msgstr "" -"Ce lien n'est valide que pendant quelques jours. Après cela, vous devrez " -"nous contacter pour valider votre email." +msgstr "Ce lien n'est valide que pendant quelques jours." +#: templates/registration/mails/email_validation_email.html:30 #: 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." +"you can log in. You will need to pay your membership in the Kfet. Note that " +"the WEI registration includes the Kfet membership." 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." +"pouvoir vous connecter. Vous devrez payer votre adhésion à la Kfet. Notez " +"que l'adhésion Kfet est incluse dans l'inscription au WEI." +#: templates/registration/mails/email_validation_email.html:34 #: templates/registration/mails/email_validation_email.txt:13 msgid "Thanks" msgstr "Merci" +#: templates/registration/mails/email_validation_email.html:39 #: templates/registration/mails/email_validation_email.txt:15 msgid "The Note Kfet team." msgstr "L'équipe de la Note Kfet." @@ -2311,10 +2337,10 @@ msgid "" "by following the link you received." msgstr "" "Si vous vous êtes déjà inscrits, votre inscription a bien été prise en " -"compte. Le BDE doit d'abord valider votre compte avantque vous puissiez 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." +"compte. Le BDE doit d'abord valider votre compte avant que vous puissiez " +"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." #: templates/treasury/invoice_form.html:41 msgid "Add product" diff --git a/templates/registration/email_validation_email_sent.html b/templates/registration/email_validation_email_sent.html index bd4cf8d8..6167ee52 100644 --- a/templates/registration/email_validation_email_sent.html +++ b/templates/registration/email_validation_email_sent.html @@ -1,7 +1,13 @@ {% extends "base.html" %} {% block content %} -

    Account Activation

    +

    {% trans "Account activation" %}

    -An email has been sent. Please click on the link to activate your account. +

    + {% 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 diff --git a/templates/registration/mails/email_validation_email.html b/templates/registration/mails/email_validation_email.html index 0d3afc0e..84a2379f 100644 --- a/templates/registration/mails/email_validation_email.html +++ b/templates/registration/mails/email_validation_email.html @@ -27,7 +27,7 @@

    - {% 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." %} + {% 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." %}

    diff --git a/templates/registration/mails/email_validation_email.txt b/templates/registration/mails/email_validation_email.txt index 69f2d642..6427200f 100644 --- a/templates/registration/mails/email_validation_email.txt +++ b/templates/registration/mails/email_validation_email.txt @@ -8,7 +8,7 @@ https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=toke {% trans "This link is only valid for a couple of days, after that you will need to contact us to validate your email." %} -{% 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." %} +{% 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 "Thanks" %}, From 208dc7f865071d11c869c07b7ae623db7d93cad2 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 13:33:25 +0200 Subject: [PATCH 023/319] :art: Use multiple checkboxes than multiple select widget --- apps/member/forms.py | 2 ++ apps/wei/forms/registration.py | 11 ++++++++++- apps/wei/views.py | 5 +++-- templates/wei/weiregistration_form.html | 26 +++++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index 50fa9c47..58285b79 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.models import User +from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ from note.models import NoteSpecial, Alias from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput @@ -151,6 +152,7 @@ class MembershipRolesForm(forms.ModelForm): roles = forms.ModelMultipleChoiceField( queryset=Role.objects.filter(weirole=None).all(), label=_("Roles"), + widget=CheckboxSelectMultiple(), ) class Meta: diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py index 9ce3a350..738db4e2 100644 --- a/apps/wei/forms/registration.py +++ b/apps/wei/forms/registration.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.models import User from django.db.models import Q +from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget @@ -47,6 +48,7 @@ class WEIChooseBusForm(forms.Form): label=_("bus"), help_text=_("This choice is not definitive. The WEI organizers are free to attribute for you a bus and a team," + " in particular if you are a free eletron."), + widget=CheckboxSelectMultiple(), ) team = forms.ModelMultipleChoiceField( @@ -54,17 +56,24 @@ class WEIChooseBusForm(forms.Form): label=_("Team"), required=False, help_text=_("Leave this field empty if you won't be in a team (staff, bus chief, free electron)"), + widget=CheckboxSelectMultiple(), ) roles = forms.ModelMultipleChoiceField( queryset=WEIRole.objects.filter(~Q(name="1A")), label=_("WEI Roles"), help_text=_("Select the roles that you are interested in."), + initial=WEIRole.objects.filter(name="Adhérent WEI").all(), + widget=CheckboxSelectMultiple(), ) class WEIMembershipForm(forms.ModelForm): - roles = forms.ModelMultipleChoiceField(queryset=WEIRole.objects, label=_("WEI Roles")) + roles = forms.ModelMultipleChoiceField( + queryset=WEIRole.objects, + label=_("WEI Roles"), + widget=CheckboxSelectMultiple(), + ) def clean(self): cleaned_data = super().clean() diff --git a/apps/wei/views.py b/apps/wei/views.py index fb0f7b32..8a95c72a 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -527,8 +527,9 @@ class WEIRegister2AView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): context["form"].fields["user"].disabled = True choose_bus_form = WEIChooseBusForm() - choose_bus_form.fields["bus"].queryset = Bus.objects.filter(wei=context["club"]) - choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"]) + choose_bus_form.fields["bus"].queryset = Bus.objects.filter(wei=context["club"]).order_by('name') + choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"])\ + .order_by('bus__name', 'name') context['membership_form'] = choose_bus_form return context diff --git a/templates/wei/weiregistration_form.html b/templates/wei/weiregistration_form.html index 86aea555..9cf507c8 100644 --- a/templates/wei/weiregistration_form.html +++ b/templates/wei/weiregistration_form.html @@ -14,3 +14,29 @@ {% endblock %} + +{% block extrajavascript %} + +{% endblock %} From 0a2c9d9c8754b4f83d5473d0278f8daf180f225e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 13:33:25 +0200 Subject: [PATCH 024/319] :bug: Better entry page --- apps/activity/views.py | 50 +++++++++++++++---------- apps/member/forms.py | 2 + apps/wei/forms/registration.py | 11 +++++- apps/wei/views.py | 5 ++- templates/wei/weiregistration_form.html | 26 +++++++++++++ 5 files changed, 71 insertions(+), 23 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index cac7f183..923f32ec 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -114,28 +114,31 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): context = super().get_context_data(**kwargs) activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ - .get(pk=self.kwargs["pk"]) + .distinct().get(pk=self.kwargs["pk"]) context["activity"] = activity matched = [] - pattern = "^$" - if "search" in self.request.GET: - pattern = self.request.GET["search"] - - if not pattern: - pattern = "^$" - - if pattern[0] != "^": - pattern = "^" + pattern - guest_qs = Guest.objects\ .annotate(balance=F("inviter__balance"), note_name=F("inviter__user__username"))\ - .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))) \ + .filter(activity=activity)\ .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))\ - .distinct()[:20] + .order_by('last_name', 'first_name').distinct() + + if "search" in self.request.GET: + pattern = self.request.GET["search"] + 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)) + ) + else: + pattern = None + guest_qs = guest_qs.none() + for guest in guest_qs: guest.type = "Invité" matched.append(guest) @@ -145,12 +148,18 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): username=F("note__noteuser__user__username"), note_name=F("name"), balance=F("note__balance"))\ - .filter(Q(note__polymorphic_ctype__model="noteuser") - & (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)))) \ + .filter(note__polymorphic_ctype__model="noteuser")\ .filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view")) + if pattern: + 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)) + ) + else: + note_qs = note_qs.none() + if settings.DATABASES[note_qs.db]["ENGINE"] == 'django.db.backends.postgresql_psycopg2': note_qs = note_qs.distinct('note__pk')[:20] else: @@ -158,6 +167,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): # 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] + for note in note_qs: note.type = "Adhérent" note.activity = activity diff --git a/apps/member/forms.py b/apps/member/forms.py index 50fa9c47..58285b79 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.forms import AuthenticationForm from django.contrib.auth.models import User +from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ from note.models import NoteSpecial, Alias from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput @@ -151,6 +152,7 @@ class MembershipRolesForm(forms.ModelForm): roles = forms.ModelMultipleChoiceField( queryset=Role.objects.filter(weirole=None).all(), label=_("Roles"), + widget=CheckboxSelectMultiple(), ) class Meta: diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py index 9ce3a350..738db4e2 100644 --- a/apps/wei/forms/registration.py +++ b/apps/wei/forms/registration.py @@ -4,6 +4,7 @@ from django import forms from django.contrib.auth.models import User from django.db.models import Q +from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget @@ -47,6 +48,7 @@ class WEIChooseBusForm(forms.Form): label=_("bus"), help_text=_("This choice is not definitive. The WEI organizers are free to attribute for you a bus and a team," + " in particular if you are a free eletron."), + widget=CheckboxSelectMultiple(), ) team = forms.ModelMultipleChoiceField( @@ -54,17 +56,24 @@ class WEIChooseBusForm(forms.Form): label=_("Team"), required=False, help_text=_("Leave this field empty if you won't be in a team (staff, bus chief, free electron)"), + widget=CheckboxSelectMultiple(), ) roles = forms.ModelMultipleChoiceField( queryset=WEIRole.objects.filter(~Q(name="1A")), label=_("WEI Roles"), help_text=_("Select the roles that you are interested in."), + initial=WEIRole.objects.filter(name="Adhérent WEI").all(), + widget=CheckboxSelectMultiple(), ) class WEIMembershipForm(forms.ModelForm): - roles = forms.ModelMultipleChoiceField(queryset=WEIRole.objects, label=_("WEI Roles")) + roles = forms.ModelMultipleChoiceField( + queryset=WEIRole.objects, + label=_("WEI Roles"), + widget=CheckboxSelectMultiple(), + ) def clean(self): cleaned_data = super().clean() diff --git a/apps/wei/views.py b/apps/wei/views.py index fb0f7b32..8a95c72a 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -527,8 +527,9 @@ class WEIRegister2AView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): context["form"].fields["user"].disabled = True choose_bus_form = WEIChooseBusForm() - choose_bus_form.fields["bus"].queryset = Bus.objects.filter(wei=context["club"]) - choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"]) + choose_bus_form.fields["bus"].queryset = Bus.objects.filter(wei=context["club"]).order_by('name') + choose_bus_form.fields["team"].queryset = BusTeam.objects.filter(bus__wei=context["club"])\ + .order_by('bus__name', 'name') context['membership_form'] = choose_bus_form return context diff --git a/templates/wei/weiregistration_form.html b/templates/wei/weiregistration_form.html index 86aea555..9cf507c8 100644 --- a/templates/wei/weiregistration_form.html +++ b/templates/wei/weiregistration_form.html @@ -14,3 +14,29 @@ {% endblock %} + +{% block extrajavascript %} + +{% endblock %} From 5ea8d8f870d5a4f4d0ac852ccd8a43093f800006 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 16:11:05 +0200 Subject: [PATCH 025/319] :art: Update activity interface --- apps/activity/views.py | 9 ++++-- apps/api/viewsets.py | 4 +-- apps/note/api/views.py | 6 ++++ apps/note/views.py | 12 ++++++-- apps/permission/fixtures/initial.json | 40 +++++++++++++++++++++++++-- 5 files changed, 61 insertions(+), 10 deletions(-) diff --git a/apps/activity/views.py b/apps/activity/views.py index 923f32ec..370e6040 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -182,8 +182,11 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): context["noteuser_ctype"] = ContentType.objects.get_for_model(NoteUser).pk context["notespecial_ctype"] = ContentType.objects.get_for_model(NoteSpecial).pk - context["activities_open"] = Activity.objects.filter(open=True).filter( - PermissionBackend.filter_queryset(self.request.user, Activity, "view")).filter( - PermissionBackend.filter_queryset(self.request.user, Activity, "change")).all() + activities_open = Activity.objects.filter(open=True).filter( + PermissionBackend.filter_queryset(self.request.user, Activity, "view")).distinct().all() + context["activities_open"] = [a for a in activities_open + if PermissionBackend.check_perm(self.request.user, + "activity.add_entry", + Entry(activity=a, note=self.request.user.note,))] return context diff --git a/apps/api/viewsets.py b/apps/api/viewsets.py index 6e0cb6b8..f4dd56f6 100644 --- a/apps/api/viewsets.py +++ b/apps/api/viewsets.py @@ -18,7 +18,7 @@ class ReadProtectedModelViewSet(viewsets.ModelViewSet): def get_queryset(self): user = get_current_authenticated_user() - return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")) + return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct() class ReadOnlyProtectedModelViewSet(viewsets.ReadOnlyModelViewSet): @@ -32,4 +32,4 @@ class ReadOnlyProtectedModelViewSet(viewsets.ReadOnlyModelViewSet): def get_queryset(self): user = get_current_authenticated_user() - return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")) + return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct() diff --git a/apps/note/api/views.py b/apps/note/api/views.py index a365c343..f806bbf2 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -9,6 +9,8 @@ from rest_framework import viewsets from rest_framework.response import Response from rest_framework import status from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet +from note_kfet.middlewares import get_current_authenticated_user +from permission.backends import PermissionBackend from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\ TemplateCategorySerializer, TransactionTemplateSerializer, TransactionPolymorphicSerializer @@ -150,3 +152,7 @@ class TransactionViewSet(ReadProtectedModelViewSet): serializer_class = TransactionPolymorphicSerializer filter_backends = [SearchFilter] search_fields = ['$reason', ] + + def get_queryset(self): + user = get_current_authenticated_user() + return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")) diff --git a/apps/note/views.py b/apps/note/views.py index ef9da668..ad2b2a99 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -10,6 +10,8 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, UpdateView from django_tables2 import SingleTableView from django.urls import reverse_lazy + +from activity.models import Entry from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin @@ -52,9 +54,13 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl # Add a shortcut for entry page for open activities if "activity" in settings.INSTALLED_APPS: from activity.models import Activity - context["activities_open"] = Activity.objects.filter(open=True).filter( - PermissionBackend.filter_queryset(self.request.user, Activity, "view")).filter( - PermissionBackend.filter_queryset(self.request.user, Activity, "change")).all() + activities_open = Activity.objects.filter(open=True).filter( + PermissionBackend.filter_queryset(self.request.user, Activity, "view")).distinct().all() + context["activities_open"] = [a for a in activities_open + if PermissionBackend.check_perm(self.request.user, + "activity.add_entry", + Entry(activity=a, + note=self.request.user.note, ))] return context diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index bbe2e7e9..1ce50d80 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2311,6 +2311,38 @@ "description": "Ajouter un membre à n'importe quel club" } }, + { + "model": "permission.permission", + "pk": 148, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "{\"valid\": false}", + "type": "change", + "mask": 2, + "field": "", + "permanent": false, + "description": "Modifier une activité non validée" + } + }, + { + "model": "permission.permission", + "pk": 149, + "fields": { + "model": [ + "activity", + "activity" + ], + "query": "{\"valid\": false}", + "type": "delete", + "mask": 2, + "field": "", + "permanent": false, + "description": "Supprimer une activité non validée" + } + }, { "model": "permission.role", "pk": 1, @@ -2643,7 +2675,9 @@ 144, 145, 146, - 147 + 147, + 148, + 149 ] } }, @@ -2690,7 +2724,9 @@ 43, 44, 45, - 46 + 46, + 148, + 149 ] } }, From 985a5ca876006cf1b13b6ef30fd3e6de676ae753 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 18:49:15 +0200 Subject: [PATCH 026/319] :heavy_plus_sign: Add "search transactions page" --- apps/note/forms.py | 82 ++++++++++- apps/note/models/transactions.py | 9 ++ apps/note/urls.py | 1 + apps/note/views.py | 56 +++++++- apps/wei/views.py | 5 +- locale/de/LC_MESSAGES/django.po | 160 +++++++++++++-------- locale/fr/LC_MESSAGES/django.po | 168 +++++++++++++++-------- note_kfet/inputs.py | 8 +- static/js/autocomplete_model.js | 9 ++ templates/member/autocomplete_model.html | 5 + templates/member/club_tables.html | 4 +- templates/member/profile_info.html | 28 ++-- templates/member/profile_tables.html | 8 +- templates/note/search_transactions.html | 57 ++++++++ templates/wei/weiclub_tables.html | 51 +------ 15 files changed, 455 insertions(+), 196 deletions(-) create mode 100644 templates/note/search_transactions.html diff --git a/apps/note/forms.py b/apps/note/forms.py index bc479e20..fe81783e 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -3,10 +3,11 @@ from django import forms from django.contrib.contenttypes.models import ContentType +from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ -from note_kfet.inputs import Autocomplete, AmountInput +from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput -from .models import TransactionTemplate, NoteClub +from .models import TransactionTemplate, NoteClub, Alias class ImageForm(forms.Form): @@ -38,3 +39,80 @@ class TransactionTemplateForm(forms.ModelForm): ), 'amount': AmountInput(), } + + +class SearchTransactionForm(forms.Form): + source = forms.ModelChoiceField( + queryset=Alias.objects.all(), + label=_("Source"), + required=False, + widget=Autocomplete( + Alias, + resetable=True, + attrs={ + 'api_url': '/api/note/alias/', + 'placeholder': 'Note ...', + }, + ), + ) + + destination = forms.ModelChoiceField( + queryset=Alias.objects.all(), + label=_("Destination"), + required=False, + widget=Autocomplete( + Alias, + resetable=True, + attrs={ + 'api_url': '/api/note/alias/', + 'placeholder': 'Note ...', + }, + ), + ) + + type = forms.ModelMultipleChoiceField( + queryset=ContentType.objects.filter(app_label="note", model__endswith="transaction"), + initial=ContentType.objects.filter(app_label="note", model__endswith="transaction"), + label=_("Type"), + required=False, + widget=CheckboxSelectMultiple(), + ) + + reason = forms.CharField( + label=_("Reason"), + required=False, + ) + + valid = forms.BooleanField( + label=_("Valid"), + initial=False, + required=False, + ) + + amount_gte = forms.Field( + label=_("Total amount greater than"), + initial=0, + required=False, + widget=AmountInput(), + ) + + amount_lte = forms.Field( + initial=2 ** 31 - 1, + label=_("Total amount less than"), + required=False, + widget=AmountInput(), + ) + + created_after = forms.Field( + label=_("Created after"), + initial="2000-01-01 00:00", + required=False, + widget=DateTimePickerInput(), + ) + + created_before = forms.Field( + label=_("Created before"), + initial="2042-12-31 21:42", + required=False, + widget=DateTimePickerInput(), + ) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 6eab05ee..69306b71 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -243,6 +243,7 @@ class RecurrentTransaction(Transaction): TransactionTemplate, on_delete=models.PROTECT, ) + category = models.ForeignKey( TemplateCategory, on_delete=models.PROTECT, @@ -252,6 +253,10 @@ class RecurrentTransaction(Transaction): def type(self): return _('Template') + class Meta: + verbose_name = _("recurrent transaction") + verbose_name_plural = _("recurrent transactions") + class SpecialTransaction(Transaction): """ @@ -290,6 +295,10 @@ class SpecialTransaction(Transaction): raise(ValidationError(_("A special transaction is only possible between a" " Note associated to a payment method and a User or a Club"))) + class Meta: + verbose_name = _("Special transaction") + verbose_name_plural = _("Special transactions") + class MembershipTransaction(Transaction): """ diff --git a/apps/note/urls.py b/apps/note/urls.py index 9d6af317..c5662f2c 100644 --- a/apps/note/urls.py +++ b/apps/note/urls.py @@ -12,4 +12,5 @@ urlpatterns = [ path('buttons/update//', views.TransactionTemplateUpdateView.as_view(), name='template_update'), path('buttons/', views.TransactionTemplateListView.as_view(), name='template_list'), path('consos/', views.ConsoView.as_view(), name='consos'), + path('transactions//', views.TransactionSearchView.as_view(), name='transactions'), ] diff --git a/apps/note/views.py b/apps/note/views.py index ad2b2a99..3524a080 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -5,9 +5,9 @@ import json from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType -from django.db.models import Q +from django.db.models import Q, F from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, UpdateView +from django.views.generic import CreateView, UpdateView, DetailView from django_tables2 import SingleTableView from django.urls import reverse_lazy @@ -16,8 +16,8 @@ from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend from permission.views import ProtectQuerysetMixin -from .forms import TransactionTemplateForm -from .models import TemplateCategory, Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial +from .forms import TransactionTemplateForm, SearchTransactionForm +from .models import TemplateCategory, Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial, Note from .models.transactions import SpecialTransaction from .tables import HistoryTable, ButtonTable @@ -171,3 +171,51 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): context['no_cache'] = True return context + + +class TransactionSearchView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): + model = Note + context_object_name = "note" + template_name = "note/search_transactions.html" + extra_context = {"title": _("Search transactions")} + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + form = SearchTransactionForm(data=self.request.GET if self.request.GET else None) + context["form"] = form + + form.full_clean() + if form.is_valid(): + data = form.cleaned_data + else: + data = {} + + transactions = Transaction.objects.annotate(total_amount=F("quantity") * F("amount")).filter( + PermissionBackend.filter_queryset(self.request.user, Transaction, "view"))\ + .filter(Q(source=self.object) | Q(destination=self.object)).order_by('-created_at') + + if "source" in data and data["source"]: + transactions = transactions.filter(source_id=data["source"].note_id) + if "destination" in data and data["destination"]: + transactions = transactions.filter(destination_id=data["destination"].note_id) + if "type" in data and data["type"]: + transactions = transactions.filter(polymorphic_ctype__in=data["type"]) + if "reason" in data and data["reason"]: + transactions = transactions.filter(reason__iregex=data["reason"]) + if "valid" in data and data["valid"]: + transactions = transactions.filter(valid=data["valid"]) + if "amount_gte" in data and data["amount_gte"]: + transactions = transactions.filter(total_amount__gte=data["amount_gte"]) + if "amount_lte" in data and data["amount_lte"]: + transactions = transactions.filter(total_amount__lte=data["amount_lte"]) + if "created_after" in data and data["created_after"]: + transactions = transactions.filter(created_at__gte=data["created_after"]) + if "created_before" in data and data["created_before"]: + transactions = transactions.filter(created_at__lte=data["created_before"]) + + table = HistoryTable(transactions) + table.paginate(per_page=20) + context["table"] = table + + return context diff --git a/apps/wei/views.py b/apps/wei/views.py index 8a95c72a..ed76cc0f 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -130,7 +130,7 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): context["my_registration"] = my_registration buses = Bus.objects.filter(PermissionBackend.filter_queryset(self.request.user, Bus, "view")) \ - .filter(wei=self.object).annotate(count=Count("memberships")) + .filter(wei=self.object).annotate(count=Count("memberships")).order_by("name") bus_table = BusTable(data=buses, prefix="bus-") context['buses'] = bus_table @@ -589,9 +589,6 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update form_class = WEIRegistrationForm extra_context = {"title": _("Update WEI Registration")} - def get_queryset(self, **kwargs): - return WEIRegistration.objects - def dispatch(self, request, *args, **kwargs): wei = self.get_object().wei today = date.today() diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index b094a5ac..3f207ceb 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-03 12:35+0200\n" +"POT-Creation-Date: 2020-08-03 18:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" #: apps/activity/models.py:24 apps/activity/models.py:49 #: apps/member/models.py:158 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:263 apps/permission/models.py:339 +#: apps/note/models/transactions.py:268 apps/permission/models.py:339 #: apps/wei/models.py:65 apps/wei/models.py:117 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -182,16 +182,16 @@ msgstr "" msgid "remove" msgstr "" -#: apps/activity/tables.py:75 apps/treasury/models.py:141 +#: apps/activity/tables.py:75 apps/note/forms.py:76 apps/treasury/models.py:141 msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/member/forms.py:102 +#: apps/activity/tables.py:77 apps/member/forms.py:103 #: apps/registration/forms.py:70 apps/treasury/forms.py:120 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/member/forms.py:107 +#: apps/activity/tables.py:79 apps/member/forms.py:108 #: apps/registration/forms.py:75 apps/treasury/forms.py:122 #: templates/note/transaction_form.html:129 msgid "First name" @@ -225,7 +225,7 @@ msgstr "" msgid "Invite guest to the activity \"{}\"" msgstr "" -#: apps/activity/views.py:171 +#: apps/activity/views.py:181 msgid "Entry for activity \"{}\"" msgstr "" @@ -313,45 +313,45 @@ msgstr "" msgid "member" msgstr "" -#: apps/member/forms.py:58 apps/member/views.py:82 +#: apps/member/forms.py:59 apps/member/views.py:82 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/forms.py:81 apps/registration/forms.py:50 +#: apps/member/forms.py:82 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "" -#: apps/member/forms.py:83 apps/registration/forms.py:52 +#: apps/member/forms.py:84 apps/registration/forms.py:52 msgid "Check this case is the Société Générale paid the inscription." msgstr "" -#: apps/member/forms.py:88 apps/registration/forms.py:57 +#: apps/member/forms.py:89 apps/registration/forms.py:57 msgid "Credit type" msgstr "" -#: apps/member/forms.py:89 apps/registration/forms.py:58 +#: apps/member/forms.py:90 apps/registration/forms.py:58 msgid "No credit" msgstr "" -#: apps/member/forms.py:91 +#: apps/member/forms.py:92 msgid "You can credit the note of the user." msgstr "" -#: apps/member/forms.py:95 apps/registration/forms.py:63 +#: apps/member/forms.py:96 apps/registration/forms.py:63 msgid "Credit amount" msgstr "" -#: apps/member/forms.py:112 apps/registration/forms.py:80 +#: apps/member/forms.py:113 apps/registration/forms.py:80 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:135 msgid "Bank" msgstr "" -#: apps/member/forms.py:139 +#: apps/member/forms.py:140 msgid "User" msgstr "" -#: apps/member/forms.py:153 +#: apps/member/forms.py:154 msgid "Roles" msgstr "" @@ -540,7 +540,7 @@ msgstr "" msgid "membership ends on" msgstr "" -#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:795 +#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:793 msgid "User is not a member of the parent club" msgstr "" @@ -620,7 +620,7 @@ msgstr "" msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:530 apps/wei/views.py:786 +#: apps/member/views.py:530 apps/wei/views.py:784 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -662,14 +662,46 @@ msgstr "" msgid "amount" msgstr "" -#: apps/note/forms.py:14 +#: apps/note/forms.py:15 msgid "select an image" msgstr "" -#: apps/note/forms.py:15 +#: apps/note/forms.py:16 msgid "Maximal size: 2MB" msgstr "" +#: apps/note/forms.py:47 +msgid "Source" +msgstr "" + +#: apps/note/forms.py:61 +msgid "Destination" +msgstr "" + +#: apps/note/forms.py:82 templates/note/transaction_form.html:104 +msgid "Reason" +msgstr "" + +#: apps/note/forms.py:87 apps/treasury/tables.py:117 +msgid "Valid" +msgstr "" + +#: apps/note/forms.py:93 +msgid "Total amount greater than" +msgstr "" + +#: apps/note/forms.py:101 +msgid "Total amount less than" +msgstr "" + +#: apps/note/forms.py:107 +msgid "Created after" +msgstr "" + +#: apps/note/forms.py:114 +msgid "Created before" +msgstr "" + #: apps/note/models/notes.py:29 msgid "account balance" msgstr "" @@ -842,39 +874,55 @@ msgstr "" msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:253 +#: apps/note/models/transactions.py:254 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:268 -msgid "first_name" +#: apps/note/models/transactions.py:257 +msgid "recurrent transaction" +msgstr "" + +#: apps/note/models/transactions.py:258 +msgid "recurrent transactions" msgstr "" #: apps/note/models/transactions.py:273 +msgid "first_name" +msgstr "" + +#: apps/note/models/transactions.py:278 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:279 +#: apps/note/models/transactions.py:284 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:279 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:284 templates/note/transaction_form.html:24 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:290 +#: apps/note/models/transactions.py:295 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" msgstr "" -#: apps/note/models/transactions.py:307 apps/note/models/transactions.py:312 +#: apps/note/models/transactions.py:299 +msgid "Special transaction" +msgstr "" + +#: apps/note/models/transactions.py:300 +msgid "Special transactions" +msgstr "" + +#: apps/note/models/transactions.py:316 apps/note/models/transactions.py:321 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:308 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:317 apps/treasury/models.py:228 msgid "membership transactions" msgstr "" @@ -903,26 +951,30 @@ msgstr "" msgid "Edit" msgstr "" -#: apps/note/views.py:33 +#: apps/note/views.py:35 msgid "Transfer money" msgstr "" -#: apps/note/views.py:69 +#: apps/note/views.py:75 msgid "Create new button" msgstr "" -#: apps/note/views.py:78 +#: apps/note/views.py:84 msgid "Search button" msgstr "" -#: apps/note/views.py:101 +#: apps/note/views.py:107 msgid "Update button" msgstr "" -#: apps/note/views.py:138 templates/base.html:94 +#: apps/note/views.py:144 templates/base.html:94 msgid "Consumptions" msgstr "" +#: apps/note/views.py:180 +msgid "Search transactions" +msgstr "" + #: apps/permission/models.py:99 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" @@ -1288,10 +1340,6 @@ msgstr "" msgid "Remove" msgstr "" -#: apps/treasury/tables.py:117 -msgid "Valid" -msgstr "" - #: apps/treasury/tables.py:124 msgid "Yes" msgstr "" @@ -1342,37 +1390,37 @@ msgstr "" msgid "WEI" msgstr "" -#: apps/wei/forms/registration.py:47 apps/wei/models.py:112 +#: apps/wei/forms/registration.py:48 apps/wei/models.py:112 #: apps/wei/models.py:297 msgid "bus" msgstr "" -#: apps/wei/forms/registration.py:48 +#: apps/wei/forms/registration.py:49 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." msgstr "" -#: apps/wei/forms/registration.py:54 +#: apps/wei/forms/registration.py:56 msgid "Team" msgstr "" -#: apps/wei/forms/registration.py:56 +#: apps/wei/forms/registration.py:58 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" msgstr "" -#: apps/wei/forms/registration.py:61 apps/wei/forms/registration.py:67 +#: apps/wei/forms/registration.py:64 apps/wei/forms/registration.py:74 #: apps/wei/models.py:147 msgid "WEI Roles" msgstr "" -#: apps/wei/forms/registration.py:62 +#: apps/wei/forms/registration.py:65 msgid "Select the roles that you are interested in." msgstr "" -#: apps/wei/forms/registration.py:72 +#: apps/wei/forms/registration.py:81 msgid "This team doesn't belong to the given bus." msgstr "" @@ -1618,7 +1666,7 @@ msgstr "" msgid "Register 1A" msgstr "" -#: apps/wei/views.py:489 apps/wei/views.py:559 +#: apps/wei/views.py:489 apps/wei/views.py:560 msgid "This user is already registered to this WEI." msgstr "" @@ -1636,31 +1684,31 @@ msgstr "" msgid "Register 2A+" msgstr "" -#: apps/wei/views.py:541 apps/wei/views.py:629 +#: apps/wei/views.py:542 apps/wei/views.py:627 msgid "You already opened an account in the Société générale." msgstr "" -#: apps/wei/views.py:589 +#: apps/wei/views.py:590 msgid "Update WEI Registration" msgstr "" -#: apps/wei/views.py:679 +#: apps/wei/views.py:677 msgid "Delete WEI registration" msgstr "" -#: apps/wei/views.py:690 +#: apps/wei/views.py:688 msgid "You don't have the right to delete this WEI registration." msgstr "" -#: apps/wei/views.py:709 +#: apps/wei/views.py:707 msgid "Validate WEI registration" msgstr "" -#: apps/wei/views.py:790 +#: apps/wei/views.py:788 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:827 apps/wei/views.py:880 apps/wei/views.py:890 +#: apps/wei/views.py:825 apps/wei/views.py:878 apps/wei/views.py:888 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1822,6 +1870,10 @@ msgstr "" msgid "Add alias" msgstr "" +#: templates/member/autocomplete_model.html:11 +msgid "Reset" +msgstr "" + #: templates/member/club_info.html:17 msgid "Club Parent" msgstr "" @@ -1990,10 +2042,6 @@ msgstr "" msgid "Action" msgstr "" -#: templates/note/transaction_form.html:104 -msgid "Reason" -msgstr "" - #: templates/note/transaction_form.html:113 msgid "Transfer type" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 511b3efb..8fedb67a 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-03 12:35+0200\n" +"POT-Creation-Date: 2020-08-03 18:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:24 apps/activity/models.py:49 #: apps/member/models.py:158 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:263 apps/permission/models.py:339 +#: apps/note/models/transactions.py:268 apps/permission/models.py:339 #: apps/wei/models.py:65 apps/wei/models.py:117 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -183,16 +183,16 @@ msgstr "Entré le " msgid "remove" msgstr "supprimer" -#: apps/activity/tables.py:75 apps/treasury/models.py:141 +#: apps/activity/tables.py:75 apps/note/forms.py:76 apps/treasury/models.py:141 msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/member/forms.py:102 +#: apps/activity/tables.py:77 apps/member/forms.py:103 #: apps/registration/forms.py:70 apps/treasury/forms.py:120 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/member/forms.py:107 +#: apps/activity/tables.py:79 apps/member/forms.py:108 #: apps/registration/forms.py:75 apps/treasury/forms.py:122 #: templates/note/transaction_form.html:129 msgid "First name" @@ -226,7 +226,7 @@ msgstr "Modifier l'activité" msgid "Invite guest to the activity \"{}\"" msgstr "Invitation pour l'activité « {} »" -#: apps/activity/views.py:171 +#: apps/activity/views.py:181 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -314,45 +314,45 @@ msgstr "cotisation" msgid "member" msgstr "adhérent" -#: apps/member/forms.py:58 apps/member/views.py:82 +#: apps/member/forms.py:59 apps/member/views.py:82 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:81 apps/registration/forms.py:50 +#: apps/member/forms.py:82 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:83 apps/registration/forms.py:52 +#: apps/member/forms.py:84 apps/registration/forms.py:52 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:88 apps/registration/forms.py:57 +#: apps/member/forms.py:89 apps/registration/forms.py:57 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:89 apps/registration/forms.py:58 +#: apps/member/forms.py:90 apps/registration/forms.py:58 msgid "No credit" msgstr "Pas de rechargement" -#: apps/member/forms.py:91 +#: apps/member/forms.py:92 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:95 apps/registration/forms.py:63 +#: apps/member/forms.py:96 apps/registration/forms.py:63 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:112 apps/registration/forms.py:80 +#: apps/member/forms.py:113 apps/registration/forms.py:80 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:135 msgid "Bank" msgstr "Banque" -#: apps/member/forms.py:139 +#: apps/member/forms.py:140 msgid "User" msgstr "Utilisateur" -#: apps/member/forms.py:153 +#: apps/member/forms.py:154 msgid "Roles" msgstr "Rôles" @@ -545,7 +545,7 @@ msgstr "l'adhésion commence le" msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:795 +#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:793 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" @@ -625,7 +625,7 @@ msgstr "Modifier le club" msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:530 apps/wei/views.py:786 +#: apps/member/views.py:530 apps/wei/views.py:784 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -669,14 +669,46 @@ msgstr "destination" msgid "amount" msgstr "montant" -#: apps/note/forms.py:14 +#: apps/note/forms.py:15 msgid "select an image" msgstr "Choisissez une image" -#: apps/note/forms.py:15 +#: apps/note/forms.py:16 msgid "Maximal size: 2MB" msgstr "Taille maximale : 2 Mo" +#: apps/note/forms.py:47 +msgid "Source" +msgstr "Source" + +#: apps/note/forms.py:61 +msgid "Destination" +msgstr "Destination" + +#: apps/note/forms.py:82 templates/note/transaction_form.html:104 +msgid "Reason" +msgstr "Raison" + +#: apps/note/forms.py:87 apps/treasury/tables.py:117 +msgid "Valid" +msgstr "Valide" + +#: apps/note/forms.py:93 +msgid "Total amount greater than" +msgstr "Montant total supérieur à" + +#: apps/note/forms.py:101 +msgid "Total amount less than" +msgstr "Montant total inférieur à" + +#: apps/note/forms.py:107 +msgid "Created after" +msgstr "Créé après" + +#: apps/note/forms.py:114 +msgid "Created before" +msgstr "Créé avant" + #: apps/note/models/notes.py:29 msgid "account balance" msgstr "solde du compte" @@ -805,11 +837,11 @@ msgstr "mis en avant" #: apps/note/models/transactions.py:87 msgid "transaction template" -msgstr "modèle de transaction" +msgstr "Modèle de transaction" #: apps/note/models/transactions.py:88 msgid "transaction templates" -msgstr "modèles de transaction" +msgstr "Modèles de transaction" #: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125 #: apps/note/tables.py:35 apps/note/tables.py:44 @@ -830,12 +862,12 @@ msgstr "Motif d'invalidité" #: apps/note/models/transactions.py:159 msgid "transaction" -msgstr "transaction" +msgstr "Transaction" #: apps/note/models/transactions.py:160 #: templates/treasury/sogecredit_detail.html:22 msgid "transactions" -msgstr "transactions" +msgstr "Transactions" #: apps/note/models/transactions.py:175 msgid "" @@ -852,29 +884,37 @@ msgstr "" msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:253 +#: apps/note/models/transactions.py:254 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:268 +#: apps/note/models/transactions.py:257 +msgid "recurrent transaction" +msgstr "Transaction issue de bouton" + +#: apps/note/models/transactions.py:258 +msgid "recurrent transactions" +msgstr "Transactions issues de boutons" + +#: apps/note/models/transactions.py:273 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:273 +#: apps/note/models/transactions.py:278 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:279 +#: apps/note/models/transactions.py:284 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:279 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:284 templates/note/transaction_form.html:24 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:290 +#: apps/note/models/transactions.py:295 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -882,11 +922,19 @@ 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:307 apps/note/models/transactions.py:312 +#: apps/note/models/transactions.py:299 +msgid "Special transaction" +msgstr "Transaction de crédit/retrait" + +#: apps/note/models/transactions.py:300 +msgid "Special transactions" +msgstr "Transactions de crédit/retrait" + +#: apps/note/models/transactions.py:316 apps/note/models/transactions.py:321 msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:308 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:317 apps/treasury/models.py:228 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -915,26 +963,30 @@ msgstr "Supprimer" msgid "Edit" msgstr "Éditer" -#: apps/note/views.py:33 +#: apps/note/views.py:35 msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:69 +#: apps/note/views.py:75 msgid "Create new button" msgstr "Créer un nouveau bouton" -#: apps/note/views.py:78 +#: apps/note/views.py:84 msgid "Search button" msgstr "Chercher un bouton" -#: apps/note/views.py:101 +#: apps/note/views.py:107 msgid "Update button" msgstr "Modifier le bouton" -#: apps/note/views.py:138 templates/base.html:94 +#: apps/note/views.py:144 templates/base.html:94 msgid "Consumptions" msgstr "Consommations" +#: apps/note/views.py:180 +msgid "Search transactions" +msgstr "Rechercher des transactions" + #: apps/permission/models.py:99 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" @@ -1317,10 +1369,6 @@ msgstr "Ajouter" msgid "Remove" msgstr "supprimer" -#: apps/treasury/tables.py:117 -msgid "Valid" -msgstr "Valide" - #: apps/treasury/tables.py:124 msgid "Yes" msgstr "Oui" @@ -1371,12 +1419,12 @@ msgstr "Gérer les crédits de la Société générale" msgid "WEI" msgstr "WEI" -#: apps/wei/forms/registration.py:47 apps/wei/models.py:112 +#: apps/wei/forms/registration.py:48 apps/wei/models.py:112 #: apps/wei/models.py:297 msgid "bus" msgstr "Bus" -#: apps/wei/forms/registration.py:48 +#: apps/wei/forms/registration.py:49 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." @@ -1385,11 +1433,11 @@ msgstr "" "attribuer un bus et une équipe, en particulier si vous êtes un électron " "libre." -#: apps/wei/forms/registration.py:54 +#: apps/wei/forms/registration.py:56 msgid "Team" msgstr "Équipe" -#: apps/wei/forms/registration.py:56 +#: apps/wei/forms/registration.py:58 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" @@ -1397,16 +1445,16 @@ msgstr "" "Laissez ce champ vide si vous ne serez pas dans une équipe (staff, chef de " "bus ou électron libre)" -#: apps/wei/forms/registration.py:61 apps/wei/forms/registration.py:67 +#: apps/wei/forms/registration.py:64 apps/wei/forms/registration.py:74 #: apps/wei/models.py:147 msgid "WEI Roles" msgstr "Rôles au WEI" -#: apps/wei/forms/registration.py:62 +#: apps/wei/forms/registration.py:65 msgid "Select the roles that you are interested in." msgstr "Sélectionnez les rôles qui vous intéressent." -#: apps/wei/forms/registration.py:72 +#: apps/wei/forms/registration.py:81 msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." @@ -1662,7 +1710,7 @@ msgstr "Inscrire un 1A au WEI" msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/views.py:489 apps/wei/views.py:559 +#: apps/wei/views.py:489 apps/wei/views.py:560 msgid "This user is already registered to this WEI." msgstr "Cette personne est déjà inscrite au WEI." @@ -1682,31 +1730,31 @@ msgstr "Inscrire un 2A+ au WEI" msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/views.py:541 apps/wei/views.py:629 +#: apps/wei/views.py:542 apps/wei/views.py:627 msgid "You already opened an account in the Société générale." msgstr "Vous avez déjà ouvert un compte auprès de la société générale." -#: apps/wei/views.py:589 +#: apps/wei/views.py:590 msgid "Update WEI Registration" msgstr "Modifier l'inscription WEI" -#: apps/wei/views.py:679 +#: apps/wei/views.py:677 msgid "Delete WEI registration" msgstr "Supprimer l'inscription WEI" -#: apps/wei/views.py:690 +#: apps/wei/views.py:688 msgid "You don't have the right to delete this WEI registration." msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI." -#: apps/wei/views.py:709 +#: apps/wei/views.py:707 msgid "Validate WEI registration" msgstr "Valider l'inscription WEI" -#: apps/wei/views.py:790 +#: apps/wei/views.py:788 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:827 apps/wei/views.py:880 apps/wei/views.py:890 +#: apps/wei/views.py:825 apps/wei/views.py:878 apps/wei/views.py:888 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1882,6 +1930,10 @@ msgstr "" msgid "Add alias" msgstr "Ajouter un alias" +#: templates/member/autocomplete_model.html:11 +msgid "Reset" +msgstr "" + #: templates/member/club_info.html:17 msgid "Club Parent" msgstr "Club parent" @@ -2050,10 +2102,6 @@ msgstr "Sélection des destinataires" msgid "Action" msgstr "Action" -#: templates/note/transaction_form.html:104 -msgid "Reason" -msgstr "Raison" - #: templates/note/transaction_form.html:113 msgid "Transfer type" msgstr "Type de transfert" diff --git a/note_kfet/inputs.py b/note_kfet/inputs.py index 1a17d5ac..8e3d9e29 100644 --- a/note_kfet/inputs.py +++ b/note_kfet/inputs.py @@ -23,10 +23,11 @@ class AmountInput(NumberInput): class Autocomplete(TextInput): template_name = "member/autocomplete_model.html" - def __init__(self, model, attrs=None): + def __init__(self, model, resetable=False, attrs=None): super().__init__(attrs) self.model = model + self.resetable = resetable self.model_pk = None class Media: @@ -34,6 +35,11 @@ class Autocomplete(TextInput): js = ('js/autocomplete_model.js', ) + def get_context(self, name, value, attrs): + context = super().get_context(name, value, attrs) + context['widget']['resetable'] = self.resetable + return context + def format_value(self, value): if value: self.attrs["model_pk"] = int(value) diff --git a/static/js/autocomplete_model.js b/static/js/autocomplete_model.js index 6e135ad1..9d9ba2d3 100644 --- a/static/js/autocomplete_model.js +++ b/static/js/autocomplete_model.js @@ -10,6 +10,7 @@ $(document).ready(function () { if (!name_field) name_field = "name"; let input = target.val(); + $("#" + prefix + "_reset").removeClass("d-none"); $.getJSON(api_url + (api_url.includes("?") ? "&" : "?") + "format=json&search=^" + input + api_url_suffix, function(objects) { let html = ""; @@ -39,4 +40,12 @@ $(document).ready(function () { } }); }); + + $(".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 diff --git a/templates/member/autocomplete_model.html b/templates/member/autocomplete_model.html index 2236c6ef..0aeca361 100644 --- a/templates/member/autocomplete_model.html +++ b/templates/member/autocomplete_model.html @@ -1,3 +1,5 @@ +{% load i18n %} + + {% if widget.resetable %} + {% trans "Reset" %} + {% endif %}

    diff --git a/templates/member/club_tables.html b/templates/member/club_tables.html index 139d3abc..063c00c5 100644 --- a/templates/member/club_tables.html +++ b/templates/member/club_tables.html @@ -1,5 +1,7 @@ {% load render_table from django_tables2 %} {% load i18n %} +{% load perms %} + {% if managers.data %}
    @@ -29,7 +31,7 @@ {% if history_list.data %}
    diff --git a/templates/member/profile_info.html b/templates/member/profile_info.html index 7be10ba1..35d3e4ea 100644 --- a/templates/member/profile_info.html +++ b/templates/member/profile_info.html @@ -2,22 +2,22 @@
    -

    {% trans "Account #" %} {{ object.pk }}

    +

    {% trans "Account #" %} {{ user.pk }}

    - - + +
    {% trans 'name'|capfirst %}, {% trans 'first name' %}
    -
    {{ object.last_name }} {{ object.first_name }}
    +
    {{ user.last_name }} {{ user.first_name }}
    {% trans 'username'|capfirst %}
    -
    {{ object.username }}
    +
    {{ user.username }}
    - {% if object.pk == user.pk %} + {% if user.pk == user.pk %}
    {% trans 'password'|capfirst %}
    @@ -27,25 +27,25 @@ {% endif %}
    {% trans 'section'|capfirst %}
    -
    {{ object.profile.section }}
    +
    {{ user.profile.section }}
    {% trans 'address'|capfirst %}
    -
    {{ object.profile.address }}
    +
    {{ user.profile.address }}
    {% trans 'balance'|capfirst %}
    -
    {{ object.note.balance | pretty_money }}
    +
    {{ user.note.balance | pretty_money }}
    -
    {% trans 'aliases'|capfirst %}
    -
    {{ object.note.alias_set.all|join:", " }}
    +
    {% trans 'aliases'|capfirst %}
    +
    {{ user.note.alias_set.all|join:", " }}
    - {% if object.pk == user.pk %} + {% if user.pk == user.pk %} {% trans 'Manage auth token' %} {% endif %}
    - {% trans 'Update Profile' %} - {% url 'member:user_detail' object.pk as user_profile_url %} + {% trans 'Update Profile' %} + {% url 'member:user_detail' user.pk as user_profile_url %} {%if request.path_info != user_profile_url %} {% trans 'View Profile' %} {% endif %} diff --git a/templates/member/profile_tables.html b/templates/member/profile_tables.html index 4936cc26..ff66155a 100644 --- a/templates/member/profile_tables.html +++ b/templates/member/profile_tables.html @@ -2,10 +2,10 @@ {% load i18n %} {% load perms %} -{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:object.profile %} +{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user.profile %}
    {% trans "This user doesn't have confirmed his/her e-mail address." %} - {% trans "Click here to resend a validation link." %} + {% trans "Click here to resend a validation link." %}
    {% endif %} @@ -22,9 +22,7 @@
    diff --git a/templates/note/search_transactions.html b/templates/note/search_transactions.html new file mode 100644 index 00000000..cc92639a --- /dev/null +++ b/templates/note/search_transactions.html @@ -0,0 +1,57 @@ +{% extends "member/noteowner_detail.html" %} +{% load render_table from django_tables2 %} +{% load crispy_forms_tags %} + +{% block profile_info %} + {% if note.club.weiclub %} + {% with club=note.club.weiclub %} + {% include "wei/weiclub_info.html" %} + {% endwith %} + {% elif note.club %} + {% with club=note.club %} + {% include "member/club_info.html" %} + {% endwith %} + {% elif note.user %} + {% with user=note.user %} + {% include "member/profile_info.html" %} + {% endwith %} + {% endif %} +{% endblock %} + +{% block profile_content %} + {% crispy form %} +
    + {% render_table table %} +
    +{% endblock %} + +{% block extrajavascript %} + +{% endblock %} \ No newline at end of file diff --git a/templates/wei/weiclub_tables.html b/templates/wei/weiclub_tables.html index b97f5736..a8d02dcb 100644 --- a/templates/wei/weiclub_tables.html +++ b/templates/wei/weiclub_tables.html @@ -1,59 +1,12 @@ {% load render_table from django_tables2 %} {% load i18n %} +{% load perms %}

    WEI

    LE WEI, c'est cool !

    - -

    - Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore - magna aliqua. Dapibus ultrices in iaculis nunc sed augue. In hendrerit gravida rutrum quisque non tellus orci - ac. Massa vitae tortor condimentum lacinia quis vel eros. Elit ut aliquam purus sit amet. Aliquam faucibus - purus in massa tempor. Quisque id diam vel quam elementum pulvinar etiam non. Condimentum id venenatis a - condimentum vitae sapien pellentesque habitant. Egestas congue quisque egestas diam in. Vestibulum rhoncus - est pellentesque elit ullamcorper. Massa sed elementum tempus egestas sed sed. Sapien pellentesque habitant - morbi tristique. Lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt ornare. Sed - adipiscing diam donec adipiscing. Leo integer malesuada nunc vel risus commodo viverra maecenas. -

    - -

    - Fusce id velit ut tortor pretium viverra suspendisse. Urna condimentum mattis pellentesque id nibh tortor id - aliquet. Vel facilisis volutpat est velit egestas dui. Turpis egestas sed tempus urna et pharetra pharetra - massa massa. Eget nunc scelerisque viverra mauris in. Etiam dignissim diam quis enim. Urna cursus eget nunc - scelerisque viverra mauris in aliquam sem. Amet porttitor eget dolor morbi non arcu risus quis. Ullamcorper - sit amet risus nullam eget felis. Ullamcorper eget nulla facilisi etiam dignissim diam quis. Enim nulla - aliquet porttitor lacus luctus accumsan tortor. Urna condimentum mattis pellentesque id nibh tortor id. - Feugiat in fermentum posuere urna nec. Risus nec feugiat in fermentum posuere urna nec tincidunt. Porttitor - massa id neque aliquam vestibulum morbi. Diam quis enim lobortis scelerisque. Ornare massa eget egestas - purus. Ut tortor pretium viverra suspendisse. Purus in mollis nunc sed. Tristique magna sit amet purus - gravida. -

    - -

    - Ut porttitor leo a diam sollicitudin tempor. Viverra nam libero justo laoreet sit amet cursus sit amet. - Lectus arcu bibendum at varius vel pharetra vel turpis nunc. Vivamus arcu felis bibendum ut tristique et - egestas quis ipsum. Parturient montes nascetur ridiculus mus mauris. A cras semper auctor neque vitae - tempus quam pellentesque. Netus et malesuada fames ac. Mauris in aliquam sem fringilla ut. Sapien - pellentesque habitant morbi tristique. Mauris sit amet massa vitae tortor condimentum. Sagittis - aliquam malesuada bibendum arcu vitae elementum curabitur vitae nunc. Amet consectetur adipiscing elit - duis tristique sollicitudin nibh sit. Nunc mattis enim ut tellus elementum. Sapien eget mi proin sed libero - enim. Pulvinar sapien et ligula ullamcorper. Nibh mauris cursus mattis molestie a iaculis at erat - pellentesque. Molestie at elementum eu facilisis. Velit sed ullamcorper morbi tincidunt. Quam vulputate - dignissim suspendisse in est ante. -

    - -

    - Id cursus metus aliquam eleifend mi. Eu turpis egestas pretium aenean pharetra magna ac. Faucibus ornare - suspendisse sed nisi lacus sed viverra tellus. Sed vulputate mi sit amet mauris commodo. Lacus laoreet non - curabitur gravida arcu ac. At ultrices mi tempus imperdiet nulla malesuada pellentesque elit eget. Fusce ut - placerat orci nulla pellentesque dignissim. Quis blandit turpis cursus in hac habitasse platea dictumst - quisque. Tellus id interdum velit laoreet id donec ultrices. Risus feugiat in ante metus dictum. Velit ut - tortor pretium viverra suspendisse. Lacus vel facilisis volutpat est velit egestas dui id. Nunc eget lorem - dolor sed viverra ipsum nunc aliquet bibendum. Varius quam quisque id diam vel quam. Orci dapibus ultrices - in iaculis. Neque gravida in fermentum et sollicitudin ac orci. -

    {% if club.is_current_wei %} @@ -101,7 +54,7 @@ {% if history_list.data %}
    From 655390b26597da8b97958b65bcb1ba9761b33bff Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 18:50:51 +0200 Subject: [PATCH 027/319] A longer transaction history is better --- apps/note/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/note/views.py b/apps/note/views.py index 3524a080..d08dd2ec 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -215,7 +215,7 @@ class TransactionSearchView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView transactions = transactions.filter(created_at__lte=data["created_before"]) table = HistoryTable(transactions) - table.paginate(per_page=20) + table.paginate(per_page=100) context["table"] = table return context From 0e8058ab0d43d97007b75de0bb3614dd65dd782c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 19:35:25 +0200 Subject: [PATCH 028/319] Add script to send weekly report to all members --- apps/scripts | 2 +- templates/note/mails/weekly_report.html | 41 +++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 templates/note/mails/weekly_report.html diff --git a/apps/scripts b/apps/scripts index f41a5a32..630fc9a0 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit f41a5a32f7417a874b497640373ea3911eb1e133 +Subproject commit 630fc9a0dfd611c3e3a0b159c7c10ebf3747af5e diff --git a/templates/note/mails/weekly_report.html b/templates/note/mails/weekly_report.html new file mode 100644 index 00000000..e093554b --- /dev/null +++ b/templates/note/mails/weekly_report.html @@ -0,0 +1,41 @@ +{% load pretty_money %} +{% load render_table from django_tables2 %} + + + + + + [Note Kfet] Rapport de la Note Kfet + + + + + +

    + Rapport d'activité de {{ user.first_name }} {{ user.last_name }} (note : {{ user }}) + depuis le {{ last_week }} jusqu'au {{ now }}. +

    + +

    + Dépenses totales : {{ outcoming|pretty_money }}
    + Apports totaux : {{ incoming|pretty_money }}
    + Différentiel : {{ diff|pretty_money }}
    + Nouveau solde : {{ user.note.balance|pretty_money }} +

    + +

    Rapport détaillé

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

    + Le BDE
    + Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} +

    + + \ No newline at end of file From 2a744a8610af81d7d7b86f62c22797cd6690f975 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 19:37:47 +0200 Subject: [PATCH 029/319] Display invalid transactions but don't count on them in the total --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 630fc9a0..034d8c43 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 630fc9a0dfd611c3e3a0b159c7c10ebf3747af5e +Subproject commit 034d8c43b663ac3a33f6e3d06bcdcbbeea0bc517 From ba067f050ec52f93ed9361ebb4fec18bc22de0cf Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 20:09:16 +0200 Subject: [PATCH 030/319] Mails to be sent are added in a queue thanks to Django Mailer (todo: configure cron) --- note_kfet/settings/base.py | 1 + note_kfet/settings/production.py | 3 ++- requirements/base.txt | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index 4733bbad..3c557937 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -36,6 +36,7 @@ INSTALLED_APPS = [ # 'theme', # External apps + 'mailer', 'polymorphic', 'crispy_forms', 'django_tables2', diff --git a/note_kfet/settings/production.py b/note_kfet/settings/production.py index c22bca60..d7c51ebc 100644 --- a/note_kfet/settings/production.py +++ b/note_kfet/settings/production.py @@ -33,7 +33,8 @@ ALLOWED_HOSTS = [os.environ.get('NOTE_URL', 'localhost')] SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS') # Emails -EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_BACKEND = 'mailer.backend.DbBackend' # Mailer place emails in a queue before sending them to avoid spam +MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_USE_SSL = False EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org') EMAIL_PORT = os.getenv('EMAIL_PORT', 465) diff --git a/requirements/base.txt b/requirements/base.txt index 7da788e3..d6e5b075 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -6,6 +6,7 @@ django-allauth==0.39.1 django-crispy-forms==1.7.2 django-extensions==2.1.9 django-filter==2.2.0 +django-mailer==2.0.1 django-polymorphic==2.0.3 django-tables2==2.1.0 docutils==0.14 From 20ce817b16adca75b0eaa5c2e2fe58a1e0189bc7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 23:55:01 +0200 Subject: [PATCH 031/319] :bug: WEI members must be members of the Kfet club *this year* --- apps/member/views.py | 7 ++- apps/wei/views.py | 15 +++-- locale/de/LC_MESSAGES/django.po | 79 +++++++++++------------- locale/fr/LC_MESSAGES/django.po | 86 +++++++++++---------------- templates/wei/weimembership_form.html | 8 +-- 5 files changed, 89 insertions(+), 106 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index 30fbb139..edcb0feb 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -531,7 +531,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): return super().form_invalid(form) if club.parent_club is not None: - if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): + if not Membership.objects.filter( + user=form.instance.user, + club=club.parent_club, + date_start__lte=form.instance.date_start, + date_end__gte=form.instance.date_start, + ).exists(): form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) return super().form_invalid(form) diff --git a/apps/wei/views.py b/apps/wei/views.py index ed76cc0f..7731f08b 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -728,8 +728,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea context["kfet_member"] = Membership.objects.filter( club__name="Kfet", user=registration.user, - date_start__lte=datetime.now().date(), - date_end__gte=datetime.now().date(), + date_start__gte=registration.wei.parent_club.membership_start, ).exists() return context @@ -788,9 +787,15 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea form.add_error('bus', _("This user didn't give her/his caution check.")) return super().form_invalid(form) - if club.parent_club is not None: - if not Membership.objects.filter(user=form.instance.user, club=club.parent_club).exists(): - form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) + if club.parent_club is not None: # parent_club is never None: this is Kfet. + # We want that the user is member of the Kfet club *of this year*: the Kfet membership is included + # in the WEI registration. + if not Membership.objects.filter( + user=form.instance.user, + club=club.parent_club, # Kfet + date_start__gte=club.parent_club.membership_start, + ).exists(): + form.add_error('bus', _('User is not a member of the parent club') + ' ' + club.parent_club.name) return super().form_invalid(form) # Now, all is fine, the membership can be created. diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 3f207ceb..be04465e 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-03 18:38+0200\n" +"POT-Creation-Date: 2020-08-03 23:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -540,7 +540,7 @@ msgstr "" msgid "membership ends on" msgstr "" -#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:793 +#: apps/member/models.py:310 apps/member/views.py:540 apps/wei/views.py:798 msgid "User is not a member of the parent club" msgstr "" @@ -549,7 +549,7 @@ msgstr "" msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:328 apps/member/views.py:544 +#: apps/member/models.py:328 apps/member/views.py:549 msgid "User is already a member of the club" msgstr "" @@ -620,31 +620,31 @@ msgstr "" msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:530 apps/wei/views.py:784 +#: apps/member/views.py:530 apps/wei/views.py:783 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:548 +#: apps/member/views.py:553 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:553 +#: apps/member/views.py:558 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574 +#: apps/member/views.py:575 apps/member/views.py:577 apps/member/views.py:579 #: apps/registration/views.py:290 apps/registration/views.py:292 #: apps/registration/views.py:294 msgid "This field is required." msgstr "" -#: apps/member/views.py:642 +#: apps/member/views.py:647 msgid "Manage roles of an user in the club" msgstr "" -#: apps/member/views.py:667 +#: apps/member/views.py:672 msgid "Members of the club" msgstr "" @@ -1448,7 +1448,7 @@ msgstr "" msgid "Bus" msgstr "" -#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:79 +#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:32 msgid "Buses" msgstr "" @@ -1704,25 +1704,25 @@ msgstr "" msgid "Validate WEI registration" msgstr "" -#: apps/wei/views.py:788 +#: apps/wei/views.py:787 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:825 apps/wei/views.py:878 apps/wei/views.py:888 +#: apps/wei/views.py:830 apps/wei/views.py:883 apps/wei/views.py:893 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" msgstr "" -#: note_kfet/settings/base.py:155 +#: note_kfet/settings/base.py:156 msgid "German" msgstr "" -#: note_kfet/settings/base.py:156 +#: note_kfet/settings/base.py:157 msgid "English" msgstr "" -#: note_kfet/settings/base.py:157 +#: note_kfet/settings/base.py:158 msgid "French" msgstr "" @@ -1921,16 +1921,16 @@ msgstr "" msgid "There is no membership found with this pattern." msgstr "" -#: templates/member/club_tables.html:7 +#: templates/member/club_tables.html:9 msgid "Club managers" msgstr "" -#: templates/member/club_tables.html:20 +#: templates/member/club_tables.html:22 msgid "Club members" msgstr "" -#: templates/member/club_tables.html:33 templates/member/profile_tables.html:28 -#: templates/wei/weiclub_tables.html:105 +#: templates/member/club_tables.html:35 templates/member/profile_tables.html:26 +#: templates/wei/weiclub_tables.html:58 msgid "Transaction history" msgstr "" @@ -2470,23 +2470,23 @@ msgstr "" msgid "WEI listing" msgstr "" -#: templates/wei/weiclub_tables.html:63 +#: templates/wei/weiclub_tables.html:16 msgid "Register to the WEI! – 1A" msgstr "" -#: templates/wei/weiclub_tables.html:65 +#: templates/wei/weiclub_tables.html:18 msgid "Register to the WEI! – 2A+" msgstr "" -#: templates/wei/weiclub_tables.html:67 +#: templates/wei/weiclub_tables.html:20 msgid "Update my registration" msgstr "" -#: templates/wei/weiclub_tables.html:92 +#: templates/wei/weiclub_tables.html:45 msgid "Members of the WEI" msgstr "" -#: templates/wei/weiclub_tables.html:120 +#: templates/wei/weiclub_tables.html:73 msgid "Unvalidated registrations" msgstr "" @@ -2557,23 +2557,17 @@ msgstr "" #: templates/wei/weimembership_form.html:152 msgid "" -"\n" -" The WEI will be paid by Société générale. The " -"membership will be created even if the bank didn't pay the BDE yet.\n" -" The membership transaction will be created but " -"will be invalid. You will have to validate it once the bank\n" -" validated the creation of the account, or to " -"change the payment method.\n" -" " +"The WEI will be paid by Société générale. The membership will be created " +"even if the bank didn't pay the BDE yet. The membership transaction will be " +"created but will be invalid. You will have to validate it once the bank " +"validated the creation of the account, or to change the payment method." msgstr "" #: templates/wei/weimembership_form.html:162 #, python-format msgid "" -"\n" -" The note don't have enough money " -"(%(balance)s, %(pretty_fee)s required). The registration may fail.\n" -" " +"The note don't have enough money (%(balance)s, %(pretty_fee)s required). The " +"registration may fail." msgstr "" #: templates/wei/weimembership_form.html:169 @@ -2587,15 +2581,10 @@ msgstr "" #: templates/wei/weimembership_form.html:184 #, python-format msgid "" -"\n" -" This user is not a member of the Kfet club. " -"Please adhere\n" -" here if he/" -"she is in her/his first year\n" -" or here if he/she " -"was an old member before you validate\n" -" the registration of the WEI.\n" -" " +"This user is not a member of the Kfet club for the comming year. Please " +"adhere here if he/she is in her/his first " +"year or here if he/she was an old member " +"before you validate the registration of the WEI." msgstr "" #: templates/wei/weimembership_list.html:24 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 8fedb67a..f1a36008 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-03 18:38+0200\n" +"POT-Creation-Date: 2020-08-03 23:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -545,7 +545,7 @@ msgstr "l'adhésion commence le" msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:310 apps/member/views.py:535 apps/wei/views.py:793 +#: apps/member/models.py:310 apps/member/views.py:540 apps/wei/views.py:798 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" @@ -554,7 +554,7 @@ msgstr "L'utilisateur n'est pas membre du club parent" 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:328 apps/member/views.py:544 +#: apps/member/models.py:328 apps/member/views.py:549 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" @@ -625,7 +625,7 @@ msgstr "Modifier le club" msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:530 apps/wei/views.py:784 +#: apps/member/views.py:530 apps/wei/views.py:783 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -633,25 +633,25 @@ 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:548 +#: apps/member/views.py:553 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:553 +#: apps/member/views.py:558 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574 +#: apps/member/views.py:575 apps/member/views.py:577 apps/member/views.py:579 #: apps/registration/views.py:290 apps/registration/views.py:292 #: apps/registration/views.py:294 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:642 +#: apps/member/views.py:647 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:667 +#: apps/member/views.py:672 msgid "Members of the club" msgstr "Membres du club" @@ -1483,7 +1483,7 @@ msgstr "" msgid "Bus" msgstr "Bus" -#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:79 +#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:32 msgid "Buses" msgstr "Bus" @@ -1750,25 +1750,25 @@ msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI." msgid "Validate WEI registration" msgstr "Valider l'inscription WEI" -#: apps/wei/views.py:788 +#: apps/wei/views.py:787 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:825 apps/wei/views.py:878 apps/wei/views.py:888 +#: apps/wei/views.py:830 apps/wei/views.py:883 apps/wei/views.py:893 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" msgstr "Questionnaire WEI" -#: note_kfet/settings/base.py:155 +#: note_kfet/settings/base.py:156 msgid "German" msgstr "Allemand" -#: note_kfet/settings/base.py:156 +#: note_kfet/settings/base.py:157 msgid "English" msgstr "Anglais" -#: note_kfet/settings/base.py:157 +#: note_kfet/settings/base.py:158 msgid "French" msgstr "Français" @@ -1981,16 +1981,16 @@ msgstr "Filtrer par rôle :" msgid "There is no membership found with this pattern." msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée." -#: templates/member/club_tables.html:7 +#: templates/member/club_tables.html:9 msgid "Club managers" msgstr "Bureau du club" -#: templates/member/club_tables.html:20 +#: templates/member/club_tables.html:22 msgid "Club members" msgstr "Membres du club" -#: templates/member/club_tables.html:33 templates/member/profile_tables.html:28 -#: templates/wei/weiclub_tables.html:105 +#: templates/member/club_tables.html:35 templates/member/profile_tables.html:26 +#: templates/wei/weiclub_tables.html:58 msgid "Transaction history" msgstr "Historique des transactions" @@ -2579,23 +2579,23 @@ msgstr "Voir le WEI" msgid "WEI listing" msgstr "Liste des WEI" -#: templates/wei/weiclub_tables.html:63 +#: templates/wei/weiclub_tables.html:16 msgid "Register to the WEI! – 1A" msgstr "M'inscrire au WEI ! – 1A" -#: templates/wei/weiclub_tables.html:65 +#: templates/wei/weiclub_tables.html:18 msgid "Register to the WEI! – 2A+" msgstr "M'inscrire au WEI ! – 2A+" -#: templates/wei/weiclub_tables.html:67 +#: templates/wei/weiclub_tables.html:20 msgid "Update my registration" msgstr "Modifier mon inscription" -#: templates/wei/weiclub_tables.html:92 +#: templates/wei/weiclub_tables.html:45 msgid "Members of the WEI" msgstr "Membres du WEI" -#: templates/wei/weiclub_tables.html:120 +#: templates/wei/weiclub_tables.html:73 msgid "Unvalidated registrations" msgstr "Inscriptions non validées" @@ -2666,14 +2666,10 @@ msgstr "avec les rôles suivants :" #: templates/wei/weimembership_form.html:152 msgid "" -"\n" -" The WEI will be paid by Société générale. The " -"membership will be created even if the bank didn't pay the BDE yet.\n" -" The membership transaction will be created but " -"will be invalid. You will have to validate it once the bank\n" -" validated the creation of the account, or to " -"change the payment method.\n" -" " +"The WEI will be paid by Société générale. The membership will be created " +"even if the bank didn't pay the BDE yet. The membership transaction will be " +"created but will be invalid. You will have to validate it once the bank " +"validated the creation of the account, or to change the payment method." msgstr "" "\n" "Le WEI va être payé par la Société générale. L'adhésion sera créée même si " @@ -2684,12 +2680,9 @@ msgstr "" " " #: templates/wei/weimembership_form.html:162 -#, python-format msgid "" -"\n" -" The note don't have enough money " -"(%(balance)s, %(pretty_fee)s required). The registration may fail.\n" -" " +"The note don't have enough money (%(balance)s, %(pretty_fee)s required). The " +"registration may fail." msgstr "" "\n" "La note n'a pas assez d'argent (%(balance)s, %(pretty_fee)s requis). " @@ -2705,20 +2698,14 @@ msgid "The user didn't give her/his caution check." msgstr "L'utilisateur n'a pas donné son chèque de caution." #: templates/wei/weimembership_form.html:184 -#, python-format msgid "" -"\n" -" This user is not a member of the Kfet club. " -"Please adhere\n" -" here if he/" -"she is in her/his first year\n" -" or here if he/she " -"was an old member before you validate\n" -" the registration of the WEI.\n" -" " +"This user is not a member of the Kfet club for the comming year. Please " +"adhere here if he/she is in her/his first " +"year or here if he/she was an old member " +"before you validate the registration of the WEI." msgstr "" "\n" -"Cet utilisateur n'est pas membre du club Kfet. Merci de le faire adhérer\n" +"Cet utilisateur n'est pas membre du club Kfet pour l'année à venir. Merci de le faire adhérer\n" "ici s'iel est en première année\n" "ou ici s'iel est un ancien membre avant de " "valider\n" @@ -2749,6 +2736,3 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." #: templates/wei/weiregistration_list.html:24 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." - -#~ msgid "Validate a registration" -#~ msgstr "Valider l'inscription" diff --git a/templates/wei/weimembership_form.html b/templates/wei/weimembership_form.html index d33c3de7..7c74457b 100644 --- a/templates/wei/weimembership_form.html +++ b/templates/wei/weimembership_form.html @@ -149,7 +149,7 @@ {% else %} {% if registration.soge_credit %}
    - {% blocktrans %} + {% blocktrans trimmed %} The WEI will be paid by Société générale. The membership will be created even if the bank didn't pay the BDE yet. The membership transaction will be created but will be invalid. You will have to validate it once the bank validated the creation of the account, or to change the payment method. @@ -159,7 +159,7 @@ {% if registration.user.note.balance < fee %}
    {% with pretty_fee=fee|pretty_money %} - {% blocktrans with balance=registration.user.note.balance|pretty_money %} + {% blocktrans trimmed with balance=registration.user.note.balance|pretty_money %} The note don't have enough money ({{ balance }}, {{ pretty_fee }} required). The registration may fail. {% endblocktrans %} {% endwith %} @@ -181,8 +181,8 @@
    {% url 'registration:future_user_detail' pk=registration.user.pk as future_user_detail %} {% url 'member:club_detail' pk=club.parent_club.parent_club.pk as club_detail %} - {% blocktrans %} - This user is not a member of the Kfet club. Please adhere + {% blocktrans trimmed %} + This user is not a member of the Kfet club for the comming year. Please adhere here if he/she is in her/his first year or here if he/she was an old member before you validate the registration of the WEI. From 358691aaa939f2e9773985dc1a51c8c32eb6a818 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 3 Aug 2020 23:57:59 +0200 Subject: [PATCH 032/319] :bug: Fix french translation --- locale/fr/LC_MESSAGES/django.po | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index f1a36008..fa49f7cc 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2671,23 +2671,19 @@ msgid "" "created but will be invalid. You will have to validate it once the bank " "validated the creation of the account, or to change the payment method." msgstr "" -"\n" "Le WEI va être payé par la Société générale. L'adhésion sera créée même si " "la banque n'a pas encore payé le BDE.\n" "La transaction d'adhésion sera créée mais invalide. Vous devrez la valider " "une fois que la banque\n" -"aura validé la création du compte, ou bien changer de moyen de paiement.\n" -" " +"aura validé la création du compte, ou bien changer de moyen de paiement." #: templates/wei/weimembership_form.html:162 msgid "" "The note don't have enough money (%(balance)s, %(pretty_fee)s required). The " "registration may fail." msgstr "" -"\n" "La note n'a pas assez d'argent (%(balance)s, %(pretty_fee)s requis). " -"L'inscription va échouer.\n" -" " +"L'inscription va échouer." #: templates/wei/weimembership_form.html:169 msgid "The note has enough money, the registration is possible." @@ -2704,13 +2700,11 @@ msgid "" "year or here if he/she was an old member " "before you validate the registration of the WEI." msgstr "" -"\n" "Cet utilisateur n'est pas membre du club Kfet pour l'année à venir. Merci de le faire adhérer\n" "ici s'iel est en première année\n" "ou ici s'iel est un ancien membre avant de " "valider\n" -"l'inscription au WEI.\n" -" " +"l'inscription au WEI." #: templates/wei/weimembership_list.html:24 msgid "View unvalidated registrations..." From a096dc44271dcd46769c197bd1419a08a189d89c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Tue, 4 Aug 2020 20:04:41 +0200 Subject: [PATCH 033/319] :sparkles: Adhere to parent clubs automatically, adhere to Kfet automatically when registering to the WEI --- apps/member/models.py | 90 +++++-- apps/member/views.py | 135 +++++++---- apps/treasury/views.py | 19 +- apps/wei/forms/registration.py | 31 +++ apps/wei/tables.py | 33 ++- apps/wei/views.py | 130 ++++++++-- locale/fr/LC_MESSAGES/django.po | 301 ++++++++++++++---------- templates/base.html | 12 +- templates/member/add_members.html | 27 ++- templates/member/club_detail.html | 2 - templates/member/profile_detail.html | 6 +- templates/member/profile_info.html | 28 +-- templates/member/profile_tables.html | 6 +- templates/wei/weiclub_detail.html | 12 +- templates/wei/weimembership_form.html | 12 +- templates/wei/weiregistration_list.html | 10 + 16 files changed, 588 insertions(+), 266 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 5d6544af..7bde2680 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -10,6 +10,7 @@ from django.core.exceptions import ValidationError from django.db import models from django.template import loader from django.urls import reverse, reverse_lazy +from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.utils.translation import gettext_lazy as _ @@ -301,13 +302,34 @@ class Membership(models.Model): else: return self.date_start.toordinal() <= datetime.datetime.now().toordinal() + def renew(self): + if 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( + user=self.user, + club=self.club, + date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start), + ) + from django.forms import model_to_dict + 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 save(self, *args, **kwargs): """ Calculate fee and end date before saving the membership and creating the transaction if needed. """ - if self.club.parent_club is not None: - if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists(): - raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name) if self.pk: for role in self.roles.all(): @@ -327,17 +349,54 @@ class Membership(models.Model): ).exists(): raise ValidationError(_('User is already a member of the club')) - if self.user.profile.paid: - self.fee = self.club.membership_fee_paid - else: - self.fee = self.club.membership_fee_unpaid + if self.club.parent_club is not None: + if not Membership.objects.filter( + user=self.user, + club=self.club.parent_club, + 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() + else: + raise ValidationError(_('User is not a member of the parent club') + + ' ' + self.club.parent_club.name) - 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) - if self.club.membership_end is not None and self.date_end > self.club.membership_end: - self.date_end = self.club.membership_end + if self.user.profile.paid: + self.fee = self.club.membership_fee_paid + else: + self.fee = 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) + if self.club.membership_end is not None and self.date_end > self.club.membership_end: + self.date_end = self.club.membership_end super().save(*args, **kwargs) @@ -360,8 +419,9 @@ class Membership(models.Model): reason="Adhésion " + self.club.name, ) transaction._force_save = True - print(hasattr(self, '_soge')) - if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS: + if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS\ + and (self.club.name == "BDE" or self.club.name == "Kfet" or + ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)): # If the soge pays, then the transaction is unvalidated in a first time, then submitted for control # to treasurers. transaction.valid = False diff --git a/apps/member/views.py b/apps/member/views.py index edcb0feb..cc1264a1 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -442,6 +442,16 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): .get(pk=self.kwargs["club_pk"], weiclub=None) form.fields['credit_amount'].initial = club.membership_fee_paid + c = club + clubs_renewal = [] + additional_fee_renewal = 0 + while c.parent_club is not None: + c = c.parent_club + clubs_renewal.append(c) + additional_fee_renewal += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid + context["clubs_renewal"] = clubs_renewal + context["additional_fee_renewal"] = additional_fee_renewal + # If the concerned club is the BDE, then we add the option that Société générale pays the membership. if club.name != "BDE": del form.fields['soge'] @@ -454,26 +464,54 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): context["total_fee"] = "{:.02f}".format(fee / 100, ) else: # This is a renewal. Fields can be pre-completed. + context["renewal"] = True + old_membership = self.get_queryset().get(pk=self.kwargs["pk"]) club = old_membership.club user = old_membership.user + + c = club + clubs_renewal = [] + additional_fee_renewal = 0 + while c.parent_club is not None: + c = c.parent_club + if not Membership.objects.filter( + club=c, + user=user, + date_start__gte=c.membership_start, + ).exists(): + clubs_renewal.append(c) + additional_fee_renewal += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid + context["clubs_renewal"] = clubs_renewal + context["additional_fee_renewal"] = additional_fee_renewal + form.fields['user'].initial = user form.fields['user'].disabled = True form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1) - form.fields['credit_amount'].initial = club.membership_fee_paid if user.profile.paid \ - else club.membership_fee_unpaid + form.fields['credit_amount'].initial = (club.membership_fee_paid if user.profile.paid + else club.membership_fee_unpaid) + additional_fee_renewal form.fields['last_name'].initial = user.last_name form.fields['first_name'].initial = user.first_name # If this is a renewal of a BDE membership, Société générale can pays, if it is not yet done - if club.name != "BDE" or user.profile.soge: + if (club.name != "BDE" and club.name != "Kfet") or user.profile.soge: del form.fields['soge'] else: fee = 0 bde = Club.objects.get(name="BDE") - fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid + if not Membership.objects.filter( + club=bde, + user=user, + date_start__gte=bde.membership_start, + ).exists(): + fee += bde.membership_fee_paid if user.profile.paid else bde.membership_fee_unpaid kfet = Club.objects.get(name="Kfet") - fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid + if not Membership.objects.filter( + club=kfet, + user=user, + date_start__gte=bde.membership_start, + ).exists(): + fee += kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid context["total_fee"] = "{:.02f}".format(fee / 100, ) context['club'] = club @@ -502,7 +540,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): last_name = form.cleaned_data["last_name"] first_name = form.cleaned_data["first_name"] bank = form.cleaned_data["bank"] - soge = form.cleaned_data["soge"] and not user.profile.soge and club.name == "BDE" + soge = form.cleaned_data["soge"] and not user.profile.soge and (club.name == "BDE" or club.name == "Kfet") # If Société générale pays, then we store that information but the payment must be controlled by treasurers # later. The membership transaction will be invalidated. @@ -513,10 +551,17 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): if credit_type is None: credit_amount = 0 - if user.profile.paid: - fee = club.membership_fee_paid - else: - fee = club.membership_fee_unpaid + fee = 0 + c = club + while c is not None: + if not Membership.objects.filter( + club=c, + user=user, + date_start__gte=c.membership_start, + ).exists(): + fee += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid + c = c.parent_club + if user.note.balance + credit_amount < fee and not Membership.objects.filter( club__name="Kfet", user=user, @@ -524,22 +569,11 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): date_end__gte=datetime.now().date(), ).exists(): # Users without a valid Kfet membership can't have a negative balance. - # Club 2 = Kfet (hard-code :'( ) # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note form.add_error('user', _("This user don't have enough money to join this club, and can't have a negative balance.")) return super().form_invalid(form) - if club.parent_club is not None: - if not Membership.objects.filter( - user=form.instance.user, - club=club.parent_club, - date_start__lte=form.instance.date_start, - date_end__gte=form.instance.date_start, - ).exists(): - form.add_error('user', _('User is not a member of the parent club') + ' ' + club.parent_club.name) - return super().form_invalid(form) - if Membership.objects.filter( user=form.instance.user, club=club, @@ -561,7 +595,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): # Now, all is fine, the membership can be created. - if club.name == "BDE": + if club.name == "BDE" or club.name == "Kfet": # When we renew the BDE membership, we update the profile section. # We could automate that and remove the section field from the Profile model, # but with this way users can customize their section as they want. @@ -593,6 +627,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): transaction._force_save = True transaction.save() + form.instance._force_renew_parent = True + ret = super().form_valid(form) member_role = Role.objects.filter(name="Membre de club").all() @@ -603,33 +639,40 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): # If Société générale pays, then we assume that this is the BDE membership, and we auto-renew the # Kfet membership. if soge: + # If not already done, create BDE and Kfet memberships + bde = Club.objects.get(name="BDE") kfet = Club.objects.get(name="Kfet") - kfet_fee = kfet.membership_fee_paid if user.profile.paid else kfet.membership_fee_unpaid - # Get current membership, to get the end date - old_membership = Membership.objects.filter( - club__name="Kfet", - user=user, - date_start__lte=datetime.today(), - date_end__gte=datetime.today(), - ) + soge_clubs = [bde, kfet] + for club in soge_clubs: + fee = club.membership_fee_paid if user.profile.paid else club.membership_fee_unpaid - membership = Membership( - club=kfet, - user=user, - fee=kfet_fee, - date_start=old_membership.get().date_end + timedelta(days=1) - if old_membership.exists() else form.instance.date_start, - ) - membership._force_save = True - membership._soge = True - membership.save() - membership.refresh_from_db() - if old_membership.exists(): - membership.roles.set(old_membership.get().roles.all()) - else: - membership.roles.add(Role.objects.get(name="Adhérent Kfet")) - membership.save() + # Get current membership, to get the end date + old_membership = Membership.objects.filter( + club=club, + user=user, + ).order_by("-date_start") + + if old_membership.filter(date_start__gte=club.membership_start).exists(): + # Membership is already renewed + continue + + membership = Membership( + club=club, + user=user, + fee=fee, + date_start=max(old_membership.first().date_end + timedelta(days=1), club.membership_start) + if old_membership.exists() else form.instance.date_start, + ) + membership._force_save = True + membership._soge = True + membership.save() + membership.refresh_from_db() + if old_membership.exists(): + membership.roles.set(old_membership.get().roles.all()) + else: + membership.roles.add(Role.objects.get(name="Adhérent Kfet")) + membership.save() return ret diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 22215254..088345b8 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -353,18 +353,13 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi qs = super().get_queryset() if "search" in self.request.GET: pattern = self.request.GET["search"] - - if not pattern: - return qs.none() - - qs = qs.filter( - Q(user__first_name__iregex=pattern) - | Q(user__last_name__iregex=pattern) - | Q(user__note__alias__name__iregex="^" + pattern) - | Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern)) - ) - else: - qs = qs.none() + if pattern: + qs = qs.filter( + Q(user__first_name__iregex=pattern) + | Q(user__last_name__iregex=pattern) + | Q(user__note__alias__name__iregex="^" + pattern) + | Q(user__note__alias__normalized_name__iregex="^" + Alias.normalize(pattern)) + ) if "valid" in self.request.GET: q = Q(credit_transaction=None) diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py index 738db4e2..98215f4b 100644 --- a/apps/wei/forms/registration.py +++ b/apps/wei/forms/registration.py @@ -6,6 +6,8 @@ from django.contrib.auth.models import User from django.db.models import Q from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ + +from note.models import NoteSpecial from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget from ..models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership, WEIRole @@ -75,6 +77,35 @@ class WEIMembershipForm(forms.ModelForm): widget=CheckboxSelectMultiple(), ) + credit_type = forms.ModelChoiceField( + queryset=NoteSpecial.objects.all(), + label=_("Credit type"), + empty_label=_("No credit"), + required=False, + ) + + credit_amount = forms.IntegerField( + label=_("Credit amount"), + widget=AmountInput(), + initial=0, + required=False, + ) + + last_name = forms.CharField( + label=_("Last name"), + required=False, + ) + + first_name = forms.CharField( + label=_("First name"), + required=False, + ) + + bank = forms.CharField( + label=_("Bank"), + required=False, + ) + def clean(self): cleaned_data = super().clean() if cleaned_data["team"] is not None and cleaned_data["team"].bus != cleaned_data["bus"]: diff --git a/apps/wei/tables.py b/apps/wei/tables.py index 41c35a47..0fae6848 100644 --- a/apps/wei/tables.py +++ b/apps/wei/tables.py @@ -3,9 +3,13 @@ import django_tables2 as tables from django.urls import reverse_lazy +from django.utils import timezone +from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ from django_tables2 import A +from note_kfet.middlewares import get_current_authenticated_user +from permission.backends import PermissionBackend from .models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership @@ -53,8 +57,12 @@ class WEIRegistrationTable(tables.Table): verbose_name=_("Validate"), text=_("Validate"), attrs={ + 'th': { + 'id': 'validate-membership-header' + }, 'a': { - 'class': 'btn btn-success' + 'class': 'btn btn-success', + 'data-type': 'validate-membership' } } ) @@ -65,12 +73,33 @@ class WEIRegistrationTable(tables.Table): verbose_name=_("delete"), text=_("Delete"), attrs={ + 'th': { + 'id': 'delete-membership-header' + }, 'a': { - 'class': 'btn btn-danger' + 'class': 'btn btn-danger', + 'data-type': 'delete-membership' } }, ) + def render_validate(self, record): + if PermissionBackend.check_perm(get_current_authenticated_user(), "wei.add_weimembership", WEIMembership( + club=record.wei, + user=record.user, + date_start=timezone.now().date(), + date_end=timezone.now().date(), + fee=0, + registration=record, + )): + return _("Validate") + return format_html("") + + def render_delete(self, record): + if PermissionBackend.check_perm(get_current_authenticated_user(), "wei.delete_weimembership", record): + return _("Delete") + return format_html("") + class Meta: attrs = { 'class': 'table table-condensed table-striped table-hover' diff --git a/apps/wei/views.py b/apps/wei/views.py index 7731f08b..fe2a47a5 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -24,10 +24,11 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic.edit import BaseFormView, DeleteView from django_tables2 import SingleTableView from member.models import Membership, Club -from note.models import Transaction, NoteClub, Alias +from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSpecial from note.tables import HistoryTable from note_kfet.settings import BASE_DIR from permission.backends import PermissionBackend +from permission.models import Role from permission.views import ProtectQuerysetMixin from .forms.registration import WEIChooseBusForm @@ -666,6 +667,15 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update survey = CurrentSurvey(self.object) if not survey.is_complete(): return reverse_lazy("wei:wei_survey", kwargs={"pk": self.object.pk}) + if PermissionBackend.check_perm(self.request.user, "wei.add_weimembership", WEIMembership( + club=self.object.wei, + user=self.object.user, + date_start=timezone.now().date(), + date_end=timezone.now().date(), + fee=0, + registration=self.object, + )): + return reverse_lazy("wei:validate_registration", kwargs={"pk": self.object.pk}) return reverse_lazy("wei:wei_detail", kwargs={"pk": self.object.wei.pk}) @@ -723,19 +733,55 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea if survey.information.valid: context["suggested_bus"] = survey.information.get_selected_bus() context["club"] = registration.wei - context["fee"] = registration.wei.membership_fee_paid if registration.user.profile.paid \ - else registration.wei.membership_fee_unpaid + + kfet = registration.wei.parent_club + bde = kfet.parent_club + context["kfet_member"] = Membership.objects.filter( - club__name="Kfet", + club__name=kfet.name, user=registration.user, - date_start__gte=registration.wei.parent_club.membership_start, + date_start__gte=kfet.membership_start, ).exists() + context["bde_member"] = Membership.objects.filter( + club__name=bde.name, + user=registration.user, + date_start__gte=bde.membership_start, + ).exists() + + fee = registration.wei.membership_fee_paid if registration.user.profile.paid \ + else registration.wei.membership_fee_unpaid + if not context["kfet_member"]: + fee += kfet.membership_fee_paid if registration.user.profile.paid \ + else kfet.membership_fee_unpaid + if not context["bde_member"]: + fee += bde.membership_fee_paid if registration.user.profile.paid \ + else bde.membership_fee_unpaid + + context["fee"] = fee + + form = context["form"] + if registration.soge_credit: + form.fields["credit_amount"].initial = fee + else: + form.fields["credit_amount"].initial = max(0, fee - registration.user.note.balance) return context def get_form(self, form_class=None): form = super().get_form(form_class) registration = WEIRegistration.objects.get(pk=self.kwargs["pk"]) + form.fields["last_name"].initial = registration.user.last_name + form.fields["first_name"].initial = registration.user.first_name + + if registration.soge_credit: + form.fields["credit_type"].disabled = True + form.fields["credit_type"].initial = NoteSpecial.objects.get(special_type="Virement bancaire") + form.fields["credit_amount"].disabled = True + form.fields["last_name"].disabled = True + form.fields["first_name"].disabled = True + form.fields["bank"].disabled = True + form.fields["bank"].initial = "Société générale" + form.fields["bus"].widget.attrs["api_url"] = "/api/wei/bus/?wei=" + str(registration.wei.pk) if registration.first_year: # Use the results of the survey to fill initial data @@ -750,7 +796,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea if "preferred_bus_pk" in information and len(information["preferred_bus_pk"]) == 1: form["bus"].initial = Bus.objects.get(pk=information["preferred_bus_pk"][0]) if "preferred_team_pk" in information and len(information["preferred_team_pk"]) == 1: - form["team"].initial = Bus.objects.get(pk=information["preferred_team_pk"][0]) + form["team"].initial = BusTeam.objects.get(pk=information["preferred_team_pk"][0]) if "preferred_roles_pk" in information: form["roles"].initial = WEIRole.objects.filter( Q(pk__in=information["preferred_roles_pk"]) | Q(name="Adhérent WEI") @@ -770,38 +816,80 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea membership.club = club membership.date_start = min(date.today(), club.date_start) membership.registration = registration + # Force the membership of the clubs BDE and Kfet + membership._force_renew_parent = True if user.profile.paid: fee = club.membership_fee_paid else: fee = club.membership_fee_unpaid - if not registration.soge_credit and user.note.balance < fee: - # Users must have money before registering to the WEI. - # TODO Send a notification to the user (with a mail?) to tell her/him to credit her/his note - form.add_error('bus', - _("This user don't have enough money to join this club, and can't have a negative balance.")) - return super().form_invalid(form) + kfet = club.parent_club + bde = kfet.parent_club + + kfet_member = Membership.objects.filter( + club__name=kfet.name, + user=registration.user, + date_start__gte=kfet.membership_start, + ).exists() + bde_member = Membership.objects.filter( + club__name=bde.name, + user=registration.user, + date_start__gte=bde.membership_start, + ).exists() + + if not kfet_member: + fee += kfet.membership_fee_paid if registration.user.profile.paid else kfet.membership_fee_unpaid + if not bde_member: + fee += bde.membership_fee_paid if registration.user.profile.paid else bde.membership_fee_unpaid + + credit_type = form.cleaned_data["credit_type"] + credit_amount = form.cleaned_data["credit_amount"] + last_name = form.cleaned_data["last_name"] + first_name = form.cleaned_data["first_name"] + bank = form.cleaned_data["bank"] + + if credit_type is None or registration.soge_credit: + credit_amount = 0 if not registration.caution_check and not registration.first_year: form.add_error('bus', _("This user didn't give her/his caution check.")) return super().form_invalid(form) - if club.parent_club is not None: # parent_club is never None: this is Kfet. - # We want that the user is member of the Kfet club *of this year*: the Kfet membership is included - # in the WEI registration. - if not Membership.objects.filter( - user=form.instance.user, - club=club.parent_club, # Kfet - date_start__gte=club.parent_club.membership_start, - ).exists(): - form.add_error('bus', _('User is not a member of the parent club') + ' ' + club.parent_club.name) + if not registration.soge_credit and user.note.balance < fee + credit_amount: + # Users must have money before registering to the WEI. + form.add_error('bus', + _("This user don't have enough money to join this club, and can't have a negative balance.")) + return super().form_invalid(form) + + if credit_amount: + if not last_name: + form.add_error('last_name', _("This field is required.")) return super().form_invalid(form) + if not first_name: + form.add_error('first_name', _("This field is required.")) + return super().form_invalid(form) + + # Credit note before adding the membership + SpecialTransaction.objects.create( + source=credit_type, + destination=registration.user.note, + amount=credit_amount, + reason="Crédit " + str(credit_type) + " (WEI)", + last_name=last_name, + first_name=first_name, + bank=bank, + ) + # Now, all is fine, the membership can be created. + if registration.soge_credit: + form.instance._soge = True + if registration.first_year: membership = form.instance + # If the user is not a member of the club Kfet, then the membership is created. membership.save() membership.refresh_from_db() membership.roles.set(WEIRole.objects.filter(name="1A").all()) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index fa49f7cc..6875a00d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-03 23:53+0200\n" +"POT-Creation-Date: 2020-08-04 20:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,7 @@ 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:24 apps/activity/models.py:49 -#: apps/member/models.py:158 apps/note/models/notes.py:212 +#: apps/member/models.py:159 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 #: apps/note/models/transactions.py:268 apps/permission/models.py:339 #: apps/wei/models.py:65 apps/wei/models.py:117 @@ -84,7 +84,7 @@ msgstr "description" msgid "type" msgstr "type" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:266 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:267 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 #: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -189,12 +189,13 @@ msgstr "Type" #: apps/activity/tables.py:77 apps/member/forms.py:103 #: apps/registration/forms.py:70 apps/treasury/forms.py:120 +#: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:79 apps/member/forms.py:108 #: apps/registration/forms.py:75 apps/treasury/forms.py:122 -#: templates/note/transaction_form.html:129 +#: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" msgstr "Prénom" @@ -268,7 +269,7 @@ msgid "edit" msgstr "Modifier" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:137 apps/wei/tables.py:65 +#: apps/permission/models.py:137 apps/wei/tables.py:73 msgid "delete" msgstr "Supprimer" @@ -292,25 +293,25 @@ msgstr "journal de modification" msgid "changelogs" msgstr "journaux de modifications" -#: apps/member/admin.py:52 apps/member/models.py:185 +#: apps/member/admin.py:52 apps/member/models.py:186 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/admin.py:53 apps/member/models.py:190 +#: apps/member/admin.py:53 apps/member/models.py:191 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:67 apps/member/models.py:277 +#: apps/member/admin.py:67 apps/member/models.py:278 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:68 apps/member/models.py:291 +#: apps/member/admin.py:68 apps/member/models.py:292 msgid "fee" msgstr "cotisation" -#: apps/member/apps.py:14 apps/wei/tables.py:150 apps/wei/tables.py:181 +#: apps/member/apps.py:14 apps/wei/tables.py:179 apps/wei/tables.py:210 msgid "member" msgstr "adhérent" @@ -328,10 +329,12 @@ 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:89 apps/registration/forms.py:57 +#: apps/wei/forms/registration.py:82 msgid "Credit type" msgstr "Type de rechargement" #: apps/member/forms.py:90 apps/registration/forms.py:58 +#: apps/wei/forms/registration.py:83 msgid "No credit" msgstr "Pas de rechargement" @@ -340,11 +343,13 @@ 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:96 apps/registration/forms.py:63 +#: apps/wei/forms/registration.py:88 msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:113 apps/registration/forms.py:80 -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:135 +#: apps/treasury/forms.py:124 apps/wei/forms/registration.py:105 +#: templates/note/transaction_form.html:135 msgid "Bank" msgstr "Banque" @@ -356,171 +361,171 @@ msgstr "Utilisateur" msgid "Roles" msgstr "Rôles" -#: apps/member/models.py:34 +#: apps/member/models.py:35 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:41 templates/member/profile_info.html:29 +#: apps/member/models.py:42 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "section" -#: apps/member/models.py:42 +#: apps/member/models.py:43 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:50 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:51 templates/wei/weimembership_form.html:36 msgid "department" msgstr "département" -#: apps/member/models.py:52 +#: apps/member/models.py:53 msgid "Informatics (A0)" msgstr "Informatique (A0)" -#: apps/member/models.py:53 +#: apps/member/models.py:54 msgid "Mathematics (A1)" msgstr "Mathématiques (A1)" -#: apps/member/models.py:54 +#: apps/member/models.py:55 msgid "Physics (A2)" msgstr "Physique (A2)" -#: apps/member/models.py:55 +#: apps/member/models.py:56 msgid "Applied physics (A'2)" msgstr "Physique appliquée (A'2)" -#: apps/member/models.py:56 +#: apps/member/models.py:57 msgid "Chemistry (A''2)" msgstr "Chimie (A''2)" -#: apps/member/models.py:57 +#: apps/member/models.py:58 msgid "Biology (A3)" msgstr "Biologie (A3)" -#: apps/member/models.py:58 +#: apps/member/models.py:59 msgid "SAPHIRE (B1234)" msgstr "SAPHIRE (B1234)" -#: apps/member/models.py:59 +#: apps/member/models.py:60 msgid "Mechanics (B1)" msgstr "Mécanique (B1)" -#: apps/member/models.py:60 +#: apps/member/models.py:61 msgid "Civil engineering (B2)" msgstr "Génie civil (B2)" -#: apps/member/models.py:61 +#: apps/member/models.py:62 msgid "Mechanical engineering (B3)" msgstr "Génie mécanique (B3)" -#: apps/member/models.py:62 +#: apps/member/models.py:63 msgid "EEA (B4)" msgstr "EEA (B4)" -#: apps/member/models.py:63 +#: apps/member/models.py:64 msgid "Design (C)" msgstr "Design (C)" -#: apps/member/models.py:64 +#: apps/member/models.py:65 msgid "Economy-management (D2)" msgstr "Économie-gestion (D2)" -#: apps/member/models.py:65 +#: apps/member/models.py:66 msgid "Social sciences (D3)" msgstr "Sciences sociales (D3)" -#: apps/member/models.py:66 +#: apps/member/models.py:67 msgid "English (E)" msgstr "Anglais (E)" -#: apps/member/models.py:67 +#: apps/member/models.py:68 msgid "External (EXT)" msgstr "Externe (EXT)" -#: apps/member/models.py:74 +#: apps/member/models.py:75 msgid "promotion" msgstr "promotion" -#: apps/member/models.py:75 +#: apps/member/models.py:76 msgid "Year of entry to the school (None if not ENS student)" msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)" -#: apps/member/models.py:79 templates/member/profile_info.html:32 +#: apps/member/models.py:80 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "adresse" -#: apps/member/models.py:86 +#: apps/member/models.py:87 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "payé" -#: apps/member/models.py:87 +#: apps/member/models.py:88 msgid "Tells if the user receive a salary." msgstr "Indique si l'utilisateur perçoit un salaire." -#: apps/member/models.py:92 +#: apps/member/models.py:93 msgid "email confirmed" msgstr "adresse email confirmée" -#: apps/member/models.py:97 +#: apps/member/models.py:98 msgid "registration valid" msgstr "inscription valid" -#: apps/member/models.py:126 apps/member/models.py:127 +#: apps/member/models.py:127 apps/member/models.py:128 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:134 +#: apps/member/models.py:135 msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" -#: apps/member/models.py:163 templates/member/club_info.html:57 +#: apps/member/models.py:164 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "courriel" -#: apps/member/models.py:170 +#: apps/member/models.py:171 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:179 +#: apps/member/models.py:180 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:180 +#: apps/member/models.py:181 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:196 templates/member/club_info.html:33 +#: apps/member/models.py:197 templates/member/club_info.html:33 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:197 +#: apps/member/models.py:198 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:204 templates/member/club_info.html:23 +#: apps/member/models.py:205 templates/member/club_info.html:23 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:205 +#: apps/member/models.py:206 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:212 templates/member/club_info.html:28 +#: apps/member/models.py:213 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:213 +#: apps/member/models.py:214 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -528,46 +533,46 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:247 apps/member/models.py:272 +#: apps/member/models.py:248 apps/member/models.py:273 #: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:248 +#: apps/member/models.py:249 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:282 +#: apps/member/models.py:283 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:286 +#: apps/member/models.py:287 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:310 apps/member/views.py:540 apps/wei/views.py:798 -msgid "User is not a member of the parent club" -msgstr "L'utilisateur n'est pas membre du club parent" - -#: apps/member/models.py:317 +#: apps/member/models.py:339 #, 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:328 apps/member/views.py:549 +#: apps/member/models.py:350 apps/member/views.py:583 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:379 +#: apps/member/models.py:386 +msgid "User is not a member of the parent club" +msgstr "L'utilisateur n'est pas membre du club parent" + +#: apps/member/models.py:439 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:382 +#: apps/member/models.py:442 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:383 +#: apps/member/models.py:443 msgid "memberships" msgstr "adhésions" @@ -625,7 +630,7 @@ msgstr "Modifier le club" msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:530 apps/wei/views.py:783 +#: apps/member/views.py:574 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -633,25 +638,25 @@ 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:553 +#: apps/member/views.py:587 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:558 +#: apps/member/views.py:592 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:575 apps/member/views.py:577 apps/member/views.py:579 +#: apps/member/views.py:609 apps/member/views.py:611 apps/member/views.py:613 #: apps/registration/views.py:290 apps/registration/views.py:292 -#: apps/registration/views.py:294 +#: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:647 +#: apps/member/views.py:690 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:672 +#: apps/member/views.py:715 msgid "Members of the club" msgstr "Membres du club" @@ -950,13 +955,13 @@ msgstr "Cliquez pour valider" msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:66 -#: templates/treasury/sogecredit_detail.html:59 +#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:74 +#: apps/wei/tables.py:100 templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "Supprimer" -#: apps/note/tables.py:162 apps/wei/tables.py:42 apps/wei/tables.py:43 +#: apps/note/tables.py:162 apps/wei/tables.py:46 apps/wei/tables.py:47 #: templates/member/club_info.html:67 templates/note/conso_form.html:128 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 @@ -1190,7 +1195,7 @@ msgstr "Trésorerie" #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/add_members.html:14 templates/member/club_form.html:9 +#: templates/member/add_members.html:31 templates/member/club_form.html:9 #: templates/note/transactiontemplate_form.html:15 #: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 @@ -1410,7 +1415,7 @@ msgstr "Joindre une transaction à une remise" 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:384 +#: apps/treasury/views.py:379 msgid "Manage credits from the Société générale" msgstr "Gérer les crédits de la Société générale" @@ -1419,12 +1424,12 @@ msgstr "Gérer les crédits de la Société générale" msgid "WEI" msgstr "WEI" -#: apps/wei/forms/registration.py:48 apps/wei/models.py:112 +#: apps/wei/forms/registration.py:50 apps/wei/models.py:112 #: apps/wei/models.py:297 msgid "bus" msgstr "Bus" -#: apps/wei/forms/registration.py:49 +#: apps/wei/forms/registration.py:51 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." @@ -1433,11 +1438,11 @@ msgstr "" "attribuer un bus et une équipe, en particulier si vous êtes un électron " "libre." -#: apps/wei/forms/registration.py:56 +#: apps/wei/forms/registration.py:58 msgid "Team" msgstr "Équipe" -#: apps/wei/forms/registration.py:58 +#: apps/wei/forms/registration.py:60 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" @@ -1445,16 +1450,16 @@ msgstr "" "Laissez ce champ vide si vous ne serez pas dans une équipe (staff, chef de " "bus ou électron libre)" -#: apps/wei/forms/registration.py:64 apps/wei/forms/registration.py:74 +#: apps/wei/forms/registration.py:66 apps/wei/forms/registration.py:76 #: apps/wei/models.py:147 msgid "WEI Roles" msgstr "Rôles au WEI" -#: apps/wei/forms/registration.py:65 +#: apps/wei/forms/registration.py:67 msgid "Select the roles that you are interested in." msgstr "Sélectionnez les rôles qui vous intéressent." -#: apps/wei/forms/registration.py:81 +#: apps/wei/forms/registration.py:112 msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." @@ -1624,97 +1629,97 @@ msgstr "adhésion au WEI" msgid "WEI memberships" msgstr "adhésions au WEI" -#: apps/wei/tables.py:53 apps/wei/tables.py:54 +#: apps/wei/tables.py:57 apps/wei/tables.py:58 apps/wei/tables.py:95 #: templates/treasury/sogecredit_detail.html:57 msgid "Validate" msgstr "Valider" -#: apps/wei/tables.py:96 +#: apps/wei/tables.py:125 msgid "Year" msgstr "Année" -#: apps/wei/tables.py:134 templates/wei/bus_tables.html:26 +#: apps/wei/tables.py:163 templates/wei/bus_tables.html:26 #: templates/wei/busteam_tables.html:43 msgid "Teams" msgstr "Équipes" -#: apps/wei/tables.py:143 apps/wei/tables.py:184 +#: apps/wei/tables.py:172 apps/wei/tables.py:213 msgid "Members count" msgstr "Nombre de membres" -#: apps/wei/tables.py:150 apps/wei/tables.py:181 +#: apps/wei/tables.py:179 apps/wei/tables.py:210 msgid "members" msgstr "adhérents" -#: apps/wei/views.py:56 +#: apps/wei/views.py:57 msgid "Search WEI" msgstr "Chercher un WEI" -#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10 +#: apps/wei/views.py:75 templates/wei/weiclub_list.html:10 msgid "Create WEI" msgstr "Créer un WEI" -#: apps/wei/views.py:94 +#: apps/wei/views.py:95 msgid "WEI Detail" msgstr "Détails du WEI" -#: apps/wei/views.py:189 +#: apps/wei/views.py:190 msgid "View members of the WEI" msgstr "Voir les membres du WEI" -#: apps/wei/views.py:217 +#: apps/wei/views.py:218 msgid "Find WEI Membership" msgstr "Trouver une adhésion au WEI" -#: apps/wei/views.py:227 +#: apps/wei/views.py:228 msgid "View registrations to the WEI" msgstr "Voir les inscriptions au WEI" -#: apps/wei/views.py:251 +#: apps/wei/views.py:252 msgid "Find WEI Registration" msgstr "Trouver une inscription au WEI" -#: apps/wei/views.py:262 +#: apps/wei/views.py:263 msgid "Update the WEI" msgstr "Modifier le WEI" -#: apps/wei/views.py:283 +#: apps/wei/views.py:284 msgid "Create new bus" msgstr "Ajouter un nouveau bus" -#: apps/wei/views.py:314 +#: apps/wei/views.py:315 msgid "Update bus" msgstr "Modifier le bus" -#: apps/wei/views.py:344 +#: apps/wei/views.py:345 msgid "Manage bus" msgstr "Gérer le bus" -#: apps/wei/views.py:371 +#: apps/wei/views.py:372 msgid "Create new team" msgstr "Créer une nouvelle équipe" -#: apps/wei/views.py:403 +#: apps/wei/views.py:404 msgid "Update team" msgstr "Modifier l'équipe" -#: apps/wei/views.py:434 +#: apps/wei/views.py:435 msgid "Manage WEI team" msgstr "Gérer l'équipe WEI" -#: apps/wei/views.py:456 +#: apps/wei/views.py:457 msgid "Register first year student to the WEI" msgstr "Inscrire un 1A au WEI" -#: apps/wei/views.py:468 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:469 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/views.py:489 apps/wei/views.py:560 +#: apps/wei/views.py:490 apps/wei/views.py:561 msgid "This user is already registered to this WEI." msgstr "Cette personne est déjà inscrite au WEI." -#: apps/wei/views.py:494 +#: apps/wei/views.py:495 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." @@ -1722,39 +1727,39 @@ msgstr "" "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà " "participé à un WEI." -#: apps/wei/views.py:511 +#: apps/wei/views.py:512 msgid "Register old student to the WEI" msgstr "Inscrire un 2A+ au WEI" -#: apps/wei/views.py:523 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:524 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/views.py:542 apps/wei/views.py:627 +#: apps/wei/views.py:543 apps/wei/views.py:628 msgid "You already opened an account in the Société générale." msgstr "Vous avez déjà ouvert un compte auprès de la société générale." -#: apps/wei/views.py:590 +#: apps/wei/views.py:591 msgid "Update WEI Registration" msgstr "Modifier l'inscription WEI" -#: apps/wei/views.py:677 +#: apps/wei/views.py:687 msgid "Delete WEI registration" msgstr "Supprimer l'inscription WEI" -#: apps/wei/views.py:688 +#: apps/wei/views.py:698 msgid "You don't have the right to delete this WEI registration." msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI." -#: apps/wei/views.py:707 +#: apps/wei/views.py:717 msgid "Validate WEI registration" msgstr "Valider l'inscription WEI" -#: apps/wei/views.py:787 +#: apps/wei/views.py:856 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:830 apps/wei/views.py:883 apps/wei/views.py:893 +#: apps/wei/views.py:918 apps/wei/views.py:971 apps/wei/views.py:981 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1807,7 +1812,7 @@ msgstr "Page inexistante" msgid "" "The requested path %(request_path)s was not found on the server." msgstr "" -"The chemin demandé %(request_path)s n'a pas été trouvé sur le " +"Le chemin demandé %(request_path)s n'a pas été trouvé sur le " "serveur." #: templates/500.html:6 @@ -1926,13 +1931,33 @@ msgstr "" msgid "Field filters" msgstr "" +#: templates/member/add_members.html:15 +#, python-format +msgid "" +"The user is not a member of the club·s %(clubs)s. An additional fee of " +"%(pretty_fee)s will be charged to renew automatically the membership in this/" +"these club·s." +msgstr "" +"Cet utilisateur n'est pas membre du/des club·s parent·s %(clubs)s. Un " +"montant supplémentaire de%(pretty_fee)s sera débitée afin de renouveler " +"automatiquement l'adhésion dans ce·s club·s." + +#: templates/member/add_members.html:20 +#, python-format +msgid "" +"This club has parents %(clubs)s. An additional fee of %(pretty_fee)s will be " +"charged to adhere automatically to this/these club·s." +msgstr "" +"Ce club a pour parent·s %(clubs)s. Un coût supplémentaire de %(pretty_fee)s " +"peut être ajouté pour adhérer automatiquement à ce·s club·s." + #: templates/member/alias_update.html:5 msgid "Add alias" msgstr "Ajouter un alias" #: templates/member/autocomplete_model.html:11 msgid "Reset" -msgstr "" +msgstr "Réinitialiser" #: templates/member/club_info.html:17 msgid "Club Parent" @@ -2478,7 +2503,7 @@ msgid "" "validated, but no credit will be operated." msgstr "" "Si vous supprimez cette demande de crédit, alors toutes les transactions " -"d'adhésion seront aussi validées, but il n'y aura pas de transaction de " +"d'adhésion seront aussi validées, mais il n'y aura pas de transaction de " "crédit créée." #: templates/treasury/sogecredit_detail.html:37 @@ -2678,6 +2703,7 @@ msgstr "" "aura validé la création du compte, ou bien changer de moyen de paiement." #: templates/wei/weimembership_form.html:162 +#, python-format msgid "" "The note don't have enough money (%(balance)s, %(pretty_fee)s required). The " "registration may fail." @@ -2686,25 +2712,29 @@ msgstr "" "L'inscription va échouer." #: templates/wei/weimembership_form.html:169 -msgid "The note has enough money, the registration is possible." +#, fuzzy, python-format +#| msgid "The note has enough money, the registration is possible." +msgid "" +"The note has enough money (%(pretty_fee)s required), the registration is " +"possible." msgstr "La note a assez d'argent, l'inscription est possible." -#: templates/wei/weimembership_form.html:176 +#: templates/wei/weimembership_form.html:178 msgid "The user didn't give her/his caution check." msgstr "L'utilisateur n'a pas donné son chèque de caution." -#: templates/wei/weimembership_form.html:184 +#: templates/wei/weimembership_form.html:186 +#, fuzzy +#| msgid "" +#| "You must also go to the Kfet to pay your membership. The WEI registration " +#| "includes the BDE membership." msgid "" -"This user is not a member of the Kfet club for the comming year. Please " -"adhere here if he/she is in her/his first " -"year or here if he/she was an old member " -"before you validate the registration of the WEI." +"This user is not a member of the Kfet club for the coming year. The " +"membership will be processed automatically, the WEI registration includes " +"the membership fee." msgstr "" -"Cet utilisateur n'est pas membre du club Kfet pour l'année à venir. Merci de le faire adhérer\n" -"ici s'iel est en première année\n" -"ou ici s'iel est un ancien membre avant de " -"valider\n" -"l'inscription au WEI." +"Vous devrez également vous rendre à la Kfet pour payer votre adhésion. " +"L'inscription au WEI inclut l'adhésion au BDE." #: templates/wei/weimembership_list.html:24 msgid "View unvalidated registrations..." @@ -2730,3 +2760,16 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." #: templates/wei/weiregistration_list.html:24 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." + +#~ msgid "" +#~ "This user is not a member of the Kfet club for the comming year. Please " +#~ "adhere here if he/she is in her/his " +#~ "first year or here if he/she was an old " +#~ "member before you validate the registration of the WEI." +#~ msgstr "" +#~ "Cet utilisateur n'est pas membre du club Kfet pour l'année à venir. Merci " +#~ "de le faire adhérer\n" +#~ "ici s'iel est en première année\n" +#~ "ou ici s'iel est un ancien membre avant " +#~ "de valider\n" +#~ "l'inscription au WEI." diff --git a/templates/base.html b/templates/base.html index 9b1f463e..8b45d914 100644 --- a/templates/base.html +++ b/templates/base.html @@ -124,27 +124,27 @@ SPDX-License-Identifier: GPL-3.0-or-later {% trans 'WEI' %} {% endif %} - {% if user.is_authenticated %} + {% if request.user.is_authenticated %}
  • {% trans 'Rights' %}
    • {% endif %} - {% if user.is_staff and ""|has_perm:user %} + {% if request.user.is_staff and ""|has_perm:user %}
  • {% trans 'Admin' %}
    • {% endif %}
      - {% if user.is_authenticated %} + {% if request.user.is_authenticated %}
    • - + Mon compte @@ -168,7 +168,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
      - {% if user.is_authenticated and not user.profile.email_confirmed %} + {% if request.user.is_authenticated and not request.user.profile.email_confirmed %}
      {% trans "Your e-mail address is not validated. Please check your mail inbox and click on the validation link." %}
      diff --git a/templates/member/add_members.html b/templates/member/add_members.html index ad6f1f29..8f429541 100644 --- a/templates/member/add_members.html +++ b/templates/member/add_members.html @@ -2,17 +2,34 @@ {% load crispy_forms_tags %} {% load static %} {% load i18n %} +{% load pretty_money %} {% block profile_info %} {% include "member/club_info.html" %} {% endblock %} {% block profile_content %} -
      - {% csrf_token %} - {{ form|crispy }} - -
      + {% if additional_fee_renewal %} +
      + {% if renewal %} + {% blocktrans trimmed with clubs=clubs_renewal|join:", " pretty_fee=additional_fee_renewal|pretty_money %} + The user is not a member of the club·s {{ clubs }}. An additional fee of {{ pretty_fee }} + will be charged to renew automatically the membership in this/these club·s. + {% endblocktrans %} + {% else %} + {% blocktrans trimmed with clubs=clubs_renewal|join:", " pretty_fee=additional_fee_renewal|pretty_money %} + This club has parents {{ clubs }}. An additional fee of {{ pretty_fee }} + will be charged to adhere automatically to this/these club·s. + {% endblocktrans %} + {% endif %} +
      + {% endif %} + +
      + {% csrf_token %} + {{ form|crispy }} + +
      {% endblock %} {% block extrajavascript %} diff --git a/templates/member/club_detail.html b/templates/member/club_detail.html index fedd43fa..451e4d76 100644 --- a/templates/member/club_detail.html +++ b/templates/member/club_detail.html @@ -14,7 +14,5 @@ $("#history_list").load("{% url 'member:club_detail' pk=object.pk %} #history_list"); $("#profile_infos").load("{% url 'member:club_detail' pk=object.pk %} #profile_infos"); } - - window.history.replaceState({}, document.title, location.pathname); {% endblock %} diff --git a/templates/member/profile_detail.html b/templates/member/profile_detail.html index 04b15d3b..297af21c 100644 --- a/templates/member/profile_detail.html +++ b/templates/member/profile_detail.html @@ -11,10 +11,8 @@ {% block extrajavascript %} {% endblock %} diff --git a/templates/member/profile_info.html b/templates/member/profile_info.html index 35d3e4ea..3694fde3 100644 --- a/templates/member/profile_info.html +++ b/templates/member/profile_info.html @@ -2,22 +2,22 @@
      -

      {% trans "Account #" %} {{ user.pk }}

      +

      {% trans "Account #" %} {{ user_object.pk }}

      - - + +
      {% trans 'name'|capfirst %}, {% trans 'first name' %}
      -
      {{ user.last_name }} {{ user.first_name }}
      +
      {{ user_object.last_name }} {{ user_object.first_name }}
      {% trans 'username'|capfirst %}
      -
      {{ user.username }}
      +
      {{ user_object.username }}
      - {% if user.pk == user.pk %} + {% if user_object.pk == user_object.pk %}
      {% trans 'password'|capfirst %}
      @@ -27,25 +27,25 @@ {% endif %}
      {% trans 'section'|capfirst %}
      -
      {{ user.profile.section }}
      +
      {{ user_object.profile.section }}
      {% trans 'address'|capfirst %}
      -
      {{ user.profile.address }}
      +
      {{ user_object.profile.address }}
      {% trans 'balance'|capfirst %}
      -
      {{ user.note.balance | pretty_money }}
      +
      {{ user_object.note.balance | pretty_money }}
      -
      {% trans 'aliases'|capfirst %}
      -
      {{ user.note.alias_set.all|join:", " }}
      +
      {% trans 'aliases'|capfirst %}
      +
      {{ user_object.note.alias_set.all|join:", " }}
      - {% if user.pk == user.pk %} + {% if user_object.pk == user_object.pk %} {% trans 'Manage auth token' %} {% endif %}
      - {% trans 'Update Profile' %} - {% url 'member:user_detail' user.pk as user_profile_url %} + {% trans 'Update Profile' %} + {% url 'member:user_detail' user_object.pk as user_profile_url %} {%if request.path_info != user_profile_url %} {% trans 'View Profile' %} {% endif %} diff --git a/templates/member/profile_tables.html b/templates/member/profile_tables.html index ff66155a..6c4cf662 100644 --- a/templates/member/profile_tables.html +++ b/templates/member/profile_tables.html @@ -2,10 +2,10 @@ {% load i18n %} {% load perms %} -{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user.profile %} +{% if not object.profile.email_confirmed and "member.change_profile_email_confirmed"|has_perm:user_object.profile %}
      {% trans "This user doesn't have confirmed his/her e-mail address." %} - {% trans "Click here to resend a validation link." %} + {% trans "Click here to resend a validation link." %}
      {% endif %} @@ -22,7 +22,7 @@
      diff --git a/templates/wei/weiclub_detail.html b/templates/wei/weiclub_detail.html index 72c70aa5..d0e8f8e9 100644 --- a/templates/wei/weiclub_detail.html +++ b/templates/wei/weiclub_detail.html @@ -15,6 +15,16 @@ $("#profile_infos").load("{% url 'wei:wei_detail' pk=object.pk %} #profile_infos"); } - window.history.replaceState({}, document.title, location.pathname); + $(document).ready(function() { + $(".no-perm").parent().addClass("d-none"); + if ($("a[data-type='validate-membership']:not(.d-none)").length === 0) { + $("a[data-type='validate-membership']").parent().addClass("d-none"); + $("#validate-membership-header").addClass("d-none"); + } + if ($("a[data-type='delete-membership']:not(.d-none)").length === 0) { + $("a[data-type='delete-membership']").parent().addClass("d-none"); + $("#delete-membership-header").addClass("d-none"); + } + }); {% endblock %} diff --git a/templates/wei/weimembership_form.html b/templates/wei/weimembership_form.html index 7c74457b..1e26414b 100644 --- a/templates/wei/weimembership_form.html +++ b/templates/wei/weimembership_form.html @@ -166,7 +166,9 @@
      {% else %}
      - {% trans "The note has enough money, the registration is possible." %} + {% blocktrans trimmed with pretty_fee=fee|pretty_money %} + The note has enough money ({{ pretty_fee }} required), the registration is possible. + {% endblocktrans %}
      {% endif %} {% endif %} @@ -178,14 +180,12 @@ {% endif %} {% if not kfet_member %} -
      +
      {% url 'registration:future_user_detail' pk=registration.user.pk as future_user_detail %} {% url 'member:club_detail' pk=club.parent_club.parent_club.pk as club_detail %} {% blocktrans trimmed %} - This user is not a member of the Kfet club for the comming year. Please adhere - here if he/she is in her/his first year - or here if he/she was an old member before you validate - the registration of the WEI. + This user is not a member of the Kfet club for the coming year. The membership will be + processed automatically, the WEI registration includes the membership fee. {% endblocktrans %}
      {% endif %} diff --git a/templates/wei/weiregistration_list.html b/templates/wei/weiregistration_list.html index 05626dd2..88c217aa 100644 --- a/templates/wei/weiregistration_list.html +++ b/templates/wei/weiregistration_list.html @@ -41,6 +41,16 @@ } searchbar_obj.keyup(reloadTable); + + $(".no-perm").parent().addClass("d-none"); + if ($("a[data-type='validate-membership']:not(.d-none)").length === 0) { + $("a[data-type='validate-membership']").parent().addClass("d-none"); + $("#validate-membership-header").addClass("d-none"); + } + if ($("a[data-type='delete-membership']:not(.d-none)").length === 0) { + $("a[data-type='delete-membership']").parent().addClass("d-none"); + $("#delete-membership-header").addClass("d-none"); + } }); {% endblock %} From 2222175d4e74a926297b179a3ec2b7e433971bc3 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 11:34:23 +0200 Subject: [PATCH 034/319] Fix search transactions page --- templates/note/search_transactions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/note/search_transactions.html b/templates/note/search_transactions.html index cc92639a..62c45797 100644 --- a/templates/note/search_transactions.html +++ b/templates/note/search_transactions.html @@ -12,7 +12,7 @@ {% include "member/club_info.html" %} {% endwith %} {% elif note.user %} - {% with user=note.user %} + {% with user_object=note.user %} {% include "member/profile_info.html" %} {% endwith %} {% endif %} From 6c9cf73848d637f4874f4d8dba5890a7308ed278 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 12:22:35 +0200 Subject: [PATCH 035/319] Update permissions to see our own note --- apps/member/models.py | 14 ++++++++++++ apps/member/views.py | 13 ++++++++--- apps/permission/fixtures/initial.json | 33 +++++++++++++++++++++++---- 3 files changed, 52 insertions(+), 8 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 7bde2680..56e4dff8 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -8,12 +8,15 @@ from django.conf import settings from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.db import models +from django.db.models import Q from django.template import loader from django.urls import reverse, reverse_lazy from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.utils.translation import gettext_lazy as _ + +from permission.models import Role from registration.tokens import email_validation_token from note.models import MembershipTransaction @@ -382,6 +385,17 @@ class Membership(models.Model): 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() else: raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name) diff --git a/apps/member/views.py b/apps/member/views.py index cc1264a1..9b3cd288 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -631,7 +631,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): ret = super().form_valid(form) - member_role = Role.objects.filter(name="Membre de club").all() + if club.name == "BDE": + member_role = Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all() + elif club.name == "Kfet": + member_role = Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all() + else: + member_role = Role.objects.filter(name="Membre de club").all() form.instance.roles.set(member_role) form.instance._force_save = True form.instance.save() @@ -670,8 +675,10 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): membership.refresh_from_db() if old_membership.exists(): membership.roles.set(old_membership.get().roles.all()) - else: - membership.roles.add(Role.objects.get(name="Adhérent Kfet")) + elif c.name == "BDE": + membership.roles.set(Role.objects.filter(Q(name="Adhérent BDE") | Q(name="Membre de club")).all()) + elif c.name == "Kfet": + membership.roles.set(Role.objects.filter(Q(name="Adhérent Kfet") | Q(name="Membre de club")).all()) membership.save() return ret diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index 1ce50d80..c4afa200 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -61,7 +61,7 @@ "fields": { "model": [ "note", - "noteuser" + "note" ], "query": "{\"pk\": [\"user\", \"note\", \"pk\"]}", "type": "view", @@ -2221,9 +2221,9 @@ "fields": { "model": [ "note", - "noteclub" + "note" ], - "query": "{\"club\": [\"club\"]}", + "query": "{\"noteclub__club\": [\"club\"]}", "type": "view", "mask": 2, "field": "", @@ -2343,6 +2343,22 @@ "description": "Supprimer une activité non validée" } }, + { + "model": "permission.permission", + "pk": 150, + "fields": { + "model": [ + "note", + "note" + ], + "query": "{}", + "type": "view", + "mask": 2, + "field": "", + "permanent": false, + "description": "Voir toutes les notes" + } + }, { "model": "permission.role", "pk": 1, @@ -2522,7 +2538,8 @@ 139, 143, 146, - 147 + 147, + 150 ] } }, @@ -2677,7 +2694,8 @@ 146, 147, 148, - 149 + 149, + 150 ] } }, @@ -2737,6 +2755,7 @@ "for_club": null, "name": "GC WEI", "permissions": [ + 22, 76, 85, 86, @@ -2770,6 +2789,7 @@ "for_club": null, "name": "Chef de bus", "permissions": [ + 22, 84, 117, 118, @@ -2787,6 +2807,7 @@ "for_club": null, "name": "Chef d'\u00e9quipe", "permissions": [ + 22, 84, 116, 123, @@ -2802,6 +2823,7 @@ "for_club": null, "name": "\u00c9lectron libre", "permissions": [ + 22, 84 ] } @@ -2813,6 +2835,7 @@ "for_club": null, "name": "\u00c9lectron libre (avec perm)", "permissions": [ + 22, 84 ] } From acf7ecc4ae6447fa83a30f715cc7b160543ee006 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 14:14:51 +0200 Subject: [PATCH 036/319] Use phone number validator --- apps/member/models.py | 4 +- apps/member/views.py | 49 ++-- apps/wei/models.py | 4 +- locale/de/LC_MESSAGES/django.po | 381 +++++++++++++++++--------------- locale/fr/LC_MESSAGES/django.po | 269 +++++++++++----------- note_kfet/settings/base.py | 5 + requirements/base.txt | 2 + 7 files changed, 366 insertions(+), 348 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 56e4dff8..e5ec1572 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -11,10 +11,10 @@ from django.db import models from django.db.models import Q from django.template import loader from django.urls import reverse, reverse_lazy -from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.utils.translation import gettext_lazy as _ +from phonenumber_field.modelfields import PhoneNumberField from permission.models import Role from registration.tokens import email_validation_token @@ -34,7 +34,7 @@ class Profile(models.Model): on_delete=models.CASCADE, ) - phone_number = models.CharField( + phone_number = PhoneNumberField( verbose_name=_('phone number'), max_length=50, blank=True, diff --git a/apps/member/views.py b/apps/member/views.py index 9b3cd288..82d2cf32 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -69,7 +69,9 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): form.fields['email'].required = True form.fields['email'].help_text = _("This address must be valid.") - context['profile_form'] = self.profile_form(instance=context['user_object'].profile) + context['profile_form'] = self.profile_form(instance=context['user_object'].profile, + data=self.request.POST if self.request.POST else None) + return context def form_valid(self, form): @@ -86,30 +88,33 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): data=self.request.POST, instance=self.object.profile, ) - if form.is_valid() and profile_form.is_valid(): - new_username = form.data['username'] - alias = Alias.objects.filter(name=new_username) - # Si le nouveau pseudo n'est pas un de nos alias, - # on supprime éventuellement un alias similaire pour le remplacer - if not alias.exists(): - similar = Alias.objects.filter( - normalized_name=Alias.normalize(new_username)) - if similar.exists(): - similar.delete() + profile_form.full_clean() + if not profile_form.is_valid(): + return super().form_invalid(form) - olduser = User.objects.get(pk=form.instance.pk) + new_username = form.data['username'] + alias = Alias.objects.filter(name=new_username) + # Si le nouveau pseudo n'est pas un de nos alias, + # on supprime éventuellement un alias similaire pour le remplacer + if not alias.exists(): + similar = Alias.objects.filter( + normalized_name=Alias.normalize(new_username)) + if similar.exists(): + similar.delete() - user = form.save(commit=False) - profile = profile_form.save(commit=False) - profile.user = user - profile.save() - user.save() + olduser = User.objects.get(pk=form.instance.pk) - if olduser.email != user.email: - # If the user changed her/his email, then it is unvalidated and a confirmation link is sent. - user.profile.email_confirmed = False - user.profile.save() - user.profile.send_email_validation_link() + user = form.save(commit=False) + profile = profile_form.save(commit=False) + profile.user = user + profile.save() + user.save() + + if olduser.email != user.email: + # If the user changed her/his email, then it is unvalidated and a confirmation link is sent. + user.profile.email_confirmed = False + user.profile.save() + user.profile.send_email_validation_link() return super().form_valid(form) diff --git a/apps/wei/models.py b/apps/wei/models.py index df353338..e500715a 100644 --- a/apps/wei/models.py +++ b/apps/wei/models.py @@ -8,6 +8,8 @@ from django.conf import settings from django.contrib.auth.models import User from django.db import models from django.utils.translation import gettext_lazy as _ +from phonenumber_field.modelfields import PhoneNumberField + from member.models import Club, Membership from note.models import MembershipTransaction from permission.models import Role @@ -223,7 +225,7 @@ class WEIRegistration(models.Model): verbose_name=_("emergency contact name"), ) - emergency_contact_phone = models.CharField( + emergency_contact_phone = PhoneNumberField( max_length=32, verbose_name=_("emergency contact phone"), ) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index be04465e..c21f5f55 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-03 23:53+0200\n" +"POT-Creation-Date: 2020-08-05 13:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,10 +44,10 @@ msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:24 apps/activity/models.py:49 -#: apps/member/models.py:158 apps/note/models/notes.py:212 +#: apps/member/models.py:162 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 #: apps/note/models/transactions.py:268 apps/permission/models.py:339 -#: apps/wei/models.py:65 apps/wei/models.py:117 +#: apps/wei/models.py:67 apps/wei/models.py:119 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18 @@ -72,7 +72,7 @@ msgstr "" #: apps/activity/models.py:54 apps/note/models/transactions.py:81 #: apps/permission/models.py:120 apps/permission/models.py:199 -#: apps/wei/models.py:71 apps/wei/models.py:128 +#: apps/wei/models.py:73 apps/wei/models.py:130 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "" @@ -83,9 +83,9 @@ msgstr "" msgid "type" msgstr "" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:266 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:270 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 -#: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14 +#: apps/wei/models.py:161 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" msgstr "" @@ -188,12 +188,13 @@ msgstr "" #: apps/activity/tables.py:77 apps/member/forms.py:103 #: apps/registration/forms.py:70 apps/treasury/forms.py:120 +#: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "" #: apps/activity/tables.py:79 apps/member/forms.py:108 #: apps/registration/forms.py:75 apps/treasury/forms.py:122 -#: templates/note/transaction_form.html:129 +#: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" msgstr "" @@ -267,7 +268,7 @@ msgid "edit" msgstr "" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:137 apps/wei/tables.py:65 +#: apps/permission/models.py:137 apps/wei/tables.py:73 msgid "delete" msgstr "" @@ -291,29 +292,29 @@ msgstr "" msgid "changelogs" msgstr "" -#: apps/member/admin.py:52 apps/member/models.py:185 +#: apps/member/admin.py:52 apps/member/models.py:189 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "" -#: apps/member/admin.py:53 apps/member/models.py:190 +#: apps/member/admin.py:53 apps/member/models.py:194 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/admin.py:67 apps/member/models.py:277 +#: apps/member/admin.py:67 apps/member/models.py:281 msgid "roles" msgstr "" -#: apps/member/admin.py:68 apps/member/models.py:291 +#: apps/member/admin.py:68 apps/member/models.py:295 msgid "fee" msgstr "" -#: apps/member/apps.py:14 apps/wei/tables.py:150 apps/wei/tables.py:181 +#: apps/member/apps.py:14 apps/wei/tables.py:179 apps/wei/tables.py:210 msgid "member" msgstr "" -#: apps/member/forms.py:59 apps/member/views.py:82 +#: apps/member/forms.py:59 apps/member/views.py:84 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "" @@ -327,10 +328,12 @@ msgid "Check this case is the Société Générale paid the inscription." msgstr "" #: apps/member/forms.py:89 apps/registration/forms.py:57 +#: apps/wei/forms/registration.py:82 msgid "Credit type" msgstr "" #: apps/member/forms.py:90 apps/registration/forms.py:58 +#: apps/wei/forms/registration.py:83 msgid "No credit" msgstr "" @@ -339,11 +342,13 @@ msgid "You can credit the note of the user." msgstr "" #: apps/member/forms.py:96 apps/registration/forms.py:63 +#: apps/wei/forms/registration.py:88 msgid "Credit amount" msgstr "" #: apps/member/forms.py:113 apps/registration/forms.py:80 -#: apps/treasury/forms.py:124 templates/note/transaction_form.html:135 +#: apps/treasury/forms.py:124 apps/wei/forms/registration.py:105 +#: templates/note/transaction_form.html:135 msgid "Bank" msgstr "" @@ -355,214 +360,214 @@ msgstr "" msgid "Roles" msgstr "" -#: apps/member/models.py:34 +#: apps/member/models.py:38 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "" -#: apps/member/models.py:41 templates/member/profile_info.html:29 +#: apps/member/models.py:45 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "" -#: apps/member/models.py:42 +#: apps/member/models.py:46 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:50 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:54 templates/wei/weimembership_form.html:36 msgid "department" msgstr "" -#: apps/member/models.py:52 +#: apps/member/models.py:56 msgid "Informatics (A0)" msgstr "" -#: apps/member/models.py:53 +#: apps/member/models.py:57 msgid "Mathematics (A1)" msgstr "" -#: apps/member/models.py:54 +#: apps/member/models.py:58 msgid "Physics (A2)" msgstr "" -#: apps/member/models.py:55 +#: apps/member/models.py:59 msgid "Applied physics (A'2)" msgstr "" -#: apps/member/models.py:56 +#: apps/member/models.py:60 msgid "Chemistry (A''2)" msgstr "" -#: apps/member/models.py:57 +#: apps/member/models.py:61 msgid "Biology (A3)" msgstr "" -#: apps/member/models.py:58 +#: apps/member/models.py:62 msgid "SAPHIRE (B1234)" msgstr "" -#: apps/member/models.py:59 +#: apps/member/models.py:63 msgid "Mechanics (B1)" msgstr "" -#: apps/member/models.py:60 +#: apps/member/models.py:64 msgid "Civil engineering (B2)" msgstr "" -#: apps/member/models.py:61 +#: apps/member/models.py:65 msgid "Mechanical engineering (B3)" msgstr "" -#: apps/member/models.py:62 +#: apps/member/models.py:66 msgid "EEA (B4)" msgstr "" -#: apps/member/models.py:63 +#: apps/member/models.py:67 msgid "Design (C)" msgstr "" -#: apps/member/models.py:64 +#: apps/member/models.py:68 msgid "Economy-management (D2)" msgstr "" -#: apps/member/models.py:65 +#: apps/member/models.py:69 msgid "Social sciences (D3)" msgstr "" -#: apps/member/models.py:66 +#: apps/member/models.py:70 msgid "English (E)" msgstr "" -#: apps/member/models.py:67 +#: apps/member/models.py:71 msgid "External (EXT)" msgstr "" -#: apps/member/models.py:74 +#: apps/member/models.py:78 msgid "promotion" msgstr "" -#: apps/member/models.py:75 +#: apps/member/models.py:79 msgid "Year of entry to the school (None if not ENS student)" msgstr "" -#: apps/member/models.py:79 templates/member/profile_info.html:32 +#: apps/member/models.py:83 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "" -#: apps/member/models.py:86 +#: apps/member/models.py:90 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "" -#: apps/member/models.py:87 +#: apps/member/models.py:91 msgid "Tells if the user receive a salary." msgstr "" -#: apps/member/models.py:92 +#: apps/member/models.py:96 msgid "email confirmed" msgstr "" -#: apps/member/models.py:97 +#: apps/member/models.py:101 msgid "registration valid" msgstr "" -#: apps/member/models.py:126 apps/member/models.py:127 +#: apps/member/models.py:130 apps/member/models.py:131 msgid "user profile" msgstr "" -#: apps/member/models.py:134 +#: apps/member/models.py:138 msgid "Activate your Note Kfet account" msgstr "" -#: apps/member/models.py:163 templates/member/club_info.html:57 +#: apps/member/models.py:167 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "" -#: apps/member/models.py:170 +#: apps/member/models.py:174 msgid "parent club" msgstr "" -#: apps/member/models.py:179 +#: apps/member/models.py:183 msgid "require memberships" msgstr "" -#: apps/member/models.py:180 +#: apps/member/models.py:184 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:196 templates/member/club_info.html:33 +#: apps/member/models.py:200 templates/member/club_info.html:33 msgid "membership duration" msgstr "" -#: apps/member/models.py:197 +#: apps/member/models.py:201 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:204 templates/member/club_info.html:23 +#: apps/member/models.py:208 templates/member/club_info.html:23 msgid "membership start" msgstr "" -#: apps/member/models.py:205 +#: apps/member/models.py:209 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:212 templates/member/club_info.html:28 +#: apps/member/models.py:216 templates/member/club_info.html:28 msgid "membership end" msgstr "" -#: apps/member/models.py:213 +#: apps/member/models.py:217 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:247 apps/member/models.py:272 +#: apps/member/models.py:251 apps/member/models.py:276 #: apps/note/models/notes.py:163 msgid "club" msgstr "" -#: apps/member/models.py:248 +#: apps/member/models.py:252 msgid "clubs" msgstr "" -#: apps/member/models.py:282 +#: apps/member/models.py:286 msgid "membership starts on" msgstr "" -#: apps/member/models.py:286 +#: apps/member/models.py:290 msgid "membership ends on" msgstr "" -#: apps/member/models.py:310 apps/member/views.py:540 apps/wei/views.py:798 -msgid "User is not a member of the parent club" -msgstr "" - -#: apps/member/models.py:317 +#: apps/member/models.py:342 #, python-brace-format msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:328 apps/member/views.py:549 +#: apps/member/models.py:353 apps/member/views.py:589 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:379 +#: apps/member/models.py:400 +msgid "User is not a member of the parent club" +msgstr "" + +#: apps/member/models.py:453 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:382 +#: apps/member/models.py:456 msgid "membership" msgstr "" -#: apps/member/models.py:383 +#: apps/member/models.py:457 msgid "memberships" msgstr "" @@ -580,71 +585,71 @@ msgstr "" msgid "This address must be valid." msgstr "" -#: apps/member/views.py:128 +#: apps/member/views.py:134 msgid "Profile detail" msgstr "" -#: apps/member/views.py:162 +#: apps/member/views.py:168 msgid "Search user" msgstr "" -#: apps/member/views.py:196 apps/member/views.py:382 +#: apps/member/views.py:202 apps/member/views.py:388 msgid "Note aliases" msgstr "" -#: apps/member/views.py:210 +#: apps/member/views.py:216 msgid "Update note picture" msgstr "" -#: apps/member/views.py:268 templates/member/profile_info.html:43 +#: apps/member/views.py:274 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "" -#: apps/member/views.py:296 +#: apps/member/views.py:302 msgid "Create new club" msgstr "" -#: apps/member/views.py:308 +#: apps/member/views.py:314 msgid "Search club" msgstr "" -#: apps/member/views.py:333 +#: apps/member/views.py:339 msgid "Club detail" msgstr "" -#: apps/member/views.py:399 +#: apps/member/views.py:405 msgid "Update club" msgstr "" -#: apps/member/views.py:433 +#: apps/member/views.py:439 msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:530 apps/wei/views.py:783 +#: apps/member/views.py:580 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:553 +#: apps/member/views.py:593 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:558 +#: apps/member/views.py:598 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:575 apps/member/views.py:577 apps/member/views.py:579 +#: apps/member/views.py:615 apps/member/views.py:617 apps/member/views.py:619 #: apps/registration/views.py:290 apps/registration/views.py:292 -#: apps/registration/views.py:294 +#: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "" -#: apps/member/views.py:647 +#: apps/member/views.py:703 msgid "Manage roles of an user in the club" msgstr "" -#: apps/member/views.py:672 +#: apps/member/views.py:728 msgid "Members of the club" msgstr "" @@ -938,13 +943,13 @@ msgstr "" msgid "No reason specified" msgstr "" -#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:66 -#: templates/treasury/sogecredit_detail.html:59 +#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:74 +#: apps/wei/tables.py:100 templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "" -#: apps/note/tables.py:162 apps/wei/tables.py:42 apps/wei/tables.py:43 +#: apps/note/tables.py:162 apps/wei/tables.py:46 apps/wei/tables.py:47 #: templates/member/club_info.html:67 templates/note/conso_form.html:128 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 @@ -1163,7 +1168,7 @@ msgstr "" #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 -#: templates/member/add_members.html:14 templates/member/club_form.html:9 +#: templates/member/add_members.html:31 templates/member/club_form.html:9 #: templates/note/transactiontemplate_form.html:15 #: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 @@ -1381,348 +1386,348 @@ msgstr "" msgid "List of credits from the Société générale" msgstr "" -#: apps/treasury/views.py:384 +#: apps/treasury/views.py:379 msgid "Manage credits from the Société générale" msgstr "" -#: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49 -#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:124 +#: apps/wei/apps.py:10 apps/wei/models.py:50 apps/wei/models.py:51 +#: apps/wei/models.py:62 apps/wei/models.py:168 templates/base.html:124 msgid "WEI" msgstr "" -#: apps/wei/forms/registration.py:48 apps/wei/models.py:112 -#: apps/wei/models.py:297 +#: apps/wei/forms/registration.py:50 apps/wei/models.py:114 +#: apps/wei/models.py:299 msgid "bus" msgstr "" -#: apps/wei/forms/registration.py:49 +#: apps/wei/forms/registration.py:51 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." msgstr "" -#: apps/wei/forms/registration.py:56 +#: apps/wei/forms/registration.py:58 msgid "Team" msgstr "" -#: apps/wei/forms/registration.py:58 +#: apps/wei/forms/registration.py:60 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" msgstr "" -#: apps/wei/forms/registration.py:64 apps/wei/forms/registration.py:74 -#: apps/wei/models.py:147 +#: apps/wei/forms/registration.py:66 apps/wei/forms/registration.py:76 +#: apps/wei/models.py:149 msgid "WEI Roles" msgstr "" -#: apps/wei/forms/registration.py:65 +#: apps/wei/forms/registration.py:67 msgid "Select the roles that you are interested in." msgstr "" -#: apps/wei/forms/registration.py:81 +#: apps/wei/forms/registration.py:112 msgid "This team doesn't belong to the given bus." msgstr "" -#: apps/wei/models.py:23 templates/wei/weiclub_info.html:23 +#: apps/wei/models.py:25 templates/wei/weiclub_info.html:23 msgid "year" msgstr "" -#: apps/wei/models.py:27 templates/wei/weiclub_info.html:17 +#: apps/wei/models.py:29 templates/wei/weiclub_info.html:17 msgid "date start" msgstr "" -#: apps/wei/models.py:31 templates/wei/weiclub_info.html:20 +#: apps/wei/models.py:33 templates/wei/weiclub_info.html:20 msgid "date end" msgstr "" -#: apps/wei/models.py:76 +#: apps/wei/models.py:78 msgid "survey information" msgstr "" -#: apps/wei/models.py:77 +#: apps/wei/models.py:79 msgid "Information about the survey for new members, encoded in JSON" msgstr "" -#: apps/wei/models.py:99 +#: apps/wei/models.py:101 msgid "Bus" msgstr "" -#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:32 +#: apps/wei/models.py:102 templates/wei/weiclub_tables.html:32 msgid "Buses" msgstr "" -#: apps/wei/models.py:121 +#: apps/wei/models.py:123 msgid "color" msgstr "" -#: apps/wei/models.py:122 +#: apps/wei/models.py:124 msgid "The color of the T-Shirt, stored with its number equivalent" msgstr "" -#: apps/wei/models.py:136 +#: apps/wei/models.py:138 msgid "Bus team" msgstr "" -#: apps/wei/models.py:137 +#: apps/wei/models.py:139 msgid "Bus teams" msgstr "" -#: apps/wei/models.py:146 +#: apps/wei/models.py:148 msgid "WEI Role" msgstr "" -#: apps/wei/models.py:171 +#: apps/wei/models.py:173 msgid "Credit from Société générale" msgstr "" -#: apps/wei/models.py:176 +#: apps/wei/models.py:178 msgid "Caution check given" msgstr "" -#: apps/wei/models.py:180 templates/wei/weimembership_form.html:68 +#: apps/wei/models.py:182 templates/wei/weimembership_form.html:68 msgid "birth date" msgstr "" -#: apps/wei/models.py:186 apps/wei/models.py:196 +#: apps/wei/models.py:188 apps/wei/models.py:198 msgid "Male" msgstr "" -#: apps/wei/models.py:187 apps/wei/models.py:197 +#: apps/wei/models.py:189 apps/wei/models.py:199 msgid "Female" msgstr "" -#: apps/wei/models.py:188 +#: apps/wei/models.py:190 msgid "Non binary" msgstr "" -#: apps/wei/models.py:190 templates/wei/weimembership_form.html:59 +#: apps/wei/models.py:192 templates/wei/weimembership_form.html:59 msgid "gender" msgstr "" -#: apps/wei/models.py:199 templates/wei/weimembership_form.html:62 +#: apps/wei/models.py:201 templates/wei/weimembership_form.html:62 msgid "clothing cut" msgstr "" -#: apps/wei/models.py:212 templates/wei/weimembership_form.html:65 +#: apps/wei/models.py:214 templates/wei/weimembership_form.html:65 msgid "clothing size" msgstr "" -#: apps/wei/models.py:218 templates/wei/weimembership_form.html:71 +#: apps/wei/models.py:220 templates/wei/weimembership_form.html:71 msgid "health issues" msgstr "" -#: apps/wei/models.py:223 templates/wei/weimembership_form.html:74 +#: apps/wei/models.py:225 templates/wei/weimembership_form.html:74 msgid "emergency contact name" msgstr "" -#: apps/wei/models.py:228 templates/wei/weimembership_form.html:77 +#: apps/wei/models.py:230 templates/wei/weimembership_form.html:77 msgid "emergency contact phone" msgstr "" -#: apps/wei/models.py:233 templates/wei/weimembership_form.html:80 +#: apps/wei/models.py:235 templates/wei/weimembership_form.html:80 msgid "" "Register on the mailing list to stay informed of the events of the campus (1 " "mail/week)" msgstr "" -#: apps/wei/models.py:238 templates/wei/weimembership_form.html:83 +#: apps/wei/models.py:240 templates/wei/weimembership_form.html:83 msgid "" "Register on the mailing list to stay informed of the sport events of the " "campus (1 mail/week)" msgstr "" -#: apps/wei/models.py:243 templates/wei/weimembership_form.html:86 +#: apps/wei/models.py:245 templates/wei/weimembership_form.html:86 msgid "" "Register on the mailing list to stay informed of the art events of the " "campus (1 mail/week)" msgstr "" -#: apps/wei/models.py:248 templates/wei/weimembership_form.html:56 +#: apps/wei/models.py:250 templates/wei/weimembership_form.html:56 msgid "first year" msgstr "" -#: apps/wei/models.py:249 +#: apps/wei/models.py:251 msgid "Tells if the user is new in the school." msgstr "" -#: apps/wei/models.py:254 +#: apps/wei/models.py:256 msgid "registration information" msgstr "" -#: apps/wei/models.py:255 +#: apps/wei/models.py:257 msgid "" "Information about the registration (buses for old members, survey fot the " "new members), encoded in JSON" msgstr "" -#: apps/wei/models.py:286 +#: apps/wei/models.py:288 msgid "WEI User" msgstr "" -#: apps/wei/models.py:287 +#: apps/wei/models.py:289 msgid "WEI Users" msgstr "" -#: apps/wei/models.py:307 +#: apps/wei/models.py:309 msgid "team" msgstr "" -#: apps/wei/models.py:317 +#: apps/wei/models.py:319 msgid "WEI registration" msgstr "" -#: apps/wei/models.py:321 +#: apps/wei/models.py:323 msgid "WEI membership" msgstr "" -#: apps/wei/models.py:322 +#: apps/wei/models.py:324 msgid "WEI memberships" msgstr "" -#: apps/wei/tables.py:53 apps/wei/tables.py:54 +#: apps/wei/tables.py:57 apps/wei/tables.py:58 apps/wei/tables.py:95 #: templates/treasury/sogecredit_detail.html:57 msgid "Validate" msgstr "" -#: apps/wei/tables.py:96 +#: apps/wei/tables.py:125 msgid "Year" msgstr "" -#: apps/wei/tables.py:134 templates/wei/bus_tables.html:26 +#: apps/wei/tables.py:163 templates/wei/bus_tables.html:26 #: templates/wei/busteam_tables.html:43 msgid "Teams" msgstr "" -#: apps/wei/tables.py:143 apps/wei/tables.py:184 +#: apps/wei/tables.py:172 apps/wei/tables.py:213 msgid "Members count" msgstr "" -#: apps/wei/tables.py:150 apps/wei/tables.py:181 +#: apps/wei/tables.py:179 apps/wei/tables.py:210 msgid "members" msgstr "" -#: apps/wei/views.py:56 +#: apps/wei/views.py:57 msgid "Search WEI" msgstr "" -#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10 +#: apps/wei/views.py:75 templates/wei/weiclub_list.html:10 msgid "Create WEI" msgstr "" -#: apps/wei/views.py:94 +#: apps/wei/views.py:95 msgid "WEI Detail" msgstr "" -#: apps/wei/views.py:189 +#: apps/wei/views.py:190 msgid "View members of the WEI" msgstr "" -#: apps/wei/views.py:217 +#: apps/wei/views.py:218 msgid "Find WEI Membership" msgstr "" -#: apps/wei/views.py:227 +#: apps/wei/views.py:228 msgid "View registrations to the WEI" msgstr "" -#: apps/wei/views.py:251 +#: apps/wei/views.py:252 msgid "Find WEI Registration" msgstr "" -#: apps/wei/views.py:262 +#: apps/wei/views.py:263 msgid "Update the WEI" msgstr "" -#: apps/wei/views.py:283 +#: apps/wei/views.py:284 msgid "Create new bus" msgstr "" -#: apps/wei/views.py:314 +#: apps/wei/views.py:315 msgid "Update bus" msgstr "" -#: apps/wei/views.py:344 +#: apps/wei/views.py:345 msgid "Manage bus" msgstr "" -#: apps/wei/views.py:371 +#: apps/wei/views.py:372 msgid "Create new team" msgstr "" -#: apps/wei/views.py:403 +#: apps/wei/views.py:404 msgid "Update team" msgstr "" -#: apps/wei/views.py:434 +#: apps/wei/views.py:435 msgid "Manage WEI team" msgstr "" -#: apps/wei/views.py:456 +#: apps/wei/views.py:457 msgid "Register first year student to the WEI" msgstr "" -#: apps/wei/views.py:468 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:469 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "" -#: apps/wei/views.py:489 apps/wei/views.py:560 +#: apps/wei/views.py:490 apps/wei/views.py:561 msgid "This user is already registered to this WEI." msgstr "" -#: apps/wei/views.py:494 +#: apps/wei/views.py:495 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." msgstr "" -#: apps/wei/views.py:511 +#: apps/wei/views.py:512 msgid "Register old student to the WEI" msgstr "" -#: apps/wei/views.py:523 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:524 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "" -#: apps/wei/views.py:542 apps/wei/views.py:627 +#: apps/wei/views.py:543 apps/wei/views.py:628 msgid "You already opened an account in the Société générale." msgstr "" -#: apps/wei/views.py:590 +#: apps/wei/views.py:591 msgid "Update WEI Registration" msgstr "" -#: apps/wei/views.py:677 +#: apps/wei/views.py:687 msgid "Delete WEI registration" msgstr "" -#: apps/wei/views.py:688 +#: apps/wei/views.py:698 msgid "You don't have the right to delete this WEI registration." msgstr "" -#: apps/wei/views.py:707 +#: apps/wei/views.py:717 msgid "Validate WEI registration" msgstr "" -#: apps/wei/views.py:787 +#: apps/wei/views.py:856 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:830 apps/wei/views.py:883 apps/wei/views.py:893 +#: apps/wei/views.py:918 apps/wei/views.py:971 apps/wei/views.py:981 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" msgstr "" -#: note_kfet/settings/base.py:156 +#: note_kfet/settings/base.py:157 msgid "German" msgstr "" -#: note_kfet/settings/base.py:157 +#: note_kfet/settings/base.py:158 msgid "English" msgstr "" -#: note_kfet/settings/base.py:158 +#: note_kfet/settings/base.py:159 msgid "French" msgstr "" @@ -1866,6 +1871,21 @@ msgstr "" msgid "Field filters" msgstr "" +#: templates/member/add_members.html:15 +#, python-format +msgid "" +"The user is not a member of the club·s %(clubs)s. An additional fee of " +"%(pretty_fee)s will be charged to renew automatically the membership in this/" +"these club·s." +msgstr "" + +#: templates/member/add_members.html:20 +#, python-format +msgid "" +"This club has parents %(clubs)s. An additional fee of %(pretty_fee)s will be " +"charged to adhere automatically to this/these club·s." +msgstr "" + #: templates/member/alias_update.html:5 msgid "Add alias" msgstr "" @@ -2571,20 +2591,21 @@ msgid "" msgstr "" #: templates/wei/weimembership_form.html:169 -msgid "The note has enough money, the registration is possible." +#, python-format +msgid "" +"The note has enough money (%(pretty_fee)s required), the registration is " +"possible." msgstr "" -#: templates/wei/weimembership_form.html:176 +#: templates/wei/weimembership_form.html:178 msgid "The user didn't give her/his caution check." msgstr "" -#: templates/wei/weimembership_form.html:184 -#, python-format +#: templates/wei/weimembership_form.html:186 msgid "" -"This user is not a member of the Kfet club for the comming year. Please " -"adhere here if he/she is in her/his first " -"year or here if he/she was an old member " -"before you validate the registration of the WEI." +"This user is not a member of the Kfet club for the coming year. The " +"membership will be processed automatically, the WEI registration includes " +"the membership fee." msgstr "" #: templates/wei/weimembership_list.html:24 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 6875a00d..cd4f17d7 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-04 20:03+0200\n" +"POT-Creation-Date: 2020-08-05 13:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,10 +45,10 @@ 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:24 apps/activity/models.py:49 -#: apps/member/models.py:159 apps/note/models/notes.py:212 +#: apps/member/models.py:162 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 #: apps/note/models/transactions.py:268 apps/permission/models.py:339 -#: apps/wei/models.py:65 apps/wei/models.py:117 +#: apps/wei/models.py:67 apps/wei/models.py:119 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18 @@ -73,7 +73,7 @@ msgstr "types d'activité" #: apps/activity/models.py:54 apps/note/models/transactions.py:81 #: apps/permission/models.py:120 apps/permission/models.py:199 -#: apps/wei/models.py:71 apps/wei/models.py:128 +#: apps/wei/models.py:73 apps/wei/models.py:130 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "description" @@ -84,9 +84,9 @@ msgstr "description" msgid "type" msgstr "type" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:267 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:270 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 -#: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14 +#: apps/wei/models.py:161 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" msgstr "utilisateur" @@ -293,21 +293,21 @@ msgstr "journal de modification" msgid "changelogs" msgstr "journaux de modifications" -#: apps/member/admin.py:52 apps/member/models.py:186 +#: apps/member/admin.py:52 apps/member/models.py:189 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/admin.py:53 apps/member/models.py:191 +#: apps/member/admin.py:53 apps/member/models.py:194 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:67 apps/member/models.py:278 +#: apps/member/admin.py:67 apps/member/models.py:281 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:68 apps/member/models.py:292 +#: apps/member/admin.py:68 apps/member/models.py:295 msgid "fee" msgstr "cotisation" @@ -315,7 +315,7 @@ msgstr "cotisation" msgid "member" msgstr "adhérent" -#: apps/member/forms.py:59 apps/member/views.py:82 +#: apps/member/forms.py:59 apps/member/views.py:84 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." @@ -361,171 +361,171 @@ msgstr "Utilisateur" msgid "Roles" msgstr "Rôles" -#: apps/member/models.py:35 +#: apps/member/models.py:38 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:42 templates/member/profile_info.html:29 +#: apps/member/models.py:45 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "section" -#: apps/member/models.py:43 +#: apps/member/models.py:46 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:51 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:54 templates/wei/weimembership_form.html:36 msgid "department" msgstr "département" -#: apps/member/models.py:53 +#: apps/member/models.py:56 msgid "Informatics (A0)" msgstr "Informatique (A0)" -#: apps/member/models.py:54 +#: apps/member/models.py:57 msgid "Mathematics (A1)" msgstr "Mathématiques (A1)" -#: apps/member/models.py:55 +#: apps/member/models.py:58 msgid "Physics (A2)" msgstr "Physique (A2)" -#: apps/member/models.py:56 +#: apps/member/models.py:59 msgid "Applied physics (A'2)" msgstr "Physique appliquée (A'2)" -#: apps/member/models.py:57 +#: apps/member/models.py:60 msgid "Chemistry (A''2)" msgstr "Chimie (A''2)" -#: apps/member/models.py:58 +#: apps/member/models.py:61 msgid "Biology (A3)" msgstr "Biologie (A3)" -#: apps/member/models.py:59 +#: apps/member/models.py:62 msgid "SAPHIRE (B1234)" msgstr "SAPHIRE (B1234)" -#: apps/member/models.py:60 +#: apps/member/models.py:63 msgid "Mechanics (B1)" msgstr "Mécanique (B1)" -#: apps/member/models.py:61 +#: apps/member/models.py:64 msgid "Civil engineering (B2)" msgstr "Génie civil (B2)" -#: apps/member/models.py:62 +#: apps/member/models.py:65 msgid "Mechanical engineering (B3)" msgstr "Génie mécanique (B3)" -#: apps/member/models.py:63 +#: apps/member/models.py:66 msgid "EEA (B4)" msgstr "EEA (B4)" -#: apps/member/models.py:64 +#: apps/member/models.py:67 msgid "Design (C)" msgstr "Design (C)" -#: apps/member/models.py:65 +#: apps/member/models.py:68 msgid "Economy-management (D2)" msgstr "Économie-gestion (D2)" -#: apps/member/models.py:66 +#: apps/member/models.py:69 msgid "Social sciences (D3)" msgstr "Sciences sociales (D3)" -#: apps/member/models.py:67 +#: apps/member/models.py:70 msgid "English (E)" msgstr "Anglais (E)" -#: apps/member/models.py:68 +#: apps/member/models.py:71 msgid "External (EXT)" msgstr "Externe (EXT)" -#: apps/member/models.py:75 +#: apps/member/models.py:78 msgid "promotion" msgstr "promotion" -#: apps/member/models.py:76 +#: apps/member/models.py:79 msgid "Year of entry to the school (None if not ENS student)" msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)" -#: apps/member/models.py:80 templates/member/profile_info.html:32 +#: apps/member/models.py:83 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "adresse" -#: apps/member/models.py:87 +#: apps/member/models.py:90 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "payé" -#: apps/member/models.py:88 +#: apps/member/models.py:91 msgid "Tells if the user receive a salary." msgstr "Indique si l'utilisateur perçoit un salaire." -#: apps/member/models.py:93 +#: apps/member/models.py:96 msgid "email confirmed" msgstr "adresse email confirmée" -#: apps/member/models.py:98 +#: apps/member/models.py:101 msgid "registration valid" msgstr "inscription valid" -#: apps/member/models.py:127 apps/member/models.py:128 +#: apps/member/models.py:130 apps/member/models.py:131 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:135 +#: apps/member/models.py:138 msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" -#: apps/member/models.py:164 templates/member/club_info.html:57 +#: apps/member/models.py:167 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "courriel" -#: apps/member/models.py:171 +#: apps/member/models.py:174 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:180 +#: apps/member/models.py:183 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:181 +#: apps/member/models.py:184 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:197 templates/member/club_info.html:33 +#: apps/member/models.py:200 templates/member/club_info.html:33 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:198 +#: apps/member/models.py:201 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:205 templates/member/club_info.html:23 +#: apps/member/models.py:208 templates/member/club_info.html:23 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:206 +#: apps/member/models.py:209 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:213 templates/member/club_info.html:28 +#: apps/member/models.py:216 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:214 +#: apps/member/models.py:217 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -533,46 +533,46 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:248 apps/member/models.py:273 +#: apps/member/models.py:251 apps/member/models.py:276 #: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:249 +#: apps/member/models.py:252 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:283 +#: apps/member/models.py:286 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:287 +#: apps/member/models.py:290 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:339 +#: apps/member/models.py:342 #, 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:350 apps/member/views.py:583 +#: apps/member/models.py:353 apps/member/views.py:589 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:386 +#: apps/member/models.py:400 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:439 +#: apps/member/models.py:453 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:442 +#: apps/member/models.py:456 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:443 +#: apps/member/models.py:457 msgid "memberships" msgstr "adhésions" @@ -590,47 +590,47 @@ msgstr "Modifier le profil" msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:128 +#: apps/member/views.py:134 msgid "Profile detail" msgstr "Détails de l'utilisateur" -#: apps/member/views.py:162 +#: apps/member/views.py:168 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:196 apps/member/views.py:382 +#: apps/member/views.py:202 apps/member/views.py:388 msgid "Note aliases" msgstr "Alias de la note" -#: apps/member/views.py:210 +#: apps/member/views.py:216 msgid "Update note picture" msgstr "Modifier la photo de la note" -#: apps/member/views.py:268 templates/member/profile_info.html:43 +#: apps/member/views.py:274 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: apps/member/views.py:296 +#: apps/member/views.py:302 msgid "Create new club" msgstr "Créer un nouveau club" -#: apps/member/views.py:308 +#: apps/member/views.py:314 msgid "Search club" msgstr "Chercher un club" -#: apps/member/views.py:333 +#: apps/member/views.py:339 msgid "Club detail" msgstr "Détails du club" -#: apps/member/views.py:399 +#: apps/member/views.py:405 msgid "Update club" msgstr "Modifier le club" -#: apps/member/views.py:433 +#: apps/member/views.py:439 msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:574 apps/wei/views.py:862 +#: apps/member/views.py:580 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -638,25 +638,25 @@ 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:587 +#: apps/member/views.py:593 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:592 +#: apps/member/views.py:598 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:609 apps/member/views.py:611 apps/member/views.py:613 +#: apps/member/views.py:615 apps/member/views.py:617 apps/member/views.py:619 #: apps/registration/views.py:290 apps/registration/views.py:292 #: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:690 +#: apps/member/views.py:703 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:715 +#: apps/member/views.py:728 msgid "Members of the club" msgstr "Membres du club" @@ -1419,13 +1419,13 @@ msgstr "Liste des crédits de la Société générale" 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:48 apps/wei/models.py:49 -#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:124 +#: apps/wei/apps.py:10 apps/wei/models.py:50 apps/wei/models.py:51 +#: apps/wei/models.py:62 apps/wei/models.py:168 templates/base.html:124 msgid "WEI" msgstr "WEI" -#: apps/wei/forms/registration.py:50 apps/wei/models.py:112 -#: apps/wei/models.py:297 +#: apps/wei/forms/registration.py:50 apps/wei/models.py:114 +#: apps/wei/models.py:299 msgid "bus" msgstr "Bus" @@ -1451,7 +1451,7 @@ msgstr "" "bus ou électron libre)" #: apps/wei/forms/registration.py:66 apps/wei/forms/registration.py:76 -#: apps/wei/models.py:147 +#: apps/wei/models.py:149 msgid "WEI Roles" msgstr "Rôles au WEI" @@ -1463,105 +1463,105 @@ msgstr "Sélectionnez les rôles qui vous intéressent." msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." -#: apps/wei/models.py:23 templates/wei/weiclub_info.html:23 +#: apps/wei/models.py:25 templates/wei/weiclub_info.html:23 msgid "year" msgstr "année" -#: apps/wei/models.py:27 templates/wei/weiclub_info.html:17 +#: apps/wei/models.py:29 templates/wei/weiclub_info.html:17 msgid "date start" msgstr "début" -#: apps/wei/models.py:31 templates/wei/weiclub_info.html:20 +#: apps/wei/models.py:33 templates/wei/weiclub_info.html:20 msgid "date end" msgstr "fin" -#: apps/wei/models.py:76 +#: apps/wei/models.py:78 msgid "survey information" msgstr "informations sur le questionnaire" -#: apps/wei/models.py:77 +#: apps/wei/models.py:79 msgid "Information about the survey for new members, encoded in JSON" msgstr "" "Informations sur le sondage pour les nouveaux membres, encodées en JSON" -#: apps/wei/models.py:99 +#: apps/wei/models.py:101 msgid "Bus" msgstr "Bus" -#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:32 +#: apps/wei/models.py:102 templates/wei/weiclub_tables.html:32 msgid "Buses" msgstr "Bus" -#: apps/wei/models.py:121 +#: apps/wei/models.py:123 msgid "color" msgstr "couleur" -#: apps/wei/models.py:122 +#: apps/wei/models.py:124 msgid "The color of the T-Shirt, stored with its number equivalent" msgstr "" "La couleur du T-Shirt, stocké sous la forme de son équivalent numérique" -#: apps/wei/models.py:136 +#: apps/wei/models.py:138 msgid "Bus team" msgstr "Équipe de bus" -#: apps/wei/models.py:137 +#: apps/wei/models.py:139 msgid "Bus teams" msgstr "Équipes de bus" -#: apps/wei/models.py:146 +#: apps/wei/models.py:148 msgid "WEI Role" msgstr "Rôle au WEI" -#: apps/wei/models.py:171 +#: apps/wei/models.py:173 msgid "Credit from Société générale" msgstr "Crédit de la Société générale" -#: apps/wei/models.py:176 +#: apps/wei/models.py:178 msgid "Caution check given" msgstr "Chèque de caution donné" -#: apps/wei/models.py:180 templates/wei/weimembership_form.html:68 +#: apps/wei/models.py:182 templates/wei/weimembership_form.html:68 msgid "birth date" msgstr "date de naissance" -#: apps/wei/models.py:186 apps/wei/models.py:196 +#: apps/wei/models.py:188 apps/wei/models.py:198 msgid "Male" msgstr "Homme" -#: apps/wei/models.py:187 apps/wei/models.py:197 +#: apps/wei/models.py:189 apps/wei/models.py:199 msgid "Female" msgstr "Femme" -#: apps/wei/models.py:188 +#: apps/wei/models.py:190 msgid "Non binary" msgstr "Non-binaire" -#: apps/wei/models.py:190 templates/wei/weimembership_form.html:59 +#: apps/wei/models.py:192 templates/wei/weimembership_form.html:59 msgid "gender" msgstr "genre" -#: apps/wei/models.py:199 templates/wei/weimembership_form.html:62 +#: apps/wei/models.py:201 templates/wei/weimembership_form.html:62 msgid "clothing cut" msgstr "coupe de vêtement" -#: apps/wei/models.py:212 templates/wei/weimembership_form.html:65 +#: apps/wei/models.py:214 templates/wei/weimembership_form.html:65 msgid "clothing size" msgstr "taille de vêtement" -#: apps/wei/models.py:218 templates/wei/weimembership_form.html:71 +#: apps/wei/models.py:220 templates/wei/weimembership_form.html:71 msgid "health issues" msgstr "problèmes de santé" -#: apps/wei/models.py:223 templates/wei/weimembership_form.html:74 +#: apps/wei/models.py:225 templates/wei/weimembership_form.html:74 msgid "emergency contact name" msgstr "Nom du contact en cas d'urgence" -#: apps/wei/models.py:228 templates/wei/weimembership_form.html:77 +#: apps/wei/models.py:230 templates/wei/weimembership_form.html:77 msgid "emergency contact phone" msgstr "Téléphone du contact en cas d'urgence" -#: apps/wei/models.py:233 templates/wei/weimembership_form.html:80 +#: apps/wei/models.py:235 templates/wei/weimembership_form.html:80 msgid "" "Register on the mailing list to stay informed of the events of the campus (1 " "mail/week)" @@ -1569,7 +1569,7 @@ msgstr "" "S'inscrire sur la liste de diffusion pour rester informé des événements sur " "le campus (1 mail par semaine)" -#: apps/wei/models.py:238 templates/wei/weimembership_form.html:83 +#: apps/wei/models.py:240 templates/wei/weimembership_form.html:83 msgid "" "Register on the mailing list to stay informed of the sport events of the " "campus (1 mail/week)" @@ -1577,7 +1577,7 @@ msgstr "" "S'inscrire sur la liste de diffusion pour rester informé des actualités " "sportives sur le campus (1 mail par semaine)" -#: apps/wei/models.py:243 templates/wei/weimembership_form.html:86 +#: apps/wei/models.py:245 templates/wei/weimembership_form.html:86 msgid "" "Register on the mailing list to stay informed of the art events of the " "campus (1 mail/week)" @@ -1585,19 +1585,19 @@ msgstr "" "S'inscrire sur la liste de diffusion pour rester informé des actualités " "artistiques sur le campus (1 mail par semaine)" -#: apps/wei/models.py:248 templates/wei/weimembership_form.html:56 +#: apps/wei/models.py:250 templates/wei/weimembership_form.html:56 msgid "first year" msgstr "première année" -#: apps/wei/models.py:249 +#: apps/wei/models.py:251 msgid "Tells if the user is new in the school." msgstr "Indique si l'utilisateur est nouveau dans l'école." -#: apps/wei/models.py:254 +#: apps/wei/models.py:256 msgid "registration information" msgstr "informations sur l'inscription" -#: apps/wei/models.py:255 +#: apps/wei/models.py:257 msgid "" "Information about the registration (buses for old members, survey fot the " "new members), encoded in JSON" @@ -1605,27 +1605,27 @@ msgstr "" "Informations sur l'inscription (bus pour les 2A+, questionnaire pour les " "1A), encodées en JSON" -#: apps/wei/models.py:286 +#: apps/wei/models.py:288 msgid "WEI User" msgstr "Participant au WEI" -#: apps/wei/models.py:287 +#: apps/wei/models.py:289 msgid "WEI Users" msgstr "Participants au WEI" -#: apps/wei/models.py:307 +#: apps/wei/models.py:309 msgid "team" msgstr "équipe" -#: apps/wei/models.py:317 +#: apps/wei/models.py:319 msgid "WEI registration" msgstr "inscription au WEI" -#: apps/wei/models.py:321 +#: apps/wei/models.py:323 msgid "WEI membership" msgstr "adhésion au WEI" -#: apps/wei/models.py:322 +#: apps/wei/models.py:324 msgid "WEI memberships" msgstr "adhésions au WEI" @@ -1765,15 +1765,15 @@ msgstr "Cet utilisateur n'a pas donné son chèque de caution." msgid "Survey WEI" msgstr "Questionnaire WEI" -#: note_kfet/settings/base.py:156 +#: note_kfet/settings/base.py:157 msgid "German" msgstr "Allemand" -#: note_kfet/settings/base.py:157 +#: note_kfet/settings/base.py:158 msgid "English" msgstr "Anglais" -#: note_kfet/settings/base.py:158 +#: note_kfet/settings/base.py:159 msgid "French" msgstr "Français" @@ -2712,29 +2712,25 @@ msgstr "" "L'inscription va échouer." #: templates/wei/weimembership_form.html:169 -#, fuzzy, python-format -#| msgid "The note has enough money, the registration is possible." +#, python-format msgid "" "The note has enough money (%(pretty_fee)s required), the registration is " "possible." -msgstr "La note a assez d'argent, l'inscription est possible." +msgstr "" +"La note a assez d'argent (%(pretty_fee) requis), l'inscription est possible." #: templates/wei/weimembership_form.html:178 msgid "The user didn't give her/his caution check." msgstr "L'utilisateur n'a pas donné son chèque de caution." #: templates/wei/weimembership_form.html:186 -#, fuzzy -#| msgid "" -#| "You must also go to the Kfet to pay your membership. The WEI registration " -#| "includes the BDE membership." msgid "" "This user is not a member of the Kfet club for the coming year. The " "membership will be processed automatically, the WEI registration includes " "the membership fee." msgstr "" -"Vous devrez également vous rendre à la Kfet pour payer votre adhésion. " -"L'inscription au WEI inclut l'adhésion au BDE." +"Vous devrez également vous rendre à la Kfet pour payer votre adhésion pour " +"l'année à venir. L'inscription au WEI inclut l'adhésion au BDE." #: templates/wei/weimembership_list.html:24 msgid "View unvalidated registrations..." @@ -2760,16 +2756,3 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." #: templates/wei/weiregistration_list.html:24 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." - -#~ msgid "" -#~ "This user is not a member of the Kfet club for the comming year. Please " -#~ "adhere here if he/she is in her/his " -#~ "first year or here if he/she was an old " -#~ "member before you validate the registration of the WEI." -#~ msgstr "" -#~ "Cet utilisateur n'est pas membre du club Kfet pour l'année à venir. Merci " -#~ "de le faire adhérer\n" -#~ "ici s'iel est en première année\n" -#~ "ou ici s'iel est un ancien membre avant " -#~ "de valider\n" -#~ "l'inscription au WEI." diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index 3c557937..5df999fb 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -37,6 +37,7 @@ INSTALLED_APPS = [ # External apps 'mailer', + 'phonenumber_field', 'polymorphic', 'crispy_forms', 'django_tables2', @@ -195,3 +196,7 @@ MEDIA_URL = '/media/' # Profile Picture Settings PIC_WIDTH = 200 PIC_RATIO = 1 + + +PHONENUMBER_DB_FORMAT = 'NATIONAL' +PHONENUMBER_DEFAULT_REGION = 'FR' diff --git a/requirements/base.txt b/requirements/base.txt index d6e5b075..eb03fbf1 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,11 +7,13 @@ django-crispy-forms==1.7.2 django-extensions==2.1.9 django-filter==2.2.0 django-mailer==2.0.1 +django-phonenumber-field==4.0.0 django-polymorphic==2.0.3 django-tables2==2.1.0 docutils==0.14 idna==2.8 oauthlib==3.1.0 +phonenumbers==8.12.7 Pillow==7.1.2 python3-openid==3.1.0 pytz==2019.1 From af857d6faebfe7afbb9b62adf6cb07aba24e9f7e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 16:23:32 +0200 Subject: [PATCH 037/319] :bug: Prevent transactions where note balances go out integer bounds --- apps/note/api/serializers.py | 19 +++++++++ apps/note/models/transactions.py | 50 ++++++++++++++-------- locale/de/LC_MESSAGES/django.po | 71 ++++++++++++++++--------------- locale/fr/LC_MESSAGES/django.po | 73 +++++++++++++++++--------------- static/js/base.js | 6 ++- static/js/consos.js | 6 +-- static/js/transfer.js | 31 +++++++++++--- 7 files changed, 164 insertions(+), 92 deletions(-) diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index bcf0bdf5..99ee2cc1 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -5,6 +5,7 @@ from rest_framework import serializers from rest_polymorphic.serializers import PolymorphicSerializer from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend +from rest_framework.utils import model_meta from ..models.notes import Note, NoteClub, NoteSpecial, NoteUser, Alias from ..models.transactions import TransactionTemplate, Transaction, MembershipTransaction, TemplateCategory, \ @@ -209,5 +210,23 @@ class TransactionPolymorphicSerializer(PolymorphicSerializer): except ImportError: # Activity app is not loaded pass + def validate(self, attrs): + resource_type = attrs.pop(self.resource_type_field_name) + serializer = self._get_serializer_from_resource_type(resource_type) + if self.instance: + instance = self.instance + info = model_meta.get_field_info(instance) + for attr, value in attrs.items(): + if attr in info.relations and info.relations[attr].to_many: + field = getattr(instance, attr) + field.set(value) + else: + setattr(instance, attr, value) + instance.validate(True) + else: + serializer.Meta.model(**attrs).validate(True) + attrs[self.resource_type_field_name] = resource_type + return super().validate(attrs) + class Meta: model = Transaction diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 69306b71..c4f880f6 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -164,10 +164,43 @@ class Transaction(PolymorphicModel): models.Index(fields=['destination']), ] + def validate(self, reset=False): + previous_source_balance = self.source.balance + previous_dest_balance = self.destination.balance + + created = self.pk is None + to_transfer = self.amount * self.quantity + if not created: + # Revert old transaction + old_transaction = Transaction.objects.get(pk=self.pk) + if old_transaction.valid: + self.source.balance += to_transfer + self.destination.balance -= to_transfer + + if self.valid: + self.source.balance -= to_transfer + self.destination.balance += to_transfer + + # When a transaction is declared valid, we ensure that the invalidity reason is null, if it was + # previously invalid + self.invalidity_reason = None + + source_balance = self.source.balance + dest_balance = self.destination.balance + + if reset: + self.source.balance = previous_source_balance + self.destination.balance = previous_dest_balance + + if source_balance > 2147483647 or source_balance < -2147483648\ + or dest_balance > 2147483647 or dest_balance < -2147483648: + raise ValidationError(_("The note balances must be between - 21 474 836.47 € and 21 474 836.47 €.")) + def save(self, *args, **kwargs): """ When saving, also transfer money between two notes """ + self.validate(False) if not self.source.is_active or not self.destination.is_active: if 'force_insert' not in kwargs or not kwargs['force_insert']: @@ -187,23 +220,6 @@ class Transaction(PolymorphicModel): super().save(*args, **kwargs) return - created = self.pk is None - to_transfer = self.amount * self.quantity - if not created: - # Revert old transaction - old_transaction = Transaction.objects.get(pk=self.pk) - if old_transaction.valid: - self.source.balance += to_transfer - self.destination.balance -= to_transfer - - if self.valid: - self.source.balance -= to_transfer - self.destination.balance += to_transfer - - # When a transaction is declared valid, we ensure that the invalidity reason is null, if it was - # previously invalid - self.invalidity_reason = None - # We save first the transaction, in case of the user has no right to transfer money super().save(*args, **kwargs) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index c21f5f55..f75fc004 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 13:58+0200\n" +"POT-Creation-Date: 2020-08-05 16:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" #: apps/activity/models.py:24 apps/activity/models.py:49 #: apps/member/models.py:162 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:268 apps/permission/models.py:339 +#: apps/note/models/transactions.py:284 apps/permission/models.py:339 #: apps/wei/models.py:67 apps/wei/models.py:119 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -550,7 +550,7 @@ msgstr "" msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:353 apps/member/views.py:589 +#: apps/member/models.py:353 apps/member/views.py:588 msgid "User is already a member of the club" msgstr "" @@ -585,71 +585,71 @@ msgstr "" msgid "This address must be valid." msgstr "" -#: apps/member/views.py:134 +#: apps/member/views.py:133 msgid "Profile detail" msgstr "" -#: apps/member/views.py:168 +#: apps/member/views.py:167 msgid "Search user" msgstr "" -#: apps/member/views.py:202 apps/member/views.py:388 +#: apps/member/views.py:201 apps/member/views.py:387 msgid "Note aliases" msgstr "" -#: apps/member/views.py:216 +#: apps/member/views.py:215 msgid "Update note picture" msgstr "" -#: apps/member/views.py:274 templates/member/profile_info.html:43 +#: apps/member/views.py:273 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "" -#: apps/member/views.py:302 +#: apps/member/views.py:301 msgid "Create new club" msgstr "" -#: apps/member/views.py:314 +#: apps/member/views.py:313 msgid "Search club" msgstr "" -#: apps/member/views.py:339 +#: apps/member/views.py:338 msgid "Club detail" msgstr "" -#: apps/member/views.py:405 +#: apps/member/views.py:404 msgid "Update club" msgstr "" -#: apps/member/views.py:439 +#: apps/member/views.py:438 msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:580 apps/wei/views.py:862 +#: apps/member/views.py:579 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:593 +#: apps/member/views.py:592 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:598 +#: apps/member/views.py:597 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:615 apps/member/views.py:617 apps/member/views.py:619 +#: apps/member/views.py:614 apps/member/views.py:616 apps/member/views.py:618 #: apps/registration/views.py:290 apps/registration/views.py:292 #: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "" -#: apps/member/views.py:703 +#: apps/member/views.py:702 msgid "Manage roles of an user in the club" msgstr "" -#: apps/member/views.py:728 +#: apps/member/views.py:727 msgid "Members of the club" msgstr "" @@ -866,68 +866,73 @@ msgstr "" msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:175 +#: apps/note/models/transactions.py:197 +msgid "" +"The note balances must be between - 21 474 836.47 € and 21 474 836.47 €." +msgstr "" + +#: apps/note/models/transactions.py:208 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." msgstr "" -#: apps/note/models/transactions.py:230 +#: apps/note/models/transactions.py:246 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 #: templates/note/transaction_form.html:143 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:254 +#: apps/note/models/transactions.py:270 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:257 +#: apps/note/models/transactions.py:273 msgid "recurrent transaction" msgstr "" -#: apps/note/models/transactions.py:258 +#: apps/note/models/transactions.py:274 msgid "recurrent transactions" msgstr "" -#: apps/note/models/transactions.py:273 +#: apps/note/models/transactions.py:289 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:278 +#: apps/note/models/transactions.py:294 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:284 +#: apps/note/models/transactions.py:300 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:284 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:300 templates/note/transaction_form.html:24 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:295 +#: apps/note/models/transactions.py:311 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" msgstr "" -#: apps/note/models/transactions.py:299 +#: apps/note/models/transactions.py:315 msgid "Special transaction" msgstr "" -#: apps/note/models/transactions.py:300 +#: apps/note/models/transactions.py:316 msgid "Special transactions" msgstr "" -#: apps/note/models/transactions.py:316 apps/note/models/transactions.py:321 +#: apps/note/models/transactions.py:332 apps/note/models/transactions.py:337 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:317 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:333 apps/treasury/models.py:228 msgid "membership transactions" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index cd4f17d7..e4d860c3 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 13:58+0200\n" +"POT-Creation-Date: 2020-08-05 16:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:24 apps/activity/models.py:49 #: apps/member/models.py:162 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:268 apps/permission/models.py:339 +#: apps/note/models/transactions.py:284 apps/permission/models.py:339 #: apps/wei/models.py:67 apps/wei/models.py:119 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -555,7 +555,7 @@ msgstr "l'adhésion finit le" 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:353 apps/member/views.py:589 +#: apps/member/models.py:353 apps/member/views.py:588 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" @@ -590,47 +590,47 @@ msgstr "Modifier le profil" msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:134 +#: apps/member/views.py:133 msgid "Profile detail" msgstr "Détails de l'utilisateur" -#: apps/member/views.py:168 +#: apps/member/views.py:167 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:202 apps/member/views.py:388 +#: apps/member/views.py:201 apps/member/views.py:387 msgid "Note aliases" msgstr "Alias de la note" -#: apps/member/views.py:216 +#: apps/member/views.py:215 msgid "Update note picture" msgstr "Modifier la photo de la note" -#: apps/member/views.py:274 templates/member/profile_info.html:43 +#: apps/member/views.py:273 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: apps/member/views.py:302 +#: apps/member/views.py:301 msgid "Create new club" msgstr "Créer un nouveau club" -#: apps/member/views.py:314 +#: apps/member/views.py:313 msgid "Search club" msgstr "Chercher un club" -#: apps/member/views.py:339 +#: apps/member/views.py:338 msgid "Club detail" msgstr "Détails du club" -#: apps/member/views.py:405 +#: apps/member/views.py:404 msgid "Update club" msgstr "Modifier le club" -#: apps/member/views.py:439 +#: apps/member/views.py:438 msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:580 apps/wei/views.py:862 +#: apps/member/views.py:579 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -638,25 +638,25 @@ 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:593 +#: apps/member/views.py:592 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:598 +#: apps/member/views.py:597 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:615 apps/member/views.py:617 apps/member/views.py:619 +#: apps/member/views.py:614 apps/member/views.py:616 apps/member/views.py:618 #: apps/registration/views.py:290 apps/registration/views.py:292 #: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:703 +#: apps/member/views.py:702 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:728 +#: apps/member/views.py:727 msgid "Members of the club" msgstr "Membres du club" @@ -874,7 +874,14 @@ msgstr "Transaction" msgid "transactions" msgstr "Transactions" -#: apps/note/models/transactions.py:175 +#: apps/note/models/transactions.py:197 +msgid "" +"The note balances must be between - 21 474 836.47 € and 21 474 836.47 €." +msgstr "" +"Les montants des notes doivent se trouver entre - 21 474 836.47 € et 21 474 " +"836.47 €. Ne cherchez pas à capitaliser l'argent du BDE." + +#: apps/note/models/transactions.py:208 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." @@ -882,44 +889,44 @@ msgstr "" "La transaction ne peut pas être sauvegardée puisque la note source ou la " "note de destination n'est pas active." -#: apps/note/models/transactions.py:230 +#: apps/note/models/transactions.py:246 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 #: templates/note/transaction_form.html:143 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:254 +#: apps/note/models/transactions.py:270 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:257 +#: apps/note/models/transactions.py:273 msgid "recurrent transaction" msgstr "Transaction issue de bouton" -#: apps/note/models/transactions.py:258 +#: apps/note/models/transactions.py:274 msgid "recurrent transactions" msgstr "Transactions issues de boutons" -#: apps/note/models/transactions.py:273 +#: apps/note/models/transactions.py:289 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:278 +#: apps/note/models/transactions.py:294 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:284 +#: apps/note/models/transactions.py:300 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:284 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:300 templates/note/transaction_form.html:24 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:295 +#: apps/note/models/transactions.py:311 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -927,19 +934,19 @@ 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:299 +#: apps/note/models/transactions.py:315 msgid "Special transaction" msgstr "Transaction de crédit/retrait" -#: apps/note/models/transactions.py:300 +#: apps/note/models/transactions.py:316 msgid "Special transactions" msgstr "Transactions de crédit/retrait" -#: apps/note/models/transactions.py:316 apps/note/models/transactions.py:321 +#: apps/note/models/transactions.py:332 apps/note/models/transactions.py:337 msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:317 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:333 apps/treasury/models.py:228 msgid "membership transactions" msgstr "Transactions d'adhésion" diff --git a/static/js/base.js b/static/js/base.js index cf67759b..9e458ee6 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -371,8 +371,12 @@ function de_validate(id, validated) { refreshHistory(); }, error: function (err) { + let errObj = JSON.parse(err.responseText); + let error = errObj["detail"] ? errObj["detail"] : errObj["non_field_errors"]; + if (!error) + error = err.responseText; addMsg("Une erreur est survenue lors de la validation/dévalidation " + - "de cette transaction : " + JSON.parse(err.responseText)["detail"], "danger", 10000); + "de cette transaction : " + error, "danger"); refreshBalance(); // error if this method doesn't exist. Please define it. diff --git a/static/js/consos.js b/static/js/consos.js index 3b6b5bc5..b75a7b59 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -212,11 +212,11 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat if (newBalance <= -5000) addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + "succès, mais la note émettrice " + source_alias + " est en négatif sévère.", - "danger", 10000); + "danger", 30000); else if (newBalance < 0) addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + "succès, mais la note émettrice " + source_alias + " est en négatif.", - "warning", 10000); + "warning", 30000); } reset(); }).fail(function (e) { @@ -240,7 +240,7 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat addMsg("La transaction n'a pas pu être validée pour cause de solde insuffisant.", "danger", 10000); }).fail(function () { reset(); - errMsg(e.responseJSON, 10000); + errMsg(e.responseJSON); }); }); } diff --git a/static/js/transfer.js b/static/js/transfer.js index feca4a0d..bff6b493 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -213,6 +213,13 @@ $("#btn_transfer").click(function() { error = true; } + let amount = Math.floor(100 * amount_field.val()); + if (amount > 2147483647) { + amount_field.addClass('is-invalid'); + $("#amount-required").html("Le montant ne doit pas excéder 21474836.47 €."); + error = true; + } + if (!reason_field.val()) { reason_field.addClass('is-invalid'); $("#reason-required").html("Ce champ est requis."); @@ -232,7 +239,6 @@ $("#btn_transfer").click(function() { if (error) return; - let amount = 100 * amount_field.val(); let reason = reason_field.val(); if ($("#type_transfer").is(':checked')) { @@ -277,7 +283,15 @@ $("#btn_transfer").click(function() { + " vers la note " + dest.name + " a été fait avec succès !", "success", 10000); reset(); - }).fail(function () { // do it again but valid = false + }).fail(function (err) { // do it again but valid = false + let errObj = JSON.parse(err.responseText); + if (errObj["non_field_errors"]) { + addMsg("Le transfert de " + + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name + + " vers la note " + dest.name + " a échoué : " + errObj["non_field_errors"], "danger"); + return; + } + $.post("/api/note/transaction/transaction/", { "csrfmiddlewaretoken": CSRF_TOKEN, @@ -298,9 +312,13 @@ $("#btn_transfer").click(function() { + " vers la note " + dest.name + " a échoué : Solde insuffisant", "danger", 10000); reset(); }).fail(function (err) { + let errObj = JSON.parse(err.responseText); + let error = errObj["detail"] ? errObj["detail"] : errObj["non_field_errors"] + if (!error) + error = err.responseText; addMsg("Le transfert de " + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name - + " vers la note " + dest.name + " a échoué : " + err.responseText, "danger"); + + " vers la note " + dest.name + " a échoué : " + error, "danger"); }); }); }); @@ -346,8 +364,11 @@ $("#btn_transfer").click(function() { addMsg("Le crédit/retrait a bien été effectué !", "success", 10000); reset(); }).fail(function (err) { - addMsg("Le crédit/retrait a échoué : " + JSON.parse(err.responseText)["detail"], - "danger", 10000); + let errObj = JSON.parse(err.responseText); + let error = errObj["detail"] ? errObj["detail"] : errObj["non_field_errors"] + if (!error) + error = err.responseText; + addMsg("Le crédit/retrait a échoué : " + error, "danger", 10000); }); } }); From 21f1347a606ec356a64803ac3dec756364478abd Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 16:26:44 +0200 Subject: [PATCH 038/319] :bug: Fix signup --- apps/registration/views.py | 2 +- templates/registration/email_validation_email_sent.html | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/registration/views.py b/apps/registration/views.py index f4574b0f..95f271b1 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -39,7 +39,7 @@ class UserCreateView(CreateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["profile_form"] = self.second_form() + context["profile_form"] = self.second_form(self.request.POST) del context["profile_form"].fields["section"] return context diff --git a/templates/registration/email_validation_email_sent.html b/templates/registration/email_validation_email_sent.html index 6167ee52..bb2bcea8 100644 --- a/templates/registration/email_validation_email_sent.html +++ b/templates/registration/email_validation_email_sent.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% load i18n %} {% block content %}

      {% trans "Account activation" %}

      From 9c3e978a4170404a1088eddc83fd4ddf1996db9f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 16:27:44 +0200 Subject: [PATCH 039/319] :bug: Fix signup --- apps/registration/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/registration/views.py b/apps/registration/views.py index 95f271b1..41a9a405 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -39,7 +39,7 @@ class UserCreateView(CreateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["profile_form"] = self.second_form(self.request.POST) + context["profile_form"] = self.second_form(self.request.POST if self.request.POST else None) del context["profile_form"].fields["section"] return context From b0398e59b8d218c4bc434d931ee2168ab4abbaae Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 18:04:01 +0200 Subject: [PATCH 040/319] :bug: Fix treasury --- apps/treasury/forms.py | 56 +++++++++++++++----------------- apps/treasury/models.py | 2 +- apps/treasury/tables.py | 4 ++- apps/treasury/views.py | 4 +-- locale/de/LC_MESSAGES/django.po | 49 +++++++++++++++------------- locale/fr/LC_MESSAGES/django.po | 49 +++++++++++++++------------- templates/note/amount_input.html | 2 +- 7 files changed, 86 insertions(+), 80 deletions(-) diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index 4c761ef2..7ff16c8f 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -1,11 +1,10 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -import datetime - from crispy_forms.helper import FormHelper from crispy_forms.layout import Submit from django import forms +from django.utils import timezone from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import DatePickerInput, AmountInput @@ -19,12 +18,13 @@ class InvoiceForm(forms.ModelForm): # Django forms don't support date fields. We have to add it manually date = forms.DateField( - initial=datetime.date.today, - widget=DatePickerInput() + initial=timezone.now, + widget=DatePickerInput(), ) def clean_date(self): self.instance.date = self.data.get("date") + return self.instance.date class Meta: model = Invoice @@ -36,7 +36,11 @@ class ProductForm(forms.ModelForm): model = Product fields = '__all__' widgets = { - "amount": AmountInput() + "amount": AmountInput( + attrs={ + "negative": True, + } + ) } @@ -115,6 +119,12 @@ class LinkTransactionToRemittanceForm(forms.ModelForm): """ Attach a special transaction to a remittance. """ + remittance = forms.ModelChoiceField( + queryset=Remittance.objects.none(), + label=_("Remittance"), + empty_label=_("No attached remittance"), + required=False, + ) # Since we use a proxy model for special transactions, we add manually the fields related to the transaction last_name = forms.CharField(label=_("Last name")) @@ -123,7 +133,7 @@ class LinkTransactionToRemittanceForm(forms.ModelForm): bank = forms.Field(label=_("Bank")) - amount = forms.IntegerField(label=_("Amount"), min_value=0) + amount = forms.IntegerField(label=_("Amount"), min_value=0, widget=AmountInput(), disabled=True, required=False) def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) @@ -133,33 +143,19 @@ class LinkTransactionToRemittanceForm(forms.ModelForm): self.fields["remittance"].queryset = Remittance.objects.filter(closed=False) - def clean_last_name(self): - """ - Replace the first name in the information of the transaction. - """ - self.instance.transaction.last_name = self.data.get("last_name") - self.instance.transaction.clean() + def clean(self): + cleaned_data = super().clean() + self.instance.transaction.last_name = cleaned_data["last_name"] + self.instance.transaction.first_name = cleaned_data["first_name"] + self.instance.transaction.bank = cleaned_data["bank"] + return cleaned_data - def clean_first_name(self): + def save(self, commit=True): """ - Replace the last name in the information of the transaction. + Save the transaction and the remittance. """ - self.instance.transaction.first_name = self.data.get("first_name") - self.instance.transaction.clean() - - def clean_bank(self): - """ - Replace the bank in the information of the transaction. - """ - self.instance.transaction.bank = self.data.get("bank") - self.instance.transaction.clean() - - def clean_amount(self): - """ - Replace the amount of the transaction. - """ - self.instance.transaction.amount = self.data.get("amount") - self.instance.transaction.clean() + self.instance.transaction.save() + return super().save(commit) class Meta: model = SpecialTransactionProxy diff --git a/apps/treasury/models.py b/apps/treasury/models.py index 6cfb55c1..90366e7e 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -82,7 +82,7 @@ class Product(models.Model): verbose_name=_("Designation"), ) - quantity = models.PositiveIntegerField( + quantity = models.IntegerField( verbose_name=_("Quantity") ) diff --git a/apps/treasury/tables.py b/apps/treasury/tables.py index 9f4e43e6..c7bdb6eb 100644 --- a/apps/treasury/tables.py +++ b/apps/treasury/tables.py @@ -64,6 +64,7 @@ class RemittanceTable(tables.Table): model = Remittance template_name = 'django_tables2/bootstrap4.html' fields = ('id', 'date', 'remittance_type', 'comment', 'count', 'amount', 'view',) + order_by = ('-date',) class SpecialTransactionTable(tables.Table): @@ -100,7 +101,8 @@ class SpecialTransactionTable(tables.Table): } model = SpecialTransaction template_name = 'django_tables2/bootstrap4.html' - fields = ('id', 'source', 'destination', 'last_name', 'first_name', 'bank', 'amount', 'reason',) + fields = ('created_at', 'source', 'destination', 'last_name', 'first_name', 'bank', 'amount', 'reason',) + order_by = ('-created_at',) class SogeCreditTable(tables.Table): diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 088345b8..2fbe4777 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -238,7 +238,7 @@ class RemittanceListView(LoginRequiredMixin, TemplateView): closed_remittances = RemittanceTable( data=Remittance.objects.filter(closed=True).filter( - PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all(), + PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(), prefix="closed-remittances-", ) closed_remittances.paginate(page=self.request.GET.get("closed-remittances-page", 1), per_page=10) @@ -281,8 +281,6 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView) def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["table"] = RemittanceTable(data=Remittance.objects.filter( - PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all()) data = SpecialTransaction.objects.filter(specialtransactionproxy__remittance=self.object).filter( PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all() context["special_transactions"] = SpecialTransactionTable( diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index f75fc004..80397341 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 16:18+0200\n" +"POT-Creation-Date: 2020-08-05 16:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -187,13 +187,13 @@ msgid "Type" msgstr "" #: apps/activity/tables.py:77 apps/member/forms.py:103 -#: apps/registration/forms.py:70 apps/treasury/forms.py:120 +#: apps/registration/forms.py:70 apps/treasury/forms.py:126 #: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "" #: apps/activity/tables.py:79 apps/member/forms.py:108 -#: apps/registration/forms.py:75 apps/treasury/forms.py:122 +#: apps/registration/forms.py:75 apps/treasury/forms.py:128 #: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" msgstr "" @@ -347,7 +347,7 @@ msgid "Credit amount" msgstr "" #: apps/member/forms.py:113 apps/registration/forms.py:80 -#: apps/treasury/forms.py:124 apps/wei/forms/registration.py:105 +#: apps/treasury/forms.py:130 apps/wei/forms/registration.py:105 #: templates/note/transaction_form.html:135 msgid "Bank" msgstr "" @@ -687,7 +687,7 @@ msgstr "" msgid "Reason" msgstr "" -#: apps/note/forms.py:87 apps/treasury/tables.py:117 +#: apps/note/forms.py:87 apps/treasury/tables.py:119 msgid "Valid" msgstr "" @@ -1169,7 +1169,7 @@ msgstr "" msgid "Treasury" msgstr "" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: apps/treasury/forms.py:84 apps/treasury/forms.py:138 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 @@ -1193,8 +1193,20 @@ msgstr "" msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:126 apps/treasury/tables.py:47 -#: apps/treasury/tables.py:113 templates/note/transaction_form.html:97 +#: apps/treasury/forms.py:120 apps/treasury/models.py:207 +#: apps/treasury/tables.py:77 apps/treasury/tables.py:85 +#: templates/treasury/invoice_list.html:13 +#: templates/treasury/remittance_list.html:13 +#: templates/treasury/sogecredit_list.html:13 +msgid "Remittance" +msgstr "" + +#: apps/treasury/forms.py:121 +msgid "No attached remittance" +msgstr "" + +#: apps/treasury/forms.py:132 apps/treasury/tables.py:47 +#: apps/treasury/tables.py:115 templates/note/transaction_form.html:97 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "" @@ -1291,13 +1303,6 @@ msgstr "" msgid "Remittance #{:d}: {}" msgstr "" -#: apps/treasury/models.py:207 apps/treasury/tables.py:76 -#: apps/treasury/tables.py:84 templates/treasury/invoice_list.html:13 -#: templates/treasury/remittance_list.html:13 -#: templates/treasury/sogecredit_list.html:13 -msgid "Remittance" -msgstr "" - #: apps/treasury/models.py:211 msgid "special transaction proxy" msgstr "" @@ -1342,19 +1347,19 @@ msgstr "" msgid "View" msgstr "" -#: apps/treasury/tables.py:78 +#: apps/treasury/tables.py:79 msgid "Add" msgstr "" -#: apps/treasury/tables.py:86 +#: apps/treasury/tables.py:87 msgid "Remove" msgstr "" -#: apps/treasury/tables.py:124 +#: apps/treasury/tables.py:126 msgid "Yes" msgstr "" -#: apps/treasury/tables.py:124 +#: apps/treasury/tables.py:126 msgid "No" msgstr "" @@ -2147,16 +2152,16 @@ msgid "" "activate your account." msgstr "" -#: templates/registration/email_validation_email_sent.html:4 +#: templates/registration/email_validation_email_sent.html:5 msgid "Account activation" msgstr "" -#: templates/registration/email_validation_email_sent.html:7 +#: templates/registration/email_validation_email_sent.html:8 msgid "" "An email has been sent. Please click on the link to activate your account." msgstr "" -#: templates/registration/email_validation_email_sent.html:11 +#: templates/registration/email_validation_email_sent.html:12 msgid "" "You must also go to the Kfet to pay your membership. The WEI registration " "includes the BDE membership." diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e4d860c3..b87eaa1d 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 16:18+0200\n" +"POT-Creation-Date: 2020-08-05 16:49+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -188,13 +188,13 @@ msgid "Type" msgstr "Type" #: apps/activity/tables.py:77 apps/member/forms.py:103 -#: apps/registration/forms.py:70 apps/treasury/forms.py:120 +#: apps/registration/forms.py:70 apps/treasury/forms.py:126 #: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:79 apps/member/forms.py:108 -#: apps/registration/forms.py:75 apps/treasury/forms.py:122 +#: apps/registration/forms.py:75 apps/treasury/forms.py:128 #: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" msgstr "Prénom" @@ -348,7 +348,7 @@ msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:113 apps/registration/forms.py:80 -#: apps/treasury/forms.py:124 apps/wei/forms/registration.py:105 +#: apps/treasury/forms.py:130 apps/wei/forms/registration.py:105 #: templates/note/transaction_form.html:135 msgid "Bank" msgstr "Banque" @@ -694,7 +694,7 @@ msgstr "Destination" msgid "Reason" msgstr "Raison" -#: apps/note/forms.py:87 apps/treasury/tables.py:117 +#: apps/note/forms.py:87 apps/treasury/tables.py:119 msgid "Valid" msgstr "Valide" @@ -1198,7 +1198,7 @@ msgstr "Invalider l'inscription" msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:132 +#: apps/treasury/forms.py:84 apps/treasury/forms.py:138 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 @@ -1222,8 +1222,20 @@ msgstr "La remise est déjà fermée." 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:126 apps/treasury/tables.py:47 -#: apps/treasury/tables.py:113 templates/note/transaction_form.html:97 +#: apps/treasury/forms.py:120 apps/treasury/models.py:207 +#: apps/treasury/tables.py:77 apps/treasury/tables.py:85 +#: templates/treasury/invoice_list.html:13 +#: templates/treasury/remittance_list.html:13 +#: templates/treasury/sogecredit_list.html:13 +msgid "Remittance" +msgstr "Remise" + +#: apps/treasury/forms.py:121 +msgid "No attached remittance" +msgstr "Pas de remise associée" + +#: apps/treasury/forms.py:132 apps/treasury/tables.py:47 +#: apps/treasury/tables.py:115 templates/note/transaction_form.html:97 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "Montant" @@ -1320,13 +1332,6 @@ msgstr "remises" msgid "Remittance #{:d}: {}" msgstr "Remise n°{:d} : {}" -#: apps/treasury/models.py:207 apps/treasury/tables.py:76 -#: apps/treasury/tables.py:84 templates/treasury/invoice_list.html:13 -#: templates/treasury/remittance_list.html:13 -#: templates/treasury/sogecredit_list.html:13 -msgid "Remittance" -msgstr "Remise" - #: apps/treasury/models.py:211 msgid "special transaction proxy" msgstr "Proxy de transaction spéciale" @@ -1373,19 +1378,19 @@ msgstr "Nombre de transactions" msgid "View" msgstr "Voir" -#: apps/treasury/tables.py:78 +#: apps/treasury/tables.py:79 msgid "Add" msgstr "Ajouter" -#: apps/treasury/tables.py:86 +#: apps/treasury/tables.py:87 msgid "Remove" msgstr "supprimer" -#: apps/treasury/tables.py:124 +#: apps/treasury/tables.py:126 msgid "Yes" msgstr "Oui" -#: apps/treasury/tables.py:124 +#: apps/treasury/tables.py:126 msgid "No" msgstr "Non" @@ -2218,18 +2223,18 @@ msgstr "" "Le lien est invalide. Le jeton a sans doute expiré. Merci de nous contacter " "pour activer votre compte." -#: templates/registration/email_validation_email_sent.html:4 +#: templates/registration/email_validation_email_sent.html:5 msgid "Account activation" msgstr "Activation du compte" -#: templates/registration/email_validation_email_sent.html:7 +#: templates/registration/email_validation_email_sent.html:8 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." -#: templates/registration/email_validation_email_sent.html:11 +#: templates/registration/email_validation_email_sent.html:12 msgid "" "You must also go to the Kfet to pay your membership. The WEI registration " "includes the BDE membership." diff --git a/templates/note/amount_input.html b/templates/note/amount_input.html index cd8cd201..f4515234 100644 --- a/templates/note/amount_input.html +++ b/templates/note/amount_input.html @@ -1,5 +1,5 @@
      - Date: Wed, 5 Aug 2020 19:42:44 +0200 Subject: [PATCH 041/319] :bug: Fix transaction update concurency --- apps/api/viewsets.py | 8 +++-- apps/note/api/views.py | 8 +++-- apps/note/models/transactions.py | 57 ++++++++++++++++++++------------ apps/permission/models.py | 51 ++++++++++++---------------- 4 files changed, 67 insertions(+), 57 deletions(-) diff --git a/apps/api/viewsets.py b/apps/api/viewsets.py index f4dd56f6..01fc7998 100644 --- a/apps/api/viewsets.py +++ b/apps/api/viewsets.py @@ -4,7 +4,7 @@ from django.contrib.contenttypes.models import ContentType from permission.backends import PermissionBackend from rest_framework import viewsets -from note_kfet.middlewares import get_current_authenticated_user +from note_kfet.middlewares import get_current_session class ReadProtectedModelViewSet(viewsets.ModelViewSet): @@ -17,7 +17,8 @@ class ReadProtectedModelViewSet(viewsets.ModelViewSet): self.model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class() def get_queryset(self): - user = get_current_authenticated_user() + user = self.request.user + get_current_session().setdefault("permission_mask", 42) return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct() @@ -31,5 +32,6 @@ class ReadOnlyProtectedModelViewSet(viewsets.ReadOnlyModelViewSet): self.model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class() def get_queryset(self): - user = get_current_authenticated_user() + user = self.request.user + get_current_session().setdefault("permission_mask", 42) return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")).distinct() diff --git a/apps/note/api/views.py b/apps/note/api/views.py index f806bbf2..be11aa7f 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -9,7 +9,7 @@ from rest_framework import viewsets from rest_framework.response import Response from rest_framework import status from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet -from note_kfet.middlewares import get_current_authenticated_user +from note_kfet.middlewares import get_current_session from permission.backends import PermissionBackend from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\ @@ -154,5 +154,7 @@ class TransactionViewSet(ReadProtectedModelViewSet): search_fields = ['$reason', ] def get_queryset(self): - user = get_current_authenticated_user() - return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view")) + user = self.request.user + get_current_session().setdefault("permission_mask", 42) + return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view"))\ + .order_by("created_at", "id") diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index c4f880f6..3d7aeb58 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -1,7 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later from django.core.exceptions import ValidationError -from django.db import models +from django.db import models, transaction from django.urls import reverse from django.utils import timezone from django.utils.translation import gettext_lazy as _ @@ -196,38 +196,51 @@ class Transaction(PolymorphicModel): or dest_balance > 2147483647 or dest_balance < -2147483648: raise ValidationError(_("The note balances must be between - 21 474 836.47 € and 21 474 836.47 €.")) + @transaction.atomic def save(self, *args, **kwargs): """ When saving, also transfer money between two notes """ - self.validate(False) + with transaction.atomic(): + self.refresh_from_db() + self.source.refresh_from_db() + self.destination.refresh_from_db() + self.validate(False) - if not self.source.is_active or not self.destination.is_active: - if 'force_insert' not in kwargs or not kwargs['force_insert']: - if 'force_update' not in kwargs or not kwargs['force_update']: - raise ValidationError(_("The transaction can't be saved since the source note " - "or the destination note is not active.")) + if not self.source.is_active or not self.destination.is_active: + if 'force_insert' not in kwargs or not kwargs['force_insert']: + if 'force_update' not in kwargs or not kwargs['force_update']: + raise ValidationError(_("The transaction can't be saved since the source note " + "or the destination note is not active.")) - # If the aliases are not entered, we assume that the used alias is the name of the note - if not self.source_alias: - self.source_alias = str(self.source) + # If the aliases are not entered, we assume that the used alias is the name of the note + if not self.source_alias: + self.source_alias = str(self.source) - if not self.destination_alias: - self.destination_alias = str(self.destination) + if not self.destination_alias: + self.destination_alias = str(self.destination) - if self.source.pk == self.destination.pk: - # When source == destination, no money is transferred + if self.source.pk == self.destination.pk: + # When source == destination, no money is transferred + super().save(*args, **kwargs) + return + + self.log("Saving") + # We save first the transaction, in case of the user has no right to transfer money super().save(*args, **kwargs) - return + self.log("Saved") - # We save first the transaction, in case of the user has no right to transfer money - super().save(*args, **kwargs) + # Save notes + self.source._force_save = True + self.source.save() + self.log("Source saved") + self.destination._force_save = True + self.destination.save() + self.log("Destination saved") - # Save notes - self.source._force_save = True - self.source.save() - self.destination._force_save = True - self.destination.save() + def log(self, msg): + with open("/tmp/log", "a") as f: + f.write(msg + "\n") def delete(self, **kwargs): """ diff --git a/apps/permission/models.py b/apps/permission/models.py index 235977bb..a7e178b3 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -10,7 +10,7 @@ from time import sleep from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError from django.core.mail import mail_admins -from django.db import models +from django.db import models, transaction from django.db.models import F, Q, Model from django.forms import model_to_dict from django.utils.translation import gettext_lazy as _ @@ -43,35 +43,28 @@ class InstancedPermission: obj = copy(obj) obj.pk = 0 - # Ensure previous models are deleted - for ignored in range(1000): - if self.model.model_class().objects.filter(pk=0).exists(): - # If the object exists, that means that one permission is currently checked. - # We wait before the other permission, at most 1 second. - sleep(0.001) - continue - break - for o in self.model.model_class().objects.filter(pk=0).all(): - o._force_delete = True - Model.delete(o) - # An object with pk 0 wouldn't deleted. That's not normal, we alert admins. - msg = "Lors de la vérification d'une permission d'ajout, un objet de clé primaire nulle était "\ - "encore présent.\n"\ - "Type de permission : " + self.type + "\n"\ - "Modèle : " + str(self.model) + "\n"\ - "Objet trouvé : " + str(model_to_dict(o)) + "\n\n"\ - "--\nLe BDE" - mail_admins("[Note Kfet] Un objet a été supprimé de force", msg) + with transaction.atomic(): + for o in self.model.model_class().objects.filter(pk=0).all(): + o._force_delete = True + Model.delete(o) + # An object with pk 0 wouldn't deleted. That's not normal, we alert admins. + msg = "Lors de la vérification d'une permission d'ajout, un objet de clé primaire nulle était "\ + "encore présent.\n"\ + "Type de permission : " + self.type + "\n"\ + "Modèle : " + str(self.model) + "\n"\ + "Objet trouvé : " + str(model_to_dict(o)) + "\n\n"\ + "--\nLe BDE" + mail_admins("[Note Kfet] Un objet a été supprimé de force", msg) - # Force insertion, no data verification, no trigger - obj._force_save = True - Model.save(obj, force_insert=True) - # We don't want log anything - obj._no_log = True - ret = self.model.model_class().objects.filter(self.query & Q(pk=0)).exists() - # Delete testing object - obj._force_delete = True - Model.delete(obj) + # Force insertion, no data verification, no trigger + obj._force_save = True + Model.save(obj, force_insert=True) + # We don't want log anything + obj._no_log = True + ret = self.model.model_class().objects.filter(self.query & Q(pk=0)).exists() + # Delete testing object + obj._force_delete = True + Model.delete(obj) with open("/tmp/log", "w") as f: f.write(str(obj) + ", " + str(obj.pk) + ", " + str(self.model.model_class().objects.filter(pk=0).exists())) From 2851d7764c947adaf5a3c6f3ba5024d05f25e548 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 19:52:36 +0200 Subject: [PATCH 042/319] Profile pictures are clickable --- static/js/base.js | 10 +++------- static/js/consos.js | 1 + static/js/transfer.js | 1 + templates/note/conso_form.html | 6 ++++-- templates/note/transaction_form.html | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/static/js/base.js b/static/js/base.js index 9e458ee6..52fce901 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -131,13 +131,9 @@ function displayNote(note, alias, user_note_field = null, profile_pic_field = nu $("#" + 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).click(function () { - if (note.resourcetype === "NoteUser") { - document.location.href = "/accounts/user/" + note.user; - } else if (note.resourcetype === "NoteClub") { - document.location.href = "/accounts/club/" + note.club; - } - }); + $("#" + profile_pic_field + "_link").attr('href', note.resourcetype === "NoteUser" ? + "/accounts/user/" + note.user : note.resourcetype === "NoteClub" ? + "/accounts/club/" + note.club : "#"); } } } diff --git a/static/js/consos.js b/static/js/consos.js index b75a7b59..cb6b730f 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -145,6 +145,7 @@ function reset() { $("#consos_list").html(""); $("#user_note").text(""); $("#profile_pic").attr("src", "/media/pic/default.png"); + $("#profile_pic_link").attr("href", "#"); refreshHistory(); refreshBalance(); } diff --git a/static/js/transfer.js b/static/js/transfer.js index bff6b493..88368a27 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -37,6 +37,7 @@ function reset(refresh=true) { $("#bank").val(""); $("#user_note").val(""); $("#profile_pic").attr("src", "/media/pic/default.png"); + $("#profile_pic_link").attr("href", "#"); if (refresh) { refreshBalance(); refreshHistory(); diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html index a63f7ffe..52c6b94f 100644 --- a/templates/note/conso_form.html +++ b/templates/note/conso_form.html @@ -12,8 +12,10 @@ {# User details column #}
      - + + +
      diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html index 3549871f..8494c22b 100644 --- a/templates/note/transaction_form.html +++ b/templates/note/transaction_form.html @@ -36,8 +36,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
      - +
      From 018ca84e2d2a558d3d4a687c6a882e308db9f7b2 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 20:40:30 +0200 Subject: [PATCH 043/319] Prevent superusers when they make a transaction with a non-member user --- apps/note/api/serializers.py | 19 ++++++++++++++++++- apps/note/models/transactions.py | 3 ++- static/js/base.js | 5 ++++- static/js/consos.js | 3 +++ static/js/transfer.js | 24 ++++++++++++++++++------ 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index 99ee2cc1..b4fceeda 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -1,8 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later - +from django.utils import timezone from rest_framework import serializers +from rest_framework.serializers import ListSerializer from rest_polymorphic.serializers import PolymorphicSerializer + +from member.api.serializers import MembershipSerializer +from member.models import Membership from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend from rest_framework.utils import model_meta @@ -109,6 +113,8 @@ class ConsumerSerializer(serializers.ModelSerializer): email_confirmed = serializers.SerializerMethodField() + membership = serializers.SerializerMethodField() + class Meta: model = Alias fields = '__all__' @@ -127,6 +133,17 @@ class ConsumerSerializer(serializers.ModelSerializer): return obj.note.user.profile.email_confirmed return True + def get_membership(self, obj): + if isinstance(obj.note, NoteUser): + memberships = Membership.objects.filter( + PermissionBackend.filter_queryset(get_current_authenticated_user(), Membership, "view")).filter( + user=obj.note.user, + club=2, # Kfet + ).order_by("-date_start") + if memberships.exists(): + return MembershipSerializer().to_representation(memberships.first()) + return None + class TemplateCategorySerializer(serializers.ModelSerializer): """ diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 3d7aeb58..6a5d4680 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -202,7 +202,8 @@ class Transaction(PolymorphicModel): When saving, also transfer money between two notes """ with transaction.atomic(): - self.refresh_from_db() + if self.pk: + self.refresh_from_db() self.source.refresh_from_db() self.destination.refresh_from_db() self.validate(False) diff --git a/static/js/base.js b/static/js/base.js index 52fce901..5400bf5d 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -105,8 +105,10 @@ function displayStyle(note) { css += " text-danger"; else if (balance < 0) css += " text-warning"; - if (!note.email_confirmed) + else if (!note.email_confirmed) css += " text-white bg-primary"; + else if (note.membership && note.membership.date_end < new Date().toISOString()) + css += "text-white bg-info"; return css; } @@ -263,6 +265,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr consumers.results.forEach(function (consumer) { let note = consumer.note; note.email_confirmed = consumer.email_confirmed; + note.membership = consumer.membership; let extra_css = displayStyle(note); aliases_matched_html += li(alias_prefix + '_' + consumer.id, consumer.name, diff --git a/static/js/consos.js b/static/js/consos.js index cb6b730f..a953eee3 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -218,6 +218,9 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + "succès, mais la note émettrice " + source_alias + " est en négatif.", "warning", 30000); + if (source.note.membership && source.note.membership.date_end > new Date().toISOString()) + addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.", + "danger", 30000); } reset(); }).fail(function (e) { diff --git a/static/js/transfer.js b/static/js/transfer.js index 88368a27..6e2f183c 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -260,6 +260,13 @@ $("#btn_transfer").click(function() { "destination": dest.note.id, "destination_alias": dest.name }).done(function () { + if (source.note.membership && source.note.membership.date_end > new Date().toISOString()) + addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.", + "danger", 30000); + if (dest.note.membership && dest.note.membership.date_end > new Date().toISOString()) + addMsg("Attention : la note destination " + dest.name + " n'est plus adhérente.", + "danger", 30000); + if (!isNaN(source.note.balance)) { let newBalance = source.note.balance - source.quantity * dest.quantity * amount; if (newBalance <= -5000) { @@ -327,19 +334,22 @@ $("#btn_transfer").click(function() { } else if ($("#type_credit").is(':checked') || $("#type_debit").is(':checked')) { let special_note = $("#credit_type").val(); let user_note; + let alias; let given_reason = reason; let source_id, dest_id; if ($("#type_credit").is(':checked')) { - user_note = dests_notes_display[0].note.id; + user_note = dests_notes_display[0].note; + alias = dests_notes_display[0].name; source_id = special_note; - dest_id = user_note; + dest_id = user_note.id; reason = "Crédit " + $("#credit_type option:selected").text().toLowerCase(); if (given_reason.length > 0) reason += " (" + given_reason + ")"; } else { - user_note = sources_notes_display[0].note.id; - source_id = user_note; + user_note = sources_notes_display[0].note; + alias = sources_notes_display[0].name; + source_id = user_note.id; dest_id = special_note; reason = "Retrait " + $("#credit_type option:selected").text().toLowerCase(); if (given_reason.length > 0) @@ -355,14 +365,16 @@ $("#btn_transfer").click(function() { "polymorphic_ctype": SPECIAL_TRANSFER_POLYMORPHIC_CTYPE, "resourcetype": "SpecialTransaction", "source": source_id, - "source_alias": sources_notes_display.length ? sources_notes_display[0].name : null, + "source_alias": sources_notes_display.length ? alias : null, "destination": dest_id, - "destination_alias": dests_notes_display.length ? dests_notes_display[0].name : null, + "destination_alias": dests_notes_display.length ? alias : null, "last_name": $("#last_name").val(), "first_name": $("#first_name").val(), "bank": $("#bank").val() }).done(function () { addMsg("Le crédit/retrait a bien été effectué !", "success", 10000); + if (user_note.membership && user_note.membership.date_end > new Date().toISOString()) + addMsg("Attention : la note " + alias + " n'est plus adhérente.", "danger", 10000); reset(); }).fail(function (err) { let errObj = JSON.parse(err.responseText); From 24ac3ce45f51cc890678f6c855ef61f2baf76784 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 21:07:31 +0200 Subject: [PATCH 044/319] Display users that have surnormal roles --- apps/permission/tables.py | 51 ++++++++++ apps/permission/views.py | 15 +++ locale/de/LC_MESSAGES/django.po | 142 ++++++++++++++------------- locale/fr/LC_MESSAGES/django.po | 142 ++++++++++++++------------- templates/permission/all_rights.html | 10 ++ 5 files changed, 226 insertions(+), 134 deletions(-) create mode 100644 apps/permission/tables.py diff --git a/apps/permission/tables.py b/apps/permission/tables.py new file mode 100644 index 00000000..7a07bd6a --- /dev/null +++ b/apps/permission/tables.py @@ -0,0 +1,51 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +import django_tables2 as tables +from django.urls import reverse_lazy +from django.utils.html import format_html + +from member.models import Membership +from note_kfet.middlewares import get_current_authenticated_user +from permission.backends import PermissionBackend + + +class RightsTable(tables.Table): + """ + List managers of a club. + """ + + def render_user(self, value): + # If the user has the right, link the displayed user with the page of its detail. + s = value.username + if PermissionBackend.check_perm(get_current_authenticated_user(), "auth.view_user", value): + s = format_html("{name}", + url=reverse_lazy('member:user_detail', kwargs={"pk": value.pk}), name=s) + return s + + def render_club(self, value): + # If the user has the right, link the displayed user with the page of its detail. + s = value.name + if PermissionBackend.check_perm(get_current_authenticated_user(), "member.view_club", value): + s = format_html("{name}", + url=reverse_lazy('member:club_detail', kwargs={"pk": value.pk}), name=s) + + return s + + def render_roles(self, record): + # If the user has the right to manage the roles, display the link to manage them + roles = record.roles.all() + s = ", ".join(str(role) for role in roles) + if PermissionBackend.check_perm(get_current_authenticated_user(), "member.change_membership_roles", record): + s = format_html("" + s + "") + return s + + class Meta: + attrs = { + 'class': 'table table-condensed table-striped table-hover', + 'style': 'table-layout: fixed;' + } + template_name = 'django_tables2/bootstrap4.html' + fields = ('user.last_name', 'user.first_name', 'user', 'club', 'roles', ) + model = Membership diff --git a/apps/permission/views.py b/apps/permission/views.py index 9132e5f0..113f0443 100644 --- a/apps/permission/views.py +++ b/apps/permission/views.py @@ -2,13 +2,16 @@ # SPDX-License-Identifier: GPL-3.0-or-later from datetime import date +from django.db.models import Q from django.forms import HiddenInput +from django.utils import timezone from django.utils.translation import gettext_lazy as _ from django.views.generic import UpdateView, TemplateView from member.models import Membership from .backends import PermissionBackend from .models import Role +from .tables import RightsTable class ProtectQuerysetMixin: @@ -59,4 +62,16 @@ class RightsView(TemplateView): for role in roles: role.clubs = [membership.club for membership in active_memberships if role in membership.roles.all()] + if self.request.user.is_authenticated: + special_memberships = Membership.objects.filter( + date_start__lte=timezone.now().date(), + date_end__gte=timezone.now().date(), + ).filter(roles__in=Role.objects.filter(~(Q(name="Adhérent BDE") + | Q(name="Adhérent Kfet") + | Q(name="Membre de club") + | Q(name="Adhérent WEI") + | Q(name="1A")))).order_by("club", "user__last_name")\ + .distinct().all() + context["special_memberships_table"] = RightsTable(special_memberships) + return context diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 80397341..57663f94 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 16:49+0200\n" +"POT-Creation-Date: 2020-08-05 21:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,7 +46,7 @@ msgstr "" #: apps/activity/models.py:24 apps/activity/models.py:49 #: apps/member/models.py:162 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:284 apps/permission/models.py:339 +#: apps/note/models/transactions.py:298 apps/permission/models.py:332 #: apps/wei/models.py:67 apps/wei/models.py:119 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -71,14 +71,14 @@ msgid "activity types" msgstr "" #: apps/activity/models.py:54 apps/note/models/transactions.py:81 -#: apps/permission/models.py:120 apps/permission/models.py:199 +#: apps/permission/models.py:113 apps/permission/models.py:192 #: apps/wei/models.py:73 apps/wei/models.py:130 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "" #: apps/activity/models.py:61 apps/note/models/notes.py:188 -#: apps/note/models/transactions.py:66 apps/permission/models.py:174 +#: apps/note/models/transactions.py:66 apps/permission/models.py:167 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "" @@ -187,13 +187,13 @@ msgid "Type" msgstr "" #: apps/activity/tables.py:77 apps/member/forms.py:103 -#: apps/registration/forms.py:70 apps/treasury/forms.py:126 +#: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "" #: apps/activity/tables.py:79 apps/member/forms.py:108 -#: apps/registration/forms.py:75 apps/treasury/forms.py:128 +#: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" msgstr "" @@ -242,7 +242,7 @@ msgstr "" msgid "IP Address" msgstr "" -#: apps/logs/models.py:36 apps/permission/models.py:144 +#: apps/logs/models.py:36 apps/permission/models.py:137 msgid "model" msgstr "" @@ -268,7 +268,7 @@ msgid "edit" msgstr "" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:137 apps/wei/tables.py:73 +#: apps/permission/models.py:130 apps/wei/tables.py:73 msgid "delete" msgstr "" @@ -347,7 +347,7 @@ msgid "Credit amount" msgstr "" #: apps/member/forms.py:113 apps/registration/forms.py:80 -#: apps/treasury/forms.py:130 apps/wei/forms/registration.py:105 +#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:105 #: templates/note/transaction_form.html:135 msgid "Bank" msgstr "" @@ -871,68 +871,68 @@ msgid "" "The note balances must be between - 21 474 836.47 € and 21 474 836.47 €." msgstr "" -#: apps/note/models/transactions.py:208 +#: apps/note/models/transactions.py:214 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." msgstr "" -#: apps/note/models/transactions.py:246 +#: apps/note/models/transactions.py:260 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 #: templates/note/transaction_form.html:143 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:270 +#: apps/note/models/transactions.py:284 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:273 +#: apps/note/models/transactions.py:287 msgid "recurrent transaction" msgstr "" -#: apps/note/models/transactions.py:274 +#: apps/note/models/transactions.py:288 msgid "recurrent transactions" msgstr "" -#: apps/note/models/transactions.py:289 +#: apps/note/models/transactions.py:303 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:294 +#: apps/note/models/transactions.py:308 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:300 +#: apps/note/models/transactions.py:314 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:300 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:314 templates/note/transaction_form.html:24 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:311 +#: apps/note/models/transactions.py:325 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" msgstr "" -#: apps/note/models/transactions.py:315 +#: apps/note/models/transactions.py:329 msgid "Special transaction" msgstr "" -#: apps/note/models/transactions.py:316 +#: apps/note/models/transactions.py:330 msgid "Special transactions" msgstr "" -#: apps/note/models/transactions.py:332 apps/note/models/transactions.py:337 +#: apps/note/models/transactions.py:346 apps/note/models/transactions.py:351 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:333 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:347 apps/treasury/models.py:228 msgid "membership transactions" msgstr "" @@ -955,7 +955,7 @@ msgid "Delete" msgstr "" #: apps/note/tables.py:162 apps/wei/tables.py:46 apps/wei/tables.py:47 -#: templates/member/club_info.html:67 templates/note/conso_form.html:128 +#: templates/member/club_info.html:67 templates/note/conso_form.html:130 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 msgid "Edit" @@ -985,79 +985,79 @@ msgstr "" msgid "Search transactions" msgstr "" -#: apps/permission/models.py:99 +#: apps/permission/models.py:92 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:101 +#: apps/permission/models.py:94 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:114 +#: apps/permission/models.py:107 msgid "rank" msgstr "" -#: apps/permission/models.py:127 +#: apps/permission/models.py:120 msgid "permission mask" msgstr "" -#: apps/permission/models.py:128 +#: apps/permission/models.py:121 msgid "permission masks" msgstr "" -#: apps/permission/models.py:134 +#: apps/permission/models.py:127 msgid "add" msgstr "" -#: apps/permission/models.py:135 +#: apps/permission/models.py:128 msgid "view" msgstr "" -#: apps/permission/models.py:136 +#: apps/permission/models.py:129 msgid "change" msgstr "" -#: apps/permission/models.py:168 +#: apps/permission/models.py:161 msgid "query" msgstr "" -#: apps/permission/models.py:181 +#: apps/permission/models.py:174 msgid "mask" msgstr "" -#: apps/permission/models.py:187 +#: apps/permission/models.py:180 msgid "field" msgstr "" -#: apps/permission/models.py:192 +#: apps/permission/models.py:185 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." msgstr "" -#: apps/permission/models.py:193 templates/permission/all_rights.html:26 +#: apps/permission/models.py:186 templates/permission/all_rights.html:36 msgid "permanent" msgstr "" -#: apps/permission/models.py:204 +#: apps/permission/models.py:197 msgid "permission" msgstr "" -#: apps/permission/models.py:205 apps/permission/models.py:344 +#: apps/permission/models.py:198 apps/permission/models.py:337 msgid "permissions" msgstr "" -#: apps/permission/models.py:210 +#: apps/permission/models.py:203 msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/permission/models.py:349 +#: apps/permission/models.py:342 msgid "for club" msgstr "" -#: apps/permission/models.py:359 apps/permission/models.py:360 +#: apps/permission/models.py:352 apps/permission/models.py:353 msgid "role permissions" msgstr "" @@ -1082,11 +1082,11 @@ msgid "" "{model_name}." msgstr "" -#: apps/permission/views.py:44 templates/base.html:129 +#: apps/permission/views.py:47 templates/base.html:129 msgid "Rights" msgstr "" -#: apps/permission/views.py:49 +#: apps/permission/views.py:52 msgid "All rights" msgstr "" @@ -1169,7 +1169,7 @@ msgstr "" msgid "Treasury" msgstr "" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:138 +#: apps/treasury/forms.py:88 apps/treasury/forms.py:142 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 @@ -1181,19 +1181,19 @@ msgstr "" msgid "Submit" msgstr "" -#: apps/treasury/forms.py:86 +#: apps/treasury/forms.py:90 msgid "Close" msgstr "" -#: apps/treasury/forms.py:95 +#: apps/treasury/forms.py:99 msgid "Remittance is already closed." msgstr "" -#: apps/treasury/forms.py:100 +#: apps/treasury/forms.py:104 msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:120 apps/treasury/models.py:207 +#: apps/treasury/forms.py:124 apps/treasury/models.py:207 #: apps/treasury/tables.py:77 apps/treasury/tables.py:85 #: templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 @@ -1201,11 +1201,11 @@ msgstr "" msgid "Remittance" msgstr "" -#: apps/treasury/forms.py:121 +#: apps/treasury/forms.py:125 msgid "No attached remittance" msgstr "" -#: apps/treasury/forms.py:132 apps/treasury/tables.py:47 +#: apps/treasury/forms.py:136 apps/treasury/tables.py:47 #: apps/treasury/tables.py:115 templates/note/transaction_form.html:97 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -1388,15 +1388,15 @@ msgstr "" msgid "Update a remittance" msgstr "" -#: apps/treasury/views.py:301 +#: apps/treasury/views.py:299 msgid "Attach a transaction to a remittance" msgstr "" -#: apps/treasury/views.py:345 +#: apps/treasury/views.py:343 msgid "List of credits from the Société générale" msgstr "" -#: apps/treasury/views.py:379 +#: apps/treasury/views.py:377 msgid "Manage credits from the Société générale" msgstr "" @@ -2023,36 +2023,36 @@ msgstr "" msgid "Registrations" msgstr "" -#: templates/note/conso_form.html:28 +#: templates/note/conso_form.html:30 msgid "Consum" msgstr "" -#: templates/note/conso_form.html:39 templates/note/transaction_form.html:57 +#: templates/note/conso_form.html:41 templates/note/transaction_form.html:57 #: templates/note/transaction_form.html:78 msgid "Name or alias..." msgstr "" -#: templates/note/conso_form.html:48 +#: templates/note/conso_form.html:50 msgid "Select consumptions" msgstr "" -#: templates/note/conso_form.html:57 +#: templates/note/conso_form.html:59 msgid "Consume!" msgstr "" -#: templates/note/conso_form.html:71 +#: templates/note/conso_form.html:73 msgid "Highlighted buttons" msgstr "" -#: templates/note/conso_form.html:134 +#: templates/note/conso_form.html:136 msgid "Single consumptions" msgstr "" -#: templates/note/conso_form.html:139 +#: templates/note/conso_form.html:141 msgid "Double consumptions" msgstr "" -#: templates/note/conso_form.html:150 templates/note/transaction_form.html:154 +#: templates/note/conso_form.html:152 templates/note/transaction_form.html:154 msgid "Recent transactions history" msgstr "" @@ -2112,23 +2112,31 @@ msgstr "" msgid "Unable to delete button " msgstr "" -#: templates/permission/all_rights.html:10 +#: templates/permission/all_rights.html:8 +msgid "Users that have surnormal rights" +msgstr "" + +#: templates/permission/all_rights.html:14 +msgid "Roles description" +msgstr "" + +#: templates/permission/all_rights.html:19 msgid "Filter with roles that I have in at least one club" msgstr "" -#: templates/permission/all_rights.html:21 +#: templates/permission/all_rights.html:31 msgid "Own this role in the clubs" msgstr "" -#: templates/permission/all_rights.html:26 +#: templates/permission/all_rights.html:36 msgid "Mask:" msgstr "" -#: templates/permission/all_rights.html:26 +#: templates/permission/all_rights.html:36 msgid "Query:" msgstr "" -#: templates/permission/all_rights.html:28 +#: templates/permission/all_rights.html:38 msgid "No associated permission" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index b87eaa1d..ac678a93 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 16:49+0200\n" +"POT-Creation-Date: 2020-08-05 21:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité." #: apps/activity/models.py:24 apps/activity/models.py:49 #: apps/member/models.py:162 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:284 apps/permission/models.py:339 +#: apps/note/models/transactions.py:298 apps/permission/models.py:332 #: apps/wei/models.py:67 apps/wei/models.py:119 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -72,14 +72,14 @@ msgid "activity types" msgstr "types d'activité" #: apps/activity/models.py:54 apps/note/models/transactions.py:81 -#: apps/permission/models.py:120 apps/permission/models.py:199 +#: apps/permission/models.py:113 apps/permission/models.py:192 #: apps/wei/models.py:73 apps/wei/models.py:130 #: templates/activity/activity_detail.html:16 msgid "description" msgstr "description" #: apps/activity/models.py:61 apps/note/models/notes.py:188 -#: apps/note/models/transactions.py:66 apps/permission/models.py:174 +#: apps/note/models/transactions.py:66 apps/permission/models.py:167 #: templates/activity/activity_detail.html:19 msgid "type" msgstr "type" @@ -188,13 +188,13 @@ msgid "Type" msgstr "Type" #: apps/activity/tables.py:77 apps/member/forms.py:103 -#: apps/registration/forms.py:70 apps/treasury/forms.py:126 +#: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:79 apps/member/forms.py:108 -#: apps/registration/forms.py:75 apps/treasury/forms.py:128 +#: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" msgstr "Prénom" @@ -243,7 +243,7 @@ msgstr "Logs" msgid "IP Address" msgstr "Adresse IP" -#: apps/logs/models.py:36 apps/permission/models.py:144 +#: apps/logs/models.py:36 apps/permission/models.py:137 msgid "model" msgstr "Modèle" @@ -269,7 +269,7 @@ msgid "edit" msgstr "Modifier" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:137 apps/wei/tables.py:73 +#: apps/permission/models.py:130 apps/wei/tables.py:73 msgid "delete" msgstr "Supprimer" @@ -348,7 +348,7 @@ msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:113 apps/registration/forms.py:80 -#: apps/treasury/forms.py:130 apps/wei/forms/registration.py:105 +#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:105 #: templates/note/transaction_form.html:135 msgid "Bank" msgstr "Banque" @@ -881,7 +881,7 @@ msgstr "" "Les montants des notes doivent se trouver entre - 21 474 836.47 € et 21 474 " "836.47 €. Ne cherchez pas à capitaliser l'argent du BDE." -#: apps/note/models/transactions.py:208 +#: apps/note/models/transactions.py:214 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." @@ -889,44 +889,44 @@ msgstr "" "La transaction ne peut pas être sauvegardée puisque la note source ou la " "note de destination n'est pas active." -#: apps/note/models/transactions.py:246 +#: apps/note/models/transactions.py:260 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 #: templates/note/transaction_form.html:143 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:270 +#: apps/note/models/transactions.py:284 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:273 +#: apps/note/models/transactions.py:287 msgid "recurrent transaction" msgstr "Transaction issue de bouton" -#: apps/note/models/transactions.py:274 +#: apps/note/models/transactions.py:288 msgid "recurrent transactions" msgstr "Transactions issues de boutons" -#: apps/note/models/transactions.py:289 +#: apps/note/models/transactions.py:303 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:294 +#: apps/note/models/transactions.py:308 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:300 +#: apps/note/models/transactions.py:314 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:300 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:314 templates/note/transaction_form.html:24 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:311 +#: apps/note/models/transactions.py:325 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -934,19 +934,19 @@ 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:315 +#: apps/note/models/transactions.py:329 msgid "Special transaction" msgstr "Transaction de crédit/retrait" -#: apps/note/models/transactions.py:316 +#: apps/note/models/transactions.py:330 msgid "Special transactions" msgstr "Transactions de crédit/retrait" -#: apps/note/models/transactions.py:332 apps/note/models/transactions.py:337 +#: apps/note/models/transactions.py:346 apps/note/models/transactions.py:351 msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:333 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:347 apps/treasury/models.py:228 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -969,7 +969,7 @@ msgid "Delete" msgstr "Supprimer" #: apps/note/tables.py:162 apps/wei/tables.py:46 apps/wei/tables.py:47 -#: templates/member/club_info.html:67 templates/note/conso_form.html:128 +#: templates/member/club_info.html:67 templates/note/conso_form.html:130 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 msgid "Edit" @@ -999,53 +999,53 @@ msgstr "Consommations" msgid "Search transactions" msgstr "Rechercher des transactions" -#: apps/permission/models.py:99 +#: apps/permission/models.py:92 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "Can {type} {model}.{field} in {query}" -#: apps/permission/models.py:101 +#: apps/permission/models.py:94 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "Can {type} {model} in {query}" -#: apps/permission/models.py:114 +#: apps/permission/models.py:107 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:127 +#: apps/permission/models.py:120 msgid "permission mask" msgstr "masque de permissions" -#: apps/permission/models.py:128 +#: apps/permission/models.py:121 msgid "permission masks" msgstr "masques de permissions" -#: apps/permission/models.py:134 +#: apps/permission/models.py:127 msgid "add" msgstr "ajouter" -#: apps/permission/models.py:135 +#: apps/permission/models.py:128 msgid "view" msgstr "voir" -#: apps/permission/models.py:136 +#: apps/permission/models.py:129 msgid "change" msgstr "modifier" -#: apps/permission/models.py:168 +#: apps/permission/models.py:161 msgid "query" msgstr "requête" -#: apps/permission/models.py:181 +#: apps/permission/models.py:174 msgid "mask" msgstr "masque" -#: apps/permission/models.py:187 +#: apps/permission/models.py:180 msgid "field" msgstr "champ" -#: apps/permission/models.py:192 +#: apps/permission/models.py:185 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." @@ -1053,29 +1053,29 @@ msgstr "" "Indique si la permission doit être attribuée même si l'adhésion de " "l'utilisateur est expirée." -#: apps/permission/models.py:193 templates/permission/all_rights.html:26 +#: apps/permission/models.py:186 templates/permission/all_rights.html:36 msgid "permanent" msgstr "permanent" -#: apps/permission/models.py:204 +#: apps/permission/models.py:197 msgid "permission" msgstr "permission" -#: apps/permission/models.py:205 apps/permission/models.py:344 +#: apps/permission/models.py:198 apps/permission/models.py:337 msgid "permissions" msgstr "permissions" -#: apps/permission/models.py:210 +#: apps/permission/models.py:203 msgid "Specifying field applies only to view and change permission types." msgstr "" "Spécifie le champ concerné, ne fonctionne que pour les permissions view et " "change." -#: apps/permission/models.py:349 +#: apps/permission/models.py:342 msgid "for club" msgstr "s'applique au club" -#: apps/permission/models.py:359 apps/permission/models.py:360 +#: apps/permission/models.py:352 apps/permission/models.py:353 msgid "role permissions" msgstr "Permissions par rôles" @@ -1106,11 +1106,11 @@ msgstr "" "Vous n'avez pas la permission de supprimer cette instance du modèle " "{app_label}.{model_name}." -#: apps/permission/views.py:44 templates/base.html:129 +#: apps/permission/views.py:47 templates/base.html:129 msgid "Rights" msgstr "Droits" -#: apps/permission/views.py:49 +#: apps/permission/views.py:52 msgid "All rights" msgstr "Tous les droits" @@ -1198,7 +1198,7 @@ msgstr "Invalider l'inscription" msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:84 apps/treasury/forms.py:138 +#: apps/treasury/forms.py:88 apps/treasury/forms.py:142 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 @@ -1210,19 +1210,19 @@ msgstr "Trésorerie" msgid "Submit" msgstr "Envoyer" -#: apps/treasury/forms.py:86 +#: apps/treasury/forms.py:90 msgid "Close" msgstr "Fermer" -#: apps/treasury/forms.py:95 +#: apps/treasury/forms.py:99 msgid "Remittance is already closed." msgstr "La remise est déjà fermée." -#: apps/treasury/forms.py:100 +#: apps/treasury/forms.py:104 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:120 apps/treasury/models.py:207 +#: apps/treasury/forms.py:124 apps/treasury/models.py:207 #: apps/treasury/tables.py:77 apps/treasury/tables.py:85 #: templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 @@ -1230,11 +1230,11 @@ msgstr "Vous ne pouvez pas changer le type de la remise." msgid "Remittance" msgstr "Remise" -#: apps/treasury/forms.py:121 +#: apps/treasury/forms.py:125 msgid "No attached remittance" msgstr "Pas de remise associée" -#: apps/treasury/forms.py:132 apps/treasury/tables.py:47 +#: apps/treasury/forms.py:136 apps/treasury/tables.py:47 #: apps/treasury/tables.py:115 templates/note/transaction_form.html:97 #: templates/treasury/remittance_form.html:18 msgid "Amount" @@ -1419,15 +1419,15 @@ msgstr "Liste des remises" msgid "Update a remittance" msgstr "Modifier la remise" -#: apps/treasury/views.py:301 +#: apps/treasury/views.py:299 msgid "Attach a transaction to a remittance" msgstr "Joindre une transaction à une remise" -#: apps/treasury/views.py:345 +#: apps/treasury/views.py:343 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:379 +#: apps/treasury/views.py:377 msgid "Manage credits from the Société générale" msgstr "Gérer les crédits de la Société générale" @@ -2090,36 +2090,36 @@ msgstr "Il n'y a pas d'utilisateur trouvé avec cette entrée." msgid "Registrations" msgstr "Inscriptions" -#: templates/note/conso_form.html:28 +#: templates/note/conso_form.html:30 msgid "Consum" msgstr "Consommer" -#: templates/note/conso_form.html:39 templates/note/transaction_form.html:57 +#: templates/note/conso_form.html:41 templates/note/transaction_form.html:57 #: templates/note/transaction_form.html:78 msgid "Name or alias..." msgstr "Pseudo ou alias ..." -#: templates/note/conso_form.html:48 +#: templates/note/conso_form.html:50 msgid "Select consumptions" msgstr "Sélection des consommations" -#: templates/note/conso_form.html:57 +#: templates/note/conso_form.html:59 msgid "Consume!" msgstr "Consommer !" -#: templates/note/conso_form.html:71 +#: templates/note/conso_form.html:73 msgid "Highlighted buttons" msgstr "Boutons mis en avant" -#: templates/note/conso_form.html:134 +#: templates/note/conso_form.html:136 msgid "Single consumptions" msgstr "Consommations simples" -#: templates/note/conso_form.html:139 +#: templates/note/conso_form.html:141 msgid "Double consumptions" msgstr "Consommations doubles" -#: templates/note/conso_form.html:150 templates/note/transaction_form.html:154 +#: templates/note/conso_form.html:152 templates/note/transaction_form.html:154 msgid "Recent transactions history" msgstr "Historique des transactions récentes" @@ -2179,23 +2179,31 @@ msgstr "Le bouton a bien été supprimé" msgid "Unable to delete button " msgstr "Impossible de supprimer le bouton " -#: templates/permission/all_rights.html:10 +#: templates/permission/all_rights.html:8 +msgid "Users that have surnormal rights" +msgstr "Liste des utilisateurs ayant des droits surnormaux" + +#: templates/permission/all_rights.html:14 +msgid "Roles description" +msgstr "Description de tous les rôles" + +#: templates/permission/all_rights.html:19 msgid "Filter with roles that I have in at least one club" msgstr "Filtrer les rôles que je possède dans au moins un club" -#: templates/permission/all_rights.html:21 +#: templates/permission/all_rights.html:31 msgid "Own this role in the clubs" msgstr "Possède ce rôle dans les clubs" -#: templates/permission/all_rights.html:26 +#: templates/permission/all_rights.html:36 msgid "Mask:" msgstr "Masque :" -#: templates/permission/all_rights.html:26 +#: templates/permission/all_rights.html:36 msgid "Query:" msgstr "Requête :" -#: templates/permission/all_rights.html:28 +#: templates/permission/all_rights.html:38 msgid "No associated permission" msgstr "Pas de permission associée" diff --git a/templates/permission/all_rights.html b/templates/permission/all_rights.html index 9bb6faf5..827532f9 100644 --- a/templates/permission/all_rights.html +++ b/templates/permission/all_rights.html @@ -1,8 +1,17 @@ {% extends "base.html" %} {% load i18n %} +{% load render_table from django_tables2 %} {% block content %} + {% if user.is_authenticated %} +

      {% trans "Users that have surnormal rights" %}

      + {% render_table special_memberships_table %} + +
      + {% endif %} + +

      {% trans "Roles description" %}

      {% if user.is_authenticated %}
      {% endif %} +
        {% regroup active_memberships by roles as memberships_per_role %} {% for role in roles %} From 33806967c864e0b80194506caa28c3925167ef78 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 23:19:17 +0200 Subject: [PATCH 045/319] Prepare weekly reports --- apps/member/admin.py | 2 +- apps/member/forms.py | 1 + apps/member/models.py | 11 ++ apps/member/views.py | 2 + apps/registration/views.py | 2 + apps/scripts | 2 +- locale/de/LC_MESSAGES/django.po | 208 +++++++++++++----------- locale/fr/LC_MESSAGES/django.po | 208 +++++++++++++----------- templates/note/mails/weekly_report.html | 17 +- 9 files changed, 254 insertions(+), 199 deletions(-) diff --git a/apps/member/admin.py b/apps/member/admin.py index bd29557b..4cc2d0bf 100644 --- a/apps/member/admin.py +++ b/apps/member/admin.py @@ -17,6 +17,7 @@ class ProfileInline(admin.StackedInline): Inline user profile in user admin """ model = Profile + form = ProfileForm can_delete = False @@ -25,7 +26,6 @@ class CustomUserAdmin(UserAdmin): inlines = (ProfileInline,) list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff') list_select_related = ('profile',) - form = ProfileForm def get_inline_instances(self, request, obj=None): """ diff --git a/apps/member/forms.py b/apps/member/forms.py index 58285b79..c8e405ac 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -37,6 +37,7 @@ class ProfileForm(forms.ModelForm): """ A form for the extras field provided by the :model:`member.Profile` model. """ + last_report = forms.DateField(required=False, disabled=True, label=_("Last report date")) def save(self, commit=True): if not self.instance.section or (("department" in self.changed_data diff --git a/apps/member/models.py b/apps/member/models.py index e5ec1572..70745f08 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -11,6 +11,7 @@ from django.db import models from django.db.models import Q from django.template import loader from django.urls import reverse, reverse_lazy +from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.utils.translation import gettext_lazy as _ @@ -92,6 +93,16 @@ class Profile(models.Model): default=False, ) + report_frequency = models.PositiveSmallIntegerField( + verbose_name=_("report frequency (in days)"), + default=0, + ) + + last_report = models.DateField( + verbose_name=_("last report date"), + default=timezone.now, + ) + email_confirmed = models.BooleanField( verbose_name=_("email confirmed"), default=False, diff --git a/apps/member/views.py b/apps/member/views.py index 82d2cf32..7720c097 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -71,6 +71,8 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): context['profile_form'] = self.profile_form(instance=context['user_object'].profile, data=self.request.POST if self.request.POST else None) + if not self.object.profile.report_frequency: + del context['profile_form'].fields["last_report"] return context diff --git a/apps/registration/views.py b/apps/registration/views.py index 41a9a405..42d9ffc7 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -41,6 +41,8 @@ class UserCreateView(CreateView): context = super().get_context_data(**kwargs) context["profile_form"] = self.second_form(self.request.POST if self.request.POST else None) del context["profile_form"].fields["section"] + del context["profile_form"].fields["report_frequency"] + del context["profile_form"].fields["last_report"] return context diff --git a/apps/scripts b/apps/scripts index 034d8c43..31dc478b 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 034d8c43b663ac3a33f6e3d06bcdcbbeea0bc517 +Subproject commit 31dc478b7a2ebc26ab9c2b46c13f4d51aed595bc diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 57663f94..a9240ee5 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 21:06+0200\n" +"POT-Creation-Date: 2020-08-05 23:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,7 +44,7 @@ msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:24 apps/activity/models.py:49 -#: apps/member/models.py:162 apps/note/models/notes.py:212 +#: apps/member/models.py:173 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 #: apps/note/models/transactions.py:298 apps/permission/models.py:332 #: apps/wei/models.py:67 apps/wei/models.py:119 @@ -83,7 +83,7 @@ msgstr "" msgid "type" msgstr "" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:270 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:281 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 #: apps/wei/models.py:161 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -186,13 +186,13 @@ msgstr "" msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/member/forms.py:103 +#: apps/activity/tables.py:77 apps/member/forms.py:104 #: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/member/forms.py:108 +#: apps/activity/tables.py:79 apps/member/forms.py:109 #: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" @@ -292,21 +292,21 @@ msgstr "" msgid "changelogs" msgstr "" -#: apps/member/admin.py:52 apps/member/models.py:189 +#: apps/member/admin.py:52 apps/member/models.py:200 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "" -#: apps/member/admin.py:53 apps/member/models.py:194 +#: apps/member/admin.py:53 apps/member/models.py:205 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/admin.py:67 apps/member/models.py:281 +#: apps/member/admin.py:67 apps/member/models.py:292 msgid "roles" msgstr "" -#: apps/member/admin.py:68 apps/member/models.py:295 +#: apps/member/admin.py:68 apps/member/models.py:306 msgid "fee" msgstr "" @@ -314,260 +314,272 @@ msgstr "" msgid "member" msgstr "" -#: apps/member/forms.py:59 apps/member/views.py:84 +#: apps/member/forms.py:40 +msgid "Last report date" +msgstr "" + +#: apps/member/forms.py:60 apps/member/views.py:86 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/forms.py:82 apps/registration/forms.py:50 +#: apps/member/forms.py:83 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "" -#: apps/member/forms.py:84 apps/registration/forms.py:52 +#: apps/member/forms.py:85 apps/registration/forms.py:52 msgid "Check this case is the Société Générale paid the inscription." msgstr "" -#: apps/member/forms.py:89 apps/registration/forms.py:57 +#: apps/member/forms.py:90 apps/registration/forms.py:57 #: apps/wei/forms/registration.py:82 msgid "Credit type" msgstr "" -#: apps/member/forms.py:90 apps/registration/forms.py:58 +#: apps/member/forms.py:91 apps/registration/forms.py:58 #: apps/wei/forms/registration.py:83 msgid "No credit" msgstr "" -#: apps/member/forms.py:92 +#: apps/member/forms.py:93 msgid "You can credit the note of the user." msgstr "" -#: apps/member/forms.py:96 apps/registration/forms.py:63 +#: apps/member/forms.py:97 apps/registration/forms.py:63 #: apps/wei/forms/registration.py:88 msgid "Credit amount" msgstr "" -#: apps/member/forms.py:113 apps/registration/forms.py:80 +#: apps/member/forms.py:114 apps/registration/forms.py:80 #: apps/treasury/forms.py:134 apps/wei/forms/registration.py:105 #: templates/note/transaction_form.html:135 msgid "Bank" msgstr "" -#: apps/member/forms.py:140 +#: apps/member/forms.py:141 msgid "User" msgstr "" -#: apps/member/forms.py:154 +#: apps/member/forms.py:155 msgid "Roles" msgstr "" -#: apps/member/models.py:38 +#: apps/member/models.py:39 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "" -#: apps/member/models.py:45 templates/member/profile_info.html:29 +#: apps/member/models.py:46 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "" -#: apps/member/models.py:46 +#: apps/member/models.py:47 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:54 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:55 templates/wei/weimembership_form.html:36 msgid "department" msgstr "" -#: apps/member/models.py:56 +#: apps/member/models.py:57 msgid "Informatics (A0)" msgstr "" -#: apps/member/models.py:57 +#: apps/member/models.py:58 msgid "Mathematics (A1)" msgstr "" -#: apps/member/models.py:58 +#: apps/member/models.py:59 msgid "Physics (A2)" msgstr "" -#: apps/member/models.py:59 +#: apps/member/models.py:60 msgid "Applied physics (A'2)" msgstr "" -#: apps/member/models.py:60 +#: apps/member/models.py:61 msgid "Chemistry (A''2)" msgstr "" -#: apps/member/models.py:61 +#: apps/member/models.py:62 msgid "Biology (A3)" msgstr "" -#: apps/member/models.py:62 +#: apps/member/models.py:63 msgid "SAPHIRE (B1234)" msgstr "" -#: apps/member/models.py:63 +#: apps/member/models.py:64 msgid "Mechanics (B1)" msgstr "" -#: apps/member/models.py:64 +#: apps/member/models.py:65 msgid "Civil engineering (B2)" msgstr "" -#: apps/member/models.py:65 +#: apps/member/models.py:66 msgid "Mechanical engineering (B3)" msgstr "" -#: apps/member/models.py:66 +#: apps/member/models.py:67 msgid "EEA (B4)" msgstr "" -#: apps/member/models.py:67 +#: apps/member/models.py:68 msgid "Design (C)" msgstr "" -#: apps/member/models.py:68 +#: apps/member/models.py:69 msgid "Economy-management (D2)" msgstr "" -#: apps/member/models.py:69 +#: apps/member/models.py:70 msgid "Social sciences (D3)" msgstr "" -#: apps/member/models.py:70 +#: apps/member/models.py:71 msgid "English (E)" msgstr "" -#: apps/member/models.py:71 +#: apps/member/models.py:72 msgid "External (EXT)" msgstr "" -#: apps/member/models.py:78 +#: apps/member/models.py:79 msgid "promotion" msgstr "" -#: apps/member/models.py:79 +#: apps/member/models.py:80 msgid "Year of entry to the school (None if not ENS student)" msgstr "" -#: apps/member/models.py:83 templates/member/profile_info.html:32 +#: apps/member/models.py:84 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "" -#: apps/member/models.py:90 +#: apps/member/models.py:91 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "" -#: apps/member/models.py:91 +#: apps/member/models.py:92 msgid "Tells if the user receive a salary." msgstr "" -#: apps/member/models.py:96 +#: apps/member/models.py:97 +msgid "report frequency (in days)" +msgstr "" + +#: apps/member/models.py:102 +msgid "last report date" +msgstr "" + +#: apps/member/models.py:107 msgid "email confirmed" msgstr "" -#: apps/member/models.py:101 +#: apps/member/models.py:112 msgid "registration valid" msgstr "" -#: apps/member/models.py:130 apps/member/models.py:131 +#: apps/member/models.py:141 apps/member/models.py:142 msgid "user profile" msgstr "" -#: apps/member/models.py:138 +#: apps/member/models.py:149 msgid "Activate your Note Kfet account" msgstr "" -#: apps/member/models.py:167 templates/member/club_info.html:57 +#: apps/member/models.py:178 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "" -#: apps/member/models.py:174 +#: apps/member/models.py:185 msgid "parent club" msgstr "" -#: apps/member/models.py:183 +#: apps/member/models.py:194 msgid "require memberships" msgstr "" -#: apps/member/models.py:184 +#: apps/member/models.py:195 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:200 templates/member/club_info.html:33 +#: apps/member/models.py:211 templates/member/club_info.html:33 msgid "membership duration" msgstr "" -#: apps/member/models.py:201 +#: apps/member/models.py:212 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:208 templates/member/club_info.html:23 +#: apps/member/models.py:219 templates/member/club_info.html:23 msgid "membership start" msgstr "" -#: apps/member/models.py:209 +#: apps/member/models.py:220 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:216 templates/member/club_info.html:28 +#: apps/member/models.py:227 templates/member/club_info.html:28 msgid "membership end" msgstr "" -#: apps/member/models.py:217 +#: apps/member/models.py:228 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:251 apps/member/models.py:276 +#: apps/member/models.py:262 apps/member/models.py:287 #: apps/note/models/notes.py:163 msgid "club" msgstr "" -#: apps/member/models.py:252 +#: apps/member/models.py:263 msgid "clubs" msgstr "" -#: apps/member/models.py:286 +#: apps/member/models.py:297 msgid "membership starts on" msgstr "" -#: apps/member/models.py:290 +#: apps/member/models.py:301 msgid "membership ends on" msgstr "" -#: apps/member/models.py:342 +#: apps/member/models.py:353 #, python-brace-format msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:353 apps/member/views.py:588 +#: apps/member/models.py:364 apps/member/views.py:590 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:400 +#: apps/member/models.py:411 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:453 +#: apps/member/models.py:464 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:456 +#: apps/member/models.py:467 msgid "membership" msgstr "" -#: apps/member/models.py:457 +#: apps/member/models.py:468 msgid "memberships" msgstr "" @@ -585,71 +597,71 @@ msgstr "" msgid "This address must be valid." msgstr "" -#: apps/member/views.py:133 +#: apps/member/views.py:135 msgid "Profile detail" msgstr "" -#: apps/member/views.py:167 +#: apps/member/views.py:169 msgid "Search user" msgstr "" -#: apps/member/views.py:201 apps/member/views.py:387 +#: apps/member/views.py:203 apps/member/views.py:389 msgid "Note aliases" msgstr "" -#: apps/member/views.py:215 +#: apps/member/views.py:217 msgid "Update note picture" msgstr "" -#: apps/member/views.py:273 templates/member/profile_info.html:43 +#: apps/member/views.py:275 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "" -#: apps/member/views.py:301 +#: apps/member/views.py:303 msgid "Create new club" msgstr "" -#: apps/member/views.py:313 +#: apps/member/views.py:315 msgid "Search club" msgstr "" -#: apps/member/views.py:338 +#: apps/member/views.py:340 msgid "Club detail" msgstr "" -#: apps/member/views.py:404 +#: apps/member/views.py:406 msgid "Update club" msgstr "" -#: apps/member/views.py:438 +#: apps/member/views.py:440 msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:579 apps/wei/views.py:862 +#: apps/member/views.py:581 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:592 +#: apps/member/views.py:594 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:597 +#: apps/member/views.py:599 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:614 apps/member/views.py:616 apps/member/views.py:618 -#: apps/registration/views.py:290 apps/registration/views.py:292 -#: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 +#: apps/member/views.py:616 apps/member/views.py:618 apps/member/views.py:620 +#: apps/registration/views.py:292 apps/registration/views.py:294 +#: apps/registration/views.py:296 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "" -#: apps/member/views.py:702 +#: apps/member/views.py:704 msgid "Manage roles of an user in the club" msgstr "" -#: apps/member/views.py:727 +#: apps/member/views.py:729 msgid "Members of the club" msgstr "" @@ -1116,52 +1128,52 @@ msgstr "" msgid "Register new user" msgstr "" -#: apps/registration/views.py:80 +#: apps/registration/views.py:82 msgid "Email validation" msgstr "" -#: apps/registration/views.py:82 +#: apps/registration/views.py:84 msgid "Validate email" msgstr "" -#: apps/registration/views.py:124 +#: apps/registration/views.py:126 msgid "Email validation unsuccessful" msgstr "" -#: apps/registration/views.py:135 +#: apps/registration/views.py:137 msgid "Email validation email sent" msgstr "" -#: apps/registration/views.py:143 +#: apps/registration/views.py:145 msgid "Resend email validation link" msgstr "" -#: apps/registration/views.py:161 +#: apps/registration/views.py:163 msgid "Pre-registered users list" msgstr "" -#: apps/registration/views.py:188 +#: apps/registration/views.py:190 msgid "Unregistered users" msgstr "" -#: apps/registration/views.py:201 +#: apps/registration/views.py:203 msgid "Registration detail" msgstr "" -#: apps/registration/views.py:256 +#: apps/registration/views.py:258 msgid "You must join the BDE." msgstr "" -#: apps/registration/views.py:278 +#: apps/registration/views.py:280 msgid "You must join BDE club before joining Kfet club." msgstr "" -#: apps/registration/views.py:283 +#: apps/registration/views.py:285 msgid "" "The entered amount is not enough for the memberships, should be at least {}" msgstr "" -#: apps/registration/views.py:358 +#: apps/registration/views.py:360 msgid "Invalidate pre-registration" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index ac678a93..4c65a5ac 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 21:06+0200\n" +"POT-Creation-Date: 2020-08-05 23:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,7 +45,7 @@ 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:24 apps/activity/models.py:49 -#: apps/member/models.py:162 apps/note/models/notes.py:212 +#: apps/member/models.py:173 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 #: apps/note/models/transactions.py:298 apps/permission/models.py:332 #: apps/wei/models.py:67 apps/wei/models.py:119 @@ -84,7 +84,7 @@ msgstr "description" msgid "type" msgstr "type" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:270 +#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:281 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 #: apps/wei/models.py:161 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -187,13 +187,13 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/member/forms.py:103 +#: apps/activity/tables.py:77 apps/member/forms.py:104 #: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/wei/forms/registration.py:95 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/member/forms.py:108 +#: apps/activity/tables.py:79 apps/member/forms.py:109 #: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 msgid "First name" @@ -293,21 +293,21 @@ msgstr "journal de modification" msgid "changelogs" msgstr "journaux de modifications" -#: apps/member/admin.py:52 apps/member/models.py:189 +#: apps/member/admin.py:52 apps/member/models.py:200 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/admin.py:53 apps/member/models.py:194 +#: apps/member/admin.py:53 apps/member/models.py:205 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:67 apps/member/models.py:281 +#: apps/member/admin.py:67 apps/member/models.py:292 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:68 apps/member/models.py:295 +#: apps/member/admin.py:68 apps/member/models.py:306 msgid "fee" msgstr "cotisation" @@ -315,217 +315,229 @@ msgstr "cotisation" msgid "member" msgstr "adhérent" -#: apps/member/forms.py:59 apps/member/views.py:84 +#: apps/member/forms.py:40 +msgid "Last report date" +msgstr "Date de dernier rapport" + +#: apps/member/forms.py:60 apps/member/views.py:86 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:82 apps/registration/forms.py:50 +#: apps/member/forms.py:83 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:84 apps/registration/forms.py:52 +#: apps/member/forms.py:85 apps/registration/forms.py:52 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:89 apps/registration/forms.py:57 +#: apps/member/forms.py:90 apps/registration/forms.py:57 #: apps/wei/forms/registration.py:82 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:90 apps/registration/forms.py:58 +#: apps/member/forms.py:91 apps/registration/forms.py:58 #: apps/wei/forms/registration.py:83 msgid "No credit" msgstr "Pas de rechargement" -#: apps/member/forms.py:92 +#: apps/member/forms.py:93 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:96 apps/registration/forms.py:63 +#: apps/member/forms.py:97 apps/registration/forms.py:63 #: apps/wei/forms/registration.py:88 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:113 apps/registration/forms.py:80 +#: apps/member/forms.py:114 apps/registration/forms.py:80 #: apps/treasury/forms.py:134 apps/wei/forms/registration.py:105 #: templates/note/transaction_form.html:135 msgid "Bank" msgstr "Banque" -#: apps/member/forms.py:140 +#: apps/member/forms.py:141 msgid "User" msgstr "Utilisateur" -#: apps/member/forms.py:154 +#: apps/member/forms.py:155 msgid "Roles" msgstr "Rôles" -#: apps/member/models.py:38 +#: apps/member/models.py:39 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:45 templates/member/profile_info.html:29 +#: apps/member/models.py:46 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "section" -#: apps/member/models.py:46 +#: apps/member/models.py:47 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:54 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:55 templates/wei/weimembership_form.html:36 msgid "department" msgstr "département" -#: apps/member/models.py:56 +#: apps/member/models.py:57 msgid "Informatics (A0)" msgstr "Informatique (A0)" -#: apps/member/models.py:57 +#: apps/member/models.py:58 msgid "Mathematics (A1)" msgstr "Mathématiques (A1)" -#: apps/member/models.py:58 +#: apps/member/models.py:59 msgid "Physics (A2)" msgstr "Physique (A2)" -#: apps/member/models.py:59 +#: apps/member/models.py:60 msgid "Applied physics (A'2)" msgstr "Physique appliquée (A'2)" -#: apps/member/models.py:60 +#: apps/member/models.py:61 msgid "Chemistry (A''2)" msgstr "Chimie (A''2)" -#: apps/member/models.py:61 +#: apps/member/models.py:62 msgid "Biology (A3)" msgstr "Biologie (A3)" -#: apps/member/models.py:62 +#: apps/member/models.py:63 msgid "SAPHIRE (B1234)" msgstr "SAPHIRE (B1234)" -#: apps/member/models.py:63 +#: apps/member/models.py:64 msgid "Mechanics (B1)" msgstr "Mécanique (B1)" -#: apps/member/models.py:64 +#: apps/member/models.py:65 msgid "Civil engineering (B2)" msgstr "Génie civil (B2)" -#: apps/member/models.py:65 +#: apps/member/models.py:66 msgid "Mechanical engineering (B3)" msgstr "Génie mécanique (B3)" -#: apps/member/models.py:66 +#: apps/member/models.py:67 msgid "EEA (B4)" msgstr "EEA (B4)" -#: apps/member/models.py:67 +#: apps/member/models.py:68 msgid "Design (C)" msgstr "Design (C)" -#: apps/member/models.py:68 +#: apps/member/models.py:69 msgid "Economy-management (D2)" msgstr "Économie-gestion (D2)" -#: apps/member/models.py:69 +#: apps/member/models.py:70 msgid "Social sciences (D3)" msgstr "Sciences sociales (D3)" -#: apps/member/models.py:70 +#: apps/member/models.py:71 msgid "English (E)" msgstr "Anglais (E)" -#: apps/member/models.py:71 +#: apps/member/models.py:72 msgid "External (EXT)" msgstr "Externe (EXT)" -#: apps/member/models.py:78 +#: apps/member/models.py:79 msgid "promotion" msgstr "promotion" -#: apps/member/models.py:79 +#: apps/member/models.py:80 msgid "Year of entry to the school (None if not ENS student)" msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)" -#: apps/member/models.py:83 templates/member/profile_info.html:32 +#: apps/member/models.py:84 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "adresse" -#: apps/member/models.py:90 +#: apps/member/models.py:91 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "payé" -#: apps/member/models.py:91 +#: apps/member/models.py:92 msgid "Tells if the user receive a salary." msgstr "Indique si l'utilisateur perçoit un salaire." -#: apps/member/models.py:96 +#: apps/member/models.py:97 +msgid "report frequency (in days)" +msgstr "fréquence des rapports (en jours)" + +#: apps/member/models.py:102 +msgid "last report date" +msgstr "date de dernier rapport" + +#: apps/member/models.py:107 msgid "email confirmed" msgstr "adresse email confirmée" -#: apps/member/models.py:101 +#: apps/member/models.py:112 msgid "registration valid" msgstr "inscription valid" -#: apps/member/models.py:130 apps/member/models.py:131 +#: apps/member/models.py:141 apps/member/models.py:142 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:138 +#: apps/member/models.py:149 msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" -#: apps/member/models.py:167 templates/member/club_info.html:57 +#: apps/member/models.py:178 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "courriel" -#: apps/member/models.py:174 +#: apps/member/models.py:185 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:183 +#: apps/member/models.py:194 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:184 +#: apps/member/models.py:195 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:200 templates/member/club_info.html:33 +#: apps/member/models.py:211 templates/member/club_info.html:33 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:201 +#: apps/member/models.py:212 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:208 templates/member/club_info.html:23 +#: apps/member/models.py:219 templates/member/club_info.html:23 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:209 +#: apps/member/models.py:220 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:216 templates/member/club_info.html:28 +#: apps/member/models.py:227 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:217 +#: apps/member/models.py:228 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -533,46 +545,46 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:251 apps/member/models.py:276 +#: apps/member/models.py:262 apps/member/models.py:287 #: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:252 +#: apps/member/models.py:263 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:286 +#: apps/member/models.py:297 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:290 +#: apps/member/models.py:301 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:342 +#: apps/member/models.py:353 #, 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:353 apps/member/views.py:588 +#: apps/member/models.py:364 apps/member/views.py:590 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:400 +#: apps/member/models.py:411 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:453 +#: apps/member/models.py:464 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:456 +#: apps/member/models.py:467 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:457 +#: apps/member/models.py:468 msgid "memberships" msgstr "adhésions" @@ -590,47 +602,47 @@ msgstr "Modifier le profil" msgid "This address must be valid." msgstr "Cette adresse doit être valide." -#: apps/member/views.py:133 +#: apps/member/views.py:135 msgid "Profile detail" msgstr "Détails de l'utilisateur" -#: apps/member/views.py:167 +#: apps/member/views.py:169 msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:201 apps/member/views.py:387 +#: apps/member/views.py:203 apps/member/views.py:389 msgid "Note aliases" msgstr "Alias de la note" -#: apps/member/views.py:215 +#: apps/member/views.py:217 msgid "Update note picture" msgstr "Modifier la photo de la note" -#: apps/member/views.py:273 templates/member/profile_info.html:43 +#: apps/member/views.py:275 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: apps/member/views.py:301 +#: apps/member/views.py:303 msgid "Create new club" msgstr "Créer un nouveau club" -#: apps/member/views.py:313 +#: apps/member/views.py:315 msgid "Search club" msgstr "Chercher un club" -#: apps/member/views.py:338 +#: apps/member/views.py:340 msgid "Club detail" msgstr "Détails du club" -#: apps/member/views.py:404 +#: apps/member/views.py:406 msgid "Update club" msgstr "Modifier le club" -#: apps/member/views.py:438 +#: apps/member/views.py:440 msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:579 apps/wei/views.py:862 +#: apps/member/views.py:581 apps/wei/views.py:862 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -638,25 +650,25 @@ 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:592 +#: apps/member/views.py:594 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:597 +#: apps/member/views.py:599 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:614 apps/member/views.py:616 apps/member/views.py:618 -#: apps/registration/views.py:290 apps/registration/views.py:292 -#: apps/registration/views.py:294 apps/wei/views.py:867 apps/wei/views.py:871 +#: apps/member/views.py:616 apps/member/views.py:618 apps/member/views.py:620 +#: apps/registration/views.py:292 apps/registration/views.py:294 +#: apps/registration/views.py:296 apps/wei/views.py:867 apps/wei/views.py:871 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:702 +#: apps/member/views.py:704 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:727 +#: apps/member/views.py:729 msgid "Members of the club" msgstr "Membres du club" @@ -1143,54 +1155,54 @@ msgstr "Adhérer au club Kfet" msgid "Register new user" msgstr "Enregistrer un nouvel utilisateur" -#: apps/registration/views.py:80 +#: apps/registration/views.py:82 msgid "Email validation" msgstr "Validation de l'adresse mail" -#: apps/registration/views.py:82 +#: apps/registration/views.py:84 msgid "Validate email" msgstr "Valider l'adresse e-mail" -#: apps/registration/views.py:124 +#: apps/registration/views.py:126 msgid "Email validation unsuccessful" msgstr " La validation de l'adresse mail a échoué" -#: apps/registration/views.py:135 +#: apps/registration/views.py:137 msgid "Email validation email sent" msgstr "L'email de vérification de l'adresse email a bien été envoyé." -#: apps/registration/views.py:143 +#: apps/registration/views.py:145 msgid "Resend email validation link" msgstr "Renvoyer le lien de validation" -#: apps/registration/views.py:161 +#: apps/registration/views.py:163 msgid "Pre-registered users list" msgstr "Liste des utilisateurs en attente d'inscription" -#: apps/registration/views.py:188 +#: apps/registration/views.py:190 msgid "Unregistered users" msgstr "Utilisateurs en attente d'inscription" -#: apps/registration/views.py:201 +#: apps/registration/views.py:203 msgid "Registration detail" msgstr "Détails de l'inscription" -#: apps/registration/views.py:256 +#: apps/registration/views.py:258 msgid "You must join the BDE." msgstr "Vous devez adhérer au BDE." -#: apps/registration/views.py:278 +#: 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:283 +#: 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:358 +#: apps/registration/views.py:360 msgid "Invalidate pre-registration" msgstr "Invalider l'inscription" diff --git a/templates/note/mails/weekly_report.html b/templates/note/mails/weekly_report.html index e093554b..324d100e 100644 --- a/templates/note/mails/weekly_report.html +++ b/templates/note/mails/weekly_report.html @@ -16,9 +16,24 @@ crossorigin="anonymous"> +

        + Bonjour, +

        + +

        + Vous recevez ce mail car vous avez défini une « Fréquence des rapports » dans la Note.
        + Le premier rapport récapitule toutes vos consommations depuis la création de votre compte.
        + 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.
        + Pour toutes suggestions par rapport à ce service, contactez + notekfet2020@lists.crans.org. +

        +

        Rapport d'activité de {{ user.first_name }} {{ user.last_name }} (note : {{ user }}) - depuis le {{ last_week }} jusqu'au {{ now }}. + depuis le {{ last_report }} jusqu'au {{ now }}.

        From 6759586ef3a81ee44f0fb43238b44c6c4a16570a Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 23:19:30 +0200 Subject: [PATCH 046/319] Setup crons --- ansible/roles/2-nk20/tasks/main.yml | 13 +++++++++++++ note.cron | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 note.cron diff --git a/ansible/roles/2-nk20/tasks/main.yml b/ansible/roles/2-nk20/tasks/main.yml index 2aca0698..96d5f4a4 100644 --- a/ansible/roles/2-nk20/tasks/main.yml +++ b/ansible/roles/2-nk20/tasks/main.yml @@ -28,3 +28,16 @@ recurse: yes owner: www-data group: www-data + +- name: Setup cron jobs + file: + src: /var/www/note_kfet/note.cron + dest: /etc/cron.d/note + state: link + owner: root + group: root + +- name: Reload cron service + systemd: + name: cron + state: reloaded diff --git a/note.cron b/note.cron new file mode 100644 index 00000000..0791eb3e --- /dev/null +++ b/note.cron @@ -0,0 +1,19 @@ +# Attention, il faut *copier* ce fichier dans /etc/cron.d, owner root:root et droits 644 +# Les cronjobs dont a besoin la Note Kfet + +# m h dom mon dow user command +# Envoyer les mails en attente + * * * * * www-data (/var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_mail >> /var/www/note_kfet/cron_mail.log 2>&1) + * * * * * www-data (/var/www/note_kfet/env/python /var/www/note_kfet/manage.py retry_deferred >> /var/www/note_kfet/cron_mail_deferred.log 2>&1) + 00 0 * * * www-data (/var/www/note_kfet/env/python /var/www/note_kfet/manage.py purge_mail_log 7 >> /var/www/note_kfet/cron_mail_purge.log 2>&1) +# Vérifier la cohérence de la base et mailer en cas de problème + 00 4 * * * www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py check_consistency --sum-all --check-all --mail +# TODO +# Mettre à jour le wiki (modification sans (dé)validation, activités passées) +#30 5 * * * www-data /home/note/note-kfet-2015-serveur/serveur/Wiki.py --human --raw +# Spammer les gens en négatif + 00 5 * * 2 www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_mail_to_negative_balances --spam +# Envoyer le rapport mensuel aux trésoriers et respos info + 00 8 6 * * www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_mail_to_negative_balances --report +# Envoyer les rapports aux gens + 55 6 * * * www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_reports From 8b66bcc3d53fb8096ffa4e01001b12e118eca6f7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 23:50:30 +0200 Subject: [PATCH 047/319] Fix cron --- ansible/roles/2-nk20/tasks/main.yml | 6 +++--- note.cron | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ansible/roles/2-nk20/tasks/main.yml b/ansible/roles/2-nk20/tasks/main.yml index 96d5f4a4..0649dee6 100644 --- a/ansible/roles/2-nk20/tasks/main.yml +++ b/ansible/roles/2-nk20/tasks/main.yml @@ -11,7 +11,7 @@ git: repo: https://gitlab.crans.org/bde/nk20.git dest: /var/www/note_kfet - version: master + version: beta force: true - name: Use default env vars (should be updated!) @@ -37,7 +37,7 @@ owner: root group: root -- name: Reload cron service +- name: Restart cron service systemd: name: cron - state: reloaded + state: restarted diff --git a/note.cron b/note.cron index 0791eb3e..c8723857 100644 --- a/note.cron +++ b/note.cron @@ -1,19 +1,19 @@ # Attention, il faut *copier* ce fichier dans /etc/cron.d, owner root:root et droits 644 # Les cronjobs dont a besoin la Note Kfet -# m h dom mon dow user command +# m h dom mon dow user command # Envoyer les mails en attente - * * * * * www-data (/var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_mail >> /var/www/note_kfet/cron_mail.log 2>&1) - * * * * * www-data (/var/www/note_kfet/env/python /var/www/note_kfet/manage.py retry_deferred >> /var/www/note_kfet/cron_mail_deferred.log 2>&1) - 00 0 * * * www-data (/var/www/note_kfet/env/python /var/www/note_kfet/manage.py purge_mail_log 7 >> /var/www/note_kfet/cron_mail_purge.log 2>&1) + * * * * * 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 # Vérifier la cohérence de la base et mailer en cas de problème - 00 4 * * * www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py check_consistency --sum-all --check-all --mail + 00 4 * * * root cd /var/www/note_kfet && env/bin/python manage.py check_consistency --sum-all --check-all --mail # TODO # Mettre à jour le wiki (modification sans (dé)validation, activités passées) -#30 5 * * * www-data /home/note/note-kfet-2015-serveur/serveur/Wiki.py --human --raw +#30 5 * * * root /home/note/note-kfet-2015-serveur/serveur/Wiki.py --human --raw # Spammer les gens en négatif - 00 5 * * 2 www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_mail_to_negative_balances --spam + 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 * * www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_mail_to_negative_balances --report + 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 * * * www-data /var/www/note_kfet/env/python /var/www/note_kfet/manage.py send_reports + 55 6 * * * root cd /var/www/note_kfet && env/bin/python manage.py send_reports From 199219861c82975aba5ae73c6cfc8d7a0c3fe558 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 23:51:59 +0200 Subject: [PATCH 048/319] Fix check consistency script --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 31dc478b..e01b48b8 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 31dc478b7a2ebc26ab9c2b46c13f4d51aed595bc +Subproject commit e01b48b807cf90aeeba6ba46cfe3ebfc17880073 From 93f7e1d45b7afaf31bf421a0540d6c2a6f57a3f2 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Wed, 5 Aug 2020 23:53:50 +0200 Subject: [PATCH 049/319] Fix check consistency script --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index e01b48b8..47dc4dd9 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit e01b48b807cf90aeeba6ba46cfe3ebfc17880073 +Subproject commit 47dc4dd9e6742c3fd0f0d4ea654b1e9a0a39f4f7 From 2aebeb8927583de3e885cc30529b9ab0ea659705 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 08:13:44 +0200 Subject: [PATCH 050/319] respoinfo.bde => respo-info.bde --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 47dc4dd9..a66ce1ad 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 47dc4dd9e6742c3fd0f0d4ea654b1e9a0a39f4f7 +Subproject commit a66ce1ad8520b792e6fdcbc6c9196cb3542565c1 From 547fbf564bd98a2cd9f43c562b36b82056edca6f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 08:14:54 +0200 Subject: [PATCH 051/319] Add cron to refresh highlighted buttons --- note.cron | 2 ++ 1 file changed, 2 insertions(+) diff --git a/note.cron b/note.cron index c8723857..3aeea476 100644 --- a/note.cron +++ b/note.cron @@ -17,3 +17,5 @@ 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 + 00 9 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_highlighted_buttons From 0b46140771d4ee2c9be967f1893db08f56abf253 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 08:21:05 +0200 Subject: [PATCH 052/319] Cron file must be owned by root --- ansible/roles/2-nk20/tasks/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/roles/2-nk20/tasks/main.yml b/ansible/roles/2-nk20/tasks/main.yml index 0649dee6..19dcdbbd 100644 --- a/ansible/roles/2-nk20/tasks/main.yml +++ b/ansible/roles/2-nk20/tasks/main.yml @@ -41,3 +41,9 @@ systemd: name: cron state: restarted + +- name: Update permissions for the cron file + file: + path: /var/www/note_kfet/note.cron + owner: root + group: www-data From fd7e314ca35305abee644cea589078e85c928909 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 08:53:47 +0200 Subject: [PATCH 053/319] Don't log mails in database --- apps/logs/signals.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/logs/signals.py b/apps/logs/signals.py index 68bf95c0..12d22155 100644 --- a/apps/logs/signals.py +++ b/apps/logs/signals.py @@ -23,6 +23,9 @@ EXCLUDED = [ 'cas_server.userattributes', 'contenttypes.contenttype', 'logs.changelog', # Never remove this line + 'mailer.dontsendentry', + 'mailer.message', + 'mailer.messagelog', 'migrations.migration', 'note.note' # We only store the subclasses 'note.transaction', From 315af75c4561c1dc0e9d44346c59478df04f2f11 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 09:27:33 +0200 Subject: [PATCH 054/319] :sparkles: Backup database daily --- .gitignore | 1 + apps/scripts | 2 +- note.cron | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2372bf46..d3b62d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ secrets.py .env map.json *.log +backups/ media/ # Virtualenv diff --git a/apps/scripts b/apps/scripts index a66ce1ad..b311d7d5 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit a66ce1ad8520b792e6fdcbc6c9196cb3542565c1 +Subproject commit b311d7d51b3777b6cfc60e100a61bf563dee51ec diff --git a/note.cron b/note.cron index 3aeea476..9683b391 100644 --- a/note.cron +++ b/note.cron @@ -6,6 +6,8 @@ * * * * * 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 +# 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 # TODO From b7ae411f96de9c8cb1e71e1965eacc7e023cf27f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:15:23 +0200 Subject: [PATCH 055/319] :sparkles: Export activities in the Crans Wiki --- .env_example | 2 ++ README.md | 2 ++ apps/activity/models.py | 23 +++++++++++++++++++++++ note.cron | 3 +-- uwsgi_note.ini | 6 ++++-- 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.env_example b/.env_example index 91db0e31..7e90f965 100644 --- a/.env_example +++ b/.env_example @@ -16,3 +16,5 @@ EMAIL_HOST=smtp.localhost EMAIL_PORT=465 EMAIL_USER=notekfet@localhost EMAIL_PASSWORD=CHANGE_ME +WIKI_USER=NoteKfet2020 +WIKI_PASSWORD= \ No newline at end of file diff --git a/README.md b/README.md index c04c7321..e5775b29 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,8 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n EMAIL_PORT=465 EMAIL_USER=notekfet@localhost EMAIL_PASSWORD=CHANGE_ME + WIKI_USER=NoteKfet2020 + WIKI_PASSWORD=CHANGE_ME Ensuite on (re)bascule dans l'environement virtuel et on lance les migrations diff --git a/apps/activity/models.py b/apps/activity/models.py index 45942cc5..93942720 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,8 +1,11 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later from datetime import timedelta, datetime +from threading import Thread +from django.conf import settings from django.contrib.auth.models import User +from django.core.management import call_command from django.db import models from django.db.models import Q from django.utils import timezone @@ -54,6 +57,13 @@ class Activity(models.Model): verbose_name=_('description'), ) + location = models.CharField( + verbose_name=_('location'), + max_length=255, + blank=True, + default="", + ) + activity_type = models.ForeignKey( ActivityType, on_delete=models.PROTECT, @@ -99,6 +109,19 @@ class Activity(models.Model): verbose_name=_('open'), ) + def save(self, *args, **kwargs): + """ + Update the activity wiki page each time the activity is updated (validation, change description, ...) + """ + ret = super().save(*args, **kwargs) + if self.pk and "scripts" in settings.INSTALLED_APPS: + def refresh_activities(): + from scripts.management.commands.refresh_activities import Command as RefreshActivitiesCommand + RefreshActivitiesCommand.refresh_human_readable_wiki_page("Modification de l'activité " + self.name) + RefreshActivitiesCommand.refresh_raw_wiki_page("Modification de l'activité " + self.name) + Thread(daemon=True, target=refresh_activities).start() + return ret + def __str__(self): return self.name diff --git a/note.cron b/note.cron index 9683b391..f3e18d90 100644 --- a/note.cron +++ b/note.cron @@ -10,9 +10,8 @@ 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 -# TODO # Mettre à jour le wiki (modification sans (dé)validation, activités passées) -#30 5 * * * root /home/note/note-kfet-2015-serveur/serveur/Wiki.py --human --raw +#30 5 * * * root cd /var/www/note_kfet && env/bin/python manage.py refresh_activities --raw --comment refresh # 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 diff --git a/uwsgi_note.ini b/uwsgi_note.ini index 83c52e50..34a8ecce 100644 --- a/uwsgi_note.ini +++ b/uwsgi_note.ini @@ -22,5 +22,7 @@ socket = /var/www/note_kfet/note_kfet.sock chmod-socket = 664 # clear environment on exit vacuum = true -#Touch reload -touch-reload = /var/www/note_kfet/note_kfet/settings/__init__.py +# Touch reload +touch-reload = /var/www/note_kfet/note_kfet/settings/__init__.py +# Enable threads +enable-threads = true \ No newline at end of file From a07b942738c40d6a3b113aeca63359d9c51f29b4 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:15:37 +0200 Subject: [PATCH 056/319] :sparkles: Export activities in the Crans Wiki --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index b311d7d5..18be620b 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit b311d7d51b3777b6cfc60e100a61bf563dee51ec +Subproject commit 18be620b60b9cf45a13453d9033429c90e6f8c7a From 9439b3cb2db3734c0ff16c6ee7a64f39892d953b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:22:19 +0200 Subject: [PATCH 057/319] :bug: Add Beautifulsoup4 as a dependency --- requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/base.txt b/requirements/base.txt index eb03fbf1..ea0b4770 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,3 +1,4 @@ +beautifulsoup4==4.9.1 certifi==2019.6.16 chardet==3.0.4 defusedxml==0.6.0 From 1247818033fb0b33beffbcec621b5a5c4528e533 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:30:14 +0200 Subject: [PATCH 058/319] :bug: lxml is required to parse html pages --- requirements/base.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/base.txt b/requirements/base.txt index ea0b4770..3181c493 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -13,6 +13,7 @@ django-polymorphic==2.0.3 django-tables2==2.1.0 docutils==0.14 idna==2.8 +lxml==4.5.2 oauthlib==3.1.0 phonenumbers==8.12.7 Pillow==7.1.2 From 6dcb82855dae860b998a13e22c3a9a12bfe7b22f Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:31:57 +0200 Subject: [PATCH 059/319] :bug: Default comment is an empty string, not None --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 18be620b..1b7014f3 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 18be620b60b9cf45a13453d9033429c90e6f8c7a +Subproject commit 1b7014f3699e565f5c5b07c79b1b364c9f80d283 From 252ddb832d4de5f43a43ffebc03e815c8ef638d3 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:36:28 +0200 Subject: [PATCH 060/319] :bug: Invert membership date inequalities --- static/js/consos.js | 2 +- static/js/transfer.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/consos.js b/static/js/consos.js index a953eee3..652b0901 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -218,7 +218,7 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + "succès, mais la note émettrice " + source_alias + " est en négatif.", "warning", 30000); - if (source.note.membership && source.note.membership.date_end > new Date().toISOString()) + if (source.note.membership && source.note.membership.date_end < new Date().toISOString()) addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.", "danger", 30000); } diff --git a/static/js/transfer.js b/static/js/transfer.js index 6e2f183c..db467a31 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -260,10 +260,10 @@ $("#btn_transfer").click(function() { "destination": dest.note.id, "destination_alias": dest.name }).done(function () { - if (source.note.membership && source.note.membership.date_end > new Date().toISOString()) + if (source.note.membership && source.note.membership.date_end < new Date().toISOString()) addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.", "danger", 30000); - if (dest.note.membership && dest.note.membership.date_end > new Date().toISOString()) + if (dest.note.membership && dest.note.membership.date_end < new Date().toISOString()) addMsg("Attention : la note destination " + dest.name + " n'est plus adhérente.", "danger", 30000); @@ -373,7 +373,7 @@ $("#btn_transfer").click(function() { "bank": $("#bank").val() }).done(function () { addMsg("Le crédit/retrait a bien été effectué !", "success", 10000); - if (user_note.membership && user_note.membership.date_end > new Date().toISOString()) + if (user_note.membership && user_note.membership.date_end < new Date().toISOString()) addMsg("Attention : la note " + alias + " n'est plus adhérente.", "danger", 10000); reset(); }).fail(function (err) { From d9cf812074d840badd1e19a512be81b169e9523b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:46:44 +0200 Subject: [PATCH 061/319] :bug: Prevent transactions to have the same source and destination --- apps/note/models/transactions.py | 3 +-- static/js/transfer.js | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 6a5d4680..677e0fa8 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -222,8 +222,7 @@ class Transaction(PolymorphicModel): self.destination_alias = str(self.destination) if self.source.pk == self.destination.pk: - # When source == destination, no money is transferred - super().save(*args, **kwargs) + # When source == destination, no money is transferred and no transaction is created return self.log("Saving") diff --git a/static/js/transfer.js b/static/js/transfer.js index db467a31..2ee879dc 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -246,6 +246,13 @@ $("#btn_transfer").click(function() { // We copy the arrays to ensure that transactions are well-processed even if the form is reset [...sources_notes_display].forEach(function (source) { [...dests_notes_display].forEach(function (dest) { + if (source.note.id === dest.note.id) { + addMsg("Attention : la transaction de " + pretty_money(amount) + " de la note " + source.name + + " vers la note " + dest.name + " n'a pas été faite car il s'agit de la même note au départ" + + " et à l'arrivée.","warning", 10000); + return; + } + $.post("/api/note/transaction/transaction/", { "csrfmiddlewaretoken": CSRF_TOKEN, From 0de69cbfaf95d960f8eb4288d5dbad4795307c5c Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 12:50:24 +0200 Subject: [PATCH 062/319] :green_heart: Fix linters --- apps/activity/admin.py | 2 +- apps/activity/models.py | 2 +- apps/member/models.py | 18 ++++++++---------- apps/member/views.py | 4 ++-- apps/note/api/serializers.py | 6 ++---- apps/note/api/views.py | 2 +- apps/note/models/transactions.py | 2 +- apps/note/views.py | 1 - apps/permission/models.py | 1 - apps/permission/tables.py | 1 - apps/wei/forms/registration.py | 1 - apps/wei/models.py | 1 - apps/wei/tables.py | 2 +- apps/wei/views.py | 1 - 14 files changed, 17 insertions(+), 27 deletions(-) diff --git a/apps/activity/admin.py b/apps/activity/admin.py index 27cabd4e..7f40b421 100644 --- a/apps/activity/admin.py +++ b/apps/activity/admin.py @@ -2,8 +2,8 @@ # SPDX-License-Identifier: GPL-3.0-or-later from django.contrib import admin - from note_kfet.admin import admin_site + from .models import Activity, ActivityType, Guest, Entry diff --git a/apps/activity/models.py b/apps/activity/models.py index 93942720..3ad0aa29 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,11 +1,11 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later + from datetime import timedelta, datetime from threading import Thread from django.conf import settings from django.contrib.auth.models import User -from django.core.management import call_command from django.db import models from django.db.models import Q from django.utils import timezone diff --git a/apps/member/models.py b/apps/member/models.py index 70745f08..90117f35 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -16,7 +16,6 @@ from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode from django.utils.translation import gettext_lazy as _ from phonenumber_field.modelfields import PhoneNumberField - from permission.models import Role from registration.tokens import email_validation_token from note.models import MembershipTransaction @@ -155,12 +154,12 @@ class Profile(models.Model): 'uid': urlsafe_base64_encode(force_bytes(self.user.pk)), }) 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)), - }) + { + '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)), + }) self.user.email_user(subject, message, html_message=html) @@ -329,7 +328,6 @@ class Membership(models.Model): club=self.club, date_start=max(self.date_end + datetime.timedelta(days=1), self.club.membership_start), ) - from django.forms import model_to_dict if hasattr(self, '_force_renew_parent') and self._force_renew_parent: new_membership._force_renew_parent = True if hasattr(self, '_soge') and self._soge: @@ -445,8 +443,8 @@ class Membership(models.Model): ) transaction._force_save = True if hasattr(self, '_soge') and "treasury" in settings.INSTALLED_APPS\ - and (self.club.name == "BDE" or self.club.name == "Kfet" or - ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)): + and (self.club.name == "BDE" or self.club.name == "Kfet" + or ("wei" in settings.INSTALLED_APPS and hasattr(self.club, "weiclub") and self.club.weiclub)): # If the soge pays, then the transaction is unvalidated in a first time, then submitted for control # to treasurers. transaction.valid = False diff --git a/apps/member/views.py b/apps/member/views.py index 7720c097..3caf5a84 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -455,7 +455,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): while c.parent_club is not None: c = c.parent_club clubs_renewal.append(c) - additional_fee_renewal += c.membership_fee_paid if user.profile.paid else c.membership_fee_unpaid + additional_fee_renewal += c.membership_fee_paid context["clubs_renewal"] = clubs_renewal context["additional_fee_renewal"] = additional_fee_renewal @@ -496,7 +496,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): form.fields['user'].disabled = True form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1) form.fields['credit_amount'].initial = (club.membership_fee_paid if user.profile.paid - else club.membership_fee_unpaid) + additional_fee_renewal + else club.membership_fee_unpaid) + additional_fee_renewal form.fields['last_name'].initial = user.last_name form.fields['first_name'].initial = user.first_name diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index b4fceeda..4b2ed0a6 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -1,10 +1,8 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from django.utils import timezone -from rest_framework import serializers -from rest_framework.serializers import ListSerializer -from rest_polymorphic.serializers import PolymorphicSerializer +from rest_framework import serializers +from rest_polymorphic.serializers import PolymorphicSerializer from member.api.serializers import MembershipSerializer from member.models import Membership from note_kfet.middlewares import get_current_authenticated_user diff --git a/apps/note/api/views.py b/apps/note/api/views.py index be11aa7f..0821ab48 100644 --- a/apps/note/api/views.py +++ b/apps/note/api/views.py @@ -9,7 +9,7 @@ from rest_framework import viewsets from rest_framework.response import Response from rest_framework import status from api.viewsets import ReadProtectedModelViewSet, ReadOnlyProtectedModelViewSet -from note_kfet.middlewares import get_current_session +from note_kfet.middlewares import get_current_session from permission.backends import PermissionBackend from .serializers import NotePolymorphicSerializer, AliasSerializer, ConsumerSerializer,\ diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 677e0fa8..df64d80d 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -7,7 +7,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ from polymorphic.models import PolymorphicModel -from .notes import Note, NoteClub, NoteSpecial, NoteUser +from .notes import Note, NoteClub, NoteSpecial from ..templatetags.pretty_money import pretty_money """ diff --git a/apps/note/views.py b/apps/note/views.py index d08dd2ec..bdc450fe 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -10,7 +10,6 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, UpdateView, DetailView from django_tables2 import SingleTableView from django.urls import reverse_lazy - from activity.models import Entry from note_kfet.inputs import AmountInput from permission.backends import PermissionBackend diff --git a/apps/permission/models.py b/apps/permission/models.py index a7e178b3..d49afdab 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -5,7 +5,6 @@ import functools import json import operator from copy import copy -from time import sleep from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError diff --git a/apps/permission/tables.py b/apps/permission/tables.py index 7a07bd6a..2ba80505 100644 --- a/apps/permission/tables.py +++ b/apps/permission/tables.py @@ -4,7 +4,6 @@ import django_tables2 as tables from django.urls import reverse_lazy from django.utils.html import format_html - from member.models import Membership from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py index 98215f4b..1645f60c 100644 --- a/apps/wei/forms/registration.py +++ b/apps/wei/forms/registration.py @@ -6,7 +6,6 @@ from django.contrib.auth.models import User from django.db.models import Q from django.forms import CheckboxSelectMultiple from django.utils.translation import gettext_lazy as _ - from note.models import NoteSpecial from note_kfet.inputs import AmountInput, DatePickerInput, Autocomplete, ColorWidget diff --git a/apps/wei/models.py b/apps/wei/models.py index e500715a..b72208ed 100644 --- a/apps/wei/models.py +++ b/apps/wei/models.py @@ -9,7 +9,6 @@ from django.contrib.auth.models import User from django.db import models from django.utils.translation import gettext_lazy as _ from phonenumber_field.modelfields import PhoneNumberField - from member.models import Club, Membership from note.models import MembershipTransaction from permission.models import Role diff --git a/apps/wei/tables.py b/apps/wei/tables.py index 0fae6848..a1d982cd 100644 --- a/apps/wei/tables.py +++ b/apps/wei/tables.py @@ -7,9 +7,9 @@ from django.utils import timezone from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ from django_tables2 import A - from note_kfet.middlewares import get_current_authenticated_user from permission.backends import PermissionBackend + from .models import WEIClub, WEIRegistration, Bus, BusTeam, WEIMembership diff --git a/apps/wei/views.py b/apps/wei/views.py index fe2a47a5..3d96ed9f 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -28,7 +28,6 @@ from note.models import Transaction, NoteClub, Alias, SpecialTransaction, NoteSp from note.tables import HistoryTable from note_kfet.settings import BASE_DIR from permission.backends import PermissionBackend -from permission.models import Role from permission.views import ProtectQuerysetMixin from .forms.registration import WEIChooseBusForm From cba6a35b6c21892ae996375a80040ab29d4b8dd0 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 13:07:22 +0200 Subject: [PATCH 063/319] Display matched alias in user table --- apps/member/tables.py | 4 +++- apps/member/views.py | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/apps/member/tables.py b/apps/member/tables.py index 1247da00..7c2673d9 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -38,6 +38,8 @@ class UserTable(tables.Table): """ List all users. """ + alias = tables.Column() + section = tables.Column(accessor='profile.section') balance = tables.Column(accessor='note.balance', verbose_name=_("Balance")) @@ -50,7 +52,7 @@ class UserTable(tables.Table): 'class': 'table table-condensed table-striped table-hover' } template_name = 'django_tables2/bootstrap4.html' - fields = ('last_name', 'first_name', 'username', 'email') + fields = ('last_name', 'first_name', 'username', 'alias', 'email') model = User row_attrs = { 'class': 'table-row', diff --git a/apps/member/views.py b/apps/member/views.py index 3caf5a84..46f56816 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -10,7 +10,7 @@ from django.contrib.auth import logout from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.models import User from django.contrib.auth.views import LoginView -from django.db.models import Q +from django.db.models import Q, F from django.shortcuts import redirect from django.urls import reverse_lazy from django.utils import timezone @@ -172,7 +172,9 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): """ Filter the user list with the given pattern. """ - qs = super().get_queryset().distinct().filter(profile__registration_valid=True) + qs = super().get_queryset().distinct("pk").annotate(alias=F("note__alias__name"))\ + .annotate(normalized_alias=F("note__alias__normalized_name"))\ + .filter(profile__registration_valid=True) if "search" in self.request.GET: pattern = self.request.GET["search"] @@ -184,8 +186,8 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): | Q(last_name__iregex=pattern) | Q(profile__section__iregex=pattern) | Q(username__iregex="^" + pattern) - | Q(note__alias__name__iregex="^" + pattern) - | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern)) + | Q(alias__iregex="^" + pattern) + | Q(normalized_alias__iregex=Alias.normalize("^" + pattern)) ) else: qs = qs.none() From 434a393f3bea27b3e442f21ddad304ab25b2c889 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 13:09:35 +0200 Subject: [PATCH 064/319] During the beta, don't update the wiki automatically --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 1b7014f3..3806feb6 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 1b7014f3699e565f5c5b07c79b1b364c9f80d283 +Subproject commit 3806feb67fcb1fe822cfdedddbbc4ca7eeef3829 From de5e0c958e06fc98950591a831b7dd64c09868b7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 14:11:55 +0200 Subject: [PATCH 065/319] Fix some activity errors --- apps/activity/forms.py | 6 ++++-- apps/activity/models.py | 4 ++-- apps/activity/views.py | 2 +- apps/member/views.py | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/activity/forms.py b/apps/activity/forms.py index dced014a..c41769a9 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -1,9 +1,11 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import timedelta, datetime + +from datetime import timedelta from django import forms from django.contrib.contenttypes.models import ContentType +from django.utils import timezone from django.utils.translation import gettext_lazy as _ from member.models import Club from note.models import NoteUser, Note @@ -41,7 +43,7 @@ class GuestForm(forms.ModelForm): def clean(self): cleaned_data = super().clean() - if self.activity.date_start > datetime.now(): + if self.activity.date_start > timezone.now(): self.add_error("inviter", _("You can't invite someone once the activity is started.")) if not self.activity.valid: diff --git a/apps/activity/models.py b/apps/activity/models.py index 3ad0aa29..c43e9258 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,7 +1,7 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import timedelta, datetime +from datetime import timedelta from threading import Thread from django.conf import settings @@ -236,7 +236,7 @@ class Guest(models.Model): one_year = timedelta(days=365) if not force_insert: - if self.activity.date_start > datetime.now(): + if self.activity.date_start > timezone.now(): raise ValidationError(_("You can't invite someone once the activity is started.")) if not self.activity.valid: diff --git a/apps/activity/views.py b/apps/activity/views.py index 370e6040..25565f2c 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -125,7 +125,7 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))\ .order_by('last_name', 'first_name').distinct() - if "search" in self.request.GET: + if "search" in self.request.GET and self.request.GET["search"]: pattern = self.request.GET["search"] if pattern[0] != "^": pattern = "^" + pattern diff --git a/apps/member/views.py b/apps/member/views.py index 46f56816..73fb4d90 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -484,7 +484,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): additional_fee_renewal = 0 while c.parent_club is not None: c = c.parent_club - if not Membership.objects.filter( + if c.membership_start and not Membership.objects.filter( club=c, user=user, date_start__gte=c.membership_start, @@ -562,7 +562,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView): fee = 0 c = club - while c is not None: + while c is not None and c.membership_start: if not Membership.objects.filter( club=c, user=user, From a4702fca86c5b1573b2bc70bd7a9c3ecaccabea7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 14:19:51 +0200 Subject: [PATCH 066/319] Escape special TeX characters --- apps/treasury/templatetags/escape_tex.py | 20 ++++++++++++++++++++ templates/treasury/invoice_sample.tex | 16 +++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 apps/treasury/templatetags/escape_tex.py diff --git a/apps/treasury/templatetags/escape_tex.py b/apps/treasury/templatetags/escape_tex.py new file mode 100644 index 00000000..3d635690 --- /dev/null +++ b/apps/treasury/templatetags/escape_tex.py @@ -0,0 +1,20 @@ +# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay +# SPDX-License-Identifier: GPL-3.0-or-later + +from django import template + + +def do_latex_escape(value): + return ( + value.replace("&", "\\&") + .replace("$", "\\$") + .replace("%", "\\%") + .replace("#", "\\#") + .replace("_", "\\_") + .replace("{", "\\{") + .replace("}", "\\}") + ) + + +register = template.Library() +register.filter("escape_tex", do_latex_escape) diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index 3c76403e..6562e3df 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -1,3 +1,5 @@ +{% load escape_tex %} + \nonstopmode \documentclass[11pt]{article} @@ -81,22 +83,22 @@ \def\IBAN{FR76\CodeBanque\CodeGuichet\NCompte\CleRib} \def\CodeBic{{"{"}}{{ obj.bic }}} -\def\FactureNum {{"{"}}{{obj.id}}} % Numéro de facture +\def\FactureNum {{"{"}}{{ obj.id }}} % Numéro de facture \def\FactureAcquittee {% if obj.acquitted %} {oui} {% else %} {non} {% endif %} % Facture acquittée : oui/non -\def\FactureLieu {{"{"}}{{ obj.place }}} % Lieu de l'édition de la facture +\def\FactureLieu {{"{"}}{{ obj.place|safe|escape_tex }}} % Lieu de l'édition de la facture \def\FactureDate {{"{"}}{{ obj.date }}} % Date de l'édition de la facture -\def\FactureObjet {{"{"}}{{ obj.object|safe }} } % Objet du document +\def\FactureObjet {{"{"}}{{ obj.object|safe|escape_tex }} } % Objet du document % Description de la facture -\def\FactureDescr {{"{"}}{{ obj.description|safe }}} +\def\FactureDescr {{"{"}}{{ obj.description|safe|escape_tex }}} % Infos Client -\def\ClientNom{{"{"}}{{obj.name|safe}}} % Nom du client -\def\ClientAdresse{{"{"}}{{ obj.address|safe }}} % Adresse du client +\def\ClientNom{{"{"}}{{ obj.name|safe|escape_tex }}} % Nom du client +\def\ClientAdresse{{"{"}}{{ obj.address|safe|escape_tex }}} % Adresse du client % Liste des produits facturés : Désignation, quantité, prix unitaire HT {% for product in products %} -\AjouterProduit{ {{product.designation|safe}}} { {{product.quantity|safe}}} { {{product.amount_euros|safe}}} { {{product.total_euros|safe}}} +\AjouterProduit{ {{ product.designation|safe|escape_tex }}} { {{ product.quantity|safe|escape_tex }}} { {{ product.amount_euros|safe|escape_tex }}} { {{ product.total_euros|safe|escape_tex }}} {% endfor %} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% From c859fc7821fab49d8ce3d70791b16be0f866e08d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 14:39:01 +0200 Subject: [PATCH 067/319] Use neg for negative numbers in invoices --- apps/treasury/templatetags/escape_tex.py | 5 +++++ templates/treasury/invoice_sample.tex | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/treasury/templatetags/escape_tex.py b/apps/treasury/templatetags/escape_tex.py index 3d635690..c8094ae1 100644 --- a/apps/treasury/templatetags/escape_tex.py +++ b/apps/treasury/templatetags/escape_tex.py @@ -16,5 +16,10 @@ def do_latex_escape(value): ) +def fp_value(value): + return value.replace("-", "neg ") + + register = template.Library() register.filter("escape_tex", do_latex_escape) +register.filter("fp_value", fp_value) diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index 6562e3df..d1b045ac 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -98,7 +98,7 @@ % Liste des produits facturés : Désignation, quantité, prix unitaire HT {% for product in products %} -\AjouterProduit{ {{ product.designation|safe|escape_tex }}} { {{ product.quantity|safe|escape_tex }}} { {{ product.amount_euros|safe|escape_tex }}} { {{ product.total_euros|safe|escape_tex }}} +\AjouterProduit{ {{ product.designation|safe|escape_tex }}} { {{ product.quantity|safe|escape_tex|fp_value }}} { {{ product.amount_euros|safe|escape_tex|fp_value }}} { {{ product.total_euros|safe|escape_tex|fp_value }}} {% endfor %} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% From f47a0b8c9d3e4db041864a1fe6ea06172ea059a1 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 14:41:14 +0200 Subject: [PATCH 068/319] Use neg for negative numbers in invoices --- apps/treasury/templatetags/escape_tex.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/treasury/templatetags/escape_tex.py b/apps/treasury/templatetags/escape_tex.py index c8094ae1..7cc41fb5 100644 --- a/apps/treasury/templatetags/escape_tex.py +++ b/apps/treasury/templatetags/escape_tex.py @@ -17,7 +17,7 @@ def do_latex_escape(value): def fp_value(value): - return value.replace("-", "neg ") + return value.replace("-", "").replace("-", "neg") register = template.Library() From d8c7018b9aee52e21b2242ec482387f434dac967 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 15:08:35 +0200 Subject: [PATCH 069/319] FP is bugggy --- apps/treasury/templatetags/escape_tex.py | 5 ----- templates/treasury/invoice_sample.tex | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apps/treasury/templatetags/escape_tex.py b/apps/treasury/templatetags/escape_tex.py index 7cc41fb5..3d635690 100644 --- a/apps/treasury/templatetags/escape_tex.py +++ b/apps/treasury/templatetags/escape_tex.py @@ -16,10 +16,5 @@ def do_latex_escape(value): ) -def fp_value(value): - return value.replace("-", "").replace("-", "neg") - - register = template.Library() register.filter("escape_tex", do_latex_escape) -register.filter("fp_value", fp_value) diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index d1b045ac..cf79029e 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -31,7 +31,8 @@ \newcommand{\AfficheResultat}{% \ListeProduits - \FPeval{\TotalTVA}{\TotalHT * \TVA / 100} + \FPmul{\TotalTVA}{\TotalHT}{\TVA} + \FPdiv{\TotalTVA}{\TotalTVA}{100} \FPadd{\TotalTTC}{\TotalHT}{\TotalTVA} \FPround{\TotalHT}{\TotalHT}{2} \FPround{\TotalTVA}{\TotalTVA}{2} @@ -98,7 +99,7 @@ % Liste des produits facturés : Désignation, quantité, prix unitaire HT {% for product in products %} -\AjouterProduit{ {{ product.designation|safe|escape_tex }}} { {{ product.quantity|safe|escape_tex|fp_value }}} { {{ product.amount_euros|safe|escape_tex|fp_value }}} { {{ product.total_euros|safe|escape_tex|fp_value }}} +\AjouterProduit{{"{"}}{{ product.designation|safe|escape_tex }}} {{"{"}}{{ product.quantity|safe|escape_tex }}} {{"{"}}{{ product.amount_euros|safe|escape_tex }}} {{"{"}}{{ product.total_euros|safe|escape_tex }}} {% endfor %} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% From eb3d426947633e3d19b13a202d208be31676aa12 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 15:18:14 +0200 Subject: [PATCH 070/319] :poop: Don't reset a transaction before saving it... --- apps/note/models/transactions.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index df64d80d..6cc5174b 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -202,8 +202,6 @@ class Transaction(PolymorphicModel): When saving, also transfer money between two notes """ with transaction.atomic(): - if self.pk: - self.refresh_from_db() self.source.refresh_from_db() self.destination.refresh_from_db() self.validate(False) From dd4b24d999a1f8b01569e6b2a1d9b3460545d074 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 15:21:16 +0200 Subject: [PATCH 071/319] Don't match users only with the start of the name --- apps/member/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/member/views.py b/apps/member/views.py index 73fb4d90..83304b06 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -185,9 +185,9 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): Q(first_name__iregex=pattern) | Q(last_name__iregex=pattern) | Q(profile__section__iregex=pattern) - | Q(username__iregex="^" + pattern) - | Q(alias__iregex="^" + pattern) - | Q(normalized_alias__iregex=Alias.normalize("^" + pattern)) + | Q(username__iregex=pattern) + | Q(alias__iregex=pattern) + | Q(normalized_alias__iregex=Alias.normalize(pattern)) ) else: qs = qs.none() From 9c7cb07decd659e0776b21b9bd71c84748808652 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 17:41:30 +0200 Subject: [PATCH 072/319] Improve activity interface --- apps/activity/fixtures/initial.json | 2 + apps/activity/forms.py | 15 +- apps/activity/models.py | 20 +- apps/activity/tables.py | 6 +- apps/activity/views.py | 19 +- apps/scripts | 2 +- locale/de/LC_MESSAGES/django.po | 610 ++++++++++++------------ locale/fr/LC_MESSAGES/django.po | 610 ++++++++++++------------ templates/activity/activity_detail.html | 65 +-- templates/activity/activity_entry.html | 10 +- templates/activity/activity_info.html | 78 +++ templates/activity/activity_list.html | 8 + templates/note/transaction_form.html | 10 +- 13 files changed, 772 insertions(+), 683 deletions(-) create mode 100644 templates/activity/activity_info.html diff --git a/apps/activity/fixtures/initial.json b/apps/activity/fixtures/initial.json index 1856bce4..95e841ca 100644 --- a/apps/activity/fixtures/initial.json +++ b/apps/activity/fixtures/initial.json @@ -4,6 +4,7 @@ "pk": 1, "fields": { "name": "Pot", + "manage_entries": true, "can_invite": true, "guest_entry_fee": 500 } @@ -13,6 +14,7 @@ "pk": 2, "fields": { "name": "Soir\u00e9e de club", + "manage_entries": false, "can_invite": false, "guest_entry_fee": 0 } diff --git a/apps/activity/forms.py b/apps/activity/forms.py index c41769a9..4f03f32a 100644 --- a/apps/activity/forms.py +++ b/apps/activity/forms.py @@ -43,7 +43,7 @@ class GuestForm(forms.ModelForm): def clean(self): cleaned_data = super().clean() - if self.activity.date_start > timezone.now(): + if timezone.now() > timezone.localtime(self.activity.date_start): self.add_error("inviter", _("You can't invite someone once the activity is started.")) if not self.activity.valid: @@ -52,20 +52,21 @@ class GuestForm(forms.ModelForm): one_year = timedelta(days=365) qs = Guest.objects.filter( - first_name=cleaned_data["first_name"], - last_name=cleaned_data["last_name"], + first_name__iexact=cleaned_data["first_name"], + last_name__iexact=cleaned_data["last_name"], activity__date_start__gte=self.activity.date_start - one_year, + entry__isnull=False, ) - if len(qs) >= 5: + if qs.count() >= 5: self.add_error("last_name", _("This person has been already invited 5 times this year.")) qs = qs.filter(activity=self.activity) if qs.exists(): self.add_error("last_name", _("This person is already invited.")) - qs = Guest.objects.filter(inviter=cleaned_data["inviter"], activity=self.activity) - if len(qs) >= 3: - self.add_error("inviter", _("You can't invite more than 3 people to this activity.")) + if "inviter" in cleaned_data: + if Guest.objects.filter(inviter=cleaned_data["inviter"], activity=self.activity).count() >= 3: + self.add_error("inviter", _("You can't invite more than 3 people to this activity.")) return cleaned_data diff --git a/apps/activity/models.py b/apps/activity/models.py index c43e9258..e576b9d9 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -27,11 +27,21 @@ class ActivityType(models.Model): verbose_name=_('name'), max_length=255, ) + + manage_entries = models.BooleanField( + verbose_name=_('manage entries'), + help_text=_('Enable the support of entries for this activity.'), + default=False, + ) + can_invite = models.BooleanField( verbose_name=_('can invite'), + default=False, ) + guest_entry_fee = models.PositiveIntegerField( verbose_name=_('guest entry fee'), + default=0, ) class Meta: @@ -236,18 +246,18 @@ class Guest(models.Model): one_year = timedelta(days=365) if not force_insert: - if self.activity.date_start > timezone.now(): + if timezone.now() > timezone.localtime(self.activity.date_start): raise ValidationError(_("You can't invite someone once the activity is started.")) if not self.activity.valid: raise ValidationError(_("This activity is not validated yet.")) qs = Guest.objects.filter( - first_name=self.first_name, - last_name=self.last_name, + first_name__iexact=self.first_name, + last_name__iexact=self.last_name, activity__date_start__gte=self.activity.date_start - one_year, ) - if len(qs) >= 5: + if qs.count() >= 5: raise ValidationError(_("This person has been already invited 5 times this year.")) qs = qs.filter(activity=self.activity) @@ -255,7 +265,7 @@ class Guest(models.Model): raise ValidationError(_("This person is already invited.")) qs = Guest.objects.filter(inviter=self.inviter, activity=self.activity) - if len(qs) >= 3: + if qs.count() >= 3: raise ValidationError(_("You can't invite more than 3 people to this activity.")) return super().save(force_insert, force_update, using, update_fields) diff --git a/apps/activity/tables.py b/apps/activity/tables.py index d6e566d3..b63c3dd7 100644 --- a/apps/activity/tables.py +++ b/apps/activity/tables.py @@ -1,6 +1,6 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later - +from django.utils import timezone from django.utils.html import format_html from django.utils.translation import gettext_lazy as _ import django_tables2 as tables @@ -66,6 +66,10 @@ def get_row_class(record): qs = Entry.objects.filter(note=record.note, activity=record.activity, guest=None) if qs.exists(): c += " table-success" + elif not record.note.user.memberships.filter(club=record.activity.attendees_club, + date_start__lte=timezone.now(), + date_end__gte=timezone.now()).exists(): + c += " table-info" elif record.note.balance < 0: c += " table-danger" return c diff --git a/apps/activity/views.py b/apps/activity/views.py index 25565f2c..6ce84185 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,13 +1,12 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import datetime, timezone - from django.conf import settings from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.contenttypes.models import ContentType from django.db.models import F, Q from django.urls import reverse_lazy +from django.utils import timezone from django.views.generic import CreateView, DetailView, UpdateView, TemplateView from django.utils.translation import gettext_lazy as _ from django_tables2.views import SingleTableView @@ -46,12 +45,17 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now()) + upcoming_activities = Activity.objects.filter(date_end__gt=timezone.now()) context['upcoming'] = ActivityTable( data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")), prefix='upcoming-', ) + started_activities = Activity.objects\ + .filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\ + .filter(open=True, valid=True).all() + context["started_activities"] = started_activities + return context @@ -67,7 +71,7 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView): .filter(PermissionBackend.filter_queryset(self.request.user, Guest, "view"))) context["guests"] = table - context["activity_started"] = datetime.now(timezone.utc) > self.object.date_start + context["activity_started"] = timezone.now() > timezone.localtime(self.object.date_start) return context @@ -148,7 +152,12 @@ class ActivityEntryView(LoginRequiredMixin, TemplateView): username=F("note__noteuser__user__username"), note_name=F("name"), balance=F("note__balance"))\ - .filter(note__polymorphic_ctype__model="noteuser")\ + .filter(note__noteuser__isnull=False)\ + .filter( + note__noteuser__user__memberships__club=activity.attendees_club, + note__noteuser__user__memberships__date_start__lte=timezone.now(), + note__noteuser__user__memberships__date_end__gte=timezone.now(), + )\ .filter(PermissionBackend.filter_queryset(self.request.user, Alias, "view")) if pattern: note_qs = note_qs.filter( diff --git a/apps/scripts b/apps/scripts index 3806feb6..4984159a 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 3806feb67fcb1fe822cfdedddbbc4ca7eeef3829 +Subproject commit 4984159a61642a0d3668e85daf39472b59b86447 diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index a9240ee5..d54f1006 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 23:17+0200\n" +"POT-Creation-Date: 2020-08-06 17:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,159 +18,171 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:106 -#: apps/activity/models.py:121 +#: apps/activity/apps.py:10 apps/activity/models.py:139 +#: apps/activity/models.py:154 msgid "activity" msgstr "" -#: apps/activity/forms.py:45 apps/activity/models.py:217 +#: apps/activity/forms.py:47 apps/activity/models.py:250 msgid "You can't invite someone once the activity is started." msgstr "" -#: apps/activity/forms.py:48 apps/activity/models.py:220 +#: apps/activity/forms.py:50 apps/activity/models.py:253 msgid "This activity is not validated yet." msgstr "" -#: apps/activity/forms.py:58 apps/activity/models.py:228 +#: apps/activity/forms.py:61 apps/activity/models.py:261 msgid "This person has been already invited 5 times this year." msgstr "" -#: apps/activity/forms.py:62 apps/activity/models.py:232 +#: apps/activity/forms.py:65 apps/activity/models.py:265 msgid "This person is already invited." msgstr "" -#: apps/activity/forms.py:66 apps/activity/models.py:236 +#: apps/activity/forms.py:69 apps/activity/models.py:269 msgid "You can't invite more than 3 people to this activity." msgstr "" -#: apps/activity/models.py:24 apps/activity/models.py:49 -#: apps/member/models.py:173 apps/note/models/notes.py:212 +#: apps/activity/models.py:27 apps/activity/models.py:62 +#: apps/member/models.py:172 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:298 apps/permission/models.py:332 -#: apps/wei/models.py:67 apps/wei/models.py:119 +#: apps/note/models/transactions.py:295 apps/permission/models.py:331 +#: apps/wei/models.py:66 apps/wei/models.py:118 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18 msgid "name" msgstr "" -#: apps/activity/models.py:28 templates/activity/activity_detail.html:39 +#: apps/activity/models.py:32 +msgid "manage entries" +msgstr "" + +#: apps/activity/models.py:33 +msgid "Enable the support of entries for this activity." +msgstr "" + +#: apps/activity/models.py:38 templates/activity/activity_info.html:42 msgid "can invite" msgstr "" -#: apps/activity/models.py:31 templates/activity/activity_detail.html:43 +#: apps/activity/models.py:43 templates/activity/activity_info.html:46 msgid "guest entry fee" msgstr "" -#: apps/activity/models.py:35 +#: apps/activity/models.py:48 msgid "activity type" msgstr "" -#: apps/activity/models.py:36 +#: apps/activity/models.py:49 msgid "activity types" msgstr "" -#: apps/activity/models.py:54 apps/note/models/transactions.py:81 -#: apps/permission/models.py:113 apps/permission/models.py:192 -#: apps/wei/models.py:73 apps/wei/models.py:130 -#: templates/activity/activity_detail.html:16 +#: apps/activity/models.py:67 apps/note/models/transactions.py:81 +#: apps/permission/models.py:112 apps/permission/models.py:191 +#: apps/wei/models.py:72 apps/wei/models.py:129 +#: templates/activity/activity_info.html:19 msgid "description" msgstr "" -#: apps/activity/models.py:61 apps/note/models/notes.py:188 -#: apps/note/models/transactions.py:66 apps/permission/models.py:167 -#: templates/activity/activity_detail.html:19 +#: apps/activity/models.py:71 +msgid "location" +msgstr "" + +#: apps/activity/models.py:81 apps/note/models/notes.py:188 +#: apps/note/models/transactions.py:66 apps/permission/models.py:166 +#: templates/activity/activity_info.html:22 msgid "type" msgstr "" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:281 +#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 -#: apps/wei/models.py:161 templates/treasury/sogecredit_detail.html:14 +#: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" msgstr "" -#: apps/activity/models.py:74 templates/activity/activity_detail.html:33 +#: apps/activity/models.py:94 templates/activity/activity_info.html:36 msgid "organizer" msgstr "" -#: apps/activity/models.py:81 templates/activity/activity_detail.html:36 +#: apps/activity/models.py:101 templates/activity/activity_info.html:39 msgid "attendees club" msgstr "" -#: apps/activity/models.py:85 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:105 templates/activity/activity_info.html:25 msgid "start date" msgstr "" -#: apps/activity/models.py:89 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:109 templates/activity/activity_info.html:28 msgid "end date" msgstr "" -#: apps/activity/models.py:94 apps/note/models/transactions.py:146 -#: templates/activity/activity_detail.html:47 +#: apps/activity/models.py:114 apps/note/models/transactions.py:146 +#: templates/activity/activity_info.html:50 msgid "valid" msgstr "" -#: apps/activity/models.py:99 templates/activity/activity_detail.html:61 +#: apps/activity/models.py:119 templates/activity/activity_info.html:65 msgid "open" msgstr "" -#: apps/activity/models.py:107 +#: apps/activity/models.py:140 msgid "activities" msgstr "" -#: apps/activity/models.py:126 +#: apps/activity/models.py:159 msgid "entry time" msgstr "" -#: apps/activity/models.py:132 apps/note/apps.py:14 +#: apps/activity/models.py:165 apps/note/apps.py:14 #: apps/note/models/notes.py:60 msgid "note" msgstr "" -#: apps/activity/models.py:143 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:176 templates/activity/activity_entry.html:38 msgid "entry" msgstr "" -#: apps/activity/models.py:144 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:177 templates/activity/activity_entry.html:38 msgid "entries" msgstr "" -#: apps/activity/models.py:150 +#: apps/activity/models.py:183 msgid "Already entered on " msgstr "" -#: apps/activity/models.py:150 apps/activity/tables.py:54 +#: apps/activity/models.py:183 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "" -#: apps/activity/models.py:158 +#: apps/activity/models.py:191 msgid "The balance is negative." msgstr "" -#: apps/activity/models.py:188 +#: apps/activity/models.py:221 msgid "last name" msgstr "" -#: apps/activity/models.py:193 templates/member/profile_info.html:14 +#: apps/activity/models.py:226 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weimembership_form.html:18 msgid "first name" msgstr "" -#: apps/activity/models.py:200 +#: apps/activity/models.py:233 msgid "inviter" msgstr "" -#: apps/activity/models.py:244 +#: apps/activity/models.py:277 msgid "guest" msgstr "" -#: apps/activity/models.py:245 +#: apps/activity/models.py:278 msgid "guests" msgstr "" -#: apps/activity/models.py:257 +#: apps/activity/models.py:290 msgid "Invitation" msgstr "" @@ -182,51 +194,51 @@ msgstr "" msgid "remove" msgstr "" -#: apps/activity/tables.py:75 apps/note/forms.py:76 apps/treasury/models.py:141 +#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:141 msgid "Type" msgstr "" -#: apps/activity/tables.py:77 apps/member/forms.py:104 +#: apps/activity/tables.py:81 apps/member/forms.py:104 #: apps/registration/forms.py:70 apps/treasury/forms.py:130 -#: apps/wei/forms/registration.py:95 +#: apps/wei/forms/registration.py:94 msgid "Last name" msgstr "" -#: apps/activity/tables.py:79 apps/member/forms.py:109 +#: apps/activity/tables.py:83 apps/member/forms.py:109 #: apps/registration/forms.py:75 apps/treasury/forms.py:132 -#: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 +#: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 msgid "First name" msgstr "" -#: apps/activity/tables.py:81 apps/note/models/notes.py:69 +#: apps/activity/tables.py:85 apps/note/models/notes.py:69 msgid "Note" msgstr "" -#: apps/activity/tables.py:83 apps/member/tables.py:43 +#: apps/activity/tables.py:87 apps/member/tables.py:45 msgid "Balance" msgstr "" -#: apps/activity/views.py:26 +#: apps/activity/views.py:25 msgid "Create new activity" msgstr "" -#: apps/activity/views.py:41 templates/base.html:114 +#: apps/activity/views.py:40 templates/base.html:114 msgid "Activities" msgstr "" -#: apps/activity/views.py:61 +#: apps/activity/views.py:65 msgid "Activity detail" msgstr "" -#: apps/activity/views.py:78 +#: apps/activity/views.py:82 msgid "Update activity" msgstr "" -#: apps/activity/views.py:92 +#: apps/activity/views.py:96 msgid "Invite guest to the activity \"{}\"" msgstr "" -#: apps/activity/views.py:181 +#: apps/activity/views.py:190 msgid "Entry for activity \"{}\"" msgstr "" @@ -242,7 +254,7 @@ msgstr "" msgid "IP Address" msgstr "" -#: apps/logs/models.py:36 apps/permission/models.py:137 +#: apps/logs/models.py:36 apps/permission/models.py:136 msgid "model" msgstr "" @@ -263,12 +275,12 @@ msgid "create" msgstr "" #: apps/logs/models.py:62 apps/note/tables.py:160 -#: templates/activity/activity_detail.html:67 +#: templates/activity/activity_info.html:71 msgid "edit" msgstr "" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:130 apps/wei/tables.py:73 +#: apps/permission/models.py:129 apps/wei/tables.py:73 msgid "delete" msgstr "" @@ -292,21 +304,21 @@ msgstr "" msgid "changelogs" msgstr "" -#: apps/member/admin.py:52 apps/member/models.py:200 +#: apps/member/admin.py:52 apps/member/models.py:199 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "" -#: apps/member/admin.py:53 apps/member/models.py:205 +#: apps/member/admin.py:53 apps/member/models.py:204 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/admin.py:67 apps/member/models.py:292 +#: apps/member/admin.py:67 apps/member/models.py:291 msgid "roles" msgstr "" -#: apps/member/admin.py:68 apps/member/models.py:306 +#: apps/member/admin.py:68 apps/member/models.py:305 msgid "fee" msgstr "" @@ -332,12 +344,12 @@ msgid "Check this case is the Société Générale paid the inscription." msgstr "" #: apps/member/forms.py:90 apps/registration/forms.py:57 -#: apps/wei/forms/registration.py:82 +#: apps/wei/forms/registration.py:81 msgid "Credit type" msgstr "" #: apps/member/forms.py:91 apps/registration/forms.py:58 -#: apps/wei/forms/registration.py:83 +#: apps/wei/forms/registration.py:82 msgid "No credit" msgstr "" @@ -346,13 +358,13 @@ msgid "You can credit the note of the user." msgstr "" #: apps/member/forms.py:97 apps/registration/forms.py:63 -#: apps/wei/forms/registration.py:88 +#: apps/wei/forms/registration.py:87 msgid "Credit amount" msgstr "" #: apps/member/forms.py:114 apps/registration/forms.py:80 -#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:105 -#: templates/note/transaction_form.html:135 +#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 +#: templates/note/transaction_form.html:137 msgid "Bank" msgstr "" @@ -364,226 +376,226 @@ msgstr "" msgid "Roles" msgstr "" -#: apps/member/models.py:39 +#: apps/member/models.py:38 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "" -#: apps/member/models.py:46 templates/member/profile_info.html:29 +#: apps/member/models.py:45 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "" -#: apps/member/models.py:47 +#: apps/member/models.py:46 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "" -#: apps/member/models.py:55 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:54 templates/wei/weimembership_form.html:36 msgid "department" msgstr "" -#: apps/member/models.py:57 +#: apps/member/models.py:56 msgid "Informatics (A0)" msgstr "" -#: apps/member/models.py:58 +#: apps/member/models.py:57 msgid "Mathematics (A1)" msgstr "" -#: apps/member/models.py:59 +#: apps/member/models.py:58 msgid "Physics (A2)" msgstr "" -#: apps/member/models.py:60 +#: apps/member/models.py:59 msgid "Applied physics (A'2)" msgstr "" -#: apps/member/models.py:61 +#: apps/member/models.py:60 msgid "Chemistry (A''2)" msgstr "" -#: apps/member/models.py:62 +#: apps/member/models.py:61 msgid "Biology (A3)" msgstr "" -#: apps/member/models.py:63 +#: apps/member/models.py:62 msgid "SAPHIRE (B1234)" msgstr "" -#: apps/member/models.py:64 +#: apps/member/models.py:63 msgid "Mechanics (B1)" msgstr "" -#: apps/member/models.py:65 +#: apps/member/models.py:64 msgid "Civil engineering (B2)" msgstr "" -#: apps/member/models.py:66 +#: apps/member/models.py:65 msgid "Mechanical engineering (B3)" msgstr "" -#: apps/member/models.py:67 +#: apps/member/models.py:66 msgid "EEA (B4)" msgstr "" -#: apps/member/models.py:68 +#: apps/member/models.py:67 msgid "Design (C)" msgstr "" -#: apps/member/models.py:69 +#: apps/member/models.py:68 msgid "Economy-management (D2)" msgstr "" -#: apps/member/models.py:70 +#: apps/member/models.py:69 msgid "Social sciences (D3)" msgstr "" -#: apps/member/models.py:71 +#: apps/member/models.py:70 msgid "English (E)" msgstr "" -#: apps/member/models.py:72 +#: apps/member/models.py:71 msgid "External (EXT)" msgstr "" -#: apps/member/models.py:79 +#: apps/member/models.py:78 msgid "promotion" msgstr "" -#: apps/member/models.py:80 +#: apps/member/models.py:79 msgid "Year of entry to the school (None if not ENS student)" msgstr "" -#: apps/member/models.py:84 templates/member/profile_info.html:32 +#: apps/member/models.py:83 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "" -#: apps/member/models.py:91 +#: apps/member/models.py:90 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "" -#: apps/member/models.py:92 +#: apps/member/models.py:91 msgid "Tells if the user receive a salary." msgstr "" -#: apps/member/models.py:97 +#: apps/member/models.py:96 msgid "report frequency (in days)" msgstr "" -#: apps/member/models.py:102 +#: apps/member/models.py:101 msgid "last report date" msgstr "" -#: apps/member/models.py:107 +#: apps/member/models.py:106 msgid "email confirmed" msgstr "" -#: apps/member/models.py:112 +#: apps/member/models.py:111 msgid "registration valid" msgstr "" -#: apps/member/models.py:141 apps/member/models.py:142 +#: apps/member/models.py:140 apps/member/models.py:141 msgid "user profile" msgstr "" -#: apps/member/models.py:149 +#: apps/member/models.py:148 msgid "Activate your Note Kfet account" msgstr "" -#: apps/member/models.py:178 templates/member/club_info.html:57 +#: apps/member/models.py:177 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "" -#: apps/member/models.py:185 +#: apps/member/models.py:184 msgid "parent club" msgstr "" -#: apps/member/models.py:194 +#: apps/member/models.py:193 msgid "require memberships" msgstr "" -#: apps/member/models.py:195 +#: apps/member/models.py:194 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:211 templates/member/club_info.html:33 +#: apps/member/models.py:210 templates/member/club_info.html:33 msgid "membership duration" msgstr "" -#: apps/member/models.py:212 +#: apps/member/models.py:211 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:219 templates/member/club_info.html:23 +#: apps/member/models.py:218 templates/member/club_info.html:23 msgid "membership start" msgstr "" -#: apps/member/models.py:220 +#: apps/member/models.py:219 msgid "How long after January 1st the members can renew their membership." msgstr "" -#: apps/member/models.py:227 templates/member/club_info.html:28 +#: apps/member/models.py:226 templates/member/club_info.html:28 msgid "membership end" msgstr "" -#: apps/member/models.py:228 +#: apps/member/models.py:227 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." msgstr "" -#: apps/member/models.py:262 apps/member/models.py:287 +#: apps/member/models.py:261 apps/member/models.py:286 #: apps/note/models/notes.py:163 msgid "club" msgstr "" -#: apps/member/models.py:263 +#: apps/member/models.py:262 msgid "clubs" msgstr "" -#: apps/member/models.py:297 +#: apps/member/models.py:296 msgid "membership starts on" msgstr "" -#: apps/member/models.py:301 +#: apps/member/models.py:300 msgid "membership ends on" msgstr "" -#: apps/member/models.py:353 +#: apps/member/models.py:351 #, python-brace-format msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:364 apps/member/views.py:590 +#: apps/member/models.py:362 apps/member/views.py:592 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:411 +#: apps/member/models.py:409 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:464 +#: apps/member/models.py:462 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:467 +#: apps/member/models.py:465 msgid "membership" msgstr "" -#: apps/member/models.py:468 +#: apps/member/models.py:466 msgid "memberships" msgstr "" -#: apps/member/tables.py:114 +#: apps/member/tables.py:116 msgid "Renew" msgstr "" @@ -605,63 +617,63 @@ msgstr "" msgid "Search user" msgstr "" -#: apps/member/views.py:203 apps/member/views.py:389 +#: apps/member/views.py:205 apps/member/views.py:391 msgid "Note aliases" msgstr "" -#: apps/member/views.py:217 +#: apps/member/views.py:219 msgid "Update note picture" msgstr "" -#: apps/member/views.py:275 templates/member/profile_info.html:43 +#: apps/member/views.py:277 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "" -#: apps/member/views.py:303 +#: apps/member/views.py:305 msgid "Create new club" msgstr "" -#: apps/member/views.py:315 +#: apps/member/views.py:317 msgid "Search club" msgstr "" -#: apps/member/views.py:340 +#: apps/member/views.py:342 msgid "Club detail" msgstr "" -#: apps/member/views.py:406 +#: apps/member/views.py:408 msgid "Update club" msgstr "" -#: apps/member/views.py:440 +#: apps/member/views.py:442 msgid "Add new member to the club" msgstr "" -#: apps/member/views.py:581 apps/wei/views.py:862 +#: apps/member/views.py:583 apps/wei/views.py:861 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." msgstr "" -#: apps/member/views.py:594 +#: apps/member/views.py:596 msgid "The membership must start after {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:599 +#: apps/member/views.py:601 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "" -#: apps/member/views.py:616 apps/member/views.py:618 apps/member/views.py:620 +#: apps/member/views.py:618 apps/member/views.py:620 apps/member/views.py:622 #: apps/registration/views.py:292 apps/registration/views.py:294 -#: apps/registration/views.py:296 apps/wei/views.py:867 apps/wei/views.py:871 +#: apps/registration/views.py:296 apps/wei/views.py:866 apps/wei/views.py:870 msgid "This field is required." msgstr "" -#: apps/member/views.py:704 +#: apps/member/views.py:706 msgid "Manage roles of an user in the club" msgstr "" -#: apps/member/views.py:729 +#: apps/member/views.py:731 msgid "Members of the club" msgstr "" @@ -695,7 +707,7 @@ msgstr "" msgid "Destination" msgstr "" -#: apps/note/forms.py:82 templates/note/transaction_form.html:104 +#: apps/note/forms.py:82 templates/note/transaction_form.html:106 msgid "Reason" msgstr "" @@ -883,68 +895,68 @@ msgid "" "The note balances must be between - 21 474 836.47 € and 21 474 836.47 €." msgstr "" -#: apps/note/models/transactions.py:214 +#: apps/note/models/transactions.py:212 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." msgstr "" -#: apps/note/models/transactions.py:260 +#: apps/note/models/transactions.py:257 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 -#: templates/note/transaction_form.html:143 +#: templates/note/transaction_form.html:145 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:284 +#: apps/note/models/transactions.py:281 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:287 +#: apps/note/models/transactions.py:284 msgid "recurrent transaction" msgstr "" -#: apps/note/models/transactions.py:288 +#: apps/note/models/transactions.py:285 msgid "recurrent transactions" msgstr "" -#: apps/note/models/transactions.py:303 +#: apps/note/models/transactions.py:300 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:308 +#: apps/note/models/transactions.py:305 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:314 +#: apps/note/models/transactions.py:311 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:314 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:311 templates/note/transaction_form.html:25 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:325 +#: apps/note/models/transactions.py:322 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" msgstr "" -#: apps/note/models/transactions.py:329 +#: apps/note/models/transactions.py:326 msgid "Special transaction" msgstr "" -#: apps/note/models/transactions.py:330 +#: apps/note/models/transactions.py:327 msgid "Special transactions" msgstr "" -#: apps/note/models/transactions.py:346 apps/note/models/transactions.py:351 +#: apps/note/models/transactions.py:343 apps/note/models/transactions.py:348 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:347 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:344 apps/treasury/models.py:228 msgid "membership transactions" msgstr "" @@ -973,103 +985,103 @@ msgstr "" msgid "Edit" msgstr "" -#: apps/note/views.py:35 +#: apps/note/views.py:34 msgid "Transfer money" msgstr "" -#: apps/note/views.py:75 +#: apps/note/views.py:74 msgid "Create new button" msgstr "" -#: apps/note/views.py:84 +#: apps/note/views.py:83 msgid "Search button" msgstr "" -#: apps/note/views.py:107 +#: apps/note/views.py:106 msgid "Update button" msgstr "" -#: apps/note/views.py:144 templates/base.html:94 +#: apps/note/views.py:143 templates/base.html:94 msgid "Consumptions" msgstr "" -#: apps/note/views.py:180 +#: apps/note/views.py:179 msgid "Search transactions" msgstr "" -#: apps/permission/models.py:92 +#: apps/permission/models.py:91 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:94 +#: apps/permission/models.py:93 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:107 +#: apps/permission/models.py:106 msgid "rank" msgstr "" -#: apps/permission/models.py:120 +#: apps/permission/models.py:119 msgid "permission mask" msgstr "" -#: apps/permission/models.py:121 +#: apps/permission/models.py:120 msgid "permission masks" msgstr "" -#: apps/permission/models.py:127 +#: apps/permission/models.py:126 msgid "add" msgstr "" -#: apps/permission/models.py:128 +#: apps/permission/models.py:127 msgid "view" msgstr "" -#: apps/permission/models.py:129 +#: apps/permission/models.py:128 msgid "change" msgstr "" -#: apps/permission/models.py:161 +#: apps/permission/models.py:160 msgid "query" msgstr "" -#: apps/permission/models.py:174 +#: apps/permission/models.py:173 msgid "mask" msgstr "" -#: apps/permission/models.py:180 +#: apps/permission/models.py:179 msgid "field" msgstr "" -#: apps/permission/models.py:185 +#: apps/permission/models.py:184 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." msgstr "" -#: apps/permission/models.py:186 templates/permission/all_rights.html:36 +#: apps/permission/models.py:185 templates/permission/all_rights.html:36 msgid "permanent" msgstr "" -#: apps/permission/models.py:197 +#: apps/permission/models.py:196 msgid "permission" msgstr "" -#: apps/permission/models.py:198 apps/permission/models.py:337 +#: apps/permission/models.py:197 apps/permission/models.py:336 msgid "permissions" msgstr "" -#: apps/permission/models.py:203 +#: apps/permission/models.py:202 msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/permission/models.py:342 +#: apps/permission/models.py:341 msgid "for club" msgstr "" -#: apps/permission/models.py:352 apps/permission/models.py:353 +#: apps/permission/models.py:351 apps/permission/models.py:352 msgid "role permissions" msgstr "" @@ -1218,7 +1230,7 @@ msgid "No attached remittance" msgstr "" #: apps/treasury/forms.py:136 apps/treasury/tables.py:47 -#: apps/treasury/tables.py:115 templates/note/transaction_form.html:97 +#: apps/treasury/tables.py:115 templates/note/transaction_form.html:99 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "" @@ -1239,7 +1251,7 @@ msgstr "" msgid "Description" msgstr "" -#: apps/treasury/models.py:49 templates/note/transaction_form.html:123 +#: apps/treasury/models.py:49 templates/note/transaction_form.html:125 msgid "Name" msgstr "" @@ -1412,198 +1424,198 @@ msgstr "" msgid "Manage credits from the Société générale" msgstr "" -#: apps/wei/apps.py:10 apps/wei/models.py:50 apps/wei/models.py:51 -#: apps/wei/models.py:62 apps/wei/models.py:168 templates/base.html:124 +#: 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 templates/base.html:124 msgid "WEI" msgstr "" -#: apps/wei/forms/registration.py:50 apps/wei/models.py:114 -#: apps/wei/models.py:299 +#: apps/wei/forms/registration.py:49 apps/wei/models.py:113 +#: apps/wei/models.py:298 msgid "bus" msgstr "" -#: apps/wei/forms/registration.py:51 +#: apps/wei/forms/registration.py:50 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." msgstr "" -#: apps/wei/forms/registration.py:58 +#: apps/wei/forms/registration.py:57 msgid "Team" msgstr "" -#: apps/wei/forms/registration.py:60 +#: apps/wei/forms/registration.py:59 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" msgstr "" -#: apps/wei/forms/registration.py:66 apps/wei/forms/registration.py:76 -#: apps/wei/models.py:149 +#: apps/wei/forms/registration.py:65 apps/wei/forms/registration.py:75 +#: apps/wei/models.py:148 msgid "WEI Roles" msgstr "" -#: apps/wei/forms/registration.py:67 +#: apps/wei/forms/registration.py:66 msgid "Select the roles that you are interested in." msgstr "" -#: apps/wei/forms/registration.py:112 +#: apps/wei/forms/registration.py:111 msgid "This team doesn't belong to the given bus." msgstr "" -#: apps/wei/models.py:25 templates/wei/weiclub_info.html:23 +#: apps/wei/models.py:24 templates/wei/weiclub_info.html:23 msgid "year" msgstr "" -#: apps/wei/models.py:29 templates/wei/weiclub_info.html:17 +#: apps/wei/models.py:28 templates/wei/weiclub_info.html:17 msgid "date start" msgstr "" -#: apps/wei/models.py:33 templates/wei/weiclub_info.html:20 +#: apps/wei/models.py:32 templates/wei/weiclub_info.html:20 msgid "date end" msgstr "" -#: apps/wei/models.py:78 +#: apps/wei/models.py:77 msgid "survey information" msgstr "" -#: apps/wei/models.py:79 +#: apps/wei/models.py:78 msgid "Information about the survey for new members, encoded in JSON" msgstr "" -#: apps/wei/models.py:101 +#: apps/wei/models.py:100 msgid "Bus" msgstr "" -#: apps/wei/models.py:102 templates/wei/weiclub_tables.html:32 +#: apps/wei/models.py:101 templates/wei/weiclub_tables.html:32 msgid "Buses" msgstr "" -#: apps/wei/models.py:123 +#: apps/wei/models.py:122 msgid "color" msgstr "" -#: apps/wei/models.py:124 +#: apps/wei/models.py:123 msgid "The color of the T-Shirt, stored with its number equivalent" msgstr "" -#: apps/wei/models.py:138 +#: apps/wei/models.py:137 msgid "Bus team" msgstr "" -#: apps/wei/models.py:139 +#: apps/wei/models.py:138 msgid "Bus teams" msgstr "" -#: apps/wei/models.py:148 +#: apps/wei/models.py:147 msgid "WEI Role" msgstr "" -#: apps/wei/models.py:173 +#: apps/wei/models.py:172 msgid "Credit from Société générale" msgstr "" -#: apps/wei/models.py:178 +#: apps/wei/models.py:177 msgid "Caution check given" msgstr "" -#: apps/wei/models.py:182 templates/wei/weimembership_form.html:68 +#: apps/wei/models.py:181 templates/wei/weimembership_form.html:68 msgid "birth date" msgstr "" -#: apps/wei/models.py:188 apps/wei/models.py:198 +#: apps/wei/models.py:187 apps/wei/models.py:197 msgid "Male" msgstr "" -#: apps/wei/models.py:189 apps/wei/models.py:199 +#: apps/wei/models.py:188 apps/wei/models.py:198 msgid "Female" msgstr "" -#: apps/wei/models.py:190 +#: apps/wei/models.py:189 msgid "Non binary" msgstr "" -#: apps/wei/models.py:192 templates/wei/weimembership_form.html:59 +#: apps/wei/models.py:191 templates/wei/weimembership_form.html:59 msgid "gender" msgstr "" -#: apps/wei/models.py:201 templates/wei/weimembership_form.html:62 +#: apps/wei/models.py:200 templates/wei/weimembership_form.html:62 msgid "clothing cut" msgstr "" -#: apps/wei/models.py:214 templates/wei/weimembership_form.html:65 +#: apps/wei/models.py:213 templates/wei/weimembership_form.html:65 msgid "clothing size" msgstr "" -#: apps/wei/models.py:220 templates/wei/weimembership_form.html:71 +#: apps/wei/models.py:219 templates/wei/weimembership_form.html:71 msgid "health issues" msgstr "" -#: apps/wei/models.py:225 templates/wei/weimembership_form.html:74 +#: apps/wei/models.py:224 templates/wei/weimembership_form.html:74 msgid "emergency contact name" msgstr "" -#: apps/wei/models.py:230 templates/wei/weimembership_form.html:77 +#: apps/wei/models.py:229 templates/wei/weimembership_form.html:77 msgid "emergency contact phone" msgstr "" -#: apps/wei/models.py:235 templates/wei/weimembership_form.html:80 +#: apps/wei/models.py:234 templates/wei/weimembership_form.html:80 msgid "" "Register on the mailing list to stay informed of the events of the campus (1 " "mail/week)" msgstr "" -#: apps/wei/models.py:240 templates/wei/weimembership_form.html:83 +#: apps/wei/models.py:239 templates/wei/weimembership_form.html:83 msgid "" "Register on the mailing list to stay informed of the sport events of the " "campus (1 mail/week)" msgstr "" -#: apps/wei/models.py:245 templates/wei/weimembership_form.html:86 +#: apps/wei/models.py:244 templates/wei/weimembership_form.html:86 msgid "" "Register on the mailing list to stay informed of the art events of the " "campus (1 mail/week)" msgstr "" -#: apps/wei/models.py:250 templates/wei/weimembership_form.html:56 +#: apps/wei/models.py:249 templates/wei/weimembership_form.html:56 msgid "first year" msgstr "" -#: apps/wei/models.py:251 +#: apps/wei/models.py:250 msgid "Tells if the user is new in the school." msgstr "" -#: apps/wei/models.py:256 +#: apps/wei/models.py:255 msgid "registration information" msgstr "" -#: apps/wei/models.py:257 +#: apps/wei/models.py:256 msgid "" "Information about the registration (buses for old members, survey fot the " "new members), encoded in JSON" msgstr "" -#: apps/wei/models.py:288 +#: apps/wei/models.py:287 msgid "WEI User" msgstr "" -#: apps/wei/models.py:289 +#: apps/wei/models.py:288 msgid "WEI Users" msgstr "" -#: apps/wei/models.py:309 +#: apps/wei/models.py:308 msgid "team" msgstr "" -#: apps/wei/models.py:319 +#: apps/wei/models.py:318 msgid "WEI registration" msgstr "" -#: apps/wei/models.py:323 +#: apps/wei/models.py:322 msgid "WEI membership" msgstr "" -#: apps/wei/models.py:324 +#: apps/wei/models.py:323 msgid "WEI memberships" msgstr "" @@ -1629,113 +1641,113 @@ msgstr "" msgid "members" msgstr "" -#: apps/wei/views.py:57 +#: apps/wei/views.py:56 msgid "Search WEI" msgstr "" -#: apps/wei/views.py:75 templates/wei/weiclub_list.html:10 +#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10 msgid "Create WEI" msgstr "" -#: apps/wei/views.py:95 +#: apps/wei/views.py:94 msgid "WEI Detail" msgstr "" -#: apps/wei/views.py:190 +#: apps/wei/views.py:189 msgid "View members of the WEI" msgstr "" -#: apps/wei/views.py:218 +#: apps/wei/views.py:217 msgid "Find WEI Membership" msgstr "" -#: apps/wei/views.py:228 +#: apps/wei/views.py:227 msgid "View registrations to the WEI" msgstr "" -#: apps/wei/views.py:252 +#: apps/wei/views.py:251 msgid "Find WEI Registration" msgstr "" -#: apps/wei/views.py:263 +#: apps/wei/views.py:262 msgid "Update the WEI" msgstr "" -#: apps/wei/views.py:284 +#: apps/wei/views.py:283 msgid "Create new bus" msgstr "" -#: apps/wei/views.py:315 +#: apps/wei/views.py:314 msgid "Update bus" msgstr "" -#: apps/wei/views.py:345 +#: apps/wei/views.py:344 msgid "Manage bus" msgstr "" -#: apps/wei/views.py:372 +#: apps/wei/views.py:371 msgid "Create new team" msgstr "" -#: apps/wei/views.py:404 +#: apps/wei/views.py:403 msgid "Update team" msgstr "" -#: apps/wei/views.py:435 +#: apps/wei/views.py:434 msgid "Manage WEI team" msgstr "" -#: apps/wei/views.py:457 +#: apps/wei/views.py:456 msgid "Register first year student to the WEI" msgstr "" -#: apps/wei/views.py:469 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:468 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "" -#: apps/wei/views.py:490 apps/wei/views.py:561 +#: apps/wei/views.py:489 apps/wei/views.py:560 msgid "This user is already registered to this WEI." msgstr "" -#: apps/wei/views.py:495 +#: apps/wei/views.py:494 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." msgstr "" -#: apps/wei/views.py:512 +#: apps/wei/views.py:511 msgid "Register old student to the WEI" msgstr "" -#: apps/wei/views.py:524 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:523 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "" -#: apps/wei/views.py:543 apps/wei/views.py:628 +#: apps/wei/views.py:542 apps/wei/views.py:627 msgid "You already opened an account in the Société générale." msgstr "" -#: apps/wei/views.py:591 +#: apps/wei/views.py:590 msgid "Update WEI Registration" msgstr "" -#: apps/wei/views.py:687 +#: apps/wei/views.py:686 msgid "Delete WEI registration" msgstr "" -#: apps/wei/views.py:698 +#: apps/wei/views.py:697 msgid "You don't have the right to delete this WEI registration." msgstr "" -#: apps/wei/views.py:717 +#: apps/wei/views.py:716 msgid "Validate WEI registration" msgstr "" -#: apps/wei/views.py:856 +#: apps/wei/views.py:855 msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:918 apps/wei/views.py:971 apps/wei/views.py:981 +#: apps/wei/views.py:917 apps/wei/views.py:970 apps/wei/views.py:980 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1797,40 +1809,12 @@ msgid "" "soon. You can now drink a beer." msgstr "" -#: templates/activity/activity_detail.html:29 -msgid "creater" -msgstr "" - -#: templates/activity/activity_detail.html:50 -msgid "opened" -msgstr "" - -#: templates/activity/activity_detail.html:57 -msgid "Entry page" -msgstr "" - -#: templates/activity/activity_detail.html:61 -msgid "close" -msgstr "" - -#: templates/activity/activity_detail.html:64 -msgid "invalidate" -msgstr "" - -#: templates/activity/activity_detail.html:64 -msgid "validate" -msgstr "" - -#: templates/activity/activity_detail.html:70 -msgid "Invite" -msgstr "" - -#: templates/activity/activity_detail.html:77 +#: templates/activity/activity_detail.html:14 msgid "Guests list" msgstr "" #: templates/activity/activity_entry.html:22 -#: templates/note/transaction_form.html:29 +#: templates/note/transaction_form.html:31 msgid "Entries" msgstr "" @@ -1838,19 +1822,51 @@ msgstr "" msgid "Return to activity page" msgstr "" -#: templates/activity/activity_list.html:5 +#: templates/activity/activity_info.html:32 +msgid "creater" +msgstr "" + +#: templates/activity/activity_info.html:53 +msgid "opened" +msgstr "" + +#: templates/activity/activity_info.html:60 +msgid "Entry page" +msgstr "" + +#: templates/activity/activity_info.html:65 +msgid "close" +msgstr "" + +#: templates/activity/activity_info.html:68 +msgid "invalidate" +msgstr "" + +#: templates/activity/activity_info.html:68 +msgid "validate" +msgstr "" + +#: templates/activity/activity_info.html:74 +msgid "Invite" +msgstr "" + +#: templates/activity/activity_list.html:6 +msgid "Current activity" +msgstr "" + +#: templates/activity/activity_list.html:13 msgid "Upcoming activities" msgstr "" -#: templates/activity/activity_list.html:10 +#: templates/activity/activity_list.html:18 msgid "There is no planned activity." msgstr "" -#: templates/activity/activity_list.html:14 +#: templates/activity/activity_list.html:22 msgid "New activity" msgstr "" -#: templates/activity/activity_list.html:18 +#: templates/activity/activity_list.html:26 msgid "All activities" msgstr "" @@ -2039,8 +2055,8 @@ msgstr "" msgid "Consum" msgstr "" -#: templates/note/conso_form.html:41 templates/note/transaction_form.html:57 -#: templates/note/transaction_form.html:78 +#: templates/note/conso_form.html:41 templates/note/transaction_form.html:59 +#: templates/note/transaction_form.html:80 msgid "Name or alias..." msgstr "" @@ -2064,27 +2080,27 @@ msgstr "" msgid "Double consumptions" msgstr "" -#: templates/note/conso_form.html:152 templates/note/transaction_form.html:154 +#: templates/note/conso_form.html:152 templates/note/transaction_form.html:156 msgid "Recent transactions history" msgstr "" -#: templates/note/transaction_form.html:51 +#: templates/note/transaction_form.html:53 msgid "Select emitters" msgstr "" -#: templates/note/transaction_form.html:61 +#: templates/note/transaction_form.html:63 msgid "I am the emitter" msgstr "" -#: templates/note/transaction_form.html:72 +#: templates/note/transaction_form.html:74 msgid "Select receivers" msgstr "" -#: templates/note/transaction_form.html:89 +#: templates/note/transaction_form.html:91 msgid "Action" msgstr "" -#: templates/note/transaction_form.html:113 +#: templates/note/transaction_form.html:115 msgid "Transfer type" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 4c65a5ac..e9b09431 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-05 23:17+0200\n" +"POT-Creation-Date: 2020-08-06 17:40+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,160 +18,172 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: apps/activity/apps.py:10 apps/activity/models.py:106 -#: apps/activity/models.py:121 +#: apps/activity/apps.py:10 apps/activity/models.py:139 +#: apps/activity/models.py:154 msgid "activity" msgstr "activité" -#: apps/activity/forms.py:45 apps/activity/models.py:217 +#: apps/activity/forms.py:47 apps/activity/models.py:250 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:48 apps/activity/models.py:220 +#: apps/activity/forms.py:50 apps/activity/models.py:253 msgid "This activity is not validated yet." msgstr "Cette activité n'est pas encore validée." -#: apps/activity/forms.py:58 apps/activity/models.py:228 +#: apps/activity/forms.py:61 apps/activity/models.py:261 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:62 apps/activity/models.py:232 +#: apps/activity/forms.py:65 apps/activity/models.py:265 msgid "This person is already invited." msgstr "Cette personne est déjà invitée." -#: apps/activity/forms.py:66 apps/activity/models.py:236 +#: apps/activity/forms.py:69 apps/activity/models.py:269 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:24 apps/activity/models.py:49 -#: apps/member/models.py:173 apps/note/models/notes.py:212 +#: apps/activity/models.py:27 apps/activity/models.py:62 +#: apps/member/models.py:172 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:298 apps/permission/models.py:332 -#: apps/wei/models.py:67 apps/wei/models.py:119 +#: apps/note/models/transactions.py:295 apps/permission/models.py:331 +#: apps/wei/models.py:66 apps/wei/models.py:118 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18 msgid "name" msgstr "nom" -#: apps/activity/models.py:28 templates/activity/activity_detail.html:39 +#: apps/activity/models.py:32 +msgid "manage entries" +msgstr "gérer les entrées" + +#: apps/activity/models.py:33 +msgid "Enable the support of entries for this activity." +msgstr "Activer le support des entrées pour cette activité." + +#: apps/activity/models.py:38 templates/activity/activity_info.html:42 msgid "can invite" msgstr "peut inviter" -#: apps/activity/models.py:31 templates/activity/activity_detail.html:43 +#: apps/activity/models.py:43 templates/activity/activity_info.html:46 msgid "guest entry fee" msgstr "cotisation de l'entrée invité" -#: apps/activity/models.py:35 +#: apps/activity/models.py:48 msgid "activity type" msgstr "type d'activité" -#: apps/activity/models.py:36 +#: apps/activity/models.py:49 msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:54 apps/note/models/transactions.py:81 -#: apps/permission/models.py:113 apps/permission/models.py:192 -#: apps/wei/models.py:73 apps/wei/models.py:130 -#: templates/activity/activity_detail.html:16 +#: apps/activity/models.py:67 apps/note/models/transactions.py:81 +#: apps/permission/models.py:112 apps/permission/models.py:191 +#: apps/wei/models.py:72 apps/wei/models.py:129 +#: templates/activity/activity_info.html:19 msgid "description" msgstr "description" -#: apps/activity/models.py:61 apps/note/models/notes.py:188 -#: apps/note/models/transactions.py:66 apps/permission/models.py:167 -#: templates/activity/activity_detail.html:19 +#: apps/activity/models.py:71 +msgid "location" +msgstr "lieu" + +#: apps/activity/models.py:81 apps/note/models/notes.py:188 +#: apps/note/models/transactions.py:66 apps/permission/models.py:166 +#: templates/activity/activity_info.html:22 msgid "type" msgstr "type" -#: apps/activity/models.py:67 apps/logs/models.py:22 apps/member/models.py:281 +#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 #: apps/note/models/notes.py:126 apps/treasury/models.py:222 -#: apps/wei/models.py:161 templates/treasury/sogecredit_detail.html:14 +#: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" msgstr "utilisateur" -#: apps/activity/models.py:74 templates/activity/activity_detail.html:33 +#: apps/activity/models.py:94 templates/activity/activity_info.html:36 msgid "organizer" msgstr "organisateur" -#: apps/activity/models.py:81 templates/activity/activity_detail.html:36 +#: apps/activity/models.py:101 templates/activity/activity_info.html:39 msgid "attendees club" msgstr "club attendu" -#: apps/activity/models.py:85 templates/activity/activity_detail.html:22 +#: apps/activity/models.py:105 templates/activity/activity_info.html:25 msgid "start date" msgstr "date de début" -#: apps/activity/models.py:89 templates/activity/activity_detail.html:25 +#: apps/activity/models.py:109 templates/activity/activity_info.html:28 msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:94 apps/note/models/transactions.py:146 -#: templates/activity/activity_detail.html:47 +#: apps/activity/models.py:114 apps/note/models/transactions.py:146 +#: templates/activity/activity_info.html:50 msgid "valid" msgstr "valide" -#: apps/activity/models.py:99 templates/activity/activity_detail.html:61 +#: apps/activity/models.py:119 templates/activity/activity_info.html:65 msgid "open" msgstr "ouvrir" -#: apps/activity/models.py:107 +#: apps/activity/models.py:140 msgid "activities" msgstr "activités" -#: apps/activity/models.py:126 +#: apps/activity/models.py:159 msgid "entry time" msgstr "heure d'entrée" -#: apps/activity/models.py:132 apps/note/apps.py:14 +#: apps/activity/models.py:165 apps/note/apps.py:14 #: apps/note/models/notes.py:60 msgid "note" msgstr "note" -#: apps/activity/models.py:143 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:176 templates/activity/activity_entry.html:38 msgid "entry" msgstr "entrée" -#: apps/activity/models.py:144 templates/activity/activity_entry.html:38 +#: apps/activity/models.py:177 templates/activity/activity_entry.html:38 msgid "entries" msgstr "entrées" -#: apps/activity/models.py:150 +#: apps/activity/models.py:183 msgid "Already entered on " msgstr "Déjà rentré le " -#: apps/activity/models.py:150 apps/activity/tables.py:54 +#: apps/activity/models.py:183 apps/activity/tables.py:54 msgid "{:%Y-%m-%d %H:%M:%S}" msgstr "{:%d/%m/%Y %H:%M:%S}" -#: apps/activity/models.py:158 +#: apps/activity/models.py:191 msgid "The balance is negative." msgstr "La note est en négatif." -#: apps/activity/models.py:188 +#: apps/activity/models.py:221 msgid "last name" msgstr "nom de famille" -#: apps/activity/models.py:193 templates/member/profile_info.html:14 +#: apps/activity/models.py:226 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 #: templates/wei/weimembership_form.html:18 msgid "first name" msgstr "prénom" -#: apps/activity/models.py:200 +#: apps/activity/models.py:233 msgid "inviter" msgstr "hôte" -#: apps/activity/models.py:244 +#: apps/activity/models.py:277 msgid "guest" msgstr "invité" -#: apps/activity/models.py:245 +#: apps/activity/models.py:278 msgid "guests" msgstr "invités" -#: apps/activity/models.py:257 +#: apps/activity/models.py:290 msgid "Invitation" msgstr "Invitation" @@ -183,51 +195,51 @@ msgstr "Entré le " msgid "remove" msgstr "supprimer" -#: apps/activity/tables.py:75 apps/note/forms.py:76 apps/treasury/models.py:141 +#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:141 msgid "Type" msgstr "Type" -#: apps/activity/tables.py:77 apps/member/forms.py:104 +#: apps/activity/tables.py:81 apps/member/forms.py:104 #: apps/registration/forms.py:70 apps/treasury/forms.py:130 -#: apps/wei/forms/registration.py:95 +#: apps/wei/forms/registration.py:94 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:79 apps/member/forms.py:109 +#: apps/activity/tables.py:83 apps/member/forms.py:109 #: apps/registration/forms.py:75 apps/treasury/forms.py:132 -#: apps/wei/forms/registration.py:100 templates/note/transaction_form.html:129 +#: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 msgid "First name" msgstr "Prénom" -#: apps/activity/tables.py:81 apps/note/models/notes.py:69 +#: apps/activity/tables.py:85 apps/note/models/notes.py:69 msgid "Note" msgstr "Note" -#: apps/activity/tables.py:83 apps/member/tables.py:43 +#: apps/activity/tables.py:87 apps/member/tables.py:45 msgid "Balance" msgstr "Solde du compte" -#: apps/activity/views.py:26 +#: apps/activity/views.py:25 msgid "Create new activity" msgstr "Créer une nouvelle activité" -#: apps/activity/views.py:41 templates/base.html:114 +#: apps/activity/views.py:40 templates/base.html:114 msgid "Activities" msgstr "Activités" -#: apps/activity/views.py:61 +#: apps/activity/views.py:65 msgid "Activity detail" msgstr "Détails de l'activité" -#: apps/activity/views.py:78 +#: apps/activity/views.py:82 msgid "Update activity" msgstr "Modifier l'activité" -#: apps/activity/views.py:92 +#: apps/activity/views.py:96 msgid "Invite guest to the activity \"{}\"" msgstr "Invitation pour l'activité « {} »" -#: apps/activity/views.py:181 +#: apps/activity/views.py:190 msgid "Entry for activity \"{}\"" msgstr "Entrées pour l'activité « {} »" @@ -243,7 +255,7 @@ msgstr "Logs" msgid "IP Address" msgstr "Adresse IP" -#: apps/logs/models.py:36 apps/permission/models.py:137 +#: apps/logs/models.py:36 apps/permission/models.py:136 msgid "model" msgstr "Modèle" @@ -264,12 +276,12 @@ msgid "create" msgstr "Créer" #: apps/logs/models.py:62 apps/note/tables.py:160 -#: templates/activity/activity_detail.html:67 +#: templates/activity/activity_info.html:71 msgid "edit" msgstr "Modifier" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:130 apps/wei/tables.py:73 +#: apps/permission/models.py:129 apps/wei/tables.py:73 msgid "delete" msgstr "Supprimer" @@ -293,21 +305,21 @@ msgstr "journal de modification" msgid "changelogs" msgstr "journaux de modifications" -#: apps/member/admin.py:52 apps/member/models.py:200 +#: apps/member/admin.py:52 apps/member/models.py:199 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/admin.py:53 apps/member/models.py:205 +#: apps/member/admin.py:53 apps/member/models.py:204 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:67 apps/member/models.py:292 +#: apps/member/admin.py:67 apps/member/models.py:291 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:68 apps/member/models.py:306 +#: apps/member/admin.py:68 apps/member/models.py:305 msgid "fee" msgstr "cotisation" @@ -333,12 +345,12 @@ 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:90 apps/registration/forms.py:57 -#: apps/wei/forms/registration.py:82 +#: apps/wei/forms/registration.py:81 msgid "Credit type" msgstr "Type de rechargement" #: apps/member/forms.py:91 apps/registration/forms.py:58 -#: apps/wei/forms/registration.py:83 +#: apps/wei/forms/registration.py:82 msgid "No credit" msgstr "Pas de rechargement" @@ -347,13 +359,13 @@ 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:97 apps/registration/forms.py:63 -#: apps/wei/forms/registration.py:88 +#: apps/wei/forms/registration.py:87 msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:114 apps/registration/forms.py:80 -#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:105 -#: templates/note/transaction_form.html:135 +#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 +#: templates/note/transaction_form.html:137 msgid "Bank" msgstr "Banque" @@ -365,179 +377,179 @@ msgstr "Utilisateur" msgid "Roles" msgstr "Rôles" -#: apps/member/models.py:39 +#: apps/member/models.py:38 #: templates/registration/future_profile_detail.html:40 #: templates/wei/weimembership_form.html:48 msgid "phone number" msgstr "numéro de téléphone" -#: apps/member/models.py:46 templates/member/profile_info.html:29 +#: apps/member/models.py:45 templates/member/profile_info.html:29 #: templates/registration/future_profile_detail.html:34 #: templates/wei/weimembership_form.html:42 msgid "section" msgstr "section" -#: apps/member/models.py:47 +#: apps/member/models.py:46 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\"" -#: apps/member/models.py:55 templates/wei/weimembership_form.html:36 +#: apps/member/models.py:54 templates/wei/weimembership_form.html:36 msgid "department" msgstr "département" -#: apps/member/models.py:57 +#: apps/member/models.py:56 msgid "Informatics (A0)" msgstr "Informatique (A0)" -#: apps/member/models.py:58 +#: apps/member/models.py:57 msgid "Mathematics (A1)" msgstr "Mathématiques (A1)" -#: apps/member/models.py:59 +#: apps/member/models.py:58 msgid "Physics (A2)" msgstr "Physique (A2)" -#: apps/member/models.py:60 +#: apps/member/models.py:59 msgid "Applied physics (A'2)" msgstr "Physique appliquée (A'2)" -#: apps/member/models.py:61 +#: apps/member/models.py:60 msgid "Chemistry (A''2)" msgstr "Chimie (A''2)" -#: apps/member/models.py:62 +#: apps/member/models.py:61 msgid "Biology (A3)" msgstr "Biologie (A3)" -#: apps/member/models.py:63 +#: apps/member/models.py:62 msgid "SAPHIRE (B1234)" msgstr "SAPHIRE (B1234)" -#: apps/member/models.py:64 +#: apps/member/models.py:63 msgid "Mechanics (B1)" msgstr "Mécanique (B1)" -#: apps/member/models.py:65 +#: apps/member/models.py:64 msgid "Civil engineering (B2)" msgstr "Génie civil (B2)" -#: apps/member/models.py:66 +#: apps/member/models.py:65 msgid "Mechanical engineering (B3)" msgstr "Génie mécanique (B3)" -#: apps/member/models.py:67 +#: apps/member/models.py:66 msgid "EEA (B4)" msgstr "EEA (B4)" -#: apps/member/models.py:68 +#: apps/member/models.py:67 msgid "Design (C)" msgstr "Design (C)" -#: apps/member/models.py:69 +#: apps/member/models.py:68 msgid "Economy-management (D2)" msgstr "Économie-gestion (D2)" -#: apps/member/models.py:70 +#: apps/member/models.py:69 msgid "Social sciences (D3)" msgstr "Sciences sociales (D3)" -#: apps/member/models.py:71 +#: apps/member/models.py:70 msgid "English (E)" msgstr "Anglais (E)" -#: apps/member/models.py:72 +#: apps/member/models.py:71 msgid "External (EXT)" msgstr "Externe (EXT)" -#: apps/member/models.py:79 +#: apps/member/models.py:78 msgid "promotion" msgstr "promotion" -#: apps/member/models.py:80 +#: apps/member/models.py:79 msgid "Year of entry to the school (None if not ENS student)" msgstr "Année d'entrée dans l'école (None si non-étudiant·e de l'ENS)" -#: apps/member/models.py:84 templates/member/profile_info.html:32 +#: apps/member/models.py:83 templates/member/profile_info.html:32 #: templates/registration/future_profile_detail.html:37 #: templates/wei/weimembership_form.html:45 msgid "address" msgstr "adresse" -#: apps/member/models.py:91 +#: apps/member/models.py:90 #: templates/registration/future_profile_detail.html:43 #: templates/wei/weimembership_form.html:51 msgid "paid" msgstr "payé" -#: apps/member/models.py:92 +#: apps/member/models.py:91 msgid "Tells if the user receive a salary." msgstr "Indique si l'utilisateur perçoit un salaire." -#: apps/member/models.py:97 +#: apps/member/models.py:96 msgid "report frequency (in days)" msgstr "fréquence des rapports (en jours)" -#: apps/member/models.py:102 +#: apps/member/models.py:101 msgid "last report date" msgstr "date de dernier rapport" -#: apps/member/models.py:107 +#: apps/member/models.py:106 msgid "email confirmed" msgstr "adresse email confirmée" -#: apps/member/models.py:112 +#: apps/member/models.py:111 msgid "registration valid" msgstr "inscription valid" -#: apps/member/models.py:141 apps/member/models.py:142 +#: apps/member/models.py:140 apps/member/models.py:141 msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:149 +#: apps/member/models.py:148 msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" -#: apps/member/models.py:178 templates/member/club_info.html:57 +#: apps/member/models.py:177 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "courriel" -#: apps/member/models.py:185 +#: apps/member/models.py:184 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:194 +#: apps/member/models.py:193 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:195 +#: apps/member/models.py:194 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:211 templates/member/club_info.html:33 +#: apps/member/models.py:210 templates/member/club_info.html:33 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:212 +#: apps/member/models.py:211 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:219 templates/member/club_info.html:23 +#: apps/member/models.py:218 templates/member/club_info.html:23 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:220 +#: apps/member/models.py:219 msgid "How long after January 1st the members can renew their membership." msgstr "" "Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:227 templates/member/club_info.html:28 +#: apps/member/models.py:226 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:228 +#: apps/member/models.py:227 msgid "" "How long the membership can last after January 1st of the next year after " "members can renew their membership." @@ -545,50 +557,50 @@ msgstr "" "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " "suivante avant que les adhérents peuvent renouveler leur adhésion." -#: apps/member/models.py:262 apps/member/models.py:287 +#: apps/member/models.py:261 apps/member/models.py:286 #: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:263 +#: apps/member/models.py:262 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:297 +#: apps/member/models.py:296 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:301 +#: apps/member/models.py:300 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:353 +#: apps/member/models.py:351 #, 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:364 apps/member/views.py:590 +#: apps/member/models.py:362 apps/member/views.py:592 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:411 +#: apps/member/models.py:409 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:464 +#: apps/member/models.py:462 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:467 +#: apps/member/models.py:465 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:468 +#: apps/member/models.py:466 msgid "memberships" msgstr "adhésions" -#: apps/member/tables.py:114 +#: apps/member/tables.py:116 msgid "Renew" msgstr "Renouveler" @@ -610,39 +622,39 @@ msgstr "Détails de l'utilisateur" msgid "Search user" msgstr "Chercher un utilisateur" -#: apps/member/views.py:203 apps/member/views.py:389 +#: apps/member/views.py:205 apps/member/views.py:391 msgid "Note aliases" msgstr "Alias de la note" -#: apps/member/views.py:217 +#: apps/member/views.py:219 msgid "Update note picture" msgstr "Modifier la photo de la note" -#: apps/member/views.py:275 templates/member/profile_info.html:43 +#: apps/member/views.py:277 templates/member/profile_info.html:43 msgid "Manage auth token" msgstr "Gérer les jetons d'authentification" -#: apps/member/views.py:303 +#: apps/member/views.py:305 msgid "Create new club" msgstr "Créer un nouveau club" -#: apps/member/views.py:315 +#: apps/member/views.py:317 msgid "Search club" msgstr "Chercher un club" -#: apps/member/views.py:340 +#: apps/member/views.py:342 msgid "Club detail" msgstr "Détails du club" -#: apps/member/views.py:406 +#: apps/member/views.py:408 msgid "Update club" msgstr "Modifier le club" -#: apps/member/views.py:440 +#: apps/member/views.py:442 msgid "Add new member to the club" msgstr "Ajouter un nouveau membre au club" -#: apps/member/views.py:581 apps/wei/views.py:862 +#: apps/member/views.py:583 apps/wei/views.py:861 msgid "" "This user don't have enough money to join this club, and can't have a " "negative balance." @@ -650,25 +662,25 @@ 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:594 +#: apps/member/views.py:596 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:599 +#: apps/member/views.py:601 msgid "The membership must begin before {:%m-%d-%Y}." msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}." -#: apps/member/views.py:616 apps/member/views.py:618 apps/member/views.py:620 +#: apps/member/views.py:618 apps/member/views.py:620 apps/member/views.py:622 #: apps/registration/views.py:292 apps/registration/views.py:294 -#: apps/registration/views.py:296 apps/wei/views.py:867 apps/wei/views.py:871 +#: apps/registration/views.py:296 apps/wei/views.py:866 apps/wei/views.py:870 msgid "This field is required." msgstr "Ce champ est requis." -#: apps/member/views.py:704 +#: apps/member/views.py:706 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:729 +#: apps/member/views.py:731 msgid "Members of the club" msgstr "Membres du club" @@ -702,7 +714,7 @@ msgstr "Source" msgid "Destination" msgstr "Destination" -#: apps/note/forms.py:82 templates/note/transaction_form.html:104 +#: apps/note/forms.py:82 templates/note/transaction_form.html:106 msgid "Reason" msgstr "Raison" @@ -893,7 +905,7 @@ msgstr "" "Les montants des notes doivent se trouver entre - 21 474 836.47 € et 21 474 " "836.47 €. Ne cherchez pas à capitaliser l'argent du BDE." -#: apps/note/models/transactions.py:214 +#: apps/note/models/transactions.py:212 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." @@ -901,44 +913,44 @@ msgstr "" "La transaction ne peut pas être sauvegardée puisque la note source ou la " "note de destination n'est pas active." -#: apps/note/models/transactions.py:260 +#: apps/note/models/transactions.py:257 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 -#: templates/note/transaction_form.html:143 +#: templates/note/transaction_form.html:145 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:284 +#: apps/note/models/transactions.py:281 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:287 +#: apps/note/models/transactions.py:284 msgid "recurrent transaction" msgstr "Transaction issue de bouton" -#: apps/note/models/transactions.py:288 +#: apps/note/models/transactions.py:285 msgid "recurrent transactions" msgstr "Transactions issues de boutons" -#: apps/note/models/transactions.py:303 +#: apps/note/models/transactions.py:300 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:308 +#: apps/note/models/transactions.py:305 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:314 +#: apps/note/models/transactions.py:311 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:314 templates/note/transaction_form.html:24 +#: apps/note/models/transactions.py:311 templates/note/transaction_form.html:25 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:325 +#: apps/note/models/transactions.py:322 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -946,19 +958,19 @@ 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:329 +#: apps/note/models/transactions.py:326 msgid "Special transaction" msgstr "Transaction de crédit/retrait" -#: apps/note/models/transactions.py:330 +#: apps/note/models/transactions.py:327 msgid "Special transactions" msgstr "Transactions de crédit/retrait" -#: apps/note/models/transactions.py:346 apps/note/models/transactions.py:351 +#: apps/note/models/transactions.py:343 apps/note/models/transactions.py:348 msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:347 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:344 apps/treasury/models.py:228 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -987,77 +999,77 @@ msgstr "Supprimer" msgid "Edit" msgstr "Éditer" -#: apps/note/views.py:35 +#: apps/note/views.py:34 msgid "Transfer money" msgstr "Transférer de l'argent" -#: apps/note/views.py:75 +#: apps/note/views.py:74 msgid "Create new button" msgstr "Créer un nouveau bouton" -#: apps/note/views.py:84 +#: apps/note/views.py:83 msgid "Search button" msgstr "Chercher un bouton" -#: apps/note/views.py:107 +#: apps/note/views.py:106 msgid "Update button" msgstr "Modifier le bouton" -#: apps/note/views.py:144 templates/base.html:94 +#: apps/note/views.py:143 templates/base.html:94 msgid "Consumptions" msgstr "Consommations" -#: apps/note/views.py:180 +#: apps/note/views.py:179 msgid "Search transactions" msgstr "Rechercher des transactions" -#: apps/permission/models.py:92 +#: apps/permission/models.py:91 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "Can {type} {model}.{field} in {query}" -#: apps/permission/models.py:94 +#: apps/permission/models.py:93 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "Can {type} {model} in {query}" -#: apps/permission/models.py:107 +#: apps/permission/models.py:106 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:120 +#: apps/permission/models.py:119 msgid "permission mask" msgstr "masque de permissions" -#: apps/permission/models.py:121 +#: apps/permission/models.py:120 msgid "permission masks" msgstr "masques de permissions" -#: apps/permission/models.py:127 +#: apps/permission/models.py:126 msgid "add" msgstr "ajouter" -#: apps/permission/models.py:128 +#: apps/permission/models.py:127 msgid "view" msgstr "voir" -#: apps/permission/models.py:129 +#: apps/permission/models.py:128 msgid "change" msgstr "modifier" -#: apps/permission/models.py:161 +#: apps/permission/models.py:160 msgid "query" msgstr "requête" -#: apps/permission/models.py:174 +#: apps/permission/models.py:173 msgid "mask" msgstr "masque" -#: apps/permission/models.py:180 +#: apps/permission/models.py:179 msgid "field" msgstr "champ" -#: apps/permission/models.py:185 +#: apps/permission/models.py:184 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." @@ -1065,29 +1077,29 @@ msgstr "" "Indique si la permission doit être attribuée même si l'adhésion de " "l'utilisateur est expirée." -#: apps/permission/models.py:186 templates/permission/all_rights.html:36 +#: apps/permission/models.py:185 templates/permission/all_rights.html:36 msgid "permanent" msgstr "permanent" -#: apps/permission/models.py:197 +#: apps/permission/models.py:196 msgid "permission" msgstr "permission" -#: apps/permission/models.py:198 apps/permission/models.py:337 +#: apps/permission/models.py:197 apps/permission/models.py:336 msgid "permissions" msgstr "permissions" -#: apps/permission/models.py:203 +#: apps/permission/models.py:202 msgid "Specifying field applies only to view and change permission types." msgstr "" "Spécifie le champ concerné, ne fonctionne que pour les permissions view et " "change." -#: apps/permission/models.py:342 +#: apps/permission/models.py:341 msgid "for club" msgstr "s'applique au club" -#: apps/permission/models.py:352 apps/permission/models.py:353 +#: apps/permission/models.py:351 apps/permission/models.py:352 msgid "role permissions" msgstr "Permissions par rôles" @@ -1247,7 +1259,7 @@ msgid "No attached remittance" msgstr "Pas de remise associée" #: apps/treasury/forms.py:136 apps/treasury/tables.py:47 -#: apps/treasury/tables.py:115 templates/note/transaction_form.html:97 +#: apps/treasury/tables.py:115 templates/note/transaction_form.html:99 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "Montant" @@ -1268,7 +1280,7 @@ msgstr "Objet" msgid "Description" msgstr "Description" -#: apps/treasury/models.py:49 templates/note/transaction_form.html:123 +#: apps/treasury/models.py:49 templates/note/transaction_form.html:125 msgid "Name" msgstr "Nom" @@ -1443,17 +1455,17 @@ msgstr "Liste des crédits de la Société générale" 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:50 apps/wei/models.py:51 -#: apps/wei/models.py:62 apps/wei/models.py:168 templates/base.html:124 +#: 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 templates/base.html:124 msgid "WEI" msgstr "WEI" -#: apps/wei/forms/registration.py:50 apps/wei/models.py:114 -#: apps/wei/models.py:299 +#: apps/wei/forms/registration.py:49 apps/wei/models.py:113 +#: apps/wei/models.py:298 msgid "bus" msgstr "Bus" -#: apps/wei/forms/registration.py:51 +#: apps/wei/forms/registration.py:50 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." @@ -1462,11 +1474,11 @@ msgstr "" "attribuer un bus et une équipe, en particulier si vous êtes un électron " "libre." -#: apps/wei/forms/registration.py:58 +#: apps/wei/forms/registration.py:57 msgid "Team" msgstr "Équipe" -#: apps/wei/forms/registration.py:60 +#: apps/wei/forms/registration.py:59 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" @@ -1474,118 +1486,118 @@ msgstr "" "Laissez ce champ vide si vous ne serez pas dans une équipe (staff, chef de " "bus ou électron libre)" -#: apps/wei/forms/registration.py:66 apps/wei/forms/registration.py:76 -#: apps/wei/models.py:149 +#: apps/wei/forms/registration.py:65 apps/wei/forms/registration.py:75 +#: apps/wei/models.py:148 msgid "WEI Roles" msgstr "Rôles au WEI" -#: apps/wei/forms/registration.py:67 +#: apps/wei/forms/registration.py:66 msgid "Select the roles that you are interested in." msgstr "Sélectionnez les rôles qui vous intéressent." -#: apps/wei/forms/registration.py:112 +#: apps/wei/forms/registration.py:111 msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." -#: apps/wei/models.py:25 templates/wei/weiclub_info.html:23 +#: apps/wei/models.py:24 templates/wei/weiclub_info.html:23 msgid "year" msgstr "année" -#: apps/wei/models.py:29 templates/wei/weiclub_info.html:17 +#: apps/wei/models.py:28 templates/wei/weiclub_info.html:17 msgid "date start" msgstr "début" -#: apps/wei/models.py:33 templates/wei/weiclub_info.html:20 +#: apps/wei/models.py:32 templates/wei/weiclub_info.html:20 msgid "date end" msgstr "fin" -#: apps/wei/models.py:78 +#: apps/wei/models.py:77 msgid "survey information" msgstr "informations sur le questionnaire" -#: apps/wei/models.py:79 +#: apps/wei/models.py:78 msgid "Information about the survey for new members, encoded in JSON" msgstr "" "Informations sur le sondage pour les nouveaux membres, encodées en JSON" -#: apps/wei/models.py:101 +#: apps/wei/models.py:100 msgid "Bus" msgstr "Bus" -#: apps/wei/models.py:102 templates/wei/weiclub_tables.html:32 +#: apps/wei/models.py:101 templates/wei/weiclub_tables.html:32 msgid "Buses" msgstr "Bus" -#: apps/wei/models.py:123 +#: apps/wei/models.py:122 msgid "color" msgstr "couleur" -#: apps/wei/models.py:124 +#: apps/wei/models.py:123 msgid "The color of the T-Shirt, stored with its number equivalent" msgstr "" "La couleur du T-Shirt, stocké sous la forme de son équivalent numérique" -#: apps/wei/models.py:138 +#: apps/wei/models.py:137 msgid "Bus team" msgstr "Équipe de bus" -#: apps/wei/models.py:139 +#: apps/wei/models.py:138 msgid "Bus teams" msgstr "Équipes de bus" -#: apps/wei/models.py:148 +#: apps/wei/models.py:147 msgid "WEI Role" msgstr "Rôle au WEI" -#: apps/wei/models.py:173 +#: apps/wei/models.py:172 msgid "Credit from Société générale" msgstr "Crédit de la Société générale" -#: apps/wei/models.py:178 +#: apps/wei/models.py:177 msgid "Caution check given" msgstr "Chèque de caution donné" -#: apps/wei/models.py:182 templates/wei/weimembership_form.html:68 +#: apps/wei/models.py:181 templates/wei/weimembership_form.html:68 msgid "birth date" msgstr "date de naissance" -#: apps/wei/models.py:188 apps/wei/models.py:198 +#: apps/wei/models.py:187 apps/wei/models.py:197 msgid "Male" msgstr "Homme" -#: apps/wei/models.py:189 apps/wei/models.py:199 +#: apps/wei/models.py:188 apps/wei/models.py:198 msgid "Female" msgstr "Femme" -#: apps/wei/models.py:190 +#: apps/wei/models.py:189 msgid "Non binary" msgstr "Non-binaire" -#: apps/wei/models.py:192 templates/wei/weimembership_form.html:59 +#: apps/wei/models.py:191 templates/wei/weimembership_form.html:59 msgid "gender" msgstr "genre" -#: apps/wei/models.py:201 templates/wei/weimembership_form.html:62 +#: apps/wei/models.py:200 templates/wei/weimembership_form.html:62 msgid "clothing cut" msgstr "coupe de vêtement" -#: apps/wei/models.py:214 templates/wei/weimembership_form.html:65 +#: apps/wei/models.py:213 templates/wei/weimembership_form.html:65 msgid "clothing size" msgstr "taille de vêtement" -#: apps/wei/models.py:220 templates/wei/weimembership_form.html:71 +#: apps/wei/models.py:219 templates/wei/weimembership_form.html:71 msgid "health issues" msgstr "problèmes de santé" -#: apps/wei/models.py:225 templates/wei/weimembership_form.html:74 +#: apps/wei/models.py:224 templates/wei/weimembership_form.html:74 msgid "emergency contact name" msgstr "Nom du contact en cas d'urgence" -#: apps/wei/models.py:230 templates/wei/weimembership_form.html:77 +#: apps/wei/models.py:229 templates/wei/weimembership_form.html:77 msgid "emergency contact phone" msgstr "Téléphone du contact en cas d'urgence" -#: apps/wei/models.py:235 templates/wei/weimembership_form.html:80 +#: apps/wei/models.py:234 templates/wei/weimembership_form.html:80 msgid "" "Register on the mailing list to stay informed of the events of the campus (1 " "mail/week)" @@ -1593,7 +1605,7 @@ msgstr "" "S'inscrire sur la liste de diffusion pour rester informé des événements sur " "le campus (1 mail par semaine)" -#: apps/wei/models.py:240 templates/wei/weimembership_form.html:83 +#: apps/wei/models.py:239 templates/wei/weimembership_form.html:83 msgid "" "Register on the mailing list to stay informed of the sport events of the " "campus (1 mail/week)" @@ -1601,7 +1613,7 @@ msgstr "" "S'inscrire sur la liste de diffusion pour rester informé des actualités " "sportives sur le campus (1 mail par semaine)" -#: apps/wei/models.py:245 templates/wei/weimembership_form.html:86 +#: apps/wei/models.py:244 templates/wei/weimembership_form.html:86 msgid "" "Register on the mailing list to stay informed of the art events of the " "campus (1 mail/week)" @@ -1609,19 +1621,19 @@ msgstr "" "S'inscrire sur la liste de diffusion pour rester informé des actualités " "artistiques sur le campus (1 mail par semaine)" -#: apps/wei/models.py:250 templates/wei/weimembership_form.html:56 +#: apps/wei/models.py:249 templates/wei/weimembership_form.html:56 msgid "first year" msgstr "première année" -#: apps/wei/models.py:251 +#: apps/wei/models.py:250 msgid "Tells if the user is new in the school." msgstr "Indique si l'utilisateur est nouveau dans l'école." -#: apps/wei/models.py:256 +#: apps/wei/models.py:255 msgid "registration information" msgstr "informations sur l'inscription" -#: apps/wei/models.py:257 +#: apps/wei/models.py:256 msgid "" "Information about the registration (buses for old members, survey fot the " "new members), encoded in JSON" @@ -1629,27 +1641,27 @@ msgstr "" "Informations sur l'inscription (bus pour les 2A+, questionnaire pour les " "1A), encodées en JSON" -#: apps/wei/models.py:288 +#: apps/wei/models.py:287 msgid "WEI User" msgstr "Participant au WEI" -#: apps/wei/models.py:289 +#: apps/wei/models.py:288 msgid "WEI Users" msgstr "Participants au WEI" -#: apps/wei/models.py:309 +#: apps/wei/models.py:308 msgid "team" msgstr "équipe" -#: apps/wei/models.py:319 +#: apps/wei/models.py:318 msgid "WEI registration" msgstr "inscription au WEI" -#: apps/wei/models.py:323 +#: apps/wei/models.py:322 msgid "WEI membership" msgstr "adhésion au WEI" -#: apps/wei/models.py:324 +#: apps/wei/models.py:323 msgid "WEI memberships" msgstr "adhésions au WEI" @@ -1675,75 +1687,75 @@ msgstr "Nombre de membres" msgid "members" msgstr "adhérents" -#: apps/wei/views.py:57 +#: apps/wei/views.py:56 msgid "Search WEI" msgstr "Chercher un WEI" -#: apps/wei/views.py:75 templates/wei/weiclub_list.html:10 +#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10 msgid "Create WEI" msgstr "Créer un WEI" -#: apps/wei/views.py:95 +#: apps/wei/views.py:94 msgid "WEI Detail" msgstr "Détails du WEI" -#: apps/wei/views.py:190 +#: apps/wei/views.py:189 msgid "View members of the WEI" msgstr "Voir les membres du WEI" -#: apps/wei/views.py:218 +#: apps/wei/views.py:217 msgid "Find WEI Membership" msgstr "Trouver une adhésion au WEI" -#: apps/wei/views.py:228 +#: apps/wei/views.py:227 msgid "View registrations to the WEI" msgstr "Voir les inscriptions au WEI" -#: apps/wei/views.py:252 +#: apps/wei/views.py:251 msgid "Find WEI Registration" msgstr "Trouver une inscription au WEI" -#: apps/wei/views.py:263 +#: apps/wei/views.py:262 msgid "Update the WEI" msgstr "Modifier le WEI" -#: apps/wei/views.py:284 +#: apps/wei/views.py:283 msgid "Create new bus" msgstr "Ajouter un nouveau bus" -#: apps/wei/views.py:315 +#: apps/wei/views.py:314 msgid "Update bus" msgstr "Modifier le bus" -#: apps/wei/views.py:345 +#: apps/wei/views.py:344 msgid "Manage bus" msgstr "Gérer le bus" -#: apps/wei/views.py:372 +#: apps/wei/views.py:371 msgid "Create new team" msgstr "Créer une nouvelle équipe" -#: apps/wei/views.py:404 +#: apps/wei/views.py:403 msgid "Update team" msgstr "Modifier l'équipe" -#: apps/wei/views.py:435 +#: apps/wei/views.py:434 msgid "Manage WEI team" msgstr "Gérer l'équipe WEI" -#: apps/wei/views.py:457 +#: apps/wei/views.py:456 msgid "Register first year student to the WEI" msgstr "Inscrire un 1A au WEI" -#: apps/wei/views.py:469 templates/wei/weiclub_info.html:62 +#: apps/wei/views.py:468 templates/wei/weiclub_info.html:62 msgid "Register 1A" msgstr "Inscrire un 1A" -#: apps/wei/views.py:490 apps/wei/views.py:561 +#: apps/wei/views.py:489 apps/wei/views.py:560 msgid "This user is already registered to this WEI." msgstr "Cette personne est déjà inscrite au WEI." -#: apps/wei/views.py:495 +#: apps/wei/views.py:494 msgid "" "This user can't be in her/his first year since he/she has already participed " "to a WEI." @@ -1751,39 +1763,39 @@ msgstr "" "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà " "participé à un WEI." -#: apps/wei/views.py:512 +#: apps/wei/views.py:511 msgid "Register old student to the WEI" msgstr "Inscrire un 2A+ au WEI" -#: apps/wei/views.py:524 templates/wei/weiclub_info.html:65 +#: apps/wei/views.py:523 templates/wei/weiclub_info.html:65 msgid "Register 2A+" msgstr "Inscrire un 2A+" -#: apps/wei/views.py:543 apps/wei/views.py:628 +#: apps/wei/views.py:542 apps/wei/views.py:627 msgid "You already opened an account in the Société générale." msgstr "Vous avez déjà ouvert un compte auprès de la société générale." -#: apps/wei/views.py:591 +#: apps/wei/views.py:590 msgid "Update WEI Registration" msgstr "Modifier l'inscription WEI" -#: apps/wei/views.py:687 +#: apps/wei/views.py:686 msgid "Delete WEI registration" msgstr "Supprimer l'inscription WEI" -#: apps/wei/views.py:698 +#: apps/wei/views.py:697 msgid "You don't have the right to delete this WEI registration." msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI." -#: apps/wei/views.py:717 +#: apps/wei/views.py:716 msgid "Validate WEI registration" msgstr "Valider l'inscription WEI" -#: apps/wei/views.py:856 +#: apps/wei/views.py:855 msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:918 apps/wei/views.py:971 apps/wei/views.py:981 +#: apps/wei/views.py:917 apps/wei/views.py:970 apps/wei/views.py:980 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -1854,40 +1866,12 @@ msgstr "" "erreur, qui sera corrigée rapidement. Vous pouvez désormais aller boire une " "bière." -#: templates/activity/activity_detail.html:29 -msgid "creater" -msgstr "Créateur" - -#: templates/activity/activity_detail.html:50 -msgid "opened" -msgstr "ouvert" - -#: templates/activity/activity_detail.html:57 -msgid "Entry page" -msgstr "Page des entrées" - -#: templates/activity/activity_detail.html:61 -msgid "close" -msgstr "fermer" - -#: templates/activity/activity_detail.html:64 -msgid "invalidate" -msgstr "dévalider" - -#: templates/activity/activity_detail.html:64 -msgid "validate" -msgstr "valider" - -#: templates/activity/activity_detail.html:70 -msgid "Invite" -msgstr "Inviter" - -#: templates/activity/activity_detail.html:77 +#: templates/activity/activity_detail.html:14 msgid "Guests list" msgstr "Liste des invités" #: templates/activity/activity_entry.html:22 -#: templates/note/transaction_form.html:29 +#: templates/note/transaction_form.html:31 msgid "Entries" msgstr "Entrées" @@ -1895,19 +1879,51 @@ msgstr "Entrées" msgid "Return to activity page" msgstr "Retour à la page de l'activité" -#: templates/activity/activity_list.html:5 +#: templates/activity/activity_info.html:32 +msgid "creater" +msgstr "Créateur" + +#: templates/activity/activity_info.html:53 +msgid "opened" +msgstr "ouvert" + +#: templates/activity/activity_info.html:60 +msgid "Entry page" +msgstr "Page des entrées" + +#: templates/activity/activity_info.html:65 +msgid "close" +msgstr "fermer" + +#: templates/activity/activity_info.html:68 +msgid "invalidate" +msgstr "dévalider" + +#: templates/activity/activity_info.html:68 +msgid "validate" +msgstr "valider" + +#: templates/activity/activity_info.html:74 +msgid "Invite" +msgstr "Inviter" + +#: templates/activity/activity_list.html:6 +msgid "Current activity" +msgstr "Activité en cours" + +#: templates/activity/activity_list.html:13 msgid "Upcoming activities" msgstr "Activités à venir" -#: templates/activity/activity_list.html:10 +#: templates/activity/activity_list.html:18 msgid "There is no planned activity." msgstr "Il n'y a pas d'activité prévue." -#: templates/activity/activity_list.html:14 +#: templates/activity/activity_list.html:22 msgid "New activity" msgstr "Nouvelle activité" -#: templates/activity/activity_list.html:18 +#: templates/activity/activity_list.html:26 msgid "All activities" msgstr "Toutes les activités" @@ -2106,8 +2122,8 @@ msgstr "Inscriptions" msgid "Consum" msgstr "Consommer" -#: templates/note/conso_form.html:41 templates/note/transaction_form.html:57 -#: templates/note/transaction_form.html:78 +#: templates/note/conso_form.html:41 templates/note/transaction_form.html:59 +#: templates/note/transaction_form.html:80 msgid "Name or alias..." msgstr "Pseudo ou alias ..." @@ -2131,27 +2147,27 @@ msgstr "Consommations simples" msgid "Double consumptions" msgstr "Consommations doubles" -#: templates/note/conso_form.html:152 templates/note/transaction_form.html:154 +#: templates/note/conso_form.html:152 templates/note/transaction_form.html:156 msgid "Recent transactions history" msgstr "Historique des transactions récentes" -#: templates/note/transaction_form.html:51 +#: templates/note/transaction_form.html:53 msgid "Select emitters" msgstr "Sélection des émetteurs" -#: templates/note/transaction_form.html:61 +#: templates/note/transaction_form.html:63 msgid "I am the emitter" msgstr "Je suis l'émetteur" -#: templates/note/transaction_form.html:72 +#: templates/note/transaction_form.html:74 msgid "Select receivers" msgstr "Sélection des destinataires" -#: templates/note/transaction_form.html:89 +#: templates/note/transaction_form.html:91 msgid "Action" msgstr "Action" -#: templates/note/transaction_form.html:113 +#: templates/note/transaction_form.html:115 msgid "Transfer type" msgstr "Type de transfert" diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html index a955d194..37dcb9a4 100644 --- a/templates/activity/activity_detail.html +++ b/templates/activity/activity_detail.html @@ -7,70 +7,7 @@ {% block content %} -

        -
        -

        {{ activity.name }}

        -
        -
        -
        -
        {% trans 'description'|capfirst %}
        -
        {{ activity.description }}
        - -
        {% trans 'type'|capfirst %}
        -
        {{ activity.activity_type }}
        - -
        {% trans 'start date'|capfirst %}
        -
        {{ activity.date_start }}
        - -
        {% trans 'end date'|capfirst %}
        -
        {{ activity.date_end }}
        - - {% if ".view_"|has_perm:activity.creater %} -
        {% trans 'creater'|capfirst %}
        -
        {{ activity.creater }}
        - {% endif %} - -
        {% trans 'organizer'|capfirst %}
        -
        {{ activity.organizer }}
        - -
        {% trans 'attendees club'|capfirst %}
        -
        {{ activity.attendees_club }}
        - -
        {% trans 'can invite'|capfirst %}
        -
        {{ activity.activity_type.can_invite|yesno }}
        - - {% if activity.activity_type.can_invite %} -
        {% trans 'guest entry fee'|capfirst %}
        -
        {{ activity.activity_type.guest_entry_fee|pretty_money }}
        - {% endif %} - -
        {% trans 'valid'|capfirst %}
        -
        {{ activity.valid|yesno }}
        - -
        {% trans 'opened'|capfirst %}
        -
        {{ activity.open|yesno }}
        -
        -
        - -
        - {% if activity.open and ".change__open"|has_perm:activity %} - {% trans "Entry page" %} - {% endif %} - - {% if activity.valid and ".change__open"|has_perm:activity %} - {% if activity.open %}{% trans "close"|capfirst %}{% else %}{% trans "open"|capfirst %}{% endif %} - {% endif %} - {% if not activity.open and ".change__valid"|has_perm:activity %} - {% if activity.valid %}{% trans "invalidate"|capfirst %}{% else %}{% trans "validate"|capfirst %}{% endif %} - {% endif %} - {% if ".change_"|has_perm:activity %} - {% trans "edit"|capfirst %} - {% endif %} - {% if activity.activity_type.can_invite and not activity_started %} - {% trans "Invite" %} - {% endif %} -
        -
        + {% include "activity/activity_info.html" %} {% if guests.data %}
        diff --git a/templates/activity/activity_entry.html b/templates/activity/activity_entry.html index abf4eef8..cca044e2 100644 --- a/templates/activity/activity_entry.html +++ b/templates/activity/activity_entry.html @@ -76,7 +76,10 @@ note: id, guest: null }).done(function () { - addMsg("Entrée effectuée !", "success", 4000); + if (target.hasClass("table-info")) + addMsg("Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.", "warning", 10000); + else + addMsg("Entrée effectuée !", "success", 4000); reloadTable(true); }).fail(function(xhr) { errMsg(xhr.responseJSON, 4000); @@ -104,7 +107,10 @@ note: target.attr("data-inviter"), guest: id }).done(function () { - addMsg("Entrée effectuée !", "success", 4000); + if (target.hasClass("table-info")) + addMsg("Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.", "warning", 10000); + else + addMsg("Entrée effectuée !", "success", 4000); reloadTable(true); }).fail(function (xhr) { errMsg(xhr.responseJSON, 4000); diff --git a/templates/activity/activity_info.html b/templates/activity/activity_info.html new file mode 100644 index 00000000..4eb6dd29 --- /dev/null +++ b/templates/activity/activity_info.html @@ -0,0 +1,78 @@ +{% load i18n %} +{% load perms %} +{% load pretty_money %} + +{% url 'activity:activity_detail' activity.pk as activity_detail_url %} + +
        +
        +

        + {% if request.path_info != activity_detail_url %} + {{ activity.name }} + {% else %} + {{ activity.name }} + {% endif %} +

        +
        +
        +
        +
        {% trans 'description'|capfirst %}
        +
        {{ activity.description }}
        + +
        {% trans 'type'|capfirst %}
        +
        {{ activity.activity_type }}
        + +
        {% trans 'start date'|capfirst %}
        +
        {{ activity.date_start }}
        + +
        {% trans 'end date'|capfirst %}
        +
        {{ activity.date_end }}
        + + {% if ".view_"|has_perm:activity.creater %} +
        {% trans 'creater'|capfirst %}
        +
        {{ activity.creater }}
        + {% endif %} + +
        {% trans 'organizer'|capfirst %}
        +
        {{ activity.organizer }}
        + +
        {% trans 'attendees club'|capfirst %}
        +
        {{ activity.attendees_club }}
        + +
        {% trans 'can invite'|capfirst %}
        +
        {{ activity.activity_type.can_invite|yesno }}
        + + {% if activity.activity_type.can_invite %} +
        {% trans 'guest entry fee'|capfirst %}
        +
        {{ activity.activity_type.guest_entry_fee|pretty_money }}
        + {% endif %} + +
        {% trans 'valid'|capfirst %}
        +
        {{ activity.valid|yesno }}
        + +
        {% trans 'opened'|capfirst %}
        +
        {{ activity.open|yesno }}
        +
        +
        + +
        + {% if activity.open and activity.activity_type.manage_entries and ".change__open"|has_perm:activity %} + {% trans "Entry page" %} + {% endif %} + + {% if request.path_info == activity_detail_url %} + {% if activity.valid and ".change__open"|has_perm:activity %} + {% if activity.open %}{% trans "close"|capfirst %}{% else %}{% trans "open"|capfirst %}{% endif %} + {% endif %} + {% if not activity.open and ".change__valid"|has_perm:activity %} + {% if activity.valid %}{% trans "invalidate"|capfirst %}{% else %}{% trans "validate"|capfirst %}{% endif %} + {% endif %} + {% if ".change_"|has_perm:activity %} + {% trans "edit"|capfirst %} + {% endif %} + {% if activity.activity_type.can_invite and not activity_started %} + {% trans "Invite" %} + {% endif %} + {% endif %} +
        +
        \ No newline at end of file diff --git a/templates/activity/activity_list.html b/templates/activity/activity_list.html index f2871fd6..bf1d846b 100644 --- a/templates/activity/activity_list.html +++ b/templates/activity/activity_list.html @@ -2,6 +2,14 @@ {% load render_table from django_tables2 %} {% load i18n crispy_forms_tags%} {% block content %} + {% if started_activities %} +

        {% trans "Current activity" %}

        + {% for activity in started_activities %} + {% include "activity/activity_info.html" %} +
        + {% endfor %} + {% endif %} +

        {% trans "Upcoming activities" %}

        {% if upcoming.data %} {% render_table upcoming %} diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html index 8494c22b..4715e79f 100644 --- a/templates/note/transaction_form.html +++ b/templates/note/transaction_form.html @@ -19,10 +19,12 @@ SPDX-License-Identifier: GPL-2.0-or-later {% trans "Credit" %} - + {% if not activities_open %} + + {% endif %} {% endif %} {% for activity in activities_open %} From 5b3361f086d26c6f0fdcf81109e6c23d91979b1a Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 18:05:58 +0200 Subject: [PATCH 073/319] Product quantity must be positive --- apps/treasury/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/treasury/models.py b/apps/treasury/models.py index 90366e7e..6cfb55c1 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -82,7 +82,7 @@ class Product(models.Model): verbose_name=_("Designation"), ) - quantity = models.IntegerField( + quantity = models.PositiveIntegerField( verbose_name=_("Quantity") ) From d95cd8c7c7cd220f92f924e8b78f613ab9d1e0a7 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 18:27:57 +0200 Subject: [PATCH 074/319] :art: Better autocomplete field --- apps/api/urls.py | 2 +- apps/member/views.py | 4 ++-- static/js/autocomplete_model.js | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/api/urls.py b/apps/api/urls.py index 03d6bd68..b74efc88 100644 --- a/apps/api/urls.py +++ b/apps/api/urls.py @@ -54,7 +54,7 @@ class UserViewSet(ReadProtectedModelViewSet): serializer_class = UserSerializer filter_backends = [DjangoFilterBackend, SearchFilter] filterset_fields = ['id', 'username', 'first_name', 'last_name', 'email', 'is_superuser', 'is_staff', 'is_active', ] - search_fields = ['$username', '$first_name', '$last_name', ] + search_fields = ['$username', '$first_name', '$last_name', '$note__alias__name', '$note__alias__normalized_name', ] # This ViewSet is the only one that is accessible from all authenticated users! diff --git a/apps/member/views.py b/apps/member/views.py index 83304b06..ebcd9d7b 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -326,8 +326,8 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView): qs = qs.filter( Q(name__iregex=pattern) - | Q(note__alias__name__iregex="^" + pattern) - | Q(note__alias__normalized_name__iregex=Alias.normalize("^" + pattern)) + | Q(note__alias__name__iregex=pattern) + | Q(note__alias__normalized_name__iregex=Alias.normalize(pattern)) ) return qs diff --git a/static/js/autocomplete_model.js b/static/js/autocomplete_model.js index 9d9ba2d3..c4f9405b 100644 --- a/static/js/autocomplete_model.js +++ b/static/js/autocomplete_model.js @@ -10,6 +10,8 @@ $(document).ready(function () { if (!name_field) name_field = "name"; let 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) { @@ -27,6 +29,10 @@ $(document).ready(function () { target.val(obj[name_field]); $("#" + prefix + "_pk").val(obj.id); + results_list.html(""); + target.removeClass("is-invalid"); + target.addClass("is-valid"); + if (typeof autocompleted != 'undefined') autocompleted(obj, prefix) }); From f222ba134d9f29eba50a089f8058a2628b2c621e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 19:39:40 +0200 Subject: [PATCH 075/319] :bug: Remove \eaddto in the invoice template, unicode characters weren't supported --- templates/treasury/invoice_sample.tex | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index cf79029e..b20eff3b 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -24,8 +24,6 @@ \FPround{\prix}{#3}{2} \FPround{\montant}{#4}{2} \FPadd{\TotalHT}{\TotalHT}{\montant} - - \eaddto\ListeProduits{#1 & \prix & #2 & \montant \cr} } \newcommand{\AfficheResultat}{% @@ -48,15 +46,12 @@ \textbf{Total TTC} & & & \TotalTTC } -\newcommand*\eaddto[2]{% version développée de \addto - \edef\tmp{#2}% - \expandafter\addto - \expandafter#1% - \expandafter{\tmp}% +\newcommand {\ListeProduits}{ + {% for product in products %} + {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex }} & {{ product.quantity|safe|escape_tex }} & {{ product.total_euros|safe|escape_tex }} \cr + {% endfor %} } -\newcommand {\ListeProduits}{} - % Logo du BDE \AddToShipoutPicture*{ \put(0,0){ From 48a7128370d4c2624e2b6c7aa6c2112af5212c56 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 19:42:22 +0200 Subject: [PATCH 076/319] =?UTF-8?q?:package:=20On=20a=20d=C3=A9m=C3=A9nag?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/treasury/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 2fbe4777..76fd4f46 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -142,10 +142,10 @@ class InvoiceRenderView(LoginRequiredMixin, View): products = Product.objects.filter(invoice=invoice).all() # Informations of the BDE. Should be updated when the school will move. - invoice.place = "Cachan" - invoice.my_name = "BDE ENS Cachan" - invoice.my_address_street = "61 avenue du Président Wilson" - invoice.my_city = "94230 Cachan" + invoice.place = "Gif-sur-Yvette" + invoice.my_name = "BDE ENS Paris-Saclay" + invoice.my_address_street = "4 avenue des Sciences" + invoice.my_city = "91190 Gif-sur-Yvette" invoice.bank_code = 30003 invoice.desk_code = 3894 invoice.account_number = 37280662 From fd2f426f559d758d82c6283ddf059637a3d5456b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 19:56:37 +0200 Subject: [PATCH 077/319] :bug: Fix signup --- apps/member/forms.py | 2 ++ apps/member/models.py | 2 +- locale/de/LC_MESSAGES/django.po | 30 +++++++++++++++++------------- locale/fr/LC_MESSAGES/django.po | 30 +++++++++++++++++------------- 4 files changed, 37 insertions(+), 27 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index c8e405ac..2934bbee 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -37,6 +37,8 @@ class ProfileForm(forms.ModelForm): """ A form for the extras field provided by the :model:`member.Profile` model. """ + report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency")) + last_report = forms.DateField(required=False, disabled=True, label=_("Last report date")) def save(self, commit=True): diff --git a/apps/member/models.py b/apps/member/models.py index 90117f35..cdcb6af2 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -99,7 +99,7 @@ class Profile(models.Model): last_report = models.DateField( verbose_name=_("last report date"), - default=timezone.now, + default=timezone.now().date(), ) email_confirmed = models.BooleanField( diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index d54f1006..8698220f 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 17:40+0200\n" +"POT-Creation-Date: 2020-08-06 19:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -198,13 +198,13 @@ msgstr "" msgid "Type" msgstr "" -#: apps/activity/tables.py:81 apps/member/forms.py:104 +#: apps/activity/tables.py:81 apps/member/forms.py:106 #: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/wei/forms/registration.py:94 msgid "Last name" msgstr "" -#: apps/activity/tables.py:83 apps/member/forms.py:109 +#: apps/activity/tables.py:83 apps/member/forms.py:111 #: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 msgid "First name" @@ -327,52 +327,56 @@ msgid "member" msgstr "" #: apps/member/forms.py:40 +msgid "Report frequency" +msgstr "" + +#: apps/member/forms.py:42 msgid "Last report date" msgstr "" -#: apps/member/forms.py:60 apps/member/views.py:86 +#: apps/member/forms.py:62 apps/member/views.py:86 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/forms.py:83 apps/registration/forms.py:50 +#: apps/member/forms.py:85 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "" -#: apps/member/forms.py:85 apps/registration/forms.py:52 +#: apps/member/forms.py:87 apps/registration/forms.py:52 msgid "Check this case is the Société Générale paid the inscription." msgstr "" -#: apps/member/forms.py:90 apps/registration/forms.py:57 +#: apps/member/forms.py:92 apps/registration/forms.py:57 #: apps/wei/forms/registration.py:81 msgid "Credit type" msgstr "" -#: apps/member/forms.py:91 apps/registration/forms.py:58 +#: apps/member/forms.py:93 apps/registration/forms.py:58 #: apps/wei/forms/registration.py:82 msgid "No credit" msgstr "" -#: apps/member/forms.py:93 +#: apps/member/forms.py:95 msgid "You can credit the note of the user." msgstr "" -#: apps/member/forms.py:97 apps/registration/forms.py:63 +#: apps/member/forms.py:99 apps/registration/forms.py:63 #: apps/wei/forms/registration.py:87 msgid "Credit amount" msgstr "" -#: apps/member/forms.py:114 apps/registration/forms.py:80 +#: apps/member/forms.py:116 apps/registration/forms.py:80 #: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 #: templates/note/transaction_form.html:137 msgid "Bank" msgstr "" -#: apps/member/forms.py:141 +#: apps/member/forms.py:143 msgid "User" msgstr "" -#: apps/member/forms.py:155 +#: apps/member/forms.py:157 msgid "Roles" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e9b09431..517bfeed 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 17:40+0200\n" +"POT-Creation-Date: 2020-08-06 19:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -199,13 +199,13 @@ msgstr "supprimer" msgid "Type" msgstr "Type" -#: apps/activity/tables.py:81 apps/member/forms.py:104 +#: apps/activity/tables.py:81 apps/member/forms.py:106 #: apps/registration/forms.py:70 apps/treasury/forms.py:130 #: apps/wei/forms/registration.py:94 msgid "Last name" msgstr "Nom de famille" -#: apps/activity/tables.py:83 apps/member/forms.py:109 +#: apps/activity/tables.py:83 apps/member/forms.py:111 #: apps/registration/forms.py:75 apps/treasury/forms.py:132 #: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 msgid "First name" @@ -328,52 +328,56 @@ msgid "member" msgstr "adhérent" #: apps/member/forms.py:40 +msgid "Report frequency" +msgstr "Fréquence des rapports (en jours)" + +#: apps/member/forms.py:42 msgid "Last report date" msgstr "Date de dernier rapport" -#: apps/member/forms.py:60 apps/member/views.py:86 +#: apps/member/forms.py:62 apps/member/views.py:86 #: apps/registration/forms.py:28 msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:83 apps/registration/forms.py:50 +#: apps/member/forms.py:85 apps/registration/forms.py:50 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:85 apps/registration/forms.py:52 +#: apps/member/forms.py:87 apps/registration/forms.py:52 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:90 apps/registration/forms.py:57 +#: apps/member/forms.py:92 apps/registration/forms.py:57 #: apps/wei/forms/registration.py:81 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:91 apps/registration/forms.py:58 +#: apps/member/forms.py:93 apps/registration/forms.py:58 #: apps/wei/forms/registration.py:82 msgid "No credit" msgstr "Pas de rechargement" -#: apps/member/forms.py:93 +#: apps/member/forms.py:95 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:97 apps/registration/forms.py:63 +#: apps/member/forms.py:99 apps/registration/forms.py:63 #: apps/wei/forms/registration.py:87 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:114 apps/registration/forms.py:80 +#: apps/member/forms.py:116 apps/registration/forms.py:80 #: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 #: templates/note/transaction_form.html:137 msgid "Bank" msgstr "Banque" -#: apps/member/forms.py:141 +#: apps/member/forms.py:143 msgid "User" msgstr "Utilisateur" -#: apps/member/forms.py:155 +#: apps/member/forms.py:157 msgid "Roles" msgstr "Rôles" From 86ff23357c8754ff073b77ee591858c5a8b82a3b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 20:19:29 +0200 Subject: [PATCH 078/319] Display what is matched in user table (experimental, normalizing is not working) --- templates/member/user_list.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/member/user_list.html b/templates/member/user_list.html index 658292b0..eeb616fe 100644 --- a/templates/member/user_list.html +++ b/templates/member/user_list.html @@ -57,6 +57,10 @@ window.document.location = $(this).data("href"); timer_on = false; }); + + $("tr > td:eq(0), tr > td:eq(1), tr > td:eq(2), tr > td:eq(3), tr > td:eq(5)").each(function() { + $(this).html($(this).text().replace(new RegExp(searchbar_obj.val(), 'i'), "$&")); + }); } init(); From bb8e3aaccf121b2492253aedbaf314baffcff912 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 20:21:35 +0200 Subject: [PATCH 079/319] Display what is matched in user table (experimental, normalizing is not working) --- templates/member/user_list.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/member/user_list.html b/templates/member/user_list.html index eeb616fe..d605c492 100644 --- a/templates/member/user_list.html +++ b/templates/member/user_list.html @@ -58,8 +58,10 @@ timer_on = false; }); - $("tr > td:eq(0), tr > td:eq(1), tr > td:eq(2), tr > td:eq(3), tr > td:eq(5)").each(function() { - $(this).html($(this).text().replace(new RegExp(searchbar_obj.val(), 'i'), "$&")); + $("tr").each(function() { + $(this).find("td:eq(0), td:eq(1), td:eq(2), td:eq(3), td:eq(5)").each(function() { + $(this).html($(this).text().replace(new RegExp(searchbar_obj.val(), 'i'), "$&")); + }); }); } From 979628b02d49236798d090b06d7d9aabc1457310 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 20:30:17 +0200 Subject: [PATCH 080/319] :bug: default last_report date is today, not the migration date --- apps/member/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/member/models.py b/apps/member/models.py index cdcb6af2..90117f35 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -99,7 +99,7 @@ class Profile(models.Model): last_report = models.DateField( verbose_name=_("last report date"), - default=timezone.now().date(), + default=timezone.now, ) email_confirmed = models.BooleanField( From 5c01c0bb6cc40b2d37992e2ecd95614b49911fcc Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 21:02:25 +0200 Subject: [PATCH 081/319] Display 2 decimals in invoices --- apps/treasury/views.py | 3 +-- templates/treasury/invoice_sample.tex | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 76fd4f46..9b1efa63 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -141,9 +141,8 @@ class InvoiceRenderView(LoginRequiredMixin, View): invoice = Invoice.objects.filter(PermissionBackend.filter_queryset(request.user, Invoice, "view")).get(pk=pk) products = Product.objects.filter(invoice=invoice).all() - # Informations of the BDE. Should be updated when the school will move. invoice.place = "Gif-sur-Yvette" - invoice.my_name = "BDE ENS Paris-Saclay" + invoice.my_name = "BDE ENS Cachan" invoice.my_address_street = "4 avenue des Sciences" invoice.my_city = "91190 Gif-sur-Yvette" invoice.bank_code = 30003 diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index b20eff3b..18a7ff9e 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -48,7 +48,7 @@ \newcommand {\ListeProduits}{ {% for product in products %} - {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex }} & {{ product.quantity|safe|escape_tex }} & {{ product.total_euros|safe|escape_tex }} \cr + {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex|floatformat:2 }} & {{ product.quantity|safe|escape_tex|floatformat:2 }} & {{ product.total_euros|safe|escape_tex|floatformat:2 }} \cr {% endfor %} } @@ -76,7 +76,7 @@ \def\CodeGuichet{{"{"}}{{ obj.desk_code|stringformat:".05d" }}} \def\NCompte{{"{"}}{{ obj.account_number|stringformat:".011d" }}} \def\CleRib{{"{"}}{{ obj.rib_key|stringformat:".02d" }}} -\def\IBAN{FR76\CodeBanque\CodeGuichet\NCompte\CleRib} +\def\IBAN{FR76 \CodeBanque\CodeGuichet\NCompte\CleRib} \def\CodeBic{{"{"}}{{ obj.bic }}} \def\FactureNum {{"{"}}{{ obj.id }}} % Numéro de facture From 3e28ed87168857f2831c98f8b98abcf214d7ba2e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 21:45:50 +0200 Subject: [PATCH 082/319] Remove space in IBAN --- templates/treasury/invoice_sample.tex | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index 18a7ff9e..118717f8 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -1,4 +1,5 @@ {% load escape_tex %} +{% load l10n %} \nonstopmode \documentclass[11pt]{article} @@ -47,9 +48,11 @@ } \newcommand {\ListeProduits}{ - {% for product in products %} - {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex|floatformat:2 }} & {{ product.quantity|safe|escape_tex|floatformat:2 }} & {{ product.total_euros|safe|escape_tex|floatformat:2 }} \cr - {% endfor %} + {% localize off %} + {% for product in products %} + {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex|floatformat:2 }} & {{ product.quantity|safe|escape_tex|floatformat:2 }} & {{ product.total_euros|safe|escape_tex|floatformat:2 }} \cr + {% endfor %} + {% endlocalize %} } % Logo du BDE @@ -76,7 +79,7 @@ \def\CodeGuichet{{"{"}}{{ obj.desk_code|stringformat:".05d" }}} \def\NCompte{{"{"}}{{ obj.account_number|stringformat:".011d" }}} \def\CleRib{{"{"}}{{ obj.rib_key|stringformat:".02d" }}} -\def\IBAN{FR76 \CodeBanque\CodeGuichet\NCompte\CleRib} +\def\IBAN{FR76\CodeBanque\CodeGuichet\NCompte\CleRib} \def\CodeBic{{"{"}}{{ obj.bic }}} \def\FactureNum {{"{"}}{{ obj.id }}} % Numéro de facture From e23eafd56cf9c9550d2fb909f45532af7a5af02b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 21:51:53 +0200 Subject: [PATCH 083/319] Add invoices in Django Admin --- apps/treasury/admin.py | 20 +++++++++++++++++++- apps/treasury/models.py | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/apps/treasury/admin.py b/apps/treasury/admin.py index 33224ba7..843eaf88 100644 --- a/apps/treasury/admin.py +++ b/apps/treasury/admin.py @@ -3,8 +3,9 @@ from django.contrib import admin from note_kfet.admin import admin_site +from .forms import ProductForm -from .models import RemittanceType, Remittance, SogeCredit +from .models import RemittanceType, Remittance, SogeCredit, Invoice, Product @admin.register(RemittanceType, site=admin_site) @@ -39,3 +40,20 @@ class SogeCreditAdmin(admin.ModelAdmin): def has_add_permission(self, request): # Don't create a credit manually return False + + +class ProductInline(admin.StackedInline): + """ + Inline product in invoice admin + """ + model = Product + form = ProductForm + + +@admin.register(Invoice, site=admin_site) +class InvoiceAdmin(admin.ModelAdmin): + """ + Admin customisation for Invoice + """ + list_display = ('object', 'id', 'bde', 'name', 'date', 'acquitted',) + inlines = (ProductInline,) diff --git a/apps/treasury/models.py b/apps/treasury/models.py index 6cfb55c1..880439fe 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -55,7 +55,7 @@ class Invoice(models.Model): date = models.DateField( default=timezone.now, - verbose_name=_("Place"), + verbose_name=_("Date"), ) acquitted = models.BooleanField( From 1fb14ea33dea5a3939fb194666dfe764a67ff434 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Thu, 6 Aug 2020 22:30:14 +0200 Subject: [PATCH 084/319] Store invoice source code instead of generate it everytime --- apps/treasury/forms.py | 2 +- apps/treasury/models.py | 31 +++++ apps/treasury/templatetags/escape_tex.py | 2 + apps/treasury/views.py | 18 +-- locale/de/LC_MESSAGES/django.po | 160 +++++++++++----------- locale/fr/LC_MESSAGES/django.po | 166 ++++++++++++----------- templates/treasury/invoice_form.html | 10 ++ templates/treasury/invoice_sample.tex | 15 +- 8 files changed, 224 insertions(+), 180 deletions(-) diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index 7ff16c8f..b5f9284e 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -28,7 +28,7 @@ class InvoiceForm(forms.ModelForm): class Meta: model = Invoice - exclude = ('bde', ) + exclude = ('bde', 'tex', ) class ProductForm(forms.ModelForm): diff --git a/apps/treasury/models.py b/apps/treasury/models.py index 880439fe..adbda701 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -6,6 +6,7 @@ from django.contrib.auth.models import User from django.core.exceptions import ValidationError from django.db import models from django.db.models import Q +from django.template.loader import render_to_string from django.utils import timezone from django.utils.translation import gettext_lazy as _ from note.models import NoteSpecial, SpecialTransaction, MembershipTransaction @@ -62,6 +63,34 @@ class Invoice(models.Model): verbose_name=_("Acquitted"), ) + tex = models.TextField( + default="", + verbose_name=_("tex source"), + ) + + def save(self, *args, **kwargs): + """ + When an invoice is generated, we store the tex source. + The advantage is to never change the template. + Warning: editing this model regenerate the tex source, so be careful. + """ + products = self.products.all() + + self.place = "Gif-sur-Yvette" + self.my_name = "BDE ENS Cachan" + self.my_address_street = "4 avenue des Sciences" + self.my_city = "91190 Gif-sur-Yvette" + self.bank_code = 30003 + self.desk_code = 3894 + self.account_number = 37280662 + self.rib_key = 14 + self.bic = "SOGEFRPP" + + # Fill the template with the information + self.tex = render_to_string("treasury/invoice_sample.tex", dict(obj=self, products=products)) + + return super().save(*args, **kwargs) + class Meta: verbose_name = _("invoice") verbose_name_plural = _("invoices") @@ -75,6 +104,8 @@ class Product(models.Model): invoice = models.ForeignKey( Invoice, on_delete=models.PROTECT, + related_name="products", + verbose_name=_("invoice"), ) designation = models.CharField( diff --git a/apps/treasury/templatetags/escape_tex.py b/apps/treasury/templatetags/escape_tex.py index 3d635690..1be2f51e 100644 --- a/apps/treasury/templatetags/escape_tex.py +++ b/apps/treasury/templatetags/escape_tex.py @@ -13,6 +13,8 @@ def do_latex_escape(value): .replace("_", "\\_") .replace("{", "\\{") .replace("}", "\\}") + .replace("\n", "\\\\") + .replace("\r", "") ) diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 9b1efa63..4ac8822b 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -139,23 +139,7 @@ class InvoiceRenderView(LoginRequiredMixin, View): def get(self, request, **kwargs): pk = kwargs["pk"] invoice = Invoice.objects.filter(PermissionBackend.filter_queryset(request.user, Invoice, "view")).get(pk=pk) - products = Product.objects.filter(invoice=invoice).all() - - invoice.place = "Gif-sur-Yvette" - invoice.my_name = "BDE ENS Cachan" - invoice.my_address_street = "4 avenue des Sciences" - invoice.my_city = "91190 Gif-sur-Yvette" - invoice.bank_code = 30003 - invoice.desk_code = 3894 - invoice.account_number = 37280662 - invoice.rib_key = 14 - invoice.bic = "SOGEFRPP" - - # Replace line breaks with the LaTeX equivalent - invoice.description = invoice.description.replace("\r", "").replace("\n", "\\\\ ") - invoice.address = invoice.address.replace("\r", "").replace("\n", "\\\\ ") - # Fill the template with the information - tex = render_to_string("treasury/invoice_sample.tex", dict(obj=invoice, products=products)) + tex = invoice.tex try: os.mkdir(BASE_DIR + "/tmp") diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 8698220f..4d957992 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 19:55+0200\n" +"POT-Creation-Date: 2020-08-06 22:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,7 +96,7 @@ msgid "type" msgstr "" #: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 -#: apps/note/models/notes.py:126 apps/treasury/models.py:222 +#: apps/note/models/notes.py:126 apps/treasury/models.py:253 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" @@ -194,7 +194,7 @@ msgstr "" msgid "remove" msgstr "" -#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:141 +#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:172 msgid "Type" msgstr "" @@ -960,7 +960,7 @@ msgstr "" msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:344 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:344 apps/treasury/models.py:259 msgid "membership transactions" msgstr "" @@ -1203,7 +1203,7 @@ msgstr "" #: templates/django_filters/rest_framework/form.html:5 #: templates/member/add_members.html:31 templates/member/club_form.html:9 #: templates/note/transactiontemplate_form.html:15 -#: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13 +#: templates/treasury/invoice_form.html:56 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 #: templates/wei/weiregistration_form.html:14 msgid "Submit" @@ -1221,7 +1221,7 @@ msgstr "" msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:124 apps/treasury/models.py:207 +#: apps/treasury/forms.py:124 apps/treasury/models.py:238 #: apps/treasury/tables.py:77 apps/treasury/tables.py:85 #: templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 @@ -1239,121 +1239,121 @@ msgstr "" msgid "Amount" msgstr "" -#: apps/treasury/models.py:21 +#: apps/treasury/models.py:22 msgid "Invoice identifier" msgstr "" -#: apps/treasury/models.py:35 +#: apps/treasury/models.py:36 msgid "BDE" msgstr "" -#: apps/treasury/models.py:40 +#: apps/treasury/models.py:41 msgid "Object" msgstr "" -#: apps/treasury/models.py:44 +#: apps/treasury/models.py:45 msgid "Description" msgstr "" -#: apps/treasury/models.py:49 templates/note/transaction_form.html:125 +#: apps/treasury/models.py:50 templates/note/transaction_form.html:125 msgid "Name" msgstr "" -#: apps/treasury/models.py:53 +#: apps/treasury/models.py:54 msgid "Address" msgstr "" -#: apps/treasury/models.py:58 -msgid "Place" -msgstr "" - -#: apps/treasury/models.py:62 -msgid "Acquitted" -msgstr "" - -#: apps/treasury/models.py:66 -msgid "invoice" -msgstr "" - -#: apps/treasury/models.py:67 -msgid "invoices" -msgstr "" - -#: apps/treasury/models.py:82 -msgid "Designation" -msgstr "" - -#: apps/treasury/models.py:86 -msgid "Quantity" -msgstr "" - -#: apps/treasury/models.py:90 -msgid "Unit price" -msgstr "" - -#: apps/treasury/models.py:106 -msgid "product" -msgstr "" - -#: apps/treasury/models.py:107 -msgid "products" -msgstr "" - -#: apps/treasury/models.py:124 -msgid "remittance type" -msgstr "" - -#: apps/treasury/models.py:125 -msgid "remittance types" -msgstr "" - -#: apps/treasury/models.py:135 +#: apps/treasury/models.py:59 apps/treasury/models.py:166 msgid "Date" msgstr "" -#: apps/treasury/models.py:146 -msgid "Comment" +#: apps/treasury/models.py:63 +msgid "Acquitted" msgstr "" -#: apps/treasury/models.py:151 -msgid "Closed" +#: apps/treasury/models.py:68 +msgid "tex source" +msgstr "" + +#: apps/treasury/models.py:95 apps/treasury/models.py:108 +msgid "invoice" +msgstr "" + +#: apps/treasury/models.py:96 +msgid "invoices" +msgstr "" + +#: apps/treasury/models.py:113 +msgid "Designation" +msgstr "" + +#: apps/treasury/models.py:117 +msgid "Quantity" +msgstr "" + +#: apps/treasury/models.py:121 +msgid "Unit price" +msgstr "" + +#: apps/treasury/models.py:137 +msgid "product" +msgstr "" + +#: apps/treasury/models.py:138 +msgid "products" msgstr "" #: apps/treasury/models.py:155 -msgid "remittance" +msgid "remittance type" msgstr "" #: apps/treasury/models.py:156 +msgid "remittance types" +msgstr "" + +#: apps/treasury/models.py:177 +msgid "Comment" +msgstr "" + +#: apps/treasury/models.py:182 +msgid "Closed" +msgstr "" + +#: apps/treasury/models.py:186 +msgid "remittance" +msgstr "" + +#: apps/treasury/models.py:187 msgid "remittances" msgstr "" -#: apps/treasury/models.py:188 +#: apps/treasury/models.py:219 msgid "Remittance #{:d}: {}" msgstr "" -#: apps/treasury/models.py:211 +#: apps/treasury/models.py:242 msgid "special transaction proxy" msgstr "" -#: apps/treasury/models.py:212 +#: apps/treasury/models.py:243 msgid "special transaction proxies" msgstr "" -#: apps/treasury/models.py:234 +#: apps/treasury/models.py:265 msgid "credit transaction" msgstr "" -#: apps/treasury/models.py:297 +#: apps/treasury/models.py:328 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." msgstr "" -#: apps/treasury/models.py:309 templates/treasury/sogecredit_detail.html:10 +#: apps/treasury/models.py:340 templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "" -#: apps/treasury/models.py:310 +#: apps/treasury/models.py:341 msgid "Credits from the Société générale" msgstr "" @@ -1403,28 +1403,28 @@ msgstr "" msgid "Update an invoice" msgstr "" -#: apps/treasury/views.py:205 +#: apps/treasury/views.py:188 msgid "Create a new remittance" msgstr "" -#: apps/treasury/views.py:226 templates/treasury/remittance_form.html:9 +#: apps/treasury/views.py:209 templates/treasury/remittance_form.html:9 #: templates/treasury/specialtransactionproxy_form.html:7 msgid "Remittances list" msgstr "" -#: apps/treasury/views.py:276 +#: apps/treasury/views.py:259 msgid "Update a remittance" msgstr "" -#: apps/treasury/views.py:299 +#: apps/treasury/views.py:282 msgid "Attach a transaction to a remittance" msgstr "" -#: apps/treasury/views.py:343 +#: apps/treasury/views.py:326 msgid "List of credits from the Société générale" msgstr "" -#: apps/treasury/views.py:377 +#: apps/treasury/views.py:360 msgid "Manage credits from the Société générale" msgstr "" @@ -2365,11 +2365,17 @@ msgid "" "by following the link you received." msgstr "" -#: templates/treasury/invoice_form.html:41 +#: templates/treasury/invoice_form.html:10 +msgid "" +"Warning: the LaTeX template is saved with this object. Updating the invoice " +"implies regenerate it. Be careful if you manipulate old invoices." +msgstr "" + +#: templates/treasury/invoice_form.html:51 msgid "Add product" msgstr "" -#: templates/treasury/invoice_form.html:42 +#: templates/treasury/invoice_form.html:52 msgid "Remove product" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 517bfeed..e440843f 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 19:55+0200\n" +"POT-Creation-Date: 2020-08-06 22:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -97,7 +97,7 @@ msgid "type" msgstr "type" #: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 -#: apps/note/models/notes.py:126 apps/treasury/models.py:222 +#: apps/note/models/notes.py:126 apps/treasury/models.py:253 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" @@ -195,7 +195,7 @@ msgstr "Entré le " msgid "remove" msgstr "supprimer" -#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:141 +#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:172 msgid "Type" msgstr "Type" @@ -974,7 +974,7 @@ msgstr "Transactions de crédit/retrait" msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:344 apps/treasury/models.py:228 +#: apps/note/models/transactions.py:344 apps/treasury/models.py:259 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -1232,7 +1232,7 @@ msgstr "Trésorerie" #: templates/django_filters/rest_framework/form.html:5 #: templates/member/add_members.html:31 templates/member/club_form.html:9 #: templates/note/transactiontemplate_form.html:15 -#: templates/treasury/invoice_form.html:46 templates/wei/bus_form.html:13 +#: templates/treasury/invoice_form.html:56 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 #: templates/wei/weiregistration_form.html:14 msgid "Submit" @@ -1250,7 +1250,7 @@ msgstr "La remise est déjà fermée." 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:124 apps/treasury/models.py:207 +#: apps/treasury/forms.py:124 apps/treasury/models.py:238 #: apps/treasury/tables.py:77 apps/treasury/tables.py:85 #: templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 @@ -1268,111 +1268,113 @@ msgstr "Pas de remise associée" msgid "Amount" msgstr "Montant" -#: apps/treasury/models.py:21 +#: apps/treasury/models.py:22 msgid "Invoice identifier" msgstr "Numéro de facture" -#: apps/treasury/models.py:35 +#: apps/treasury/models.py:36 msgid "BDE" msgstr "BDE" -#: apps/treasury/models.py:40 +#: apps/treasury/models.py:41 msgid "Object" msgstr "Objet" -#: apps/treasury/models.py:44 +#: apps/treasury/models.py:45 msgid "Description" msgstr "Description" -#: apps/treasury/models.py:49 templates/note/transaction_form.html:125 +#: apps/treasury/models.py:50 templates/note/transaction_form.html:125 msgid "Name" msgstr "Nom" -#: apps/treasury/models.py:53 +#: apps/treasury/models.py:54 msgid "Address" msgstr "Adresse" -#: apps/treasury/models.py:58 -msgid "Place" -msgstr "Lieu" - -#: apps/treasury/models.py:62 -msgid "Acquitted" -msgstr "Acquittée" - -#: apps/treasury/models.py:66 -msgid "invoice" -msgstr "facture" - -#: apps/treasury/models.py:67 -msgid "invoices" -msgstr "factures" - -#: apps/treasury/models.py:82 -msgid "Designation" -msgstr "Désignation" - -#: apps/treasury/models.py:86 -msgid "Quantity" -msgstr "Quantité" - -#: apps/treasury/models.py:90 -msgid "Unit price" -msgstr "Prix unitaire" - -#: apps/treasury/models.py:106 -msgid "product" -msgstr "produit" - -#: apps/treasury/models.py:107 -msgid "products" -msgstr "produits" - -#: apps/treasury/models.py:124 -msgid "remittance type" -msgstr "type de remise" - -#: apps/treasury/models.py:125 -msgid "remittance types" -msgstr "types de remises" - -#: apps/treasury/models.py:135 +#: apps/treasury/models.py:59 apps/treasury/models.py:166 msgid "Date" msgstr "Date" -#: apps/treasury/models.py:146 +#: apps/treasury/models.py:63 +msgid "Acquitted" +msgstr "Acquittée" + +#: apps/treasury/models.py:68 +#, fuzzy +#| msgid "source" +msgid "tex source" +msgstr "source" + +#: apps/treasury/models.py:95 apps/treasury/models.py:108 +msgid "invoice" +msgstr "facture" + +#: apps/treasury/models.py:96 +msgid "invoices" +msgstr "factures" + +#: apps/treasury/models.py:113 +msgid "Designation" +msgstr "Désignation" + +#: apps/treasury/models.py:117 +msgid "Quantity" +msgstr "Quantité" + +#: apps/treasury/models.py:121 +msgid "Unit price" +msgstr "Prix unitaire" + +#: apps/treasury/models.py:137 +msgid "product" +msgstr "produit" + +#: apps/treasury/models.py:138 +msgid "products" +msgstr "produits" + +#: apps/treasury/models.py:155 +msgid "remittance type" +msgstr "type de remise" + +#: apps/treasury/models.py:156 +msgid "remittance types" +msgstr "types de remises" + +#: apps/treasury/models.py:177 msgid "Comment" msgstr "Commentaire" -#: apps/treasury/models.py:151 +#: apps/treasury/models.py:182 msgid "Closed" msgstr "Fermée" -#: apps/treasury/models.py:155 +#: apps/treasury/models.py:186 msgid "remittance" msgstr "remise" -#: apps/treasury/models.py:156 +#: apps/treasury/models.py:187 msgid "remittances" msgstr "remises" -#: apps/treasury/models.py:188 +#: apps/treasury/models.py:219 msgid "Remittance #{:d}: {}" msgstr "Remise n°{:d} : {}" -#: apps/treasury/models.py:211 +#: apps/treasury/models.py:242 msgid "special transaction proxy" msgstr "Proxy de transaction spéciale" -#: apps/treasury/models.py:212 +#: apps/treasury/models.py:243 msgid "special transaction proxies" msgstr "Proxys de transactions spéciales" -#: apps/treasury/models.py:234 +#: apps/treasury/models.py:265 msgid "credit transaction" msgstr "transaction de crédit" -#: apps/treasury/models.py:297 +#: apps/treasury/models.py:328 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." @@ -1380,11 +1382,11 @@ 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:309 templates/treasury/sogecredit_detail.html:10 +#: apps/treasury/models.py:340 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:310 +#: apps/treasury/models.py:341 msgid "Credits from the Société générale" msgstr "Crédits de la Société générale" @@ -1434,28 +1436,28 @@ msgstr "Liste des factures" msgid "Update an invoice" msgstr "Modifier la facture" -#: apps/treasury/views.py:205 +#: apps/treasury/views.py:188 msgid "Create a new remittance" msgstr "Créer une nouvelle remise" -#: apps/treasury/views.py:226 templates/treasury/remittance_form.html:9 +#: apps/treasury/views.py:209 templates/treasury/remittance_form.html:9 #: templates/treasury/specialtransactionproxy_form.html:7 msgid "Remittances list" msgstr "Liste des remises" -#: apps/treasury/views.py:276 +#: apps/treasury/views.py:259 msgid "Update a remittance" msgstr "Modifier la remise" -#: apps/treasury/views.py:299 +#: apps/treasury/views.py:282 msgid "Attach a transaction to a remittance" msgstr "Joindre une transaction à une remise" -#: apps/treasury/views.py:343 +#: apps/treasury/views.py:326 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:377 +#: apps/treasury/views.py:360 msgid "Manage credits from the Société générale" msgstr "Gérer les crédits de la Société générale" @@ -2467,11 +2469,20 @@ msgstr "" "d'adhésion. Vous devez également valider votre adresse email en suivant le " "lien que vous avez reçu." -#: templates/treasury/invoice_form.html:41 +#: templates/treasury/invoice_form.html:10 +msgid "" +"Warning: the LaTeX template is saved with this object. Updating the invoice " +"implies regenerate it. Be careful if you manipulate old invoices." +msgstr "" +"Attention : le template LaTeX est enregistré avec cet objet. Modifier la " +"facture implique la regénérer. Faites attention si vous manipulez de " +"vieilles factures." + +#: templates/treasury/invoice_form.html:51 msgid "Add product" msgstr "Ajouter produit" -#: templates/treasury/invoice_form.html:42 +#: templates/treasury/invoice_form.html:52 msgid "Remove product" msgstr "Retirer produit" @@ -2808,3 +2819,6 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." #: templates/wei/weiregistration_list.html:24 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." + +#~ msgid "Place" +#~ msgstr "Lieu" diff --git a/templates/treasury/invoice_form.html b/templates/treasury/invoice_form.html index 2875d410..5ad254ca 100644 --- a/templates/treasury/invoice_form.html +++ b/templates/treasury/invoice_form.html @@ -4,6 +4,16 @@ {% load crispy_forms_tags %} {% block content %}

        {% trans "Invoices list" %}

        + + {% if not object.pk %} +
        + {% blocktrans trimmed %} + Warning: the LaTeX template is saved with this object. Updating the invoice implies regenerate it. + Be careful if you manipulate old invoices. + {% endblocktrans %} +
        + {% endif %} +
        {% csrf_token %} {# Render the invoice form #} diff --git a/templates/treasury/invoice_sample.tex b/templates/treasury/invoice_sample.tex index 118717f8..198d0c24 100644 --- a/templates/treasury/invoice_sample.tex +++ b/templates/treasury/invoice_sample.tex @@ -1,5 +1,4 @@ {% load escape_tex %} -{% load l10n %} \nonstopmode \documentclass[11pt]{article} @@ -48,11 +47,9 @@ } \newcommand {\ListeProduits}{ - {% localize off %} - {% for product in products %} - {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex|floatformat:2 }} & {{ product.quantity|safe|escape_tex|floatformat:2 }} & {{ product.total_euros|safe|escape_tex|floatformat:2 }} \cr - {% endfor %} - {% endlocalize %} + {% for product in products %} + {{ product.designation|safe|escape_tex }} & {{ product.amount_euros|safe|escape_tex|floatformat:2 }} & {{ product.quantity|safe|escape_tex|floatformat:2 }} & {{ product.total_euros|safe|escape_tex|floatformat:2 }} \cr + {% endfor %} } % Logo du BDE @@ -70,9 +67,9 @@ %%%%%%%%%%%%%%%%%%%%% A MODIFIER DANS LA FACTURE %%%%%%%%%%%%%%%%%%%%% % Infos Association -\def\MonNom{{"{"}}{{ obj.my_name }}} % Nom de l'association -\def\MonAdresseRue{{"{"}}{{ obj.my_address_street }}} % Adresse de l'association -\def\MonAdresseVille{{"{"}}{{ obj.my_city }}} +\def\MonNom{{"{"}}{{ obj.my_name|safe|escape_tex }}} % Nom de l'association +\def\MonAdresseRue{{"{"}}{{ obj.my_address_street|safe|escape_tex }}} % Adresse de l'association +\def\MonAdresseVille{{"{"}}{{ obj.my_city|safe|escape_tex }}} % Informations bancaires de l'association \def\CodeBanque{{"{"}}{{ obj.bank_code|stringformat:".05d" }}} From 679ac3a652bd79cfe1f552def9f45a8d1049df9e Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 7 Aug 2020 11:04:54 +0200 Subject: [PATCH 085/319] Lock invoices, delete them --- apps/permission/fixtures/initial.json | 22 ++- apps/treasury/forms.py | 27 +-- apps/treasury/models.py | 15 +- apps/treasury/tables.py | 44 +++-- apps/treasury/urls.py | 7 +- apps/treasury/views.py | 25 ++- locale/de/LC_MESSAGES/django.po | 148 +++++++++------- locale/fr/LC_MESSAGES/django.po | 160 +++++++++++------- .../treasury/invoice_confirm_delete.html | 33 ++++ templates/treasury/invoice_form.html | 32 ++-- 10 files changed, 352 insertions(+), 161 deletions(-) create mode 100644 templates/treasury/invoice_confirm_delete.html diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json index c4afa200..c31ea6a5 100644 --- a/apps/permission/fixtures/initial.json +++ b/apps/permission/fixtures/initial.json @@ -2359,6 +2359,22 @@ "description": "Voir toutes les notes" } }, + { + "model": "permission.permission", + "pk": 151, + "fields": { + "model": [ + "treasury", + "invoice" + ], + "query": "{}", + "type": "delete", + "mask": 3, + "field": "", + "permanent": false, + "description": "Supprimer une facture" + } + }, { "model": "permission.role", "pk": 1, @@ -2539,7 +2555,8 @@ 143, 146, 147, - 150 + 150, + 151 ] } }, @@ -2695,7 +2712,8 @@ 147, 148, 149, - 150 + 150, + 151 ] } }, diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py index b5f9284e..38da324d 100644 --- a/apps/treasury/forms.py +++ b/apps/treasury/forms.py @@ -4,9 +4,8 @@ from crispy_forms.helper import FormHelper from crispy_forms.layout import Submit from django import forms -from django.utils import timezone from django.utils.translation import gettext_lazy as _ -from note_kfet.inputs import DatePickerInput, AmountInput +from note_kfet.inputs import AmountInput from .models import Invoice, Product, Remittance, SpecialTransactionProxy @@ -16,19 +15,25 @@ class InvoiceForm(forms.ModelForm): Create and generate invoices. """ - # Django forms don't support date fields. We have to add it manually - date = forms.DateField( - initial=timezone.now, - widget=DatePickerInput(), - ) + def clean(self): + if self.instance and self.instance.locked: + for field_name in self.fields: + self.cleaned_data[field_name] = getattr(self.instance, field_name) + self.errors.clear() + return self.cleaned_data + return super().clean() - def clean_date(self): - self.instance.date = self.data.get("date") - return self.instance.date + def save(self, commit=True): + """ + If the invoice is locked, don't save it + """ + if not self.instance.locked: + super().save(commit) + return self.instance class Meta: model = Invoice - exclude = ('bde', 'tex', ) + exclude = ('bde', 'date', 'tex', ) class ProductForm(forms.ModelForm): diff --git a/apps/treasury/models.py b/apps/treasury/models.py index adbda701..2d6d93dc 100644 --- a/apps/treasury/models.py +++ b/apps/treasury/models.py @@ -61,6 +61,13 @@ class Invoice(models.Model): acquitted = models.BooleanField( verbose_name=_("Acquitted"), + default=False, + ) + + locked = models.BooleanField( + verbose_name=_("Locked"), + help_text=_("An invoice can't be edited when it is locked."), + default=False, ) tex = models.TextField( @@ -74,6 +81,12 @@ class Invoice(models.Model): The advantage is to never change the template. Warning: editing this model regenerate the tex source, so be careful. """ + + old_invoice = Invoice.objects.filter(id=self.id) + if old_invoice.exists(): + if old_invoice.get().locked: + raise ValidationError(_("This invoice is locked and can no longer be edited.")) + products = self.products.all() self.place = "Gif-sur-Yvette" @@ -103,7 +116,7 @@ class Product(models.Model): invoice = models.ForeignKey( Invoice, - on_delete=models.PROTECT, + on_delete=models.CASCADE, related_name="products", verbose_name=_("invoice"), ) diff --git a/apps/treasury/tables.py b/apps/treasury/tables.py index c7bdb6eb..b8843d0d 100644 --- a/apps/treasury/tables.py +++ b/apps/treasury/tables.py @@ -14,19 +14,39 @@ class InvoiceTable(tables.Table): """ List all invoices. """ - id = tables.LinkColumn("treasury:invoice_update", - args=[A("pk")], - text=lambda record: _("Invoice #{:d}").format(record.id), ) + id = tables.LinkColumn( + "treasury:invoice_update", + args=[A("pk")], + text=lambda record: _("Invoice #{:d}").format(record.id), + ) - invoice = tables.LinkColumn("treasury:invoice_render", - verbose_name=_("Invoice"), - args=[A("pk")], - accessor="pk", - text="", - attrs={ - 'a': {'class': 'fa fa-file-pdf-o'}, - 'td': {'data-turbolinks': 'false'} - }) + invoice = tables.LinkColumn( + "treasury:invoice_render", + verbose_name=_("Invoice"), + args=[A("pk")], + accessor="pk", + text="", + attrs={ + 'a': {'class': 'fa fa-file-pdf-o'}, + 'td': {'data-turbolinks': 'false'} + } + ) + + delete = tables.LinkColumn( + 'treasury:invoice_delete', + args=[A('pk')], + verbose_name=_("delete"), + text=_("Delete"), + attrs={ + 'th': { + 'id': 'delete-membership-header' + }, + 'a': { + 'class': 'btn btn-danger', + 'data-type': 'delete-membership' + } + }, + ) class Meta: attrs = { diff --git a/apps/treasury/urls.py b/apps/treasury/urls.py index 8606fb5b..e7c09639 100644 --- a/apps/treasury/urls.py +++ b/apps/treasury/urls.py @@ -3,9 +3,9 @@ from django.urls import path -from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceRenderView, RemittanceListView,\ - RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView, UnlinkTransactionToRemittanceView,\ - SogeCreditListView, SogeCreditManageView +from .views import InvoiceCreateView, InvoiceListView, InvoiceUpdateView, InvoiceDeleteView, InvoiceRenderView,\ + RemittanceListView, RemittanceCreateView, RemittanceUpdateView, LinkTransactionToRemittanceView,\ + UnlinkTransactionToRemittanceView, SogeCreditListView, SogeCreditManageView app_name = 'treasury' urlpatterns = [ @@ -13,6 +13,7 @@ urlpatterns = [ path('invoice/', InvoiceListView.as_view(), name='invoice_list'), path('invoice/create/', InvoiceCreateView.as_view(), name='invoice_create'), path('invoice//', InvoiceUpdateView.as_view(), name='invoice_update'), + path('invoice//delete/', InvoiceDeleteView.as_view(), name='invoice_delete'), path('invoice/render//', InvoiceRenderView.as_view(), name='invoice_render'), # Remittance app paths diff --git a/apps/treasury/views.py b/apps/treasury/views.py index 4ac8822b..b3da4d69 100644 --- a/apps/treasury/views.py +++ b/apps/treasury/views.py @@ -18,7 +18,7 @@ from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, UpdateView, DetailView from django.views.generic.base import View, TemplateView -from django.views.generic.edit import BaseFormView +from django.views.generic.edit import BaseFormView, DeleteView from django_tables2 import SingleTableView from note.models import SpecialTransaction, NoteSpecial, Alias from note_kfet.settings.base import BASE_DIR @@ -97,14 +97,20 @@ class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): form.helper = FormHelper() # Remove form tag on the generation of the form in the template (already present on the template) form.helper.form_tag = False - # Fill the intial value for the date field, with the initial date of the model instance - form.fields['date'].initial = form.instance.date # The formset handles the set of the products - form_set = ProductFormSet(instance=form.instance) + form_set = ProductFormSet(instance=self.object) context['formset'] = form_set context['helper'] = ProductFormSetHelper() context['no_cache'] = True + if self.object.locked: + for field_name in form.fields: + form.fields[field_name].disabled = True + for f in form_set.forms: + for field_name in f.fields: + f.fields[field_name].disabled = True + + return context def form_valid(self, form): @@ -131,6 +137,17 @@ class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView): return reverse_lazy('treasury:invoice_list') +class InvoiceDeleteView(ProtectQuerysetMixin, LoginRequiredMixin, DeleteView): + """ + Delete a non-validated WEI registration + """ + model = Invoice + extra_context = {"title": _("Delete invoice")} + + def get_success_url(self): + return reverse_lazy('treasury:invoice_list') + + class InvoiceRenderView(LoginRequiredMixin, View): """ Render Invoice as a generated PDF with the given information and a LaTeX template diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 4d957992..20b8f3e7 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 22:27+0200\n" +"POT-Creation-Date: 2020-08-07 11:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,7 +96,7 @@ msgid "type" msgstr "" #: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 -#: apps/note/models/notes.py:126 apps/treasury/models.py:253 +#: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" @@ -194,18 +194,18 @@ msgstr "" msgid "remove" msgstr "" -#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:172 +#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:185 msgid "Type" msgstr "" #: apps/activity/tables.py:81 apps/member/forms.py:106 -#: apps/registration/forms.py:70 apps/treasury/forms.py:130 +#: apps/registration/forms.py:70 apps/treasury/forms.py:135 #: apps/wei/forms/registration.py:94 msgid "Last name" msgstr "" #: apps/activity/tables.py:83 apps/member/forms.py:111 -#: apps/registration/forms.py:75 apps/treasury/forms.py:132 +#: apps/registration/forms.py:75 apps/treasury/forms.py:137 #: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 msgid "First name" msgstr "" @@ -280,7 +280,8 @@ msgid "edit" msgstr "" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:129 apps/wei/tables.py:73 +#: apps/permission/models.py:129 apps/treasury/tables.py:38 +#: apps/wei/tables.py:73 msgid "delete" msgstr "" @@ -367,7 +368,7 @@ msgid "Credit amount" msgstr "" #: apps/member/forms.py:116 apps/registration/forms.py:80 -#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 +#: apps/treasury/forms.py:139 apps/wei/forms/registration.py:104 #: templates/note/transaction_form.html:137 msgid "Bank" msgstr "" @@ -715,7 +716,7 @@ msgstr "" msgid "Reason" msgstr "" -#: apps/note/forms.py:87 apps/treasury/tables.py:119 +#: apps/note/forms.py:87 apps/treasury/tables.py:139 msgid "Valid" msgstr "" @@ -960,7 +961,7 @@ msgstr "" msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:344 apps/treasury/models.py:259 +#: apps/note/models/transactions.py:344 apps/treasury/models.py:272 msgid "membership transactions" msgstr "" @@ -976,8 +977,10 @@ msgstr "" msgid "No reason specified" msgstr "" -#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:74 -#: apps/wei/tables.py:100 templates/treasury/sogecredit_detail.html:59 +#: apps/note/tables.py:139 apps/note/tables.py:167 apps/treasury/tables.py:39 +#: apps/wei/tables.py:74 apps/wei/tables.py:100 +#: templates/treasury/invoice_confirm_delete.html:28 +#: templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "" @@ -1197,44 +1200,44 @@ msgstr "" msgid "Treasury" msgstr "" -#: apps/treasury/forms.py:88 apps/treasury/forms.py:142 +#: apps/treasury/forms.py:93 apps/treasury/forms.py:147 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 #: templates/member/add_members.html:31 templates/member/club_form.html:9 #: templates/note/transactiontemplate_form.html:15 -#: templates/treasury/invoice_form.html:56 templates/wei/bus_form.html:13 +#: templates/treasury/invoice_form.html:64 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 #: templates/wei/weiregistration_form.html:14 msgid "Submit" msgstr "" -#: apps/treasury/forms.py:90 +#: apps/treasury/forms.py:95 msgid "Close" msgstr "" -#: apps/treasury/forms.py:99 +#: apps/treasury/forms.py:104 msgid "Remittance is already closed." msgstr "" -#: apps/treasury/forms.py:104 +#: apps/treasury/forms.py:109 msgid "You can't change the type of the remittance." msgstr "" -#: apps/treasury/forms.py:124 apps/treasury/models.py:238 -#: apps/treasury/tables.py:77 apps/treasury/tables.py:85 +#: apps/treasury/forms.py:129 apps/treasury/models.py:251 +#: apps/treasury/tables.py:97 apps/treasury/tables.py:105 #: templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 #: templates/treasury/sogecredit_list.html:13 msgid "Remittance" msgstr "" -#: apps/treasury/forms.py:125 +#: apps/treasury/forms.py:130 msgid "No attached remittance" msgstr "" -#: apps/treasury/forms.py:136 apps/treasury/tables.py:47 -#: apps/treasury/tables.py:115 templates/note/transaction_form.html:99 +#: apps/treasury/forms.py:141 apps/treasury/tables.py:67 +#: apps/treasury/tables.py:135 templates/note/transaction_form.html:99 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "" @@ -1263,7 +1266,7 @@ msgstr "" msgid "Address" msgstr "" -#: apps/treasury/models.py:59 apps/treasury/models.py:166 +#: apps/treasury/models.py:59 apps/treasury/models.py:179 msgid "Date" msgstr "" @@ -1272,122 +1275,134 @@ msgid "Acquitted" msgstr "" #: apps/treasury/models.py:68 +msgid "Locked" +msgstr "" + +#: apps/treasury/models.py:69 +msgid "An invoice can't be edited when it is locked." +msgstr "" + +#: apps/treasury/models.py:75 msgid "tex source" msgstr "" -#: apps/treasury/models.py:95 apps/treasury/models.py:108 +#: apps/treasury/models.py:88 templates/treasury/invoice_form.html:17 +msgid "This invoice is locked and can no longer be edited." +msgstr "" + +#: apps/treasury/models.py:108 apps/treasury/models.py:121 msgid "invoice" msgstr "" -#: apps/treasury/models.py:96 +#: apps/treasury/models.py:109 msgid "invoices" msgstr "" -#: apps/treasury/models.py:113 +#: apps/treasury/models.py:126 msgid "Designation" msgstr "" -#: apps/treasury/models.py:117 +#: apps/treasury/models.py:130 msgid "Quantity" msgstr "" -#: apps/treasury/models.py:121 +#: apps/treasury/models.py:134 msgid "Unit price" msgstr "" -#: apps/treasury/models.py:137 +#: apps/treasury/models.py:150 msgid "product" msgstr "" -#: apps/treasury/models.py:138 +#: apps/treasury/models.py:151 msgid "products" msgstr "" -#: apps/treasury/models.py:155 +#: apps/treasury/models.py:168 msgid "remittance type" msgstr "" -#: apps/treasury/models.py:156 +#: apps/treasury/models.py:169 msgid "remittance types" msgstr "" -#: apps/treasury/models.py:177 +#: apps/treasury/models.py:190 msgid "Comment" msgstr "" -#: apps/treasury/models.py:182 +#: apps/treasury/models.py:195 msgid "Closed" msgstr "" -#: apps/treasury/models.py:186 +#: apps/treasury/models.py:199 msgid "remittance" msgstr "" -#: apps/treasury/models.py:187 +#: apps/treasury/models.py:200 msgid "remittances" msgstr "" -#: apps/treasury/models.py:219 +#: apps/treasury/models.py:232 msgid "Remittance #{:d}: {}" msgstr "" -#: apps/treasury/models.py:242 +#: apps/treasury/models.py:255 msgid "special transaction proxy" msgstr "" -#: apps/treasury/models.py:243 +#: apps/treasury/models.py:256 msgid "special transaction proxies" msgstr "" -#: apps/treasury/models.py:265 +#: apps/treasury/models.py:278 msgid "credit transaction" msgstr "" -#: apps/treasury/models.py:328 +#: apps/treasury/models.py:341 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." msgstr "" -#: apps/treasury/models.py:340 templates/treasury/sogecredit_detail.html:10 +#: apps/treasury/models.py:353 templates/treasury/sogecredit_detail.html:10 msgid "Credit from the Société générale" msgstr "" -#: apps/treasury/models.py:341 +#: apps/treasury/models.py:354 msgid "Credits from the Société générale" msgstr "" -#: apps/treasury/tables.py:19 +#: apps/treasury/tables.py:20 msgid "Invoice #{:d}" msgstr "" -#: apps/treasury/tables.py:22 templates/treasury/invoice_list.html:10 +#: apps/treasury/tables.py:25 templates/treasury/invoice_list.html:10 #: templates/treasury/remittance_list.html:10 #: templates/treasury/sogecredit_list.html:10 msgid "Invoice" msgstr "" -#: apps/treasury/tables.py:45 +#: apps/treasury/tables.py:65 msgid "Transaction count" msgstr "" -#: apps/treasury/tables.py:50 apps/treasury/tables.py:52 +#: apps/treasury/tables.py:70 apps/treasury/tables.py:72 msgid "View" msgstr "" -#: apps/treasury/tables.py:79 +#: apps/treasury/tables.py:99 msgid "Add" msgstr "" -#: apps/treasury/tables.py:87 +#: apps/treasury/tables.py:107 msgid "Remove" msgstr "" -#: apps/treasury/tables.py:126 +#: apps/treasury/tables.py:146 msgid "Yes" msgstr "" -#: apps/treasury/tables.py:126 +#: apps/treasury/tables.py:146 msgid "No" msgstr "" @@ -1403,28 +1418,32 @@ msgstr "" msgid "Update an invoice" msgstr "" -#: apps/treasury/views.py:188 +#: apps/treasury/views.py:145 templates/treasury/invoice_confirm_delete.html:8 +msgid "Delete invoice" +msgstr "" + +#: apps/treasury/views.py:205 msgid "Create a new remittance" msgstr "" -#: apps/treasury/views.py:209 templates/treasury/remittance_form.html:9 +#: apps/treasury/views.py:226 templates/treasury/remittance_form.html:9 #: templates/treasury/specialtransactionproxy_form.html:7 msgid "Remittances list" msgstr "" -#: apps/treasury/views.py:259 +#: apps/treasury/views.py:276 msgid "Update a remittance" msgstr "" -#: apps/treasury/views.py:282 +#: apps/treasury/views.py:299 msgid "Attach a transaction to a remittance" msgstr "" -#: apps/treasury/views.py:326 +#: apps/treasury/views.py:343 msgid "List of credits from the Société générale" msgstr "" -#: apps/treasury/views.py:360 +#: apps/treasury/views.py:377 msgid "Manage credits from the Société générale" msgstr "" @@ -2365,17 +2384,30 @@ msgid "" "by following the link you received." msgstr "" +#: templates/treasury/invoice_confirm_delete.html:13 +msgid "This invoice is locked and can't be deleted." +msgstr "" + +#: templates/treasury/invoice_confirm_delete.html:19 +msgid "" +"Are you sure you want to delete this invoice? This action can't be undone." +msgstr "" + +#: templates/treasury/invoice_confirm_delete.html:26 +msgid "Return to invoices list" +msgstr "" + #: templates/treasury/invoice_form.html:10 msgid "" "Warning: the LaTeX template is saved with this object. Updating the invoice " "implies regenerate it. Be careful if you manipulate old invoices." msgstr "" -#: templates/treasury/invoice_form.html:51 +#: templates/treasury/invoice_form.html:58 msgid "Add product" msgstr "" -#: templates/treasury/invoice_form.html:52 +#: templates/treasury/invoice_form.html:59 msgid "Remove product" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e440843f..7d0dcd54 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-06 22:27+0200\n" +"POT-Creation-Date: 2020-08-07 11:03+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -97,7 +97,7 @@ msgid "type" msgstr "type" #: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 -#: apps/note/models/notes.py:126 apps/treasury/models.py:253 +#: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 msgid "user" @@ -195,18 +195,18 @@ msgstr "Entré le " msgid "remove" msgstr "supprimer" -#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:172 +#: apps/activity/tables.py:79 apps/note/forms.py:76 apps/treasury/models.py:185 msgid "Type" msgstr "Type" #: apps/activity/tables.py:81 apps/member/forms.py:106 -#: apps/registration/forms.py:70 apps/treasury/forms.py:130 +#: apps/registration/forms.py:70 apps/treasury/forms.py:135 #: apps/wei/forms/registration.py:94 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:83 apps/member/forms.py:111 -#: apps/registration/forms.py:75 apps/treasury/forms.py:132 +#: apps/registration/forms.py:75 apps/treasury/forms.py:137 #: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 msgid "First name" msgstr "Prénom" @@ -281,7 +281,8 @@ msgid "edit" msgstr "Modifier" #: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:129 apps/wei/tables.py:73 +#: apps/permission/models.py:129 apps/treasury/tables.py:38 +#: apps/wei/tables.py:73 msgid "delete" msgstr "Supprimer" @@ -368,7 +369,7 @@ msgid "Credit amount" msgstr "Montant à créditer" #: apps/member/forms.py:116 apps/registration/forms.py:80 -#: apps/treasury/forms.py:134 apps/wei/forms/registration.py:104 +#: apps/treasury/forms.py:139 apps/wei/forms/registration.py:104 #: templates/note/transaction_form.html:137 msgid "Bank" msgstr "Banque" @@ -722,7 +723,7 @@ msgstr "Destination" msgid "Reason" msgstr "Raison" -#: apps/note/forms.py:87 apps/treasury/tables.py:119 +#: apps/note/forms.py:87 apps/treasury/tables.py:139 msgid "Valid" msgstr "Valide" @@ -974,7 +975,7 @@ msgstr "Transactions de crédit/retrait" msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:344 apps/treasury/models.py:259 +#: apps/note/models/transactions.py:344 apps/treasury/models.py:272 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -990,8 +991,10 @@ msgstr "Cliquez pour valider" msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/tables.py:139 apps/note/tables.py:167 apps/wei/tables.py:74 -#: apps/wei/tables.py:100 templates/treasury/sogecredit_detail.html:59 +#: apps/note/tables.py:139 apps/note/tables.py:167 apps/treasury/tables.py:39 +#: apps/wei/tables.py:74 apps/wei/tables.py:100 +#: templates/treasury/invoice_confirm_delete.html:28 +#: templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "Supprimer" @@ -1226,44 +1229,44 @@ msgstr "Invalider l'inscription" msgid "Treasury" msgstr "Trésorerie" -#: apps/treasury/forms.py:88 apps/treasury/forms.py:142 +#: apps/treasury/forms.py:93 apps/treasury/forms.py:147 #: templates/activity/activity_form.html:9 #: templates/activity/activity_invite.html:8 #: templates/django_filters/rest_framework/form.html:5 #: templates/member/add_members.html:31 templates/member/club_form.html:9 #: templates/note/transactiontemplate_form.html:15 -#: templates/treasury/invoice_form.html:56 templates/wei/bus_form.html:13 +#: templates/treasury/invoice_form.html:64 templates/wei/bus_form.html:13 #: templates/wei/busteam_form.html:13 templates/wei/weiclub_form.html:15 #: templates/wei/weiregistration_form.html:14 msgid "Submit" msgstr "Envoyer" -#: apps/treasury/forms.py:90 +#: apps/treasury/forms.py:95 msgid "Close" msgstr "Fermer" -#: apps/treasury/forms.py:99 +#: apps/treasury/forms.py:104 msgid "Remittance is already closed." msgstr "La remise est déjà fermée." -#: apps/treasury/forms.py:104 +#: apps/treasury/forms.py:109 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:124 apps/treasury/models.py:238 -#: apps/treasury/tables.py:77 apps/treasury/tables.py:85 +#: apps/treasury/forms.py:129 apps/treasury/models.py:251 +#: apps/treasury/tables.py:97 apps/treasury/tables.py:105 #: templates/treasury/invoice_list.html:13 #: templates/treasury/remittance_list.html:13 #: templates/treasury/sogecredit_list.html:13 msgid "Remittance" msgstr "Remise" -#: apps/treasury/forms.py:125 +#: apps/treasury/forms.py:130 msgid "No attached remittance" msgstr "Pas de remise associée" -#: apps/treasury/forms.py:136 apps/treasury/tables.py:47 -#: apps/treasury/tables.py:115 templates/note/transaction_form.html:99 +#: apps/treasury/forms.py:141 apps/treasury/tables.py:67 +#: apps/treasury/tables.py:135 templates/note/transaction_form.html:99 #: templates/treasury/remittance_form.html:18 msgid "Amount" msgstr "Montant" @@ -1292,7 +1295,7 @@ msgstr "Nom" msgid "Address" msgstr "Adresse" -#: apps/treasury/models.py:59 apps/treasury/models.py:166 +#: apps/treasury/models.py:59 apps/treasury/models.py:179 msgid "Date" msgstr "Date" @@ -1301,80 +1304,92 @@ msgid "Acquitted" msgstr "Acquittée" #: apps/treasury/models.py:68 +msgid "Locked" +msgstr "Verrouillée" + +#: apps/treasury/models.py:69 +msgid "An invoice can't be edited when it is locked." +msgstr "Une facture ne peut plus être modifiée si elle est verrouillée." + +#: apps/treasury/models.py:75 #, fuzzy #| msgid "source" msgid "tex source" msgstr "source" -#: apps/treasury/models.py:95 apps/treasury/models.py:108 +#: apps/treasury/models.py:88 templates/treasury/invoice_form.html:17 +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:108 apps/treasury/models.py:121 msgid "invoice" msgstr "facture" -#: apps/treasury/models.py:96 +#: apps/treasury/models.py:109 msgid "invoices" msgstr "factures" -#: apps/treasury/models.py:113 +#: apps/treasury/models.py:126 msgid "Designation" msgstr "Désignation" -#: apps/treasury/models.py:117 +#: apps/treasury/models.py:130 msgid "Quantity" msgstr "Quantité" -#: apps/treasury/models.py:121 +#: apps/treasury/models.py:134 msgid "Unit price" msgstr "Prix unitaire" -#: apps/treasury/models.py:137 +#: apps/treasury/models.py:150 msgid "product" msgstr "produit" -#: apps/treasury/models.py:138 +#: apps/treasury/models.py:151 msgid "products" msgstr "produits" -#: apps/treasury/models.py:155 +#: apps/treasury/models.py:168 msgid "remittance type" msgstr "type de remise" -#: apps/treasury/models.py:156 +#: apps/treasury/models.py:169 msgid "remittance types" msgstr "types de remises" -#: apps/treasury/models.py:177 +#: apps/treasury/models.py:190 msgid "Comment" msgstr "Commentaire" -#: apps/treasury/models.py:182 +#: apps/treasury/models.py:195 msgid "Closed" msgstr "Fermée" -#: apps/treasury/models.py:186 +#: apps/treasury/models.py:199 msgid "remittance" msgstr "remise" -#: apps/treasury/models.py:187 +#: apps/treasury/models.py:200 msgid "remittances" msgstr "remises" -#: apps/treasury/models.py:219 +#: apps/treasury/models.py:232 msgid "Remittance #{:d}: {}" msgstr "Remise n°{:d} : {}" -#: apps/treasury/models.py:242 +#: apps/treasury/models.py:255 msgid "special transaction proxy" msgstr "Proxy de transaction spéciale" -#: apps/treasury/models.py:243 +#: apps/treasury/models.py:256 msgid "special transaction proxies" msgstr "Proxys de transactions spéciales" -#: apps/treasury/models.py:265 +#: apps/treasury/models.py:278 msgid "credit transaction" msgstr "transaction de crédit" -#: apps/treasury/models.py:328 +#: apps/treasury/models.py:341 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." @@ -1382,45 +1397,45 @@ 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:340 templates/treasury/sogecredit_detail.html:10 +#: apps/treasury/models.py:353 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:341 +#: apps/treasury/models.py:354 msgid "Credits from the Société générale" msgstr "Crédits de la Société générale" -#: apps/treasury/tables.py:19 +#: apps/treasury/tables.py:20 msgid "Invoice #{:d}" msgstr "Facture n°{:d}" -#: apps/treasury/tables.py:22 templates/treasury/invoice_list.html:10 +#: apps/treasury/tables.py:25 templates/treasury/invoice_list.html:10 #: templates/treasury/remittance_list.html:10 #: templates/treasury/sogecredit_list.html:10 msgid "Invoice" msgstr "Facture" -#: apps/treasury/tables.py:45 +#: apps/treasury/tables.py:65 msgid "Transaction count" msgstr "Nombre de transactions" -#: apps/treasury/tables.py:50 apps/treasury/tables.py:52 +#: apps/treasury/tables.py:70 apps/treasury/tables.py:72 msgid "View" msgstr "Voir" -#: apps/treasury/tables.py:79 +#: apps/treasury/tables.py:99 msgid "Add" msgstr "Ajouter" -#: apps/treasury/tables.py:87 +#: apps/treasury/tables.py:107 msgid "Remove" msgstr "supprimer" -#: apps/treasury/tables.py:126 +#: apps/treasury/tables.py:146 msgid "Yes" msgstr "Oui" -#: apps/treasury/tables.py:126 +#: apps/treasury/tables.py:146 msgid "No" msgstr "Non" @@ -1436,28 +1451,34 @@ msgstr "Liste des factures" msgid "Update an invoice" msgstr "Modifier la facture" -#: apps/treasury/views.py:188 +#: apps/treasury/views.py:145 templates/treasury/invoice_confirm_delete.html:8 +#, fuzzy +#| msgid "New invoice" +msgid "Delete invoice" +msgstr "Nouvelle facture" + +#: apps/treasury/views.py:205 msgid "Create a new remittance" msgstr "Créer une nouvelle remise" -#: apps/treasury/views.py:209 templates/treasury/remittance_form.html:9 +#: apps/treasury/views.py:226 templates/treasury/remittance_form.html:9 #: templates/treasury/specialtransactionproxy_form.html:7 msgid "Remittances list" msgstr "Liste des remises" -#: apps/treasury/views.py:259 +#: apps/treasury/views.py:276 msgid "Update a remittance" msgstr "Modifier la remise" -#: apps/treasury/views.py:282 +#: apps/treasury/views.py:299 msgid "Attach a transaction to a remittance" msgstr "Joindre une transaction à une remise" -#: apps/treasury/views.py:326 +#: apps/treasury/views.py:343 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:360 +#: apps/treasury/views.py:377 msgid "Manage credits from the Société générale" msgstr "Gérer les crédits de la Société générale" @@ -2469,6 +2490,29 @@ msgstr "" "d'adhésion. Vous devez également valider votre adresse email en suivant le " "lien que vous avez reçu." +#: templates/treasury/invoice_confirm_delete.html:13 +#, fuzzy +#| msgid "This registration is already validated and can't be deleted." +msgid "This invoice is locked and can't be deleted." +msgstr "L'inscription a déjà été validée et ne peut pas être supprimée." + +#: templates/treasury/invoice_confirm_delete.html:19 +#, fuzzy +#| msgid "" +#| "Are you sure you want to delete the registration of %(user)s for the WEI " +#| "%(wei_name)s? This action can't be undone." +msgid "" +"Are you sure you want to delete this invoice? This action can't be undone." +msgstr "" +"Êtes-vous sûr de vouloir supprimer l'inscription de %(user)s pour le WEI " +"%(wei_name)s ? Cette action ne pourra pas être annulée." + +#: templates/treasury/invoice_confirm_delete.html:26 +#, fuzzy +#| msgid "Return to credit list" +msgid "Return to invoices list" +msgstr "Retour à la liste des crédits" + #: templates/treasury/invoice_form.html:10 msgid "" "Warning: the LaTeX template is saved with this object. Updating the invoice " @@ -2478,11 +2522,11 @@ msgstr "" "facture implique la regénérer. Faites attention si vous manipulez de " "vieilles factures." -#: templates/treasury/invoice_form.html:51 +#: templates/treasury/invoice_form.html:58 msgid "Add product" msgstr "Ajouter produit" -#: templates/treasury/invoice_form.html:52 +#: templates/treasury/invoice_form.html:59 msgid "Remove product" msgstr "Retirer produit" diff --git a/templates/treasury/invoice_confirm_delete.html b/templates/treasury/invoice_confirm_delete.html new file mode 100644 index 00000000..1de30e0f --- /dev/null +++ b/templates/treasury/invoice_confirm_delete.html @@ -0,0 +1,33 @@ +{% extends "base.html" %} +{% load i18n %} +{% load crispy_forms_tags %} + +{% block content %} +
        +
        +

        {% trans "Delete invoice" %}

        +
        + {% if object.locked %} +
        +
        + {% blocktrans %}This invoice is locked and can't be deleted.{% endblocktrans %} +
        +
        + {% else %} +
        +
        + {% blocktrans %}Are you sure you want to delete this invoice? This action can't be undone.{% endblocktrans %} +
        +
        + {% endif %} +
        + + {% csrf_token %} + {% trans "Return to invoices list" %} + {% if not object.locked %} + + {% endif %} + +
        +
        +{% endblock %} diff --git a/templates/treasury/invoice_form.html b/templates/treasury/invoice_form.html index 5ad254ca..7ebcdb26 100644 --- a/templates/treasury/invoice_form.html +++ b/templates/treasury/invoice_form.html @@ -5,13 +5,19 @@ {% block content %}

        {% trans "Invoices list" %}

        - {% if not object.pk %} + {% if object.pk and not object.locked %}
        {% blocktrans trimmed %} Warning: the LaTeX template is saved with this object. Updating the invoice implies regenerate it. Be careful if you manipulate old invoices. {% endblocktrans %}
        + {% elif object.locked %} +
        + {% blocktrans trimmed %} + This invoice is locked and can no longer be edited. + {% endblocktrans %} +
        {% endif %}
        @@ -47,10 +53,12 @@ {# Display buttons to add and remove products #} -
        - - -
        + {% if not object.locked %} +
        + + +
        + {% endif %}
        @@ -78,21 +86,21 @@ {# Script that handles add and remove lines #} IDS = {}; - $("#id_product_set-TOTAL_FORMS").val($(".row-formset").length - 1); + $("#id_products-TOTAL_FORMS").val($(".row-formset").length - 1); $('#add_more').click(function () { - var form_idx = $('#id_product_set-TOTAL_FORMS').val(); + let form_idx = $('#id_products-TOTAL_FORMS').val(); $('#form_body').append($('#for_real').html().replace(/__prefix__/g, form_idx)); - $('#id_product_set-TOTAL_FORMS').val(parseInt(form_idx) + 1); - $('#id_product_set-' + parseInt(form_idx) + '-id').val(IDS[parseInt(form_idx)]); + $('#id_products-TOTAL_FORMS').val(parseInt(form_idx) + 1); + $('#id_products-' + parseInt(form_idx) + '-id').val(IDS[parseInt(form_idx)]); }); $('#remove_one').click(function () { - let form_idx = $('#id_product_set-TOTAL_FORMS').val(); + let form_idx = $('#id_products-TOTAL_FORMS').val(); if (form_idx > 0) { - IDS[parseInt(form_idx) - 1] = $('#id_product_set-' + (parseInt(form_idx) - 1) + '-id').val(); + IDS[parseInt(form_idx) - 1] = $('#id_products-' + (parseInt(form_idx) - 1) + '-id').val(); $('#form_body tr:last-child').remove(); - $('#id_product_set-TOTAL_FORMS').val(parseInt(form_idx) - 1); + $('#id_products-TOTAL_FORMS').val(parseInt(form_idx) - 1); } }); From 9751a5ad92f674cb796d4be0ae159a9a6cc0fa6d Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 7 Aug 2020 12:55:07 +0200 Subject: [PATCH 086/319] :bug: Fix pagination in transaction page --- apps/note/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/note/views.py b/apps/note/views.py index bdc450fe..169920e9 100644 --- a/apps/note/views.py +++ b/apps/note/views.py @@ -214,7 +214,7 @@ class TransactionSearchView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView transactions = transactions.filter(created_at__lte=data["created_before"]) table = HistoryTable(transactions) - table.paginate(per_page=100) + table.paginate(per_page=100, page=self.request.GET.get("page", 1)) context["table"] = table return context From aab194b9872d0d1b57abf8bc3ce268b53d3ec9ae Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 7 Aug 2020 13:19:00 +0200 Subject: [PATCH 087/319] =?UTF-8?q?Import=20Soci=C3=A9t=C3=A9=20g=C3=A9n?= =?UTF-8?q?=C3=A9rale=20credits?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 4984159a..169895a8 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 4984159a61642a0d3668e85daf39472b59b86447 +Subproject commit 169895a825d0ea670682a6e718b719d91807e1f9 From 88917dde237567c7c684d7bb7ac110f6ca481457 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 7 Aug 2020 14:00:54 +0200 Subject: [PATCH 088/319] Some memberships were detected twice --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 169895a8..53098f8a 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 169895a825d0ea670682a6e718b719d91807e1f9 +Subproject commit 53098f8adcf085fdb0e8ff058a3035bd2d4977a3 From ad59b5c81ef7ca1392719ebf1ea9102ac75cd3d6 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 7 Aug 2020 14:20:34 +0200 Subject: [PATCH 089/319] Change help text in membership fields in club form --- apps/member/models.py | 7 +--- locale/de/LC_MESSAGES/django.po | 38 +++++++++--------- locale/fr/LC_MESSAGES/django.po | 70 ++++++++++++--------------------- 3 files changed, 45 insertions(+), 70 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 90117f35..4e930202 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -216,17 +216,14 @@ class Club(models.Model): blank=True, null=True, verbose_name=_('membership start'), - help_text=_('How long after January 1st the members can renew ' - 'their membership.'), + help_text=_('Date from which the members can renew their membership.'), ) membership_end = models.DateField( blank=True, null=True, verbose_name=_('membership end'), - help_text=_('How long the membership can last after January 1st ' - 'of the next year after members can renew their ' - 'membership.'), + help_text=_('Maximal date of a membership, after which members must renew it.'), ) def update_membership_dates(self): diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 20b8f3e7..b3a2ca05 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-07 11:03+0200\n" +"POT-Creation-Date: 2020-08-07 14:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,7 +95,7 @@ msgstr "" msgid "type" msgstr "" -#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 +#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:277 #: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -315,11 +315,11 @@ msgstr "" msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/admin.py:67 apps/member/models.py:291 +#: apps/member/admin.py:67 apps/member/models.py:288 msgid "roles" msgstr "" -#: apps/member/admin.py:68 apps/member/models.py:305 +#: apps/member/admin.py:68 apps/member/models.py:302 msgid "fee" msgstr "" @@ -544,59 +544,57 @@ msgid "membership start" msgstr "" #: apps/member/models.py:219 -msgid "How long after January 1st the members can renew their membership." +msgid "Date from which the members can renew their membership." msgstr "" -#: apps/member/models.py:226 templates/member/club_info.html:28 +#: apps/member/models.py:225 templates/member/club_info.html:28 msgid "membership end" msgstr "" -#: apps/member/models.py:227 -msgid "" -"How long the membership can last after January 1st of the next year after " -"members can renew their membership." +#: apps/member/models.py:226 +msgid "Maximal date of a membership, after which members must renew it." msgstr "" -#: apps/member/models.py:261 apps/member/models.py:286 +#: apps/member/models.py:258 apps/member/models.py:283 #: apps/note/models/notes.py:163 msgid "club" msgstr "" -#: apps/member/models.py:262 +#: apps/member/models.py:259 msgid "clubs" msgstr "" -#: apps/member/models.py:296 +#: apps/member/models.py:293 msgid "membership starts on" msgstr "" -#: apps/member/models.py:300 +#: apps/member/models.py:297 msgid "membership ends on" msgstr "" -#: apps/member/models.py:351 +#: apps/member/models.py:348 #, python-brace-format msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:362 apps/member/views.py:592 +#: apps/member/models.py:359 apps/member/views.py:592 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:409 +#: apps/member/models.py:406 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:462 +#: apps/member/models.py:459 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:465 +#: apps/member/models.py:462 msgid "membership" msgstr "" -#: apps/member/models.py:466 +#: apps/member/models.py:463 msgid "memberships" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 7d0dcd54..ddad77a5 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-07 11:03+0200\n" +"POT-Creation-Date: 2020-08-07 14:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -96,7 +96,7 @@ msgstr "lieu" msgid "type" msgstr "type" -#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 +#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:277 #: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -316,11 +316,11 @@ msgstr "cotisation pour adhérer (normalien élève)" msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:67 apps/member/models.py:291 +#: apps/member/admin.py:67 apps/member/models.py:288 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:68 apps/member/models.py:305 +#: apps/member/admin.py:68 apps/member/models.py:302 msgid "fee" msgstr "cotisation" @@ -545,63 +545,59 @@ msgid "membership start" msgstr "début de l'adhésion" #: apps/member/models.py:219 -msgid "How long after January 1st the members can renew their membership." +msgid "Date from which the members can renew their membership." msgstr "" -"Combien de temps après le 1er Janvier les adhérents peuvent renouveler leur " +"Date à partir de laquelle les adhérents peuvent renouveler leur " "adhésion." -#: apps/member/models.py:226 templates/member/club_info.html:28 +#: apps/member/models.py:225 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:227 -msgid "" -"How long the membership can last after January 1st of the next year after " -"members can renew their membership." -msgstr "" -"Combien de temps l'adhésion peut durer après le 1er Janvier de l'année " -"suivante avant que les adhérents peuvent renouveler leur adhésion." +#: apps/member/models.py:226 +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:261 apps/member/models.py:286 +#: apps/member/models.py:258 apps/member/models.py:283 #: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:262 +#: apps/member/models.py:259 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:296 +#: apps/member/models.py:293 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:300 +#: apps/member/models.py:297 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:351 +#: apps/member/models.py:348 #, 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:362 apps/member/views.py:592 +#: apps/member/models.py:359 apps/member/views.py:592 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:409 +#: apps/member/models.py:406 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:462 +#: apps/member/models.py:459 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:465 +#: apps/member/models.py:462 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:466 +#: apps/member/models.py:463 msgid "memberships" msgstr "adhésions" @@ -1312,10 +1308,8 @@ msgid "An invoice can't be edited when it is locked." msgstr "Une facture ne peut plus être modifiée si elle est verrouillée." #: apps/treasury/models.py:75 -#, fuzzy -#| msgid "source" msgid "tex source" -msgstr "source" +msgstr "Fichier TeX source" #: apps/treasury/models.py:88 templates/treasury/invoice_form.html:17 msgid "This invoice is locked and can no longer be edited." @@ -1452,10 +1446,8 @@ msgid "Update an invoice" msgstr "Modifier la facture" #: apps/treasury/views.py:145 templates/treasury/invoice_confirm_delete.html:8 -#, fuzzy -#| msgid "New invoice" msgid "Delete invoice" -msgstr "Nouvelle facture" +msgstr "Supprimer la facture" #: apps/treasury/views.py:205 msgid "Create a new remittance" @@ -2491,27 +2483,18 @@ msgstr "" "lien que vous avez reçu." #: templates/treasury/invoice_confirm_delete.html:13 -#, fuzzy -#| msgid "This registration is already validated and can't be deleted." msgid "This invoice is locked and can't be deleted." -msgstr "L'inscription a déjà été validée et ne peut pas être supprimée." +msgstr "Cette facture est verrouillée et ne peut pas être supprimée." #: templates/treasury/invoice_confirm_delete.html:19 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete the registration of %(user)s for the WEI " -#| "%(wei_name)s? This action can't be undone." msgid "" "Are you sure you want to delete this invoice? This action can't be undone." msgstr "" -"Êtes-vous sûr de vouloir supprimer l'inscription de %(user)s pour le WEI " -"%(wei_name)s ? Cette action ne pourra pas être annulée." +"Êtes-vous sûr de vouloir supprimer cette facture ? Cette action ne pourra pas être annulée." #: templates/treasury/invoice_confirm_delete.html:26 -#, fuzzy -#| msgid "Return to credit list" msgid "Return to invoices list" -msgstr "Retour à la liste des crédits" +msgstr "Retour à la liste des factures" #: templates/treasury/invoice_form.html:10 msgid "" @@ -2863,6 +2846,3 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée." #: templates/wei/weiregistration_list.html:24 msgid "View validated memberships..." msgstr "Voir les adhésions validées ..." - -#~ msgid "Place" -#~ msgstr "Lieu" From e4998cb6e3a4735fd83f535fec64d04bf99e0bc5 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Fri, 7 Aug 2020 20:11:28 +0200 Subject: [PATCH 090/319] [WEI] Implement WEI Survey front --- apps/wei/forms/surveys/base.py | 7 ++++ apps/wei/forms/surveys/wei2020.py | 66 ++++++++++++++++++++++++------- apps/wei/views.py | 1 + locale/de/LC_MESSAGES/django.po | 8 +++- locale/fr/LC_MESSAGES/django.po | 18 ++++++--- templates/base.html | 1 + 6 files changed, 79 insertions(+), 22 deletions(-) diff --git a/apps/wei/forms/surveys/base.py b/apps/wei/forms/surveys/base.py index f43dafc2..173d1758 100644 --- a/apps/wei/forms/surveys/base.py +++ b/apps/wei/forms/surveys/base.py @@ -44,6 +44,13 @@ class WEIBusInformation: def __init__(self, bus: Bus): self.__dict__.update(bus.information) self.bus = bus + self.save() + + def save(self): + d = self.__dict__.copy() + d.pop("bus") + self.bus.information = d + self.bus.save() class WEISurveyAlgorithm: diff --git a/apps/wei/forms/surveys/wei2020.py b/apps/wei/forms/surveys/wei2020.py index 4f60f6d4..34a5c587 100644 --- a/apps/wei/forms/surveys/wei2020.py +++ b/apps/wei/forms/surveys/wei2020.py @@ -1,27 +1,56 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later -from django import forms +from random import choice -from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm +from django import forms +from django.utils.translation import gettext_lazy as _ + +from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation from ...models import Bus +# TODO: Use new words +WORDS = ['Rap', 'Retro', 'DJ', 'Rock', 'Jazz', 'Chansons Populaires', 'Chansons Paillardes', 'Pop', 'Fanfare', + 'Biere', 'Pastis', 'Vodka', 'Cocktails', 'Eau', 'Sirop', 'Jus de fruit', 'Binge Drinking', 'Rhum', + 'Eau de vie', 'Apéro', 'Morning beer', 'Huit-six', 'Jeux de societé', 'Jeux de cartes', 'Danse', 'Karaoké', + 'Bière Pong', 'Poker', 'Loup Garou', 'Films', "Jeux d'alcool", 'Sport', 'Rangées de cul', 'Chips', 'BBQ', + 'Kebab', 'Saucisse', 'Vegan', 'Vege', 'LGBTIQ+', 'Dab', 'Solitaire', 'Séducteur', 'Sociale', 'Chanteur', + 'Se lacher', 'Chill', 'Débile', 'Beauf', 'Bon enfant'] + + class WEISurveyForm2020(forms.Form): """ Survey form for the year 2020. - For now, that's only a Bus selector. - TODO: Do a better survey (later) + Members choose 20 words, from which we calculate the best associated bus. """ - bus = forms.ModelChoiceField( - Bus.objects, + + word = forms.ChoiceField( + label=_("Choose a word:"), + widget=forms.RadioSelect(), ) def set_registration(self, registration): """ Filter the bus selector with the buses of the current WEI. """ - self.fields["bus"].queryset = Bus.objects.filter(wei=registration.wei) + words = [choice(WORDS) for _ in range(10)] + words = [(w, w) for w in words] + if self.data: + self.fields["word"].choices = WORDS + if self.is_valid(): + return + self.fields["word"].choices = words + + +class WEIBusInformation2020(WEIBusInformation): + """ + For each word, the bus has a score + """ + def __init__(self, bus): + for word in WORDS: + setattr(self, word, 0.0) + super().__init__(bus) class WEISurveyInformation2020(WEISurveyInformation): @@ -29,14 +58,19 @@ class WEISurveyInformation2020(WEISurveyInformation): We store the id of the selected bus. We store only the name, but is not used in the selection: that's only for humans that try to read data. """ - chosen_bus_pk = None - chosen_bus_name = None + step = 0 + + def __init__(self, registration): + for i in range(1, 21): + setattr(self, "word" + str(i), None) + super().__init__(registration) class WEISurvey2020(WEISurvey): """ Survey for the year 2020. """ + @classmethod def get_year(cls): return 2020 @@ -55,9 +89,9 @@ class WEISurvey2020(WEISurvey): form.set_registration(self.registration) def form_valid(self, form): - bus = form.cleaned_data["bus"] - self.information.chosen_bus_pk = bus.pk - self.information.chosen_bus_name = bus.name + word = form.cleaned_data["word"] + self.information.step += 1 + setattr(self.information, "word" + str(self.information.step), word) self.save() @classmethod @@ -68,7 +102,7 @@ class WEISurvey2020(WEISurvey): """ The survey is complete once the bus is chosen. """ - return self.information.chosen_bus_pk is not None + return self.information.step == 20 class WEISurveyAlgorithm2020(WEISurveyAlgorithm): @@ -82,8 +116,12 @@ class WEISurveyAlgorithm2020(WEISurveyAlgorithm): def get_survey_class(cls): return WEISurvey2020 + @classmethod + def get_bus_information_class(cls): + return WEIBusInformation2020 + def run_algorithm(self): for registration in self.get_registrations(): survey = self.get_survey_class()(registration) - survey.select_bus(Bus.objects.get(pk=survey.information.chosen_bus_pk)) + survey.select_bus(choice(Bus.objects.all())) survey.save() diff --git a/apps/wei/views.py b/apps/wei/views.py index 3d96ed9f..b9edcbe9 100644 --- a/apps/wei/views.py +++ b/apps/wei/views.py @@ -918,6 +918,7 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView): def dispatch(self, request, *args, **kwargs): obj = self.get_object() + self.object = obj wei = obj.wei today = date.today() diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index b3a2ca05..6296da52 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-07 14:17+0200\n" +"POT-Creation-Date: 2020-08-07 19:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1484,6 +1484,10 @@ msgstr "" msgid "This team doesn't belong to the given bus." msgstr "" +#: apps/wei/forms/surveys/wei2020.py:26 +msgid "Choose a word:" +msgstr "" + #: apps/wei/models.py:24 templates/wei/weiclub_info.html:23 msgid "year" msgstr "" @@ -1768,7 +1772,7 @@ msgstr "" msgid "This user didn't give her/his caution check." msgstr "" -#: apps/wei/views.py:917 apps/wei/views.py:970 apps/wei/views.py:980 +#: apps/wei/views.py:917 apps/wei/views.py:971 apps/wei/views.py:981 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index ddad77a5..6d75fe26 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-07 14:17+0200\n" +"POT-Creation-Date: 2020-08-07 19:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -547,8 +547,7 @@ msgstr "début de l'adhésion" #: apps/member/models.py:219 msgid "Date from which the members can renew their membership." msgstr "" -"Date à partir de laquelle les adhérents peuvent renouveler leur " -"adhésion." +"Date à partir de laquelle les adhérents peuvent renouveler leur adhésion." #: apps/member/models.py:225 templates/member/club_info.html:28 msgid "membership end" @@ -556,7 +555,9 @@ msgstr "fin de l'adhésion" #: apps/member/models.py:226 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." +msgstr "" +"Date maximale d'une fin d'adhésion, après laquelle les adhérents doivent la " +"renouveler." #: apps/member/models.py:258 apps/member/models.py:283 #: apps/note/models/notes.py:163 @@ -1518,6 +1519,10 @@ msgstr "Sélectionnez les rôles qui vous intéressent." msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." +#: apps/wei/forms/surveys/wei2020.py:26 +msgid "Choose a word:" +msgstr "Choisissez un mot :" + #: apps/wei/models.py:24 templates/wei/weiclub_info.html:23 msgid "year" msgstr "année" @@ -1814,7 +1819,7 @@ msgstr "Valider l'inscription WEI" msgid "This user didn't give her/his caution check." msgstr "Cet utilisateur n'a pas donné son chèque de caution." -#: apps/wei/views.py:917 apps/wei/views.py:970 apps/wei/views.py:980 +#: apps/wei/views.py:917 apps/wei/views.py:971 apps/wei/views.py:981 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12 #: templates/wei/survey_end.html:12 msgid "Survey WEI" @@ -2490,7 +2495,8 @@ msgstr "Cette facture est verrouillée et ne peut pas être supprimée." msgid "" "Are you sure you want to delete this invoice? This action can't be undone." msgstr "" -"Êtes-vous sûr de vouloir supprimer cette facture ? Cette action ne pourra pas être annulée." +"Êtes-vous sûr de vouloir supprimer cette facture ? Cette action ne pourra " +"pas être annulée." #: templates/treasury/invoice_confirm_delete.html:26 msgid "Return to invoices list" diff --git a/templates/base.html b/templates/base.html index 8b45d914..e50defcb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -231,6 +231,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block extrajavascript %} From 18eaf4477e354b763c8b83bcfae0508f89842979 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sat, 8 Aug 2020 15:30:33 +0200 Subject: [PATCH 091/319] :bug: timezone.now is a DateTime, not a Date --- apps/member/forms.py | 4 ++-- apps/member/models.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index 2934bbee..5c211b4d 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -39,7 +39,7 @@ class ProfileForm(forms.ModelForm): """ report_frequency = forms.IntegerField(required=False, initial=0, label=_("Report frequency")) - last_report = forms.DateField(required=False, disabled=True, label=_("Last report date")) + last_report = forms.DateTimeField(required=False, disabled=True, label=_("Last report date")) def save(self, commit=True): if not self.instance.section or (("department" in self.changed_data @@ -50,7 +50,7 @@ class ProfileForm(forms.ModelForm): class Meta: model = Profile fields = '__all__' - exclude = ('user', 'email_confirmed', 'registration_valid', ) + exclude = ('user', ) class ClubForm(forms.ModelForm): diff --git a/apps/member/models.py b/apps/member/models.py index 4e930202..29174732 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -97,7 +97,7 @@ class Profile(models.Model): default=0, ) - last_report = models.DateField( + last_report = models.DateTimeField( verbose_name=_("last report date"), default=timezone.now, ) From 963ba05d01574de0491d9eec1b13d8fcf8d2a4d2 Mon Sep 17 00:00:00 2001 From: Pierre-antoine Comby Date: Sat, 8 Aug 2020 16:20:59 +0200 Subject: [PATCH 092/319] :art: set default birthday to 2001-01-01 --- apps/wei/forms/registration.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py index 1645f60c..0c199161 100644 --- a/apps/wei/forms/registration.py +++ b/apps/wei/forms/registration.py @@ -39,7 +39,9 @@ class WEIRegistrationForm(forms.ModelForm): 'placeholder': 'Nom ...', }, ), - "birth_date": DatePickerInput(), + "birth_date": DatePickerInput(options={'defaultDate':'2000-01-01', + 'minDate':'1900-01-01', + 'maxDate': '2100-01-01'}), } From 872456df207614d4b1be217fbaadd2c6b8389484 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 12:31:06 +0200 Subject: [PATCH 093/319] :bug: Don't break the note --- apps/note/api/serializers.py | 4 ++-- apps/note/models/transactions.py | 16 ++++++++-------- static/js/consos.js | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py index 4b2ed0a6..1230de4b 100644 --- a/apps/note/api/serializers.py +++ b/apps/note/api/serializers.py @@ -237,9 +237,9 @@ class TransactionPolymorphicSerializer(PolymorphicSerializer): field.set(value) else: setattr(instance, attr, value) - instance.validate(True) + instance.validate() else: - serializer.Meta.model(**attrs).validate(True) + serializer.Meta.model(**attrs).validate() attrs[self.resource_type_field_name] = resource_type return super().validate(attrs) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 6cc5174b..762a2bdf 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -164,7 +164,7 @@ class Transaction(PolymorphicModel): models.Index(fields=['destination']), ] - def validate(self, reset=False): + def validate(self): previous_source_balance = self.source.balance previous_dest_balance = self.destination.balance @@ -188,23 +188,19 @@ class Transaction(PolymorphicModel): source_balance = self.source.balance dest_balance = self.destination.balance - if reset: - self.source.balance = previous_source_balance - self.destination.balance = previous_dest_balance - if source_balance > 2147483647 or source_balance < -2147483648\ or dest_balance > 2147483647 or dest_balance < -2147483648: raise ValidationError(_("The note balances must be between - 21 474 836.47 € and 21 474 836.47 €.")) + return source_balance - previous_source_balance, dest_balance - previous_dest_balance + @transaction.atomic def save(self, *args, **kwargs): """ When saving, also transfer money between two notes """ with transaction.atomic(): - self.source.refresh_from_db() - self.destination.refresh_from_db() - self.validate(False) + diff_source, diff_dest = self.validate() if not self.source.is_active or not self.destination.is_active: if 'force_insert' not in kwargs or not kwargs['force_insert']: @@ -229,9 +225,13 @@ class Transaction(PolymorphicModel): self.log("Saved") # Save notes + self.source.refresh_from_db() + self.source.balance += diff_source self.source._force_save = True self.source.save() self.log("Source saved") + self.destination.refresh_from_db() + self.destination.balance += diff_dest self.destination._force_save = True self.destination.save() self.log("Destination saved") diff --git a/static/js/consos.js b/static/js/consos.js index 652b0901..24d0d0fb 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -218,7 +218,7 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat addMsg("Attention, La transaction depuis la note " + source_alias + " a été réalisée avec " + "succès, mais la note émettrice " + source_alias + " est en négatif.", "warning", 30000); - if (source.note.membership && source.note.membership.date_end < new Date().toISOString()) + if (source.membership && source.membership.date_end < new Date().toISOString()) addMsg("Attention : la note émettrice " + source.name + " n'est plus adhérente.", "danger", 30000); } From 4afb849aec0af6bd7d69ca5d9717f9c0ce27f6fb Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 12:42:25 +0200 Subject: [PATCH 094/319] I hate you JS --- static/js/base.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/js/base.js b/static/js/base.js index 5400bf5d..f8b7d50f 100644 --- a/static/js/base.js +++ b/static/js/base.js @@ -265,7 +265,10 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr consumers.results.forEach(function (consumer) { let note = consumer.note; note.email_confirmed = consumer.email_confirmed; - note.membership = consumer.membership; + 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, From 255e4dd0aa0b5e2265233691f97528752411ded1 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 13:19:27 +0200 Subject: [PATCH 095/319] Lock interfaces when a transfer is performed to prevent spam click accidents --- static/js/consos.js | 33 +++++++++++++++++++++++++++------ static/js/transfer.js | 25 ++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/static/js/consos.js b/static/js/consos.js index 24d0d0fb..32dd44a9 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -1,6 +1,9 @@ // Copyright (C) 2018-2020 by BDE ENS Paris-Saclay // SPDX-License-Identifier: GPL-3.0-or-later +// When a transaction is performed, lock the interface to prevent spam clicks. +let LOCK = false; + /** * Refresh the history table on the consumptions page. */ @@ -35,8 +38,11 @@ $(document).ready(function() { note_list_obj.html(""); buttons.forEach(function(button) { - $("#conso_button_" + button.id).click(removeNote(button, "conso_button", buttons, - "consos_list")); + $("#conso_button_" + button.id).click(function() { + if (LOCK) + return; + removeNote(button, "conso_button", buttons,"consos_list"); + }); }); } }); @@ -52,8 +58,11 @@ $(document).ready(function() { $("#note_list").html(consos_list_obj.html()); consos_list_obj.html(""); buttons.forEach(function(button) { - $("#conso_button_" + button.id).click(removeNote(button, "conso_button", buttons, - "note_list")); + $("#conso_button_" + button.id).click(function() { + if (LOCK) + return; + removeNote(button, "conso_button", buttons,"note_list"); + }); }); } else { @@ -127,7 +136,11 @@ function addConso(dest, amount, type, category_id, category_name, template_id, t $("#" + list).html(html); buttons.forEach(function(button) { - $("#conso_button_" + button.id).click(removeNote(button, "conso_button", buttons, list)); + $("#conso_button_" + button.id).click(function() { + if (LOCK) + return; + removeNote(button, "conso_button", buttons, list); + }); }); } else @@ -148,6 +161,7 @@ function reset() { $("#profile_pic_link").attr("href", "#"); refreshHistory(); refreshBalance(); + LOCK = false; } @@ -155,6 +169,11 @@ function reset() { * Apply all transactions: all notes in `notes` buy each item in `buttons` */ function consumeAll() { + if (LOCK) + return; + + LOCK = true; + let error = false; if (notes_display.length === 0) { @@ -168,8 +187,10 @@ function consumeAll() { error = true; } - if (error) + if (error) { + LOCK = false; return; + } notes_display.forEach(function(note_display) { buttons.forEach(function(button) { diff --git a/static/js/transfer.js b/static/js/transfer.js index 2ee879dc..8df25c42 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -1,3 +1,5 @@ +let LOCK = true; + sources = []; sources_notes_display = []; dests = []; @@ -42,6 +44,8 @@ function reset(refresh=true) { refreshBalance(); refreshHistory(); } + + LOCK = false; } $(document).ready(function() { @@ -91,6 +95,9 @@ $(document).ready(function() { let dest = $("#dest_note"); $("#type_transfer").click(function() { + if (LOCK) + return; + $("#source_me_div").removeClass('d-none'); $("#source_note").removeClass('is-invalid'); $("#dest_note").removeClass('is-invalid'); @@ -102,6 +109,9 @@ $(document).ready(function() { }); $("#type_credit").click(function() { + if (LOCK) + return; + $("#source_me_div").addClass('d-none'); $("#source_note").removeClass('is-invalid'); $("#dest_note").removeClass('is-invalid'); @@ -122,6 +132,9 @@ $(document).ready(function() { }); $("#type_debit").click(function() { + if (LOCK) + return; + $("#source_me_div").addClass('d-none'); $("#source_note").removeClass('is-invalid'); $("#dest_note").removeClass('is-invalid'); @@ -165,6 +178,9 @@ $(document).ready(function() { location.hash = ""; $("#source_me").click(function() { + if (LOCK) + return; + // Shortcut to set the current user as the only emitter sources_notes_display.length = 0; sources.length = 0; @@ -198,6 +214,11 @@ $(document).ready(function() { }); $("#btn_transfer").click(function() { + if (LOCK) + return; + + LOCK = true; + let error = false; let amount_field = $("#amount"); @@ -237,8 +258,10 @@ $("#btn_transfer").click(function() { error = true; } - if (error) + if (error) { + LOCK = false; return; + } let reason = reason_field.val(); From 8c885d372bda89b72e05954477120a38645b52bc Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 13:23:22 +0200 Subject: [PATCH 096/319] Typo, closes #57 --- locale/fr/LC_MESSAGES/django.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 6d75fe26..6a6855ac 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2373,7 +2373,7 @@ msgid "" "You recently registered on the Note Kfet. Please click on the link below to " "confirm your registration." msgstr "" -"Vous vous êtes inscrits récemment sur la Note Kfet. Merci de cliquer sur le " +"Vous vous êtes inscrit·e récemment sur la Note Kfet. Merci de cliquer sur le " "lien ci-dessous pour confirmer votre adresse email." #: templates/registration/mails/email_validation_email.html:26 From 5f87e76be82f6ecf03ecb2e45ad75d52e1a0a4a9 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 13:42:37 +0200 Subject: [PATCH 097/319] Fix Profile model in Django Admin --- apps/member/models.py | 5 ++++- locale/fr/LC_MESSAGES/django.po | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/member/models.py b/apps/member/models.py index 29174732..13002158 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -142,7 +142,10 @@ class Profile(models.Model): indexes = [models.Index(fields=['user'])] def get_absolute_url(self): - return reverse('user_detail', args=(self.pk,)) + return reverse('member:user_detail', args=(self.user_id,)) + + def __str__(self): + return str(self.user) def send_email_validation_link(self): subject = "[Note Kfet]" + str(_("Activate your Note Kfet account")) diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 6a6855ac..d3b5fd5a 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -504,7 +504,7 @@ msgstr "adresse email confirmée" #: apps/member/models.py:111 msgid "registration valid" -msgstr "inscription valid" +msgstr "inscription valide" #: apps/member/models.py:140 apps/member/models.py:141 msgid "user profile" From 901af1a86a893d5f042dbc97129db380fd93e0df Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 14:01:59 +0200 Subject: [PATCH 098/319] Use var instead of let to declare a global var (turbolinks...) --- static/js/consos.js | 2 +- static/js/transfer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/consos.js b/static/js/consos.js index 32dd44a9..8b8e612c 100644 --- a/static/js/consos.js +++ b/static/js/consos.js @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later // When a transaction is performed, lock the interface to prevent spam clicks. -let LOCK = false; +var LOCK = false; /** * Refresh the history table on the consumptions page. diff --git a/static/js/transfer.js b/static/js/transfer.js index 8df25c42..5e49aa4f 100644 --- a/static/js/transfer.js +++ b/static/js/transfer.js @@ -1,4 +1,4 @@ -let LOCK = true; +var LOCK = false; sources = []; sources_notes_display = []; From 11fbbca2a8d88f392c81d21d6aed9b49651c3c6b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 14:52:57 +0200 Subject: [PATCH 099/319] Amount help text in transaction templates forms can be misleading: they type euros not cents --- apps/note/models/transactions.py | 1 - locale/de/LC_MESSAGES/django.po | 4 ---- locale/fr/LC_MESSAGES/django.po | 4 ---- 3 files changed, 9 deletions(-) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 762a2bdf..9ee82188 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -57,7 +57,6 @@ class TransactionTemplate(models.Model): amount = models.PositiveIntegerField( verbose_name=_('amount'), - help_text=_('in centimes'), ) category = models.ForeignKey( TemplateCategory, diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 6296da52..32e2995e 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -847,10 +847,6 @@ msgstr "" msgid "A template with this name already exist" msgstr "" -#: apps/note/models/transactions.py:60 -msgid "in centimes" -msgstr "" - #: apps/note/models/transactions.py:72 msgid "display" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index d3b5fd5a..38b31c6c 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -854,10 +854,6 @@ msgstr "catégories de transaction" msgid "A template with this name already exist" msgstr "Un modèle de transaction avec un nom similaire existe déjà." -#: apps/note/models/transactions.py:60 -msgid "in centimes" -msgstr "en centimes" - #: apps/note/models/transactions.py:72 msgid "display" msgstr "afficher" From 49bda926c66b1b405fc3911f35fe3d3d4e5a6eb8 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 15:31:38 +0200 Subject: [PATCH 100/319] Disable turbolinks for pages that require custom JS, like calendars or autocomplete fields --- apps/note/tables.py | 5 ++++- apps/wei/tables.py | 3 ++- templates/activity/activity_info.html | 4 ++-- templates/activity/activity_list.html | 2 +- templates/member/club_info.html | 4 ++-- templates/member/club_list.html | 2 +- templates/note/transactiontemplate_list.html | 2 +- templates/wei/bus_tables.html | 4 ++-- templates/wei/busteam_tables.html | 4 ++-- templates/wei/weiclub_info.html | 8 ++++---- templates/wei/weiclub_tables.html | 6 +++--- templates/wei/weimembership_form.html | 2 +- 12 files changed, 25 insertions(+), 21 deletions(-) diff --git a/apps/note/tables.py b/apps/note/tables.py index 505e8dfa..f0e4469a 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -156,7 +156,10 @@ class ButtonTable(tables.Table): edit = tables.LinkColumn('note:template_update', args=[A('pk')], attrs={'td': {'class': 'col-sm-1'}, - 'a': {'class': 'btn btn-sm btn-primary'}}, + 'a': { + 'class': 'btn btn-sm btn-primary', + 'data-turbolinks': 'false', + }}, text=_('edit'), accessor='pk', verbose_name=_("Edit"),) diff --git a/apps/wei/tables.py b/apps/wei/tables.py index a1d982cd..a963ba0e 100644 --- a/apps/wei/tables.py +++ b/apps/wei/tables.py @@ -47,7 +47,8 @@ class WEIRegistrationTable(tables.Table): text=_("Edit"), attrs={ 'a': { - 'class': 'btn btn-warning' + 'class': 'btn btn-warning', + 'data-turbolinks': 'false', } } ) diff --git a/templates/activity/activity_info.html b/templates/activity/activity_info.html index 4eb6dd29..ca2988b5 100644 --- a/templates/activity/activity_info.html +++ b/templates/activity/activity_info.html @@ -68,10 +68,10 @@ {% if activity.valid %}{% trans "invalidate"|capfirst %}{% else %}{% trans "validate"|capfirst %}{% endif %} {% endif %} {% if ".change_"|has_perm:activity %} - {% trans "edit"|capfirst %} + {% trans "edit"|capfirst %} {% endif %} {% if activity.activity_type.can_invite and not activity_started %} - {% trans "Invite" %} + {% trans "Invite" %} {% endif %} {% endif %}
        diff --git a/templates/activity/activity_list.html b/templates/activity/activity_list.html index bf1d846b..3c2add37 100644 --- a/templates/activity/activity_list.html +++ b/templates/activity/activity_list.html @@ -19,7 +19,7 @@
      {% endif %} - {% trans 'New activity' %} + {% trans 'New activity' %}
      diff --git a/templates/member/club_info.html b/templates/member/club_info.html index e7974f77..8dcf5baa 100644 --- a/templates/member/club_info.html +++ b/templates/member/club_info.html @@ -61,10 +61,10 @@ {% if not club.weiclub %}
      {% if can_add_members %} - {% trans "Add member" %} + {% trans "Add member" %} {% endif %} {% if ".change_"|has_perm:club %} - {% trans "Edit" %} + {% trans "Edit" %} {% endif %} {% url 'member:club_detail' club.pk as club_detail_url %} {%if request.path_info != club_detail_url %} diff --git a/templates/member/club_list.html b/templates/member/club_list.html index 346cc623..9b06e924 100644 --- a/templates/member/club_list.html +++ b/templates/member/club_list.html @@ -6,7 +6,7 @@
      - {% trans "Create club" %} + {% trans "Create club" %}
      diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html index 793b2278..dc1f9d0c 100644 --- a/templates/note/transactiontemplate_list.html +++ b/templates/note/transactiontemplate_list.html @@ -7,7 +7,7 @@
      - {% trans "New button" %} + {% trans "New button" %}
      diff --git a/templates/wei/bus_tables.html b/templates/wei/bus_tables.html index f0df7e44..46509d8d 100644 --- a/templates/wei/bus_tables.html +++ b/templates/wei/bus_tables.html @@ -12,8 +12,8 @@
      - {% trans "Edit" %} - {% trans "Add team" %} + {% trans "Edit" %} + {% trans "Add team" %}
      diff --git a/templates/wei/busteam_tables.html b/templates/wei/busteam_tables.html index c3e53bf7..433405b8 100644 --- a/templates/wei/busteam_tables.html +++ b/templates/wei/busteam_tables.html @@ -12,8 +12,8 @@
      - {% trans "Edit" %} - {% trans "Add team" %} + {% trans "Edit" %} + {% trans "Add team" %}
      diff --git a/templates/wei/weiclub_info.html b/templates/wei/weiclub_info.html index 4af6afa0..99c57e28 100644 --- a/templates/wei/weiclub_info.html +++ b/templates/wei/weiclub_info.html @@ -59,16 +59,16 @@ {% endif %} {% if club.is_current_wei %} {% if can_add_first_year_member %} - {% trans "Register 1A" %} + {% trans "Register 1A" %} {% endif %} {% if can_add_any_member %} - {% trans "Register 2A+" %} + {% trans "Register 2A+" %} {% endif %} {% if "wei.change_"|has_perm:club %} - {% trans "Edit" %} + {% trans "Edit" %} {% endif %} {% if can_add_bus %} - {% trans "Add bus" %} + {% trans "Add bus" %} {% endif %} {% url 'wei:wei_detail' club.pk as club_detail_url %} {%if request.path_info != club_detail_url %} diff --git a/templates/wei/weiclub_tables.html b/templates/wei/weiclub_tables.html index a8d02dcb..20887384 100644 --- a/templates/wei/weiclub_tables.html +++ b/templates/wei/weiclub_tables.html @@ -13,11 +13,11 @@
      {% if not my_registration %} {% if not not_first_year %} - + {% endif %} - + {% else %} - + {% endif %}
      {% endif %} diff --git a/templates/wei/weimembership_form.html b/templates/wei/weimembership_form.html index 1e26414b..b19353c1 100644 --- a/templates/wei/weimembership_form.html +++ b/templates/wei/weimembership_form.html @@ -125,7 +125,7 @@
      - {% trans 'Update registration' %} + {% trans 'Update registration' %} {% if "auth.change_user"|has_perm:registration.user %} {% trans 'Update Profile' %} {% endif %} From 29f84ea0077ad6cb05f1efb456f8e09ff6c333b8 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 15:42:07 +0200 Subject: [PATCH 101/319] Remove test code --- apps/note/models/transactions.py | 8 -------- apps/permission/models.py | 2 -- 2 files changed, 10 deletions(-) diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py index 9ee82188..b3a541a1 100644 --- a/apps/note/models/transactions.py +++ b/apps/note/models/transactions.py @@ -218,26 +218,18 @@ class Transaction(PolymorphicModel): # When source == destination, no money is transferred and no transaction is created return - self.log("Saving") # We save first the transaction, in case of the user has no right to transfer money super().save(*args, **kwargs) - self.log("Saved") # Save notes self.source.refresh_from_db() self.source.balance += diff_source self.source._force_save = True self.source.save() - self.log("Source saved") self.destination.refresh_from_db() self.destination.balance += diff_dest self.destination._force_save = True self.destination.save() - self.log("Destination saved") - - def log(self, msg): - with open("/tmp/log", "a") as f: - f.write(msg + "\n") def delete(self, **kwargs): """ diff --git a/apps/permission/models.py b/apps/permission/models.py index d49afdab..9136d30d 100644 --- a/apps/permission/models.py +++ b/apps/permission/models.py @@ -65,8 +65,6 @@ class InstancedPermission: obj._force_delete = True Model.delete(obj) - with open("/tmp/log", "w") as f: - f.write(str(obj) + ", " + str(obj.pk) + ", " + str(self.model.model_class().objects.filter(pk=0).exists())) return ret if permission_type == self.type: From 52e8b46aa2378867902848ff08676d186b50b887 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 15:50:51 +0200 Subject: [PATCH 102/319] :bug: Last report date is a datetime, not a date --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 53098f8a..16d74dbf 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 53098f8adcf085fdb0e8ff058a3035bd2d4977a3 +Subproject commit 16d74dbf717c35c4ae7ab1a9084e4daf341b5596 From 5846f032203111b4507d4215fa2ff78ec031a99b Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 15:53:50 +0200 Subject: [PATCH 103/319] :bug: Last report date is a datetime, not a date --- apps/scripts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/scripts b/apps/scripts index 16d74dbf..24951287 160000 --- a/apps/scripts +++ b/apps/scripts @@ -1 +1 @@ -Subproject commit 16d74dbf717c35c4ae7ab1a9084e4daf341b5596 +Subproject commit 2495128755f4d1fd803bfc3b641db8074fa65310 From 764eaafb9579895b00eb069fbd05870041a608f2 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Sun, 9 Aug 2020 16:38:37 +0200 Subject: [PATCH 104/319] Emails are unique. Translate mail foooters. Closes #55 #56 --- apps/member/forms.py | 2 +- apps/member/models.py | 2 +- apps/registration/forms.py | 6 + locale/de/LC_MESSAGES/django.po | 248 ++++++++--------- locale/fr/LC_MESSAGES/django.po | 250 +++++++++--------- templates/note/mails/negative_balance.html | 3 +- templates/note/mails/negative_balance.txt | 3 +- .../note/mails/negative_notes_report.html | 3 +- .../note/mails/negative_notes_report.txt | 3 +- templates/note/mails/weekly_report.html | 3 +- .../mails/email_validation_email.html | 4 +- .../mails/email_validation_email.txt | 2 +- 12 files changed, 279 insertions(+), 250 deletions(-) diff --git a/apps/member/forms.py b/apps/member/forms.py index 5c211b4d..40c23485 100644 --- a/apps/member/forms.py +++ b/apps/member/forms.py @@ -50,7 +50,7 @@ class ProfileForm(forms.ModelForm): class Meta: model = Profile fields = '__all__' - exclude = ('user', ) + exclude = ('user', 'email_confirmed', 'registration_valid', ) class ClubForm(forms.ModelForm): diff --git a/apps/member/models.py b/apps/member/models.py index 13002158..9844a194 100644 --- a/apps/member/models.py +++ b/apps/member/models.py @@ -148,7 +148,7 @@ class Profile(models.Model): return str(self.user) def send_email_validation_link(self): - subject = "[Note Kfet]" + str(_("Activate your Note Kfet account")) + subject = "[Note Kfet] " + str(_("Activate your Note Kfet account")) message = loader.render_to_string('registration/mails/email_validation_email.txt', { 'user': self.user, diff --git a/apps/registration/forms.py b/apps/registration/forms.py index 3ba791a0..02b9472e 100644 --- a/apps/registration/forms.py +++ b/apps/registration/forms.py @@ -28,6 +28,12 @@ class SignUpForm(UserCreationForm): self.add_error("username", _("An alias with a similar name already exists.")) return value + def clean_email(self): + email = self.cleaned_data["email"] + if User.objects.filter(email=email).exists(): + self.add_error("email", _("This email address is already used.")) + return email + class Meta: model = User fields = ('first_name', 'last_name', 'username', 'email', ) diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 32e2995e..5e50b3d6 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-07 19:53+0200\n" +"POT-Creation-Date: 2020-08-09 16:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -44,9 +44,9 @@ msgid "You can't invite more than 3 people to this activity." msgstr "" #: apps/activity/models.py:27 apps/activity/models.py:62 -#: apps/member/models.py:172 apps/note/models/notes.py:212 +#: apps/member/models.py:175 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:295 apps/permission/models.py:331 +#: apps/note/models/transactions.py:286 apps/permission/models.py:329 #: apps/wei/models.py:66 apps/wei/models.py:118 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -78,8 +78,8 @@ msgstr "" msgid "activity types" msgstr "" -#: apps/activity/models.py:67 apps/note/models/transactions.py:81 -#: apps/permission/models.py:112 apps/permission/models.py:191 +#: apps/activity/models.py:67 apps/note/models/transactions.py:80 +#: apps/permission/models.py:110 apps/permission/models.py:189 #: apps/wei/models.py:72 apps/wei/models.py:129 #: templates/activity/activity_info.html:19 msgid "description" @@ -90,12 +90,12 @@ msgid "location" msgstr "" #: apps/activity/models.py:81 apps/note/models/notes.py:188 -#: apps/note/models/transactions.py:66 apps/permission/models.py:166 +#: apps/note/models/transactions.py:65 apps/permission/models.py:164 #: templates/activity/activity_info.html:22 msgid "type" msgstr "" -#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:277 +#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 #: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -118,7 +118,7 @@ msgstr "" msgid "end date" msgstr "" -#: apps/activity/models.py:114 apps/note/models/transactions.py:146 +#: apps/activity/models.py:114 apps/note/models/transactions.py:145 #: templates/activity/activity_info.html:50 msgid "valid" msgstr "" @@ -199,14 +199,14 @@ msgid "Type" msgstr "" #: apps/activity/tables.py:81 apps/member/forms.py:106 -#: apps/registration/forms.py:70 apps/treasury/forms.py:135 -#: apps/wei/forms/registration.py:94 +#: apps/registration/forms.py:76 apps/treasury/forms.py:135 +#: apps/wei/forms/registration.py:96 msgid "Last name" msgstr "" #: apps/activity/tables.py:83 apps/member/forms.py:111 -#: apps/registration/forms.py:75 apps/treasury/forms.py:137 -#: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 +#: apps/registration/forms.py:81 apps/treasury/forms.py:137 +#: apps/wei/forms/registration.py:101 templates/note/transaction_form.html:131 msgid "First name" msgstr "" @@ -254,7 +254,7 @@ msgstr "" msgid "IP Address" msgstr "" -#: apps/logs/models.py:36 apps/permission/models.py:136 +#: apps/logs/models.py:36 apps/permission/models.py:134 msgid "model" msgstr "" @@ -274,14 +274,14 @@ msgstr "" msgid "create" msgstr "" -#: apps/logs/models.py:62 apps/note/tables.py:160 +#: apps/logs/models.py:62 apps/note/tables.py:163 #: templates/activity/activity_info.html:71 msgid "edit" msgstr "" -#: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:129 apps/treasury/tables.py:38 -#: apps/wei/tables.py:73 +#: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:168 +#: apps/permission/models.py:127 apps/treasury/tables.py:38 +#: apps/wei/tables.py:74 msgid "delete" msgstr "" @@ -305,25 +305,25 @@ msgstr "" msgid "changelogs" msgstr "" -#: apps/member/admin.py:52 apps/member/models.py:199 +#: apps/member/admin.py:52 apps/member/models.py:202 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "" -#: apps/member/admin.py:53 apps/member/models.py:204 +#: apps/member/admin.py:53 apps/member/models.py:207 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "" -#: apps/member/admin.py:67 apps/member/models.py:288 +#: apps/member/admin.py:67 apps/member/models.py:291 msgid "roles" msgstr "" -#: apps/member/admin.py:68 apps/member/models.py:302 +#: apps/member/admin.py:68 apps/member/models.py:305 msgid "fee" msgstr "" -#: apps/member/apps.py:14 apps/wei/tables.py:179 apps/wei/tables.py:210 +#: apps/member/apps.py:14 apps/wei/tables.py:180 apps/wei/tables.py:211 msgid "member" msgstr "" @@ -340,21 +340,21 @@ msgstr "" msgid "An alias with a similar name already exists." msgstr "" -#: apps/member/forms.py:85 apps/registration/forms.py:50 +#: apps/member/forms.py:85 apps/registration/forms.py:56 msgid "Inscription paid by Société Générale" msgstr "" -#: apps/member/forms.py:87 apps/registration/forms.py:52 +#: apps/member/forms.py:87 apps/registration/forms.py:58 msgid "Check this case is the Société Générale paid the inscription." msgstr "" -#: apps/member/forms.py:92 apps/registration/forms.py:57 -#: apps/wei/forms/registration.py:81 +#: apps/member/forms.py:92 apps/registration/forms.py:63 +#: apps/wei/forms/registration.py:83 msgid "Credit type" msgstr "" -#: apps/member/forms.py:93 apps/registration/forms.py:58 -#: apps/wei/forms/registration.py:82 +#: apps/member/forms.py:93 apps/registration/forms.py:64 +#: apps/wei/forms/registration.py:84 msgid "No credit" msgstr "" @@ -362,13 +362,13 @@ msgstr "" msgid "You can credit the note of the user." msgstr "" -#: apps/member/forms.py:99 apps/registration/forms.py:63 -#: apps/wei/forms/registration.py:87 +#: apps/member/forms.py:99 apps/registration/forms.py:69 +#: apps/wei/forms/registration.py:89 msgid "Credit amount" msgstr "" -#: apps/member/forms.py:116 apps/registration/forms.py:80 -#: apps/treasury/forms.py:139 apps/wei/forms/registration.py:104 +#: apps/member/forms.py:116 apps/registration/forms.py:86 +#: apps/treasury/forms.py:139 apps/wei/forms/registration.py:106 #: templates/note/transaction_form.html:137 msgid "Bank" msgstr "" @@ -509,92 +509,92 @@ msgstr "" msgid "user profile" msgstr "" -#: apps/member/models.py:148 +#: apps/member/models.py:151 msgid "Activate your Note Kfet account" msgstr "" -#: apps/member/models.py:177 templates/member/club_info.html:57 +#: apps/member/models.py:180 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "" -#: apps/member/models.py:184 +#: apps/member/models.py:187 msgid "parent club" msgstr "" -#: apps/member/models.py:193 +#: apps/member/models.py:196 msgid "require memberships" msgstr "" -#: apps/member/models.py:194 +#: apps/member/models.py:197 msgid "Uncheck if this club don't require memberships." msgstr "" -#: apps/member/models.py:210 templates/member/club_info.html:33 +#: apps/member/models.py:213 templates/member/club_info.html:33 msgid "membership duration" msgstr "" -#: apps/member/models.py:211 +#: apps/member/models.py:214 msgid "The longest time (in days) a membership can last (NULL = infinite)." msgstr "" -#: apps/member/models.py:218 templates/member/club_info.html:23 +#: apps/member/models.py:221 templates/member/club_info.html:23 msgid "membership start" msgstr "" -#: apps/member/models.py:219 +#: apps/member/models.py:222 msgid "Date from which the members can renew their membership." msgstr "" -#: apps/member/models.py:225 templates/member/club_info.html:28 +#: apps/member/models.py:228 templates/member/club_info.html:28 msgid "membership end" msgstr "" -#: apps/member/models.py:226 +#: apps/member/models.py:229 msgid "Maximal date of a membership, after which members must renew it." msgstr "" -#: apps/member/models.py:258 apps/member/models.py:283 +#: apps/member/models.py:261 apps/member/models.py:286 #: apps/note/models/notes.py:163 msgid "club" msgstr "" -#: apps/member/models.py:259 +#: apps/member/models.py:262 msgid "clubs" msgstr "" -#: apps/member/models.py:293 +#: apps/member/models.py:296 msgid "membership starts on" msgstr "" -#: apps/member/models.py:297 +#: apps/member/models.py:300 msgid "membership ends on" msgstr "" -#: apps/member/models.py:348 +#: apps/member/models.py:351 #, python-brace-format msgid "The role {role} does not apply to the club {club}." msgstr "" -#: apps/member/models.py:359 apps/member/views.py:592 +#: apps/member/models.py:362 apps/member/views.py:592 msgid "User is already a member of the club" msgstr "" -#: apps/member/models.py:406 +#: apps/member/models.py:409 msgid "User is not a member of the parent club" msgstr "" -#: apps/member/models.py:459 +#: apps/member/models.py:462 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "" -#: apps/member/models.py:462 +#: apps/member/models.py:465 msgid "membership" msgstr "" -#: apps/member/models.py:463 +#: apps/member/models.py:466 msgid "memberships" msgstr "" @@ -680,17 +680,17 @@ msgstr "" msgid "Members of the club" msgstr "" -#: apps/note/admin.py:133 apps/note/models/transactions.py:106 +#: apps/note/admin.py:133 apps/note/models/transactions.py:105 msgid "source" msgstr "" #: apps/note/admin.py:141 apps/note/admin.py:191 -#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119 +#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:118 msgid "destination" msgstr "" #: apps/note/admin.py:196 apps/note/models/transactions.py:59 -#: apps/note/models/transactions.py:137 +#: apps/note/models/transactions.py:136 msgid "amount" msgstr "" @@ -764,7 +764,7 @@ msgstr "" msgid "display image" msgstr "" -#: apps/note/models/notes.py:55 apps/note/models/transactions.py:129 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:128 msgid "created at" msgstr "" @@ -847,115 +847,115 @@ msgstr "" msgid "A template with this name already exist" msgstr "" -#: apps/note/models/transactions.py:72 +#: apps/note/models/transactions.py:71 msgid "display" msgstr "" -#: apps/note/models/transactions.py:77 +#: apps/note/models/transactions.py:76 msgid "highlighted" msgstr "" -#: apps/note/models/transactions.py:87 +#: apps/note/models/transactions.py:86 msgid "transaction template" msgstr "" -#: apps/note/models/transactions.py:88 +#: apps/note/models/transactions.py:87 msgid "transaction templates" msgstr "" -#: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125 +#: apps/note/models/transactions.py:111 apps/note/models/transactions.py:124 #: apps/note/tables.py:35 apps/note/tables.py:44 msgid "used alias" msgstr "" -#: apps/note/models/transactions.py:133 +#: apps/note/models/transactions.py:132 msgid "quantity" msgstr "" -#: apps/note/models/transactions.py:141 +#: apps/note/models/transactions.py:140 msgid "reason" msgstr "" -#: apps/note/models/transactions.py:151 apps/note/tables.py:112 +#: apps/note/models/transactions.py:150 apps/note/tables.py:112 msgid "invalidity reason" msgstr "" -#: apps/note/models/transactions.py:159 +#: apps/note/models/transactions.py:158 msgid "transaction" msgstr "" -#: apps/note/models/transactions.py:160 +#: apps/note/models/transactions.py:159 #: templates/treasury/sogecredit_detail.html:22 msgid "transactions" msgstr "" -#: apps/note/models/transactions.py:197 +#: apps/note/models/transactions.py:192 msgid "" "The note balances must be between - 21 474 836.47 € and 21 474 836.47 €." msgstr "" -#: apps/note/models/transactions.py:212 +#: apps/note/models/transactions.py:207 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." msgstr "" -#: apps/note/models/transactions.py:257 +#: apps/note/models/transactions.py:248 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 #: templates/note/transaction_form.html:145 msgid "Transfer" msgstr "" -#: apps/note/models/transactions.py:281 +#: apps/note/models/transactions.py:272 msgid "Template" msgstr "" -#: apps/note/models/transactions.py:284 +#: apps/note/models/transactions.py:275 msgid "recurrent transaction" msgstr "" -#: apps/note/models/transactions.py:285 +#: apps/note/models/transactions.py:276 msgid "recurrent transactions" msgstr "" -#: apps/note/models/transactions.py:300 +#: apps/note/models/transactions.py:291 msgid "first_name" msgstr "" -#: apps/note/models/transactions.py:305 +#: apps/note/models/transactions.py:296 msgid "bank" msgstr "" -#: apps/note/models/transactions.py:311 +#: apps/note/models/transactions.py:302 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "" -#: apps/note/models/transactions.py:311 templates/note/transaction_form.html:25 +#: apps/note/models/transactions.py:302 templates/note/transaction_form.html:25 msgid "Debit" msgstr "" -#: apps/note/models/transactions.py:322 +#: apps/note/models/transactions.py:313 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" msgstr "" -#: apps/note/models/transactions.py:326 +#: apps/note/models/transactions.py:317 msgid "Special transaction" msgstr "" -#: apps/note/models/transactions.py:327 +#: apps/note/models/transactions.py:318 msgid "Special transactions" msgstr "" -#: apps/note/models/transactions.py:343 apps/note/models/transactions.py:348 +#: apps/note/models/transactions.py:334 apps/note/models/transactions.py:339 msgid "membership transaction" msgstr "" -#: apps/note/models/transactions.py:344 apps/treasury/models.py:272 +#: apps/note/models/transactions.py:335 apps/treasury/models.py:272 msgid "membership transactions" msgstr "" @@ -971,15 +971,15 @@ msgstr "" msgid "No reason specified" msgstr "" -#: apps/note/tables.py:139 apps/note/tables.py:167 apps/treasury/tables.py:39 -#: apps/wei/tables.py:74 apps/wei/tables.py:100 +#: apps/note/tables.py:139 apps/note/tables.py:170 apps/treasury/tables.py:39 +#: apps/wei/tables.py:75 apps/wei/tables.py:101 #: templates/treasury/invoice_confirm_delete.html:28 #: templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "" -#: apps/note/tables.py:162 apps/wei/tables.py:46 apps/wei/tables.py:47 +#: apps/note/tables.py:165 apps/wei/tables.py:46 apps/wei/tables.py:47 #: templates/member/club_info.html:67 templates/note/conso_form.html:130 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 @@ -1010,79 +1010,79 @@ msgstr "" msgid "Search transactions" msgstr "" -#: apps/permission/models.py:91 +#: apps/permission/models.py:89 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "" -#: apps/permission/models.py:93 +#: apps/permission/models.py:91 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "" -#: apps/permission/models.py:106 +#: apps/permission/models.py:104 msgid "rank" msgstr "" -#: apps/permission/models.py:119 +#: apps/permission/models.py:117 msgid "permission mask" msgstr "" -#: apps/permission/models.py:120 +#: apps/permission/models.py:118 msgid "permission masks" msgstr "" -#: apps/permission/models.py:126 +#: apps/permission/models.py:124 msgid "add" msgstr "" -#: apps/permission/models.py:127 +#: apps/permission/models.py:125 msgid "view" msgstr "" -#: apps/permission/models.py:128 +#: apps/permission/models.py:126 msgid "change" msgstr "" -#: apps/permission/models.py:160 +#: apps/permission/models.py:158 msgid "query" msgstr "" -#: apps/permission/models.py:173 +#: apps/permission/models.py:171 msgid "mask" msgstr "" -#: apps/permission/models.py:179 +#: apps/permission/models.py:177 msgid "field" msgstr "" -#: apps/permission/models.py:184 +#: apps/permission/models.py:182 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." msgstr "" -#: apps/permission/models.py:185 templates/permission/all_rights.html:36 +#: apps/permission/models.py:183 templates/permission/all_rights.html:36 msgid "permanent" msgstr "" -#: apps/permission/models.py:196 +#: apps/permission/models.py:194 msgid "permission" msgstr "" -#: apps/permission/models.py:197 apps/permission/models.py:336 +#: apps/permission/models.py:195 apps/permission/models.py:334 msgid "permissions" msgstr "" -#: apps/permission/models.py:202 +#: apps/permission/models.py:200 msgid "Specifying field applies only to view and change permission types." msgstr "" -#: apps/permission/models.py:341 +#: apps/permission/models.py:339 msgid "for club" msgstr "" -#: apps/permission/models.py:351 apps/permission/models.py:352 +#: apps/permission/models.py:349 apps/permission/models.py:350 msgid "role permissions" msgstr "" @@ -1119,21 +1119,25 @@ msgstr "" msgid "registration" msgstr "" -#: apps/registration/forms.py:38 +#: apps/registration/forms.py:34 +msgid "This email address is already used." +msgstr "" + +#: apps/registration/forms.py:44 msgid "Register to the WEI" msgstr "" -#: apps/registration/forms.py:40 +#: apps/registration/forms.py:46 msgid "" "Check this case if you want to register to the WEI. If you hesitate, you " "will be able to register later, after validating your account in the Kfet." msgstr "" -#: apps/registration/forms.py:85 +#: apps/registration/forms.py:91 msgid "Join BDE Club" msgstr "" -#: apps/registration/forms.py:92 +#: apps/registration/forms.py:98 msgid "Join Kfet Club" msgstr "" @@ -1446,41 +1450,41 @@ msgstr "" msgid "WEI" msgstr "" -#: apps/wei/forms/registration.py:49 apps/wei/models.py:113 +#: apps/wei/forms/registration.py:51 apps/wei/models.py:113 #: apps/wei/models.py:298 msgid "bus" msgstr "" -#: apps/wei/forms/registration.py:50 +#: apps/wei/forms/registration.py:52 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." msgstr "" -#: apps/wei/forms/registration.py:57 +#: apps/wei/forms/registration.py:59 msgid "Team" msgstr "" -#: apps/wei/forms/registration.py:59 +#: apps/wei/forms/registration.py:61 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" msgstr "" -#: apps/wei/forms/registration.py:65 apps/wei/forms/registration.py:75 +#: apps/wei/forms/registration.py:67 apps/wei/forms/registration.py:77 #: apps/wei/models.py:148 msgid "WEI Roles" msgstr "" -#: apps/wei/forms/registration.py:66 +#: apps/wei/forms/registration.py:68 msgid "Select the roles that you are interested in." msgstr "" -#: apps/wei/forms/registration.py:111 +#: apps/wei/forms/registration.py:113 msgid "This team doesn't belong to the given bus." msgstr "" -#: apps/wei/forms/surveys/wei2020.py:26 +#: apps/wei/forms/surveys/wei2020.py:29 msgid "Choose a word:" msgstr "" @@ -1640,25 +1644,25 @@ msgstr "" msgid "WEI memberships" msgstr "" -#: apps/wei/tables.py:57 apps/wei/tables.py:58 apps/wei/tables.py:95 +#: apps/wei/tables.py:58 apps/wei/tables.py:59 apps/wei/tables.py:96 #: templates/treasury/sogecredit_detail.html:57 msgid "Validate" msgstr "" -#: apps/wei/tables.py:125 +#: apps/wei/tables.py:126 msgid "Year" msgstr "" -#: apps/wei/tables.py:163 templates/wei/bus_tables.html:26 +#: apps/wei/tables.py:164 templates/wei/bus_tables.html:26 #: templates/wei/busteam_tables.html:43 msgid "Teams" msgstr "" -#: apps/wei/tables.py:172 apps/wei/tables.py:213 +#: apps/wei/tables.py:173 apps/wei/tables.py:214 msgid "Members count" msgstr "" -#: apps/wei/tables.py:179 apps/wei/tables.py:210 +#: apps/wei/tables.py:180 apps/wei/tables.py:211 msgid "members" msgstr "" @@ -2316,6 +2320,10 @@ msgstr "" msgid "The Note Kfet team." msgstr "" +#: templates/registration/mails/email_validation_email.html:40 +msgid "Mail generated by the Note Kfet on the" +msgstr "" + #: templates/registration/password_change_done.html:8 msgid "Your password was changed." msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 38b31c6c..992ef5f5 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-08-07 19:53+0200\n" +"POT-Creation-Date: 2020-08-09 16:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,9 +45,9 @@ 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:172 apps/note/models/notes.py:212 +#: apps/member/models.py:175 apps/note/models/notes.py:212 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45 -#: apps/note/models/transactions.py:295 apps/permission/models.py:331 +#: apps/note/models/transactions.py:286 apps/permission/models.py:329 #: apps/wei/models.py:66 apps/wei/models.py:118 #: templates/member/club_info.html:13 templates/member/profile_info.html:14 #: templates/registration/future_profile_detail.html:16 @@ -79,8 +79,8 @@ msgstr "type d'activité" msgid "activity types" msgstr "types d'activité" -#: apps/activity/models.py:67 apps/note/models/transactions.py:81 -#: apps/permission/models.py:112 apps/permission/models.py:191 +#: apps/activity/models.py:67 apps/note/models/transactions.py:80 +#: apps/permission/models.py:110 apps/permission/models.py:189 #: apps/wei/models.py:72 apps/wei/models.py:129 #: templates/activity/activity_info.html:19 msgid "description" @@ -91,12 +91,12 @@ msgid "location" msgstr "lieu" #: apps/activity/models.py:81 apps/note/models/notes.py:188 -#: apps/note/models/transactions.py:66 apps/permission/models.py:166 +#: apps/note/models/transactions.py:65 apps/permission/models.py:164 #: templates/activity/activity_info.html:22 msgid "type" msgstr "type" -#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:277 +#: apps/activity/models.py:87 apps/logs/models.py:22 apps/member/models.py:280 #: apps/note/models/notes.py:126 apps/treasury/models.py:266 #: apps/wei/models.py:160 templates/treasury/sogecredit_detail.html:14 #: templates/wei/survey.html:16 @@ -119,7 +119,7 @@ msgstr "date de début" msgid "end date" msgstr "date de fin" -#: apps/activity/models.py:114 apps/note/models/transactions.py:146 +#: apps/activity/models.py:114 apps/note/models/transactions.py:145 #: templates/activity/activity_info.html:50 msgid "valid" msgstr "valide" @@ -200,14 +200,14 @@ msgid "Type" msgstr "Type" #: apps/activity/tables.py:81 apps/member/forms.py:106 -#: apps/registration/forms.py:70 apps/treasury/forms.py:135 -#: apps/wei/forms/registration.py:94 +#: apps/registration/forms.py:76 apps/treasury/forms.py:135 +#: apps/wei/forms/registration.py:96 msgid "Last name" msgstr "Nom de famille" #: apps/activity/tables.py:83 apps/member/forms.py:111 -#: apps/registration/forms.py:75 apps/treasury/forms.py:137 -#: apps/wei/forms/registration.py:99 templates/note/transaction_form.html:131 +#: apps/registration/forms.py:81 apps/treasury/forms.py:137 +#: apps/wei/forms/registration.py:101 templates/note/transaction_form.html:131 msgid "First name" msgstr "Prénom" @@ -255,7 +255,7 @@ msgstr "Logs" msgid "IP Address" msgstr "Adresse IP" -#: apps/logs/models.py:36 apps/permission/models.py:136 +#: apps/logs/models.py:36 apps/permission/models.py:134 msgid "model" msgstr "Modèle" @@ -275,14 +275,14 @@ msgstr "Nouvelles données" msgid "create" msgstr "Créer" -#: apps/logs/models.py:62 apps/note/tables.py:160 +#: apps/logs/models.py:62 apps/note/tables.py:163 #: templates/activity/activity_info.html:71 msgid "edit" msgstr "Modifier" -#: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:165 -#: apps/permission/models.py:129 apps/treasury/tables.py:38 -#: apps/wei/tables.py:73 +#: apps/logs/models.py:63 apps/note/tables.py:137 apps/note/tables.py:168 +#: apps/permission/models.py:127 apps/treasury/tables.py:38 +#: apps/wei/tables.py:74 msgid "delete" msgstr "Supprimer" @@ -306,25 +306,25 @@ msgstr "journal de modification" msgid "changelogs" msgstr "journaux de modifications" -#: apps/member/admin.py:52 apps/member/models.py:199 +#: apps/member/admin.py:52 apps/member/models.py:202 #: templates/member/club_info.html:41 msgid "membership fee (paid students)" msgstr "cotisation pour adhérer (normalien élève)" -#: apps/member/admin.py:53 apps/member/models.py:204 +#: apps/member/admin.py:53 apps/member/models.py:207 #: templates/member/club_info.html:44 msgid "membership fee (unpaid students)" msgstr "cotisation pour adhérer (normalien étudiant)" -#: apps/member/admin.py:67 apps/member/models.py:288 +#: apps/member/admin.py:67 apps/member/models.py:291 msgid "roles" msgstr "rôles" -#: apps/member/admin.py:68 apps/member/models.py:302 +#: apps/member/admin.py:68 apps/member/models.py:305 msgid "fee" msgstr "cotisation" -#: apps/member/apps.py:14 apps/wei/tables.py:179 apps/wei/tables.py:210 +#: apps/member/apps.py:14 apps/wei/tables.py:180 apps/wei/tables.py:211 msgid "member" msgstr "adhérent" @@ -341,21 +341,21 @@ msgstr "Date de dernier rapport" msgid "An alias with a similar name already exists." msgstr "Un alias avec un nom similaire existe déjà." -#: apps/member/forms.py:85 apps/registration/forms.py:50 +#: apps/member/forms.py:85 apps/registration/forms.py:56 msgid "Inscription paid by Société Générale" msgstr "Inscription payée par la Société générale" -#: apps/member/forms.py:87 apps/registration/forms.py:52 +#: apps/member/forms.py:87 apps/registration/forms.py:58 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:92 apps/registration/forms.py:57 -#: apps/wei/forms/registration.py:81 +#: apps/member/forms.py:92 apps/registration/forms.py:63 +#: apps/wei/forms/registration.py:83 msgid "Credit type" msgstr "Type de rechargement" -#: apps/member/forms.py:93 apps/registration/forms.py:58 -#: apps/wei/forms/registration.py:82 +#: apps/member/forms.py:93 apps/registration/forms.py:64 +#: apps/wei/forms/registration.py:84 msgid "No credit" msgstr "Pas de rechargement" @@ -363,13 +363,13 @@ msgstr "Pas de rechargement" 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:99 apps/registration/forms.py:63 -#: apps/wei/forms/registration.py:87 +#: apps/member/forms.py:99 apps/registration/forms.py:69 +#: apps/wei/forms/registration.py:89 msgid "Credit amount" msgstr "Montant à créditer" -#: apps/member/forms.py:116 apps/registration/forms.py:80 -#: apps/treasury/forms.py:139 apps/wei/forms/registration.py:104 +#: apps/member/forms.py:116 apps/registration/forms.py:86 +#: apps/treasury/forms.py:139 apps/wei/forms/registration.py:106 #: templates/note/transaction_form.html:137 msgid "Bank" msgstr "Banque" @@ -510,95 +510,95 @@ msgstr "inscription valide" msgid "user profile" msgstr "profil utilisateur" -#: apps/member/models.py:148 +#: apps/member/models.py:151 msgid "Activate your Note Kfet account" msgstr "Activez votre compte Note Kfet" -#: apps/member/models.py:177 templates/member/club_info.html:57 +#: apps/member/models.py:180 templates/member/club_info.html:57 #: templates/registration/future_profile_detail.html:22 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24 msgid "email" msgstr "courriel" -#: apps/member/models.py:184 +#: apps/member/models.py:187 msgid "parent club" msgstr "club parent" -#: apps/member/models.py:193 +#: apps/member/models.py:196 msgid "require memberships" msgstr "nécessite des adhésions" -#: apps/member/models.py:194 +#: apps/member/models.py:197 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:210 templates/member/club_info.html:33 +#: apps/member/models.py:213 templates/member/club_info.html:33 msgid "membership duration" msgstr "durée de l'adhésion" -#: apps/member/models.py:211 +#: apps/member/models.py:214 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:218 templates/member/club_info.html:23 +#: apps/member/models.py:221 templates/member/club_info.html:23 msgid "membership start" msgstr "début de l'adhésion" -#: apps/member/models.py:219 +#: apps/member/models.py:222 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:225 templates/member/club_info.html:28 +#: apps/member/models.py:228 templates/member/club_info.html:28 msgid "membership end" msgstr "fin de l'adhésion" -#: apps/member/models.py:226 +#: apps/member/models.py:229 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:258 apps/member/models.py:283 +#: apps/member/models.py:261 apps/member/models.py:286 #: apps/note/models/notes.py:163 msgid "club" msgstr "club" -#: apps/member/models.py:259 +#: apps/member/models.py:262 msgid "clubs" msgstr "clubs" -#: apps/member/models.py:293 +#: apps/member/models.py:296 msgid "membership starts on" msgstr "l'adhésion commence le" -#: apps/member/models.py:297 +#: apps/member/models.py:300 msgid "membership ends on" msgstr "l'adhésion finit le" -#: apps/member/models.py:348 +#: apps/member/models.py:351 #, 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:359 apps/member/views.py:592 +#: apps/member/models.py:362 apps/member/views.py:592 msgid "User is already a member of the club" msgstr "L'utilisateur est déjà membre du club" -#: apps/member/models.py:406 +#: apps/member/models.py:409 msgid "User is not a member of the parent club" msgstr "L'utilisateur n'est pas membre du club parent" -#: apps/member/models.py:459 +#: apps/member/models.py:462 #, python-brace-format msgid "Membership of {user} for the club {club}" msgstr "Adhésion de {user} pour le club {club}" -#: apps/member/models.py:462 +#: apps/member/models.py:465 msgid "membership" msgstr "adhésion" -#: apps/member/models.py:463 +#: apps/member/models.py:466 msgid "memberships" msgstr "adhésions" @@ -686,17 +686,17 @@ msgstr "Gérer les rôles d'un utilisateur dans le club" msgid "Members of the club" msgstr "Membres du club" -#: apps/note/admin.py:133 apps/note/models/transactions.py:106 +#: apps/note/admin.py:133 apps/note/models/transactions.py:105 msgid "source" msgstr "source" #: apps/note/admin.py:141 apps/note/admin.py:191 -#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119 +#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:118 msgid "destination" msgstr "destination" #: apps/note/admin.py:196 apps/note/models/transactions.py:59 -#: apps/note/models/transactions.py:137 +#: apps/note/models/transactions.py:136 msgid "amount" msgstr "montant" @@ -771,7 +771,7 @@ msgstr "" msgid "display image" msgstr "image affichée" -#: apps/note/models/notes.py:55 apps/note/models/transactions.py:129 +#: apps/note/models/notes.py:55 apps/note/models/transactions.py:128 msgid "created at" msgstr "créée le" @@ -854,56 +854,56 @@ msgstr "catégories de transaction" msgid "A template with this name already exist" msgstr "Un modèle de transaction avec un nom similaire existe déjà." -#: apps/note/models/transactions.py:72 +#: apps/note/models/transactions.py:71 msgid "display" msgstr "afficher" -#: apps/note/models/transactions.py:77 +#: apps/note/models/transactions.py:76 msgid "highlighted" msgstr "mis en avant" -#: apps/note/models/transactions.py:87 +#: apps/note/models/transactions.py:86 msgid "transaction template" msgstr "Modèle de transaction" -#: apps/note/models/transactions.py:88 +#: apps/note/models/transactions.py:87 msgid "transaction templates" msgstr "Modèles de transaction" -#: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125 +#: apps/note/models/transactions.py:111 apps/note/models/transactions.py:124 #: apps/note/tables.py:35 apps/note/tables.py:44 msgid "used alias" msgstr "alias utilisé" -#: apps/note/models/transactions.py:133 +#: apps/note/models/transactions.py:132 msgid "quantity" msgstr "quantité" -#: apps/note/models/transactions.py:141 +#: apps/note/models/transactions.py:140 msgid "reason" msgstr "raison" -#: apps/note/models/transactions.py:151 apps/note/tables.py:112 +#: apps/note/models/transactions.py:150 apps/note/tables.py:112 msgid "invalidity reason" msgstr "Motif d'invalidité" -#: apps/note/models/transactions.py:159 +#: apps/note/models/transactions.py:158 msgid "transaction" msgstr "Transaction" -#: apps/note/models/transactions.py:160 +#: apps/note/models/transactions.py:159 #: templates/treasury/sogecredit_detail.html:22 msgid "transactions" msgstr "Transactions" -#: apps/note/models/transactions.py:197 +#: apps/note/models/transactions.py:192 msgid "" "The note balances must be between - 21 474 836.47 € and 21 474 836.47 €." msgstr "" "Les montants des notes doivent se trouver entre - 21 474 836.47 € et 21 474 " "836.47 €. Ne cherchez pas à capitaliser l'argent du BDE." -#: apps/note/models/transactions.py:212 +#: apps/note/models/transactions.py:207 msgid "" "The transaction can't be saved since the source note or the destination note " "is not active." @@ -911,44 +911,44 @@ msgstr "" "La transaction ne peut pas être sauvegardée puisque la note source ou la " "note de destination n'est pas active." -#: apps/note/models/transactions.py:257 +#: apps/note/models/transactions.py:248 #: templates/activity/activity_entry.html:13 templates/base.html:99 #: templates/note/transaction_form.html:15 #: templates/note/transaction_form.html:145 msgid "Transfer" msgstr "Virement" -#: apps/note/models/transactions.py:281 +#: apps/note/models/transactions.py:272 msgid "Template" msgstr "Bouton" -#: apps/note/models/transactions.py:284 +#: apps/note/models/transactions.py:275 msgid "recurrent transaction" msgstr "Transaction issue de bouton" -#: apps/note/models/transactions.py:285 +#: apps/note/models/transactions.py:276 msgid "recurrent transactions" msgstr "Transactions issues de boutons" -#: apps/note/models/transactions.py:300 +#: apps/note/models/transactions.py:291 msgid "first_name" msgstr "prénom" -#: apps/note/models/transactions.py:305 +#: apps/note/models/transactions.py:296 msgid "bank" msgstr "banque" -#: apps/note/models/transactions.py:311 +#: apps/note/models/transactions.py:302 #: templates/activity/activity_entry.html:17 #: templates/note/transaction_form.html:20 msgid "Credit" msgstr "Crédit" -#: apps/note/models/transactions.py:311 templates/note/transaction_form.html:25 +#: apps/note/models/transactions.py:302 templates/note/transaction_form.html:25 msgid "Debit" msgstr "Débit" -#: apps/note/models/transactions.py:322 +#: apps/note/models/transactions.py:313 msgid "" "A special transaction is only possible between a Note associated to a " "payment method and a User or a Club" @@ -956,19 +956,19 @@ 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:326 +#: apps/note/models/transactions.py:317 msgid "Special transaction" msgstr "Transaction de crédit/retrait" -#: apps/note/models/transactions.py:327 +#: apps/note/models/transactions.py:318 msgid "Special transactions" msgstr "Transactions de crédit/retrait" -#: apps/note/models/transactions.py:343 apps/note/models/transactions.py:348 +#: apps/note/models/transactions.py:334 apps/note/models/transactions.py:339 msgid "membership transaction" msgstr "Transaction d'adhésion" -#: apps/note/models/transactions.py:344 apps/treasury/models.py:272 +#: apps/note/models/transactions.py:335 apps/treasury/models.py:272 msgid "membership transactions" msgstr "Transactions d'adhésion" @@ -984,15 +984,15 @@ msgstr "Cliquez pour valider" msgid "No reason specified" msgstr "Pas de motif spécifié" -#: apps/note/tables.py:139 apps/note/tables.py:167 apps/treasury/tables.py:39 -#: apps/wei/tables.py:74 apps/wei/tables.py:100 +#: apps/note/tables.py:139 apps/note/tables.py:170 apps/treasury/tables.py:39 +#: apps/wei/tables.py:75 apps/wei/tables.py:101 #: templates/treasury/invoice_confirm_delete.html:28 #: templates/treasury/sogecredit_detail.html:59 #: templates/wei/weiregistration_confirm_delete.html:32 msgid "Delete" msgstr "Supprimer" -#: apps/note/tables.py:162 apps/wei/tables.py:46 apps/wei/tables.py:47 +#: apps/note/tables.py:165 apps/wei/tables.py:46 apps/wei/tables.py:47 #: templates/member/club_info.html:67 templates/note/conso_form.html:130 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68 @@ -1023,53 +1023,53 @@ msgstr "Consommations" msgid "Search transactions" msgstr "Rechercher des transactions" -#: apps/permission/models.py:91 +#: apps/permission/models.py:89 #, python-brace-format msgid "Can {type} {model}.{field} in {query}" msgstr "Can {type} {model}.{field} in {query}" -#: apps/permission/models.py:93 +#: apps/permission/models.py:91 #, python-brace-format msgid "Can {type} {model} in {query}" msgstr "Can {type} {model} in {query}" -#: apps/permission/models.py:106 +#: apps/permission/models.py:104 msgid "rank" msgstr "Rang" -#: apps/permission/models.py:119 +#: apps/permission/models.py:117 msgid "permission mask" msgstr "masque de permissions" -#: apps/permission/models.py:120 +#: apps/permission/models.py:118 msgid "permission masks" msgstr "masques de permissions" -#: apps/permission/models.py:126 +#: apps/permission/models.py:124 msgid "add" msgstr "ajouter" -#: apps/permission/models.py:127 +#: apps/permission/models.py:125 msgid "view" msgstr "voir" -#: apps/permission/models.py:128 +#: apps/permission/models.py:126 msgid "change" msgstr "modifier" -#: apps/permission/models.py:160 +#: apps/permission/models.py:158 msgid "query" msgstr "requête" -#: apps/permission/models.py:173 +#: apps/permission/models.py:171 msgid "mask" msgstr "masque" -#: apps/permission/models.py:179 +#: apps/permission/models.py:177 msgid "field" msgstr "champ" -#: apps/permission/models.py:184 +#: apps/permission/models.py:182 msgid "" "Tells if the permission should be granted even if the membership of the user " "is expired." @@ -1077,29 +1077,29 @@ msgstr "" "Indique si la permission doit être attribuée même si l'adhésion de " "l'utilisateur est expirée." -#: apps/permission/models.py:185 templates/permission/all_rights.html:36 +#: apps/permission/models.py:183 templates/permission/all_rights.html:36 msgid "permanent" msgstr "permanent" -#: apps/permission/models.py:196 +#: apps/permission/models.py:194 msgid "permission" msgstr "permission" -#: apps/permission/models.py:197 apps/permission/models.py:336 +#: apps/permission/models.py:195 apps/permission/models.py:334 msgid "permissions" msgstr "permissions" -#: apps/permission/models.py:202 +#: apps/permission/models.py:200 msgid "Specifying field applies only to view and change permission types." msgstr "" "Spécifie le champ concerné, ne fonctionne que pour les permissions view et " "change." -#: apps/permission/models.py:341 +#: apps/permission/models.py:339 msgid "for club" msgstr "s'applique au club" -#: apps/permission/models.py:351 apps/permission/models.py:352 +#: apps/permission/models.py:349 apps/permission/models.py:350 msgid "role permissions" msgstr "Permissions par rôles" @@ -1142,11 +1142,17 @@ msgstr "Tous les droits" msgid "registration" msgstr "inscription" -#: apps/registration/forms.py:38 +#: apps/registration/forms.py:34 +#, fuzzy +#| msgid "This alias is already taken." +msgid "This email address is already used." +msgstr "Cet alias est déjà pris." + +#: apps/registration/forms.py:44 msgid "Register to the WEI" msgstr "S'inscrire au WEI" -#: apps/registration/forms.py:40 +#: apps/registration/forms.py:46 msgid "" "Check this case if you want to register to the WEI. If you hesitate, you " "will be able to register later, after validating your account in the Kfet." @@ -1155,11 +1161,11 @@ msgstr "" "pourrez toujours vous inscrire plus tard, après avoir validé votre compte à " "la Kfet." -#: apps/registration/forms.py:85 +#: apps/registration/forms.py:91 msgid "Join BDE Club" msgstr "Adhérer au club BDE" -#: apps/registration/forms.py:92 +#: apps/registration/forms.py:98 msgid "Join Kfet Club" msgstr "Adhérer au club Kfet" @@ -1476,12 +1482,12 @@ msgstr "Gérer les crédits de la Société générale" msgid "WEI" msgstr "WEI" -#: apps/wei/forms/registration.py:49 apps/wei/models.py:113 +#: apps/wei/forms/registration.py:51 apps/wei/models.py:113 #: apps/wei/models.py:298 msgid "bus" msgstr "Bus" -#: apps/wei/forms/registration.py:50 +#: apps/wei/forms/registration.py:52 msgid "" "This choice is not definitive. The WEI organizers are free to attribute for " "you a bus and a team, in particular if you are a free eletron." @@ -1490,11 +1496,11 @@ msgstr "" "attribuer un bus et une équipe, en particulier si vous êtes un électron " "libre." -#: apps/wei/forms/registration.py:57 +#: apps/wei/forms/registration.py:59 msgid "Team" msgstr "Équipe" -#: apps/wei/forms/registration.py:59 +#: apps/wei/forms/registration.py:61 msgid "" "Leave this field empty if you won't be in a team (staff, bus chief, free " "electron)" @@ -1502,20 +1508,20 @@ msgstr "" "Laissez ce champ vide si vous ne serez pas dans une équipe (staff, chef de " "bus ou électron libre)" -#: apps/wei/forms/registration.py:65 apps/wei/forms/registration.py:75 +#: apps/wei/forms/registration.py:67 apps/wei/forms/registration.py:77 #: apps/wei/models.py:148 msgid "WEI Roles" msgstr "Rôles au WEI" -#: apps/wei/forms/registration.py:66 +#: apps/wei/forms/registration.py:68 msgid "Select the roles that you are interested in." msgstr "Sélectionnez les rôles qui vous intéressent." -#: apps/wei/forms/registration.py:111 +#: apps/wei/forms/registration.py:113 msgid "This team doesn't belong to the given bus." msgstr "Cette équipe n'appartient pas à ce bus." -#: apps/wei/forms/surveys/wei2020.py:26 +#: apps/wei/forms/surveys/wei2020.py:29 msgid "Choose a word:" msgstr "Choisissez un mot :" @@ -1685,25 +1691,25 @@ msgstr "adhésion au WEI" msgid "WEI memberships" msgstr "adhésions au WEI" -#: apps/wei/tables.py:57 apps/wei/tables.py:58 apps/wei/tables.py:95 +#: apps/wei/tables.py:58 apps/wei/tables.py:59 apps/wei/tables.py:96 #: templates/treasury/sogecredit_detail.html:57 msgid "Validate" msgstr "Valider" -#: apps/wei/tables.py:125 +#: apps/wei/tables.py:126 msgid "Year" msgstr "Année" -#: apps/wei/tables.py:163 templates/wei/bus_tables.html:26 +#: apps/wei/tables.py:164 templates/wei/bus_tables.html:26 #: templates/wei/busteam_tables.html:43 msgid "Teams" msgstr "Équipes" -#: apps/wei/tables.py:172 apps/wei/tables.py:213 +#: apps/wei/tables.py:173 apps/wei/tables.py:214 msgid "Members count" msgstr "Nombre de membres" -#: apps/wei/tables.py:179 apps/wei/tables.py:210 +#: apps/wei/tables.py:180 apps/wei/tables.py:211 msgid "members" msgstr "adhérents" @@ -2400,6 +2406,10 @@ msgstr "Merci" msgid "The Note Kfet team." msgstr "L'équipe de la Note Kfet." +#: templates/registration/mails/email_validation_email.html:40 +msgid "Mail generated by the Note Kfet on the" +msgstr "Mail généré par la Note Kfet le" + #: templates/registration/password_change_done.html:8 msgid "Your password was changed." msgstr "Votre mot de passe a bien été changé." diff --git a/templates/note/mails/negative_balance.html b/templates/note/mails/negative_balance.html index 30e38cc8..b8527ee6 100644 --- a/templates/note/mails/negative_balance.html +++ b/templates/note/mails/negative_balance.html @@ -1,4 +1,5 @@ {% load pretty_money %} +{% load i18n %} @@ -38,7 +39,7 @@ --

      Le BDE
      - Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} + {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}

      \ No newline at end of file diff --git a/templates/note/mails/negative_balance.txt b/templates/note/mails/negative_balance.txt index b49caf73..f215788a 100644 --- a/templates/note/mails/negative_balance.txt +++ b/templates/note/mails/negative_balance.txt @@ -1,4 +1,5 @@ {% load pretty_money %} +{% load i18n %} Bonjour {{ note.user.first_name }} {{ note.user.last_name }}, @@ -20,4 +21,4 @@ virement bancaire. -- Le BDE -Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} \ No newline at end of file +{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %} \ No newline at end of file diff --git a/templates/note/mails/negative_notes_report.html b/templates/note/mails/negative_notes_report.html index c895b903..434c2d4d 100644 --- a/templates/note/mails/negative_notes_report.html +++ b/templates/note/mails/negative_notes_report.html @@ -1,4 +1,5 @@ {% load pretty_money %} +{% load i18n %} @@ -35,7 +36,7 @@ --

      Le BDE
      - Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} + {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}

      \ No newline at end of file diff --git a/templates/note/mails/negative_notes_report.txt b/templates/note/mails/negative_notes_report.txt index b7fa1f23..ead5b5fb 100644 --- a/templates/note/mails/negative_notes_report.txt +++ b/templates/note/mails/negative_notes_report.txt @@ -1,4 +1,5 @@ {% load pretty_money %} +{% load i18n %} Nom | Prénom | Pseudo | Email | Solde | Durée ---------------------+------------+-----------------+-----------------------------------+----------+----------- @@ -9,4 +10,4 @@ -- Le BDE -Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} \ No newline at end of file +{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %} \ No newline at end of file diff --git a/templates/note/mails/weekly_report.html b/templates/note/mails/weekly_report.html index 324d100e..871e09c2 100644 --- a/templates/note/mails/weekly_report.html +++ b/templates/note/mails/weekly_report.html @@ -1,5 +1,6 @@ {% load pretty_money %} {% load render_table from django_tables2 %} +{% load i18n %} @@ -50,7 +51,7 @@ --

      Le BDE
      - Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} + {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}

      \ No newline at end of file diff --git a/templates/registration/mails/email_validation_email.html b/templates/registration/mails/email_validation_email.html index 84a2379f..0d5b41f5 100644 --- a/templates/registration/mails/email_validation_email.html +++ b/templates/registration/mails/email_validation_email.html @@ -36,6 +36,6 @@ --

      - {% trans "The Note Kfet team." %} - Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} + {% trans "The Note Kfet team." %}
      + {% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %}

      \ No newline at end of file diff --git a/templates/registration/mails/email_validation_email.txt b/templates/registration/mails/email_validation_email.txt index 6427200f..5ce48110 100644 --- a/templates/registration/mails/email_validation_email.txt +++ b/templates/registration/mails/email_validation_email.txt @@ -13,4 +13,4 @@ https://{{ domain }}{% url 'registration:email_validation' uidb64=uid token=toke {% trans "Thanks" %}, {% trans "The Note Kfet team." %} -Mail généré par la Note Kfet le {% now "j F Y à H:i:s" %} \ No newline at end of file +{% trans "Mail generated by the Note Kfet on the" %} {% now "j F Y à H:i:s" %} \ No newline at end of file From ccfc37d22605215ee1945dbeb9e5b1e3ea94cd9e Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 9 Aug 2020 17:52:19 +0200 Subject: [PATCH 105/319] Reorder base Django settings and read env vars --- note_kfet/settings/base.py | 161 ++++++++++++++++++++++--------------- 1 file changed, 97 insertions(+), 64 deletions(-) diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index 5df999fb..bf9b99c7 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -2,45 +2,32 @@ # SPDX-License-Identifier: GPL-3.0-or-later import os -import sys - -from django.utils.translation import gettext_lazy as _ # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) -APPS_DIR = os.path.realpath(os.path.join(BASE_DIR, "apps")) -sys.path.append(APPS_DIR) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'CHANGE_ME_IN_LOCAL_SETTINGS!' +SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_LOCAL_SETTINGS!') # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ADMINS = ( - # ('Admin', 'webmaster@example.com'), -) - -SITE_ID = 1 +DEBUG = os.getenv('DJANGO_DEBUG', False) ALLOWED_HOSTS = [] + # Application definition INSTALLED_APPS = [ - # Theme overrides Django Admin templates - # 'theme', - # External apps 'mailer', 'phonenumber_field', 'polymorphic', 'crispy_forms', 'django_tables2', + # Django contrib 'django.contrib.admin', 'django.contrib.admindocs', @@ -51,6 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.messages', 'django.contrib.staticfiles', 'django.forms', + # API 'rest_framework', 'rest_framework.authtoken', @@ -67,7 +55,6 @@ INSTALLED_APPS = [ 'treasury', 'wei', ] -LOGIN_REDIRECT_URL = '/note/transfer/' MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', @@ -97,16 +84,28 @@ TEMPLATES = [ 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', 'django.template.context_processors.request', - # 'django.template.context_processors.media', ], }, }, ] -FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' - WSGI_APPLICATION = 'note_kfet.wsgi.application' + +# Database +# https://docs.djangoproject.com/en/2.2/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': os.getenv('DJANGO_DB_ENGINE', 'django.db.backends.sqlite3'), + 'NAME': os.getenv('DJANGO_DB_NAME', os.path.join(BASE_DIR, 'db.sqlite3')), + 'USER': os.getenv('DJANGO_DB_USER', 'note'), + 'HOST': os.getenv('DJANGO_DB_HOST', 'localhost'), + 'PORT': os.getenv('DJANGO_DB_PORT', ''), # Use default port + } +} + + # Password validation # https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators @@ -125,16 +124,71 @@ AUTH_PASSWORD_VALIDATORS = [ }, ] -# Use our custom hasher in order to import NK15 passwords + +# Internationalization +# https://docs.djangoproject.com/en/2.2/topics/i18n/ + +LANGUAGE_CODE = 'en' + +TIME_ZONE = 'Europe/Paris' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + +# Limit available languages to this subset +from django.utils.translation import gettext_lazy as _ +LANGUAGES = [ + ('de', _('German')), + ('en', _('English')), + ('fr', _('French')), +] + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/2.2/howto/static-files/ + +STATIC_URL = '/static/' + +# Add some custom statics from /note_kfet/static +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, 'note_kfet/static'), +] + +# Collect statics to /static/ +# THIS FOLDER SOULD NOT BE IN GIT TREE!!! +STATIC_ROOT = os.path.join(BASE_DIR, "static/") + +# Add /apps/ directory to Python modules search path +import sys +sys.path.append(os.path.realpath(os.path.join(BASE_DIR, 'apps'))) +print(BASE_DIR, sys.path) + +# Use /locale/ for locale files +LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale')] + +# Use /note_kfet/fixtures for database fixtures +FIXTURE_DIRS = [os.path.join(BASE_DIR, 'note_kfet/fixtures')] + +# NK15 password hasher for retrocompatibility +# On first login the password will be rehashed with PBKDF2PasswordHasher PASSWORD_HASHERS = [ 'django.contrib.auth.hashers.PBKDF2PasswordHasher', 'member.hashers.CustomNK15Hasher', ] +# Custom role-based permission system AUTHENTICATION_BACKENDS = ( - 'permission.backends.PermissionBackend', # Custom role-based permission system + 'permission.backends.PermissionBackend', ) +# Use /media/ for user uploaded media (user profile pictures) +MEDIA_ROOT = os.path.join(BASE_DIR, "media") +MEDIA_URL = '/media/' + +# Django REST Framework REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ # Control API access with our role-based permission system @@ -148,55 +202,34 @@ REST_FRAMEWORK = { 'PAGE_SIZE': 20, } -# Internationalization -# https://docs.djangoproject.com/en/2.2/topics/i18n/ +# Take control on how widget templates are sourced +# See https://docs.djangoproject.com/en/2.2/ref/forms/renderers/#templatessetting +FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' -LANGUAGE_CODE = 'en' +# After login redirect user to transfer page +LOGIN_REDIRECT_URL = '/note/transfer/' -LANGUAGES = [ - ('de', _('German')), - ('en', _('English')), - ('fr', _('French')), -] - -TIME_ZONE = 'Europe/Paris' - -USE_I18N = True - -USE_L10N = True - -USE_TZ = True - -LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")] - -FIXTURE_DIRS = [os.path.join(BASE_DIR, "note_kfet/fixtures")] - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/2.2/howto/static-files/ - -# Absolute path to the directory static files should be collected to. -# Don't put anything in this directory yourself; store your static files -# in apps' "static/" subdirectories and in STATICFILES_DIRS. -# Example: "/var/www/example.com/static/" -STATIC_ROOT = os.path.join(BASE_DIR, "static/") -# STATICFILES_DIRS = [ -# os.path.join(BASE_DIR, 'static')] -STATICFILES_DIRS = [] +# Use Crispy Bootstrap4 theme CRISPY_TEMPLATE_PACK = 'bootstrap4' -DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html' -# URL prefix for static files. -# Example: "http://example.com/static/", "http://static.example.com/" -STATIC_URL = '/static/' +# Use Django Table2 Bootstrap4 theme +DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html' + +# Use only one Django Sites +SITE_ID = 1 + +# When a server error occured, send an email to these addresses +ADMINS = ( + # ('Admin', 'webmaster@example.com'), +) + +# Default regex to validate users aliases ALIAS_VALIDATOR_REGEX = r'' -MEDIA_ROOT = os.path.join(BASE_DIR, "media") -MEDIA_URL = '/media/' - -# Profile Picture Settings +# Profile picture cropping PIC_WIDTH = 200 PIC_RATIO = 1 - +# Custom phone number format PHONENUMBER_DB_FORMAT = 'NATIONAL' PHONENUMBER_DEFAULT_REGION = 'FR' From efe833cec37ceff1cfd58d629aa301fe1c74720f Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 9 Aug 2020 18:34:51 +0200 Subject: [PATCH 106/319] Merge production settings in base settings --- .env_example | 12 ++++-- README.md | 6 +-- note_kfet/settings/__init__.py | 14 ++++--- note_kfet/settings/base.py | 36 +++++++++++++----- note_kfet/settings/development.py | 36 ++++-------------- note_kfet/settings/production.py | 54 --------------------------- note_kfet/settings/secrets_example.py | 5 ++- 7 files changed, 57 insertions(+), 106 deletions(-) delete mode 100644 note_kfet/settings/production.py diff --git a/.env_example b/.env_example index 7e90f965..8af8d592 100644 --- a/.env_example +++ b/.env_example @@ -1,6 +1,6 @@ DJANGO_APP_STAGE=prod # Only used in dev mode, change to "postgresql" if you want to use PostgreSQL in dev -DJANGO_DEV_STORE_METHOD=sqllite +DJANGO_DEV_STORE_METHOD=sqlite DJANGO_DB_HOST=localhost DJANGO_DB_NAME=note_db DJANGO_DB_USER=note @@ -8,13 +8,17 @@ DJANGO_DB_PASSWORD=CHANGE_ME DJANGO_DB_PORT= DJANGO_SECRET_KEY=CHANGE_ME DJANGO_SETTINGS_MODULE=note_kfet.settings +DJANGO_ALLOWED_HOST=localhost CONTACT_EMAIL=tresorerie.bde@localhost -NOTE_URL=localhost +DOMAIN=localhost + # Config for mails. Only used in production NOTE_MAIL=notekfet@localhost EMAIL_HOST=smtp.localhost -EMAIL_PORT=465 +EMAIL_PORT=25 EMAIL_USER=notekfet@localhost EMAIL_PASSWORD=CHANGE_ME + +# Wiki configuration WIKI_USER=NoteKfet2020 -WIKI_PASSWORD= \ No newline at end of file +WIKI_PASSWORD= diff --git a/README.md b/README.md index e5775b29..0c36c859 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n et on renseigne des secrets et des paramètres : DJANGO_APP_STAGE=dev # ou "prod" - DJANGO_DEV_STORE_METHOD=sqllite # ou "postgres" + DJANGO_DEV_STORE_METHOD=sqlite # ou "postgres" DJANGO_DB_HOST=localhost DJANGO_DB_NAME=note_db DJANGO_DB_USER=note @@ -115,13 +115,13 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n DJANGO_DB_PORT= DJANGO_SECRET_KEY=CHANGE_ME DJANGO_SETTINGS_MODULE="note_kfet.settings + DJANGO_ALLOWED_HOST=localhost # URL où accéder à la note DOMAIN=localhost # note.example.com CONTACT_EMAIL=tresorerie.bde@localhost - NOTE_URL=localhost # URL où accéder à la note # Le reste n'est utile qu'en production, pour configurer l'envoi des mails NOTE_MAIL=notekfet@localhost EMAIL_HOST=smtp.localhost - EMAIL_PORT=465 + EMAIL_PORT=25 EMAIL_USER=notekfet@localhost EMAIL_PASSWORD=CHANGE_ME WIKI_USER=NoteKfet2020 diff --git a/note_kfet/settings/__init__.py b/note_kfet/settings/__init__.py index ce691cc9..dcfa88a8 100644 --- a/note_kfet/settings/__init__.py +++ b/note_kfet/settings/__init__.py @@ -3,8 +3,7 @@ from django.utils.translation import gettext_lazy as _ import re - -from .base import * +import os def read_env(): @@ -30,12 +29,15 @@ def read_env(): os.environ.setdefault(key, val) +# Try to load environment variables from project .env read_env() -app_stage = os.environ.get('DJANGO_APP_STAGE', 'dev') -if app_stage == 'prod': - from .production import * -else: +# Load base settings +from .base import * + +# If in dev mode, then override some settings +app_stage = os.getenv('DJANGO_APP_STAGE', 'dev') +if app_stage == 'dev': from .development import * try: diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index bf9b99c7..7da8680b 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -1,6 +1,9 @@ # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # SPDX-License-Identifier: GPL-3.0-or-later +# This file implements sane defaults to use in production. +# Some settings are overridable with an environment variable. + import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) @@ -10,12 +13,14 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__fil # See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_LOCAL_SETTINGS!') +SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS') # SECURITY WARNING: don't run with debug turned on in production! DEBUG = os.getenv('DJANGO_DEBUG', False) -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = [ + os.getenv('DJANGO_ALLOWED_HOST', 'localhost'), +] # Application definition @@ -97,9 +102,10 @@ WSGI_APPLICATION = 'note_kfet.wsgi.application' DATABASES = { 'default': { - 'ENGINE': os.getenv('DJANGO_DB_ENGINE', 'django.db.backends.sqlite3'), - 'NAME': os.getenv('DJANGO_DB_NAME', os.path.join(BASE_DIR, 'db.sqlite3')), + 'ENGINE': os.getenv('DJANGO_DB_ENGINE', 'django.db.backends.postgresql'), + 'NAME': os.getenv('DJANGO_DB_NAME', 'note_db'), 'USER': os.getenv('DJANGO_DB_USER', 'note'), + 'PASSWORD': os.getenv('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'), 'HOST': os.getenv('DJANGO_DB_HOST', 'localhost'), 'PORT': os.getenv('DJANGO_DB_PORT', ''), # Use default port } @@ -164,7 +170,6 @@ STATIC_ROOT = os.path.join(BASE_DIR, "static/") # Add /apps/ directory to Python modules search path import sys sys.path.append(os.path.realpath(os.path.join(BASE_DIR, 'apps'))) -print(BASE_DIR, sys.path) # Use /locale/ for locale files LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale')] @@ -188,6 +193,19 @@ AUTHENTICATION_BACKENDS = ( MEDIA_ROOT = os.path.join(BASE_DIR, "media") MEDIA_URL = '/media/' +# Use mailer in production to place emails in a queue before sending them to avoid spam +EMAIL_BACKEND = 'mailer.backend.DbBackend' +MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' +EMAIL_USE_SSL = os.getenv('EMAIL_USE_SSL', False) +EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org') +EMAIL_PORT = os.getenv('EMAIL_PORT', 25) +EMAIL_HOST_USER = os.getenv('EMAIL_USER', None) +EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', None) + +# Mail will be sent from this address +SERVER_EMAIL = os.getenv("NOTE_MAIL", "notekfet@example.com") +DEFAULT_FROM_EMAIL = "NoteKfet2020 <" + SERVER_EMAIL + ">" + # Django REST Framework REST_FRAMEWORK = { 'DEFAULT_PERMISSION_CLASSES': [ @@ -209,6 +227,9 @@ FORM_RENDERER = 'django.forms.renderers.TemplatesSetting' # After login redirect user to transfer page LOGIN_REDIRECT_URL = '/note/transfer/' +# An user session will expired after 3 hours +SESSION_COOKIE_AGE = 60 * 60 * 3 + # Use Crispy Bootstrap4 theme CRISPY_TEMPLATE_PACK = 'bootstrap4' @@ -218,11 +239,6 @@ DJANGO_TABLES2_TEMPLATE = 'django_tables2/bootstrap4.html' # Use only one Django Sites SITE_ID = 1 -# When a server error occured, send an email to these addresses -ADMINS = ( - # ('Admin', 'webmaster@example.com'), -) - # Default regex to validate users aliases ALIAS_VALIDATOR_REGEX = r'' diff --git a/note_kfet/settings/development.py b/note_kfet/settings/development.py index cc94ffd6..0ac5864b 100644 --- a/note_kfet/settings/development.py +++ b/note_kfet/settings/development.py @@ -5,30 +5,15 @@ # Development Settings # ######################## # For local dev on your machine: -# - Enabled by default -# - use sqlite as a db engine , Debug is True. +# - debug by default +# - use sqlite as a db engine by default # - standalone mail server -# - and more ... - +# - and more... import os -# Database -# https://docs.djangoproject.com/en/2.2/ref/settings/#databases -from . import * - -if os.getenv("DJANGO_DEV_STORE_METHOD", "sqllite") == "postgresql": - DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': os.environ.get('DJANGO_DB_NAME', 'note_db'), - 'USER': os.environ.get('DJANGO_DB_USER', 'note'), - 'PASSWORD': os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'), - 'HOST': os.environ.get('DJANGO_DB_HOST', 'localhost'), - 'PORT': os.environ.get('DJANGO_DB_PORT', ''), # Use default port - } - } -else: +if os.getenv("DJANGO_DEV_STORE_METHOD", "sqlite") != "postgresql": + # Use an SQLite database DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', @@ -39,15 +24,14 @@ else: # Break it, fix it! DEBUG = True -# Mandatory ! +# Allow access from all hostnames ALLOWED_HOSTS = ['*'] -# Emails +# Drop emails to server console EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - SERVER_EMAIL = 'notekfet@localhost' -# Security settings +# Disable some security settings SECURE_CONTENT_TYPE_NOSNIFF = False SECURE_BROWSER_XSS_FILTER = False SESSION_COOKIE_SECURE = False @@ -55,7 +39,3 @@ CSRF_COOKIE_SECURE = False CSRF_COOKIE_HTTPONLY = False X_FRAME_OPTIONS = 'DENY' SESSION_COOKIE_AGE = 60 * 60 * 3 - -STATIC_ROOT = '' # not needed in development settings -STATICFILES_DIRS = [ - os.path.join(BASE_DIR, 'static')] diff --git a/note_kfet/settings/production.py b/note_kfet/settings/production.py deleted file mode 100644 index d7c51ebc..00000000 --- a/note_kfet/settings/production.py +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay -# SPDX-License-Identifier: GPL-3.0-or-later - -import os - -######################## -# Production Settings # -######################## -# For local dev on your machine: -# - Enabled by setting env variable DJANGO_APP_STAGE = 'prod' -# - use Postgresql as db engine -# - Debug should be false. -# - should have a dedicated mail server -# - and more ... - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': os.environ.get('DJANGO_DB_NAME', 'note_db'), - 'USER': os.environ.get('DJANGO_DB_USER', 'note'), - 'PASSWORD': os.environ.get('DJANGO_DB_PASSWORD', 'CHANGE_ME_IN_ENV_SETTINGS'), - 'HOST': os.environ.get('DJANGO_DB_HOST', 'localhost'), - 'PORT': os.environ.get('DJANGO_DB_PORT', ''), # Use default port - } -} - -# Break it, fix it! -DEBUG = False - -# Mandatory ! -ALLOWED_HOSTS = [os.environ.get('NOTE_URL', 'localhost')] - -SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS') - -# Emails -EMAIL_BACKEND = 'mailer.backend.DbBackend' # Mailer place emails in a queue before sending them to avoid spam -MAILER_EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' -EMAIL_USE_SSL = False -EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org') -EMAIL_PORT = os.getenv('EMAIL_PORT', 465) -EMAIL_HOST_USER = os.getenv('EMAIL_USER', None) -EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', None) - -SERVER_EMAIL = os.getenv("NOTE_MAIL", "notekfet@example.com") -DEFAULT_FROM_EMAIL = "NoteKfet2020 <" + SERVER_EMAIL + ">" - -# Security settings -SECURE_CONTENT_TYPE_NOSNIFF = False -SECURE_BROWSER_XSS_FILTER = False -SESSION_COOKIE_SECURE = False -CSRF_COOKIE_SECURE = False -CSRF_COOKIE_HTTPONLY = False -X_FRAME_OPTIONS = 'DENY' -SESSION_COOKIE_AGE = 60 * 60 * 3 diff --git a/note_kfet/settings/secrets_example.py b/note_kfet/settings/secrets_example.py index 5f4b8ff5..b1f9e399 100644 --- a/note_kfet/settings/secrets_example.py +++ b/note_kfet/settings/secrets_example.py @@ -7,4 +7,7 @@ OPTIONAL_APPS = [ # 'debug_toolbar' ] -ADMINS = [('Note Kfet', 'notekfet@example.com')] +# When a server error occured, send an email to these addresses +ADMINS = ( + ('Note Kfet', 'notekfet@example.com'), +) From 8c1cf754ed10236aa45b0e0f35046c8897d5e3c4 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 9 Aug 2020 18:39:06 +0200 Subject: [PATCH 107/319] Revert to NOTE_URL --- .env_example | 2 +- README.md | 2 +- note_kfet/settings/base.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env_example b/.env_example index 8af8d592..eef94aac 100644 --- a/.env_example +++ b/.env_example @@ -8,8 +8,8 @@ DJANGO_DB_PASSWORD=CHANGE_ME DJANGO_DB_PORT= DJANGO_SECRET_KEY=CHANGE_ME DJANGO_SETTINGS_MODULE=note_kfet.settings -DJANGO_ALLOWED_HOST=localhost CONTACT_EMAIL=tresorerie.bde@localhost +NOTE_URL=localhost DOMAIN=localhost # Config for mails. Only used in production diff --git a/README.md b/README.md index 0c36c859..fb97e587 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ On supposera pour la suite que vous utilisez Debian/Ubuntu sur un serveur tout n DJANGO_DB_PORT= DJANGO_SECRET_KEY=CHANGE_ME DJANGO_SETTINGS_MODULE="note_kfet.settings - DJANGO_ALLOWED_HOST=localhost # URL où accéder à la note + NOTE_URL=localhost # URL où accéder à la note DOMAIN=localhost # note.example.com CONTACT_EMAIL=tresorerie.bde@localhost # Le reste n'est utile qu'en production, pour configurer l'envoi des mails diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index 7da8680b..a3ce54e7 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -19,7 +19,7 @@ SECRET_KEY = os.getenv('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS') DEBUG = os.getenv('DJANGO_DEBUG', False) ALLOWED_HOSTS = [ - os.getenv('DJANGO_ALLOWED_HOST', 'localhost'), + os.getenv('NOTE_URL', 'localhost'), ] From 53b496546df5a358a81188b8a51d000b532e7b7b Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Sun, 9 Aug 2020 18:51:20 +0200 Subject: [PATCH 108/319] Add django-bootstrap-datepicker-plus and django-colorfield, move statics --- .gitignore | 1 + note_kfet/settings/base.py | 2 + .../favicon/android-chrome-192x192.png | Bin .../favicon/android-chrome-512x512.png | Bin .../static}/favicon/apple-touch-icon.png | Bin .../static}/favicon/browserconfig.xml | 0 .../static}/favicon/favicon-16x16.png | Bin .../static}/favicon/favicon-32x32.png | Bin .../static}/favicon/favicon.ico | Bin .../static}/favicon/mstile-150x150.png | Bin .../static}/favicon/safari-pinned-tab.svg | 0 .../static}/favicon/site.webmanifest | 0 {static => note_kfet/static}/img/Finalist.png | Bin .../static}/img/Kataclist.png | Bin .../static}/img/Listorique.png | Bin .../static}/img/Monopolist.png | Bin .../static}/img/Saperlistpopette.png | Bin .../static}/img/Satellist.png | Bin {static => note_kfet/static}/js/alias.js | 0 .../static}/js/autocomplete_model.js | 0 {static => note_kfet/static}/js/base.js | 0 {static => note_kfet/static}/js/consos.js | 0 .../static}/js/dynamic-formset.js | 0 {static => note_kfet/static}/js/transfer.js | 0 requirements/base.txt | 2 + static/admin/css/autocomplete.css | 260 - static/admin/css/base.css | 987 -- static/admin/css/changelists.css | 344 - static/admin/css/dashboard.css | 27 - static/admin/css/fonts.css | 20 - static/admin/css/forms.css | 532 - static/admin/css/login.css | 79 - static/admin/css/responsive.css | 992 -- static/admin/css/responsive_rtl.css | 84 - static/admin/css/rtl.css | 269 - .../css/vendor/select2/LICENSE-SELECT2.md | 21 - static/admin/css/vendor/select2/select2.css | 484 - .../admin/css/vendor/select2/select2.min.css | 1 - static/admin/css/widgets.css | 565 - static/admin/fonts/LICENSE.txt | 202 - static/admin/fonts/README.txt | 3 - static/admin/fonts/Roboto-Bold-webfont.woff | Bin 86184 -> 0 bytes static/admin/fonts/Roboto-Light-webfont.woff | Bin 85692 -> 0 bytes .../admin/fonts/Roboto-Regular-webfont.woff | Bin 85876 -> 0 bytes static/admin/img/LICENSE | 20 - static/admin/img/README.txt | 7 - static/admin/img/calendar-icons.svg | 14 - static/admin/img/gis/move_vertex_off.svg | 1 - static/admin/img/gis/move_vertex_on.svg | 1 - static/admin/img/icon-addlink.svg | 3 - static/admin/img/icon-alert.svg | 3 - static/admin/img/icon-calendar.svg | 9 - static/admin/img/icon-changelink.svg | 3 - static/admin/img/icon-clock.svg | 9 - static/admin/img/icon-deletelink.svg | 3 - static/admin/img/icon-no.svg | 3 - static/admin/img/icon-unknown-alt.svg | 3 - static/admin/img/icon-unknown.svg | 3 - static/admin/img/icon-viewlink.svg | 3 - static/admin/img/icon-yes.svg | 3 - static/admin/img/inline-delete.svg | 3 - static/admin/img/search.svg | 3 - static/admin/img/selector-icons.svg | 34 - static/admin/img/sorting-icons.svg | 19 - static/admin/img/tooltag-add.svg | 3 - static/admin/img/tooltag-arrowright.svg | 3 - static/admin/js/SelectBox.js | 144 - static/admin/js/SelectFilter2.js | 246 - static/admin/js/actions.js | 153 - static/admin/js/actions.min.js | 7 - static/admin/js/admin/DateTimeShortcuts.js | 423 - static/admin/js/admin/RelatedObjectLookups.js | 181 - static/admin/js/autocomplete.js | 37 - static/admin/js/calendar.js | 208 - static/admin/js/cancel.js | 13 - static/admin/js/change_form.js | 20 - static/admin/js/collapse.js | 55 - static/admin/js/collapse.min.js | 3 - static/admin/js/core.js | 212 - static/admin/js/inlines.js | 298 - static/admin/js/inlines.min.js | 13 - static/admin/js/jquery.init.js | 8 - static/admin/js/popup_response.js | 16 - static/admin/js/prepopulate.js | 42 - static/admin/js/prepopulate.min.js | 1 - static/admin/js/prepopulate_init.js | 10 - static/admin/js/timeparse.js | 106 - static/admin/js/urlify.js | 195 - static/admin/js/vendor/jquery/LICENSE.txt | 20 - static/admin/js/vendor/jquery/jquery.js | 10872 ---------------- static/admin/js/vendor/jquery/jquery.min.js | 2 - static/admin/js/vendor/select2/LICENSE.md | 21 - static/admin/js/vendor/select2/i18n/ar.js | 3 - static/admin/js/vendor/select2/i18n/az.js | 3 - static/admin/js/vendor/select2/i18n/bg.js | 3 - static/admin/js/vendor/select2/i18n/ca.js | 3 - static/admin/js/vendor/select2/i18n/cs.js | 3 - static/admin/js/vendor/select2/i18n/da.js | 3 - static/admin/js/vendor/select2/i18n/de.js | 3 - static/admin/js/vendor/select2/i18n/el.js | 3 - static/admin/js/vendor/select2/i18n/en.js | 3 - static/admin/js/vendor/select2/i18n/es.js | 3 - static/admin/js/vendor/select2/i18n/et.js | 3 - static/admin/js/vendor/select2/i18n/eu.js | 3 - static/admin/js/vendor/select2/i18n/fa.js | 3 - static/admin/js/vendor/select2/i18n/fi.js | 3 - static/admin/js/vendor/select2/i18n/fr.js | 3 - static/admin/js/vendor/select2/i18n/gl.js | 3 - static/admin/js/vendor/select2/i18n/he.js | 3 - static/admin/js/vendor/select2/i18n/hi.js | 3 - static/admin/js/vendor/select2/i18n/hr.js | 3 - static/admin/js/vendor/select2/i18n/hu.js | 3 - static/admin/js/vendor/select2/i18n/id.js | 3 - static/admin/js/vendor/select2/i18n/is.js | 3 - static/admin/js/vendor/select2/i18n/it.js | 3 - static/admin/js/vendor/select2/i18n/ja.js | 3 - static/admin/js/vendor/select2/i18n/km.js | 3 - static/admin/js/vendor/select2/i18n/ko.js | 3 - static/admin/js/vendor/select2/i18n/lt.js | 3 - static/admin/js/vendor/select2/i18n/lv.js | 3 - static/admin/js/vendor/select2/i18n/mk.js | 3 - static/admin/js/vendor/select2/i18n/ms.js | 3 - static/admin/js/vendor/select2/i18n/nb.js | 3 - static/admin/js/vendor/select2/i18n/nl.js | 3 - static/admin/js/vendor/select2/i18n/pl.js | 3 - static/admin/js/vendor/select2/i18n/pt-BR.js | 3 - static/admin/js/vendor/select2/i18n/pt.js | 3 - static/admin/js/vendor/select2/i18n/ro.js | 3 - static/admin/js/vendor/select2/i18n/ru.js | 3 - static/admin/js/vendor/select2/i18n/sk.js | 3 - .../admin/js/vendor/select2/i18n/sr-Cyrl.js | 3 - static/admin/js/vendor/select2/i18n/sr.js | 3 - static/admin/js/vendor/select2/i18n/sv.js | 3 - static/admin/js/vendor/select2/i18n/th.js | 3 - static/admin/js/vendor/select2/i18n/tr.js | 3 - static/admin/js/vendor/select2/i18n/uk.js | 3 - static/admin/js/vendor/select2/i18n/vi.js | 3 - static/admin/js/vendor/select2/i18n/zh-CN.js | 3 - static/admin/js/vendor/select2/i18n/zh-TW.js | 3 - .../admin/js/vendor/select2/select2.full.js | 6436 --------- .../js/vendor/select2/select2.full.min.js | 3 - static/admin/js/vendor/xregexp/LICENSE.txt | 21 - static/admin/js/vendor/xregexp/xregexp.js | 2308 ---- static/admin/js/vendor/xregexp/xregexp.min.js | 18 - .../autocomplete_light/autocomplete.init.js | 162 - static/autocomplete_light/forward.js | 191 - static/autocomplete_light/jquery.init.js | 36 - .../autocomplete_light/jquery.post-setup.js | 7 - static/autocomplete_light/select2.css | 14 - static/autocomplete_light/select2.js | 122 - .../css/datepicker-widget.css | 121 - .../js/datepicker-widget.js | 55 - static/colorfield/colorfield.js | 12 - static/colorfield/jscolor/jscolor.js | 1855 --- static/colorfield/jscolor/jscolor.min.js | 1 - static/debug_toolbar/css/print.css | 3 - static/debug_toolbar/css/toolbar.css | 646 - static/debug_toolbar/img/ajax-loader.gif | Bin 404 -> 0 bytes static/debug_toolbar/img/back.png | Bin 574 -> 0 bytes static/debug_toolbar/img/back_hover.png | Bin 613 -> 0 bytes static/debug_toolbar/img/close.png | Bin 498 -> 0 bytes static/debug_toolbar/img/close_hover.png | Bin 706 -> 0 bytes static/debug_toolbar/img/djdt_vertical.png | Bin 882 -> 0 bytes static/debug_toolbar/img/indicator.png | Bin 436 -> 0 bytes static/debug_toolbar/js/redirect.js | 1 - static/debug_toolbar/js/toolbar.js | 324 - static/debug_toolbar/js/toolbar.timer.js | 52 - static/django_tables2/bootstrap.css | 8 - .../themes/paleblue/css/screen.css | 127 - .../themes/paleblue/img/arrow-active-down.png | Bin 216 -> 0 bytes .../themes/paleblue/img/arrow-active-up.png | Bin 202 -> 0 bytes .../paleblue/img/arrow-inactive-down.png | Bin 246 -> 0 bytes .../themes/paleblue/img/arrow-inactive-up.png | Bin 210 -> 0 bytes .../themes/paleblue/img/false.gif | Bin 176 -> 0 bytes .../themes/paleblue/img/header-bg.png | Bin 130 -> 0 bytes .../themes/paleblue/img/missing.png | Bin 509 -> 0 bytes .../themes/paleblue/img/pagination-bg.gif | Bin 273 -> 0 bytes .../themes/paleblue/img/true.gif | Bin 299 -> 0 bytes .../polymorphic/css/polymorphic_inlines.css | 34 - static/polymorphic/js/polymorphic_inlines.js | 338 - .../css/bootstrap-theme.min.css | 11 - .../rest_framework/css/bootstrap-tweaks.css | 233 - static/rest_framework/css/bootstrap.min.css | 6 - static/rest_framework/css/default.css | 82 - .../rest_framework/css/font-awesome-4.0.3.css | 1338 -- static/rest_framework/css/prettify.css | 30 - static/rest_framework/docs/css/base.css | 352 - static/rest_framework/docs/css/highlight.css | 125 - .../docs/css/jquery.json-view.min.css | 11 - static/rest_framework/docs/img/favicon.ico | Bin 5430 -> 0 bytes static/rest_framework/docs/img/grid.png | Bin 1458 -> 0 bytes static/rest_framework/docs/js/api.js | 321 - .../rest_framework/docs/js/highlight.pack.js | 2 - .../docs/js/jquery.json-view.min.js | 7 - .../fonts/fontawesome-webfont.eot | Bin 38205 -> 0 bytes .../fonts/fontawesome-webfont.svg | 414 - .../fonts/fontawesome-webfont.ttf | Bin 80652 -> 0 bytes .../fonts/fontawesome-webfont.woff | Bin 44432 -> 0 bytes .../fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes .../fonts/glyphicons-halflings-regular.svg | 288 - .../fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes .../img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes .../img/glyphicons-halflings.png | Bin 12762 -> 0 bytes static/rest_framework/img/grid.png | Bin 1458 -> 0 bytes static/rest_framework/js/ajax-form.js | 127 - static/rest_framework/js/bootstrap.min.js | 7 - static/rest_framework/js/coreapi-0.1.1.js | 2043 --- static/rest_framework/js/csrf.js | 52 - static/rest_framework/js/default.js | 47 - static/rest_framework/js/jquery-3.3.1.min.js | 2 - static/rest_framework/js/prettify-min.js | 28 - 213 files changed, 5 insertions(+), 36891 deletions(-) rename {static => note_kfet/static}/favicon/android-chrome-192x192.png (100%) rename {static => note_kfet/static}/favicon/android-chrome-512x512.png (100%) rename {static => note_kfet/static}/favicon/apple-touch-icon.png (100%) rename {static => note_kfet/static}/favicon/browserconfig.xml (100%) rename {static => note_kfet/static}/favicon/favicon-16x16.png (100%) rename {static => note_kfet/static}/favicon/favicon-32x32.png (100%) rename {static => note_kfet/static}/favicon/favicon.ico (100%) rename {static => note_kfet/static}/favicon/mstile-150x150.png (100%) rename {static => note_kfet/static}/favicon/safari-pinned-tab.svg (100%) rename {static => note_kfet/static}/favicon/site.webmanifest (100%) rename {static => note_kfet/static}/img/Finalist.png (100%) rename {static => note_kfet/static}/img/Kataclist.png (100%) rename {static => note_kfet/static}/img/Listorique.png (100%) rename {static => note_kfet/static}/img/Monopolist.png (100%) rename {static => note_kfet/static}/img/Saperlistpopette.png (100%) rename {static => note_kfet/static}/img/Satellist.png (100%) rename {static => note_kfet/static}/js/alias.js (100%) rename {static => note_kfet/static}/js/autocomplete_model.js (100%) rename {static => note_kfet/static}/js/base.js (100%) rename {static => note_kfet/static}/js/consos.js (100%) rename {static => note_kfet/static}/js/dynamic-formset.js (100%) rename {static => note_kfet/static}/js/transfer.js (100%) delete mode 100644 static/admin/css/autocomplete.css delete mode 100644 static/admin/css/base.css delete mode 100644 static/admin/css/changelists.css delete mode 100644 static/admin/css/dashboard.css delete mode 100644 static/admin/css/fonts.css delete mode 100644 static/admin/css/forms.css delete mode 100644 static/admin/css/login.css delete mode 100644 static/admin/css/responsive.css delete mode 100644 static/admin/css/responsive_rtl.css delete mode 100644 static/admin/css/rtl.css delete mode 100644 static/admin/css/vendor/select2/LICENSE-SELECT2.md delete mode 100644 static/admin/css/vendor/select2/select2.css delete mode 100644 static/admin/css/vendor/select2/select2.min.css delete mode 100644 static/admin/css/widgets.css delete mode 100644 static/admin/fonts/LICENSE.txt delete mode 100644 static/admin/fonts/README.txt delete mode 100644 static/admin/fonts/Roboto-Bold-webfont.woff delete mode 100644 static/admin/fonts/Roboto-Light-webfont.woff delete mode 100644 static/admin/fonts/Roboto-Regular-webfont.woff delete mode 100644 static/admin/img/LICENSE delete mode 100644 static/admin/img/README.txt delete mode 100644 static/admin/img/calendar-icons.svg delete mode 100644 static/admin/img/gis/move_vertex_off.svg delete mode 100644 static/admin/img/gis/move_vertex_on.svg delete mode 100644 static/admin/img/icon-addlink.svg delete mode 100644 static/admin/img/icon-alert.svg delete mode 100644 static/admin/img/icon-calendar.svg delete mode 100644 static/admin/img/icon-changelink.svg delete mode 100644 static/admin/img/icon-clock.svg delete mode 100644 static/admin/img/icon-deletelink.svg delete mode 100644 static/admin/img/icon-no.svg delete mode 100644 static/admin/img/icon-unknown-alt.svg delete mode 100644 static/admin/img/icon-unknown.svg delete mode 100644 static/admin/img/icon-viewlink.svg delete mode 100644 static/admin/img/icon-yes.svg delete mode 100644 static/admin/img/inline-delete.svg delete mode 100644 static/admin/img/search.svg delete mode 100644 static/admin/img/selector-icons.svg delete mode 100644 static/admin/img/sorting-icons.svg delete mode 100644 static/admin/img/tooltag-add.svg delete mode 100644 static/admin/img/tooltag-arrowright.svg delete mode 100644 static/admin/js/SelectBox.js delete mode 100644 static/admin/js/SelectFilter2.js delete mode 100644 static/admin/js/actions.js delete mode 100644 static/admin/js/actions.min.js delete mode 100644 static/admin/js/admin/DateTimeShortcuts.js delete mode 100644 static/admin/js/admin/RelatedObjectLookups.js delete mode 100644 static/admin/js/autocomplete.js delete mode 100644 static/admin/js/calendar.js delete mode 100644 static/admin/js/cancel.js delete mode 100644 static/admin/js/change_form.js delete mode 100644 static/admin/js/collapse.js delete mode 100644 static/admin/js/collapse.min.js delete mode 100644 static/admin/js/core.js delete mode 100644 static/admin/js/inlines.js delete mode 100644 static/admin/js/inlines.min.js delete mode 100644 static/admin/js/jquery.init.js delete mode 100644 static/admin/js/popup_response.js delete mode 100644 static/admin/js/prepopulate.js delete mode 100644 static/admin/js/prepopulate.min.js delete mode 100644 static/admin/js/prepopulate_init.js delete mode 100644 static/admin/js/timeparse.js delete mode 100644 static/admin/js/urlify.js delete mode 100644 static/admin/js/vendor/jquery/LICENSE.txt delete mode 100644 static/admin/js/vendor/jquery/jquery.js delete mode 100644 static/admin/js/vendor/jquery/jquery.min.js delete mode 100644 static/admin/js/vendor/select2/LICENSE.md delete mode 100644 static/admin/js/vendor/select2/i18n/ar.js delete mode 100644 static/admin/js/vendor/select2/i18n/az.js delete mode 100644 static/admin/js/vendor/select2/i18n/bg.js delete mode 100644 static/admin/js/vendor/select2/i18n/ca.js delete mode 100644 static/admin/js/vendor/select2/i18n/cs.js delete mode 100644 static/admin/js/vendor/select2/i18n/da.js delete mode 100644 static/admin/js/vendor/select2/i18n/de.js delete mode 100644 static/admin/js/vendor/select2/i18n/el.js delete mode 100644 static/admin/js/vendor/select2/i18n/en.js delete mode 100644 static/admin/js/vendor/select2/i18n/es.js delete mode 100644 static/admin/js/vendor/select2/i18n/et.js delete mode 100644 static/admin/js/vendor/select2/i18n/eu.js delete mode 100644 static/admin/js/vendor/select2/i18n/fa.js delete mode 100644 static/admin/js/vendor/select2/i18n/fi.js delete mode 100644 static/admin/js/vendor/select2/i18n/fr.js delete mode 100644 static/admin/js/vendor/select2/i18n/gl.js delete mode 100644 static/admin/js/vendor/select2/i18n/he.js delete mode 100644 static/admin/js/vendor/select2/i18n/hi.js delete mode 100644 static/admin/js/vendor/select2/i18n/hr.js delete mode 100644 static/admin/js/vendor/select2/i18n/hu.js delete mode 100644 static/admin/js/vendor/select2/i18n/id.js delete mode 100644 static/admin/js/vendor/select2/i18n/is.js delete mode 100644 static/admin/js/vendor/select2/i18n/it.js delete mode 100644 static/admin/js/vendor/select2/i18n/ja.js delete mode 100644 static/admin/js/vendor/select2/i18n/km.js delete mode 100644 static/admin/js/vendor/select2/i18n/ko.js delete mode 100644 static/admin/js/vendor/select2/i18n/lt.js delete mode 100644 static/admin/js/vendor/select2/i18n/lv.js delete mode 100644 static/admin/js/vendor/select2/i18n/mk.js delete mode 100644 static/admin/js/vendor/select2/i18n/ms.js delete mode 100644 static/admin/js/vendor/select2/i18n/nb.js delete mode 100644 static/admin/js/vendor/select2/i18n/nl.js delete mode 100644 static/admin/js/vendor/select2/i18n/pl.js delete mode 100644 static/admin/js/vendor/select2/i18n/pt-BR.js delete mode 100644 static/admin/js/vendor/select2/i18n/pt.js delete mode 100644 static/admin/js/vendor/select2/i18n/ro.js delete mode 100644 static/admin/js/vendor/select2/i18n/ru.js delete mode 100644 static/admin/js/vendor/select2/i18n/sk.js delete mode 100644 static/admin/js/vendor/select2/i18n/sr-Cyrl.js delete mode 100644 static/admin/js/vendor/select2/i18n/sr.js delete mode 100644 static/admin/js/vendor/select2/i18n/sv.js delete mode 100644 static/admin/js/vendor/select2/i18n/th.js delete mode 100644 static/admin/js/vendor/select2/i18n/tr.js delete mode 100644 static/admin/js/vendor/select2/i18n/uk.js delete mode 100644 static/admin/js/vendor/select2/i18n/vi.js delete mode 100644 static/admin/js/vendor/select2/i18n/zh-CN.js delete mode 100644 static/admin/js/vendor/select2/i18n/zh-TW.js delete mode 100644 static/admin/js/vendor/select2/select2.full.js delete mode 100644 static/admin/js/vendor/select2/select2.full.min.js delete mode 100644 static/admin/js/vendor/xregexp/LICENSE.txt delete mode 100644 static/admin/js/vendor/xregexp/xregexp.js delete mode 100644 static/admin/js/vendor/xregexp/xregexp.min.js delete mode 100644 static/autocomplete_light/autocomplete.init.js delete mode 100644 static/autocomplete_light/forward.js delete mode 100644 static/autocomplete_light/jquery.init.js delete mode 100644 static/autocomplete_light/jquery.post-setup.js delete mode 100644 static/autocomplete_light/select2.css delete mode 100644 static/autocomplete_light/select2.js delete mode 100644 static/bootstrap_datepicker_plus/css/datepicker-widget.css delete mode 100644 static/bootstrap_datepicker_plus/js/datepicker-widget.js delete mode 100644 static/colorfield/colorfield.js delete mode 100755 static/colorfield/jscolor/jscolor.js delete mode 100755 static/colorfield/jscolor/jscolor.min.js delete mode 100644 static/debug_toolbar/css/print.css delete mode 100644 static/debug_toolbar/css/toolbar.css delete mode 100644 static/debug_toolbar/img/ajax-loader.gif delete mode 100644 static/debug_toolbar/img/back.png delete mode 100644 static/debug_toolbar/img/back_hover.png delete mode 100644 static/debug_toolbar/img/close.png delete mode 100644 static/debug_toolbar/img/close_hover.png delete mode 100644 static/debug_toolbar/img/djdt_vertical.png delete mode 100644 static/debug_toolbar/img/indicator.png delete mode 100644 static/debug_toolbar/js/redirect.js delete mode 100644 static/debug_toolbar/js/toolbar.js delete mode 100644 static/debug_toolbar/js/toolbar.timer.js delete mode 100644 static/django_tables2/bootstrap.css delete mode 100644 static/django_tables2/themes/paleblue/css/screen.css delete mode 100644 static/django_tables2/themes/paleblue/img/arrow-active-down.png delete mode 100644 static/django_tables2/themes/paleblue/img/arrow-active-up.png delete mode 100644 static/django_tables2/themes/paleblue/img/arrow-inactive-down.png delete mode 100644 static/django_tables2/themes/paleblue/img/arrow-inactive-up.png delete mode 100644 static/django_tables2/themes/paleblue/img/false.gif delete mode 100644 static/django_tables2/themes/paleblue/img/header-bg.png delete mode 100644 static/django_tables2/themes/paleblue/img/missing.png delete mode 100644 static/django_tables2/themes/paleblue/img/pagination-bg.gif delete mode 100644 static/django_tables2/themes/paleblue/img/true.gif delete mode 100644 static/polymorphic/css/polymorphic_inlines.css delete mode 100644 static/polymorphic/js/polymorphic_inlines.js delete mode 100644 static/rest_framework/css/bootstrap-theme.min.css delete mode 100644 static/rest_framework/css/bootstrap-tweaks.css delete mode 100644 static/rest_framework/css/bootstrap.min.css delete mode 100644 static/rest_framework/css/default.css delete mode 100644 static/rest_framework/css/font-awesome-4.0.3.css delete mode 100644 static/rest_framework/css/prettify.css delete mode 100644 static/rest_framework/docs/css/base.css delete mode 100644 static/rest_framework/docs/css/highlight.css delete mode 100644 static/rest_framework/docs/css/jquery.json-view.min.css delete mode 100644 static/rest_framework/docs/img/favicon.ico delete mode 100644 static/rest_framework/docs/img/grid.png delete mode 100644 static/rest_framework/docs/js/api.js delete mode 100644 static/rest_framework/docs/js/highlight.pack.js delete mode 100644 static/rest_framework/docs/js/jquery.json-view.min.js delete mode 100644 static/rest_framework/fonts/fontawesome-webfont.eot delete mode 100644 static/rest_framework/fonts/fontawesome-webfont.svg delete mode 100644 static/rest_framework/fonts/fontawesome-webfont.ttf delete mode 100644 static/rest_framework/fonts/fontawesome-webfont.woff delete mode 100644 static/rest_framework/fonts/glyphicons-halflings-regular.eot delete mode 100644 static/rest_framework/fonts/glyphicons-halflings-regular.svg delete mode 100644 static/rest_framework/fonts/glyphicons-halflings-regular.ttf delete mode 100644 static/rest_framework/fonts/glyphicons-halflings-regular.woff delete mode 100644 static/rest_framework/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 static/rest_framework/img/glyphicons-halflings-white.png delete mode 100644 static/rest_framework/img/glyphicons-halflings.png delete mode 100644 static/rest_framework/img/grid.png delete mode 100644 static/rest_framework/js/ajax-form.js delete mode 100644 static/rest_framework/js/bootstrap.min.js delete mode 100644 static/rest_framework/js/coreapi-0.1.1.js delete mode 100644 static/rest_framework/js/csrf.js delete mode 100644 static/rest_framework/js/default.js delete mode 100644 static/rest_framework/js/jquery-3.3.1.min.js delete mode 100644 static/rest_framework/js/prettify-min.js diff --git a/.gitignore b/.gitignore index d3b62d5a..8f97c7c6 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ secrets.py map.json *.log backups/ +static/ media/ # Virtualenv diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index a3ce54e7..809cd91c 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -32,6 +32,8 @@ INSTALLED_APPS = [ 'polymorphic', 'crispy_forms', 'django_tables2', + 'bootstrap_datepicker_plus', + 'colorfield', # Django contrib 'django.contrib.admin', diff --git a/static/favicon/android-chrome-192x192.png b/note_kfet/static/favicon/android-chrome-192x192.png similarity index 100% rename from static/favicon/android-chrome-192x192.png rename to note_kfet/static/favicon/android-chrome-192x192.png diff --git a/static/favicon/android-chrome-512x512.png b/note_kfet/static/favicon/android-chrome-512x512.png similarity index 100% rename from static/favicon/android-chrome-512x512.png rename to note_kfet/static/favicon/android-chrome-512x512.png diff --git a/static/favicon/apple-touch-icon.png b/note_kfet/static/favicon/apple-touch-icon.png similarity index 100% rename from static/favicon/apple-touch-icon.png rename to note_kfet/static/favicon/apple-touch-icon.png diff --git a/static/favicon/browserconfig.xml b/note_kfet/static/favicon/browserconfig.xml similarity index 100% rename from static/favicon/browserconfig.xml rename to note_kfet/static/favicon/browserconfig.xml diff --git a/static/favicon/favicon-16x16.png b/note_kfet/static/favicon/favicon-16x16.png similarity index 100% rename from static/favicon/favicon-16x16.png rename to note_kfet/static/favicon/favicon-16x16.png diff --git a/static/favicon/favicon-32x32.png b/note_kfet/static/favicon/favicon-32x32.png similarity index 100% rename from static/favicon/favicon-32x32.png rename to note_kfet/static/favicon/favicon-32x32.png diff --git a/static/favicon/favicon.ico b/note_kfet/static/favicon/favicon.ico similarity index 100% rename from static/favicon/favicon.ico rename to note_kfet/static/favicon/favicon.ico diff --git a/static/favicon/mstile-150x150.png b/note_kfet/static/favicon/mstile-150x150.png similarity index 100% rename from static/favicon/mstile-150x150.png rename to note_kfet/static/favicon/mstile-150x150.png diff --git a/static/favicon/safari-pinned-tab.svg b/note_kfet/static/favicon/safari-pinned-tab.svg similarity index 100% rename from static/favicon/safari-pinned-tab.svg rename to note_kfet/static/favicon/safari-pinned-tab.svg diff --git a/static/favicon/site.webmanifest b/note_kfet/static/favicon/site.webmanifest similarity index 100% rename from static/favicon/site.webmanifest rename to note_kfet/static/favicon/site.webmanifest diff --git a/static/img/Finalist.png b/note_kfet/static/img/Finalist.png similarity index 100% rename from static/img/Finalist.png rename to note_kfet/static/img/Finalist.png diff --git a/static/img/Kataclist.png b/note_kfet/static/img/Kataclist.png similarity index 100% rename from static/img/Kataclist.png rename to note_kfet/static/img/Kataclist.png diff --git a/static/img/Listorique.png b/note_kfet/static/img/Listorique.png similarity index 100% rename from static/img/Listorique.png rename to note_kfet/static/img/Listorique.png diff --git a/static/img/Monopolist.png b/note_kfet/static/img/Monopolist.png similarity index 100% rename from static/img/Monopolist.png rename to note_kfet/static/img/Monopolist.png diff --git a/static/img/Saperlistpopette.png b/note_kfet/static/img/Saperlistpopette.png similarity index 100% rename from static/img/Saperlistpopette.png rename to note_kfet/static/img/Saperlistpopette.png diff --git a/static/img/Satellist.png b/note_kfet/static/img/Satellist.png similarity index 100% rename from static/img/Satellist.png rename to note_kfet/static/img/Satellist.png diff --git a/static/js/alias.js b/note_kfet/static/js/alias.js similarity index 100% rename from static/js/alias.js rename to note_kfet/static/js/alias.js diff --git a/static/js/autocomplete_model.js b/note_kfet/static/js/autocomplete_model.js similarity index 100% rename from static/js/autocomplete_model.js rename to note_kfet/static/js/autocomplete_model.js diff --git a/static/js/base.js b/note_kfet/static/js/base.js similarity index 100% rename from static/js/base.js rename to note_kfet/static/js/base.js diff --git a/static/js/consos.js b/note_kfet/static/js/consos.js similarity index 100% rename from static/js/consos.js rename to note_kfet/static/js/consos.js diff --git a/static/js/dynamic-formset.js b/note_kfet/static/js/dynamic-formset.js similarity index 100% rename from static/js/dynamic-formset.js rename to note_kfet/static/js/dynamic-formset.js diff --git a/static/js/transfer.js b/note_kfet/static/js/transfer.js similarity index 100% rename from static/js/transfer.js rename to note_kfet/static/js/transfer.js diff --git a/requirements/base.txt b/requirements/base.txt index 3181c493..b614fdae 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -26,3 +26,5 @@ sqlparse==0.3.0 djangorestframework==3.9.0 django-rest-polymorphic==0.1.8 urllib3==1.25.3 +django-bootstrap-datepicker-plus==3.0.5 +django-colorfield==0.3.2 diff --git a/static/admin/css/autocomplete.css b/static/admin/css/autocomplete.css deleted file mode 100644 index 3ef95d15..00000000 --- a/static/admin/css/autocomplete.css +++ /dev/null @@ -1,260 +0,0 @@ -select.admin-autocomplete { - width: 20em; -} - -.select2-container--admin-autocomplete.select2-container { - min-height: 30px; -} - -.select2-container--admin-autocomplete .select2-selection--single, -.select2-container--admin-autocomplete .select2-selection--multiple { - min-height: 30px; - padding: 0; -} - -.select2-container--admin-autocomplete.select2-container--focus .select2-selection, -.select2-container--admin-autocomplete.select2-container--open .select2-selection { - border-color: #999; - min-height: 30px; -} - -.select2-container--admin-autocomplete.select2-container--focus .select2-selection.select2-selection--single, -.select2-container--admin-autocomplete.select2-container--open .select2-selection.select2-selection--single { - padding: 0; -} - -.select2-container--admin-autocomplete.select2-container--focus .select2-selection.select2-selection--multiple, -.select2-container--admin-autocomplete.select2-container--open .select2-selection.select2-selection--multiple { - padding: 0; -} - -.select2-container--admin-autocomplete .select2-selection--single { - background-color: #fff; - border: 1px solid #ccc; - border-radius: 4px; -} - -.select2-container--admin-autocomplete .select2-selection--single .select2-selection__rendered { - color: #444; - line-height: 30px; -} - -.select2-container--admin-autocomplete .select2-selection--single .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; -} - -.select2-container--admin-autocomplete .select2-selection--single .select2-selection__placeholder { - color: #999; -} - -.select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow { - height: 26px; - position: absolute; - top: 1px; - right: 1px; - width: 20px; -} - -.select2-container--admin-autocomplete .select2-selection--single .select2-selection__arrow b { - border-color: #888 transparent transparent transparent; - border-style: solid; - border-width: 5px 4px 0 4px; - height: 0; - left: 50%; - margin-left: -4px; - margin-top: -2px; - position: absolute; - top: 50%; - width: 0; -} - -.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--single .select2-selection__clear { - float: left; -} - -.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--single .select2-selection__arrow { - left: 1px; - right: auto; -} - -.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single { - background-color: #eee; - cursor: default; -} - -.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--single .select2-selection__clear { - display: none; -} - -.select2-container--admin-autocomplete.select2-container--open .select2-selection--single .select2-selection__arrow b { - border-color: transparent transparent #888 transparent; - border-width: 0 4px 5px 4px; -} - -.select2-container--admin-autocomplete .select2-selection--multiple { - background-color: white; - border: 1px solid #ccc; - border-radius: 4px; - cursor: text; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered { - box-sizing: border-box; - list-style: none; - margin: 0; - padding: 0 5px; - width: 100%; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__rendered li { - list-style: none; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__placeholder { - color: #999; - margin-top: 5px; - float: left; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; - margin: 5px; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #ccc; - border-radius: 4px; - cursor: default; - float: left; - margin-right: 5px; - margin-top: 5px; - padding: 0 5px; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove { - color: #999; - cursor: pointer; - display: inline-block; - font-weight: bold; - margin-right: 2px; -} - -.select2-container--admin-autocomplete .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #333; -} - -.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-search--inline { - float: right; -} - -.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice { - margin-left: 5px; - margin-right: auto; -} - -.select2-container--admin-autocomplete[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { - margin-left: 2px; - margin-right: auto; -} - -.select2-container--admin-autocomplete.select2-container--focus .select2-selection--multiple { - border: solid #999 1px; - outline: 0; -} - -.select2-container--admin-autocomplete.select2-container--disabled .select2-selection--multiple { - background-color: #eee; - cursor: default; -} - -.select2-container--admin-autocomplete.select2-container--disabled .select2-selection__choice__remove { - display: none; -} - -.select2-container--admin-autocomplete.select2-container--open.select2-container--above .select2-selection--single, .select2-container--admin-autocomplete.select2-container--open.select2-container--above .select2-selection--multiple { - border-top-left-radius: 0; - border-top-right-radius: 0; -} - -.select2-container--admin-autocomplete.select2-container--open.select2-container--below .select2-selection--single, .select2-container--admin-autocomplete.select2-container--open.select2-container--below .select2-selection--multiple { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; -} - -.select2-container--admin-autocomplete .select2-search--dropdown .select2-search__field { - border: 1px solid #ccc; -} - -.select2-container--admin-autocomplete .select2-search--inline .select2-search__field { - background: transparent; - border: none; - outline: 0; - box-shadow: none; - -webkit-appearance: textfield; -} - -.select2-container--admin-autocomplete .select2-results > .select2-results__options { - max-height: 200px; - overflow-y: auto; -} - -.select2-container--admin-autocomplete .select2-results__option[role=group] { - padding: 0; -} - -.select2-container--admin-autocomplete .select2-results__option[aria-disabled=true] { - color: #999; -} - -.select2-container--admin-autocomplete .select2-results__option[aria-selected=true] { - background-color: #ddd; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option { - padding-left: 1em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__group { - padding-left: 0; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option { - margin-left: -1em; - padding-left: 2em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -2em; - padding-left: 3em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -3em; - padding-left: 4em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -4em; - padding-left: 5em; -} - -.select2-container--admin-autocomplete .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -5em; - padding-left: 6em; -} - -.select2-container--admin-autocomplete .select2-results__option--highlighted[aria-selected] { - background-color: #79aec8; - color: white; -} - -.select2-container--admin-autocomplete .select2-results__group { - cursor: default; - display: block; - padding: 6px; -} diff --git a/static/admin/css/base.css b/static/admin/css/base.css deleted file mode 100644 index fd011a3f..00000000 --- a/static/admin/css/base.css +++ /dev/null @@ -1,987 +0,0 @@ -/* - DJANGO Admin styles -*/ - -@import url(fonts.css); - -body { - margin: 0; - padding: 0; - font-size: 14px; - font-family: "Roboto","Lucida Grande","DejaVu Sans","Bitstream Vera Sans",Verdana,Arial,sans-serif; - color: #333; - background: #fff; -} - -/* LINKS */ - -a:link, a:visited { - color: #447e9b; - text-decoration: none; -} - -a:focus, a:hover { - color: #036; -} - -a:focus { - text-decoration: underline; -} - -a img { - border: none; -} - -a.section:link, a.section:visited { - color: #fff; - text-decoration: none; -} - -a.section:focus, a.section:hover { - text-decoration: underline; -} - -/* GLOBAL DEFAULTS */ - -p, ol, ul, dl { - margin: .2em 0 .8em 0; -} - -p { - padding: 0; - line-height: 140%; -} - -h1,h2,h3,h4,h5 { - font-weight: bold; -} - -h1 { - margin: 0 0 20px; - font-weight: 300; - font-size: 20px; - color: #666; -} - -h2 { - font-size: 16px; - margin: 1em 0 .5em 0; -} - -h2.subhead { - font-weight: normal; - margin-top: 0; -} - -h3 { - font-size: 14px; - margin: .8em 0 .3em 0; - color: #666; - font-weight: bold; -} - -h4 { - font-size: 12px; - margin: 1em 0 .8em 0; - padding-bottom: 3px; -} - -h5 { - font-size: 10px; - margin: 1.5em 0 .5em 0; - color: #666; - text-transform: uppercase; - letter-spacing: 1px; -} - -ul li { - list-style-type: square; - padding: 1px 0; -} - -li ul { - margin-bottom: 0; -} - -li, dt, dd { - font-size: 13px; - line-height: 20px; -} - -dt { - font-weight: bold; - margin-top: 4px; -} - -dd { - margin-left: 0; -} - -form { - margin: 0; - padding: 0; -} - -fieldset { - margin: 0; - padding: 0; - border: none; - border-top: 1px solid #eee; -} - -blockquote { - font-size: 11px; - color: #777; - margin-left: 2px; - padding-left: 10px; - border-left: 5px solid #ddd; -} - -code, pre { - font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; - color: #666; - font-size: 12px; -} - -pre.literal-block { - margin: 10px; - background: #eee; - padding: 6px 8px; -} - -code strong { - color: #930; -} - -hr { - clear: both; - color: #eee; - background-color: #eee; - height: 1px; - border: none; - margin: 0; - padding: 0; - font-size: 1px; - line-height: 1px; -} - -/* TEXT STYLES & MODIFIERS */ - -.small { - font-size: 11px; -} - -.tiny { - font-size: 10px; -} - -p.tiny { - margin-top: -2px; -} - -.mini { - font-size: 10px; -} - -p.mini { - margin-top: -3px; -} - -.help, p.help, form p.help, div.help, form div.help, div.help li { - font-size: 11px; - color: #999; -} - -div.help ul { - margin-bottom: 0; -} - -.help-tooltip { - cursor: help; -} - -p img, h1 img, h2 img, h3 img, h4 img, td img { - vertical-align: middle; -} - -.quiet, a.quiet:link, a.quiet:visited { - color: #999; - font-weight: normal; -} - -.float-right { - float: right; -} - -.float-left { - float: left; -} - -.clear { - clear: both; -} - -.align-left { - text-align: left; -} - -.align-right { - text-align: right; -} - -.example { - margin: 10px 0; - padding: 5px 10px; - background: #efefef; -} - -.nowrap { - white-space: nowrap; -} - -/* TABLES */ - -table { - border-collapse: collapse; - border-color: #ccc; -} - -td, th { - font-size: 13px; - line-height: 16px; - border-bottom: 1px solid #eee; - vertical-align: top; - padding: 8px; - font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif; -} - -th { - font-weight: 600; - text-align: left; -} - -thead th, -tfoot td { - color: #666; - padding: 5px 10px; - font-size: 11px; - background: #fff; - border: none; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; -} - -tfoot td { - border-bottom: none; - border-top: 1px solid #eee; -} - -thead th.required { - color: #000; -} - -tr.alt { - background: #f6f6f6; -} - -.row1 { - background: #fff; -} - -.row2 { - background: #f9f9f9; -} - -/* SORTABLE TABLES */ - -thead th { - padding: 5px 10px; - line-height: normal; - text-transform: uppercase; - background: #f6f6f6; -} - -thead th a:link, thead th a:visited { - color: #666; -} - -thead th.sorted { - background: #eee; -} - -thead th.sorted .text { - padding-right: 42px; -} - -table thead th .text span { - padding: 8px 10px; - display: block; -} - -table thead th .text a { - display: block; - cursor: pointer; - padding: 8px 10px; -} - -table thead th .text a:focus, table thead th .text a:hover { - background: #eee; -} - -thead th.sorted a.sortremove { - visibility: hidden; -} - -table thead th.sorted:hover a.sortremove { - visibility: visible; -} - -table thead th.sorted .sortoptions { - display: block; - padding: 9px 5px 0 5px; - float: right; - text-align: right; -} - -table thead th.sorted .sortpriority { - font-size: .8em; - min-width: 12px; - text-align: center; - vertical-align: 3px; - margin-left: 2px; - margin-right: 2px; -} - -table thead th.sorted .sortoptions a { - position: relative; - width: 14px; - height: 14px; - display: inline-block; - background: url(../img/sorting-icons.svg) 0 0 no-repeat; - background-size: 14px auto; -} - -table thead th.sorted .sortoptions a.sortremove { - background-position: 0 0; -} - -table thead th.sorted .sortoptions a.sortremove:after { - content: '\\'; - position: absolute; - top: -6px; - left: 3px; - font-weight: 200; - font-size: 18px; - color: #999; -} - -table thead th.sorted .sortoptions a.sortremove:focus:after, -table thead th.sorted .sortoptions a.sortremove:hover:after { - color: #447e9b; -} - -table thead th.sorted .sortoptions a.sortremove:focus, -table thead th.sorted .sortoptions a.sortremove:hover { - background-position: 0 -14px; -} - -table thead th.sorted .sortoptions a.ascending { - background-position: 0 -28px; -} - -table thead th.sorted .sortoptions a.ascending:focus, -table thead th.sorted .sortoptions a.ascending:hover { - background-position: 0 -42px; -} - -table thead th.sorted .sortoptions a.descending { - top: 1px; - background-position: 0 -56px; -} - -table thead th.sorted .sortoptions a.descending:focus, -table thead th.sorted .sortoptions a.descending:hover { - background-position: 0 -70px; -} - -/* FORM DEFAULTS */ - -input, textarea, select, .form-row p, form .button { - margin: 2px 0; - padding: 2px 3px; - vertical-align: middle; - font-family: "Roboto", "Lucida Grande", Verdana, Arial, sans-serif; - font-weight: normal; - font-size: 13px; -} -.form-row div.help { - padding: 2px 3px; -} - -textarea { - vertical-align: top; -} - -input[type=text], input[type=password], input[type=email], input[type=url], -input[type=number], input[type=tel], textarea, select, .vTextField { - border: 1px solid #ccc; - border-radius: 4px; - padding: 5px 6px; - margin-top: 0; -} - -input[type=text]:focus, input[type=password]:focus, input[type=email]:focus, -input[type=url]:focus, input[type=number]:focus, input[type=tel]:focus, -textarea:focus, select:focus, .vTextField:focus { - border-color: #999; -} - -select { - height: 30px; -} - -select[multiple] { - /* Allow HTML size attribute to override the height in the rule above. */ - height: auto; - min-height: 150px; -} - -/* FORM BUTTONS */ - -.button, input[type=submit], input[type=button], .submit-row input, a.button { - background: #79aec8; - padding: 10px 15px; - border: none; - border-radius: 4px; - color: #fff; - cursor: pointer; -} - -a.button { - padding: 4px 5px; -} - -.button:active, input[type=submit]:active, input[type=button]:active, -.button:focus, input[type=submit]:focus, input[type=button]:focus, -.button:hover, input[type=submit]:hover, input[type=button]:hover { - background: #609ab6; -} - -.button[disabled], input[type=submit][disabled], input[type=button][disabled] { - opacity: 0.4; -} - -.button.default, input[type=submit].default, .submit-row input.default { - float: right; - border: none; - font-weight: 400; - background: #417690; -} - -.button.default:active, input[type=submit].default:active, -.button.default:focus, input[type=submit].default:focus, -.button.default:hover, input[type=submit].default:hover { - background: #205067; -} - -.button[disabled].default, -input[type=submit][disabled].default, -input[type=button][disabled].default { - opacity: 0.4; -} - - -/* MODULES */ - -.module { - border: none; - margin-bottom: 30px; - background: #fff; -} - -.module p, .module ul, .module h3, .module h4, .module dl, .module pre { - padding-left: 10px; - padding-right: 10px; -} - -.module blockquote { - margin-left: 12px; -} - -.module ul, .module ol { - margin-left: 1.5em; -} - -.module h3 { - margin-top: .6em; -} - -.module h2, .module caption, .inline-group h2 { - margin: 0; - padding: 8px; - font-weight: 400; - font-size: 13px; - text-align: left; - background: #79aec8; - color: #fff; -} - -.module caption, -.inline-group h2 { - font-size: 12px; - letter-spacing: 0.5px; - text-transform: uppercase; -} - -.module table { - border-collapse: collapse; -} - -/* MESSAGES & ERRORS */ - -ul.messagelist { - padding: 0; - margin: 0; -} - -ul.messagelist li { - display: block; - font-weight: 400; - font-size: 13px; - padding: 10px 10px 10px 65px; - margin: 0 0 10px 0; - background: #dfd url(../img/icon-yes.svg) 40px 12px no-repeat; - background-size: 16px auto; - color: #333; -} - -ul.messagelist li.warning { - background: #ffc url(../img/icon-alert.svg) 40px 14px no-repeat; - background-size: 14px auto; -} - -ul.messagelist li.error { - background: #ffefef url(../img/icon-no.svg) 40px 12px no-repeat; - background-size: 16px auto; -} - -.errornote { - font-size: 14px; - font-weight: 700; - display: block; - padding: 10px 12px; - margin: 0 0 10px 0; - color: #ba2121; - border: 1px solid #ba2121; - border-radius: 4px; - background-color: #fff; - background-position: 5px 12px; -} - -ul.errorlist { - margin: 0 0 4px; - padding: 0; - color: #ba2121; - background: #fff; -} - -ul.errorlist li { - font-size: 13px; - display: block; - margin-bottom: 4px; -} - -ul.errorlist li:first-child { - margin-top: 0; -} - -ul.errorlist li a { - color: inherit; - text-decoration: underline; -} - -td ul.errorlist { - margin: 0; - padding: 0; -} - -td ul.errorlist li { - margin: 0; -} - -.form-row.errors { - margin: 0; - border: none; - border-bottom: 1px solid #eee; - background: none; -} - -.form-row.errors ul.errorlist li { - padding-left: 0; -} - -.errors input, .errors select, .errors textarea { - border: 1px solid #ba2121; -} - -div.system-message { - background: #ffc; - margin: 10px; - padding: 6px 8px; - font-size: .8em; -} - -div.system-message p.system-message-title { - padding: 4px 5px 4px 25px; - margin: 0; - color: #c11; - background: #ffefef url(../img/icon-no.svg) 5px 5px no-repeat; -} - -.description { - font-size: 12px; - padding: 5px 0 0 12px; -} - -/* BREADCRUMBS */ - -div.breadcrumbs { - background: #79aec8; - padding: 10px 40px; - border: none; - font-size: 14px; - color: #c4dce8; - text-align: left; -} - -div.breadcrumbs a { - color: #fff; -} - -div.breadcrumbs a:focus, div.breadcrumbs a:hover { - color: #c4dce8; -} - -/* ACTION ICONS */ - -.viewlink, .inlineviewlink { - padding-left: 16px; - background: url(../img/icon-viewlink.svg) 0 1px no-repeat; -} - -.addlink { - padding-left: 16px; - background: url(../img/icon-addlink.svg) 0 1px no-repeat; -} - -.changelink, .inlinechangelink { - padding-left: 16px; - background: url(../img/icon-changelink.svg) 0 1px no-repeat; -} - -.deletelink { - padding-left: 16px; - background: url(../img/icon-deletelink.svg) 0 1px no-repeat; -} - -a.deletelink:link, a.deletelink:visited { - color: #CC3434; -} - -a.deletelink:focus, a.deletelink:hover { - color: #993333; - text-decoration: none; -} - -/* OBJECT TOOLS */ - -.object-tools { - font-size: 10px; - font-weight: bold; - padding-left: 0; - float: right; - position: relative; - margin-top: -48px; -} - -.form-row .object-tools { - margin-top: 5px; - margin-bottom: 5px; - float: none; - height: 2em; - padding-left: 3.5em; -} - -.object-tools li { - display: block; - float: left; - margin-left: 5px; - height: 16px; -} - -.object-tools a { - border-radius: 15px; -} - -.object-tools a:link, .object-tools a:visited { - display: block; - float: left; - padding: 3px 12px; - background: #999; - font-weight: 400; - font-size: 11px; - text-transform: uppercase; - letter-spacing: 0.5px; - color: #fff; -} - -.object-tools a:focus, .object-tools a:hover { - background-color: #417690; -} - -.object-tools a:focus{ - text-decoration: none; -} - -.object-tools a.viewsitelink, .object-tools a.golink,.object-tools a.addlink { - background-repeat: no-repeat; - background-position: right 7px center; - padding-right: 26px; -} - -.object-tools a.viewsitelink, .object-tools a.golink { - background-image: url(../img/tooltag-arrowright.svg); -} - -.object-tools a.addlink { - background-image: url(../img/tooltag-add.svg); -} - -/* OBJECT HISTORY */ - -table#change-history { - width: 100%; -} - -table#change-history tbody th { - width: 16em; -} - -/* PAGE STRUCTURE */ - -#container { - position: relative; - width: 100%; - min-width: 980px; - padding: 0; -} - -#content { - padding: 20px 40px; -} - -.dashboard #content { - width: 600px; -} - -#content-main { - float: left; - width: 100%; -} - -#content-related { - float: right; - width: 260px; - position: relative; - margin-right: -300px; -} - -#footer { - clear: both; - padding: 10px; -} - -/* COLUMN TYPES */ - -.colMS { - margin-right: 300px; -} - -.colSM { - margin-left: 300px; -} - -.colSM #content-related { - float: left; - margin-right: 0; - margin-left: -300px; -} - -.colSM #content-main { - float: right; -} - -.popup .colM { - width: auto; -} - -/* HEADER */ - -#header { - width: auto; - height: auto; - display: flex; - justify-content: space-between; - align-items: center; - padding: 10px 40px; - background: #417690; - color: #ffc; - overflow: hidden; -} - -#header a:link, #header a:visited { - color: #fff; -} - -#header a:focus , #header a:hover { - text-decoration: underline; -} - -#branding { - float: left; -} - -#branding h1 { - padding: 0; - margin: 0 20px 0 0; - font-weight: 300; - font-size: 24px; - color: #f5dd5d; -} - -#branding h1, #branding h1 a:link, #branding h1 a:visited { - color: #f5dd5d; -} - -#branding h2 { - padding: 0 10px; - font-size: 14px; - margin: -8px 0 8px 0; - font-weight: normal; - color: #ffc; -} - -#branding a:hover { - text-decoration: none; -} - -#user-tools { - float: right; - padding: 0; - margin: 0 0 0 20px; - font-weight: 300; - font-size: 11px; - letter-spacing: 0.5px; - text-transform: uppercase; - text-align: right; -} - -#user-tools a { - border-bottom: 1px solid rgba(255, 255, 255, 0.25); -} - -#user-tools a:focus, #user-tools a:hover { - text-decoration: none; - border-bottom-color: #79aec8; - color: #79aec8; -} - -/* SIDEBAR */ - -#content-related { - background: #f8f8f8; -} - -#content-related .module { - background: none; -} - -#content-related h3 { - font-size: 14px; - color: #666; - padding: 0 16px; - margin: 0 0 16px; -} - -#content-related h4 { - font-size: 13px; -} - -#content-related p { - padding-left: 16px; - padding-right: 16px; -} - -#content-related .actionlist { - padding: 0; - margin: 16px; -} - -#content-related .actionlist li { - line-height: 1.2; - margin-bottom: 10px; - padding-left: 18px; -} - -#content-related .module h2 { - background: none; - padding: 16px; - margin-bottom: 16px; - border-bottom: 1px solid #eaeaea; - font-size: 18px; - color: #333; -} - -.delete-confirmation form input[type="submit"] { - background: #ba2121; - border-radius: 4px; - padding: 10px 15px; - color: #fff; -} - -.delete-confirmation form input[type="submit"]:active, -.delete-confirmation form input[type="submit"]:focus, -.delete-confirmation form input[type="submit"]:hover { - background: #a41515; -} - -.delete-confirmation form .cancel-link { - display: inline-block; - vertical-align: middle; - height: 15px; - line-height: 15px; - background: #ddd; - border-radius: 4px; - padding: 10px 15px; - color: #333; - margin: 0 0 0 10px; -} - -.delete-confirmation form .cancel-link:active, -.delete-confirmation form .cancel-link:focus, -.delete-confirmation form .cancel-link:hover { - background: #ccc; -} - -/* POPUP */ -.popup #content { - padding: 20px; -} - -.popup #container { - min-width: 0; -} - -.popup #header { - padding: 10px 20px; -} diff --git a/static/admin/css/changelists.css b/static/admin/css/changelists.css deleted file mode 100644 index 17690a34..00000000 --- a/static/admin/css/changelists.css +++ /dev/null @@ -1,344 +0,0 @@ -/* CHANGELISTS */ - -#changelist { - position: relative; - width: 100%; -} - -#changelist table { - width: 100%; -} - -.change-list .hiddenfields { display:none; } - -.change-list .filtered table { - border-right: none; -} - -.change-list .filtered { - min-height: 400px; -} - -.change-list .filtered .results, .change-list .filtered .paginator, -.filtered #toolbar, .filtered div.xfull { - margin-right: 280px; - width: auto; -} - -.change-list .filtered table tbody th { - padding-right: 1em; -} - -#changelist-form .results { - overflow-x: auto; -} - -#changelist .toplinks { - border-bottom: 1px solid #ddd; -} - -#changelist .paginator { - color: #666; - border-bottom: 1px solid #eee; - background: #fff; - overflow: hidden; -} - -/* CHANGELIST TABLES */ - -#changelist table thead th { - padding: 0; - white-space: nowrap; - vertical-align: middle; -} - -#changelist table thead th.action-checkbox-column { - width: 1.5em; - text-align: center; -} - -#changelist table tbody td.action-checkbox { - text-align: center; -} - -#changelist table tfoot { - color: #666; -} - -/* TOOLBAR */ - -#changelist #toolbar { - padding: 8px 10px; - margin-bottom: 15px; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; - background: #f8f8f8; - color: #666; -} - -#changelist #toolbar form input { - border-radius: 4px; - font-size: 14px; - padding: 5px; - color: #333; -} - -#changelist #toolbar form #searchbar { - height: 19px; - border: 1px solid #ccc; - padding: 2px 5px; - margin: 0; - vertical-align: top; - font-size: 13px; -} - -#changelist #toolbar form #searchbar:focus { - border-color: #999; -} - -#changelist #toolbar form input[type="submit"] { - border: 1px solid #ccc; - padding: 2px 10px; - margin: 0; - vertical-align: middle; - background: #fff; - box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; - cursor: pointer; - color: #333; -} - -#changelist #toolbar form input[type="submit"]:focus, -#changelist #toolbar form input[type="submit"]:hover { - border-color: #999; -} - -#changelist #changelist-search img { - vertical-align: middle; - margin-right: 4px; -} - -/* FILTER COLUMN */ - -#changelist-filter { - position: absolute; - top: 0; - right: 0; - z-index: 1000; - width: 240px; - background: #f8f8f8; - border-left: none; - margin: 0; -} - -#changelist-filter h2 { - font-size: 14px; - text-transform: uppercase; - letter-spacing: 0.5px; - padding: 5px 15px; - margin-bottom: 12px; - border-bottom: none; -} - -#changelist-filter h3 { - font-weight: 400; - font-size: 14px; - padding: 0 15px; - margin-bottom: 10px; -} - -#changelist-filter ul { - margin: 5px 0; - padding: 0 15px 15px; - border-bottom: 1px solid #eaeaea; -} - -#changelist-filter ul:last-child { - border-bottom: none; - padding-bottom: none; -} - -#changelist-filter li { - list-style-type: none; - margin-left: 0; - padding-left: 0; -} - -#changelist-filter a { - display: block; - color: #999; - text-overflow: ellipsis; - overflow-x: hidden; -} - -#changelist-filter li.selected { - border-left: 5px solid #eaeaea; - padding-left: 10px; - margin-left: -15px; -} - -#changelist-filter li.selected a { - color: #5b80b2; -} - -#changelist-filter a:focus, #changelist-filter a:hover, -#changelist-filter li.selected a:focus, -#changelist-filter li.selected a:hover { - color: #036; -} - -/* DATE DRILLDOWN */ - -.change-list ul.toplinks { - display: block; - float: left; - padding: 0; - margin: 0; - width: 100%; -} - -.change-list ul.toplinks li { - padding: 3px 6px; - font-weight: bold; - list-style-type: none; - display: inline-block; -} - -.change-list ul.toplinks .date-back a { - color: #999; -} - -.change-list ul.toplinks .date-back a:focus, -.change-list ul.toplinks .date-back a:hover { - color: #036; -} - -/* PAGINATOR */ - -.paginator { - font-size: 13px; - padding-top: 10px; - padding-bottom: 10px; - line-height: 22px; - margin: 0; - border-top: 1px solid #ddd; -} - -.paginator a:link, .paginator a:visited { - padding: 2px 6px; - background: #79aec8; - text-decoration: none; - color: #fff; -} - -.paginator a.showall { - padding: 0; - border: none; - background: none; - color: #5b80b2; -} - -.paginator a.showall:focus, .paginator a.showall:hover { - background: none; - color: #036; -} - -.paginator .end { - margin-right: 6px; -} - -.paginator .this-page { - padding: 2px 6px; - font-weight: bold; - font-size: 13px; - vertical-align: top; -} - -.paginator a:focus, .paginator a:hover { - color: white; - background: #036; -} - -/* ACTIONS */ - -.filtered .actions { - margin-right: 280px; - border-right: none; -} - -#changelist table input { - margin: 0; - vertical-align: baseline; -} - -#changelist table tbody tr.selected { - background-color: #FFFFCC; -} - -#changelist .actions { - padding: 10px; - background: #fff; - border-top: none; - border-bottom: none; - line-height: 24px; - color: #999; -} - -#changelist .actions.selected { - background: #fffccf; - border-top: 1px solid #fffee8; - border-bottom: 1px solid #edecd6; -} - -#changelist .actions span.all, -#changelist .actions span.action-counter, -#changelist .actions span.clear, -#changelist .actions span.question { - font-size: 13px; - margin: 0 0.5em; - display: none; -} - -#changelist .actions:last-child { - border-bottom: none; -} - -#changelist .actions select { - vertical-align: top; - height: 24px; - background: none; - color: #000; - border: 1px solid #ccc; - border-radius: 4px; - font-size: 14px; - padding: 0 0 0 4px; - margin: 0; - margin-left: 10px; -} - -#changelist .actions select:focus { - border-color: #999; -} - -#changelist .actions label { - display: inline-block; - vertical-align: middle; - font-size: 13px; -} - -#changelist .actions .button { - font-size: 13px; - border: 1px solid #ccc; - border-radius: 4px; - background: #fff; - box-shadow: 0 -15px 20px -10px rgba(0, 0, 0, 0.15) inset; - cursor: pointer; - height: 24px; - line-height: 1; - padding: 4px 8px; - margin: 0; - color: #333; -} - -#changelist .actions .button:focus, #changelist .actions .button:hover { - border-color: #999; -} diff --git a/static/admin/css/dashboard.css b/static/admin/css/dashboard.css deleted file mode 100644 index 1560c7b4..00000000 --- a/static/admin/css/dashboard.css +++ /dev/null @@ -1,27 +0,0 @@ -/* DASHBOARD */ - -.dashboard .module table th { - width: 100%; -} - -.dashboard .module table td { - white-space: nowrap; -} - -.dashboard .module table td a { - display: block; - padding-right: .6em; -} - -/* RECENT ACTIONS MODULE */ - -.module ul.actionlist { - margin-left: 0; -} - -ul.actionlist li { - list-style-type: none; - overflow: hidden; - text-overflow: ellipsis; - -o-text-overflow: ellipsis; -} diff --git a/static/admin/css/fonts.css b/static/admin/css/fonts.css deleted file mode 100644 index c837e017..00000000 --- a/static/admin/css/fonts.css +++ /dev/null @@ -1,20 +0,0 @@ -@font-face { - font-family: 'Roboto'; - src: url('../fonts/Roboto-Bold-webfont.woff'); - font-weight: 700; - font-style: normal; -} - -@font-face { - font-family: 'Roboto'; - src: url('../fonts/Roboto-Regular-webfont.woff'); - font-weight: 400; - font-style: normal; -} - -@font-face { - font-family: 'Roboto'; - src: url('../fonts/Roboto-Light-webfont.woff'); - font-weight: 300; - font-style: normal; -} diff --git a/static/admin/css/forms.css b/static/admin/css/forms.css deleted file mode 100644 index 62a093f9..00000000 --- a/static/admin/css/forms.css +++ /dev/null @@ -1,532 +0,0 @@ -@import url('widgets.css'); - -/* FORM ROWS */ - -.form-row { - overflow: hidden; - padding: 10px; - font-size: 13px; - border-bottom: 1px solid #eee; -} - -.form-row img, .form-row input { - vertical-align: middle; -} - -.form-row label input[type="checkbox"] { - margin-top: 0; - vertical-align: 0; -} - -form .form-row p { - padding-left: 0; -} - -.hidden { - display: none; -} - -/* FORM LABELS */ - -label { - font-weight: normal; - color: #666; - font-size: 13px; -} - -.required label, label.required { - font-weight: bold; - color: #333; -} - -/* RADIO BUTTONS */ - -form ul.radiolist li { - list-style-type: none; -} - -form ul.radiolist label { - float: none; - display: inline; -} - -form ul.radiolist input[type="radio"] { - margin: -2px 4px 0 0; - padding: 0; -} - -form ul.inline { - margin-left: 0; - padding: 0; -} - -form ul.inline li { - float: left; - padding-right: 7px; -} - -/* ALIGNED FIELDSETS */ - -.aligned label { - display: block; - padding: 4px 10px 0 0; - float: left; - width: 160px; - word-wrap: break-word; - line-height: 1; -} - -.aligned label:not(.vCheckboxLabel):after { - content: ''; - display: inline-block; - vertical-align: middle; - height: 26px; -} - -.aligned label + p, .aligned label + div.help, .aligned label + div.readonly { - padding: 6px 0; - margin-top: 0; - margin-bottom: 0; - margin-left: 170px; -} - -.aligned ul label { - display: inline; - float: none; - width: auto; -} - -.aligned .form-row input { - margin-bottom: 0; -} - -.colMS .aligned .vLargeTextField, .colMS .aligned .vXMLLargeTextField { - width: 350px; -} - -form .aligned ul { - margin-left: 160px; - padding-left: 10px; -} - -form .aligned ul.radiolist { - display: inline-block; - margin: 0; - padding: 0; -} - -form .aligned p.help, -form .aligned div.help { - clear: left; - margin-top: 0; - margin-left: 160px; - padding-left: 10px; -} - -form .aligned label + p.help, -form .aligned label + div.help { - margin-left: 0; - padding-left: 0; -} - -form .aligned p.help:last-child, -form .aligned div.help:last-child { - margin-bottom: 0; - padding-bottom: 0; -} - -form .aligned input + p.help, -form .aligned textarea + p.help, -form .aligned select + p.help, -form .aligned input + div.help, -form .aligned textarea + div.help, -form .aligned select + div.help { - margin-left: 160px; - padding-left: 10px; -} - -form .aligned ul li { - list-style: none; -} - -form .aligned table p { - margin-left: 0; - padding-left: 0; -} - -.aligned .vCheckboxLabel { - float: none; - width: auto; - display: inline-block; - vertical-align: -3px; - padding: 0 0 5px 5px; -} - -.aligned .vCheckboxLabel + p.help, -.aligned .vCheckboxLabel + div.help { - margin-top: -4px; -} - -.colM .aligned .vLargeTextField, .colM .aligned .vXMLLargeTextField { - width: 610px; -} - -.checkbox-row p.help, -.checkbox-row div.help { - margin-left: 0; - padding-left: 0; -} - -fieldset .fieldBox { - float: left; - margin-right: 20px; -} - -/* WIDE FIELDSETS */ - -.wide label { - width: 200px; -} - -form .wide p, -form .wide input + p.help, -form .wide input + div.help { - margin-left: 200px; -} - -form .wide p.help, -form .wide div.help { - padding-left: 38px; -} - -form div.help ul { - padding-left: 0; - margin-left: 0; -} - -.colM fieldset.wide .vLargeTextField, .colM fieldset.wide .vXMLLargeTextField { - width: 450px; -} - -/* COLLAPSED FIELDSETS */ - -fieldset.collapsed * { - display: none; -} - -fieldset.collapsed h2, fieldset.collapsed { - display: block; -} - -fieldset.collapsed { - border: 1px solid #eee; - border-radius: 4px; - overflow: hidden; -} - -fieldset.collapsed h2 { - background: #f8f8f8; - color: #666; -} - -fieldset .collapse-toggle { - color: #fff; -} - -fieldset.collapsed .collapse-toggle { - background: transparent; - display: inline; - color: #447e9b; -} - -/* MONOSPACE TEXTAREAS */ - -fieldset.monospace textarea { - font-family: "Bitstream Vera Sans Mono", Monaco, "Courier New", Courier, monospace; -} - -/* SUBMIT ROW */ - -.submit-row { - padding: 12px 14px; - margin: 0 0 20px; - background: #f8f8f8; - border: 1px solid #eee; - border-radius: 4px; - text-align: right; - overflow: hidden; -} - -body.popup .submit-row { - overflow: auto; -} - -.submit-row input { - height: 35px; - line-height: 15px; - margin: 0 0 0 5px; -} - -.submit-row input.default { - margin: 0 0 0 8px; - text-transform: uppercase; -} - -.submit-row p { - margin: 0.3em; -} - -.submit-row p.deletelink-box { - float: left; - margin: 0; -} - -.submit-row a.deletelink { - display: block; - background: #ba2121; - border-radius: 4px; - padding: 10px 15px; - height: 15px; - line-height: 15px; - color: #fff; -} - -.submit-row a.closelink { - display: inline-block; - background: #bbbbbb; - border-radius: 4px; - padding: 10px 15px; - height: 15px; - line-height: 15px; - margin: 0 0 0 5px; - color: #fff; -} - -.submit-row a.deletelink:focus, -.submit-row a.deletelink:hover, -.submit-row a.deletelink:active { - background: #a41515; -} - -.submit-row a.closelink:focus, -.submit-row a.closelink:hover, -.submit-row a.closelink:active { - background: #aaaaaa; -} - -/* CUSTOM FORM FIELDS */ - -.vSelectMultipleField { - vertical-align: top; -} - -.vCheckboxField { - border: none; -} - -.vDateField, .vTimeField { - margin-right: 2px; - margin-bottom: 4px; -} - -.vDateField { - min-width: 6.85em; -} - -.vTimeField { - min-width: 4.7em; -} - -.vURLField { - width: 30em; -} - -.vLargeTextField, .vXMLLargeTextField { - width: 48em; -} - -.flatpages-flatpage #id_content { - height: 40.2em; -} - -.module table .vPositiveSmallIntegerField { - width: 2.2em; -} - -.vTextField, .vUUIDField { - width: 20em; -} - -.vIntegerField { - width: 5em; -} - -.vBigIntegerField { - width: 10em; -} - -.vForeignKeyRawIdAdminField { - width: 5em; -} - -/* INLINES */ - -.inline-group { - padding: 0; - margin: 0 0 30px; -} - -.inline-group thead th { - padding: 8px 10px; -} - -.inline-group .aligned label { - width: 160px; -} - -.inline-related { - position: relative; -} - -.inline-related h3 { - margin: 0; - color: #666; - padding: 5px; - font-size: 13px; - background: #f8f8f8; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; -} - -.inline-related h3 span.delete { - float: right; -} - -.inline-related h3 span.delete label { - margin-left: 2px; - font-size: 11px; -} - -.inline-related fieldset { - margin: 0; - background: #fff; - border: none; - width: 100%; -} - -.inline-related fieldset.module h3 { - margin: 0; - padding: 2px 5px 3px 5px; - font-size: 11px; - text-align: left; - font-weight: bold; - background: #bcd; - color: #fff; -} - -.inline-group .tabular fieldset.module { - border: none; -} - -.inline-related.tabular fieldset.module table { - width: 100%; -} - -.last-related fieldset { - border: none; -} - -.inline-group .tabular tr.has_original td { - padding-top: 2em; -} - -.inline-group .tabular tr td.original { - padding: 2px 0 0 0; - width: 0; - _position: relative; -} - -.inline-group .tabular th.original { - width: 0px; - padding: 0; -} - -.inline-group .tabular td.original p { - position: absolute; - left: 0; - height: 1.1em; - padding: 2px 9px; - overflow: hidden; - font-size: 9px; - font-weight: bold; - color: #666; - _width: 700px; -} - -.inline-group ul.tools { - padding: 0; - margin: 0; - list-style: none; -} - -.inline-group ul.tools li { - display: inline; - padding: 0 5px; -} - -.inline-group div.add-row, -.inline-group .tabular tr.add-row td { - color: #666; - background: #f8f8f8; - padding: 8px 10px; - border-bottom: 1px solid #eee; -} - -.inline-group .tabular tr.add-row td { - padding: 8px 10px; - border-bottom: 1px solid #eee; -} - -.inline-group ul.tools a.add, -.inline-group div.add-row a, -.inline-group .tabular tr.add-row td a { - background: url(../img/icon-addlink.svg) 0 1px no-repeat; - padding-left: 16px; - font-size: 12px; -} - -.empty-form { - display: none; -} - -/* RELATED FIELD ADD ONE / LOOKUP */ - -.add-another, .related-lookup { - margin-left: 5px; - display: inline-block; - vertical-align: middle; - background-repeat: no-repeat; - background-size: 14px; -} - -.add-another { - width: 16px; - height: 16px; - background-image: url(../img/icon-addlink.svg); -} - -.related-lookup { - width: 16px; - height: 16px; - background-image: url(../img/search.svg); -} - -form .related-widget-wrapper ul { - display: inline-block; - margin-left: 0; - padding-left: 0; -} - -.clearable-file-input input { - margin-top: 0; -} diff --git a/static/admin/css/login.css b/static/admin/css/login.css deleted file mode 100644 index 2ec241c2..00000000 --- a/static/admin/css/login.css +++ /dev/null @@ -1,79 +0,0 @@ -/* LOGIN FORM */ - -body.login { - background: #f8f8f8; -} - -.login #header { - height: auto; - padding: 15px 16px; - justify-content: center; -} - -.login #header h1 { - font-size: 18px; -} - -.login #header h1 a { - color: #fff; -} - -.login #content { - padding: 20px 20px 0; -} - -.login #container { - background: #fff; - border: 1px solid #eaeaea; - border-radius: 4px; - overflow: hidden; - width: 28em; - min-width: 300px; - margin: 100px auto; -} - -.login #content-main { - width: 100%; -} - -.login .form-row { - padding: 4px 0; - float: left; - width: 100%; - border-bottom: none; -} - -.login .form-row label { - padding-right: 0.5em; - line-height: 2em; - font-size: 1em; - clear: both; - color: #333; -} - -.login .form-row #id_username, .login .form-row #id_password { - clear: both; - padding: 8px; - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -.login span.help { - font-size: 10px; - display: block; -} - -.login .submit-row { - clear: both; - padding: 1em 0 0 9.4em; - margin: 0; - border: none; - background: none; - text-align: left; -} - -.login .password-reset-link { - text-align: center; -} diff --git a/static/admin/css/responsive.css b/static/admin/css/responsive.css deleted file mode 100644 index 5b0d1ec3..00000000 --- a/static/admin/css/responsive.css +++ /dev/null @@ -1,992 +0,0 @@ -/* Tablets */ - -input[type="submit"], button { - -webkit-appearance: none; - appearance: none; -} - -@media (max-width: 1024px) { - /* Basic */ - - html { - -webkit-text-size-adjust: 100%; - } - - td, th { - padding: 10px; - font-size: 14px; - } - - .small { - font-size: 12px; - } - - /* Layout */ - - #container { - min-width: 0; - } - - #content { - padding: 20px 30px 30px; - } - - div.breadcrumbs { - padding: 10px 30px; - } - - /* Header */ - - #header { - flex-direction: column; - padding: 15px 30px; - justify-content: flex-start; - } - - #branding h1 { - margin: 0 0 8px; - font-size: 20px; - line-height: 1.2; - } - - #user-tools { - margin: 0; - font-weight: 400; - line-height: 1.85; - text-align: left; - } - - #user-tools a { - display: inline-block; - line-height: 1.4; - } - - /* Dashboard */ - - .dashboard #content { - width: auto; - } - - #content-related { - margin-right: -290px; - } - - .colSM #content-related { - margin-left: -290px; - } - - .colMS { - margin-right: 290px; - } - - .colSM { - margin-left: 290px; - } - - .dashboard .module table td a { - padding-right: 0; - } - - td .changelink, td .addlink { - font-size: 13px; - } - - /* Changelist */ - - #changelist #toolbar { - border: none; - padding: 15px; - } - - #changelist-search > div { - display: -webkit-flex; - display: flex; - -webkit-flex-wrap: wrap; - flex-wrap: wrap; - max-width: 480px; - } - - #changelist-search label { - line-height: 22px; - } - - #changelist #toolbar form #searchbar { - -webkit-flex: 1 0 auto; - flex: 1 0 auto; - width: 0; - height: 22px; - margin: 0 10px 0 6px; - } - - #changelist-search .quiet { - width: 100%; - margin: 5px 0 0 25px; - } - - #changelist .actions { - display: flex; - flex-wrap: wrap; - padding: 15px 0; - } - - #changelist .actions.selected { - border: none; - } - - #changelist .actions label { - display: flex; - } - - #changelist .actions select { - background: #fff; - } - - #changelist .actions .button { - min-width: 48px; - margin: 0 10px; - } - - #changelist .actions span.all, - #changelist .actions span.clear, - #changelist .actions span.question, - #changelist .actions span.action-counter { - font-size: 11px; - margin: 0 10px 0 0; - } - - #changelist-filter { - width: 200px; - } - - .change-list .filtered .results, - .change-list .filtered .paginator, - .filtered #toolbar, - .filtered .actions, - .filtered div.xfull { - margin-right: 230px; - } - - #changelist .paginator { - border-top-color: #eee; - } - - #changelist .results + .paginator { - border-top: none; - } - - /* Forms */ - - label { - font-size: 14px; - } - - .form-row input[type=text], - .form-row input[type=password], - .form-row input[type=email], - .form-row input[type=url], - .form-row input[type=tel], - .form-row input[type=number], - .form-row textarea, - .form-row select, - .form-row .vTextField { - box-sizing: border-box; - margin: 0; - padding: 6px 8px; - min-height: 36px; - font-size: 14px; - } - - .form-row select { - height: 36px; - } - - .form-row select[multiple] { - height: auto; - min-height: 0; - } - - fieldset .fieldBox { - float: none; - margin: 0 -10px; - padding: 0 10px; - } - - fieldset .fieldBox + .fieldBox { - margin-top: 10px; - padding-top: 10px; - border-top: 1px solid #eee; - } - - textarea { - max-width: 518px; - max-height: 120px; - } - - .aligned label { - padding-top: 6px; - } - - .aligned .add-another, - .aligned .related-lookup, - .aligned .datetimeshortcuts, - .aligned .related-lookup + strong { - align-self: center; - margin-left: 15px; - } - - form .aligned ul.radiolist { - margin-left: 2px; - } - - /* Related widget */ - - .related-widget-wrapper { - float: none; - } - - .related-widget-wrapper-link + .selector { - max-width: calc(100% - 30px); - margin-right: 15px; - } - - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 10px; - } - - /* Selector */ - - .selector { - display: flex; - width: 100%; - } - - .selector .selector-filter { - display: flex; - align-items: center; - } - - .selector .selector-filter label { - margin: 0 8px 0 0; - } - - .selector .selector-filter input { - width: auto; - min-height: 0; - flex: 1 1; - } - - .selector-available, .selector-chosen { - width: auto; - flex: 1 1; - display: flex; - flex-direction: column; - } - - .selector select { - width: 100%; - flex: 1 0 auto; - margin-bottom: 5px; - } - - .selector ul.selector-chooser { - width: 26px; - height: 52px; - padding: 2px 0; - margin: auto 15px; - border-radius: 20px; - transform: translateY(-10px); - } - - .selector-add, .selector-remove { - width: 20px; - height: 20px; - background-size: 20px auto; - } - - .selector-add { - background-position: 0 -120px; - } - - .selector-remove { - background-position: 0 -80px; - } - - a.selector-chooseall, a.selector-clearall { - align-self: center; - } - - .stacked { - flex-direction: column; - max-width: 480px; - } - - .stacked > * { - flex: 0 1 auto; - } - - .stacked select { - margin-bottom: 0; - } - - .stacked .selector-available, .stacked .selector-chosen { - width: auto; - } - - .stacked ul.selector-chooser { - width: 52px; - height: 26px; - padding: 0 2px; - margin: 15px auto; - transform: none; - } - - .stacked .selector-chooser li { - padding: 3px; - } - - .stacked .selector-add, .stacked .selector-remove { - background-size: 20px auto; - } - - .stacked .selector-add { - background-position: 0 -40px; - } - - .stacked .active.selector-add { - background-position: 0 -60px; - } - - .stacked .selector-remove { - background-position: 0 0; - } - - .stacked .active.selector-remove { - background-position: 0 -20px; - } - - .help-tooltip, .selector .help-icon { - display: none; - } - - form .form-row p.datetime { - width: 100%; - } - - .datetime input { - width: 50%; - max-width: 120px; - } - - .datetime span { - font-size: 13px; - } - - .datetime .timezonewarning { - display: block; - font-size: 11px; - color: #999; - } - - .datetimeshortcuts { - color: #ccc; - } - - .inline-group { - overflow: auto; - } - - /* Messages */ - - ul.messagelist li { - padding-left: 55px; - background-position: 30px 12px; - } - - ul.messagelist li.error { - background-position: 30px 12px; - } - - ul.messagelist li.warning { - background-position: 30px 14px; - } - - /* Login */ - - .login #header { - padding: 15px 20px; - } - - .login #branding h1 { - margin: 0; - } - - /* GIS */ - - div.olMap { - max-width: calc(100vw - 30px); - max-height: 300px; - } - - .olMap + .clear_features { - display: block; - margin-top: 10px; - } - - /* Docs */ - - .module table.xfull { - width: 100%; - } - - pre.literal-block { - overflow: auto; - } -} - -/* Mobile */ - -@media (max-width: 767px) { - /* Layout */ - - #header, #content, #footer { - padding: 15px; - } - - #footer:empty { - padding: 0; - } - - div.breadcrumbs { - padding: 10px 15px; - } - - /* Dashboard */ - - .colMS, .colSM { - margin: 0; - } - - #content-related, .colSM #content-related { - width: 100%; - margin: 0; - } - - #content-related .module { - margin-bottom: 0; - } - - #content-related .module h2 { - padding: 10px 15px; - font-size: 16px; - } - - /* Changelist */ - - #changelist { - display: flex; - flex-direction: column; - } - - #changelist #toolbar { - order: 1; - padding: 10px; - } - - #changelist .xfull { - order: 2; - } - - #changelist-form { - order: 3; - } - - #changelist-filter { - order: 4; - } - - #changelist .actions label { - flex: 1 1; - } - - #changelist .actions select { - flex: 1 0; - width: 100%; - } - - #changelist .actions span { - flex: 1 0 100%; - } - - .change-list .filtered .results, .change-list .filtered .paginator, - .filtered #toolbar, .filtered .actions, .filtered div.xfull { - margin-right: 0; - } - - #changelist-filter { - position: static; - width: auto; - margin-top: 30px; - } - - .object-tools { - float: none; - margin: 0 0 15px; - padding: 0; - overflow: hidden; - } - - .object-tools li { - height: auto; - margin-left: 0; - } - - .object-tools li + li { - margin-left: 15px; - } - - /* Forms */ - - .form-row { - padding: 15px 0; - } - - .aligned .form-row, - .aligned .form-row > div { - display: flex; - flex-wrap: wrap; - max-width: 100vw; - } - - .aligned .form-row > div { - width: calc(100vw - 30px); - } - - textarea { - max-width: none; - } - - .vURLField { - width: auto; - } - - fieldset .fieldBox + .fieldBox { - margin-top: 15px; - padding-top: 15px; - } - - fieldset.collapsed .form-row { - display: none; - } - - .aligned label { - width: 100%; - padding: 0 0 10px; - } - - .aligned label:after { - max-height: 0; - } - - .aligned .form-row input, - .aligned .form-row select, - .aligned .form-row textarea { - flex: 1 1 auto; - max-width: 100%; - } - - .aligned .checkbox-row { - align-items: center; - } - - .aligned .checkbox-row input { - flex: 0 1 auto; - margin: 0; - } - - .aligned .vCheckboxLabel { - flex: 1 0; - padding: 1px 0 0 5px; - } - - .aligned label + p, - .aligned label + div.help, - .aligned label + div.readonly { - padding: 0; - margin-left: 0; - } - - .aligned p.file-upload { - margin-left: 0; - font-size: 13px; - } - - span.clearable-file-input { - margin-left: 15px; - } - - span.clearable-file-input label { - font-size: 13px; - padding-bottom: 0; - } - - .aligned .timezonewarning { - flex: 1 0 100%; - margin-top: 5px; - } - - form .aligned .form-row div.help { - width: 100%; - margin: 5px 0 0; - padding: 0; - } - - form .aligned ul { - margin-left: 0; - padding-left: 0; - } - - form .aligned ul.radiolist { - margin-right: 15px; - margin-bottom: -3px; - } - - form .aligned ul.radiolist li + li { - margin-top: 5px; - } - - /* Related widget */ - - .related-widget-wrapper { - width: 100%; - display: flex; - align-items: flex-start; - } - - .related-widget-wrapper .selector { - order: 1; - } - - .related-widget-wrapper > a { - order: 2; - } - - .related-widget-wrapper .radiolist ~ a { - align-self: flex-end; - } - - .related-widget-wrapper > select ~ a { - align-self: center; - } - - select + .related-widget-wrapper-link, - .related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 15px; - } - - /* Selector */ - - .selector { - flex-direction: column; - } - - .selector > * { - float: none; - } - - .selector-available, .selector-chosen { - margin-bottom: 0; - flex: 1 1 auto; - } - - .selector select { - max-height: 96px; - } - - .selector ul.selector-chooser { - display: block; - float: none; - width: 52px; - height: 26px; - padding: 0 2px; - margin: 15px auto 20px; - transform: none; - } - - .selector ul.selector-chooser li { - float: left; - } - - .selector-remove { - background-position: 0 0; - } - - .selector-add { - background-position: 0 -40px; - } - - /* Inlines */ - - .inline-group[data-inline-type="stacked"] .inline-related { - border: 2px solid #eee; - border-radius: 4px; - margin-top: 15px; - overflow: auto; - } - - .inline-group[data-inline-type="stacked"] .inline-related > * { - box-sizing: border-box; - } - - .inline-group[data-inline-type="stacked"] .inline-related + .inline-related { - margin-top: 30px; - } - - .inline-group[data-inline-type="stacked"] .inline-related .module { - padding: 0 10px; - } - - .inline-group[data-inline-type="stacked"] .inline-related .module .form-row:last-child { - border-bottom: none; - } - - .inline-group[data-inline-type="stacked"] .inline-related h3 { - padding: 10px; - border-top-width: 0; - border-bottom-width: 2px; - display: flex; - flex-wrap: wrap; - align-items: center; - } - - .inline-group[data-inline-type="stacked"] .inline-related h3 .inline_label { - margin-right: auto; - } - - .inline-group[data-inline-type="stacked"] .inline-related h3 span.delete { - float: none; - flex: 1 1 100%; - margin-top: 5px; - } - - .inline-group[data-inline-type="stacked"] .aligned .form-row > div:not([class]) { - width: 100%; - } - - .inline-group[data-inline-type="stacked"] .aligned label { - width: 100%; - } - - .inline-group[data-inline-type="stacked"] div.add-row { - margin-top: 15px; - border: 1px solid #eee; - border-radius: 4px; - } - - .inline-group div.add-row, - .inline-group .tabular tr.add-row td { - padding: 0; - } - - .inline-group div.add-row a, - .inline-group .tabular tr.add-row td a { - display: block; - padding: 8px 10px 8px 26px; - background-position: 8px 9px; - } - - /* Submit row */ - - .submit-row { - padding: 10px 10px 0; - margin: 0 0 15px; - display: flex; - flex-direction: column; - } - - .submit-row > * { - width: 100%; - } - - .submit-row input, .submit-row input.default, .submit-row a, .submit-row a.closelink { - float: none; - margin: 0 0 10px; - text-align: center; - } - - .submit-row a.closelink { - padding: 10px 0; - } - - .submit-row p.deletelink-box { - order: 4; - } - - /* Messages */ - - ul.messagelist li { - padding-left: 40px; - background-position: 15px 12px; - } - - ul.messagelist li.error { - background-position: 15px 12px; - } - - ul.messagelist li.warning { - background-position: 15px 14px; - } - - /* Paginator */ - - .paginator .this-page, .paginator a:link, .paginator a:visited { - padding: 4px 10px; - } - - /* Login */ - - body.login { - padding: 0 15px; - } - - .login #container { - width: auto; - max-width: 480px; - margin: 50px auto; - } - - .login #header, - .login #content { - padding: 15px; - } - - .login #content-main { - float: none; - } - - .login .form-row { - padding: 0; - } - - .login .form-row + .form-row { - margin-top: 15px; - } - - .login .form-row label { - display: block; - margin: 0 0 5px; - padding: 0; - line-height: 1.2; - } - - .login .submit-row { - padding: 15px 0 0; - } - - .login br, .login .submit-row label { - display: none; - } - - .login .submit-row input { - margin: 0; - text-transform: uppercase; - } - - .errornote { - margin: 0 0 20px; - padding: 8px 12px; - font-size: 13px; - } - - /* Calendar and clock */ - - .calendarbox, .clockbox { - position: fixed !important; - top: 50% !important; - left: 50% !important; - transform: translate(-50%, -50%); - margin: 0; - border: none; - overflow: visible; - } - - .calendarbox:before, .clockbox:before { - content: ''; - position: fixed; - top: 50%; - left: 50%; - width: 100vw; - height: 100vh; - background: rgba(0, 0, 0, 0.75); - transform: translate(-50%, -50%); - } - - .calendarbox > *, .clockbox > * { - position: relative; - z-index: 1; - } - - .calendarbox > div:first-child { - z-index: 2; - } - - .calendarbox .calendar, .clockbox h2 { - border-radius: 4px 4px 0 0; - overflow: hidden; - } - - .calendarbox .calendar-cancel, .clockbox .calendar-cancel { - border-radius: 0 0 4px 4px; - overflow: hidden; - } - - .calendar-shortcuts { - padding: 10px 0; - font-size: 12px; - line-height: 12px; - } - - .calendar-shortcuts a { - margin: 0 4px; - } - - .timelist a { - background: #fff; - padding: 4px; - } - - .calendar-cancel { - padding: 8px 10px; - } - - .clockbox h2 { - padding: 8px 15px; - } - - .calendar caption { - padding: 10px; - } - - .calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { - z-index: 1; - top: 10px; - } - - /* History */ - - table#change-history tbody th, table#change-history tbody td { - font-size: 13px; - word-break: break-word; - } - - table#change-history tbody th { - width: auto; - } - - /* Docs */ - - table.model tbody th, table.model tbody td { - font-size: 13px; - word-break: break-word; - } -} diff --git a/static/admin/css/responsive_rtl.css b/static/admin/css/responsive_rtl.css deleted file mode 100644 index f999cb12..00000000 --- a/static/admin/css/responsive_rtl.css +++ /dev/null @@ -1,84 +0,0 @@ -/* TABLETS */ - -@media (max-width: 1024px) { - [dir="rtl"] .colMS { - margin-right: 0; - } - - [dir="rtl"] #user-tools { - text-align: right; - } - - [dir="rtl"] #changelist .actions label { - padding-left: 10px; - padding-right: 0; - } - - [dir="rtl"] #changelist .actions select { - margin-left: 0; - margin-right: 15px; - } - - [dir="rtl"] .change-list .filtered .results, - [dir="rtl"] .change-list .filtered .paginator, - [dir="rtl"] .filtered #toolbar, - [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions { - margin-right: 0; - margin-left: 230px; - } - - [dir="rtl"] .inline-group ul.tools a.add, - [dir="rtl"] .inline-group div.add-row a, - [dir="rtl"] .inline-group .tabular tr.add-row td a { - padding: 8px 26px 8px 10px; - background-position: calc(100% - 8px) 9px; - } - - [dir="rtl"] .related-widget-wrapper-link + .selector { - margin-right: 0; - margin-left: 15px; - } - - [dir="rtl"] .selector .selector-filter label { - margin-right: 0; - margin-left: 8px; - } - - [dir="rtl"] .object-tools li { - float: right; - } - - [dir="rtl"] .object-tools li + li { - margin-left: 0; - margin-right: 15px; - } - - [dir="rtl"] .dashboard .module table td a { - padding-left: 0; - padding-right: 16px; - } -} - -/* MOBILE */ - -@media (max-width: 767px) { - [dir="rtl"] .change-list .filtered .results, - [dir="rtl"] .change-list .filtered .paginator, - [dir="rtl"] .filtered #toolbar, - [dir="rtl"] .filtered div.xfull, - [dir="rtl"] .filtered .actions { - margin-left: 0; - } - - [dir="rtl"] .aligned .add-another, - [dir="rtl"] .aligned .related-lookup, - [dir="rtl"] .aligned .datetimeshortcuts { - margin-left: 0; - margin-right: 15px; - } - - [dir="rtl"] .aligned ul { - margin-right: 0; - } -} diff --git a/static/admin/css/rtl.css b/static/admin/css/rtl.css deleted file mode 100644 index b9e26bfe..00000000 --- a/static/admin/css/rtl.css +++ /dev/null @@ -1,269 +0,0 @@ -body { - direction: rtl; -} - -/* LOGIN */ - -.login .form-row { - float: right; -} - -.login .form-row label { - float: right; - padding-left: 0.5em; - padding-right: 0; - text-align: left; -} - -.login .submit-row { - clear: both; - padding: 1em 9.4em 0 0; -} - -/* GLOBAL */ - -th { - text-align: right; -} - -.module h2, .module caption { - text-align: right; -} - -.module ul, .module ol { - margin-left: 0; - margin-right: 1.5em; -} - -.viewlink, .addlink, .changelink { - padding-left: 0; - padding-right: 16px; - background-position: 100% 1px; -} - -.deletelink { - padding-left: 0; - padding-right: 16px; - background-position: 100% 1px; -} - -.object-tools { - float: left; -} - -thead th:first-child, -tfoot td:first-child { - border-left: none; -} - -/* LAYOUT */ - -#user-tools { - right: auto; - left: 0; - text-align: left; -} - -div.breadcrumbs { - text-align: right; -} - -#content-main { - float: right; -} - -#content-related { - float: left; - margin-left: -300px; - margin-right: auto; -} - -.colMS { - margin-left: 300px; - margin-right: 0; -} - -/* SORTABLE TABLES */ - -table thead th.sorted .sortoptions { - float: left; -} - -thead th.sorted .text { - padding-right: 0; - padding-left: 42px; -} - -/* dashboard styles */ - -.dashboard .module table td a { - padding-left: .6em; - padding-right: 16px; -} - -/* changelists styles */ - -.change-list .filtered table { - border-left: none; - border-right: 0px none; -} - -#changelist-filter { - right: auto; - left: 0; - border-left: none; - border-right: none; -} - -.change-list .filtered .results, .change-list .filtered .paginator, .filtered #toolbar, .filtered div.xfull { - margin-right: 0; - margin-left: 280px; -} - -#changelist-filter li.selected { - border-left: none; - padding-left: 10px; - margin-left: 0; - border-right: 5px solid #eaeaea; - padding-right: 10px; - margin-right: -15px; -} - -.filtered .actions { - margin-left: 280px; - margin-right: 0; -} - -#changelist table tbody td:first-child, #changelist table tbody th:first-child { - border-right: none; - border-left: none; -} - -/* FORMS */ - -.aligned label { - padding: 0 0 3px 1em; - float: right; -} - -.submit-row { - text-align: left -} - -.submit-row p.deletelink-box { - float: right; -} - -.submit-row input.default { - margin-left: 0; -} - -.vDateField, .vTimeField { - margin-left: 2px; -} - -.aligned .form-row input { - margin-left: 5px; -} - -form .aligned p.help, form .aligned div.help { - clear: right; -} - -form .aligned ul { - margin-right: 163px; - margin-left: 0; -} - -form ul.inline li { - float: right; - padding-right: 0; - padding-left: 7px; -} - -input[type=submit].default, .submit-row input.default { - float: left; -} - -fieldset .fieldBox { - float: right; - margin-left: 20px; - margin-right: 0; -} - -.errorlist li { - background-position: 100% 12px; - padding: 0; -} - -.errornote { - background-position: 100% 12px; - padding: 10px 12px; -} - -/* WIDGETS */ - -.calendarnav-previous { - top: 0; - left: auto; - right: 10px; -} - -.calendarnav-next { - top: 0; - right: auto; - left: 10px; -} - -.calendar caption, .calendarbox h2 { - text-align: center; -} - -.selector { - float: right; -} - -.selector .selector-filter { - text-align: right; -} - -.inline-deletelink { - float: left; -} - -form .form-row p.datetime { - overflow: hidden; -} - -.related-widget-wrapper { - float: right; -} - -/* MISC */ - -.inline-related h2, .inline-group h2 { - text-align: right -} - -.inline-related h3 span.delete { - padding-right: 20px; - padding-left: inherit; - left: 10px; - right: inherit; - float:left; -} - -.inline-related h3 span.delete label { - margin-left: inherit; - margin-right: 2px; -} - -/* IE7 specific bug fixes */ - -div.colM { - position: relative; -} - -.submit-row input { - float: left; -} diff --git a/static/admin/css/vendor/select2/LICENSE-SELECT2.md b/static/admin/css/vendor/select2/LICENSE-SELECT2.md deleted file mode 100644 index 86c7c291..00000000 --- a/static/admin/css/vendor/select2/LICENSE-SELECT2.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2012-2015 Kevin Brown, Igor Vaynberg, and Select2 contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/static/admin/css/vendor/select2/select2.css b/static/admin/css/vendor/select2/select2.css deleted file mode 100644 index 447b2b86..00000000 --- a/static/admin/css/vendor/select2/select2.css +++ /dev/null @@ -1,484 +0,0 @@ -.select2-container { - box-sizing: border-box; - display: inline-block; - margin: 0; - position: relative; - vertical-align: middle; } - .select2-container .select2-selection--single { - box-sizing: border-box; - cursor: pointer; - display: block; - height: 28px; - user-select: none; - -webkit-user-select: none; } - .select2-container .select2-selection--single .select2-selection__rendered { - display: block; - padding-left: 8px; - padding-right: 20px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } - .select2-container .select2-selection--single .select2-selection__clear { - position: relative; } - .select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered { - padding-right: 8px; - padding-left: 20px; } - .select2-container .select2-selection--multiple { - box-sizing: border-box; - cursor: pointer; - display: block; - min-height: 32px; - user-select: none; - -webkit-user-select: none; } - .select2-container .select2-selection--multiple .select2-selection__rendered { - display: inline-block; - overflow: hidden; - padding-left: 8px; - text-overflow: ellipsis; - white-space: nowrap; } - .select2-container .select2-search--inline { - float: left; } - .select2-container .select2-search--inline .select2-search__field { - box-sizing: border-box; - border: none; - font-size: 100%; - margin-top: 5px; - padding: 0; } - .select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button { - -webkit-appearance: none; } - -.select2-dropdown { - background-color: white; - border: 1px solid #aaa; - border-radius: 4px; - box-sizing: border-box; - display: block; - position: absolute; - left: -100000px; - width: 100%; - z-index: 1051; } - -.select2-results { - display: block; } - -.select2-results__options { - list-style: none; - margin: 0; - padding: 0; } - -.select2-results__option { - padding: 6px; - user-select: none; - -webkit-user-select: none; } - .select2-results__option[aria-selected] { - cursor: pointer; } - -.select2-container--open .select2-dropdown { - left: 0; } - -.select2-container--open .select2-dropdown--above { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - -.select2-container--open .select2-dropdown--below { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; } - -.select2-search--dropdown { - display: block; - padding: 4px; } - .select2-search--dropdown .select2-search__field { - padding: 4px; - width: 100%; - box-sizing: border-box; } - .select2-search--dropdown .select2-search__field::-webkit-search-cancel-button { - -webkit-appearance: none; } - .select2-search--dropdown.select2-search--hide { - display: none; } - -.select2-close-mask { - border: 0; - margin: 0; - padding: 0; - display: block; - position: fixed; - left: 0; - top: 0; - min-height: 100%; - min-width: 100%; - height: auto; - width: auto; - opacity: 0; - z-index: 99; - background-color: #fff; - filter: alpha(opacity=0); } - -.select2-hidden-accessible { - border: 0 !important; - clip: rect(0 0 0 0) !important; - height: 1px !important; - margin: -1px !important; - overflow: hidden !important; - padding: 0 !important; - position: absolute !important; - width: 1px !important; } - -.select2-container--default .select2-selection--single { - background-color: #fff; - border: 1px solid #aaa; - border-radius: 4px; } - .select2-container--default .select2-selection--single .select2-selection__rendered { - color: #444; - line-height: 28px; } - .select2-container--default .select2-selection--single .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; } - .select2-container--default .select2-selection--single .select2-selection__placeholder { - color: #999; } - .select2-container--default .select2-selection--single .select2-selection__arrow { - height: 26px; - position: absolute; - top: 1px; - right: 1px; - width: 20px; } - .select2-container--default .select2-selection--single .select2-selection__arrow b { - border-color: #888 transparent transparent transparent; - border-style: solid; - border-width: 5px 4px 0 4px; - height: 0; - left: 50%; - margin-left: -4px; - margin-top: -2px; - position: absolute; - top: 50%; - width: 0; } - -.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear { - float: left; } - -.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow { - left: 1px; - right: auto; } - -.select2-container--default.select2-container--disabled .select2-selection--single { - background-color: #eee; - cursor: default; } - .select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear { - display: none; } - -.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b { - border-color: transparent transparent #888 transparent; - border-width: 0 4px 5px 4px; } - -.select2-container--default .select2-selection--multiple { - background-color: white; - border: 1px solid #aaa; - border-radius: 4px; - cursor: text; } - .select2-container--default .select2-selection--multiple .select2-selection__rendered { - box-sizing: border-box; - list-style: none; - margin: 0; - padding: 0 5px; - width: 100%; } - .select2-container--default .select2-selection--multiple .select2-selection__rendered li { - list-style: none; } - .select2-container--default .select2-selection--multiple .select2-selection__placeholder { - color: #999; - margin-top: 5px; - float: left; } - .select2-container--default .select2-selection--multiple .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; - margin-top: 5px; - margin-right: 10px; } - .select2-container--default .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #aaa; - border-radius: 4px; - cursor: default; - float: left; - margin-right: 5px; - margin-top: 5px; - padding: 0 5px; } - .select2-container--default .select2-selection--multiple .select2-selection__choice__remove { - color: #999; - cursor: pointer; - display: inline-block; - font-weight: bold; - margin-right: 2px; } - .select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #333; } - -.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder, .select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline { - float: right; } - -.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice { - margin-left: 5px; - margin-right: auto; } - -.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { - margin-left: 2px; - margin-right: auto; } - -.select2-container--default.select2-container--focus .select2-selection--multiple { - border: solid black 1px; - outline: 0; } - -.select2-container--default.select2-container--disabled .select2-selection--multiple { - background-color: #eee; - cursor: default; } - -.select2-container--default.select2-container--disabled .select2-selection__choice__remove { - display: none; } - -.select2-container--default.select2-container--open.select2-container--above .select2-selection--single, .select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple { - border-top-left-radius: 0; - border-top-right-radius: 0; } - -.select2-container--default.select2-container--open.select2-container--below .select2-selection--single, .select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple { - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - -.select2-container--default .select2-search--dropdown .select2-search__field { - border: 1px solid #aaa; } - -.select2-container--default .select2-search--inline .select2-search__field { - background: transparent; - border: none; - outline: 0; - box-shadow: none; - -webkit-appearance: textfield; } - -.select2-container--default .select2-results > .select2-results__options { - max-height: 200px; - overflow-y: auto; } - -.select2-container--default .select2-results__option[role=group] { - padding: 0; } - -.select2-container--default .select2-results__option[aria-disabled=true] { - color: #999; } - -.select2-container--default .select2-results__option[aria-selected=true] { - background-color: #ddd; } - -.select2-container--default .select2-results__option .select2-results__option { - padding-left: 1em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__group { - padding-left: 0; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option { - margin-left: -1em; - padding-left: 2em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -2em; - padding-left: 3em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -3em; - padding-left: 4em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -4em; - padding-left: 5em; } - .select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option { - margin-left: -5em; - padding-left: 6em; } - -.select2-container--default .select2-results__option--highlighted[aria-selected] { - background-color: #5897fb; - color: white; } - -.select2-container--default .select2-results__group { - cursor: default; - display: block; - padding: 6px; } - -.select2-container--classic .select2-selection--single { - background-color: #f7f7f7; - border: 1px solid #aaa; - border-radius: 4px; - outline: 0; - background-image: -webkit-linear-gradient(top, white 50%, #eeeeee 100%); - background-image: -o-linear-gradient(top, white 50%, #eeeeee 100%); - background-image: linear-gradient(to bottom, white 50%, #eeeeee 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); } - .select2-container--classic .select2-selection--single:focus { - border: 1px solid #5897fb; } - .select2-container--classic .select2-selection--single .select2-selection__rendered { - color: #444; - line-height: 28px; } - .select2-container--classic .select2-selection--single .select2-selection__clear { - cursor: pointer; - float: right; - font-weight: bold; - margin-right: 10px; } - .select2-container--classic .select2-selection--single .select2-selection__placeholder { - color: #999; } - .select2-container--classic .select2-selection--single .select2-selection__arrow { - background-color: #ddd; - border: none; - border-left: 1px solid #aaa; - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - height: 26px; - position: absolute; - top: 1px; - right: 1px; - width: 20px; - background-image: -webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%); - background-image: -o-linear-gradient(top, #eeeeee 50%, #cccccc 100%); - background-image: linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0); } - .select2-container--classic .select2-selection--single .select2-selection__arrow b { - border-color: #888 transparent transparent transparent; - border-style: solid; - border-width: 5px 4px 0 4px; - height: 0; - left: 50%; - margin-left: -4px; - margin-top: -2px; - position: absolute; - top: 50%; - width: 0; } - -.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear { - float: left; } - -.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow { - border: none; - border-right: 1px solid #aaa; - border-radius: 0; - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - left: 1px; - right: auto; } - -.select2-container--classic.select2-container--open .select2-selection--single { - border: 1px solid #5897fb; } - .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow { - background: transparent; - border: none; } - .select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b { - border-color: transparent transparent #888 transparent; - border-width: 0 4px 5px 4px; } - -.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; - background-image: -webkit-linear-gradient(top, white 0%, #eeeeee 50%); - background-image: -o-linear-gradient(top, white 0%, #eeeeee 50%); - background-image: linear-gradient(to bottom, white 0%, #eeeeee 50%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0); } - -.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - background-image: -webkit-linear-gradient(top, #eeeeee 50%, white 100%); - background-image: -o-linear-gradient(top, #eeeeee 50%, white 100%); - background-image: linear-gradient(to bottom, #eeeeee 50%, white 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0); } - -.select2-container--classic .select2-selection--multiple { - background-color: white; - border: 1px solid #aaa; - border-radius: 4px; - cursor: text; - outline: 0; } - .select2-container--classic .select2-selection--multiple:focus { - border: 1px solid #5897fb; } - .select2-container--classic .select2-selection--multiple .select2-selection__rendered { - list-style: none; - margin: 0; - padding: 0 5px; } - .select2-container--classic .select2-selection--multiple .select2-selection__clear { - display: none; } - .select2-container--classic .select2-selection--multiple .select2-selection__choice { - background-color: #e4e4e4; - border: 1px solid #aaa; - border-radius: 4px; - cursor: default; - float: left; - margin-right: 5px; - margin-top: 5px; - padding: 0 5px; } - .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove { - color: #888; - cursor: pointer; - display: inline-block; - font-weight: bold; - margin-right: 2px; } - .select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover { - color: #555; } - -.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice { - float: right; } - -.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice { - margin-left: 5px; - margin-right: auto; } - -.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove { - margin-left: 2px; - margin-right: auto; } - -.select2-container--classic.select2-container--open .select2-selection--multiple { - border: 1px solid #5897fb; } - -.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple { - border-top: none; - border-top-left-radius: 0; - border-top-right-radius: 0; } - -.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple { - border-bottom: none; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; } - -.select2-container--classic .select2-search--dropdown .select2-search__field { - border: 1px solid #aaa; - outline: 0; } - -.select2-container--classic .select2-search--inline .select2-search__field { - outline: 0; - box-shadow: none; } - -.select2-container--classic .select2-dropdown { - background-color: white; - border: 1px solid transparent; } - -.select2-container--classic .select2-dropdown--above { - border-bottom: none; } - -.select2-container--classic .select2-dropdown--below { - border-top: none; } - -.select2-container--classic .select2-results > .select2-results__options { - max-height: 200px; - overflow-y: auto; } - -.select2-container--classic .select2-results__option[role=group] { - padding: 0; } - -.select2-container--classic .select2-results__option[aria-disabled=true] { - color: grey; } - -.select2-container--classic .select2-results__option--highlighted[aria-selected] { - background-color: #3875d7; - color: white; } - -.select2-container--classic .select2-results__group { - cursor: default; - display: block; - padding: 6px; } - -.select2-container--classic.select2-container--open .select2-dropdown { - border-color: #5897fb; } diff --git a/static/admin/css/vendor/select2/select2.min.css b/static/admin/css/vendor/select2/select2.min.css deleted file mode 100644 index 76de04d9..00000000 --- a/static/admin/css/vendor/select2/select2.min.css +++ /dev/null @@ -1 +0,0 @@ -.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{position:relative}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-search--inline{float:left}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;padding:0}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option[aria-selected]{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;height:1px !important;margin:-1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%}.select2-container--default .select2-selection--multiple .select2-selection__rendered li{list-style:none}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-search--inline{float:right}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option[role=group]{padding:0}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option[role=group]{padding:0}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb} diff --git a/static/admin/css/widgets.css b/static/admin/css/widgets.css deleted file mode 100644 index d3bd67ac..00000000 --- a/static/admin/css/widgets.css +++ /dev/null @@ -1,565 +0,0 @@ -/* SELECTOR (FILTER INTERFACE) */ - -.selector { - width: 800px; - float: left; -} - -.selector select { - width: 380px; - height: 17.2em; -} - -.selector-available, .selector-chosen { - float: left; - width: 380px; - text-align: center; - margin-bottom: 5px; -} - -.selector-chosen select { - border-top: none; -} - -.selector-available h2, .selector-chosen h2 { - border: 1px solid #ccc; - border-radius: 4px 4px 0 0; -} - -.selector-chosen h2 { - background: #79aec8; - color: #fff; -} - -.selector .selector-available h2 { - background: #f8f8f8; - color: #666; -} - -.selector .selector-filter { - background: white; - border: 1px solid #ccc; - border-width: 0 1px; - padding: 8px; - color: #999; - font-size: 10px; - margin: 0; - text-align: left; -} - -.selector .selector-filter label, -.inline-group .aligned .selector .selector-filter label { - float: left; - margin: 7px 0 0; - width: 18px; - height: 18px; - padding: 0; - overflow: hidden; - line-height: 1; -} - -.selector .selector-available input { - width: 320px; - margin-left: 8px; -} - -.selector ul.selector-chooser { - float: left; - width: 22px; - background-color: #eee; - border-radius: 10px; - margin: 10em 5px 0 5px; - padding: 0; -} - -.selector-chooser li { - margin: 0; - padding: 3px; - list-style-type: none; -} - -.selector select { - padding: 0 10px; - margin: 0 0 10px; - border-radius: 0 0 4px 4px; -} - -.selector-add, .selector-remove { - width: 16px; - height: 16px; - display: block; - text-indent: -3000px; - overflow: hidden; - cursor: default; - opacity: 0.3; -} - -.active.selector-add, .active.selector-remove { - opacity: 1; -} - -.active.selector-add:hover, .active.selector-remove:hover { - cursor: pointer; -} - -.selector-add { - background: url(../img/selector-icons.svg) 0 -96px no-repeat; -} - -.active.selector-add:focus, .active.selector-add:hover { - background-position: 0 -112px; -} - -.selector-remove { - background: url(../img/selector-icons.svg) 0 -64px no-repeat; -} - -.active.selector-remove:focus, .active.selector-remove:hover { - background-position: 0 -80px; -} - -a.selector-chooseall, a.selector-clearall { - display: inline-block; - height: 16px; - text-align: left; - margin: 1px auto 3px; - overflow: hidden; - font-weight: bold; - line-height: 16px; - color: #666; - text-decoration: none; - opacity: 0.3; -} - -a.active.selector-chooseall:focus, a.active.selector-clearall:focus, -a.active.selector-chooseall:hover, a.active.selector-clearall:hover { - color: #447e9b; -} - -a.active.selector-chooseall, a.active.selector-clearall { - opacity: 1; -} - -a.active.selector-chooseall:hover, a.active.selector-clearall:hover { - cursor: pointer; -} - -a.selector-chooseall { - padding: 0 18px 0 0; - background: url(../img/selector-icons.svg) right -160px no-repeat; - cursor: default; -} - -a.active.selector-chooseall:focus, a.active.selector-chooseall:hover { - background-position: 100% -176px; -} - -a.selector-clearall { - padding: 0 0 0 18px; - background: url(../img/selector-icons.svg) 0 -128px no-repeat; - cursor: default; -} - -a.active.selector-clearall:focus, a.active.selector-clearall:hover { - background-position: 0 -144px; -} - -/* STACKED SELECTORS */ - -.stacked { - float: left; - width: 490px; -} - -.stacked select { - width: 480px; - height: 10.1em; -} - -.stacked .selector-available, .stacked .selector-chosen { - width: 480px; -} - -.stacked .selector-available { - margin-bottom: 0; -} - -.stacked .selector-available input { - width: 422px; -} - -.stacked ul.selector-chooser { - height: 22px; - width: 50px; - margin: 0 0 10px 40%; - background-color: #eee; - border-radius: 10px; -} - -.stacked .selector-chooser li { - float: left; - padding: 3px 3px 3px 5px; -} - -.stacked .selector-chooseall, .stacked .selector-clearall { - display: none; -} - -.stacked .selector-add { - background: url(../img/selector-icons.svg) 0 -32px no-repeat; - cursor: default; -} - -.stacked .active.selector-add { - background-position: 0 -48px; - cursor: pointer; -} - -.stacked .selector-remove { - background: url(../img/selector-icons.svg) 0 0 no-repeat; - cursor: default; -} - -.stacked .active.selector-remove { - background-position: 0 -16px; - cursor: pointer; -} - -.selector .help-icon { - background: url(../img/icon-unknown.svg) 0 0 no-repeat; - display: inline-block; - vertical-align: middle; - margin: -2px 0 0 2px; - width: 13px; - height: 13px; -} - -.selector .selector-chosen .help-icon { - background: url(../img/icon-unknown-alt.svg) 0 0 no-repeat; -} - -.selector .search-label-icon { - background: url(../img/search.svg) 0 0 no-repeat; - display: inline-block; - height: 18px; - width: 18px; -} - -/* DATE AND TIME */ - -p.datetime { - line-height: 20px; - margin: 0; - padding: 0; - color: #666; - font-weight: bold; -} - -.datetime span { - white-space: nowrap; - font-weight: normal; - font-size: 11px; - color: #ccc; -} - -.datetime input, .form-row .datetime input.vDateField, .form-row .datetime input.vTimeField { - min-width: 0; - margin-left: 5px; - margin-bottom: 4px; -} - -table p.datetime { - font-size: 11px; - margin-left: 0; - padding-left: 0; -} - -.datetimeshortcuts .clock-icon, .datetimeshortcuts .date-icon { - position: relative; - display: inline-block; - vertical-align: middle; - height: 16px; - width: 16px; - overflow: hidden; -} - -.datetimeshortcuts .clock-icon { - background: url(../img/icon-clock.svg) 0 0 no-repeat; -} - -.datetimeshortcuts a:focus .clock-icon, -.datetimeshortcuts a:hover .clock-icon { - background-position: 0 -16px; -} - -.datetimeshortcuts .date-icon { - background: url(../img/icon-calendar.svg) 0 0 no-repeat; - top: -1px; -} - -.datetimeshortcuts a:focus .date-icon, -.datetimeshortcuts a:hover .date-icon { - background-position: 0 -16px; -} - -.timezonewarning { - font-size: 11px; - color: #999; -} - -/* URL */ - -p.url { - line-height: 20px; - margin: 0; - padding: 0; - color: #666; - font-size: 11px; - font-weight: bold; -} - -.url a { - font-weight: normal; -} - -/* FILE UPLOADS */ - -p.file-upload { - line-height: 20px; - margin: 0; - padding: 0; - color: #666; - font-size: 11px; - font-weight: bold; -} - -.aligned p.file-upload { - margin-left: 170px; -} - -.file-upload a { - font-weight: normal; -} - -.file-upload .deletelink { - margin-left: 5px; -} - -span.clearable-file-input label { - color: #333; - font-size: 11px; - display: inline; - float: none; -} - -/* CALENDARS & CLOCKS */ - -.calendarbox, .clockbox { - margin: 5px auto; - font-size: 12px; - width: 19em; - text-align: center; - background: white; - border: 1px solid #ddd; - border-radius: 4px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15); - overflow: hidden; - position: relative; -} - -.clockbox { - width: auto; -} - -.calendar { - margin: 0; - padding: 0; -} - -.calendar table { - margin: 0; - padding: 0; - border-collapse: collapse; - background: white; - width: 100%; -} - -.calendar caption, .calendarbox h2 { - margin: 0; - text-align: center; - border-top: none; - background: #f5dd5d; - font-weight: 700; - font-size: 12px; - color: #333; -} - -.calendar th { - padding: 8px 5px; - background: #f8f8f8; - border-bottom: 1px solid #ddd; - font-weight: 400; - font-size: 12px; - text-align: center; - color: #666; -} - -.calendar td { - font-weight: 400; - font-size: 12px; - text-align: center; - padding: 0; - border-top: 1px solid #eee; - border-bottom: none; -} - -.calendar td.selected a { - background: #79aec8; - color: #fff; -} - -.calendar td.nonday { - background: #f8f8f8; -} - -.calendar td.today a { - font-weight: 700; -} - -.calendar td a, .timelist a { - display: block; - font-weight: 400; - padding: 6px; - text-decoration: none; - color: #444; -} - -.calendar td a:focus, .timelist a:focus, -.calendar td a:hover, .timelist a:hover { - background: #79aec8; - color: white; -} - -.calendar td a:active, .timelist a:active { - background: #417690; - color: white; -} - -.calendarnav { - font-size: 10px; - text-align: center; - color: #ccc; - margin: 0; - padding: 1px 3px; -} - -.calendarnav a:link, #calendarnav a:visited, -#calendarnav a:focus, #calendarnav a:hover { - color: #999; -} - -.calendar-shortcuts { - background: white; - font-size: 11px; - line-height: 11px; - border-top: 1px solid #eee; - padding: 8px 0; - color: #ccc; -} - -.calendarbox .calendarnav-previous, .calendarbox .calendarnav-next { - display: block; - position: absolute; - top: 8px; - width: 15px; - height: 15px; - text-indent: -9999px; - padding: 0; -} - -.calendarnav-previous { - left: 10px; - background: url(../img/calendar-icons.svg) 0 0 no-repeat; -} - -.calendarbox .calendarnav-previous:focus, -.calendarbox .calendarnav-previous:hover { - background-position: 0 -15px; -} - -.calendarnav-next { - right: 10px; - background: url(../img/calendar-icons.svg) 0 -30px no-repeat; -} - -.calendarbox .calendarnav-next:focus, -.calendarbox .calendarnav-next:hover { - background-position: 0 -45px; -} - -.calendar-cancel { - margin: 0; - padding: 4px 0; - font-size: 12px; - background: #eee; - border-top: 1px solid #ddd; - color: #333; -} - -.calendar-cancel:focus, .calendar-cancel:hover { - background: #ddd; -} - -.calendar-cancel a { - color: black; - display: block; -} - -ul.timelist, .timelist li { - list-style-type: none; - margin: 0; - padding: 0; -} - -.timelist a { - padding: 2px; -} - -/* EDIT INLINE */ - -.inline-deletelink { - float: right; - text-indent: -9999px; - background: url(../img/inline-delete.svg) 0 0 no-repeat; - width: 16px; - height: 16px; - border: 0px none; -} - -.inline-deletelink:focus, .inline-deletelink:hover { - cursor: pointer; -} - -/* RELATED WIDGET WRAPPER */ -.related-widget-wrapper { - float: left; /* display properly in form rows with multiple fields */ - overflow: hidden; /* clear floated contents */ -} - -.related-widget-wrapper-link { - opacity: 0.3; -} - -.related-widget-wrapper-link:link { - opacity: .8; -} - -.related-widget-wrapper-link:link:focus, -.related-widget-wrapper-link:link:hover { - opacity: 1; -} - -select + .related-widget-wrapper-link, -.related-widget-wrapper-link + .related-widget-wrapper-link { - margin-left: 7px; -} diff --git a/static/admin/fonts/LICENSE.txt b/static/admin/fonts/LICENSE.txt deleted file mode 100644 index 75b52484..00000000 --- a/static/admin/fonts/LICENSE.txt +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/static/admin/fonts/README.txt b/static/admin/fonts/README.txt deleted file mode 100644 index b247bef3..00000000 --- a/static/admin/fonts/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Roboto webfont source: https://www.google.com/fonts/specimen/Roboto -WOFF files extracted using https://github.com/majodev/google-webfonts-helper -Weights used in this project: Light (300), Regular (400), Bold (700) diff --git a/static/admin/fonts/Roboto-Bold-webfont.woff b/static/admin/fonts/Roboto-Bold-webfont.woff deleted file mode 100644 index 6e0f56267035c2321ca6b590adcfc0fc93b7dc51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86184 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 z 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

      qKeC=lP*lYeHehI6Q)MS6&+vP#n675bfQ1FhUtH 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 I3*a(Q$S^tF@Bjb+ diff --git a/static/admin/fonts/Roboto-Light-webfont.woff b/static/admin/fonts/Roboto-Light-webfont.woff deleted file mode 100644 index b9e99185c8300c786fa77a0490fefdd26ab2e99e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85692 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ŐfpB|})B55Bx+ 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 diff --git a/static/admin/fonts/Roboto-Regular-webfont.woff b/static/admin/fonts/Roboto-Regular-webfont.woff deleted file mode 100644 index 96c1986f01459bc3b7ca8e18fc06785e5e35dc45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 85876 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 YL6htZCcLmfC1Z!aXXnWeQyf*20Ac;`*Z=?k diff --git a/static/admin/img/LICENSE b/static/admin/img/LICENSE deleted file mode 100644 index a4faaa1d..00000000 --- a/static/admin/img/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Code Charm Ltd - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/static/admin/img/README.txt b/static/admin/img/README.txt deleted file mode 100644 index 4eb2e492..00000000 --- a/static/admin/img/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -All icons are taken from Font Awesome (http://fontawesome.io/) project. -The Font Awesome font is licensed under the SIL OFL 1.1: -- https://scripts.sil.org/OFL - -SVG icons source: https://github.com/encharm/Font-Awesome-SVG-PNG -Font-Awesome-SVG-PNG is licensed under the MIT license (see file license -in current folder). diff --git a/static/admin/img/calendar-icons.svg b/static/admin/img/calendar-icons.svg deleted file mode 100644 index dbf21c39..00000000 --- a/static/admin/img/calendar-icons.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/static/admin/img/gis/move_vertex_off.svg b/static/admin/img/gis/move_vertex_off.svg deleted file mode 100644 index 228854f3..00000000 --- a/static/admin/img/gis/move_vertex_off.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/admin/img/gis/move_vertex_on.svg b/static/admin/img/gis/move_vertex_on.svg deleted file mode 100644 index 96b87fdd..00000000 --- a/static/admin/img/gis/move_vertex_on.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/static/admin/img/icon-addlink.svg b/static/admin/img/icon-addlink.svg deleted file mode 100644 index e004fb16..00000000 --- a/static/admin/img/icon-addlink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-alert.svg b/static/admin/img/icon-alert.svg deleted file mode 100644 index e51ea83f..00000000 --- a/static/admin/img/icon-alert.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-calendar.svg b/static/admin/img/icon-calendar.svg deleted file mode 100644 index 97910a99..00000000 --- a/static/admin/img/icon-calendar.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/static/admin/img/icon-changelink.svg b/static/admin/img/icon-changelink.svg deleted file mode 100644 index bbb137aa..00000000 --- a/static/admin/img/icon-changelink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-clock.svg b/static/admin/img/icon-clock.svg deleted file mode 100644 index bf9985d3..00000000 --- a/static/admin/img/icon-clock.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/static/admin/img/icon-deletelink.svg b/static/admin/img/icon-deletelink.svg deleted file mode 100644 index 4059b155..00000000 --- a/static/admin/img/icon-deletelink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-no.svg b/static/admin/img/icon-no.svg deleted file mode 100644 index 2e0d3832..00000000 --- a/static/admin/img/icon-no.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-unknown-alt.svg b/static/admin/img/icon-unknown-alt.svg deleted file mode 100644 index 1c6b99fc..00000000 --- a/static/admin/img/icon-unknown-alt.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-unknown.svg b/static/admin/img/icon-unknown.svg deleted file mode 100644 index 50b4f972..00000000 --- a/static/admin/img/icon-unknown.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-viewlink.svg b/static/admin/img/icon-viewlink.svg deleted file mode 100644 index a1ca1d3f..00000000 --- a/static/admin/img/icon-viewlink.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/icon-yes.svg b/static/admin/img/icon-yes.svg deleted file mode 100644 index 5883d877..00000000 --- a/static/admin/img/icon-yes.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/inline-delete.svg b/static/admin/img/inline-delete.svg deleted file mode 100644 index 17d1ad67..00000000 --- a/static/admin/img/inline-delete.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/search.svg b/static/admin/img/search.svg deleted file mode 100644 index c8c69b2a..00000000 --- a/static/admin/img/search.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/selector-icons.svg b/static/admin/img/selector-icons.svg deleted file mode 100644 index 926b8e21..00000000 --- a/static/admin/img/selector-icons.svg +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/admin/img/sorting-icons.svg b/static/admin/img/sorting-icons.svg deleted file mode 100644 index 7c31ec91..00000000 --- a/static/admin/img/sorting-icons.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/static/admin/img/tooltag-add.svg b/static/admin/img/tooltag-add.svg deleted file mode 100644 index 1ca64ae5..00000000 --- a/static/admin/img/tooltag-add.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/img/tooltag-arrowright.svg b/static/admin/img/tooltag-arrowright.svg deleted file mode 100644 index b664d619..00000000 --- a/static/admin/img/tooltag-arrowright.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/static/admin/js/SelectBox.js b/static/admin/js/SelectBox.js deleted file mode 100644 index 2073f03d..00000000 --- a/static/admin/js/SelectBox.js +++ /dev/null @@ -1,144 +0,0 @@ -(function($) { - 'use strict'; - var SelectBox = { - cache: {}, - init: function(id) { - var box = document.getElementById(id); - var node; - SelectBox.cache[id] = []; - var cache = SelectBox.cache[id]; - var boxOptions = box.options; - var boxOptionsLength = boxOptions.length; - for (var i = 0, j = boxOptionsLength; i < j; i++) { - node = boxOptions[i]; - cache.push({value: node.value, text: node.text, displayed: 1}); - } - }, - redisplay: function(id) { - // Repopulate HTML select box from cache - var box = document.getElementById(id); - var node; - $(box).empty(); // clear all options - var new_options = box.outerHTML.slice(0, -9); // grab just the opening tag - var cache = SelectBox.cache[id]; - for (var i = 0, j = cache.length; i < j; i++) { - node = cache[i]; - if (node.displayed) { - var new_option = new Option(node.text, node.value, false, false); - // Shows a tooltip when hovering over the option - new_option.setAttribute("title", node.text); - new_options += new_option.outerHTML; - } - } - new_options += ''; - box.outerHTML = new_options; - }, - filter: function(id, text) { - // Redisplay the HTML select box, displaying only the choices containing ALL - // the words in text. (It's an AND search.) - var tokens = text.toLowerCase().split(/\s+/); - var node, token; - var cache = SelectBox.cache[id]; - for (var i = 0, j = cache.length; i < j; i++) { - node = cache[i]; - node.displayed = 1; - var node_text = node.text.toLowerCase(); - var numTokens = tokens.length; - for (var k = 0; k < numTokens; k++) { - token = tokens[k]; - if (node_text.indexOf(token) === -1) { - node.displayed = 0; - break; // Once the first token isn't found we're done - } - } - } - SelectBox.redisplay(id); - }, - delete_from_cache: function(id, value) { - var node, delete_index = null; - var cache = SelectBox.cache[id]; - for (var i = 0, j = cache.length; i < j; i++) { - node = cache[i]; - if (node.value === value) { - delete_index = i; - break; - } - } - cache.splice(delete_index, 1); - }, - add_to_cache: function(id, option) { - SelectBox.cache[id].push({value: option.value, text: option.text, displayed: 1}); - }, - cache_contains: function(id, value) { - // Check if an item is contained in the cache - var node; - var cache = SelectBox.cache[id]; - for (var i = 0, j = cache.length; i < j; i++) { - node = cache[i]; - if (node.value === value) { - return true; - } - } - return false; - }, - move: function(from, to) { - var from_box = document.getElementById(from); - var option; - var boxOptions = from_box.options; - var boxOptionsLength = boxOptions.length; - for (var i = 0, j = boxOptionsLength; i < j; i++) { - option = boxOptions[i]; - var option_value = option.value; - if (option.selected && SelectBox.cache_contains(from, option_value)) { - SelectBox.add_to_cache(to, {value: option_value, text: option.text, displayed: 1}); - SelectBox.delete_from_cache(from, option_value); - } - } - SelectBox.redisplay(from); - SelectBox.redisplay(to); - }, - move_all: function(from, to) { - var from_box = document.getElementById(from); - var option; - var boxOptions = from_box.options; - var boxOptionsLength = boxOptions.length; - for (var i = 0, j = boxOptionsLength; i < j; i++) { - option = boxOptions[i]; - var option_value = option.value; - if (SelectBox.cache_contains(from, option_value)) { - SelectBox.add_to_cache(to, {value: option_value, text: option.text, displayed: 1}); - SelectBox.delete_from_cache(from, option_value); - } - } - SelectBox.redisplay(from); - SelectBox.redisplay(to); - }, - sort: function(id) { - SelectBox.cache[id].sort(function(a, b) { - a = a.text.toLowerCase(); - b = b.text.toLowerCase(); - try { - if (a > b) { - return 1; - } - if (a < b) { - return -1; - } - } - catch (e) { - // silently fail on IE 'unknown' exception - } - return 0; - } ); - }, - select_all: function(id) { - var box = document.getElementById(id); - var boxOptions = box.options; - var boxOptionsLength = boxOptions.length; - for (var i = 0; i < boxOptionsLength; i++) { - boxOptions[i].selected = 'selected'; - } - } - }; - window.SelectBox = SelectBox; -})(django.jQuery); diff --git a/static/admin/js/SelectFilter2.js b/static/admin/js/SelectFilter2.js deleted file mode 100644 index 4221778b..00000000 --- a/static/admin/js/SelectFilter2.js +++ /dev/null @@ -1,246 +0,0 @@ -/*global SelectBox, gettext, interpolate, quickElement, SelectFilter*/ -/* -SelectFilter2 - Turns a multiple-select box into a filter interface. - -Requires jQuery, core.js, and SelectBox.js. -*/ -(function($) { - 'use strict'; - function findForm(node) { - // returns the node of the form containing the given node - if (node.tagName.toLowerCase() !== 'form') { - return findForm(node.parentNode); - } - return node; - } - - window.SelectFilter = { - init: function(field_id, field_name, is_stacked) { - if (field_id.match(/__prefix__/)) { - // Don't initialize on empty forms. - return; - } - var from_box = document.getElementById(field_id); - from_box.id += '_from'; // change its ID - from_box.className = 'filtered'; - - var ps = from_box.parentNode.getElementsByTagName('p'); - for (var i = 0; i < ps.length; i++) { - if (ps[i].className.indexOf("info") !== -1) { - // Remove

      , because it just gets in the way. - from_box.parentNode.removeChild(ps[i]); - } else if (ps[i].className.indexOf("help") !== -1) { - // Move help text up to the top so it isn't below the select - // boxes or wrapped off on the side to the right of the add - // button: - from_box.parentNode.insertBefore(ps[i], from_box.parentNode.firstChild); - } - } - - //

      or
      - var selector_div = quickElement('div', from_box.parentNode); - selector_div.className = is_stacked ? 'selector stacked' : 'selector'; - - //
      - var selector_available = quickElement('div', selector_div); - selector_available.className = 'selector-available'; - var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name])); - quickElement( - 'span', title_available, '', - 'class', 'help help-tooltip help-icon', - 'title', interpolate( - gettext( - 'This is the list of available %s. You may choose some by ' + - 'selecting them in the box below and then clicking the ' + - '"Choose" arrow between the two boxes.' - ), - [field_name] - ) - ); - - var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter'); - filter_p.className = 'selector-filter'; - - var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + '_input'); - - quickElement( - 'span', search_filter_label, '', - 'class', 'help-tooltip search-label-icon', - 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]) - ); - - filter_p.appendChild(document.createTextNode(' ')); - - var filter_input = quickElement('input', filter_p, '', 'type', 'text', 'placeholder', gettext("Filter")); - filter_input.id = field_id + '_input'; - - selector_available.appendChild(from_box); - var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'title', interpolate(gettext('Click to choose all %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_add_all_link'); - choose_all.className = 'selector-chooseall'; - - //
        - var selector_chooser = quickElement('ul', selector_div); - selector_chooser.className = 'selector-chooser'; - var add_link = quickElement('a', quickElement('li', selector_chooser), gettext('Choose'), 'title', gettext('Choose'), 'href', '#', 'id', field_id + '_add_link'); - add_link.className = 'selector-add'; - var remove_link = quickElement('a', quickElement('li', selector_chooser), gettext('Remove'), 'title', gettext('Remove'), 'href', '#', 'id', field_id + '_remove_link'); - remove_link.className = 'selector-remove'; - - //
        - var selector_chosen = quickElement('div', selector_div); - selector_chosen.className = 'selector-chosen'; - var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name])); - quickElement( - 'span', title_chosen, '', - 'class', 'help help-tooltip help-icon', - 'title', interpolate( - gettext( - 'This is the list of chosen %s. You may remove some by ' + - 'selecting them in the box below and then clicking the ' + - '"Remove" arrow between the two boxes.' - ), - [field_name] - ) - ); - - var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name')); - to_box.className = 'filtered'; - var clear_all = quickElement('a', selector_chosen, gettext('Remove all'), 'title', interpolate(gettext('Click to remove all chosen %s at once.'), [field_name]), 'href', '#', 'id', field_id + '_remove_all_link'); - clear_all.className = 'selector-clearall'; - - from_box.setAttribute('name', from_box.getAttribute('name') + '_old'); - - // Set up the JavaScript event handlers for the select box filter interface - var move_selection = function(e, elem, move_func, from, to) { - if (elem.className.indexOf('active') !== -1) { - move_func(from, to); - SelectFilter.refresh_icons(field_id); - } - e.preventDefault(); - }; - choose_all.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move_all, field_id + '_from', field_id + '_to'); - }); - add_link.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move, field_id + '_from', field_id + '_to'); - }); - remove_link.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move, field_id + '_to', field_id + '_from'); - }); - clear_all.addEventListener('click', function(e) { - move_selection(e, this, SelectBox.move_all, field_id + '_to', field_id + '_from'); - }); - filter_input.addEventListener('keypress', function(e) { - SelectFilter.filter_key_press(e, field_id); - }); - filter_input.addEventListener('keyup', function(e) { - SelectFilter.filter_key_up(e, field_id); - }); - filter_input.addEventListener('keydown', function(e) { - SelectFilter.filter_key_down(e, field_id); - }); - selector_div.addEventListener('change', function(e) { - if (e.target.tagName === 'SELECT') { - SelectFilter.refresh_icons(field_id); - } - }); - selector_div.addEventListener('dblclick', function(e) { - if (e.target.tagName === 'OPTION') { - if (e.target.closest('select').id === field_id + '_to') { - SelectBox.move(field_id + '_to', field_id + '_from'); - } else { - SelectBox.move(field_id + '_from', field_id + '_to'); - } - SelectFilter.refresh_icons(field_id); - } - }); - findForm(from_box).addEventListener('submit', function() { - SelectBox.select_all(field_id + '_to'); - }); - SelectBox.init(field_id + '_from'); - SelectBox.init(field_id + '_to'); - // Move selected from_box options to to_box - SelectBox.move(field_id + '_from', field_id + '_to'); - - if (!is_stacked) { - // In horizontal mode, give the same height to the two boxes. - var j_from_box = $('#' + field_id + '_from'); - var j_to_box = $('#' + field_id + '_to'); - j_to_box.height($(filter_p).outerHeight() + j_from_box.outerHeight()); - } - - // Initial icon refresh - SelectFilter.refresh_icons(field_id); - }, - any_selected: function(field) { - var any_selected = false; - try { - // Temporarily add the required attribute and check validity. - // This is much faster in WebKit browsers than the fallback. - field.attr('required', 'required'); - any_selected = field.is(':valid'); - field.removeAttr('required'); - } catch (e) { - // Browsers that don't support :valid (IE < 10) - any_selected = field.find('option:selected').length > 0; - } - return any_selected; - }, - refresh_icons: function(field_id) { - var from = $('#' + field_id + '_from'); - var to = $('#' + field_id + '_to'); - // Active if at least one item is selected - $('#' + field_id + '_add_link').toggleClass('active', SelectFilter.any_selected(from)); - $('#' + field_id + '_remove_link').toggleClass('active', SelectFilter.any_selected(to)); - // Active if the corresponding box isn't empty - $('#' + field_id + '_add_all_link').toggleClass('active', from.find('option').length > 0); - $('#' + field_id + '_remove_all_link').toggleClass('active', to.find('option').length > 0); - }, - filter_key_press: function(event, field_id) { - var from = document.getElementById(field_id + '_from'); - // don't submit form if user pressed Enter - if ((event.which && event.which === 13) || (event.keyCode && event.keyCode === 13)) { - from.selectedIndex = 0; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = 0; - event.preventDefault(); - return false; - } - }, - filter_key_up: function(event, field_id) { - var from = document.getElementById(field_id + '_from'); - var temp = from.selectedIndex; - SelectBox.filter(field_id + '_from', document.getElementById(field_id + '_input').value); - from.selectedIndex = temp; - return true; - }, - filter_key_down: function(event, field_id) { - var from = document.getElementById(field_id + '_from'); - // right arrow -- move across - if ((event.which && event.which === 39) || (event.keyCode && event.keyCode === 39)) { - var old_index = from.selectedIndex; - SelectBox.move(field_id + '_from', field_id + '_to'); - from.selectedIndex = (old_index === from.length) ? from.length - 1 : old_index; - return false; - } - // down arrow -- wrap around - if ((event.which && event.which === 40) || (event.keyCode && event.keyCode === 40)) { - from.selectedIndex = (from.length === from.selectedIndex + 1) ? 0 : from.selectedIndex + 1; - } - // up arrow -- wrap around - if ((event.which && event.which === 38) || (event.keyCode && event.keyCode === 38)) { - from.selectedIndex = (from.selectedIndex === 0) ? from.length - 1 : from.selectedIndex - 1; - } - return true; - } - }; - - window.addEventListener('load', function(e) { - $('select.selectfilter, select.selectfilterstacked').each(function() { - var $el = $(this), - data = $el.data(); - SelectFilter.init($el.attr('id'), data.fieldName, parseInt(data.isStacked, 10)); - }); - }); - -})(django.jQuery); diff --git a/static/admin/js/actions.js b/static/admin/js/actions.js deleted file mode 100644 index 27c60a6e..00000000 --- a/static/admin/js/actions.js +++ /dev/null @@ -1,153 +0,0 @@ -/*global gettext, interpolate, ngettext*/ -(function($) { - 'use strict'; - var lastChecked; - - $.fn.actions = function(opts) { - var options = $.extend({}, $.fn.actions.defaults, opts); - var actionCheckboxes = $(this); - var list_editable_changed = false; - var showQuestion = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).show(); - $(options.allContainer).hide(); - }, - showClear = function() { - $(options.acrossClears).show(); - $(options.acrossQuestions).hide(); - $(options.actionContainer).toggleClass(options.selectedClass); - $(options.allContainer).show(); - $(options.counterContainer).hide(); - }, - reset = function() { - $(options.acrossClears).hide(); - $(options.acrossQuestions).hide(); - $(options.allContainer).hide(); - $(options.counterContainer).show(); - }, - clearAcross = function() { - reset(); - $(options.acrossInput).val(0); - $(options.actionContainer).removeClass(options.selectedClass); - }, - checker = function(checked) { - if (checked) { - showQuestion(); - } else { - reset(); - } - $(actionCheckboxes).prop("checked", checked) - .parent().parent().toggleClass(options.selectedClass, checked); - }, - updateCounter = function() { - var sel = $(actionCheckboxes).filter(":checked").length; - // data-actions-icnt is defined in the generated HTML - // and contains the total amount of objects in the queryset - var actions_icnt = $('.action-counter').data('actionsIcnt'); - $(options.counterContainer).html(interpolate( - ngettext('%(sel)s of %(cnt)s selected', '%(sel)s of %(cnt)s selected', sel), { - sel: sel, - cnt: actions_icnt - }, true)); - $(options.allToggle).prop("checked", function() { - var value; - if (sel === actionCheckboxes.length) { - value = true; - showQuestion(); - } else { - value = false; - clearAcross(); - } - return value; - }); - }; - // Show counter by default - $(options.counterContainer).show(); - // Check state of checkboxes and reinit state if needed - $(this).filter(":checked").each(function(i) { - $(this).parent().parent().toggleClass(options.selectedClass); - updateCounter(); - if ($(options.acrossInput).val() === 1) { - showClear(); - } - }); - $(options.allToggle).show().on('click', function() { - checker($(this).prop("checked")); - updateCounter(); - }); - $("a", options.acrossQuestions).on('click', function(event) { - event.preventDefault(); - $(options.acrossInput).val(1); - showClear(); - }); - $("a", options.acrossClears).on('click', function(event) { - event.preventDefault(); - $(options.allToggle).prop("checked", false); - clearAcross(); - checker(0); - updateCounter(); - }); - lastChecked = null; - $(actionCheckboxes).on('click', function(event) { - if (!event) { event = window.event; } - var target = event.target ? event.target : event.srcElement; - if (lastChecked && $.data(lastChecked) !== $.data(target) && event.shiftKey === true) { - var inrange = false; - $(lastChecked).prop("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - $(actionCheckboxes).each(function() { - if ($.data(this) === $.data(lastChecked) || $.data(this) === $.data(target)) { - inrange = (inrange) ? false : true; - } - if (inrange) { - $(this).prop("checked", target.checked) - .parent().parent().toggleClass(options.selectedClass, target.checked); - } - }); - } - $(target).parent().parent().toggleClass(options.selectedClass, target.checked); - lastChecked = target; - updateCounter(); - }); - $('form#changelist-form table#result_list tr').on('change', 'td:gt(0) :input', function() { - list_editable_changed = true; - }); - $('form#changelist-form button[name="index"]').on('click', function(event) { - if (list_editable_changed) { - return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost.")); - } - }); - $('form#changelist-form input[name="_save"]').on('click', function(event) { - var action_changed = false; - $('select option:selected', options.actionContainer).each(function() { - if ($(this).val()) { - action_changed = true; - } - }); - if (action_changed) { - if (list_editable_changed) { - return confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")); - } else { - return confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button.")); - } - } - }); - }; - /* Setup plugin defaults */ - $.fn.actions.defaults = { - actionContainer: "div.actions", - counterContainer: "span.action-counter", - allContainer: "div.actions span.all", - acrossInput: "div.actions input.select-across", - acrossQuestions: "div.actions span.question", - acrossClears: "div.actions span.clear", - allToggle: "#action-toggle", - selectedClass: "selected" - }; - $(document).ready(function() { - var $actionsEls = $('tr input.action-select'); - if ($actionsEls.length > 0) { - $actionsEls.actions(); - } - }); -})(django.jQuery); diff --git a/static/admin/js/actions.min.js b/static/admin/js/actions.min.js deleted file mode 100644 index 31e83c1f..00000000 --- a/static/admin/js/actions.min.js +++ /dev/null @@ -1,7 +0,0 @@ -(function(a){var f;a.fn.actions=function(e){var b=a.extend({},a.fn.actions.defaults,e),g=a(this),k=!1,l=function(){a(b.acrossClears).hide();a(b.acrossQuestions).show();a(b.allContainer).hide()},m=function(){a(b.acrossClears).show();a(b.acrossQuestions).hide();a(b.actionContainer).toggleClass(b.selectedClass);a(b.allContainer).show();a(b.counterContainer).hide()},n=function(){a(b.acrossClears).hide();a(b.acrossQuestions).hide();a(b.allContainer).hide();a(b.counterContainer).show()},p=function(){n(); -a(b.acrossInput).val(0);a(b.actionContainer).removeClass(b.selectedClass)},q=function(c){c?l():n();a(g).prop("checked",c).parent().parent().toggleClass(b.selectedClass,c)},h=function(){var c=a(g).filter(":checked").length,d=a(".action-counter").data("actionsIcnt");a(b.counterContainer).html(interpolate(ngettext("%(sel)s of %(cnt)s selected","%(sel)s of %(cnt)s selected",c),{sel:c,cnt:d},!0));a(b.allToggle).prop("checked",function(){if(c===g.length){var a=!0;l()}else a=!1,p();return a})};a(b.counterContainer).show(); -a(this).filter(":checked").each(function(c){a(this).parent().parent().toggleClass(b.selectedClass);h();1===a(b.acrossInput).val()&&m()});a(b.allToggle).show().on("click",function(){q(a(this).prop("checked"));h()});a("a",b.acrossQuestions).on("click",function(c){c.preventDefault();a(b.acrossInput).val(1);m()});a("a",b.acrossClears).on("click",function(c){c.preventDefault();a(b.allToggle).prop("checked",!1);p();q(0);h()});f=null;a(g).on("click",function(c){c||(c=window.event);var d=c.target?c.target: -c.srcElement;if(f&&a.data(f)!==a.data(d)&&!0===c.shiftKey){var e=!1;a(f).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked);a(g).each(function(){if(a.data(this)===a.data(f)||a.data(this)===a.data(d))e=e?!1:!0;e&&a(this).prop("checked",d.checked).parent().parent().toggleClass(b.selectedClass,d.checked)})}a(d).parent().parent().toggleClass(b.selectedClass,d.checked);f=d;h()});a("form#changelist-form table#result_list tr").on("change","td:gt(0) :input",function(){k=!0}); -a('form#changelist-form button[name="index"]').on("click",function(a){if(k)return confirm(gettext("You have unsaved changes on individual editable fields. If you run an action, your unsaved changes will be lost."))});a('form#changelist-form input[name="_save"]').on("click",function(c){var d=!1;a("select option:selected",b.actionContainer).each(function(){a(this).val()&&(d=!0)});if(d)return k?confirm(gettext("You have selected an action, but you haven't saved your changes to individual fields yet. Please click OK to save. You'll need to re-run the action.")): -confirm(gettext("You have selected an action, and you haven't made any changes on individual fields. You're probably looking for the Go button rather than the Save button."))})};a.fn.actions.defaults={actionContainer:"div.actions",counterContainer:"span.action-counter",allContainer:"div.actions span.all",acrossInput:"div.actions input.select-across",acrossQuestions:"div.actions span.question",acrossClears:"div.actions span.clear",allToggle:"#action-toggle",selectedClass:"selected"};a(document).ready(function(){var e= -a("tr input.action-select");0 -// -(function() { - 'use strict'; - var DateTimeShortcuts = { - calendars: [], - calendarInputs: [], - clockInputs: [], - clockHours: { - default_: [ - [gettext_noop('Now'), -1], - [gettext_noop('Midnight'), 0], - [gettext_noop('6 a.m.'), 6], - [gettext_noop('Noon'), 12], - [gettext_noop('6 p.m.'), 18] - ] - }, - dismissClockFunc: [], - dismissCalendarFunc: [], - calendarDivName1: 'calendarbox', // name of calendar
        that gets toggled - calendarDivName2: 'calendarin', // name of
        that contains calendar - calendarLinkName: 'calendarlink', // name of the link that is used to toggle - clockDivName: 'clockbox', // name of clock
        that gets toggled - clockLinkName: 'clocklink', // name of the link that is used to toggle - shortCutsClass: 'datetimeshortcuts', // class of the clock and cal shortcuts - timezoneWarningClass: 'timezonewarning', // class of the warning for timezone mismatch - timezoneOffset: 0, - init: function() { - var body = document.getElementsByTagName('body')[0]; - var serverOffset = body.getAttribute('data-admin-utc-offset'); - if (serverOffset) { - var localOffset = new Date().getTimezoneOffset() * -60; - DateTimeShortcuts.timezoneOffset = localOffset - serverOffset; - } - - var inputs = document.getElementsByTagName('input'); - for (var i = 0; i < inputs.length; i++) { - var inp = inputs[i]; - if (inp.getAttribute('type') === 'text' && inp.className.match(/vTimeField/)) { - DateTimeShortcuts.addClock(inp); - DateTimeShortcuts.addTimezoneWarning(inp); - } - else if (inp.getAttribute('type') === 'text' && inp.className.match(/vDateField/)) { - DateTimeShortcuts.addCalendar(inp); - DateTimeShortcuts.addTimezoneWarning(inp); - } - } - }, - // Return the current time while accounting for the server timezone. - now: function() { - var body = document.getElementsByTagName('body')[0]; - var serverOffset = body.getAttribute('data-admin-utc-offset'); - if (serverOffset) { - var localNow = new Date(); - var localOffset = localNow.getTimezoneOffset() * -60; - localNow.setTime(localNow.getTime() + 1000 * (serverOffset - localOffset)); - return localNow; - } else { - return new Date(); - } - }, - // Add a warning when the time zone in the browser and backend do not match. - addTimezoneWarning: function(inp) { - var warningClass = DateTimeShortcuts.timezoneWarningClass; - var timezoneOffset = DateTimeShortcuts.timezoneOffset / 3600; - - // Only warn if there is a time zone mismatch. - if (!timezoneOffset) { - return; - } - - // Check if warning is already there. - if (inp.parentNode.querySelectorAll('.' + warningClass).length) { - return; - } - - var message; - if (timezoneOffset > 0) { - message = ngettext( - 'Note: You are %s hour ahead of server time.', - 'Note: You are %s hours ahead of server time.', - timezoneOffset - ); - } - else { - timezoneOffset *= -1; - message = ngettext( - 'Note: You are %s hour behind server time.', - 'Note: You are %s hours behind server time.', - timezoneOffset - ); - } - message = interpolate(message, [timezoneOffset]); - - var warning = document.createElement('span'); - warning.className = warningClass; - warning.textContent = message; - inp.parentNode.appendChild(document.createElement('br')); - inp.parentNode.appendChild(warning); - }, - // Add clock widget to a given field - addClock: function(inp) { - var num = DateTimeShortcuts.clockInputs.length; - DateTimeShortcuts.clockInputs[num] = inp; - DateTimeShortcuts.dismissClockFunc[num] = function() { DateTimeShortcuts.dismissClock(num); return true; }; - - // Shortcut links (clock icon and "Now" link) - var shortcuts_span = document.createElement('span'); - shortcuts_span.className = DateTimeShortcuts.shortCutsClass; - inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); - var now_link = document.createElement('a'); - now_link.setAttribute('href', "#"); - now_link.textContent = gettext('Now'); - now_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleClockQuicklink(num, -1); - }); - var clock_link = document.createElement('a'); - clock_link.setAttribute('href', '#'); - clock_link.id = DateTimeShortcuts.clockLinkName + num; - clock_link.addEventListener('click', function(e) { - e.preventDefault(); - // avoid triggering the document click handler to dismiss the clock - e.stopPropagation(); - DateTimeShortcuts.openClock(num); - }); - - quickElement( - 'span', clock_link, '', - 'class', 'clock-icon', - 'title', gettext('Choose a Time') - ); - shortcuts_span.appendChild(document.createTextNode('\u00A0')); - shortcuts_span.appendChild(now_link); - shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0')); - shortcuts_span.appendChild(clock_link); - - // Create clock link div - // - // Markup looks like: - // - - var clock_box = document.createElement('div'); - clock_box.style.display = 'none'; - clock_box.style.position = 'absolute'; - clock_box.className = 'clockbox module'; - clock_box.setAttribute('id', DateTimeShortcuts.clockDivName + num); - document.body.appendChild(clock_box); - clock_box.addEventListener('click', function(e) { e.stopPropagation(); }); - - quickElement('h2', clock_box, gettext('Choose a time')); - var time_list = quickElement('ul', clock_box); - time_list.className = 'timelist'; - // The list of choices can be overridden in JavaScript like this: - // DateTimeShortcuts.clockHours.name = [['3 a.m.', 3]]; - // where name is the name attribute of the . - var name = typeof DateTimeShortcuts.clockHours[inp.name] === 'undefined' ? 'default_' : inp.name; - DateTimeShortcuts.clockHours[name].forEach(function(element) { - var time_link = quickElement('a', quickElement('li', time_list), gettext(element[0]), 'href', '#'); - time_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleClockQuicklink(num, element[1]); - }); - }); - - var cancel_p = quickElement('p', clock_box); - cancel_p.className = 'calendar-cancel'; - var cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#'); - cancel_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.dismissClock(num); - }); - - document.addEventListener('keyup', function(event) { - if (event.which === 27) { - // ESC key closes popup - DateTimeShortcuts.dismissClock(num); - event.preventDefault(); - } - }); - }, - openClock: function(num) { - var clock_box = document.getElementById(DateTimeShortcuts.clockDivName + num); - var clock_link = document.getElementById(DateTimeShortcuts.clockLinkName + num); - - // Recalculate the clockbox position - // is it left-to-right or right-to-left layout ? - if (getStyle(document.body, 'direction') !== 'rtl') { - clock_box.style.left = findPosX(clock_link) + 17 + 'px'; - } - else { - // since style's width is in em, it'd be tough to calculate - // px value of it. let's use an estimated px for now - // TODO: IE returns wrong value for findPosX when in rtl mode - // (it returns as it was left aligned), needs to be fixed. - clock_box.style.left = findPosX(clock_link) - 110 + 'px'; - } - clock_box.style.top = Math.max(0, findPosY(clock_link) - 30) + 'px'; - - // Show the clock box - clock_box.style.display = 'block'; - document.addEventListener('click', DateTimeShortcuts.dismissClockFunc[num]); - }, - dismissClock: function(num) { - document.getElementById(DateTimeShortcuts.clockDivName + num).style.display = 'none'; - document.removeEventListener('click', DateTimeShortcuts.dismissClockFunc[num]); - }, - handleClockQuicklink: function(num, val) { - var d; - if (val === -1) { - d = DateTimeShortcuts.now(); - } - else { - d = new Date(1970, 1, 1, val, 0, 0, 0); - } - DateTimeShortcuts.clockInputs[num].value = d.strftime(get_format('TIME_INPUT_FORMATS')[0]); - DateTimeShortcuts.clockInputs[num].focus(); - DateTimeShortcuts.dismissClock(num); - }, - // Add calendar widget to a given field. - addCalendar: function(inp) { - var num = DateTimeShortcuts.calendars.length; - - DateTimeShortcuts.calendarInputs[num] = inp; - DateTimeShortcuts.dismissCalendarFunc[num] = function() { DateTimeShortcuts.dismissCalendar(num); return true; }; - - // Shortcut links (calendar icon and "Today" link) - var shortcuts_span = document.createElement('span'); - shortcuts_span.className = DateTimeShortcuts.shortCutsClass; - inp.parentNode.insertBefore(shortcuts_span, inp.nextSibling); - var today_link = document.createElement('a'); - today_link.setAttribute('href', '#'); - today_link.appendChild(document.createTextNode(gettext('Today'))); - today_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, 0); - }); - var cal_link = document.createElement('a'); - cal_link.setAttribute('href', '#'); - cal_link.id = DateTimeShortcuts.calendarLinkName + num; - cal_link.addEventListener('click', function(e) { - e.preventDefault(); - // avoid triggering the document click handler to dismiss the calendar - e.stopPropagation(); - DateTimeShortcuts.openCalendar(num); - }); - quickElement( - 'span', cal_link, '', - 'class', 'date-icon', - 'title', gettext('Choose a Date') - ); - shortcuts_span.appendChild(document.createTextNode('\u00A0')); - shortcuts_span.appendChild(today_link); - shortcuts_span.appendChild(document.createTextNode('\u00A0|\u00A0')); - shortcuts_span.appendChild(cal_link); - - // Create calendarbox div. - // - // Markup looks like: - // - //
        - //

        - // - // February 2003 - //

        - //
        - // - //
        - //
        - // Yesterday | Today | Tomorrow - //
        - //

        Cancel

        - //
        - var cal_box = document.createElement('div'); - cal_box.style.display = 'none'; - cal_box.style.position = 'absolute'; - cal_box.className = 'calendarbox module'; - cal_box.setAttribute('id', DateTimeShortcuts.calendarDivName1 + num); - document.body.appendChild(cal_box); - cal_box.addEventListener('click', function(e) { e.stopPropagation(); }); - - // next-prev links - var cal_nav = quickElement('div', cal_box); - var cal_nav_prev = quickElement('a', cal_nav, '<', 'href', '#'); - cal_nav_prev.className = 'calendarnav-previous'; - cal_nav_prev.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.drawPrev(num); - }); - - var cal_nav_next = quickElement('a', cal_nav, '>', 'href', '#'); - cal_nav_next.className = 'calendarnav-next'; - cal_nav_next.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.drawNext(num); - }); - - // main box - var cal_main = quickElement('div', cal_box, '', 'id', DateTimeShortcuts.calendarDivName2 + num); - cal_main.className = 'calendar'; - DateTimeShortcuts.calendars[num] = new Calendar(DateTimeShortcuts.calendarDivName2 + num, DateTimeShortcuts.handleCalendarCallback(num)); - DateTimeShortcuts.calendars[num].drawCurrent(); - - // calendar shortcuts - var shortcuts = quickElement('div', cal_box); - shortcuts.className = 'calendar-shortcuts'; - var day_link = quickElement('a', shortcuts, gettext('Yesterday'), 'href', '#'); - day_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, -1); - }); - shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0')); - day_link = quickElement('a', shortcuts, gettext('Today'), 'href', '#'); - day_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, 0); - }); - shortcuts.appendChild(document.createTextNode('\u00A0|\u00A0')); - day_link = quickElement('a', shortcuts, gettext('Tomorrow'), 'href', '#'); - day_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.handleCalendarQuickLink(num, +1); - }); - - // cancel bar - var cancel_p = quickElement('p', cal_box); - cancel_p.className = 'calendar-cancel'; - var cancel_link = quickElement('a', cancel_p, gettext('Cancel'), 'href', '#'); - cancel_link.addEventListener('click', function(e) { - e.preventDefault(); - DateTimeShortcuts.dismissCalendar(num); - }); - document.addEventListener('keyup', function(event) { - if (event.which === 27) { - // ESC key closes popup - DateTimeShortcuts.dismissCalendar(num); - event.preventDefault(); - } - }); - }, - openCalendar: function(num) { - var cal_box = document.getElementById(DateTimeShortcuts.calendarDivName1 + num); - var cal_link = document.getElementById(DateTimeShortcuts.calendarLinkName + num); - var inp = DateTimeShortcuts.calendarInputs[num]; - - // Determine if the current value in the input has a valid date. - // If so, draw the calendar with that date's year and month. - if (inp.value) { - var format = get_format('DATE_INPUT_FORMATS')[0]; - var selected = inp.value.strptime(format); - var year = selected.getUTCFullYear(); - var month = selected.getUTCMonth() + 1; - var re = /\d{4}/; - if (re.test(year.toString()) && month >= 1 && month <= 12) { - DateTimeShortcuts.calendars[num].drawDate(month, year, selected); - } - } - - // Recalculate the clockbox position - // is it left-to-right or right-to-left layout ? - if (getStyle(document.body, 'direction') !== 'rtl') { - cal_box.style.left = findPosX(cal_link) + 17 + 'px'; - } - else { - // since style's width is in em, it'd be tough to calculate - // px value of it. let's use an estimated px for now - // TODO: IE returns wrong value for findPosX when in rtl mode - // (it returns as it was left aligned), needs to be fixed. - cal_box.style.left = findPosX(cal_link) - 180 + 'px'; - } - cal_box.style.top = Math.max(0, findPosY(cal_link) - 75) + 'px'; - - cal_box.style.display = 'block'; - document.addEventListener('click', DateTimeShortcuts.dismissCalendarFunc[num]); - }, - dismissCalendar: function(num) { - document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none'; - document.removeEventListener('click', DateTimeShortcuts.dismissCalendarFunc[num]); - }, - drawPrev: function(num) { - DateTimeShortcuts.calendars[num].drawPreviousMonth(); - }, - drawNext: function(num) { - DateTimeShortcuts.calendars[num].drawNextMonth(); - }, - handleCalendarCallback: function(num) { - var format = get_format('DATE_INPUT_FORMATS')[0]; - // the format needs to be escaped a little - format = format.replace('\\', '\\\\') - .replace('\r', '\\r') - .replace('\n', '\\n') - .replace('\t', '\\t') - .replace("'", "\\'"); - return function(y, m, d) { - DateTimeShortcuts.calendarInputs[num].value = new Date(y, m - 1, d).strftime(format); - DateTimeShortcuts.calendarInputs[num].focus(); - document.getElementById(DateTimeShortcuts.calendarDivName1 + num).style.display = 'none'; - }; - }, - handleCalendarQuickLink: function(num, offset) { - var d = DateTimeShortcuts.now(); - d.setDate(d.getDate() + offset); - DateTimeShortcuts.calendarInputs[num].value = d.strftime(get_format('DATE_INPUT_FORMATS')[0]); - DateTimeShortcuts.calendarInputs[num].focus(); - DateTimeShortcuts.dismissCalendar(num); - } - }; - - window.addEventListener('load', DateTimeShortcuts.init); - window.DateTimeShortcuts = DateTimeShortcuts; -})(); diff --git a/static/admin/js/admin/RelatedObjectLookups.js b/static/admin/js/admin/RelatedObjectLookups.js deleted file mode 100644 index f4c57c40..00000000 --- a/static/admin/js/admin/RelatedObjectLookups.js +++ /dev/null @@ -1,181 +0,0 @@ -/*global SelectBox, interpolate*/ -// Handles related-objects functionality: lookup link for raw_id_fields -// and Add Another links. - -(function($) { - 'use strict'; - - // IE doesn't accept periods or dashes in the window name, but the element IDs - // we use to generate popup window names may contain them, therefore we map them - // to allowed characters in a reversible way so that we can locate the correct - // element when the popup window is dismissed. - function id_to_windowname(text) { - text = text.replace(/\./g, '__dot__'); - text = text.replace(/\-/g, '__dash__'); - return text; - } - - function windowname_to_id(text) { - text = text.replace(/__dot__/g, '.'); - text = text.replace(/__dash__/g, '-'); - return text; - } - - function showAdminPopup(triggeringLink, name_regexp, add_popup) { - var name = triggeringLink.id.replace(name_regexp, ''); - name = id_to_windowname(name); - var href = triggeringLink.href; - if (add_popup) { - if (href.indexOf('?') === -1) { - href += '?_popup=1'; - } else { - href += '&_popup=1'; - } - } - var win = window.open(href, name, 'height=500,width=800,resizable=yes,scrollbars=yes'); - win.focus(); - return false; - } - - function showRelatedObjectLookupPopup(triggeringLink) { - return showAdminPopup(triggeringLink, /^lookup_/, true); - } - - function dismissRelatedLookupPopup(win, chosenId) { - var name = windowname_to_id(win.name); - var elem = document.getElementById(name); - if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) { - elem.value += ',' + chosenId; - } else { - document.getElementById(name).value = chosenId; - } - win.close(); - } - - function showRelatedObjectPopup(triggeringLink) { - return showAdminPopup(triggeringLink, /^(change|add|delete)_/, false); - } - - function updateRelatedObjectLinks(triggeringLink) { - var $this = $(triggeringLink); - var siblings = $this.nextAll('.view-related, .change-related, .delete-related'); - if (!siblings.length) { - return; - } - var value = $this.val(); - if (value) { - siblings.each(function() { - var elm = $(this); - elm.attr('href', elm.attr('data-href-template').replace('__fk__', value)); - }); - } else { - siblings.removeAttr('href'); - } - } - - function dismissAddRelatedObjectPopup(win, newId, newRepr) { - var name = windowname_to_id(win.name); - var elem = document.getElementById(name); - if (elem) { - var elemName = elem.nodeName.toUpperCase(); - if (elemName === 'SELECT') { - elem.options[elem.options.length] = new Option(newRepr, newId, true, true); - } else if (elemName === 'INPUT') { - if (elem.className.indexOf('vManyToManyRawIdAdminField') !== -1 && elem.value) { - elem.value += ',' + newId; - } else { - elem.value = newId; - } - } - // Trigger a change event to update related links if required. - $(elem).trigger('change'); - } else { - var toId = name + "_to"; - var o = new Option(newRepr, newId); - SelectBox.add_to_cache(toId, o); - SelectBox.redisplay(toId); - } - win.close(); - } - - function dismissChangeRelatedObjectPopup(win, objId, newRepr, newId) { - var id = windowname_to_id(win.name).replace(/^edit_/, ''); - var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]); - var selects = $(selectsSelector); - selects.find('option').each(function() { - if (this.value === objId) { - this.textContent = newRepr; - this.value = newId; - } - }); - selects.next().find('.select2-selection__rendered').each(function() { - // The element can have a clear button as a child. - // Use the lastChild to modify only the displayed value. - this.lastChild.textContent = newRepr; - this.title = newRepr; - }); - win.close(); - } - - function dismissDeleteRelatedObjectPopup(win, objId) { - var id = windowname_to_id(win.name).replace(/^delete_/, ''); - var selectsSelector = interpolate('#%s, #%s_from, #%s_to', [id, id, id]); - var selects = $(selectsSelector); - selects.find('option').each(function() { - if (this.value === objId) { - $(this).remove(); - } - }).trigger('change'); - win.close(); - } - - // Global for testing purposes - window.id_to_windowname = id_to_windowname; - window.windowname_to_id = windowname_to_id; - - window.showRelatedObjectLookupPopup = showRelatedObjectLookupPopup; - window.dismissRelatedLookupPopup = dismissRelatedLookupPopup; - window.showRelatedObjectPopup = showRelatedObjectPopup; - window.updateRelatedObjectLinks = updateRelatedObjectLinks; - window.dismissAddRelatedObjectPopup = dismissAddRelatedObjectPopup; - window.dismissChangeRelatedObjectPopup = dismissChangeRelatedObjectPopup; - window.dismissDeleteRelatedObjectPopup = dismissDeleteRelatedObjectPopup; - - // Kept for backward compatibility - window.showAddAnotherPopup = showRelatedObjectPopup; - window.dismissAddAnotherPopup = dismissAddRelatedObjectPopup; - - $(document).ready(function() { - $("a[data-popup-opener]").on('click', function(event) { - event.preventDefault(); - opener.dismissRelatedLookupPopup(window, $(this).data("popup-opener")); - }); - $('body').on('click', '.related-widget-wrapper-link', function(e) { - e.preventDefault(); - if (this.href) { - var event = $.Event('django:show-related', {href: this.href}); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectPopup(this); - } - } - }); - $('body').on('change', '.related-widget-wrapper select', function(e) { - var event = $.Event('django:update-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - updateRelatedObjectLinks(this); - } - }); - $('.related-widget-wrapper select').trigger('change'); - $('body').on('click', '.related-lookup', function(e) { - e.preventDefault(); - var event = $.Event('django:lookup-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showRelatedObjectLookupPopup(this); - } - }); - }); - -})(django.jQuery); diff --git a/static/admin/js/autocomplete.js b/static/admin/js/autocomplete.js deleted file mode 100644 index 65c0702d..00000000 --- a/static/admin/js/autocomplete.js +++ /dev/null @@ -1,37 +0,0 @@ -(function($) { - 'use strict'; - var init = function($element, options) { - var settings = $.extend({ - ajax: { - data: function(params) { - return { - term: params.term, - page: params.page - }; - } - } - }, options); - $element.select2(settings); - }; - - $.fn.djangoAdminSelect2 = function(options) { - var settings = $.extend({}, options); - $.each(this, function(i, element) { - var $element = $(element); - init($element, settings); - }); - return this; - }; - - $(function() { - // Initialize all autocomplete widgets except the one in the template - // form used when a new formset is added. - $('.admin-autocomplete').not('[name*=__prefix__]').djangoAdminSelect2(); - }); - - $(document).on('formset:added', (function() { - return function(event, $newFormset) { - return $newFormset.find('.admin-autocomplete').djangoAdminSelect2(); - }; - })(this)); -}(django.jQuery)); diff --git a/static/admin/js/calendar.js b/static/admin/js/calendar.js deleted file mode 100644 index a4c047aa..00000000 --- a/static/admin/js/calendar.js +++ /dev/null @@ -1,208 +0,0 @@ -/*global gettext, pgettext, get_format, quickElement, removeChildren*/ -/* -calendar.js - Calendar functions by Adrian Holovaty -depends on core.js for utility functions like removeChildren or quickElement -*/ - -(function() { - 'use strict'; - // CalendarNamespace -- Provides a collection of HTML calendar-related helper functions - var CalendarNamespace = { - monthsOfYear: [ - gettext('January'), - gettext('February'), - gettext('March'), - gettext('April'), - gettext('May'), - gettext('June'), - gettext('July'), - gettext('August'), - gettext('September'), - gettext('October'), - gettext('November'), - gettext('December') - ], - daysOfWeek: [ - pgettext('one letter Sunday', 'S'), - pgettext('one letter Monday', 'M'), - pgettext('one letter Tuesday', 'T'), - pgettext('one letter Wednesday', 'W'), - pgettext('one letter Thursday', 'T'), - pgettext('one letter Friday', 'F'), - pgettext('one letter Saturday', 'S') - ], - firstDayOfWeek: parseInt(get_format('FIRST_DAY_OF_WEEK')), - isLeapYear: function(year) { - return (((year % 4) === 0) && ((year % 100) !== 0 ) || ((year % 400) === 0)); - }, - getDaysInMonth: function(month, year) { - var days; - if (month === 1 || month === 3 || month === 5 || month === 7 || month === 8 || month === 10 || month === 12) { - days = 31; - } - else if (month === 4 || month === 6 || month === 9 || month === 11) { - days = 30; - } - else if (month === 2 && CalendarNamespace.isLeapYear(year)) { - days = 29; - } - else { - days = 28; - } - return days; - }, - draw: function(month, year, div_id, callback, selected) { // month = 1-12, year = 1-9999 - var today = new Date(); - var todayDay = today.getDate(); - var todayMonth = today.getMonth() + 1; - var todayYear = today.getFullYear(); - var todayClass = ''; - - // Use UTC functions here because the date field does not contain time - // and using the UTC function variants prevent the local time offset - // from altering the date, specifically the day field. For example: - // - // ``` - // var x = new Date('2013-10-02'); - // var day = x.getDate(); - // ``` - // - // The day variable above will be 1 instead of 2 in, say, US Pacific time - // zone. - var isSelectedMonth = false; - if (typeof selected !== 'undefined') { - isSelectedMonth = (selected.getUTCFullYear() === year && (selected.getUTCMonth() + 1) === month); - } - - month = parseInt(month); - year = parseInt(year); - var calDiv = document.getElementById(div_id); - removeChildren(calDiv); - var calTable = document.createElement('table'); - quickElement('caption', calTable, CalendarNamespace.monthsOfYear[month - 1] + ' ' + year); - var tableBody = quickElement('tbody', calTable); - - // Draw days-of-week header - var tableRow = quickElement('tr', tableBody); - for (var i = 0; i < 7; i++) { - quickElement('th', tableRow, CalendarNamespace.daysOfWeek[(i + CalendarNamespace.firstDayOfWeek) % 7]); - } - - var startingPos = new Date(year, month - 1, 1 - CalendarNamespace.firstDayOfWeek).getDay(); - var days = CalendarNamespace.getDaysInMonth(month, year); - - var nonDayCell; - - // Draw blanks before first of month - tableRow = quickElement('tr', tableBody); - for (i = 0; i < startingPos; i++) { - nonDayCell = quickElement('td', tableRow, ' '); - nonDayCell.className = "nonday"; - } - - function calendarMonth(y, m) { - function onClick(e) { - e.preventDefault(); - callback(y, m, this.textContent); - } - return onClick; - } - - // Draw days of month - var currentDay = 1; - for (i = startingPos; currentDay <= days; i++) { - if (i % 7 === 0 && currentDay !== 1) { - tableRow = quickElement('tr', tableBody); - } - if ((currentDay === todayDay) && (month === todayMonth) && (year === todayYear)) { - todayClass = 'today'; - } else { - todayClass = ''; - } - - // use UTC function; see above for explanation. - if (isSelectedMonth && currentDay === selected.getUTCDate()) { - if (todayClass !== '') { - todayClass += " "; - } - todayClass += "selected"; - } - - var cell = quickElement('td', tableRow, '', 'class', todayClass); - var link = quickElement('a', cell, currentDay, 'href', '#'); - link.addEventListener('click', calendarMonth(year, month)); - currentDay++; - } - - // Draw blanks after end of month (optional, but makes for valid code) - while (tableRow.childNodes.length < 7) { - nonDayCell = quickElement('td', tableRow, ' '); - nonDayCell.className = "nonday"; - } - - calDiv.appendChild(calTable); - } - }; - - // Calendar -- A calendar instance - function Calendar(div_id, callback, selected) { - // div_id (string) is the ID of the element in which the calendar will - // be displayed - // callback (string) is the name of a JavaScript function that will be - // called with the parameters (year, month, day) when a day in the - // calendar is clicked - this.div_id = div_id; - this.callback = callback; - this.today = new Date(); - this.currentMonth = this.today.getMonth() + 1; - this.currentYear = this.today.getFullYear(); - if (typeof selected !== 'undefined') { - this.selected = selected; - } - } - Calendar.prototype = { - drawCurrent: function() { - CalendarNamespace.draw(this.currentMonth, this.currentYear, this.div_id, this.callback, this.selected); - }, - drawDate: function(month, year, selected) { - this.currentMonth = month; - this.currentYear = year; - - if(selected) { - this.selected = selected; - } - - this.drawCurrent(); - }, - drawPreviousMonth: function() { - if (this.currentMonth === 1) { - this.currentMonth = 12; - this.currentYear--; - } - else { - this.currentMonth--; - } - this.drawCurrent(); - }, - drawNextMonth: function() { - if (this.currentMonth === 12) { - this.currentMonth = 1; - this.currentYear++; - } - else { - this.currentMonth++; - } - this.drawCurrent(); - }, - drawPreviousYear: function() { - this.currentYear--; - this.drawCurrent(); - }, - drawNextYear: function() { - this.currentYear++; - this.drawCurrent(); - } - }; - window.Calendar = Calendar; - window.CalendarNamespace = CalendarNamespace; -})(); diff --git a/static/admin/js/cancel.js b/static/admin/js/cancel.js deleted file mode 100644 index 8809ee77..00000000 --- a/static/admin/js/cancel.js +++ /dev/null @@ -1,13 +0,0 @@ -(function($) { - 'use strict'; - $(function() { - $('.cancel-link').on('click', function(e) { - e.preventDefault(); - if (window.location.search.indexOf('&_popup=1') === -1) { - window.history.back(); // Go back if not a popup. - } else { - window.close(); // Otherwise, close the popup. - } - }); - }); -})(django.jQuery); diff --git a/static/admin/js/change_form.js b/static/admin/js/change_form.js deleted file mode 100644 index 4797383b..00000000 --- a/static/admin/js/change_form.js +++ /dev/null @@ -1,20 +0,0 @@ -/*global showAddAnotherPopup, showRelatedObjectLookupPopup showRelatedObjectPopup updateRelatedObjectLinks*/ - -(function($) { - 'use strict'; - $(document).ready(function() { - var modelName = $('#django-admin-form-add-constants').data('modelName'); - $('body').on('click', '.add-another', function(e) { - e.preventDefault(); - var event = $.Event('django:add-another-related'); - $(this).trigger(event); - if (!event.isDefaultPrevented()) { - showAddAnotherPopup(this); - } - }); - - if (modelName) { - $('form#' + modelName + '_form :input:visible:enabled:first').focus(); - } - }); -})(django.jQuery); diff --git a/static/admin/js/collapse.js b/static/admin/js/collapse.js deleted file mode 100644 index 20e7030e..00000000 --- a/static/admin/js/collapse.js +++ /dev/null @@ -1,55 +0,0 @@ -/*global gettext*/ -(function() { - 'use strict'; - var closestElem = function(elem, tagName) { - if (elem.nodeName === tagName.toUpperCase()) { - return elem; - } - if (elem.parentNode.nodeName === 'BODY') { - return null; - } - return elem.parentNode && closestElem(elem.parentNode, tagName); - }; - - window.addEventListener('load', function() { - // Add anchor tag for Show/Hide link - var fieldsets = document.querySelectorAll('fieldset.collapse'); - for (var i = 0; i < fieldsets.length; i++) { - var elem = fieldsets[i]; - // Don't hide if fields in this fieldset have errors - if (elem.querySelectorAll('div.errors').length === 0) { - elem.classList.add('collapsed'); - var h2 = elem.querySelector('h2'); - var link = document.createElement('a'); - link.setAttribute('id', 'fieldsetcollapser' + i); - link.setAttribute('class', 'collapse-toggle'); - link.setAttribute('href', '#'); - link.textContent = gettext('Show'); - h2.appendChild(document.createTextNode(' (')); - h2.appendChild(link); - h2.appendChild(document.createTextNode(')')); - } - } - // Add toggle to hide/show anchor tag - var toggleFunc = function(ev) { - if (ev.target.matches('.collapse-toggle')) { - ev.preventDefault(); - ev.stopPropagation(); - var fieldset = closestElem(ev.target, 'fieldset'); - if (fieldset.classList.contains('collapsed')) { - // Show - ev.target.textContent = gettext('Hide'); - fieldset.classList.remove('collapsed'); - } else { - // Hide - ev.target.textContent = gettext('Show'); - fieldset.classList.add('collapsed'); - } - } - }; - var inlineDivs = document.querySelectorAll('fieldset.module'); - for (i = 0; i < inlineDivs.length; i++) { - inlineDivs[i].addEventListener('click', toggleFunc); - } - }); -})(); diff --git a/static/admin/js/collapse.min.js b/static/admin/js/collapse.min.js deleted file mode 100644 index 9e16a21e..00000000 --- a/static/admin/js/collapse.min.js +++ /dev/null @@ -1,3 +0,0 @@ -(function(){var e=function(b,a){return b.nodeName===a.toUpperCase()?b:"BODY"===b.parentNode.nodeName?null:b.parentNode&&e(b.parentNode,a)};window.addEventListener("load",function(){for(var b=document.querySelectorAll("fieldset.collapse"),a=0;a= 0) && parseFloat(navigator.appVersion); -var isIE = ((document.all) && (!isOpera)) && parseFloat(navigator.appVersion.split("MSIE ")[1].split(";")[0]); - -// quickElement(tagType, parentReference [, textInChildNode, attribute, attributeValue ...]); -function quickElement() { - 'use strict'; - var obj = document.createElement(arguments[0]); - if (arguments[2]) { - var textNode = document.createTextNode(arguments[2]); - obj.appendChild(textNode); - } - var len = arguments.length; - for (var i = 3; i < len; i += 2) { - obj.setAttribute(arguments[i], arguments[i + 1]); - } - arguments[1].appendChild(obj); - return obj; -} - -// "a" is reference to an object -function removeChildren(a) { - 'use strict'; - while (a.hasChildNodes()) { - a.removeChild(a.lastChild); - } -} - -// ---------------------------------------------------------------------------- -// Find-position functions by PPK -// See https://www.quirksmode.org/js/findpos.html -// ---------------------------------------------------------------------------- -function findPosX(obj) { - 'use strict'; - var curleft = 0; - if (obj.offsetParent) { - while (obj.offsetParent) { - curleft += obj.offsetLeft - ((isOpera) ? 0 : obj.scrollLeft); - obj = obj.offsetParent; - } - // IE offsetParent does not include the top-level - if (isIE && obj.parentElement) { - curleft += obj.offsetLeft - obj.scrollLeft; - } - } else if (obj.x) { - curleft += obj.x; - } - return curleft; -} - -function findPosY(obj) { - 'use strict'; - var curtop = 0; - if (obj.offsetParent) { - while (obj.offsetParent) { - curtop += obj.offsetTop - ((isOpera) ? 0 : obj.scrollTop); - obj = obj.offsetParent; - } - // IE offsetParent does not include the top-level - if (isIE && obj.parentElement) { - curtop += obj.offsetTop - obj.scrollTop; - } - } else if (obj.y) { - curtop += obj.y; - } - return curtop; -} - -//----------------------------------------------------------------------------- -// Date object extensions -// ---------------------------------------------------------------------------- -(function() { - 'use strict'; - Date.prototype.getTwelveHours = function() { - var hours = this.getHours(); - if (hours === 0) { - return 12; - } - else { - return hours <= 12 ? hours : hours - 12; - } - }; - - Date.prototype.getTwoDigitMonth = function() { - return (this.getMonth() < 9) ? '0' + (this.getMonth() + 1) : (this.getMonth() + 1); - }; - - Date.prototype.getTwoDigitDate = function() { - return (this.getDate() < 10) ? '0' + this.getDate() : this.getDate(); - }; - - Date.prototype.getTwoDigitTwelveHour = function() { - return (this.getTwelveHours() < 10) ? '0' + this.getTwelveHours() : this.getTwelveHours(); - }; - - Date.prototype.getTwoDigitHour = function() { - return (this.getHours() < 10) ? '0' + this.getHours() : this.getHours(); - }; - - Date.prototype.getTwoDigitMinute = function() { - return (this.getMinutes() < 10) ? '0' + this.getMinutes() : this.getMinutes(); - }; - - Date.prototype.getTwoDigitSecond = function() { - return (this.getSeconds() < 10) ? '0' + this.getSeconds() : this.getSeconds(); - }; - - Date.prototype.getHourMinute = function() { - return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute(); - }; - - Date.prototype.getHourMinuteSecond = function() { - return this.getTwoDigitHour() + ':' + this.getTwoDigitMinute() + ':' + this.getTwoDigitSecond(); - }; - - Date.prototype.getFullMonthName = function() { - return typeof window.CalendarNamespace === "undefined" - ? this.getTwoDigitMonth() - : window.CalendarNamespace.monthsOfYear[this.getMonth()]; - }; - - Date.prototype.strftime = function(format) { - var fields = { - B: this.getFullMonthName(), - c: this.toString(), - d: this.getTwoDigitDate(), - H: this.getTwoDigitHour(), - I: this.getTwoDigitTwelveHour(), - m: this.getTwoDigitMonth(), - M: this.getTwoDigitMinute(), - p: (this.getHours() >= 12) ? 'PM' : 'AM', - S: this.getTwoDigitSecond(), - w: '0' + this.getDay(), - x: this.toLocaleDateString(), - X: this.toLocaleTimeString(), - y: ('' + this.getFullYear()).substr(2, 4), - Y: '' + this.getFullYear(), - '%': '%' - }; - var result = '', i = 0; - while (i < format.length) { - if (format.charAt(i) === '%') { - result = result + fields[format.charAt(i + 1)]; - ++i; - } - else { - result = result + format.charAt(i); - } - ++i; - } - return result; - }; - - // ---------------------------------------------------------------------------- - // String object extensions - // ---------------------------------------------------------------------------- - String.prototype.pad_left = function(pad_length, pad_string) { - var new_string = this; - for (var i = 0; new_string.length < pad_length; i++) { - new_string = pad_string + new_string; - } - return new_string; - }; - - String.prototype.strptime = function(format) { - var split_format = format.split(/[.\-/]/); - var date = this.split(/[.\-/]/); - var i = 0; - var day, month, year; - while (i < split_format.length) { - switch (split_format[i]) { - case "%d": - day = date[i]; - break; - case "%m": - month = date[i] - 1; - break; - case "%Y": - year = date[i]; - break; - case "%y": - year = date[i]; - break; - } - ++i; - } - // Create Date object from UTC since the parsed value is supposed to be - // in UTC, not local time. Also, the calendar uses UTC functions for - // date extraction. - return new Date(Date.UTC(year, month, day)); - }; - -})(); -// ---------------------------------------------------------------------------- -// Get the computed style for and element -// ---------------------------------------------------------------------------- -function getStyle(oElm, strCssRule) { - 'use strict'; - var strValue = ""; - if(document.defaultView && document.defaultView.getComputedStyle) { - strValue = document.defaultView.getComputedStyle(oElm, "").getPropertyValue(strCssRule); - } - else if(oElm.currentStyle) { - strCssRule = strCssRule.replace(/\-(\w)/g, function(strMatch, p1) { - return p1.toUpperCase(); - }); - strValue = oElm.currentStyle[strCssRule]; - } - return strValue; -} diff --git a/static/admin/js/inlines.js b/static/admin/js/inlines.js deleted file mode 100644 index ba8c9cd7..00000000 --- a/static/admin/js/inlines.js +++ /dev/null @@ -1,298 +0,0 @@ -/*global DateTimeShortcuts, SelectFilter*/ -/** - * Django admin inlines - * - * Based on jQuery Formset 1.1 - * @author Stanislaus Madueke (stan DOT madueke AT gmail DOT com) - * @requires jQuery 1.2.6 or later - * - * Copyright (c) 2009, Stanislaus Madueke - * All rights reserved. - * - * Spiced up with Code from Zain Memon's GSoC project 2009 - * and modified for Django by Jannis Leidel, Travis Swicegood and Julien Phalip. - * - * Licensed under the New BSD License - * See: https://opensource.org/licenses/bsd-license.php - */ -(function($) { - 'use strict'; - $.fn.formset = function(opts) { - var options = $.extend({}, $.fn.formset.defaults, opts); - var $this = $(this); - var $parent = $this.parent(); - var updateElementIndex = function(el, prefix, ndx) { - var id_regex = new RegExp("(" + prefix + "-(\\d+|__prefix__))"); - var replacement = prefix + "-" + ndx; - if ($(el).prop("for")) { - $(el).prop("for", $(el).prop("for").replace(id_regex, replacement)); - } - if (el.id) { - el.id = el.id.replace(id_regex, replacement); - } - if (el.name) { - el.name = el.name.replace(id_regex, replacement); - } - }; - var totalForms = $("#id_" + options.prefix + "-TOTAL_FORMS").prop("autocomplete", "off"); - var nextIndex = parseInt(totalForms.val(), 10); - var maxForms = $("#id_" + options.prefix + "-MAX_NUM_FORMS").prop("autocomplete", "off"); - // only show the add button if we are allowed to add more items, - // note that max_num = None translates to a blank string. - var showAddButton = maxForms.val() === '' || (maxForms.val() - totalForms.val()) > 0; - $this.each(function(i) { - $(this).not("." + options.emptyCssClass).addClass(options.formCssClass); - }); - if ($this.length && showAddButton) { - var addButton = options.addButton; - if (addButton === null) { - if ($this.prop("tagName") === "TR") { - // If forms are laid out as table rows, insert the - // "add" button in a new table row: - var numCols = this.eq(-1).children().length; - $parent.append('' + options.addText + ""); - addButton = $parent.find("tr:last a"); - } else { - // Otherwise, insert it immediately after the last form: - $this.filter(":last").after('
        ' + options.addText + "
        "); - addButton = $this.filter(":last").next().find("a"); - } - } - addButton.on('click', function(e) { - e.preventDefault(); - var template = $("#" + options.prefix + "-empty"); - var row = template.clone(true); - row.removeClass(options.emptyCssClass) - .addClass(options.formCssClass) - .attr("id", options.prefix + "-" + nextIndex); - if (row.is("tr")) { - // If the forms are laid out in table rows, insert - // the remove button into the last table cell: - row.children(":last").append('"); - } 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('
      • ' + options.deleteText + "
        • "); - } else { - // Otherwise, just insert the remove button as the - // last child element of the form's container: - row.children(":first").append('' + options.deleteText + ""); - } - row.find("*").each(function() { - updateElementIndex(this, options.prefix, totalForms.val()); - }); - // Insert the new form when it has been fully edited - row.insertBefore($(template)); - // Update number of total forms - $(totalForms).val(parseInt(totalForms.val(), 10) + 1); - nextIndex += 1; - // Hide add button in case we've hit the max, except we want to add infinitely - if ((maxForms.val() !== '') && (maxForms.val() - totalForms.val()) <= 0) { - addButton.parent().hide(); - } - // The delete button of each row triggers a bunch of other things - row.find("a." + options.deleteCssClass).on('click', function(e1) { - e1.preventDefault(); - // Remove the parent form containing this button: - row.remove(); - nextIndex -= 1; - // If a post-delete callback was provided, call it with the deleted form: - if (options.removed) { - options.removed(row); - } - $(document).trigger('formset:removed', [row, options.prefix]); - // Update the TOTAL_FORMS form count. - var forms = $("." + options.formCssClass); - $("#id_" + options.prefix + "-TOTAL_FORMS").val(forms.length); - // Show add button again once we drop below max - if ((maxForms.val() === '') || (maxForms.val() - forms.length) > 0) { - addButton.parent().show(); - } - // Also, update names and ids for all remaining form controls - // so they remain in sequence: - var i, formCount; - var updateElementCallback = function() { - updateElementIndex(this, options.prefix, i); - }; - for (i = 0, formCount = forms.length; i < formCount; i++) { - updateElementIndex($(forms).get(i), options.prefix, i); - $(forms.get(i)).find("*").each(updateElementCallback); - } - }); - // If a post-add callback was supplied, call it with the added form: - if (options.added) { - options.added(row); - } - $(document).trigger('formset:added', [row, options.prefix]); - }); - } - return this; - }; - - /* Setup plugin defaults */ - $.fn.formset.defaults = { - prefix: "form", // The form prefix for your django formset - addText: "add another", // Text for the add link - deleteText: "remove", // Text for the delete link - addCssClass: "add-row", // CSS class applied to the add link - deleteCssClass: "delete-row", // CSS class applied to the delete link - emptyCssClass: "empty-row", // CSS class applied to the empty row - formCssClass: "dynamic-form", // CSS class applied to each form in a formset - added: null, // Function called each time a new form is added - removed: null, // Function called each time a form is deleted - addButton: null // Existing add button to use - }; - - - // Tabular inlines --------------------------------------------------------- - $.fn.tabularFormset = function(selector, options) { - var $rows = $(this); - var alternatingRows = function(row) { - $(selector).not(".add-row").removeClass("row1 row2") - .filter(":even").addClass("row1").end() - .filter(":odd").addClass("row2"); - }; - - var reinitDateTimeShortCuts = function() { - // Reinitialize the calendar and clock widgets by force - if (typeof DateTimeShortcuts !== "undefined") { - $(".datetimeshortcuts").remove(); - DateTimeShortcuts.init(); - } - }; - - var updateSelectFilter = function() { - // If any SelectFilter widgets are a part of the new form, - // instantiate a new SelectFilter instance for it. - if (typeof SelectFilter !== 'undefined') { - $('.selectfilter').each(function(index, value) { - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length - 1], false); - }); - $('.selectfilterstacked').each(function(index, value) { - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length - 1], true); - }); - } - }; - - var initPrepopulatedFields = function(row) { - row.find('.prepopulated_field').each(function() { - var field = $(this), - input = field.find('input, select, textarea'), - dependency_list = input.data('dependency_list') || [], - dependencies = []; - $.each(dependency_list, function(i, field_name) { - dependencies.push('#' + row.find('.field-' + field_name).find('input, select, textarea').attr('id')); - }); - if (dependencies.length) { - input.prepopulate(dependencies, input.attr('maxlength')); - } - }); - }; - - $rows.formset({ - prefix: options.prefix, - addText: options.addText, - formCssClass: "dynamic-" + options.prefix, - deleteCssClass: "inline-deletelink", - deleteText: options.deleteText, - emptyCssClass: "empty-form", - removed: alternatingRows, - added: function(row) { - initPrepopulatedFields(row); - reinitDateTimeShortCuts(); - updateSelectFilter(); - alternatingRows(row); - }, - addButton: options.addButton - }); - - return $rows; - }; - - // Stacked inlines --------------------------------------------------------- - $.fn.stackedFormset = function(selector, options) { - var $rows = $(this); - var updateInlineLabel = function(row) { - $(selector).find(".inline_label").each(function(i) { - var count = i + 1; - $(this).html($(this).html().replace(/(#\d+)/g, "#" + count)); - }); - }; - - var reinitDateTimeShortCuts = function() { - // Reinitialize the calendar and clock widgets by force, yuck. - if (typeof DateTimeShortcuts !== "undefined") { - $(".datetimeshortcuts").remove(); - DateTimeShortcuts.init(); - } - }; - - var updateSelectFilter = function() { - // If any SelectFilter widgets were added, instantiate a new instance. - if (typeof SelectFilter !== "undefined") { - $(".selectfilter").each(function(index, value) { - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length - 1], false); - }); - $(".selectfilterstacked").each(function(index, value) { - var namearr = value.name.split('-'); - SelectFilter.init(value.id, namearr[namearr.length - 1], true); - }); - } - }; - - var initPrepopulatedFields = function(row) { - row.find('.prepopulated_field').each(function() { - var field = $(this), - input = field.find('input, select, textarea'), - dependency_list = input.data('dependency_list') || [], - dependencies = []; - $.each(dependency_list, function(i, field_name) { - dependencies.push('#' + row.find('.form-row .field-' + field_name).find('input, select, textarea').attr('id')); - }); - if (dependencies.length) { - input.prepopulate(dependencies, input.attr('maxlength')); - } - }); - }; - - $rows.formset({ - prefix: options.prefix, - addText: options.addText, - formCssClass: "dynamic-" + options.prefix, - deleteCssClass: "inline-deletelink", - deleteText: options.deleteText, - emptyCssClass: "empty-form", - removed: updateInlineLabel, - added: function(row) { - initPrepopulatedFields(row); - reinitDateTimeShortCuts(); - updateSelectFilter(); - updateInlineLabel(row); - }, - addButton: options.addButton - }); - - return $rows; - }; - - $(document).ready(function() { - $(".js-inline-admin-formset").each(function() { - var data = $(this).data(), - inlineOptions = data.inlineFormset, - selector; - switch(data.inlineType) { - case "stacked": - selector = inlineOptions.name + "-group .inline-related"; - $(selector).stackedFormset(selector, inlineOptions.options); - break; - case "tabular": - selector = inlineOptions.name + "-group .tabular.inline-related tbody:first > tr"; - $(selector).tabularFormset(selector, inlineOptions.options); - break; - } - }); - }); -})(django.jQuery); diff --git a/static/admin/js/inlines.min.js b/static/admin/js/inlines.min.js deleted file mode 100644 index 65af8eb3..00000000 --- a/static/admin/js/inlines.min.js +++ /dev/null @@ -1,13 +0,0 @@ -var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(b,d,a){b instanceof String&&(b=String(b));for(var c=b.length,f=0;f'+a.addText+""),l=d.find("tr:last a")):(c.filter(":last").after('
        '+a.addText+"
        "),l=c.filter(":last").next().find("a")));l.on("click",function(d){d.preventDefault();d=b("#"+a.prefix+"-empty"); -var c=d.clone(!0);c.removeClass(a.emptyCssClass).addClass(a.formCssClass).attr("id",a.prefix+"-"+h);c.is("tr")?c.children(":last").append('"):c.is("ul")||c.is("ol")?c.append('
      • '+a.deleteText+"
        • "):c.children(":first").append(''+a.deleteText+"");c.find("*").each(function(){f(this,a.prefix,g.val())});c.insertBefore(b(d)); -b(g).val(parseInt(g.val(),10)+1);h+=1;""!==e.val()&&0>=e.val()-g.val()&&l.parent().hide();c.find("a."+a.deleteCssClass).on("click",function(d){d.preventDefault();c.remove();--h;a.removed&&a.removed(c);b(document).trigger("formset:removed",[c,a.prefix]);d=b("."+a.formCssClass);b("#id_"+a.prefix+"-TOTAL_FORMS").val(d.length);(""===e.val()||0 tr",b(d).tabularFormset(d,a.options)}})})})(django.jQuery); diff --git a/static/admin/js/jquery.init.js b/static/admin/js/jquery.init.js deleted file mode 100644 index f3ac1625..00000000 --- a/static/admin/js/jquery.init.js +++ /dev/null @@ -1,8 +0,0 @@ -/*global django:true, jQuery:false*/ -/* Puts the included jQuery into our own namespace using noConflict and passing - * it 'true'. This ensures that the included jQuery doesn't pollute the global - * namespace (i.e. this preserves pre-existing values for both window.$ and - * window.jQuery). - */ -var django = django || {}; -django.jQuery = jQuery.noConflict(true); diff --git a/static/admin/js/popup_response.js b/static/admin/js/popup_response.js deleted file mode 100644 index b4a07e74..00000000 --- a/static/admin/js/popup_response.js +++ /dev/null @@ -1,16 +0,0 @@ -/*global opener */ -(function() { - 'use strict'; - var initData = JSON.parse(document.getElementById('django-admin-popup-response-constants').dataset.popupResponse); - switch(initData.action) { - case 'change': - opener.dismissChangeRelatedObjectPopup(window, initData.value, initData.obj, initData.new_value); - break; - case 'delete': - opener.dismissDeleteRelatedObjectPopup(window, initData.value); - break; - default: - opener.dismissAddRelatedObjectPopup(window, initData.value, initData.obj); - break; - } -})(); diff --git a/static/admin/js/prepopulate.js b/static/admin/js/prepopulate.js deleted file mode 100644 index bef45a3a..00000000 --- a/static/admin/js/prepopulate.js +++ /dev/null @@ -1,42 +0,0 @@ -/*global URLify*/ -(function($) { - 'use strict'; - $.fn.prepopulate = function(dependencies, maxLength, allowUnicode) { - /* - Depends on urlify.js - Populates a selected field with the values of the dependent fields, - URLifies and shortens the string. - dependencies - array of dependent fields ids - maxLength - maximum length of the URLify'd string - allowUnicode - Unicode support of the URLify'd string - */ - return this.each(function() { - var prepopulatedField = $(this); - - var populate = function() { - // Bail if the field's value has been changed by the user - if (prepopulatedField.data('_changed')) { - return; - } - - var values = []; - $.each(dependencies, function(i, field) { - field = $(field); - if (field.val().length > 0) { - values.push(field.val()); - } - }); - prepopulatedField.val(URLify(values.join(' '), maxLength, allowUnicode)); - }; - - prepopulatedField.data('_changed', false); - prepopulatedField.on('change', function() { - prepopulatedField.data('_changed', true); - }); - - if (!prepopulatedField.val()) { - $(dependencies.join(',')).on('keyup change focus', populate); - } - }); - }; -})(django.jQuery); diff --git a/static/admin/js/prepopulate.min.js b/static/admin/js/prepopulate.min.js deleted file mode 100644 index 43c1b79e..00000000 --- a/static/admin/js/prepopulate.min.js +++ /dev/null @@ -1 +0,0 @@ -(function(b){b.fn.prepopulate=function(d,f,g){return this.each(function(){var a=b(this),h=function(){if(!a.data("_changed")){var e=[];b.each(d,function(a,c){c=b(c);0 elements - // (i.e., `typeof document.createElement( "object" ) === "function"`). - // We don't want to classify *any* DOM node as a function. - return typeof obj === "function" && typeof obj.nodeType !== "number"; - }; - - -var isWindow = function isWindow( obj ) { - return obj != null && obj === obj.window; - }; - - -var document = window.document; - - - - var preservedScriptAttributes = { - type: true, - src: true, - nonce: true, - noModule: true - }; - - function DOMEval( code, node, doc ) { - doc = doc || document; - - var i, val, - script = doc.createElement( "script" ); - - script.text = code; - if ( node ) { - for ( i in preservedScriptAttributes ) { - - // Support: Firefox 64+, Edge 18+ - // Some browsers don't support the "nonce" property on scripts. - // On the other hand, just using `getAttribute` is not enough as - // the `nonce` attribute is reset to an empty string whenever it - // becomes browsing-context connected. - // See https://github.com/whatwg/html/issues/2369 - // See https://html.spec.whatwg.org/#nonce-attributes - // The `node.getAttribute` check was added for the sake of - // `jQuery.globalEval` so that it can fake a nonce-containing node - // via an object. - val = node[ i ] || node.getAttribute && node.getAttribute( i ); - if ( val ) { - script.setAttribute( i, val ); - } - } - } - doc.head.appendChild( script ).parentNode.removeChild( script ); - } - - -function toType( obj ) { - if ( obj == null ) { - return obj + ""; - } - - // Support: Android <=2.3 only (functionish RegExp) - return typeof obj === "object" || typeof obj === "function" ? - class2type[ toString.call( obj ) ] || "object" : - typeof obj; -} -/* global Symbol */ -// Defining this global in .eslintrc.json would create a danger of using the global -// unguarded in another place, it seems safer to define global only for this module - - - -var - version = "3.5.1", - - // Define a local copy of jQuery - jQuery = function( selector, context ) { - - // The jQuery object is actually just the init constructor 'enhanced' - // Need init if jQuery is called (just allow error to be thrown if not included) - return new jQuery.fn.init( selector, context ); - }; - -jQuery.fn = jQuery.prototype = { - - // The current version of jQuery being used - jquery: version, - - constructor: jQuery, - - // The default length of a jQuery object is 0 - length: 0, - - toArray: function() { - return slice.call( this ); - }, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - - // Return all the elements in a clean array - if ( num == null ) { - return slice.call( this ); - } - - // Return just the one element from the set - return num < 0 ? this[ num + this.length ] : this[ num ]; - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - - // Build a new jQuery matched element set - var ret = jQuery.merge( this.constructor(), elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - // Return the newly-formed element set - return ret; - }, - - // Execute a callback for every element in the matched set. - each: function( callback ) { - return jQuery.each( this, callback ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map( this, function( elem, i ) { - return callback.call( elem, i, elem ); - } ) ); - }, - - slice: function() { - return this.pushStack( slice.apply( this, arguments ) ); - }, - - first: function() { - return this.eq( 0 ); - }, - - last: function() { - return this.eq( -1 ); - }, - - even: function() { - return this.pushStack( jQuery.grep( this, function( _elem, i ) { - return ( i + 1 ) % 2; - } ) ); - }, - - odd: function() { - return this.pushStack( jQuery.grep( this, function( _elem, i ) { - return i % 2; - } ) ); - }, - - eq: function( i ) { - var len = this.length, - j = +i + ( i < 0 ? len : 0 ); - return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] ); - }, - - end: function() { - return this.prevObject || this.constructor(); - }, - - // For internal use only. - // Behaves like an Array's method, not like a jQuery method. - push: push, - sort: arr.sort, - splice: arr.splice -}; - -jQuery.extend = jQuery.fn.extend = function() { - var options, name, src, copy, copyIsArray, clone, - target = arguments[ 0 ] || {}, - i = 1, - length = arguments.length, - deep = false; - - // Handle a deep copy situation - if ( typeof target === "boolean" ) { - deep = target; - - // Skip the boolean and the target - target = arguments[ i ] || {}; - i++; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target !== "object" && !isFunction( target ) ) { - target = {}; - } - - // Extend jQuery itself if only one argument is passed - if ( i === length ) { - target = this; - i--; - } - - for ( ; i < length; i++ ) { - - // Only deal with non-null/undefined values - if ( ( options = arguments[ i ] ) != null ) { - - // Extend the base object - for ( name in options ) { - copy = options[ name ]; - - // Prevent Object.prototype pollution - // Prevent never-ending loop - if ( name === "__proto__" || target === copy ) { - continue; - } - - // Recurse if we're merging plain objects or arrays - if ( deep && copy && ( jQuery.isPlainObject( copy ) || - ( copyIsArray = Array.isArray( copy ) ) ) ) { - src = target[ name ]; - - // Ensure proper type for the source value - if ( copyIsArray && !Array.isArray( src ) ) { - clone = []; - } else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) { - clone = {}; - } else { - clone = src; - } - copyIsArray = false; - - // Never move original objects, clone them - target[ name ] = jQuery.extend( deep, clone, copy ); - - // Don't bring in undefined values - } else if ( copy !== undefined ) { - target[ name ] = copy; - } - } - } - } - - // Return the modified object - return target; -}; - -jQuery.extend( { - - // Unique for each copy of jQuery on the page - expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ), - - // Assume jQuery is ready without the ready module - isReady: true, - - error: function( msg ) { - throw new Error( msg ); - }, - - noop: function() {}, - - isPlainObject: function( obj ) { - var proto, Ctor; - - // Detect obvious negatives - // Use toString instead of jQuery.type to catch host objects - if ( !obj || toString.call( obj ) !== "[object Object]" ) { - return false; - } - - proto = getProto( obj ); - - // Objects with no prototype (e.g., `Object.create( null )`) are plain - if ( !proto ) { - return true; - } - - // Objects with prototype are plain iff they were constructed by a global Object function - Ctor = hasOwn.call( proto, "constructor" ) && proto.constructor; - return typeof Ctor === "function" && fnToString.call( Ctor ) === ObjectFunctionString; - }, - - isEmptyObject: function( obj ) { - var name; - - for ( name in obj ) { - return false; - } - return true; - }, - - // Evaluates a script in a provided context; falls back to the global one - // if not specified. - globalEval: function( code, options, doc ) { - DOMEval( code, { nonce: options && options.nonce }, doc ); - }, - - each: function( obj, callback ) { - var length, i = 0; - - if ( isArrayLike( obj ) ) { - length = obj.length; - for ( ; i < length; i++ ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } else { - for ( i in obj ) { - if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) { - break; - } - } - } - - return obj; - }, - - // results is for internal usage only - makeArray: function( arr, results ) { - var ret = results || []; - - if ( arr != null ) { - if ( isArrayLike( Object( arr ) ) ) { - jQuery.merge( ret, - typeof arr === "string" ? - [ arr ] : arr - ); - } else { - push.call( ret, arr ); - } - } - - return ret; - }, - - inArray: function( elem, arr, i ) { - return arr == null ? -1 : indexOf.call( arr, elem, i ); - }, - - // Support: Android <=4.0 only, PhantomJS 1 only - // push.apply(_, arraylike) throws on ancient WebKit - merge: function( first, second ) { - var len = +second.length, - j = 0, - i = first.length; - - for ( ; j < len; j++ ) { - first[ i++ ] = second[ j ]; - } - - first.length = i; - - return first; - }, - - grep: function( elems, callback, invert ) { - var callbackInverse, - matches = [], - i = 0, - length = elems.length, - callbackExpect = !invert; - - // Go through the array, only saving the items - // that pass the validator function - for ( ; i < length; i++ ) { - callbackInverse = !callback( elems[ i ], i ); - if ( callbackInverse !== callbackExpect ) { - matches.push( elems[ i ] ); - } - } - - return matches; - }, - - // arg is for internal usage only - map: function( elems, callback, arg ) { - var length, value, - i = 0, - ret = []; - - // Go through the array, translating each of the items to their new values - if ( isArrayLike( elems ) ) { - length = elems.length; - for ( ; i < length; i++ ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - - // Go through every key on the object, - } else { - for ( i in elems ) { - value = callback( elems[ i ], i, arg ); - - if ( value != null ) { - ret.push( value ); - } - } - } - - // Flatten any nested arrays - return flat( ret ); - }, - - // A global GUID counter for objects - guid: 1, - - // jQuery.support is not used in Core but other projects attach their - // properties to it so it needs to exist. - support: support -} ); - -if ( typeof Symbol === "function" ) { - jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ]; -} - -// Populate the class2type map -jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), -function( _i, name ) { - class2type[ "[object " + name + "]" ] = name.toLowerCase(); -} ); - -function isArrayLike( obj ) { - - // Support: real iOS 8.2 only (not reproducible in simulator) - // `in` check used to prevent JIT error (gh-2145) - // hasOwn isn't used here due to false negatives - // regarding Nodelist length in IE - var length = !!obj && "length" in obj && obj.length, - type = toType( obj ); - - if ( isFunction( obj ) || isWindow( obj ) ) { - return false; - } - - return type === "array" || length === 0 || - typeof length === "number" && length > 0 && ( length - 1 ) in obj; -} -var Sizzle = -/*! - * Sizzle CSS Selector Engine v2.3.5 - * https://sizzlejs.com/ - * - * Copyright JS Foundation and other contributors - * Released under the MIT license - * https://js.foundation/ - * - * Date: 2020-03-14 - */ -( function( window ) { -var i, - support, - Expr, - getText, - isXML, - tokenize, - compile, - select, - outermostContext, - sortInput, - hasDuplicate, - - // Local document vars - setDocument, - document, - docElem, - documentIsHTML, - rbuggyQSA, - rbuggyMatches, - matches, - contains, - - // Instance-specific data - expando = "sizzle" + 1 * new Date(), - preferredDoc = window.document, - dirruns = 0, - done = 0, - classCache = createCache(), - tokenCache = createCache(), - compilerCache = createCache(), - nonnativeSelectorCache = createCache(), - sortOrder = function( a, b ) { - if ( a === b ) { - hasDuplicate = true; - } - return 0; - }, - - // Instance methods - hasOwn = ( {} ).hasOwnProperty, - arr = [], - pop = arr.pop, - pushNative = arr.push, - push = arr.push, - slice = arr.slice, - - // Use a stripped-down indexOf as it's faster than native - // https://jsperf.com/thor-indexof-vs-for/5 - indexOf = function( list, elem ) { - var i = 0, - len = list.length; - for ( ; i < len; i++ ) { - if ( list[ i ] === elem ) { - return i; - } - } - return -1; - }, - - booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" + - "ismap|loop|multiple|open|readonly|required|scoped", - - // Regular expressions - - // http://www.w3.org/TR/css3-selectors/#whitespace - whitespace = "[\\x20\\t\\r\\n\\f]", - - // https://www.w3.org/TR/css-syntax-3/#ident-token-diagram - identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace + - "?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+", - - // Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors - attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace + - - // Operator (capture 2) - "*([*^$|!~]?=)" + whitespace + - - // "Attribute values must be CSS identifiers [capture 5] - // or strings [capture 3 or capture 4]" - "*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + - whitespace + "*\\]", - - pseudos = ":(" + identifier + ")(?:\\((" + - - // To reduce the number of selectors needing tokenize in the preFilter, prefer arguments: - // 1. quoted (capture 3; capture 4 or capture 5) - "('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" + - - // 2. simple (capture 6) - "((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" + - - // 3. anything else (capture 2) - ".*" + - ")\\)|)", - - // Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter - rwhitespace = new RegExp( whitespace + "+", "g" ), - rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + - whitespace + "+$", "g" ), - - rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ), - rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + - "*" ), - rdescend = new RegExp( whitespace + "|>" ), - - rpseudo = new RegExp( pseudos ), - ridentifier = new RegExp( "^" + identifier + "$" ), - - matchExpr = { - "ID": new RegExp( "^#(" + identifier + ")" ), - "CLASS": new RegExp( "^\\.(" + identifier + ")" ), - "TAG": new RegExp( "^(" + identifier + "|[*])" ), - "ATTR": new RegExp( "^" + attributes ), - "PSEUDO": new RegExp( "^" + pseudos ), - "CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + - whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + - whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ), - "bool": new RegExp( "^(?:" + booleans + ")$", "i" ), - - // For use in libraries implementing .is() - // We use this for POS matching in `select` - "needsContext": new RegExp( "^" + whitespace + - "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace + - "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" ) - }, - - rhtml = /HTML$/i, - rinputs = /^(?:input|select|textarea|button)$/i, - rheader = /^h\d$/i, - - rnative = /^[^{]+\{\s*\[native \w/, - - // Easily-parseable/retrievable ID or TAG or CLASS selectors - rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/, - - rsibling = /[+~]/, - - // CSS escapes - // http://www.w3.org/TR/CSS21/syndata.html#escaped-characters - runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ), - funescape = function( escape, nonHex ) { - var high = "0x" + escape.slice( 1 ) - 0x10000; - - return nonHex ? - - // Strip the backslash prefix from a non-hex escape sequence - nonHex : - - // Replace a hexadecimal escape sequence with the encoded Unicode code point - // Support: IE <=11+ - // For values outside the Basic Multilingual Plane (BMP), manually construct a - // surrogate pair - high < 0 ? - String.fromCharCode( high + 0x10000 ) : - String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 ); - }, - - // CSS string/identifier serialization - // https://drafts.csswg.org/cssom/#common-serializing-idioms - rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g, - fcssescape = function( ch, asCodePoint ) { - if ( asCodePoint ) { - - // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER - if ( ch === "\0" ) { - return "\uFFFD"; - } - - // Control characters and (dependent upon position) numbers get escaped as code points - return ch.slice( 0, -1 ) + "\\" + - ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " "; - } - - // Other potentially-special ASCII characters get backslash-escaped - return "\\" + ch; - }, - - // Used for iframes - // See setDocument() - // Removing the function wrapper causes a "Permission Denied" - // error in IE - unloadHandler = function() { - setDocument(); - }, - - inDisabledFieldset = addCombinator( - function( elem ) { - return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset"; - }, - { dir: "parentNode", next: "legend" } - ); - -// Optimize for push.apply( _, NodeList ) -try { - push.apply( - ( arr = slice.call( preferredDoc.childNodes ) ), - preferredDoc.childNodes - ); - - // Support: Android<4.0 - // Detect silently failing push.apply - // eslint-disable-next-line no-unused-expressions - arr[ preferredDoc.childNodes.length ].nodeType; -} catch ( e ) { - push = { apply: arr.length ? - - // Leverage slice if possible - function( target, els ) { - pushNative.apply( target, slice.call( els ) ); - } : - - // Support: IE<9 - // Otherwise append directly - function( target, els ) { - var j = target.length, - i = 0; - - // Can't trust NodeList.length - while ( ( target[ j++ ] = els[ i++ ] ) ) {} - target.length = j - 1; - } - }; -} - -function Sizzle( selector, context, results, seed ) { - var m, i, elem, nid, match, groups, newSelector, - newContext = context && context.ownerDocument, - - // nodeType defaults to 9, since context defaults to document - nodeType = context ? context.nodeType : 9; - - results = results || []; - - // Return early from calls with invalid selector or context - if ( typeof selector !== "string" || !selector || - nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) { - - return results; - } - - // Try to shortcut find operations (as opposed to filters) in HTML documents - if ( !seed ) { - setDocument( context ); - context = context || document; - - if ( documentIsHTML ) { - - // If the selector is sufficiently simple, try using a "get*By*" DOM method - // (excepting DocumentFragment context, where the methods don't exist) - if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) { - - // ID selector - if ( ( m = match[ 1 ] ) ) { - - // Document context - if ( nodeType === 9 ) { - if ( ( elem = context.getElementById( m ) ) ) { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( elem.id === m ) { - results.push( elem ); - return results; - } - } else { - return results; - } - - // Element context - } else { - - // Support: IE, Opera, Webkit - // TODO: identify versions - // getElementById can match elements by name instead of ID - if ( newContext && ( elem = newContext.getElementById( m ) ) && - contains( context, elem ) && - elem.id === m ) { - - results.push( elem ); - return results; - } - } - - // Type selector - } else if ( match[ 2 ] ) { - push.apply( results, context.getElementsByTagName( selector ) ); - return results; - - // Class selector - } else if ( ( m = match[ 3 ] ) && support.getElementsByClassName && - context.getElementsByClassName ) { - - push.apply( results, context.getElementsByClassName( m ) ); - return results; - } - } - - // Take advantage of querySelectorAll - if ( support.qsa && - !nonnativeSelectorCache[ selector + " " ] && - ( !rbuggyQSA || !rbuggyQSA.test( selector ) ) && - - // Support: IE 8 only - // Exclude object elements - ( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) { - - newSelector = selector; - newContext = context; - - // qSA considers elements outside a scoping root when evaluating child or - // descendant combinators, which is not what we want. - // In such cases, we work around the behavior by prefixing every selector in the - // list with an ID selector referencing the scope context. - // The technique has to be used as well when a leading combinator is used - // as such selectors are not recognized by querySelectorAll. - // Thanks to Andrew Dupont for this technique. - if ( nodeType === 1 && - ( rdescend.test( selector ) || rcombinators.test( selector ) ) ) { - - // Expand context for sibling selectors - newContext = rsibling.test( selector ) && testContext( context.parentNode ) || - context; - - // We can use :scope instead of the ID hack if the browser - // supports it & if we're not changing the context. - if ( newContext !== context || !support.scope ) { - - // Capture the context ID, setting it first if necessary - if ( ( nid = context.getAttribute( "id" ) ) ) { - nid = nid.replace( rcssescape, fcssescape ); - } else { - context.setAttribute( "id", ( nid = expando ) ); - } - } - - // Prefix every selector in the list - groups = tokenize( selector ); - i = groups.length; - while ( i-- ) { - groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " + - toSelector( groups[ i ] ); - } - newSelector = groups.join( "," ); - } - - try { - push.apply( results, - newContext.querySelectorAll( newSelector ) - ); - return results; - } catch ( qsaError ) { - nonnativeSelectorCache( selector, true ); - } finally { - if ( nid === expando ) { - context.removeAttribute( "id" ); - } - } - } - } - } - - // All others - return select( selector.replace( rtrim, "$1" ), context, results, seed ); -} - -/** - * Create key-value caches of limited size - * @returns {function(string, object)} Returns the Object data after storing it on itself with - * property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength) - * deleting the oldest entry - */ -function createCache() { - var keys = []; - - function cache( key, value ) { - - // Use (key + " ") to avoid collision with native prototype properties (see Issue #157) - if ( keys.push( key + " " ) > Expr.cacheLength ) { - - // Only keep the most recent entries - delete cache[ keys.shift() ]; - } - return ( cache[ key + " " ] = value ); - } - return cache; -} - -/** - * Mark a function for special use by Sizzle - * @param {Function} fn The function to mark - */ -function markFunction( fn ) { - fn[ expando ] = true; - return fn; -} - -/** - * Support testing using an element - * @param {Function} fn Passed the created element and returns a boolean result - */ -function assert( fn ) { - var el = document.createElement( "fieldset" ); - - try { - return !!fn( el ); - } catch ( e ) { - return false; - } finally { - - // Remove from its parent by default - if ( el.parentNode ) { - el.parentNode.removeChild( el ); - } - - // release memory in IE - el = null; - } -} - -/** - * Adds the same handler for all of the specified attrs - * @param {String} attrs Pipe-separated list of attributes - * @param {Function} handler The method that will be applied - */ -function addHandle( attrs, handler ) { - var arr = attrs.split( "|" ), - i = arr.length; - - while ( i-- ) { - Expr.attrHandle[ arr[ i ] ] = handler; - } -} - -/** - * Checks document order of two siblings - * @param {Element} a - * @param {Element} b - * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b - */ -function siblingCheck( a, b ) { - var cur = b && a, - diff = cur && a.nodeType === 1 && b.nodeType === 1 && - a.sourceIndex - b.sourceIndex; - - // Use IE sourceIndex if available on both nodes - if ( diff ) { - return diff; - } - - // Check if b follows a - if ( cur ) { - while ( ( cur = cur.nextSibling ) ) { - if ( cur === b ) { - return -1; - } - } - } - - return a ? 1 : -1; -} - -/** - * Returns a function to use in pseudos for input types - * @param {String} type - */ -function createInputPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for buttons - * @param {String} type - */ -function createButtonPseudo( type ) { - return function( elem ) { - var name = elem.nodeName.toLowerCase(); - return ( name === "input" || name === "button" ) && elem.type === type; - }; -} - -/** - * Returns a function to use in pseudos for :enabled/:disabled - * @param {Boolean} disabled true for :disabled; false for :enabled - */ -function createDisabledPseudo( disabled ) { - - // Known :disabled false positives: fieldset[disabled] > legend:nth-of-type(n+2) :can-disable - return function( elem ) { - - // Only certain elements can match :enabled or :disabled - // https://html.spec.whatwg.org/multipage/scripting.html#selector-enabled - // https://html.spec.whatwg.org/multipage/scripting.html#selector-disabled - if ( "form" in elem ) { - - // Check for inherited disabledness on relevant non-disabled elements: - // * listed form-associated elements in a disabled fieldset - // https://html.spec.whatwg.org/multipage/forms.html#category-listed - // https://html.spec.whatwg.org/multipage/forms.html#concept-fe-disabled - // * option elements in a disabled optgroup - // https://html.spec.whatwg.org/multipage/forms.html#concept-option-disabled - // All such elements have a "form" property. - if ( elem.parentNode && elem.disabled === false ) { - - // Option elements defer to a parent optgroup if present - if ( "label" in elem ) { - if ( "label" in elem.parentNode ) { - return elem.parentNode.disabled === disabled; - } else { - return elem.disabled === disabled; - } - } - - // Support: IE 6 - 11 - // Use the isDisabled shortcut property to check for disabled fieldset ancestors - return elem.isDisabled === disabled || - - // Where there is no isDisabled, check manually - /* jshint -W018 */ - elem.isDisabled !== !disabled && - inDisabledFieldset( elem ) === disabled; - } - - return elem.disabled === disabled; - - // Try to winnow out elements that can't be disabled before trusting the disabled property. - // Some victims get caught in our net (label, legend, menu, track), but it shouldn't - // even exist on them, let alone have a boolean value. - } else if ( "label" in elem ) { - return elem.disabled === disabled; - } - - // Remaining elements are neither :enabled nor :disabled - return false; - }; -} - -/** - * Returns a function to use in pseudos for positionals - * @param {Function} fn - */ -function createPositionalPseudo( fn ) { - return markFunction( function( argument ) { - argument = +argument; - return markFunction( function( seed, matches ) { - var j, - matchIndexes = fn( [], seed.length, argument ), - i = matchIndexes.length; - - // Match elements found at the specified indexes - while ( i-- ) { - if ( seed[ ( j = matchIndexes[ i ] ) ] ) { - seed[ j ] = !( matches[ j ] = seed[ j ] ); - } - } - } ); - } ); -} - -/** - * Checks a node for validity as a Sizzle context - * @param {Element|Object=} context - * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value - */ -function testContext( context ) { - return context && typeof context.getElementsByTagName !== "undefined" && context; -} - -// Expose support vars for convenience -support = Sizzle.support = {}; - -/** - * Detects XML nodes - * @param {Element|Object} elem An element or a document - * @returns {Boolean} True iff elem is a non-HTML XML node - */ -isXML = Sizzle.isXML = function( elem ) { - var namespace = elem.namespaceURI, - docElem = ( elem.ownerDocument || elem ).documentElement; - - // Support: IE <=8 - // Assume HTML when documentElement doesn't yet exist, such as inside loading iframes - // https://bugs.jquery.com/ticket/4833 - return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" ); -}; - -/** - * Sets document-related variables once based on the current document - * @param {Element|Object} [doc] An element or document object to use to set the document - * @returns {Object} Returns the current document - */ -setDocument = Sizzle.setDocument = function( node ) { - var hasCompare, subWindow, - doc = node ? node.ownerDocument || node : preferredDoc; - - // Return early if doc is invalid or already selected - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) { - return document; - } - - // Update global variables - document = doc; - docElem = document.documentElement; - documentIsHTML = !isXML( document ); - - // Support: IE 9 - 11+, Edge 12 - 18+ - // Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936) - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( preferredDoc != document && - ( subWindow = document.defaultView ) && subWindow.top !== subWindow ) { - - // Support: IE 11, Edge - if ( subWindow.addEventListener ) { - subWindow.addEventListener( "unload", unloadHandler, false ); - - // Support: IE 9 - 10 only - } else if ( subWindow.attachEvent ) { - subWindow.attachEvent( "onunload", unloadHandler ); - } - } - - // Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only, - // Safari 4 - 5 only, Opera <=11.6 - 12.x only - // IE/Edge & older browsers don't support the :scope pseudo-class. - // Support: Safari 6.0 only - // Safari 6.0 supports :scope but it's an alias of :root there. - support.scope = assert( function( el ) { - docElem.appendChild( el ).appendChild( document.createElement( "div" ) ); - return typeof el.querySelectorAll !== "undefined" && - !el.querySelectorAll( ":scope fieldset div" ).length; - } ); - - /* Attributes - ---------------------------------------------------------------------- */ - - // Support: IE<8 - // Verify that getAttribute really returns attributes and not properties - // (excepting IE8 booleans) - support.attributes = assert( function( el ) { - el.className = "i"; - return !el.getAttribute( "className" ); - } ); - - /* getElement(s)By* - ---------------------------------------------------------------------- */ - - // Check if getElementsByTagName("*") returns only elements - support.getElementsByTagName = assert( function( el ) { - el.appendChild( document.createComment( "" ) ); - return !el.getElementsByTagName( "*" ).length; - } ); - - // Support: IE<9 - support.getElementsByClassName = rnative.test( document.getElementsByClassName ); - - // Support: IE<10 - // Check if getElementById returns elements by name - // The broken getElementById methods don't pick up programmatically-set names, - // so use a roundabout getElementsByName test - support.getById = assert( function( el ) { - docElem.appendChild( el ).id = expando; - return !document.getElementsByName || !document.getElementsByName( expando ).length; - } ); - - // ID filter and find - if ( support.getById ) { - Expr.filter[ "ID" ] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - return elem.getAttribute( "id" ) === attrId; - }; - }; - Expr.find[ "ID" ] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var elem = context.getElementById( id ); - return elem ? [ elem ] : []; - } - }; - } else { - Expr.filter[ "ID" ] = function( id ) { - var attrId = id.replace( runescape, funescape ); - return function( elem ) { - var node = typeof elem.getAttributeNode !== "undefined" && - elem.getAttributeNode( "id" ); - return node && node.value === attrId; - }; - }; - - // Support: IE 6 - 7 only - // getElementById is not reliable as a find shortcut - Expr.find[ "ID" ] = function( id, context ) { - if ( typeof context.getElementById !== "undefined" && documentIsHTML ) { - var node, i, elems, - elem = context.getElementById( id ); - - if ( elem ) { - - // Verify the id attribute - node = elem.getAttributeNode( "id" ); - if ( node && node.value === id ) { - return [ elem ]; - } - - // Fall back on getElementsByName - elems = context.getElementsByName( id ); - i = 0; - while ( ( elem = elems[ i++ ] ) ) { - node = elem.getAttributeNode( "id" ); - if ( node && node.value === id ) { - return [ elem ]; - } - } - } - - return []; - } - }; - } - - // Tag - Expr.find[ "TAG" ] = support.getElementsByTagName ? - function( tag, context ) { - if ( typeof context.getElementsByTagName !== "undefined" ) { - return context.getElementsByTagName( tag ); - - // DocumentFragment nodes don't have gEBTN - } else if ( support.qsa ) { - return context.querySelectorAll( tag ); - } - } : - - function( tag, context ) { - var elem, - tmp = [], - i = 0, - - // By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too - results = context.getElementsByTagName( tag ); - - // Filter out possible comments - if ( tag === "*" ) { - while ( ( elem = results[ i++ ] ) ) { - if ( elem.nodeType === 1 ) { - tmp.push( elem ); - } - } - - return tmp; - } - return results; - }; - - // Class - Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) { - if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) { - return context.getElementsByClassName( className ); - } - }; - - /* QSA/matchesSelector - ---------------------------------------------------------------------- */ - - // QSA and matchesSelector support - - // matchesSelector(:active) reports false when true (IE9/Opera 11.5) - rbuggyMatches = []; - - // qSa(:focus) reports false when true (Chrome 21) - // We allow this because of a bug in IE8/9 that throws an error - // whenever `document.activeElement` is accessed on an iframe - // So, we allow :focus to pass through QSA all the time to avoid the IE error - // See https://bugs.jquery.com/ticket/13378 - rbuggyQSA = []; - - if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) { - - // Build QSA regex - // Regex strategy adopted from Diego Perini - assert( function( el ) { - - var input; - - // Select is set to empty string on purpose - // This is to test IE's treatment of not explicitly - // setting a boolean content attribute, - // since its presence should be enough - // https://bugs.jquery.com/ticket/12359 - docElem.appendChild( el ).innerHTML = "" + - ""; - - // Support: IE8, Opera 11-12.16 - // Nothing should be selected when empty strings follow ^= or $= or *= - // The test attribute must be unknown in Opera but "safe" for WinRT - // https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section - if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) { - rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" ); - } - - // Support: IE8 - // Boolean attributes and "value" are not treated correctly - if ( !el.querySelectorAll( "[selected]" ).length ) { - rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" ); - } - - // Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+ - if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) { - rbuggyQSA.push( "~=" ); - } - - // Support: IE 11+, Edge 15 - 18+ - // IE 11/Edge don't find elements on a `[name='']` query in some cases. - // Adding a temporary attribute to the document before the selection works - // around the issue. - // Interestingly, IE 10 & older don't seem to have the issue. - input = document.createElement( "input" ); - input.setAttribute( "name", "" ); - el.appendChild( input ); - if ( !el.querySelectorAll( "[name='']" ).length ) { - rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" + - whitespace + "*(?:''|\"\")" ); - } - - // Webkit/Opera - :checked should return selected option elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - // IE8 throws error here and will not see later tests - if ( !el.querySelectorAll( ":checked" ).length ) { - rbuggyQSA.push( ":checked" ); - } - - // Support: Safari 8+, iOS 8+ - // https://bugs.webkit.org/show_bug.cgi?id=136851 - // In-page `selector#id sibling-combinator selector` fails - if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) { - rbuggyQSA.push( ".#.+[+~]" ); - } - - // Support: Firefox <=3.6 - 5 only - // Old Firefox doesn't throw on a badly-escaped identifier. - el.querySelectorAll( "\\\f" ); - rbuggyQSA.push( "[\\r\\n\\f]" ); - } ); - - assert( function( el ) { - el.innerHTML = "" + - ""; - - // Support: Windows 8 Native Apps - // The type and name attributes are restricted during .innerHTML assignment - var input = document.createElement( "input" ); - input.setAttribute( "type", "hidden" ); - el.appendChild( input ).setAttribute( "name", "D" ); - - // Support: IE8 - // Enforce case-sensitivity of name attribute - if ( el.querySelectorAll( "[name=d]" ).length ) { - rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" ); - } - - // FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled) - // IE8 throws error here and will not see later tests - if ( el.querySelectorAll( ":enabled" ).length !== 2 ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Support: IE9-11+ - // IE's :disabled selector does not pick up the children of disabled fieldsets - docElem.appendChild( el ).disabled = true; - if ( el.querySelectorAll( ":disabled" ).length !== 2 ) { - rbuggyQSA.push( ":enabled", ":disabled" ); - } - - // Support: Opera 10 - 11 only - // Opera 10-11 does not throw on post-comma invalid pseudos - el.querySelectorAll( "*,:x" ); - rbuggyQSA.push( ",.*:" ); - } ); - } - - if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches || - docElem.webkitMatchesSelector || - docElem.mozMatchesSelector || - docElem.oMatchesSelector || - docElem.msMatchesSelector ) ) ) ) { - - assert( function( el ) { - - // Check to see if it's possible to do matchesSelector - // on a disconnected node (IE 9) - support.disconnectedMatch = matches.call( el, "*" ); - - // This should fail with an exception - // Gecko does not error, returns false instead - matches.call( el, "[s!='']:x" ); - rbuggyMatches.push( "!=", pseudos ); - } ); - } - - rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) ); - rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) ); - - /* Contains - ---------------------------------------------------------------------- */ - hasCompare = rnative.test( docElem.compareDocumentPosition ); - - // Element contains another - // Purposefully self-exclusive - // As in, an element does not contain itself - contains = hasCompare || rnative.test( docElem.contains ) ? - function( a, b ) { - var adown = a.nodeType === 9 ? a.documentElement : a, - bup = b && b.parentNode; - return a === bup || !!( bup && bup.nodeType === 1 && ( - adown.contains ? - adown.contains( bup ) : - a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16 - ) ); - } : - function( a, b ) { - if ( b ) { - while ( ( b = b.parentNode ) ) { - if ( b === a ) { - return true; - } - } - } - return false; - }; - - /* Sorting - ---------------------------------------------------------------------- */ - - // Document order sorting - sortOrder = hasCompare ? - function( a, b ) { - - // Flag for duplicate removal - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - // Sort on method existence if only one input has compareDocumentPosition - var compare = !a.compareDocumentPosition - !b.compareDocumentPosition; - if ( compare ) { - return compare; - } - - // Calculate position if both inputs belong to the same document - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ? - a.compareDocumentPosition( b ) : - - // Otherwise we know they are disconnected - 1; - - // Disconnected nodes - if ( compare & 1 || - ( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) { - - // Choose the first element that is related to our preferred document - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( a == document || a.ownerDocument == preferredDoc && - contains( preferredDoc, a ) ) { - return -1; - } - - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( b == document || b.ownerDocument == preferredDoc && - contains( preferredDoc, b ) ) { - return 1; - } - - // Maintain original order - return sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - } - - return compare & 4 ? -1 : 1; - } : - function( a, b ) { - - // Exit early if the nodes are identical - if ( a === b ) { - hasDuplicate = true; - return 0; - } - - var cur, - i = 0, - aup = a.parentNode, - bup = b.parentNode, - ap = [ a ], - bp = [ b ]; - - // Parentless nodes are either documents or disconnected - if ( !aup || !bup ) { - - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - /* eslint-disable eqeqeq */ - return a == document ? -1 : - b == document ? 1 : - /* eslint-enable eqeqeq */ - aup ? -1 : - bup ? 1 : - sortInput ? - ( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) : - 0; - - // If the nodes are siblings, we can do a quick check - } else if ( aup === bup ) { - return siblingCheck( a, b ); - } - - // Otherwise we need full lists of their ancestors for comparison - cur = a; - while ( ( cur = cur.parentNode ) ) { - ap.unshift( cur ); - } - cur = b; - while ( ( cur = cur.parentNode ) ) { - bp.unshift( cur ); - } - - // Walk down the tree looking for a discrepancy - while ( ap[ i ] === bp[ i ] ) { - i++; - } - - return i ? - - // Do a sibling check if the nodes have a common ancestor - siblingCheck( ap[ i ], bp[ i ] ) : - - // Otherwise nodes in our document sort first - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - /* eslint-disable eqeqeq */ - ap[ i ] == preferredDoc ? -1 : - bp[ i ] == preferredDoc ? 1 : - /* eslint-enable eqeqeq */ - 0; - }; - - return document; -}; - -Sizzle.matches = function( expr, elements ) { - return Sizzle( expr, null, null, elements ); -}; - -Sizzle.matchesSelector = function( elem, expr ) { - setDocument( elem ); - - if ( support.matchesSelector && documentIsHTML && - !nonnativeSelectorCache[ expr + " " ] && - ( !rbuggyMatches || !rbuggyMatches.test( expr ) ) && - ( !rbuggyQSA || !rbuggyQSA.test( expr ) ) ) { - - try { - var ret = matches.call( elem, expr ); - - // IE 9's matchesSelector returns false on disconnected nodes - if ( ret || support.disconnectedMatch || - - // As well, disconnected nodes are said to be in a document - // fragment in IE 9 - elem.document && elem.document.nodeType !== 11 ) { - return ret; - } - } catch ( e ) { - nonnativeSelectorCache( expr, true ); - } - } - - return Sizzle( expr, document, null, [ elem ] ).length > 0; -}; - -Sizzle.contains = function( context, elem ) { - - // Set document vars if needed - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( ( context.ownerDocument || context ) != document ) { - setDocument( context ); - } - return contains( context, elem ); -}; - -Sizzle.attr = function( elem, name ) { - - // Set document vars if needed - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( ( elem.ownerDocument || elem ) != document ) { - setDocument( elem ); - } - - var fn = Expr.attrHandle[ name.toLowerCase() ], - - // Don't get fooled by Object.prototype properties (jQuery #13807) - val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ? - fn( elem, name, !documentIsHTML ) : - undefined; - - return val !== undefined ? - val : - support.attributes || !documentIsHTML ? - elem.getAttribute( name ) : - ( val = elem.getAttributeNode( name ) ) && val.specified ? - val.value : - null; -}; - -Sizzle.escape = function( sel ) { - return ( sel + "" ).replace( rcssescape, fcssescape ); -}; - -Sizzle.error = function( msg ) { - throw new Error( "Syntax error, unrecognized expression: " + msg ); -}; - -/** - * Document sorting and removing duplicates - * @param {ArrayLike} results - */ -Sizzle.uniqueSort = function( results ) { - var elem, - duplicates = [], - j = 0, - i = 0; - - // Unless we *know* we can detect duplicates, assume their presence - hasDuplicate = !support.detectDuplicates; - sortInput = !support.sortStable && results.slice( 0 ); - results.sort( sortOrder ); - - if ( hasDuplicate ) { - while ( ( elem = results[ i++ ] ) ) { - if ( elem === results[ i ] ) { - j = duplicates.push( i ); - } - } - while ( j-- ) { - results.splice( duplicates[ j ], 1 ); - } - } - - // Clear input after sorting to release objects - // See https://github.com/jquery/sizzle/pull/225 - sortInput = null; - - return results; -}; - -/** - * Utility function for retrieving the text value of an array of DOM nodes - * @param {Array|Element} elem - */ -getText = Sizzle.getText = function( elem ) { - var node, - ret = "", - i = 0, - nodeType = elem.nodeType; - - if ( !nodeType ) { - - // If no nodeType, this is expected to be an array - while ( ( node = elem[ i++ ] ) ) { - - // Do not traverse comment nodes - ret += getText( node ); - } - } else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) { - - // Use textContent for elements - // innerText usage removed for consistency of new lines (jQuery #11153) - if ( typeof elem.textContent === "string" ) { - return elem.textContent; - } else { - - // Traverse its children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - ret += getText( elem ); - } - } - } else if ( nodeType === 3 || nodeType === 4 ) { - return elem.nodeValue; - } - - // Do not include comment or processing instruction nodes - - return ret; -}; - -Expr = Sizzle.selectors = { - - // Can be adjusted by the user - cacheLength: 50, - - createPseudo: markFunction, - - match: matchExpr, - - attrHandle: {}, - - find: {}, - - relative: { - ">": { dir: "parentNode", first: true }, - " ": { dir: "parentNode" }, - "+": { dir: "previousSibling", first: true }, - "~": { dir: "previousSibling" } - }, - - preFilter: { - "ATTR": function( match ) { - match[ 1 ] = match[ 1 ].replace( runescape, funescape ); - - // Move the given value to match[3] whether quoted or unquoted - match[ 3 ] = ( match[ 3 ] || match[ 4 ] || - match[ 5 ] || "" ).replace( runescape, funescape ); - - if ( match[ 2 ] === "~=" ) { - match[ 3 ] = " " + match[ 3 ] + " "; - } - - return match.slice( 0, 4 ); - }, - - "CHILD": function( match ) { - - /* matches from matchExpr["CHILD"] - 1 type (only|nth|...) - 2 what (child|of-type) - 3 argument (even|odd|\d*|\d*n([+-]\d+)?|...) - 4 xn-component of xn+y argument ([+-]?\d*n|) - 5 sign of xn-component - 6 x of xn-component - 7 sign of y-component - 8 y of y-component - */ - match[ 1 ] = match[ 1 ].toLowerCase(); - - if ( match[ 1 ].slice( 0, 3 ) === "nth" ) { - - // nth-* requires argument - if ( !match[ 3 ] ) { - Sizzle.error( match[ 0 ] ); - } - - // numeric x and y parameters for Expr.filter.CHILD - // remember that false/true cast respectively to 0/1 - match[ 4 ] = +( match[ 4 ] ? - match[ 5 ] + ( match[ 6 ] || 1 ) : - 2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) ); - match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" ); - - // other types prohibit arguments - } else if ( match[ 3 ] ) { - Sizzle.error( match[ 0 ] ); - } - - return match; - }, - - "PSEUDO": function( match ) { - var excess, - unquoted = !match[ 6 ] && match[ 2 ]; - - if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) { - return null; - } - - // Accept quoted arguments as-is - if ( match[ 3 ] ) { - match[ 2 ] = match[ 4 ] || match[ 5 ] || ""; - - // Strip excess characters from unquoted arguments - } else if ( unquoted && rpseudo.test( unquoted ) && - - // Get excess from tokenize (recursively) - ( excess = tokenize( unquoted, true ) ) && - - // advance to the next closing parenthesis - ( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) { - - // excess is a negative index - match[ 0 ] = match[ 0 ].slice( 0, excess ); - match[ 2 ] = unquoted.slice( 0, excess ); - } - - // Return only captures needed by the pseudo filter method (type and argument) - return match.slice( 0, 3 ); - } - }, - - filter: { - - "TAG": function( nodeNameSelector ) { - var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase(); - return nodeNameSelector === "*" ? - function() { - return true; - } : - function( elem ) { - return elem.nodeName && elem.nodeName.toLowerCase() === nodeName; - }; - }, - - "CLASS": function( className ) { - var pattern = classCache[ className + " " ]; - - return pattern || - ( pattern = new RegExp( "(^|" + whitespace + - ")" + className + "(" + whitespace + "|$)" ) ) && classCache( - className, function( elem ) { - return pattern.test( - typeof elem.className === "string" && elem.className || - typeof elem.getAttribute !== "undefined" && - elem.getAttribute( "class" ) || - "" - ); - } ); - }, - - "ATTR": function( name, operator, check ) { - return function( elem ) { - var result = Sizzle.attr( elem, name ); - - if ( result == null ) { - return operator === "!="; - } - if ( !operator ) { - return true; - } - - result += ""; - - /* eslint-disable max-len */ - - return operator === "=" ? result === check : - operator === "!=" ? result !== check : - operator === "^=" ? check && result.indexOf( check ) === 0 : - operator === "*=" ? check && result.indexOf( check ) > -1 : - operator === "$=" ? check && result.slice( -check.length ) === check : - operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 : - operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" : - false; - /* eslint-enable max-len */ - - }; - }, - - "CHILD": function( type, what, _argument, first, last ) { - var simple = type.slice( 0, 3 ) !== "nth", - forward = type.slice( -4 ) !== "last", - ofType = what === "of-type"; - - return first === 1 && last === 0 ? - - // Shortcut for :nth-*(n) - function( elem ) { - return !!elem.parentNode; - } : - - function( elem, _context, xml ) { - var cache, uniqueCache, outerCache, node, nodeIndex, start, - dir = simple !== forward ? "nextSibling" : "previousSibling", - parent = elem.parentNode, - name = ofType && elem.nodeName.toLowerCase(), - useCache = !xml && !ofType, - diff = false; - - if ( parent ) { - - // :(first|last|only)-(child|of-type) - if ( simple ) { - while ( dir ) { - node = elem; - while ( ( node = node[ dir ] ) ) { - if ( ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1 ) { - - return false; - } - } - - // Reverse direction for :only-* (if we haven't yet done so) - start = dir = type === "only" && !start && "nextSibling"; - } - return true; - } - - start = [ forward ? parent.firstChild : parent.lastChild ]; - - // non-xml :nth-child(...) stores cache data on `parent` - if ( forward && useCache ) { - - // Seek `elem` from a previously-cached index - - // ...in a gzip-friendly way - node = parent; - outerCache = node[ expando ] || ( node[ expando ] = {} ); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - ( outerCache[ node.uniqueID ] = {} ); - - cache = uniqueCache[ type ] || []; - nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; - diff = nodeIndex && cache[ 2 ]; - node = nodeIndex && parent.childNodes[ nodeIndex ]; - - while ( ( node = ++nodeIndex && node && node[ dir ] || - - // Fallback to seeking `elem` from the start - ( diff = nodeIndex = 0 ) || start.pop() ) ) { - - // When found, cache indexes on `parent` and break - if ( node.nodeType === 1 && ++diff && node === elem ) { - uniqueCache[ type ] = [ dirruns, nodeIndex, diff ]; - break; - } - } - - } else { - - // Use previously-cached element index if available - if ( useCache ) { - - // ...in a gzip-friendly way - node = elem; - outerCache = node[ expando ] || ( node[ expando ] = {} ); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - ( outerCache[ node.uniqueID ] = {} ); - - cache = uniqueCache[ type ] || []; - nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ]; - diff = nodeIndex; - } - - // xml :nth-child(...) - // or :nth-last-child(...) or :nth(-last)?-of-type(...) - if ( diff === false ) { - - // Use the same loop as above to seek `elem` from the start - while ( ( node = ++nodeIndex && node && node[ dir ] || - ( diff = nodeIndex = 0 ) || start.pop() ) ) { - - if ( ( ofType ? - node.nodeName.toLowerCase() === name : - node.nodeType === 1 ) && - ++diff ) { - - // Cache the index of each encountered element - if ( useCache ) { - outerCache = node[ expando ] || - ( node[ expando ] = {} ); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ node.uniqueID ] || - ( outerCache[ node.uniqueID ] = {} ); - - uniqueCache[ type ] = [ dirruns, diff ]; - } - - if ( node === elem ) { - break; - } - } - } - } - } - - // Incorporate the offset, then check against cycle size - diff -= last; - return diff === first || ( diff % first === 0 && diff / first >= 0 ); - } - }; - }, - - "PSEUDO": function( pseudo, argument ) { - - // pseudo-class names are case-insensitive - // http://www.w3.org/TR/selectors/#pseudo-classes - // Prioritize by case sensitivity in case custom pseudos are added with uppercase letters - // Remember that setFilters inherits from pseudos - var args, - fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] || - Sizzle.error( "unsupported pseudo: " + pseudo ); - - // The user may use createPseudo to indicate that - // arguments are needed to create the filter function - // just as Sizzle does - if ( fn[ expando ] ) { - return fn( argument ); - } - - // But maintain support for old signatures - if ( fn.length > 1 ) { - args = [ pseudo, pseudo, "", argument ]; - return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ? - markFunction( function( seed, matches ) { - var idx, - matched = fn( seed, argument ), - i = matched.length; - while ( i-- ) { - idx = indexOf( seed, matched[ i ] ); - seed[ idx ] = !( matches[ idx ] = matched[ i ] ); - } - } ) : - function( elem ) { - return fn( elem, 0, args ); - }; - } - - return fn; - } - }, - - pseudos: { - - // Potentially complex pseudos - "not": markFunction( function( selector ) { - - // Trim the selector passed to compile - // to avoid treating leading and trailing - // spaces as combinators - var input = [], - results = [], - matcher = compile( selector.replace( rtrim, "$1" ) ); - - return matcher[ expando ] ? - markFunction( function( seed, matches, _context, xml ) { - var elem, - unmatched = matcher( seed, null, xml, [] ), - i = seed.length; - - // Match elements unmatched by `matcher` - while ( i-- ) { - if ( ( elem = unmatched[ i ] ) ) { - seed[ i ] = !( matches[ i ] = elem ); - } - } - } ) : - function( elem, _context, xml ) { - input[ 0 ] = elem; - matcher( input, null, xml, results ); - - // Don't keep the element (issue #299) - input[ 0 ] = null; - return !results.pop(); - }; - } ), - - "has": markFunction( function( selector ) { - return function( elem ) { - return Sizzle( selector, elem ).length > 0; - }; - } ), - - "contains": markFunction( function( text ) { - text = text.replace( runescape, funescape ); - return function( elem ) { - return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1; - }; - } ), - - // "Whether an element is represented by a :lang() selector - // is based solely on the element's language value - // being equal to the identifier C, - // or beginning with the identifier C immediately followed by "-". - // The matching of C against the element's language value is performed case-insensitively. - // The identifier C does not have to be a valid language name." - // http://www.w3.org/TR/selectors/#lang-pseudo - "lang": markFunction( function( lang ) { - - // lang value must be a valid identifier - if ( !ridentifier.test( lang || "" ) ) { - Sizzle.error( "unsupported lang: " + lang ); - } - lang = lang.replace( runescape, funescape ).toLowerCase(); - return function( elem ) { - var elemLang; - do { - if ( ( elemLang = documentIsHTML ? - elem.lang : - elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) { - - elemLang = elemLang.toLowerCase(); - return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0; - } - } while ( ( elem = elem.parentNode ) && elem.nodeType === 1 ); - return false; - }; - } ), - - // Miscellaneous - "target": function( elem ) { - var hash = window.location && window.location.hash; - return hash && hash.slice( 1 ) === elem.id; - }, - - "root": function( elem ) { - return elem === docElem; - }, - - "focus": function( elem ) { - return elem === document.activeElement && - ( !document.hasFocus || document.hasFocus() ) && - !!( elem.type || elem.href || ~elem.tabIndex ); - }, - - // Boolean properties - "enabled": createDisabledPseudo( false ), - "disabled": createDisabledPseudo( true ), - - "checked": function( elem ) { - - // In CSS3, :checked should return both checked and selected elements - // http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked - var nodeName = elem.nodeName.toLowerCase(); - return ( nodeName === "input" && !!elem.checked ) || - ( nodeName === "option" && !!elem.selected ); - }, - - "selected": function( elem ) { - - // Accessing this property makes selected-by-default - // options in Safari work properly - if ( elem.parentNode ) { - // eslint-disable-next-line no-unused-expressions - elem.parentNode.selectedIndex; - } - - return elem.selected === true; - }, - - // Contents - "empty": function( elem ) { - - // http://www.w3.org/TR/selectors/#empty-pseudo - // :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5), - // but not by others (comment: 8; processing instruction: 7; etc.) - // nodeType < 6 works because attributes (2) do not appear as children - for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) { - if ( elem.nodeType < 6 ) { - return false; - } - } - return true; - }, - - "parent": function( elem ) { - return !Expr.pseudos[ "empty" ]( elem ); - }, - - // Element/input types - "header": function( elem ) { - return rheader.test( elem.nodeName ); - }, - - "input": function( elem ) { - return rinputs.test( elem.nodeName ); - }, - - "button": function( elem ) { - var name = elem.nodeName.toLowerCase(); - return name === "input" && elem.type === "button" || name === "button"; - }, - - "text": function( elem ) { - var attr; - return elem.nodeName.toLowerCase() === "input" && - elem.type === "text" && - - // Support: IE<8 - // New HTML5 attribute values (e.g., "search") appear with elem.type === "text" - ( ( attr = elem.getAttribute( "type" ) ) == null || - attr.toLowerCase() === "text" ); - }, - - // Position-in-collection - "first": createPositionalPseudo( function() { - return [ 0 ]; - } ), - - "last": createPositionalPseudo( function( _matchIndexes, length ) { - return [ length - 1 ]; - } ), - - "eq": createPositionalPseudo( function( _matchIndexes, length, argument ) { - return [ argument < 0 ? argument + length : argument ]; - } ), - - "even": createPositionalPseudo( function( matchIndexes, length ) { - var i = 0; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - } ), - - "odd": createPositionalPseudo( function( matchIndexes, length ) { - var i = 1; - for ( ; i < length; i += 2 ) { - matchIndexes.push( i ); - } - return matchIndexes; - } ), - - "lt": createPositionalPseudo( function( matchIndexes, length, argument ) { - var i = argument < 0 ? - argument + length : - argument > length ? - length : - argument; - for ( ; --i >= 0; ) { - matchIndexes.push( i ); - } - return matchIndexes; - } ), - - "gt": createPositionalPseudo( function( matchIndexes, length, argument ) { - var i = argument < 0 ? argument + length : argument; - for ( ; ++i < length; ) { - matchIndexes.push( i ); - } - return matchIndexes; - } ) - } -}; - -Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ]; - -// Add button/input type pseudos -for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) { - Expr.pseudos[ i ] = createInputPseudo( i ); -} -for ( i in { submit: true, reset: true } ) { - Expr.pseudos[ i ] = createButtonPseudo( i ); -} - -// Easy API for creating new setFilters -function setFilters() {} -setFilters.prototype = Expr.filters = Expr.pseudos; -Expr.setFilters = new setFilters(); - -tokenize = Sizzle.tokenize = function( selector, parseOnly ) { - var matched, match, tokens, type, - soFar, groups, preFilters, - cached = tokenCache[ selector + " " ]; - - if ( cached ) { - return parseOnly ? 0 : cached.slice( 0 ); - } - - soFar = selector; - groups = []; - preFilters = Expr.preFilter; - - while ( soFar ) { - - // Comma and first run - if ( !matched || ( match = rcomma.exec( soFar ) ) ) { - if ( match ) { - - // Don't consume trailing commas as valid - soFar = soFar.slice( match[ 0 ].length ) || soFar; - } - groups.push( ( tokens = [] ) ); - } - - matched = false; - - // Combinators - if ( ( match = rcombinators.exec( soFar ) ) ) { - matched = match.shift(); - tokens.push( { - value: matched, - - // Cast descendant combinators to space - type: match[ 0 ].replace( rtrim, " " ) - } ); - soFar = soFar.slice( matched.length ); - } - - // Filters - for ( type in Expr.filter ) { - if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] || - ( match = preFilters[ type ]( match ) ) ) ) { - matched = match.shift(); - tokens.push( { - value: matched, - type: type, - matches: match - } ); - soFar = soFar.slice( matched.length ); - } - } - - if ( !matched ) { - break; - } - } - - // Return the length of the invalid excess - // if we're just parsing - // Otherwise, throw an error or return tokens - return parseOnly ? - soFar.length : - soFar ? - Sizzle.error( selector ) : - - // Cache the tokens - tokenCache( selector, groups ).slice( 0 ); -}; - -function toSelector( tokens ) { - var i = 0, - len = tokens.length, - selector = ""; - for ( ; i < len; i++ ) { - selector += tokens[ i ].value; - } - return selector; -} - -function addCombinator( matcher, combinator, base ) { - var dir = combinator.dir, - skip = combinator.next, - key = skip || dir, - checkNonElements = base && key === "parentNode", - doneName = done++; - - return combinator.first ? - - // Check against closest ancestor/preceding element - function( elem, context, xml ) { - while ( ( elem = elem[ dir ] ) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - return matcher( elem, context, xml ); - } - } - return false; - } : - - // Check against all ancestor/preceding elements - function( elem, context, xml ) { - var oldCache, uniqueCache, outerCache, - newCache = [ dirruns, doneName ]; - - // We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching - if ( xml ) { - while ( ( elem = elem[ dir ] ) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - if ( matcher( elem, context, xml ) ) { - return true; - } - } - } - } else { - while ( ( elem = elem[ dir ] ) ) { - if ( elem.nodeType === 1 || checkNonElements ) { - outerCache = elem[ expando ] || ( elem[ expando ] = {} ); - - // Support: IE <9 only - // Defend against cloned attroperties (jQuery gh-1709) - uniqueCache = outerCache[ elem.uniqueID ] || - ( outerCache[ elem.uniqueID ] = {} ); - - if ( skip && skip === elem.nodeName.toLowerCase() ) { - elem = elem[ dir ] || elem; - } else if ( ( oldCache = uniqueCache[ key ] ) && - oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) { - - // Assign to newCache so results back-propagate to previous elements - return ( newCache[ 2 ] = oldCache[ 2 ] ); - } else { - - // Reuse newcache so results back-propagate to previous elements - uniqueCache[ key ] = newCache; - - // A match means we're done; a fail means we have to keep checking - if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) { - return true; - } - } - } - } - } - return false; - }; -} - -function elementMatcher( matchers ) { - return matchers.length > 1 ? - function( elem, context, xml ) { - var i = matchers.length; - while ( i-- ) { - if ( !matchers[ i ]( elem, context, xml ) ) { - return false; - } - } - return true; - } : - matchers[ 0 ]; -} - -function multipleContexts( selector, contexts, results ) { - var i = 0, - len = contexts.length; - for ( ; i < len; i++ ) { - Sizzle( selector, contexts[ i ], results ); - } - return results; -} - -function condense( unmatched, map, filter, context, xml ) { - var elem, - newUnmatched = [], - i = 0, - len = unmatched.length, - mapped = map != null; - - for ( ; i < len; i++ ) { - if ( ( elem = unmatched[ i ] ) ) { - if ( !filter || filter( elem, context, xml ) ) { - newUnmatched.push( elem ); - if ( mapped ) { - map.push( i ); - } - } - } - } - - return newUnmatched; -} - -function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) { - if ( postFilter && !postFilter[ expando ] ) { - postFilter = setMatcher( postFilter ); - } - if ( postFinder && !postFinder[ expando ] ) { - postFinder = setMatcher( postFinder, postSelector ); - } - return markFunction( function( seed, results, context, xml ) { - var temp, i, elem, - preMap = [], - postMap = [], - preexisting = results.length, - - // Get initial elements from seed or context - elems = seed || multipleContexts( - selector || "*", - context.nodeType ? [ context ] : context, - [] - ), - - // Prefilter to get matcher input, preserving a map for seed-results synchronization - matcherIn = preFilter && ( seed || !selector ) ? - condense( elems, preMap, preFilter, context, xml ) : - elems, - - matcherOut = matcher ? - - // If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results, - postFinder || ( seed ? preFilter : preexisting || postFilter ) ? - - // ...intermediate processing is necessary - [] : - - // ...otherwise use results directly - results : - matcherIn; - - // Find primary matches - if ( matcher ) { - matcher( matcherIn, matcherOut, context, xml ); - } - - // Apply postFilter - if ( postFilter ) { - temp = condense( matcherOut, postMap ); - postFilter( temp, [], context, xml ); - - // Un-match failing elements by moving them back to matcherIn - i = temp.length; - while ( i-- ) { - if ( ( elem = temp[ i ] ) ) { - matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem ); - } - } - } - - if ( seed ) { - if ( postFinder || preFilter ) { - if ( postFinder ) { - - // Get the final matcherOut by condensing this intermediate into postFinder contexts - temp = []; - i = matcherOut.length; - while ( i-- ) { - if ( ( elem = matcherOut[ i ] ) ) { - - // Restore matcherIn since elem is not yet a final match - temp.push( ( matcherIn[ i ] = elem ) ); - } - } - postFinder( null, ( matcherOut = [] ), temp, xml ); - } - - // Move matched elements from seed to results to keep them synchronized - i = matcherOut.length; - while ( i-- ) { - if ( ( elem = matcherOut[ i ] ) && - ( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) { - - seed[ temp ] = !( results[ temp ] = elem ); - } - } - } - - // Add elements to results, through postFinder if defined - } else { - matcherOut = condense( - matcherOut === results ? - matcherOut.splice( preexisting, matcherOut.length ) : - matcherOut - ); - if ( postFinder ) { - postFinder( null, results, matcherOut, xml ); - } else { - push.apply( results, matcherOut ); - } - } - } ); -} - -function matcherFromTokens( tokens ) { - var checkContext, matcher, j, - len = tokens.length, - leadingRelative = Expr.relative[ tokens[ 0 ].type ], - implicitRelative = leadingRelative || Expr.relative[ " " ], - i = leadingRelative ? 1 : 0, - - // The foundational matcher ensures that elements are reachable from top-level context(s) - matchContext = addCombinator( function( elem ) { - return elem === checkContext; - }, implicitRelative, true ), - matchAnyContext = addCombinator( function( elem ) { - return indexOf( checkContext, elem ) > -1; - }, implicitRelative, true ), - matchers = [ function( elem, context, xml ) { - var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || ( - ( checkContext = context ).nodeType ? - matchContext( elem, context, xml ) : - matchAnyContext( elem, context, xml ) ); - - // Avoid hanging onto element (issue #299) - checkContext = null; - return ret; - } ]; - - for ( ; i < len; i++ ) { - if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) { - matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ]; - } else { - matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches ); - - // Return special upon seeing a positional matcher - if ( matcher[ expando ] ) { - - // Find the next relative operator (if any) for proper handling - j = ++i; - for ( ; j < len; j++ ) { - if ( Expr.relative[ tokens[ j ].type ] ) { - break; - } - } - return setMatcher( - i > 1 && elementMatcher( matchers ), - i > 1 && toSelector( - - // If the preceding token was a descendant combinator, insert an implicit any-element `*` - tokens - .slice( 0, i - 1 ) - .concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } ) - ).replace( rtrim, "$1" ), - matcher, - i < j && matcherFromTokens( tokens.slice( i, j ) ), - j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ), - j < len && toSelector( tokens ) - ); - } - matchers.push( matcher ); - } - } - - return elementMatcher( matchers ); -} - -function matcherFromGroupMatchers( elementMatchers, setMatchers ) { - var bySet = setMatchers.length > 0, - byElement = elementMatchers.length > 0, - superMatcher = function( seed, context, xml, results, outermost ) { - var elem, j, matcher, - matchedCount = 0, - i = "0", - unmatched = seed && [], - setMatched = [], - contextBackup = outermostContext, - - // We must always have either seed elements or outermost context - elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ), - - // Use integer dirruns iff this is the outermost matcher - dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ), - len = elems.length; - - if ( outermost ) { - - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - outermostContext = context == document || context || outermost; - } - - // Add elements passing elementMatchers directly to results - // Support: IE<9, Safari - // Tolerate NodeList properties (IE: "length"; Safari: ) matching elements by id - for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) { - if ( byElement && elem ) { - j = 0; - - // Support: IE 11+, Edge 17 - 18+ - // IE/Edge sometimes throw a "Permission denied" error when strict-comparing - // two documents; shallow comparisons work. - // eslint-disable-next-line eqeqeq - if ( !context && elem.ownerDocument != document ) { - setDocument( elem ); - xml = !documentIsHTML; - } - while ( ( matcher = elementMatchers[ j++ ] ) ) { - if ( matcher( elem, context || document, xml ) ) { - results.push( elem ); - break; - } - } - if ( outermost ) { - dirruns = dirrunsUnique; - } - } - - // Track unmatched elements for set filters - if ( bySet ) { - - // They will have gone through all possible matchers - if ( ( elem = !matcher && elem ) ) { - matchedCount--; - } - - // Lengthen the array for every element, matched or not - if ( seed ) { - unmatched.push( elem ); - } - } - } - - // `i` is now the count of elements visited above, and adding it to `matchedCount` - // makes the latter nonnegative. - matchedCount += i; - - // Apply set filters to unmatched elements - // NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount` - // equals `i`), unless we didn't visit _any_ elements in the above loop because we have - // no element matchers and no seed. - // Incrementing an initially-string "0" `i` allows `i` to remain a string only in that - // case, which will result in a "00" `matchedCount` that differs from `i` but is also - // numerically zero. - if ( bySet && i !== matchedCount ) { - j = 0; - while ( ( matcher = setMatchers[ j++ ] ) ) { - matcher( unmatched, setMatched, context, xml ); - } - - if ( seed ) { - - // Reintegrate element matches to eliminate the need for sorting - if ( matchedCount > 0 ) { - while ( i-- ) { - if ( !( unmatched[ i ] || setMatched[ i ] ) ) { - setMatched[ i ] = pop.call( results ); - } - } - } - - // Discard index placeholder values to get only actual matches - setMatched = condense( setMatched ); - } - - // Add matches to results - push.apply( results, setMatched ); - - // Seedless set matches succeeding multiple successful matchers stipulate sorting - if ( outermost && !seed && setMatched.length > 0 && - ( matchedCount + setMatchers.length ) > 1 ) { - - Sizzle.uniqueSort( results ); - } - } - - // Override manipulation of globals by nested matchers - if ( outermost ) { - dirruns = dirrunsUnique; - outermostContext = contextBackup; - } - - return unmatched; - }; - - return bySet ? - markFunction( superMatcher ) : - superMatcher; -} - -compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) { - var i, - setMatchers = [], - elementMatchers = [], - cached = compilerCache[ selector + " " ]; - - if ( !cached ) { - - // Generate a function of recursive functions that can be used to check each element - if ( !match ) { - match = tokenize( selector ); - } - i = match.length; - while ( i-- ) { - cached = matcherFromTokens( match[ i ] ); - if ( cached[ expando ] ) { - setMatchers.push( cached ); - } else { - elementMatchers.push( cached ); - } - } - - // Cache the compiled function - cached = compilerCache( - selector, - matcherFromGroupMatchers( elementMatchers, setMatchers ) - ); - - // Save selector and tokenization - cached.selector = selector; - } - return cached; -}; - -/** - * A low-level selection function that works with Sizzle's compiled - * selector functions - * @param {String|Function} selector A selector or a pre-compiled - * selector function built with Sizzle.compile - * @param {Element} context - * @param {Array} [results] - * @param {Array} [seed] A set of elements to match against - */ -select = Sizzle.select = function( selector, context, results, seed ) { - var i, tokens, token, type, find, - compiled = typeof selector === "function" && selector, - match = !seed && tokenize( ( selector = compiled.selector || selector ) ); - - results = results || []; - - // Try to minimize operations if there is only one selector in the list and no seed - // (the latter of which guarantees us context) - if ( match.length === 1 ) { - - // Reduce context if the leading compound selector is an ID - tokens = match[ 0 ] = match[ 0 ].slice( 0 ); - if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" && - context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) { - - context = ( Expr.find[ "ID" ]( token.matches[ 0 ] - .replace( runescape, funescape ), context ) || [] )[ 0 ]; - if ( !context ) { - return results; - - // Precompiled matchers will still verify ancestry, so step up a level - } else if ( compiled ) { - context = context.parentNode; - } - - selector = selector.slice( tokens.shift().value.length ); - } - - // Fetch a seed set for right-to-left matching - i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length; - while ( i-- ) { - token = tokens[ i ]; - - // Abort if we hit a combinator - if ( Expr.relative[ ( type = token.type ) ] ) { - break; - } - if ( ( find = Expr.find[ type ] ) ) { - - // Search, expanding context for leading sibling combinators - if ( ( seed = find( - token.matches[ 0 ].replace( runescape, funescape ), - rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) || - context - ) ) ) { - - // If seed is empty or no tokens remain, we can return early - tokens.splice( i, 1 ); - selector = seed.length && toSelector( tokens ); - if ( !selector ) { - push.apply( results, seed ); - return results; - } - - break; - } - } - } - } - - // Compile and execute a filtering function if one is not provided - // Provide `match` to avoid retokenization if we modified the selector above - ( compiled || compile( selector, match ) )( - seed, - context, - !documentIsHTML, - results, - !context || rsibling.test( selector ) && testContext( context.parentNode ) || context - ); - return results; -}; - -// One-time assignments - -// Sort stability -support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando; - -// Support: Chrome 14-35+ -// Always assume duplicates if they aren't passed to the comparison function -support.detectDuplicates = !!hasDuplicate; - -// Initialize against the default document -setDocument(); - -// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27) -// Detached nodes confoundingly follow *each other* -support.sortDetached = assert( function( el ) { - - // Should return 1, but returns 4 (following) - return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1; -} ); - -// Support: IE<8 -// Prevent attribute/property "interpolation" -// https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx -if ( !assert( function( el ) { - el.innerHTML = ""; - return el.firstChild.getAttribute( "href" ) === "#"; -} ) ) { - addHandle( "type|href|height|width", function( elem, name, isXML ) { - if ( !isXML ) { - return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 ); - } - } ); -} - -// Support: IE<9 -// Use defaultValue in place of getAttribute("value") -if ( !support.attributes || !assert( function( el ) { - el.innerHTML = ""; - el.firstChild.setAttribute( "value", "" ); - return el.firstChild.getAttribute( "value" ) === ""; -} ) ) { - addHandle( "value", function( elem, _name, isXML ) { - if ( !isXML && elem.nodeName.toLowerCase() === "input" ) { - return elem.defaultValue; - } - } ); -} - -// Support: IE<9 -// Use getAttributeNode to fetch booleans when getAttribute lies -if ( !assert( function( el ) { - return el.getAttribute( "disabled" ) == null; -} ) ) { - addHandle( booleans, function( elem, name, isXML ) { - var val; - if ( !isXML ) { - return elem[ name ] === true ? name.toLowerCase() : - ( val = elem.getAttributeNode( name ) ) && val.specified ? - val.value : - null; - } - } ); -} - -return Sizzle; - -} )( window ); - - - -jQuery.find = Sizzle; -jQuery.expr = Sizzle.selectors; - -// Deprecated -jQuery.expr[ ":" ] = jQuery.expr.pseudos; -jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort; -jQuery.text = Sizzle.getText; -jQuery.isXMLDoc = Sizzle.isXML; -jQuery.contains = Sizzle.contains; -jQuery.escapeSelector = Sizzle.escape; - - - - -var dir = function( elem, dir, until ) { - var matched = [], - truncate = until !== undefined; - - while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) { - if ( elem.nodeType === 1 ) { - if ( truncate && jQuery( elem ).is( until ) ) { - break; - } - matched.push( elem ); - } - } - return matched; -}; - - -var siblings = function( n, elem ) { - var matched = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType === 1 && n !== elem ) { - matched.push( n ); - } - } - - return matched; -}; - - -var rneedsContext = jQuery.expr.match.needsContext; - - - -function nodeName( elem, name ) { - - return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase(); - -}; -var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i ); - - - -// Implement the identical functionality for filter and not -function winnow( elements, qualifier, not ) { - if ( isFunction( qualifier ) ) { - return jQuery.grep( elements, function( elem, i ) { - return !!qualifier.call( elem, i, elem ) !== not; - } ); - } - - // Single element - if ( qualifier.nodeType ) { - return jQuery.grep( elements, function( elem ) { - return ( elem === qualifier ) !== not; - } ); - } - - // Arraylike of elements (jQuery, arguments, Array) - if ( typeof qualifier !== "string" ) { - return jQuery.grep( elements, function( elem ) { - return ( indexOf.call( qualifier, elem ) > -1 ) !== not; - } ); - } - - // Filtered directly for both simple and complex selectors - return jQuery.filter( qualifier, elements, not ); -} - -jQuery.filter = function( expr, elems, not ) { - var elem = elems[ 0 ]; - - if ( not ) { - expr = ":not(" + expr + ")"; - } - - if ( elems.length === 1 && elem.nodeType === 1 ) { - return jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : []; - } - - return jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) { - return elem.nodeType === 1; - } ) ); -}; - -jQuery.fn.extend( { - find: function( selector ) { - var i, ret, - len = this.length, - self = this; - - if ( typeof selector !== "string" ) { - return this.pushStack( jQuery( selector ).filter( function() { - for ( i = 0; i < len; i++ ) { - if ( jQuery.contains( self[ i ], this ) ) { - return true; - } - } - } ) ); - } - - ret = this.pushStack( [] ); - - for ( i = 0; i < len; i++ ) { - jQuery.find( selector, self[ i ], ret ); - } - - return len > 1 ? jQuery.uniqueSort( ret ) : ret; - }, - filter: function( selector ) { - return this.pushStack( winnow( this, selector || [], false ) ); - }, - not: function( selector ) { - return this.pushStack( winnow( this, selector || [], true ) ); - }, - is: function( selector ) { - return !!winnow( - this, - - // If this is a positional/relative selector, check membership in the returned set - // so $("p:first").is("p:last") won't return true for a doc with two "p". - typeof selector === "string" && rneedsContext.test( selector ) ? - jQuery( selector ) : - selector || [], - false - ).length; - } -} ); - - -// Initialize a jQuery object - - -// A central reference to the root jQuery(document) -var rootjQuery, - - // A simple way to check for HTML strings - // Prioritize #id over to avoid XSS via location.hash (#9521) - // Strict HTML recognition (#11290: must start with <) - // Shortcut simple #id case for speed - rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/, - - init = jQuery.fn.init = function( selector, context, root ) { - var match, elem; - - // HANDLE: $(""), $(null), $(undefined), $(false) - if ( !selector ) { - return this; - } - - // Method init() accepts an alternate rootjQuery - // so migrate can support jQuery.sub (gh-2101) - root = root || rootjQuery; - - // Handle HTML strings - if ( typeof selector === "string" ) { - if ( selector[ 0 ] === "<" && - selector[ selector.length - 1 ] === ">" && - selector.length >= 3 ) { - - // Assume that strings that start and end with <> are HTML and skip the regex check - match = [ null, selector, null ]; - - } else { - match = rquickExpr.exec( selector ); - } - - // Match html or make sure no context is specified for #id - if ( match && ( match[ 1 ] || !context ) ) { - - // HANDLE: $(html) -> $(array) - if ( match[ 1 ] ) { - context = context instanceof jQuery ? context[ 0 ] : context; - - // Option to run scripts is true for back-compat - // Intentionally let the error be thrown if parseHTML is not present - jQuery.merge( this, jQuery.parseHTML( - match[ 1 ], - context && context.nodeType ? context.ownerDocument || context : document, - true - ) ); - - // HANDLE: $(html, props) - if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) { - for ( match in context ) { - - // Properties of context are called as methods if possible - if ( isFunction( this[ match ] ) ) { - this[ match ]( context[ match ] ); - - // ...and otherwise set as attributes - } else { - this.attr( match, context[ match ] ); - } - } - } - - return this; - - // HANDLE: $(#id) - } else { - elem = document.getElementById( match[ 2 ] ); - - if ( elem ) { - - // Inject the element directly into the jQuery object - this[ 0 ] = elem; - this.length = 1; - } - return this; - } - - // HANDLE: $(expr, $(...)) - } else if ( !context || context.jquery ) { - return ( context || root ).find( selector ); - - // HANDLE: $(expr, context) - // (which is just equivalent to: $(context).find(expr) - } else { - return this.constructor( context ).find( selector ); - } - - // HANDLE: $(DOMElement) - } else if ( selector.nodeType ) { - this[ 0 ] = selector; - this.length = 1; - return this; - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( isFunction( selector ) ) { - return root.ready !== undefined ? - root.ready( selector ) : - - // Execute immediately if ready is not present - selector( jQuery ); - } - - return jQuery.makeArray( selector, this ); - }; - -// Give the init function the jQuery prototype for later instantiation -init.prototype = jQuery.fn; - -// Initialize central reference -rootjQuery = jQuery( document ); - - -var rparentsprev = /^(?:parents|prev(?:Until|All))/, - - // Methods guaranteed to produce a unique set when starting from a unique set - guaranteedUnique = { - children: true, - contents: true, - next: true, - prev: true - }; - -jQuery.fn.extend( { - has: function( target ) { - var targets = jQuery( target, this ), - l = targets.length; - - return this.filter( function() { - var i = 0; - for ( ; i < l; i++ ) { - if ( jQuery.contains( this, targets[ i ] ) ) { - return true; - } - } - } ); - }, - - closest: function( selectors, context ) { - var cur, - i = 0, - l = this.length, - matched = [], - targets = typeof selectors !== "string" && jQuery( selectors ); - - // Positional selectors never match, since there's no _selection_ context - if ( !rneedsContext.test( selectors ) ) { - for ( ; i < l; i++ ) { - for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) { - - // Always skip document fragments - if ( cur.nodeType < 11 && ( targets ? - targets.index( cur ) > -1 : - - // Don't pass non-elements to Sizzle - cur.nodeType === 1 && - jQuery.find.matchesSelector( cur, selectors ) ) ) { - - matched.push( cur ); - break; - } - } - } - } - - return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched ); - }, - - // Determine the position of an element within the set - index: function( elem ) { - - // No argument, return index in parent - if ( !elem ) { - return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1; - } - - // Index in selector - if ( typeof elem === "string" ) { - return indexOf.call( jQuery( elem ), this[ 0 ] ); - } - - // Locate the position of the desired element - return indexOf.call( this, - - // If it receives a jQuery object, the first element is used - elem.jquery ? elem[ 0 ] : elem - ); - }, - - add: function( selector, context ) { - return this.pushStack( - jQuery.uniqueSort( - jQuery.merge( this.get(), jQuery( selector, context ) ) - ) - ); - }, - - addBack: function( selector ) { - return this.add( selector == null ? - this.prevObject : this.prevObject.filter( selector ) - ); - } -} ); - -function sibling( cur, dir ) { - while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {} - return cur; -} - -jQuery.each( { - parent: function( elem ) { - var parent = elem.parentNode; - return parent && parent.nodeType !== 11 ? parent : null; - }, - parents: function( elem ) { - return dir( elem, "parentNode" ); - }, - parentsUntil: function( elem, _i, until ) { - return dir( elem, "parentNode", until ); - }, - next: function( elem ) { - return sibling( elem, "nextSibling" ); - }, - prev: function( elem ) { - return sibling( elem, "previousSibling" ); - }, - nextAll: function( elem ) { - return dir( elem, "nextSibling" ); - }, - prevAll: function( elem ) { - return dir( elem, "previousSibling" ); - }, - nextUntil: function( elem, _i, until ) { - return dir( elem, "nextSibling", until ); - }, - prevUntil: function( elem, _i, until ) { - return dir( elem, "previousSibling", until ); - }, - siblings: function( elem ) { - return siblings( ( elem.parentNode || {} ).firstChild, elem ); - }, - children: function( elem ) { - return siblings( elem.firstChild ); - }, - contents: function( elem ) { - if ( elem.contentDocument != null && - - // Support: IE 11+ - // elements with no `data` attribute has an object - // `contentDocument` with a `null` prototype. - getProto( elem.contentDocument ) ) { - - return elem.contentDocument; - } - - // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only - // Treat the template element as a regular one in browsers that - // don't support it. - if ( nodeName( elem, "template" ) ) { - elem = elem.content || elem; - } - - return jQuery.merge( [], elem.childNodes ); - } -}, function( name, fn ) { - jQuery.fn[ name ] = function( until, selector ) { - var matched = jQuery.map( this, fn, until ); - - if ( name.slice( -5 ) !== "Until" ) { - selector = until; - } - - if ( selector && typeof selector === "string" ) { - matched = jQuery.filter( selector, matched ); - } - - if ( this.length > 1 ) { - - // Remove duplicates - if ( !guaranteedUnique[ name ] ) { - jQuery.uniqueSort( matched ); - } - - // Reverse order for parents* and prev-derivatives - if ( rparentsprev.test( name ) ) { - matched.reverse(); - } - } - - return this.pushStack( matched ); - }; -} ); -var rnothtmlwhite = ( /[^\x20\t\r\n\f]+/g ); - - - -// Convert String-formatted options into Object-formatted ones -function createOptions( options ) { - var object = {}; - jQuery.each( options.match( rnothtmlwhite ) || [], function( _, flag ) { - object[ flag ] = true; - } ); - return object; -} - -/* - * Create a callback list using the following parameters: - * - * options: an optional list of space-separated options that will change how - * the callback list behaves or a more traditional option object - * - * By default a callback list will act like an event callback list and can be - * "fired" multiple times. - * - * Possible options: - * - * once: will ensure the callback list can only be fired once (like a Deferred) - * - * memory: will keep track of previous values and will call any callback added - * after the list has been fired right away with the latest "memorized" - * values (like a Deferred) - * - * unique: will ensure a callback can only be added once (no duplicate in the list) - * - * stopOnFalse: interrupt callings when a callback returns false - * - */ -jQuery.Callbacks = function( options ) { - - // Convert options from String-formatted to Object-formatted if needed - // (we check in cache first) - options = typeof options === "string" ? - createOptions( options ) : - jQuery.extend( {}, options ); - - var // Flag to know if list is currently firing - firing, - - // Last fire value for non-forgettable lists - memory, - - // Flag to know if list was already fired - fired, - - // Flag to prevent firing - locked, - - // Actual callback list - list = [], - - // Queue of execution data for repeatable lists - queue = [], - - // Index of currently firing callback (modified by add/remove as needed) - firingIndex = -1, - - // Fire callbacks - fire = function() { - - // Enforce single-firing - locked = locked || options.once; - - // Execute callbacks for all pending executions, - // respecting firingIndex overrides and runtime changes - fired = firing = true; - for ( ; queue.length; firingIndex = -1 ) { - memory = queue.shift(); - while ( ++firingIndex < list.length ) { - - // Run callback and check for early termination - if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false && - options.stopOnFalse ) { - - // Jump to end and forget the data so .add doesn't re-fire - firingIndex = list.length; - memory = false; - } - } - } - - // Forget the data if we're done with it - if ( !options.memory ) { - memory = false; - } - - firing = false; - - // Clean up if we're done firing for good - if ( locked ) { - - // Keep an empty list if we have data for future add calls - if ( memory ) { - list = []; - - // Otherwise, this object is spent - } else { - list = ""; - } - } - }, - - // Actual Callbacks object - self = { - - // Add a callback or a collection of callbacks to the list - add: function() { - if ( list ) { - - // If we have memory from a past run, we should fire after adding - if ( memory && !firing ) { - firingIndex = list.length - 1; - queue.push( memory ); - } - - ( function add( args ) { - jQuery.each( args, function( _, arg ) { - if ( isFunction( arg ) ) { - if ( !options.unique || !self.has( arg ) ) { - list.push( arg ); - } - } else if ( arg && arg.length && toType( arg ) !== "string" ) { - - // Inspect recursively - add( arg ); - } - } ); - } )( arguments ); - - if ( memory && !firing ) { - fire(); - } - } - return this; - }, - - // Remove a callback from the list - remove: function() { - jQuery.each( arguments, function( _, arg ) { - var index; - while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) { - list.splice( index, 1 ); - - // Handle firing indexes - if ( index <= firingIndex ) { - firingIndex--; - } - } - } ); - return this; - }, - - // Check if a given callback is in the list. - // If no argument is given, return whether or not list has callbacks attached. - has: function( fn ) { - return fn ? - jQuery.inArray( fn, list ) > -1 : - list.length > 0; - }, - - // Remove all callbacks from the list - empty: function() { - if ( list ) { - list = []; - } - return this; - }, - - // Disable .fire and .add - // Abort any current/pending executions - // Clear all callbacks and values - disable: function() { - locked = queue = []; - list = memory = ""; - return this; - }, - disabled: function() { - return !list; - }, - - // Disable .fire - // Also disable .add unless we have memory (since it would have no effect) - // Abort any pending executions - lock: function() { - locked = queue = []; - if ( !memory && !firing ) { - list = memory = ""; - } - return this; - }, - locked: function() { - return !!locked; - }, - - // Call all callbacks with the given context and arguments - fireWith: function( context, args ) { - if ( !locked ) { - args = args || []; - args = [ context, args.slice ? args.slice() : args ]; - queue.push( args ); - if ( !firing ) { - fire(); - } - } - return this; - }, - - // Call all the callbacks with the given arguments - fire: function() { - self.fireWith( this, arguments ); - return this; - }, - - // To know if the callbacks have already been called at least once - fired: function() { - return !!fired; - } - }; - - return self; -}; - - -function Identity( v ) { - return v; -} -function Thrower( ex ) { - throw ex; -} - -function adoptValue( value, resolve, reject, noValue ) { - var method; - - try { - - // Check for promise aspect first to privilege synchronous behavior - if ( value && isFunction( ( method = value.promise ) ) ) { - method.call( value ).done( resolve ).fail( reject ); - - // Other thenables - } else if ( value && isFunction( ( method = value.then ) ) ) { - method.call( value, resolve, reject ); - - // Other non-thenables - } else { - - // Control `resolve` arguments by letting Array#slice cast boolean `noValue` to integer: - // * false: [ value ].slice( 0 ) => resolve( value ) - // * true: [ value ].slice( 1 ) => resolve() - resolve.apply( undefined, [ value ].slice( noValue ) ); - } - - // For Promises/A+, convert exceptions into rejections - // Since jQuery.when doesn't unwrap thenables, we can skip the extra checks appearing in - // Deferred#then to conditionally suppress rejection. - } catch ( value ) { - - // Support: Android 4.0 only - // Strict mode functions invoked without .call/.apply get global-object context - reject.apply( undefined, [ value ] ); - } -} - -jQuery.extend( { - - Deferred: function( func ) { - var tuples = [ - - // action, add listener, callbacks, - // ... .then handlers, argument index, [final state] - [ "notify", "progress", jQuery.Callbacks( "memory" ), - jQuery.Callbacks( "memory" ), 2 ], - [ "resolve", "done", jQuery.Callbacks( "once memory" ), - jQuery.Callbacks( "once memory" ), 0, "resolved" ], - [ "reject", "fail", jQuery.Callbacks( "once memory" ), - jQuery.Callbacks( "once memory" ), 1, "rejected" ] - ], - state = "pending", - promise = { - state: function() { - return state; - }, - always: function() { - deferred.done( arguments ).fail( arguments ); - return this; - }, - "catch": function( fn ) { - return promise.then( null, fn ); - }, - - // Keep pipe for back-compat - pipe: function( /* fnDone, fnFail, fnProgress */ ) { - var fns = arguments; - - return jQuery.Deferred( function( newDefer ) { - jQuery.each( tuples, function( _i, tuple ) { - - // Map tuples (progress, done, fail) to arguments (done, fail, progress) - var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ]; - - // deferred.progress(function() { bind to newDefer or newDefer.notify }) - // deferred.done(function() { bind to newDefer or newDefer.resolve }) - // deferred.fail(function() { bind to newDefer or newDefer.reject }) - deferred[ tuple[ 1 ] ]( function() { - var returned = fn && fn.apply( this, arguments ); - if ( returned && isFunction( returned.promise ) ) { - returned.promise() - .progress( newDefer.notify ) - .done( newDefer.resolve ) - .fail( newDefer.reject ); - } else { - newDefer[ tuple[ 0 ] + "With" ]( - this, - fn ? [ returned ] : arguments - ); - } - } ); - } ); - fns = null; - } ).promise(); - }, - then: function( onFulfilled, onRejected, onProgress ) { - var maxDepth = 0; - function resolve( depth, deferred, handler, special ) { - return function() { - var that = this, - args = arguments, - mightThrow = function() { - var returned, then; - - // Support: Promises/A+ section 2.3.3.3.3 - // https://promisesaplus.com/#point-59 - // Ignore double-resolution attempts - if ( depth < maxDepth ) { - return; - } - - returned = handler.apply( that, args ); - - // Support: Promises/A+ section 2.3.1 - // https://promisesaplus.com/#point-48 - if ( returned === deferred.promise() ) { - throw new TypeError( "Thenable self-resolution" ); - } - - // Support: Promises/A+ sections 2.3.3.1, 3.5 - // https://promisesaplus.com/#point-54 - // https://promisesaplus.com/#point-75 - // Retrieve `then` only once - then = returned && - - // Support: Promises/A+ section 2.3.4 - // https://promisesaplus.com/#point-64 - // Only check objects and functions for thenability - ( typeof returned === "object" || - typeof returned === "function" ) && - returned.then; - - // Handle a returned thenable - if ( isFunction( then ) ) { - - // Special processors (notify) just wait for resolution - if ( special ) { - then.call( - returned, - resolve( maxDepth, deferred, Identity, special ), - resolve( maxDepth, deferred, Thrower, special ) - ); - - // Normal processors (resolve) also hook into progress - } else { - - // ...and disregard older resolution values - maxDepth++; - - then.call( - returned, - resolve( maxDepth, deferred, Identity, special ), - resolve( maxDepth, deferred, Thrower, special ), - resolve( maxDepth, deferred, Identity, - deferred.notifyWith ) - ); - } - - // Handle all other returned values - } else { - - // Only substitute handlers pass on context - // and multiple values (non-spec behavior) - if ( handler !== Identity ) { - that = undefined; - args = [ returned ]; - } - - // Process the value(s) - // Default process is resolve - ( special || deferred.resolveWith )( that, args ); - } - }, - - // Only normal processors (resolve) catch and reject exceptions - process = special ? - mightThrow : - function() { - try { - mightThrow(); - } catch ( e ) { - - if ( jQuery.Deferred.exceptionHook ) { - jQuery.Deferred.exceptionHook( e, - process.stackTrace ); - } - - // Support: Promises/A+ section 2.3.3.3.4.1 - // https://promisesaplus.com/#point-61 - // Ignore post-resolution exceptions - if ( depth + 1 >= maxDepth ) { - - // Only substitute handlers pass on context - // and multiple values (non-spec behavior) - if ( handler !== Thrower ) { - that = undefined; - args = [ e ]; - } - - deferred.rejectWith( that, args ); - } - } - }; - - // Support: Promises/A+ section 2.3.3.3.1 - // https://promisesaplus.com/#point-57 - // Re-resolve promises immediately to dodge false rejection from - // subsequent errors - if ( depth ) { - process(); - } else { - - // Call an optional hook to record the stack, in case of exception - // since it's otherwise lost when execution goes async - if ( jQuery.Deferred.getStackHook ) { - process.stackTrace = jQuery.Deferred.getStackHook(); - } - window.setTimeout( process ); - } - }; - } - - return jQuery.Deferred( function( newDefer ) { - - // progress_handlers.add( ... ) - tuples[ 0 ][ 3 ].add( - resolve( - 0, - newDefer, - isFunction( onProgress ) ? - onProgress : - Identity, - newDefer.notifyWith - ) - ); - - // fulfilled_handlers.add( ... ) - tuples[ 1 ][ 3 ].add( - resolve( - 0, - newDefer, - isFunction( onFulfilled ) ? - onFulfilled : - Identity - ) - ); - - // rejected_handlers.add( ... ) - tuples[ 2 ][ 3 ].add( - resolve( - 0, - newDefer, - isFunction( onRejected ) ? - onRejected : - Thrower - ) - ); - } ).promise(); - }, - - // Get a promise for this deferred - // If obj is provided, the promise aspect is added to the object - promise: function( obj ) { - return obj != null ? jQuery.extend( obj, promise ) : promise; - } - }, - deferred = {}; - - // Add list-specific methods - jQuery.each( tuples, function( i, tuple ) { - var list = tuple[ 2 ], - stateString = tuple[ 5 ]; - - // promise.progress = list.add - // promise.done = list.add - // promise.fail = list.add - promise[ tuple[ 1 ] ] = list.add; - - // Handle state - if ( stateString ) { - list.add( - function() { - - // state = "resolved" (i.e., fulfilled) - // state = "rejected" - state = stateString; - }, - - // rejected_callbacks.disable - // fulfilled_callbacks.disable - tuples[ 3 - i ][ 2 ].disable, - - // rejected_handlers.disable - // fulfilled_handlers.disable - tuples[ 3 - i ][ 3 ].disable, - - // progress_callbacks.lock - tuples[ 0 ][ 2 ].lock, - - // progress_handlers.lock - tuples[ 0 ][ 3 ].lock - ); - } - - // progress_handlers.fire - // fulfilled_handlers.fire - // rejected_handlers.fire - list.add( tuple[ 3 ].fire ); - - // deferred.notify = function() { deferred.notifyWith(...) } - // deferred.resolve = function() { deferred.resolveWith(...) } - // deferred.reject = function() { deferred.rejectWith(...) } - deferred[ tuple[ 0 ] ] = function() { - deferred[ tuple[ 0 ] + "With" ]( this === deferred ? undefined : this, arguments ); - return this; - }; - - // deferred.notifyWith = list.fireWith - // deferred.resolveWith = list.fireWith - // deferred.rejectWith = list.fireWith - deferred[ tuple[ 0 ] + "With" ] = list.fireWith; - } ); - - // Make the deferred a promise - promise.promise( deferred ); - - // Call given func if any - if ( func ) { - func.call( deferred, deferred ); - } - - // All done! - return deferred; - }, - - // Deferred helper - when: function( singleValue ) { - var - - // count of uncompleted subordinates - remaining = arguments.length, - - // count of unprocessed arguments - i = remaining, - - // subordinate fulfillment data - resolveContexts = Array( i ), - resolveValues = slice.call( arguments ), - - // the master Deferred - master = jQuery.Deferred(), - - // subordinate callback factory - updateFunc = function( i ) { - return function( value ) { - resolveContexts[ i ] = this; - resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value; - if ( !( --remaining ) ) { - master.resolveWith( resolveContexts, resolveValues ); - } - }; - }; - - // Single- and empty arguments are adopted like Promise.resolve - if ( remaining <= 1 ) { - adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject, - !remaining ); - - // Use .then() to unwrap secondary thenables (cf. gh-3000) - if ( master.state() === "pending" || - isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) { - - return master.then(); - } - } - - // Multiple arguments are aggregated like Promise.all array elements - while ( i-- ) { - adoptValue( resolveValues[ i ], updateFunc( i ), master.reject ); - } - - return master.promise(); - } -} ); - - -// These usually indicate a programmer mistake during development, -// warn about them ASAP rather than swallowing them by default. -var rerrorNames = /^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/; - -jQuery.Deferred.exceptionHook = function( error, stack ) { - - // Support: IE 8 - 9 only - // Console exists when dev tools are open, which can happen at any time - if ( window.console && window.console.warn && error && rerrorNames.test( error.name ) ) { - window.console.warn( "jQuery.Deferred exception: " + error.message, error.stack, stack ); - } -}; - - - - -jQuery.readyException = function( error ) { - window.setTimeout( function() { - throw error; - } ); -}; - - - - -// The deferred used on DOM ready -var readyList = jQuery.Deferred(); - -jQuery.fn.ready = function( fn ) { - - readyList - .then( fn ) - - // Wrap jQuery.readyException in a function so that the lookup - // happens at the time of error handling instead of callback - // registration. - .catch( function( error ) { - jQuery.readyException( error ); - } ); - - return this; -}; - -jQuery.extend( { - - // Is the DOM ready to be used? Set to true once it occurs. - isReady: false, - - // A counter to track how many items to wait for before - // the ready event fires. See #6781 - readyWait: 1, - - // Handle when the DOM is ready - ready: function( wait ) { - - // Abort if there are pending holds or we're already ready - if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) { - return; - } - - // Remember that the DOM is ready - jQuery.isReady = true; - - // If a normal DOM Ready event fired, decrement, and wait if need be - if ( wait !== true && --jQuery.readyWait > 0 ) { - return; - } - - // If there are functions bound, to execute - readyList.resolveWith( document, [ jQuery ] ); - } -} ); - -jQuery.ready.then = readyList.then; - -// The ready event handler and self cleanup method -function completed() { - document.removeEventListener( "DOMContentLoaded", completed ); - window.removeEventListener( "load", completed ); - jQuery.ready(); -} - -// Catch cases where $(document).ready() is called -// after the browser event has already occurred. -// Support: IE <=9 - 10 only -// Older IE sometimes signals "interactive" too soon -if ( document.readyState === "complete" || - ( document.readyState !== "loading" && !document.documentElement.doScroll ) ) { - - // Handle it asynchronously to allow scripts the opportunity to delay ready - window.setTimeout( jQuery.ready ); - -} else { - - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", completed ); - - // A fallback to window.onload, that will always work - window.addEventListener( "load", completed ); -} - - - - -// Multifunctional method to get and set values of a collection -// The value/s can optionally be executed if it's a function -var access = function( elems, fn, key, value, chainable, emptyGet, raw ) { - var i = 0, - len = elems.length, - bulk = key == null; - - // Sets many values - if ( toType( key ) === "object" ) { - chainable = true; - for ( i in key ) { - access( elems, fn, i, key[ i ], true, emptyGet, raw ); - } - - // Sets one value - } else if ( value !== undefined ) { - chainable = true; - - if ( !isFunction( value ) ) { - raw = true; - } - - if ( bulk ) { - - // Bulk operations run against the entire set - if ( raw ) { - fn.call( elems, value ); - fn = null; - - // ...except when executing function values - } else { - bulk = fn; - fn = function( elem, _key, value ) { - return bulk.call( jQuery( elem ), value ); - }; - } - } - - if ( fn ) { - for ( ; i < len; i++ ) { - fn( - elems[ i ], key, raw ? - value : - value.call( elems[ i ], i, fn( elems[ i ], key ) ) - ); - } - } - } - - if ( chainable ) { - return elems; - } - - // Gets - if ( bulk ) { - return fn.call( elems ); - } - - return len ? fn( elems[ 0 ], key ) : emptyGet; -}; - - -// Matches dashed string for camelizing -var rmsPrefix = /^-ms-/, - rdashAlpha = /-([a-z])/g; - -// Used by camelCase as callback to replace() -function fcamelCase( _all, letter ) { - return letter.toUpperCase(); -} - -// Convert dashed to camelCase; used by the css and data modules -// Support: IE <=9 - 11, Edge 12 - 15 -// Microsoft forgot to hump their vendor prefix (#9572) -function camelCase( string ) { - return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase ); -} -var acceptData = function( owner ) { - - // Accepts only: - // - Node - // - Node.ELEMENT_NODE - // - Node.DOCUMENT_NODE - // - Object - // - Any - return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType ); -}; - - - - -function Data() { - this.expando = jQuery.expando + Data.uid++; -} - -Data.uid = 1; - -Data.prototype = { - - cache: function( owner ) { - - // Check if the owner object already has a cache - var value = owner[ this.expando ]; - - // If not, create one - if ( !value ) { - value = {}; - - // We can accept data for non-element nodes in modern browsers, - // but we should not, see #8335. - // Always return an empty object. - if ( acceptData( owner ) ) { - - // If it is a node unlikely to be stringify-ed or looped over - // use plain assignment - if ( owner.nodeType ) { - owner[ this.expando ] = value; - - // Otherwise secure it in a non-enumerable property - // configurable must be true to allow the property to be - // deleted when data is removed - } else { - Object.defineProperty( owner, this.expando, { - value: value, - configurable: true - } ); - } - } - } - - return value; - }, - set: function( owner, data, value ) { - var prop, - cache = this.cache( owner ); - - // Handle: [ owner, key, value ] args - // Always use camelCase key (gh-2257) - if ( typeof data === "string" ) { - cache[ camelCase( data ) ] = value; - - // Handle: [ owner, { properties } ] args - } else { - - // Copy the properties one-by-one to the cache object - for ( prop in data ) { - cache[ camelCase( prop ) ] = data[ prop ]; - } - } - return cache; - }, - get: function( owner, key ) { - return key === undefined ? - this.cache( owner ) : - - // Always use camelCase key (gh-2257) - owner[ this.expando ] && owner[ this.expando ][ camelCase( key ) ]; - }, - access: function( owner, key, value ) { - - // In cases where either: - // - // 1. No key was specified - // 2. A string key was specified, but no value provided - // - // Take the "read" path and allow the get method to determine - // which value to return, respectively either: - // - // 1. The entire cache object - // 2. The data stored at the key - // - if ( key === undefined || - ( ( key && typeof key === "string" ) && value === undefined ) ) { - - return this.get( owner, key ); - } - - // When the key is not a string, or both a key and value - // are specified, set or extend (existing objects) with either: - // - // 1. An object of properties - // 2. A key and value - // - this.set( owner, key, value ); - - // Since the "set" path can have two possible entry points - // return the expected data based on which path was taken[*] - return value !== undefined ? value : key; - }, - remove: function( owner, key ) { - var i, - cache = owner[ this.expando ]; - - if ( cache === undefined ) { - return; - } - - if ( key !== undefined ) { - - // Support array or space separated string of keys - if ( Array.isArray( key ) ) { - - // If key is an array of keys... - // We always set camelCase keys, so remove that. - key = key.map( camelCase ); - } else { - key = camelCase( key ); - - // If a key with the spaces exists, use it. - // Otherwise, create an array by matching non-whitespace - key = key in cache ? - [ key ] : - ( key.match( rnothtmlwhite ) || [] ); - } - - i = key.length; - - while ( i-- ) { - delete cache[ key[ i ] ]; - } - } - - // Remove the expando if there's no more data - if ( key === undefined || jQuery.isEmptyObject( cache ) ) { - - // Support: Chrome <=35 - 45 - // Webkit & Blink performance suffers when deleting properties - // from DOM nodes, so set to undefined instead - // https://bugs.chromium.org/p/chromium/issues/detail?id=378607 (bug restricted) - if ( owner.nodeType ) { - owner[ this.expando ] = undefined; - } else { - delete owner[ this.expando ]; - } - } - }, - hasData: function( owner ) { - var cache = owner[ this.expando ]; - return cache !== undefined && !jQuery.isEmptyObject( cache ); - } -}; -var dataPriv = new Data(); - -var dataUser = new Data(); - - - -// Implementation Summary -// -// 1. Enforce API surface and semantic compatibility with 1.9.x branch -// 2. Improve the module's maintainability by reducing the storage -// paths to a single mechanism. -// 3. Use the same single mechanism to support "private" and "user" data. -// 4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData) -// 5. Avoid exposing implementation details on user objects (eg. expando properties) -// 6. Provide a clear path for implementation upgrade to WeakMap in 2014 - -var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, - rmultiDash = /[A-Z]/g; - -function getData( data ) { - if ( data === "true" ) { - return true; - } - - if ( data === "false" ) { - return false; - } - - if ( data === "null" ) { - return null; - } - - // Only convert to a number if it doesn't change the string - if ( data === +data + "" ) { - return +data; - } - - if ( rbrace.test( data ) ) { - return JSON.parse( data ); - } - - return data; -} - -function dataAttr( elem, key, data ) { - var name; - - // If nothing was found internally, try to fetch any - // data from the HTML5 data-* attribute - if ( data === undefined && elem.nodeType === 1 ) { - name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase(); - data = elem.getAttribute( name ); - - if ( typeof data === "string" ) { - try { - data = getData( data ); - } catch ( e ) {} - - // Make sure we set the data so it isn't changed later - dataUser.set( elem, key, data ); - } else { - data = undefined; - } - } - return data; -} - -jQuery.extend( { - hasData: function( elem ) { - return dataUser.hasData( elem ) || dataPriv.hasData( elem ); - }, - - data: function( elem, name, data ) { - return dataUser.access( elem, name, data ); - }, - - removeData: function( elem, name ) { - dataUser.remove( elem, name ); - }, - - // TODO: Now that all calls to _data and _removeData have been replaced - // with direct calls to dataPriv methods, these can be deprecated. - _data: function( elem, name, data ) { - return dataPriv.access( elem, name, data ); - }, - - _removeData: function( elem, name ) { - dataPriv.remove( elem, name ); - } -} ); - -jQuery.fn.extend( { - data: function( key, value ) { - var i, name, data, - elem = this[ 0 ], - attrs = elem && elem.attributes; - - // Gets all values - if ( key === undefined ) { - if ( this.length ) { - data = dataUser.get( elem ); - - if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) { - i = attrs.length; - while ( i-- ) { - - // Support: IE 11 only - // The attrs elements can be null (#14894) - if ( attrs[ i ] ) { - name = attrs[ i ].name; - if ( name.indexOf( "data-" ) === 0 ) { - name = camelCase( name.slice( 5 ) ); - dataAttr( elem, name, data[ name ] ); - } - } - } - dataPriv.set( elem, "hasDataAttrs", true ); - } - } - - return data; - } - - // Sets multiple values - if ( typeof key === "object" ) { - return this.each( function() { - dataUser.set( this, key ); - } ); - } - - return access( this, function( value ) { - var data; - - // The calling jQuery object (element matches) is not empty - // (and therefore has an element appears at this[ 0 ]) and the - // `value` parameter was not undefined. An empty jQuery object - // will result in `undefined` for elem = this[ 0 ] which will - // throw an exception if an attempt to read a data cache is made. - if ( elem && value === undefined ) { - - // Attempt to get data from the cache - // The key will always be camelCased in Data - data = dataUser.get( elem, key ); - if ( data !== undefined ) { - return data; - } - - // Attempt to "discover" the data in - // HTML5 custom data-* attrs - data = dataAttr( elem, key ); - if ( data !== undefined ) { - return data; - } - - // We tried really hard, but the data doesn't exist. - return; - } - - // Set the data... - this.each( function() { - - // We always store the camelCased key - dataUser.set( this, key, value ); - } ); - }, null, value, arguments.length > 1, null, true ); - }, - - removeData: function( key ) { - return this.each( function() { - dataUser.remove( this, key ); - } ); - } -} ); - - -jQuery.extend( { - queue: function( elem, type, data ) { - var queue; - - if ( elem ) { - type = ( type || "fx" ) + "queue"; - queue = dataPriv.get( elem, type ); - - // Speed up dequeue by getting out quickly if this is just a lookup - if ( data ) { - if ( !queue || Array.isArray( data ) ) { - queue = dataPriv.access( elem, type, jQuery.makeArray( data ) ); - } else { - queue.push( data ); - } - } - return queue || []; - } - }, - - dequeue: function( elem, type ) { - type = type || "fx"; - - var queue = jQuery.queue( elem, type ), - startLength = queue.length, - fn = queue.shift(), - hooks = jQuery._queueHooks( elem, type ), - next = function() { - jQuery.dequeue( elem, type ); - }; - - // If the fx queue is dequeued, always remove the progress sentinel - if ( fn === "inprogress" ) { - fn = queue.shift(); - startLength--; - } - - if ( fn ) { - - // Add a progress sentinel to prevent the fx queue from being - // automatically dequeued - if ( type === "fx" ) { - queue.unshift( "inprogress" ); - } - - // Clear up the last queue stop function - delete hooks.stop; - fn.call( elem, next, hooks ); - } - - if ( !startLength && hooks ) { - hooks.empty.fire(); - } - }, - - // Not public - generate a queueHooks object, or return the current one - _queueHooks: function( elem, type ) { - var key = type + "queueHooks"; - return dataPriv.get( elem, key ) || dataPriv.access( elem, key, { - empty: jQuery.Callbacks( "once memory" ).add( function() { - dataPriv.remove( elem, [ type + "queue", key ] ); - } ) - } ); - } -} ); - -jQuery.fn.extend( { - queue: function( type, data ) { - var setter = 2; - - if ( typeof type !== "string" ) { - data = type; - type = "fx"; - setter--; - } - - if ( arguments.length < setter ) { - return jQuery.queue( this[ 0 ], type ); - } - - return data === undefined ? - this : - this.each( function() { - var queue = jQuery.queue( this, type, data ); - - // Ensure a hooks for this queue - jQuery._queueHooks( this, type ); - - if ( type === "fx" && queue[ 0 ] !== "inprogress" ) { - jQuery.dequeue( this, type ); - } - } ); - }, - dequeue: function( type ) { - return this.each( function() { - jQuery.dequeue( this, type ); - } ); - }, - clearQueue: function( type ) { - return this.queue( type || "fx", [] ); - }, - - // Get a promise resolved when queues of a certain type - // are emptied (fx is the type by default) - promise: function( type, obj ) { - var tmp, - count = 1, - defer = jQuery.Deferred(), - elements = this, - i = this.length, - resolve = function() { - if ( !( --count ) ) { - defer.resolveWith( elements, [ elements ] ); - } - }; - - if ( typeof type !== "string" ) { - obj = type; - type = undefined; - } - type = type || "fx"; - - while ( i-- ) { - tmp = dataPriv.get( elements[ i ], type + "queueHooks" ); - if ( tmp && tmp.empty ) { - count++; - tmp.empty.add( resolve ); - } - } - resolve(); - return defer.promise( obj ); - } -} ); -var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source; - -var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" ); - - -var cssExpand = [ "Top", "Right", "Bottom", "Left" ]; - -var documentElement = document.documentElement; - - - - var isAttached = function( elem ) { - return jQuery.contains( elem.ownerDocument, elem ); - }, - composed = { composed: true }; - - // Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only - // Check attachment across shadow DOM boundaries when possible (gh-3504) - // Support: iOS 10.0-10.2 only - // Early iOS 10 versions support `attachShadow` but not `getRootNode`, - // leading to errors. We need to check for `getRootNode`. - if ( documentElement.getRootNode ) { - isAttached = function( elem ) { - return jQuery.contains( elem.ownerDocument, elem ) || - elem.getRootNode( composed ) === elem.ownerDocument; - }; - } -var isHiddenWithinTree = function( elem, el ) { - - // isHiddenWithinTree might be called from jQuery#filter function; - // in that case, element will be second argument - elem = el || elem; - - // Inline style trumps all - return elem.style.display === "none" || - elem.style.display === "" && - - // Otherwise, check computed style - // Support: Firefox <=43 - 45 - // Disconnected elements can have computed display: none, so first confirm that elem is - // in the document. - isAttached( elem ) && - - jQuery.css( elem, "display" ) === "none"; - }; - - - -function adjustCSS( elem, prop, valueParts, tween ) { - var adjusted, scale, - maxIterations = 20, - currentValue = tween ? - function() { - return tween.cur(); - } : - function() { - return jQuery.css( elem, prop, "" ); - }, - initial = currentValue(), - unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ), - - // Starting value computation is required for potential unit mismatches - initialInUnit = elem.nodeType && - ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) && - rcssNum.exec( jQuery.css( elem, prop ) ); - - if ( initialInUnit && initialInUnit[ 3 ] !== unit ) { - - // Support: Firefox <=54 - // Halve the iteration target value to prevent interference from CSS upper bounds (gh-2144) - initial = initial / 2; - - // Trust units reported by jQuery.css - unit = unit || initialInUnit[ 3 ]; - - // Iteratively approximate from a nonzero starting point - initialInUnit = +initial || 1; - - while ( maxIterations-- ) { - - // Evaluate and update our best guess (doubling guesses that zero out). - // Finish if the scale equals or crosses 1 (making the old*new product non-positive). - jQuery.style( elem, prop, initialInUnit + unit ); - if ( ( 1 - scale ) * ( 1 - ( scale = currentValue() / initial || 0.5 ) ) <= 0 ) { - maxIterations = 0; - } - initialInUnit = initialInUnit / scale; - - } - - initialInUnit = initialInUnit * 2; - jQuery.style( elem, prop, initialInUnit + unit ); - - // Make sure we update the tween properties later on - valueParts = valueParts || []; - } - - if ( valueParts ) { - initialInUnit = +initialInUnit || +initial || 0; - - // Apply relative offset (+=/-=) if specified - adjusted = valueParts[ 1 ] ? - initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] : - +valueParts[ 2 ]; - if ( tween ) { - tween.unit = unit; - tween.start = initialInUnit; - tween.end = adjusted; - } - } - return adjusted; -} - - -var defaultDisplayMap = {}; - -function getDefaultDisplay( elem ) { - var temp, - doc = elem.ownerDocument, - nodeName = elem.nodeName, - display = defaultDisplayMap[ nodeName ]; - - if ( display ) { - return display; - } - - temp = doc.body.appendChild( doc.createElement( nodeName ) ); - display = jQuery.css( temp, "display" ); - - temp.parentNode.removeChild( temp ); - - if ( display === "none" ) { - display = "block"; - } - defaultDisplayMap[ nodeName ] = display; - - return display; -} - -function showHide( elements, show ) { - var display, elem, - values = [], - index = 0, - length = elements.length; - - // Determine new display value for elements that need to change - for ( ; index < length; index++ ) { - elem = elements[ index ]; - if ( !elem.style ) { - continue; - } - - display = elem.style.display; - if ( show ) { - - // Since we force visibility upon cascade-hidden elements, an immediate (and slow) - // check is required in this first loop unless we have a nonempty display value (either - // inline or about-to-be-restored) - if ( display === "none" ) { - values[ index ] = dataPriv.get( elem, "display" ) || null; - if ( !values[ index ] ) { - elem.style.display = ""; - } - } - if ( elem.style.display === "" && isHiddenWithinTree( elem ) ) { - values[ index ] = getDefaultDisplay( elem ); - } - } else { - if ( display !== "none" ) { - values[ index ] = "none"; - - // Remember what we're overwriting - dataPriv.set( elem, "display", display ); - } - } - } - - // Set the display of the elements in a second loop to avoid constant reflow - for ( index = 0; index < length; index++ ) { - if ( values[ index ] != null ) { - elements[ index ].style.display = values[ index ]; - } - } - - return elements; -} - -jQuery.fn.extend( { - show: function() { - return showHide( this, true ); - }, - hide: function() { - return showHide( this ); - }, - toggle: function( state ) { - if ( typeof state === "boolean" ) { - return state ? this.show() : this.hide(); - } - - return this.each( function() { - if ( isHiddenWithinTree( this ) ) { - jQuery( this ).show(); - } else { - jQuery( this ).hide(); - } - } ); - } -} ); -var rcheckableType = ( /^(?:checkbox|radio)$/i ); - -var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]*)/i ); - -var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i ); - - - -( function() { - var fragment = document.createDocumentFragment(), - div = fragment.appendChild( document.createElement( "div" ) ), - input = document.createElement( "input" ); - - // Support: Android 4.0 - 4.3 only - // Check state lost if the name is set (#11217) - // Support: Windows Web Apps (WWA) - // `name` and `type` must use .setAttribute for WWA (#14901) - input.setAttribute( "type", "radio" ); - input.setAttribute( "checked", "checked" ); - input.setAttribute( "name", "t" ); - - div.appendChild( input ); - - // Support: Android <=4.1 only - // Older WebKit doesn't clone checked state correctly in fragments - support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; - - // Support: IE <=11 only - // Make sure textarea (and checkbox) defaultValue is properly cloned - div.innerHTML = ""; - support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; - - // Support: IE <=9 only - // IE <=9 replaces "; - support.option = !!div.lastChild; -} )(); - - -// We have to close these tags to support XHTML (#13200) -var wrapMap = { - - // XHTML parsers do not magically insert elements in the - // same way that tag soup parsers do. So we cannot shorten - // this by omitting or other required elements. - thead: [ 1, "", "
        " ], - col: [ 2, "", "
        " ], - tr: [ 2, "", "
        " ], - td: [ 3, "", "
        " ], - - _default: [ 0, "", "" ] -}; - -wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; -wrapMap.th = wrapMap.td; - -// Support: IE <=9 only -if ( !support.option ) { - wrapMap.optgroup = wrapMap.option = [ 1, "" ]; -} - - -function getAll( context, tag ) { - - // Support: IE <=9 - 11 only - // Use typeof to avoid zero-argument method invocation on host objects (#15151) - var ret; - - if ( typeof context.getElementsByTagName !== "undefined" ) { - ret = context.getElementsByTagName( tag || "*" ); - - } else if ( typeof context.querySelectorAll !== "undefined" ) { - ret = context.querySelectorAll( tag || "*" ); - - } else { - ret = []; - } - - if ( tag === undefined || tag && nodeName( context, tag ) ) { - return jQuery.merge( [ context ], ret ); - } - - return ret; -} - - -// Mark scripts as having already been evaluated -function setGlobalEval( elems, refElements ) { - var i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - dataPriv.set( - elems[ i ], - "globalEval", - !refElements || dataPriv.get( refElements[ i ], "globalEval" ) - ); - } -} - - -var rhtml = /<|&#?\w+;/; - -function buildFragment( elems, context, scripts, selection, ignored ) { - var elem, tmp, tag, wrap, attached, j, - fragment = context.createDocumentFragment(), - nodes = [], - i = 0, - l = elems.length; - - for ( ; i < l; i++ ) { - elem = elems[ i ]; - - if ( elem || elem === 0 ) { - - // Add nodes directly - if ( toType( elem ) === "object" ) { - - // Support: Android <=4.0 only, PhantomJS 1 only - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem ); - - // Convert non-html into a text node - } else if ( !rhtml.test( elem ) ) { - nodes.push( context.createTextNode( elem ) ); - - // Convert html into DOM nodes - } else { - tmp = tmp || fragment.appendChild( context.createElement( "div" ) ); - - // Deserialize a standard representation - tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase(); - wrap = wrapMap[ tag ] || wrapMap._default; - tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ]; - - // Descend through wrappers to the right content - j = wrap[ 0 ]; - while ( j-- ) { - tmp = tmp.lastChild; - } - - // Support: Android <=4.0 only, PhantomJS 1 only - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( nodes, tmp.childNodes ); - - // Remember the top-level container - tmp = fragment.firstChild; - - // Ensure the created nodes are orphaned (#12392) - tmp.textContent = ""; - } - } - } - - // Remove wrapper from fragment - fragment.textContent = ""; - - i = 0; - while ( ( elem = nodes[ i++ ] ) ) { - - // Skip elements already in the context collection (trac-4087) - if ( selection && jQuery.inArray( elem, selection ) > -1 ) { - if ( ignored ) { - ignored.push( elem ); - } - continue; - } - - attached = isAttached( elem ); - - // Append to fragment - tmp = getAll( fragment.appendChild( elem ), "script" ); - - // Preserve script evaluation history - if ( attached ) { - setGlobalEval( tmp ); - } - - // Capture executables - if ( scripts ) { - j = 0; - while ( ( elem = tmp[ j++ ] ) ) { - if ( rscriptType.test( elem.type || "" ) ) { - scripts.push( elem ); - } - } - } - } - - return fragment; -} - - -var - rkeyEvent = /^key/, - rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, - rtypenamespace = /^([^.]*)(?:\.(.+)|)/; - -function returnTrue() { - return true; -} - -function returnFalse() { - return false; -} - -// Support: IE <=9 - 11+ -// focus() and blur() are asynchronous, except when they are no-op. -// So expect focus to be synchronous when the element is already active, -// and blur to be synchronous when the element is not already active. -// (focus and blur are always synchronous in other supported browsers, -// this just defines when we can count on it). -function expectSync( elem, type ) { - return ( elem === safeActiveElement() ) === ( type === "focus" ); -} - -// Support: IE <=9 only -// Accessing document.activeElement can throw unexpectedly -// https://bugs.jquery.com/ticket/13393 -function safeActiveElement() { - try { - return document.activeElement; - } catch ( err ) { } -} - -function on( elem, types, selector, data, fn, one ) { - var origFn, type; - - // Types can be a map of types/handlers - if ( typeof types === "object" ) { - - // ( types-Object, selector, data ) - if ( typeof selector !== "string" ) { - - // ( types-Object, data ) - data = data || selector; - selector = undefined; - } - for ( type in types ) { - on( elem, type, selector, data, types[ type ], one ); - } - return elem; - } - - if ( data == null && fn == null ) { - - // ( types, fn ) - fn = selector; - data = selector = undefined; - } else if ( fn == null ) { - if ( typeof selector === "string" ) { - - // ( types, selector, fn ) - fn = data; - data = undefined; - } else { - - // ( types, data, fn ) - fn = data; - data = selector; - selector = undefined; - } - } - if ( fn === false ) { - fn = returnFalse; - } else if ( !fn ) { - return elem; - } - - if ( one === 1 ) { - origFn = fn; - fn = function( event ) { - - // Can use an empty set, since event contains the info - jQuery().off( event ); - return origFn.apply( this, arguments ); - }; - - // Use same guid so caller can remove using origFn - fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); - } - return elem.each( function() { - jQuery.event.add( this, types, fn, data, selector ); - } ); -} - -/* - * Helper functions for managing events -- not part of the public interface. - * Props to Dean Edwards' addEvent library for many of the ideas. - */ -jQuery.event = { - - global: {}, - - add: function( elem, types, handler, data, selector ) { - - var handleObjIn, eventHandle, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = dataPriv.get( elem ); - - // Only attach events to objects that accept data - if ( !acceptData( elem ) ) { - return; - } - - // Caller can pass in an object of custom data in lieu of the handler - if ( handler.handler ) { - handleObjIn = handler; - handler = handleObjIn.handler; - selector = handleObjIn.selector; - } - - // Ensure that invalid selectors throw exceptions at attach time - // Evaluate against documentElement in case elem is a non-element node (e.g., document) - if ( selector ) { - jQuery.find.matchesSelector( documentElement, selector ); - } - - // Make sure that the handler has a unique ID, used to find/remove it later - if ( !handler.guid ) { - handler.guid = jQuery.guid++; - } - - // Init the element's event structure and main handler, if this is the first - if ( !( events = elemData.events ) ) { - events = elemData.events = Object.create( null ); - } - if ( !( eventHandle = elemData.handle ) ) { - eventHandle = elemData.handle = function( e ) { - - // Discard the second event of a jQuery.event.trigger() and - // when an event is called after a page has unloaded - return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ? - jQuery.event.dispatch.apply( elem, arguments ) : undefined; - }; - } - - // Handle multiple events separated by a space - types = ( types || "" ).match( rnothtmlwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[ t ] ) || []; - type = origType = tmp[ 1 ]; - namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); - - // There *must* be a type, no attaching namespace-only handlers - if ( !type ) { - continue; - } - - // If event changes its type, use the special event handlers for the changed type - special = jQuery.event.special[ type ] || {}; - - // If selector defined, determine special event api type, otherwise given type - type = ( selector ? special.delegateType : special.bindType ) || type; - - // Update special based on newly reset type - special = jQuery.event.special[ type ] || {}; - - // handleObj is passed to all event handlers - handleObj = jQuery.extend( { - type: type, - origType: origType, - data: data, - handler: handler, - guid: handler.guid, - selector: selector, - needsContext: selector && jQuery.expr.match.needsContext.test( selector ), - namespace: namespaces.join( "." ) - }, handleObjIn ); - - // Init the event handler queue if we're the first - if ( !( handlers = events[ type ] ) ) { - handlers = events[ type ] = []; - handlers.delegateCount = 0; - - // Only use addEventListener if the special events handler returns false - if ( !special.setup || - special.setup.call( elem, data, namespaces, eventHandle ) === false ) { - - if ( elem.addEventListener ) { - elem.addEventListener( type, eventHandle ); - } - } - } - - if ( special.add ) { - special.add.call( elem, handleObj ); - - if ( !handleObj.handler.guid ) { - handleObj.handler.guid = handler.guid; - } - } - - // Add to the element's handler list, delegates in front - if ( selector ) { - handlers.splice( handlers.delegateCount++, 0, handleObj ); - } else { - handlers.push( handleObj ); - } - - // Keep track of which events have ever been used, for event optimization - jQuery.event.global[ type ] = true; - } - - }, - - // Detach an event or set of events from an element - remove: function( elem, types, handler, selector, mappedTypes ) { - - var j, origCount, tmp, - events, t, handleObj, - special, handlers, type, namespaces, origType, - elemData = dataPriv.hasData( elem ) && dataPriv.get( elem ); - - if ( !elemData || !( events = elemData.events ) ) { - return; - } - - // Once for each type.namespace in types; type may be omitted - types = ( types || "" ).match( rnothtmlwhite ) || [ "" ]; - t = types.length; - while ( t-- ) { - tmp = rtypenamespace.exec( types[ t ] ) || []; - type = origType = tmp[ 1 ]; - namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); - - // Unbind all events (on this namespace, if provided) for the element - if ( !type ) { - for ( type in events ) { - jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); - } - continue; - } - - special = jQuery.event.special[ type ] || {}; - type = ( selector ? special.delegateType : special.bindType ) || type; - handlers = events[ type ] || []; - tmp = tmp[ 2 ] && - new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); - - // Remove matching events - origCount = j = handlers.length; - while ( j-- ) { - handleObj = handlers[ j ]; - - if ( ( mappedTypes || origType === handleObj.origType ) && - ( !handler || handler.guid === handleObj.guid ) && - ( !tmp || tmp.test( handleObj.namespace ) ) && - ( !selector || selector === handleObj.selector || - selector === "**" && handleObj.selector ) ) { - handlers.splice( j, 1 ); - - if ( handleObj.selector ) { - handlers.delegateCount--; - } - if ( special.remove ) { - special.remove.call( elem, handleObj ); - } - } - } - - // Remove generic event handler if we removed something and no more handlers exist - // (avoids potential for endless recursion during removal of special event handlers) - if ( origCount && !handlers.length ) { - if ( !special.teardown || - special.teardown.call( elem, namespaces, elemData.handle ) === false ) { - - jQuery.removeEvent( elem, type, elemData.handle ); - } - - delete events[ type ]; - } - } - - // Remove data and the expando if it's no longer used - if ( jQuery.isEmptyObject( events ) ) { - dataPriv.remove( elem, "handle events" ); - } - }, - - dispatch: function( nativeEvent ) { - - var i, j, ret, matched, handleObj, handlerQueue, - args = new Array( arguments.length ), - - // Make a writable jQuery.Event from the native event object - event = jQuery.event.fix( nativeEvent ), - - handlers = ( - dataPriv.get( this, "events" ) || Object.create( null ) - )[ event.type ] || [], - special = jQuery.event.special[ event.type ] || {}; - - // Use the fix-ed jQuery.Event rather than the (read-only) native event - args[ 0 ] = event; - - for ( i = 1; i < arguments.length; i++ ) { - args[ i ] = arguments[ i ]; - } - - event.delegateTarget = this; - - // Call the preDispatch hook for the mapped type, and let it bail if desired - if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { - return; - } - - // Determine handlers - handlerQueue = jQuery.event.handlers.call( this, event, handlers ); - - // Run delegates first; they may want to stop propagation beneath us - i = 0; - while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { - event.currentTarget = matched.elem; - - j = 0; - while ( ( handleObj = matched.handlers[ j++ ] ) && - !event.isImmediatePropagationStopped() ) { - - // If the event is namespaced, then each handler is only invoked if it is - // specially universal or its namespaces are a superset of the event's. - if ( !event.rnamespace || handleObj.namespace === false || - event.rnamespace.test( handleObj.namespace ) ) { - - event.handleObj = handleObj; - event.data = handleObj.data; - - ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || - handleObj.handler ).apply( matched.elem, args ); - - if ( ret !== undefined ) { - if ( ( event.result = ret ) === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - } - } - - // Call the postDispatch hook for the mapped type - if ( special.postDispatch ) { - special.postDispatch.call( this, event ); - } - - return event.result; - }, - - handlers: function( event, handlers ) { - var i, handleObj, sel, matchedHandlers, matchedSelectors, - handlerQueue = [], - delegateCount = handlers.delegateCount, - cur = event.target; - - // Find delegate handlers - if ( delegateCount && - - // Support: IE <=9 - // Black-hole SVG instance trees (trac-13180) - cur.nodeType && - - // Support: Firefox <=42 - // Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861) - // https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click - // Support: IE 11 only - // ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343) - !( event.type === "click" && event.button >= 1 ) ) { - - for ( ; cur !== this; cur = cur.parentNode || this ) { - - // Don't check non-elements (#13208) - // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) - if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) { - matchedHandlers = []; - matchedSelectors = {}; - for ( i = 0; i < delegateCount; i++ ) { - handleObj = handlers[ i ]; - - // Don't conflict with Object.prototype properties (#13203) - sel = handleObj.selector + " "; - - if ( matchedSelectors[ sel ] === undefined ) { - matchedSelectors[ sel ] = handleObj.needsContext ? - jQuery( sel, this ).index( cur ) > -1 : - jQuery.find( sel, this, null, [ cur ] ).length; - } - if ( matchedSelectors[ sel ] ) { - matchedHandlers.push( handleObj ); - } - } - if ( matchedHandlers.length ) { - handlerQueue.push( { elem: cur, handlers: matchedHandlers } ); - } - } - } - } - - // Add the remaining (directly-bound) handlers - cur = this; - if ( delegateCount < handlers.length ) { - handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } ); - } - - return handlerQueue; - }, - - addProp: function( name, hook ) { - Object.defineProperty( jQuery.Event.prototype, name, { - enumerable: true, - configurable: true, - - get: isFunction( hook ) ? - function() { - if ( this.originalEvent ) { - return hook( this.originalEvent ); - } - } : - function() { - if ( this.originalEvent ) { - return this.originalEvent[ name ]; - } - }, - - set: function( value ) { - Object.defineProperty( this, name, { - enumerable: true, - configurable: true, - writable: true, - value: value - } ); - } - } ); - }, - - fix: function( originalEvent ) { - return originalEvent[ jQuery.expando ] ? - originalEvent : - new jQuery.Event( originalEvent ); - }, - - special: { - load: { - - // Prevent triggered image.load events from bubbling to window.load - noBubble: true - }, - click: { - - // Utilize native event to ensure correct state for checkable inputs - setup: function( data ) { - - // For mutual compressibility with _default, replace `this` access with a local var. - // `|| data` is dead code meant only to preserve the variable through minification. - var el = this || data; - - // Claim the first handler - if ( rcheckableType.test( el.type ) && - el.click && nodeName( el, "input" ) ) { - - // dataPriv.set( el, "click", ... ) - leverageNative( el, "click", returnTrue ); - } - - // Return false to allow normal processing in the caller - return false; - }, - trigger: function( data ) { - - // For mutual compressibility with _default, replace `this` access with a local var. - // `|| data` is dead code meant only to preserve the variable through minification. - var el = this || data; - - // Force setup before triggering a click - if ( rcheckableType.test( el.type ) && - el.click && nodeName( el, "input" ) ) { - - leverageNative( el, "click" ); - } - - // Return non-false to allow normal event-path propagation - return true; - }, - - // For cross-browser consistency, suppress native .click() on links - // Also prevent it if we're currently inside a leveraged native-event stack - _default: function( event ) { - var target = event.target; - return rcheckableType.test( target.type ) && - target.click && nodeName( target, "input" ) && - dataPriv.get( target, "click" ) || - nodeName( target, "a" ); - } - }, - - beforeunload: { - postDispatch: function( event ) { - - // Support: Firefox 20+ - // Firefox doesn't alert if the returnValue field is not set. - if ( event.result !== undefined && event.originalEvent ) { - event.originalEvent.returnValue = event.result; - } - } - } - } -}; - -// Ensure the presence of an event listener that handles manually-triggered -// synthetic events by interrupting progress until reinvoked in response to -// *native* events that it fires directly, ensuring that state changes have -// already occurred before other listeners are invoked. -function leverageNative( el, type, expectSync ) { - - // Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add - if ( !expectSync ) { - if ( dataPriv.get( el, type ) === undefined ) { - jQuery.event.add( el, type, returnTrue ); - } - return; - } - - // Register the controller as a special universal handler for all event namespaces - dataPriv.set( el, type, false ); - jQuery.event.add( el, type, { - namespace: false, - handler: function( event ) { - var notAsync, result, - saved = dataPriv.get( this, type ); - - if ( ( event.isTrigger & 1 ) && this[ type ] ) { - - // Interrupt processing of the outer synthetic .trigger()ed event - // Saved data should be false in such cases, but might be a leftover capture object - // from an async native handler (gh-4350) - if ( !saved.length ) { - - // Store arguments for use when handling the inner native event - // There will always be at least one argument (an event object), so this array - // will not be confused with a leftover capture object. - saved = slice.call( arguments ); - dataPriv.set( this, type, saved ); - - // Trigger the native event and capture its result - // Support: IE <=9 - 11+ - // focus() and blur() are asynchronous - notAsync = expectSync( this, type ); - this[ type ](); - result = dataPriv.get( this, type ); - if ( saved !== result || notAsync ) { - dataPriv.set( this, type, false ); - } else { - result = {}; - } - if ( saved !== result ) { - - // Cancel the outer synthetic event - event.stopImmediatePropagation(); - event.preventDefault(); - return result.value; - } - - // If this is an inner synthetic event for an event with a bubbling surrogate - // (focus or blur), assume that the surrogate already propagated from triggering the - // native event and prevent that from happening again here. - // This technically gets the ordering wrong w.r.t. to `.trigger()` (in which the - // bubbling surrogate propagates *after* the non-bubbling base), but that seems - // less bad than duplication. - } else if ( ( jQuery.event.special[ type ] || {} ).delegateType ) { - event.stopPropagation(); - } - - // If this is a native event triggered above, everything is now in order - // Fire an inner synthetic event with the original arguments - } else if ( saved.length ) { - - // ...and capture the result - dataPriv.set( this, type, { - value: jQuery.event.trigger( - - // Support: IE <=9 - 11+ - // Extend with the prototype to reset the above stopImmediatePropagation() - jQuery.extend( saved[ 0 ], jQuery.Event.prototype ), - saved.slice( 1 ), - this - ) - } ); - - // Abort handling of the native event - event.stopImmediatePropagation(); - } - } - } ); -} - -jQuery.removeEvent = function( elem, type, handle ) { - - // This "if" is needed for plain objects - if ( elem.removeEventListener ) { - elem.removeEventListener( type, handle ); - } -}; - -jQuery.Event = function( src, props ) { - - // Allow instantiation without the 'new' keyword - if ( !( this instanceof jQuery.Event ) ) { - return new jQuery.Event( src, props ); - } - - // Event object - if ( src && src.type ) { - this.originalEvent = src; - this.type = src.type; - - // Events bubbling up the document may have been marked as prevented - // by a handler lower down the tree; reflect the correct value. - this.isDefaultPrevented = src.defaultPrevented || - src.defaultPrevented === undefined && - - // Support: Android <=2.3 only - src.returnValue === false ? - returnTrue : - returnFalse; - - // Create target properties - // Support: Safari <=6 - 7 only - // Target should not be a text node (#504, #13143) - this.target = ( src.target && src.target.nodeType === 3 ) ? - src.target.parentNode : - src.target; - - this.currentTarget = src.currentTarget; - this.relatedTarget = src.relatedTarget; - - // Event type - } else { - this.type = src; - } - - // Put explicitly provided properties onto the event object - if ( props ) { - jQuery.extend( this, props ); - } - - // Create a timestamp if incoming event doesn't have one - this.timeStamp = src && src.timeStamp || Date.now(); - - // Mark it as fixed - this[ jQuery.expando ] = true; -}; - -// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding -// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html -jQuery.Event.prototype = { - constructor: jQuery.Event, - isDefaultPrevented: returnFalse, - isPropagationStopped: returnFalse, - isImmediatePropagationStopped: returnFalse, - isSimulated: false, - - preventDefault: function() { - var e = this.originalEvent; - - this.isDefaultPrevented = returnTrue; - - if ( e && !this.isSimulated ) { - e.preventDefault(); - } - }, - stopPropagation: function() { - var e = this.originalEvent; - - this.isPropagationStopped = returnTrue; - - if ( e && !this.isSimulated ) { - e.stopPropagation(); - } - }, - stopImmediatePropagation: function() { - var e = this.originalEvent; - - this.isImmediatePropagationStopped = returnTrue; - - if ( e && !this.isSimulated ) { - e.stopImmediatePropagation(); - } - - this.stopPropagation(); - } -}; - -// Includes all common event props including KeyEvent and MouseEvent specific props -jQuery.each( { - altKey: true, - bubbles: true, - cancelable: true, - changedTouches: true, - ctrlKey: true, - detail: true, - eventPhase: true, - metaKey: true, - pageX: true, - pageY: true, - shiftKey: true, - view: true, - "char": true, - code: true, - charCode: true, - key: true, - keyCode: true, - button: true, - buttons: true, - clientX: true, - clientY: true, - offsetX: true, - offsetY: true, - pointerId: true, - pointerType: true, - screenX: true, - screenY: true, - targetTouches: true, - toElement: true, - touches: true, - - which: function( event ) { - var button = event.button; - - // Add which for key events - if ( event.which == null && rkeyEvent.test( event.type ) ) { - return event.charCode != null ? event.charCode : event.keyCode; - } - - // Add which for click: 1 === left; 2 === middle; 3 === right - if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) { - if ( button & 1 ) { - return 1; - } - - if ( button & 2 ) { - return 3; - } - - if ( button & 4 ) { - return 2; - } - - return 0; - } - - return event.which; - } -}, jQuery.event.addProp ); - -jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) { - jQuery.event.special[ type ] = { - - // Utilize native event if possible so blur/focus sequence is correct - setup: function() { - - // Claim the first handler - // dataPriv.set( this, "focus", ... ) - // dataPriv.set( this, "blur", ... ) - leverageNative( this, type, expectSync ); - - // Return false to allow normal processing in the caller - return false; - }, - trigger: function() { - - // Force setup before trigger - leverageNative( this, type ); - - // Return non-false to allow normal event-path propagation - return true; - }, - - delegateType: delegateType - }; -} ); - -// Create mouseenter/leave events using mouseover/out and event-time checks -// so that event delegation works in jQuery. -// Do the same for pointerenter/pointerleave and pointerover/pointerout -// -// Support: Safari 7 only -// Safari sends mouseenter too often; see: -// https://bugs.chromium.org/p/chromium/issues/detail?id=470258 -// for the description of the bug (it existed in older Chrome versions as well). -jQuery.each( { - mouseenter: "mouseover", - mouseleave: "mouseout", - pointerenter: "pointerover", - pointerleave: "pointerout" -}, function( orig, fix ) { - jQuery.event.special[ orig ] = { - delegateType: fix, - bindType: fix, - - handle: function( event ) { - var ret, - target = this, - related = event.relatedTarget, - handleObj = event.handleObj; - - // For mouseenter/leave call the handler if related is outside the target. - // NB: No relatedTarget if the mouse left/entered the browser window - if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { - event.type = handleObj.origType; - ret = handleObj.handler.apply( this, arguments ); - event.type = fix; - } - return ret; - } - }; -} ); - -jQuery.fn.extend( { - - on: function( types, selector, data, fn ) { - return on( this, types, selector, data, fn ); - }, - one: function( types, selector, data, fn ) { - return on( this, types, selector, data, fn, 1 ); - }, - off: function( types, selector, fn ) { - var handleObj, type; - if ( types && types.preventDefault && types.handleObj ) { - - // ( event ) dispatched jQuery.Event - handleObj = types.handleObj; - jQuery( types.delegateTarget ).off( - handleObj.namespace ? - handleObj.origType + "." + handleObj.namespace : - handleObj.origType, - handleObj.selector, - handleObj.handler - ); - return this; - } - if ( typeof types === "object" ) { - - // ( types-object [, selector] ) - for ( type in types ) { - this.off( type, selector, types[ type ] ); - } - return this; - } - if ( selector === false || typeof selector === "function" ) { - - // ( types [, fn] ) - fn = selector; - selector = undefined; - } - if ( fn === false ) { - fn = returnFalse; - } - return this.each( function() { - jQuery.event.remove( this, types, fn, selector ); - } ); - } -} ); - - -var - - // Support: IE <=10 - 11, Edge 12 - 13 only - // In IE/Edge using regex groups here causes severe slowdowns. - // See https://connect.microsoft.com/IE/feedback/details/1736512/ - rnoInnerhtml = /\s*$/g; - -// Prefer a tbody over its parent table for containing new rows -function manipulationTarget( elem, content ) { - if ( nodeName( elem, "table" ) && - nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ) { - - return jQuery( elem ).children( "tbody" )[ 0 ] || elem; - } - - return elem; -} - -// Replace/restore the type attribute of script elements for safe DOM manipulation -function disableScript( elem ) { - elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type; - return elem; -} -function restoreScript( elem ) { - if ( ( elem.type || "" ).slice( 0, 5 ) === "true/" ) { - elem.type = elem.type.slice( 5 ); - } else { - elem.removeAttribute( "type" ); - } - - return elem; -} - -function cloneCopyEvent( src, dest ) { - var i, l, type, pdataOld, udataOld, udataCur, events; - - if ( dest.nodeType !== 1 ) { - return; - } - - // 1. Copy private data: events, handlers, etc. - if ( dataPriv.hasData( src ) ) { - pdataOld = dataPriv.get( src ); - events = pdataOld.events; - - if ( events ) { - dataPriv.remove( dest, "handle events" ); - - for ( type in events ) { - for ( i = 0, l = events[ type ].length; i < l; i++ ) { - jQuery.event.add( dest, type, events[ type ][ i ] ); - } - } - } - } - - // 2. Copy user data - if ( dataUser.hasData( src ) ) { - udataOld = dataUser.access( src ); - udataCur = jQuery.extend( {}, udataOld ); - - dataUser.set( dest, udataCur ); - } -} - -// Fix IE bugs, see support tests -function fixInput( src, dest ) { - var nodeName = dest.nodeName.toLowerCase(); - - // Fails to persist the checked state of a cloned checkbox or radio button. - if ( nodeName === "input" && rcheckableType.test( src.type ) ) { - dest.checked = src.checked; - - // Fails to return the selected option to the default selected state when cloning options - } else if ( nodeName === "input" || nodeName === "textarea" ) { - dest.defaultValue = src.defaultValue; - } -} - -function domManip( collection, args, callback, ignored ) { - - // Flatten any nested arrays - args = flat( args ); - - var fragment, first, scripts, hasScripts, node, doc, - i = 0, - l = collection.length, - iNoClone = l - 1, - value = args[ 0 ], - valueIsFunction = isFunction( value ); - - // We can't cloneNode fragments that contain checked, in WebKit - if ( valueIsFunction || - ( l > 1 && typeof value === "string" && - !support.checkClone && rchecked.test( value ) ) ) { - return collection.each( function( index ) { - var self = collection.eq( index ); - if ( valueIsFunction ) { - args[ 0 ] = value.call( this, index, self.html() ); - } - domManip( self, args, callback, ignored ); - } ); - } - - if ( l ) { - fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); - first = fragment.firstChild; - - if ( fragment.childNodes.length === 1 ) { - fragment = first; - } - - // Require either new content or an interest in ignored elements to invoke the callback - if ( first || ignored ) { - scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); - hasScripts = scripts.length; - - // Use the original fragment for the last item - // instead of the first because it can end up - // being emptied incorrectly in certain situations (#8070). - for ( ; i < l; i++ ) { - node = fragment; - - if ( i !== iNoClone ) { - node = jQuery.clone( node, true, true ); - - // Keep references to cloned scripts for later restoration - if ( hasScripts ) { - - // Support: Android <=4.0 only, PhantomJS 1 only - // push.apply(_, arraylike) throws on ancient WebKit - jQuery.merge( scripts, getAll( node, "script" ) ); - } - } - - callback.call( collection[ i ], node, i ); - } - - if ( hasScripts ) { - doc = scripts[ scripts.length - 1 ].ownerDocument; - - // Reenable scripts - jQuery.map( scripts, restoreScript ); - - // Evaluate executable scripts on first document insertion - for ( i = 0; i < hasScripts; i++ ) { - node = scripts[ i ]; - if ( rscriptType.test( node.type || "" ) && - !dataPriv.access( node, "globalEval" ) && - jQuery.contains( doc, node ) ) { - - if ( node.src && ( node.type || "" ).toLowerCase() !== "module" ) { - - // Optional AJAX dependency, but won't run scripts if not present - if ( jQuery._evalUrl && !node.noModule ) { - jQuery._evalUrl( node.src, { - nonce: node.nonce || node.getAttribute( "nonce" ) - }, doc ); - } - } else { - DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc ); - } - } - } - } - } - } - - return collection; -} - -function remove( elem, selector, keepData ) { - var node, - nodes = selector ? jQuery.filter( selector, elem ) : elem, - i = 0; - - for ( ; ( node = nodes[ i ] ) != null; i++ ) { - if ( !keepData && node.nodeType === 1 ) { - jQuery.cleanData( getAll( node ) ); - } - - if ( node.parentNode ) { - if ( keepData && isAttached( node ) ) { - setGlobalEval( getAll( node, "script" ) ); - } - node.parentNode.removeChild( node ); - } - } - - return elem; -} - -jQuery.extend( { - htmlPrefilter: function( html ) { - return html; - }, - - clone: function( elem, dataAndEvents, deepDataAndEvents ) { - var i, l, srcElements, destElements, - clone = elem.cloneNode( true ), - inPage = isAttached( elem ); - - // Fix IE cloning issues - if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) && - !jQuery.isXMLDoc( elem ) ) { - - // We eschew Sizzle here for performance reasons: https://jsperf.com/getall-vs-sizzle/2 - destElements = getAll( clone ); - srcElements = getAll( elem ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - fixInput( srcElements[ i ], destElements[ i ] ); - } - } - - // Copy the events from the original to the clone - if ( dataAndEvents ) { - if ( deepDataAndEvents ) { - srcElements = srcElements || getAll( elem ); - destElements = destElements || getAll( clone ); - - for ( i = 0, l = srcElements.length; i < l; i++ ) { - cloneCopyEvent( srcElements[ i ], destElements[ i ] ); - } - } else { - cloneCopyEvent( elem, clone ); - } - } - - // Preserve script evaluation history - destElements = getAll( clone, "script" ); - if ( destElements.length > 0 ) { - setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); - } - - // Return the cloned set - return clone; - }, - - cleanData: function( elems ) { - var data, elem, type, - special = jQuery.event.special, - i = 0; - - for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) { - if ( acceptData( elem ) ) { - if ( ( data = elem[ dataPriv.expando ] ) ) { - if ( data.events ) { - for ( type in data.events ) { - if ( special[ type ] ) { - jQuery.event.remove( elem, type ); - - // This is a shortcut to avoid jQuery.event.remove's overhead - } else { - jQuery.removeEvent( elem, type, data.handle ); - } - } - } - - // Support: Chrome <=35 - 45+ - // Assign undefined instead of using delete, see Data#remove - elem[ dataPriv.expando ] = undefined; - } - if ( elem[ dataUser.expando ] ) { - - // Support: Chrome <=35 - 45+ - // Assign undefined instead of using delete, see Data#remove - elem[ dataUser.expando ] = undefined; - } - } - } - } -} ); - -jQuery.fn.extend( { - detach: function( selector ) { - return remove( this, selector, true ); - }, - - remove: function( selector ) { - return remove( this, selector ); - }, - - text: function( value ) { - return access( this, function( value ) { - return value === undefined ? - jQuery.text( this ) : - this.empty().each( function() { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - this.textContent = value; - } - } ); - }, null, value, arguments.length ); - }, - - append: function() { - return domManip( this, arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.appendChild( elem ); - } - } ); - }, - - prepend: function() { - return domManip( this, arguments, function( elem ) { - if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { - var target = manipulationTarget( this, elem ); - target.insertBefore( elem, target.firstChild ); - } - } ); - }, - - before: function() { - return domManip( this, arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this ); - } - } ); - }, - - after: function() { - return domManip( this, arguments, function( elem ) { - if ( this.parentNode ) { - this.parentNode.insertBefore( elem, this.nextSibling ); - } - } ); - }, - - empty: function() { - var elem, - i = 0; - - for ( ; ( elem = this[ i ] ) != null; i++ ) { - if ( elem.nodeType === 1 ) { - - // Prevent memory leaks - jQuery.cleanData( getAll( elem, false ) ); - - // Remove any remaining nodes - elem.textContent = ""; - } - } - - return this; - }, - - clone: function( dataAndEvents, deepDataAndEvents ) { - dataAndEvents = dataAndEvents == null ? false : dataAndEvents; - deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; - - return this.map( function() { - return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); - } ); - }, - - html: function( value ) { - return access( this, function( value ) { - var elem = this[ 0 ] || {}, - i = 0, - l = this.length; - - if ( value === undefined && elem.nodeType === 1 ) { - return elem.innerHTML; - } - - // See if we can take a shortcut and just use innerHTML - if ( typeof value === "string" && !rnoInnerhtml.test( value ) && - !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { - - value = jQuery.htmlPrefilter( value ); - - try { - for ( ; i < l; i++ ) { - elem = this[ i ] || {}; - - // Remove element nodes and prevent memory leaks - if ( elem.nodeType === 1 ) { - jQuery.cleanData( getAll( elem, false ) ); - elem.innerHTML = value; - } - } - - elem = 0; - - // If using innerHTML throws an exception, use the fallback method - } catch ( e ) {} - } - - if ( elem ) { - this.empty().append( value ); - } - }, null, value, arguments.length ); - }, - - replaceWith: function() { - var ignored = []; - - // Make the changes, replacing each non-ignored context element with the new content - return domManip( this, arguments, function( elem ) { - var parent = this.parentNode; - - if ( jQuery.inArray( this, ignored ) < 0 ) { - jQuery.cleanData( getAll( this ) ); - if ( parent ) { - parent.replaceChild( elem, this ); - } - } - - // Force callback invocation - }, ignored ); - } -} ); - -jQuery.each( { - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function( name, original ) { - jQuery.fn[ name ] = function( selector ) { - var elems, - ret = [], - insert = jQuery( selector ), - last = insert.length - 1, - i = 0; - - for ( ; i <= last; i++ ) { - elems = i === last ? this : this.clone( true ); - jQuery( insert[ i ] )[ original ]( elems ); - - // Support: Android <=4.0 only, PhantomJS 1 only - // .get() because push.apply(_, arraylike) throws on ancient WebKit - push.apply( ret, elems.get() ); - } - - return this.pushStack( ret ); - }; -} ); -var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" ); - -var getStyles = function( elem ) { - - // Support: IE <=11 only, Firefox <=30 (#15098, #14150) - // IE throws on elements created in popups - // FF meanwhile throws on frame elements through "defaultView.getComputedStyle" - var view = elem.ownerDocument.defaultView; - - if ( !view || !view.opener ) { - view = window; - } - - return view.getComputedStyle( elem ); - }; - -var swap = function( elem, options, callback ) { - var ret, name, - old = {}; - - // Remember the old values, and insert the new ones - for ( name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - ret = callback.call( elem ); - - // Revert the old values - for ( name in options ) { - elem.style[ name ] = old[ name ]; - } - - return ret; -}; - - -var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" ); - - - -( function() { - - // Executing both pixelPosition & boxSizingReliable tests require only one layout - // so they're executed at the same time to save the second computation. - function computeStyleTests() { - - // This is a singleton, we need to execute it only once - if ( !div ) { - return; - } - - container.style.cssText = "position:absolute;left:-11111px;width:60px;" + - "margin-top:1px;padding:0;border:0"; - div.style.cssText = - "position:relative;display:block;box-sizing:border-box;overflow:scroll;" + - "margin:auto;border:1px;padding:1px;" + - "width:60%;top:1%"; - documentElement.appendChild( container ).appendChild( div ); - - var divStyle = window.getComputedStyle( div ); - pixelPositionVal = divStyle.top !== "1%"; - - // Support: Android 4.0 - 4.3 only, Firefox <=3 - 44 - reliableMarginLeftVal = roundPixelMeasures( divStyle.marginLeft ) === 12; - - // Support: Android 4.0 - 4.3 only, Safari <=9.1 - 10.1, iOS <=7.0 - 9.3 - // Some styles come back with percentage values, even though they shouldn't - div.style.right = "60%"; - pixelBoxStylesVal = roundPixelMeasures( divStyle.right ) === 36; - - // Support: IE 9 - 11 only - // Detect misreporting of content dimensions for box-sizing:border-box elements - boxSizingReliableVal = roundPixelMeasures( divStyle.width ) === 36; - - // Support: IE 9 only - // Detect overflow:scroll screwiness (gh-3699) - // Support: Chrome <=64 - // Don't get tricked when zoom affects offsetWidth (gh-4029) - div.style.position = "absolute"; - scrollboxSizeVal = roundPixelMeasures( div.offsetWidth / 3 ) === 12; - - documentElement.removeChild( container ); - - // Nullify the div so it wouldn't be stored in the memory and - // it will also be a sign that checks already performed - div = null; - } - - function roundPixelMeasures( measure ) { - return Math.round( parseFloat( measure ) ); - } - - var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal, - reliableTrDimensionsVal, reliableMarginLeftVal, - container = document.createElement( "div" ), - div = document.createElement( "div" ); - - // Finish early in limited (non-browser) environments - if ( !div.style ) { - return; - } - - // Support: IE <=9 - 11 only - // Style of cloned element affects source element cloned (#8908) - div.style.backgroundClip = "content-box"; - div.cloneNode( true ).style.backgroundClip = ""; - support.clearCloneStyle = div.style.backgroundClip === "content-box"; - - jQuery.extend( support, { - boxSizingReliable: function() { - computeStyleTests(); - return boxSizingReliableVal; - }, - pixelBoxStyles: function() { - computeStyleTests(); - return pixelBoxStylesVal; - }, - pixelPosition: function() { - computeStyleTests(); - return pixelPositionVal; - }, - reliableMarginLeft: function() { - computeStyleTests(); - return reliableMarginLeftVal; - }, - scrollboxSize: function() { - computeStyleTests(); - return scrollboxSizeVal; - }, - - // Support: IE 9 - 11+, Edge 15 - 18+ - // IE/Edge misreport `getComputedStyle` of table rows with width/height - // set in CSS while `offset*` properties report correct values. - // Behavior in IE 9 is more subtle than in newer versions & it passes - // some versions of this test; make sure not to make it pass there! - reliableTrDimensions: function() { - var table, tr, trChild, trStyle; - if ( reliableTrDimensionsVal == null ) { - table = document.createElement( "table" ); - tr = document.createElement( "tr" ); - trChild = document.createElement( "div" ); - - table.style.cssText = "position:absolute;left:-11111px"; - tr.style.height = "1px"; - trChild.style.height = "9px"; - - documentElement - .appendChild( table ) - .appendChild( tr ) - .appendChild( trChild ); - - trStyle = window.getComputedStyle( tr ); - reliableTrDimensionsVal = parseInt( trStyle.height ) > 3; - - documentElement.removeChild( table ); - } - return reliableTrDimensionsVal; - } - } ); -} )(); - - -function curCSS( elem, name, computed ) { - var width, minWidth, maxWidth, ret, - - // Support: Firefox 51+ - // Retrieving style before computed somehow - // fixes an issue with getting wrong values - // on detached elements - style = elem.style; - - computed = computed || getStyles( elem ); - - // getPropertyValue is needed for: - // .css('filter') (IE 9 only, #12537) - // .css('--customProperty) (#3144) - if ( computed ) { - ret = computed.getPropertyValue( name ) || computed[ name ]; - - if ( ret === "" && !isAttached( elem ) ) { - ret = jQuery.style( elem, name ); - } - - // A tribute to the "awesome hack by Dean Edwards" - // Android Browser returns percentage for some values, - // but width seems to be reliably pixels. - // This is against the CSSOM draft spec: - // https://drafts.csswg.org/cssom/#resolved-values - if ( !support.pixelBoxStyles() && rnumnonpx.test( ret ) && rboxStyle.test( name ) ) { - - // Remember the original values - width = style.width; - minWidth = style.minWidth; - maxWidth = style.maxWidth; - - // Put in the new values to get a computed value out - style.minWidth = style.maxWidth = style.width = ret; - ret = computed.width; - - // Revert the changed values - style.width = width; - style.minWidth = minWidth; - style.maxWidth = maxWidth; - } - } - - return ret !== undefined ? - - // Support: IE <=9 - 11 only - // IE returns zIndex value as an integer. - ret + "" : - ret; -} - - -function addGetHookIf( conditionFn, hookFn ) { - - // Define the hook, we'll check on the first run if it's really needed. - return { - get: function() { - if ( conditionFn() ) { - - // Hook not needed (or it's not possible to use it due - // to missing dependency), remove it. - delete this.get; - return; - } - - // Hook needed; redefine it so that the support test is not executed again. - return ( this.get = hookFn ).apply( this, arguments ); - } - }; -} - - -var cssPrefixes = [ "Webkit", "Moz", "ms" ], - emptyStyle = document.createElement( "div" ).style, - vendorProps = {}; - -// Return a vendor-prefixed property or undefined -function vendorPropName( name ) { - - // Check for vendor prefixed names - var capName = name[ 0 ].toUpperCase() + name.slice( 1 ), - i = cssPrefixes.length; - - while ( i-- ) { - name = cssPrefixes[ i ] + capName; - if ( name in emptyStyle ) { - return name; - } - } -} - -// Return a potentially-mapped jQuery.cssProps or vendor prefixed property -function finalPropName( name ) { - var final = jQuery.cssProps[ name ] || vendorProps[ name ]; - - if ( final ) { - return final; - } - if ( name in emptyStyle ) { - return name; - } - return vendorProps[ name ] = vendorPropName( name ) || name; -} - - -var - - // Swappable if display is none or starts with table - // except "table", "table-cell", or "table-caption" - // See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display - rdisplayswap = /^(none|table(?!-c[ea]).+)/, - rcustomProp = /^--/, - cssShow = { position: "absolute", visibility: "hidden", display: "block" }, - cssNormalTransform = { - letterSpacing: "0", - fontWeight: "400" - }; - -function setPositiveNumber( _elem, value, subtract ) { - - // Any relative (+/-) values have already been - // normalized at this point - var matches = rcssNum.exec( value ); - return matches ? - - // Guard against undefined "subtract", e.g., when used as in cssHooks - Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) : - value; -} - -function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computedVal ) { - var i = dimension === "width" ? 1 : 0, - extra = 0, - delta = 0; - - // Adjustment may not be necessary - if ( box === ( isBorderBox ? "border" : "content" ) ) { - return 0; - } - - for ( ; i < 4; i += 2 ) { - - // Both box models exclude margin - if ( box === "margin" ) { - delta += jQuery.css( elem, box + cssExpand[ i ], true, styles ); - } - - // If we get here with a content-box, we're seeking "padding" or "border" or "margin" - if ( !isBorderBox ) { - - // Add padding - delta += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); - - // For "border" or "margin", add border - if ( box !== "padding" ) { - delta += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); - - // But still keep track of it otherwise - } else { - extra += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); - } - - // If we get here with a border-box (content + padding + border), we're seeking "content" or - // "padding" or "margin" - } else { - - // For "content", subtract padding - if ( box === "content" ) { - delta -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles ); - } - - // For "content" or "padding", subtract border - if ( box !== "margin" ) { - delta -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles ); - } - } - } - - // Account for positive content-box scroll gutter when requested by providing computedVal - if ( !isBorderBox && computedVal >= 0 ) { - - // offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border - // Assuming integer scroll gutter, subtract the rest and round down - delta += Math.max( 0, Math.ceil( - elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - - computedVal - - delta - - extra - - 0.5 - - // If offsetWidth/offsetHeight is unknown, then we can't determine content-box scroll gutter - // Use an explicit zero to avoid NaN (gh-3964) - ) ) || 0; - } - - return delta; -} - -function getWidthOrHeight( elem, dimension, extra ) { - - // Start with computed style - var styles = getStyles( elem ), - - // To avoid forcing a reflow, only fetch boxSizing if we need it (gh-4322). - // Fake content-box until we know it's needed to know the true value. - boxSizingNeeded = !support.boxSizingReliable() || extra, - isBorderBox = boxSizingNeeded && - jQuery.css( elem, "boxSizing", false, styles ) === "border-box", - valueIsBorderBox = isBorderBox, - - val = curCSS( elem, dimension, styles ), - offsetProp = "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ); - - // Support: Firefox <=54 - // Return a confounding non-pixel value or feign ignorance, as appropriate. - if ( rnumnonpx.test( val ) ) { - if ( !extra ) { - return val; - } - val = "auto"; - } - - - // Support: IE 9 - 11 only - // Use offsetWidth/offsetHeight for when box sizing is unreliable. - // In those cases, the computed value can be trusted to be border-box. - if ( ( !support.boxSizingReliable() && isBorderBox || - - // Support: IE 10 - 11+, Edge 15 - 18+ - // IE/Edge misreport `getComputedStyle` of table rows with width/height - // set in CSS while `offset*` properties report correct values. - // Interestingly, in some cases IE 9 doesn't suffer from this issue. - !support.reliableTrDimensions() && nodeName( elem, "tr" ) || - - // Fall back to offsetWidth/offsetHeight when value is "auto" - // This happens for inline elements with no explicit setting (gh-3571) - val === "auto" || - - // Support: Android <=4.1 - 4.3 only - // Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602) - !parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) && - - // Make sure the element is visible & connected - elem.getClientRects().length ) { - - isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box"; - - // Where available, offsetWidth/offsetHeight approximate border box dimensions. - // Where not available (e.g., SVG), assume unreliable box-sizing and interpret the - // retrieved value as a content box dimension. - valueIsBorderBox = offsetProp in elem; - if ( valueIsBorderBox ) { - val = elem[ offsetProp ]; - } - } - - // Normalize "" and auto - val = parseFloat( val ) || 0; - - // Adjust for the element's box model - return ( val + - boxModelAdjustment( - elem, - dimension, - extra || ( isBorderBox ? "border" : "content" ), - valueIsBorderBox, - styles, - - // Provide the current computed size to request scroll gutter calculation (gh-3589) - val - ) - ) + "px"; -} - -jQuery.extend( { - - // Add in style property hooks for overriding the default - // behavior of getting and setting a style property - cssHooks: { - opacity: { - get: function( elem, computed ) { - if ( computed ) { - - // We should always get a number back from opacity - var ret = curCSS( elem, "opacity" ); - return ret === "" ? "1" : ret; - } - } - } - }, - - // Don't automatically add "px" to these possibly-unitless properties - cssNumber: { - "animationIterationCount": true, - "columnCount": true, - "fillOpacity": true, - "flexGrow": true, - "flexShrink": true, - "fontWeight": true, - "gridArea": true, - "gridColumn": true, - "gridColumnEnd": true, - "gridColumnStart": true, - "gridRow": true, - "gridRowEnd": true, - "gridRowStart": true, - "lineHeight": true, - "opacity": true, - "order": true, - "orphans": true, - "widows": true, - "zIndex": true, - "zoom": true - }, - - // Add in properties whose names you wish to fix before - // setting or getting the value - cssProps: {}, - - // Get and set the style property on a DOM Node - style: function( elem, name, value, extra ) { - - // Don't set styles on text and comment nodes - if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) { - return; - } - - // Make sure that we're working with the right name - var ret, type, hooks, - origName = camelCase( name ), - isCustomProp = rcustomProp.test( name ), - style = elem.style; - - // Make sure that we're working with the right name. We don't - // want to query the value if it is a CSS custom property - // since they are user-defined. - if ( !isCustomProp ) { - name = finalPropName( origName ); - } - - // Gets hook for the prefixed version, then unprefixed version - hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; - - // Check if we're setting a value - if ( value !== undefined ) { - type = typeof value; - - // Convert "+=" or "-=" to relative numbers (#7345) - if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) { - value = adjustCSS( elem, name, ret ); - - // Fixes bug #9237 - type = "number"; - } - - // Make sure that null and NaN values aren't set (#7116) - if ( value == null || value !== value ) { - return; - } - - // If a number was passed in, add the unit (except for certain CSS properties) - // The isCustomProp check can be removed in jQuery 4.0 when we only auto-append - // "px" to a few hardcoded values. - if ( type === "number" && !isCustomProp ) { - value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" ); - } - - // background-* props affect original clone's values - if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) { - style[ name ] = "inherit"; - } - - // If a hook was provided, use that value, otherwise just set the specified value - if ( !hooks || !( "set" in hooks ) || - ( value = hooks.set( elem, value, extra ) ) !== undefined ) { - - if ( isCustomProp ) { - style.setProperty( name, value ); - } else { - style[ name ] = value; - } - } - - } else { - - // If a hook was provided get the non-computed value from there - if ( hooks && "get" in hooks && - ( ret = hooks.get( elem, false, extra ) ) !== undefined ) { - - return ret; - } - - // Otherwise just get the value from the style object - return style[ name ]; - } - }, - - css: function( elem, name, extra, styles ) { - var val, num, hooks, - origName = camelCase( name ), - isCustomProp = rcustomProp.test( name ); - - // Make sure that we're working with the right name. We don't - // want to modify the value if it is a CSS custom property - // since they are user-defined. - if ( !isCustomProp ) { - name = finalPropName( origName ); - } - - // Try prefixed name followed by the unprefixed name - hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ]; - - // If a hook was provided get the computed value from there - if ( hooks && "get" in hooks ) { - val = hooks.get( elem, true, extra ); - } - - // Otherwise, if a way to get the computed value exists, use that - if ( val === undefined ) { - val = curCSS( elem, name, styles ); - } - - // Convert "normal" to computed value - if ( val === "normal" && name in cssNormalTransform ) { - val = cssNormalTransform[ name ]; - } - - // Make numeric if forced or a qualifier was provided and val looks numeric - if ( extra === "" || extra ) { - num = parseFloat( val ); - return extra === true || isFinite( num ) ? num || 0 : val; - } - - return val; - } -} ); - -jQuery.each( [ "height", "width" ], function( _i, dimension ) { - jQuery.cssHooks[ dimension ] = { - get: function( elem, computed, extra ) { - if ( computed ) { - - // Certain elements can have dimension info if we invisibly show them - // but it must have a current display style that would benefit - return rdisplayswap.test( jQuery.css( elem, "display" ) ) && - - // Support: Safari 8+ - // Table columns in Safari have non-zero offsetWidth & zero - // getBoundingClientRect().width unless display is changed. - // Support: IE <=11 only - // Running getBoundingClientRect on a disconnected node - // in IE throws an error. - ( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ? - swap( elem, cssShow, function() { - return getWidthOrHeight( elem, dimension, extra ); - } ) : - getWidthOrHeight( elem, dimension, extra ); - } - }, - - set: function( elem, value, extra ) { - var matches, - styles = getStyles( elem ), - - // Only read styles.position if the test has a chance to fail - // to avoid forcing a reflow. - scrollboxSizeBuggy = !support.scrollboxSize() && - styles.position === "absolute", - - // To avoid forcing a reflow, only fetch boxSizing if we need it (gh-3991) - boxSizingNeeded = scrollboxSizeBuggy || extra, - isBorderBox = boxSizingNeeded && - jQuery.css( elem, "boxSizing", false, styles ) === "border-box", - subtract = extra ? - boxModelAdjustment( - elem, - dimension, - extra, - isBorderBox, - styles - ) : - 0; - - // Account for unreliable border-box dimensions by comparing offset* to computed and - // faking a content-box to get border and padding (gh-3699) - if ( isBorderBox && scrollboxSizeBuggy ) { - subtract -= Math.ceil( - elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - - parseFloat( styles[ dimension ] ) - - boxModelAdjustment( elem, dimension, "border", false, styles ) - - 0.5 - ); - } - - // Convert to pixels if value adjustment is needed - if ( subtract && ( matches = rcssNum.exec( value ) ) && - ( matches[ 3 ] || "px" ) !== "px" ) { - - elem.style[ dimension ] = value; - value = jQuery.css( elem, dimension ); - } - - return setPositiveNumber( elem, value, subtract ); - } - }; -} ); - -jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft, - function( elem, computed ) { - if ( computed ) { - return ( parseFloat( curCSS( elem, "marginLeft" ) ) || - elem.getBoundingClientRect().left - - swap( elem, { marginLeft: 0 }, function() { - return elem.getBoundingClientRect().left; - } ) - ) + "px"; - } - } -); - -// These hooks are used by animate to expand properties -jQuery.each( { - margin: "", - padding: "", - border: "Width" -}, function( prefix, suffix ) { - jQuery.cssHooks[ prefix + suffix ] = { - expand: function( value ) { - var i = 0, - expanded = {}, - - // Assumes a single number if not a string - parts = typeof value === "string" ? value.split( " " ) : [ value ]; - - for ( ; i < 4; i++ ) { - expanded[ prefix + cssExpand[ i ] + suffix ] = - parts[ i ] || parts[ i - 2 ] || parts[ 0 ]; - } - - return expanded; - } - }; - - if ( prefix !== "margin" ) { - jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber; - } -} ); - -jQuery.fn.extend( { - css: function( name, value ) { - return access( this, function( elem, name, value ) { - var styles, len, - map = {}, - i = 0; - - if ( Array.isArray( name ) ) { - styles = getStyles( elem ); - len = name.length; - - for ( ; i < len; i++ ) { - map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles ); - } - - return map; - } - - return value !== undefined ? - jQuery.style( elem, name, value ) : - jQuery.css( elem, name ); - }, name, value, arguments.length > 1 ); - } -} ); - - -function Tween( elem, options, prop, end, easing ) { - return new Tween.prototype.init( elem, options, prop, end, easing ); -} -jQuery.Tween = Tween; - -Tween.prototype = { - constructor: Tween, - init: function( elem, options, prop, end, easing, unit ) { - this.elem = elem; - this.prop = prop; - this.easing = easing || jQuery.easing._default; - this.options = options; - this.start = this.now = this.cur(); - this.end = end; - this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" ); - }, - cur: function() { - var hooks = Tween.propHooks[ this.prop ]; - - return hooks && hooks.get ? - hooks.get( this ) : - Tween.propHooks._default.get( this ); - }, - run: function( percent ) { - var eased, - hooks = Tween.propHooks[ this.prop ]; - - if ( this.options.duration ) { - this.pos = eased = jQuery.easing[ this.easing ]( - percent, this.options.duration * percent, 0, 1, this.options.duration - ); - } else { - this.pos = eased = percent; - } - this.now = ( this.end - this.start ) * eased + this.start; - - if ( this.options.step ) { - this.options.step.call( this.elem, this.now, this ); - } - - if ( hooks && hooks.set ) { - hooks.set( this ); - } else { - Tween.propHooks._default.set( this ); - } - return this; - } -}; - -Tween.prototype.init.prototype = Tween.prototype; - -Tween.propHooks = { - _default: { - get: function( tween ) { - var result; - - // Use a property on the element directly when it is not a DOM element, - // or when there is no matching style property that exists. - if ( tween.elem.nodeType !== 1 || - tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) { - return tween.elem[ tween.prop ]; - } - - // Passing an empty string as a 3rd parameter to .css will automatically - // attempt a parseFloat and fallback to a string if the parse fails. - // Simple values such as "10px" are parsed to Float; - // complex values such as "rotate(1rad)" are returned as-is. - result = jQuery.css( tween.elem, tween.prop, "" ); - - // Empty strings, null, undefined and "auto" are converted to 0. - return !result || result === "auto" ? 0 : result; - }, - set: function( tween ) { - - // Use step hook for back compat. - // Use cssHook if its there. - // Use .style if available and use plain properties where available. - if ( jQuery.fx.step[ tween.prop ] ) { - jQuery.fx.step[ tween.prop ]( tween ); - } else if ( tween.elem.nodeType === 1 && ( - jQuery.cssHooks[ tween.prop ] || - tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) { - jQuery.style( tween.elem, tween.prop, tween.now + tween.unit ); - } else { - tween.elem[ tween.prop ] = tween.now; - } - } - } -}; - -// Support: IE <=9 only -// Panic based approach to setting things on disconnected nodes -Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = { - set: function( tween ) { - if ( tween.elem.nodeType && tween.elem.parentNode ) { - tween.elem[ tween.prop ] = tween.now; - } - } -}; - -jQuery.easing = { - linear: function( p ) { - return p; - }, - swing: function( p ) { - return 0.5 - Math.cos( p * Math.PI ) / 2; - }, - _default: "swing" -}; - -jQuery.fx = Tween.prototype.init; - -// Back compat <1.8 extension point -jQuery.fx.step = {}; - - - - -var - fxNow, inProgress, - rfxtypes = /^(?:toggle|show|hide)$/, - rrun = /queueHooks$/; - -function schedule() { - if ( inProgress ) { - if ( document.hidden === false && window.requestAnimationFrame ) { - window.requestAnimationFrame( schedule ); - } else { - window.setTimeout( schedule, jQuery.fx.interval ); - } - - jQuery.fx.tick(); - } -} - -// Animations created synchronously will run synchronously -function createFxNow() { - window.setTimeout( function() { - fxNow = undefined; - } ); - return ( fxNow = Date.now() ); -} - -// Generate parameters to create a standard animation -function genFx( type, includeWidth ) { - var which, - i = 0, - attrs = { height: type }; - - // If we include width, step value is 1 to do all cssExpand values, - // otherwise step value is 2 to skip over Left and Right - includeWidth = includeWidth ? 1 : 0; - for ( ; i < 4; i += 2 - includeWidth ) { - which = cssExpand[ i ]; - attrs[ "margin" + which ] = attrs[ "padding" + which ] = type; - } - - if ( includeWidth ) { - attrs.opacity = attrs.width = type; - } - - return attrs; -} - -function createTween( value, prop, animation ) { - var tween, - collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ), - index = 0, - length = collection.length; - for ( ; index < length; index++ ) { - if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) { - - // We're done with this property - return tween; - } - } -} - -function defaultPrefilter( elem, props, opts ) { - var prop, value, toggle, hooks, oldfire, propTween, restoreDisplay, display, - isBox = "width" in props || "height" in props, - anim = this, - orig = {}, - style = elem.style, - hidden = elem.nodeType && isHiddenWithinTree( elem ), - dataShow = dataPriv.get( elem, "fxshow" ); - - // Queue-skipping animations hijack the fx hooks - if ( !opts.queue ) { - hooks = jQuery._queueHooks( elem, "fx" ); - if ( hooks.unqueued == null ) { - hooks.unqueued = 0; - oldfire = hooks.empty.fire; - hooks.empty.fire = function() { - if ( !hooks.unqueued ) { - oldfire(); - } - }; - } - hooks.unqueued++; - - anim.always( function() { - - // Ensure the complete handler is called before this completes - anim.always( function() { - hooks.unqueued--; - if ( !jQuery.queue( elem, "fx" ).length ) { - hooks.empty.fire(); - } - } ); - } ); - } - - // Detect show/hide animations - for ( prop in props ) { - value = props[ prop ]; - if ( rfxtypes.test( value ) ) { - delete props[ prop ]; - toggle = toggle || value === "toggle"; - if ( value === ( hidden ? "hide" : "show" ) ) { - - // Pretend to be hidden if this is a "show" and - // there is still data from a stopped show/hide - if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) { - hidden = true; - - // Ignore all other no-op show/hide data - } else { - continue; - } - } - orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop ); - } - } - - // Bail out if this is a no-op like .hide().hide() - propTween = !jQuery.isEmptyObject( props ); - if ( !propTween && jQuery.isEmptyObject( orig ) ) { - return; - } - - // Restrict "overflow" and "display" styles during box animations - if ( isBox && elem.nodeType === 1 ) { - - // Support: IE <=9 - 11, Edge 12 - 15 - // Record all 3 overflow attributes because IE does not infer the shorthand - // from identically-valued overflowX and overflowY and Edge just mirrors - // the overflowX value there. - opts.overflow = [ style.overflow, style.overflowX, style.overflowY ]; - - // Identify a display type, preferring old show/hide data over the CSS cascade - restoreDisplay = dataShow && dataShow.display; - if ( restoreDisplay == null ) { - restoreDisplay = dataPriv.get( elem, "display" ); - } - display = jQuery.css( elem, "display" ); - if ( display === "none" ) { - if ( restoreDisplay ) { - display = restoreDisplay; - } else { - - // Get nonempty value(s) by temporarily forcing visibility - showHide( [ elem ], true ); - restoreDisplay = elem.style.display || restoreDisplay; - display = jQuery.css( elem, "display" ); - showHide( [ elem ] ); - } - } - - // Animate inline elements as inline-block - if ( display === "inline" || display === "inline-block" && restoreDisplay != null ) { - if ( jQuery.css( elem, "float" ) === "none" ) { - - // Restore the original display value at the end of pure show/hide animations - if ( !propTween ) { - anim.done( function() { - style.display = restoreDisplay; - } ); - if ( restoreDisplay == null ) { - display = style.display; - restoreDisplay = display === "none" ? "" : display; - } - } - style.display = "inline-block"; - } - } - } - - if ( opts.overflow ) { - style.overflow = "hidden"; - anim.always( function() { - style.overflow = opts.overflow[ 0 ]; - style.overflowX = opts.overflow[ 1 ]; - style.overflowY = opts.overflow[ 2 ]; - } ); - } - - // Implement show/hide animations - propTween = false; - for ( prop in orig ) { - - // General show/hide setup for this element animation - if ( !propTween ) { - if ( dataShow ) { - if ( "hidden" in dataShow ) { - hidden = dataShow.hidden; - } - } else { - dataShow = dataPriv.access( elem, "fxshow", { display: restoreDisplay } ); - } - - // Store hidden/visible for toggle so `.stop().toggle()` "reverses" - if ( toggle ) { - dataShow.hidden = !hidden; - } - - // Show elements before animating them - if ( hidden ) { - showHide( [ elem ], true ); - } - - /* eslint-disable no-loop-func */ - - anim.done( function() { - - /* eslint-enable no-loop-func */ - - // The final step of a "hide" animation is actually hiding the element - if ( !hidden ) { - showHide( [ elem ] ); - } - dataPriv.remove( elem, "fxshow" ); - for ( prop in orig ) { - jQuery.style( elem, prop, orig[ prop ] ); - } - } ); - } - - // Per-property setup - propTween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim ); - if ( !( prop in dataShow ) ) { - dataShow[ prop ] = propTween.start; - if ( hidden ) { - propTween.end = propTween.start; - propTween.start = 0; - } - } - } -} - -function propFilter( props, specialEasing ) { - var index, name, easing, value, hooks; - - // camelCase, specialEasing and expand cssHook pass - for ( index in props ) { - name = camelCase( index ); - easing = specialEasing[ name ]; - value = props[ index ]; - if ( Array.isArray( value ) ) { - easing = value[ 1 ]; - value = props[ index ] = value[ 0 ]; - } - - if ( index !== name ) { - props[ name ] = value; - delete props[ index ]; - } - - hooks = jQuery.cssHooks[ name ]; - if ( hooks && "expand" in hooks ) { - value = hooks.expand( value ); - delete props[ name ]; - - // Not quite $.extend, this won't overwrite existing keys. - // Reusing 'index' because we have the correct "name" - for ( index in value ) { - if ( !( index in props ) ) { - props[ index ] = value[ index ]; - specialEasing[ index ] = easing; - } - } - } else { - specialEasing[ name ] = easing; - } - } -} - -function Animation( elem, properties, options ) { - var result, - stopped, - index = 0, - length = Animation.prefilters.length, - deferred = jQuery.Deferred().always( function() { - - // Don't match elem in the :animated selector - delete tick.elem; - } ), - tick = function() { - if ( stopped ) { - return false; - } - var currentTime = fxNow || createFxNow(), - remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ), - - // Support: Android 2.3 only - // Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497) - temp = remaining / animation.duration || 0, - percent = 1 - temp, - index = 0, - length = animation.tweens.length; - - for ( ; index < length; index++ ) { - animation.tweens[ index ].run( percent ); - } - - deferred.notifyWith( elem, [ animation, percent, remaining ] ); - - // If there's more to do, yield - if ( percent < 1 && length ) { - return remaining; - } - - // If this was an empty animation, synthesize a final progress notification - if ( !length ) { - deferred.notifyWith( elem, [ animation, 1, 0 ] ); - } - - // Resolve the animation and report its conclusion - deferred.resolveWith( elem, [ animation ] ); - return false; - }, - animation = deferred.promise( { - elem: elem, - props: jQuery.extend( {}, properties ), - opts: jQuery.extend( true, { - specialEasing: {}, - easing: jQuery.easing._default - }, options ), - originalProperties: properties, - originalOptions: options, - startTime: fxNow || createFxNow(), - duration: options.duration, - tweens: [], - createTween: function( prop, end ) { - var tween = jQuery.Tween( elem, animation.opts, prop, end, - animation.opts.specialEasing[ prop ] || animation.opts.easing ); - animation.tweens.push( tween ); - return tween; - }, - stop: function( gotoEnd ) { - var index = 0, - - // If we are going to the end, we want to run all the tweens - // otherwise we skip this part - length = gotoEnd ? animation.tweens.length : 0; - if ( stopped ) { - return this; - } - stopped = true; - for ( ; index < length; index++ ) { - animation.tweens[ index ].run( 1 ); - } - - // Resolve when we played the last frame; otherwise, reject - if ( gotoEnd ) { - deferred.notifyWith( elem, [ animation, 1, 0 ] ); - deferred.resolveWith( elem, [ animation, gotoEnd ] ); - } else { - deferred.rejectWith( elem, [ animation, gotoEnd ] ); - } - return this; - } - } ), - props = animation.props; - - propFilter( props, animation.opts.specialEasing ); - - for ( ; index < length; index++ ) { - result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts ); - if ( result ) { - if ( isFunction( result.stop ) ) { - jQuery._queueHooks( animation.elem, animation.opts.queue ).stop = - result.stop.bind( result ); - } - return result; - } - } - - jQuery.map( props, createTween, animation ); - - if ( isFunction( animation.opts.start ) ) { - animation.opts.start.call( elem, animation ); - } - - // Attach callbacks from options - animation - .progress( animation.opts.progress ) - .done( animation.opts.done, animation.opts.complete ) - .fail( animation.opts.fail ) - .always( animation.opts.always ); - - jQuery.fx.timer( - jQuery.extend( tick, { - elem: elem, - anim: animation, - queue: animation.opts.queue - } ) - ); - - return animation; -} - -jQuery.Animation = jQuery.extend( Animation, { - - tweeners: { - "*": [ function( prop, value ) { - var tween = this.createTween( prop, value ); - adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween ); - return tween; - } ] - }, - - tweener: function( props, callback ) { - if ( isFunction( props ) ) { - callback = props; - props = [ "*" ]; - } else { - props = props.match( rnothtmlwhite ); - } - - var prop, - index = 0, - length = props.length; - - for ( ; index < length; index++ ) { - prop = props[ index ]; - Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || []; - Animation.tweeners[ prop ].unshift( callback ); - } - }, - - prefilters: [ defaultPrefilter ], - - prefilter: function( callback, prepend ) { - if ( prepend ) { - Animation.prefilters.unshift( callback ); - } else { - Animation.prefilters.push( callback ); - } - } -} ); - -jQuery.speed = function( speed, easing, fn ) { - var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : { - complete: fn || !fn && easing || - isFunction( speed ) && speed, - duration: speed, - easing: fn && easing || easing && !isFunction( easing ) && easing - }; - - // Go to the end state if fx are off - if ( jQuery.fx.off ) { - opt.duration = 0; - - } else { - if ( typeof opt.duration !== "number" ) { - if ( opt.duration in jQuery.fx.speeds ) { - opt.duration = jQuery.fx.speeds[ opt.duration ]; - - } else { - opt.duration = jQuery.fx.speeds._default; - } - } - } - - // Normalize opt.queue - true/undefined/null -> "fx" - if ( opt.queue == null || opt.queue === true ) { - opt.queue = "fx"; - } - - // Queueing - opt.old = opt.complete; - - opt.complete = function() { - if ( isFunction( opt.old ) ) { - opt.old.call( this ); - } - - if ( opt.queue ) { - jQuery.dequeue( this, opt.queue ); - } - }; - - return opt; -}; - -jQuery.fn.extend( { - fadeTo: function( speed, to, easing, callback ) { - - // Show any hidden elements after setting opacity to 0 - return this.filter( isHiddenWithinTree ).css( "opacity", 0 ).show() - - // Animate to the value specified - .end().animate( { opacity: to }, speed, easing, callback ); - }, - animate: function( prop, speed, easing, callback ) { - var empty = jQuery.isEmptyObject( prop ), - optall = jQuery.speed( speed, easing, callback ), - doAnimation = function() { - - // Operate on a copy of prop so per-property easing won't be lost - var anim = Animation( this, jQuery.extend( {}, prop ), optall ); - - // Empty animations, or finishing resolves immediately - if ( empty || dataPriv.get( this, "finish" ) ) { - anim.stop( true ); - } - }; - doAnimation.finish = doAnimation; - - return empty || optall.queue === false ? - this.each( doAnimation ) : - this.queue( optall.queue, doAnimation ); - }, - stop: function( type, clearQueue, gotoEnd ) { - var stopQueue = function( hooks ) { - var stop = hooks.stop; - delete hooks.stop; - stop( gotoEnd ); - }; - - if ( typeof type !== "string" ) { - gotoEnd = clearQueue; - clearQueue = type; - type = undefined; - } - if ( clearQueue ) { - this.queue( type || "fx", [] ); - } - - return this.each( function() { - var dequeue = true, - index = type != null && type + "queueHooks", - timers = jQuery.timers, - data = dataPriv.get( this ); - - if ( index ) { - if ( data[ index ] && data[ index ].stop ) { - stopQueue( data[ index ] ); - } - } else { - for ( index in data ) { - if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) { - stopQueue( data[ index ] ); - } - } - } - - for ( index = timers.length; index--; ) { - if ( timers[ index ].elem === this && - ( type == null || timers[ index ].queue === type ) ) { - - timers[ index ].anim.stop( gotoEnd ); - dequeue = false; - timers.splice( index, 1 ); - } - } - - // Start the next in the queue if the last step wasn't forced. - // Timers currently will call their complete callbacks, which - // will dequeue but only if they were gotoEnd. - if ( dequeue || !gotoEnd ) { - jQuery.dequeue( this, type ); - } - } ); - }, - finish: function( type ) { - if ( type !== false ) { - type = type || "fx"; - } - return this.each( function() { - var index, - data = dataPriv.get( this ), - queue = data[ type + "queue" ], - hooks = data[ type + "queueHooks" ], - timers = jQuery.timers, - length = queue ? queue.length : 0; - - // Enable finishing flag on private data - data.finish = true; - - // Empty the queue first - jQuery.queue( this, type, [] ); - - if ( hooks && hooks.stop ) { - hooks.stop.call( this, true ); - } - - // Look for any active animations, and finish them - for ( index = timers.length; index--; ) { - if ( timers[ index ].elem === this && timers[ index ].queue === type ) { - timers[ index ].anim.stop( true ); - timers.splice( index, 1 ); - } - } - - // Look for any animations in the old queue and finish them - for ( index = 0; index < length; index++ ) { - if ( queue[ index ] && queue[ index ].finish ) { - queue[ index ].finish.call( this ); - } - } - - // Turn off finishing flag - delete data.finish; - } ); - } -} ); - -jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) { - var cssFn = jQuery.fn[ name ]; - jQuery.fn[ name ] = function( speed, easing, callback ) { - return speed == null || typeof speed === "boolean" ? - cssFn.apply( this, arguments ) : - this.animate( genFx( name, true ), speed, easing, callback ); - }; -} ); - -// Generate shortcuts for custom animations -jQuery.each( { - slideDown: genFx( "show" ), - slideUp: genFx( "hide" ), - slideToggle: genFx( "toggle" ), - fadeIn: { opacity: "show" }, - fadeOut: { opacity: "hide" }, - fadeToggle: { opacity: "toggle" } -}, function( name, props ) { - jQuery.fn[ name ] = function( speed, easing, callback ) { - return this.animate( props, speed, easing, callback ); - }; -} ); - -jQuery.timers = []; -jQuery.fx.tick = function() { - var timer, - i = 0, - timers = jQuery.timers; - - fxNow = Date.now(); - - for ( ; i < timers.length; i++ ) { - timer = timers[ i ]; - - // Run the timer and safely remove it when done (allowing for external removal) - if ( !timer() && timers[ i ] === timer ) { - timers.splice( i--, 1 ); - } - } - - if ( !timers.length ) { - jQuery.fx.stop(); - } - fxNow = undefined; -}; - -jQuery.fx.timer = function( timer ) { - jQuery.timers.push( timer ); - jQuery.fx.start(); -}; - -jQuery.fx.interval = 13; -jQuery.fx.start = function() { - if ( inProgress ) { - return; - } - - inProgress = true; - schedule(); -}; - -jQuery.fx.stop = function() { - inProgress = null; -}; - -jQuery.fx.speeds = { - slow: 600, - fast: 200, - - // Default speed - _default: 400 -}; - - -// Based off of the plugin by Clint Helfers, with permission. -// https://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/ -jQuery.fn.delay = function( time, type ) { - time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time; - type = type || "fx"; - - return this.queue( type, function( next, hooks ) { - var timeout = window.setTimeout( next, time ); - hooks.stop = function() { - window.clearTimeout( timeout ); - }; - } ); -}; - - -( function() { - var input = document.createElement( "input" ), - select = document.createElement( "select" ), - opt = select.appendChild( document.createElement( "option" ) ); - - input.type = "checkbox"; - - // Support: Android <=4.3 only - // Default value for a checkbox should be "on" - support.checkOn = input.value !== ""; - - // Support: IE <=11 only - // Must access selectedIndex to make default options select - support.optSelected = opt.selected; - - // Support: IE <=11 only - // An input loses its value after becoming a radio - input = document.createElement( "input" ); - input.value = "t"; - input.type = "radio"; - support.radioValue = input.value === "t"; -} )(); - - -var boolHook, - attrHandle = jQuery.expr.attrHandle; - -jQuery.fn.extend( { - attr: function( name, value ) { - return access( this, jQuery.attr, name, value, arguments.length > 1 ); - }, - - removeAttr: function( name ) { - return this.each( function() { - jQuery.removeAttr( this, name ); - } ); - } -} ); - -jQuery.extend( { - attr: function( elem, name, value ) { - var ret, hooks, - nType = elem.nodeType; - - // Don't get/set attributes on text, comment and attribute nodes - if ( nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - // Fallback to prop when attributes are not supported - if ( typeof elem.getAttribute === "undefined" ) { - return jQuery.prop( elem, name, value ); - } - - // Attribute hooks are determined by the lowercase version - // Grab necessary hook if one is defined - if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { - hooks = jQuery.attrHooks[ name.toLowerCase() ] || - ( jQuery.expr.match.bool.test( name ) ? boolHook : undefined ); - } - - if ( value !== undefined ) { - if ( value === null ) { - jQuery.removeAttr( elem, name ); - return; - } - - if ( hooks && "set" in hooks && - ( ret = hooks.set( elem, value, name ) ) !== undefined ) { - return ret; - } - - elem.setAttribute( name, value + "" ); - return value; - } - - if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) { - return ret; - } - - ret = jQuery.find.attr( elem, name ); - - // Non-existent attributes return null, we normalize to undefined - return ret == null ? undefined : ret; - }, - - attrHooks: { - type: { - set: function( elem, value ) { - if ( !support.radioValue && value === "radio" && - nodeName( elem, "input" ) ) { - var val = elem.value; - elem.setAttribute( "type", value ); - if ( val ) { - elem.value = val; - } - return value; - } - } - } - }, - - removeAttr: function( elem, value ) { - var name, - i = 0, - - // Attribute names can contain non-HTML whitespace characters - // https://html.spec.whatwg.org/multipage/syntax.html#attributes-2 - attrNames = value && value.match( rnothtmlwhite ); - - if ( attrNames && elem.nodeType === 1 ) { - while ( ( name = attrNames[ i++ ] ) ) { - elem.removeAttribute( name ); - } - } - } -} ); - -// Hooks for boolean attributes -boolHook = { - set: function( elem, value, name ) { - if ( value === false ) { - - // Remove boolean attributes when set to false - jQuery.removeAttr( elem, name ); - } else { - elem.setAttribute( name, name ); - } - return name; - } -}; - -jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) { - var getter = attrHandle[ name ] || jQuery.find.attr; - - attrHandle[ name ] = function( elem, name, isXML ) { - var ret, handle, - lowercaseName = name.toLowerCase(); - - if ( !isXML ) { - - // Avoid an infinite loop by temporarily removing this function from the getter - handle = attrHandle[ lowercaseName ]; - attrHandle[ lowercaseName ] = ret; - ret = getter( elem, name, isXML ) != null ? - lowercaseName : - null; - attrHandle[ lowercaseName ] = handle; - } - return ret; - }; -} ); - - - - -var rfocusable = /^(?:input|select|textarea|button)$/i, - rclickable = /^(?:a|area)$/i; - -jQuery.fn.extend( { - prop: function( name, value ) { - return access( this, jQuery.prop, name, value, arguments.length > 1 ); - }, - - removeProp: function( name ) { - return this.each( function() { - delete this[ jQuery.propFix[ name ] || name ]; - } ); - } -} ); - -jQuery.extend( { - prop: function( elem, name, value ) { - var ret, hooks, - nType = elem.nodeType; - - // Don't get/set properties on text, comment and attribute nodes - if ( nType === 3 || nType === 8 || nType === 2 ) { - return; - } - - if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) { - - // Fix name and attach hooks - name = jQuery.propFix[ name ] || name; - hooks = jQuery.propHooks[ name ]; - } - - if ( value !== undefined ) { - if ( hooks && "set" in hooks && - ( ret = hooks.set( elem, value, name ) ) !== undefined ) { - return ret; - } - - return ( elem[ name ] = value ); - } - - if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) { - return ret; - } - - return elem[ name ]; - }, - - propHooks: { - tabIndex: { - get: function( elem ) { - - // Support: IE <=9 - 11 only - // elem.tabIndex doesn't always return the - // correct value when it hasn't been explicitly set - // https://web.archive.org/web/20141116233347/http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/ - // Use proper attribute retrieval(#12072) - var tabindex = jQuery.find.attr( elem, "tabindex" ); - - if ( tabindex ) { - return parseInt( tabindex, 10 ); - } - - if ( - rfocusable.test( elem.nodeName ) || - rclickable.test( elem.nodeName ) && - elem.href - ) { - return 0; - } - - return -1; - } - } - }, - - propFix: { - "for": "htmlFor", - "class": "className" - } -} ); - -// Support: IE <=11 only -// Accessing the selectedIndex property -// forces the browser to respect setting selected -// on the option -// The getter ensures a default option is selected -// when in an optgroup -// eslint rule "no-unused-expressions" is disabled for this code -// since it considers such accessions noop -if ( !support.optSelected ) { - jQuery.propHooks.selected = { - get: function( elem ) { - - /* eslint no-unused-expressions: "off" */ - - var parent = elem.parentNode; - if ( parent && parent.parentNode ) { - parent.parentNode.selectedIndex; - } - return null; - }, - set: function( elem ) { - - /* eslint no-unused-expressions: "off" */ - - var parent = elem.parentNode; - if ( parent ) { - parent.selectedIndex; - - if ( parent.parentNode ) { - parent.parentNode.selectedIndex; - } - } - } - }; -} - -jQuery.each( [ - "tabIndex", - "readOnly", - "maxLength", - "cellSpacing", - "cellPadding", - "rowSpan", - "colSpan", - "useMap", - "frameBorder", - "contentEditable" -], function() { - jQuery.propFix[ this.toLowerCase() ] = this; -} ); - - - - - // Strip and collapse whitespace according to HTML spec - // https://infra.spec.whatwg.org/#strip-and-collapse-ascii-whitespace - function stripAndCollapse( value ) { - var tokens = value.match( rnothtmlwhite ) || []; - return tokens.join( " " ); - } - - -function getClass( elem ) { - return elem.getAttribute && elem.getAttribute( "class" ) || ""; -} - -function classesToArray( value ) { - if ( Array.isArray( value ) ) { - return value; - } - if ( typeof value === "string" ) { - return value.match( rnothtmlwhite ) || []; - } - return []; -} - -jQuery.fn.extend( { - addClass: function( value ) { - var classes, elem, cur, curValue, clazz, j, finalValue, - i = 0; - - if ( isFunction( value ) ) { - return this.each( function( j ) { - jQuery( this ).addClass( value.call( this, j, getClass( this ) ) ); - } ); - } - - classes = classesToArray( value ); - - if ( classes.length ) { - while ( ( elem = this[ i++ ] ) ) { - curValue = getClass( elem ); - cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " ); - - if ( cur ) { - j = 0; - while ( ( clazz = classes[ j++ ] ) ) { - if ( cur.indexOf( " " + clazz + " " ) < 0 ) { - cur += clazz + " "; - } - } - - // Only assign if different to avoid unneeded rendering. - finalValue = stripAndCollapse( cur ); - if ( curValue !== finalValue ) { - elem.setAttribute( "class", finalValue ); - } - } - } - } - - return this; - }, - - removeClass: function( value ) { - var classes, elem, cur, curValue, clazz, j, finalValue, - i = 0; - - if ( isFunction( value ) ) { - return this.each( function( j ) { - jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) ); - } ); - } - - if ( !arguments.length ) { - return this.attr( "class", "" ); - } - - classes = classesToArray( value ); - - if ( classes.length ) { - while ( ( elem = this[ i++ ] ) ) { - curValue = getClass( elem ); - - // This expression is here for better compressibility (see addClass) - cur = elem.nodeType === 1 && ( " " + stripAndCollapse( curValue ) + " " ); - - if ( cur ) { - j = 0; - while ( ( clazz = classes[ j++ ] ) ) { - - // Remove *all* instances - while ( cur.indexOf( " " + clazz + " " ) > -1 ) { - cur = cur.replace( " " + clazz + " ", " " ); - } - } - - // Only assign if different to avoid unneeded rendering. - finalValue = stripAndCollapse( cur ); - if ( curValue !== finalValue ) { - elem.setAttribute( "class", finalValue ); - } - } - } - } - - return this; - }, - - toggleClass: function( value, stateVal ) { - var type = typeof value, - isValidValue = type === "string" || Array.isArray( value ); - - if ( typeof stateVal === "boolean" && isValidValue ) { - return stateVal ? this.addClass( value ) : this.removeClass( value ); - } - - if ( isFunction( value ) ) { - return this.each( function( i ) { - jQuery( this ).toggleClass( - value.call( this, i, getClass( this ), stateVal ), - stateVal - ); - } ); - } - - return this.each( function() { - var className, i, self, classNames; - - if ( isValidValue ) { - - // Toggle individual class names - i = 0; - self = jQuery( this ); - classNames = classesToArray( value ); - - while ( ( className = classNames[ i++ ] ) ) { - - // Check each className given, space separated list - if ( self.hasClass( className ) ) { - self.removeClass( className ); - } else { - self.addClass( className ); - } - } - - // Toggle whole class name - } else if ( value === undefined || type === "boolean" ) { - className = getClass( this ); - if ( className ) { - - // Store className if set - dataPriv.set( this, "__className__", className ); - } - - // If the element has a class name or if we're passed `false`, - // then remove the whole classname (if there was one, the above saved it). - // Otherwise bring back whatever was previously saved (if anything), - // falling back to the empty string if nothing was stored. - if ( this.setAttribute ) { - this.setAttribute( "class", - className || value === false ? - "" : - dataPriv.get( this, "__className__" ) || "" - ); - } - } - } ); - }, - - hasClass: function( selector ) { - var className, elem, - i = 0; - - className = " " + selector + " "; - while ( ( elem = this[ i++ ] ) ) { - if ( elem.nodeType === 1 && - ( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) { - return true; - } - } - - return false; - } -} ); - - - - -var rreturn = /\r/g; - -jQuery.fn.extend( { - val: function( value ) { - var hooks, ret, valueIsFunction, - elem = this[ 0 ]; - - if ( !arguments.length ) { - if ( elem ) { - hooks = jQuery.valHooks[ elem.type ] || - jQuery.valHooks[ elem.nodeName.toLowerCase() ]; - - if ( hooks && - "get" in hooks && - ( ret = hooks.get( elem, "value" ) ) !== undefined - ) { - return ret; - } - - ret = elem.value; - - // Handle most common string cases - if ( typeof ret === "string" ) { - return ret.replace( rreturn, "" ); - } - - // Handle cases where value is null/undef or number - return ret == null ? "" : ret; - } - - return; - } - - valueIsFunction = isFunction( value ); - - return this.each( function( i ) { - var val; - - if ( this.nodeType !== 1 ) { - return; - } - - if ( valueIsFunction ) { - val = value.call( this, i, jQuery( this ).val() ); - } else { - val = value; - } - - // Treat null/undefined as ""; convert numbers to string - if ( val == null ) { - val = ""; - - } else if ( typeof val === "number" ) { - val += ""; - - } else if ( Array.isArray( val ) ) { - val = jQuery.map( val, function( value ) { - return value == null ? "" : value + ""; - } ); - } - - hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ]; - - // If set returns undefined, fall back to normal setting - if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) { - this.value = val; - } - } ); - } -} ); - -jQuery.extend( { - valHooks: { - option: { - get: function( elem ) { - - var val = jQuery.find.attr( elem, "value" ); - return val != null ? - val : - - // Support: IE <=10 - 11 only - // option.text throws exceptions (#14686, #14858) - // Strip and collapse whitespace - // https://html.spec.whatwg.org/#strip-and-collapse-whitespace - stripAndCollapse( jQuery.text( elem ) ); - } - }, - select: { - get: function( elem ) { - var value, option, i, - options = elem.options, - index = elem.selectedIndex, - one = elem.type === "select-one", - values = one ? null : [], - max = one ? index + 1 : options.length; - - if ( index < 0 ) { - i = max; - - } else { - i = one ? index : 0; - } - - // Loop through all the selected options - for ( ; i < max; i++ ) { - option = options[ i ]; - - // Support: IE <=9 only - // IE8-9 doesn't update selected after form reset (#2551) - if ( ( option.selected || i === index ) && - - // Don't return options that are disabled or in a disabled optgroup - !option.disabled && - ( !option.parentNode.disabled || - !nodeName( option.parentNode, "optgroup" ) ) ) { - - // Get the specific value for the option - value = jQuery( option ).val(); - - // We don't need an array for one selects - if ( one ) { - return value; - } - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - }, - - set: function( elem, value ) { - var optionSet, option, - options = elem.options, - values = jQuery.makeArray( value ), - i = options.length; - - while ( i-- ) { - option = options[ i ]; - - /* eslint-disable no-cond-assign */ - - if ( option.selected = - jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1 - ) { - optionSet = true; - } - - /* eslint-enable no-cond-assign */ - } - - // Force browsers to behave consistently when non-matching value is set - if ( !optionSet ) { - elem.selectedIndex = -1; - } - return values; - } - } - } -} ); - -// Radios and checkboxes getter/setter -jQuery.each( [ "radio", "checkbox" ], function() { - jQuery.valHooks[ this ] = { - set: function( elem, value ) { - if ( Array.isArray( value ) ) { - return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 ); - } - } - }; - if ( !support.checkOn ) { - jQuery.valHooks[ this ].get = function( elem ) { - return elem.getAttribute( "value" ) === null ? "on" : elem.value; - }; - } -} ); - - - - -// Return jQuery for attributes-only inclusion - - -support.focusin = "onfocusin" in window; - - -var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, - stopPropagationCallback = function( e ) { - e.stopPropagation(); - }; - -jQuery.extend( jQuery.event, { - - trigger: function( event, data, elem, onlyHandlers ) { - - var i, cur, tmp, bubbleType, ontype, handle, special, lastElement, - eventPath = [ elem || document ], - type = hasOwn.call( event, "type" ) ? event.type : event, - namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : []; - - cur = lastElement = tmp = elem = elem || document; - - // Don't do events on text and comment nodes - if ( elem.nodeType === 3 || elem.nodeType === 8 ) { - return; - } - - // focus/blur morphs to focusin/out; ensure we're not firing them right now - if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { - return; - } - - if ( type.indexOf( "." ) > -1 ) { - - // Namespaced trigger; create a regexp to match event type in handle() - namespaces = type.split( "." ); - type = namespaces.shift(); - namespaces.sort(); - } - ontype = type.indexOf( ":" ) < 0 && "on" + type; - - // Caller can pass in a jQuery.Event object, Object, or just an event type string - event = event[ jQuery.expando ] ? - event : - new jQuery.Event( type, typeof event === "object" && event ); - - // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) - event.isTrigger = onlyHandlers ? 2 : 3; - event.namespace = namespaces.join( "." ); - event.rnamespace = event.namespace ? - new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) : - null; - - // Clean up the event in case it is being reused - event.result = undefined; - if ( !event.target ) { - event.target = elem; - } - - // Clone any incoming data and prepend the event, creating the handler arg list - data = data == null ? - [ event ] : - jQuery.makeArray( data, [ event ] ); - - // Allow special events to draw outside the lines - special = jQuery.event.special[ type ] || {}; - if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { - return; - } - - // Determine event propagation path in advance, per W3C events spec (#9951) - // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) - if ( !onlyHandlers && !special.noBubble && !isWindow( elem ) ) { - - bubbleType = special.delegateType || type; - if ( !rfocusMorph.test( bubbleType + type ) ) { - cur = cur.parentNode; - } - for ( ; cur; cur = cur.parentNode ) { - eventPath.push( cur ); - tmp = cur; - } - - // Only add window if we got to document (e.g., not plain obj or detached DOM) - if ( tmp === ( elem.ownerDocument || document ) ) { - eventPath.push( tmp.defaultView || tmp.parentWindow || window ); - } - } - - // Fire handlers on the event path - i = 0; - while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) { - lastElement = cur; - event.type = i > 1 ? - bubbleType : - special.bindType || type; - - // jQuery handler - handle = ( - dataPriv.get( cur, "events" ) || Object.create( null ) - )[ event.type ] && - dataPriv.get( cur, "handle" ); - if ( handle ) { - handle.apply( cur, data ); - } - - // Native handler - handle = ontype && cur[ ontype ]; - if ( handle && handle.apply && acceptData( cur ) ) { - event.result = handle.apply( cur, data ); - if ( event.result === false ) { - event.preventDefault(); - } - } - } - event.type = type; - - // If nobody prevented the default action, do it now - if ( !onlyHandlers && !event.isDefaultPrevented() ) { - - if ( ( !special._default || - special._default.apply( eventPath.pop(), data ) === false ) && - acceptData( elem ) ) { - - // Call a native DOM method on the target with the same name as the event. - // Don't do default actions on window, that's where global variables be (#6170) - if ( ontype && isFunction( elem[ type ] ) && !isWindow( elem ) ) { - - // Don't re-trigger an onFOO event when we call its FOO() method - tmp = elem[ ontype ]; - - if ( tmp ) { - elem[ ontype ] = null; - } - - // Prevent re-triggering of the same event, since we already bubbled it above - jQuery.event.triggered = type; - - if ( event.isPropagationStopped() ) { - lastElement.addEventListener( type, stopPropagationCallback ); - } - - elem[ type ](); - - if ( event.isPropagationStopped() ) { - lastElement.removeEventListener( type, stopPropagationCallback ); - } - - jQuery.event.triggered = undefined; - - if ( tmp ) { - elem[ ontype ] = tmp; - } - } - } - } - - return event.result; - }, - - // Piggyback on a donor event to simulate a different one - // Used only for `focus(in | out)` events - simulate: function( type, elem, event ) { - var e = jQuery.extend( - new jQuery.Event(), - event, - { - type: type, - isSimulated: true - } - ); - - jQuery.event.trigger( e, null, elem ); - } - -} ); - -jQuery.fn.extend( { - - trigger: function( type, data ) { - return this.each( function() { - jQuery.event.trigger( type, data, this ); - } ); - }, - triggerHandler: function( type, data ) { - var elem = this[ 0 ]; - if ( elem ) { - return jQuery.event.trigger( type, data, elem, true ); - } - } -} ); - - -// Support: Firefox <=44 -// Firefox doesn't have focus(in | out) events -// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787 -// -// Support: Chrome <=48 - 49, Safari <=9.0 - 9.1 -// focus(in | out) events fire after focus & blur events, -// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order -// Related ticket - https://bugs.chromium.org/p/chromium/issues/detail?id=449857 -if ( !support.focusin ) { - jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) { - - // Attach a single capturing handler on the document while someone wants focusin/focusout - var handler = function( event ) { - jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) ); - }; - - jQuery.event.special[ fix ] = { - setup: function() { - - // Handle: regular nodes (via `this.ownerDocument`), window - // (via `this.document`) & document (via `this`). - var doc = this.ownerDocument || this.document || this, - attaches = dataPriv.access( doc, fix ); - - if ( !attaches ) { - doc.addEventListener( orig, handler, true ); - } - dataPriv.access( doc, fix, ( attaches || 0 ) + 1 ); - }, - teardown: function() { - var doc = this.ownerDocument || this.document || this, - attaches = dataPriv.access( doc, fix ) - 1; - - if ( !attaches ) { - doc.removeEventListener( orig, handler, true ); - dataPriv.remove( doc, fix ); - - } else { - dataPriv.access( doc, fix, attaches ); - } - } - }; - } ); -} -var location = window.location; - -var nonce = { guid: Date.now() }; - -var rquery = ( /\?/ ); - - - -// Cross-browser xml parsing -jQuery.parseXML = function( data ) { - var xml; - if ( !data || typeof data !== "string" ) { - return null; - } - - // Support: IE 9 - 11 only - // IE throws on parseFromString with invalid input. - try { - xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" ); - } catch ( e ) { - xml = undefined; - } - - if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) { - jQuery.error( "Invalid XML: " + data ); - } - return xml; -}; - - -var - rbracket = /\[\]$/, - rCRLF = /\r?\n/g, - rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i, - rsubmittable = /^(?:input|select|textarea|keygen)/i; - -function buildParams( prefix, obj, traditional, add ) { - var name; - - if ( Array.isArray( obj ) ) { - - // Serialize array item. - jQuery.each( obj, function( i, v ) { - if ( traditional || rbracket.test( prefix ) ) { - - // Treat each array item as a scalar. - add( prefix, v ); - - } else { - - // Item is non-scalar (array or object), encode its numeric index. - buildParams( - prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]", - v, - traditional, - add - ); - } - } ); - - } else if ( !traditional && toType( obj ) === "object" ) { - - // Serialize object item. - for ( name in obj ) { - buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add ); - } - - } else { - - // Serialize scalar item. - add( prefix, obj ); - } -} - -// Serialize an array of form elements or a set of -// key/values into a query string -jQuery.param = function( a, traditional ) { - var prefix, - s = [], - add = function( key, valueOrFunction ) { - - // If value is a function, invoke it and use its return value - var value = isFunction( valueOrFunction ) ? - valueOrFunction() : - valueOrFunction; - - s[ s.length ] = encodeURIComponent( key ) + "=" + - encodeURIComponent( value == null ? "" : value ); - }; - - if ( a == null ) { - return ""; - } - - // If an array was passed in, assume that it is an array of form elements. - if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) { - - // Serialize the form elements - jQuery.each( a, function() { - add( this.name, this.value ); - } ); - - } else { - - // If traditional, encode the "old" way (the way 1.3.2 or older - // did it), otherwise encode params recursively. - for ( prefix in a ) { - buildParams( prefix, a[ prefix ], traditional, add ); - } - } - - // Return the resulting serialization - return s.join( "&" ); -}; - -jQuery.fn.extend( { - serialize: function() { - return jQuery.param( this.serializeArray() ); - }, - serializeArray: function() { - return this.map( function() { - - // Can add propHook for "elements" to filter or add form elements - var elements = jQuery.prop( this, "elements" ); - return elements ? jQuery.makeArray( elements ) : this; - } ) - .filter( function() { - var type = this.type; - - // Use .is( ":disabled" ) so that fieldset[disabled] works - return this.name && !jQuery( this ).is( ":disabled" ) && - rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) && - ( this.checked || !rcheckableType.test( type ) ); - } ) - .map( function( _i, elem ) { - var val = jQuery( this ).val(); - - if ( val == null ) { - return null; - } - - if ( Array.isArray( val ) ) { - return jQuery.map( val, function( val ) { - return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; - } ); - } - - return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) }; - } ).get(); - } -} ); - - -var - r20 = /%20/g, - rhash = /#.*$/, - rantiCache = /([?&])_=[^&]*/, - rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg, - - // #7653, #8125, #8152: local protocol detection - rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/, - rnoContent = /^(?:GET|HEAD)$/, - rprotocol = /^\/\//, - - /* Prefilters - * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example) - * 2) These are called: - * - BEFORE asking for a transport - * - AFTER param serialization (s.data is a string if s.processData is true) - * 3) key is the dataType - * 4) the catchall symbol "*" can be used - * 5) execution will start with transport dataType and THEN continue down to "*" if needed - */ - prefilters = {}, - - /* Transports bindings - * 1) key is the dataType - * 2) the catchall symbol "*" can be used - * 3) selection will start with transport dataType and THEN go to "*" if needed - */ - transports = {}, - - // Avoid comment-prolog char sequence (#10098); must appease lint and evade compression - allTypes = "*/".concat( "*" ), - - // Anchor tag for parsing the document origin - originAnchor = document.createElement( "a" ); - originAnchor.href = location.href; - -// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport -function addToPrefiltersOrTransports( structure ) { - - // dataTypeExpression is optional and defaults to "*" - return function( dataTypeExpression, func ) { - - if ( typeof dataTypeExpression !== "string" ) { - func = dataTypeExpression; - dataTypeExpression = "*"; - } - - var dataType, - i = 0, - dataTypes = dataTypeExpression.toLowerCase().match( rnothtmlwhite ) || []; - - if ( isFunction( func ) ) { - - // For each dataType in the dataTypeExpression - while ( ( dataType = dataTypes[ i++ ] ) ) { - - // Prepend if requested - if ( dataType[ 0 ] === "+" ) { - dataType = dataType.slice( 1 ) || "*"; - ( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func ); - - // Otherwise append - } else { - ( structure[ dataType ] = structure[ dataType ] || [] ).push( func ); - } - } - } - }; -} - -// Base inspection function for prefilters and transports -function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) { - - var inspected = {}, - seekingTransport = ( structure === transports ); - - function inspect( dataType ) { - var selected; - inspected[ dataType ] = true; - jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) { - var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR ); - if ( typeof dataTypeOrTransport === "string" && - !seekingTransport && !inspected[ dataTypeOrTransport ] ) { - - options.dataTypes.unshift( dataTypeOrTransport ); - inspect( dataTypeOrTransport ); - return false; - } else if ( seekingTransport ) { - return !( selected = dataTypeOrTransport ); - } - } ); - return selected; - } - - return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" ); -} - -// A special extend for ajax options -// that takes "flat" options (not to be deep extended) -// Fixes #9887 -function ajaxExtend( target, src ) { - var key, deep, - flatOptions = jQuery.ajaxSettings.flatOptions || {}; - - for ( key in src ) { - if ( src[ key ] !== undefined ) { - ( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ]; - } - } - if ( deep ) { - jQuery.extend( true, target, deep ); - } - - return target; -} - -/* Handles responses to an ajax request: - * - finds the right dataType (mediates between content-type and expected dataType) - * - returns the corresponding response - */ -function ajaxHandleResponses( s, jqXHR, responses ) { - - var ct, type, finalDataType, firstDataType, - contents = s.contents, - dataTypes = s.dataTypes; - - // Remove auto dataType and get content-type in the process - while ( dataTypes[ 0 ] === "*" ) { - dataTypes.shift(); - if ( ct === undefined ) { - ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" ); - } - } - - // Check if we're dealing with a known content-type - if ( ct ) { - for ( type in contents ) { - if ( contents[ type ] && contents[ type ].test( ct ) ) { - dataTypes.unshift( type ); - break; - } - } - } - - // Check to see if we have a response for the expected dataType - if ( dataTypes[ 0 ] in responses ) { - finalDataType = dataTypes[ 0 ]; - } else { - - // Try convertible dataTypes - for ( type in responses ) { - if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) { - finalDataType = type; - break; - } - if ( !firstDataType ) { - firstDataType = type; - } - } - - // Or just use first one - finalDataType = finalDataType || firstDataType; - } - - // If we found a dataType - // We add the dataType to the list if needed - // and return the corresponding response - if ( finalDataType ) { - if ( finalDataType !== dataTypes[ 0 ] ) { - dataTypes.unshift( finalDataType ); - } - return responses[ finalDataType ]; - } -} - -/* Chain conversions given the request and the original response - * Also sets the responseXXX fields on the jqXHR instance - */ -function ajaxConvert( s, response, jqXHR, isSuccess ) { - var conv2, current, conv, tmp, prev, - converters = {}, - - // Work with a copy of dataTypes in case we need to modify it for conversion - dataTypes = s.dataTypes.slice(); - - // Create converters map with lowercased keys - if ( dataTypes[ 1 ] ) { - for ( conv in s.converters ) { - converters[ conv.toLowerCase() ] = s.converters[ conv ]; - } - } - - current = dataTypes.shift(); - - // Convert to each sequential dataType - while ( current ) { - - if ( s.responseFields[ current ] ) { - jqXHR[ s.responseFields[ current ] ] = response; - } - - // Apply the dataFilter if provided - if ( !prev && isSuccess && s.dataFilter ) { - response = s.dataFilter( response, s.dataType ); - } - - prev = current; - current = dataTypes.shift(); - - if ( current ) { - - // There's only work to do if current dataType is non-auto - if ( current === "*" ) { - - current = prev; - - // Convert response if prev dataType is non-auto and differs from current - } else if ( prev !== "*" && prev !== current ) { - - // Seek a direct converter - conv = converters[ prev + " " + current ] || converters[ "* " + current ]; - - // If none found, seek a pair - if ( !conv ) { - for ( conv2 in converters ) { - - // If conv2 outputs current - tmp = conv2.split( " " ); - if ( tmp[ 1 ] === current ) { - - // If prev can be converted to accepted input - conv = converters[ prev + " " + tmp[ 0 ] ] || - converters[ "* " + tmp[ 0 ] ]; - if ( conv ) { - - // Condense equivalence converters - if ( conv === true ) { - conv = converters[ conv2 ]; - - // Otherwise, insert the intermediate dataType - } else if ( converters[ conv2 ] !== true ) { - current = tmp[ 0 ]; - dataTypes.unshift( tmp[ 1 ] ); - } - break; - } - } - } - } - - // Apply converter (if not an equivalence) - if ( conv !== true ) { - - // Unless errors are allowed to bubble, catch and return them - if ( conv && s.throws ) { - response = conv( response ); - } else { - try { - response = conv( response ); - } catch ( e ) { - return { - state: "parsererror", - error: conv ? e : "No conversion from " + prev + " to " + current - }; - } - } - } - } - } - } - - return { state: "success", data: response }; -} - -jQuery.extend( { - - // Counter for holding the number of active queries - active: 0, - - // Last-Modified header cache for next request - lastModified: {}, - etag: {}, - - ajaxSettings: { - url: location.href, - type: "GET", - isLocal: rlocalProtocol.test( location.protocol ), - global: true, - processData: true, - async: true, - contentType: "application/x-www-form-urlencoded; charset=UTF-8", - - /* - timeout: 0, - data: null, - dataType: null, - username: null, - password: null, - cache: null, - throws: false, - traditional: false, - headers: {}, - */ - - accepts: { - "*": allTypes, - text: "text/plain", - html: "text/html", - xml: "application/xml, text/xml", - json: "application/json, text/javascript" - }, - - contents: { - xml: /\bxml\b/, - html: /\bhtml/, - json: /\bjson\b/ - }, - - responseFields: { - xml: "responseXML", - text: "responseText", - json: "responseJSON" - }, - - // Data converters - // Keys separate source (or catchall "*") and destination types with a single space - converters: { - - // Convert anything to text - "* text": String, - - // Text to html (true = no transformation) - "text html": true, - - // Evaluate text as a json expression - "text json": JSON.parse, - - // Parse text as xml - "text xml": jQuery.parseXML - }, - - // For options that shouldn't be deep extended: - // you can add your own custom options here if - // and when you create one that shouldn't be - // deep extended (see ajaxExtend) - flatOptions: { - url: true, - context: true - } - }, - - // Creates a full fledged settings object into target - // with both ajaxSettings and settings fields. - // If target is omitted, writes into ajaxSettings. - ajaxSetup: function( target, settings ) { - return settings ? - - // Building a settings object - ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) : - - // Extending ajaxSettings - ajaxExtend( jQuery.ajaxSettings, target ); - }, - - ajaxPrefilter: addToPrefiltersOrTransports( prefilters ), - ajaxTransport: addToPrefiltersOrTransports( transports ), - - // Main method - ajax: function( url, options ) { - - // If url is an object, simulate pre-1.5 signature - if ( typeof url === "object" ) { - options = url; - url = undefined; - } - - // Force options to be an object - options = options || {}; - - var transport, - - // URL without anti-cache param - cacheURL, - - // Response headers - responseHeadersString, - responseHeaders, - - // timeout handle - timeoutTimer, - - // Url cleanup var - urlAnchor, - - // Request state (becomes false upon send and true upon completion) - completed, - - // To know if global events are to be dispatched - fireGlobals, - - // Loop variable - i, - - // uncached part of the url - uncached, - - // Create the final options object - s = jQuery.ajaxSetup( {}, options ), - - // Callbacks context - callbackContext = s.context || s, - - // Context for global events is callbackContext if it is a DOM node or jQuery collection - globalEventContext = s.context && - ( callbackContext.nodeType || callbackContext.jquery ) ? - jQuery( callbackContext ) : - jQuery.event, - - // Deferreds - deferred = jQuery.Deferred(), - completeDeferred = jQuery.Callbacks( "once memory" ), - - // Status-dependent callbacks - statusCode = s.statusCode || {}, - - // Headers (they are sent all at once) - requestHeaders = {}, - requestHeadersNames = {}, - - // Default abort message - strAbort = "canceled", - - // Fake xhr - jqXHR = { - readyState: 0, - - // Builds headers hashtable if needed - getResponseHeader: function( key ) { - var match; - if ( completed ) { - if ( !responseHeaders ) { - responseHeaders = {}; - while ( ( match = rheaders.exec( responseHeadersString ) ) ) { - responseHeaders[ match[ 1 ].toLowerCase() + " " ] = - ( responseHeaders[ match[ 1 ].toLowerCase() + " " ] || [] ) - .concat( match[ 2 ] ); - } - } - match = responseHeaders[ key.toLowerCase() + " " ]; - } - return match == null ? null : match.join( ", " ); - }, - - // Raw string - getAllResponseHeaders: function() { - return completed ? responseHeadersString : null; - }, - - // Caches the header - setRequestHeader: function( name, value ) { - if ( completed == null ) { - name = requestHeadersNames[ name.toLowerCase() ] = - requestHeadersNames[ name.toLowerCase() ] || name; - requestHeaders[ name ] = value; - } - return this; - }, - - // Overrides response content-type header - overrideMimeType: function( type ) { - if ( completed == null ) { - s.mimeType = type; - } - return this; - }, - - // Status-dependent callbacks - statusCode: function( map ) { - var code; - if ( map ) { - if ( completed ) { - - // Execute the appropriate callbacks - jqXHR.always( map[ jqXHR.status ] ); - } else { - - // Lazy-add the new callbacks in a way that preserves old ones - for ( code in map ) { - statusCode[ code ] = [ statusCode[ code ], map[ code ] ]; - } - } - } - return this; - }, - - // Cancel the request - abort: function( statusText ) { - var finalText = statusText || strAbort; - if ( transport ) { - transport.abort( finalText ); - } - done( 0, finalText ); - return this; - } - }; - - // Attach deferreds - deferred.promise( jqXHR ); - - // Add protocol if not provided (prefilters might expect it) - // Handle falsy url in the settings object (#10093: consistency with old signature) - // We also use the url parameter if available - s.url = ( ( url || s.url || location.href ) + "" ) - .replace( rprotocol, location.protocol + "//" ); - - // Alias method option to type as per ticket #12004 - s.type = options.method || options.type || s.method || s.type; - - // Extract dataTypes list - s.dataTypes = ( s.dataType || "*" ).toLowerCase().match( rnothtmlwhite ) || [ "" ]; - - // A cross-domain request is in order when the origin doesn't match the current origin. - if ( s.crossDomain == null ) { - urlAnchor = document.createElement( "a" ); - - // Support: IE <=8 - 11, Edge 12 - 15 - // IE throws exception on accessing the href property if url is malformed, - // e.g. http://example.com:80x/ - try { - urlAnchor.href = s.url; - - // Support: IE <=8 - 11 only - // Anchor's host property isn't correctly set when s.url is relative - urlAnchor.href = urlAnchor.href; - s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !== - urlAnchor.protocol + "//" + urlAnchor.host; - } catch ( e ) { - - // If there is an error parsing the URL, assume it is crossDomain, - // it can be rejected by the transport if it is invalid - s.crossDomain = true; - } - } - - // Convert data if not already a string - if ( s.data && s.processData && typeof s.data !== "string" ) { - s.data = jQuery.param( s.data, s.traditional ); - } - - // Apply prefilters - inspectPrefiltersOrTransports( prefilters, s, options, jqXHR ); - - // If request was aborted inside a prefilter, stop there - if ( completed ) { - return jqXHR; - } - - // We can fire global events as of now if asked to - // Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118) - fireGlobals = jQuery.event && s.global; - - // Watch for a new set of requests - if ( fireGlobals && jQuery.active++ === 0 ) { - jQuery.event.trigger( "ajaxStart" ); - } - - // Uppercase the type - s.type = s.type.toUpperCase(); - - // Determine if request has content - s.hasContent = !rnoContent.test( s.type ); - - // Save the URL in case we're toying with the If-Modified-Since - // and/or If-None-Match header later on - // Remove hash to simplify url manipulation - cacheURL = s.url.replace( rhash, "" ); - - // More options handling for requests with no content - if ( !s.hasContent ) { - - // Remember the hash so we can put it back - uncached = s.url.slice( cacheURL.length ); - - // If data is available and should be processed, append data to url - if ( s.data && ( s.processData || typeof s.data === "string" ) ) { - cacheURL += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data; - - // #9682: remove data so that it's not used in an eventual retry - delete s.data; - } - - // Add or update anti-cache param if needed - if ( s.cache === false ) { - cacheURL = cacheURL.replace( rantiCache, "$1" ); - uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) + - uncached; - } - - // Put hash and anti-cache on the URL that will be requested (gh-1732) - s.url = cacheURL + uncached; - - // Change '%20' to '+' if this is encoded form body content (gh-2658) - } else if ( s.data && s.processData && - ( s.contentType || "" ).indexOf( "application/x-www-form-urlencoded" ) === 0 ) { - s.data = s.data.replace( r20, "+" ); - } - - // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. - if ( s.ifModified ) { - if ( jQuery.lastModified[ cacheURL ] ) { - jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] ); - } - if ( jQuery.etag[ cacheURL ] ) { - jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] ); - } - } - - // Set the correct header, if data is being sent - if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) { - jqXHR.setRequestHeader( "Content-Type", s.contentType ); - } - - // Set the Accepts header for the server, depending on the dataType - jqXHR.setRequestHeader( - "Accept", - s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ? - s.accepts[ s.dataTypes[ 0 ] ] + - ( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) : - s.accepts[ "*" ] - ); - - // Check for headers option - for ( i in s.headers ) { - jqXHR.setRequestHeader( i, s.headers[ i ] ); - } - - // Allow custom headers/mimetypes and early abort - if ( s.beforeSend && - ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || completed ) ) { - - // Abort if not done already and return - return jqXHR.abort(); - } - - // Aborting is no longer a cancellation - strAbort = "abort"; - - // Install callbacks on deferreds - completeDeferred.add( s.complete ); - jqXHR.done( s.success ); - jqXHR.fail( s.error ); - - // Get transport - transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR ); - - // If no transport, we auto-abort - if ( !transport ) { - done( -1, "No Transport" ); - } else { - jqXHR.readyState = 1; - - // Send global event - if ( fireGlobals ) { - globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] ); - } - - // If request was aborted inside ajaxSend, stop there - if ( completed ) { - return jqXHR; - } - - // Timeout - if ( s.async && s.timeout > 0 ) { - timeoutTimer = window.setTimeout( function() { - jqXHR.abort( "timeout" ); - }, s.timeout ); - } - - try { - completed = false; - transport.send( requestHeaders, done ); - } catch ( e ) { - - // Rethrow post-completion exceptions - if ( completed ) { - throw e; - } - - // Propagate others as results - done( -1, e ); - } - } - - // Callback for when everything is done - function done( status, nativeStatusText, responses, headers ) { - var isSuccess, success, error, response, modified, - statusText = nativeStatusText; - - // Ignore repeat invocations - if ( completed ) { - return; - } - - completed = true; - - // Clear timeout if it exists - if ( timeoutTimer ) { - window.clearTimeout( timeoutTimer ); - } - - // Dereference transport for early garbage collection - // (no matter how long the jqXHR object will be used) - transport = undefined; - - // Cache response headers - responseHeadersString = headers || ""; - - // Set readyState - jqXHR.readyState = status > 0 ? 4 : 0; - - // Determine if successful - isSuccess = status >= 200 && status < 300 || status === 304; - - // Get response data - if ( responses ) { - response = ajaxHandleResponses( s, jqXHR, responses ); - } - - // Use a noop converter for missing script - if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) { - s.converters[ "text script" ] = function() {}; - } - - // Convert no matter what (that way responseXXX fields are always set) - response = ajaxConvert( s, response, jqXHR, isSuccess ); - - // If successful, handle type chaining - if ( isSuccess ) { - - // Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode. - if ( s.ifModified ) { - modified = jqXHR.getResponseHeader( "Last-Modified" ); - if ( modified ) { - jQuery.lastModified[ cacheURL ] = modified; - } - modified = jqXHR.getResponseHeader( "etag" ); - if ( modified ) { - jQuery.etag[ cacheURL ] = modified; - } - } - - // if no content - if ( status === 204 || s.type === "HEAD" ) { - statusText = "nocontent"; - - // if not modified - } else if ( status === 304 ) { - statusText = "notmodified"; - - // If we have data, let's convert it - } else { - statusText = response.state; - success = response.data; - error = response.error; - isSuccess = !error; - } - } else { - - // Extract error from statusText and normalize for non-aborts - error = statusText; - if ( status || !statusText ) { - statusText = "error"; - if ( status < 0 ) { - status = 0; - } - } - } - - // Set data for the fake xhr object - jqXHR.status = status; - jqXHR.statusText = ( nativeStatusText || statusText ) + ""; - - // Success/Error - if ( isSuccess ) { - deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] ); - } else { - deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] ); - } - - // Status-dependent callbacks - jqXHR.statusCode( statusCode ); - statusCode = undefined; - - if ( fireGlobals ) { - globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError", - [ jqXHR, s, isSuccess ? success : error ] ); - } - - // Complete - completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] ); - - if ( fireGlobals ) { - globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] ); - - // Handle the global AJAX counter - if ( !( --jQuery.active ) ) { - jQuery.event.trigger( "ajaxStop" ); - } - } - } - - return jqXHR; - }, - - getJSON: function( url, data, callback ) { - return jQuery.get( url, data, callback, "json" ); - }, - - getScript: function( url, callback ) { - return jQuery.get( url, undefined, callback, "script" ); - } -} ); - -jQuery.each( [ "get", "post" ], function( _i, method ) { - jQuery[ method ] = function( url, data, callback, type ) { - - // Shift arguments if data argument was omitted - if ( isFunction( data ) ) { - type = type || callback; - callback = data; - data = undefined; - } - - // The url can be an options object (which then must have .url) - return jQuery.ajax( jQuery.extend( { - url: url, - type: method, - dataType: type, - data: data, - success: callback - }, jQuery.isPlainObject( url ) && url ) ); - }; -} ); - -jQuery.ajaxPrefilter( function( s ) { - var i; - for ( i in s.headers ) { - if ( i.toLowerCase() === "content-type" ) { - s.contentType = s.headers[ i ] || ""; - } - } -} ); - - -jQuery._evalUrl = function( url, options, doc ) { - return jQuery.ajax( { - url: url, - - // Make this explicit, since user can override this through ajaxSetup (#11264) - type: "GET", - dataType: "script", - cache: true, - async: false, - global: false, - - // Only evaluate the response if it is successful (gh-4126) - // dataFilter is not invoked for failure responses, so using it instead - // of the default converter is kludgy but it works. - converters: { - "text script": function() {} - }, - dataFilter: function( response ) { - jQuery.globalEval( response, options, doc ); - } - } ); -}; - - -jQuery.fn.extend( { - wrapAll: function( html ) { - var wrap; - - if ( this[ 0 ] ) { - if ( isFunction( html ) ) { - html = html.call( this[ 0 ] ); - } - - // The elements to wrap the target around - wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true ); - - if ( this[ 0 ].parentNode ) { - wrap.insertBefore( this[ 0 ] ); - } - - wrap.map( function() { - var elem = this; - - while ( elem.firstElementChild ) { - elem = elem.firstElementChild; - } - - return elem; - } ).append( this ); - } - - return this; - }, - - wrapInner: function( html ) { - if ( isFunction( html ) ) { - return this.each( function( i ) { - jQuery( this ).wrapInner( html.call( this, i ) ); - } ); - } - - return this.each( function() { - var self = jQuery( this ), - contents = self.contents(); - - if ( contents.length ) { - contents.wrapAll( html ); - - } else { - self.append( html ); - } - } ); - }, - - wrap: function( html ) { - var htmlIsFunction = isFunction( html ); - - return this.each( function( i ) { - jQuery( this ).wrapAll( htmlIsFunction ? html.call( this, i ) : html ); - } ); - }, - - unwrap: function( selector ) { - this.parent( selector ).not( "body" ).each( function() { - jQuery( this ).replaceWith( this.childNodes ); - } ); - return this; - } -} ); - - -jQuery.expr.pseudos.hidden = function( elem ) { - return !jQuery.expr.pseudos.visible( elem ); -}; -jQuery.expr.pseudos.visible = function( elem ) { - return !!( elem.offsetWidth || elem.offsetHeight || elem.getClientRects().length ); -}; - - - - -jQuery.ajaxSettings.xhr = function() { - try { - return new window.XMLHttpRequest(); - } catch ( e ) {} -}; - -var xhrSuccessStatus = { - - // File protocol always yields status code 0, assume 200 - 0: 200, - - // Support: IE <=9 only - // #1450: sometimes IE returns 1223 when it should be 204 - 1223: 204 - }, - xhrSupported = jQuery.ajaxSettings.xhr(); - -support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported ); -support.ajax = xhrSupported = !!xhrSupported; - -jQuery.ajaxTransport( function( options ) { - var callback, errorCallback; - - // Cross domain only allowed if supported through XMLHttpRequest - if ( support.cors || xhrSupported && !options.crossDomain ) { - return { - send: function( headers, complete ) { - var i, - xhr = options.xhr(); - - xhr.open( - options.type, - options.url, - options.async, - options.username, - options.password - ); - - // Apply custom fields if provided - if ( options.xhrFields ) { - for ( i in options.xhrFields ) { - xhr[ i ] = options.xhrFields[ i ]; - } - } - - // Override mime type if needed - if ( options.mimeType && xhr.overrideMimeType ) { - xhr.overrideMimeType( options.mimeType ); - } - - // X-Requested-With header - // For cross-domain requests, seeing as conditions for a preflight are - // akin to a jigsaw puzzle, we simply never set it to be sure. - // (it can always be set on a per-request basis or even using ajaxSetup) - // For same-domain requests, won't change header if already provided. - if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) { - headers[ "X-Requested-With" ] = "XMLHttpRequest"; - } - - // Set headers - for ( i in headers ) { - xhr.setRequestHeader( i, headers[ i ] ); - } - - // Callback - callback = function( type ) { - return function() { - if ( callback ) { - callback = errorCallback = xhr.onload = - xhr.onerror = xhr.onabort = xhr.ontimeout = - xhr.onreadystatechange = null; - - if ( type === "abort" ) { - xhr.abort(); - } else if ( type === "error" ) { - - // Support: IE <=9 only - // On a manual native abort, IE9 throws - // errors on any property access that is not readyState - if ( typeof xhr.status !== "number" ) { - complete( 0, "error" ); - } else { - complete( - - // File: protocol always yields status 0; see #8605, #14207 - xhr.status, - xhr.statusText - ); - } - } else { - complete( - xhrSuccessStatus[ xhr.status ] || xhr.status, - xhr.statusText, - - // Support: IE <=9 only - // IE9 has no XHR2 but throws on binary (trac-11426) - // For XHR2 non-text, let the caller handle it (gh-2498) - ( xhr.responseType || "text" ) !== "text" || - typeof xhr.responseText !== "string" ? - { binary: xhr.response } : - { text: xhr.responseText }, - xhr.getAllResponseHeaders() - ); - } - } - }; - }; - - // Listen to events - xhr.onload = callback(); - errorCallback = xhr.onerror = xhr.ontimeout = callback( "error" ); - - // Support: IE 9 only - // Use onreadystatechange to replace onabort - // to handle uncaught aborts - if ( xhr.onabort !== undefined ) { - xhr.onabort = errorCallback; - } else { - xhr.onreadystatechange = function() { - - // Check readyState before timeout as it changes - if ( xhr.readyState === 4 ) { - - // Allow onerror to be called first, - // but that will not handle a native abort - // Also, save errorCallback to a variable - // as xhr.onerror cannot be accessed - window.setTimeout( function() { - if ( callback ) { - errorCallback(); - } - } ); - } - }; - } - - // Create the abort callback - callback = callback( "abort" ); - - try { - - // Do send the request (this may raise an exception) - xhr.send( options.hasContent && options.data || null ); - } catch ( e ) { - - // #14683: Only rethrow if this hasn't been notified as an error yet - if ( callback ) { - throw e; - } - } - }, - - abort: function() { - if ( callback ) { - callback(); - } - } - }; - } -} ); - - - - -// Prevent auto-execution of scripts when no explicit dataType was provided (See gh-2432) -jQuery.ajaxPrefilter( function( s ) { - if ( s.crossDomain ) { - s.contents.script = false; - } -} ); - -// Install script dataType -jQuery.ajaxSetup( { - accepts: { - script: "text/javascript, application/javascript, " + - "application/ecmascript, application/x-ecmascript" - }, - contents: { - script: /\b(?:java|ecma)script\b/ - }, - converters: { - "text script": function( text ) { - jQuery.globalEval( text ); - return text; - } - } -} ); - -// Handle cache's special case and crossDomain -jQuery.ajaxPrefilter( "script", function( s ) { - if ( s.cache === undefined ) { - s.cache = false; - } - if ( s.crossDomain ) { - s.type = "GET"; - } -} ); - -// Bind script tag hack transport -jQuery.ajaxTransport( "script", function( s ) { - - // This transport only deals with cross domain or forced-by-attrs requests - if ( s.crossDomain || s.scriptAttrs ) { - var script, callback; - return { - send: function( _, complete ) { - script = jQuery( "",rE:!0,sL:""}},s,{cN:"pi",b:/<\?\w+/,e:/\?>/,r:10},{cN:"tag",b:"",c:[{cN:"title",b:/[^ \/><\n\t]+/,r:0},c]}]}});hljs.registerLanguage("autohotkey",function(e){var r={cN:"escape",b:"`[\\s\\S]"},c=e.C(";","$",{r:0}),n=[{cN:"built_in",b:"A_[a-zA-Z0-9]+"},{cN:"built_in",bK:"ComSpec Clipboard ClipboardAll ErrorLevel"}];return{cI:!0,k:{keyword:"Break Continue Else Gosub If Loop Return While",literal:"A true false NOT AND OR"},c:n.concat([r,e.inherit(e.QSM,{c:[r]}),c,{cN:"number",b:e.NR,r:0},{cN:"var_expand",b:"%",e:"%",i:"\\n",c:[r]},{cN:"label",c:[r],v:[{b:'^[^\\n";]+::(?!=)'},{b:'^[^\\n";]+:(?!=)',r:0}]},{b:",\\s*,",r:10}])}});hljs.registerLanguage("r",function(e){var r="([a-zA-Z]|\\.[a-zA-Z.])[a-zA-Z0-9._]*";return{c:[e.HCM,{b:r,l:r,k:{keyword:"function if in break next repeat else for return switch while try tryCatch stop warning require library attach detach source setMethod setGeneric setGroupGeneric setClass ...",literal:"NULL NA TRUE FALSE T F Inf NaN NA_integer_|10 NA_real_|10 NA_character_|10 NA_complex_|10"},r:0},{cN:"number",b:"0[xX][0-9a-fA-F]+[Li]?\\b",r:0},{cN:"number",b:"\\d+(?:[eE][+\\-]?\\d*)?L\\b",r:0},{cN:"number",b:"\\d+\\.(?!\\d)(?:i\\b)?",r:0},{cN:"number",b:"\\d+(?:\\.\\d*)?(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{cN:"number",b:"\\.\\d+(?:[eE][+\\-]?\\d*)?i?\\b",r:0},{b:"`",e:"`",r:0},{cN:"string",c:[e.BE],v:[{b:'"',e:'"'},{b:"'",e:"'"}]}]}});hljs.registerLanguage("cs",function(e){var r="abstract as base bool break byte case catch char checked const continue decimal dynamic default delegate do double else enum event explicit extern false finally fixed float for foreach goto if implicit in int interface internal is lock long null when object operator out override params private protected public readonly ref sbyte sealed short sizeof stackalloc static string struct switch this true try typeof uint ulong unchecked unsafe ushort using virtual volatile void while async protected public private internal ascending descending from get group into join let orderby partial select set value var where yield",t=e.IR+"(<"+e.IR+">)?";return{aliases:["csharp"],k:r,i:/::/,c:[e.C("///","$",{rB:!0,c:[{cN:"xmlDocTag",v:[{b:"///",r:0},{b:""},{b:""}]}]}),e.CLCM,e.CBCM,{cN:"preprocessor",b:"#",e:"$",k:"if else elif endif define undef warning error line region endregion pragma checksum"},{cN:"string",b:'@"',e:'"',c:[{b:'""'}]},e.ASM,e.QSM,e.CNM,{bK:"class namespace interface",e:/[{;=]/,i:/[^\s:]/,c:[e.TM,e.CLCM,e.CBCM]},{bK:"new return throw await",r:0},{cN:"function",b:"("+t+"\\s+)+"+e.IR+"\\s*\\(",rB:!0,e:/[{;=]/,eE:!0,k:r,c:[{b:e.IR+"\\s*\\(",rB:!0,c:[e.TM],r:0},{cN:"params",b:/\(/,e:/\)/,k:r,r:0,c:[e.ASM,e.QSM,e.CNM,e.CBCM]},e.CLCM,e.CBCM]}]}});hljs.registerLanguage("nsis",function(e){var t={cN:"symbol",b:"\\$(ADMINTOOLS|APPDATA|CDBURN_AREA|CMDLINE|COMMONFILES32|COMMONFILES64|COMMONFILES|COOKIES|DESKTOP|DOCUMENTS|EXEDIR|EXEFILE|EXEPATH|FAVORITES|FONTS|HISTORY|HWNDPARENT|INSTDIR|INTERNET_CACHE|LANGUAGE|LOCALAPPDATA|MUSIC|NETHOOD|OUTDIR|PICTURES|PLUGINSDIR|PRINTHOOD|PROFILE|PROGRAMFILES32|PROGRAMFILES64|PROGRAMFILES|QUICKLAUNCH|RECENT|RESOURCES_LOCALIZED|RESOURCES|SENDTO|SMPROGRAMS|SMSTARTUP|STARTMENU|SYSDIR|TEMP|TEMPLATES|VIDEOS|WINDIR)"},n={cN:"constant",b:"\\$+{[a-zA-Z0-9_]+}"},i={cN:"variable",b:"\\$+[a-zA-Z0-9_]+",i:"\\(\\){}"},r={cN:"constant",b:"\\$+\\([a-zA-Z0-9_]+\\)"},o={cN:"params",b:"(ARCHIVE|FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_NORMAL|FILE_ATTRIBUTE_OFFLINE|FILE_ATTRIBUTE_READONLY|FILE_ATTRIBUTE_SYSTEM|FILE_ATTRIBUTE_TEMPORARY|HKCR|HKCU|HKDD|HKEY_CLASSES_ROOT|HKEY_CURRENT_CONFIG|HKEY_CURRENT_USER|HKEY_DYN_DATA|HKEY_LOCAL_MACHINE|HKEY_PERFORMANCE_DATA|HKEY_USERS|HKLM|HKPD|HKU|IDABORT|IDCANCEL|IDIGNORE|IDNO|IDOK|IDRETRY|IDYES|MB_ABORTRETRYIGNORE|MB_DEFBUTTON1|MB_DEFBUTTON2|MB_DEFBUTTON3|MB_DEFBUTTON4|MB_ICONEXCLAMATION|MB_ICONINFORMATION|MB_ICONQUESTION|MB_ICONSTOP|MB_OK|MB_OKCANCEL|MB_RETRYCANCEL|MB_RIGHT|MB_RTLREADING|MB_SETFOREGROUND|MB_TOPMOST|MB_USERICON|MB_YESNO|NORMAL|OFFLINE|READONLY|SHCTX|SHELL_CONTEXT|SYSTEM|TEMPORARY)"},l={cN:"constant",b:"\\!(addincludedir|addplugindir|appendfile|cd|define|delfile|echo|else|endif|error|execute|finalize|getdllversionsystem|ifdef|ifmacrodef|ifmacrondef|ifndef|if|include|insertmacro|macroend|macro|makensis|packhdr|searchparse|searchreplace|tempfile|undef|verbose|warning)"};return{cI:!1,k:{keyword:"Abort AddBrandingImage AddSize AllowRootDirInstall AllowSkipFiles AutoCloseWindow BGFont BGGradient BrandingText BringToFront Call CallInstDLL Caption ChangeUI CheckBitmap ClearErrors CompletedText ComponentText CopyFiles CRCCheck CreateDirectory CreateFont CreateShortCut Delete DeleteINISec DeleteINIStr DeleteRegKey DeleteRegValue DetailPrint DetailsButtonText DirText DirVar DirVerify EnableWindow EnumRegKey EnumRegValue Exch Exec ExecShell ExecWait ExpandEnvStrings File FileBufSize FileClose FileErrorText FileOpen FileRead FileReadByte FileReadUTF16LE FileReadWord FileSeek FileWrite FileWriteByte FileWriteUTF16LE FileWriteWord FindClose FindFirst FindNext FindWindow FlushINI FunctionEnd GetCurInstType GetCurrentAddress GetDlgItem GetDLLVersion GetDLLVersionLocal GetErrorLevel GetFileTime GetFileTimeLocal GetFullPathName GetFunctionAddress GetInstDirError GetLabelAddress GetTempFileName Goto HideWindow Icon IfAbort IfErrors IfFileExists IfRebootFlag IfSilent InitPluginsDir InstallButtonText InstallColors InstallDir InstallDirRegKey InstProgressFlags InstType InstTypeGetText InstTypeSetText IntCmp IntCmpU IntFmt IntOp IsWindow LangString LicenseBkColor LicenseData LicenseForceSelection LicenseLangString LicenseText LoadLanguageFile LockWindow LogSet LogText ManifestDPIAware ManifestSupportedOS MessageBox MiscButtonText Name Nop OutFile Page PageCallbacks PageExEnd Pop Push Quit ReadEnvStr ReadINIStr ReadRegDWORD ReadRegStr Reboot RegDLL Rename RequestExecutionLevel ReserveFile Return RMDir SearchPath SectionEnd SectionGetFlags SectionGetInstTypes SectionGetSize SectionGetText SectionGroupEnd SectionIn SectionSetFlags SectionSetInstTypes SectionSetSize SectionSetText SendMessage SetAutoClose SetBrandingImage SetCompress SetCompressor SetCompressorDictSize SetCtlColors SetCurInstType SetDatablockOptimize SetDateSave SetDetailsPrint SetDetailsView SetErrorLevel SetErrors SetFileAttributes SetFont SetOutPath SetOverwrite SetPluginUnload SetRebootFlag SetRegView SetShellVarContext SetSilent ShowInstDetails ShowUninstDetails ShowWindow SilentInstall SilentUnInstall Sleep SpaceTexts StrCmp StrCmpS StrCpy StrLen SubCaption SubSectionEnd Unicode UninstallButtonText UninstallCaption UninstallIcon UninstallSubCaption UninstallText UninstPage UnRegDLL Var VIAddVersionKey VIFileVersion VIProductVersion WindowIcon WriteINIStr WriteRegBin WriteRegDWORD WriteRegExpandStr WriteRegStr WriteUninstaller XPStyle",literal:"admin all auto both colored current false force hide highest lastused leave listonly none normal notset off on open print show silent silentlog smooth textonly true user "},c:[e.HCM,e.CBCM,{cN:"string",b:'"',e:'"',i:"\\n",c:[{cN:"symbol",b:"\\$(\\\\(n|r|t)|\\$)"},t,n,i,r]},e.C(";","$",{r:0}),{cN:"function",bK:"Function PageEx Section SectionGroup SubSection",e:"$"},l,n,i,r,o,e.NM,{cN:"literal",b:e.IR+"::"+e.IR}]}});hljs.registerLanguage("less",function(e){var r="[\\w-]+",t="("+r+"|@{"+r+"})",a=[],c=[],n=function(e){return{cN:"string",b:"~?"+e+".*?"+e}},i=function(e,r,t){return{cN:e,b:r,r:t}},s=function(r,t,a){return e.inherit({cN:r,b:t+"\\(",e:"\\(",rB:!0,eE:!0,r:0},a)},b={b:"\\(",e:"\\)",c:c,r:0};c.push(e.CLCM,e.CBCM,n("'"),n('"'),e.CSSNM,i("hexcolor","#[0-9A-Fa-f]+\\b"),s("function","(url|data-uri)",{starts:{cN:"string",e:"[\\)\\n]",eE:!0}}),s("function",r),b,i("variable","@@?"+r,10),i("variable","@{"+r+"}"),i("built_in","~?`[^`]*?`"),{cN:"attribute",b:r+"\\s*:",e:":",rB:!0,eE:!0});var o=c.concat({b:"{",e:"}",c:a}),u={bK:"when",eW:!0,c:[{bK:"and not"}].concat(c)},C={cN:"attribute",b:t,e:":",eE:!0,c:[e.CLCM,e.CBCM],i:/\S/,starts:{e:"[;}]",rE:!0,c:c,i:"[<=$]"}},l={cN:"at_rule",b:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b",starts:{e:"[;{}]",rE:!0,c:c,r:0}},d={cN:"variable",v:[{b:"@"+r+"\\s*:",r:15},{b:"@"+r}],starts:{e:"[;}]",rE:!0,c:o}},p={v:[{b:"[\\.#:&\\[]",e:"[;{}]"},{b:t+"[^;]*{",e:"{"}],rB:!0,rE:!0,i:"[<='$\"]",c:[e.CLCM,e.CBCM,u,i("keyword","all\\b"),i("variable","@{"+r+"}"),i("tag",t+"%?",0),i("id","#"+t),i("class","\\."+t,0),i("keyword","&",0),s("pseudo",":not"),s("keyword",":extend"),i("pseudo","::?"+t),{cN:"attr_selector",b:"\\[",e:"\\]"},{b:"\\(",e:"\\)",c:o},{b:"!important"}]};return a.push(e.CLCM,e.CBCM,l,d,p,C),{cI:!0,i:"[=>'/<($\"]",c:a}});hljs.registerLanguage("pf",function(t){var o={cN:"variable",b:/\$[\w\d#@][\w\d_]*/},e={cN:"variable",b://};return{aliases:["pf.conf"],l:/[a-z0-9_<>-]+/,k:{built_in:"block match pass load anchor|5 antispoof|10 set table",keyword:"in out log quick on rdomain inet inet6 proto from port os to routeallow-opts divert-packet divert-reply divert-to flags group icmp-typeicmp6-type label once probability recieved-on rtable prio queuetos tag tagged user keep fragment for os dropaf-to|10 binat-to|10 nat-to|10 rdr-to|10 bitmask least-stats random round-robinsource-hash static-portdup-to reply-to route-toparent bandwidth default min max qlimitblock-policy debug fingerprints hostid limit loginterface optimizationreassemble ruleset-optimization basic none profile skip state-defaultsstate-policy timeoutconst counters persistno modulate synproxy state|5 floating if-bound no-sync pflow|10 sloppysource-track global rule max-src-nodes max-src-states max-src-connmax-src-conn-rate overload flushscrub|5 max-mss min-ttl no-df|10 random-id",literal:"all any no-route self urpf-failed egress|5 unknown"},c:[t.HCM,t.NM,t.QSM,o,e]}});hljs.registerLanguage("lasso",function(e){var r="[a-zA-Z_][a-zA-Z0-9_.]*",a="<\\?(lasso(script)?|=)",t="\\]|\\?>",s={literal:"true false none minimal full all void and or not bw nbw ew new cn ncn lt lte gt gte eq neq rx nrx ft",built_in:"array date decimal duration integer map pair string tag xml null boolean bytes keyword list locale queue set stack staticarray local var variable global data self inherited",keyword:"error_code error_msg error_pop error_push error_reset cache database_names database_schemanames database_tablenames define_tag define_type email_batch encode_set html_comment handle handle_error header if inline iterate ljax_target link link_currentaction link_currentgroup link_currentrecord link_detail link_firstgroup link_firstrecord link_lastgroup link_lastrecord link_nextgroup link_nextrecord link_prevgroup link_prevrecord log loop namespace_using output_none portal private protect records referer referrer repeating resultset rows search_args search_arguments select sort_args sort_arguments thread_atomic value_list while abort case else if_empty if_false if_null if_true loop_abort loop_continue loop_count params params_up return return_value run_children soap_definetag soap_lastrequest soap_lastresponse tag_name ascending average by define descending do equals frozen group handle_failure import in into join let match max min on order parent protected provide public require returnhome skip split_thread sum take thread to trait type where with yield yieldhome"},n=e.C("",{r:0}),o={cN:"preprocessor",b:"\\[noprocess\\]",starts:{cN:"markup",e:"\\[/noprocess\\]",rE:!0,c:[n]}},i={cN:"preprocessor",b:"\\[/noprocess|"+a},l={cN:"variable",b:"'"+r+"'"},c=[e.CLCM,{cN:"javadoc",b:"/\\*\\*!",e:"\\*/",c:[e.PWM]},e.CBCM,e.inherit(e.CNM,{b:e.CNR+"|(-?infinity|nan)\\b"}),e.inherit(e.ASM,{i:null}),e.inherit(e.QSM,{i:null}),{cN:"string",b:"`",e:"`"},{cN:"variable",v:[{b:"[#$]"+r},{b:"#",e:"\\d+",i:"\\W"}]},{cN:"tag",b:"::\\s*",e:r,i:"\\W"},{cN:"attribute",v:[{b:"-"+e.UIR,r:0},{b:"(\\.\\.\\.)"}]},{cN:"subst",v:[{b:"->\\s*",c:[l]},{b:":=|/(?!\\w)=?|[-+*%=<>&|!?\\\\]+",r:0}]},{cN:"built_in",b:"\\.\\.?\\s*",r:0,c:[l]},{cN:"class",bK:"define",rE:!0,e:"\\(|=>",c:[e.inherit(e.TM,{b:e.UIR+"(=(?!>))?"})]}];return{aliases:["ls","lassoscript"],cI:!0,l:r+"|&[lg]t;",k:s,c:[{cN:"preprocessor",b:t,r:0,starts:{cN:"markup",e:"\\[|"+a,rE:!0,r:0,c:[n]}},o,i,{cN:"preprocessor",b:"\\[no_square_brackets",starts:{e:"\\[/no_square_brackets\\]",l:r+"|&[lg]t;",k:s,c:[{cN:"preprocessor",b:t,r:0,starts:{cN:"markup",e:"\\[noprocess\\]|"+a,rE:!0,c:[n]}},o,i].concat(c)}},{cN:"preprocessor",b:"\\[",r:0},{cN:"shebang",b:"^#!.+lasso9\\b",r:10}].concat(c)}});hljs.registerLanguage("prolog",function(c){var r={cN:"atom",b:/[a-z][A-Za-z0-9_]*/,r:0},b={cN:"name",v:[{b:/[A-Z][a-zA-Z0-9_]*/},{b:/_[A-Za-z0-9_]*/}],r:0},a={b:/\(/,e:/\)/,r:0},e={b:/\[/,e:/\]/},n={cN:"comment",b:/%/,e:/$/,c:[c.PWM]},t={cN:"string",b:/`/,e:/`/,c:[c.BE]},g={cN:"string",b:/0\'(\\\'|.)/},N={cN:"string",b:/0\'\\s/},o={b:/:-/},s=[r,b,a,o,e,n,c.CBCM,c.QSM,c.ASM,t,g,N,c.CNM];return a.c=s,e.c=s,{c:s.concat([{b:/\.$/}])}});hljs.registerLanguage("oxygene",function(e){var r="abstract add and array as asc aspect assembly async begin break block by case class concat const copy constructor continue create default delegate desc distinct div do downto dynamic each else empty end ensure enum equals event except exit extension external false final finalize finalizer finally flags for forward from function future global group has if implementation implements implies in index inherited inline interface into invariants is iterator join locked locking loop matching method mod module namespace nested new nil not notify nullable of old on operator or order out override parallel params partial pinned private procedure property protected public queryable raise read readonly record reintroduce remove repeat require result reverse sealed select self sequence set shl shr skip static step soft take then to true try tuple type union unit unsafe until uses using var virtual raises volatile where while with write xor yield await mapped deprecated stdcall cdecl pascal register safecall overload library platform reference packed strict published autoreleasepool selector strong weak unretained",t=e.C("{","}",{r:0}),a=e.C("\\(\\*","\\*\\)",{r:10}),n={cN:"string",b:"'",e:"'",c:[{b:"''"}]},o={cN:"string",b:"(#\\d+)+"},i={cN:"function",bK:"function constructor destructor procedure method",e:"[:;]",k:"function constructor|10 destructor|10 procedure|10 method|10",c:[e.TM,{cN:"params",b:"\\(",e:"\\)",k:r,c:[n,o]},t,a]};return{cI:!0,k:r,i:'("|\\$[G-Zg-z]|\\/\\*||->)',c:[t,a,e.CLCM,n,o,e.NM,i,{cN:"class",b:"=\\bclass\\b",e:"end;",k:r,c:[n,o,t,a,e.CLCM,i]}]}});hljs.registerLanguage("applescript",function(e){var t=e.inherit(e.QSM,{i:""}),r={cN:"params",b:"\\(",e:"\\)",c:["self",e.CNM,t]},o=e.C("--","$"),n=e.C("\\(\\*","\\*\\)",{c:["self",o]}),a=[o,n,e.HCM];return{aliases:["osascript"],k:{keyword:"about above after against and around as at back before beginning behind below beneath beside between but by considering contain contains continue copy div does eighth else end equal equals error every exit fifth first for fourth from front get given global if ignoring in into is it its last local me middle mod my ninth not of on onto or over prop property put ref reference repeat returning script second set seventh since sixth some tell tenth that the|0 then third through thru timeout times to transaction try until where while whose with without",constant:"AppleScript false linefeed return pi quote result space tab true",type:"alias application boolean class constant date file integer list number real record string text",command:"activate beep count delay launch log offset read round run say summarize write",property:"character characters contents day frontmost id item length month name paragraph paragraphs rest reverse running time version weekday word words year"},c:[t,e.CNM,{cN:"type",b:"\\bPOSIX file\\b"},{cN:"command",b:"\\b(clipboard info|the clipboard|info for|list (disks|folder)|mount volume|path to|(close|open for) access|(get|set) eof|current date|do shell script|get volume settings|random number|set volume|system attribute|system info|time to GMT|(load|run|store) script|scripting components|ASCII (character|number)|localized string|choose (application|color|file|file name|folder|from list|remote application|URL)|display (alert|dialog))\\b|^\\s*return\\b"},{cN:"constant",b:"\\b(text item delimiters|current application|missing value)\\b"},{cN:"keyword",b:"\\b(apart from|aside from|instead of|out of|greater than|isn't|(doesn't|does not) (equal|come before|come after|contain)|(greater|less) than( or equal)?|(starts?|ends|begins?) with|contained by|comes (before|after)|a (ref|reference))\\b"},{cN:"property",b:"\\b(POSIX path|(date|time) string|quoted form)\\b"},{cN:"function_start",bK:"on",i:"[${=;\\n]",c:[e.UTM,r]}].concat(a),i:"//|->|=>"}});hljs.registerLanguage("makefile",function(e){var a={cN:"variable",b:/\$\(/,e:/\)/,c:[e.BE]};return{aliases:["mk","mak"],c:[e.HCM,{b:/^\w+\s*\W*=/,rB:!0,r:0,starts:{cN:"constant",e:/\s*\W*=/,eE:!0,starts:{e:/$/,r:0,c:[a]}}},{cN:"title",b:/^[\w]+:\s*$/},{cN:"phony",b:/^\.PHONY:/,e:/$/,k:".PHONY",l:/[\.\w]+/},{b:/^\t+/,e:/$/,r:0,c:[e.QSM,a]}]}});hljs.registerLanguage("dust",function(e){var a="if eq ne lt lte gt gte select default math sep";return{aliases:["dst"],cI:!0,sL:"xml",subLanguageMode:"continuous",c:[{cN:"expression",b:"{",e:"}",r:0,c:[{cN:"begin-block",b:"#[a-zA-Z- .]+",k:a},{cN:"string",b:'"',e:'"'},{cN:"end-block",b:"\\/[a-zA-Z- .]+",k:a},{cN:"variable",b:"[a-zA-Z-.]+",k:a,r:0}]}]}});hljs.registerLanguage("clojure-repl",function(e){return{c:[{cN:"prompt",b:/^([\w.-]+|\s*#_)=>/,starts:{e:/$/,sL:"clojure",subLanguageMode:"continuous"}}]}});hljs.registerLanguage("dart",function(e){var t={cN:"subst",b:"\\$\\{",e:"}",k:"true false null this is new super"},r={cN:"string",v:[{b:"r'''",e:"'''"},{b:'r"""',e:'"""'},{b:"r'",e:"'",i:"\\n"},{b:'r"',e:'"',i:"\\n"},{b:"'''",e:"'''",c:[e.BE,t]},{b:'"""',e:'"""',c:[e.BE,t]},{b:"'",e:"'",i:"\\n",c:[e.BE,t]},{b:'"',e:'"',i:"\\n",c:[e.BE,t]}]};t.c=[e.CNM,r];var n={keyword:"assert break case catch class const continue default do else enum extends false final finally for if in is new null rethrow return super switch this throw true try var void while with",literal:"abstract as dynamic export external factory get implements import library operator part set static typedef",built_in:"print Comparable DateTime Duration Function Iterable Iterator List Map Match Null Object Pattern RegExp Set Stopwatch String StringBuffer StringSink Symbol Type Uri bool double int num document window querySelector querySelectorAll Element ElementList"};return{k:n,c:[r,{cN:"dartdoc",b:"/\\*\\*",e:"\\*/",sL:"markdown",subLanguageMode:"continuous"},{cN:"dartdoc",b:"///",e:"$",sL:"markdown",subLanguageMode:"continuous"},e.CLCM,e.CBCM,{cN:"class",bK:"class interface",e:"{",eE:!0,c:[{bK:"extends implements"},e.UTM]},e.CNM,{cN:"annotation",b:"@[A-Za-z]+"},{b:"=>"}]}}); \ No newline at end of file diff --git a/static/rest_framework/docs/js/jquery.json-view.min.js b/static/rest_framework/docs/js/jquery.json-view.min.js deleted file mode 100644 index ce3a6043..00000000 --- a/static/rest_framework/docs/js/jquery.json-view.min.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * jquery.json-view - jQuery collapsible JSON plugin - * @version v1.0.0 - * @link http://github.com/bazh/jquery.json-view - * @license MIT - */ -!function(e){"use strict";var n=function(n){var a=e("",{"class":"collapser",on:{click:function(){var n=e(this);n.toggleClass("collapsed");var a=n.parent().children(".block"),p=a.children("ul");n.hasClass("collapsed")?(p.hide(),a.children(".dots, .comments").show()):(p.show(),a.children(".dots, .comments").hide())}}});return n&&a.addClass("collapsed"),a},a=function(a,p){var t=e.extend({},{nl2br:!0},p),r=function(e){return e.toString()?e.toString().replace(/&/g,"&").replace(/"/g,""").replace(//g,">"):""},s=function(n,a){return e("",{"class":a,html:r(n)})},l=function(a,p){switch(e.type(a)){case"object":p||(p=0);var c=e("",{"class":"block"}),d=Object.keys(a).length;if(!d)return c.append(s("{","b")).append(" ").append(s("}","b"));c.append(s("{","b"));var i=e("