spreadsheet: Change download file name and copy on page

#67
Open-Telecoms-Data · Dec 16, 2022 · 1fc9c73 · 1fc9c73
1 parent 4facb65
commit 1fc9c73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/cove_ofds/process.py b/cove_ofds/process.py
@@ -353,9 +353,7 @@ def __init__(self, supplied_data):
         self.csvs_zip_filename = os.path.join(
             self.supplied_data.data_dir(), "flatten", "flattened.csvs.zip"
         )
-        self.output_dir = os.path.join(
-            self.supplied_data.data_dir(), "flatten", "flattened"
-        )
+        self.output_dir = os.path.join(self.supplied_data.data_dir(), "flatten", "data")
 
     def process(self, process_data: dict) -> dict:
 
@@ -401,24 +399,24 @@ def get_context(self):
         context = {}
         # XLSX
         xlsx_filename = os.path.join(
-            self.supplied_data.data_dir(), "flatten", "flattened.xlsx"
+            self.supplied_data.data_dir(), "flatten", "data.xlsx"
         )
         if os.path.exists(xlsx_filename):
             context["can_download_xlsx"] = True
             context["download_xlsx_url"] = os.path.join(
-                self.supplied_data.data_url(), "flatten", "flattened.xlsx"
+                self.supplied_data.data_url(), "flatten", "data.xlsx"
             )
             context["download_xlsx_size"] = os.stat(xlsx_filename).st_size
         else:
             context["can_download_xlsx"] = False
         # ODS
         ods_filename = os.path.join(
-            self.supplied_data.data_dir(), "flatten", "flattened.ods"
+            self.supplied_data.data_dir(), "flatten", "data.ods"
         )
         if os.path.exists(ods_filename):
             context["can_download_ods"] = True
             context["download_ods_url"] = os.path.join(
-                self.supplied_data.data_url(), "flatten", "flattened.ods"
+                self.supplied_data.data_url(), "flatten", "data.ods"
             )
             context["download_ods_size"] = os.stat(ods_filename).st_size
         else:
@@ -435,7 +433,7 @@ def get_context(self):
                     "name": f,
                     "size": os.stat(os.path.join(self.output_dir, f)).st_size,
                     "url": os.path.join(
-                        self.supplied_data.data_url(), "flatten", "flattened", f
+                        self.supplied_data.data_url(), "flatten", "data", f
                     ),
                 }
                 for f in self._get_list_csv_filenames()

diff --git a/cove_ofds/templates/cove_ofds/explore.html b/cove_ofds/templates/cove_ofds/explore.html
@@ -199,13 +199,13 @@ <h4 class="panel-title">
                                             {% if can_download_ods %}
                                                 <li>
                                                     <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
-                                                    <a href="{{download_ods_url}}">Open Office, ODS ({{ download_ods_size|filesizeformat }})</a>
+                                                    <a href="{{download_ods_url}}">data.ods ({{ download_ods_size|filesizeformat }})</a>
                                                 </li>
                                             {% endif %}
                                             {% if can_download_xlsx %}
                                                 <li>
                                                     <span class="glyphicon glyphicon-download" aria-hidden="true"></span>
-                                                    <a href="{{download_xlsx_url}}">Excel, XLSX ({{ download_xlsx_size|filesizeformat }})</a>
+                                                    <a href="{{download_xlsx_url}}">data.xlsx ({{ download_xlsx_size|filesizeformat }})</a>
                                                 </li>
                                             {% endif %}
                                         </ul>