Home Information - Your home, your data, organized.
Python
Issue #320: Render history values via value_template_name dispatch (#324)
Tony C0ef20dccb5e7
diff --git a/src/hi/apps/control/templates/control/modals/controller_history.html b/src/hi/apps/control/templates/control/modals/controller_history.htmlindex 3f552092..bee74f9d 100644--- a/src/hi/apps/control/templates/control/modals/controller_history.html+++ b/src/hi/apps/control/templates/control/modals/controller_history.html@@ -7,7 +7,7 @@{% block body %}<h5>Controller History</h5><div class="py-2">- {% include "control/panes/controller_history_list.html" with controller_history_list=controller_history_list %}+ {% include "control/panes/controller_history_list.html" with controller_response_list=controller_response_list %}</div>{% include "common/panes/pagination.html" with pagination=pagination %}diff --git a/src/hi/apps/control/templates/control/panes/controller_data.html b/src/hi/apps/control/templates/control/panes/controller_data.htmlindex c652a229..f42996db 100644--- a/src/hi/apps/control/templates/control/panes/controller_data.html+++ b/src/hi/apps/control/templates/control/panes/controller_data.html@@ -1,4 +1,5 @@{% load common_tags %}+{% load control_tags %}{% generate_uuid as unique_id %}<div id="hi-controller-{{ controller_data.controller.id }}-{{ unique_id }}"class="{{ controller_data.css_class }}" >@@ -8,7 +9,7 @@{% csrf_token %}<input type="hidden" name="response_context" value="{% if in_modal_context %}modal{% else %}page{% endif %}">- {% include_with_fallback controller_data.controller.entity_state.entity_state_type.controller_template_name "control/panes/controller_default.html" %}+ {% include_controller_widget controller_data.controller %}{% if controller_data.error_list %}<div class="text-danger"><ul>diff --git a/src/hi/apps/control/templates/control/panes/controller_history_list.html b/src/hi/apps/control/templates/control/panes/controller_history_list.htmlindex 2422d862..203599a8 100644--- a/src/hi/apps/control/templates/control/panes/controller_history_list.html+++ b/src/hi/apps/control/templates/control/panes/controller_history_list.html@@ -1,12 +1,19 @@{% load tz %}+{% load common_tags %}{% timezone USER_TIMEZONE %}+{# Dispatches through value_template_name (read-only value display), #}+{# NOT controller_template_name's old role (interactive form widget). #}+{# Controllers and their paired sensors share an EntityState — so their #}+{# values share a value space — and history is always read-only. #}<div class="table-responsive"><table class="table table-striped"><tbody>- {% for controller_history in controller_history_list %}+ {% for sensor_response in controller_response_list %}<tr>- <td><div class="text-center" status="{{ controller_history.value }}"> {{ controller_history.value }}</div></td>- <td>{{ controller_history.created_datetime|localtime }}</td>+ <td>+ {% include_with_fallback sensor_response.sensor.entity_state.entity_state_type.value_template_name "sense/panes/sensor_response_value_default.html" %}+ </td>+ <td>{{ sensor_response.timestamp|localtime }}</td></tr>{% empty %}<tr><td colspan="2"><div class="alert alert-info" >No history.</div></td></tr>@@ -15,7 +22,7 @@</table></div>-{% if show_all_link and controller_history_list %}+{% if show_all_link and controller_response_list %}<div><a href="{% url 'control_controller_history' controller_id=controller.id %}"data-async="true">>> See All</a>diff --git a/src/hi/apps/control/templatetags/__init__.py b/src/hi/apps/control/templatetags/__init__.pynew file mode 100644index 00000000..e69de29bdiff --git a/src/hi/apps/control/templatetags/control_tags.py b/src/hi/apps/control/templatetags/control_tags.pynew file mode 100644index 00000000..d7c3402b--- /dev/null+++ b/src/hi/apps/control/templatetags/control_tags.py@@ -0,0 +1,26 @@+from django import template+from django.template.loader import get_template++from hi.apps.control.models import Controller++register = template.Library()++[email protected]_tag( takes_context = True )+def include_controller_widget( context, controller : Controller ):+ """Render the interactive controller widget for ``controller``.++ Resolves ``control/panes/controller_{state_type}.html`` for the+ controller's EntityStateType, falling back to+ ``control/panes/controller_default.html``. This is the per-state-type+ widget *layout* used by the EntityStatus row-list — a template-layer+ concern, not a model-layer one (it assumes an inline form snippet inside+ a row). Read-only value display dispatches through the model's+ ``EntityStateType.value_template_name`` instead."""+ state_type_name = controller.entity_state.entity_state_type.name.lower()+ template_name = f'control/panes/controller_{state_type_name}.html'+ try:+ template_obj = get_template( template_name )+ except Exception:+ template_obj = get_template( 'control/panes/controller_default.html' )+ return template_obj.render( context.flatten() )diff --git a/src/hi/apps/control/tests/test_control_tags.py b/src/hi/apps/control/tests/test_control_tags.pynew file mode 100644index 00000000..a94f437e--- /dev/null+++ b/src/hi/apps/control/tests/test_control_tags.py@@ -0,0 +1,58 @@+import logging++from django.template import Context, Template++from hi.apps.control.models import Controller+from hi.apps.entity.models import Entity, EntityState+from hi.testing.base_test_case import BaseTestCase++logging.disable(logging.CRITICAL)+++class TestIncludeControllerWidget(BaseTestCase):+ """``include_controller_widget`` is the EntityStatus-layer dispatch+ that resolves the per-state-type interactive widget template, with+ fallback to the default. Lives in the control app rather than on+ ``EntityStateType`` because the layout assumptions (inline form+ snippet, row-list context) belong to the EntityStatus templates,+ not the model."""++ def _render( self, controller ):+ return Template(+ '{% load control_tags %}'+ '{% include_controller_widget controller %}'+ ).render( Context({ 'controller': controller, 'controller_data': _Dummy(controller) }) )++ def test_resolves_per_state_type_template_when_present(self):+ entity = Entity.objects.create( name = 'Switch', entity_type_str = 'WALL_SWITCH' )+ state = EntityState.objects.create( entity = entity, entity_state_type_str = 'ON_OFF' )+ controller = Controller.objects.create(+ entity_state = state, name = 'sw', controller_type_str = 'DEFAULT',+ )+ # control/panes/controller_on_off.html exists in the codebase; the+ # rendered output should be that template's content (a toggle+ # switch), not the default.+ output = self._render( controller )+ self.assertIn( 'switch-modern', output )++ def test_falls_back_to_default_for_unimplemented_state_type(self):+ # BLOB has no controller_blob.html — must fall through to+ # controller_default.html without raising.+ entity = Entity.objects.create( name = 'Blob', entity_type_str = 'OTHER' )+ state = EntityState.objects.create( entity = entity, entity_state_type_str = 'BLOB' )+ controller = Controller.objects.create(+ entity_state = state, name = 'blob-ctrl', controller_type_str = 'DEFAULT',+ )+ output = self._render( controller )+ # Default template renders without error.+ self.assertIsNotNone( output )+++class _Dummy:+ """Minimum surface to render the per-state-type widget templates+ that read ``controller_data.controller`` / ``controller_data.value``."""+ def __init__( self, controller ):+ self.controller = controller+ self.value = ''+ self.css_class = ''+ self.error_list = []diff --git a/src/hi/apps/control/tests/test_views.py b/src/hi/apps/control/tests/test_views.pyindex 7abc380a..ffe9371e 100644--- a/src/hi/apps/control/tests/test_views.py+++ b/src/hi/apps/control/tests/test_views.py@@ -207,7 +207,7 @@ class TestControllerHistoryView(DualModeViewTestCase):self.assertSuccessResponse(response)self.assertEqual(response.context['controller'], self.controller)- self.assertIn('controller_history_list', response.context)+ self.assertIn('controller_response_list', response.context)self.assertIn('pagination', response.context)def test_pagination_context(self):@@ -248,11 +248,11 @@ class TestControllerHistoryView(DualModeViewTestCase):response = self.client.get(url)self.assertSuccessResponse(response)- history_list = response.context['controller_history_list']+ history_list = response.context['controller_response_list']- # All history entries should belong to our controller- for history_entry in history_list:- self.assertEqual(history_entry.controller, self.controller)+ # All adapted responses should reference our controller+ for response_entry in history_list:+ self.assertEqual(response_entry.controller, self.controller)def test_nonexistent_controller_returns_404(self):"""Test that accessing nonexistent controller returns 404."""@@ -275,7 +275,7 @@ class TestControllerHistoryView(DualModeViewTestCase):response = self.client.get(url)self.assertSuccessResponse(response)- history_list = response.context['controller_history_list']+ history_list = response.context['controller_response_list']# Should be limited by page size (25)self.assertLessEqual(len(history_list), 25)@@ -286,4 +286,42 @@ class TestControllerHistoryView(DualModeViewTestCase):response = self.client.post(url)self.assertEqual(response.status_code, 405)+++class TestControllerHistoryRendering(DualModeViewTestCase):+ """Controller history dispatches each row through+ ``EntityStateType.value_template_name`` (the read-only value+ display) — not ``controller_template_name``'s old role+ (interactive widget). Discrete-enum stored values render as+ their human-readable labels."""++ def test_discrete_value_renders_as_human_readable_label(self):+ import json+ entity = Entity.objects.create( name = 'Switch', entity_type_str = 'WALL_SWITCH' )+ state = EntityState.objects.create(+ entity = entity,+ name = 'on_off',+ entity_state_type_str = 'ON_OFF',+ value_range_str = json.dumps([ 'on', 'off' ]),+ )+ controller = Controller.objects.create(+ entity_state = state,+ controller_type_str = 'DEFAULT',+ integration_payload = '{"device_id": "sw1"}',+ )+ ControllerHistory.objects.create(+ controller = controller, value = 'on',+ created_datetime = '2024-03-01T12:00:00Z',+ )++ url = reverse( 'control_controller_history',+ kwargs = { 'controller_id': controller.id } )+ response = self.client.get( url )+ self.assertSuccessResponse( response )+ body = response.content.decode()+ # 'on' is an EntityStateValue enum member → its label is 'On'.+ self.assertIn( 'On', body )+ # The interactive widget chrome (the toggle switch class from+ # controller_on_off.html) must NOT appear in history rendering.+ self.assertNotIn( 'switch-modern', body )diff --git a/src/hi/apps/control/transient_models.py b/src/hi/apps/control/transient_models.pyindex f20e863a..df24ea90 100644--- a/src/hi/apps/control/transient_models.py+++ b/src/hi/apps/control/transient_models.py@@ -1,11 +1,12 @@from dataclasses import dataclass+from datetime import datetimefrom typing import Listfrom django.urls import reversefrom hi.apps.sense.transient_models import SensorResponse-from .models import Controller+from .models import Controller, ControllerHistory@dataclass@@ -32,6 +33,37 @@ class ControllerData:return self.controller.entity_state.css_class+@dataclass+class ControllerHistoryResponse:+ """Adapter exposing a ControllerHistory row through the surface the+ per-state-type value templates read from a SensorResponse:+ ``.value``, ``.timestamp``, ``.entity_state``. Used by the controller+ history list so it dispatches through+ ``EntityStateType.value_template_name`` — the canonical read-only+ value display — instead of the interactive controller widget.++ The loop-variable name ``sensor_response`` in the per-state-type+ templates is a duck-typed slot: both ``SensorResponse`` and this+ adapter satisfy the access pattern. A neutral rename of the+ template variable lives with the merged-history work in #323."""++ value : str+ timestamp : datetime+ controller : Controller++ @classmethod+ def from_controller_history( cls, controller_history : ControllerHistory ) -> 'ControllerHistoryResponse':+ return cls(+ value = controller_history.value,+ timestamp = controller_history.created_datetime,+ controller = controller_history.controller,+ )++ @property+ def entity_state(self):+ return self.controller.entity_state++@dataclassclass ControllerOutcome:controller : Controllerdiff --git a/src/hi/apps/control/views.py b/src/hi/apps/control/views.pyindex f9e11ea7..22c50bed 100644--- a/src/hi/apps/control/views.py+++ b/src/hi/apps/control/views.py@@ -11,6 +11,7 @@ from hi.hi_async_view import HiModalViewfrom .control_mixins import ControllerMixinfrom .models import Controller, ControllerHistory+from .transient_models import ControllerHistoryResponsefrom .view_mixins import ControlViewMixinlogger = logging.getLogger(__name__)@@ -109,10 +110,13 @@ class ControllerHistoryView( HiModalView, ControlViewMixin ):page_size = self.CONTROLLER_HISTORY_PAGE_SIZE,async_urls = True )controller_history_list = queryset[pagination.start_offset:pagination.end_offset + 1]+ controller_response_list = [+ ControllerHistoryResponse.from_controller_history( h ) for h in controller_history_list+ ]context = {'controller': controller,- 'controller_history_list': controller_history_list,+ 'controller_response_list': controller_response_list,'pagination': pagination,}return self.modal_response( request, context )diff --git a/src/hi/apps/entity/enums.py b/src/hi/apps/entity/enums.pyindex 3d951f6f..a5787579 100644--- a/src/hi/apps/entity/enums.py+++ b/src/hi/apps/entity/enums.py@@ -479,15 +479,6 @@ class EntityStateType(LabeledEnum):"""return f'sense/panes/sensor_response_value_{self.name.lower()}.html'- def controller_template_name(self):- """- Template used to render a controllers for this state. Create the- template at the given location to define a state-specific rendering, else- it will fallback to the default template of- "entity/panes/controller_value_default.html"- """- return f'control/panes/controller_{self.name.lower()}.html'-def default_role(self) -> EntityStateRole:"""The default EntityStateRole for an EntityState of this type.Type-default ``EntityStateRole`` members share their name withdiff --git a/src/hi/apps/entity/templates/entity/modals/entity_state_history.html b/src/hi/apps/entity/templates/entity/modals/entity_state_history.htmlindex 71a5db12..ab91fedc 100644--- a/src/hi/apps/entity/templates/entity/modals/entity_state_history.html+++ b/src/hi/apps/entity/templates/entity/modals/entity_state_history.html@@ -8,23 +8,23 @@{% block body %}-{% if sensor_history_list_map %}+{% if sensor_response_list_map %}<div>- {% for sensor, sensor_history_list in sensor_history_list_map.items %}+ {% for sensor, sensor_response_list in sensor_response_list_map.items %}<div><div class="h5">{{ sensor.name }} <small class="text-muted">[sensor]</small></div>- {% include "sense/panes/sensor_history_list.html" with sensor_history_list=sensor_history_list show_all_link=True %}+ {% include "sense/panes/sensor_history_list.html" with sensor_response_list=sensor_response_list show_all_link=True %}</div>{% endfor %}</div>{% endif %}-{% if controller_history_list_map %}+{% if controller_response_list_map %}<div>- {% for controller, controller_history_list in controller_history_list_map.items %}+ {% for controller, controller_response_list in controller_response_list_map.items %}<div><div class="h5">{{ controller.name }} <small class="text-muted">[controller]</small></div>- {% include "control/panes/controller_history_list.html" with controller_history_list=controller_history_list show_all_link=True %}+ {% include "control/panes/controller_history_list.html" with controller_response_list=controller_response_list show_all_link=True %}</div>{% endfor %}</div>diff --git a/src/hi/apps/entity/tests/test_enums.py b/src/hi/apps/entity/tests/test_enums.pyindex bf05fadc..f125e02d 100644--- a/src/hi/apps/entity/tests/test_enums.py+++ b/src/hi/apps/entity/tests/test_enums.py@@ -12,32 +12,22 @@ logging.disable(logging.CRITICAL)class TestEntityStateType(BaseTestCase):- def test_template_name_generation_supports_ui_customization(self):- """Test template name generation - enables state-specific UI rendering."""- # Test that different state types generate distinct template paths+ def test_value_template_name_generation_supports_ui_customization(self):+ """``value_template_name`` is the model-layer template-dispatch+ primitive for read-only value display. Per-state-type templates+ are resolved by the lowercased enum name."""on_off_template = EntityStateType.ON_OFF.value_template_name()temperature_template = EntityStateType.TEMPERATURE.value_template_name()-- # Should generate different templates for different state types+self.assertNotEqual(on_off_template, temperature_template)-- # Templates should follow consistent naming pattern+self.assertTrue(on_off_template.startswith('sense/panes/sensor_response_value_'))self.assertTrue(on_off_template.endswith('.html'))-- # Controller templates should use different namespace- controller_template = EntityStateType.TEMPERATURE.controller_template_name()- self.assertTrue(controller_template.startswith('control/panes/controller_'))- self.assertTrue(controller_template.endswith('.html'))-- # Value and controller templates should be different- self.assertNotEqual(temperature_template, controller_template)-- # Complex state types should work correctly+multivalued_template = EntityStateType.MULTIVALUED.value_template_name()self.assertTrue(multivalued_template.startswith('sense/panes/sensor_response_value_'))self.assertIn('multivalued', multivalued_template)-+returndiff --git a/src/hi/apps/entity/transient_models.py b/src/hi/apps/entity/transient_models.pyindex 9f6e0528..227664b4 100644--- a/src/hi/apps/entity/transient_models.py+++ b/src/hi/apps/entity/transient_models.py@@ -1,9 +1,11 @@from dataclasses import dataclass, fieldfrom typing import Any, Dict, List-from hi.apps.control.models import Controller, ControllerHistory+from hi.apps.control.models import Controller+from hi.apps.control.transient_models import ControllerHistoryResponsefrom hi.apps.entity.edit.forms import EntityPositionForm-from hi.apps.sense.models import Sensor, SensorHistory+from hi.apps.sense.models import Sensor+from hi.apps.sense.transient_models import SensorResponsefrom .enums import EntityGroupType, EntityPairingType, VideoStreamTypefrom .forms import EntityForm@@ -85,15 +87,15 @@ class EntityEditModeData:@dataclassclass EntityStateHistoryData:- entity : Entity- sensor_history_list_map : Dict[ Sensor, List[ SensorHistory ] ]- controller_history_list_map : Dict[ Controller, List[ ControllerHistory ] ]-+ entity : Entity+ sensor_response_list_map : Dict[ Sensor, List[ SensorResponse ] ]+ controller_response_list_map : Dict[ Controller, List[ ControllerHistoryResponse ] ]+def to_template_context(self):context = {'entity': self.entity,- 'sensor_history_list_map': self.sensor_history_list_map,- 'controller_history_list_map': self.controller_history_list_map,+ 'sensor_response_list_map': self.sensor_response_list_map,+ 'controller_response_list_map': self.controller_response_list_map,}return contextdiff --git a/src/hi/apps/entity/views.py b/src/hi/apps/entity/views.pyindex 19f1eaa2..4f9765f1 100644--- a/src/hi/apps/entity/views.py+++ b/src/hi/apps/entity/views.py@@ -7,8 +7,10 @@ from django.views.generic import Viewfrom hi.apps.attribute.view_mixins import AttributeEditViewMixinfrom hi.apps.attribute.edit_response_renderer import AttributeEditResponseRendererfrom hi.apps.control.controller_history_manager import ControllerHistoryManager+from hi.apps.control.transient_models import ControllerHistoryResponsefrom hi.apps.monitor.status_display_manager import StatusDisplayManagerfrom hi.apps.sense.sensor_history_manager import SensorHistoryMixin+from hi.apps.sense.transient_models import SensorResponsefrom hi.views import page_not_found_responsefrom hi.hi_async_view import HiModalView@@ -58,11 +60,19 @@ class EntityStateHistoryView( HiModalView, EntityViewMixin, SensorHistoryMixin )controller_history_list_map = ControllerHistoryManager().get_latest_entity_controller_history(entity = entity,max_items = self.ENTITY_STATE_HISTORY_ITEM_MAX,- )+ )+ sensor_response_list_map = {+ sensor: [ SensorResponse.from_sensor_history( h ) for h in history_list ]+ for sensor, history_list in sensor_history_list_map.items()+ }+ controller_response_list_map = {+ controller: [ ControllerHistoryResponse.from_controller_history( h ) for h in history_list ]+ for controller, history_list in controller_history_list_map.items()+ }entity_state_history_data = EntityStateHistoryData(entity = entity,- sensor_history_list_map = sensor_history_list_map,- controller_history_list_map = controller_history_list_map,+ sensor_response_list_map = sensor_response_list_map,+ controller_response_list_map = controller_response_list_map,)context: Dict[str, Any] = entity_state_history_data.to_template_context()return self.modal_response( request, context )diff --git a/src/hi/apps/sense/templates/sense/modals/sensor_history.html b/src/hi/apps/sense/templates/sense/modals/sensor_history.htmlindex 057c450e..d945ffb7 100644--- a/src/hi/apps/sense/templates/sense/modals/sensor_history.html+++ b/src/hi/apps/sense/templates/sense/modals/sensor_history.html@@ -18,7 +18,7 @@</div></div><div class="py-2" >- {% include "sense/panes/sensor_history_list.html" with sensor_history_list=sensor_history_list %}+ {% include "sense/panes/sensor_history_list.html" with sensor_response_list=sensor_response_list %}</div>{% include "common/panes/pagination.html" with pagination=pagination %}diff --git a/src/hi/apps/sense/templates/sense/panes/sensor_history_list.html b/src/hi/apps/sense/templates/sense/panes/sensor_history_list.htmlindex a5be37ca..350f32f7 100644--- a/src/hi/apps/sense/templates/sense/panes/sensor_history_list.html+++ b/src/hi/apps/sense/templates/sense/panes/sensor_history_list.html@@ -1,36 +1,34 @@{% load tz %}+{% load common_tags %}{% timezone USER_TIMEZONE %}<div class="table-responsive"><table class="table table-striped"><tbody>- {% for sensor_history in sensor_history_list %}- {% if sensor_history.has_video_stream %}+ {% for sensor_response in sensor_response_list %}+ {% if sensor_response.has_video_stream %}<tr><td>- <a href="{{ sensor_history.video_browse_url }}" data-async="true">- <div class="text-center" status="{{ sensor_history.value }}">- {{ sensor_history.value }}- </div>+ <a href="{{ sensor_response.video_browse_url }}" data-async="true">+ {% include_with_fallback sensor_response.sensor.entity_state.entity_state_type.value_template_name "sense/panes/sensor_response_value_default.html" %}</a></td>- <td>{{ sensor_history.response_datetime|localtime }}</td>+ <td>{{ sensor_response.timestamp|localtime }}</td></tr>- </a>- {% elif sensor_history.details %}+ {% elif sensor_response.has_details %}<tr><td>- <a href="{{ sensor_history.details_url }}" data-async="true">- <div class="text-center" status="{{ sensor_history.value }}">- {{ sensor_history.value }}- </div>+ <a href="{{ sensor_response.details_url }}" data-async="true">+ {% include_with_fallback sensor_response.sensor.entity_state.entity_state_type.value_template_name "sense/panes/sensor_response_value_default.html" %}</a></td>- <td>{{ sensor_history.response_datetime|localtime }}</td>+ <td>{{ sensor_response.timestamp|localtime }}</td></tr>{% else %}<tr>- <td><div class="text-center" status="{{ sensor_history.value }}"> {{ sensor_history.value }}</div></td>- <td>{{ sensor_history.response_datetime|localtime }}</td>+ <td>+ {% include_with_fallback sensor_response.sensor.entity_state.entity_state_type.value_template_name "sense/panes/sensor_response_value_default.html" %}+ </td>+ <td>{{ sensor_response.timestamp|localtime }}</td></tr>{% endif %}{% empty %}@@ -39,8 +37,8 @@</tbody></table></div>--{% if show_all_link and sensor_history_list %}++{% if show_all_link and sensor_response_list %}<div>{% if sensor.provides_video_stream %}<a href="{% url 'console_entity_video_sensor_history' entity_id=sensor.entity_state.entity.id sensor_id=sensor.id %}"diff --git a/src/hi/apps/sense/templates/sense/panes/sensor_response_value_default.html b/src/hi/apps/sense/templates/sense/panes/sensor_response_value_default.htmlindex 737c89e7..44231672 100644--- a/src/hi/apps/sense/templates/sense/panes/sensor_response_value_default.html+++ b/src/hi/apps/sense/templates/sense/panes/sensor_response_value_default.html@@ -1,2 +1,2 @@{% load entity_tags units %}-<div class="text-center px-2" status="{{ sensor_response.value }}" display-text>{% if sensor_response.sensor.entity_state.units %}{{ sensor_response.value|as_display_value:sensor_response.sensor.entity_state }}{% else %}{{ sensor_response.value|value_label }}{% endif %}</div>+<div class="text-center px-2" status="{{ sensor_response.value }}" display-text>{% if sensor_response.entity_state.units %}{{ sensor_response.value|as_display_value:sensor_response.entity_state }}{% else %}{{ sensor_response.value|value_label }}{% endif %}</div>diff --git a/src/hi/apps/sense/templates/sense/panes/sensor_response_value_temperature.html b/src/hi/apps/sense/templates/sense/panes/sensor_response_value_temperature.htmlindex f0c445a3..6b5410f1 100644--- a/src/hi/apps/sense/templates/sense/panes/sensor_response_value_temperature.html+++ b/src/hi/apps/sense/templates/sense/panes/sensor_response_value_temperature.html@@ -7,5 +7,5 @@ to produce a ``DisplayValue`` whose ``__str__`` combines theuser-display magnitude and unit symbol.{% endcomment %}<div class="text-center px-2" status="{{ sensor_response.value }}" display-text>- {{ sensor_response.value|as_display_value:sensor_response.sensor.entity_state }}+ {{ sensor_response.value|as_display_value:sensor_response.entity_state }}</div>diff --git a/src/hi/apps/sense/tests/test_views.py b/src/hi/apps/sense/tests/test_views.pyindex 0bac2770..d9ad1f6d 100644--- a/src/hi/apps/sense/tests/test_views.py+++ b/src/hi/apps/sense/tests/test_views.py@@ -1,3 +1,4 @@+import jsonimport loggingfrom django.urls import reverse@@ -69,11 +70,11 @@ class TestSensorHistoryView(DualModeViewTestCase):self.assertSuccessResponse(response)self.assertEqual(response.context['sensor'], self.sensor)- self.assertIn('sensor_history_list', response.context)+ self.assertIn('sensor_response_list', response.context)self.assertIn('pagination', response.context)# Should have our test entries- history_list = response.context['sensor_history_list']+ history_list = response.context['sensor_response_list']self.assertEqual(len(history_list), 5)def test_pagination_context(self):@@ -114,11 +115,11 @@ class TestSensorHistoryView(DualModeViewTestCase):response = self.client.get(url)self.assertSuccessResponse(response)- history_list = response.context['sensor_history_list']+ history_list = response.context['sensor_response_list']- # All history entries should belong to our sensor- for history_entry in history_list:- self.assertEqual(history_entry.sensor, self.sensor)+ # All response entries should belong to our sensor+ for sensor_response in history_list:+ self.assertEqual(sensor_response.sensor, self.sensor)def test_pagination_with_many_entries(self):"""Test pagination when there are many sensor history entries."""@@ -134,7 +135,7 @@ class TestSensorHistoryView(DualModeViewTestCase):response = self.client.get(url)self.assertSuccessResponse(response)- history_list = response.context['sensor_history_list']+ history_list = response.context['sensor_response_list']# Should be limited by page size (25)self.assertLessEqual(len(history_list), 25)@@ -144,7 +145,7 @@ class TestSensorHistoryView(DualModeViewTestCase):from hi.apps.sense.views import SensorHistoryViewself.assertEqual(SensorHistoryView.SENSOR_HISTORY_PAGE_SIZE, 25)- def test_empty_sensor_history_list(self):+ def test_empty_sensor_response_list(self):"""Test page displays correctly when no sensor history exists."""# Delete all sensor historySensorHistory.objects.all().delete()@@ -153,7 +154,7 @@ class TestSensorHistoryView(DualModeViewTestCase):response = self.client.get(url)self.assertSuccessResponse(response)- history_list = response.context['sensor_history_list']+ history_list = response.context['sensor_response_list']self.assertEqual(len(history_list), 0)def test_pagination_with_page_parameter(self):@@ -171,7 +172,7 @@ class TestSensorHistoryView(DualModeViewTestCase):self.assertSuccessResponse(response)# Should still return valid response for page 2- self.assertIn('sensor_history_list', response.context)+ self.assertIn('sensor_response_list', response.context)def test_nonexistent_sensor_returns_404(self):"""Test that accessing nonexistent sensor returns 404."""@@ -288,4 +289,37 @@ class TestSensorHistoryDetailsView(DualModeViewTestCase):self.assertSuccessResponse(response)self.assertEqual(response.context['sensor_history'], other_history)self.assertNotEqual(response.context['sensor_history'], self.sensor_history)-+++class TestSensorHistoryRendering(DualModeViewTestCase):+ """The history list dispatches per row through+ ``EntityStateType.value_template_name``, so discrete-enum stored+ values render as their human-readable labels in the rendered HTML+ rather than the raw stored string."""++ def test_discrete_value_renders_as_human_readable_label(self):+ entity = Entity.objects.create( name = 'Motion', entity_type_str = 'MOTION_SENSOR' )+ state = EntityState.objects.create(+ entity = entity,+ name = 'movement',+ entity_state_type_str = 'MOVEMENT',+ value_range_str = json.dumps([ 'active', 'idle' ]),+ )+ sensor = Sensor.objects.create(+ entity_state = state,+ sensor_type_str = 'MOTION',+ integration_payload = '{"device_id": "m1"}',+ )+ SensorHistory.objects.create(+ sensor = sensor, value = 'active',+ response_datetime = '2024-03-01T12:00:00Z',+ )++ url = reverse( 'sense_sensor_history', kwargs = { 'sensor_id': sensor.id } )+ response = self.client.get( url )+ self.assertSuccessResponse( response )+ body = response.content.decode()+ # The raw stored value 'active' is humanized to 'Active' by the+ # value_template_name dispatch's default template.+ self.assertIn( 'Active', body )+diff --git a/src/hi/apps/sense/views.py b/src/hi/apps/sense/views.pyindex ac0a10e9..a7f1f518 100644--- a/src/hi/apps/sense/views.py+++ b/src/hi/apps/sense/views.py@@ -7,6 +7,7 @@ from hi.apps.common.pagination import compute_pagination_from_querysetfrom hi.hi_async_view import HiModalViewfrom .models import SensorHistory+from .transient_models import SensorResponsefrom .view_mixins import SenseViewMixinlogger = logging.getLogger(__name__)@@ -31,10 +32,13 @@ class SensorHistoryView( HiModalView, SenseViewMixin ):page_size = self.SENSOR_HISTORY_PAGE_SIZE,async_urls = True )sensor_history_list = queryset[pagination.start_offset:pagination.end_offset + 1]+ sensor_response_list = [+ SensorResponse.from_sensor_history( h ) for h in sensor_history_list+ ]context = {'sensor': sensor,- 'sensor_history_list': sensor_history_list,+ 'sensor_response_list': sensor_response_list,'pagination': pagination,}return self.modal_response( request, context )@@ -51,7 +55,6 @@ class SensorHistoryDetailsView( HiModalView, SenseViewMixin ):# Create SensorResponse from sensor_history for video URL generationsensor_response = Nonetry:- from .transient_models import SensorResponsesensor_response = SensorResponse.from_sensor_history(sensor_history)except Exception as e:logger.error(f"Error creating SensorResponse from sensor_history: {e}")