From cffcaa03ce275064d44859df86ea4d9d1ea5f77c Mon Sep 17 00:00:00 2001 From: Emmanuel Viennet Date: Sun, 22 Aug 2021 16:43:48 +0200 Subject: [PATCH] =?UTF-8?q?synchro=5Fetuds:=20plus=20d'exemples=20avec=20c?= =?UTF-8?q?aract=C3=A8res=20sp=C3=A9ciaux?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scodoc/sco_synchro_etuds.py | 6 ++++-- scotests/demo/noms.txt | 25 ++++++++++--------------- scotests/demo/prenoms-f.txt | 1 + scotests/demo/prenoms-h.txt | 5 ++++- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/app/scodoc/sco_synchro_etuds.py b/app/scodoc/sco_synchro_etuds.py index fceeb9def..27acef3d7 100644 --- a/app/scodoc/sco_synchro_etuds.py +++ b/app/scodoc/sco_synchro_etuds.py @@ -120,9 +120,11 @@ def formsemestre_synchro_etuds( ) anneeapogee = str(anneeapogee) - if type(etuds) == type(""): + if isinstance(etuds, str): etuds = etuds.split(",") # vient du form de confirmation - if type(inscrits_without_key) == type(""): + elif isinstance(etuds, int): + etuds = [etuds] + if isinstance(inscrits_without_key, str): inscrits_without_key = inscrits_without_key.split(",") ( diff --git a/scotests/demo/noms.txt b/scotests/demo/noms.txt index eb6ea355f..6b0221a98 100644 --- a/scotests/demo/noms.txt +++ b/scotests/demo/noms.txt @@ -1,5 +1,5 @@ Martin -Bernard +Richard-Lenoir Thomas Petit Robert @@ -15,27 +15,28 @@ Leroy David Roux Morel -Bertrand +M'Rahi Fournier Girard Fontaine Lambert +Lançon Dupont Bonnet Rousseau Vincent Muller -Lefevre +Lefèvre Faure -Andre +André Mercier -Guerin +Guérin Garcia Boyer Blanc Garnier Chevalier -Francois +François Legrand Gauthier Perrin @@ -46,7 +47,6 @@ Henry Nicolas Roussel Gautier -Mathieu Masson Duval Marchand @@ -54,7 +54,7 @@ Denis Lemaire Dumont Marie -Noel +Noël Meyer Dufour Meunier @@ -63,6 +63,7 @@ Blanchard Brun Riviere Lucas +Giscard d'Estaing Joly Giraud Brunet @@ -80,12 +81,10 @@ Colin Vidal Picard Roger -Fabre Aubert Lemoine Renaud Dumas -Payet Olivier Lacroix Philippe @@ -99,8 +98,6 @@ Leclercq Sanchez Lecomte Rolland -Guillaume -Jean Hubert Dupuy Carpentier @@ -108,7 +105,6 @@ Guillot Berger Perez Dupuis -Louis Moulin Deschamps Vasseur @@ -116,7 +112,6 @@ Huet Boucher Fernandez Fleury -Adam Royer Paris Jacquet @@ -254,7 +249,7 @@ Colas Paul Raymond Guillon -Regnier +Régnier Hardy Imbert Brunel diff --git a/scotests/demo/prenoms-f.txt b/scotests/demo/prenoms-f.txt index cfda8438f..ac1c900c6 100644 --- a/scotests/demo/prenoms-f.txt +++ b/scotests/demo/prenoms-f.txt @@ -11,6 +11,7 @@ Sylvie Martine Madeleine Nicole +Rêve d'Or Suzanne Hélène Christine diff --git a/scotests/demo/prenoms-h.txt b/scotests/demo/prenoms-h.txt index b3ddbb618..61e44fefa 100644 --- a/scotests/demo/prenoms-h.txt +++ b/scotests/demo/prenoms-h.txt @@ -29,4 +29,7 @@ Laurent Frédéric Eric David - +Pierre-François +Jean-Christophe +Derc'hen +Lee-Van's \ No newline at end of file