pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bug on download alternative scenarios

Browse source
This commit is contained in:
Luis Aleixo 2022-08-12 14:34:50 +01:00
parent 17b3419de7
commit aef19f4f96
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cara/apps/calculator/static/js/report.js
View file

@ -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;
};
});

2
cara/apps/templates/base/calculator.report.html.j2
View file

@ -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 %}