Loading src/resources/models.py +0 −1 Original line number Diff line number Diff line Loading @@ -1028,7 +1028,6 @@ class Collection(models.Model): ) col_number = col_number + 1 row_number = row_number + 1 print(row_number) col_number = 1 for key in r.keys(): cell = ws.cell(row=1, column=col_number) Loading src/rpc/views.py +2 −25 Original line number Diff line number Diff line Loading @@ -41,8 +41,7 @@ from resources.tasks import ( update_data_from_xlsx_rows, hls_task, ) from openpyxl import Workbook, load_workbook from openpyxl.utils.exceptions import IllegalCharacterError from openpyxl import load_workbook import tempfile from rpc.signals import rpc_success_signal Loading Loading @@ -481,30 +480,8 @@ def download_metas_xls(request: HttpRequest, collection_id): return HttpResponse("Forbidden", status=403) UserAccess(user, collection_instance.project).check_read(collection_instance) wb = Workbook() ws = wb.active row_number = 2 # /!\ Index starts at 1. Leave the first row for headers. r = {} for r in collection_instance.yield_resource_data_for_export(): col_number = 1 for value in r.values(): cell = ws.cell(row=row_number, column=col_number) try: cell.value = value except IllegalCharacterError: logger.warning( f"Could not add value of type {type(value)} to cell: {value}" ) col_number = col_number + 1 row_number = row_number + 1 col_number = 1 for key in r.keys(): cell = ws.cell(row=1, column=col_number) cell.value = key col_number = col_number + 1 with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp: wb.save(tmp.name) collection_instance.export_to_xlsx(tmp.name) return RangedFileResponse( request, open(tmp.name, "rb"), Loading Loading
src/resources/models.py +0 −1 Original line number Diff line number Diff line Loading @@ -1028,7 +1028,6 @@ class Collection(models.Model): ) col_number = col_number + 1 row_number = row_number + 1 print(row_number) col_number = 1 for key in r.keys(): cell = ws.cell(row=1, column=col_number) Loading
src/rpc/views.py +2 −25 Original line number Diff line number Diff line Loading @@ -41,8 +41,7 @@ from resources.tasks import ( update_data_from_xlsx_rows, hls_task, ) from openpyxl import Workbook, load_workbook from openpyxl.utils.exceptions import IllegalCharacterError from openpyxl import load_workbook import tempfile from rpc.signals import rpc_success_signal Loading Loading @@ -481,30 +480,8 @@ def download_metas_xls(request: HttpRequest, collection_id): return HttpResponse("Forbidden", status=403) UserAccess(user, collection_instance.project).check_read(collection_instance) wb = Workbook() ws = wb.active row_number = 2 # /!\ Index starts at 1. Leave the first row for headers. r = {} for r in collection_instance.yield_resource_data_for_export(): col_number = 1 for value in r.values(): cell = ws.cell(row=row_number, column=col_number) try: cell.value = value except IllegalCharacterError: logger.warning( f"Could not add value of type {type(value)} to cell: {value}" ) col_number = col_number + 1 row_number = row_number + 1 col_number = 1 for key in r.keys(): cell = ws.cell(row=1, column=col_number) cell.value = key col_number = col_number + 1 with tempfile.NamedTemporaryFile(suffix=".xlsx") as tmp: wb.save(tmp.name) collection_instance.export_to_xlsx(tmp.name) return RangedFileResponse( request, open(tmp.name, "rb"), Loading