API doc: ameliore script sample + sample evaluation

.pylintrc

@@ -20,5 +20,5 @@ ignored-classes=Permission,
 # supports qualified module names, as well as Unix pattern matching.
 ignored-modules=entreprises
 
-good-names=d,e,f,i,j,k,n,nt,t,u,ue,v,x,y,z,H,F
+good-names=d,df,e,f,i,j,k,n,nt,t,u,ue,v,x,y,z,H,F
 

app/api/jury.py

@@ -10,7 +10,7 @@
 
 import datetime
 
-from flask import flash, g, request, url_for
+from flask import g, request, url_for
 from flask_json import as_json
 from flask_login import current_user, login_required
 

app/scodoc/sco_cal.py

@@ -0,0 +1,511 @@
+# -*- mode: python -*-
+# -*- coding: utf-8 -*-
+
+##############################################################################
+#
+# Gestion scolarite IUT
+#
+# Copyright (c) 1999 - 2023 Emmanuel Viennet.  All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#   Emmanuel Viennet      emmanuel.viennet@viennet.net
+#
+##############################################################################
+
+"""Génération calendrier (ancienne présentation)
+"""
+
+import calendar
+import datetime
+import html
+import time
+
+from app.scodoc.sco_exceptions import ScoValueError, ScoInvalidDateError
+from app.scodoc import sco_preferences
+import app.scodoc.sco_utils as scu
+
+
+def is_work_saturday():
+    "Vrai si le samedi est travaillé"
+    return int(sco_preferences.get_preference("work_saturday"))
+
+
+def MonthNbDays(month, year):
+    "returns nb of days in month"
+    if month > 7:
+        month = month + 1
+    if month % 2:
+        return 31
+    elif month == 2:
+        if calendar.isleap(year):
+            return 29
+        else:
+            return 28
+    else:
+        return 30
+
+
+class ddmmyyyy(object):
+    """immutable dates"""
+
+    def __init__(self, date=None, fmt="ddmmyyyy", work_saturday=False):
+        self.work_saturday = work_saturday
+        if date is None:
+            return
+        try:
+            if fmt == "ddmmyyyy":
+                self.day, self.month, self.year = date.split("/")
+            elif fmt == "iso":
+                self.year, self.month, self.day = date.split("-")
+            else:
+                raise ValueError("invalid format spec. (%s)" % fmt)
+            self.year = int(self.year)
+            self.month = int(self.month)
+            self.day = int(self.day)
+        except ValueError:
+            raise ScoValueError("date invalide: %s" % date)
+        # accept years YYYY or YY, uses 1970 as pivot
+        if self.year < 1970:
+            if self.year > 100:
+                raise ScoInvalidDateError("Année invalide: %s" % self.year)
+            if self.year < 70:
+                self.year = self.year + 2000
+            else:
+                self.year = self.year + 1900
+        if self.month < 1 or self.month > 12:
+            raise ScoInvalidDateError("Mois invalide: %s" % self.month)
+
+        if self.day < 1 or self.day > MonthNbDays(self.month, self.year):
+            raise ScoInvalidDateError("Jour invalide: %s" % self.day)
+
+        # weekday in 0-6, where 0 is monday
+        self.weekday = calendar.weekday(self.year, self.month, self.day)
+
+        self.time = time.mktime((self.year, self.month, self.day, 0, 0, 0, 0, 0, 0))
+
+    def iswork(self):
+        "returns true if workable day"
+        if self.work_saturday:
+            nbdays = 6
+        else:
+            nbdays = 5
+        if (
+            self.weekday >= 0 and self.weekday < nbdays
+        ):  # monday-friday or monday-saturday
+            return 1
+        else:
+            return 0
+
+    def __repr__(self):
+        return "'%02d/%02d/%04d'" % (self.day, self.month, self.year)
+
+    def __str__(self):
+        return "%02d/%02d/%04d" % (self.day, self.month, self.year)
+
+    def ISO(self):
+        "iso8601 representation of the date"
+        return "%04d-%02d-%02d" % (self.year, self.month, self.day)
+
+    def next_day(self, days=1):
+        "date for the next day (nota: may be a non workable day)"
+        day = self.day + days
+        month = self.month
+        year = self.year
+
+        while day > MonthNbDays(month, year):
+            day = day - MonthNbDays(month, year)
+            month = month + 1
+            if month > 12:
+                month = 1
+                year = year + 1
+        return self.__class__(
+            "%02d/%02d/%04d" % (day, month, year), work_saturday=self.work_saturday
+        )
+
+    def prev(self, days=1):
+        "date for previous day"
+        day = self.day - days
+        month = self.month
+        year = self.year
+        while day <= 0:
+            month = month - 1
+            if month == 0:
+                month = 12
+                year = year - 1
+            day = day + MonthNbDays(month, year)
+
+        return self.__class__(
+            "%02d/%02d/%04d" % (day, month, year), work_saturday=self.work_saturday
+        )
+
+    def next_monday(self):
+        "date of next monday"
+        return self.next_day((7 - self.weekday) % 7)
+
+    def prev_monday(self):
+        "date of last monday, but on sunday, pick next monday"
+        if self.weekday == 6:
+            return self.next_monday()
+        else:
+            return self.prev(self.weekday)
+
+    def __cmp__(self, other):  # #py3 TODO à supprimer
+        """return a negative integer if self < other,
+        zero if self == other, a positive integer if self > other"""
+        return int(self.time - other.time)
+
+    def __eq__(self, other):
+        return self.time == other.time
+
+    def __ne__(self, other):
+        return self.time != other.time
+
+    def __lt__(self, other):
+        return self.time < other.time
+
+    def __le__(self, other):
+        return self.time <= other.time
+
+    def __gt__(self, other):
+        return self.time > other.time
+
+    def __ge__(self, other):
+        return self.time >= other.time
+
+    def __hash__(self):
+        "we are immutable !"
+        return hash(self.time) ^ hash(str(self))
+
+
+# d = ddmmyyyy( '21/12/99' )
+def DateRangeISO(date_beg, date_end, workable=1):
+    """returns list of dates in [date_beg,date_end]
+    workable = 1 => keeps only workable days"""
+    if not date_beg:
+        raise ScoValueError("pas de date spécifiée !")
+    if not date_end:
+        date_end = date_beg
+    r = []
+    work_saturday = is_work_saturday()
+    try:
+        cur = ddmmyyyy(date_beg, work_saturday=work_saturday)
+        end = ddmmyyyy(date_end, work_saturday=work_saturday)
+    except (AttributeError, ValueError) as e:
+        raise ScoValueError("date invalide !") from e
+    while cur <= end:
+        if (not workable) or cur.iswork():
+            r.append(cur)
+        cur = cur.next_day()
+
+    return [x.ISO() for x in r]
+
+
+def day_names():
+    """Returns week day names.
+    If work_saturday property is set, include saturday
+    """
+    if is_work_saturday():
+        return scu.DAY_NAMES[:-1]
+    else:
+        return scu.DAY_NAMES[:-2]
+
+
+def next_iso_day(date):
+    "return date after date"
+    d = ddmmyyyy(date, fmt="iso", work_saturday=is_work_saturday())
+    return d.next_day().ISO()
+
+
+def YearTable(
+    year,
+    events=[],
+    firstmonth=9,
+    lastmonth=7,
+    halfday=0,
+    dayattributes="",
+    pad_width=8,
+):
+    """Generate a calendar table
+    events = list of tuples (date, text, color, href [,halfday])
+             where date is a string in ISO format (yyyy-mm-dd)
+             halfday is boolean (true: morning, false: afternoon)
+    text  = text to put in calendar (must be short, 1-5 cars) (optional)
+    if halfday, generate 2 cells per day (morning, afternoon)
+    """
+    T = [
+        '<table id="maincalendar" class="maincalendar" border="3" cellpadding="1" cellspacing="1" frame="box">'
+    ]
+    T.append("<tr>")
+    month = firstmonth
+    while 1:
+        T.append('<td valign="top">')
+        T.append(MonthTableHead(month))
+        T.append(
+            MonthTableBody(
+                month,
+                year,
+                events,
+                halfday,
+                dayattributes,
+                is_work_saturday(),
+                pad_width=pad_width,
+            )
+        )
+        T.append(MonthTableTail())
+        T.append("</td>")
+        if month == lastmonth:
+            break
+        month = month + 1
+        if month > 12:
+            month = 1
+            year = year + 1
+    T.append("</table>")
+    return "\n".join(T)
+
+
+# ------ HTML Calendar functions (see YearTable function)
+
+# MONTH/DAY NAMES:
+
+MONTHNAMES = (
+    "Janvier",
+    "Février",
+    "Mars",
+    "Avril",
+    "Mai",
+    "Juin",
+    "Juillet",
+    "Aout",
+    "Septembre",
+    "Octobre",
+    "Novembre",
+    "Décembre",
+)
+
+MONTHNAMES_ABREV = (
+    "Jan.",
+    "Fév.",
+    "Mars",
+    "Avr.",
+    "Mai&nbsp;",
+    "Juin",
+    "Juil",
+    "Aout",
+    "Sept",
+    "Oct.",
+    "Nov.",
+    "Déc.",
+)
+
+DAYNAMES = ("Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi", "Dimanche")
+
+DAYNAMES_ABREV = ("L", "M", "M", "J", "V", "S", "D")
+
+# COLORS:
+
+WHITE = "#FFFFFF"
+GRAY1 = "#EEEEEE"
+GREEN3 = "#99CC99"
+WEEKDAYCOLOR = GRAY1
+WEEKENDCOLOR = GREEN3
+
+
+def MonthTableHead(month):
+    color = WHITE
+    return """<table class="monthcalendar" border="0" cellpadding="0" cellspacing="0" frame="box">
+     <tr bgcolor="%s"><td class="calcol" colspan="2" align="center">%s</td></tr>\n""" % (
+        color,
+        MONTHNAMES_ABREV[month - 1],
+    )
+
+
+def MonthTableTail():
+    return "</table>\n"
+
+
+def MonthTableBody(
+    month, year, events=[], halfday=0, trattributes="", work_saturday=False, pad_width=8
+):
+    firstday, nbdays = calendar.monthrange(year, month)
+    localtime = time.localtime()
+    current_weeknum = time.strftime("%U", localtime)
+    current_year = localtime[0]
+    T = []
+    # cherche date du lundi de la 1ere semaine de ce mois
+    monday = ddmmyyyy("1/%d/%d" % (month, year))
+    while monday.weekday != 0:
+        monday = monday.prev()
+
+    if work_saturday:
+        weekend = ("D",)
+    else:
+        weekend = ("S", "D")
+
+    if not halfday:
+        for d in range(1, nbdays + 1):
+            weeknum = time.strftime(
+                "%U", time.strptime("%d/%d/%d" % (d, month, year), "%d/%m/%Y")
+            )
+            day = DAYNAMES_ABREV[(firstday + d - 1) % 7]
+            if day in weekend:
+                bgcolor = WEEKENDCOLOR
+                weekclass = "wkend"
+                attrs = ""
+            else:
+                bgcolor = WEEKDAYCOLOR
+                weekclass = "wk" + str(monday).replace("/", "_")
+                attrs = trattributes
+            color = None
+            legend = ""
+            href = ""
+            descr = ""
+            # event this day ?
+            # each event is a tuple (date, text, color, href)
+            #  where date is a string in ISO format (yyyy-mm-dd)
+            for ev in events:
+                ev_year = int(ev[0][:4])
+                ev_month = int(ev[0][5:7])
+                ev_day = int(ev[0][8:10])
+                if year == ev_year and month == ev_month and ev_day == d:
+                    if ev[1]:
+                        legend = ev[1]
+                    if ev[2]:
+                        color = ev[2]
+                    if ev[3]:
+                        href = ev[3]
+                    if len(ev) > 4 and ev[4]:
+                        descr = ev[4]
+            #
+            cc = []
+            if color is not None:
+                cc.append('<td bgcolor="%s" class="calcell">' % color)
+            else:
+                cc.append('<td class="calcell">')
+
+            if href:
+                href = 'href="%s"' % href
+            if descr:
+                descr = 'title="%s"' % html.escape(descr, quote=True)
+            if href or descr:
+                cc.append("<a %s %s>" % (href, descr))
+
+            if legend or d == 1:
+                if pad_width is not None:
+                    n = pad_width - len(legend)  # pad to 8 cars
+                    if n > 0:
+                        legend = (
+                            "&nbsp;" * (n // 2) + legend + "&nbsp;" * ((n + 1) // 2)
+                        )
+            else:
+                legend = "&nbsp;"  # empty cell
+            cc.append(legend)
+            if href or descr:
+                cc.append("</a>")
+            cc.append("</td>")
+            cell = "".join(cc)
+            if day == "D":
+                monday = monday.next_day(7)
+            if (
+                weeknum == current_weeknum
+                and current_year == year
+                and weekclass != "wkend"
+            ):
+                weekclass += " currentweek"
+            T.append(
+                '<tr bgcolor="%s" class="%s" %s><td class="calday">%d%s</td>%s</tr>'
+                % (bgcolor, weekclass, attrs, d, day, cell)
+            )
+    else:
+        # Calendar with 2 cells / day
+        for d in range(1, nbdays + 1):
+            weeknum = time.strftime(
+                "%U", time.strptime("%d/%d/%d" % (d, month, year), "%d/%m/%Y")
+            )
+            day = DAYNAMES_ABREV[(firstday + d - 1) % 7]
+            if day in weekend:
+                bgcolor = WEEKENDCOLOR
+                weekclass = "wkend"
+                attrs = ""
+            else:
+                bgcolor = WEEKDAYCOLOR
+                weekclass = "wk" + str(monday).replace("/", "_")
+                attrs = trattributes
+            if (
+                weeknum == current_weeknum
+                and current_year == year
+                and weekclass != "wkend"
+            ):
+                weeknum += " currentweek"
+
+            if day == "D":
+                monday = monday.next_day(7)
+            T.append(
+                '<tr bgcolor="%s" class="wk%s" %s><td class="calday">%d%s</td>'
+                % (bgcolor, weekclass, attrs, d, day)
+            )
+            cc = []
+            for morning in (True, False):
+                color = None
+                legend = ""
+                href = ""
+                descr = ""
+                for ev in events:
+                    ev_year = int(ev[0][:4])
+                    ev_month = int(ev[0][5:7])
+                    ev_day = int(ev[0][8:10])
+                    if ev[4] is not None:
+                        ev_half = int(ev[4])
+                    else:
+                        ev_half = 0
+                    if (
+                        year == ev_year
+                        and month == ev_month
+                        and ev_day == d
+                        and morning == ev_half
+                    ):
+                        if ev[1]:
+                            legend = ev[1]
+                        if ev[2]:
+                            color = ev[2]
+                        if ev[3]:
+                            href = ev[3]
+                        if len(ev) > 5 and ev[5]:
+                            descr = ev[5]
+                #
+                if color is not None:
+                    cc.append('<td bgcolor="%s" class="calcell">' % (color))
+                else:
+                    cc.append('<td class="calcell">')
+                if href:
+                    href = 'href="%s"' % href
+                if descr:
+                    descr = 'title="%s"' % html.escape(descr, quote=True)
+                if href or descr:
+                    cc.append("<a %s %s>" % (href, descr))
+                if legend or d == 1:
+                    n = 3 - len(legend)  # pad to 3 cars
+                    if n > 0:
+                        legend = (
+                            "&nbsp;" * (n // 2) + legend + "&nbsp;" * ((n + 1) // 2)
+                        )
+                else:
+                    legend = "&nbsp;&nbsp;&nbsp;"  # empty cell
+                cc.append(legend)
+                if href or descr:
+                    cc.append("</a>")
+                cc.append("</td>\n")
+            T.append("".join(cc) + "</tr>")
+    return "\n".join(T)

app/scodoc/sco_evaluation_edit.py

@@ -351,14 +351,15 @@ def evaluation_create_form(
         else:
             date_debut = None
         args.pop("jour", None)
-        if args.get("heure_debut"):
+        if date_debut and args.get("heure_debut"):
             try:
                 heure_debut = heure_to_time(args["heure_debut"])
             except ValueError as exc:
                 raise ScoValueError("Heure début invalide") from exc
             args["date_debut"] = datetime.datetime.combine(date_debut, heure_debut)
         args.pop("heure_debut", None)
-        if args.get("heure_fin"):
+        # note: ce formulaire ne permet de créer que des évaluation avec debut et fin sur le même jour.
+        if date_debut and args.get("heure_fin"):
             try:
                 heure_fin = heure_to_time(args["heure_fin"])
             except ValueError as exc:

sco_version.py

@@ -1,7 +1,7 @@
 # -*- mode: python -*-
 # -*- coding: utf-8 -*-
 
-SCOVERSION = "9.6.11"
+SCOVERSION = "9.6.15"
 
 SCONAME = "ScoDoc"
 

tests/api/make_samples.py

@@ -5,40 +5,51 @@
 """Construction des fichiers exemples pour la documentation.
 
     Usage:
-        cd /opt/scodoc/tests/api
-        python make_samples.py [entry_names]
-        python make_samples.py -i <filepath> [entrynames]
+        python tests/api/make_samples.py [entry_names]
+        python tests/api/make_samples.py -i <filepath> [entrynames]
 
-si entry_names est spécifié, la génération est restreints aux exemples cités. expl: `python make_samples departements departement-formsemestres`
-doit être exécutée immédiatement apres une initialisation de la base pour test API! (car dépendant des identifiants générés lors de la création des objets)
-        cd /opt/scodoc/tests/api
-        tools/create_database.sh --drop SCODOC_TEST_API && flask db upgrade &&flask sco-db-init --erase && flask init-test-database
+Si entry_names est spécifié, la génération est restreinte aux exemples cités.
+Exemple:
+    python make_samples departements departement-formsemestres
 
-Créer éventuellement un fichier `.env` dans /opt/scodoc/tests/api
-avec la config du client API:
-```
-    SCODOC_URL = "http://localhost:5000/"
+Doit être exécutée immédiatement apres une initialisation de la base pour test API! 
+(car dépendant des identifiants générés lors de la création des objets)
+
+Modifer le /opt/scodoc/.env pour pointer sur la base test
+    SCODOC_DATABASE_URI="postgresql:///SCODOC_TEST_API"
+
+puis re-créer cette base     
+    tools/create_database.sh --drop SCODOC_TEST_API
+    flask db upgrade
+    flask sco-db-init --erase
+    flask init-test-database
+
+et lancer le serveur test:
+    flask run --debug
 ```
 
-Cet utilitaire prend en donnée le fichier de nom `samples.csv` contenant la description des exemples (séparés par une tabulation (\t), une ligne par exemple)
-* Le nom de l'exemple donne le nom du fichier généré (nom_exemple => nom_exemple.json.md). plusieurs lignes peuvent partager le même nom. dans ce cas le fichier contiendra chacun des exemples
+Cet utilitaire prend en argument le fichier de nom `samples.csv` contenant la description 
+des exemples (séparés par une tabulation (\t), une ligne par exemple)
+* Le nom de l'exemple donne le nom du fichier généré (nom_exemple => nom_exemple.json.md). 
+Plusieurs lignes peuvent partager le même nom. dans ce cas le fichier contiendra 
+chacun des exemples
 * l'url utilisée
 * la permission nécessaire (par défaut ScoView)
 * la méthode GET,POST à utiliser (si commence par #, la ligne est ignorée)
 * les arguments éventuel (en cas de POST): une chaîne de caractère selon json
 
 Implémentation:
-Le code complète une structure de données (Samples) qui est un dictionnaire de set (indicé par le nom des exemple.
+Le code complète une structure de données (Samples) qui est un dictionnaire de set 
+(indicé par le nom des exemples).
 Chacun des éléments du set est un exemple (Sample)
 Quand la structure est complète, on génére tous les fichiers textes
-- nom de l exemple
-- un ou plusieurs exemples avec pour chaucn
-    - l url utilisée
+- nom de l'exemple
+- un ou plusieurs exemples avec pour chacun
+    - l'url utilisée
     - les arguments éventuels
     - le résultat
-Le tout mis en forme au format markdown et rangé dans le répertoire DATA_DIR (/tmp/samples) qui est créé ou écrasé si déjà existant
-
-
+Le tout mis en forme au format markdown et rangé dans le répertoire DATA_DIR (/tmp/samples) 
+qui est créé ou écrasé si déjà existant.
 """
 import os
 import shutil
@@ -50,7 +61,7 @@ from pprint import pprint as pp
 import urllib3
 import json
 
-from pandas import read_csv
+import pandas as pd
 
 from setup_test_api import (
     API_PASSWORD,
@@ -68,6 +79,10 @@ DATA_DIR = "/tmp/samples/"
 SAMPLES_FILENAME = "tests/ressources/samples/samples.csv"
 
 
+class SampleException(Exception):
+    pass
+
+
 class Sample:
     def __init__(self, url, method="GET", permission="ScoView", content=None):
         self.content = content
@@ -83,7 +98,7 @@ class Sample:
         elif permission == "ScoUsersAdmin":
             HEADERS = get_auth_headers("admin_api", "admin_api")
         else:
-            raise Exception(f"Bad permission : {permission}")
+            raise SampleException(f"Bad permission : {permission}")
         if self.method == "GET":
             self.result = GET(self.url, HEADERS)
         elif self.method == "POST":
@@ -94,20 +109,19 @@ class Sample:
                 self.result = POST_JSON(self.url, json.loads(self.content), HEADERS)
         elif self.method[0] != "#":
             error = f'Bad method : "{self.method}"'
-            raise Exception(error)
+            raise SampleException(error)
         self.shorten()
-        file = open(f"sample_TEST.json.md", "tw")
-        self.dump(file)
-        file.close()
+        with open("sample_TEST.json.md", "tw", encoding="utf-8") as f:
+            self.dump(f)
 
-    def _shorten(
-        self, item
-    ):  # abrege les longues listes (limite à 2 éléments et affiche "... etc. à la place"
+    def _shorten(self, item):
+        "Abrège les longues listes: limite à 2 éléments et affiche '...' etc. à la place"
         if isinstance(item, list):
-            return [self._shorten(child) for child in item[:2]] + ["... etc."]
+            return [self._shorten(child) for child in item[:2] + ["..."]]
         return item
 
     def shorten(self):
+        "Abrège le résultat"
         self.result = self._shorten(self.result)
 
     def pp(self):
@@ -122,8 +136,8 @@ class Sample:
 
         file.write(f"#### {self.method} {self.url}\n")
         if len(self.content) > 0:
-            file.write(f"> `Content-Type: application/json`\n")
-            file.write(f"> \n")
+            file.write("> `Content-Type: application/json`\n")
+            file.write("> \n")
             file.write(f"> `{self.content}`\n\n")
 
         file.write("```json\n")
@@ -143,7 +157,7 @@ class Samples:
         """Entry_names: la liste des entrées à reconstruire.
         si None, la totalité des lignes de samples.csv est prise en compte
         """
-        self.entries = defaultdict(lambda: set())
+        self.entries = defaultdict(set)
         self.entry_names = entry_names
 
     def add_sample(self, line):
@@ -171,35 +185,35 @@ class Samples:
 
     def dump(self):
         for entry, samples in self.entries.items():
-            file = open(f"{DATA_DIR}sample_{entry}.json.md", "tw")
-            file.write(f"### {entry}\n\n")
-            for sample in sorted(
-                samples, key=lambda s: s.url
-            ):  # sorted de façon à rendre le fichier résultat déterministe (i.e. indépendant de l ordre d arrivée des résultats)
-                sample.dump(file)
-            file.close()
+            with open(f"{DATA_DIR}sample_{entry}.json.md", "tw", encoding="utf-8") as f:
+                f.write(f"### {entry}\n\n")
+                # Trié de façon à rendre le fichier indépendant de l'ordre des résultats
+                for sample in sorted(samples, key=lambda s: s.url):
+                    sample.dump(f)
 
 
 def make_samples(samples_filename):
-    if len(sys.argv) == 1:
-        entry_names = None
-    elif len(sys.argv) >= 3 and sys.argv[1] == "-i":
+    "Génère les samples"
+    entry_names = None
+    if len(sys.argv) >= 3 and sys.argv[1] == "-i":
         samples_filename = sys.argv[2]
         entry_names = sys.argv[3:] if len(sys.argv) > 3 else None
+    else:
+        entry_names = sys.argv[1:]
 
     if os.path.exists(DATA_DIR):
         if not os.path.isdir(DATA_DIR):
-            raise f"{DATA_DIR} existe déjà et n'est pas un répertoire"
-        else:
-            # DATA_DIR existe déjà - effacer et recréer
-            shutil.rmtree(DATA_DIR)
-            os.mkdir(DATA_DIR)
+            raise SampleException(f"{DATA_DIR} existe déjà et n'est pas un répertoire")
+        # DATA_DIR existe déjà - effacer et recréer
+        shutil.rmtree(DATA_DIR)
+        os.mkdir(DATA_DIR)
     else:
         os.mkdir(DATA_DIR)
 
     samples = Samples(entry_names)
-    df = read_csv(
+    df = pd.read_csv(
         samples_filename,
+        comment="#",
         sep=";",
         quotechar='"',
         dtype={
@@ -212,11 +226,12 @@ def make_samples(samples_filename):
         keep_default_na=False,
     )
     df = df.reset_index()
-    df.apply(lambda line: samples.add_sample(line), axis=1)
+    df.apply(samples.add_sample, axis=1)
     samples.dump()
     return samples
 
 
 if not CHECK_CERTIFICATE:
     urllib3.disable_warnings()
+
 make_samples(SAMPLES_FILENAME)

tests/ressources/samples/samples.csv

@@ -1,119 +1,120 @@
 "entry_name";"url";"permission";"method";"content"
+"assiduite_create";"/assiduite/1/create";"ScoView";"POST";"{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""}"
+"assiduite_create";"/assiduite/1/create/batch";"ScoView";"POST";"{""batch"":[{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""},{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""retard""},{""date_debut"": ""2022-10-27T11:00"",""date_fin"": ""2022-10-27T13:00"",""etat"": ""present""}]}"
+"assiduite_delete";"/assiduite/delete";"ScoView";"POST";"{""assiduite_id"": 1}"
+"assiduite_delete";"/assiduite/delete/batch";"ScoView";"POST";"{""batch"":[2,2,3]}"
+"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"": ""retard"",""moduleimpl_id"":3}"
+"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"":""absent""}"
+"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""moduleimpl_id"":2}"
 "assiduite";"/assiduite/1";"ScoView";"GET";
-"assiduites";"/assiduites/1";"ScoView";"GET";
-"assiduites";"/assiduites/1/query?etat=retard";"ScoView";"GET";
-"assiduites";"/assiduites/1/query?moduleimpl_id=1";"ScoView";"GET";
 "assiduites_count";"/assiduites/1/count";"ScoView";"GET";
-"assiduites_count";"/assiduites/1/count/query?etat=retard";"ScoView";"GET";
 "assiduites_count";"/assiduites/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET";
+"assiduites_count";"/assiduites/1/count/query?etat=retard";"ScoView";"GET";
+"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count";"ScoView";"GET";
+"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET";
+"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=retard";"ScoView";"GET";
 "assiduites_formsemestre";"/assiduites/formsemestre/1";"ScoView";"GET";
 "assiduites_formsemestre";"/assiduites/formsemestre/1/query?etat=retard";"ScoView";"GET";
 "assiduites_formsemestre";"/assiduites/formsemestre/1/query?moduleimpl_id=1";"ScoView";"GET";
-"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count";"ScoView";"GET";
-"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=retard";"ScoView";"GET";
-"assiduites_formsemestre_count";"/assiduites/formsemestre/1/count/query?etat=present,retard&metric=compte,heure";"ScoView";"GET";
-"assiduite_create";"/assiduite/1/create";"ScoView";"POST";"{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""}"
-"assiduite_create";"/assiduite/1/create/batch";"ScoView";"POST";"{""batch"":[{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""absent""},{""date_debut"": ""2022-10-27T08:00"",""date_fin"": ""2022-10-27T10:00"",""etat"": ""retard""},{""date_debut"": ""2022-10-27T11:00"",""date_fin"": ""2022-10-27T13:00"",""etat"": ""present""}]}"
-"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"":""absent""}"
-"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""moduleimpl_id"":2}"
-"assiduite_edit";"/assiduite/1/edit";"ScoView";"POST";"{""etat"": ""retard"",""moduleimpl_id"":3}"
-"assiduite_delete";"/assiduite/delete";"ScoView";"POST";"{""assiduite_id"": 1}"
-"assiduite_delete";"/assiduite/delete/batch";"ScoView";"POST";"{""batch"":[2,2,3]}"
-"departements";"/departements";"ScoView";"GET";
-"departements-ids";"/departements_ids";"ScoView";"GET";
-"departement";"/departement/TAPI";"ScoView";"GET";
-"departement";"/departement/id/1";"ScoView";"GET";
-"departement-etudiants";"/departement/TAPI/etudiants";"ScoView";"GET";
-"departement-etudiants";"/departement/id/1/etudiants";"ScoView";"GET";
-"departement-formsemestres_ids";"/departement/TAPI/formsemestres_ids";"ScoView";"GET";
-"departement-formsemestres_ids";"/departement/id/1/formsemestres_ids";"ScoView";"GET";
-"departement-formsemestres-courants";"/departement/TAPI/formsemestres_courants";"ScoView";"GET";
-"departement-formsemestres-courants";"/departement/id/1/formsemestres_courants";"ScoView";"GET";
+"assiduites";"/assiduites/1";"ScoView";"GET";
+"assiduites";"/assiduites/1/query?etat=retard";"ScoView";"GET";
+"assiduites";"/assiduites/1/query?moduleimpl_id=1";"ScoView";"GET";
 "departement-create";"/departement/create";"ScoSuperAdmin";"POST";"{""acronym"": ""NEWONE"" , ""visible"": true}"
-"departement-edit";"/departement/NEWONE/edit";"ScoSuperAdmin";"POST";"{""visible"": false}"
 "departement-delete";"/departement/NEWONE/delete";"ScoSuperAdmin";"POST";
-"etudiants-courants";"/etudiants/courants?date_courante=2022-07-20";"ScoView";"GET";
-"etudiants-courants";"/etudiants/courants/long?date_courante=2022-07-20";"ScoView";"GET";
+"departement-edit";"/departement/NEWONE/edit";"ScoSuperAdmin";"POST";"{""visible"": false}"
+"departement-etudiants";"/departement/id/1/etudiants";"ScoView";"GET";
+"departement-etudiants";"/departement/TAPI/etudiants";"ScoView";"GET";
+"departement-formsemestres_ids";"/departement/id/1/formsemestres_ids";"ScoView";"GET";
+"departement-formsemestres_ids";"/departement/TAPI/formsemestres_ids";"ScoView";"GET";
+"departement-formsemestres-courants";"/departement/id/1/formsemestres_courants";"ScoView";"GET";
+"departement-formsemestres-courants";"/departement/TAPI/formsemestres_courants";"ScoView";"GET";
+"departement-logo";"/departement/id/1/logo/D";"ScoSuperAdmin";"GET";
+"departement-logo";"/departement/TAPI/logo/D";"ScoSuperAdmin";"GET";
+"departement-logos";"/departement/id/1/logos";"ScoSuperAdmin";"GET";
+"departement-logos";"/departement/TAPI/logos";"ScoSuperAdmin";"GET";
+"departement";"/departement/id/1";"ScoView";"GET";
+"departement";"/departement/TAPI";"ScoView";"GET";
+"departements-ids";"/departements_ids";"ScoView";"GET";
+"departements";"/departements";"ScoView";"GET";
+"etudiant_formsemestres";"/etudiant/nip/11/formsemestres";"ScoView";"GET";
+"etudiant-formsemestre-bulletin";"/etudiant/etudid/11/formsemestre/1/bulletin";"ScoView";"GET";
+#"etudiant-formsemestre-bulletin";"/etudiant/ine/INE11/formsemestre/1/bulletin";"ScoView";"GET";
+#"etudiant-formsemestre-bulletin";"/etudiant/nip/11/formsemestre/1/bulletin";"ScoView";"GET";
+#"etudiant-formsemestre-bulletin";"/etudiant/nip/11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
+"etudiant-formsemestre-groups";"/etudiant/etudid/11/formsemestre/1/groups";"ScoView";"GET";
+"etudiant-formsemestres";"/etudiant/etudid/11/formsemestres";"ScoView";"GET";
+"etudiant-formsemestres";"/etudiant/ine/INE11/formsemestres";"ScoView";"GET";
 "etudiant";"/etudiant/etudid/11";"ScoView";"GET";
-"etudiant";"/etudiant/nip/11";"ScoView";"GET";
 "etudiant";"/etudiant/ine/INE11";"ScoView";"GET";
+"etudiant";"/etudiant/nip/11";"ScoView";"GET";
 "etudiants-clef";"/etudiants/etudid/11";"ScoView";"GET";
 "etudiants-clef";"/etudiants/ine/INE11";"ScoView";"GET";
 "etudiants-clef";"/etudiants/nip/11";"ScoView";"GET";
-"etudiant-formsemestres";"/etudiant/etudid/11/formsemestres";"ScoView";"GET";
-"etudiant-formsemestres";"/etudiant/ine/INE11/formsemestres";"ScoView";"GET";
-"etudiant_formsemestres";"/etudiant/nip/11/formsemestres";"ScoView";"GET";
-"etudiant-formsemestre-bulletin";"/etudiant/etudid/11/formsemestre/1/bulletin";"ScoView";"GET";
-"etudiant-formsemestre-bulletin";"/etudiant/ine/INE11/formsemestre/1/bulletin";"ScoView";"GET";
-"etudiant-formsemestre-bulletin";"/etudiant/nip/11/formsemestre/1/bulletin";"ScoView";"GET";
-"etudiant-formsemestre-bulletin";"/etudiant/nip/11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
-"etudiant-formsemestre-groups";"/etudiant/etudid/11/formsemestre/1/groups";"ScoView";"GET";
-"formations";"/formations";"ScoView";"GET";
-"formations_ids";"/formations_ids";"ScoView";"GET";
-"formation";"/formation/1";"ScoView";"GET";
-"formation-export";"/formation/1/export";"ScoView";"GET";
+"etudiants-courants";"/etudiants/courants?date_courante=2022-07-20";"ScoView";"GET";
+"etudiants-courants";"/etudiants/courants/long?date_courante=2022-07-20";"ScoView";"GET";
+"evaluation";"/evaluation/1";"ScoView";"GET";
+"evaluation-notes";"/evaluation/1/notes";"ScoView";"GET";
 "formation-export";"/formation/1/export_with_ids";"ScoView";"GET";
+"formation-export";"/formation/1/export";"ScoView";"GET";
 "formation-referentiel_competences";"/formation/1/referentiel_competences";"ScoView";"GET";
-"moduleimpl";"/moduleimpl/1";"ScoView";"GET";
+"formation";"/formation/1";"ScoView";"GET";
+"formations_ids";"/formations_ids";"ScoView";"GET";
+"formations";"/formations";"ScoView";"GET";
+"formsemestre-bulletins";"/formsemestre/1/bulletins";"ScoView";"GET";
+"formsemestre-decisions_jury";"/formsemestre/1/decisions_jury";"ScoView";"GET";
+"formsemestre-etat_evals";"/formsemestre/1/etat_evals";"ScoView";"GET";
+"formsemestre-etudiants-query";"/formsemestre/1/etudiants/query?etat=D";"ScoView";"GET";
+"formsemestre-etudiants";"/formsemestre/1/etudiants";"ScoView";"GET";
+"formsemestre-etudiants";"/formsemestre/1/etudiants/long";"ScoView";"GET";
+"formsemestre-partition-create";"/formsemestre/1/partition/create";"ScoSuperAdmin";"POST";"{""partition_name"": ""PART""} "
+"formsemestre-partitions-order";"/formsemestre/1/partitions/order";"ScoSuperAdmin";"POST";"[ 1 ]"
+"formsemestre-partitions";"/formsemestre/1/partitions";"ScoView";"GET";
+"formsemestre-programme";"/formsemestre/1/programme";"ScoView";"GET";
+"formsemestre-resultats";"/formsemestre/1/resultats";"ScoView";"GET";
 "formsemestre";"/formsemestre/1";"ScoView";"GET";
 "formsemestres-query";"/formsemestres/query?annee_scolaire=2022&etape_apo=A2";"ScoView";"GET";
 "formsemestres-query";"/formsemestres/query?nip=11";"ScoView";"GET";
-"formsemestre-bulletins";"/formsemestre/1/bulletins";"ScoView";"GET";
-"formsemestre-programme";"/formsemestre/1/programme";"ScoView";"GET";
-"formsemestre-etudiants";"/formsemestre/1/etudiants";"ScoView";"GET";
-"formsemestre-etudiants";"/formsemestre/1/etudiants/long";"ScoView";"GET";
-"formsemestre-etudiants-query";"/formsemestre/1/etudiants/query?etat=D";"ScoView";"GET";
-"formsemestre-etat_evals";"/formsemestre/1/etat_evals";"ScoView";"GET";
-"formsemestre-resultats";"/formsemestre/1/resultats";"ScoView";"GET";
-"formsemestre-decisions_jury";"/formsemestre/1/decisions_jury";"ScoView";"GET";
-"formsemestre-partitions";"/formsemestre/1/partitions";"ScoView";"GET";
-"partition";"/partition/1";"ScoView";"GET";
-"group-etudiants";"/group/1/etudiants";"ScoView";"GET";
-"group-etudiants-query";"/group/1/etudiants/query?etat=D";"ScoView";"GET";
-"moduleimpl-evaluations";"/moduleimpl/1/evaluations";"ScoView";"GET";
-"evaluation-notes";"/evaluation/1/notes";"ScoView";"GET";
-"user";"/user/1";"ScoView";"GET";
-"users-query";"/users/query?starts_with=u_";"ScoView";"GET";
-"permissions";"/permissions";"ScoView";"GET";
-"roles";"/roles";"ScoView";"GET";
-"role";"/role/Observateur";"ScoView";"GET";
-"group-set_etudiant";"/group/1/set_etudiant/10";"ScoSuperAdmin";"POST";
-"group-remove_etudiant";"/group/1/remove_etudiant/10";"ScoSuperAdmin";"POST";
-"partition-group-create";"/partition/1/group/create";"ScoSuperAdmin";"POST";"{""group_name"": ""NEW_GROUP""}"
-"group-edit";"/group/2/edit";"ScoSuperAdmin";"POST";"{""group_name"": ""NEW_GROUP2""}"
 "group-delete";"/group/2/delete";"ScoSuperAdmin";"POST";
-"formsemestre-partition-create";"/formsemestre/1/partition/create";"ScoSuperAdmin";"POST";"{""partition_name"": ""PART""} "
-"formsemestre-partitions-order";"/formsemestre/1/partitions/order";"ScoSuperAdmin";"POST";"[ 1 ]"
-"partition-edit";"/partition/1/edit";"ScoSuperAdmin";"POST";"{""partition_name"":""P2BIS"", ""numero"":3,""bul_show_rank"":true,""show_in_lists"":false, ""groups_editable"":true}"
-"partition-remove_etudiant";"/partition/2/remove_etudiant/10";"ScoSuperAdmin";"POST";
-"partition-groups-order";"/partition/1/groups/order";"ScoSuperAdmin";"POST";"[ 1 ]"
+"group-edit";"/group/2/edit";"ScoSuperAdmin";"POST";"{""group_name"": ""NEW_GROUP2""}"
+"group-etudiants-query";"/group/1/etudiants/query?etat=D";"ScoView";"GET";
+"group-etudiants";"/group/1/etudiants";"ScoView";"GET";
+"group-remove_etudiant";"/group/1/remove_etudiant/10";"ScoSuperAdmin";"POST";
+"group-set_etudiant";"/group/1/set_etudiant/10";"ScoSuperAdmin";"POST";
+"logo";"/logo/B";"ScoSuperAdmin";"GET";
+"logos";"/logos";"ScoSuperAdmin";"GET";
+"moduleimpl-evaluations";"/moduleimpl/1/evaluations";"ScoView";"GET";
+"moduleimpl";"/moduleimpl/1";"ScoView";"GET";
 "partition-delete";"/partition/2/delete";"ScoSuperAdmin";"POST";
+"partition-edit";"/partition/1/edit";"ScoSuperAdmin";"POST";"{""partition_name"":""P2BIS"", ""numero"":3,""bul_show_rank"":true,""show_in_lists"":false, ""groups_editable"":true}"
+"partition-group-create";"/partition/1/group/create";"ScoSuperAdmin";"POST";"{""group_name"": ""NEW_GROUP""}"
+"partition-groups-order";"/partition/1/groups/order";"ScoSuperAdmin";"POST";"[ 1 ]"
+"partition-remove_etudiant";"/partition/2/remove_etudiant/10";"ScoSuperAdmin";"POST";
+"partition";"/partition/1";"ScoView";"GET";
+"permissions";"/permissions";"ScoView";"GET";
+"role-add_permission";"/role/customRole/add_permission/ScoUsersView";"ScoSuperAdmin";"POST";
+"role-create";"/role/create/customRole";"ScoSuperAdmin";"POST";"{""permissions"": [""ScoView"", ""ScoUsersView""]}"
+"role-delete";"/role/customRole/delete";"ScoSuperAdmin";"POST";
+"role-edit";"/role/customRole/edit";"ScoSuperAdmin";"POST";"{ ""name"" : ""LaveurDeVitres"", ""permissions"" : [ ""ScoView"" ] }"
+"role-remove_permission";"/role/customRole/remove_permission/ScoUsersView";"ScoSuperAdmin";"POST";
+"role";"/role/Observateur";"ScoView";"GET";
+"roles";"/roles";"ScoView";"GET";
+"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin";"ScoView";"GET";
+"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin/pdf";"ScoView";"GET";
+"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin/short";"ScoView";"GET";
+"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
+"test-pdf";"/etudiant/ine/INE11/formsemestre/1/bulletin";"ScoView";"GET";
+"test-pdf";"/etudiant/ine/INE11/formsemestre/1/bulletin/short";"ScoView";"GET";
+"test-pdf";"/etudiant/ine/INE11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
+"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin";"ScoView";"GET";
+"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/pdf";"ScoView";"GET";
+"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/pdf";"ScoView";"GET";
+"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/short";"ScoView";"GET";
+"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
 "user-create";"/user/create";"ScoSuperAdmin";"POST";"{""user_name"": ""alain"", ""dept"": null, ""nom"": ""alain"", ""prenom"": ""bruno"", ""active"": true }"
 "user-edit";"/user/10/edit";"ScoSuperAdmin";"POST";"{ ""dept"":  ""TAPI"", ""nom"": ""alain2"", ""prenom"": ""bruno2"", ""active"": false }"
 "user-password";"/user/3/password";"ScoSuperAdmin";"POST";"{ ""password"": ""rePlaCemeNT456averylongandcomplicated"" }"
 "user-password";"/user/3/password";"ScoSuperAdmin";"POST";"{ ""password"": ""too_simple"" }"
 "user-role-add";"/user/10/role/Observateur/add";"ScoSuperAdmin";"POST";
 "user-role-remove";"/user/10/role/Observateur/remove";"ScoSuperAdmin";"POST";
-"role-create";"/role/create/customRole";"ScoSuperAdmin";"POST";"{""permissions"": [""ScoView"", ""ScoUsersView""]}"
-"role-remove_permission";"/role/customRole/remove_permission/ScoUsersView";"ScoSuperAdmin";"POST";
-"role-add_permission";"/role/customRole/add_permission/ScoUsersView";"ScoSuperAdmin";"POST";
-"role-edit";"/role/customRole/edit";"ScoSuperAdmin";"POST";"{ ""name"" : ""LaveurDeVitres"", ""permissions"" : [ ""ScoView"" ] }"
-"role-delete";"/role/customRole/delete";"ScoSuperAdmin";"POST";
-"logos";"/logos";"ScoSuperAdmin";"GET";
-"logo";"/logo/B";"ScoSuperAdmin";"GET";
-"departement-logos";"/departement/TAPI/logos";"ScoSuperAdmin";"GET";
-"departement-logos";"/departement/id/1/logos";"ScoSuperAdmin";"GET";
-"departement-logo";"/departement/TAPI/logo/D";"ScoSuperAdmin";"GET";
-"departement-logo";"/departement/id/1/logo/D";"ScoSuperAdmin";"GET";
-"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/pdf";"ScoView";"GET";
-"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/pdf";"ScoView";"GET";
-"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
-"test-pdf";"/etudiant/ine/INE11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
-"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/short/pdf";"ScoView";"GET";
-"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin/pdf";"ScoView";"GET";
-"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin/short";"ScoView";"GET";
-"test-pdf";"/etudiant/ine/INE11/formsemestre/1/bulletin/short";"ScoView";"GET";
-"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin/short";"ScoView";"GET";
-"test-pdf";"/etudiant/etudid/11/formsemestre/1/bulletin";"ScoView";"GET";
-"test-pdf";"/etudiant/ine/INE11/formsemestre/1/bulletin";"ScoView";"GET";
-"test-pdf";"/etudiant/nip/11/formsemestre/1/bulletin";"ScoView";"GET";
+"user";"/user/1";"ScoView";"GET";
+"users-query";"/users/query?starts_with=u_";"ScoView";"GET";