lehmann/ScoDoc-Front
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Pull Requests Activity

Fix: choix groupe saisie absences hed-bdo (DS)

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-02-18 08:10:21 +01:00
parent 8ea64acf07
commit 0571e8d8e2
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sco_groups_view.py
View File

@ -784,9 +784,7 @@ def groups_table(
context.Notes, etud, groups_infos.formsemestre_id context.Notes, etud, groups_infos.formsemestre_id
) )
m["parcours"] = Se.get_parcours_descr() m["parcours"] = Se.get_parcours_descr()
m["codeparcours"], decisions_jury = sco_report.get_codeparcoursetud( m["codeparcours"], _ = sco_report.get_codeparcoursetud(context.Notes, etud)
context.Notes, etud
)
def dicttakestr(d, keys): def dicttakestr(d, keys):
r = [] r = []
@ -933,7 +931,7 @@ def form_choix_saisie_semaine(context, groups_infos, REQUEST=None):
DateJour = time.strftime("%d/%m/%Y") DateJour = time.strftime("%d/%m/%Y")
datelundi = sco_abs.ddmmyyyy(DateJour).prev_monday() datelundi = sco_abs.ddmmyyyy(DateJour).prev_monday()
FA = [] # formulaire avec menu saisi hebdo des absences FA = [] # formulaire avec menu saisie hebdo des absences
FA.append('<form action="Absences/SignaleAbsenceGrHebdo" method="get">') FA.append('<form action="Absences/SignaleAbsenceGrHebdo" method="get">')
FA.append('<input type="hidden" name="datelundi" value="%s"/>' % datelundi) FA.append('<input type="hidden" name="datelundi" value="%s"/>' % datelundi)
FA.append('<input type="hidden" name="moduleimpl_id" value="%s"/>' % moduleimpl_id) FA.append('<input type="hidden" name="moduleimpl_id" value="%s"/>' % moduleimpl_id)
@ -955,7 +953,7 @@ def export_groups_as_moodle_csv(context, formsemestre_id=None, REQUEST=None):
""" """
if not formsemestre_id: if not formsemestre_id:
raise ScoValueError("missing parameter: formsemestre_id") raise ScoValueError("missing parameter: formsemestre_id")
partitions, partitions_etud_groups = sco_groups.get_formsemestre_groups( _, partitions_etud_groups = sco_groups.get_formsemestre_groups(
context, formsemestre_id, with_default=True context, formsemestre_id, with_default=True
) )
sem = sco_formsemestre.get_formsemestre(context, formsemestre_id) sem = sco_formsemestre.get_formsemestre(context, formsemestre_id)

5
sco_moduleimpl_status.py
View File

@ -259,9 +259,10 @@ def moduleimpl_status(context, moduleimpl_id=None, partition_id=None, REQUEST=No
ScoAbsChange, context ScoAbsChange, context
) and sco_formsemestre.sem_est_courant(context, sem): ) and sco_formsemestre.sem_est_courant(context, sem):
datelundi = sco_abs.ddmmyyyy(time.strftime("%d/%m/%Y")).prev_monday() datelundi = sco_abs.ddmmyyyy(time.strftime("%d/%m/%Y")).prev_monday()
group_id = sco_groups.get_default_group(context, formsemestre_id)
H.append( H.append(
'<span class="moduleimpl_abs_link"><a class="stdlink" href="Absences/SignaleAbsenceGrHebdo?formsemestre_id=%s&moduleimpl_id=%s&datelundi=%s">Saisie Absences hebdo.</a></span>' '<span class="moduleimpl_abs_link"><a class="stdlink" href="Absences/SignaleAbsenceGrHebdo?formsemestre_id=%s&moduleimpl_id=%s&datelundi=%s&group_ids=%s">Saisie Absences hebdo.</a></span>'
% (formsemestre_id, moduleimpl_id, datelundi) % (formsemestre_id, moduleimpl_id, datelundi, group_id)
) )
H.append("</td></tr></table>") H.append("</td></tr></table>")