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 +6 -13
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2e7e00eb0a - Show all commits

9
app/scodoc/sco_bulletins_legacy.py
View File

@ -314,16 +314,13 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
authuser = self.authuser authuser = self.authuser
H = [] H = []
# --- Absences # --- Absences
# XXX TODO-ASSIDUITE
# au passage, utiliser url_for...
H.append( H.append(
"""<p> f"""<p>
XXX <a href="../Absences/CalAbs?etudid=%(etudid)s" class="bull_link"> <a href="{ url_for('assiduites.calendrier_etud', scodoc_dept=g.scodoc_dept, etudid=I["etudid"]) }" class="bull_link">
<b>Absences :</b> %(nbabs)s demi-journées, dont %(nbabsjust)s justifiées <b>Absences :</b>{I['nbabs']} demi-journées, dont {I['nbabsjust']} justifiées
(pendant ce semestre). (pendant ce semestre).
</a></p> </a></p>
""" """
% I
) )
# --- Decision Jury # --- Decision Jury
if I["situation"]: if I["situation"]:

10
app/scodoc/sco_bulletins_standard.py
View File

@ -132,17 +132,13 @@ class BulletinGeneratorStandard(sco_bulletins_generator.BulletinGenerator):
nbabs = self.infos["nbabs"] nbabs = self.infos["nbabs"]
story.append(Spacer(1, 2 * mm)) story.append(Spacer(1, 2 * mm))
if nbabs: if nbabs:
# XXX TODO-ASSIDUITE
# et utiliser url_for...
H.append( H.append(
"""<p class="bul_abs"> f"""<p class="bul_abs">
<a href="../Absences/CalAbs?etudid=%(etudid)s" class="bull_link"> <a href="{ url_for('assiduites.calendrier_etud', scodoc_dept=g.scodoc_dept, etudid=self.infos["etudid"]) }" class="bull_link">
XXX <b>Absences :</b> {self.infos['nbabs']} demi-journées, dont {self.infos['nbabsjust']} justifiées
<b>Absences :</b> %(nbabs)s demi-journées, dont %(nbabsjust)s justifiées
(pendant ce semestre). (pendant ce semestre).
</a></p> </a></p>
""" """
% self.infos
) )
story.append( story.append(
Paragraph( Paragraph(