From dfa0b168e54c6a9ef5e775d3401a86a751321e57 Mon Sep 17 00:00:00 2001 From: Jean-Marie Place Date: Wed, 1 Mar 2023 13:35:46 +0100 Subject: [PATCH] add parameter and fix parameter effects --- app/scodoc/sco_groups.py | 6 ++---- app/scodoc/sco_import_etuds.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/scodoc/sco_groups.py b/app/scodoc/sco_groups.py index 43362edd7..4b615879e 100644 --- a/app/scodoc/sco_groups.py +++ b/app/scodoc/sco_groups.py @@ -491,14 +491,12 @@ def etud_add_group_infos(etud, formsemestre_id, sep=" ", only_to_show=False): etud["partitions"][info["partition_id"]] = info # resume textuel des groupes: - etud["groupes"] = sep.join( - [gr["group_name"] for gr in infos if gr["group_name"] is not None] - ) + etud["groupes"] = sep.join([gr["group_name"] for gr in infos if gr["group_name"]]) etud["partitionsgroupes"] = sep.join( [ (gr["partition_name"] or "") + ":" + gr["group_name"] for gr in infos - if gr["group_name"] is not None + if gr["group_name"] ] ) diff --git a/app/scodoc/sco_import_etuds.py b/app/scodoc/sco_import_etuds.py index 4d88cdb16..9fa5e0f35 100644 --- a/app/scodoc/sco_import_etuds.py +++ b/app/scodoc/sco_import_etuds.py @@ -203,7 +203,7 @@ def sco_import_generate_excel_sample( for field in titles: if field == "groupes": sco_groups.etud_add_group_infos( - etud, groups_infos.formsemestre_id, sep=";" + etud, groups_infos.formsemestre_id, sep=";", only_to_show=True ) l.append(etud["partitionsgroupes"]) else: