opolka/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Activity

Update opolka/ScoDoc from ScoDoc/ScoDoc #2

Merged
opolka merged 1272 commits from ScoDoc/ScoDoc:master into master 2024-05-27 09:11:04 +02:00
Conversation 0 Commits 1272 Files Changed 656 +39 -44
1 changed files with 39 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce3452df73 - Show all commits

83
app/scodoc/sco_groups_view.py
View File

@ -106,57 +106,52 @@ def groups_view(
with_bourse=with_bourse, with_bourse=with_bourse,
) )
H = [
html_sco_header.sco_header(
javascripts=JAVASCRIPTS,
cssstyles=CSSSTYLES,
init_qtip=True,
)
]
# Menu choix groupe
H.append("""<div id="group-tabs">""")
H.append(form_groups_choice(groups_infos, submit_on_change=True))
# Note: le formulaire est soumis a chaque modif des groupes # Note: le formulaire est soumis a chaque modif des groupes
# on pourrait faire comme pour le form de saisie des notes. Il faudrait pour cela: # on pourrait faire comme pour le form de saisie des notes. Il faudrait pour cela:
# - charger tous les etudiants au debut, quels que soient les groupes selectionnés # - charger tous les etudiants au debut, quels que soient les groupes selectionnés
# - ajouter du JS pour modifier les liens (arguments group_ids) quand le menu change # - ajouter du JS pour modifier les liens (arguments group_ids) quand le menu change
# Tabs return f"""
H.extend( { html_sco_header.sco_header(
( javascripts=JAVASCRIPTS,
"""<ul class="nav nav-tabs"> cssstyles=CSSSTYLES,
<li class="active"><a href="#tab-listes" data-toggle="tab">Listes</a></li> init_qtip=True,
<li><a href="#tab-photos" data-toggle="tab">Photos</a></li> )
<li><a href="#tab-abs" data-toggle="tab">Absences et feuilles...</a></li> }
</ul> <div id="group-tabs">
<!-- Menu choix groupe -->
{form_groups_choice(groups_infos, submit_on_change=True)}
<ul class="nav nav-tabs">
<li class="active"><a href="#tab-listes" data-toggle="tab">Listes</a></li>
<li><a href="#tab-photos" data-toggle="tab">Photos</a></li>
<li><a href="#tab-abs" data-toggle="tab">Absences et feuilles...</a></li>
</ul>
</div> </div>
<!-- Tab panes --> <!-- Tab panes -->
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane active" id="tab-listes"> <div class="tab-pane active" id="tab-listes">
""", {
groups_table( groups_table(
groups_infos=groups_infos, groups_infos=groups_infos,
fmt=fmt, fmt=fmt,
with_codes=with_codes, with_codes=with_codes,
etat=etat, etat=etat,
with_paiement=with_paiement, with_paiement=with_paiement,
with_archives=with_archives, with_archives=with_archives,
with_annotations=with_annotations, with_annotations=with_annotations,
with_bourse=with_bourse, with_bourse=with_bourse,
), )
"</div>", }
"""<div class="tab-pane" id="tab-photos">""", </div>
tab_photos_html(groups_infos, etat=etat), <div class="tab-pane" id="tab-photos">
#'<p>hello</p>', { tab_photos_html(groups_infos, etat=etat) }
"</div>", </div>
'<div class="tab-pane" id="tab-abs">', <div class="tab-pane" id="tab-abs">
tab_absences_html(groups_infos, etat=etat), { tab_absences_html(groups_infos, etat=etat) }
"</div>", </div>
) </div>
) { html_sco_header.sco_footer() }
"""
H.append(html_sco_header.sco_footer())
return "\n".join(H)
def form_groups_choice( def form_groups_choice(
@ -751,7 +746,7 @@ def groups_table(
H.append("</ul>") H.append("</ul>")
return "".join(H) + "</div>" return "".join(H)
elif ( elif (
fmt == "pdf" fmt == "pdf"