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

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

@ -60,10 +60,10 @@ div.submit > input {
{{ render_field_errors(form, 'assi_raison') }} {{ render_field_errors(form, 'assi_raison') }}
</div> </div>
{# Fichier(s) justificatif(s) #} {# Fichier(s) justificatif(s) #}
<div> <div><em>chargement fichier désactivé (travaux en cours), passer ensuite par "modifier le justificatif"</em>
<div>{{ form.fichiers.label }}</div> {# <div>{{ form.fichiers.label }}</div>
{{ form.fichiers() }} {{ form.fichiers() }}
{{ render_field_errors(form, 'fichiers') }} {{ render_field_errors(form, 'fichiers') }} #}
</div> </div>
{# Date dépot #} {# Date dépot #}
{{ form.entry_date.label }}&nbsp;: {{ form.entry_date }} {{ form.entry_date.label }}&nbsp;: {{ form.entry_date }}

4
app/views/assiduites.py
View File

@ -675,6 +675,8 @@ def _record_justificatif_etud(
) )
db.session.add(just) db.session.add(just)
if not _upload_justificatif_files(just, form): if not _upload_justificatif_files(just, form):
flash("Erreur enregistrement fichiers")
log("problem in _upload_justificatif_files, rolling back")
db.session.rollback() db.session.rollback()
return False return False
db.session.commit() db.session.commit()
@ -709,7 +711,7 @@ def _upload_justificatif_files(
# On actualise l'archive du justificatif # On actualise l'archive du justificatif
just.fichier = archive_name just.fichier = archive_name
db.session.add(just) db.session.add(just)
db.session.commit()
return True return True
except ScoValueError as exc: except ScoValueError as exc:
log( log(