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

3
app/api/assiduites.py
View File

@ -728,7 +728,6 @@ def assiduite_edit(assiduite_id: int):
assiduite_unique.etudiant.id, assiduite_unique.etudiant.id,
msg=f"assiduite: modif {assiduite_unique}", msg=f"assiduite: modif {assiduite_unique}",
) )
db.session.add(assiduite_unique)
db.session.commit() db.session.commit()
scass.simple_invalidate_cache(assiduite_unique.to_dict()) scass.simple_invalidate_cache(assiduite_unique.to_dict())
@ -848,7 +847,7 @@ def _edit_singular(assiduite_unique, data):
# Cas 3 : desc # Cas 3 : desc
desc = data.get("desc", False) desc = data.get("desc", False)
if desc is not False: if desc is not False:
assiduite_unique.desc = desc assiduite_unique.description = desc
# Cas 4 : est_just # Cas 4 : est_just
if assiduite_unique.etat == scu.EtatAssiduite.PRESENT: if assiduite_unique.etat == scu.EtatAssiduite.PRESENT:

2
app/templates/assiduites/widgets/tableau_assi.j2
View File

@ -147,7 +147,7 @@
<span class="obj-content">${etat}</span> <span class="obj-content">${etat}</span>
</div> </div>
<div id="user" class="obj-part"> <div id="user" class="obj-part">
<span class="obj-title">Créer par</span> <span class="obj-title">Créée par</span>
<span class="obj-content">${user}</span> <span class="obj-content">${user}</span>
</div> </div>
</div> </div>

2
app/templates/assiduites/widgets/tableau_justi.j2
View File

@ -169,7 +169,7 @@
<span class="obj-content">${etat}</span> <span class="obj-content">${etat}</span>
</div> </div>
<div id="user" class="obj-part"> <div id="user" class="obj-part">
<span class="obj-title">Créer par</span> <span class="obj-title">Créé par</span>
<span class="obj-content">${user}</span> <span class="obj-content">${user}</span>
</div> </div>
</div> </div>