Skip to content

Home Information - Your home, your data, organized.

Python

In progress collection view and edit mode for it.

Anthony Cassandrab3949cdcbd0a
diff --git a/src/hi/apps/collection/collection_data.py b/src/hi/apps/collection/collection_data.py
new file mode 100644
index 00000000..5654cb91
--- /dev/null
+++ b/src/hi/apps/collection/collection_data.py
@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+from typing import List
+
+from hi.apps.entity.models import Entity
+
+from .models import Collection
+
+
+@dataclass
+class CollectionData:
+
+ collection : Collection
+ entity_list : List[ Entity ]
diff --git a/src/hi/apps/collection/collection_manager.py b/src/hi/apps/collection/collection_manager.py
new file mode 100644
index 00000000..0d84022f
--- /dev/null
+++ b/src/hi/apps/collection/collection_manager.py
@@ -0,0 +1,22 @@
+from hi.apps.common.singleton import Singleton
+
+from .collection_data import CollectionData
+from .models import Collection
+
+
+class CollectionManager(Singleton):
+
+ def __init_singleton__(self):
+ return
+
+ def get_collection_data( self, collection : Collection ):
+
+ entity_list = list()
+ for collection_entity in collection.entities.all().order_by('order_id'):
+ entity_list.append( collection_entity.entity )
+ continue
+
+ return CollectionData(
+ collection = collection,
+ entity_list = entity_list,
+ )
diff --git a/src/hi/apps/collection/migrations/0006_remove_collectionview_order_id_collection_order_id.py b/src/hi/apps/collection/migrations/0006_remove_collectionview_order_id_collection_order_id.py
new file mode 100644
index 00000000..289bdb52
--- /dev/null
+++ b/src/hi/apps/collection/migrations/0006_remove_collectionview_order_id_collection_order_id.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.2.15 on 2024-10-02 18:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("collection", "0005_alter_collectionposition_svg_rotate"),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name="collectionview",
+ name="order_id",
+ ),
+ migrations.AddField(
+ model_name="collection",
+ name="order_id",
+ field=models.PositiveIntegerField(default=0, verbose_name="Order Id"),
+ ),
+ ]
diff --git a/src/hi/apps/collection/models.py b/src/hi/apps/collection/models.py
index 591abfb3..8c4cec5b 100644
--- a/src/hi/apps/collection/models.py
+++ b/src/hi/apps/collection/models.py
@@ -22,6 +22,10 @@ class Collection( models.Model ):
max_length = 32,
null = False, blank = False,
)
+ order_id = models.PositiveIntegerField(
+ 'Order Id',
+ default = 0,
+ )
created_datetime = models.DateTimeField(
'Created',
auto_now_add = True,
@@ -138,10 +142,6 @@ class CollectionView(models.Model):
verbose_name = 'Location',
on_delete = models.CASCADE,
)
- order_id = models.PositiveIntegerField(
- 'Order Id',
- default = 0,
- )
created_datetime = models.DateTimeField(
'Created',
auto_now_add = True,
diff --git a/src/hi/apps/collection/templates/collection/collection_buttons.html b/src/hi/apps/collection/templates/collection/collection_buttons.html
new file mode 100644
index 00000000..329a7073
--- /dev/null
+++ b/src/hi/apps/collection/templates/collection/collection_buttons.html
@@ -0,0 +1,9 @@
+{% for collection in collection_list %}
+<div class="col-1">
+ <a href="{% url 'collection_view' id=collection.id %}"
+ class="btn btn-secondary btn-control" role="button"
+ data-async="#{{ DIVID.MAIN }}" >
+ {{ collection.name }}
+ </a>
+</div>
+{% endfor %}
diff --git a/src/hi/apps/collection/templates/collection/collection_view.html b/src/hi/apps/collection/templates/collection/collection_view.html
new file mode 100644
index 00000000..0a4ea32a
--- /dev/null
+++ b/src/hi/apps/collection/templates/collection/collection_view.html
@@ -0,0 +1,14 @@
+<div id="hi-collection-view-main" class="hi-collection-view">
+ <h5><sub>COLLECTION:</sub> {{ collection_data.collection.name }}</h5>
+
+ {% for entity in collection_data.entity_list %}
+ <div class="">
+ <a href="#"
+ data-async="true">
+ {{ entity.name }}
+ </a>
+ </div>
+ {% empty %}
+ <div><em>No entities in collection.</em></div>
+ {% endfor %}
+</div>
diff --git a/src/hi/apps/collection/urls.py b/src/hi/apps/collection/urls.py
new file mode 100644
index 00000000..678c204a
--- /dev/null
+++ b/src/hi/apps/collection/urls.py
@@ -0,0 +1,15 @@
+from django.urls import re_path
+
+from . import views
+
+
+urlpatterns = [
+
+ re_path( r'^view/(?P<id>\d+)$',
+ views.CollectionView.as_view(),
+ name='collection_view'),
+
+ re_path( r'^view$',
+ views.CollectionViewDefaultView.as_view(),
+ name='collection_view_default'),
+]
diff --git a/src/hi/apps/collection/views.py b/src/hi/apps/collection/views.py
new file mode 100644
index 00000000..c0e800b7
--- /dev/null
+++ b/src/hi/apps/collection/views.py
@@ -0,0 +1,81 @@
+import logging
+
+from django.http import HttpResponseRedirect
+from django.urls import reverse
+from django.views.generic import View
+
+import hi.apps.common.antinode as antinode
+from hi.apps.common.utils import is_ajax
+from hi.enums import ViewType
+from hi.hi_grid_view import HiGridView
+
+from .collection_manager import CollectionManager
+from .models import Collection
+
+logger = logging.getLogger(__name__)
+
+
+class CollectionViewDefaultView( View ):
+
+ def get(self, request, *args, **kwargs):
+
+ collection = self._get_default_collection( request )
+ redirect_url = reverse(
+ 'collection_view',
+ kwargs = { 'id': collection.id }
+ )
+ return HttpResponseRedirect( redirect_url )
+
+ def _get_default_collection( self, request ):
+ if request.view_parameters.collection:
+ return request.view_parameters.collection
+
+ collection = Collection.objects.order_by( 'order_id' ).first()
+ if not collection:
+ raise NotImplementedError('Handling no defined collections not yet implemented')
+
+ request.view_parameters.view_type = ViewType.COLLECTION
+ request.view_parameters.collection_id = collection.id
+ request.view_parameters.to_session( request )
+ return collection
+
+
+class CollectionView( HiGridView ):
+
+ def get(self, request, *args, **kwargs):
+
+ collection_id = kwargs.get('id')
+ try:
+ collection = Collection.objects.get( id = collection_id )
+ except Collection.DoesNotExist:
+ logger.warning( f'Collection "{collection_id}" does not exist.' )
+ raise NotImplementedError('Handling bad collection not yet implemented')
+
+ # Remember last collection chosen
+ request.view_parameters.view_type = ViewType.COLLECTION
+ request.view_parameters.collection_id = collection.id
+ request.view_parameters.to_session( request )
+
+ # When in edit mode, a collection change needs a full
+ # synchronous page load to ensure any front-end editing state and
+ # views are invalidated. Else, the editing state and edit side
+ # panel will be invalid for the new view.
+ #
+ if is_ajax( request ) and request.view_parameters.view_mode.should_reload_on_view_change:
+ sync_url = reverse( 'collection_view', kwargs = kwargs )
+ return antinode.redirect_response( url = sync_url )
+
+ collection_data = CollectionManager().get_collection_data(
+ collection = collection,
+ )
+ context = {
+ 'is_async_request': is_ajax( request ),
+ 'collection_data': collection_data,
+ }
+ return self.hi_grid_response(
+ request = request,
+ context = context,
+ main_template_name = 'collection/collection_view.html',
+ push_url_name = 'collection_view',
+ push_url_kwargs = kwargs,
+ )
diff --git a/src/hi/apps/edit/helpers.py b/src/hi/apps/edit/helpers_collection.py
similarity index 90%
rename from src/hi/apps/edit/helpers.py
rename to src/hi/apps/edit/helpers_collection.py
index 5bf75cdc..df0858ca 100644
--- a/src/hi/apps/edit/helpers.py
+++ b/src/hi/apps/edit/helpers_collection.py
@@ -24,7 +24,7 @@ from .transient_models import (
)
-class EditHelpers:
+class CollectionEditHelpers:
@classmethod
def create_entity_view_group_list( cls, location_view : LocationView ) -> List[EntityViewItem]:
@@ -182,7 +182,10 @@ class EditHelpers:
return entity_path
@classmethod
- def toggle_collection_in_view( cls, collection : Collection, location_view : LocationView ) -> bool:
+ def toggle_collection_in_view( cls,
+ collection : Collection,
+ location_view : LocationView,
+ add_position_if_needed : bool ) -> bool:
try:
collection_view = CollectionView.objects.get(
@@ -193,20 +196,25 @@ class EditHelpers:
return False
except CollectionView.DoesNotExist:
- cls.add_collection_to_view( collection = collection, location_view = location_view )
+ cls.add_collection_to_view(
+ collection = collection,
+ location_view = location_view,
+ add_position_if_needed = add_position_if_needed,
+ )
return True
@classmethod
def add_collection_to_view( cls,
- collection : Collection,
- location_view : LocationView ):
+ collection : Collection,
+ location_view : LocationView,
+ add_position_if_needed : bool ):
with transaction.atomic():
- # Need to make sure it has some visible representation in the view if none exists.
- cls.add_collection_position_if_needed(
- collection = collection,
- location_view = location_view,
- )
+ if add_position_if_needed:
+ cls.add_collection_position_if_needed(
+ collection = collection,
+ location_view = location_view,
+ )
_ = CollectionView.objects.create(
collection = collection,
location_view = location_view,
diff --git a/src/hi/apps/edit/helpers_location_view.py b/src/hi/apps/edit/helpers_location_view.py
new file mode 100644
index 00000000..e9fdd506
--- /dev/null
+++ b/src/hi/apps/edit/helpers_location_view.py
@@ -0,0 +1,250 @@
+from decimal import Decimal
+from typing import List
+
+from django.db import transaction
+
+from hi.apps.collection.models import (
+ Collection,
+ CollectionView,
+ CollectionPosition,
+)
+from hi.apps.entity.models import (
+ Entity,
+ EntityView,
+ EntityPosition,
+ EntityPath,
+)
+from hi.apps.location.models import LocationView
+
+from .transient_models import (
+ CollectionViewItem,
+ CollectionViewGroup,
+ EntityViewItem,
+ EntityViewGroup,
+)
+
+
+class LocationViewEditHelpers:
+
+ @classmethod
+ def create_entity_view_group_list( cls, location_view : LocationView ) -> List[EntityViewItem]:
+
+ entity_queryset = Entity.objects.all()
+
+ entity_view_group_dict = dict()
+ for entity in entity_queryset:
+
+ exists_in_view = False
+ for entity_view in entity.entity_views.all():
+ if entity_view.location_view == location_view:
+ exists_in_view = True
+ break
+ continue
+
+ entity_view_item = EntityViewItem(
+ entity = entity,
+ exists_in_view = exists_in_view,
+ )
+
+ if entity.entity_type not in entity_view_group_dict:
+ entity_view_group = EntityViewGroup(
+ location_view = location_view,
+ entity_type = entity.entity_type,
+ )
+ entity_view_group_dict[entity.entity_type] = entity_view_group
+ entity_view_group_dict[entity.entity_type].item_list.append( entity_view_item )
+ continue
+
+ entity_view_group_list = list( entity_view_group_dict.values() )
+ entity_view_group_list.sort( key = lambda item : item.entity_type.label )
+ return entity_view_group_list
+
+ @classmethod
+ def create_collection_view_group( cls, location_view : LocationView ) -> CollectionViewGroup:
+
+ collection_queryset = Collection.objects.all()
+
+ collection_view_group = CollectionViewGroup(
+ location_view = location_view,
+ )
+ for collection in collection_queryset:
+
+ exists_in_view = False
+ for collection_view in collection.collection_views.all():
+ if collection_view.location_view == location_view:
+ exists_in_view = True
+ break
+ continue
+
+ collection_view_item = CollectionViewItem(
+ collection = collection,
+ exists_in_view = exists_in_view,
+ )
+ collection_view_group.item_list.append( collection_view_item )
+ continue
+
+ collection_view_group.item_list.sort( key = lambda item : item.collection.name )
+ return collection_view_group
+
+ @classmethod
+ def toggle_entity_in_view( cls, entity : Entity, location_view : LocationView ) -> bool:
+
+ try:
+ entity_view = EntityView.objects.get(
+ entity = entity,
+ location_view = location_view,
+ )
+ entity_view.delete()
+ return False
+
+ except EntityView.DoesNotExist:
+ cls.add_entity_to_view( entity = entity, location_view = location_view )
+ return True
+
+ @classmethod
+ def add_entity_to_view( cls, entity : Entity, location_view : LocationView ):
+
+ with transaction.atomic():
+ # Need to make sure it has some visible representation in the view if none exists.
+ if entity.entity_type.is_path:
+ cls.add_entity_path_if_needed(
+ entity = entity,
+ location_view = location_view,
+ )
+ else:
+ cls.add_entity_position_if_needed(
+ entity = entity,
+ location_view = location_view,
+ )
+
+ _ = EntityView.objects.create(
+ entity = entity,
+ location_view = location_view,
+ )
+ return
+
+ @classmethod
+ def add_entity_position_if_needed( cls, entity : Entity, location_view : LocationView ) -> EntityPosition:
+ assert not entity.entity_type.is_path
+
+ try:
+ _ = EntityPosition.objects.get(
+ location = location_view.location,
+ entity = entity,
+ )
+ return
+ except EntityPosition.DoesNotExist:
+ pass
+
+ # Default display in middle of current view
+ svg_x = location_view.svg_view_box.x + ( location_view.svg_view_box.width / 2.0 )
+ svg_y = location_view.svg_view_box.y + ( location_view.svg_view_box.height / 2.0 )
+
+ entity_position = EntityPosition.objects.create(
+ entity = entity,
+ location = location_view.location,
+ svg_x = Decimal( svg_x ),
+ svg_y = Decimal( svg_y ),
+ svg_scale = Decimal( 1.0 ),
+ svg_rotate = Decimal( 0.0 ),
+ )
+ return entity_position
+
+ @classmethod
+ def add_entity_path_if_needed( cls, entity : Entity, location_view : LocationView ) -> EntityPath:
+ assert entity.entity_type.is_path
+
+ try:
+ _ = EntityPath.objects.get(
+ location = location_view.location,
+ entity = entity,
+ )
+ return
+ except EntityPath.DoesNotExist:
+ pass
+
+ # Default display a line in middle of current view with length 10% of viewbox width
+ length = location_view.svg_view_box.width / 10.0
+ center_x = location_view.svg_view_box.x + ( location_view.svg_view_box.width / 2.0 )
+ center_y = location_view.svg_view_box.y + ( location_view.svg_view_box.height / 2.0 )
+ start_x = center_x - ( length / 2.0 )
+ start_y = center_y
+ end_x = start_x + length
+ end_y = start_y
+
+ svg_path = f'M {start_x},{start_y} L {end_x},{end_y}'
+
+ entity_path = EntityPath.objects.create(
+ entity = entity,
+ location = location_view.location,
+ svg_path = svg_path,
+ )
+ return entity_path
+
+ @classmethod
+ def toggle_collection_in_view( cls,
+ collection : Collection,
+ location_view : LocationView,
+ add_position_if_needed : bool ) -> bool:
+
+ try:
+ collection_view = CollectionView.objects.get(
+ collection = collection,
+ location_view = location_view,
+ )
+ collection_view.delete()
+ return False
+
+ except CollectionView.DoesNotExist:
+ cls.add_collection_to_view(
+ collection = collection,
+ location_view = location_view,
+ add_position_if_needed = add_position_if_needed,
+ )
+ return True
+
+ @classmethod
+ def add_collection_to_view( cls,
+ collection : Collection,
+ location_view : LocationView,
+ add_position_if_needed : bool ):
+
+ with transaction.atomic():
+ if add_position_if_needed:
+ cls.add_collection_position_if_needed(
+ collection = collection,
+ location_view = location_view,
+ )
+ _ = CollectionView.objects.create(
+ collection = collection,
+ location_view = location_view,
+ )
+ return
+
+ @classmethod
+ def add_collection_position_if_needed( cls,
+ collection : Collection,
+ location_view : LocationView ) -> CollectionPosition:
+ try:
+ _ = CollectionPosition.objects.get(
+ location = location_view.location,
+ collection = collection,
+ )
+ return
+ except CollectionPosition.DoesNotExist:
+ pass
+
+ # Default display in middle of current view
+ svg_x = location_view.svg_view_box.x + ( location_view.svg_view_box.width / 2.0 )
+ svg_y = location_view.svg_view_box.y + ( location_view.svg_view_box.height / 2.0 )
+
+ collection_position = CollectionPosition.objects.create(
+ collection = collection,
+ location = location_view.location,
+ svg_x = Decimal( svg_x ),
+ svg_y = Decimal( svg_y ),
+ svg_scale = Decimal( 1.0 ),
+ svg_rotate = Decimal( 0.0 ),
+ )
+ return collection_position
+
diff --git a/src/hi/apps/edit/templates/edit/panes/collection.html b/src/hi/apps/edit/templates/edit/panes/details_collection.html
similarity index 89%
rename from src/hi/apps/edit/templates/edit/panes/collection.html
rename to src/hi/apps/edit/templates/edit/panes/details_collection.html
index 702d8c3e..9e0fd5a4 100644
--- a/src/hi/apps/edit/templates/edit/panes/collection.html
+++ b/src/hi/apps/edit/templates/edit/panes/details_collection.html
@@ -1,11 +1,13 @@
<h4>{{ collection.name }}</h4>
+{% if svg_position_form %}
<h5>Position</h5>
{% with collection.html_id as html_id %}
<div id="{{ svg_position_form.content_html_id }}">
{% include "edit/panes/svg_position.html" %}
</div>
{% endwith %}
+{% endif %}
<h5>Views</h5>
<div id="hi-edit-collection-views">
diff --git a/src/hi/apps/edit/templates/edit/panes/entity.html b/src/hi/apps/edit/templates/edit/panes/details_entity.html
similarity index 100%
rename from src/hi/apps/edit/templates/edit/panes/entity.html
rename to src/hi/apps/edit/templates/edit/panes/details_entity.html
diff --git a/src/hi/apps/edit/templates/edit/panes/side.html b/src/hi/apps/edit/templates/edit/panes/side.html
index e43102b1..2304aefe 100644
--- a/src/hi/apps/edit/templates/edit/panes/side.html
+++ b/src/hi/apps/edit/templates/edit/panes/side.html
@@ -1,12 +1,6 @@
<div id="hi-edit-side-content" class="">
<div class="">EDIT PANEL</div>
- <div class="">
- <a href="{% url 'edit_add_remove' %}"
- class="btn btn-tertiary btn-control" role="button" data-async="true">
- ADD/REMOVE
- </a>
- </div>
<div class="">
<a href="{% url 'edit_end' %}"
class="btn btn-tertiary btn-control" role="button" >
@@ -14,14 +8,21 @@
</a>
</div>
+ <div class="">
+ <a href="{% url 'edit_add_remove' %}"
+ class="btn btn-tertiary btn-control" role="button" data-async="true">
+ ADD/REMOVE
+ </a>
+ </div>
+
<div id="hi-edit-item">
{% if entity %}
- {% include "edit/panes/entity.html" %}
+ {% include "edit/panes/details_entity.html" %}
{% elif collection %}
- {% include "edit/panes/collection.html" %}
+ {% include "edit/panes/details_collection.html" %}
{% else %}
{% include "edit/panes/default.html" %}
{% endif %}
</div>
-
+
</div>
diff --git a/src/hi/apps/edit/urls.py b/src/hi/apps/edit/urls.py
index 0f8c4d74..ca4af689 100644
--- a/src/hi/apps/edit/urls.py
+++ b/src/hi/apps/edit/urls.py
@@ -6,7 +6,7 @@ from . import views
urlpatterns = [
re_path( r'^start$',
- views.EditStartView.as_view(),
+ views.EditStartView.as_view(),
name='edit_start' ),
re_path( r'^end$',
@@ -22,7 +22,7 @@ urlpatterns = [
name='edit_svg_position' ),
re_path( r'^add-remove$',
- views.EditAddRemoveView.as_view(),
+ views.AddRemoveView.as_view(),
name='edit_add_remove' ),
re_path( r'^view/entity/toggle/(?P<location_view_id>[\w\-]+)/(?P<entity_id>[\w\-]+)$',
diff --git a/src/hi/apps/edit/views.py b/src/hi/apps/edit/views.py
index 133b3552..2bc73c14 100644
--- a/src/hi/apps/edit/views.py
+++ b/src/hi/apps/edit/views.py
@@ -15,9 +15,10 @@ from hi.apps.location.location_view_manager import LocationViewManager
from hi.apps.location.models import Location, LocationView
from hi.constants import DIVID
-from hi.enums import EditMode
+from hi.enums import ViewMode
-from .helpers import EditHelpers
+from .helpers_location_view import LocationViewEditHelpers
+from .helpers_collection import CollectionEditHelpers
class EditViewMixin:
@@ -64,7 +65,7 @@ class EditStartView( View ):
# Javascript handling is consistent with the current operating
# state mode.
- request.view_parameters.edit_mode = EditMode.ON
+ request.view_parameters.view_mode = ViewMode.EDIT
request.view_parameters.to_session( request )
redirect_url = request.META.get('HTTP_REFERER')
@@ -81,7 +82,7 @@ class EditEndView( View ):
# Javascript handling is consistent with the current operating
# state mode.
- request.view_parameters.edit_mode = EditMode.OFF
+ request.view_parameters.view_mode = ViewMode.MONITOR
request.view_parameters.to_session( request )
redirect_url = request.META.get('HTTP_REFERER')
@@ -93,7 +94,7 @@ class EditEndView( View ):
class EditDetailsView( View, EditViewMixin ):
def get(self, request, *args, **kwargs):
- if request.view_parameters.edit_mode == EditMode.OFF:
+ if not request.view_parameters.view_mode.is_editing:
raise NotImplementedError( 'Not yet handling bad edit context' )
html_id = kwargs.get('html_id')
@@ -134,7 +135,7 @@ class EditDetailsView( View, EditViewMixin ):
}
return self.get_edit_side_panel_response(
request = request,
- template_name = 'edit/panes/entity.html',
+ template_name = 'edit/panes/details_entity.html',
context = context,
)
@@ -158,7 +159,7 @@ class EditDetailsView( View, EditViewMixin ):
}
return self.get_edit_side_panel_response(
request = request,
- template_name = 'edit/panes/collection.html',
+ template_name = 'edit/panes/details_collection.html',
context = context,
)
@@ -166,7 +167,7 @@ class EditDetailsView( View, EditViewMixin ):
class EditSvgPositionView( View, EditViewMixin ):
def post(self, request, *args, **kwargs):
- if request.view_parameters.edit_mode == EditMode.OFF:
+ if not request.view_parameters.view_mode.is_editing:
raise NotImplementedError( 'Not yet handling bad edit context' )
( item_type, item_id ) = self.parse_html_id( kwargs.get('html_id'))
@@ -253,14 +254,14 @@ class EditSvgPositionView( View, EditViewMixin ):
)
-class EditAddRemoveView( View, EditViewMixin ):
+class AddRemoveView( View, EditViewMixin ):
def get(self, request, *args, **kwargs):
location_view = request.view_parameters.location_view
- entity_view_group_list = EditHelpers.create_entity_view_group_list( location_view = location_view )
- collection_view_group = EditHelpers.create_collection_view_group( location_view = location_view )
+ entity_view_group_list = LocationViewEditHelpers.create_entity_view_group_list( location_view = location_view )
+ collection_view_group = LocationViewEditHelpers.create_collection_view_group( location_view = location_view )
context = {
'entity_view_group_list': entity_view_group_list,
@@ -282,7 +283,7 @@ class EditViewEntityToggleView( View, EditViewMixin ):
entity = Entity.objects.get( id = entity_id )
location_view = LocationView.objects.get( id = location_view_id )
- exists_in_view = EditHelpers.toggle_entity_in_view(
+ exists_in_view = LocationViewEditHelpers.toggle_entity_in_view(
entity = entity,
location_view = location_view,
)
@@ -316,9 +317,10 @@ class EditViewCollectionToggleView( View, EditViewMixin ):
collection = Collection.objects.get( id = collection_id )
location_view = LocationView.objects.get( id = location_view_id )
- exists_in_view = EditHelpers.toggle_collection_in_view(
+ exists_in_view = LocationViewEditHelpers.toggle_collection_in_view(
collection = collection,
location_view = location_view,
+ add_position_if_needed = True,
)
context = {
diff --git a/src/hi/apps/entity/migrations/0008_entityview_entity_view_entity_location_view.py b/src/hi/apps/entity/migrations/0008_entityview_entity_view_entity_location_view.py
new file mode 100644
index 00000000..9b0386bd
--- /dev/null
+++ b/src/hi/apps/entity/migrations/0008_entityview_entity_view_entity_location_view.py
@@ -0,0 +1,20 @@
+# Generated by Django 4.2.15 on 2024-10-02 18:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("entity", "0007_alter_entityposition_svg_rotate"),
+ ]
+
+ operations = [
+ migrations.AddConstraint(
+ model_name="entityview",
+ constraint=models.UniqueConstraint(
+ fields=("entity", "location_view"),
+ name="entity_view_entity_location_view",
+ ),
+ ),
+ ]
diff --git a/src/hi/apps/location/views.py b/src/hi/apps/location/views.py
index 4edad260..1b259cc3 100644
--- a/src/hi/apps/location/views.py
+++ b/src/hi/apps/location/views.py
@@ -6,6 +6,7 @@ from django.views.generic import View
import hi.apps.common.antinode as antinode
from hi.apps.common.utils import is_ajax
+from hi.enums import ViewType
from hi.hi_grid_view import HiGridView
from .location_view_manager import LocationViewManager
@@ -31,12 +32,13 @@ class LocationViewDefaultView( View ):
location = Location.objects.order_by( 'order_id' ).first()
if not location:
- raise NotImplementedError('Handling no defined locations not yet implemengted')
+ raise NotImplementedError('Handling no defined locations not yet implemented')
location_view = location.views.order_by( 'order_id' ).first()
if not location_view:
- raise NotImplementedError('Handling no defined views not yet implemengted')
+ raise NotImplementedError('Handling no defined views not yet implemented')
+ request.view_parameters.view_type = ViewType.LOCATION
request.view_parameters.location_view_id = location_view.id
request.view_parameters.to_session( request )
return location_view
@@ -54,7 +56,8 @@ class LocationViewView( HiGridView ):
logger.warning( f'Location view "{location_view_id}" does not exist.' )
raise NotImplementedError('Handling bad location view not yet implemengted')
- # Remember last view chosen
+ # Remember last location view chosen
+ request.view_parameters.view_type = ViewType.LOCATION
request.view_parameters.location_view_id = location_view.id
request.view_parameters.to_session( request )
@@ -63,7 +66,7 @@ class LocationViewView( HiGridView ):
# views are invalidated. Else, the editing state and edit side
# panel will be invalid for the new view.
#
- if is_ajax( request ) and request.view_parameters.edit_mode.should_reload_on_location_view_change:
+ if is_ajax( request ) and request.view_parameters.view_mode.should_reload_on_view_change:
sync_url = reverse( 'location_view', kwargs = kwargs )
return antinode.redirect_response( url = sync_url )
diff --git a/src/hi/enums.py b/src/hi/enums.py
index 4c474687..9ec2a056 100644
--- a/src/hi/enums.py
+++ b/src/hi/enums.py
@@ -1,16 +1,30 @@
from hi.apps.common.enums import LabeledEnum
-class EditMode(LabeledEnum):
+class ViewType(LabeledEnum):
- OFF = ('Off', '' )
- ON = ('On', '' )
+ LOCATION = ('Location', '' )
+ COLLECTION = ('Collection', '' )
+
+ @property
+ def is_location(self):
+ return bool( self == ViewType.LOCATION )
+
+ @property
+ def is_collection(self):
+ return bool( self == ViewType.COLLECTION )
+
+
+class ViewMode(LabeledEnum):
+
+ MONITOR = ('Monitor', '' )
+ EDIT = ('Edit', '' )
@property
def is_editing(self):
- return bool( self != EditMode.OFF )
+ return bool( self == ViewMode.EDIT )
@property
- def should_reload_on_location_view_change(self):
- return bool( self != EditMode.OFF )
+ def should_reload_on_view_change(self):
+ return bool( self == ViewMode.EDIT )
diff --git a/src/hi/hi_grid_view.py b/src/hi/hi_grid_view.py
index 5849b847..f3a2dd7f 100644
--- a/src/hi/hi_grid_view.py
+++ b/src/hi/hi_grid_view.py
@@ -11,6 +11,7 @@ from django.views.generic import View
import hi.apps.common.antinode as antinode
from hi.apps.common.utils import is_ajax
+from hi.apps.collection.models import Collection
from hi.constants import DIVID
@@ -71,6 +72,11 @@ class HiGridView(View):
location_view_list = list( location.views.order_by( 'order_id' ))
context['location_view_list'] = location_view_list
+ # This list of collections is needed for bottom buttons
+ if 'collection_list' not in context:
+ collection_list = list( Collection.objects.all().order_by( 'order_id' ))
+ context['collection_list'] = collection_list
+
return render( request, self.HI_GRID_TEMPLATE_NAME, context )
div_id_to_template_name = {
diff --git a/src/hi/middleware.py b/src/hi/middleware.py
index a343c9d4..ea3c3ebe 100644
--- a/src/hi/middleware.py
+++ b/src/hi/middleware.py
@@ -18,6 +18,6 @@ class ViewMiddleware:
def _set_view_parameters( self, request ):
request.view_parameters = ViewParameters.from_session( request )
- request.is_editing = request.view_parameters.edit_mode.is_editing
+ request.is_editing = request.view_parameters.view_mode.is_editing
return
diff --git a/src/hi/static/js/edit.js b/src/hi/static/js/edit.js
index b9906832..641cf18a 100644
--- a/src/hi/static/js/edit.js
+++ b/src/hi/static/js/edit.js
@@ -39,24 +39,24 @@
$(document).ready(function() {
$(document).on('mousedown', locationViewAreaSelector, function(event) {
- if ( gHiEditMode == 'off' ) { return; }
+ if ( gHiViewMode != 'edit' ) { return; }
handleMouseDown( event );
});
$(document).on('mousemove', locationViewAreaSelector, function(event) {
- if ( gHiEditMode == 'off' ) { return; }
+ if ( gHiViewMode != 'edit' ) { return; }
handleMouseMove( event );
});
$(document).on('mouseup', locationViewAreaSelector, function(event) {
- if ( gHiEditMode == 'off' ) { return; }
+ if ( gHiViewMode != 'edit' ) { return; }
handleMouseUp( event );
});
$(document).on('keydown', function(event) {
- if ( gHiEditMode == 'off' ) { return; }
+ if ( gHiViewMode != 'edit' ) { return; }
handleKeyDown( event );
});
$(document).on('keyup', function(event) {
- if ( gHiEditMode == 'off' ) { return; }
+ if ( gHiViewMode != 'edit' ) { return; }
handleKeyUp( event );
});
});
diff --git a/src/hi/templates/pages/base.html b/src/hi/templates/pages/base.html
index 89bbb71f..61ff5318 100644
--- a/src/hi/templates/pages/base.html
+++ b/src/hi/templates/pages/base.html
@@ -20,7 +20,7 @@
<body>
<script>
const AN_VERSION = "{{ AN_VERSION }}";
- const gHiEditMode = "{{ request.view_parameters.edit_mode }}";
+ const gHiViewMode = "{{ request.view_parameters.view_mode }}";
</script>
{% javascript 'js_before_content' %}
diff --git a/src/hi/templates/panes/bottom_buttons.html b/src/hi/templates/panes/bottom_buttons.html
index 90bbbba4..61df1988 100644
--- a/src/hi/templates/panes/bottom_buttons.html
+++ b/src/hi/templates/panes/bottom_buttons.html
@@ -1,62 +1,3 @@
<div class="row bg-white p-1">
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 1
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 2
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 3
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 4
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 5
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 6
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 7
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 8
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 9
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 10
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 11
- </div>
- </div>
- <div class="col-1">
- <div class="btn btn-secondary btn-control" role="button">
- BUTTON 12
- </div>
- </div>
+ {% include "collection/collection_buttons.html" %}
</div>
diff --git a/src/hi/urls.py b/src/hi/urls.py
index a797803c..17441e30 100644
--- a/src/hi/urls.py
+++ b/src/hi/urls.py
@@ -31,6 +31,7 @@ urlpatterns = [
re_path( r'^edit/', include('hi.apps.edit.urls' )),
re_path( r'^integration/', include('hi.integrations.core.urls' )),
re_path( r'^location/', include('hi.apps.location.urls' )),
+ re_path( r'^collection/', include('hi.apps.collection.urls' )),
]
diff --git a/src/hi/view_parameters.py b/src/hi/view_parameters.py
index 72c3285f..24b2446e 100644
--- a/src/hi/view_parameters.py
+++ b/src/hi/view_parameters.py
@@ -1,8 +1,9 @@
from dataclasses import dataclass
+from hi.apps.collection.models import Collection
from hi.apps.location.models import LocationView
-from .enums import EditMode
+from .enums import ViewMode, ViewType
@dataclass
@@ -14,13 +15,18 @@ class ViewParameters:
# requires additional event registrations to handle mouse and gesture
# events..
- location_view_id : int = None
- edit_mode : EditMode = None
+ view_type : ViewType = None
+ view_mode : ViewMode = None
+ location_view_id : int = None
+ collection_id : int = None
def __post_init__(self):
- if self.edit_mode is None:
- self.edit_mode = EditMode.default()
+ if self.view_type is None:
+ self.view_type = ViewType.default()
+ if self.view_mode is None:
+ self.view_mode = ViewMode.default()
self._location_view = None # Lazy loaded
+ self._collection = None # Lazy loaded
return
@property
@@ -35,11 +41,25 @@ class ViewParameters:
except LocationView.DoesNotExist:
return None
+ @property
+ def collection(self):
+ if self._collection:
+ return self._collection
+ if self.collection_id is None:
+ return None
+ try:
+ self._collection_ = Collection.objects.get( id = self.collection_id )
+ return self._collection
+ except Collection.DoesNotExist:
+ return None
+
def to_session( self, request ):
if not hasattr( request, 'session' ):
return
+ request.session['view_type'] = str(self.view_type)
+ request.session['view_mode'] = str(self.view_mode)
request.session['location_view_id'] = self.location_view_id
- request.session['edit_mode'] = str(self.edit_mode)
+ request.session['collection_id'] = self.collection_id
return
@staticmethod
@@ -48,15 +68,23 @@ class ViewParameters:
return ViewParameters()
if not hasattr( request, 'session' ):
return ViewParameters()
+
+ view_type = ViewType.from_name_safe( name = request.session.get( 'view_type' ))
+ view_mode = ViewMode.from_name_safe( name = request.session.get( 'view_mode' ))
+
try:
location_view_id = int( request.session.get( 'location_view_id' ))
except ( TypeError, ValueError ):
location_view_id = None
-
- edit_mode = EditMode.from_name_safe( name = request.session.get( 'edit_mode' ))
+ try:
+ collection_id = int( request.session.get( 'collection_id' ))
+ except ( TypeError, ValueError ):
+ collection_id = None
return ViewParameters(
+ view_type = view_type,
+ view_mode = view_mode,
location_view_id = location_view_id,
- edit_mode = edit_mode,
+ collection_id = collection_id,
)
diff --git a/src/hi/views.py b/src/hi/views.py
index 6ae3f217..3e1a05bf 100644
--- a/src/hi/views.py
+++ b/src/hi/views.py
@@ -3,6 +3,8 @@ from django.shortcuts import render
from django.urls import reverse
from django.views.generic import View
+from .enums import ViewType
+
def home_javascript_files( request, filename ):
return render(request, filename, {}, content_type = "text/javascript")
@@ -12,5 +14,8 @@ class HomeView( View ):
def get(self, request, *args, **kwargs):
- redirect_url = reverse( 'location_view_default' )
+ if request.view_parameters.view_type == ViewType.COLLECTION:
+ redirect_url = reverse( 'collection_view_default' )
+ else:
+ redirect_url = reverse( 'location_view_default' )
return HttpResponseRedirect( redirect_url )