iziram/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues 12 Pull Requests Projects 1 Releases Wiki Activity

Assiduites : fix #728

Browse Source
This commit is contained in:
iziram 2023-09-13 08:59:54 +02:00
parent 6cbfd97031
commit a7058fb86b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scodoc/sco_groups_view.py
View File

@ -900,7 +900,7 @@ def form_choix_jour_saisie_hebdo(groups_infos, moduleimpl_id=None):
formsemestre_id=groups_infos.formsemestre_id, formsemestre_id=groups_infos.formsemestre_id,
moduleimpl_id="" if moduleimpl_id is None else moduleimpl_id moduleimpl_id="" if moduleimpl_id is None else moduleimpl_id
) )
}';">Saisie du jour</button> }';">Saisie du jour ({datetime.date.today().strftime('%d/%m/%Y')})</button>
""" """

2
app/static/js/assiduites.js
View File

@ -577,7 +577,7 @@ function updateDate() {
return true; return true;
} else { } else {
const att = document.createTextNode( const att = document.createTextNode(
"Le jour sélectionné n'est pas un jour travaillé." `Le jour sélectionné (${formatDate(date)}) n'est pas un jour travaillé.`
); );
openAlertModal("Erreur", att, "", "crimson"); openAlertModal("Erreur", att, "", "crimson");
dateInput.value = dateInput.getAttribute("value"); dateInput.value = dateInput.getAttribute("value");

12
app/views/assiduites.py
View File

@ -565,10 +565,14 @@ def signal_assiduites_group():
real_date = scu.is_iso_formated(date, True).date() real_date = scu.is_iso_formated(date, True).date()
if real_date < formsemestre.date_debut: if real_date < formsemestre.date_debut or real_date > formsemestre.date_fin:
date = formsemestre.date_debut.isoformat() real_str = real_date.strftime("%d/%m/%Y")
elif real_date > formsemestre.date_fin: form_deb = formsemestre.date_debut.strftime("%d/%m/%Y")
date = formsemestre.date_fin.isoformat() form_fin = formsemestre.date_fin.strftime("%d/%m/%Y")
raise ScoValueError(
f"Impossible de saisir les assiduités pour le {real_str}"
+ f" : Jour en dehors du semestre ( {form_deb} → {form_fin}) "
)
# --- Restriction en fonction du moduleimpl_id --- # --- Restriction en fonction du moduleimpl_id ---
if moduleimpl_id: if moduleimpl_id: