From aef19f4f96ffec575c01e299af6f3ccce7d447dc Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Fri, 12 Aug 2022 14:34:50 +0100
Subject: [PATCH] bug on download alternative scenarios

---
 cara/apps/calculator/static/js/report.js           | 7 +++----
 cara/apps/templates/base/calculator.report.html.j2 | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/cara/apps/calculator/static/js/report.js b/cara/apps/calculator/static/js/report.js
index a08d6f4a..0c1a3aff 100644
--- a/cara/apps/calculator/static/js/report.js
+++ b/cara/apps/calculator/static/js/report.js
@@ -891,17 +891,16 @@ function export_csv() {
     let has_alternative_scenario = false;
     export_lists.forEach(e => {
         if (e.checked) {
-            let has_rename = document.getElementById(`${e.id}__rename`).value;
-            let column_name = has_rename != '' ? has_rename : e.id;
             if (e.id != "Alternative Scenarios") {
+                let has_rename = document.getElementById(`${e.id}__rename`).value;
+                let column_name = has_rename != '' ? has_rename : e.id;
                 checked_names.push(column_name);
                 checked_items.push(e.id);
             }
             else if (e.id == "Alternative Scenarios") {
                 Object.entries(alternative_scenarios).map((scenario) => {
                     if (scenario[0] != 'Current scenario') {
-                        checked_names.push(`Alternative scenario - ${column_name}`);
-                        checked_items.push(`Alternative scenario - ${e.id}`);
+                        checked_names.push(`Alternative scenario - ${scenario[0]}`);
                         has_alternative_scenario = true;
                     };
                 });
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2
index e202c1c1..b5658105 100644
--- a/cara/apps/templates/base/calculator.report.html.j2
+++ b/cara/apps/templates/base/calculator.report.html.j2
@@ -82,7 +82,7 @@
 			</div>
 			{% else %}
 			<div class="form-check">
-				<input type="checkbox" class="form-check-input" name="checkedItems" id="Alternative Scenarios" onclick="display_rename_column(this.checked, 'alternative-scenarios-rename-div')">
+				<input type="checkbox" class="form-check-input" name="checkedItems" id="Alternative Scenarios">
 				<label class="form-check-label" for="Alternative Scenarios">Alternative Scenarios</label>
 			</div>
 			{% endif %}