Home Information - Your home, your data, organized.
Python
Fix local timezone display in alert and weather templates (Issue #49) (#50)
Tony Cd82440e52739
diff --git a/src/hi/apps/alert/templates/alert/modals/alert_details.html b/src/hi/apps/alert/templates/alert/modals/alert_details.htmlindex 0c0d317e..35bc7176 100644--- a/src/hi/apps/alert/templates/alert/modals/alert_details.html+++ b/src/hi/apps/alert/templates/alert/modals/alert_details.html@@ -1,11 +1,13 @@{% extends "modals/action_done.html" %}{% load humanize %}+{% load tz %}{% block title_text %}{{ alert.title }}{% endblock %}{% block body %}+{% timezone USER_TIMEZONE %}<div>Alert Source: {{ alert.alarm_source.label }}</div>@@ -16,7 +18,7 @@Alert Type: {{ alert.alarm_type }}</div><div>- When: {{ alert.start_datetime|naturaltime }}+ When: {{ alert.start_datetime|localtime|naturaltime }}</div><div>@@ -27,4 +29,5 @@{% include "alert/panes/alarm_details.html" %}{% endfor %}</div>+{% endtimezone %}{% endblock %}diff --git a/src/hi/apps/alert/templates/alert/panes/alarm_details.html b/src/hi/apps/alert/templates/alert/panes/alarm_details.htmlindex 972ce919..7d613263 100644--- a/src/hi/apps/alert/templates/alert/panes/alarm_details.html+++ b/src/hi/apps/alert/templates/alert/panes/alarm_details.html@@ -1,6 +1,8 @@+{% load tz %}+{% timezone USER_TIMEZONE %}<div><div>- Alarmed at: {{ alarm.timestamp }}+ Alarmed at: {{ alarm.timestamp|localtime }}{{ alarm.source_details_list|length }}</div><div>@@ -12,3 +14,4 @@{% endfor %}</div></div>+{% endtimezone %}diff --git a/src/hi/apps/alert/templates/alert/panes/alert_banner_content.html b/src/hi/apps/alert/templates/alert/panes/alert_banner_content.htmlindex c0319f58..a019b10e 100644--- a/src/hi/apps/alert/templates/alert/panes/alert_banner_content.html+++ b/src/hi/apps/alert/templates/alert/panes/alert_banner_content.html@@ -1,4 +1,6 @@{% load humanize %}+{% load tz %}+{% timezone USER_TIMEZONE %}<div class="hi-alert-banner-alert-list">{% for alert in alert_list %}<div class="hi-alert hi-alarm-level-{{ alert.alarm_level }} row">@@ -9,7 +11,7 @@<div class="col-1">{{ alert.alarm_level.label }}</div><div class="col-6">{{ alert.title }}</div><div class="col-3">- Since {{ alert.start_datetime|naturaltime }}+ Since {{ alert.start_datetime|localtime|naturaltime }}</div><div class="col-1"><form action="{% url 'alert_acknowledge' alert_id=alert.id %}" method="post"@@ -23,3 +25,4 @@<div class="alert alert-warning">No alerts.</div>{% endfor %}</div>+{% endtimezone %}diff --git a/src/hi/apps/weather/templates/weather/panes/weather_alerts.html b/src/hi/apps/weather/templates/weather/panes/weather_alerts.htmlindex 121f609c..d3d8856d 100644--- a/src/hi/apps/weather/templates/weather/panes/weather_alerts.html+++ b/src/hi/apps/weather/templates/weather/panes/weather_alerts.html@@ -18,8 +18,8 @@<hr><small><strong>{{ weather_alert.event_type.label }}</strong> • {{ weather_alert.severity.label }} •- Effective: {{ weather_alert.effective|date:"M j, Y g:i A" }}- {% if weather_alert.expires %} • Expires: {{ weather_alert.expires|date:"M j, Y g:i A" }}{% endif %}+ Effective: {{ weather_alert.effective|localtime|date:"M j, Y g:i A" }}+ {% if weather_alert.expires %} • Expires: {{ weather_alert.expires|localtime|date:"M j, Y g:i A" }}{% endif %}</small></div>