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

2
app/forms/assiduite/ajout_assiduite_etud.py
View File

@ -41,6 +41,8 @@ from wtforms import (
class AjoutAssiduiteEtudForm(FlaskForm): class AjoutAssiduiteEtudForm(FlaskForm):
"Formulaire de saisie d'une assiduité pour un étudiant" "Formulaire de saisie d'une assiduité pour un étudiant"
error_message = "" # used to report our errors
assi_etat = RadioField( assi_etat = RadioField(
"Signaler:", "Signaler:",
choices=[("absent", "absence"), ("retard", "retard"), ("present", "présence")], choices=[("absent", "absence"), ("retard", "retard"), ("present", "présence")],

10
app/static/css/scodoc.css
View File

@ -1203,6 +1203,16 @@ span.wtf-field ul.errors li,
span.wtf-field-error { span.wtf-field-error {
color: red; color: red;
} }
div.wtf-error-messages {
color: red;
font-size: 110%;
font-weight: bold;
border: 1px solid red;
border-radius: 8px;
background-color: yellow;
padding: 12px;
margin: 12px;
}
#bonus_description { #bonus_description {
color: rgb(6, 73, 6); color: rgb(6, 73, 6);

6
app/templates/assiduites/pages/ajout_assiduite_etud.j2
View File

@ -53,11 +53,9 @@ div.submit > input {
<div class="tab-content"> <div class="tab-content">
<h2>Signaler une absence, retard ou présence pour {{etud.html_link_fiche()|safe}}</h2> <h2>Signaler une absence, retard ou présence pour {{etud.html_link_fiche()|safe}}</h2>
{% if 'general_errors' in form.errors %} {% if form.error_message %}
<div class="wtf-error-messages"> <div class="wtf-error-messages">
{% for error in form.errors['general_errors'] %} {{ form.error_message }}
<span>{{ error }}</span>
{% endfor %}
</div> </div>
{% endif %} {% endif %}

2
app/views/assiduites.py
View File

@ -442,7 +442,7 @@ def _record_assiduite_etud(
db.session.commit() db.session.commit()
return True return True
except ScoValueError as exc: except ScoValueError as exc:
form.errors["general_errors"] = [f"Erreur: {exc.args[0]}"] form.error_message = f"Erreur: {exc.args[0]}"
return False return False
# # Génération de la page # # Génération de la page