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

7
app/scodoc/sco_bulletins_legacy.py
View File

@ -316,7 +316,8 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
# --- Absences # --- Absences
H.append( H.append(
f"""<p> f"""<p>
<a href="{ url_for('assiduites.calendrier_etud', scodoc_dept=g.scodoc_dept, etudid=I["etudid"]) }" class="bull_link"> <a href="{ url_for('assiduites.calendrier_etud',
scodoc_dept=g.scodoc_dept, etudid=I['etudid']) }" class="bull_link">
<b>Absences :</b>{I['nbabs']} demi-journées, dont {I['nbabsjust']} 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>
@ -340,10 +341,10 @@ class BulletinGeneratorLegacy(sco_bulletins_generator.BulletinGenerator):
for appreciation in appreciations: for appreciation in appreciations:
if can_edit_app: if can_edit_app:
mlink = f"""<a class="stdlink" href="{ mlink = f"""<a class="stdlink" href="{
url_for('notes.appreciation_add_form', scodoc_dept=g.scodoc_dpt, appreciation_id=appreciation.id) url_for('notes.appreciation_add_form', scodoc_dept=g.scodoc_dept, appreciation_id=appreciation.id)
}">modifier</a> }">modifier</a>
<a class="stdlink" href="{ <a class="stdlink" href="{
url_for('notes.appreciation_add_form', scodoc_dept=g.scodoc_dpt, appreciation_id=appreciation.id, suppress=1) url_for('notes.appreciation_add_form', scodoc_dept=g.scodoc_dept, appreciation_id=appreciation.id, suppress=1)
}">supprimer</a>""" }">supprimer</a>"""
else: else:
mlink = "" mlink = ""

2
sco_version.py
View File

@ -1,7 +1,7 @@
# -*- mode: python -*- # -*- mode: python -*-
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
SCOVERSION = "9.6.48" SCOVERSION = "9.6.49"
SCONAME = "ScoDoc" SCONAME = "ScoDoc"