1
0
forked from ScoDoc/ScoDoc

correction sco_excel

This commit is contained in:
Arthur ZHU 2022-07-07 15:30:50 +02:00
parent 0140c404ea
commit f2f3fd0660

View File

@ -654,7 +654,7 @@ def _excel_to_list(filelike):
diag.append("Attention: n'utilise que la première feuille du classeur !") diag.append("Attention: n'utilise que la première feuille du classeur !")
sheet_name = workbook.get_sheet_names()[0] sheet_name = workbook.get_sheet_names()[0]
ws = workbook[sheet_name] ws = workbook[sheet_name]
matrix, diag_sheet = _excel_sheet_to_list(ws, sheet_name) diag_sheet, matrix = _excel_sheet_to_list(ws, sheet_name)
diag += diag_sheet diag += diag_sheet
return diag, matrix return diag, matrix
@ -708,7 +708,7 @@ def _excel_workbook_to_list(filelike):
for sheet_name in workbook.get_sheet_names(): for sheet_name in workbook.get_sheet_names():
# fill matrix # fill matrix
sheet = workbook.get_sheet_by_name(sheet_name) sheet = workbook.get_sheet_by_name(sheet_name)
matrix, diag_sheet = _excel_sheet_to_list(sheet, sheet_name) diag_sheet, matrix = _excel_sheet_to_list(sheet, sheet_name)
diag += diag_sheet diag += diag_sheet
matrix_list.append(matrix) matrix_list.append(matrix)
return diag, matrix_list return diag, matrix_list