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

2
app/scodoc/sco_cursus_dut.py
View File

@ -987,7 +987,7 @@ def formsemestre_has_decisions(formsemestre_id):
""" """
cnx = ndb.GetDBConnexion() cnx = ndb.GetDBConnexion()
validations = scolar_formsemestre_validation_list( validations = scolar_formsemestre_validation_list(
cnx, args={"formsemestre_id": formsemestre_id} cnx, args={"formsemestre_id": formsemestre_id, "is_external": False}
) )
return len(validations) > 0 return len(validations) > 0

8
app/scodoc/sco_moduleimpl_status.py
View File

@ -163,7 +163,7 @@ def _ue_coefs_html(coefs_lst) -> str:
""" """
+ "\n".join( + "\n".join(
[ [
f"""<div style="--coef:{coef}; f"""<div style="--coef:{coef};
{'background-color: ' + ue.color + ';' if ue.color else ''} {'background-color: ' + ue.color + ';' if ue.color else ''}
"><div>{coef}</div>{ue.acronyme}</div>""" "><div>{coef}</div>{ue.acronyme}</div>"""
for ue, coef in coefs_lst for ue, coef in coefs_lst
@ -363,8 +363,8 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
if formsemestre_has_decisions(formsemestre_id): if formsemestre_has_decisions(formsemestre_id):
H.append( H.append(
"""<ul class="tf-msg"> """<ul class="tf-msg">
<li class="tf-msg warning">Décisions de jury saisies: seul le responsable du <li class="tf-msg warning">Décisions de jury saisies: seul le ou la responsable du
semestre peut saisir des notes (il devra modifier les décisions de jury). semestre peut saisir des notes (elle devra modifier les décisions de jury).
</li> </li>
</ul>""" </ul>"""
) )
@ -419,7 +419,7 @@ def moduleimpl_status(moduleimpl_id=None, partition_id=None):
if nb_evaluations > 0: if nb_evaluations > 0:
top_table_links += f""" top_table_links += f"""
<a class="stdlink" style="margin-left:2em;" href="{ <a class="stdlink" style="margin-left:2em;" href="{
url_for("notes.moduleimpl_evaluation_renumber", url_for("notes.moduleimpl_evaluation_renumber",
scodoc_dept=g.scodoc_dept, moduleimpl_id=modimpl.id) scodoc_dept=g.scodoc_dept, moduleimpl_id=modimpl.id)
}">Trier par date</a> }">Trier par date</a>
""" """

2
sco_version.py
View File

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