.credentials/SYMPA_PASSWORD

@@ -1 +0,0 @@
-toto

.credentials/SYMPA_USERNAME

@@ -1 +0,0 @@
-sympa

.gitignore

@@ -21,4 +21,3 @@ media/
 # VSCode
 .vscode/
 .direnv
-.static

README.md

@@ -18,7 +18,7 @@ Il vous faudra installer pip, les librairies de développement de python ainsi
 que sqlite3, un moteur de base de données léger et simple d'utilisation. Sous
 Debian et dérivées (Ubuntu, ...) :
 
-    sudo apt-get install python3-pip python3-dev python3-venv sqlite3 libsasl2-dev python-dev-is-python3 libldap2-dev libssl-dev
+    sudo apt-get install python3-pip python3-dev python3-venv sqlite3
 
 Si vous décidez d'utiliser un environnement virtuel Python (virtualenv;
 fortement conseillé), déplacez-vous dans le dossier où est installé GestioCOF
@@ -30,15 +30,7 @@ Pour l'activer, il faut taper
 
     . venv/bin/activate
 
-depuis le même dossier. Pour préparer l'environnement à l'utilisation de `./manage.py`
-(qui permet de faire des tests en local), il faut également taper
-
-    export CREDENTIALS_DIRECTORY=$(realpath .credentials)
-    export DJANGO_SETTINGS_MODULE=gestioasso.settings.local
-    export GESTIOCOF_DEBUG=true
-    export GESTIOCOF_STATIC_ROOT=$(realpath .static)
-    export GESTIOBDS_DEBUG=true
-    export GESTIOBDS_STATIC_ROOT=$(realpath .static)
+depuis le même dossier.
 
 Vous pouvez maintenant installer les dépendances Python depuis le fichier
 `requirements-devel.txt` :

bda/migrations/0019_auto_20240707_1359.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.2.28 on 2024-07-07 11:59
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('bda', '0018_auto_20201021_1818'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='attribution',
-            name='paymenttype',
-            field=models.CharField(blank=True, choices=[('cash', 'Cash'), ('cb', 'CB'), ('cheque', 'Chèque'), ('virement', 'Virement'), ('autre', 'Autre')], max_length=8, verbose_name='Moyen de paiement'),
-        ),
-    ]

bda/migrations/0020_merge_0019_auto_20220630_1245_0019_auto_20240707_1359.py

@@ -1,13 +0,0 @@
-# Generated by Django 4.2.16 on 2025-02-26 08:23
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bda", "0019_auto_20220630_1245"),
-        ("bda", "0019_auto_20240707_1359"),
-    ]
-
-    operations = []

bda/models.py

@@ -151,7 +151,6 @@ PAYMENT_TYPES = (
     ("cash", "Cash"),
     ("cb", "CB"),
     ("cheque", "Chèque"),
-    ("virement", "Virement"),
     ("autre", "Autre"),
 )
 
@@ -164,7 +163,7 @@ class Attribution(models.Model):
     given = models.BooleanField("Donnée", default=False)
     paid = models.BooleanField("Payée", default=False)
     paymenttype = models.CharField(
-        "Moyen de paiement", max_length=8, choices=PAYMENT_TYPES, blank=True
+        "Moyen de paiement", max_length=6, choices=PAYMENT_TYPES, blank=True
     )
 
     def __str__(self):

bda/templates/bda/mails/attributions.txt

@@ -6,24 +6,26 @@ pour les spectacles suivants :
 - 1 place pour {{ place }}{% endfor %}
 
 *Paiement*
-Au burô :
-L'intégralité de ces places de spectacles est à régler dès maintenant, au bureau du COF pendant les heures de permanences (lundi, mardi, jeudi entre 12h et 14h et entre 18h30 et 19h30, mercredi entre 18h30 et 19h30, vendredi entre 12h et 14h). Les places sont à régler AVANT les représentations. Si vous êtes en vacances, vous pourrez venir les régler dès votre retour. Il est demandé à chacun·e de prendre garde à honorer l’ensemble des places qui lui sont attribuées et de s'engager de fait à payer la ou les place(s) qui lui sont attribuées.
-
-Par virements :
-L'intégralité de ces places de spectacles est à régler dès maintenant par virements. Il vous sera demandé d'envoyer une confirmation de l'envoi de virement à bda@ens.fr.
-IBAN AEENS : FR76 4255 9100 0008 0263 8331 927
-Motif de virements : AVR25(ou MAI25)-tirageprintemps-NOM-prénom
-
-Les places sont à régler AVANT les représentations. Il est demandé à chacun·e de prendre garde à honorer l’ensemble des places qui lui sont attribuées et de s'engager de fait à payer la ou les place(s) qui lui sont attribuées.
-Des facilités de paiement sont bien évidemment possibles : nous pouvons ne pas encaisser le chèque immédiatement, ou bien découper votre paiement en deux fois. Pour ceux qui ne pourraient pas venir payer au bureau, merci de nous contacter par mail.
+L'intégralité de ces places de spectacles est à régler dès maintenant et AVANT
+vendredi prochain, au bureau du COF pendant les heures de permanences (du lundi au vendredi
+entre 12h et 14h, et entre 18h et 20h). Des facilités de paiement sont bien
+évidemment possibles : nous pouvons ne pas encaisser le chèque immédiatement,
+ou bien découper votre paiement en deux fois. Pour ceux qui ne pourraient pas
+venir payer au bureau, merci de nous contacter par mail.
 
 *Mode de retrait des places*
-Au moment du paiement, certaines places vous seront remises directement, d'autres seront à récupérer au cours de l'année, d'autres encore seront nominatives et à retirer le soir même dans les théâtres correspondants. Pour chaque spectacle, vous recevrez un mail quelques jours avant la représentation vous indiquant le mode de retrait.
-Nous vous rappelons que l'obtention de places du BdA vous engage à respecter les règles de fonctionnement :
-https://bda.ens.fr/lequipe/charte-bda/
+Au moment du paiement, certaines places vous seront remises directement,
+d'autres seront à récupérer au cours de l'année, d'autres encore seront
+nominatives et à retirer le soir même dans les théâtres correspondants.
+Pour chaque spectacle, vous recevrez un mail quelques jours avant la
+représentation vous indiquant le mode de retrait.
 
-Un système de revente des places via les mails BdA-revente est disponible directement sur votre compte GestioCOF. Pour pouvoir l'utiliser, il faut que vous ayez payé vos places en amont.
+Nous vous rappelons que l'obtention de places du BdA vous engage à
+respecter les règles de fonctionnement :
+https://bda.ens.fr/lequipe/charte-bda/
+Un système de revente des places via les mails BdA-revente est disponible
+directement sur votre compte GestioCOF.
 
 En vous souhaitant de très beaux spectacles tout au long de l'année,
 -- 
-Le Bureau des Arts
+Le Bureau des Arts

bda/templates/bda/resume_places.html

@@ -11,19 +11,9 @@
                 <td>{{place.spectacle.date}}</td>
                 <td>{% if place.double %}deux places{%else%}une place{% endif %}</td>
                 <td>{% if place.spectacle.listing %}sur listing{% else %}place physique{% endif %}</td>
-                <td>
-                  {% if place.unpaid == 0 %}
-                    Payé
-                  {% elif place.unpaid == 1 %}
-                    Une place à payer ({{place.unpaid_price|floatformat}}€)
-                  {% else %}
-                    Deux places à payer ({{place.unpaid_price|floatformat}}€)
-                  {% endif %}
-                </td>
             </tr>
         {% endfor %}
     </table>
-    <h4 class="bda-prix">Reste à payer : {{ unpaid|floatformat }}€</h4>
     <h4 class="bda-prix">Total à payer : {{ total|floatformat }}€</h4>
     <br/>
     <p>Ne manque pas un spectacle avec le

bda/views.py

@@ -114,7 +114,6 @@ def places(request, tirage_id):
         "spectacle__date", "spectacle"
     ).select_related("spectacle", "spectacle__location")
     total = sum(place.spectacle.price for place in places)
-    unpaid = 0
     filtered_places = []
     places_dict = {}
     spectacles = []
@@ -125,8 +124,6 @@ def places(request, tirage_id):
             places_dict[place.spectacle].double = True
         else:
             place.double = False
-            place.unpaid = 0
-            place.unpaid_price = 0
             places_dict[place.spectacle] = place
             spectacles.append(place.spectacle)
             filtered_places.append(place)
@@ -135,12 +132,6 @@ def places(request, tirage_id):
                 warning = True
             else:
                 dates.append(date)
-
-        if not place.paid:
-            unpaid += place.spectacle.price
-            places_dict[place.spectacle].unpaid += 1
-            places_dict[place.spectacle].unpaid_price += place.spectacle.price
-
     # On prévient l'utilisateur s'il a deux places à la même date
     if warning:
         messages.warning(
@@ -156,7 +147,6 @@ def places(request, tirage_id):
             "places": filtered_places,
             "tirage": tirage,
             "total": total,
-            "unpaid": unpaid,
         },
     )
 

bds/urls.py

@@ -1,7 +1,6 @@
 from django.urls import path
 
 from bds import views
-from shared.views import SympaListView
 
 app_name = "bds"
 urlpatterns = [
@@ -22,10 +21,4 @@ urlpatterns = [
         name="members.expired",
     ),
     path("members/reset", views.ResetMembershipView.as_view(), name="members.reset"),
-    # Sympa export view
-    path(
-        "sympa/members/",
-        SympaListView.as_view(filters={"bds__is_member": True}),
-        name="export.sympa",
-    ),
 ]

gestioasso/settings/local.py

@@ -27,9 +27,6 @@ ALLOWED_HOSTS = []
 DEBUG = True
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
-SYMPA_PASSWORD = b"sympa"
-SYMPA_USERNAME = b"sympa"
-
 if TESTING:
     PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 

gestioasso/settings_bds.py

@@ -26,9 +26,6 @@ EMAIL_HOST = credentials.get("EMAIL_HOST")
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
-SYMPA_PASSWORD = credentials["SYMPA_PASSWORD"].encode()
-SYMPA_USERNAME = credentials["SYMPA_USERNAME"].encode()
-
 
 ##
 # Installed Apps configuration

gestioasso/settings_cof.py

@@ -30,9 +30,6 @@ LDAP_SERVER_URL = credentials.get("LDAP_SERVER_URL")
 
 DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
-SYMPA_PASSWORD = credentials["SYMPA_PASSWORD"].encode()
-SYMPA_USERNAME = credentials["SYMPA_USERNAME"].encode()
-
 
 ##
 # Installed Apps configuration
@@ -204,10 +201,7 @@ CHANNEL_LAYERS = credentials.get_json(
     },
 )
 
-ASGI_APPLICATION = "gestioasso.routing.application"
-
-CORS_ALLOWED_ORIGINS = credentials.get("CORS_ALLOWED_ORIGINS", [])
-CSRF_TRUSTED_ORIGINS = [f"https://{host}" for host in ALLOWED_HOSTS]
+CORS_ORIGIN_WHITELIST = credentials.get("CORS_ORIGIN_WHITELIST", [])
 
 
 SITE_ID = 1
@@ -270,7 +264,7 @@ MAIL_DATA = {
         "FROM": "Le BdA <bda@ens.fr>",
         "REPLYTO": "Le BdA <bda@ens.fr>",
     },
-    "kfet": {
+    "rappel_negatif": {
         "FROM": "La K-Fêt <chefs-k-fet@ens.fr>",
         "REPLYTO": "La K-Fêt <chefs-k-fet@ens.fr>",
     },

gestioasso/urls.py

@@ -57,7 +57,6 @@ if settings.DEBUG:
     # Si on est en production, MEDIA_ROOT est servi par Apache.
     # Il faut dire à Django de servir MEDIA_ROOT lui-même en développement.
     urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-    urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
 
 
 # Wagtail URLs (wagtail urls must be last, as catch-all)

gestioncof/admin.py

@@ -130,33 +130,15 @@ class UserProfileAdmin(UserAdmin):
     is_buro.short_description = "Membre du Buro"
     is_buro.boolean = True
 
-    def is_chef(self, obj):
-        try:
-            return obj.profile.is_chef
-        except CofProfile.DoesNotExist:
-            return False
-
-    is_chef.short_description = "Chef K-Fêt"
-    is_chef.boolean = True
-
     def is_cof(self, obj):
         try:
             return obj.profile.is_cof
         except CofProfile.DoesNotExist:
             return False
 
-    is_cof.short_description = "Membre COF"
+    is_cof.short_description = "Membre du COF"
     is_cof.boolean = True
 
-    def is_kfet(self, obj):
-        try:
-            return obj.profile.is_kfet
-        except CofProfile.DoesNotExist:
-            return False
-
-    is_kfet.short_description = "Membre K-Fêt"
-    is_kfet.boolean = True
-
     list_display = UserAdmin.list_display + (
         "profile_phone",
         "profile_occupation",
@@ -164,9 +146,7 @@ class UserProfileAdmin(UserAdmin):
         "profile_mailing_bda",
         "profile_mailing_bda_revente",
         "is_cof",
-        "is_kfet",
         "is_buro",
-        "is_chef",
     )
     list_display_links = ("username", "email", "first_name", "last_name")
     list_filter = UserAdmin.list_filter + (

gestioncof/cms/templates/cofcms/cof_actu_index_page.html

@@ -22,10 +22,10 @@
 
     <section class="actulist">
         {% if actus.has_previous %}
-            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% if key != 'page' %}&amp;{{ key }}={{ value }}{% endif %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
+            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
         {% endif %}
         {% if actus.has_next %}
-            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% if key != 'page' %}&amp;{{ key }}={{ value }}{% endif %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
+            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
         {% endif %}
 
         {% for actu in page.actus %}
@@ -44,10 +44,10 @@
         {% endfor %}
 
         {% if actus.has_previous %}
-            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% if key != 'page' %}&amp;{{ key }}={{ value }}{% endif %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
+            <a class="block prev-actus" href="?page={{ actus.previous_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus récentes" %}</a>
         {% endif %}
         {% if actus.has_next %}
-            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% if key != 'page' %}&amp;{{ key }}={{ value }}{% endif %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
+            <a class="block next-actus" href="?page={{ actus.next_page_number }}{% for key,value in request.GET.items %}{% ifnotequal key 'page' %}&amp;{{ key }}={{ value }}{% endifnotequal %}{% endfor %}">{% trans "Actualités plus anciennes" %}</a>
         {% endif %}
     </section>
 {% endblock %}

gestioncof/cms/views.py

@@ -1,15 +1,12 @@
 from django.shortcuts import render
-from django.views.decorators.clickjacking import xframe_options_sameorigin
 
 from gestioncof.cms.forms import CaptchaForm
 
 
-@xframe_options_sameorigin
 def raw_calendar_view(request, year, month):
     return render(request, "cofcms/calendar_raw.html", {"month": month, "year": year})
 
 
-@xframe_options_sameorigin
 def sympa_captcha_form_view(request):
     if request.method == "POST":
         form = CaptchaForm(request.POST)

gestioncof/decorators.py

@@ -9,7 +9,7 @@ logger = logging.getLogger(__name__)
 
 
 def cof_required(view_func):
-    """Décorateur qui vérifie que l'utilisateur est connecté et membre COF.
+    """Décorateur qui vérifie que l'utilisateur est connecté et membre du COF.
 
     - Si l'utilisteur n'est pas connecté, il est redirigé vers la page de
       connexion
@@ -33,31 +33,6 @@ def cof_required(view_func):
     return login_required(_wrapped_view)
 
 
-def kfet_required(view_func):
-    """Décorateur qui vérifie que l'utilisateur est connecté et membre K-Fêt.
-
-    - Si l'utilisteur n'est pas connecté, il est redirigé vers la page de
-      connexion
-    - Si l'utilisateur est connecté mais pas membre K-Fêt, il obtient une
-      page d'erreur lui demandant de s'inscrire à la K-Fêt
-    """
-
-    def is_kfet(user):
-        try:
-            return user.profile.is_cof or user.profile.is_kfet
-        except AttributeError:
-            return False
-
-    @wraps(view_func)
-    def _wrapped_view(request, *args, **kwargs):
-        if is_kfet(request.user):
-            return view_func(request, *args, **kwargs)
-
-        return render(request, "kfet-denied.html", status=403)
-
-    return login_required(_wrapped_view)
-
-
 def buro_required(view_func):
     """Décorateur qui vérifie que l'utilisateur est connecté et membre du burô.
 
@@ -83,33 +58,6 @@ def buro_required(view_func):
     return login_required(_wrapped_view)
 
 
-def chef_required(view_func):
-    """Décorateur qui vérifie que l'utilisateur est connecté et membre du burô ou chef K-fêt.
-
-    - Si l'utilisateur n'est pas connecté, il est redirigé vers la page de
-      connexion
-    - Si l'utilisateur est connecté mais pas membre du burô ou chef, il obtient une
-      page d'erreur 403 Forbidden
-    """
-
-    def is_chef(user):
-        try:
-            return user.profile.is_chef or user.profile.is_buro
-        except AttributeError:
-            return False
-
-    @wraps(view_func)
-    def _wrapped_view(request, *args, **kwargs):
-        if is_chef(request.user):
-            return view_func(request, *args, **kwargs)
-
-        return render(
-            request, "buro-denied.html", status=403
-        )  # TODO: reservé au burô ou au chef
-
-    return login_required(_wrapped_view)
-
-
 class CofRequiredMixin(PermissionRequiredMixin):
     def has_permission(self):
         if not self.request.user.is_authenticated:
@@ -131,18 +79,3 @@ class BuroRequiredMixin(PermissionRequiredMixin):
                 "L'utilisateur %s n'a pas de profil !", self.request.user.username
             )
             return False
-
-
-class ChefRequiredMixin(PermissionRequiredMixin):
-    def has_permission(self):
-        if not self.request.user.is_authenticated:
-            return False
-        try:
-            return (
-                self.request.user.profile.is_chef or self.request.user.profile.is_buro
-            )
-        except AttributeError:
-            logger.error(
-                "L'utilisateur %s n'a pas de profil !", self.request.user.username
-            )
-            return False

gestioncof/forms.py

@@ -284,7 +284,6 @@ class RegistrationProfileForm(forms.ModelForm):
             "occupation",
             "departement",
             "is_cof",
-            "is_kfet",
             "type_cotiz",
             "mailing_cof",
             "mailing_bda",
@@ -294,19 +293,6 @@ class RegistrationProfileForm(forms.ModelForm):
         ]
 
 
-class RegistrationKFProfileForm(forms.ModelForm):
-    class Meta:
-        model = CofProfile
-        fields = [
-            "login_clipper",
-            "phone",
-            "occupation",
-            "departement",
-            "is_kfet",
-            "comments",
-        ]
-
-
 STATUS_CHOICES = (
     ("no", "Non"),
     ("wait", "Oui mais attente paiement"),
@@ -458,20 +444,3 @@ class GestioncofConfigForm(ConfigForm):
         max_length=2048,
         required=False,
     )
-
-
-# ----
-# Formulaire pour les adhésions self-service
-# ----
-
-
-class SubscribForm(forms.Form):
-    accept_ri = forms.BooleanField(
-        label="Lu et accepte le réglement intérieur de l'AEENS (COF).", required=True
-    )
-    accept_status = forms.BooleanField(
-        label="Lu et accepte les status de l'AEENS (COF).", required=True
-    )
-    accept_charte_kf = forms.BooleanField(
-        label="Lu et accepte la charte de la K-Fêt.", required=True
-    )

gestioncof/migrations/0021_cofprofile_is_kfet_alter_cofprofile_is_cof.py

@@ -1,23 +0,0 @@
-# Generated by Django 4.2.16 on 2024-12-24 10:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("gestioncof", "0020_merge_20241218_2240"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="cofprofile",
-            name="is_kfet",
-            field=models.BooleanField(default=False, verbose_name="Membre K-Fêt"),
-        ),
-        migrations.AlterField(
-            model_name="cofprofile",
-            name="is_cof",
-            field=models.BooleanField(default=False, verbose_name="Membre COF"),
-        ),
-    ]

gestioncof/migrations/0022_rename_cofprofile_date_adhesion_and_more.py

@@ -1,32 +0,0 @@
-# Generated by Django 4.2.16 on 2024-12-30 14:19
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("gestioncof", "0021_cofprofile_is_kfet_alter_cofprofile_is_cof"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="cofprofile",
-            name="date_adhesion",
-            field=models.DateField(
-                blank=True, null=True, verbose_name="Date d'adhésion COF"
-            ),
-        ),
-        migrations.RenameField(
-            model_name="cofprofile",
-            old_name="date_adhesion",
-            new_name="date_adhesion_cof",
-        ),
-        migrations.AddField(
-            model_name="cofprofile",
-            name="date_adhesion_kfet",
-            field=models.DateField(
-                blank=True, null=True, verbose_name="Date d'adhésion K-Fêt"
-            ),
-        ),
-    ]

gestioncof/migrations/0023_cofprofile_is_chef.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.16 on 2025-01-21 10:06
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("gestioncof", "0022_rename_cofprofile_date_adhesion_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="cofprofile",
-            name="is_chef",
-            field=models.BooleanField(default=False, verbose_name="Chef K-Fêt"),
-        ),
-    ]

gestioncof/models.py

@@ -1,13 +1,7 @@
-from datetime import date
-from smtplib import SMTPRecipientsRefused
-
-from django.contrib import messages
 from django.contrib.auth.models import User
-from django.core.mail import send_mail
 from django.db import models
 from django.db.models.signals import post_delete, post_save
 from django.dispatch import receiver
-from django.template import loader
 from django.utils.translation import gettext_lazy as _
 
 from bda.models import Spectacle
@@ -55,12 +49,8 @@ class CofProfile(models.Model):
     login_clipper = models.CharField(
         "Login clipper", max_length=32, blank=True, unique=True, null=True
     )
-    is_cof = models.BooleanField("Membre COF", default=False)
-    is_kfet = models.BooleanField("Membre K-Fêt", default=False)
-    date_adhesion_cof = models.DateField("Date d'adhésion COF", blank=True, null=True)
-    date_adhesion_kfet = models.DateField(
-        "Date d'adhésion K-Fêt", blank=True, null=True
-    )
+    is_cof = models.BooleanField("Membre du COF", default=False)
+    date_adhesion = models.DateField("Date d'adhésion", blank=True, null=True)
     phone = models.CharField("Téléphone", max_length=20, blank=True)
     occupation = models.CharField(
         _("Occupation"),
@@ -85,7 +75,6 @@ class CofProfile(models.Model):
     )
     comments = models.TextField("Commentaires visibles par l'utilisateur", blank=True)
     is_buro = models.BooleanField("Membre du Burô", default=False)
-    is_chef = models.BooleanField("Chef K-Fêt", default=False)
     petits_cours_accept = models.BooleanField(
         "Recevoir des petits cours", default=False
     )
@@ -100,46 +89,6 @@ class CofProfile(models.Model):
     def __str__(self):
         return self.user.username
 
-    def make_adh_cof(self, request, was_cof):
-        if self.is_cof and not was_cof:
-            notify_new_member(request, self.user)
-            self.date_adhesion_cof = date.today()
-            self.save()
-
-    def make_adh_kfet(self, request, was_kfet):
-        if self.is_kfet and not was_kfet:
-            notify_new_member(request, self.user)
-            self.date_adhesion_kfet = date.today()
-            self.save()
-
-
-def notify_new_member(request, member: User):
-    if not member.email:
-        messages.warning(
-            request,
-            "GestioCOF n'a pas d'adresse mail pour {}, ".format(member)
-            + "aucun email de bienvenue n'a été envoyé",
-        )
-        return
-
-    # Try to send a welcome email and report SMTP errors
-    try:
-        send_mail(
-            "Bienvenue au COF",
-            loader.render_to_string(
-                "gestioncof/mails/welcome.txt", context={"member": member}
-            ),
-            "cof@ens.fr",
-            [member.email],
-        )
-    except SMTPRecipientsRefused:
-        messages.error(
-            request,
-            "Error lors de l'envoi de l'email de bienvenue à {} ({})".format(
-                member, member.email
-            ),
-        )
-
 
 @receiver(post_save, sender=User)
 def create_user_profile(sender, instance, created, **kwargs):

gestioncof/static/gestioncof/css/cof.css

@@ -701,9 +701,6 @@ header a:active {
 .user-is-cof {
     color : #ADE297;
 }
-.user-is-kfet {
-    color : #FF8C00;
-}
 .user-is-not-cof {
     color: #EE8585;
 }

gestioncof/templates/cof-denied.html

@@ -1,5 +1,5 @@
 {% extends "base_title.html" %}
 
 {% block realcontent %}
-                <h2>Section réservée aux membres COF -- merci de vous inscrire au COF ou de passer au COF/nous envoyer un mail si vous êtes déjà membre :)</h2>
+                <h2>Section réservée aux membres du COF -- merci de vous inscrire au COF ou de passer au COF/nous envoyer un mail si vous êtes déjà membre :)</h2>
 {% endblock %}

gestioncof/templates/gestioncof/base_header.html

@@ -10,12 +10,10 @@
             {% endblock %}
         </a>
         <div class="secondary">
-            {% if user.is_authenticated %}
             <span class="hidden-xxs">&nbsp;&nbsp;|&nbsp; </span>
             <span><a href="{% url "cof-logout" %}">Se déconnecter&nbsp;<span class="glyphicon glyphicon-log-out"></span></a></span>
-            {% endif %}
         </div>
-        <h2 class="member-status">{%if user.is_authenticated %}{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, {% endif %}{% if user.profile.is_cof %}<tt class="user-is-cof">au COF{% elif user.profile.is_kfet %}<tt class="user-is-kfet">membre K-Fêt{% else %}<tt class="user-is-not-cof">non-COF{% endif %}</tt></h2>
+        <h2 class="member-status">{% if user.first_name %}{{ user.first_name }}{% else %}<tt>{{ user.username }}</tt>{% endif %}, {% if user.profile.is_cof %}<tt class="user-is-cof">au COF{% else %}<tt class="user-is-not-cof">non-COF{% endif %}</tt></h2>
     </div><!-- /.container -->
 </header>
 

gestioncof/templates/gestioncof/carte_kf.html

@@ -1,19 +0,0 @@
-{% extends "base_title.html" %}
-{% load bootstrap %}
-
-{% block page_size %}col-sm-8{%endblock%}
-
-{% block realcontent %}
-  <h2>Pass K-Fêt</h2>
-
-  <center style="font-size: 20pt;">
-    <p>Profil de {{ user.first_name }} {{ user.last_name }}</p>
-  
-    {% if user.profile.is_cof %}
-      <p>Membre COF depuis le {{ user.profile.date_adhesion_cof }}</p>
-    {% else %}
-      <p>Membre K-Fêt depuis le {{ user.profile.date_adhesion_kfet }}</p>
-    {% endif %}
-  </center>
-
-{% endblock %}

gestioncof/templates/gestioncof/home.html

@@ -8,7 +8,7 @@
 <div class="container hidden-xs espace"></div>
 <div class="container">
     <div class="home-menu row">
-        <div class="{% if user.profile.is_buro or user.profile.is_chef %}col-sm-6 {% else %}col-sm-8 col-sm-offset-2 col-xs-12 {%endif%}normal-user-hm">
+        <div class="{% if user.profile.is_buro %}col-sm-6 {% else %}col-sm-8 col-sm-offset-2 col-xs-12 {%endif%}normal-user-hm">
             {% if open_surveys %}
             <h3 class="block-title">Sondages en cours<span class="pull-right glyphicon glyphicon-stats"></span></h3>
             <div class="hm-block">
@@ -50,10 +50,7 @@
                 <ul>
                     {# TODO: Since Django 1.9, we can store result with "as", allowing proper value management (if None) #}
                     <li><a href="{% slugurl "k-fet" %}">Page d'accueil</a></li>
-                    {% if user.profile.is_cof or user.profile.is_kfet %}
-                    <li><a href="{% url "profile.carte" %}">Carte K-Fêt</a></li>
-                    {% endif %}
-                    <li><a href="https://cof.ens.fr/k-fet/le-calendrier/">Calendrier</a></li>
+                    <li><a href="https://cof.ens.fr/gestion/k-fet/le-calendrier/">Calendrier</a></li>
                     {% if perms.kfet.is_team %}
                     <li><a href="{% url 'kfet.kpsul' %}">K-Psul</a></li>
                     {% endif %}
@@ -71,23 +68,9 @@
                 {% if not user.profile.login_clipper %}
                   <li><a href="{% url "password_change" %}">Changer mon mot de passe</a></li>
                 {% endif %}
-                {% if not user.profile.is_cof and not user.profile.is_kfet %}
-                  <li><a href="{% url "self.kf_registration" %}">Adhérer à la K-Fêt</a></li>
-                {% endif %}
               </ul>
             </div>
         </div>
-        {% if user.profile.is_chef and not user.profile.is_buro %}
-        <div class="col-sm-6 buro-user-hm">
-            <h3 class="block-title">Administration<span class="pull-right glyphicon glyphicon-cog"></span></h3>
-            <div class="hm-block">
-                <ul>
-                    <h4>Général</h4>
-                    <li><a href="{% url "registration" %}">Inscription d'un nouveau membre</a></li>
-                </ul>
-            </div>
-        </div>
-        {% endif %}
         {% if user.profile.is_buro %}
         <div class="col-sm-6 buro-user-hm">
             <h3 class="block-title">Administration<span class="pull-right glyphicon glyphicon-cog"></span></h3>
@@ -132,7 +115,7 @@
                 <ul>
                     <li><a href="{% url "utile_cof" %}">Liens utiles du COF</a></li>
                     <li><a href="{% url "utile_bda" %}">Liens utiles BdA</a></li>
-                    <li><a href="{% url "reset_comptes" %}">Remise à zéro adhérent⋅e⋅s COF</a></li>
+                    <li><a href="{% url "reset_comptes" %}">Remise à zéro adhérents COF</a></li>
                 </ul>
             </div>
         </div>

gestioncof/templates/gestioncof/mails/welcome.txt

@@ -1,11 +1,11 @@
 Bonjour {{ member.first_name }} et bienvenue au COF !
 
-Tu trouveras plein de trucs cool sur le site du COF : https://cof.ens.fr/ et notre compte instagram : https://www.instagram.com/cof_ulm
+Tu trouveras plein de trucs cool sur le site du COF : https://cof.ens.fr/ et notre page Facebook : https://www.facebook.com/cof.ulm
 Et n'oublie pas d'aller découvrir GestioCOF, la plateforme de gestion du COF !
-Si tu as des questions, tu peux nous envoyer un mail à cof@ens.fr (on aime le spam), ou passer nous voir au Burô près de la Courô les lundi, mardi, jeudi et vendredi de 12h à 14h et du lundi au jeudi de 18h30 à 19h30.
+Si tu as des questions, tu peux nous envoyer un mail à cof@ens.fr (on aime le spam), ou passer nous voir au Burô près de la Courô du lundi au vendredi de 12h à 14h et de 18h à 20h.
 
-Retrouvez tout les évènements organisés par le COF et ses clubs ici : https://calendrier.dgnum.eu/.
+Retrouvez les évènements de rentrée pour les conscrit.e.s et les vieux/vieilles organisés par le COF et ses clubs ici :  https://cof.ens.fr/planningrentree.
 
 Amicalement,
 
-Ton COF qui t'aime.
+Ton COF qui t'aime.

gestioncof/templates/gestioncof/registration_kf_form.html

@@ -1,21 +0,0 @@
-{% load bootstrap %}
-
-    {% if login_clipper %}
-        <h3>Inscription associée au compte clipper <tt>{{ login_clipper }}</tt></h3>
-    {% elif member %}
-        <h3>Inscription du compte GestioCOF existant <tt>{{ member.username }}</tt></h3>
-    {% else %}
-        <h3>Inscription d'un nouveau compte (extérieur ?)</h3>
-    {% endif %}
-    <form role="form" id="profile" method="post" action="{% url 'registration' %}">
-        {% csrf_token %}
-        <table>
-            {{ user_form | bootstrap }}
-            {{ profile_form | bootstrap }}
-        </table>
-	<hr />
-        {% if login_clipper or member %}
-            <input type="hidden" name="user_exists" value="1" />
-        {% endif %}
-        <input type="submit" class="btn btn-primary pull-right" value="Enregistrer l'inscription" />
-    </form>

gestioncof/templates/gestioncof/registration_kf_post.html

@@ -1,8 +0,0 @@
-{% extends "base_title.html" %}
-
-{% block realcontent %}
-        <h2>Inscription d'un nouveau membre</h2>
-        <div id="form-placeholder">
-        {% include "gestioncof/registration_kf_form.html" %}
-        </div>
-{% endblock %}

gestioncof/templates/gestioncof/self_registration.html

@@ -1,28 +0,0 @@
-{% extends "base_title.html" %}
-{% load static %}
-
-{% block page_size %}col-sm-8{% endblock %}
-
-{% load bootstrap %}
-
-{% block realcontent %}
-
-    {% if member %}
-        <h3>Inscription K-Fêt du compte GestioCOF existant <tt>{{ member.username }}</tt></h3>
-    {% else %}
-        <h3>Inscription K-Fêt d'un nouveau compte (extérieur ?)</h3>
-    {% endif %}
-    <form role="form" id="profile" method="post" action="{% url 'self.kf_registration' %}">
-        {% csrf_token %}
-        <table>
-            {{ user_form | bootstrap }}
-            {{ profile_form | bootstrap }}
-            {{ agreement_form | bootstrap }}
-        </table>
-	<hr />
-        {% if login_clipper or member %}
-            <input type="hidden" name="user_exists" value="1" />
-        {% endif %}
-        <input type="submit" class="btn btn-primary pull-right" value="Adhérer" />
-    </form>
-{% endblock %}

gestioncof/templates/kfet-denied.html

@@ -1,5 +0,0 @@
-{% extends "base_title.html" %}
-
-{% block realcontent %}
-                <h2>Section réservée aux membres K-Fêt -- merci de vous inscrire au COF ou de passer au COF/nous envoyer un mail si vous êtes déjà membre :)</h2>
-{% endblock %}

gestioncof/tests/test_views.py

@@ -486,7 +486,7 @@ class ExportMembersViewTests(CSVResponseMixin, ViewTestCaseMixin, TestCase):
         u1.last_name = "last"
         u1.email = "user@mail.net"
         u1.save()
-        u1.profile.date_adhesion_cof = date(2023, 5, 22)
+        u1.profile.date_adhesion = date(2023, 5, 22)
         u1.profile.phone = "0123456789"
         u1.profile.departement = "Dept"
         u1.profile.save()

gestioncof/urls.py

@@ -4,16 +4,6 @@ from django.views.generic.base import TemplateView
 from django_cas_ng import views as django_cas_views
 
 from gestioncof import csv_views, views
-from shared.views import SympaListView
-
-sympa_patterns = [
-    path(
-        f"{mailing}/",
-        SympaListView.as_view(filters={f"profile__mailing_{mailing}": True}),
-        name=f"sympa.{mailing}",
-    )
-    for mailing in ["bda", "bda_revente", "cof", "unernestaparis"]
-]
 
 export_patterns = [
     path("members", views.export_members, name="export.members"),
@@ -80,7 +70,6 @@ registration_patterns = [
         views.RegistrationAutocompleteView.as_view(),
         name="cof.registration.autocomplete",
     ),
-    path("self_kf", views.self_kf_registration, name="self.kf_registration"),
 ]
 
 urlpatterns = [
@@ -100,7 +89,6 @@ urlpatterns = [
         name="cof-user-autocomplete",
     ),
     path("config", views.ConfigUpdate.as_view(), name="config.edit"),
-    path("carte", views.carte_kf, name="profile.carte"),
     # -----
     # Authentification
     # -----
@@ -174,8 +162,4 @@ urlpatterns = [
     # Clubs
     # -----
     path("clubs/", include(clubs_patterns)),
-    # -----
-    # Sympa export
-    # -----
-    path("sympa/", include(sympa_patterns)),
 ]

gestioncof/views.py

@@ -1,6 +1,7 @@
 import csv
 import uuid
-from datetime import timedelta
+from datetime import date, timedelta
+from smtplib import SMTPRecipientsRefused
 from urllib.parse import parse_qs, urlencode, urlparse, urlunparse
 
 from django.contrib import messages
@@ -13,10 +14,11 @@ from django.contrib.auth.views import (
     redirect_to_login,
 )
 from django.contrib.sites.models import Site
-from django.db.models import Q
+from django.core.mail import send_mail
 from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django.shortcuts import get_object_or_404, redirect, render
-from django.urls import reverse, reverse_lazy
+from django.template import loader
+from django.urls import reverse_lazy
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import FormView, TemplateView
@@ -25,14 +27,7 @@ from icalendar import Calendar, Event as Vevent
 
 from bda.models import Spectacle, Tirage
 from gestioncof.autocomplete import cof_autocomplete
-from gestioncof.decorators import (
-    BuroRequiredMixin,
-    ChefRequiredMixin,
-    buro_required,
-    chef_required,
-    cof_required,
-    kfet_required,
-)
+from gestioncof.decorators import BuroRequiredMixin, buro_required, cof_required
 from gestioncof.forms import (
     CalendarForm,
     ClubsForm,
@@ -43,11 +38,9 @@ from gestioncof.forms import (
     GestioncofConfigForm,
     PhoneForm,
     ProfileForm,
-    RegistrationKFProfileForm,
     RegistrationPassUserForm,
     RegistrationProfileForm,
     RegistrationUserForm,
-    SubscribForm,
     SurveyForm,
     SurveyStatusFilterForm,
     UserForm,
@@ -93,9 +86,7 @@ class ResetComptes(BuroRequiredMixin, TemplateView):
         nb_adherents = CofProfile.objects.filter(is_cof=True).count()
         CofProfile.objects.update(
             is_cof=False,
-            is_kfet=False,
-            date_adhesion_cof=None,
-            date_adhesion_kfet=None,
+            date_adhesion=None,
             mailing_cof=False,
             mailing_bda=False,
             mailing_bda_revente=False,
@@ -430,20 +421,13 @@ def profile(request):
     return render(request, "gestioncof/profile.html", context)
 
 
-@kfet_required
-def carte_kf(request):
-    user = request.user
-    return render(request, "gestioncof/carte_kf.html", {"user": user})
-
-
 def registration_set_ro_fields(user_form, profile_form):
     user_form.fields["username"].widget.attrs["readonly"] = True
     profile_form.fields["login_clipper"].widget.attrs["readonly"] = True
 
 
-@chef_required
+@buro_required
 def registration_form2(request, login_clipper=None, username=None, fullname=None):
-    is_buro = request.user.profile.is_buro
     events = Event.objects.filter(old=False).all()
     member = None
     if login_clipper:
@@ -465,84 +449,85 @@ def registration_form2(request, login_clipper=None, username=None, fullname=None
                 user_form.fields["first_name"].initial = bits[0]
                 if len(bits) > 1:
                     user_form.fields["last_name"].initial = " ".join(bits[1:])
-            if is_buro:
-                # profile
-                profile_form = RegistrationProfileForm(
-                    initial={"login_clipper": login_clipper}
-                )
-                # events & clubs
-                event_formset = EventFormset(events=events, prefix="events")
-                clubs_form = ClubsForm()
-            else:
-                profile_form = RegistrationKFProfileForm(
-                    initial={"login_clipper": login_clipper}
-                )
-
+            # profile
+            profile_form = RegistrationProfileForm(
+                initial={"login_clipper": login_clipper}
+            )
             registration_set_ro_fields(user_form, profile_form)
+            # events & clubs
+            event_formset = EventFormset(events=events, prefix="events")
+            clubs_form = ClubsForm()
     if username:
         member = get_object_or_404(User, username=username)
         (profile, _) = CofProfile.objects.get_or_create(user=member)
         # already existing, prefill
         user_form = RegistrationUserForm(instance=member)
-        if is_buro:
-            profile_form = RegistrationProfileForm(instance=profile)
-            # events
-            current_registrations = []
-            for event in events:
-                try:
-                    current_registrations.append(
-                        EventRegistration.objects.get(user=member, event=event)
-                    )
-                except EventRegistration.DoesNotExist:
-                    current_registrations.append(None)
-            event_formset = EventFormset(
-                events=events,
-                prefix="events",
-                current_registrations=current_registrations,
-            )
-            # Clubs
-            clubs_form = ClubsForm(initial={"clubs": member.clubs.all()})
-        else:
-            profile_form = RegistrationKFProfileForm(instance=profile)
+        profile_form = RegistrationProfileForm(instance=profile)
         registration_set_ro_fields(user_form, profile_form)
+        # events
+        current_registrations = []
+        for event in events:
+            try:
+                current_registrations.append(
+                    EventRegistration.objects.get(user=member, event=event)
+                )
+            except EventRegistration.DoesNotExist:
+                current_registrations.append(None)
+        event_formset = EventFormset(
+            events=events, prefix="events", current_registrations=current_registrations
+        )
+        # Clubs
+        clubs_form = ClubsForm(initial={"clubs": member.clubs.all()})
     elif not login_clipper:
         # new user
         user_form = RegistrationPassUserForm()
-        if is_buro:
-            profile_form = RegistrationProfileForm()
-            event_formset = EventFormset(events=events, prefix="events")
-            clubs_form = ClubsForm()
-        else:
-            profile_form = RegistrationKFProfileForm()
-    if is_buro:
-        return render(
+        profile_form = RegistrationProfileForm()
+        event_formset = EventFormset(events=events, prefix="events")
+        clubs_form = ClubsForm()
+    return render(
+        request,
+        "gestioncof/registration_form.html",
+        {
+            "member": member,
+            "login_clipper": login_clipper,
+            "user_form": user_form,
+            "profile_form": profile_form,
+            "event_formset": event_formset,
+            "clubs_form": clubs_form,
+        },
+    )
+
+
+def notify_new_member(request, member: User):
+    if not member.email:
+        messages.warning(
             request,
-            "gestioncof/registration_form.html",
-            {
-                "member": member,
-                "login_clipper": login_clipper,
-                "user_form": user_form,
-                "profile_form": profile_form,
-                "event_formset": event_formset,
-                "clubs_form": clubs_form,
-            },
+            "GestioCOF n'a pas d'adresse mail pour {}, ".format(member)
+            + "aucun email de bienvenue n'a été envoyé",
         )
-    else:
-        return render(
+        return
+
+    # Try to send a welcome email and report SMTP errors
+    try:
+        send_mail(
+            "Bienvenue au COF",
+            loader.render_to_string(
+                "gestioncof/mails/welcome.txt", context={"member": member}
+            ),
+            "cof@ens.fr",
+            [member.email],
+        )
+    except SMTPRecipientsRefused:
+        messages.error(
             request,
-            "gestioncof/registration_kf_form.html",
-            {
-                "member": member,
-                "login_clipper": login_clipper,
-                "user_form": user_form,
-                "profile_form": profile_form,
-            },
+            "Error lors de l'envoi de l'email de bienvenue à {} ({})".format(
+                member, member.email
+            ),
         )
 
 
-@chef_required
+@buro_required
 def registration(request):
-    is_buro = request.user.profile.is_buro
     if request.POST:
         request_dict = request.POST.copy()
         member = None
@@ -556,15 +541,10 @@ def registration(request):
             user_form = RegistrationPassUserForm(request_dict)
         else:
             user_form = RegistrationUserForm(request_dict)
-        if is_buro:
-            profile_form = RegistrationProfileForm(request_dict)
-            clubs_form = ClubsForm(request_dict)
-            events = Event.objects.filter(old=False).all()
-            event_formset = EventFormset(
-                events=events, data=request_dict, prefix="events"
-            )
-        else:
-            profile_form = RegistrationKFProfileForm(request_dict)
+        profile_form = RegistrationProfileForm(request_dict)
+        clubs_form = ClubsForm(request_dict)
+        events = Event.objects.filter(old=False).all()
+        event_formset = EventFormset(events=events, data=request_dict, prefix="events")
         if "user_exists" in request_dict and request_dict["user_exists"]:
             username = request_dict["username"]
             try:
@@ -585,72 +565,63 @@ def registration(request):
             member = user_form.save()
             profile, _ = CofProfile.objects.get_or_create(user=member)
             was_cof = profile.is_cof
-            was_kfet = profile.is_kfet
             # Maintenant on remplit le formulaire de profil
-            if is_buro:
-                profile_form = RegistrationProfileForm(request_dict, instance=profile)
-            else:
-                profile_form = RegistrationKFProfileForm(request_dict, instance=profile)
-            if profile_form.is_valid() and (
-                not is_buro or (event_formset.is_valid() and clubs_form.is_valid())
+            profile_form = RegistrationProfileForm(request_dict, instance=profile)
+            if (
+                profile_form.is_valid()
+                and event_formset.is_valid()
+                and clubs_form.is_valid()
             ):
                 # Enregistrement du profil
                 profile = profile_form.save()
-                if is_buro:
-                    if profile.is_cof:
-                        profile.make_adh_cof(request, was_cof)
+                if profile.is_cof and not was_cof:
+                    notify_new_member(request, member)
+                    profile.date_adhesion = date.today()
+                    profile.save()
 
-                if profile.is_kfet:
-                    profile.make_adh_kfet(request, was_kfet)
-
-                if is_buro:
-                    # Enregistrement des inscriptions aux événements
-                    for form in event_formset:
-                        if "status" not in form.cleaned_data:
-                            form.cleaned_data["status"] = "no"
-                        if form.cleaned_data["status"] == "no":
-                            try:
-                                current_registration = EventRegistration.objects.get(
-                                    user=member, event=form.event
-                                )
-                                current_registration.delete()
-                            except EventRegistration.DoesNotExist:
-                                pass
-                            continue
-                        all_choices = get_event_form_choices(form.event, form)
-                        (
-                            current_registration,
-                            created_reg,
-                        ) = EventRegistration.objects.get_or_create(
-                            user=member, event=form.event
-                        )
-                        update_event_form_comments(
-                            form.event, form, current_registration
-                        )
-                        current_registration.options.set(all_choices)
-                        current_registration.paid = (
-                            form.cleaned_data["status"] == "paid"
-                        )
-                        current_registration.save()
-                        # if form.event.title == "Mega 15" and created_reg:
-                        #     field = EventCommentField.objects.get(
-                        #         event=form.event, name="Commentaires")
-                        #     try:
-                        #         comments = EventCommentValue.objects.get(
-                        #             commentfield=field,
-                        #             registration=current_registration).content
-                        #     except EventCommentValue.DoesNotExist:
-                        #         comments = field.default
-                        #     FIXME : il faut faire quelque chose de propre ici,
-                        #     par exemple écrire un mail générique pour
-                        #     l'inscription aux événements et/ou donner la
-                        #     possibilité d'associer un mail aux événements
-                        #     send_custom_mail(...)
-                    # Enregistrement des inscriptions aux clubs
-                    member.clubs.clear()
-                    for club in clubs_form.cleaned_data["clubs"]:
-                        club.membres.add(member)
-                        club.save()
+                # Enregistrement des inscriptions aux événements
+                for form in event_formset:
+                    if "status" not in form.cleaned_data:
+                        form.cleaned_data["status"] = "no"
+                    if form.cleaned_data["status"] == "no":
+                        try:
+                            current_registration = EventRegistration.objects.get(
+                                user=member, event=form.event
+                            )
+                            current_registration.delete()
+                        except EventRegistration.DoesNotExist:
+                            pass
+                        continue
+                    all_choices = get_event_form_choices(form.event, form)
+                    (
+                        current_registration,
+                        created_reg,
+                    ) = EventRegistration.objects.get_or_create(
+                        user=member, event=form.event
+                    )
+                    update_event_form_comments(form.event, form, current_registration)
+                    current_registration.options.set(all_choices)
+                    current_registration.paid = form.cleaned_data["status"] == "paid"
+                    current_registration.save()
+                    # if form.event.title == "Mega 15" and created_reg:
+                    #     field = EventCommentField.objects.get(
+                    #         event=form.event, name="Commentaires")
+                    #     try:
+                    #         comments = EventCommentValue.objects.get(
+                    #             commentfield=field,
+                    #             registration=current_registration).content
+                    #     except EventCommentValue.DoesNotExist:
+                    #         comments = field.default
+                    #     FIXME : il faut faire quelque chose de propre ici,
+                    #     par exemple écrire un mail générique pour
+                    #     l'inscription aux événements et/ou donner la
+                    #     possibilité d'associer un mail aux événements
+                    #     send_custom_mail(...)
+                # Enregistrement des inscriptions aux clubs
+                member.clubs.clear()
+                for club in clubs_form.cleaned_data["clubs"]:
+                    club.membres.add(member)
+                    club.save()
 
                 # ---
                 # Success
@@ -662,91 +633,27 @@ def registration(request):
                         member.get_full_name(), member.email
                     )
                 )
-                if is_buro and profile.is_cof:
+                if profile.is_cof:
                     msg += "\nIl est désormais membre du COF n°{:d} !".format(
                         member.profile.id
                     )
                 messages.success(request, msg, extra_tags="safe")
-        if is_buro:
-            return render(
-                request,
-                "gestioncof/registration_post.html",
-                {
-                    "user_form": user_form,
-                    "profile_form": profile_form,
-                    "member": member,
-                    "login_clipper": login_clipper,
-                    "event_formset": event_formset,
-                    "clubs_form": clubs_form,
-                },
-            )
-        else:
-            return render(
-                request,
-                "gestioncof/registration_kf_post.html",
-                {
-                    "user_form": user_form,
-                    "profile_form": profile_form,
-                    "member": member,
-                    "login_clipper": login_clipper,
-                },
-            )
+        return render(
+            request,
+            "gestioncof/registration_post.html",
+            {
+                "user_form": user_form,
+                "profile_form": profile_form,
+                "member": member,
+                "login_clipper": login_clipper,
+                "event_formset": event_formset,
+                "clubs_form": clubs_form,
+            },
+        )
     else:
         return render(request, "registration.html")
 
 
-# TODO: without login
-@login_required
-def self_kf_registration(request):
-    member = request.user
-    (profile, _) = CofProfile.objects.get_or_create(user=member)
-
-    if profile.is_kfet or profile.is_cof:
-        msg = "Vous êtes déjà adhérent du COF !"
-        messages.success(request, msg)
-        response = HttpResponse(content="", status=303)
-        response["Location"] = reverse("profile")
-        return response
-
-    was_kfet = profile.is_kfet
-    if request.POST:
-        user_form = RegistrationUserForm(request.POST, instance=member)
-        profile_form = PhoneForm(request.POST, instance=profile)
-        agreement_form = SubscribForm(request.POST)
-        if (
-            user_form.is_valid()
-            and profile_form.is_valid()
-            and agreement_form.is_valid()
-        ):
-            member = user_form.save()
-            profile = profile_form.save()
-            profile.is_kfet = True
-            profile.save()
-            profile.make_adh_kfet(request, was_kfet)
-
-            msg = "Votre adhésion a été enregistrée avec succès."
-            messages.success(request, msg, extra_tags="safe")
-            response = HttpResponse(content="", status=303)
-            response["Location"] = reverse("profile")
-            return response
-    else:
-        user_form = RegistrationUserForm(instance=member)
-        profile_form = PhoneForm(instance=profile)
-        agreement_form = SubscribForm()
-
-    user_form.fields["username"].widget.attrs["readonly"] = True
-    return render(
-        request,
-        "gestioncof/self_registration.html",
-        {
-            "user_form": user_form,
-            "profile_form": profile_form,
-            "agreement_form": agreement_form,
-            "member": member,
-        },
-    )
-
-
 # -----
 # Clubs
 # -----
@@ -800,7 +707,7 @@ def export_members(request):
     response["Content-Disposition"] = "attachment; filename=membres_cof.csv"
 
     writer = csv.writer(response)
-    for profile in CofProfile.objects.filter(Q(is_cof=True) | Q(is_kfet=True)).all():
+    for profile in CofProfile.objects.filter(is_cof=True).all():
         user = profile.user
         bits = [
             user.id,
@@ -811,10 +718,8 @@ def export_members(request):
             profile.phone,
             profile.occupation,
             profile.departement,
-            "COF" if profile.is_cof else "K-Fêt",
             profile.type_cotiz,
-            profile.date_adhesion_cof,
-            profile.date_adhesion_kfet,
+            profile.date_adhesion,
         ]
         writer.writerow([str(bit) for bit in bits])
 
@@ -1070,6 +975,6 @@ class UserAutocompleteView(BuroRequiredMixin, Select2QuerySetView):
     search_fields = ("username", "first_name", "last_name")
 
 
-class RegistrationAutocompleteView(ChefRequiredMixin, AutocompleteView):
+class RegistrationAutocompleteView(BuroRequiredMixin, AutocompleteView):
     template_name = "gestioncof/search_results.html"
     search_composer = cof_autocomplete

kfet/config.py

@@ -1,5 +1,4 @@
 import djconfig
-from asgiref.sync import sync_to_async
 from django.core.exceptions import ValidationError
 from django.db import models
 
@@ -24,7 +23,7 @@ class KFetConfig(object):
         # Note it should be called only once across requests, if you use
         # kfet_config instance below.
         if not self._conf_init:
-            sync_to_async(djconfig.reload_maybe)()
+            djconfig.reload_maybe()
             self._conf_init = True
 
     def __getattr__(self, key):

kfet/forms.py

@@ -118,11 +118,7 @@ class AccountForm(forms.ModelForm):
     class Meta:
         model = Account
         fields = ["trigramme", "promo", "nickname"]
-        widgets = {
-            "trigramme": forms.TextInput(
-                attrs={"autocomplete": "off", "class": "trigramme_field"}
-            )
-        }
+        widgets = {"trigramme": forms.TextInput(attrs={"autocomplete": "off"})}
 
 
 class AccountBalanceForm(forms.ModelForm):
@@ -195,13 +191,7 @@ class CofForm(forms.ModelForm):
 
     class Meta:
         model = CofProfile
-        fields = ["login_clipper", "is_cof", "is_kfet", "departement"]
-
-
-class CofKFForm(forms.ModelForm):
-    class Meta:
-        model = CofProfile
-        fields = ["is_kfet"]
+        fields = ["login_clipper", "is_cof", "departement"]
 
 
 class UserForm(forms.ModelForm):
@@ -356,7 +346,6 @@ class ArticleForm(forms.ModelForm):
         fields = [
             "name",
             "is_sold",
-            "no_exte",
             "hidden",
             "price",
             "stock",
@@ -371,7 +360,6 @@ class ArticleRestrictForm(ArticleForm):
         fields = [
             "name",
             "is_sold",
-            "no_exte",
             "hidden",
             "price",
             "category",
@@ -416,11 +404,7 @@ class KPsulAccountForm(forms.ModelForm):
         fields = ["trigramme"]
         widgets = {
             "trigramme": forms.TextInput(
-                attrs={
-                    "autocomplete": "off",
-                    "spellcheck": "false",
-                    "class": "trigramme_field",
-                }
+                attrs={"autocomplete": "off", "spellcheck": "false"}
             )
         }
 
@@ -666,7 +650,7 @@ class OrderArticleForm(forms.Form):
             self.v_moy = kwargs["initial"]["v_moy"]
             self.v_et = kwargs["initial"]["v_et"]
             self.v_prev = kwargs["initial"]["v_prev"]
-            self.c_rec_1w = kwargs["initial"]["c_rec_1w"]
+            self.c_rec = kwargs["initial"]["c_rec"]
             self.is_sold = kwargs["initial"]["is_sold"]
 
 

kfet/migrations/0081_article_no_exte.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.16 on 2025-01-06 16:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("kfet", "0080_accountnegative_last_rappel"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="article",
-            name="no_exte",
-            field=models.BooleanField(
-                default=False, verbose_name="Réservé au adhérents"
-            ),
-        ),
-    ]

kfet/migrations/0082_alter_operation_options.py

@@ -1,34 +0,0 @@
-# Generated by Django 4.2.16 on 2025-01-18 10:01
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("kfet", "0081_article_no_exte"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="operation",
-            options={
-                "permissions": (
-                    ("perform_deposit", "Effectuer une charge"),
-                    (
-                        "perform_negative_operations",
-                        "Enregistrer des commandes en négatif",
-                    ),
-                    (
-                        "perform_liq_reserved",
-                        "Effectuer une opération réservé aux adhérents sur LIQ",
-                    ),
-                    ("cancel_old_operations", "Annuler des commandes non récentes"),
-                    (
-                        "perform_commented_operations",
-                        "Enregistrer des commandes avec commentaires",
-                    ),
-                )
-            },
-        ),
-    ]

kfet/migrations/0083_operationgroup_is_kfet.py

@@ -1,18 +0,0 @@
-# Generated by Django 4.2.16 on 2025-03-18 10:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("kfet", "0082_alter_operation_options"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="operationgroup",
-            name="is_kfet",
-            field=models.BooleanField(default=False),
-        ),
-    ]

kfet/migrations/0084_alter_account_options.py

@@ -1,37 +0,0 @@
-# Generated by Django 4.2.16 on 2025-05-03 21:26
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("kfet", "0083_operationgroup_is_kfet"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="account",
-            options={
-                "permissions": (
-                    ("is_team", "Is part of the team"),
-                    ("change_adh", "Gérer les adhésions K-Fêt"),
-                    ("manage_perms", "Gérer les permissions K-Fêt"),
-                    ("manage_addcosts", "Gérer les majorations"),
-                    ("edit_balance_account", "Modifier la balance d'un compte"),
-                    (
-                        "change_account_password",
-                        "Modifier le mot de passe d'une personne de l'équipe",
-                    ),
-                    (
-                        "special_add_account",
-                        "Créer un compte avec une balance initiale",
-                    ),
-                    ("can_force_close", "Fermer manuellement la K-Fêt"),
-                    ("see_config", "Voir la configuration K-Fêt"),
-                    ("change_config", "Modifier la configuration K-Fêt"),
-                    ("access_old_history", "Peut accéder à l'historique plus ancien"),
-                )
-            },
-        ),
-    ]

kfet/migrations/0085_alter_operation_options_alter_article_no_exte.py

@@ -1,41 +0,0 @@
-# Generated by Django 4.2.16 on 2025-05-12 10:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("kfet", "0084_alter_account_options"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="operation",
-            options={
-                "permissions": (
-                    ("perform_deposit", "Effectuer une charge"),
-                    (
-                        "perform_negative_operations",
-                        "Enregistrer des commandes en négatif",
-                    ),
-                    (
-                        "perform_liq_reserved",
-                        "Effectuer une opération réservé aux adhérent⋅e⋅s sur LIQ",
-                    ),
-                    ("cancel_old_operations", "Annuler des commandes non récentes"),
-                    (
-                        "perform_commented_operations",
-                        "Enregistrer des commandes avec commentaires",
-                    ),
-                )
-            },
-        ),
-        migrations.AlterField(
-            model_name="article",
-            name="no_exte",
-            field=models.BooleanField(
-                default=False, verbose_name="Réservé au adhérent⋅e⋅s"
-            ),
-        ),
-    ]

kfet/models.py

@@ -73,7 +73,6 @@ class Account(models.Model):
     class Meta:
         permissions = (
             ("is_team", "Is part of the team"),
-            ("change_adh", "Gérer les adhésions K-Fêt"),
             ("manage_perms", "Gérer les permissions K-Fêt"),
             ("manage_addcosts", "Gérer les majorations"),
             ("edit_balance_account", "Modifier la balance d'un compte"),
@@ -120,10 +119,6 @@ class Account(models.Model):
     def is_cof(self):
         return self.cofprofile.is_cof
 
-    @property
-    def is_kfet(self):
-        return self.cofprofile.is_kfet
-
     # Propriétés supplémentaires
     @property
     def balance_ukf(self):
@@ -499,7 +494,6 @@ class ArticleCategory(models.Model):
 class Article(models.Model):
     name = models.CharField("nom", max_length=45)
     is_sold = models.BooleanField("en vente", default=True)
-    no_exte = models.BooleanField("Réservé au adhérent⋅e⋅s", default=False)
     hidden = models.BooleanField(
         "caché",
         default=False,
@@ -688,7 +682,6 @@ class OperationGroup(models.Model):
     at = models.DateTimeField(default=timezone.now)
     amount = models.DecimalField(max_digits=6, decimal_places=2, default=0)
     is_cof = models.BooleanField(default=False)
-    is_kfet = models.BooleanField(default=False)
     # Optional
     comment = models.CharField(max_length=255, blank=True, default="")
     valid_by = models.ForeignKey(
@@ -761,10 +754,6 @@ class Operation(models.Model):
         permissions = (
             ("perform_deposit", "Effectuer une charge"),
             ("perform_negative_operations", "Enregistrer des commandes en négatif"),
-            (
-                "perform_liq_reserved",
-                "Effectuer une opération réservé aux adhérent⋅e⋅s sur LIQ",
-            ),
             ("cancel_old_operations", "Annuler des commandes non récentes"),
             (
                 "perform_commented_operations",

kfet/open/consumers.py

@@ -1,5 +1,3 @@
-from asgiref.sync import sync_to_async
-
 from ..decorators import kfet_is_team
 from ..utils import DjangoJsonWebsocketConsumer, PermConsumerMixin
 from .open import kfet_open
@@ -21,7 +19,7 @@ class OpenKfetConsumer(PermConsumerMixin, DjangoJsonWebsocketConsumer):
         """Send current status on connect."""
         await super().connect()
 
-        group = "team" if await sync_to_async(kfet_is_team)(self.user) else "base"
+        group = "team" if kfet_is_team(self.user) else "base"
 
         await self.channel_layer.group_add(f"kfet.open.{group}", self.channel_name)
 

kfet/open/static/kfetopen/kfet-open.js

@@ -3,22 +3,20 @@ var OpenWS = new KfetWebsocket({
 });
 
 var OpenKfet = function (force_close_url, admin) {
-    that = this;
-    $( function() {
-        that.force_close_url = force_close_url;
-        that.admin = admin;
+    this.force_close_url = force_close_url;
+    this.admin = admin;
 
-        that.status = that.UNKNOWN;
-        that.dom = {
-            status_text: $('.kfetopen .status-text'),
-            force_close_btn: $('.kfetopen .force-close-btn'),
-            warning: $('.kfetopen .warning')
-        }
+    this.status = this.UNKNOWN;
+    this.dom = {
+        status_text: $('.kfetopen .status-text'),
+        force_close_btn: $('.kfetopen .force-close-btn'),
+        warning: $('.kfetopen .warning')
+    }
+
+    this.dom.force_close_btn.click(() => this.toggle_force_close());
+    setInterval(() => this.refresh(), this.refresh_interval * 1000);
+    OpenWS.add_handler(data => this.refresh(data));
 
-        that.dom.force_close_btn.click(() => that.toggle_force_close());
-        setInterval(() => that.refresh(), that.refresh_interval * 1000);
-        OpenWS.add_handler(data => that.refresh(data));
-    });
 };
 
 OpenKfet.prototype = {
@@ -51,8 +49,6 @@ OpenKfet.prototype = {
         deactivate: "Réouvrir la K-Fêt"
     },
 
-    callbacks: [ ],
-
     get is_recent() {
         return this.last_update && moment().diff(this.last_update, 'minute') <= this.time_unknown;
     },
@@ -73,9 +69,6 @@ OpenKfet.prototype = {
 
         this.add_class(status);
         this.dom.status_text.html(this.status_text[status]);
-        for (callback of this.callbacks) {
-            callback(status);
-        }
 
         // admin specific
         if (this.admin) {
@@ -116,9 +109,5 @@ OpenKfet.prototype = {
 
     add_class: function (status) {
         $(this.target).addClass(this.class_prefix + status);
-    },
-
-    add_callback: function (callback) {
-        this.callbacks.push(callback);
     }
 };

kfet/open/templates/kfetopen/indicator.html

@@ -1,89 +0,0 @@
-{% extends 'kfet/base.html' %}
-{% load static %}
-
-{% block extra_head %}
-<script type="text/javascript">
-  kfet_open.add_callback(function(status) {
-    const div = document.getElementById("main");
-    switch (status) {
-      case "opened":
-        div.className = "green";
-        document.title = "🟢 Ouvert | K-Fêt";
-        break;
-      case "closed":
-        div.className = "red";
-        document.title = "🔴 Fermé | K-Fêt";
-        break;
-      default:
-        div.className = "orange";
-        document.title = "🟠 Indéfini | K-Fêt";
-    }
-  });
-</script>
-<style>
-#main {
-  margin: 0;
-  padding: 0;
-  text-align: center;
-  font-weight: bold;
-  font-size: min(15vw, 0.75*(100vh - 50px));
-  display: flex;
-  justify-content: center;
-  align-content: center;
-  flex-direction: column;
-  position: absolute;
-  left: 0px;
-  width: 100vw;
-  top: 50px;
-  bottom: 0;
-}
-
-.red {
-  background-color: red;
-  color: white;
-}
-
-.orange {
-  background-color: orange;
-  color: black;
-}
-
-
-.green {
-  background-color: green;
-  color: white;
-}
-
-#main > p {
-  overflow: hidden;
-  display: none;
-}
-
-.orange > #orange {
-  display: block;
-}
-
-.green > #green {
-  display: block;
-}
-
-.red > #red {
-  display: block;
-}
-</style>
-{% endblock %}
-
-{% block title %}Indicateur{% endblock %}
-
-{% block header %}{% endblock %}
-{% block help %}{% endblock %}
-
-{% block content %}
-
-<div id="main" class="orange">
-  <p id="orange">Non défini</p>
-  <p id="red">Fermé</p>
-  <p id="green">Ouvert</p>
-</div>
-
-{% endblock %}

kfet/open/templates/kfetopen/init.html

@@ -4,8 +4,10 @@
 <script type="text/javascript" src="{% static "kfetopen/kfet-open.js" %}"></script>
 
 <script type="text/javascript">
-kfet_open = new OpenKfet(
-    "{% url "kfet.open.edit_force_close" %}",
-    {{ perms.kfet.is_team|yesno:"true,false" }}
-);
+$( function() {
+    kfet_open = new OpenKfet(
+        "{% url "kfet.open.edit_force_close" %}",
+        {{ perms.kfet.is_team|yesno:"true,false" }}
+    );
+});
 </script>

kfet/open/urls.py

@@ -5,5 +5,4 @@ from . import views
 urlpatterns = [
     path("raw_open", views.raw_open, name="kfet.open.edit_raw_open"),
     path("force_close", views.force_close, name="kfet.open.edit_force_close"),
-    path("", views.indicator, name="kfet.open.indicator"),
 ]

kfet/open/views.py

@@ -3,7 +3,6 @@ from django.conf import settings
 from django.contrib.auth.decorators import permission_required
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponse
-from django.shortcuts import render
 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.http import require_POST
 
@@ -31,10 +30,3 @@ def force_close(request):
     kfet_open.force_close = force_close
     async_to_sync(kfet_open.send_ws)()
     return HttpResponse()
-
-
-def indicator(request):
-    return render(
-        request,
-        "kfetopen/indicator.html",
-    )

kfet/static/kfet/js/account.js

@@ -5,7 +5,6 @@ var Account = Backbone.Model.extend({
         'name': '',
         'email': '',
         'is_cof': '',
-        'is_kfet': '',
         'promo': '',
         'balance': '',
         'is_frozen': false,
@@ -70,7 +69,7 @@ var AccountView = Backbone.View.extend({
     },
 
     get_is_cof: function () {
-        return this.model.get("is_cof") ? 'Membre COF' : (this.model.get("is_kfet") ? 'Membre K-Fêt' : 'Non-COF');
+        return this.model.get("is_cof") ? 'COF' : 'Non-COF';
     },
 
     get_balance: function () {
@@ -92,7 +91,7 @@ var AccountView = Backbone.View.extend({
     },
 
     get_buttons: function () {
-        var url = django_urls["kfet.account.read"](encodeURIComponent(this.model.get("trigramme")));
+        var url = django_urls["kfet.account.read"](this.model.get("trigramme"));
 
         return `<a href="${url}" class="btn btn-primary" target="_blank" title="Modifier"><span class="glyphicon glyphicon-cog"></span></a>`;
     },
@@ -143,4 +142,4 @@ var EmptyAccountView = AccountView.extend({
 
         return buttons
     }
-})
+})

kfet/static/kfet/js/kfet.js

@@ -3,12 +3,12 @@
  */
 
 String.prototype.format_trigramme = function () {
-    return _.toArray(this.toUpperCase()).splice(0,3).join('');
+    return this.toUpperCase().substr(0, 3)
 }
 
 String.prototype.is_valid_trigramme = function () {
-    var arr = _.toArray(this);
-    return arr && arr.length == 3;
+    var pattern = /^[^a-z]{3}$/;
+    return pattern.test(this);
 }
 
 

kfet/static/kfet/vendor/lodash.min.js

@@ -1,117 +0,0 @@
-/**
- * @license
- * lodash 4.0.0 (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
- * Build: `lodash -o ./dist/lodash.js`
- */
-;(function(){function n(n,t){return n.set(t[0],t[1]),n}function t(n,t){return n.add(t),n}function r(n,t,r){switch(r?r.length:0){case 0:return n.call(t);case 1:return n.call(t,r[0]);case 2:return n.call(t,r[0],r[1]);case 3:return n.call(t,r[0],r[1],r[2])}return n.apply(t,r)}function e(n,t){for(var r=-1,e=n.length;++r<e&&false!==t(n[r],r,n););return n}function u(n,t){for(var r=-1,e=n.length;++r<e;)if(!t(n[r],r,n))return false;return true}function o(n,t){for(var r=-1,e=n.length,u=-1,o=[];++r<e;){var i=n[r];t(i,r,n)&&(o[++u]=i);
-}return o}function i(n,t){return!!n.length&&-1<v(n,t,0)}function f(n,t,r){for(var e=-1,u=n.length;++e<u;)if(r(t,n[e]))return true;return false}function c(n,t){for(var r=-1,e=n.length,u=Array(e);++r<e;)u[r]=t(n[r],r,n);return u}function a(n,t){for(var r=-1,e=t.length,u=n.length;++r<e;)n[u+r]=t[r];return n}function l(n,t,r,e){var u=-1,o=n.length;for(e&&o&&(r=n[++u]);++u<o;)r=t(r,n[u],u,n);return r}function s(n,t,r,e){var u=n.length;for(e&&u&&(r=n[--u]);u--;)r=t(r,n[u],u,n);return r}function h(n,t){for(var r=-1,e=n.length;++r<e;)if(t(n[r],r,n))return true;
-return false}function p(n,t,r){for(var e=-1,u=n.length;++e<u;){var o=n[e],i=t(o);if(null!=i&&(f===Z?i===i:r(i,f)))var f=i,c=o}return c}function _(n,t,r,e){var u;return r(n,function(n,r,o){return t(n,r,o)?(u=e?r:n,false):void 0}),u}function g(n,t,r){for(var e=n.length,u=r?e:-1;r?u--:++u<e;)if(t(n[u],u,n))return u;return-1}function v(n,t,r){if(t!==t)return W(n,r);--r;for(var e=n.length;++r<e;)if(n[r]===t)return r;return-1}function d(n,t,r,e,u){return u(n,function(n,u,o){r=e?(e=false,n):t(r,n,u,o)}),r}function y(n,t){
-var r=n.length;for(n.sort(t);r--;)n[r]=n[r].c;return n}function b(n,t){for(var r,e=-1,u=n.length;++e<u;){var o=t(n[e]);o!==Z&&(r=r===Z?o:r+o)}return r}function x(n,t){for(var r=-1,e=Array(n);++r<n;)e[r]=t(r);return e}function m(n,t){return c(t,function(t){return[t,n[t]]})}function j(n){return function(t){return n(t)}}function w(n,t){return c(t,function(t){return n[t]})}function A(n,t){for(var r=-1,e=n.length;++r<e&&-1<v(t,n[r],0););return r}function O(n,t){for(var r=n.length;r--&&-1<v(t,n[r],0););
-return r}function E(n){return n&&n.Object===Object?n:null}function k(n,t){if(n!==t){var r=null===n,e=n===Z,u=n===n,o=null===t,i=t===Z,f=t===t;if(n>t&&!o||!u||r&&!i&&f||e&&f)return 1;if(t>n&&!r||!f||o&&!e&&u||i&&u)return-1}return 0}function I(n){return Un[n]}function R(n){return zn[n]}function S(n){return"\\"+$n[n]}function W(n,t,r){var e=n.length;for(t+=r?0:-1;r?t--:++t<e;){var u=n[t];if(u!==u)return t}return-1}function C(n){var t=false;if(null!=n&&typeof n.toString!="function")try{t=!!(n+"")}catch(r){}
-return t}function U(n,t){return n=typeof n=="number"||dn.test(n)?+n:-1,n>-1&&0==n%1&&(null==t?9007199254740991:t)>n}function z(n){for(var t,r=[];!(t=n.next()).done;)r.push(t.value);return r}function B(n){var t=-1,r=Array(n.size);return n.forEach(function(n,e){r[++t]=[e,n]}),r}function L(n,t){for(var r=-1,e=n.length,u=-1,o=[];++r<e;)n[r]===t&&(n[r]="__lodash_placeholder__",o[++u]=r);return o}function $(n){var t=-1,r=Array(n.size);return n.forEach(function(n){r[++t]=n}),r}function F(n){if(!n||!En.test(n))return n.length;
-for(var t=On.lastIndex=0;On.test(n);)t++;return t}function M(n){return Bn[n]}function N(E){function dn(n){if(_e(n)&&!Wo(n)&&!(n instanceof wn)){if(n instanceof jn)return n;if(tu.call(n,"__wrapped__"))return Br(n)}return new jn(n)}function mn(){}function jn(n,t){this.__wrapped__=n,this.__actions__=[],this.__chain__=!!t,this.__index__=0,this.__values__=Z}function wn(n){this.__wrapped__=n,this.__actions__=[],this.__dir__=1,this.__filtered__=false,this.__iteratees__=[],this.__takeCount__=4294967295,this.__views__=[];
-}function Un(){}function zn(n){var t=-1,r=n?n.length:0;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Bn(n){var t=-1,r=n?n.length:0;for(this.__data__=new zn;++t<r;)this.push(n[t])}function Ln(n,t){var r=n.__data__;return kr(t)?(r=r.__data__,"__lodash_hash_undefined__"===(typeof t=="string"?r.string:r.hash)[t]):r.has(t)}function $n(n){var t=-1,r=n?n.length:0;for(this.clear();++t<r;){var e=n[t];this.set(e[0],e[1])}}function Nn(n,t){var r=Dn(n,t);return 0>r?false:(r==n.length-1?n.pop():du.call(n,r,1),
-!0)}function Zn(n,t){var r=Dn(n,t);return 0>r?Z:n[r][1]}function Dn(n,t){for(var r=n.length;r--;)if(ue(n[r][0],t))return r;return-1}function qn(n,t,r){var e=Dn(n,t);0>e?n.push([t,r]):n[e][1]=r}function Pn(n,t,r,e){return n===Z||ue(n,Xe[r])&&!tu.call(e,r)?t:n}function Tn(n,t,r){(r!==Z&&!ue(n[t],r)||typeof t=="number"&&r===Z&&!(t in n))&&(n[t]=r)}function Vn(n,t,r){var e=n[t];(!ue(e,r)||ue(e,Xe[t])&&!tu.call(n,t)||r===Z&&!(t in n))&&(n[t]=r)}function Jn(n,t){return n&&Tt(t,Ce(t),n)}function Yn(n,t){
-for(var r=-1,e=null==n,u=t.length,o=Array(u);++r<u;)o[r]=e?Z:Re(n,t[r]);return o}function Hn(n,t,r){return n===n&&(r!==Z&&(n=n>r?r:n),t!==Z&&(n=t>n?t:n)),n}function Qn(n,t,r,u,o,i){var f;if(r&&(f=o?r(n,u,o,i):r(n)),f!==Z)return f;if(!pe(n))return n;if(u=Wo(n)){if(f=mr(n),!t)return Pt(n,f)}else{var c=br(n),a="[object Function]"==c||"[object GeneratorFunction]"==c;if("[object Object]"!=c&&"[object Arguments]"!=c&&(!a||o))return Cn[c]?wr(n,c,t):o?n:{};if(C(n))return o?n:{};if(f=jr(a?{}:n),!t)return Gt(n,Jn(f,n));
-}return i||(i=new $n),(o=i.get(n))?o:(i.set(n,f),(u?e:it)(n,function(e,u){Vn(f,u,Qn(e,t,r,u,n,i))}),u?f:Gt(n,f))}function Xn(n){var t=Ce(n),r=t.length;return function(e){if(null==e)return!r;for(var u=r;u--;){var o=t[u],i=n[o],f=e[o];if(f===Z&&!(o in Object(e))||!i(f))return false}return true}}function nt(n,t,r){if(typeof n!="function")throw new He("Expected a function");return vu(function(){n.apply(Z,r)},t)}function tt(n,t,r,e){var u=-1,o=i,a=true,l=n.length,s=[],h=t.length;if(!l)return s;r&&(t=c(t,j(r))),
-e?(o=f,a=false):t.length>=200&&(o=Ln,a=false,t=new Bn(t));n:for(;++u<l;){var p=n[u],_=r?r(p):p;if(a&&_===_){for(var g=h;g--;)if(t[g]===_)continue n;s.push(p)}else o(t,_,e)||s.push(p)}return s}function rt(n,t){var r=true;return Nu(n,function(n,e,u){return r=!!t(n,e,u)}),r}function et(n,t){var r=[];return Nu(n,function(n,e,u){t(n,e,u)&&r.push(n)}),r}function ut(n,t,r,e){e||(e=[]);for(var u=-1,o=n.length;++u<o;){var i=n[u];ce(i)&&(r||Wo(i)||ie(i))?t?ut(i,t,r,e):a(e,i):r||(e[e.length]=i)}return e}function ot(n,t){
-null==n||Du(n,t,Ue)}function it(n,t){return n&&Du(n,t,Ce)}function ft(n,t){return n&&qu(n,t,Ce)}function ct(n,t){return o(t,function(t){return le(n[t])})}function at(n,t){t=Er(t,n)?[t+""]:Lt(t);for(var r=0,e=t.length;null!=n&&e>r;)n=n[t[r++]];return r&&r==e?n:Z}function lt(n,t){return tu.call(n,t)||typeof n=="object"&&t in n&&null===hu(n)}function st(n,t){return t in Object(n)}function ht(n,t,r){for(var e=r?f:i,u=n.length,o=u,a=Array(u),l=[];o--;){var s=n[o];o&&t&&(s=c(s,j(t))),a[o]=r||!t&&120>s.length?Z:new Bn(o&&s);
-}var s=n[0],h=-1,p=s.length,_=a[0];n:for(;++h<p;){var g=s[h],v=t?t(g):g;if(_?!Ln(_,v):!e(l,v,r)){for(o=u;--o;){var d=a[o];if(d?!Ln(d,v):!e(n[o],v,r))continue n}_&&_.push(v),l.push(g)}}return l}function pt(n,t,e){return Er(t,n)||(t=Lt(t),n=Wr(n,t),t=Mr(t)),t=null==n?n:n[t],null==t?Z:r(t,n,e)}function _t(n,t,r,e,u){if(n===t)n=true;else if(null==n||null==t||!pe(n)&&!_e(t))n=n!==n&&t!==t;else n:{var o=Wo(n),i=Wo(t),f="[object Array]",c="[object Array]";o||(f=br(n),"[object Arguments]"==f?f="[object Object]":"[object Object]"!=f&&(o=me(n))),
-i||(c=br(t),"[object Arguments]"==c?c="[object Object]":"[object Object]"!=c&&me(t));var a="[object Object]"==f&&!C(n),i="[object Object]"==c&&!C(t),c=f==c;if(!c||o||a){if(!(2&e)&&(f=a&&tu.call(n,"__wrapped__"),i=i&&tu.call(t,"__wrapped__"),f||i)){n=_t(f?n.value():n,i?t.value():t,r,e,u);break n}c?(u||(u=new $n),n=(o?hr:_r)(n,t,_t,r,e,u)):n=false}else n=pr(n,t,f,_t,r,e)}return n}function gt(n,t,r,e){var u=r.length,o=u,i=!e;if(null==n)return!o;for(n=Object(n);u--;){var f=r[u];if(i&&f[2]?f[1]!==n[f[0]]:!(f[0]in n))return false;
-}for(;++u<o;){var f=r[u],c=f[0],a=n[c],l=f[1];if(i&&f[2]){if(a===Z&&!(c in n))return false}else if(f=new $n,c=e?e(a,l,c,n,t,f):Z,c===Z?!_t(l,a,e,3,f):!c)return false}return true}function vt(n){var t=typeof n;return"function"==t?n:null==n?Ne:"object"==t?Wo(n)?xt(n[0],n[1]):bt(n):Te(n)}function dt(n){n=null==n?n:Object(n);var t,r=[];for(t in n)r.push(t);return r}function yt(n,t){var r=-1,e=fe(n)?Array(n.length):[];return Nu(n,function(n,u,o){e[++r]=t(n,u,o)}),e}function bt(n){var t=dr(n);if(1==t.length&&t[0][2]){
-var r=t[0][0],e=t[0][1];return function(n){return null==n?false:n[r]===e&&(e!==Z||r in Object(n))}}return function(r){return r===n||gt(r,n,t)}}function xt(n,t){return function(r){var e=Re(r,n);return e===Z&&e===t?We(r,n):_t(t,e,Z,3)}}function mt(n,t,r,u){if(n!==t){var o=Wo(t)||me(t)?Z:Ue(t);e(o||t,function(e,i){if(o&&(i=e,e=t[i]),pe(e)){u||(u=new $n);var f=i,c=u,a=n[f],l=t[f],s=c.get(l)||c.get(a);if(s)Tn(n,f,s);else{var s=r?r(a,l,f+"",n,t,c):Z,h=s===Z;h&&(s=l,Wo(l)||me(l)?s=Wo(a)?a:ce(a)?Pt(a):Qn(l):de(l)||ie(l)?s=ie(a)?ke(a):pe(a)?a:Qn(l):h=le(l)),
-c.set(l,s),h&&mt(s,l,r,c),Tn(n,f,s)}}else f=r?r(n[i],e,i+"",n,t,u):Z,f===Z&&(f=e),Tn(n,i,f)})}}function jt(n,t,r){var e=-1,u=vr();return t=c(t.length?t:Array(1),function(n){return u(n)}),n=yt(n,function(n){return{a:c(t,function(t){return t(n)}),b:++e,c:n}}),y(n,function(n,t){var e;n:{e=-1;for(var u=n.a,o=t.a,i=u.length,f=r.length;++e<i;){var c=k(u[e],o[e]);if(c){e=f>e?c*("desc"==r[e]?-1:1):c;break n}}e=n.b-t.b}return e})}function wt(n,t){return n=Object(n),l(t,function(t,r){return r in n&&(t[r]=n[r]),
-t},{})}function At(n,t){var r={};return ot(n,function(n,e){t(n)&&(r[e]=n)}),r}function Ot(n){return function(t){return null==t?Z:t[n]}}function Et(n){return function(t){return at(t,n)}}function kt(n,t,r){var e=-1,u=t.length,o=n;for(r&&(o=c(n,function(n){return r(n)}));++e<u;)for(var i=0,f=t[e],f=r?r(f):f;-1<(i=v(o,f,i));)o!==n&&du.call(o,i,1),du.call(n,i,1);return n}function It(n,t){for(var r=n?t.length:0,e=r-1;r--;){var u=t[r];if(e==r||u!=o){var o=u;if(U(u))du.call(n,u,1);else if(Er(u,n))delete n[u];else{
-var u=Lt(u),i=Wr(n,u);null!=i&&delete i[Mr(u)]}}}}function Rt(n,t){return n+bu(Eu()*(t-n+1))}function St(n,t,r,e){t=Er(t,n)?[t+""]:Lt(t);for(var u=-1,o=t.length,i=o-1,f=n;null!=f&&++u<o;){var c=t[u];if(pe(f)){var a=r;if(u!=i){var l=f[c],a=e?e(l,c,f):Z;a===Z&&(a=null==l?U(t[u+1])?[]:{}:l)}Vn(f,c,a)}f=f[c]}return n}function Wt(n,t,r){var e=-1,u=n.length;for(0>t&&(t=-t>u?0:u+t),r=r>u?u:r,0>r&&(r+=u),u=t>r?0:r-t>>>0,t>>>=0,r=Array(u);++e<u;)r[e]=n[e+t];return r}function Ct(n,t){var r;return Nu(n,function(n,e,u){
-return r=t(n,e,u),!r}),!!r}function Ut(n,t,r){var e=0,u=n?n.length:e;if(typeof t=="number"&&t===t&&2147483647>=u){for(;u>e;){var o=e+u>>>1,i=n[o];(r?t>=i:t>i)&&null!==i?e=o+1:u=o}return u}return zt(n,t,Ne,r)}function zt(n,t,r,e){t=r(t);for(var u=0,o=n?n.length:0,i=t!==t,f=null===t,c=t===Z;o>u;){var a=bu((u+o)/2),l=r(n[a]),s=l!==Z,h=l===l;(i?h||e:f?h&&s&&(e||null!=l):c?h&&(e||s):null==l?0:e?t>=l:t>l)?u=a+1:o=a}return Au(o,4294967294)}function Bt(n,t){for(var r=0,e=n.length,u=n[0],o=t?t(u):u,i=o,f=0,c=[u];++r<e;)u=n[r],
-o=t?t(u):u,ue(o,i)||(i=o,c[++f]=u);return c}function Lt(n){return Wo(n)?n:Cr(n)}function $t(n,t,r){var e=-1,u=i,o=n.length,c=true,a=[],l=a;if(r)c=false,u=f;else if(o<200)l=t?[]:a;else{if(u=t?null:Tu(n))return $(u);c=false,u=Ln,l=new Bn}n:for(;++e<o;){var s=n[e],h=t?t(s):s;if(c&&h===h){for(var p=l.length;p--;)if(l[p]===h)continue n;t&&l.push(h),a.push(s)}else u(l,h,r)||(l!==a&&l.push(h),a.push(s))}return a}function Ft(n,t,r,e){for(var u=n.length,o=e?u:-1;(e?o--:++o<u)&&t(n[o],o,n););return r?Wt(n,e?0:o,e?o+1:u):Wt(n,e?o+1:0,e?u:o);
-}function Mt(n,t){var r=n;return r instanceof wn&&(r=r.value()),l(t,function(n,t){return t.func.apply(t.thisArg,a([n],t.args))},r)}function Nt(n,t,r){for(var e=-1,u=n.length;++e<u;)var o=o?a(tt(o,n[e],t,r),tt(n[e],o,t,r)):n[e];return o&&o.length?$t(o,t,r):[]}function Zt(n){var t=new n.constructor(n.byteLength);return new au(t).set(new au(n)),t}function Dt(n,t,r){for(var e=r.length,u=-1,o=wu(n.length-e,0),i=-1,f=t.length,c=Array(f+o);++i<f;)c[i]=t[i];for(;++u<e;)c[r[u]]=n[u];for(;o--;)c[i++]=n[u++];
-return c}function qt(n,t,r){for(var e=-1,u=r.length,o=-1,i=wu(n.length-u,0),f=-1,c=t.length,a=Array(i+c);++o<i;)a[o]=n[o];for(i=o;++f<c;)a[i+f]=t[f];for(;++e<u;)a[i+r[e]]=n[o++];return a}function Pt(n,t){var r=-1,e=n.length;for(t||(t=Array(e));++r<e;)t[r]=n[r];return t}function Tt(n,t,r){return Kt(n,t,r)}function Kt(n,t,r,e){r||(r={});for(var u=-1,o=t.length;++u<o;){var i=t[u],f=e?e(r[i],n[i],i,r,n):n[i];Vn(r,i,f)}return r}function Gt(n,t){return Tt(n,Vu(n),t)}function Vt(n,t){return function(r,e){
-var u=t?t():{};if(e=vr(e),Wo(r))for(var o=-1,i=r.length;++o<i;){var f=r[o];n(u,f,e(f),r)}else Nu(r,function(t,r,o){n(u,t,e(t),o)});return u}}function Jt(n){return ee(function(t,r){var e=-1,u=r.length,o=u>1?r[u-1]:Z,i=u>2?r[2]:Z,o=typeof o=="function"?(u--,o):Z;for(i&&Or(r[0],r[1],i)&&(o=3>u?Z:o,u=1),t=Object(t);++e<u;)(i=r[e])&&n(t,i,o);return t})}function Yt(n,t){return function(r,e){if(null==r)return r;if(!fe(r))return n(r,e);for(var u=r.length,o=t?u:-1,i=Object(r);(t?o--:++o<u)&&false!==e(i[o],o,i););
-return r}}function Ht(n){return function(t,r,e){var u=-1,o=Object(t);e=e(t);for(var i=e.length;i--;){var f=e[n?i:++u];if(false===r(o[f],f,o))break}return t}}function Qt(n,t,r){function e(){return(this&&this!==Kn&&this instanceof e?o:n).apply(u?r:this,arguments)}var u=1&t,o=tr(n);return e}function Xt(n){return function(t){t=Ie(t);var r=En.test(t)?t.match(On):Z,e=r?r[0]:t.charAt(0);return t=r?r.slice(1).join(""):t.slice(1),e[n]()+t}}function nr(n){return function(t){return l(Me($e(t)),n,"")}}function tr(n){
-return function(){var t=arguments;switch(t.length){case 0:return new n;case 1:return new n(t[0]);case 2:return new n(t[0],t[1]);case 3:return new n(t[0],t[1],t[2]);case 4:return new n(t[0],t[1],t[2],t[3]);case 5:return new n(t[0],t[1],t[2],t[3],t[4]);case 6:return new n(t[0],t[1],t[2],t[3],t[4],t[5]);case 7:return new n(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}var r=Mu(n.prototype),t=n.apply(r,t);return pe(t)?t:r}}function rr(n,t,e){function u(){for(var i=arguments.length,f=i,c=Array(i),a=this&&this!==Kn&&this instanceof u?o:n,l=u.placeholder;f--;)c[f]=arguments[f];
-return f=3>i&&c[0]!==l&&c[i-1]!==l?[]:L(c,l),i-=f.length,e>i?ar(n,t,ur,l,Z,c,f,Z,Z,e-i):r(a,this,c)}var o=tr(n);return u}function er(n){return ee(function(t){t=ut(t);var r=t.length,e=r,u=jn.prototype.thru;for(n&&t.reverse();e--;){var o=t[e];if(typeof o!="function")throw new He("Expected a function");if(u&&!i&&"wrapper"==gr(o))var i=new jn([],true)}for(e=i?e:r;++e<r;)var o=t[e],u=gr(o),f="wrapper"==u?Ku(o):Z,i=f&&Ir(f[0])&&424==f[1]&&!f[4].length&&1==f[9]?i[gr(f[0])].apply(i,f[3]):1==o.length&&Ir(o)?i[u]():i.thru(o);
-return function(){var n=arguments,e=n[0];if(i&&1==n.length&&Wo(e)&&e.length>=200)return i.plant(e).value();for(var u=0,n=r?t[u].apply(this,n):e;++u<r;)n=t[u].call(this,n);return n}})}function ur(n,t,r,e,u,o,i,f,c,a){function l(){for(var y=arguments.length,b=y,x=Array(y);b--;)x[b]=arguments[b];if(e&&(x=Dt(x,e,u)),o&&(x=qt(x,o,i)),_||g){var b=l.placeholder,m=L(x,b),y=y-m.length;if(a>y)return ar(n,t,ur,b,r,x,m,f,c,a-y)}if(y=h?r:this,b=p?y[n]:n,f)for(var m=x.length,j=Au(f.length,m),w=Pt(x);j--;){var A=f[j];
-x[j]=U(A,m)?w[A]:Z}else v&&x.length>1&&x.reverse();return s&&x.length>c&&(x.length=c),this&&this!==Kn&&this instanceof l&&(b=d||tr(b)),b.apply(y,x)}var s=128&t,h=1&t,p=2&t,_=8&t,g=16&t,v=512&t,d=p?Z:tr(n);return l}function or(n){return ee(function(t){return t=c(ut(t),vr()),ee(function(e){var u=this;return n(t,function(n){return r(n,u,e)})})})}function ir(n,t,r){return t=Ae(t),n=F(n),t&&t>n?(t-=n,r=r===Z?" ":r+"",n=Fe(r,yu(t/F(r))),En.test(r)?n.match(On).slice(0,t).join(""):n.slice(0,t)):""}function fr(n,t,e,u){
-function o(){for(var t=-1,c=arguments.length,a=-1,l=u.length,s=Array(l+c),h=this&&this!==Kn&&this instanceof o?f:n;++a<l;)s[a]=u[a];for(;c--;)s[a++]=arguments[++t];return r(h,i?e:this,s)}var i=1&t,f=tr(n);return o}function cr(n){return function(t,r,e){e&&typeof e!="number"&&Or(t,r,e)&&(r=e=Z),t=Ee(t),t=t===t?t:0,r===Z?(r=t,t=0):r=Ee(r)||0,e=e===Z?r>t?1:-1:Ee(e)||0;var u=-1;r=wu(yu((r-t)/(e||1)),0);for(var o=Array(r);r--;)o[n?r:++u]=t,t+=e;return o}}function ar(n,t,r,e,u,o,i,f,c,a){var l=8&t;f=f?Pt(f):Z;
-var s=l?i:Z;i=l?Z:i;var h=l?o:Z;return o=l?Z:o,t=(t|(l?32:64))&~(l?64:32),4&t||(t&=-4),t=[n,t,u,h,s,o,i,f,c,a],r=r.apply(Z,t),Ir(n)&&Ju(r,t),r.placeholder=e,r}function lr(n){var t=Je[n];return function(n,r){if(n=Ee(n),r=Ae(r)){var e=(Ie(n)+"e").split("e"),e=t(e[0]+"e"+(+e[1]+r)),e=(Ie(e)+"e").split("e");return+(e[0]+"e"+(+e[1]-r))}return t(n)}}function sr(n,t,r,e,u,o,i,f){var c=2&t;if(!c&&typeof n!="function")throw new He("Expected a function");var a=e?e.length:0;if(a||(t&=-97,e=u=Z),i=i===Z?i:wu(Ae(i),0),
-f=f===Z?f:Ae(f),a-=u?u.length:0,64&t){var l=e,s=u;e=u=Z}var h=c?Z:Ku(n);return o=[n,t,r,e,u,l,s,o,i,f],h&&(r=o[1],n=h[1],t=r|n,e=128==n&&8==r||128==n&&256==r&&h[8]>=o[7].length||384==n&&h[8]>=h[7].length&&8==r,131>t||e)&&(1&n&&(o[2]=h[2],t|=1&r?0:4),(r=h[3])&&(e=o[3],o[3]=e?Dt(e,r,h[4]):Pt(r),o[4]=e?L(o[3],"__lodash_placeholder__"):Pt(h[4])),(r=h[5])&&(e=o[5],o[5]=e?qt(e,r,h[6]):Pt(r),o[6]=e?L(o[5],"__lodash_placeholder__"):Pt(h[6])),(r=h[7])&&(o[7]=Pt(r)),128&n&&(o[8]=null==o[8]?h[8]:Au(o[8],h[8])),
-null==o[9]&&(o[9]=h[9]),o[0]=h[0],o[1]=t),n=o[0],t=o[1],r=o[2],e=o[3],u=o[4],f=o[9]=null==o[9]?c?0:n.length:wu(o[9]-a,0),!f&&24&t&&(t&=-25),(h?Pu:Ju)(t&&1!=t?8==t||16==t?rr(n,t,f):32!=t&&33!=t||u.length?ur.apply(Z,o):fr(n,t,r,e):Qt(n,t,r),o)}function hr(n,t,r,e,u,o){var i=-1,f=2&u,c=1&u,a=n.length,l=t.length;if(!(a==l||f&&l>a))return false;if(l=o.get(n))return l==t;for(l=true,o.set(n,t);++i<a;){var s=n[i],p=t[i];if(e)var _=f?e(p,s,i,t,n,o):e(s,p,i,n,t,o);if(_!==Z){if(_)continue;l=false;break}if(c){if(!h(t,function(n){
-return s===n||r(s,n,e,u,o)})){l=false;break}}else if(s!==p&&!r(s,p,e,u,o)){l=false;break}}return o["delete"](n),l}function pr(n,t,r,e,u,o){switch(r){case"[object ArrayBuffer]":if(n.byteLength!=t.byteLength||!e(new au(n),new au(t)))break;return true;case"[object Boolean]":case"[object Date]":return+n==+t;case"[object Error]":return n.name==t.name&&n.message==t.message;case"[object Number]":return n!=+n?t!=+t:n==+t;case"[object RegExp]":case"[object String]":return n==t+"";case"[object Map]":var i=B;case"[object Set]":
-return i||(i=$),(2&o||n.size==t.size)&&e(i(n),i(t),u,1|o);case"[object Symbol]":return!!fu&&Lu.call(n)==Lu.call(t)}return false}function _r(n,t,r,e,u,o){var i=2&u,f=1&u,c=Ce(n),a=c.length,l=Ce(t);if(a!=l.length&&!i)return false;for(var s=a;s--;){var h=c[s];if(!(i?h in t:lt(t,h))||!f&&h!=l[s])return false}if(h=o.get(n))return h==t;for(f=true,o.set(n,t),l=i;++s<a;){var h=c[s],p=n[h],_=t[h];if(e)var g=i?e(_,p,h,t,n,o):e(p,_,h,n,t,o);if(g===Z?p!==_&&!r(p,_,e,u,o):!g){f=false;break}l||(l="constructor"==h)}return f&&!l&&(r=n.constructor,
-e=t.constructor,r!=e&&"constructor"in n&&"constructor"in t&&!(typeof r=="function"&&r instanceof r&&typeof e=="function"&&e instanceof e)&&(f=false)),o["delete"](n),f}function gr(n){for(var t=n.name+"",r=Fu[t],e=r?r.length:0;e--;){var u=r[e],o=u.func;if(null==o||o==n)return u.name}return t}function vr(){var n=dn.iteratee||Ze,n=n===Ze?vt:n;return arguments.length?n(arguments[0],arguments[1]):n}function dr(n){n=ze(n);for(var t=n.length;t--;){var r=n[t][1];n[t][2]=r===r&&!pe(r)}return n}function yr(n,t){
-var r=null==n?Z:n[t];return ge(r)?r:Z}function br(n){return uu.call(n)}function xr(n,t,r){if(null==n)return false;var e=r(n,t);return e||Er(t)||(t=Lt(t),n=Wr(n,t),null!=n&&(t=Mr(t),e=r(n,t))),e||he(n&&n.length)&&U(t,n.length)&&(Wo(n)||be(n)||ie(n))}function mr(n){var t=n.length,r=n.constructor(t);return t&&"string"==typeof n[0]&&tu.call(n,"index")&&(r.index=n.index,r.input=n.input),r}function jr(n){return n=n.constructor,Mu(le(n)?n.prototype:Z)}function wr(r,e,u){var o=r.constructor;switch(e){case"[object ArrayBuffer]":
-return Zt(r);case"[object Boolean]":case"[object Date]":return new o(+r);case"[object Float32Array]":case"[object Float64Array]":case"[object Int8Array]":case"[object Int16Array]":case"[object Int32Array]":case"[object Uint8Array]":case"[object Uint8ClampedArray]":case"[object Uint16Array]":case"[object Uint32Array]":return e=r.buffer,new r.constructor(u?Zt(e):e,r.byteOffset,r.length);case"[object Map]":return u=r.constructor,l(B(r),n,new u);case"[object Number]":case"[object String]":return new o(r);
-case"[object RegExp]":return u=new r.constructor(r.source,sn.exec(r)),u.lastIndex=r.lastIndex,u;case"[object Set]":return u=r.constructor,l($(r),t,new u);case"[object Symbol]":return fu?Object(Lu.call(r)):{}}}function Ar(n){var t=n?n.length:Z;return he(t)&&(Wo(n)||be(n)||ie(n))?x(t,String):null}function Or(n,t,r){if(!pe(r))return false;var e=typeof t;return("number"==e?fe(r)&&U(t,r.length):"string"==e&&t in r)?ue(r[t],n):false}function Er(n,t){return typeof n=="number"?true:!Wo(n)&&(tn.test(n)||!nn.test(n)||null!=t&&n in Object(t));
-}function kr(n){var t=typeof n;return"number"==t||"boolean"==t||"string"==t&&"__proto__"!==n||null==n}function Ir(n){var t=gr(n),r=dn[t];return typeof r=="function"&&t in wn.prototype?n===r?true:(t=Ku(r),!!t&&n===t[0]):false}function Rr(n){var t=n&&n.constructor;return n===(typeof t=="function"&&t.prototype||Xe)}function Sr(n,t,r,e,u,o){return pe(n)&&pe(t)&&(o.set(t,n),mt(n,t,Sr,o)),n===Z?Qn(t):n}function Wr(n,t){return 1==t.length?n:Re(n,Wt(t,0,-1))}function Cr(n){var t=[];return Ie(n).replace(rn,function(n,r,e,u){
-t.push(e?u.replace(an,"$1"):r||n)}),t}function Ur(n){return ce(n)?n:[]}function zr(n){return typeof n=="function"?n:Ne}function Br(n){if(n instanceof wn)return n.clone();var t=new jn(n.__wrapped__,n.__chain__);return t.__actions__=Pt(n.__actions__),t.__index__=n.__index__,t.__values__=n.__values__,t}function Lr(n,t,r){var e=n?n.length:0;return e?(t=r||t===Z?1:Ae(t),Wt(n,0>t?0:t,e)):[]}function $r(n,t,r){var e=n?n.length:0;return e?(t=r||t===Z?1:Ae(t),t=e-t,Wt(n,0,0>t?0:t)):[]}function Fr(n){return n?n[0]:Z;
-}function Mr(n){var t=n?n.length:0;return t?n[t-1]:Z}function Nr(n,t){return n&&n.length&&t&&t.length?kt(n,t):n}function Zr(n){return n?ku.call(n):n}function Dr(n){if(!n||!n.length)return[];var t=0;return n=o(n,function(n){return ce(n)?(t=wu(n.length,t),true):void 0}),x(t,function(t){return c(n,Ot(t))})}function qr(n,t){if(!n||!n.length)return[];var e=Dr(n);return null==t?e:c(e,function(n){return r(t,Z,n)})}function Pr(n){return n=dn(n),n.__chain__=true,n}function Tr(n,t){return t(n)}function Kr(){return this;
-}function Gr(n,t){return typeof t=="function"&&Wo(n)?e(n,t):Nu(n,zr(t))}function Vr(n,t){var r;if(typeof t=="function"&&Wo(n)){for(r=n.length;r--&&false!==t(n[r],r,n););r=n}else r=Zu(n,zr(t));return r}function Jr(n,t){var r=-1,e=we(n),u=e.length,o=u-1;for(t=Hn(Ae(t),0,u);++r<t;){var u=Rt(r,o),i=e[u];e[u]=e[r],e[r]=i}return e.length=t,e}function Yr(n){if(null==n)return 0;if(fe(n)){var t=n.length;return t&&be(n)?F(n):t}return Ce(n).length}function Hr(n,t,r){return t=r?Z:t,t=n&&null==t?n.length:t,sr(n,128,Z,Z,Z,Z,t);
-}function Qr(n,t){var r;if(typeof t!="function")throw new He("Expected a function");return n=Ae(n),function(){return 0<--n&&(r=t.apply(this,arguments)),1>=n&&(t=Z),r}}function Xr(n,t,r){return t=r?Z:t,n=sr(n,8,Z,Z,Z,Z,Z,t),n.placeholder=Xr.placeholder,n}function ne(n,t,r){return t=r?Z:t,n=sr(n,16,Z,Z,Z,Z,Z,t),n.placeholder=ne.placeholder,n}function te(n,t,r){function e(){p&&lu(p),a&&lu(a),g=0,c=a=h=p=_=Z}function u(t,r){r&&lu(r),a=p=_=Z,t&&(g=jo(),l=n.apply(h,c),p||a||(c=h=Z))}function o(){var n=t-(jo()-s);
-0>=n||n>t?u(_,a):p=vu(o,n)}function i(){u(y,p)}function f(){if(c=arguments,s=jo(),h=this,_=y&&(p||!v),false===d)var r=v&&!p;else{a||v||(g=s);var e=d-(s-g),u=0>=e||e>d;u?(a&&(a=lu(a)),g=s,l=n.apply(h,c)):a||(a=vu(i,e))}return u&&p?p=lu(p):p||t===d||(p=vu(o,t)),r&&(u=true,l=n.apply(h,c)),!u||p||a||(c=h=Z),l}var c,a,l,s,h,p,_,g=0,v=false,d=false,y=true;if(typeof n!="function")throw new He("Expected a function");return t=Ee(t)||0,pe(r)&&(v=!!r.leading,d="maxWait"in r&&wu(Ee(r.maxWait)||0,t),y="trailing"in r?!!r.trailing:y),
-f.cancel=e,f.flush=function(){return(p&&_||a&&y)&&(l=n.apply(h,c)),e(),l},f}function re(n,t){function r(){var e=arguments,u=t?t.apply(this,e):e[0],o=r.cache;return o.has(u)?o.get(u):(e=n.apply(this,e),r.cache=o.set(u,e),e)}if(typeof n!="function"||t&&typeof t!="function")throw new He("Expected a function");return r.cache=new re.Cache,r}function ee(n,t){if(typeof n!="function")throw new He("Expected a function");return t=wu(t===Z?n.length-1:Ae(t),0),function(){for(var e=arguments,u=-1,o=wu(e.length-t,0),i=Array(o);++u<o;)i[u]=e[t+u];
-switch(t){case 0:return n.call(this,i);case 1:return n.call(this,e[0],i);case 2:return n.call(this,e[0],e[1],i)}for(o=Array(t+1),u=-1;++u<t;)o[u]=e[u];return o[t]=i,r(n,this,o)}}function ue(n,t){return n===t||n!==n&&t!==t}function oe(n,t){return n>t}function ie(n){return ce(n)&&tu.call(n,"callee")&&(!gu.call(n,"callee")||"[object Arguments]"==uu.call(n))}function fe(n){return null!=n&&!(typeof n=="function"&&le(n))&&he(Gu(n))}function ce(n){return _e(n)&&fe(n)}function ae(n){return _e(n)&&typeof n.message=="string"&&"[object Error]"==uu.call(n);
-}function le(n){return n=pe(n)?uu.call(n):"","[object Function]"==n||"[object GeneratorFunction]"==n}function se(n){return typeof n=="number"&&n==Ae(n)}function he(n){return typeof n=="number"&&n>-1&&0==n%1&&9007199254740991>=n}function pe(n){var t=typeof n;return!!n&&("object"==t||"function"==t)}function _e(n){return!!n&&typeof n=="object"}function ge(n){return null==n?false:le(n)?iu.test(nu.call(n)):_e(n)&&(C(n)?iu:gn).test(n)}function ve(n){return typeof n=="number"||_e(n)&&"[object Number]"==uu.call(n);
-}function de(n){if(!_e(n)||"[object Object]"!=uu.call(n)||C(n))return false;var t=Xe;return typeof n.constructor=="function"&&(t=hu(n)),null===t?true:(n=t.constructor,typeof n=="function"&&n instanceof n&&nu.call(n)==eu)}function ye(n){return pe(n)&&"[object RegExp]"==uu.call(n)}function be(n){return typeof n=="string"||!Wo(n)&&_e(n)&&"[object String]"==uu.call(n)}function xe(n){return typeof n=="symbol"||_e(n)&&"[object Symbol]"==uu.call(n)}function me(n){return _e(n)&&he(n.length)&&!!Wn[uu.call(n)]}function je(n,t){
-return t>n}function we(n){if(!n)return[];if(fe(n))return be(n)?n.match(On):Pt(n);if(_u&&n[_u])return z(n[_u]());var t=br(n);return("[object Map]"==t?B:"[object Set]"==t?$:Be)(n)}function Ae(n){if(!n)return 0===n?n:0;if(n=Ee(n),n===D||n===-D)return 1.7976931348623157e308*(0>n?-1:1);var t=n%1;return n===n?t?n-t:n:0}function Oe(n){return n?Hn(Ae(n),0,4294967295):0}function Ee(n){if(pe(n)&&(n=le(n.valueOf)?n.valueOf():n,n=pe(n)?n+"":n),typeof n!="string")return 0===n?n:+n;n=n.replace(on,"");var t=_n.test(n);
-return t||vn.test(n)?Mn(n.slice(2),t?2:8):pn.test(n)?q:+n}function ke(n){return Tt(n,Ue(n))}function Ie(n){if(typeof n=="string")return n;if(null==n)return"";if(xe(n))return fu?$u.call(n):"";var t=n+"";return"0"==t&&1/n==-D?"-0":t}function Re(n,t,r){return n=null==n?Z:at(n,t),n===Z?r:n}function Se(n,t){return xr(n,t,lt)}function We(n,t){return xr(n,t,st)}function Ce(n){var t=Rr(n);if(!t&&!fe(n))return ju(Object(n));var r,e=Ar(n),u=!!e,e=e||[],o=e.length;for(r in n)!lt(n,r)||u&&("length"==r||U(r,o))||t&&"constructor"==r||e.push(r);
-return e}function Ue(n){for(var t=-1,r=Rr(n),e=dt(n),u=e.length,o=Ar(n),i=!!o,o=o||[],f=o.length;++t<u;){var c=e[t];i&&("length"==c||U(c,f))||"constructor"==c&&(r||!tu.call(n,c))||o.push(c)}return o}function ze(n){return m(n,Ce(n))}function Be(n){return n?w(n,Ce(n)):[]}function Le(n){return Vo(Ie(n).toLowerCase())}function $e(n){return(n=Ie(n))&&n.replace(yn,I).replace(An,"")}function Fe(n,t){n=Ie(n),t=Ae(t);var r="";if(!n||1>t||t>9007199254740991)return r;do t%2&&(r+=n),t=bu(t/2),n+=n;while(t);return r;
-}function Me(n,t,r){return n=Ie(n),t=r?Z:t,t===Z&&(t=Rn.test(n)?In:kn),n.match(t)||[]}function Ne(n){return n}function Ze(n){return _e(n)&&!Wo(n)?De(n):vt(n)}function De(n){return bt(Qn(n,true))}function qe(n,t,r){var u=Ce(t),o=ct(t,u);null!=r||pe(t)&&(o.length||!u.length)||(r=t,t=n,n=this,o=ct(t,Ce(t)));var i=pe(r)&&"chain"in r?r.chain:true,f=le(n);return e(o,function(r){var e=t[r];n[r]=e,f&&(n.prototype[r]=function(){var t=this.__chain__;if(i||t){var r=n(this.__wrapped__);return(r.__actions__=Pt(this.__actions__)).push({
-func:e,args:arguments,thisArg:n}),r.__chain__=t,r}return e.apply(n,a([this.value()],arguments))})}),n}function Pe(){}function Te(n){return Er(n)?Ot(n):Et(n)}function Ke(n){return n&&n.length?b(n,Ne):Z}E=E?Gn.defaults({},E,Gn.pick(Kn,Sn)):Kn;var Ge=E.Date,Ve=E.Error,Je=E.Math,Ye=E.RegExp,He=E.TypeError,Qe=E.Array.prototype,Xe=E.Object.prototype,nu=E.Function.prototype.toString,tu=Xe.hasOwnProperty,ru=0,eu=nu.call(Object),uu=Xe.toString,ou=Kn._,iu=Ye("^"+nu.call(tu).replace(en,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),fu=E.Symbol,cu=E.f,au=E.Uint8Array,lu=E.clearTimeout,su=cu?cu.g:Z,hu=Object.getPrototypeOf,pu=Object.getOwnPropertySymbols,_u=typeof(_u=fu&&fu.iterator)=="symbol"?_u:Z,gu=Xe.propertyIsEnumerable,vu=E.setTimeout,du=Qe.splice,yu=Je.ceil,bu=Je.floor,xu=E.isFinite,mu=Qe.join,ju=Object.keys,wu=Je.max,Au=Je.min,Ou=E.parseInt,Eu=Je.random,ku=Qe.reverse,Iu=yr(E,"Map"),Ru=yr(E,"Set"),Su=yr(E,"WeakMap"),Wu=yr(Object,"create"),Cu=Su&&new Su,Uu=Iu?nu.call(Iu):"",zu=Ru?nu.call(Ru):"",Bu=fu?fu.prototype:Z,Lu=fu?Bu.valueOf:Z,$u=fu?Bu.toString:Z,Fu={};
-dn.templateSettings={escape:H,evaluate:Q,interpolate:X,variable:"",imports:{_:dn}};var Mu=function(){function n(){}return function(t){if(pe(t)){n.prototype=t;var r=new n;n.prototype=Z}return r||{}}}(),Nu=Yt(it),Zu=Yt(ft,true),Du=Ht(),qu=Ht(true);su&&!gu.call({valueOf:1},"valueOf")&&(dt=function(n){return z(su(n))});var Pu=Cu?function(n,t){return Cu.set(n,t),n}:Ne,Tu=Ru&&2===new Ru([1,2]).size?function(n){return new Ru(n)}:Pe,Ku=Cu?function(n){return Cu.get(n)}:Pe,Gu=Ot("length"),Vu=pu||function(){return[];
-};(Iu&&"[object Map]"!=br(new Iu)||Ru&&"[object Set]"!=br(new Ru))&&(br=function(n){var t=uu.call(n);if(n="[object Object]"==t?n.constructor:null,n=typeof n=="function"?nu.call(n):""){if(n==Uu)return"[object Map]";if(n==zu)return"[object Set]"}return t});var Ju=function(){var n=0,t=0;return function(r,e){var u=jo(),o=16-(u-t);if(t=u,o>0){if(150<=++n)return r}else n=0;return Pu(r,e)}}(),Yu=ee(function(n,t){t=ut(t);for(var r=Wo(n)?n:[Object(n)],e=t,u=-1,o=r.length,i=-1,f=e.length,c=Array(o+f);++u<o;)c[u]=r[u];
-for(;++i<f;)c[u++]=e[i];return c}),Hu=ee(function(n,t){return ce(n)?tt(n,ut(t,false,true)):[]}),Qu=ee(function(n,t){var r=Mr(t);return ce(r)&&(r=Z),ce(n)?tt(n,ut(t,false,true),vr(r)):[]}),Xu=ee(function(n,t){var r=Mr(t);return ce(r)&&(r=Z),ce(n)?tt(n,ut(t,false,true),Z,r):[]}),no=ee(function(n){var t=c(n,Ur);return t.length&&t[0]===n[0]?ht(t):[]}),to=ee(function(n){var t=Mr(n),r=c(n,Ur);return t===Mr(r)?t=Z:r.pop(),r.length&&r[0]===n[0]?ht(r,vr(t)):[]}),ro=ee(function(n){var t=Mr(n),r=c(n,Ur);return t===Mr(r)?t=Z:r.pop(),
-r.length&&r[0]===n[0]?ht(r,Z,t):[]}),eo=ee(Nr),uo=ee(function(n,t){t=c(ut(t),String);var r=Yn(n,t);return It(n,t.sort(k)),r}),oo=ee(function(n){return $t(ut(n,false,true))}),io=ee(function(n){var t=Mr(n);return ce(t)&&(t=Z),$t(ut(n,false,true),vr(t))}),fo=ee(function(n){var t=Mr(n);return ce(t)&&(t=Z),$t(ut(n,false,true),Z,t)}),co=ee(function(n,t){return ce(n)?tt(n,t):[]}),ao=ee(function(n){return Nt(o(n,ce))}),lo=ee(function(n){var t=Mr(n);return ce(t)&&(t=Z),Nt(o(n,ce),vr(t))}),so=ee(function(n){var t=Mr(n);return ce(t)&&(t=Z),
-Nt(o(n,ce),Z,t)}),ho=ee(Dr),po=ee(function(n){var t=n.length,t=t>1?n[t-1]:Z,t=typeof t=="function"?(n.pop(),t):Z;return qr(n,t)}),_o=ee(function(n){function t(t){return Yn(t,n)}n=ut(n);var r=n.length,e=r?n[0]:0,u=this.__wrapped__;return 1>=r&&!this.__actions__.length&&u instanceof wn&&U(e)?(u=u.slice(e,+e+(r?1:0)),u.__actions__.push({func:Tr,args:[t],thisArg:Z}),new jn(u,this.__chain__).thru(function(n){return r&&!n.length&&n.push(Z),n})):this.thru(t)}),go=Vt(function(n,t,r){tu.call(n,r)?++n[r]:n[r]=1;
-}),vo=Vt(function(n,t,r){tu.call(n,r)?n[r].push(t):n[r]=[t]}),yo=ee(function(n,t,e){var u=-1,o=typeof t=="function",i=Er(t),f=fe(n)?Array(n.length):[];return Nu(n,function(n){var c=o?t:i&&null!=n?n[t]:Z;f[++u]=c?r(c,n,e):pt(n,t,e)}),f}),bo=Vt(function(n,t,r){n[r]=t}),xo=Vt(function(n,t,r){n[r?0:1].push(t)},function(){return[[],[]]}),mo=ee(function(n,t){if(null==n)return[];var r=t.length;return r>1&&Or(n,t[0],t[1])?t=[]:r>2&&Or(t[0],t[1],t[2])&&(t.length=1),jt(n,ut(t),[])}),jo=Ge.now,wo=ee(function(n,t,r){
-var e=1;if(r.length)var u=L(r,wo.placeholder),e=32|e;return sr(n,e,t,r,u)}),Ao=ee(function(n,t,r){var e=3;if(r.length)var u=L(r,Ao.placeholder),e=32|e;return sr(t,e,n,r,u)}),Oo=ee(function(n,t){return nt(n,1,t)}),Eo=ee(function(n,t,r){return nt(n,Ee(t)||0,r)}),ko=ee(function(n,t){t=c(ut(t),vr());var e=t.length;return ee(function(u){for(var o=-1,i=Au(u.length,e);++o<i;)u[o]=t[o].call(this,u[o]);return r(n,this,u)})}),Io=ee(function(n,t){var r=L(t,Io.placeholder);return sr(n,32,Z,t,r)}),Ro=ee(function(n,t){
-var r=L(t,Ro.placeholder);return sr(n,64,Z,t,r)}),So=ee(function(n,t){return sr(n,256,Z,Z,Z,ut(t))}),Wo=Array.isArray,Co=Jt(function(n,t){Tt(t,Ce(t),n)}),Uo=Jt(function(n,t){Tt(t,Ue(t),n)}),zo=Jt(function(n,t,r){Kt(t,Ue(t),n,r)}),Bo=Jt(function(n,t,r){Kt(t,Ce(t),n,r)}),Lo=ee(function(n,t){return Yn(n,ut(t))}),$o=ee(function(n){return n.push(Z,Pn),r(zo,Z,n)}),Fo=ee(function(n){return n.push(Z,Sr),r(Zo,Z,n)}),Mo=ee(pt),No=Jt(function(n,t){mt(n,t)}),Zo=Jt(function(n,t,r){mt(n,t,r)}),Do=ee(function(n,t){
-return null==n?{}:(t=c(ut(t),String),wt(n,tt(Ue(n),t)))}),qo=ee(function(n,t){return null==n?{}:wt(n,ut(t))}),Po=nr(function(n,t,r){return t=t.toLowerCase(),n+(r?Le(t):t)}),To=nr(function(n,t,r){return n+(r?"-":"")+t.toLowerCase()}),Ko=nr(function(n,t,r){return n+(r?" ":"")+t.toLowerCase()}),Go=Xt("toLowerCase"),Vo=Xt("toUpperCase"),Jo=nr(function(n,t,r){return n+(r?"_":"")+t.toLowerCase()}),Yo=nr(function(n,t,r){return n+(r?" ":"")+Le(t)}),Ho=nr(function(n,t,r){return n+(r?" ":"")+t.toUpperCase();
-}),Qo=ee(function(n,t){try{return r(n,Z,t)}catch(e){return ae(e)?e:new Ve(e)}}),Xo=ee(function(n,t){return e(ut(t),function(t){n[t]=wo(n[t],n)}),n}),ni=er(),ti=er(true),ri=ee(function(n,t){return function(r){return pt(r,n,t)}}),ei=ee(function(n,t){return function(r){return pt(n,r,t)}}),ui=or(c),oi=or(u),ii=or(h),fi=cr(),ci=cr(true),ai=lr("ceil"),li=lr("floor"),si=lr("round");return dn.prototype=mn.prototype,jn.prototype=Mu(mn.prototype),jn.prototype.constructor=jn,wn.prototype=Mu(mn.prototype),wn.prototype.constructor=wn,
-Un.prototype=Wu?Wu(null):Xe,zn.prototype.clear=function(){this.__data__={hash:new Un,map:Iu?new Iu:[],string:new Un}},zn.prototype["delete"]=function(n){var t=this.__data__;return kr(n)?(t=typeof n=="string"?t.string:t.hash,n=(Wu?t[n]!==Z:tu.call(t,n))&&delete t[n]):n=Iu?t.map["delete"](n):Nn(t.map,n),n},zn.prototype.get=function(n){var t=this.__data__;return kr(n)?(t=typeof n=="string"?t.string:t.hash,Wu?(n=t[n],n="__lodash_hash_undefined__"===n?Z:n):n=tu.call(t,n)?t[n]:Z):n=Iu?t.map.get(n):Zn(t.map,n),
-n},zn.prototype.has=function(n){var t=this.__data__;return kr(n)?(t=typeof n=="string"?t.string:t.hash,n=Wu?t[n]!==Z:tu.call(t,n)):n=Iu?t.map.has(n):-1<Dn(t.map,n),n},zn.prototype.set=function(n,t){var r=this.__data__;return kr(n)?(typeof n=="string"?r.string:r.hash)[n]=Wu&&t===Z?"__lodash_hash_undefined__":t:Iu?r.map.set(n,t):qn(r.map,n,t),this},Bn.prototype.push=function(n){var t=this.__data__;kr(n)?(t=t.__data__,(typeof n=="string"?t.string:t.hash)[n]="__lodash_hash_undefined__"):t.set(n,"__lodash_hash_undefined__");
-},$n.prototype.clear=function(){this.__data__={array:[],map:null}},$n.prototype["delete"]=function(n){var t=this.__data__,r=t.array;return r?Nn(r,n):t.map["delete"](n)},$n.prototype.get=function(n){var t=this.__data__,r=t.array;return r?Zn(r,n):t.map.get(n)},$n.prototype.has=function(n){var t=this.__data__,r=t.array;return r?-1<Dn(r,n):t.map.has(n)},$n.prototype.set=function(n,t){var r=this.__data__,e=r.array;return e&&(199>e.length?qn(e,n,t):(r.array=null,r.map=new zn(e))),(r=r.map)&&r.set(n,t),
-this},re.Cache=zn,dn.after=function(n,t){if(typeof t!="function")throw new He("Expected a function");return n=Ae(n),function(){return 1>--n?t.apply(this,arguments):void 0}},dn.ary=Hr,dn.assign=Co,dn.assignIn=Uo,dn.assignInWith=zo,dn.assignWith=Bo,dn.at=Lo,dn.before=Qr,dn.bind=wo,dn.bindAll=Xo,dn.bindKey=Ao,dn.chain=Pr,dn.chunk=function(n,t){t=wu(Ae(t),0);var r=n?n.length:0;if(!r||1>t)return[];for(var e=0,u=-1,o=Array(yu(r/t));r>e;)o[++u]=Wt(n,e,e+=t);return o},dn.compact=function(n){for(var t=-1,r=n?n.length:0,e=-1,u=[];++t<r;){
-var o=n[t];o&&(u[++e]=o)}return u},dn.concat=Yu,dn.cond=function(n){var t=n?n.length:0,e=vr();return n=t?c(n,function(n){if("function"!=typeof n[1])throw new He("Expected a function");return[e(n[0]),n[1]]}):[],ee(function(e){for(var u=-1;++u<t;){var o=n[u];if(r(o[0],this,e))return r(o[1],this,e)}})},dn.conforms=function(n){return Xn(Qn(n,true))},dn.constant=function(n){return function(){return n}},dn.countBy=go,dn.create=function(n,t){var r=Mu(n);return t?Jn(r,t):r},dn.curry=Xr,dn.curryRight=ne,dn.debounce=te,
-dn.defaults=$o,dn.defaultsDeep=Fo,dn.defer=Oo,dn.delay=Eo,dn.difference=Hu,dn.differenceBy=Qu,dn.differenceWith=Xu,dn.drop=Lr,dn.dropRight=$r,dn.dropRightWhile=function(n,t){return n&&n.length?Ft(n,vr(t,3),true,true):[]},dn.dropWhile=function(n,t){return n&&n.length?Ft(n,vr(t,3),true):[]},dn.fill=function(n,t,r,e){var u=n?n.length:0;if(!u)return[];for(r&&typeof r!="number"&&Or(n,t,r)&&(r=0,e=u),u=n.length,r=Ae(r),0>r&&(r=-r>u?0:u+r),e=e===Z||e>u?u:Ae(e),0>e&&(e+=u),e=r>e?0:Oe(e);e>r;)n[r++]=t;return n},
-dn.filter=function(n,t){return(Wo(n)?o:et)(n,vr(t,3))},dn.flatMap=function(n,t){return n&&n.length?ut(c(n,vr(t,3))):[]},dn.flatten=function(n){return n&&n.length?ut(n):[]},dn.flattenDeep=function(n){return n&&n.length?ut(n,true):[]},dn.flip=function(n){return sr(n,512)},dn.flow=ni,dn.flowRight=ti,dn.fromPairs=function(n){for(var t=-1,r=n?n.length:0,e={};++t<r;){var u=n[t];St(e,u[0],u[1])}return e},dn.functions=function(n){return null==n?[]:ct(n,Ce(n))},dn.functionsIn=function(n){return null==n?[]:ct(n,Ue(n));
-},dn.groupBy=vo,dn.initial=function(n){return $r(n,1)},dn.intersection=no,dn.intersectionBy=to,dn.intersectionWith=ro,dn.invert=function(n,t,r){return l(Ce(n),function(e,u){var o=n[u];return t&&!r?tu.call(e,o)?e[o].push(u):e[o]=[u]:e[o]=u,e},{})},dn.invokeMap=yo,dn.iteratee=Ze,dn.keyBy=bo,dn.keys=Ce,dn.keysIn=Ue,dn.map=function(n,t){return(Wo(n)?c:yt)(n,vr(t,3))},dn.mapKeys=function(n,t){var r={};return t=vr(t,3),it(n,function(n,e,u){r[t(n,e,u)]=n}),r},dn.mapValues=function(n,t){var r={};return t=vr(t,3),
-it(n,function(n,e,u){r[e]=t(n,e,u)}),r},dn.matches=De,dn.matchesProperty=function(n,t){return xt(n,Qn(t,true))},dn.memoize=re,dn.merge=No,dn.mergeWith=Zo,dn.method=ri,dn.methodOf=ei,dn.mixin=qe,dn.negate=function(n){if(typeof n!="function")throw new He("Expected a function");return function(){return!n.apply(this,arguments)}},dn.nthArg=function(n){return n=Ae(n),function(){return arguments[n]}},dn.omit=Do,dn.omitBy=function(n,t){return t=vr(t),At(n,function(n){return!t(n)})},dn.once=function(n){return Qr(2,n);
-},dn.orderBy=function(n,t,r,e){return null==n?[]:(Wo(t)||(t=null==t?[]:[t]),r=e?Z:r,Wo(r)||(r=null==r?[]:[r]),jt(n,t,r))},dn.over=ui,dn.overArgs=ko,dn.overEvery=oi,dn.overSome=ii,dn.partial=Io,dn.partialRight=Ro,dn.partition=xo,dn.pick=qo,dn.pickBy=function(n,t){return null==n?{}:At(n,vr(t))},dn.property=Te,dn.propertyOf=function(n){return function(t){return null==n?Z:at(n,t)}},dn.pull=eo,dn.pullAll=Nr,dn.pullAllBy=function(n,t,r){return n&&n.length&&t&&t.length?kt(n,t,vr(r)):n},dn.pullAt=uo,dn.range=fi,
-dn.rangeRight=ci,dn.rearg=So,dn.reject=function(n,t){var r=Wo(n)?o:et;return t=vr(t,3),r(n,function(n,r,e){return!t(n,r,e)})},dn.remove=function(n,t){var r=[];if(!n||!n.length)return r;var e=-1,u=[],o=n.length;for(t=vr(t,3);++e<o;){var i=n[e];t(i,e,n)&&(r.push(i),u.push(e))}return It(n,u),r},dn.rest=ee,dn.reverse=Zr,dn.sampleSize=Jr,dn.set=function(n,t,r){return null==n?n:St(n,t,r)},dn.setWith=function(n,t,r,e){return e=typeof e=="function"?e:Z,null==n?n:St(n,t,r,e)},dn.shuffle=function(n){return Jr(n,4294967295);
-},dn.slice=function(n,t,r){var e=n?n.length:0;return e?(r&&typeof r!="number"&&Or(n,t,r)?(t=0,r=e):(t=null==t?0:Ae(t),r=r===Z?e:Ae(r)),Wt(n,t,r)):[]},dn.sortBy=mo,dn.sortedUniq=function(n){return n&&n.length?Bt(n):[]},dn.sortedUniqBy=function(n,t){return n&&n.length?Bt(n,vr(t)):[]},dn.split=function(n,t,r){return Ie(n).split(t,r)},dn.spread=function(n){if(typeof n!="function")throw new He("Expected a function");return function(t){return r(n,this,t)}},dn.tail=function(n){return Lr(n,1)},dn.take=function(n,t,r){
-return n&&n.length?(t=r||t===Z?1:Ae(t),Wt(n,0,0>t?0:t)):[]},dn.takeRight=function(n,t,r){var e=n?n.length:0;return e?(t=r||t===Z?1:Ae(t),t=e-t,Wt(n,0>t?0:t,e)):[]},dn.takeRightWhile=function(n,t){return n&&n.length?Ft(n,vr(t,3),false,true):[]},dn.takeWhile=function(n,t){return n&&n.length?Ft(n,vr(t,3)):[]},dn.tap=function(n,t){return t(n),n},dn.throttle=function(n,t,r){var e=true,u=true;if(typeof n!="function")throw new He("Expected a function");return pe(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),
-te(n,t,{leading:e,maxWait:t,trailing:u})},dn.thru=Tr,dn.toArray=we,dn.toPairs=ze,dn.toPairsIn=function(n){return m(n,Ue(n))},dn.toPath=function(n){return Wo(n)?c(n,String):Cr(n)},dn.toPlainObject=ke,dn.transform=function(n,t,r){var u=Wo(n)||me(n);if(t=vr(t,4),null==r)if(u||pe(n)){var o=n.constructor;r=u?Wo(n)?new o:[]:Mu(le(o)?o.prototype:Z)}else r={};return(u?e:it)(n,function(n,e,u){return t(r,n,e,u)}),r},dn.unary=function(n){return Hr(n,1)},dn.union=oo,dn.unionBy=io,dn.unionWith=fo,dn.uniq=function(n){
-return n&&n.length?$t(n):[]},dn.uniqBy=function(n,t){return n&&n.length?$t(n,vr(t)):[]},dn.uniqWith=function(n,t){return n&&n.length?$t(n,Z,t):[]},dn.unset=function(n,t){var r;if(null==n)r=true;else{r=n;var e=t,e=Er(e,r)?[e+""]:Lt(e);r=Wr(r,e),e=Mr(e),r=null!=r&&Se(r,e)?delete r[e]:true}return r},dn.unzip=Dr,dn.unzipWith=qr,dn.values=Be,dn.valuesIn=function(n){return null==n?w(n,Ue(n)):[]},dn.without=co,dn.words=Me,dn.wrap=function(n,t){return t=null==t?Ne:t,Io(t,n)},dn.xor=ao,dn.xorBy=lo,dn.xorWith=so,
-dn.zip=ho,dn.zipObject=function(n,t){for(var r=-1,e=n?n.length:0,u=t?t.length:0,o={};++r<e;)St(o,n[r],u>r?t[r]:Z);return o},dn.zipWith=po,dn.each=Gr,dn.eachRight=Vr,dn.extend=Uo,dn.extendWith=zo,qe(dn,dn),dn.add=function(n,t){var r;return n!==Z&&(r=n),t!==Z&&(r=r===Z?t:r+t),r},dn.attempt=Qo,dn.camelCase=Po,dn.capitalize=Le,dn.ceil=ai,dn.clamp=function(n,t,r){return r===Z&&(r=t,t=Z),r!==Z&&(r=Ee(r),r=r===r?r:0),t!==Z&&(t=Ee(t),t=t===t?t:0),Hn(Ee(n),t,r)},dn.clone=function(n){return Qn(n)},dn.cloneDeep=function(n){
-return Qn(n,true)},dn.cloneDeepWith=function(n,t){return Qn(n,true,t)},dn.cloneWith=function(n,t){return Qn(n,false,t)},dn.deburr=$e,dn.endsWith=function(n,t,r){n=Ie(n),t=typeof t=="string"?t:t+"";var e=n.length;return r=r===Z?e:Hn(Ae(r),0,e),r-=t.length,r>=0&&n.indexOf(t,r)==r},dn.eq=ue,dn.escape=function(n){return(n=Ie(n))&&Y.test(n)?n.replace(V,R):n},dn.escapeRegExp=function(n){return(n=Ie(n))&&un.test(n)?n.replace(en,"\\$&"):n},dn.every=function(n,t,r){var e=Wo(n)?u:rt;return r&&Or(n,t,r)&&(t=Z),e(n,vr(t,3));
-},dn.find=function(n,t){if(t=vr(t,3),Wo(n)){var r=g(n,t);return r>-1?n[r]:Z}return _(n,t,Nu)},dn.findIndex=function(n,t){return n&&n.length?g(n,vr(t,3)):-1},dn.findKey=function(n,t){return _(n,vr(t,3),it,true)},dn.findLast=function(n,t){if(t=vr(t,3),Wo(n)){var r=g(n,t,true);return r>-1?n[r]:Z}return _(n,t,Zu)},dn.findLastIndex=function(n,t){return n&&n.length?g(n,vr(t,3),true):-1},dn.findLastKey=function(n,t){return _(n,vr(t,3),ft,true)},dn.floor=li,dn.forEach=Gr,dn.forEachRight=Vr,dn.forIn=function(n,t){
-return null==n?n:Du(n,zr(t),Ue)},dn.forInRight=function(n,t){return null==n?n:qu(n,zr(t),Ue)},dn.forOwn=function(n,t){return n&&it(n,zr(t))},dn.forOwnRight=function(n,t){return n&&ft(n,zr(t))},dn.get=Re,dn.gt=oe,dn.gte=function(n,t){return n>=t},dn.has=Se,dn.hasIn=We,dn.head=Fr,dn.identity=Ne,dn.includes=function(n,t,r,e){return n=fe(n)?n:Be(n),r=r&&!e?Ae(r):0,e=n.length,0>r&&(r=wu(e+r,0)),be(n)?e>=r&&-1<n.indexOf(t,r):!!e&&-1<v(n,t,r)},dn.indexOf=function(n,t,r){var e=n?n.length:0;return e?(r=Ae(r),
-0>r&&(r=wu(e+r,0)),v(n,t,r)):-1},dn.inRange=function(n,t,r){return t=Ee(t)||0,r===Z?(r=t,t=0):r=Ee(r)||0,n=Ee(n),n>=Au(t,r)&&n<wu(t,r)},dn.invoke=Mo,dn.isArguments=ie,dn.isArray=Wo,dn.isArrayLike=fe,dn.isArrayLikeObject=ce,dn.isBoolean=function(n){return true===n||false===n||_e(n)&&"[object Boolean]"==uu.call(n)},dn.isDate=function(n){return _e(n)&&"[object Date]"==uu.call(n)},dn.isElement=function(n){return!!n&&1===n.nodeType&&_e(n)&&!de(n)},dn.isEmpty=function(n){return!_e(n)||le(n.splice)?!Yr(n):!Ce(n).length;
-},dn.isEqual=function(n,t){return _t(n,t)},dn.isEqualWith=function(n,t,r){var e=(r=typeof r=="function"?r:Z)?r(n,t):Z;return e===Z?_t(n,t,r):!!e},dn.isError=ae,dn.isFinite=function(n){return typeof n=="number"&&xu(n)},dn.isFunction=le,dn.isInteger=se,dn.isLength=he,dn.isMatch=function(n,t){return n===t||gt(n,t,dr(t))},dn.isMatchWith=function(n,t,r){return r=typeof r=="function"?r:Z,gt(n,t,dr(t),r)},dn.isNaN=function(n){return ve(n)&&n!=+n},dn.isNative=ge,dn.isNil=function(n){return null==n},dn.isNull=function(n){
-return null===n},dn.isNumber=ve,dn.isObject=pe,dn.isObjectLike=_e,dn.isPlainObject=de,dn.isRegExp=ye,dn.isSafeInteger=function(n){return se(n)&&n>=-9007199254740991&&9007199254740991>=n},dn.isString=be,dn.isSymbol=xe,dn.isTypedArray=me,dn.isUndefined=function(n){return n===Z},dn.join=function(n,t){return n?mu.call(n,t):""},dn.kebabCase=To,dn.last=Mr,dn.lastIndexOf=function(n,t,r){var e=n?n.length:0;if(!e)return-1;var u=e;if(r!==Z&&(u=Ae(r),u=(0>u?wu(e+u,0):Au(u,e-1))+1),t!==t)return W(n,u,true);for(;u--;)if(n[u]===t)return u;
-return-1},dn.lowerCase=Ko,dn.lowerFirst=Go,dn.lt=je,dn.lte=function(n,t){return t>=n},dn.max=function(n){return n&&n.length?p(n,Ne,oe):Z},dn.maxBy=function(n,t){return n&&n.length?p(n,vr(t),oe):Z},dn.mean=function(n){return Ke(n)/(n?n.length:0)},dn.min=function(n){return n&&n.length?p(n,Ne,je):Z},dn.minBy=function(n,t){return n&&n.length?p(n,vr(t),je):Z},dn.noConflict=function(){return Kn._=ou,this},dn.noop=Pe,dn.now=jo,dn.pad=function(n,t,r){n=Ie(n),t=Ae(t);var e=F(n);return t&&t>e?(e=(t-e)/2,t=bu(e),
-e=yu(e),ir("",t,r)+n+ir("",e,r)):n},dn.padEnd=function(n,t,r){return n=Ie(n),n+ir(n,t,r)},dn.padStart=function(n,t,r){return n=Ie(n),ir(n,t,r)+n},dn.parseInt=function(n,t,r){return r||null==t?t=0:t&&(t=+t),n=Ie(n).replace(on,""),Ou(n,t||(hn.test(n)?16:10))},dn.random=function(n,t,r){if(r&&typeof r!="boolean"&&Or(n,t,r)&&(t=r=Z),r===Z&&(typeof t=="boolean"?(r=t,t=Z):typeof n=="boolean"&&(r=n,n=Z)),n===Z&&t===Z?(n=0,t=1):(n=Ee(n)||0,t===Z?(t=n,n=0):t=Ee(t)||0),n>t){var e=n;n=t,t=e}return r||n%1||t%1?(r=Eu(),
-Au(n+r*(t-n+Fn("1e-"+((r+"").length-1))),t)):Rt(n,t)},dn.reduce=function(n,t,r){var e=Wo(n)?l:d,u=3>arguments.length;return e(n,vr(t,4),r,u,Nu)},dn.reduceRight=function(n,t,r){var e=Wo(n)?s:d,u=3>arguments.length;return e(n,vr(t,4),r,u,Zu)},dn.repeat=Fe,dn.replace=function(){var n=arguments,t=Ie(n[0]);return 3>n.length?t:t.replace(n[1],n[2])},dn.result=function(n,t,r){if(Er(t,n))e=null==n?Z:n[t];else{t=Lt(t);var e=Re(n,t);n=Wr(n,t)}return e===Z&&(e=r),le(e)?e.call(n):e},dn.round=si,dn.runInContext=N,
-dn.sample=function(n){n=fe(n)?n:Be(n);var t=n.length;return t>0?n[Rt(0,t-1)]:Z},dn.size=Yr,dn.snakeCase=Jo,dn.some=function(n,t,r){var e=Wo(n)?h:Ct;return r&&Or(n,t,r)&&(t=Z),e(n,vr(t,3))},dn.sortedIndex=function(n,t){return Ut(n,t)},dn.sortedIndexBy=function(n,t,r){return zt(n,t,vr(r))},dn.sortedIndexOf=function(n,t){var r=n?n.length:0;if(r){var e=Ut(n,t);if(r>e&&ue(n[e],t))return e}return-1},dn.sortedLastIndex=function(n,t){return Ut(n,t,true)},dn.sortedLastIndexBy=function(n,t,r){return zt(n,t,vr(r),true);
-},dn.sortedLastIndexOf=function(n,t){if(n&&n.length){var r=Ut(n,t,true)-1;if(ue(n[r],t))return r}return-1},dn.startCase=Yo,dn.startsWith=function(n,t,r){return n=Ie(n),r=Hn(Ae(r),0,n.length),n.lastIndexOf(t,r)==r},dn.subtract=function(n,t){var r;return n!==Z&&(r=n),t!==Z&&(r=r===Z?t:r-t),r},dn.sum=Ke,dn.sumBy=function(n,t){return n&&n.length?b(n,vr(t)):Z},dn.template=function(n,t,r){var e=dn.templateSettings;r&&Or(n,t,r)&&(t=Z),n=Ie(n),t=zo({},t,e,Pn),r=zo({},t.imports,e.imports,Pn);var u,o,i=Ce(r),f=w(r,i),c=0;
-r=t.interpolate||bn;var a="__p+='";r=Ye((t.escape||bn).source+"|"+r.source+"|"+(r===X?ln:bn).source+"|"+(t.evaluate||bn).source+"|$","g");var l="sourceURL"in t?"//# sourceURL="+t.sourceURL+"\n":"";if(n.replace(r,function(t,r,e,i,f,l){return e||(e=i),a+=n.slice(c,l).replace(xn,S),r&&(u=true,a+="'+__e("+r+")+'"),f&&(o=true,a+="';"+f+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),c=l+t.length,t}),a+="';",(t=t.variable)||(a="with(obj){"+a+"}"),a=(o?a.replace(P,""):a).replace(T,"$1").replace(K,"$1;"),
-a="function("+(t||"obj")+"){"+(t?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+a+"return __p}",t=Qo(function(){return Function(i,l+"return "+a).apply(Z,f)}),t.source=a,ae(t))throw t;return t},dn.times=function(n,t){if(n=Ae(n),1>n||n>9007199254740991)return[];var r=4294967295,e=Au(n,4294967295);for(t=zr(t),n-=4294967295,e=x(e,t);++r<n;)t(r);return e},dn.toInteger=Ae,dn.toLength=Oe,dn.toLower=function(n){
-return Ie(n).toLowerCase()},dn.toNumber=Ee,dn.toSafeInteger=function(n){return Hn(Ae(n),-9007199254740991,9007199254740991)},dn.toString=Ie,dn.toUpper=function(n){return Ie(n).toUpperCase()},dn.trim=function(n,t,r){return(n=Ie(n))?r||t===Z?n.replace(on,""):(t+="")?(n=n.match(On),t=t.match(On),n.slice(A(n,t),O(n,t)+1).join("")):n:n},dn.trimEnd=function(n,t,r){return(n=Ie(n))?r||t===Z?n.replace(cn,""):(t+="")?(n=n.match(On),n.slice(0,O(n,t.match(On))+1).join("")):n:n},dn.trimStart=function(n,t,r){return(n=Ie(n))?r||t===Z?n.replace(fn,""):(t+="")?(n=n.match(On),
-n.slice(A(n,t.match(On))).join("")):n:n},dn.truncate=function(n,t){var r=30,e="...";if(pe(t))var u="separator"in t?t.separator:u,r="length"in t?Ae(t.length):r,e="omission"in t?Ie(t.omission):e;n=Ie(n);var o=n.length;if(En.test(n))var i=n.match(On),o=i.length;if(r>=o)return n;if(o=r-F(e),1>o)return e;if(r=i?i.slice(0,o).join(""):n.slice(0,o),u===Z)return r+e;if(i&&(o+=r.length-o),ye(u)){if(n.slice(o).search(u)){var f=r;for(u.global||(u=Ye(u.source,Ie(sn.exec(u))+"g")),u.lastIndex=0;i=u.exec(f);)var c=i.index;
-r=r.slice(0,c===Z?o:c)}}else n.indexOf(u,o)!=o&&(u=r.lastIndexOf(u),u>-1&&(r=r.slice(0,u)));return r+e},dn.unescape=function(n){return(n=Ie(n))&&J.test(n)?n.replace(G,M):n},dn.uniqueId=function(n){var t=++ru;return Ie(n)+t},dn.upperCase=Ho,dn.upperFirst=Vo,dn.first=Fr,qe(dn,function(){var n={};return it(dn,function(t,r){tu.call(dn.prototype,r)||(n[r]=t)}),n}(),{chain:false}),dn.VERSION="4.0.0",e("bind bindKey curry curryRight partial partialRight".split(" "),function(n){dn[n].placeholder=dn}),e(["drop","take"],function(n,t){
-wn.prototype[n]=function(r){var e=this.__filtered__;if(e&&!t)return new wn(this);r=r===Z?1:wu(Ae(r),0);var u=this.clone();return e?u.__takeCount__=Au(r,u.__takeCount__):u.__views__.push({size:Au(r,4294967295),type:n+(0>u.__dir__?"Right":"")}),u},wn.prototype[n+"Right"]=function(t){return this.reverse()[n](t).reverse()}}),e(["filter","map","takeWhile"],function(n,t){var r=t+1,e=1==r||3==r;wn.prototype[n]=function(n){var t=this.clone();return t.__iteratees__.push({iteratee:vr(n,3),type:r}),t.__filtered__=t.__filtered__||e,
-t}}),e(["head","last"],function(n,t){var r="take"+(t?"Right":"");wn.prototype[n]=function(){return this[r](1).value()[0]}}),e(["initial","tail"],function(n,t){var r="drop"+(t?"":"Right");wn.prototype[n]=function(){return this.__filtered__?new wn(this):this[r](1)}}),wn.prototype.compact=function(){return this.filter(Ne)},wn.prototype.find=function(n){return this.filter(n).head()},wn.prototype.findLast=function(n){return this.reverse().find(n)},wn.prototype.invokeMap=ee(function(n,t){return typeof n=="function"?new wn(this):this.map(function(r){
-return pt(r,n,t)})}),wn.prototype.reject=function(n){return n=vr(n,3),this.filter(function(t){return!n(t)})},wn.prototype.slice=function(n,t){n=Ae(n);var r=this;return r.__filtered__&&(n>0||0>t)?new wn(r):(0>n?r=r.takeRight(-n):n&&(r=r.drop(n)),t!==Z&&(t=Ae(t),r=0>t?r.dropRight(-t):r.take(t-n)),r)},wn.prototype.takeRightWhile=function(n){return this.reverse().takeWhile(n).reverse()},wn.prototype.toArray=function(){return this.take(4294967295)},it(wn.prototype,function(n,t){var r=/^(?:filter|find|map|reject)|While$/.test(t),e=/^(?:head|last)$/.test(t),u=dn[e?"take"+("last"==t?"Right":""):t],o=e||/^find/.test(t);
-u&&(dn.prototype[t]=function(){function t(n){return n=u.apply(dn,a([n],f)),e&&h?n[0]:n}var i=this.__wrapped__,f=e?[1]:arguments,c=i instanceof wn,l=f[0],s=c||Wo(i);s&&r&&typeof l=="function"&&1!=l.length&&(c=s=false);var h=this.__chain__,p=!!this.__actions__.length,l=o&&!h,c=c&&!p;return!o&&s?(i=c?i:new wn(this),i=n.apply(i,f),i.__actions__.push({func:Tr,args:[t],thisArg:Z}),new jn(i,h)):l&&c?n.apply(this,f):(i=this.thru(t),l?e?i.value()[0]:i.value():i)})}),e("pop push shift sort splice unshift".split(" "),function(n){
-var t=Qe[n],r=/^(?:push|sort|unshift)$/.test(n)?"tap":"thru",e=/^(?:pop|shift)$/.test(n);dn.prototype[n]=function(){var n=arguments;return e&&!this.__chain__?t.apply(this.value(),n):this[r](function(r){return t.apply(r,n)})}}),it(wn.prototype,function(n,t){var r=dn[t];if(r){var e=r.name+"";(Fu[e]||(Fu[e]=[])).push({name:t,func:r})}}),Fu[ur(Z,2).name]=[{name:"wrapper",func:Z}],wn.prototype.clone=function(){var n=new wn(this.__wrapped__);return n.__actions__=Pt(this.__actions__),n.__dir__=this.__dir__,
-n.__filtered__=this.__filtered__,n.__iteratees__=Pt(this.__iteratees__),n.__takeCount__=this.__takeCount__,n.__views__=Pt(this.__views__),n},wn.prototype.reverse=function(){if(this.__filtered__){var n=new wn(this);n.__dir__=-1,n.__filtered__=true}else n=this.clone(),n.__dir__*=-1;return n},wn.prototype.value=function(){var n,t=this.__wrapped__.value(),r=this.__dir__,e=Wo(t),u=0>r,o=e?t.length:0;n=o;for(var i=this.__views__,f=0,c=-1,a=i.length;++c<a;){var l=i[c],s=l.size;switch(l.type){case"drop":f+=s;
-break;case"dropRight":n-=s;break;case"take":n=Au(n,f+s);break;case"takeRight":f=wu(f,n-s)}}if(n={start:f,end:n},i=n.start,f=n.end,n=f-i,u=u?f:i-1,i=this.__iteratees__,f=i.length,c=0,a=Au(n,this.__takeCount__),!e||200>o||o==n&&a==n)return Mt(t,this.__actions__);e=[];n:for(;n--&&a>c;){for(u+=r,o=-1,l=t[u];++o<f;){var h=i[o],s=h.type,h=(0,h.iteratee)(l);if(2==s)l=h;else if(!h){if(1==s)continue n;break n}}e[c++]=l}return e},dn.prototype.at=_o,dn.prototype.chain=function(){return Pr(this)},dn.prototype.commit=function(){
-return new jn(this.value(),this.__chain__)},dn.prototype.flatMap=function(n){return this.map(n).flatten()},dn.prototype.next=function(){this.__values__===Z&&(this.__values__=we(this.value()));var n=this.__index__>=this.__values__.length,t=n?Z:this.__values__[this.__index__++];return{done:n,value:t}},dn.prototype.plant=function(n){for(var t,r=this;r instanceof mn;){var e=Br(r);e.__index__=0,e.__values__=Z,t?u.__wrapped__=e:t=e;var u=e,r=r.__wrapped__}return u.__wrapped__=n,t},dn.prototype.reverse=function(){
-var n=this.__wrapped__;return n instanceof wn?(this.__actions__.length&&(n=new wn(this)),n=n.reverse(),n.__actions__.push({func:Tr,args:[Zr],thisArg:Z}),new jn(n,this.__chain__)):this.thru(Zr)},dn.prototype.toJSON=dn.prototype.valueOf=dn.prototype.value=function(){return Mt(this.__wrapped__,this.__actions__)},_u&&(dn.prototype[_u]=Kr),dn}var Z,D=1/0,q=NaN,P=/\b__p\+='';/g,T=/\b(__p\+=)''\+/g,K=/(__e\(.*?\)|\b__t\))\+'';/g,G=/&(?:amp|lt|gt|quot|#39|#96);/g,V=/[&<>"'`]/g,J=RegExp(G.source),Y=RegExp(V.source),H=/<%-([\s\S]+?)%>/g,Q=/<%([\s\S]+?)%>/g,X=/<%=([\s\S]+?)%>/g,nn=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,tn=/^\w*$/,rn=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]/g,en=/[\\^$.*+?()[\]{}|]/g,un=RegExp(en.source),on=/^\s+|\s+$/g,fn=/^\s+/,cn=/\s+$/,an=/\\(\\)?/g,ln=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,sn=/\w*$/,hn=/^0x/i,pn=/^[-+]0x[0-9a-f]+$/i,_n=/^0b[01]+$/i,gn=/^\[object .+?Constructor\]$/,vn=/^0o[0-7]+$/i,dn=/^(?:0|[1-9]\d*)$/,yn=/[\xc0-\xd6\xd8-\xde\xdf-\xf6\xf8-\xff]/g,bn=/($^)/,xn=/['\n\r\u2028\u2029\\]/g,mn="[\\ufe0e\\ufe0f]?(?:\\ud83c[\\udffb-\\udfff])?(?:\\u200d(?:[^\\ud800-\\udfff]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])[\\ufe0e\\ufe0f]?(?:\\ud83c[\\udffb-\\udfff])?)*",jn="(?:[\\u2700-\\u27bf]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff])"+mn,wn="(?:[^\\ud800-\\udfff][\\u0300-\\u036f\\ufe20-\\ufe23]?|[\\u0300-\\u036f\\ufe20-\\ufe23]|(?:\\ud83c[\\udde6-\\uddff]){2}|[\\ud800-\\udbff][\\udc00-\\udfff]|[\\ud800-\\udfff])",An=RegExp("[\\u0300-\\u036f\\ufe20-\\ufe23]","g"),On=RegExp(wn+mn,"g"),En=RegExp("[\\u200d\\ud800-\\udfff\\u0300-\\u036f\\ufe20-\\ufe23\\ufe0e\\ufe0f]"),kn=/[a-zA-Z0-9]+/g,In=RegExp(["[A-Z\\xc0-\\xd6\\xd8-\\xde]?[a-z\\xdf-\\xf6\\xf8-\\xff]+(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2018\\u2019\\u201c\\u201d \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde]|$)|(?:[A-Z\\xc0-\\xd6\\xd8-\\xde]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2018\\u2019\\u201c\\u201d \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+(?=[\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2018\\u2019\\u201c\\u201d \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000]|[A-Z\\xc0-\\xd6\\xd8-\\xde](?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2018\\u2019\\u201c\\u201d \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])|$)|[A-Z\\xc0-\\xd6\\xd8-\\xde]?(?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2018\\u2019\\u201c\\u201d \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+|\\d+(?:(?:[a-z\\xdf-\\xf6\\xf8-\\xff]|[^\\ud800-\\udfff\\xac\\xb1\\xd7\\xf7\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\xbf\\u2018\\u2019\\u201c\\u201d \\t\\x0b\\f\\xa0\\ufeff\\n\\r\\u2028\\u2029\\u1680\\u180e\\u2000\\u2001\\u2002\\u2003\\u2004\\u2005\\u2006\\u2007\\u2008\\u2009\\u200a\\u202f\\u205f\\u3000\\d+\\u2700-\\u27bfa-z\\xdf-\\xf6\\xf8-\\xffA-Z\\xc0-\\xd6\\xd8-\\xde])+)?",jn].join("|"),"g"),Rn=/[a-z][A-Z]|[0-9][a-zA-Z]|[a-zA-Z][0-9]|[^a-zA-Z0-9 ]/,Sn="Array Date Error Float32Array Float64Array Function Int8Array Int16Array Int32Array Map Math Object Reflect RegExp Set String Symbol TypeError Uint8Array Uint8ClampedArray Uint16Array Uint32Array WeakMap _ clearTimeout isFinite parseInt setTimeout".split(" "),Wn={};
-Wn["[object Float32Array]"]=Wn["[object Float64Array]"]=Wn["[object Int8Array]"]=Wn["[object Int16Array]"]=Wn["[object Int32Array]"]=Wn["[object Uint8Array]"]=Wn["[object Uint8ClampedArray]"]=Wn["[object Uint16Array]"]=Wn["[object Uint32Array]"]=true,Wn["[object Arguments]"]=Wn["[object Array]"]=Wn["[object ArrayBuffer]"]=Wn["[object Boolean]"]=Wn["[object Date]"]=Wn["[object Error]"]=Wn["[object Function]"]=Wn["[object Map]"]=Wn["[object Number]"]=Wn["[object Object]"]=Wn["[object RegExp]"]=Wn["[object Set]"]=Wn["[object String]"]=Wn["[object WeakMap]"]=false;
-var Cn={};Cn["[object Arguments]"]=Cn["[object Array]"]=Cn["[object ArrayBuffer]"]=Cn["[object Boolean]"]=Cn["[object Date]"]=Cn["[object Float32Array]"]=Cn["[object Float64Array]"]=Cn["[object Int8Array]"]=Cn["[object Int16Array]"]=Cn["[object Int32Array]"]=Cn["[object Map]"]=Cn["[object Number]"]=Cn["[object Object]"]=Cn["[object RegExp]"]=Cn["[object Set]"]=Cn["[object String]"]=Cn["[object Symbol]"]=Cn["[object Uint8Array]"]=Cn["[object Uint8ClampedArray]"]=Cn["[object Uint16Array]"]=Cn["[object Uint32Array]"]=true,
-Cn["[object Error]"]=Cn["[object Function]"]=Cn["[object WeakMap]"]=false;var Un={"\xc0":"A","\xc1":"A","\xc2":"A","\xc3":"A","\xc4":"A","\xc5":"A","\xe0":"a","\xe1":"a","\xe2":"a","\xe3":"a","\xe4":"a","\xe5":"a","\xc7":"C","\xe7":"c","\xd0":"D","\xf0":"d","\xc8":"E","\xc9":"E","\xca":"E","\xcb":"E","\xe8":"e","\xe9":"e","\xea":"e","\xeb":"e","\xcc":"I","\xcd":"I","\xce":"I","\xcf":"I","\xec":"i","\xed":"i","\xee":"i","\xef":"i","\xd1":"N","\xf1":"n","\xd2":"O","\xd3":"O","\xd4":"O","\xd5":"O","\xd6":"O",
-"\xd8":"O","\xf2":"o","\xf3":"o","\xf4":"o","\xf5":"o","\xf6":"o","\xf8":"o","\xd9":"U","\xda":"U","\xdb":"U","\xdc":"U","\xf9":"u","\xfa":"u","\xfb":"u","\xfc":"u","\xdd":"Y","\xfd":"y","\xff":"y","\xc6":"Ae","\xe6":"ae","\xde":"Th","\xfe":"th","\xdf":"ss"},zn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","`":"&#96;"},Bn={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'","&#96;":"`"},Ln={"function":true,object:true},$n={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"
-},Fn=parseFloat,Mn=parseInt,Nn=Ln[typeof exports]&&exports&&!exports.nodeType?exports:null,Zn=Ln[typeof module]&&module&&!module.nodeType?module:null,Dn=E(Ln[typeof self]&&self),qn=E(Ln[typeof window]&&window),Pn=Zn&&Zn.exports===Nn?Nn:null,Tn=E(Ln[typeof this]&&this),Kn=E(Nn&&Zn&&typeof global=="object"&&global)||qn!==(Tn&&Tn.window)&&qn||Dn||Tn||Function("return this")(),Gn=N();(qn||Dn||{})._=Gn,typeof define=="function"&&typeof define.amd=="object"&&define.amd? define(function(){return Gn}):Nn&&Zn?(Pn&&((Zn.exports=Gn)._=Gn),
-Nn._=Gn):Kn._=Gn}).call(this);

kfet/templates/kfet/account.html

@@ -31,28 +31,6 @@
   {% endif %}
 </div>
 
-<aside>
-  <div class="heading">
-    {{ positive_count }}
-    <span class="sub">compte{{ positive_count|pluralize }} en positif</span>
-  </div>
-  <div class="heading">
-    {{ positives_sum|floatformat:2 }}€
-    <span class="sub">de positif total</span>
-  </div>
-</aside>
-
-<aside>
-  <div class="heading">
-    {{ negative_count }}
-    <span class="sub">compte{{ negative_count|pluralize }} en négatif</span>
-  </div>
-  <div class="heading">
-    {{ negatives_sum|floatformat:2 }}€
-    <span class="sub">de négatif total</span>
-  </div>
-</aside>
-
 {% endblock %}
 
 {% block main %}

kfet/templates/kfet/account_create.html

@@ -60,7 +60,8 @@
         $('#id_trigramme').on('input', function() {
             var trigramme = $('#id_trigramme').val().toUpperCase();
 
-            if (!(trigramme.is_valid_trigramme())) {
+            var pattern = /^[^a-z]{3}$/;
+            if (!(trigramme.match(pattern))) {
                 $('#id_trigramme')
                     .css('background', '#fff')
                     .css('color', '#000');

kfet/templates/kfet/account_update.html

@@ -34,11 +34,10 @@ Modification de mes informations
   {% include 'kfet/form_snippet.html' with form=account_form %}
   {% include 'kfet/form_snippet.html' with form=frozen_form %}
   {% include 'kfet/form_snippet.html' with form=group_form %}
-  {% include 'kfet/form_snippet.html' with form=cof_form %}
   {% include 'kfet/form_snippet.html' with form=pwd_form %}
 
   {% include 'kfet/form_authentication_snippet.html' %}
   {% include 'kfet/form_submit_snippet.html' with value="Mettre à jour" %}
 </form>
 
-{% endblock %}
+{% endblock %}

kfet/templates/kfet/article.html

@@ -40,7 +40,6 @@
         <td class="text-right">Prix</td>
         <td class="text-right">Stock</td>
         <td class="text-right" data-sorter="article__is_sold">En vente</td>
-        <td class="text-right" data-sorter="article__is_no_exte">Reservé aux adhérent⋅e⋅s</td>
         <td class="text-right" data-sorter="article__hidden">Affiché</td>
         <td class="text-right" data-sorter="shortDate">Dernier inventaire</td>
       </tr>
@@ -64,7 +63,6 @@
             <td class="text-right">{{ article.price }}€</td>
             <td class="text-right">{{ article.stock }}</td>
             <td class="text-right">{{ article.is_sold | yesno:"En vente,Non vendu"}}</td>
-            <td class="text-right">{{ article.no_exte | yesno:"Réservé,Non réservé"}}</td>
             <td class="text-right">{{ article.hidden | yesno:"Caché,Affiché" }}</td>
             {% with last_inventory=article.inventory.0 %}
             <td class="text-right" title="{{ last_inventory.at }}">
@@ -90,7 +88,6 @@
         <td class="text-right">Prix</td>
         <td class="text-right">Stock</td>
         <td class="text-right" data-sorter="article__is_sold">En vente</td>
-        <td class="text-right" data-sorter="article__is_no_exte">Reservé aux adhérent⋅e⋅s</td>
         <td class="text-right" data-sorter="article__hidden">Affiché</td>
         <td class="text-right" data-sorter="shortDate">Dernier inventaire</td>
       </tr>
@@ -114,7 +111,6 @@
             <td class="text-right">{{ article.price }}€</td>
             <td class="text-right">{{ article.stock }}</td>
             <td class="text-right">{{ article.is_sold | yesno:"En vente,Non vendu"}}</td>
-            <td class="text-right">{{ article.no_exte | yesno:"Réservé,Non réservé"}}</td>
             <td class="text-right">{{ article.hidden | yesno:"Caché,Affiché" }}</td>
             {% with last_inventory=article.inventory.0 %}
             <td class="text-right" title="{{ last_inventory.at }}">

kfet/templates/kfet/article_read.html

@@ -39,7 +39,6 @@
       <li><b>Stock:</b> {{ article.stock }}</li>
       <li><b>En vente:</b> {{ article.is_sold|yesno|title }}</li>
       <li><b>Affiché:</b> {{ article.hidden|yesno|title }}</li>
-      <li><b>Réservé aux adhérent⋅e⋅s:</b> {{ article.no_exte|yesno|title }}</li>
     </ul>
   </div>
 </aside>
@@ -161,4 +160,4 @@
   });
 </script>
 
-{% endblock %}
+{% endblock %}

kfet/templates/kfet/base.html

@@ -19,7 +19,6 @@
     <link rel="stylesheet" type="text/css" href="{% static 'kfet/css/index.css' %}">
 
     {# JS #}
-    <script type="text/javascript" src="{% static 'kfet/vendor/lodash.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/vendor/js.cookie.js' %}"></script>
     <script type="text/javascript" src="{% static 'vendor/jquery/jquery-3.3.1.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'vendor/bootstrap/js/bootstrap.min.js' %}"></script>
@@ -30,17 +29,6 @@
     <script type="text/javascript" src="{% static 'kfet/vendor/moment/moment.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/vendor/moment/fr.js' %}"></script>
     <script type="text/javascript" src="{% static 'kfet/js/kfet.js' %}"></script>
-    <script type="text/javascript">
-      $(document).ready(function() {
-        $('.trigramme_field').map(function() {
-          elt = $(this);
-          elt.attr('maxlength','');
-          elt.on('input', function() {
-            elt.val(elt.val().format_trigramme());
-          });
-        });
-      });
-    </script>
 
     {% include "kfetopen/init.html" %}
 

kfet/templates/kfet/base_nav.html

@@ -25,7 +25,6 @@
           <b><span class="status-text">
             <span class="glyphicon glyphicon-refresh spinning"></span>
           </span></b>.
-          <br/><a href="{% url 'kfet.open.indicator' %}">Grand indicateur</a>
           {% if perms.kfet.is_team %}
           <button class="btn btn-primary force-close-btn">&nbsp;</button>
           {% endif %}

kfet/templates/kfet/kpsul.html

@@ -397,8 +397,8 @@ $(document).ready(function() {
     // -----
 
     var articles_container = $('#articles_data tbody');
-    var article_category_default_html = '<tr class="category"><td colspan="4"></td></tr>';
-    var article_default_html = '<tr class="article"><td class="name"></td><td class="price"></td><td class="no_exte"></td><td class="stock" style="width: 0;white-space: nowrap;"></td></tr>';
+    var article_category_default_html = '<tr class="category"><td colspan="3"></td></tr>';
+    var article_default_html = '<tr class="article"><td class="name"></td><td class="price"></td><td class="stock"></td></tr>';
 
     function addArticle(article) {
         var article_html = $(article_default_html);
@@ -411,7 +411,6 @@ $(document).ready(function() {
             article_html.addClass('low-stock');
         }
         article_html.find('.price').text(amountToUKF(article['price'], false, false)+' UKF');
-        article_html.find('.no_exte').text(article['no_exte'] ? "Réservé aux adhérent⋅e⋅s" : "");
         var category_html = articles_container
             .find('#data-category-'+article['category_id']);
         if (category_html.length == 0) {

kfet/templates/kfet/left_account.html

@@ -43,9 +43,7 @@
       <li>
         {% if account.is_cof %}
         <span title="Réduction de {{ kfet_config.reduction_cof }} % sur tes commandes" data-toggle="tooltip"
-          data-placement="right">Membre COF</span>
-        {% elif account.is_kfet %}
-        Membre K-Fêt
+          data-placement="right">Adhérent COF</span>
         {% else %}
         Non-COF
         {% endif %}

kfet/templates/kfet/order_create.html

@@ -7,20 +7,11 @@
 {% block main-size %}col-lg-8 col-lg-offset-2{% endblock %}
 
 {% block main %}
-<div class="form-horizontal">
-  <div class="form-group">
-    <label for="nb_weeks" class="control-label col-sm-10">Nombre de semaines</label>
-    <div class="col-sm-2">
-      <input type="number" name="nb_weeks" id="nb_weeks" spellcheck="false" value="1" class="form-control">
-    </div>
-  </div>
-</div>
 
 <form action="" method="post">
   {% csrf_token %}
   <div class="table-responsive">
   <table
-      id="#new-order-table"
       class="table table-hover table-condensed table-condensed-input text-center table-striped sortable"
       {# Initial sort: [(name,asc)] #}
       data-sortlist="[[0,0]]">
@@ -34,7 +25,7 @@
         <td rowspan="2">
           V. moy.
           <br>
-          <i class='glyphicon glyphicon-question-sign' title="Moyenne des ventes<br>sur les trois semaines les plus élevées" data-placement="bottom"></i>
+          <i class='glyphicon glyphicon-question-sign' title="Moyenne des ventes" data-placement="bottom"></i>
         </td>
         <td rowspan="2" data-sorter="false">
           E.T.
@@ -44,7 +35,7 @@
         <td rowspan="2">
           Prév.
           <br>
-          <i class='glyphicon glyphicon-question-sign' title="Prévision de ventes<br>moyenne + écart-type" data-placement="bottom"></i>
+          <i class='glyphicon glyphicon-question-sign' title="Prévision de ventes" data-placement="bottom"></i>
         </td>
         <td rowspan="2">Stock</td>
         <td rowspan="2" data-sorter="false">
@@ -55,7 +46,7 @@
         <td rowspan="2">
           Rec.
           <br>
-          <i class='glyphicon glyphicon-question-sign' title="Quantité conseillée<br>(Prév. * Nb_semaines - stock) / (capacité d'une boîte)" data-placement="bottom"></i>
+          <i class='glyphicon glyphicon-question-sign' title="Quantité conseillée" data-placement="bottom"></i>
         </td>
         <td rowspan="2" data-sorter="false" class="small-width">
           Commande
@@ -83,7 +74,7 @@
 			</tbody>
 			<tbody>
 			{% for form in category.list %}
-				<tr class="article-row">
+				<tr>
 					{{ form.article }}
 					<td class="text-left">{{ form.name }}</td>
 					{% for v_chunk in form.v_all %}
@@ -91,10 +82,10 @@
 					{% endfor %}
 					<td>{{ form.v_moy }}</td>
 					<td>{{ form.v_et }}</td>
-					<td class="prev-1w">{{ form.v_prev }}</td>
-					<td class="stock">{{ form.stock }}</td>
-					<td class="capacity">{{ form.box_capacity|default:"" }}</td>
-					<td class="recommended">{{ form.c_rec_1w }}</td>
+					<td>{{ form.v_prev }}</td>
+					<td>{{ form.stock }}</td>
+					<td>{{ form.box_capacity|default:"" }}</td>
+					<td>{{ form.c_rec }}</td>
 					<td class="nopadding">{{ form.quantity_ordered|add_class:"form-control" }}</td>
 				</tr>
 			{% endfor %}
@@ -116,42 +107,6 @@
 $(document).ready(function () {
     $('.glyphicon-question-sign').tooltip({'html': true}) ;
 });
-
-function compute_recommended(nb_weeks, prevision_1w, stock, box_capacity) {
-    if (!box_capacity) box_capacity = 1;
-    return Math.ceil(Math.max(Number(nb_weeks) * Number(prevision_1w) - Math.max(Number(stock), 0), 0) / Number(box_capacity))
-}
-
-function reload_recommended(nb_weeks) {
-    $(".article-row").each(function () {
-        const article_row = $(this)
-        article_row.find(".recommended").text(compute_recommended(nb_weeks, article_row.find(".prev-1w").text(),
-            article_row.find(".stock").text(),
-            article_row.find(".capacity").text()
-        ));
-    })
-    $("#new-order-table").trigger("updateAll", [true, () => {
-    }]);
-}
-
-$("#nb_weeks").on("change", function (e) {
-    const nb_weeks = e.target.value;
-    reload_recommended(nb_weeks);
-})
-
 </script>
 
-  <style>
-      #nb_weeks {
-          background-color: #f9f9f9;
-          -moz-appearance: revert;
-      }
-
-      #nb_weeks::-webkit-inner-spin-button,
-      #nb_weeks::-webkit-outer-spin-button {
-          -webkit-appearance: revert;
-          margin: revert;
-      }
-  </style>
-
 {% endblock %}

kfet/templates/kfet/transfers_create.html

@@ -35,12 +35,12 @@
         <tr class="transfer_form" id="{{ form.prefix }}">
           <td class="from_acc_data"></td>
           <td class="from_acc">
-            <input type="text" name="from_acc" class="input_from_acc" autocomplete="off" spellcheck="false">
+            <input type="text" name="from_acc" class="input_from_acc" maxlength="3" autocomplete="off" spellcheck="false">
             {{ form.from_acc }}
           </td>
           <td class="amount">{{ form.amount }}</td>
           <td class="to_acc">
-            <input type="text" name="to_acc" class="input_to_acc" autocomplete="off" spellcheck="false">
+            <input type="text" name="to_acc" class="input_to_acc" maxlength="3" autocomplete="off" spellcheck="false">
             {{ form.to_acc }}
           </td>
           <td class="to_acc_data"></td>
@@ -91,8 +91,7 @@ $(document).ready(function () {
 
     $(document).on("input", '.input_from_acc, .input_to_acc', function(e) {
         var target = $(e.target)
-        var tri = target.val().format_trigramme();
-        target.val(tri);
+        var tri = target.val().toUpperCase();
         updateAccountData(tri, target);
     });
 

kfet/utils.py

@@ -1,7 +1,6 @@
 import json
 import math
 
-from asgiref.sync import sync_to_async
 from channels.generic.websocket import AsyncJsonWebsocketConsumer
 from django.core.cache import cache
 from django.core.serializers.json import DjangoJSONEncoder
@@ -72,6 +71,9 @@ class DjangoJsonWebsocketConsumer(AsyncJsonWebsocketConsumer):
 
     @classmethod
     async def encode_json(cls, content):
+        # Remove the type value, only used by Channels to choose the group to send to
+        content.pop("type")
+
         return json.dumps(content, cls=DjangoJSONEncoder)
 
 
@@ -93,7 +95,7 @@ class PermConsumerMixin:
         """Check permissions on connection."""
         self.user = self.scope["user"]
 
-        if await sync_to_async(self.user.has_perms)(self.perms_connect):
+        if self.user.has_perms(self.perms_connect):
             await super().connect()
         else:
             await self.close()

kfet/views.py

@@ -66,7 +66,6 @@ from kfet.forms import (
     CheckoutStatementCreateForm,
     CheckoutStatementUpdateForm,
     CofForm,
-    CofKFForm,
     ContactForm,
     DemandeSoireeForm,
     FilterHistoryForm,
@@ -185,20 +184,7 @@ class DemandeSoireeView(FormView):
 @teamkfet_required
 def account(request):
     accounts = Account.objects.select_related("cofprofile__user").order_by("trigramme")
-    positive_accounts = Account.objects.filter(balance__gte=0).exclude(trigramme="#13")
-    negative_accounts = Account.objects.filter(balance__lt=0).exclude(trigramme="#13")
-
-    return render(
-        request,
-        "kfet/account.html",
-        {
-            "accounts": accounts,
-            "positive_count": positive_accounts.count(),
-            "positives_sum": sum(acc.balance for acc in positive_accounts),
-            "negative_count": negative_accounts.count(),
-            "negatives_sum": sum(acc.balance for acc in negative_accounts),
-        },
-    )
+    return render(request, "kfet/account.html", {"accounts": accounts})
 
 
 @login_required
@@ -257,11 +243,6 @@ def account_create(request):
                     account = trigramme_form.save(data=data)
                     account_form = AccountNoTriForm(request.POST, instance=account)
                     account_form.save()
-                    was_kfet = account.is_kfet
-                    account.cofprofile.is_kfet = cof_form.cleaned_data["is_kfet"]
-                    account.cofprofile.save()
-                    if account.cofprofile.is_kfet:
-                        account.cofprofile.make_adh_kfet(request, was_kfet)
                     messages.success(request, "Compte créé : %s" % account.trigramme)
                     account.send_creation_email()
                     return redirect("kfet.account.create")
@@ -442,7 +423,6 @@ def account_update(request, trigramme):
     account_form = AccountForm(instance=account)
     group_form = UserGroupForm(instance=account.user)
     frozen_form = AccountFrozenForm(instance=account)
-    cof_form = CofKFForm(instance=account.cofprofile)
     pwd_form = AccountPwdForm()
 
     if request.method == "POST":
@@ -450,7 +430,6 @@ def account_update(request, trigramme):
         account_form = AccountForm(request.POST, instance=account)
         group_form = UserGroupForm(request.POST, instance=account.user)
         frozen_form = AccountFrozenForm(request.POST, instance=account)
-        cof_form = CofKFForm(request.POST, instance=account.cofprofile)
         pwd_form = AccountPwdForm(request.POST, account=account)
 
         forms = []
@@ -467,11 +446,6 @@ def account_update(request, trigramme):
         elif group_form.has_changed():
             warnings.append("statut d'équipe")
 
-        if request.user.has_perm("kfet.change_adh"):
-            forms.append(cof_form)
-        elif cof_form.has_changed():
-            warnings.append("adhésion kfet")
-
         # Il ne faut pas valider `pwd_form` si elle est inchangée
         if pwd_form.has_changed():
             if self_update or request.user.has_perm("kfet.change_account_password"):
@@ -488,11 +462,8 @@ def account_update(request, trigramme):
             )
         else:
             if all(form.is_valid() for form in forms):
-                was_kfet = account.is_kfet
                 for form in forms:
                     form.save()
-                if account.is_kfet:
-                    account.cofprofile.make_adh_kfet(request, was_kfet)
 
                 if len(warnings):
                     messages.warning(
@@ -524,7 +495,6 @@ def account_update(request, trigramme):
             "frozen_form": frozen_form,
             "group_form": group_form,
             "pwd_form": pwd_form,
-            "cof_form": cof_form,
         },
     )
 
@@ -1009,7 +979,6 @@ def account_read_json(request, trigramme):
         "name": account.name,
         "email": account.email,
         "is_cof": account.is_cof,
-        "is_kfet": account.is_kfet,
         "promo": account.promo,
         "balance": account.balance,
         "is_frozen": account.is_frozen,
@@ -1186,22 +1155,6 @@ def kpsul_perform_operations(request):
                 if is_addcost and operation.article.category.has_addcost:
                     operation.addcost_amount /= cof_grant_divisor
                 operation.amount = operation.amount / cof_grant_divisor
-            if not on_acc.is_cof and not on_acc.is_kfet and operation.article.no_exte:
-                if on_acc.is_cash:
-                    required_perms.add("kfet.perform_liq_reserved")
-                else:
-                    data["errors"].append(
-                        {
-                            "code": "reserved",
-                            "message": (
-                                "L'article "
-                                + operation.article.name
-                                + " est réservé aux adhérent⋅e⋅s du COF, or "
-                                + on_acc.trigramme
-                                + " ne l'est pas"
-                            ),
-                        }
-                    )
             to_articles_stocks[operation.article] -= operation.article_nb
         else:
             if on_acc.is_cash:
@@ -1218,13 +1171,6 @@ def kpsul_perform_operations(request):
         operationgroup.amount += operation.amount
         if operation.type == Operation.DEPOSIT:
             required_perms.add("kfet.perform_deposit")
-            if request.user.profile.account_kfet == on_acc:
-                data["errors"].append(
-                    {
-                        "code": "auto_deposit",
-                        "message": ("Impossible de charger son propre trigramme"),
-                    }
-                )
         if operation.type == Operation.EDIT:
             required_perms.add("kfet.edit_balance_account")
             need_comment = True
@@ -1259,7 +1205,6 @@ def kpsul_perform_operations(request):
         operationgroup.valid_by = request.user.profile.account_kfet
     # Filling cof status for statistics
     operationgroup.is_cof = on_acc.is_cof
-    operationgroup.is_kfet = on_acc.is_kfet
 
     # Starting transaction to ensure data consistency
     with transaction.atomic():
@@ -1310,7 +1255,6 @@ def kpsul_perform_operations(request):
             "checkout__name": operationgroup.checkout.name,
             "at": operationgroup.at,
             "is_cof": operationgroup.is_cof,
-            "is_kfet": operationgroup.is_kfet,
             "comment": operationgroup.comment,
             "valid_by__trigramme": (
                 operationgroup.valid_by and operationgroup.valid_by.trigramme or None
@@ -1526,7 +1470,7 @@ def cancel_operations(request):
     # Sort objects by pk to get deterministic responses.
     opegroups_pk = [opegroup.pk for opegroup in to_groups_amounts]
     opegroups = (
-        OperationGroup.objects.values("id", "amount", "is_cof", "is_kfet")
+        OperationGroup.objects.values("id", "amount", "is_cof")
         .filter(pk__in=opegroups_pk)
         .order_by("pk")
     )
@@ -1755,7 +1699,6 @@ def kpsul_articles_data(request):
         "id",
         "name",
         "price",
-        "no_exte",
         "stock",
         "category_id",
         "category__name",
@@ -2258,11 +2201,21 @@ def order_create(request, pk):
         v_et = statistics.pstdev(v_3max, v_moy)
         # Expected sales for next week
         v_prev = v_moy + v_et
-
-        c_rec_tot = max(v_prev - max(article.stock, 0), 0)
+        # We want to have 1.5 * the expected sales in stock
+        # (because sometimes some articles are not delivered)
+        c_rec_tot = max(v_prev * 1.5 - article.stock, 0)
+        # If ordered quantity is close enough to a level which can led to free
+        # boxes, we increase it to this level.
         if article.box_capacity:
             c_rec_temp = c_rec_tot / article.box_capacity
-            c_rec = round(c_rec_temp)
+            if c_rec_temp >= 10:
+                c_rec = round(c_rec_temp)
+            elif c_rec_temp > 5:
+                c_rec = 10
+            elif c_rec_temp > 2:
+                c_rec = 5
+            else:
+                c_rec = round(c_rec_temp)
         initial.append(
             {
                 "article": article.pk,
@@ -2275,7 +2228,7 @@ def order_create(request, pk):
                 "v_moy": round(v_moy),
                 "v_et": round(v_et),
                 "v_prev": round(v_prev),
-                "c_rec_1w": article.box_capacity and c_rec or round(c_rec_tot),
+                "c_rec": article.box_capacity and c_rec or round(c_rec_tot),
                 "is_sold": article.is_sold,
             }
         )

petitscours/views.py

@@ -9,7 +9,6 @@ from django.db import transaction
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template import loader
 from django.utils import timezone
-from django.views.decorators.clickjacking import xframe_options_sameorigin
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import DetailView, ListView
 
@@ -301,7 +300,6 @@ def inscription(request):
 
 
 @csrf_exempt
-@xframe_options_sameorigin
 def demande(request, *, raw: bool = False):
     success = False
     if request.method == "POST":

provisioning/prepare_django.sh

@@ -2,7 +2,6 @@
 
 set -euC
 
-mkdir -p .static
 python manage.py migrate --noinput
 python manage.py sync_page_translation_fields
 python manage.py update_translation_fields

shared/views.py

@@ -1,53 +1,12 @@
-import base64
 from collections import namedtuple
-from typing import Any
 
 from dal import autocomplete
-from django.conf import settings
-from django.contrib.auth import get_user_model
 from django.core.exceptions import ImproperlyConfigured
-from django.http import Http404, HttpResponse
-from django.views.generic import TemplateView, View
+from django.http import Http404
+from django.views.generic import TemplateView
 
 from shared.autocomplete import ModelSearch
 
-User = get_user_model()
-
-
-class SympaListView(View):
-    realm = "sympa"
-
-    username = settings.SYMPA_USERNAME
-    password = settings.SYMPA_PASSWORD
-
-    filters: dict[str, Any] = {}
-
-    def dispatch(self, request, *args, **kwargs):
-        if "HTTP_AUTHORIZATION" in request.META:
-            auth = request.META["HTTP_AUTHORIZATION"].split()
-
-            if len(auth) == 2 and auth[0].lower() == "basic":
-                name, passwd = base64.b64decode(auth[1]).split(b":")
-
-                if name == self.username and passwd == self.password:
-                    return self.render_to_response(request, *args, **kwargs)
-
-        return HttpResponse(
-            status=401, headers={"WWW-Authenticate": f'Basic realm="{self.realm}"'}
-        )
-
-    def render_to_response(self, request, *args, **kwargs):
-        """
-        Renders a list of emails in a text response.
-        """
-
-        users = User.objects.filter(**self.filters)
-
-        return HttpResponse(
-            b"\n".join(u.email.encode("utf-8") for u in users if u.email),
-            content_type="text/plain",
-        )
-
 
 class Select2QuerySetView(ModelSearch, autocomplete.Select2QuerySetView):
     """Compatibility layer between ModelSearch and Select2QuerySetView."""

shell.nix

@@ -1,6 +1,6 @@
 {
   sources ? import ./npins,
-  pkgs ? import sources.nixpkgs { overlays = [ ]; },
+  pkgs ? import sources.nixpkgs { },
 }:
 
 let
@@ -46,10 +46,11 @@ pkgs.mkShell {
   packages = [
     (python3.withPackages (
       ps: with ps; [
+        django
+        pillow
         authens
         channels
         configparser
-        django
         django-autocomplete-light
         django-bootstrap-form
         django-cas-ng
@@ -60,11 +61,10 @@ pkgs.mkShell {
         django-widget-tweaks
         icalendar
         loadcredential
-        pillow
         python-dateutil
         statistics
-        wagtail
         wagtail-modeltranslation
+        wagtail
         wagtailmenus
 
         django-debug-toolbar
@@ -72,8 +72,6 @@ pkgs.mkShell {
         black
         flake8
         isort
-
-        daphne
       ]
     ))
     pkgs.npins