Home Information - Your home, your data, organized.
Python
Added event history view.
Anthony Cassandracfd8c3bc63ef
diff --git a/src/hi/apps/collection/edit/views.py b/src/hi/apps/collection/edit/views.pyindex 0a1727ff..bc5f146e 100644--- a/src/hi/apps/collection/edit/views.py+++ b/src/hi/apps/collection/edit/views.py@@ -260,7 +260,7 @@ class CollectionEntityToggleView( View, CollectionViewMixin, EntityViewMixin ):collection_data = CollectionManager().get_collection_data(collection = collection,- is_editing = request.is_editing,+ is_editing = request.view_parameters.is_editing,)context = collection_data.to_template_context()template = get_template( 'collection/panes/collection_view.html' )diff --git a/src/hi/apps/collection/migrations/0004_alter_collection_order_id.py b/src/hi/apps/collection/migrations/0004_alter_collection_order_id.pynew file mode 100644index 00000000..3aa7e91c--- /dev/null+++ b/src/hi/apps/collection/migrations/0004_alter_collection_order_id.py@@ -0,0 +1,20 @@+# Generated by Django 4.2.15 on 2024-12-06 20:58++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ("collection", "0003_collection_collection_view_type_str"),+ ]++ operations = [+ migrations.AlterField(+ model_name="collection",+ name="order_id",+ field=models.PositiveIntegerField(+ db_index=True, default=0, verbose_name="Order Id"+ ),+ ),+ ]diff --git a/src/hi/apps/collection/models.py b/src/hi/apps/collection/models.pyindex 8dfef7fe..07500657 100644--- a/src/hi/apps/collection/models.py+++ b/src/hi/apps/collection/models.py@@ -32,6 +32,7 @@ class Collection( models.Model, LocationItemModelMixin ):order_id = models.PositiveIntegerField('Order Id',default = 0,+ db_index = True,)created_datetime = models.DateTimeField('Created',diff --git a/src/hi/apps/collection/templates/collection/edit/panes/collection_manage_items.html b/src/hi/apps/collection/templates/collection/edit/panes/collection_manage_items.htmlindex ed599cda..152e7bd6 100644--- a/src/hi/apps/collection/templates/collection/edit/panes/collection_manage_items.html+++ b/src/hi/apps/collection/templates/collection/edit/panes/collection_manage_items.html@@ -1,4 +1,4 @@-{% if request.is_editing %}+{% if request.view_parameters.is_editing %}{% include "edit/panes/side_header.html" %}{% endif %}diff --git a/src/hi/apps/collection/templates/collection/panes/collection_buttons.html b/src/hi/apps/collection/templates/collection/panes/collection_buttons.htmlindex 0fe56616..4f10d489 100644--- a/src/hi/apps/collection/templates/collection/panes/collection_buttons.html+++ b/src/hi/apps/collection/templates/collection/panes/collection_buttons.html@@ -1,8 +1,8 @@<div class="d-flex justify-content-start draggable-container">{% for collection in collection_list %}<div id="{{ collection.html_id }}-button"- class="{% if request.is_editing %}draggable{% endif %}"- {% if request.is_editing %}draggable="true"{% endif %}+ class="{% if request.view_parameters.is_editing %}draggable{% endif %}"+ {% if request.view_parameters.is_editing %}draggable="true"{% endif %}><a href="{% url 'collection_view' collection_id=collection.id %}"class="btn btn-secondary btn-control"@@ -12,7 +12,7 @@</a></div>{% endfor %}- {% if request.is_editing %}+ {% if request.view_parameters.is_editing %}<div class=""><a href="{% url 'collection_edit_collection_add' %}"class="btn btn-success btn-control" role="button"diff --git a/src/hi/apps/collection/templates/collection/panes/collection_details.html b/src/hi/apps/collection/templates/collection/panes/collection_details.htmlindex c969e0c4..669f801b 100644--- a/src/hi/apps/collection/templates/collection/panes/collection_details.html+++ b/src/hi/apps/collection/templates/collection/panes/collection_details.html@@ -1,4 +1,4 @@-{% if request.is_editing %}+{% if request.view_parameters.is_editing %}{% include "edit/panes/side_header.html" %}{% endif %}diff --git a/src/hi/apps/collection/templates/collection/panes/collection_view.html b/src/hi/apps/collection/templates/collection/panes/collection_view.htmlindex 80a53d2f..49982fd7 100644--- a/src/hi/apps/collection/templates/collection/panes/collection_view.html+++ b/src/hi/apps/collection/templates/collection/panes/collection_view.html@@ -5,8 +5,8 @@<div class="row">{% for entity_status_data in entity_status_data_list %}<div id="{{ entity_status_data.entity.html_id }}"- class="col-4 {% if request.is_editing %}draggable{% endif %}"- {% if request.is_editing %}draggable="true"{% endif %} >+ class="col-4 {% if request.view_parameters.is_editing %}draggable{% endif %}"+ {% if request.view_parameters.is_editing %}draggable="true"{% endif %} >{% include "entity/panes/entity_status_card.html" with entity_status_data=entity_status_data %}</div>{% empty %}@@ -18,8 +18,8 @@{% for entity_status_data in entity_status_data_list %}<div id="{{ entity_status_data.entity.html_id }}"- class="{% if request.is_editing %}draggable{% endif %}"- {% if request.is_editing %}draggable="true"{% endif %} >+ class="{% if request.view_parameters.is_editing %}draggable{% endif %}"+ {% if request.view_parameters.is_editing %}draggable="true"{% endif %} >{% include "entity/panes/entity_status_row.html" with entity_status_data=entity_status_data %}</div>{% empty %}diff --git a/src/hi/apps/collection/views.py b/src/hi/apps/collection/views.pyindex 3af67e3c..1dc3e272 100644--- a/src/hi/apps/collection/views.py+++ b/src/hi/apps/collection/views.py@@ -63,7 +63,7 @@ class CollectionViewView( HiGridView, CollectionViewMixin ):collection_data = CollectionManager().get_collection_data(collection = collection,- is_editing = request.is_editing,+ is_editing = request.view_parameters.is_editing,)context = collection_data.to_template_context()context['is_async_request'] = is_ajax( request )@@ -88,6 +88,6 @@ class CollectionDetailsView( HiSideView, CollectionViewMixin ):collections_detail_data = CollectionManager().get_collection_details_data(collection = collection,location_view = current_location_view,- is_editing = request.is_editing,+ is_editing = request.view_parameters.is_editing,)return collections_detail_data.to_template_context()diff --git a/src/hi/apps/config/views.py b/src/hi/apps/config/views.pyindex d32a4e3f..6a395225 100644--- a/src/hi/apps/config/views.py+++ b/src/hi/apps/config/views.py@@ -48,7 +48,7 @@ class ConfigPageView( HiGridView ):next_id = None ):redirect_url = request.get_full_path()return antinode.redirect_response( redirect_url )-+request.view_parameters.view_type = ViewType.CONFIGURATIONrequest.view_parameters.view_mode = ViewMode.MONITORrequest.view_parameters.to_session( request )@@ -73,7 +73,7 @@ class ConfigSettingsView( ConfigPageView ):return 'config/panes/settings.html'def get_template_context( self, request, *args, **kwargs ):-+subsystem_list = SystemSettings().get_subsystems()subsystem_attribute_formset_list = list()diff --git a/src/hi/apps/control/migrations/0004_alter_controllerhistory_options_and_more.py b/src/hi/apps/control/migrations/0004_alter_controllerhistory_options_and_more.pynew file mode 100644index 00000000..1ddafa93--- /dev/null+++ b/src/hi/apps/control/migrations/0004_alter_controllerhistory_options_and_more.py@@ -0,0 +1,28 @@+# Generated by Django 4.2.15 on 2024-12-06 20:58++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ("control", "0003_controller_persist_history"),+ ]++ operations = [+ migrations.AlterModelOptions(+ name="controllerhistory",+ options={+ "ordering": ["-created_datetime"],+ "verbose_name": "Controller History",+ "verbose_name_plural": "Controller History",+ },+ ),+ migrations.AlterField(+ model_name="controllerhistory",+ name="created_datetime",+ field=models.DateTimeField(+ auto_now_add=True, db_index=True, verbose_name="Created"+ ),+ ),+ ]diff --git a/src/hi/apps/control/models.py b/src/hi/apps/control/models.pyindex 611e1551..b696e67e 100644--- a/src/hi/apps/control/models.py+++ b/src/hi/apps/control/models.py@@ -75,8 +75,10 @@ class ControllerHistory(models.Model):created_datetime = models.DateTimeField('Created',auto_now_add = True,+ db_index = True,)class Meta:verbose_name = 'Controller History'verbose_name_plural = 'Controller History'+ ordering = [ '-created_datetime' ]diff --git a/src/hi/apps/edit/views.py b/src/hi/apps/edit/views.pyindex f00668c8..07fcdafc 100644--- a/src/hi/apps/edit/views.py+++ b/src/hi/apps/edit/views.py@@ -37,16 +37,19 @@ class EditStartView( View ):# Javascript handling is consistent with the current operating# state mode.- request.view_parameters.view_mode = ViewMode.EDIT- request.view_parameters.to_session( request )-- redirect_url = request.META.get('HTTP_REFERER')+ if request.view_parameters.view_type.allows_edit_mode:+ redirect_url = request.META.get('HTTP_REFERER')+ else:+ redirect_url = Noneif not redirect_url:redirect_url = reverse('home')++ request.view_parameters.view_mode = ViewMode.EDIT+ request.view_parameters.to_session( request )+return redirect( redirect_url )-@method_decorator( edit_required, name='dispatch' )class EditEndView( View ):def get(self, request, *args, **kwargs):diff --git a/src/hi/apps/entity/templates/entity/edit/panes/entity_details.html b/src/hi/apps/entity/templates/entity/edit/panes/entity_details.htmlindex bfc46668..ec809ab5 100644--- a/src/hi/apps/entity/templates/entity/edit/panes/entity_details.html+++ b/src/hi/apps/entity/templates/entity/edit/panes/entity_details.html@@ -1,4 +1,4 @@-{% if request.is_editing %}+{% if request.view_parameters.is_editing %}{% include "edit/panes/side_header.html" %}{% endif %}diff --git a/src/hi/apps/entity/templates/entity/panes/entity_status_card.html b/src/hi/apps/entity/templates/entity/panes/entity_status_card.htmlindex 54124820..252e58ad 100644--- a/src/hi/apps/entity/templates/entity/panes/entity_status_card.html+++ b/src/hi/apps/entity/templates/entity/panes/entity_status_card.html@@ -1,7 +1,7 @@<div>{% with entity=entity_status_data.entity %}<div>- {% if request.is_editing %}+ {% if request.view_parameters.is_editing %}<a href="{% url 'entity_details' entity_id=entity.id %}"data-async="true">{{ entity.name }}diff --git a/src/hi/apps/entity/templates/entity/panes/entity_status_row.html b/src/hi/apps/entity/templates/entity/panes/entity_status_row.htmlindex d1a65d73..086ce42c 100644--- a/src/hi/apps/entity/templates/entity/panes/entity_status_row.html+++ b/src/hi/apps/entity/templates/entity/panes/entity_status_row.html@@ -1,7 +1,7 @@<div class="row">{% with entity=entity_status_data.entity %}<div class="col-3">- {% if request.is_editing %}+ {% if request.view_parameters.is_editing %}<a href="{% url 'entity_details' entity_id=entity.id %}"data-async="true">{{ entity.name }}diff --git a/src/hi/apps/entity/view_mixin.py b/src/hi/apps/entity/view_mixin.pyindex 93a322f9..78cfef5e 100644--- a/src/hi/apps/entity/view_mixin.py+++ b/src/hi/apps/entity/view_mixin.py@@ -27,7 +27,7 @@ class EntityViewMixin:entity_edit_data : EntityEditData,status_code : int = 200 ):context = entity_edit_data.to_template_context()- if request.is_editing:+ if request.view_parameters.is_editing:template = get_template( 'entity/edit/panes/entity_edit.html' )content = template.render( context, request = request )return antinode.response(diff --git a/src/hi/apps/entity/views.py b/src/hi/apps/entity/views.pyindex 155ed199..3479df92 100644--- a/src/hi/apps/entity/views.py+++ b/src/hi/apps/entity/views.py@@ -154,6 +154,6 @@ class EntityDetailsView( HiSideView, EntityViewMixin ):entity_details_data = EntityManager().get_entity_details_data(entity = entity,location_view = current_location_view,- is_editing = request.is_editing,+ is_editing = request.view_parameters.is_editing,)return entity_details_data.to_template_context()diff --git a/src/hi/apps/event/migrations/0007_alter_eventhistory_options.py b/src/hi/apps/event/migrations/0007_alter_eventhistory_options.pynew file mode 100644index 00000000..10add25b--- /dev/null+++ b/src/hi/apps/event/migrations/0007_alter_eventhistory_options.py@@ -0,0 +1,21 @@+# Generated by Django 4.2.15 on 2024-12-06 20:54++from django.db import migrations+++class Migration(migrations.Migration):++ dependencies = [+ ("event", "0006_alter_eventclause_event_definition"),+ ]++ operations = [+ migrations.AlterModelOptions(+ name="eventhistory",+ options={+ "ordering": ["-event_datetime"],+ "verbose_name": "Event History",+ "verbose_name_plural": "Event History",+ },+ ),+ ]diff --git a/src/hi/apps/event/migrations/0008_alter_eventhistory_event_datetime.py b/src/hi/apps/event/migrations/0008_alter_eventhistory_event_datetime.pynew file mode 100644index 00000000..5c7189ab--- /dev/null+++ b/src/hi/apps/event/migrations/0008_alter_eventhistory_event_datetime.py@@ -0,0 +1,18 @@+# Generated by Django 4.2.15 on 2024-12-06 20:58++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ("event", "0007_alter_eventhistory_options"),+ ]++ operations = [+ migrations.AlterField(+ model_name="eventhistory",+ name="event_datetime",+ field=models.DateTimeField(db_index=True, verbose_name="Timestamp"),+ ),+ ]diff --git a/src/hi/apps/event/models.py b/src/hi/apps/event/models.pyindex 5c801de2..2339cfde 100644--- a/src/hi/apps/event/models.py+++ b/src/hi/apps/event/models.py@@ -187,8 +187,10 @@ class EventHistory( models.Model ):)event_datetime = models.DateTimeField('Timestamp',+ db_index = True,)class Meta:verbose_name = 'Event History'verbose_name_plural = 'Event History'+ ordering = [ '-event_datetime' ]diff --git a/src/hi/apps/event/templates/event/modals/event_history.html b/src/hi/apps/event/templates/event/modals/event_history.htmlnew file mode 100644index 00000000..d99afc60--- /dev/null+++ b/src/hi/apps/event/templates/event/modals/event_history.html@@ -0,0 +1,11 @@+{% extends "modals/action_done.html" %}++{% block title_text %}+Events+{% endblock %}++{% block body %}+<h5>Event History</h5>+{% include "event/panes/event_history_list.html" with event_history_list=event_history_list %}+{% include "common/panes/pagination.html" with pagination=pagination %}+{% endblock %}diff --git a/src/hi/apps/event/templates/event/panes/event_history_list.html b/src/hi/apps/event/templates/event/panes/event_history_list.htmlnew file mode 100644index 00000000..ac9a5ff9--- /dev/null+++ b/src/hi/apps/event/templates/event/panes/event_history_list.html@@ -0,0 +1,14 @@+<div>+ {% for event_history in event_history_list %}+ <div class="row">+ <div class="col-6">+ {{ event_history.event_datetime }}+ </div>+ <div class="col-6">+ {{ event_history.event_definition.name }}+ </div>+ </div>+ {% empty %}+ <div><em>No event history</em></div>+ {% endfor %}+</div>diff --git a/src/hi/apps/event/urls.py b/src/hi/apps/event/urls.pyindex f647a4ad..a33e29f2 100644--- a/src/hi/apps/event/urls.py+++ b/src/hi/apps/event/urls.py@@ -9,6 +9,10 @@ urlpatterns = [views.EventDefinitionsView.as_view(),name='event_definitions'),+ re_path( r'^history$',+ views.EventHistoryView.as_view(),+ name='event_history'),+re_path( r'^edit/', include('hi.apps.event.edit.urls' )),]diff --git a/src/hi/apps/event/views.py b/src/hi/apps/event/views.pyindex 159ff670..20cb3c04 100644--- a/src/hi/apps/event/views.py+++ b/src/hi/apps/event/views.py@@ -1,7 +1,12 @@+from django.urls import reverse++from hi.apps.common.pagination import compute_pagination_from_querysetfrom hi.apps.config.enums import ConfigPageTypefrom hi.apps.config.views import ConfigPageView-from .models import EventDefinition+from hi.hi_async_view import HiModalView++from .models import EventDefinition, EventHistoryclass EventDefinitionsView( ConfigPageView ):@@ -25,3 +30,29 @@ class EventDefinitionsView( ConfigPageView ):return {'event_definition_list': event_definition_list,}+++class EventHistoryView( HiModalView ):++ EVENT_HISTORY_PAGE_SIZE = 25++ def get_template_name( self ) -> str:+ return 'event/modals/event_history.html'++ def get( self, request, *args, **kwargs ):++ base_url = reverse( 'event_history' )++ queryset = EventHistory.objects.all()+ pagination = compute_pagination_from_queryset( request = request,+ queryset = queryset,+ base_url = base_url,+ page_size = self.EVENT_HISTORY_PAGE_SIZE,+ async_urls = True )+ event_history_list = queryset[pagination.start_offset:pagination.end_offset + 1]++ context = {+ 'event_history_list': event_history_list,+ 'pagination': pagination,+ }+ return self.modal_response( request, context )diff --git a/src/hi/apps/location/edit/views.py b/src/hi/apps/location/edit/views.pyindex 6ec078f8..1d74bca0 100644--- a/src/hi/apps/location/edit/views.py+++ b/src/hi/apps/location/edit/views.py@@ -442,7 +442,7 @@ class LocationViewEntityToggleView( View, LocationViewMixin ):location_view_data = LocationManager().get_location_view_data(location_view = location_view,- include_status_display_data = bool( not request.is_editing ),+ include_status_display_data = bool( not request.view_parameters.is_editing ),)context = {'location_view_data': location_view_data,@@ -491,7 +491,7 @@ class LocationViewCollectionToggleView( View, LocationViewMixin ):location_view_data = LocationManager().get_location_view_data(location_view = location_view,- include_status_display_data = bool( not request.is_editing ),+ include_status_display_data = bool( not request.view_parameters.is_editing ),)context = {'location_view_data': location_view_data,diff --git a/src/hi/apps/location/migrations/0009_alter_location_order_id_alter_locationview_order_id.py b/src/hi/apps/location/migrations/0009_alter_location_order_id_alter_locationview_order_id.pynew file mode 100644index 00000000..44aab2b9--- /dev/null+++ b/src/hi/apps/location/migrations/0009_alter_location_order_id_alter_locationview_order_id.py@@ -0,0 +1,27 @@+# Generated by Django 4.2.15 on 2024-12-06 20:58++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ("location", "0008_rename_value_range_locationattribute_value_range_str"),+ ]++ operations = [+ migrations.AlterField(+ model_name="location",+ name="order_id",+ field=models.PositiveIntegerField(+ db_index=True, default=0, verbose_name="Order Id"+ ),+ ),+ migrations.AlterField(+ model_name="locationview",+ name="order_id",+ field=models.PositiveIntegerField(+ db_index=True, default=0, verbose_name="Order Id"+ ),+ ),+ ]diff --git a/src/hi/apps/location/models.py b/src/hi/apps/location/models.pyindex 43300af6..4a73c174 100644--- a/src/hi/apps/location/models.py+++ b/src/hi/apps/location/models.py@@ -33,6 +33,7 @@ class Location( models.Model, ItemTypeModelMixin ):order_id = models.PositiveIntegerField('Order Id',default = 0,+ db_index = True,)created_datetime = models.DateTimeField('Created',@@ -143,6 +144,7 @@ class LocationView( models.Model, ItemTypeModelMixin ):order_id = models.PositiveIntegerField('Order Id',default = 0,+ db_index = True,)created_datetime = models.DateTimeField('Created',diff --git a/src/hi/apps/location/templates/location/edit/panes/location_view_manage_items.html b/src/hi/apps/location/templates/location/edit/panes/location_view_manage_items.htmlindex a03fe1ce..1f4b376b 100644--- a/src/hi/apps/location/templates/location/edit/panes/location_view_manage_items.html+++ b/src/hi/apps/location/templates/location/edit/panes/location_view_manage_items.html@@ -1,4 +1,4 @@-{% if request.is_editing %}+{% if request.view_parameters.is_editing %}{% include "edit/panes/side_header.html" %}{% endif %}diff --git a/src/hi/apps/location/templates/location/panes/location_details.html b/src/hi/apps/location/templates/location/panes/location_details.htmlindex c07d9448..398e18ea 100644--- a/src/hi/apps/location/templates/location/panes/location_details.html+++ b/src/hi/apps/location/templates/location/panes/location_details.html@@ -1,4 +1,4 @@-{% if request.is_editing %}+{% if request.view_parameters.is_editing %}{% include "edit/panes/side_header.html" %}{% endif %}diff --git a/src/hi/apps/location/templates/location/panes/location_drop_down.html b/src/hi/apps/location/templates/location/panes/location_drop_down.htmlindex 8728c102..947b5e39 100644--- a/src/hi/apps/location/templates/location/panes/location_drop_down.html+++ b/src/hi/apps/location/templates/location/panes/location_drop_down.html@@ -20,7 +20,7 @@<em>No locations.</em></div>{% endfor %}- {% if request.is_editing %}+ {% if request.view_parameters.is_editing %}<div class="dropdown-divider"></div><a role="menuitem" class="dropdown-item plain"href="{% url 'location_edit_location_add' %}"diff --git a/src/hi/apps/location/templates/location/panes/location_view_buttons.html b/src/hi/apps/location/templates/location/panes/location_view_buttons.htmlindex 90126867..c686f74d 100644--- a/src/hi/apps/location/templates/location/panes/location_view_buttons.html+++ b/src/hi/apps/location/templates/location/panes/location_view_buttons.html@@ -1,8 +1,8 @@<div class="d-flex justify-content-start draggable-container">{% for location_view in location_view_list %}<div id="{{ location_view.html_id }}-button"- class="{% if request.is_editing %}draggable{% endif %}"- {% if request.is_editing %}draggable="true"{% endif %}+ class="{% if request.view_parameters.is_editing %}draggable{% endif %}"+ {% if request.view_parameters.is_editing %}draggable="true"{% endif %}><a href="{% url 'location_view' location_view_id=location_view.id %}"class="btn btn-primary btn-control"@@ -12,7 +12,7 @@</a></div>{% endfor %}- {% if request.is_editing %}+ {% if request.view_parameters.is_editing %}<div class=""><a href="{% url 'location_edit_location_view_add' %}"class="btn btn-success btn-control" role="button"diff --git a/src/hi/apps/location/views.py b/src/hi/apps/location/views.pyindex 78b33bc4..941d929c 100644--- a/src/hi/apps/location/views.py+++ b/src/hi/apps/location/views.py@@ -58,7 +58,7 @@ class LocationViewView( HiGridView, LocationViewMixin ):location_view_data = LocationManager().get_location_view_data(location_view = location_view,- include_status_display_data = bool( not request.is_editing ),+ include_status_display_data = bool( not request.view_parameters.is_editing ),)return {diff --git a/src/hi/apps/sense/migrations/0007_alter_sensorhistory_response_datetime.py b/src/hi/apps/sense/migrations/0007_alter_sensorhistory_response_datetime.pynew file mode 100644index 00000000..2401a113--- /dev/null+++ b/src/hi/apps/sense/migrations/0007_alter_sensorhistory_response_datetime.py@@ -0,0 +1,18 @@+# Generated by Django 4.2.15 on 2024-12-06 20:58++from django.db import migrations, models+++class Migration(migrations.Migration):++ dependencies = [+ ("sense", "0006_sensor_persist_history"),+ ]++ operations = [+ migrations.AlterField(+ model_name="sensorhistory",+ name="response_datetime",+ field=models.DateTimeField(db_index=True, verbose_name="Timestamp"),+ ),+ ]diff --git a/src/hi/apps/sense/models.py b/src/hi/apps/sense/models.pyindex a50f1383..7c3637a1 100644--- a/src/hi/apps/sense/models.py+++ b/src/hi/apps/sense/models.py@@ -76,13 +76,14 @@ class SensorHistory(models.Model):'Value',max_length = 255)- response_datetime = models.DateTimeField(- 'Timestamp',- )details = models.TextField('Details',blank = True, null = True,)+ response_datetime = models.DateTimeField(+ 'Timestamp',+ db_index = True,+ )class Meta:verbose_name = 'Sensor History'diff --git a/src/hi/apps/sense/views.py b/src/hi/apps/sense/views.pyindex d966c3fa..35afc7d0 100644--- a/src/hi/apps/sense/views.py+++ b/src/hi/apps/sense/views.py@@ -2,9 +2,10 @@ import loggingfrom django.urls import reverse-from hi.hi_async_view import HiModalViewfrom hi.apps.common.pagination import compute_pagination_from_queryset+from hi.hi_async_view import HiModalView+from .models import SensorHistoryfrom .view_mixin import SenseViewMixindiff --git a/src/hi/hi_grid_view.py b/src/hi/hi_grid_view.pyindex 8da4d696..618d9b16 100644--- a/src/hi/hi_grid_view.py+++ b/src/hi/hi_grid_view.py@@ -156,7 +156,7 @@ class HiGridView(View):side_view, side_kwargs = self.get_side_view_from_url( side_url )if not side_view:- if request.is_editing:+ if request.view_parameters.is_editing:if request.view_parameters.view_type.is_location_view:side_view = LocationViewManageItemsView()@@ -218,12 +218,12 @@ class HiGridView(View):if next_view_type == ViewType.LOCATION_VIEW:view_id_changed = bool( request.view_parameters.location_view_id != next_id )- return bool( request.is_editing+ return bool( request.view_parameters.is_editingand ( view_type_changed or view_id_changed ))elif next_view_type == ViewType.COLLECTION:view_id_changed = bool( request.view_parameters.collection_id != next_id )- return bool( request.is_editing+ return bool( request.view_parameters.is_editingand ( view_type_changed or view_id_changed ))return Falsediff --git a/src/hi/middleware.py b/src/hi/middleware.pyindex fa2fee3b..92b335f8 100644--- a/src/hi/middleware.py+++ b/src/hi/middleware.py@@ -33,7 +33,6 @@ class ViewMiddleware:def _set_view_parameters( self, request ):request.view_parameters = ViewParameters.from_session( request )- request.is_editing = request.view_parameters.view_mode.is_editingreturndiff --git a/src/hi/templates/panes/bottom_buttons.html b/src/hi/templates/panes/bottom_buttons.htmlindex f8aa219f..323469a3 100644--- a/src/hi/templates/panes/bottom_buttons.html+++ b/src/hi/templates/panes/bottom_buttons.html@@ -1,12 +1,21 @@<div class="bg-white p-1"><div class="d-flex justify-content-between">{% include "collection/panes/collection_buttons.html" %}- <div>- <a href="{% url 'config_settings' %}"- class="btn btn-tertiary btn-control" role="button"- data-async="true" >- ADMIN- </a>+ <div class="d-flex justify-content-end">+ <div>+ <a href="{% url 'event_history' %}"+ class="btn btn-secondary btn-control" role="button"+ data-async="true" >+ EVENTS+ </a>+ </div>+ <div>+ <a href="{% url 'config_settings' %}"+ class="btn btn-tertiary btn-control" role="button"+ data-async="true" >+ ADMIN+ </a>+ </div></div></div></div>diff --git a/src/hi/templates/panes/top_buttons.html b/src/hi/templates/panes/top_buttons.htmlindex f02eebb0..c610b7b4 100644--- a/src/hi/templates/panes/top_buttons.html+++ b/src/hi/templates/panes/top_buttons.html@@ -4,19 +4,17 @@<div class="d-flex justify-content-end">{% include "location/panes/location_drop_down.html" %}<div>- {% if request.is_editing %}+ {% if request.view_parameters.is_editing %}<a href="{% url 'edit_end' %}"class="btn btn-tertiary btn-control" role="button" >- EXIT EDITING+ EXIT EDIT</a>{% else %}- {% if request.view_parameters.view_type.allows_edit_mode %}<a href="{% url 'edit_start' %}"class="btn btn-tertiary btn-control" role="button" >EDIT</a>{% endif %}- {% endif %}</div></div></div>diff --git a/src/hi/view_parameters.py b/src/hi/view_parameters.pyindex 8fe40a3b..98a2810b 100644--- a/src/hi/view_parameters.py+++ b/src/hi/view_parameters.py@@ -31,7 +31,11 @@ class ViewParameters:self._location_view = None # Lazy loadedself._collection = None # Lazy loadedreturn-++ @property+ def is_editing(self):+ return self.view_mode.is_editing+@propertydef location_id(self) -> int:location = self.location