Add support for xlsx file, #8469

archesproject · Jul 19, 2023 · 9134337 · 9134337
1 parent 8c4e162
commit 9134337
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/arches/app/etl_modules/branch_csv_importer.py b/arches/app/etl_modules/branch_csv_importer.py
@@ -268,6 +268,11 @@ def read(self, request):
                             result["summary"]["files"][file.filename] = {"size": (self.filesize_format(file.file_size))}
                             result["summary"]["cumulative_excel_files_size"] = self.cumulative_excel_files_size
                         default_storage.save(os.path.join(self.temp_dir, file.filename), File(zip_ref.open(file)))
+        elif content.name.split(".")[-1] == "xlsx":
+            self.cumulative_excel_files_size += content.size
+            result["summary"]["files"][content.name] = {"size": (self.filesize_format(content.size))}
+            result["summary"]["cumulative_excel_files_size"] = self.cumulative_excel_files_size
+            default_storage.save(os.path.join(self.temp_dir, content.name), File(content))
         return {"success": result, "data": result}
 
     def start(self, request):

diff --git a/arches/app/templates/javascript.htm b/arches/app/templates/javascript.htm
@@ -712,7 +712,7 @@
         download-templates='{% trans "Download Templates" as downloadTemplates %} "{{ downloadTemplates|escapejs }}"'
         select-template='{% trans "Select Template" as selectTemplate %} "{{ selectTemplate|escapejs }}"'
         upload-zip-file='{% trans "Upload .zip File" as uploadZipFile %} "{{ uploadZipFile|escapejs }}"'
-        upload-your-zip-file='{% trans "Upload Your .zip File" as uploadYourZipFile %} "{{ uploadYourZipFile|escapejs }}"'
+        upload-your-xlsx-zip-file='{% trans "Upload Your .xlsx or .zip File" as uploadYourXlsxZipFile %} "{{ uploadYourXlsxZipFile|escapejs }}"'
         branch-excel='{% trans "Branch Excel" as branchExcel %} "{{ branchExcel|escapejs }}"'
         file-upload-summary='{% trans "File Upload Summary" as fileUploadSummary %} "{{ fileUploadSummary|escapejs }}"'
         file='{% trans "File" as file %} "{{ file|escapejs }}"'

diff --git a/arches/app/templates/views/components/etl_modules/branch-csv-importer.htm b/arches/app/templates/views/components/etl_modules/branch-csv-importer.htm
@@ -50,7 +50,7 @@ <h4>
                     <span><i style="color: #000" class="fa fa-cloud-upload r-select-icon"></i></span>
                 </div> 
                 <h2>
-                    <span data-bind="text: $root.translations.uploadYourZipFile"></span>
+                    <span data-bind="text: $root.translations.uploadYourXlsxZipFile"></span>
                 </h2>
                 <h4>
                     <span data-bind="text: $root.translations.dragAndDropFilesOnPanel"></span>