arthur.zhu/ScoDoc
1
0
Fork 0
forked from ScoDoc/ScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://scodoc.org/git/viennet/ScoDoc

Browse Source
This commit is contained in:
Emmanuel Viennet 2021-08-20 10:53:44 +02:00
commit 2d7b2547b8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/scodoc/sco_trombino.py
View File

@ -576,7 +576,7 @@ def zip_excel_import_files(
exceldata = xlsfile.read() exceldata = xlsfile.read()
if not exceldata: if not exceldata:
raise ScoValueError("Fichier excel vide ou invalide") raise ScoValueError("Fichier excel vide ou invalide")
_, data = sco_excel.Excel_to_list(exceldata) _, data = sco_excel.excel_bytes_to_list(exceldata)
if not data: # probably a bug if not data: # probably a bug
raise ScoValueError("Fichier excel vide !") raise ScoValueError("Fichier excel vide !")
# on doit avoir une colonne etudid et une colonne filename_title ('fichier_photo') # on doit avoir une colonne etudid et une colonne filename_title ('fichier_photo')

1
app/views/scolar.py
View File

@ -2093,6 +2093,7 @@ sco_publish(
"/photos_import_files_form", "/photos_import_files_form",
sco_trombino.photos_import_files_form, sco_trombino.photos_import_files_form,
Permission.ScoEtudChangeAdr, Permission.ScoEtudChangeAdr,
methods=["GET", "POST"],
) )
sco_publish( sco_publish(
"/photos_generate_excel_sample", "/photos_generate_excel_sample",