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
Showing only changes of commit 86c12dee08 - Show all commits

View File

@ -516,12 +516,9 @@ def filter_by_formsemestre(
.filter(FormSemestreInscription.formsemestre_id == formsemestre.id) .filter(FormSemestreInscription.formsemestre_id == formsemestre.id)
) )
form_date_debut = formsemestre.date_debut + timedelta(days=1)
form_date_fin = formsemestre.date_fin + timedelta(days=1)
collection_result = collection_result.filter( collection_result = collection_result.filter(
collection_class.date_debut <= form_date_fin collection_class.date_debut <= formsemestre.date_fin
).filter(collection_class.date_fin >= form_date_debut) ).filter(collection_class.date_fin >= formsemestre.date_debut)
return collection_result return collection_result