Skip to content

Commit f94643c

Browse files
Merge branch 'bug/co2_template' into 'master'
Update CO2_template URL See merge request caimira/caimira!534
2 parents 2192073 + ab848ca commit f94643c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

caimira/tests/data/test_weather.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ def test_timezone_at__out_of_range():
6363
@pytest.mark.parametrize(
6464
["latitude", "longitude", "expected_tz_name"],
6565
[
66-
[6.14275, 46.20833, 'Europe/Zurich'], # Geneva
67-
[144.96751, -37.81739, "Australia/Melbourne"], # Melbourne
66+
[6.14275, 46.20833, 'Europe/Paris'], # Geneva timezone
67+
[144.96751, -37.81739, "Australia/Sydney"], # Melbourne timezone
6868
[-176.433333, -44.033333, 'Pacific/Chatham'], # Chatham Islands
6969
]
7070
)

cern_caimira/src/cern_caimira/apps/templates/base/calculator.form.html.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
<div class="modal-body">
325325
<div class="d-flex d-row justify-content-between">
326326
<h5 class="mt-auto mb-auto">Upload a valid data file (.xls or .xlsx):</h5>
327-
<a class="btn btn-primary btn-sm" href="https://caimira-resources.web.cern.ch/CO2_template.xlsx">Download template</a>
327+
<a class="btn btn-primary btn-sm" href="https://caimira-resources.web.cern.ch/CO2_templates/CO2_template.csv">Download template</a>
328328
</div>
329329
<div class="d-flex">
330330
<p>You may use the provided template and fill in the values.</p>

0 commit comments

Comments
 (0)