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

2
app/api/departements.py
View File

@ -295,7 +295,7 @@ def dept_formsemestres_courants_by_id(dept_id: int):
if date_courante: if date_courante:
test_date = datetime.fromisoformat(date_courante) test_date = datetime.fromisoformat(date_courante)
else: else:
test_date = app.db.func.now() test_date = db.func.current_date()
# Les semestres en cours de ce département # Les semestres en cours de ce département
formsemestres = FormSemestre.query.filter( formsemestres = FormSemestre.query.filter(
FormSemestre.dept_id == dept.id, FormSemestre.dept_id == dept.id,

2
app/models/formsemestre.py
View File

@ -673,7 +673,7 @@ class FormSemestre(db.Model):
) -> db.Query: ) -> db.Query:
"""Liste (query) ordonnée des formsemestres courants, c'est """Liste (query) ordonnée des formsemestres courants, c'est
à dire contenant la date courant (si None, la date actuelle)""" à dire contenant la date courant (si None, la date actuelle)"""
date_courante = date_courante or db.func.now() date_courante = date_courante or db.func.current_date()
# Les semestres en cours de ce département # Les semestres en cours de ce département
formsemestres = FormSemestre.query.filter( formsemestres = FormSemestre.query.filter(
FormSemestre.dept_id == dept.id, FormSemestre.dept_id == dept.id,