diff --git a/app/scodoc/sco_groups_view.py b/app/scodoc/sco_groups_view.py index 2477bb5d0..f4a4d9ebf 100644 --- a/app/scodoc/sco_groups_view.py +++ b/app/scodoc/sco_groups_view.py @@ -56,7 +56,6 @@ from app.scodoc import sco_etud from app.scodoc.gen_tables import GenTable from app.scodoc.sco_exceptions import ScoValueError from app.scodoc.sco_permissions import Permission -from six.moves import range JAVASCRIPTS = html_sco_header.BOOTSTRAP_MULTISELECT_JS + [ "js/etud_info.js", @@ -65,11 +64,10 @@ JAVASCRIPTS = html_sco_header.BOOTSTRAP_MULTISELECT_JS + [ CSSSTYLES = html_sco_header.BOOTSTRAP_MULTISELECT_CSS - +# view: def groups_view( - group_ids=[], + group_ids=(), format="html", - REQUEST=None, # Options pour listes: with_codes=0, etat=None, @@ -94,7 +92,6 @@ def groups_view( return groups_table( groups_infos=groups_infos, format=format, - REQUEST=REQUEST, with_codes=with_codes, etat=etat, with_paiement=with_paiement, @@ -134,7 +131,6 @@ def groups_view( groups_table( groups_infos=groups_infos, format=format, - REQUEST=REQUEST, with_codes=with_codes, etat=etat, with_paiement=with_paiement, @@ -143,11 +139,11 @@ def groups_view( ), "", """
""", - tab_photos_html(groups_infos, etat=etat, REQUEST=REQUEST), + tab_photos_html(groups_infos, etat=etat), #'

hello

', "
", '
', - tab_absences_html(groups_infos, etat=etat, REQUEST=REQUEST), + tab_absences_html(groups_infos, etat=etat), "
", ) ) @@ -296,7 +292,7 @@ class DisplayedGroupsInfos(object): def __init__( self, - group_ids=[], # groupes specifies dans l'URL, ou un seul int + group_ids=(), # groupes specifies dans l'URL, ou un seul int formsemestre_id=None, etat=None, select_all_when_unspecified=False, @@ -421,7 +417,6 @@ class DisplayedGroupsInfos(object): # Ancien ZScolar.group_list renommé ici en group_table def groups_table( - REQUEST=None, groups_infos=None, # instance of DisplayedGroupsInfos with_codes=0, etat=None, @@ -529,7 +524,8 @@ def groups_table( # et groupes: for partition_id in etud["partitions"]: etud[partition_id] = etud["partitions"][partition_id]["group_name"] - # Ajoute colonne pour moodle: semestre_groupe, de la forme RT-DUT-FI-S3-2021-PARTITION-GROUPE + # Ajoute colonne pour moodle: semestre_groupe, de la forme + # RT-DUT-FI-S3-2021-PARTITION-GROUPE moodle_groupename = [] if groups_infos.selected_partitions: # il y a des groupes selectionnes, utilise leurs partitions @@ -638,22 +634,21 @@ def groups_table( [ """ - - """, + """ + + """, ] ) H.append("") @@ -797,7 +792,7 @@ def groups_table( raise ValueError("unsupported format") -def tab_absences_html(groups_infos, etat=None, REQUEST=None): +def tab_absences_html(groups_infos, etat=None): """contenu du tab "absences et feuilles diverses" """ authuser = current_user H = ['
'] @@ -808,10 +803,10 @@ def tab_absences_html(groups_infos, etat=None, REQUEST=None): "

Absences

", '