Skip to content

Home Information - Your home, your data, organized.

Python

Reactoring to cleanup common abstractions and hard-coded things. WIP

Anthony Cassandraeb4b2b54bfcc
diff --git a/src/hi/apps/collection/edit/views.py b/src/hi/apps/collection/edit/views.py
index 66676bb1..eab61269 100644
--- a/src/hi/apps/collection/edit/views.py
+++ b/src/hi/apps/collection/edit/views.py
@@ -13,7 +13,7 @@ from hi.apps.collection.collection_manager import CollectionManager
from hi.apps.collection.enums import CollectionType
from hi.apps.collection.models import Collection, CollectionPosition
from hi.apps.entity.models import Entity
-from hi.apps.location.forms import SvgPositionForm
+from hi.apps.location.forms import LocationItemPositionForm
from hi.apps.location.edit.helpers import LocationEditHelpers
from hi.decorators import edit_required
from hi.enums import ViewType
@@ -41,18 +41,20 @@ class CollectionDetailsView( View ):
location_view = request.view_parameters.location_view
- svg_position_form = None
+ location_item_position_form = None
if request.view_parameters.view_type.is_location_view:
collection_position = CollectionPosition.objects.filter(
collection = collection,
location = location_view.location,
).first()
if collection_position:
- svg_position_form = SvgPositionForm.from_svg_position_model( collection_position )
+ location_item_position_form = LocationItemPositionForm.from_svg_position_model(
+ collection_position,
+ )
context = {
'collection': collection,
- 'svg_position_form': svg_position_form,
+ 'location_item_position_form': location_item_position_form,
}
template = get_template( 'collection/edit/panes/collection_details.html' )
content = template.render( context, request = request )
diff --git a/src/hi/apps/collection/models.py b/src/hi/apps/collection/models.py
index 01467189..dadec95a 100644
--- a/src/hi/apps/collection/models.py
+++ b/src/hi/apps/collection/models.py
@@ -4,15 +4,18 @@ from hi.apps.common.svg_models import SvgIconItem, SvgPathItem
from hi.apps.entity.models import Entity
from hi.apps.location.models import (
Location,
+ LocationItemModelMixin,
+ LocationItemPositionModel,
+ LocationItemPathModel,
LocationView,
- SvgPathModel,
- SvgPositionModel,
)
+from hi.enums import ItemType
+from hi.models import ItemTypeModelMixin
from .enums import CollectionType
-class Collection( models.Model ):
+class Collection( models.Model, ItemTypeModelMixin, LocationItemModelMixin ):
name = models.CharField(
'Name',
@@ -37,8 +40,8 @@ class Collection( models.Model ):
verbose_name_plural = 'Collections'
@property
- def html_id(self):
- return f'hi-collection-{self.id}'
+ def item_type(self) -> ItemType:
+ return ItemType.COLLECTION
@property
def collection_type(self):
@@ -82,7 +85,7 @@ class CollectionEntity(models.Model):
]
-class CollectionPosition( SvgPositionModel ):
+class CollectionPosition( LocationItemPositionModel ):
location = models.ForeignKey(
Location,
@@ -129,7 +132,7 @@ class CollectionPosition( SvgPositionModel ):
)
-class CollectionPath( SvgPathModel ):
+class CollectionPath( LocationItemPathModel ):
"""
- For collection represented by an arbitary (usually closed) SVG path.
- The styling of the path is determined by the CollectionType.
diff --git a/src/hi/apps/collection/templates/collection/collection_buttons.html b/src/hi/apps/collection/templates/collection/collection_buttons.html
index c6089998..f3adfce6 100644
--- a/src/hi/apps/collection/templates/collection/collection_buttons.html
+++ b/src/hi/apps/collection/templates/collection/collection_buttons.html
@@ -1,6 +1,7 @@
<div class="d-flex justify-content-start draggable-container">
{% for collection in collection_list %}
- <div class="{% if request.is_editing %}draggable{% endif %}"
+ <div id="{{ collection.html_id }}"
+ class="{% if request.is_editing %}draggable{% endif %}"
{% if request.is_editing %}draggable="true"{% endif %}
data-id="{{ collection.html_id }}">
<a href="{% url 'collection_view' id=collection.id %}"
diff --git a/src/hi/apps/collection/templates/collection/collection_view.html b/src/hi/apps/collection/templates/collection/collection_view.html
index 7f5569eb..32c97179 100644
--- a/src/hi/apps/collection/templates/collection/collection_view.html
+++ b/src/hi/apps/collection/templates/collection/collection_view.html
@@ -2,7 +2,8 @@
<h5><sub>COLLECTION:</sub> {{ collection_data.collection.name }}</h5>
{% for entity in collection_data.entity_list %}
- <div class="{% if request.is_editing %}draggable{% endif %}"
+ <div id="{{ entity.html_id }}"
+ class="{% if request.is_editing %}draggable{% endif %}"
{% if request.is_editing %}draggable="true"{% endif %}
data-id="{{ entity.html_id }}" >
{% if request.is_editing %}
diff --git a/src/hi/apps/collection/templates/collection/edit/panes/collection_details.html b/src/hi/apps/collection/templates/collection/edit/panes/collection_details.html
index 82b4c84d..65518f0f 100644
--- a/src/hi/apps/collection/templates/collection/edit/panes/collection_details.html
+++ b/src/hi/apps/collection/templates/collection/edit/panes/collection_details.html
@@ -1,13 +1,11 @@
<h5>Collection</h5>
<div>{{ collection.name }}</div>
-{% if svg_position_form %}
+{% if location_item_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 id="{{ location_item_position_form.content_html_id }}">
+ {% include "location/edit/panes/location_item_position.html" %}
</div>
-{% endwith %}
{% endif %}
<h5>View Type</h5>
diff --git a/src/hi/apps/edit/templates/edit/panes/svg_position.html b/src/hi/apps/edit/templates/edit/panes/svg_position.html
deleted file mode 100644
index a1ae0526..00000000
--- a/src/hi/apps/edit/templates/edit/panes/svg_position.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<form action="{% url 'edit_svg_position' html_id=svg_position_form.item_html_id %}" method="post"
- class="form" data-async="#{{ svg_position_form.content_html_id }}-svg-position">
- {% csrf_token %}
-
- {% for hidden in svg_position_form.hidden_fields %}
- {{ hidden }}
- {% endfor %}
-
- {% if svg_position_form.non_field_errors %}
- <div class="non-field-errors alert alert-danger">
- {% for err in svg_position_form.non_field_errors %}
- <p class="form-error">{{ err }}</p>
- {% endfor %}
- </div>
- {% endif %}
-
- <div class="pt-4">
- {{ svg_position_form.svg_x.label }}
- {{ svg_position_form.svg_x }}
- {{ svg_position_form.svg_x.errors }}
- </div>
-
- <div class="pt-4">
- {{ svg_position_form.svg_y.label }}
- {{ svg_position_form.svg_y }}
- {{ svg_position_form.svg_y.errors }}
- </div>
-
- <div class="pt-4">
- {{ svg_position_form.svg_scale.label }}
- {{ svg_position_form.svg_scale }}
- {{ svg_position_form.svg_scale.errors }}
- </div>
-
- <div class="pt-4">
- {{ svg_position_form.svg_rotate.label }}
- {{ svg_position_form.svg_rotate }}
- {{ svg_position_form.svg_rotate.errors }}
- </div>
-
- <button type="submit" role="button" >SUBMIT</button>
-</form>
diff --git a/src/hi/apps/edit/urls.py b/src/hi/apps/edit/urls.py
index bd5c91e1..4bc89fb6 100644
--- a/src/hi/apps/edit/urls.py
+++ b/src/hi/apps/edit/urls.py
@@ -17,16 +17,12 @@ urlpatterns = [
views.EditDeleteView.as_view(),
name='edit_delete' ),
- re_path( r'^details/(?P<html_id>[\w\-]*)$',
- views.EditDetailsView.as_view(),
- name='edit_details' ),
-
re_path( r'^svg/position/(?P<html_id>[\w\-]+)$',
- views.EditSvgPositionView.as_view(),
+ views.EditLocationItemPositionView.as_view(),
name='edit_svg_position' ),
re_path( r'^svg/path/(?P<html_id>[\w\-]+)$',
- views.EditSvgPathView.as_view(),
+ views.EditLocationItemPathView.as_view(),
name='edit_svg_path' ),
re_path( r'^add-remove$',
diff --git a/src/hi/apps/edit/views.py b/src/hi/apps/edit/views.py
index d286e069..e6d40809 100644
--- a/src/hi/apps/edit/views.py
+++ b/src/hi/apps/edit/views.py
@@ -1,9 +1,7 @@
import json
import logging
import re
-from typing import Dict
-from django.http import HttpRequest
from django.shortcuts import redirect
from django.template.loader import get_template
from django.urls import reverse
@@ -13,43 +11,19 @@ from django.views.generic import View
import hi.apps.common.antinode as antinode
import hi.apps.collection.edit.views as collection_edit_views
from hi.apps.collection.collection_manager import CollectionManager
-import hi.apps.entity.edit.views as entity_edit_views
from hi.apps.entity.entity_manager import EntityManager
import hi.apps.location.edit.views as location_edit_views
-from hi.apps.location.forms import SvgPositionForm
+from hi.apps.location.forms import LocationItemPositionForm
from hi.decorators import edit_required
+from hi.hi_grid_view import HiGridView
+from hi.enums import ItemType
from hi.views import bad_request_response
-from hi.constants import DIVID
from hi.enums import ViewMode
logger = logging.getLogger(__name__)
-class EditViewMixin:
-
- def parse_html_id( self, html_id : str ):
- m = re.match( r'^hi-([\w\-]+)-(\d+)$', html_id )
- if not m:
- raise ValueError( 'Bad html id "{html_id}".' )
- return ( m.group(1), int(m.group(2)) )
-
- def get_edit_side_panel_response( self,
- request : HttpRequest,
- template_name : str,
- context : Dict = None):
- if context is None:
- context = dict()
- template = get_template( template_name )
- content = template.render( context, request = request )
- insert_map = {
- DIVID['EDIT_ITEM']: content,
- }
- return antinode.response(
- insert_map = insert_map,
- )
-
-
class EditStartView( View ):
def get(self, request, *args, **kwargs):
@@ -108,57 +82,22 @@ class EditDeleteView( View ):
@method_decorator( edit_required, name='dispatch' )
-class EditDetailsView( View, EditViewMixin ):
-
- def get(self, request, *args, **kwargs):
-
- html_id = kwargs.get('html_id')
- if not html_id:
- return self.get_default_details( request )
-
- ( item_type, item_id ) = self.parse_html_id( kwargs.get('html_id'))
-
- if item_type == 'entity':
- return entity_edit_views.EntityDetailsView().get(
- request = request,
- entity_id = item_id,
- )
-
- if item_type == 'collection':
- return collection_edit_views.CollectionDetailsView().get(
- request = request,
- collection_id = item_id,
- )
-
- return bad_request_response( request, message = 'Unknown item type "{item_type}".' )
-
- def get_default_details( self, request ):
- if request.view_parameters.view_type.is_location_view:
- return location_edit_views.LocationViewDetailsView().get(
- request = request,
- location_view_id = request.view_parameters.location_view_id,
- )
-
- return self.get_edit_side_panel_response(
- request = request,
- template_name = 'edit/panes/default.html',
- )
-
-
-@method_decorator( edit_required, name='dispatch' )
-class EditSvgPositionView( View, EditViewMixin ):
+class EditLocationItemPositionView( View ):
def post(self, request, *args, **kwargs):
- ( item_type, item_id ) = self.parse_html_id( kwargs.get('html_id'))
-
+ try:
+ ( item_type, item_id ) = ItemType.parse_from_dict( kwargs )
+ except ValueError:
+ return bad_request_response( request, messahe = 'Bad item id.' )
+
location_view = request.view_parameters.location_view
- if item_type == 'entity':
+ if item_type == ItemType.ENTITY:
svg_position_model = EntityManager().get_entity_position(
entity_id = item_id,
location = location_view.location,
)
- elif item_type == 'collection':
+ elif item_type == ItemType.COLLECTION:
svg_position_model = CollectionManager().get_collection_position(
collection_id = item_id,
location = location_view.location,
@@ -166,23 +105,23 @@ class EditSvgPositionView( View, EditViewMixin ):
else:
return bad_request_response( request, message = f'Cannot set SVG position for "{item_type}"' )
- svg_position_form = SvgPositionForm(
+ location_item_position_form = LocationItemPositionForm(
request.POST,
item_html_id = svg_position_model.svg_icon_item.html_id,
)
- if svg_position_form.is_valid():
- svg_position_form.to_svg_position_model( svg_position_model )
+ if location_item_position_form.is_valid():
+ location_item_position_form.to_svg_position_model( svg_position_model )
svg_position_model.save()
svg_icon_item = svg_position_model.svg_icon_item
context = {
- 'svg_position_form': svg_position_form,
+ 'location_item_position_form': location_item_position_form,
}
- template = get_template('edit/panes/svg_position.html')
+ template = get_template('location/edit/panes/location_item_position.html')
content = template.render( context, request = request )
insert_map = {
- svg_position_form.content_html_id: content,
+ location_item_position_form.content_html_id: content,
}
set_attributes_map = {
svg_icon_item.html_id: {
@@ -196,23 +135,27 @@ class EditSvgPositionView( View, EditViewMixin ):
@method_decorator( edit_required, name='dispatch' )
-class EditSvgPathView( View, EditViewMixin ):
+class EditLocationItemPathView( View ):
def post(self, request, *args, **kwargs):
- ( item_type, item_id ) = self.parse_html_id( kwargs.get('html_id'))
+ try:
+ ( item_type, item_id ) = ItemType.parse_from_dict( kwargs )
+ except ValueError:
+ return bad_request_response( request, messahe = 'Bad item id.' )
+
svg_path_str = request.POST.get('svg_path')
if not svg_path_str:
- return bad_request_response( request, message = 'Missing SVG path' );
+ return bad_request_response( request, message = 'Missing SVG path' )
location_view = request.view_parameters.location_view
- if item_type == 'entity':
+ if item_type == ItemType.ENTITY:
EntityManager().set_entity_path(
entity_id = item_id,
location = location_view.location,
svg_path_str = svg_path_str,
)
- elif item_type == 'collection':
+ elif item_type == ItemType.COLLECTION:
CollectionManager().set_collection_path(
collection_id = item_id,
location = location_view.location,
@@ -227,7 +170,7 @@ class EditSvgPathView( View, EditViewMixin ):
@method_decorator( edit_required, name='dispatch' )
-class AddRemoveView( View, EditViewMixin ):
+class AddRemoveView( HiGridView ):
def get( self, request, *args, **kwargs ):
@@ -239,7 +182,7 @@ class AddRemoveView( View, EditViewMixin ):
context = {
}
- return self.get_edit_side_panel_response(
+ return self.side_panel_response(
request = request,
template_name = 'edit/panes/default.html',
context = context,
@@ -247,19 +190,18 @@ class AddRemoveView( View, EditViewMixin ):
@method_decorator( edit_required, name='dispatch' )
-class ReorderItemsView( View, EditViewMixin ):
+class ReorderItemsView( View ):
def post( self, request, *args, **kwargs ):
try:
- html_id_list = json.loads( request.POST.get( 'html_id_list' ) )
- except Exception as e:
+ item_type_id_list = ItemType.parse_list_from_dict( request.POST )
+ except ValueError as e:
return bad_request_response( request, message = str(e) )
try:
item_types = set()
item_id_list = list()
- for html_id in html_id_list:
- ( item_type, item_id ) = self.parse_html_id( html_id )
+ for item_type, item_id in item_type_id_list:
item_types.add( item_type )
item_id_list.append( item_id )
continue
@@ -273,22 +215,22 @@ class ReorderItemsView( View, EditViewMixin ):
return bad_request_response( request, message = f'Too many item types: {item_types}' )
item_type = next(iter(item_types))
- if item_type == 'entity':
+ if item_type == ItemType.ENTITY:
if not request.view_parameters.view_type.is_collection:
- return bad_request_response( request, message = f'Entity reordering for collections only.' )
+ return bad_request_response( request, message = 'Entity reordering for collections only.' )
return collection_edit_views.CollectionReorderEntitiesView().post(
request,
collection_id = request.view_parameters.collection_id,
entity_id_list = json.dumps( item_id_list ),
)
- elif item_type == 'collection':
+ elif item_type == ItemType.COLLECTION:
return collection_edit_views.CollectionReorder().post(
request,
collection_id_list = json.dumps( item_id_list ),
)
- elif item_type == 'location-view':
+ elif item_type == ItemType.LOCATION_VIEW:
return location_edit_views.LocationViewReorder().post(
request,
location_view_id_list = json.dumps( item_id_list ),
diff --git a/src/hi/apps/entity/edit/views.py b/src/hi/apps/entity/edit/views.py
index ceb58737..ad23854e 100644
--- a/src/hi/apps/entity/edit/views.py
+++ b/src/hi/apps/entity/edit/views.py
@@ -13,7 +13,7 @@ from hi.apps.entity.entity_manager import EntityManager
from hi.apps.entity.enums import EntityType
from hi.apps.entity.models import Entity, EntityPosition
from hi.apps.location.edit.helpers import LocationEditHelpers
-from hi.apps.location.forms import SvgPositionForm
+from hi.apps.location.forms import LocationItemPositionForm
from hi.constants import DIVID
from hi.decorators import edit_required
@@ -38,18 +38,20 @@ class EntityDetailsView( View ):
location_view = request.view_parameters.location_view
- svg_position_form = None
+ location_item_position_form = None
if request.view_parameters.view_type.is_location_view:
entity_position = EntityPosition.objects.filter(
entity = entity,
location = location_view.location,
).first()
if entity_position:
- svg_position_form = SvgPositionForm.from_svg_position_model( entity_position )
+ location_item_position_form = LocationItemPositionForm.from_svg_position_model(
+ entity_position,
+ )
context = {
'entity': entity,
- 'svg_position_form': svg_position_form,
+ 'location_item_position_form': location_item_position_form,
}
template = get_template( 'entity/edit/panes/entity_details.html' )
content = template.render( context, request = request )
diff --git a/src/hi/apps/entity/models.py b/src/hi/apps/entity/models.py
index e5fdef9d..0762b1a9 100644
--- a/src/hi/apps/entity/models.py
+++ b/src/hi/apps/entity/models.py
@@ -3,11 +3,14 @@ from django.db import models
from hi.apps.common.svg_models import SvgIconItem, SvgPathItem
from hi.apps.location.models import (
Location,
+ LocationItemModelMixin,
+ LocationItemPositionModel,
+ LocationItemPathModel,
LocationView,
- SvgPositionModel,
- SvgPathModel,
)
from hi.integrations.core.models import IntegrationIdModel
+from hi.enums import ItemType
+from hi.models import ItemTypeModelMixin
from .enums import (
EntityType,
@@ -17,7 +20,7 @@ from .enums import (
)
-class Entity( IntegrationIdModel ):
+class Entity( IntegrationIdModel, ItemTypeModelMixin, LocationItemModelMixin ):
"""
- A physical feature, device or software artifact.
- May have a fixed physical location (or can just be part of a collection)
@@ -59,8 +62,8 @@ class Entity( IntegrationIdModel ):
return self.__str__()
@property
- def html_id(self) -> str:
- return f'hi-entity-{self.id}'
+ def item_type(self) -> ItemType:
+ return ItemType.ENTITY
@property
def entity_type(self) -> EntityType:
@@ -292,7 +295,7 @@ class EntityStateDelegation(models.Model):
]
-class EntityPosition( SvgPositionModel ):
+class EntityPosition( LocationItemPositionModel ):
"""
- For entities represented by an SVG icon.
- This is the most common case.
@@ -345,7 +348,7 @@ class EntityPosition( SvgPositionModel ):
)
-class EntityPath( SvgPathModel ):
+class EntityPath( LocationItemPathModel ):
"""
- For entities represented by an arbitary SVG path. e.g., The path of a utility line,
- The styling of the path is determined by the EntityType.
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.html
index 57736109..e7ecaf03 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,12 +1,10 @@
<h4>{{ entity.name }}</h4>
-{% if svg_position_form %}
+{% if location_item_position_form %}
<h5>Position</h5>
-{% with entity.html_id as html_id %}
-<div id="{{ svg_position_form.content_html_id }}">
- {% include "edit/panes/svg_position.html" %}
+<div id="{{ location_item_position_form.content_html_id }}">
+ {% include "location/edit/panes/location_item_position.html" %}
</div>
-{% endwith %}
{% endif %}
<h5>Attributes</h5>
diff --git a/src/hi/apps/location/edit/urls.py b/src/hi/apps/location/edit/urls.py
index 65c31daa..3b20e3c4 100644
--- a/src/hi/apps/location/edit/urls.py
+++ b/src/hi/apps/location/edit/urls.py
@@ -9,6 +9,10 @@ urlpatterns = [
views.LocationViewAddView.as_view(),
name='location_edit_location_view_add' ),
+ re_path( r'^location-view/geometry/(?P<location_view_id>\d+)$',
+ views.LocationViewGeometryView.as_view(),
+ name='location_edit_location_view_geometry' ),
+
re_path( r'^location-view/delete/(?P<location_view_id>\d+)$',
views.LocationViewDeleteView.as_view(),
name='location_edit_location_view_delete' ),
@@ -21,16 +25,12 @@ urlpatterns = [
views.LocationViewEntityToggleView.as_view(),
name='location_edit_location_view_entity_toggle' ),
- re_path( r'^location-view/entity/toggle/(?P<location_view_id>\d+)/(?P<entity_id>\d+)$',
- views.LocationViewEntityToggleView.as_view(),
- name='location_edit_location_view_entity_toggle' ),
-
re_path( r'^location-view/collection/toggle/(?P<location_view_id>\d+)/(?P<collection_id>\d+)$',
views.LocationViewCollectionToggleView.as_view(),
name='location_edit_location_view_collection_toggle' ),
- re_path( r'^location-view/geometry/(?P<location_view_id>\d+)$',
- views.LocationViewGeometryView.as_view(),
- name='location_edit_location_view_geometry' ),
+ re_path( r'^location-item/details/(?P<html_id>[\w\-]*)$',
+ views.LocationItemDetailsView.as_view(),
+ name='location_edit_location_item_details' ),
]
diff --git a/src/hi/apps/location/edit/views.py b/src/hi/apps/location/edit/views.py
index 8d5ade5d..fb64f059 100644
--- a/src/hi/apps/location/edit/views.py
+++ b/src/hi/apps/location/edit/views.py
@@ -8,14 +8,17 @@ from django.urls import reverse
from django.utils.decorators import method_decorator
from django.views.generic import View
+import hi.apps.collection.edit.views as collection_edit_views
from hi.apps.collection.models import Collection
import hi.apps.common.antinode as antinode
from hi.apps.common.svg_models import SvgViewBox
+import hi.apps.entity.edit.views as entity_edit_views
from hi.apps.entity.models import Entity
from hi.apps.location.location_view_manager import LocationViewManager
from hi.apps.location.models import LocationView
from hi.decorators import edit_required
-from hi.enums import ViewType
+from hi.enums import ItemType, ViewType
+from hi.hi_grid_view import HiGridView
from hi.views import bad_request_response, page_not_found_response
from hi.constants import DIVID
@@ -95,6 +98,53 @@ class LocationViewAddView( View ):
return redirect( redirect_url )
+class LocationViewGeometryView( View ):
+
+ def post(self, request, *args, **kwargs):
+
+ location_view_id = kwargs.get('location_view_id')
+ try:
+ location_view = LocationView.objects.select_related(
+ 'location' ).get( id = location_view_id )
+ except LocationView.DoesNotExist:
+ return page_not_found_response( request )
+
+ try:
+ svg_view_box_str = request.POST.get('view_box')
+ svg_view_box = SvgViewBox.from_attribute_value( svg_view_box_str )
+ except (TypeError, ValueError ):
+ return bad_request_response( request, message = f'Bad viewbox: {svg_view_box_str}' )
+
+ try:
+ svg_rotate_angle = float( request.POST.get('rotate_angle'))
+ except (TypeError, ValueError ):
+ return bad_request_response( request, message = f'Bad rotate angle: {svg_rotate_angle}' )
+
+ location_view.svg_view_box_str = str(svg_view_box)
+ location_view.svg_rotate = Decimal( svg_rotate_angle )
+ location_view.save()
+
+ return antinode.response( main_content = 'OK' )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class LocationViewReorder( View ):
+
+ def post(self, request, *args, **kwargs):
+ try:
+ location_view_id_list = json.loads( kwargs.get( 'location_view_id_list' ) )
+ except Exception as e:
+ return bad_request_response( request, message = str(e) )
+
+ if not location_view_id_list:
+ return bad_request_response( request, message = 'Missing location view ids.' )
+
+ LocationEditHelpers.set_location_view_order(
+ location_view_id_list = location_view_id_list,
+ )
+ return antinode.response( main_content = 'OK' )
+
+
@method_decorator( edit_required, name='dispatch' )
class LocationViewDeleteView( View ):
@@ -217,22 +267,6 @@ class LocationViewEntityToggleView( View ):
)
-@method_decorator( edit_required, name='dispatch' )
-class LocationViewEntityRemoveView( View ):
-
- def post( self, request, *args, **kwargs ):
-
- location_view_id = kwargs.get('location_view_id')
- if not location_view_id:
- return bad_request_response( request, message = 'Missing location view id in request.' )
-
- entity_id = kwargs.get('entity_id')
- if not entity_id:
- return bad_request_response( request, message = 'Missing entity id in request.' )
-
- pass
-
-
@method_decorator( edit_required, name='dispatch' )
class LocationViewCollectionToggleView( View ):
@@ -274,47 +308,43 @@ class LocationViewCollectionToggleView( View ):
@method_decorator( edit_required, name='dispatch' )
-class LocationViewReorder( View ):
-
- def post(self, request, *args, **kwargs):
- try:
- location_view_id_list = json.loads( kwargs.get( 'location_view_id_list' ) )
- except Exception as e:
- return bad_request_response( request, message = str(e) )
+class LocationItemDetailsView( HiGridView ):
- if not location_view_id_list:
- return bad_request_response( request, message = 'Missing location view ids.' )
-
- LocationEditHelpers.set_location_view_order(
- location_view_id_list = location_view_id_list,
- )
- return antinode.response( main_content = 'OK' )
-
-
-class LocationViewGeometryView( View ):
+ def get(self, request, *args, **kwargs):
- def post(self, request, *args, **kwargs):
+ if not kwargs.get( ItemType.HTML_ID_ARG() ):
+ return self.get_default_details( request )
- location_view_id = kwargs.get('location_view_id')
try:
- location_view = LocationView.objects.select_related(
- 'location' ).get( id = location_view_id )
- except LocationView.DoesNotExist:
- return page_not_found_response( request )
+ ( item_type, item_id ) = ItemType.parse_from_dict( kwargs )
+ except ValueError:
+ return bad_request_response( request, message = 'Bad item id.' )
+
+ if item_type == ItemType.ENTITY:
+ return entity_edit_views.EntityDetailsView().get(
+ request = request,
+ entity_id = item_id,
+ )
- try:
- svg_view_box_str = request.POST.get('view_box')
- svg_view_box = SvgViewBox.from_attribute_value( svg_view_box_str )
- except (TypeError, ValueError ) as e:
- return bad_request_response( request, message = f'Bad viewbox: {svg_view_box_str}' )
+ if item_type == ItemType.COLLECTION:
+ return collection_edit_views.CollectionDetailsView().get(
+ request = request,
+ collection_id = item_id,
+ )
- try:
- svg_rotate_angle = float( request.POST.get('rotate_angle'))
- except (TypeError, ValueError ) as e:
- return bad_request_response( request, message = f'Bad rotate angle: {svg_rotate_angle}' )
+ return bad_request_response( request, message = 'Unknown item type "{item_type}".' )
- location_view.svg_view_box_str = str(svg_view_box)
- location_view.svg_rotate = Decimal( svg_rotate_angle )
- location_view.save()
+ def get_default_details( self, request ):
+ if request.view_parameters.view_type.is_location_view:
+ return LocationViewDetailsView().get(
+ request = request,
+ location_view_id = request.view_parameters.location_view_id,
+ )
+
+ return self.side_panel_response(
+ request = request,
+ template_name = 'edit/panes/default.html',
+ )
+
+
- return antinode.response( main_content = 'OK' )
diff --git a/src/hi/apps/location/forms.py b/src/hi/apps/location/forms.py
index 4251a4ad..724c6db9 100644
--- a/src/hi/apps/location/forms.py
+++ b/src/hi/apps/location/forms.py
@@ -2,10 +2,10 @@ from decimal import Decimal
from django import forms
-from .models import SvgPositionModel
+from .models import LocationItemPositionModel
-class SvgPositionForm(forms.Form):
+class LocationItemPositionForm(forms.Form):
svg_x = forms.DecimalField(
label = 'X',
@@ -25,7 +25,7 @@ class SvgPositionForm(forms.Form):
)
def __init__( self, *args, item_html_id = None, **kwargs ):
- super(SvgPositionForm, self).__init__(*args, **kwargs)
+ super(LocationItemPositionForm, self).__init__(*args, **kwargs)
self._item_html_id = item_html_id
return
@@ -38,7 +38,7 @@ class SvgPositionForm(forms.Form):
return f'{self.item_html_id}-svg-position'
@classmethod
- def from_svg_position_model( cls, svg_position_model : SvgPositionModel ):
+ def from_svg_position_model( cls, svg_position_model : LocationItemPositionModel ):
if svg_position_model:
return cls(
item_html_id = svg_position_model.svg_icon_item.html_id,
@@ -57,7 +57,7 @@ class SvgPositionForm(forms.Form):
},
)
- def to_svg_position_model( self, svg_position_model : SvgPositionModel ):
+ def to_svg_position_model( self, svg_position_model : LocationItemPositionModel ):
cleaned_data = self.clean()
svg_position_model.svg_x = cleaned_data.get( 'svg_x' )
svg_position_model.svg_y = cleaned_data.get( 'svg_y' )
diff --git a/src/hi/apps/location/location_view_data.py b/src/hi/apps/location/location_view_data.py
index 9a12f6bc..057efc23 100644
--- a/src/hi/apps/location/location_view_data.py
+++ b/src/hi/apps/location/location_view_data.py
@@ -1,8 +1,12 @@
from dataclasses import dataclass
-from typing import List, Set
+from typing import Generator, List, Set
from hi.apps.collection.models import Collection, CollectionPath, CollectionPosition
from hi.apps.entity.models import Entity, EntityPosition, EntityPath
+from hi.apps.location.models import (
+ LocationItemPositionModel,
+ LocationItemPathModel,
+)
from .models import LocationView
@@ -20,3 +24,24 @@ class LocationViewData:
collection_paths : List[ CollectionPath ]
unpositioned_collections : List[ Collection ]
orphan_entities : Set[ Entity ]
+
+ @property
+ def location_item_positions(self) -> Generator[ LocationItemPositionModel, None, None ]:
+ for entity_position in self.entity_positions:
+ yield entity_position
+ continue
+ for collection_position in self.collection_positions:
+ yield collection_position
+ continue
+ return
+
+ @property
+ def location_item_paths(self) -> Generator[ LocationItemPathModel, None, None ]:
+ for entity_path in self.entity_paths:
+ yield entity_path
+ continue
+ for collection_path in self.collection_paths:
+ yield collection_path
+ continue
+ return
+
diff --git a/src/hi/apps/location/models.py b/src/hi/apps/location/models.py
index 5f05ad9b..c9b8cada 100644
--- a/src/hi/apps/location/models.py
+++ b/src/hi/apps/location/models.py
@@ -1,11 +1,13 @@
from django.db import models
from hi.apps.common.svg_models import SvgIconItem, SvgPathItem, SvgViewBox
+from hi.enums import ItemType
+from hi.models import ItemTypeModelMixin
from .enums import LocationViewType
-class Location(models.Model):
+class Location( models.Model, ItemTypeModelMixin ):
name = models.CharField(
'Name',
@@ -61,6 +63,10 @@ class Location(models.Model):
def __repr__(self):
return self.__str__()
+ @property
+ def item_type(self) -> ItemType:
+ return ItemType.LOCATION
+
@property
def svg_view_box(self):
return SvgViewBox.from_attribute_value( self.svg_view_box_str )
@@ -71,7 +77,7 @@ class Location(models.Model):
return
-class LocationView(models.Model):
+class LocationView( models.Model, ItemTypeModelMixin ):
location = models.ForeignKey(
Location,
@@ -125,8 +131,8 @@ class LocationView(models.Model):
return self.__str__()
@property
- def html_id(self):
- return f'hi-location-view-{self.id}'
+ def item_type(self) -> ItemType:
+ return ItemType.LOCATION_VIEW
@property
def location_view_type(self):
@@ -147,10 +153,17 @@ class LocationView(models.Model):
return
-class SvgPositionModel(models.Model):
+class LocationItemModelMixin:
+ # A Location Item is a model that can be associated with a Location
+ # and that can visually appeay in one or more Location Views. This
+ # defined an interface that specific instance need to conform to.
+ pass
+
+
+class LocationItemPositionModel( 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.
+ the Location's SVG as an icon with a center position, rotation and scale.
"""
class Meta:
@@ -183,8 +196,8 @@ class SvgPositionModel(models.Model):
def svg_icon_item(self) -> SvgIconItem:
raise NotImplementedError('Subclasses must implement this method.')
-
-class SvgPathModel(models.Model):
+
+class LocationItemPathModel( models.Model ):
"""
For models that have a visual representaion that can be overlayed on
the Location's SVG as a general SVG path.
diff --git a/src/hi/apps/location/templates/location/edit/panes/location_item_position.html b/src/hi/apps/location/templates/location/edit/panes/location_item_position.html
new file mode 100644
index 00000000..5ccee9e6
--- /dev/null
+++ b/src/hi/apps/location/templates/location/edit/panes/location_item_position.html
@@ -0,0 +1,42 @@
+<form action="{% url 'edit_svg_position' html_id=location_item_position_form.item_html_id %}" method="post"
+ class="form" data-async="#{{ location_item_position_form.content_html_id }}-svg-position">
+ {% csrf_token %}
+
+ {% for hidden in location_item_position_form.hidden_fields %}
+ {{ hidden }}
+ {% endfor %}
+
+ {% if location_item_position_form.non_field_errors %}
+ <div class="non-field-errors alert alert-danger">
+ {% for err in location_item_position_form.non_field_errors %}
+ <p class="form-error">{{ err }}</p>
+ {% endfor %}
+ </div>
+ {% endif %}
+
+ <div class="pt-4">
+ {{ location_item_position_form.svg_x.label }}
+ {{ location_item_position_form.svg_x }}
+ {{ location_item_position_form.svg_x.errors }}
+ </div>
+
+ <div class="pt-4">
+ {{ location_item_position_form.svg_y.label }}
+ {{ location_item_position_form.svg_y }}
+ {{ location_item_position_form.svg_y.errors }}
+ </div>
+
+ <div class="pt-4">
+ {{ location_item_position_form.svg_scale.label }}
+ {{ location_item_position_form.svg_scale }}
+ {{ location_item_position_form.svg_scale.errors }}
+ </div>
+
+ <div class="pt-4">
+ {{ location_item_position_form.svg_rotate.label }}
+ {{ location_item_position_form.svg_rotate }}
+ {{ location_item_position_form.svg_rotate.errors }}
+ </div>
+
+ <button type="submit" role="button" >SUBMIT</button>
+</form>
diff --git a/src/hi/apps/location/templates/location/location_view.html b/src/hi/apps/location/templates/location/location_view.html
index 71565d45..eb9aedf8 100644
--- a/src/hi/apps/location/templates/location/location_view.html
+++ b/src/hi/apps/location/templates/location/location_view.html
@@ -10,20 +10,12 @@
transform="rotate({{ location_view_data.location_view.svg_rotate }} 0 0)">
{% include_media_template location_view_data.location_view.location.svg_filename %}
- {% for entity_path in location_view_data.entity_paths %}
- {% include "location/svg_path_item.html" with svg_path_item=entity_path.svg_path_item %}
+ {% for location_item_path in location_view_data.location_item_paths %}
+ {% include "location/svg_path_item.html" with svg_path_item=location_item_path.svg_path_item %}
{% endfor %}
- {% for entity_position in location_view_data.entity_positions %}
- {% include "location/svg_icon_item.html" with svg_icon_item=entity_position.svg_icon_item %}
- {% endfor %}
-
- {% for collection_path in location_view_data.collection_paths %}
- {% include "location/svg_path_item.html" with svg_path_item=collection_path.svg_path_item %}
- {% endfor %}
-
- {% for collection_position in location_view_data.collection_positions %}
- {% include "location/svg_icon_item.html" with svg_icon_item=collection_position.svg_icon_item %}
+ {% for location_item_position in location_view_data.location_item_positions %}
+ {% include "location/svg_icon_item.html" with svg_icon_item=location_item_position.svg_icon_item %}
{% endfor %}
</svg>
diff --git a/src/hi/apps/location/templates/location/location_view_buttons.html b/src/hi/apps/location/templates/location/location_view_buttons.html
index ef2a3959..9b91464d 100644
--- a/src/hi/apps/location/templates/location/location_view_buttons.html
+++ b/src/hi/apps/location/templates/location/location_view_buttons.html
@@ -1,6 +1,7 @@
<div class="d-flex justify-content-start draggable-container">
{% for location_view in location_view_list %}
- <div class="{% if request.is_editing %}draggable{% endif %}"
+ <div id="{{ location_view.html_id }}"
+ class="{% if request.is_editing %}draggable{% endif %}"
{% if request.is_editing %}draggable="true"{% endif %}
data-id="{{ location_view.html_id }}" >
<a href="{% url 'location_view' id=location_view.id %}"
diff --git a/src/hi/enums.py b/src/hi/enums.py
index f0258d75..22ecdec4 100644
--- a/src/hi/enums.py
+++ b/src/hi/enums.py
@@ -1,3 +1,7 @@
+import json
+import re
+from typing import Dict, List, Tuple
+
from hi.apps.common.enums import LabeledEnum
@@ -33,3 +37,45 @@ class ViewMode(LabeledEnum):
@property
def is_editing(self):
return bool( self == ViewMode.EDIT )
+
+
+class ItemType(LabeledEnum):
+ # Many class have polymorpic behavior along different dimensions with
+ # the dimensions being overlapping between subsets. This is mostly
+ # used on the front-ends Javascript where we try to hide model details
+ # and use more a more generic data model for 'items' that could be more
+ # than backend model one type. When the Javascript needs to informt
+ # the server of an action, the server needs to be able to map that
+ # Javascript concept back to the specifics class.
+
+ ENTITY = ( 'Entity', '' )
+ COLLECTION = ( 'Collection', '' )
+ LOCATION = ( 'Location', '' )
+ LOCATION_VIEW = ( 'Location View', '' )
+
+ @classmethod
+ def HTML_ID_ARG(cls):
+ return 'html_id'
+
+ @classmethod
+ def HTML_ID_LIST_ARG(cls):
+ return 'html_id_list'
+
+ def html_id( self, item_id : int ):
+ return f'hi-{self}-{item_id}'
+
+ @classmethod
+ def parse_html_id( self, html_id_str : str ) -> Tuple[ 'ItemType', int ]:
+ m = re.match( r'^hi-([\w\-]+)-(\d+)$', html_id_str )
+ if not m:
+ raise ValueError( f'Bad html id "{html_id_str}".' )
+ return ( ItemType.from_name( m.group(1) ), int(m.group(2)) )
+
+ @classmethod
+ def parse_from_dict( cls, a_dict : Dict[ str, str ] ) -> Tuple[ 'ItemType', int ]:
+ return cls.parse_html_id( a_dict.get( cls.HTML_ID_ARG() ) )
+
+ @classmethod
+ def parse_list_from_dict( cls, a_dict : Dict[ str, str ] ) -> List[ Tuple[ 'ItemType', int ] ]:
+ html_id_str_list = json.loads( a_dict.get( cls.HTML_ID_LIST_ARG() ) )
+ return [ cls.parse_html_id( html_id_str ) for html_id_str in html_id_str_list ]
diff --git a/src/hi/hi_grid_view.py b/src/hi/hi_grid_view.py
index 4cd02c07..12e21066 100644
--- a/src/hi/hi_grid_view.py
+++ b/src/hi/hi_grid_view.py
@@ -105,3 +105,21 @@ class HiGridView(View):
insert_map = insert_map,
push_url = push_url,
)
+
+ def side_panel_response( self,
+ request : HttpRequest,
+ template_name : str,
+ context : Dict = None):
+ if context is None:
+ context = dict()
+ template = get_template( template_name )
+ content = template.render( context, request = request )
+ insert_map = {
+ DIVID['EDIT_ITEM']: content,
+ }
+ return antinode.response(
+ insert_map = insert_map,
+ )
+
+
+
diff --git a/src/hi/models.py b/src/hi/models.py
new file mode 100644
index 00000000..b7dbdd81
--- /dev/null
+++ b/src/hi/models.py
@@ -0,0 +1,13 @@
+from .enums import ItemType
+
+
+class ItemTypeModelMixin:
+
+ @property
+ def item_type(self) -> ItemType:
+ raise NotImplementedError( 'This method must be implemented.' )
+
+ @property
+ def html_id(self):
+ return self.item_type.html_id( self.id )
+
diff --git a/src/hi/static/js/main.js b/src/hi/static/js/main.js
index 1f7c0941..a7d221c8 100644
--- a/src/hi/static/js/main.js
+++ b/src/hi/static/js/main.js
@@ -13,7 +13,7 @@
DATA_TYPE_ATTR: 'data-type',
DATA_TYPE_ICON_VALUE: 'svg-icon',
DATA_TYPE_PATH_VALUE: 'svg-path',
- API_SHOW_DETAILS_URL: '/edit/details',
+ API_SHOW_DETAILS_URL: '/location/edit/location-item/details',
generateUniqueId: function() {
return _generateUniqueId();