jmplace/DocScoDoc
1
0
Fork 0
forked from ScoDoc/DocScoDoc
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'fix suffix processing' (#135) from jmplace/ScoDoc-Lille:fix_suffix into master

Browse Source 
Reviewed-on: https://scodoc.org/git/viennet/ScoDoc/pulls/135
This commit is contained in:
Emmanuel Viennet 2021-09-25 09:21:08 +02:00
commit 4e59b9597b
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scodoc/sco_archives_etud.py
View File

@ -272,7 +272,6 @@ def etudarchive_generate_excel_sample(group_id=None, REQUEST=None):
suffix=scu.XLSX_SUFFIX, suffix=scu.XLSX_SUFFIX,
mime=scu.XLSX_MIMETYPE, mime=scu.XLSX_MIMETYPE,
) )
# return sco_excel.send_excel_file(REQUEST, data, "ImportFichiersEtudiants" + scu.XLSX_SUFFIX)
def etudarchive_import_files_form(group_id, REQUEST=None): def etudarchive_import_files_form(group_id, REQUEST=None):

2
app/scodoc/sco_groups_view.py
View File

@ -786,7 +786,7 @@ def groups_table(
L = [dicttakestr(m, keys) for m in groups_infos.members] L = [dicttakestr(m, keys) for m in groups_infos.members]
title = "etudiants_%s" % groups_infos.groups_filename title = "etudiants_%s" % groups_infos.groups_filename
xls = sco_excel.excel_simple_table(titles=titles, lines=L, sheet_name=title) xls = sco_excel.excel_simple_table(titles=titles, lines=L, sheet_name=title)
filename = title + scu.XLSX_SUFFIX filename = title
return scu.send_file(xls, filename, scu.XLSX_SUFFIX, scu.XLSX_MIMETYPE) return scu.send_file(xls, filename, scu.XLSX_SUFFIX, scu.XLSX_MIMETYPE)
else: else:
raise ValueError("unsupported format") raise ValueError("unsupported format")

2
app/scodoc/sco_prepajury.py
View File

@ -328,7 +328,7 @@ def feuille_preparation_jury(formsemestre_id, REQUEST):
xls = ws.generate() xls = ws.generate()
return scu.send_file( return scu.send_file(
xls, xls,
f"PrepaJury{sn}{scu.XLSX_SUFFIX}", f"PrepaJury{sn}",
scu.XLSX_SUFFIX, scu.XLSX_SUFFIX,
mime=scu.XLSX_MIMETYPE, mime=scu.XLSX_MIMETYPE,
) )

2
app/scodoc/sco_recapcomplet.py
View File

@ -231,7 +231,7 @@ def do_formsemestre_recapcomplet(
return data return data
elif format == "csv": elif format == "csv":
return scu.send_file(data, filename=filename, mime=scu.CSV_MIMETYPE) return scu.send_file(data, filename=filename, mime=scu.CSV_MIMETYPE)
elif format[:3] == "xls" or format[:3] == "xlsx": elif format[:3] == "xls" or format[:4] == "xlsx":
return scu.send_file(data, filename=filename, mime=scu.XLSX_MIMETYPE) return scu.send_file(data, filename=filename, mime=scu.XLSX_MIMETYPE)
elif format == "json": elif format == "json":
js = json.dumps(data, indent=1, cls=scu.ScoDocJSONEncoder) js = json.dumps(data, indent=1, cls=scu.ScoDocJSONEncoder)