eticketListView: product id instead of eticket id

Add the account amount to the eboutic

See merge request ae/Sith!254

api/urls.py

@@ -53,4 +53,5 @@ urlpatterns = [
     re_path(r"^login/", include("rest_framework.urls", namespace="rest_framework")),
     re_path(r"^markdown$", RenderMarkdown, name="api_markdown"),
     re_path(r"^mailings$", FetchMailingLists, name="mailings_fetch"),
+    re_path(r"^uv$", uv_endpoint, name="uv_endpoint"),
 ]

api/views/__init__.py

@@ -77,3 +77,4 @@ from .user import *
 from .club import *
 from .group import *
 from .launderette import *
+from .uv import *

api/views/api.py

@@ -25,7 +25,6 @@
 from rest_framework.response import Response
 from rest_framework.decorators import api_view, renderer_classes
 from rest_framework.renderers import StaticHTMLRenderer
-from rest_framework.views import APIView
 
 from core.templatetags.renderer import markdown
 

api/views/uv.py

@@ -0,0 +1,127 @@
+from rest_framework.response import Response
+from rest_framework.decorators import api_view, renderer_classes
+from rest_framework.renderers import JSONRenderer
+from django.core.exceptions import PermissionDenied
+from django.conf import settings
+from rest_framework import serializers
+import urllib.request
+import json
+
+from pedagogy.views import CanCreateUVFunctionMixin
+
+
+@api_view(["GET"])
+@renderer_classes((JSONRenderer,))
+def uv_endpoint(request):
+    if not CanCreateUVFunctionMixin.can_create_uv(request.user):
+        raise PermissionDenied
+
+    params = request.query_params
+    if "year" not in params or "code" not in params:
+        raise serializers.ValidationError("Missing query parameter")
+
+    short_uv, full_uv = find_uv("fr", params["year"], params["code"])
+    if short_uv is None or full_uv is None:
+        return Response(status=204)
+
+    return Response(make_clean_uv(short_uv, full_uv))
+
+
+def find_uv(lang, year, code):
+    """
+        Uses the UTBM API to find an UV.
+        short_uv is the UV entry in the UV list. It is returned as it contains
+        information which are not in full_uv.
+        full_uv is the detailed representation of an UV.
+    """
+    # query the UV list
+    uvs_url = settings.SITH_PEDAGOGY_UTBM_API + "/uvs/{}/{}".format(lang, year)
+    response = urllib.request.urlopen(uvs_url)
+    uvs = json.loads(response.read().decode("utf-8"))
+
+    try:
+        # find the first UV which matches the code
+        short_uv = next(uv for uv in uvs if uv["code"] == code)
+    except StopIteration:
+        return (None, None)
+
+    # get detailed information about the UV
+    uv_url = settings.SITH_PEDAGOGY_UTBM_API + "/uv/{}/{}/{}/{}".format(
+        lang, year, code, short_uv["codeFormation"]
+    )
+    response = urllib.request.urlopen(uv_url)
+    full_uv = json.loads(response.read().decode("utf-8"))
+
+    return (short_uv, full_uv)
+
+
+def make_clean_uv(short_uv, full_uv):
+    """
+        Cleans the data up so that it corresponds to our data representation.
+    """
+    res = {}
+
+    res["credit_type"] = short_uv["codeCategorie"]
+
+    # probably wrong on a few UVs as we pick the first UV we find but
+    # availability depends on the formation
+    semesters = {
+        (True, True): "AUTUMN_AND_SPRING",
+        (True, False): "AUTUMN",
+        (False, True): "SPRING",
+    }
+    res["semester"] = semesters.get(
+        (short_uv["ouvertAutomne"], short_uv["ouvertPrintemps"]), "CLOSED"
+    )
+
+    langs = {"es": "SP", "en": "EN", "de": "DE"}
+    res["language"] = langs.get(full_uv["codeLangue"], "FR")
+
+    if full_uv["departement"] == "Pôle Humanités":
+        res["department"] = "HUMA"
+    else:
+        departments = {
+            "AL": "IMSI",
+            "AE": "EE",
+            "GI": "GI",
+            "GC": "EE",
+            "GM": "MC",
+            "TC": "TC",
+            "GP": "IMSI",
+            "ED": "EDIM",
+            "AI": "GI",
+            "AM": "MC",
+        }
+        res["department"] = departments.get(full_uv["codeFormation"], "NA")
+
+    res["credits"] = full_uv["creditsEcts"]
+
+    activities = ("CM", "TD", "TP", "THE", "TE")
+    for activity in activities:
+        res["hours_{}".format(activity)] = 0
+    for activity in full_uv["activites"]:
+        if activity["code"] in activities:
+            res["hours_{}".format(activity["code"])] += activity["nbh"] // 60
+
+    # wrong if the manager changes depending on the semester
+    semester = full_uv.get("automne", None)
+    if not semester:
+        semester = full_uv.get("printemps", {})
+    res["manager"] = semester.get("responsable", "")
+
+    res["title"] = full_uv["libelle"]
+
+    descriptions = {
+        "objectives": "objectifs",
+        "program": "programme",
+        "skills": "acquisitionCompetences",
+        "key_concepts": "acquisitionNotions",
+    }
+
+    for res_key, full_uv_key in descriptions.items():
+        res[res_key] = full_uv[full_uv_key]
+        # if not found or the API did not return a string
+        if type(res[res_key]) != str:
+            res[res_key] = ""
+
+    return res

club/tests.py

@@ -641,7 +641,7 @@ class MailingFormTest(TestCase):
             {"action": MailingForm.ACTION_NEW_MAILING, "mailing_email": "mde"},
         )
         mde = Mailing.objects.get(email="mde")
-        response = self.client.post(
+        self.client.post(
             reverse("club:mailing", kwargs={"club_id": self.bdf.id}),
             {
                 "action": MailingForm.ACTION_NEW_SUBSCRIPTION,
@@ -650,6 +650,11 @@ class MailingFormTest(TestCase):
                 "subscription_mailing": mde.id,
             },
         )
+
+        response = self.client.get(
+            reverse("club:mailing", kwargs={"club_id": self.bdf.id})
+        )
+
         self.assertContains(response, "comunity@git.an")
         self.assertContains(response, "richard@git.an")
         self.assertContains(response, "krophil@git.an")

club/views.py

@@ -451,7 +451,7 @@ class ClubEditPropView(ClubTabsMixin, CanEditPropMixin, UpdateView):
     current_tab = "props"
 
 
-class ClubCreateView(CanEditPropMixin, CreateView):
+class ClubCreateView(CanCreateMixin, CreateView):
     """
     Create a club (for the Sith admin)
     """
@@ -574,7 +574,8 @@ class ClubMailingView(ClubTabsMixin, CanEditMixin, DetailFormView):
             except ValidationError as validation_error:
                 return validation_error
 
-            users_to_save.append(sub.save())
+            sub.save()
+            users_to_save.append(sub)
 
         if cleaned_data["subscription_email"]:
             sub = MailingSubscription(

com/views.py

@@ -230,7 +230,11 @@ class NewsForm(forms.ModelForm):
                 self.add_error(
                     "end_date", ValidationError(_("This field is required."))
                 )
-            if self.cleaned_data["start_date"] > self.cleaned_data["end_date"]:
+            if (
+                not self.has_error("start_date")
+                and not self.has_error("end_date")
+                and self.cleaned_data["start_date"] > self.cleaned_data["end_date"]
+            ):
                 self.add_error(
                     "end_date",
                     ValidationError(

core/middleware.py

@@ -38,7 +38,7 @@ def get_cached_user(request):
     if not hasattr(request, "_cached_user"):
         user = get_user(request)
         if user.is_anonymous:
-            user = AnonymousUser(request)
+            user = AnonymousUser()
 
         request._cached_user = user
 

core/models.py

@@ -659,7 +659,7 @@ class User(AbstractBaseUser):
 
 
 class AnonymousUser(AuthAnonymousUser):
-    def __init__(self, request):
+    def __init__(self):
         super(AnonymousUser, self).__init__()
 
     @property

core/static/core/js/multiple-select.js

@@ -1,782 +0,0 @@
-/**
- * @author zhixin wen <wenzhixin2010@gmail.com>
- * @version 1.2.1
- *
- * http://wenzhixin.net.cn/p/multiple-select/
- */
-
-(function ($) {
-
-    'use strict';
-
-    // it only does '%s', and return '' when arguments are undefined
-    var sprintf = function (str) {
-        var args = arguments,
-            flag = true,
-            i = 1;
-
-        str = str.replace(/%s/g, function () {
-            var arg = args[i++];
-
-            if (typeof arg === 'undefined') {
-                flag = false;
-                return '';
-            }
-            return arg;
-        });
-        return flag ? str : '';
-    };
-
-    var removeDiacritics = function (str) {
-        var defaultDiacriticsRemovalMap = [
-            {'base':'A', 'letters':/[\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F]/g},
-            {'base':'AA','letters':/[\uA732]/g},
-            {'base':'AE','letters':/[\u00C6\u01FC\u01E2]/g},
-            {'base':'AO','letters':/[\uA734]/g},
-            {'base':'AU','letters':/[\uA736]/g},
-            {'base':'AV','letters':/[\uA738\uA73A]/g},
-            {'base':'AY','letters':/[\uA73C]/g},
-            {'base':'B', 'letters':/[\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181]/g},
-            {'base':'C', 'letters':/[\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E]/g},
-            {'base':'D', 'letters':/[\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779]/g},
-            {'base':'DZ','letters':/[\u01F1\u01C4]/g},
-            {'base':'Dz','letters':/[\u01F2\u01C5]/g},
-            {'base':'E', 'letters':/[\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E]/g},
-            {'base':'F', 'letters':/[\u0046\u24BB\uFF26\u1E1E\u0191\uA77B]/g},
-            {'base':'G', 'letters':/[\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E]/g},
-            {'base':'H', 'letters':/[\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D]/g},
-            {'base':'I', 'letters':/[\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197]/g},
-            {'base':'J', 'letters':/[\u004A\u24BF\uFF2A\u0134\u0248]/g},
-            {'base':'K', 'letters':/[\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2]/g},
-            {'base':'L', 'letters':/[\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780]/g},
-            {'base':'LJ','letters':/[\u01C7]/g},
-            {'base':'Lj','letters':/[\u01C8]/g},
-            {'base':'M', 'letters':/[\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C]/g},
-            {'base':'N', 'letters':/[\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4]/g},
-            {'base':'NJ','letters':/[\u01CA]/g},
-            {'base':'Nj','letters':/[\u01CB]/g},
-            {'base':'O', 'letters':/[\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C]/g},
-            {'base':'OI','letters':/[\u01A2]/g},
-            {'base':'OO','letters':/[\uA74E]/g},
-            {'base':'OU','letters':/[\u0222]/g},
-            {'base':'P', 'letters':/[\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754]/g},
-            {'base':'Q', 'letters':/[\u0051\u24C6\uFF31\uA756\uA758\u024A]/g},
-            {'base':'R', 'letters':/[\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782]/g},
-            {'base':'S', 'letters':/[\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784]/g},
-            {'base':'T', 'letters':/[\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786]/g},
-            {'base':'TZ','letters':/[\uA728]/g},
-            {'base':'U', 'letters':/[\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244]/g},
-            {'base':'V', 'letters':/[\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245]/g},
-            {'base':'VY','letters':/[\uA760]/g},
-            {'base':'W', 'letters':/[\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72]/g},
-            {'base':'X', 'letters':/[\u0058\u24CD\uFF38\u1E8A\u1E8C]/g},
-            {'base':'Y', 'letters':/[\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE]/g},
-            {'base':'Z', 'letters':/[\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762]/g},
-            {'base':'a', 'letters':/[\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250]/g},
-            {'base':'aa','letters':/[\uA733]/g},
-            {'base':'ae','letters':/[\u00E6\u01FD\u01E3]/g},
-            {'base':'ao','letters':/[\uA735]/g},
-            {'base':'au','letters':/[\uA737]/g},
-            {'base':'av','letters':/[\uA739\uA73B]/g},
-            {'base':'ay','letters':/[\uA73D]/g},
-            {'base':'b', 'letters':/[\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253]/g},
-            {'base':'c', 'letters':/[\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184]/g},
-            {'base':'d', 'letters':/[\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A]/g},
-            {'base':'dz','letters':/[\u01F3\u01C6]/g},
-            {'base':'e', 'letters':/[\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD]/g},
-            {'base':'f', 'letters':/[\u0066\u24D5\uFF46\u1E1F\u0192\uA77C]/g},
-            {'base':'g', 'letters':/[\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F]/g},
-            {'base':'h', 'letters':/[\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265]/g},
-            {'base':'hv','letters':/[\u0195]/g},
-            {'base':'i', 'letters':/[\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131]/g},
-            {'base':'j', 'letters':/[\u006A\u24D9\uFF4A\u0135\u01F0\u0249]/g},
-            {'base':'k', 'letters':/[\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3]/g},
-            {'base':'l', 'letters':/[\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747]/g},
-            {'base':'lj','letters':/[\u01C9]/g},
-            {'base':'m', 'letters':/[\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F]/g},
-            {'base':'n', 'letters':/[\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5]/g},
-            {'base':'nj','letters':/[\u01CC]/g},
-            {'base':'o', 'letters':/[\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275]/g},
-            {'base':'oi','letters':/[\u01A3]/g},
-            {'base':'ou','letters':/[\u0223]/g},
-            {'base':'oo','letters':/[\uA74F]/g},
-            {'base':'p','letters':/[\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755]/g},
-            {'base':'q','letters':/[\u0071\u24E0\uFF51\u024B\uA757\uA759]/g},
-            {'base':'r','letters':/[\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783]/g},
-            {'base':'s','letters':/[\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B]/g},
-            {'base':'t','letters':/[\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787]/g},
-            {'base':'tz','letters':/[\uA729]/g},
-            {'base':'u','letters':/[\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289]/g},
-            {'base':'v','letters':/[\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C]/g},
-            {'base':'vy','letters':/[\uA761]/g},
-            {'base':'w','letters':/[\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73]/g},
-            {'base':'x','letters':/[\u0078\u24E7\uFF58\u1E8B\u1E8D]/g},
-            {'base':'y','letters':/[\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF]/g},
-            {'base':'z','letters':/[\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763]/g}
-        ];
-
-        for (var i = 0; i < defaultDiacriticsRemovalMap.length; i++) {
-            str = str.replace(defaultDiacriticsRemovalMap[i].letters, defaultDiacriticsRemovalMap[i].base);
-        }
-
-        return str;
-
-   };
-
-    function MultipleSelect($el, options) {
-        var that = this,
-            name = $el.attr('name') || options.name || '';
-
-        this.options = options;
-
-        // hide select element
-        this.$el = $el.hide();
-
-        // label element
-        this.$label = this.$el.closest('label');
-        if (this.$label.length === 0 && this.$el.attr('id')) {
-            this.$label = $(sprintf('label[for="%s"]', this.$el.attr('id').replace(/:/g, '\\:')));
-        }
-
-        // restore class and title from select element
-        this.$parent = $(sprintf(
-            '<div class="ms-parent %s" %s/>',
-            $el.attr('class') || '',
-            sprintf('title="%s"', $el.attr('title'))));
-
-        // add placeholder to choice button
-        this.$choice = $(sprintf([
-                '<button type="button" class="ms-choice">',
-                '<span class="placeholder">%s</span>',
-                '<div></div>',
-                '</button>'
-            ].join(''),
-            this.options.placeholder));
-
-        // default position is bottom
-        this.$drop = $(sprintf('<div class="ms-drop %s"%s></div>',
-            this.options.position,
-            sprintf(' style="width: %s"', this.options.dropWidth)));
-
-        this.$el.after(this.$parent);
-        this.$parent.append(this.$choice);
-        this.$parent.append(this.$drop);
-
-        if (this.$el.prop('disabled')) {
-            this.$choice.addClass('disabled');
-        }
-        this.$parent.css('width',
-            this.options.width ||
-            this.$el.css('width') ||
-            this.$el.outerWidth() + 20);
-
-        this.selectAllName = 'data-name="selectAll' + name + '"';
-        this.selectGroupName = 'data-name="selectGroup' + name + '"';
-        this.selectItemName = 'data-name="selectItem' + name + '"';
-
-        if (!this.options.keepOpen) {
-            $(document).click(function (e) {
-                if ($(e.target)[0] === that.$choice[0] ||
-                    $(e.target).parents('.ms-choice')[0] === that.$choice[0]) {
-                    return;
-                }
-                if (($(e.target)[0] === that.$drop[0] ||
-                    $(e.target).parents('.ms-drop')[0] !== that.$drop[0] && e.target !== $el[0]) &&
-                    that.options.isOpen) {
-                    that.close();
-                }
-            });
-        }
-    }
-
-    MultipleSelect.prototype = {
-        constructor: MultipleSelect,
-
-        init: function () {
-            var that = this,
-                $ul = $('<ul></ul>');
-
-            this.$drop.html('');
-
-            if (this.options.filter) {
-                this.$drop.append([
-                    '<div class="ms-search">',
-                    '<input type="text" autocomplete="off" autocorrect="off" autocapitilize="off" spellcheck="false">',
-                    '</div>'].join('')
-                );
-            }
-
-            if (this.options.selectAll && !this.options.single) {
-                $ul.append([
-                    '<li class="ms-select-all">',
-                    '<label>',
-                    sprintf('<input type="checkbox" %s /> ', this.selectAllName),
-                    this.options.selectAllDelimiter[0],
-                    this.options.selectAllText,
-                    this.options.selectAllDelimiter[1],
-                    '</label>',
-                    '</li>'
-                ].join(''));
-            }
-
-            $.each(this.$el.children(), function (i, elm) {
-                $ul.append(that.optionToHtml(i, elm));
-            });
-            $ul.append(sprintf('<li class="ms-no-results">%s</li>', this.options.noMatchesFound));
-            this.$drop.append($ul);
-
-            this.$drop.find('ul').css('max-height', this.options.maxHeight + 'px');
-            this.$drop.find('.multiple').css('width', this.options.multipleWidth + 'px');
-
-            this.$searchInput = this.$drop.find('.ms-search input');
-            this.$selectAll = this.$drop.find('input[' + this.selectAllName + ']');
-            this.$selectGroups = this.$drop.find('input[' + this.selectGroupName + ']');
-            this.$selectItems = this.$drop.find('input[' + this.selectItemName + ']:enabled');
-            this.$disableItems = this.$drop.find('input[' + this.selectItemName + ']:disabled');
-            this.$noResults = this.$drop.find('.ms-no-results');
-
-            this.events();
-            this.updateSelectAll(true);
-            this.update(true);
-
-            if (this.options.isOpen) {
-                this.open();
-            }
-        },
-
-        optionToHtml: function (i, elm, group, groupDisabled) {
-            var that = this,
-                $elm = $(elm),
-                classes = $elm.attr('class') || '',
-                title = sprintf('title="%s"', $elm.attr('title')),
-                multiple = this.options.multiple ? 'multiple' : '',
-                disabled,
-                type = this.options.single ? 'radio' : 'checkbox';
-
-            if ($elm.is('option')) {
-                var value = $elm.val(),
-                    text = that.options.textTemplate($elm),
-                    selected = $elm.prop('selected'),
-                    style = sprintf('style="%s"', this.options.styler(value)),
-                    $el;
-
-                disabled = groupDisabled || $elm.prop('disabled');
-
-                $el = $([
-                    sprintf('<li class="%s %s" %s %s>', multiple, classes, title, style),
-                    sprintf('<label class="%s">', disabled ? 'disabled' : ''),
-                    sprintf('<input type="%s" %s%s%s%s>',
-                        type, this.selectItemName,
-                        selected ? ' checked="checked"' : '',
-                        disabled ? ' disabled="disabled"' : '',
-                        sprintf(' data-group="%s"', group)),
-                    sprintf('<span>%s</span>', text),
-                    '</label>',
-                    '</li>'
-                ].join(''));
-                $el.find('input').val(value);
-                return $el;
-            }
-            if ($elm.is('optgroup')) {
-                var label = that.options.labelTemplate($elm),
-                    $group = $('<div/>');
-
-                group = 'group_' + i;
-                disabled = $elm.prop('disabled');
-
-                $group.append([
-                    '<li class="group">',
-                    sprintf('<label class="optgroup %s" data-group="%s">', disabled ? 'disabled' : '', group),
-                    this.options.hideOptgroupCheckboxes || this.options.single ? '' :
-                        sprintf('<input type="checkbox" %s %s>',
-                        this.selectGroupName, disabled ? 'disabled="disabled"' : ''),
-                    label,
-                    '</label>',
-                    '</li>'
-                ].join(''));
-
-                $.each($elm.children(), function (i, elm) {
-                    $group.append(that.optionToHtml(i, elm, group, disabled));
-                });
-                return $group.html();
-            }
-        },
-
-        events: function () {
-            var that = this,
-                toggleOpen = function (e) {
-                    e.preventDefault();
-                    that[that.options.isOpen ? 'close' : 'open']();
-                };
-
-            if (this.$label) {
-                this.$label.off('click').on('click', function (e) {
-                    if (e.target.nodeName.toLowerCase() !== 'label' || e.target !== this) {
-                        return;
-                    }
-                    toggleOpen(e);
-                    if (!that.options.filter || !that.options.isOpen) {
-                        that.focus();
-                    }
-                    e.stopPropagation(); // Causes lost focus otherwise
-                });
-            }
-
-            this.$choice.off('click').on('click', toggleOpen)
-                .off('focus').on('focus', this.options.onFocus)
-                .off('blur').on('blur', this.options.onBlur);
-
-            this.$parent.off('keydown').on('keydown', function (e) {
-                switch (e.which) {
-                    case 27: // esc key
-                        that.close();
-                        that.$choice.focus();
-                        break;
-                }
-            });
-
-            this.$searchInput.off('keydown').on('keydown',function (e) {
-                // Ensure shift-tab causes lost focus from filter as with clicking away
-                if (e.keyCode === 9 && e.shiftKey) {
-                    that.close();
-                }
-            }).off('keyup').on('keyup', function (e) {
-                // enter or space
-                // Avoid selecting/deselecting if no choices made
-                if (that.options.filterAcceptOnEnter && (e.which === 13 || e.which == 32) && that.$searchInput.val()) {
-                    that.$selectAll.click();
-                    that.close();
-                    that.focus();
-                    return;
-                }
-                that.filter();
-            });
-
-            this.$selectAll.off('click').on('click', function () {
-                var checked = $(this).prop('checked'),
-                    $items = that.$selectItems.filter(':visible');
-
-                if ($items.length === that.$selectItems.length) {
-                    that[checked ? 'checkAll' : 'uncheckAll']();
-                } else { // when the filter option is true
-                    that.$selectGroups.prop('checked', checked);
-                    $items.prop('checked', checked);
-                    that.options[checked ? 'onCheckAll' : 'onUncheckAll']();
-                    that.update();
-                }
-            });
-            this.$selectGroups.off('click').on('click', function () {
-                var group = $(this).parent().attr('data-group'),
-                    $items = that.$selectItems.filter(':visible'),
-                    $children = $items.filter(sprintf('[data-group="%s"]', group)),
-                    checked = $children.length !== $children.filter(':checked').length;
-
-                $children.prop('checked', checked);
-                that.updateSelectAll();
-                that.update();
-                that.options.onOptgroupClick({
-                    label: $(this).parent().text(),
-                    checked: checked,
-                    children: $children.get(),
-                    instance: that
-                });
-            });
-            this.$selectItems.off('click').on('click', function () {
-                that.updateSelectAll();
-                that.update();
-                that.updateOptGroupSelect();
-                that.options.onClick({
-                    label: $(this).parent().text(),
-                    value: $(this).val(),
-                    checked: $(this).prop('checked'),
-                    instance: that
-                });
-
-                if (that.options.single && that.options.isOpen && !that.options.keepOpen) {
-                    that.close();
-                }
-
-                if (that.options.single) {
-                    var clickedVal = $(this).val();
-                    that.$selectItems.filter(function() {
-                        return $(this).val() !== clickedVal;
-                    }).each(function() {
-                        $(this).prop('checked', false);
-                    });
-                    that.update();
-                }
-            });
-        },
-
-        open: function () {
-            if (this.$choice.hasClass('disabled')) {
-                return;
-            }
-            this.options.isOpen = true;
-            this.$choice.find('>div').addClass('open');
-            this.$drop[this.animateMethod('show')]();
-
-            // fix filter bug: no results show
-            this.$selectAll.parent().show();
-            this.$noResults.hide();
-
-            // Fix #77: 'All selected' when no options
-            if (!this.$el.children().length) {
-                this.$selectAll.parent().hide();
-                this.$noResults.show();
-            }
-
-            if (this.options.container) {
-                var offset = this.$drop.offset();
-                this.$drop.appendTo($(this.options.container));
-                this.$drop.offset({
-                    top: offset.top,
-                    left: offset.left
-                });
-            }
-
-            if (this.options.filter) {
-                this.$searchInput.val('');
-                this.$searchInput.focus();
-                this.filter();
-            }
-            this.options.onOpen();
-        },
-
-        close: function () {
-            this.options.isOpen = false;
-            this.$choice.find('>div').removeClass('open');
-            this.$drop[this.animateMethod('hide')]();
-            if (this.options.container) {
-                this.$parent.append(this.$drop);
-                this.$drop.css({
-                    'top': 'auto',
-                    'left': 'auto'
-                });
-            }
-            this.options.onClose();
-        },
-
-        animateMethod: function (method) {
-            var methods = {
-                show: {
-                    fade: 'fadeIn',
-                    slide: 'slideDown'
-                },
-                hide: {
-                    fade: 'fadeOut',
-                    slide: 'slideUp'
-                }
-            };
-
-            return methods[method][this.options.animate] || method;
-        },
-
-        update: function (isInit) {
-            var selects = this.options.displayValues ? this.getSelects() : this.getSelects('text'),
-                $span = this.$choice.find('>span'),
-                sl = selects.length;
-
-            if (sl === 0) {
-                $span.addClass('placeholder').html(this.options.placeholder);
-            } else if (this.options.allSelected && sl === this.$selectItems.length + this.$disableItems.length) {
-                $span.removeClass('placeholder').html(this.options.allSelected);
-            } else if (this.options.ellipsis && sl > this.options.minimumCountSelected) {
-                $span.removeClass('placeholder').text(selects.slice(0, this.options.minimumCountSelected)
-                    .join(this.options.delimiter) + '...');
-            } else if (this.options.countSelected && sl > this.options.minimumCountSelected) {
-                $span.removeClass('placeholder').html(this.options.countSelected
-                    .replace('#', selects.length)
-                    .replace('%', this.$selectItems.length + this.$disableItems.length));
-            } else {
-                $span.removeClass('placeholder').text(selects.join(this.options.delimiter));
-            }
-
-            if (this.options.addTitle) {
-                $span.prop('title', this.getSelects('text'));
-            }
-
-            // set selects to select
-            this.$el.val(this.getSelects()).trigger('change');
-
-            // add selected class to selected li
-            this.$drop.find('li').removeClass('selected');
-            this.$drop.find('input:checked').each(function () {
-                $(this).parents('li').first().addClass('selected');
-            });
-
-            // trigger <select> change event
-            if (!isInit) {
-                this.$el.trigger('change');
-            }
-        },
-
-        updateSelectAll: function (isInit) {
-            var $items = this.$selectItems;
-
-            if (!isInit) {
-                $items = $items.filter(':visible');
-            }
-            this.$selectAll.prop('checked', $items.length &&
-                $items.length === $items.filter(':checked').length);
-            if (!isInit && this.$selectAll.prop('checked')) {
-                this.options.onCheckAll();
-            }
-        },
-
-        updateOptGroupSelect: function () {
-            var $items = this.$selectItems.filter(':visible');
-            $.each(this.$selectGroups, function (i, val) {
-                var group = $(val).parent().attr('data-group'),
-                    $children = $items.filter(sprintf('[data-group="%s"]', group));
-                $(val).prop('checked', $children.length &&
-                    $children.length === $children.filter(':checked').length);
-            });
-        },
-
-        //value or text, default: 'value'
-        getSelects: function (type) {
-            var that = this,
-                texts = [],
-                values = [];
-            this.$drop.find(sprintf('input[%s]:checked', this.selectItemName)).each(function () {
-                texts.push($(this).parents('li').first().text());
-                values.push($(this).val());
-            });
-
-            if (type === 'text' && this.$selectGroups.length) {
-                texts = [];
-                this.$selectGroups.each(function () {
-                    var html = [],
-                        text = $.trim($(this).parent().text()),
-                        group = $(this).parent().data('group'),
-                        $children = that.$drop.find(sprintf('[%s][data-group="%s"]', that.selectItemName, group)),
-                        $selected = $children.filter(':checked');
-
-                    if (!$selected.length) {
-                        return;
-                    }
-
-                    html.push('[');
-                    html.push(text);
-                    if ($children.length > $selected.length) {
-                        var list = [];
-                        $selected.each(function () {
-                            list.push($(this).parent().text());
-                        });
-                        html.push(': ' + list.join(', '));
-                    }
-                    html.push(']');
-                    texts.push(html.join(''));
-                });
-            }
-            return type === 'text' ? texts : values;
-        },
-
-        setSelects: function (values) {
-            var that = this;
-            this.$selectItems.prop('checked', false);
-            this.$disableItems.prop('checked', false);
-            $.each(values, function (i, value) {
-                that.$selectItems.filter(sprintf('[value="%s"]', value)).prop('checked', true);
-                that.$disableItems.filter(sprintf('[value="%s"]', value)).prop('checked', true);
-            });
-            this.$selectAll.prop('checked', this.$selectItems.length ===
-                this.$selectItems.filter(':checked').length + this.$disableItems.filter(':checked').length);
-
-            $.each(that.$selectGroups, function (i, val) {
-                var group = $(val).parent().attr('data-group'),
-                    $children = that.$selectItems.filter('[data-group="' + group + '"]');
-                $(val).prop('checked', $children.length &&
-                    $children.length === $children.filter(':checked').length);
-            });
-
-            this.update();
-        },
-
-        enable: function () {
-            this.$choice.removeClass('disabled');
-        },
-
-        disable: function () {
-            this.$choice.addClass('disabled');
-        },
-
-        checkAll: function () {
-            this.$selectItems.prop('checked', true);
-            this.$selectGroups.prop('checked', true);
-            this.$selectAll.prop('checked', true);
-            this.update();
-            this.options.onCheckAll();
-        },
-
-        uncheckAll: function () {
-            this.$selectItems.prop('checked', false);
-            this.$selectGroups.prop('checked', false);
-            this.$selectAll.prop('checked', false);
-            this.update();
-            this.options.onUncheckAll();
-        },
-
-        focus: function () {
-            this.$choice.focus();
-            this.options.onFocus();
-        },
-
-        blur: function () {
-            this.$choice.blur();
-            this.options.onBlur();
-        },
-
-        refresh: function () {
-            this.init();
-        },
-
-        filter: function () {
-            var that = this,
-                text = $.trim(this.$searchInput.val()).toLowerCase();
-
-            if (text.length === 0) {
-                this.$selectAll.parent().show();
-                this.$selectItems.parent().show();
-                this.$disableItems.parent().show();
-                this.$selectGroups.parent().show();
-                this.$noResults.hide();
-            } else {
-                this.$selectItems.each(function () {
-                    var $parent = $(this).parent();
-                    $parent[removeDiacritics($parent.text().toLowerCase()).indexOf(removeDiacritics(text)) < 0 ? 'hide' : 'show']();
-                });
-                this.$disableItems.parent().hide();
-                this.$selectGroups.each(function () {
-                    var $parent = $(this).parent();
-                    var group = $parent.attr('data-group'),
-                        $items = that.$selectItems.filter(':visible');
-                    $parent[$items.filter(sprintf('[data-group="%s"]', group)).length ? 'show' : 'hide']();
-                });
-
-                //Check if no matches found
-                if (this.$selectItems.parent().filter(':visible').length) {
-                    this.$selectAll.parent().show();
-                    this.$noResults.hide();
-                } else {
-                    this.$selectAll.parent().hide();
-                    this.$noResults.show();
-                }
-            }
-            this.updateOptGroupSelect();
-            this.updateSelectAll();
-            this.options.onFilter(text);
-        }
-    };
-
-    $.fn.multipleSelect = function () {
-        var option = arguments[0],
-            args = arguments,
-
-            value,
-            allowedMethods = [
-                'getSelects', 'setSelects',
-                'enable', 'disable',
-                'open', 'close',
-                'checkAll', 'uncheckAll',
-                'focus', 'blur',
-                'refresh', 'close'
-            ];
-
-        this.each(function () {
-            var $this = $(this),
-                data = $this.data('multipleSelect'),
-                options = $.extend({}, $.fn.multipleSelect.defaults,
-                    $this.data(), typeof option === 'object' && option);
-
-            if (!data) {
-                data = new MultipleSelect($this, options);
-                $this.data('multipleSelect', data);
-            }
-
-            if (typeof option === 'string') {
-                if ($.inArray(option, allowedMethods) < 0) {
-                    throw 'Unknown method: ' + option;
-                }
-                value = data[option](args[1]);
-            } else {
-                data.init();
-                if (args[1]) {
-                    value = data[args[1]].apply(data, [].slice.call(args, 2));
-                }
-            }
-        });
-
-        return typeof value !== 'undefined' ? value : this;
-    };
-
-    $.fn.multipleSelect.defaults = {
-        name: '',
-        isOpen: false,
-        placeholder: '',
-        selectAll: true,
-        selectAllDelimiter: ['[', ']'],
-        minimumCountSelected: 3,
-        ellipsis: false,
-        multiple: false,
-        multipleWidth: 80,
-        single: false,
-        filter: false,
-        width: undefined,
-        dropWidth: undefined,
-        maxHeight: 250,
-        container: null,
-        position: 'bottom',
-        keepOpen: false,
-        animate: 'none', // 'none', 'fade', 'slide'
-        displayValues: false,
-        delimiter: ', ',
-        addTitle: false,
-        filterAcceptOnEnter: false,
-        hideOptgroupCheckboxes: false,
-
-        selectAllText: 'Tout sélectionner',
-        allSelected: 'Tout sélectionné',
-        countSelected: '# sur % sélectionnés',
-        noMatchesFound: 'Introuvable',
-
-        styler: function () {
-            return false;
-        },
-        textTemplate: function ($elm) {
-            return $elm.html();
-        },
-        labelTemplate: function ($elm) {
-            return $elm.attr('label');
-        },
-
-        onOpen: function () {
-            return false;
-        },
-        onClose: function () {
-            return false;
-        },
-        onCheckAll: function () {
-            return false;
-        },
-        onUncheckAll: function () {
-            return false;
-        },
-        onFocus: function () {
-            return false;
-        },
-        onBlur: function () {
-            return false;
-        },
-        onOptgroupClick: function () {
-            return false;
-        },
-        onClick: function () {
-            return false;
-        },
-        onFilter: function () {
-            return false;
-        }
-    };
-})(jQuery);

core/static/core/js/script.js

@@ -38,7 +38,21 @@ $( function() {
     $("#quick_notif li").click(function () {
         $(this).hide();
     })
-} );
+});
+
+function createQuickNotif(msg) {
+    const el = document.createElement('li')
+    el.textContent = msg
+    el.addEventListener('click', () => el.parentNode.removeChild(el))
+    document.getElementById('quick_notif').appendChild(el)
+}
+
+function deleteQuickNotifs() {
+    const el = document.getElementById('quick_notif')
+    while (el.firstChild) {
+        el.removeChild(el.firstChild)
+    }
+}
 
 function display_notif() {
     $('#header_notif').toggle().parent().toggleClass("white");
@@ -52,4 +66,4 @@ function display_notif() {
 // https://docs.djangoproject.com/en/2.0/ref/csrf/#acquiring-the-token-if-csrf-use-sessions-is-true
 function getCSRFToken() {
     return $("[name=csrfmiddlewaretoken]").val();
-}
+}

core/static/core/multiple-select.css

@@ -1,191 +0,0 @@
-/**
- * @author zhixin wen <wenzhixin2010@gmail.com>
- */
-
-.ms-parent {
-    display: inline-block;
-    position: relative;
-    vertical-align: middle;
-}
-
-.ms-choice {
-    display: block;
-    width: 100%;
-    height: 26px;
-    padding: 0;
-    overflow: hidden;
-    cursor: pointer;
-    border: 1px solid #aaa;
-    text-align: left;
-    white-space: nowrap;
-    line-height: 26px;
-    color: #444;
-    text-decoration: none;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-    background-color: #fff;
-}
-
-.ms-choice.disabled {
-    background-color: #f4f4f4;
-    background-image: none;
-    border: 1px solid #ddd;
-    cursor: default;
-}
-
-.ms-choice > span {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 20px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    display: block;
-    padding-left: 8px;
-}
-
-.ms-choice > span.placeholder {
-    color: #999;
-}
-
-.ms-choice > div {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 20px;
-    height: 25px;
-    background: url('multiple-select.png') left top no-repeat;
-}
-
-.ms-choice > div.open {
-    background: url('multiple-select.png') right top no-repeat;
-}
-
-.ms-drop {
-    width: 100%;
-    overflow: hidden;
-    display: none;
-    margin-top: -1px;
-    padding: 0;
-    position: absolute;
-    z-index: 1000;
-    background: #fff;
-    color: #000;
-    border: 1px solid #aaa;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-
-.ms-drop.bottom {
-    top: 100%;
-    -webkit-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-    -moz-box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-    box-shadow: 0 4px 5px rgba(0, 0, 0, .15);
-}
-
-.ms-drop.top {
-    bottom: 100%;
-    -webkit-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-    -moz-box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-    box-shadow: 0 -4px 5px rgba(0, 0, 0, .15);
-}
-
-.ms-search {
-    display: inline-block;
-    margin: 0;
-    min-height: 26px;
-    padding: 4px;
-    position: relative;
-    white-space: nowrap;
-    width: 100%;
-    z-index: 10000;
-}
-
-.ms-search input {
-    width: 100%;
-    height: auto !important;
-    min-height: 24px;
-    padding: 0 20px 0 5px;
-    margin: 0;
-    outline: 0;
-    font-family: sans-serif;
-    font-size: 1em;
-    border: 1px solid #aaa;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    -webkit-box-shadow: none;
-    -moz-box-shadow: none;
-    box-shadow: none;
-    background: #fff url('multiple-select.png') no-repeat 100% -22px;
-    background: url('multiple-select.png') no-repeat 100% -22px, -webkit-gradient(linear, left bottom, left top, color-stop(0.85, white), color-stop(0.99, #eeeeee));
-    background: url('multiple-select.png') no-repeat 100% -22px, -webkit-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-    background: url('multiple-select.png') no-repeat 100% -22px, -moz-linear-gradient(center bottom, white 85%, #eeeeee 99%);
-    background: url('multiple-select.png') no-repeat 100% -22px, -o-linear-gradient(bottom, white 85%, #eeeeee 99%);
-    background: url('multiple-select.png') no-repeat 100% -22px, -ms-linear-gradient(top, #ffffff 85%, #eeeeee 99%);
-    background: url('multiple-select.png') no-repeat 100% -22px, linear-gradient(top, #ffffff 85%, #eeeeee 99%);
-}
-
-.ms-search, .ms-search input {
-    -webkit-box-sizing: border-box;
-    -khtml-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -ms-box-sizing: border-box;
-    box-sizing: border-box;
-}
-
-.ms-drop ul {
-    overflow: auto;
-    margin: 0;
-    padding: 5px 8px;
-}
-
-.ms-drop ul > li {
-    list-style: none;
-    display: list-item;
-    background-image: none;
-    position: static;
-}
-
-.ms-drop ul > li .disabled {
-    opacity: .35;
-    filter: Alpha(Opacity=35);
-}
-
-.ms-drop ul > li.multiple {
-    display: block;
-    float: left;
-}
-
-.ms-drop ul > li.group {
-    clear: both;
-}
-
-.ms-drop ul > li.multiple label {
-    width: 100%;
-    display: block;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.ms-drop ul > li label {
-    font-weight: normal;
-    display: block;
-    white-space: nowrap;
-}
-
-.ms-drop ul > li label.optgroup {
-    font-weight: bold;
-}
-
-.ms-drop input[type="checkbox"] {
-    vertical-align: middle;
-}
-
-.ms-drop .ms-no-results {
-    display: none;
-}

core/templates/core/base.jinja

@@ -5,7 +5,6 @@
         <title>{% block title %}{% trans %}Welcome!{% endtrans %}{% endblock %} - Association des Étudiants UTBM</title>
         <link rel="shortcut icon" href="{{ static('core/img/favicon.ico') }}">
         <link rel="stylesheet" href="{{ static('core/base.css') }}">
-        <link rel="stylesheet" href="{{ static('core/multiple-select.css') }}">
         <link rel="stylesheet" href="{{ static('core/jquery.datetimepicker.min.css') }}">
         <link rel="stylesheet" href="{{ static('ajax_select/css/ajax_select.css') }}">
         <link rel="stylesheet" href="{{ scss('core/style.scss') }}">
@@ -154,7 +153,7 @@
           <nav>
               <a href="{{ url('core:index') }}">{% trans %}Main{% endtrans %}</a>
               <div class="dropdown">
-                <button class="dropbtn">{% trans %}Associations & Clubs{% endtrans %} 
+                <button class="dropbtn">{% trans %}Associations & Clubs{% endtrans %}
                 <i class="fa fa-caret-down"></i>
                 </button>
                 <div class="dropdown-content">
@@ -166,21 +165,21 @@
                     <a href="{{ url('core:page', page_name='clubs/doceo') }}">{% trans %}Doceo{% endtrans %}</a>
                     <a href="{{ url('core:page', page_name='positions') }}">{% trans %}Positions{% endtrans %}</a>
                 </div>
-              </div> 
+              </div>
               <div class="dropdown">
-                <button class="dropbtn">{% trans %}Events{% endtrans %} 
+                <button class="dropbtn">{% trans %}Events{% endtrans %}
                 <i class="fa fa-caret-down"></i>
                 </button>
                 <div class="dropdown-content">
                     <a href="{{ url('core:page', page_name='Index/calendrier_evenements') }}">{% trans %}Calendar{% endtrans %}</a>
                     <a href="{{ url('core:page', page_name='ga') }}">{% trans %}Big event{% endtrans %}</a>
                 </div>
-              </div> 
+              </div>
               <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
               <a href="{{ url('sas:main') }}">{% trans %}Gallery{% endtrans %}</a>
               <a href="{{ url('eboutic:main') }}">{% trans %}Eboutic{% endtrans %}</a>
               <div class="dropdown">
-                <button class="dropbtn">{% trans %}Services{% endtrans %} 
+                <button class="dropbtn">{% trans %}Services{% endtrans %}
                 <i class="fa fa-caret-down"></i>
                 </button>
                 <div class="dropdown-content">
@@ -189,7 +188,7 @@
                     <a href="{{ url('core:file_list') }}">{% trans %}Files{% endtrans %}</a>
                     <a href="{{ url('pedagogy:guide') }}">{% trans %}Pedagogy{% endtrans %}</a>
                 </div>
-              </div> 
+              </div>
               <div class="dropdown">
                 <button class="dropbtn">{% trans %}My Benefits{% endtrans %}
                 <i class="fa fa-caret-down"></i>
@@ -200,7 +199,7 @@
                 </div>
               </div>
               <div class="dropdown">
-                <button class="dropbtn">{% trans %}Help{% endtrans %} 
+                <button class="dropbtn">{% trans %}Help{% endtrans %}
                 <i class="fa fa-caret-down"></i>
                 </button>
                 <div class="dropdown-content">
@@ -208,7 +207,7 @@
                     <a href="{{ url('core:page', 'contacts') }}">{% trans %}Contacts{% endtrans %}</a>
                     <a href="{{ url('core:page', page_name="Index") }}">{% trans %}Wiki{% endtrans %}</a>
                 </div>
-              </div> 
+              </div>
           </nav>
           {% endif %}
           {% endblock %}
@@ -266,22 +265,9 @@
         <script src="{{ static('core/js/ui/jquery-ui.min.js') }}"></script>
         <script src="{{ static('core/js/ui/i18n/datepicker-fr.js') }}"></script>
         <script src="{{ static('core/js/jquery.datetimepicker.full.min.js') }}"></script>
-        <script src="{{ static('core/js/multiple-select.js') }}"></script>
         <script src="{{ static('ajax_select/js/ajax_select.js') }}"></script>
         <script src="{{ url('javascript-catalog') }}"></script>
         <script>
-$('.select_single').multipleSelect({
-    single: true,
-    {% if not popup %}
-    position: 'top',
-    {% endif %}
-});
-$('.select_multiple').multipleSelect({
-    filter: true,
-    {% if not popup %}
-    position: 'top',
-    {% endif %}
-});
 $('.select_date').datepicker({
     changeMonth: true,
     changeYear: true,

core/templates/core/markdown_textarea.jinja

@@ -5,168 +5,199 @@
 	{# The easymde script can be included twice, it's safe in the code #}
 	<script src="{{ statics.js }}"> </script>
 	<script type="text/javascript">
-		var css = "{{ statics.css }}";
-		var lastAPICall;
+		$(function() {
+			const css = "{{ statics.css }}";
+			let lastAPICall;
 
-		// Only import the css once
-		if (!document.head.innerHTML.includes(css)){
-			document.head.innerHTML += '<link rel="stylesheet" href="' + css + '">';
-		}
+			// Only import the css once
+			if (!document.head.innerHTML.includes(css)) {
+				document.head.innerHTML += '<link rel="stylesheet" href="' + css + '">';
+			}
 
-		// Custom markdown parser
-		function customMarkdownParser(plainText, preview) {
-			$.ajax({
-				url: "{{ markdown_api_url }}",
-				method: "POST",
-				data: { text: plainText, csrfmiddlewaretoken: getCSRFToken() },
-			}).done(function (msg) {
-				preview.innerHTML = msg;
+			// Custom markdown parser
+			function customMarkdownParser(plainText, cb) {
+				$.ajax({
+					url: "{{ markdown_api_url }}",
+					method: "POST",
+					data: { text: plainText, csrfmiddlewaretoken: getCSRFToken() },
+				}).done(cb);
+			}
+
+			// Pretty markdown input
+			const easymde = new EasyMDE({
+				element: document.getElementById("{{ widget.attrs.id }}"),
+				spellChecker: false,
+				autoDownloadFontAwesome: false,
+				previewRender: function(plainText, preview) { // Async method
+					clearTimeout(lastAPICall);
+					lastAPICall = setTimeout(() => {
+						customMarkdownParser(plainText, (msg) => preview.innerHTML = msg);
+					}, 300);
+					return preview.innerHTML;
+				},
+				forceSync: true, // Avoid validation error on generic create view
+				toolbar: [
+					{
+						name: "heading-smaller",
+						action: EasyMDE.toggleHeadingSmaller,
+						className: "fa fa-header",
+						title: "{{ translations.heading_smaller }}"
+					},
+					{
+						name: "italic",
+						action: EasyMDE.toggleItalic,
+						className: "fa fa-italic",
+						title: "{{ translations.italic }}"
+					},
+					{
+						name: "bold",
+						action: EasyMDE.toggleBold,
+						className: "fa fa-bold",
+						title: "{{ translations.bold }}"
+					},
+					{
+						name: "strikethrough",
+						action: EasyMDE.toggleStrikethrough,
+						className: "fa fa-strikethrough",
+						title: "{{ translations.strikethrough }}"
+					},
+					{
+						name: "underline",
+						action: function customFunction(editor){
+							let cm = editor.codemirror;
+							cm.replaceSelection('__' + cm.getSelection() + '__');
+						},
+						className: "fa fa-underline",
+						title: "{{ translations.underline }}"
+					},
+					{
+						name: "superscript",
+						action: function customFunction(editor){
+							let cm = editor.codemirror;
+							cm.replaceSelection('<sup>' + cm.getSelection() + '</sup>');
+						},
+						className: "fa fa-superscript",
+						title: "{{ translations.superscript }}"
+					},
+					{
+						name: "subscript",
+						action: function customFunction(editor){
+							let cm = editor.codemirror;
+							cm.replaceSelection('<sub>' + cm.getSelection() + '</sub>');
+						},
+						className: "fa fa-subscript",
+						title: "{{ translations.subscript }}"
+					},
+					{
+						name: "code",
+						action: EasyMDE.toggleCodeBlock,
+						className: "fa fa-code",
+						title: "{{ translations.code }}"
+					},
+					"|",
+					{
+						name: "quote",
+						action: EasyMDE.toggleBlockquote,
+						className: "fa fa-quote-left",
+						title: "{{ translations.quote }}"
+					},
+					{
+						name: "unordered-list",
+						action: EasyMDE.toggleUnorderedList,
+						className: "fa fa-list-ul",
+						title: "{{ translations.unordered_list }}"
+					},
+					{
+						name: "ordered-list",
+						action: EasyMDE.toggleOrderedList,
+						className: "fa fa-list-ol",
+						title: "{{ translations.ordered_list }}"
+					},
+					"|",
+					{
+						name: "link",
+						action: EasyMDE.drawLink,
+						className: "fa fa-link",
+						title: "{{ translations.link }}"
+					},
+					{
+						name: "image",
+						action: EasyMDE.drawImage,
+						className: "fa fa-picture-o",
+						title: "{{ translations.image }}"
+					},
+					{
+						name: "table",
+						action: EasyMDE.drawTable,
+						className: "fa fa-table",
+						title: "{{ translations.table }}"
+					},
+					"|",
+					{
+						name: "clean-block",
+						action: EasyMDE.cleanBlock,
+						className: "fa fa-eraser fa-clean-block",
+						title: "{{ translations.clean_block }}"
+					},
+					"|",
+					{
+						name: "preview",
+						action: EasyMDE.togglePreview,
+						className: "fa fa-eye no-disable",
+						title: "{{ translations.preview }}"
+					},
+					{
+						name: "side-by-side",
+						action: EasyMDE.toggleSideBySide,
+						className: "fa fa-columns no-disable no-mobile",
+						title: "{{ translations.side_by_side }}"
+					},
+					{
+						name: "fullscreen",
+						action: EasyMDE.toggleFullScreen,
+						className: "fa fa-arrows-alt no-disable no-mobile",
+						title: "{{ translations.fullscreen }}"
+					},
+					"|",
+					{
+						name: "guide",
+						action: "/page/Aide_sur_la_syntaxe",
+						className: "fa fa-question-circle",
+						title: "{{ translations.guide }}"
+					},
+				]
 			});
-		}
 
-		// Pretty markdown input
-		var easymde = new EasyMDE({
-			element: document.getElementById("{{ widget.attrs.id }}"),
-			spellChecker: false,
-			autoDownloadFontAwesome: false,
-			previewRender: function(plainText, preview){ // Async method
-				clearTimeout(lastAPICall);
-				lastAPICall = setTimeout(function (plainText, preview){
-					customMarkdownParser(plainText, preview);
-				}, 300, plainText, preview);
-				return preview.innerHTML;
-			},
-			forceSync: true, // Avoid validation error on generic create view
-			toolbar: [
-				{
-					name: "heading-smaller",
-					action: EasyMDE.toggleHeadingSmaller,
-					className: "fa fa-header",
-					title: "{{ translations.heading_smaller }}"
-				},
-				{
-					name: "italic",
-					action: EasyMDE.toggleItalic,
-					className: "fa fa-italic",
-					title: "{{ translations.italic }}"
-				},
-				{
-					name: "bold",
-					action: EasyMDE.toggleBold,
-					className: "fa fa-bold",
-					title: "{{ translations.bold }}"
-				},
-				{
-					name: "strikethrough",
-					action: EasyMDE.toggleStrikethrough,
-					className: "fa fa-strikethrough",
-					title: "{{ translations.strikethrough }}"
-				},
-				{
-					name: "underline",
-					action: function customFunction(editor){
-						var cm = editor.codemirror;
-						cm.replaceSelection('__' + cm.getSelection() + '__');
-					},
-					className: "fa fa-underline",
-					title: "{{ translations.underline }}"
-				},
-				{
-					name: "superscript",
-					action: function customFunction(editor){
-						var cm = editor.codemirror;
-						cm.replaceSelection('<sup>' + cm.getSelection() + '</sup>');
-					},
-					className: "fa fa-superscript",
-					title: "{{ translations.superscript }}"
-				},
-				{
-					name: "subscript",
-					action: function customFunction(editor){
-						var cm = editor.codemirror;
-						cm.replaceSelection('<sub>' + cm.getSelection() + '</sub>');
-					},
-					className: "fa fa-subscript",
-					title: "{{ translations.subscript }}"
-				},
-				{
-					name: "code",
-					action: EasyMDE.toggleCodeBlock,
-					className: "fa fa-code",
-					title: "{{ translations.code }}"
-				},
-				"|",
-				{
-					name: "quote",
-					action: EasyMDE.toggleBlockquote,
-					className: "fa fa-quote-left",
-					title: "{{ translations.quote }}"
-				},
-				{
-					name: "unordered-list",
-					action: EasyMDE.toggleUnorderedList,
-					className: "fa fa-list-ul",
-					title: "{{ translations.unordered_list }}"
-				},
-				{
-					name: "ordered-list",
-					action: EasyMDE.toggleOrderedList,
-					className: "fa fa-list-ol",
-					title: "{{ translations.ordered_list }}"
-				},
-				"|",
-				{
-					name: "link",
-					action: EasyMDE.drawLink,
-					className: "fa fa-link",
-					title: "{{ translations.link }}"
-				},
-				{
-					name: "image",
-					action: EasyMDE.drawImage,
-					className: "fa fa-picture-o",
-					title: "{{ translations.image }}"
-				},
-				{
-					name: "table",
-					action: EasyMDE.drawTable,
-					className: "fa fa-table",
-					title: "{{ translations.table }}"
-				},
-				"|",
-				{
-					name: "clean-block",
-					action: EasyMDE.cleanBlock,
-					className: "fa fa-eraser fa-clean-block",
-					title: "{{ translations.clean_block }}"
-				},
-				"|",
-				{
-					name: "preview",
-					action: EasyMDE.togglePreview,
-					className: "fa fa-eye no-disable",
-					title: "{{ translations.preview }}"
-				},
-				{
-					name: "side-by-side",
-					action: EasyMDE.toggleSideBySide,
-					className: "fa fa-columns no-disable no-mobile",
-					title: "{{ translations.side_by_side }}"
-				},
-				{
-					name: "fullscreen",
-					action: EasyMDE.toggleFullScreen,
-					className: "fa fa-arrows-alt no-disable no-mobile",
-					title: "{{ translations.fullscreen }}"
-				},
-				"|",
-				{
-					name: "guide",
-					action: "/page/Aide_sur_la_syntaxe",
-					className: "fa fa-question-circle",
-					title: "{{ translations.guide }}"
-				},
-			]
-		});
+			const textarea = document.getElementById('{{ widget.attrs.id }}');
+			const submits = textarea
+				.closest('form')
+				.querySelectorAll('input[type="submit"]');
+			const parentDiv = textarea.parentElement;
+			let submitPressed = false;
+
+			function checkMarkdownInput(e) {
+				// an attribute is null if it does not exist, else a string
+				const required = textarea.getAttribute('required') != null;
+				const length = textarea.value.trim().length;
+
+				if (required && length == 0) {
+					parentDiv.style.boxShadow = 'red 0px 0px 1.5px 1px';
+				} else {
+					parentDiv.style.boxShadow = '';
+				}
+			}
+
+			function onSubmitClick(e) {
+				if (!submitPressed) {
+					easymde.codemirror.on('change', checkMarkdownInput);
+				}
+				submitPressed = true;
+				checkMarkdownInput(e);
+			}
+
+			submits.forEach((submit) => {
+				submit.addEventListener('click', onSubmitClick);
+			})
+		})
 	</script>
-</div>
+</div>

core/templates/core/user_detail.jinja

@@ -200,7 +200,7 @@ $( function() {
         keys.push(e.keyCode);
         if (keys.toString()==pattern) {
                 keys = [];
-                $("#right_column img").attr("src", "{{ static('core/img/yug.jpg') }}");
+                $("#user_profile_pictures_bigone img").attr("src", "{{ static('core/img/yug.jpg') }}");
         }
         if (keys.length==6) {
             keys.shift();

core/views/__init__.py

@@ -140,6 +140,52 @@ def can_view(obj, user):
     return can_edit(obj, user)
 
 
+class GenericContentPermissionMixinBuilder(View):
+    """
+    Used to build permission mixins
+    This view protect any child view that would be showing an object that is restricted based
+      on two properties
+
+    :prop permission_function: function to test permission with, takes an object and an user an return a bool
+    :prop raised_error: permission to be raised
+
+    :raises: raised_error
+    """
+
+    permission_function = lambda obj, user: False
+    raised_error = PermissionDenied
+
+    @classmethod
+    def get_permission_function(cls, obj, user):
+        return cls.permission_function(obj, user)
+
+    def dispatch(self, request, *arg, **kwargs):
+
+        if hasattr(self, "get_object") and callable(self.get_object):
+            self.object = self.get_object()
+            if not self.get_permission_function(self.object, request.user):
+                raise self.raised_error
+            return super(GenericContentPermissionMixinBuilder, self).dispatch(
+                request, *arg, **kwargs
+            )
+
+        # If we get here, it's a ListView
+
+        queryset = self.get_queryset()
+        l_id = [o.id for o in queryset if self.get_permission_function(o, request.user)]
+        if not l_id and queryset.count() != 0:
+            raise self.raised_error
+        self._get_queryset = self.get_queryset
+
+        def get_qs(self2):
+            return self2._get_queryset().filter(id__in=l_id)
+
+        self.get_queryset = types.MethodType(get_qs, self)
+        return super(GenericContentPermissionMixinBuilder, self).dispatch(
+            request, *arg, **kwargs
+        )
+
+
 class CanCreateMixin(View):
     """
     This view is made to protect any child view that would create an object, and thus, that can not be protected by any
@@ -161,7 +207,7 @@ class CanCreateMixin(View):
         raise PermissionDenied
 
 
-class CanEditPropMixin(View):
+class CanEditPropMixin(GenericContentPermissionMixinBuilder):
     """
     This view is made to protect any child view that would be showing some properties of an object that are restricted
     to only the owner group of the given object.
@@ -171,28 +217,10 @@ class CanEditPropMixin(View):
     :raises: PermissionDenied
     """
 
-    def dispatch(self, request, *arg, **kwargs):
-        try:
-            self.object = self.get_object()
-            if can_edit_prop(self.object, request.user):
-                return super(CanEditPropMixin, self).dispatch(request, *arg, **kwargs)
-            return forbidden(request)
-        except:
-            pass
-        # If we get here, it's a ListView
-        l_id = [o.id for o in self.get_queryset() if can_edit_prop(o, request.user)]
-        if not l_id and self.get_queryset().count() != 0:
-            raise PermissionDenied
-        self._get_queryset = self.get_queryset
-
-        def get_qs(self2):
-            return self2._get_queryset().filter(id__in=l_id)
-
-        self.get_queryset = types.MethodType(get_qs, self)
-        return super(CanEditPropMixin, self).dispatch(request, *arg, **kwargs)
+    permission_function = can_edit_prop
 
 
-class CanEditMixin(View):
+class CanEditMixin(GenericContentPermissionMixinBuilder):
     """
     This view makes exactly the same thing as its direct parent, but checks the group on the edit_groups field of the
     object
@@ -200,28 +228,10 @@ class CanEditMixin(View):
     :raises: PermissionDenied
     """
 
-    def dispatch(self, request, *arg, **kwargs):
-        try:
-            self.object = self.get_object()
-            if can_edit(self.object, request.user):
-                return super(CanEditMixin, self).dispatch(request, *arg, **kwargs)
-            return forbidden(request)
-        except:
-            pass
-        # If we get here, it's a ListView
-        l_id = [o.id for o in self.get_queryset() if can_edit(o, request.user)]
-        if not l_id and self.get_queryset().count() != 0:
-            raise PermissionDenied
-        self._get_queryset = self.get_queryset
-
-        def get_qs(self2):
-            return self2._get_queryset().filter(id__in=l_id)
-
-        self.get_queryset = types.MethodType(get_qs, self)
-        return super(CanEditMixin, self).dispatch(request, *arg, **kwargs)
+    permission_function = can_edit
 
 
-class CanViewMixin(View):
+class CanViewMixin(GenericContentPermissionMixinBuilder):
     """
     This view still makes exactly the same thing as its direct parent, but checks the group on the view_groups field of
     the object
@@ -229,28 +239,7 @@ class CanViewMixin(View):
     :raises: PermissionDenied
     """
 
-    def dispatch(self, request, *arg, **kwargs):
-
-        try:
-            self.object = self.get_object()
-            if can_view(self.object, request.user):
-                return super(CanViewMixin, self).dispatch(request, *arg, **kwargs)
-            return forbidden(request)
-        except:
-            pass
-        # If we get here, it's a ListView
-        queryset = self.get_queryset()
-
-        l_id = [o.id for o in queryset if can_view(o, request.user)]
-        if not l_id and queryset.count() != 0:
-            raise PermissionDenied
-        self._get_queryset = self.get_queryset
-
-        def get_qs(self2):
-            return self2._get_queryset().filter(id__in=l_id)
-
-        self.get_queryset = types.MethodType(get_qs, self)
-        return super(CanViewMixin, self).dispatch(request, *arg, **kwargs)
+    permission_function = can_view
 
 
 class FormerSubscriberMixin(View):

core/views/forms.py

@@ -55,24 +55,6 @@ from PIL import Image
 # Widgets
 
 
-class SelectSingle(Select):
-    def render(self, name, value, attrs=None, renderer=None):
-        if attrs:
-            attrs["class"] = "select_single"
-        else:
-            attrs = {"class": "select_single"}
-        return super(SelectSingle, self).render(name, value, attrs, renderer)
-
-
-class SelectMultiple(Select):
-    def render(self, name, value, attrs=None, renderer=None):
-        if attrs:
-            attrs["class"] = "select_multiple"
-        else:
-            attrs = {"class": "select_multiple"}
-        return super(SelectMultiple, self).render(name, value, attrs, renderer)
-
-
 class SelectDateTime(DateTimeInput):
     def render(self, name, value, attrs=None, renderer=None):
         if attrs:

counter/models.py

@@ -478,6 +478,10 @@ class Selling(models.Model):
         return user.is_owner(self.counter) and self.payment_method != "CARD"
 
     def can_be_viewed_by(self, user):
+        if (
+            not hasattr(self, "customer") or self.customer is None
+        ):  # Customer can be set to Null
+            return False
         return user == self.customer.user
 
     def delete(self, *args, **kwargs):

counter/templates/counter/eticket_list.jinja

@@ -10,7 +10,7 @@
 <h3>{% trans %}Eticket list{% endtrans %}</h3>
 <ul>
     {% for t in eticket_list  %}
-    <li><a href="{{ url('counter:edit_eticket', eticket_id=t.id) }}">{{ t }}</a> (ID: {{ t.id }} | Hash: <code>{{ t.secret }}</code>)</li>
+    <li><a href="{{ url('counter:edit_eticket', eticket_id=t.id) }}">{{ t }}</a> (ID: {{ t.product.id }} | Hash: <code>{{ t.secret }}</code>)</li>
     {% endfor %}
 </ul>
 {% else %}

counter/views.py

@@ -1752,7 +1752,11 @@ class EticketPDFView(CanViewMixin, DetailView):
         from reportlab.graphics.barcode.qr import QrCodeWidget
         from reportlab.graphics import renderPDF
 
-        self.object = self.get_object()
+        if not (
+            hasattr(self.object, "product") and hasattr(self.object.product, "eticket")
+        ):
+            raise Http404
+
         eticket = self.object.product.eticket
         user = self.object.customer.user
         code = "%s %s %s %s" % (

eboutic/templates/eboutic/eboutic_main.jinja

@@ -31,10 +31,22 @@
         {{ add_product(i.product_id, '+') }} {{ i.product_name }}: {{ "%0.2f"|format(i.product_unit_price*i.quantity) }} €</li>
         {% endfor %}
     </ul>
-    <p><strong>{% trans %}Total: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong></p>
+    <p>
+        <strong>{% trans %}Basket amount: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong>
+
+        {% if customer_amount != None %}
+        <br>
+        {% trans %}Current account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
+        <br>
+        {% trans %}Remaining account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount - basket.get_total()) }} €</strong>
+        {% endif %}
+    </p>
+
     <form method="post" action="{{ url('eboutic:command') }}">
         {% csrf_token %}
+        <p>
         <input type="submit" value="{% trans %}Proceed to command{% endtrans %}" />
+        </p>
     </form>
 </div>
 <div>

eboutic/templates/eboutic/eboutic_makecommand.jinja

@@ -27,13 +27,25 @@
             {% endfor %}
         <tbody>
     </table>
-    <p><strong>Total: </strong>{{ basket.get_total() }} €</p>
+
+    <p>
+        <strong>{% trans %}Basket amount: {% endtrans %}{{ "%0.2f"|format(basket.get_total()) }} €</strong>
+
+        {% if customer_amount != None %}
+        <br>
+        {% trans %}Current account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount) }} €</strong>
+        <br>
+        {% trans %}Remaining account amount: {% endtrans %}<strong>{{ "%0.2f"|format(customer_amount - basket.get_total()) }} €</strong>
+        {% endif %}
+    </p>
     {% if settings.SITH_EBOUTIC_CB_ENABLED %}
     <form method="post" action="{{ settings.SITH_EBOUTIC_ET_URL }}">
+        <p>
         {% for (field_name,field_value) in et_request.items() -%}
         <input type="hidden" name="{{ field_name }}" value="{{ field_value }}">
         {% endfor %}
         <input type="submit" value="{% trans %}Pay with credit card{% endtrans %}" />
+        </p>
     </form>
     {% endif %}
     {% if basket.items.filter(type_id=settings.SITH_COUNTER_PRODUCTTYPE_REFILLING).exists() %}

eboutic/views.py

@@ -107,6 +107,10 @@ class EbouticMain(TemplateView):
         kwargs["basket"] = self.basket
         kwargs["eboutic"] = Counter.objects.filter(type="EBOUTIC").first()
         kwargs["categories"] = ProductType.objects.all()
+        if hasattr(self.request.user, "customer"):
+            kwargs["customer_amount"] = self.request.user.customer.amount
+        else:
+            kwargs["customer_amount"] = None
         if not self.request.user.was_subscribed:
             kwargs["categories"] = kwargs["categories"].exclude(
                 id=settings.SITH_PRODUCTTYPE_SUBSCRIPTION
@@ -150,6 +154,10 @@ class EbouticCommand(TemplateView):
 
     def get_context_data(self, **kwargs):
         kwargs = super(EbouticCommand, self).get_context_data(**kwargs)
+        if hasattr(self.request.user, "customer"):
+            kwargs["customer_amount"] = self.request.user.customer.amount
+        else:
+            kwargs["customer_amount"] = None
         kwargs["et_request"] = OrderedDict()
         kwargs["et_request"]["PBX_SITE"] = settings.SITH_EBOUTIC_PBX_SITE
         kwargs["et_request"]["PBX_RANG"] = settings.SITH_EBOUTIC_PBX_RANG

pedagogy/templates/pedagogy/uv_edit.jinja

@@ -0,0 +1,86 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}
+{% trans %}Edit UV{% endtrans %}
+{% endblock %}
+
+{% block content %}
+<h2>{% trans %}Edit UV{% endtrans %}</h2>
+<form action="" method="post" enctype="multipart/form-data" id="uv_edit">
+    {% csrf_token %}
+    {{ form.non_field_errors() }}
+
+    {% for field in form %}
+
+    {% if field.is_hidden %}
+
+        {{ field }}
+
+    {% else %}
+    <p>
+        {{ field.errors }}
+        <label for="{{ field.name }}">{{ field.label }}</label>
+        {{ field }}
+
+
+        {% if field.name == 'code' %}
+        <button type="button" id="autofill">{% trans %}Import from UTBM{% endtrans %}</button>
+        {% endif %}
+    </p>
+    {% endif %}
+
+
+    {% endfor %}
+
+
+    <p><input type="submit" value="{% trans %}Update{% endtrans %}" /></p>
+</form>
+{% endblock %}
+
+{% block script %}
+{{ super() }}
+
+<script type="text/javascript">
+    document.addEventListener('DOMContentLoaded', function() {
+        const autofillBtn = document.getElementById('autofill')
+        const codeInput = document.querySelector('input[name="code"]')
+
+        autofillBtn.addEventListener('click', () => {
+            const today = new Date()
+            let year = today.getFullYear()
+            if (today.getMonth() < 7) {  // student year starts in september
+                year--
+            }
+            const url = "{{ url('api:uv_endpoint') }}?year=" + year + "&code=" + codeInput.value
+            deleteQuickNotifs()
+
+            $.ajax({
+                dataType: "json",
+                url: url,
+                success: function(data, _, xhr) {
+                    if (xhr.status != 200) {
+                        createQuickNotif("{% trans %}Unknown UV code{% endtrans %}")
+                        return
+                    }
+                    for (let key in data) {
+                        if (data.hasOwnProperty(key)) {
+                            const el = document.querySelector('[name="' + key + '"]')
+                            if (el.tagName == 'TEXTAREA') {
+                                el.parentNode.querySelector('.CodeMirror').CodeMirror.setValue(data[key])
+                            } else {
+                                el.value = data[key]
+                            }
+
+                        }
+                    }
+
+                    createQuickNotif('{% trans %}Successful autocomplete{% endtrans %}')
+                },
+                error: function(_, _, statusMessage) {
+                    createQuickNotif('{% trans %}An error occured: {% endtrans %}' + statusMessage)
+                },
+            })
+        })
+    })
+</script>
+{% endblock %}

pedagogy/views.py

@@ -294,7 +294,7 @@ class UVCreateView(CanCreateMixin, CreateView):
 
     model = UV
     form_class = UVForm
-    template_name = "core/edit.jinja"
+    template_name = "pedagogy/uv_edit.jinja"
 
     def get_form_kwargs(self):
         kwargs = super(UVCreateView, self).get_form_kwargs()
@@ -326,7 +326,7 @@ class UVUpdateView(CanEditPropMixin, UpdateView):
     model = UV
     form_class = UVForm
     pk_url_kwarg = "uv_id"
-    template_name = "core/edit.jinja"
+    template_name = "pedagogy/uv_edit.jinja"
 
     def get_form_kwargs(self):
         kwargs = super(UVUpdateView, self).get_form_kwargs()

sith/settings.py

@@ -196,6 +196,8 @@ SASS_PRECISION = 8
 
 WSGI_APPLICATION = "sith.wsgi.application"
 
+REST_FRAMEWORK = {}
+
 
 # Database
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
@@ -252,6 +254,7 @@ LOGOUT_URL = "/logout"
 LOGIN_REDIRECT_URL = "/"
 DEFAULT_FROM_EMAIL = "bibou@git.an"
 SITH_COM_EMAIL = "bibou_com@git.an"
+REST_FRAMEWORK["UNAUTHENTICATED_USER"] = "core.models.AnonymousUser"
 
 # Email
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
@@ -442,6 +445,8 @@ SITH_PEDAGOGY_UV_RESULT_GRADE = [
     ("ABS", _("Abs")),
 ]
 
+SITH_PEDAGOGY_UTBM_API = "https://extranet1.utbm.fr/gpedago/api/guide"
+
 SITH_ECOCUP_CONS = 1152
 
 SITH_ECOCUP_DECO = 1151