Home Information - Your home, your data, organized.
Python
Refined data model: Added ProxyState, CollectionView, EntityView
Anthony Cassandra75fb12a51112
diff --git a/src/hi/apps/collection/admin.py b/src/hi/apps/collection/admin.pyindex 6e28643e..7037444c 100644--- a/src/hi/apps/collection/admin.py+++ b/src/hi/apps/collection/admin.py@@ -1,10 +1,39 @@from django.contrib import admin-from .models import Collection+from . import models[email protected](Collection)+class CollectionEntityInLine(admin.TabularInline):+ model = models.CollectionEntity+ extra = 0+ show_change_link = True+++class CollectionViewInLine(admin.TabularInline):+ model = models.CollectionView+ extra = 0+ show_change_link = True+++class CollectionPositionInLine(admin.TabularInline):+ model = models.CollectionPosition+ extra = 0+ show_change_link = True++[email protected](models.Collection)class CollectionAdmin(admin.ModelAdmin):- list_display = ('name',)++ list_display = (+ 'name',+ 'collection_type_str',+ 'created_datetime',+ )search_fields = ('name',)ordering = ('name',)++ inlines = [+ CollectionEntityInLine,+ CollectionViewInLine,+ CollectionPositionInLine,+ ]diff --git a/src/hi/apps/collection/enums.py b/src/hi/apps/collection/enums.pyindex 84865f30..bebe0750 100644--- a/src/hi/apps/collection/enums.py+++ b/src/hi/apps/collection/enums.py@@ -3,6 +3,5 @@ from hi.apps.common.enums import LabeledEnumclass CollectionType(LabeledEnum):- AD_HOC = ( 'Ad-hoc', '' )- CONTROL = ( 'Control', '' )- AREA = ( 'Area', '' )+ DEFAULT = ( 'Default', '' )+ ZONE = ( 'Zone', '' )diff --git a/src/hi/apps/collection/migrations/0002_remove_collection_svg_path_collectionview_and_more.py b/src/hi/apps/collection/migrations/0002_remove_collection_svg_path_collectionview_and_more.pynew file mode 100644index 00000000..61ad4565--- /dev/null+++ b/src/hi/apps/collection/migrations/0002_remove_collection_svg_path_collectionview_and_more.py@@ -0,0 +1,135 @@+# Generated by Django 4.2.15 on 2024-08-28 02:14++from django.db import migrations, models+import django.db.models.deletion+++class Migration(migrations.Migration):++ dependencies = [+ (+ "location",+ "0003_locationview_view_type_str_alter_location_order_id_and_more",+ ),+ ("collection", "0001_initial"),+ ]++ operations = [+ migrations.RemoveField(+ model_name="collection",+ name="svg_path",+ ),+ migrations.CreateModel(+ name="CollectionView",+ fields=[+ (+ "id",+ models.BigAutoField(+ auto_created=True,+ primary_key=True,+ serialize=False,+ verbose_name="ID",+ ),+ ),+ (+ "created_datetime",+ models.DateTimeField(auto_now_add=True, verbose_name="Created"),+ ),+ (+ "collection",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="location_views",+ to="collection.collection",+ verbose_name="Collection",+ ),+ ),+ (+ "location_view",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="collections",+ to="location.locationview",+ verbose_name="Location",+ ),+ ),+ ],+ options={+ "verbose_name": "Collection View",+ "verbose_name_plural": "Collection Views",+ },+ ),+ migrations.CreateModel(+ name="CollectionPosition",+ fields=[+ (+ "id",+ models.BigAutoField(+ auto_created=True,+ primary_key=True,+ serialize=False,+ verbose_name="ID",+ ),+ ),+ (+ "svg_x",+ models.DecimalField(+ decimal_places=6, max_digits=12, verbose_name="X"+ ),+ ),+ (+ "svg_y",+ models.DecimalField(+ decimal_places=6, max_digits=12, verbose_name="Y"+ ),+ ),+ (+ "svg_scale",+ models.DecimalField(+ decimal_places=6,+ default=1.0,+ max_digits=12,+ verbose_name="Scale",+ ),+ ),+ (+ "svg_rotation",+ models.DecimalField(+ decimal_places=6,+ default=0.0,+ max_digits=12,+ verbose_name="Rotation",+ ),+ ),+ (+ "created_datetime",+ models.DateTimeField(auto_now_add=True, verbose_name="Created"),+ ),+ (+ "updated_datetime",+ models.DateTimeField(auto_now=True, verbose_name="Updated"),+ ),+ (+ "collection",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="positions",+ to="collection.collection",+ verbose_name="Collection",+ ),+ ),+ (+ "location",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="collection_positions",+ to="location.location",+ verbose_name="Location",+ ),+ ),+ ],+ options={+ "abstract": False,+ },+ ),+ ]diff --git a/src/hi/apps/collection/models.py b/src/hi/apps/collection/models.pyindex 7d36bb5c..025da175 100644--- a/src/hi/apps/collection/models.py+++ b/src/hi/apps/collection/models.py@@ -1,6 +1,7 @@from django.db import modelsfrom hi.apps.entity.models import Entity+from hi.apps.location.models import Location, LocationView, SvgPositionModelfrom .enums import CollectionType@@ -16,10 +17,6 @@ class Collection( models.Model ):max_length = 32,null = False, blank = False,)- svg_path = models.TextField(- 'Path',- null = True, blank = True,- )created_datetime = models.DateTimeField('Created',auto_now_add = True,@@ -66,3 +63,52 @@ class CollectionEntity(models.Model):models.Index( fields=[ 'collection', 'entity' ] ),]++class CollectionPosition( SvgPositionModel ):++ location = models.ForeignKey(+ Location,+ related_name = 'collection_positions',+ verbose_name = 'Location',+ on_delete = models.CASCADE,+ )+ collection = models.ForeignKey(+ Collection,+ related_name = 'positions',+ verbose_name = 'Collection',+ on_delete = models.CASCADE,+ )+ created_datetime = models.DateTimeField(+ 'Created',+ auto_now_add = True,+ )+ updated_datetime = models.DateTimeField(+ 'Updated',+ auto_now=True,+ blank = True,+ )+++class CollectionView(models.Model):++ collection = models.ForeignKey(+ Collection,+ related_name = 'location_views',+ verbose_name = 'Collection',+ on_delete = models.CASCADE,+ )+ location_view = models.ForeignKey(+ LocationView,+ related_name = 'collections',+ verbose_name = 'Location',+ on_delete = models.CASCADE,+ )+ created_datetime = models.DateTimeField(+ 'Created',+ auto_now_add = True,+ )++ class Meta:+ verbose_name = 'Collection View'+ verbose_name_plural = 'Collection Views'+diff --git a/src/hi/apps/control/admin.py b/src/hi/apps/control/admin.pyindex 931244e3..0ec4230a 100644--- a/src/hi/apps/control/admin.py+++ b/src/hi/apps/control/admin.py@@ -20,22 +20,6 @@ class ControllerAdmin(admin.ModelAdmin):readonly_fields = ( 'entity_state', )[email protected](models.ControlledEntity)-class ControlledEntityAdmin(admin.ModelAdmin):-- show_full_result_count = False-- list_display = (- 'controller',- 'entity',- 'created_datetime',- )-- search_fields = ['controller__name']- readonly_fields = ( 'controller', 'entity', )- ordering = ( '-created_datetime', )--@admin.register(models.ControllerHistory)class ControllerHistoryAdmin(admin.ModelAdmin):diff --git a/src/hi/apps/control/migrations/0005_delete_controlledentity.py b/src/hi/apps/control/migrations/0005_delete_controlledentity.pynew file mode 100644index 00000000..c2414764--- /dev/null+++ b/src/hi/apps/control/migrations/0005_delete_controlledentity.py@@ -0,0 +1,16 @@+# Generated by Django 4.2.15 on 2024-08-28 02:14++from django.db import migrations+++class Migration(migrations.Migration):++ dependencies = [+ ("control", "0004_alter_controller_integration_key"),+ ]++ operations = [+ migrations.DeleteModel(+ name="ControlledEntity",+ ),+ ]diff --git a/src/hi/apps/control/models.py b/src/hi/apps/control/models.pyindex e75deb0a..1aab7745 100644--- a/src/hi/apps/control/models.py+++ b/src/hi/apps/control/models.py@@ -1,6 +1,6 @@from django.db import models-from hi.apps.entity.models import Entity, EntityState+from hi.apps.entity.models import EntityStatefrom hi.integrations.core.models import IntegrationIdModelfrom .enums import ControllerType@@ -43,47 +43,13 @@ class Controller( IntegrationIdModel ):return-class ControlledEntity( models.Model ):- """The Entity associated with a Controller's state is implicitly a- "controlled" entity, but this may also be controlling (directly or- indirectly) the state of more than one entity.-- e.g., A light switch's on/off state is controlling the state of the- switch, but also indirectly controlling the state of the light bulb.-- e.g., A sprinkler controller's on/off state for a zone is indirectly- controlling a sprinkler valve as well as the sprinkler heads in that- zone.- """- controller = models.ForeignKey(- Controller,- related_name = '+',- verbose_name = 'Controller',- on_delete=models.CASCADE,- )- entity = models.ForeignKey(- Entity,- related_name = 'controlled_by',- verbose_name = 'Entity',- on_delete=models.CASCADE,- )- created_datetime = models.DateTimeField(- 'Created',- auto_now_add = True,- )-- class Meta:- verbose_name = 'Controlled Entity'- verbose_name_plural = 'Controlled Entities'--class ControllerHistory(models.Model):controller = models.ForeignKey(Controller,related_name = 'history',verbose_name = 'Controller',- on_delete=models.CASCADE,+ on_delete = models.CASCADE,)value = models.CharField('Value',diff --git a/src/hi/apps/edit/templates/edit/panes/bottom.html b/src/hi/apps/edit/templates/edit/panes/bottom.htmlindex 7514ec81..be029aef 100644--- a/src/hi/apps/edit/templates/edit/panes/bottom.html+++ b/src/hi/apps/edit/templates/edit/panes/bottom.html@@ -1 +1,9 @@-<h5>Edit Bottom</h5>+<div class="row bg-white p-1">++ <div class="col-1">+ <a href="{% url 'edit_end' %}"+ class="btn btn-tertiary btn-control" role="button" >+ EXIT+ </a>+ </div>+</div>diff --git a/src/hi/apps/edit/templates/edit/panes/top.html b/src/hi/apps/edit/templates/edit/panes/top.htmldeleted file mode 100644index 49e8982b..00000000--- a/src/hi/apps/edit/templates/edit/panes/top.html+++ /dev/null@@ -1,10 +0,0 @@-<div class="row bg-white p-1">-- <div class="col-1">- <a href="{% url 'edit_start' %}"- class="btn btn-tertiary btn-control" role="button"- data-async="true" >- EXIT- </a>- </div>-</div>diff --git a/src/hi/apps/edit/urls.py b/src/hi/apps/edit/urls.pyindex a3758b78..e2815040 100644--- a/src/hi/apps/edit/urls.py+++ b/src/hi/apps/edit/urls.py@@ -5,7 +5,11 @@ from . import viewsurlpatterns = [- re_path( r'^$',+ re_path( r'^start$',views.EditStartView.as_view(),name='edit_start' ),++ re_path( r'^end$',+ views.EditEndView.as_view(),+ name='edit_end' ),]diff --git a/src/hi/apps/edit/views.py b/src/hi/apps/edit/views.pyindex f6fe3661..c4a56e00 100644--- a/src/hi/apps/edit/views.py+++ b/src/hi/apps/edit/views.py@@ -1,34 +1,37 @@-from django.shortcuts import render-from django.template.loader import get_template-from django.views.generic import View+from django.http import HttpResponseRedirect+from django.urls import reverse-import hi.apps.common.antinode as antinode+from hi.hi_grid_view import HiGridView+from hi.enums import EditMode-from hi.constants import DIVID--class EditStartView( View ):+class EditStartView( HiGridView ):def get(self, request, *args, **kwargs):- div_id_to_template_name = {- DIVID['TOP'] : 'edit/panes/top.html',- DIVID['BOTTOM'] : 'edit/panes/bottom.html',- DIVID['MAIN'] : 'edit/panes/main.html',- DIVID['SIDE'] : 'edit/panes/side.html',- }+ request.view_parameters.edit_mode = EditMode.ON+ request.view_parameters.to_session( request )context = {}-- insert_map = dict()- for div_id, template_name in div_id_to_template_name.items():- template = get_template( template_name )- content = template.render( context, request = request )- insert_map[div_id] = content,- continue-- return antinode.response(- insert_map = insert_map,+ return self.hi_grid_response(+ request = request,+ context = context,+ bottom_template_name = 'edit/panes/bottom.html',+ main_template_name = 'edit/panes/main.html',+ side_template_name = 'edit/panes/side.html',+ push_url_name = 'edit_start',+ push_url_kwargs = kwargs,)++class EditEndView( HiGridView ):++ def get(self, request, *args, **kwargs):++ request.view_parameters.edit_mode = EditMode.OFF+ request.view_parameters.to_session( request )++ redirect_url = reverse( 'home' )+ return HttpResponseRedirect( redirect_url )+diff --git a/src/hi/apps/entity/admin.py b/src/hi/apps/entity/admin.pyindex 4f053821..03d27499 100644--- a/src/hi/apps/entity/admin.py+++ b/src/hi/apps/entity/admin.py@@ -26,6 +26,18 @@ class PathInLine(admin.TabularInline):extra = 0show_change_link = True++class ProxyStateInLine(admin.TabularInline):+ model = models.ProxyState+ extra = 0+ show_change_link = True+++class EntityViewInLine(admin.TabularInline):+ model = models.EntityView+ extra = 0+ show_change_link = True+@admin.register(models.Entity)class EntityAdmin(admin.ModelAdmin):@@ -42,5 +54,27 @@ class EntityAdmin(admin.ModelAdmin):search_fields = ['name']- inlines = [ AttributesInLine, StatesInLine, PositionInLine, PathInLine ]+ inlines = [+ AttributesInLine,+ StatesInLine,+ EntityViewInLine,+ PositionInLine,+ PathInLine,+ ProxyStateInLine,+ ]++[email protected](models.ProxyState)+class ProxyStateAdmin(admin.ModelAdmin):++ show_full_result_count = False++ list_display = (+ 'entity_state',+ 'entity',+ 'created_datetime',+ )++ search_fields = ['entity__name']+ readonly_fields = ( 'entity_state', 'entity', )diff --git a/src/hi/apps/entity/migrations/0005_entitypath_updated_datetime_and_more.py b/src/hi/apps/entity/migrations/0005_entitypath_updated_datetime_and_more.pynew file mode 100644index 00000000..5b1ddbf7--- /dev/null+++ b/src/hi/apps/entity/migrations/0005_entitypath_updated_datetime_and_more.py@@ -0,0 +1,109 @@+# Generated by Django 4.2.15 on 2024-08-28 02:14++from django.db import migrations, models+import django.db.models.deletion+++class Migration(migrations.Migration):++ dependencies = [+ (+ "location",+ "0003_locationview_view_type_str_alter_location_order_id_and_more",+ ),+ ("entity", "0004_alter_entity_integration_key"),+ ]++ operations = [+ migrations.AddField(+ model_name="entitypath",+ name="updated_datetime",+ field=models.DateTimeField(auto_now=True, verbose_name="Updated"),+ ),+ migrations.AlterField(+ model_name="entityposition",+ name="location",+ field=models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="entity_positions",+ to="location.location",+ verbose_name="Location",+ ),+ ),+ migrations.CreateModel(+ name="ProxyState",+ fields=[+ (+ "id",+ models.BigAutoField(+ auto_created=True,+ primary_key=True,+ serialize=False,+ verbose_name="ID",+ ),+ ),+ (+ "created_datetime",+ models.DateTimeField(auto_now_add=True, verbose_name="Created"),+ ),+ (+ "entity",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="proxy_by_states",+ to="entity.entity",+ verbose_name="Entity",+ ),+ ),+ (+ "entity_state",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="proxy_for_entities",+ to="entity.entitystate",+ verbose_name="Entity State",+ ),+ ),+ ],+ ),+ migrations.CreateModel(+ name="EntityView",+ fields=[+ (+ "id",+ models.BigAutoField(+ auto_created=True,+ primary_key=True,+ serialize=False,+ verbose_name="ID",+ ),+ ),+ (+ "created_datetime",+ models.DateTimeField(auto_now_add=True, verbose_name="Created"),+ ),+ (+ "entity",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="location_views",+ to="entity.entity",+ verbose_name="Entity",+ ),+ ),+ (+ "location_view",+ models.ForeignKey(+ on_delete=django.db.models.deletion.CASCADE,+ related_name="entities",+ to="location.locationview",+ verbose_name="Location",+ ),+ ),+ ],+ options={+ "verbose_name": "Entity View",+ "verbose_name_plural": "Entity Views",+ },+ ),+ ]diff --git a/src/hi/apps/entity/models.py b/src/hi/apps/entity/models.pyindex 15483cc3..cf4b0243 100644--- a/src/hi/apps/entity/models.py+++ b/src/hi/apps/entity/models.py@@ -1,6 +1,6 @@from django.db import models-from hi.apps.location.models import Location+from hi.apps.location.models import Location, LocationViewfrom hi.integrations.core.models import IntegrationIdModelfrom .enums import (@@ -79,7 +79,7 @@ class Attribute(models.Model):Entity,related_name = 'attributes',verbose_name = 'Entity',- on_delete=models.CASCADE,+ on_delete = models.CASCADE,)attribute_value_type_str = models.CharField('Attribute Value Type',@@ -158,8 +158,8 @@ class EntityState(models.Model):Entity,related_name = 'states',verbose_name = 'Entity',- on_delete=models.CASCADE,- )+ on_delete = models.CASCADE,+ )entity_state_type_str = models.CharField('State Type',max_length = 32,@@ -204,6 +204,62 @@ class EntityState(models.Model):return+class ProxyState(models.Model):+ """An EntityState associated with a Sensors or Controller is+ implicitly a "sensing" or "controlling" the internals of the+ entity/device. However, this may really just be a proxy for another entity's+ (hidden) state.++ e.g., An open/close sensor is directly sensing the proximity sensor in+ the device, but it is indirectly trying to sense the state of a door or window.++ e.g., A sprinkler controller valve is directly sensing and controlling+ whether it is on or off, but also serves as a proxy for all the+ sprinkler heads connected to it.++ e.g., A temperature sensor's internal temperature states is really just+ a proxy for an area (and area is also an Entity).++ e.g., A motion detectors's internal "movement" state about reflected+ infrared signals is just a proxy for movement associated with an area.++ This relationship between an EntityState and proxy for another Entity+ can either be one-to-many or many-to-one.++ e.g., A thermostat may be aggregating the readings from multiple+ remote sensors so that the internal temperature state of the+ thermostat is a proxy for all the remote sensor states.++ The purpose of representing the proxy relationships is to allow+ visually changing the display of an Entity based on the sensors+ that are serving as a proxy for it. It also allows clicks/taps on the+ entity to be associated with the sensors or controllers that are proxying+ for it.++ e.g., A common case is for defining "AREA" entities and visually+ displaying them so that they can change colors based on movement+ sensors that proxy for the area and showing the video stream for+ the camera entity proxying for the area.+ """++ entity_state = models.ForeignKey(+ EntityState,+ related_name = 'proxy_for_entities',+ verbose_name = 'Entity State',+ on_delete=models.CASCADE,+ )+ entity = models.ForeignKey(+ Entity,+ related_name = 'proxy_by_states',+ verbose_name = 'Entity',+ on_delete = models.CASCADE,+ )+ created_datetime = models.DateTimeField(+ 'Created',+ auto_now_add = True,+ )++class EntityPosition(models.Model):"""- For entities represented by an SVG icon.@@ -214,10 +270,9 @@ class EntityPosition(models.Model):location = models.ForeignKey(Location,- related_name = 'positions',+ related_name = 'entity_positions',verbose_name = 'Location',on_delete = models.CASCADE,- null = False, blank = False,)entity = models.ForeignKey(Entity,@@ -277,7 +332,6 @@ class EntityPath(models.Model):related_name = 'paths',verbose_name = 'Location',on_delete = models.CASCADE,- null = False, blank = False,)entity = models.ForeignKey(Entity,@@ -293,6 +347,11 @@ class EntityPath(models.Model):'Created',auto_now_add = True,)+ updated_datetime = models.DateTimeField(+ 'Updated',+ auto_now=True,+ blank = True,+ )class Meta:verbose_name = 'Entity Path'@@ -300,3 +359,29 @@ class EntityPath(models.Model):indexes = [models.Index( fields=[ 'location', 'entity' ] ),]+++class EntityView(models.Model):++ entity = models.ForeignKey(+ Entity,+ related_name = 'location_views',+ verbose_name = 'Entity',+ on_delete = models.CASCADE,+ )+ location_view = models.ForeignKey(+ LocationView,+ related_name = 'entities',+ verbose_name = 'Location',+ on_delete = models.CASCADE,+ )+ created_datetime = models.DateTimeField(+ 'Created',+ auto_now_add = True,+ )++ class Meta:+ verbose_name = 'Entity View'+ verbose_name_plural = 'Entity Views'++diff --git a/src/hi/apps/location/models.py b/src/hi/apps/location/models.pyindex 468e4a19..651f852e 100644--- a/src/hi/apps/location/models.py+++ b/src/hi/apps/location/models.py@@ -123,3 +123,51 @@ class LocationView(models.Model):def view_type( self, view_type : ViewType ):self.view_type_str = str(view_type)return+++class SvgPositionModel(models.Model):+ """+ For models that have a visual representaion that can be overlayed on+ the Location's SVG as an icon with a center position, rotartion and scale.+ """++ class Meta:+ abstract = True++ svg_x = models.DecimalField(+ 'X',+ max_digits = 12,+ decimal_places = 6,+ )+ svg_y = models.DecimalField(+ 'Y',+ max_digits = 12,+ decimal_places = 6,+ )+ svg_scale = models.DecimalField(+ 'Scale',+ max_digits = 12,+ decimal_places = 6,+ default = 1.0,+ )+ svg_rotation = models.DecimalField(+ 'Rotation',+ max_digits = 12,+ decimal_places = 6,+ default = 0.0,+ )+++class SvgPathModel(models.Model):+ """+ For models that have a visual representaion that can be overlayed on+ the Location's SVG as a general SVG path.+ """++ class Meta:+ abstract = True++ svg_path = models.TextField(+ 'Path',+ null = False, blank = False,+ )diff --git a/src/hi/apps/location/views.py b/src/hi/apps/location/views.pyindex bff220b5..88ec8c31 100644--- a/src/hi/apps/location/views.py+++ b/src/hi/apps/location/views.py@@ -50,7 +50,11 @@ class LocationViewView( HiGridView ):except LocationView.DoesNotExist:logger.warning( f'Location view "{location_view_id}" does not exist.' )raise NotImplementedError('Handling bad location view not yet implemengted')-++ # Remember last view chosen+ request.view_parameters.location_view_id = current_location_view.id+ request.view_parameters.to_session( request )+context = {'current_location_view': current_location_view,}diff --git a/src/hi/apps/sense/admin.py b/src/hi/apps/sense/admin.pyindex 0c700c04..99b79533 100644--- a/src/hi/apps/sense/admin.py+++ b/src/hi/apps/sense/admin.py@@ -20,22 +20,6 @@ class SensorAdmin(admin.ModelAdmin):readonly_fields = ( 'entity_state', )[email protected](models.SensedEntity)-class SensedEntityAdmin(admin.ModelAdmin):-- show_full_result_count = False-- list_display = (- 'sensor',- 'entity',- 'created_datetime',- )-- search_fields = ['sensor__name']- readonly_fields = ( 'sensor', 'entity', )- ordering = ( '-created_datetime', )--@admin.register(models.SensorHistory)class SensorHistoryAdmin(admin.ModelAdmin):diff --git a/src/hi/apps/sense/migrations/0005_delete_sensedentity.py b/src/hi/apps/sense/migrations/0005_delete_sensedentity.pynew file mode 100644index 00000000..b7ffbd5f--- /dev/null+++ b/src/hi/apps/sense/migrations/0005_delete_sensedentity.py@@ -0,0 +1,16 @@+# Generated by Django 4.2.15 on 2024-08-28 02:14++from django.db import migrations+++class Migration(migrations.Migration):++ dependencies = [+ ("sense", "0004_alter_sensor_integration_key"),+ ]++ operations = [+ migrations.DeleteModel(+ name="SensedEntity",+ ),+ ]diff --git a/src/hi/apps/sense/models.py b/src/hi/apps/sense/models.pyindex 27a288b6..397a9525 100644--- a/src/hi/apps/sense/models.py+++ b/src/hi/apps/sense/models.py@@ -1,6 +1,6 @@from django.db import models-from hi.apps.entity.models import Entity, EntityState+from hi.apps.entity.models import EntityStatefrom hi.integrations.core.models import IntegrationIdModelfrom .enums import SensorType@@ -43,47 +43,13 @@ class Sensor( IntegrationIdModel ):return-class SensedEntity(models.Model):- """The Entity associated with a Sensors's state is implicitly a- "sensed" entity, but this may also be sensing (directly or- indirectly) the state of more than one entity.-- e.g., An open/close sensor is directly sensing the proximity sensor in- the device, but it is indirectly trying to sense the state of a door or window.-- e.g., A temperature sensor might be the aggregate of a number of thermometer readings.-- """-- sensor = models.ForeignKey(- Sensor,- related_name = '+',- verbose_name = 'Sensor',- on_delete=models.CASCADE,- )- entity = models.ForeignKey(- Entity,- related_name = 'sensed_by',- verbose_name = 'Entity',- on_delete=models.CASCADE,- )- created_datetime = models.DateTimeField(- 'Created',- auto_now_add = True,- )-- class Meta:- verbose_name = 'Sensed Entity'- verbose_name_plural = 'Sensed Entities'--class SensorHistory(models.Model):sensor = models.ForeignKey(Sensor,related_name = 'history',verbose_name = 'Sensor',- on_delete=models.CASCADE,+ on_delete = models.CASCADE,)value = models.CharField('Value',diff --git a/src/hi/enums.py b/src/hi/enums.pyindex 1d63834a..49748c17 100644--- a/src/hi/enums.py+++ b/src/hi/enums.py@@ -1,8 +1,8 @@from hi.apps.common.enums import LabeledEnum-class ViewMode(LabeledEnum):+class EditMode(LabeledEnum):- INFORMATION = ('Information', '' )- CONTROL = ('Control', '' )- EDIT = ('Edit', '' )+ OFF = ('Off', '' )+ ON = ('On', '' )+diff --git a/src/hi/templates/panes/side_panel.html b/src/hi/templates/panes/side_panel.htmlindex a5493170..4d22acdd 100644--- a/src/hi/templates/panes/side_panel.html+++ b/src/hi/templates/panes/side_panel.html@@ -10,8 +10,7 @@</div><div class=""><a href="{% url 'edit_start' %}"- class="btn btn-tertiary btn-control" role="button"- data-async="true" >+ class="btn btn-tertiary btn-control" role="button" >EDIT</a></div>diff --git a/src/hi/view_parameters.py b/src/hi/view_parameters.pyindex 0d0bbb69..221e12ec 100644--- a/src/hi/view_parameters.py+++ b/src/hi/view_parameters.py@@ -2,15 +2,15 @@ from dataclasses import dataclassfrom hi.apps.location.models import LocationView-from .enums import ViewMode+from .enums import EditMode@dataclassclass ViewParameters:location_view_id : int = None- view_mode : ViewMode = None-+ edit_mode : EditMode = False+def __post_init__(self):self._location_view = None # Lazy loadedreturn@@ -31,7 +31,7 @@ class ViewParameters:if not hasattr( request, 'session' ):returnrequest.session['location_view_id'] = self.location_view_id- request.session['view_mode'] = str(self.view_mode)+ request.session['edit_mode'] = str(self.edit_mode)return@staticmethod@@ -45,10 +45,10 @@ class ViewParameters:except ( TypeError, ValueError ):location_view_id = None- view_mode = ViewMode.from_name_safe( name = request.session.get( 'view_mode' ))+ edit_mode = EditMode.from_name_safe( name = request.session.get( 'edit_mode' ))return ViewParameters(location_view_id = location_view_id,- view_mode = view_mode,+ edit_mode = edit_mode,)