Skip to content

Home Information - Your home, your data, organized.

Python

Refactored edit views, templates and helpers.

Anthony Cassandrad09d0e1294ab
diff --git a/src/hi/apps/collection/edit/__init__.py b/src/hi/apps/collection/edit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/hi/apps/edit/helpers_collection.py b/src/hi/apps/collection/edit/helpers.py
similarity index 100%
rename from src/hi/apps/edit/helpers_collection.py
rename to src/hi/apps/collection/edit/helpers.py
diff --git a/src/hi/apps/collection/edit/transient_models.py b/src/hi/apps/collection/edit/transient_models.py
new file mode 100644
index 00000000..860afe56
--- /dev/null
+++ b/src/hi/apps/collection/edit/transient_models.py
@@ -0,0 +1,22 @@
+from dataclasses import dataclass, field
+from typing import List
+
+from hi.apps.collection.models import Collection
+from hi.apps.entity.enums import EntityType
+from hi.apps.entity.models import Entity
+
+
+@dataclass
+class EntityCollectionItem:
+
+ entity : Entity
+ exists_in_collection : bool
+
+
+@dataclass
+class EntityCollectionGroup:
+
+ collection : Collection
+ entity_type : EntityType
+ item_list : List[EntityCollectionItem] = field( default_factory = list )
+
diff --git a/src/hi/apps/collection/edit/urls.py b/src/hi/apps/collection/edit/urls.py
new file mode 100644
index 00000000..c4cdd56c
--- /dev/null
+++ b/src/hi/apps/collection/edit/urls.py
@@ -0,0 +1,28 @@
+from django.urls import re_path
+
+from . import views
+
+
+urlpatterns = [
+
+ re_path( r'^collection/add$',
+ views.CollectionAddView.as_view(),
+ name='collection_edit_collection_add' ),
+
+ re_path( r'^collection/delete$',
+ views.CollectionDeleteView.as_view(),
+ name='collection_edit_collection_delete' ),
+
+ re_path( r'^collection/details/(?P<collection_id>\d+)$',
+ views.CollectionDetailsView.as_view(),
+ name='collection_edit_collection_details' ),
+
+ re_path( r'^collection/add-remove-item$',
+ views.CollectionAddRemoveItemView.as_view(),
+ name='collection_edit_collection_add_remove_item' ),
+
+ re_path( r'^collection/entity/toggle/(?P<collection_id>[\w\-]+)/(?P<entity_id>[\w\-]+)$',
+ views.CollectionEntityToggleView.as_view(),
+ name='collection_edit_collection_entity_toggle' ),
+
+]
diff --git a/src/hi/apps/collection/edit/views.py b/src/hi/apps/collection/edit/views.py
new file mode 100644
index 00000000..c097e48d
--- /dev/null
+++ b/src/hi/apps/collection/edit/views.py
@@ -0,0 +1,224 @@
+import logging
+
+from django.shortcuts import redirect
+from django.template.loader import get_template
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views.generic import View
+
+import hi.apps.common.antinode as antinode
+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.edit.forms import NameForm
+from hi.apps.entity.models import Entity
+from hi.apps.location.forms import SvgPositionForm
+from hi.decorators import edit_required
+from hi.enums import ViewType
+from hi.views import bad_request_response, page_not_found_response
+
+from hi.constants import DIVID
+
+from .helpers import CollectionEditHelpers
+
+logger = logging.getLogger(__name__)
+
+
+@method_decorator( edit_required, name='dispatch' )
+class CollectionAddView( View ):
+
+ def get( self, request, *args, **kwargs ):
+ context = {
+ 'name_form': NameForm(),
+ }
+ return antinode.modal_from_template(
+ request = request,
+ template_name = 'collection/edit/modals/collection_add.html',
+ context = context,
+ )
+
+ def post( self, request, *args, **kwargs ):
+ name_form = NameForm( request.POST )
+ if not name_form.is_valid():
+ context = {
+ 'name_form': name_form,
+ }
+ return antinode.modal_from_template(
+ request = request,
+ template_name = 'collection/edit/modals/collection_add.html',
+ context = context,
+ )
+
+ # Move to helper class
+ # Extend NameForm to add type dropdown
+
+
+
+ last_collection = Collection.objects.all().order_by( '-order_id' ).first()
+
+ collection = Collection.objects.create(
+ name = name_form.cleaned_data.get('name'),
+ collection_type_str = CollectionType.default(),
+ order_id = last_collection.order_id + 1,
+ )
+
+ request.view_parameters.view_type = ViewType.COLLECTION
+ request.view_parameters.collection_id = collection.id
+ request.view_parameters.to_session( request )
+
+ redirect_url = reverse('home')
+ return redirect( redirect_url )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class CollectionDeleteView( View ):
+
+ def get(self, request, *args, **kwargs):
+ collection_id = request.view_parameters.collection_id
+ if not collection_id:
+ return bad_request_response( request, message = 'No current collection found.' )
+
+ try:
+ collection = Collection.objects.get( id = collection_id )
+ except Collection.DoesNotExist:
+ message = f'Collection "{collection_id}" does not exist.'
+ logger.warning( message )
+ return bad_request_response( request, message = message )
+
+ context = {
+ 'collection': collection,
+ }
+ return antinode.modal_from_template(
+ request = request,
+ template_name = 'collection/edit/modals/collection_delete.html',
+ context = context,
+ )
+
+ def post( self, request, *args, **kwargs ):
+ action = request.POST.get( 'action' )
+ if action != 'confirm':
+ return bad_request_response( request, message = 'Missing confirmation value.' )
+
+ collection_id = request.POST.get( 'collection_id' )
+ if not collection_id:
+ return bad_request_response( request, message = 'Missing collection id.' )
+ try:
+ collection = Collection.objects.get( id = collection_id )
+ except Collection.DoesNotExist:
+ message = f'Collection "{collection_id}" does not exist.'
+ logger.warning( message )
+ return bad_request_response( request, message = message )
+
+ collection.delete()
+
+ next_collection = Collection.objects.all().order_by( 'order_id' ).first()
+ if next_collection:
+ request.view_parameters.collection_id = next_collection.id
+ else:
+ request.view_parameters.collection_id = None
+ request.view_parameters.to_session( request )
+
+ redirect_url = reverse('home')
+ return redirect( redirect_url )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class CollectionDetailsView( View ):
+
+ def get( self, request, *args, **kwargs ):
+ collection_id = kwargs.get( 'collection_id' )
+ if not collection_id:
+ return bad_request_response( request, message = 'Missing collection id in request.' )
+ try:
+ collection = Collection.objects.get( id = collection_id )
+ except Collection.DoesNotExist:
+ return page_not_found_response( request, message = f'No collection with id "{collection_id}".' )
+
+ location_view = request.view_parameters.location_view
+
+ svg_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 )
+
+ context = {
+ 'collection': collection,
+ 'svg_position_form': svg_position_form,
+ }
+ template = get_template( 'collection/edit/panes/collection_details.html' )
+ content = template.render( context, request = request )
+ return antinode.response(
+ insert_map = {
+ DIVID['EDIT_ITEM']: content,
+ },
+ )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class CollectionAddRemoveItemView( View ):
+
+ def get(self, request, *args, **kwargs):
+ collection = request.view_parameters.collection
+
+ entity_collection_group_list = CollectionEditHelpers.create_entity_collection_group_list(
+ collection = collection,
+ )
+
+ context = {
+ 'entity_collection_group_list': entity_collection_group_list,
+ }
+ template = get_template( 'collection/edit/panes/collection_add_remove_item.html' )
+ content = template.render( context, request = request )
+ return antinode.response(
+ insert_map = {
+ DIVID['EDIT_ITEM']: content,
+ },
+ )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class CollectionEntityToggleView( View ):
+
+ def post(self, request, *args, **kwargs):
+
+ collection_id = kwargs.get('collection_id')
+ entity_id = kwargs.get('entity_id')
+
+ entity = Entity.objects.get( id = entity_id )
+ collection = Collection.objects.get( id = collection_id )
+ exists_in_collection = CollectionEditHelpers.toggle_entity_in_collection(
+ entity = entity,
+ collection = collection,
+ )
+
+ context = {
+ 'collection': collection,
+ 'entity': entity,
+ 'exists_in_collection': exists_in_collection,
+ }
+ template = get_template( 'collection/edit/panes/collection_entity_toggle.html' )
+ main_content = template.render( context, request = request )
+
+ collection_data = CollectionManager().get_collection_data(
+ collection = collection,
+ )
+ context = {
+ 'collection_data': collection_data,
+ }
+ template = get_template( 'collection/collection_view.html' )
+ collection_content = template.render( context, request = request )
+
+ return antinode.response(
+ main_content = main_content,
+ insert_map = {
+ DIVID['MAIN'] : collection_content,
+ },
+ )
+
+
+
+
diff --git a/src/hi/apps/collection/helpers.py b/src/hi/apps/collection/helpers.py
new file mode 100644
index 00000000..f28ea9ca
--- /dev/null
+++ b/src/hi/apps/collection/helpers.py
@@ -0,0 +1,28 @@
+from hi.apps.location.models import Location
+
+from .models import Collection, CollectionPosition
+
+
+class CollectionHelpers:
+
+ @classmethod
+ def get_collection_position( cls,
+ collection_id : int,
+ location : Location ) -> CollectionPosition:
+ try:
+ collection = Collection.objects.get( id = collection_id )
+ except Collection.DoesNotExist:
+ return None
+
+ collection_position = CollectionPosition.objects.filter(
+ collection = collection,
+ location = location,
+ ).first()
+ if collection_position:
+ return collection_position
+
+ return CollectionPosition(
+ collection = collection,
+ location = location,
+ )
+
diff --git a/src/hi/apps/collection/templates/collection/collection_buttons.html b/src/hi/apps/collection/templates/collection/collection_buttons.html
index a72238ad..83988e87 100644
--- a/src/hi/apps/collection/templates/collection/collection_buttons.html
+++ b/src/hi/apps/collection/templates/collection/collection_buttons.html
@@ -9,7 +9,7 @@
{% endfor %}
{% if request.is_editing %}
<div class="col-1">
- <a href="{% url 'edit_add_collection' %}"
+ <a href="{% url 'collection_edit_collection_add' %}"
class="btn btn-success btn-control" role="button"
data-async="modal" >
ADD
diff --git a/src/hi/apps/edit/templates/edit/modals/add_collection.html b/src/hi/apps/collection/templates/collection/edit/modals/collection_add.html
similarity index 87%
rename from src/hi/apps/edit/templates/edit/modals/add_collection.html
rename to src/hi/apps/collection/templates/collection/edit/modals/collection_add.html
index 5b615f77..b0199133 100644
--- a/src/hi/apps/edit/templates/edit/modals/add_collection.html
+++ b/src/hi/apps/collection/templates/collection/edit/modals/collection_add.html
@@ -1,7 +1,7 @@
{% extends "modals/action_with_cancel.html" %}
{% block preamble %}
-<form action="{% url 'edit_add_collection' %}" method="post"
+<form action="{% url 'collection_edit_collection_add' %}" method="post"
class="form" data-async="modal">
{% csrf_token %}
{% endblock %}
diff --git a/src/hi/apps/edit/templates/edit/modals/delete_collection_confirm.html b/src/hi/apps/collection/templates/collection/edit/modals/collection_delete.html
similarity index 87%
rename from src/hi/apps/edit/templates/edit/modals/delete_collection_confirm.html
rename to src/hi/apps/collection/templates/collection/edit/modals/collection_delete.html
index b3fcd94b..629d1cb2 100644
--- a/src/hi/apps/edit/templates/edit/modals/delete_collection_confirm.html
+++ b/src/hi/apps/collection/templates/collection/edit/modals/collection_delete.html
@@ -18,7 +18,7 @@ Delete Collection?
{% endblock %}
{% block action_right %}
-<form action="{% url 'edit_delete_collection' %}" method="post" class="form"
+<form action="{% url 'collection_edit_collection_delete' %}" method="post" class="form"
data-async="true" >
{% csrf_token %}
<input type="hidden" name="collection_id" value="{{ collection.id }}" />
diff --git a/src/hi/apps/edit/templates/edit/panes/add_remove_collection.html b/src/hi/apps/collection/templates/collection/edit/panes/collection_add_remove_item.html
similarity index 60%
rename from src/hi/apps/edit/templates/edit/panes/add_remove_collection.html
rename to src/hi/apps/collection/templates/collection/edit/panes/collection_add_remove_item.html
index 6c900ed4..a4d70b5a 100644
--- a/src/hi/apps/edit/templates/edit/panes/add_remove_collection.html
+++ b/src/hi/apps/collection/templates/collection/edit/panes/collection_add_remove_item.html
@@ -4,7 +4,7 @@
<div class="">
<div class="">{{ entity_collection_group.entity_type.label }}</div>
{% for entity_collection_item in entity_collection_group.item_list %}
- {% include "edit/panes/entity_toggle_collection.html" with collection=entity_collection_group.collection entity=entity_collection_item.entity exists_in_collection=entity_collection_item.exists_in_collection %}
+ {% include "collection/edit/panes/collection_entity_toggle.html" with collection=entity_collection_group.collection entity=entity_collection_item.entity exists_in_collection=entity_collection_item.exists_in_collection %}
{% endfor %}
</div>
{% empty %}
diff --git a/src/hi/apps/edit/templates/edit/panes/details_collection.html b/src/hi/apps/collection/templates/collection/edit/panes/collection_details.html
similarity index 100%
rename from src/hi/apps/edit/templates/edit/panes/details_collection.html
rename to src/hi/apps/collection/templates/collection/edit/panes/collection_details.html
diff --git a/src/hi/apps/edit/templates/edit/panes/entity_toggle_collection.html b/src/hi/apps/collection/templates/collection/edit/panes/collection_entity_toggle.html
similarity index 83%
rename from src/hi/apps/edit/templates/edit/panes/entity_toggle_collection.html
rename to src/hi/apps/collection/templates/collection/edit/panes/collection_entity_toggle.html
index 8a4460ac..70bd1676 100644
--- a/src/hi/apps/edit/templates/edit/panes/entity_toggle_collection.html
+++ b/src/hi/apps/collection/templates/collection/edit/panes/collection_entity_toggle.html
@@ -2,7 +2,7 @@
class="d-flex justify-content-start">
<div class="">
<form method="POST" role="form"
- action="{% url 'edit_entity_toggle_collection' collection_id=collection.id entity_id=entity.id %}"
+ action="{% url 'collection_edit_collection_entity_toggle' collection_id=collection.id entity_id=entity.id %}"
data-async="#hi-entity-toggle-collection-{{ entity.id }}" data-mode="replace" >
{% csrf_token %}
<input type="checkbox" id="entity-toggle-collection-checkbox-{{ entity.id }}" name="checkbox_state"
diff --git a/src/hi/apps/collection/urls.py b/src/hi/apps/collection/urls.py
index 678c204a..b55ed460 100644
--- a/src/hi/apps/collection/urls.py
+++ b/src/hi/apps/collection/urls.py
@@ -1,4 +1,4 @@
-from django.urls import re_path
+from django.urls import include, re_path
from . import views
@@ -12,4 +12,6 @@ urlpatterns = [
re_path( r'^view$',
views.CollectionViewDefaultView.as_view(),
name='collection_view_default'),
+
+ re_path( r'^edit/', include('hi.apps.collection.edit.urls' )),
]
diff --git a/src/hi/apps/edit/urls.py b/src/hi/apps/edit/urls.py
index bfba9d57..0ca9c1dc 100644
--- a/src/hi/apps/edit/urls.py
+++ b/src/hi/apps/edit/urls.py
@@ -17,22 +17,6 @@ urlpatterns = [
views.EditDeleteView.as_view(),
name='edit_delete' ),
- re_path( r'^location-view/add$',
- views.AddLocationViewView.as_view(),
- name='edit_add_location_view' ),
-
- re_path( r'^collection/add$',
- views.AddCollectionView.as_view(),
- name='edit_add_collection' ),
-
- re_path( r'^location-view/delete$',
- views.DeleteLocationViewView.as_view(),
- name='edit_delete_location_view' ),
-
- re_path( r'^collection/delete$',
- views.DeleteCollectionView.as_view(),
- name='edit_delete_collection' ),
-
re_path( r'^details/(?P<html_id>[\w\-]*)$',
views.EditDetailsView.as_view(),
name='edit_details' ),
@@ -45,16 +29,4 @@ urlpatterns = [
views.AddRemoveView.as_view(),
name='edit_add_remove' ),
- re_path( r'^location-view/entity/toggle/(?P<location_view_id>[\w\-]+)/(?P<entity_id>[\w\-]+)$',
- views.EntityToggleLocationView.as_view(),
- name='edit_entity_toggle_location' ),
-
- re_path( r'^location-view/collection/toggle/(?P<location_view_id>[\w\-]+)/(?P<collection_id>[\w\-]+)$',
- views.CollectionToggleLocationView.as_view(),
- name='edit_collection_toggle_location' ),
-
- re_path( r'^collection/entity/toggle/(?P<collection_id>[\w\-]+)/(?P<entity_id>[\w\-]+)$',
- views.EntityToggleCollectionView.as_view(),
- name='edit_entity_toggle_collection' ),
-
]
diff --git a/src/hi/apps/edit/views.py b/src/hi/apps/edit/views.py
index 86924619..815d7ab3 100644
--- a/src/hi/apps/edit/views.py
+++ b/src/hi/apps/edit/views.py
@@ -1,4 +1,3 @@
-from decimal import Decimal
import logging
import re
from typing import Dict
@@ -11,25 +10,22 @@ from django.utils.decorators import method_decorator
from django.views.generic import View
import hi.apps.common.antinode as antinode
-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, EntityPosition
-from hi.apps.location.enums import LocationViewType
+import hi.apps.collection.edit.views as collection_edit_views
+from hi.apps.collection.helpers import CollectionHelpers
+from hi.apps.collection.models import Collection
+import hi.apps.entity.edit.views as entity_edit_views
+from hi.apps.entity.helpers import EntityHelpers
+from hi.apps.entity.models import Entity
+import hi.apps.location.edit.views as location_edit_views
from hi.apps.location.forms import SvgPositionForm
from hi.apps.location.location_view_manager import LocationViewManager
-from hi.apps.location.models import Location, LocationView
+from hi.apps.location.models import LocationView
from hi.decorators import edit_required
-from hi.enums import ViewType
from hi.views import bad_request_response
from hi.constants import DIVID
from hi.enums import ViewMode
-from . import forms
-from .helpers_location_view import LocationViewEditHelpers
-from .helpers_collection import CollectionEditHelpers
-
logger = logging.getLogger(__name__)
@@ -38,7 +34,7 @@ class EditViewMixin:
def parse_html_id( self, html_id : str ):
m = re.match( r'^hi-(\w+)-(\d+)$', html_id )
if not m:
- raise NotImplementedError( 'Not yet handling bad edit details html id' )
+ raise ValueError( 'Bad html id "{html_id}".' )
return ( m.group(1), int(m.group(2)) )
def get_edit_side_panel_response( self,
@@ -55,30 +51,6 @@ class EditViewMixin:
return antinode.response(
insert_map = insert_map,
)
-
- def render_location_view_content( self,
- request : HttpRequest,
- location_view : LocationView ) -> str:
- location_view_data = LocationViewManager().get_location_view_data(
- location_view = location_view,
- )
- context = {
- 'location_view_data': location_view_data,
- }
- template = get_template( 'location/location_view.html' )
- return template.render( context, request = request )
-
- def render_collection_content( self,
- request : HttpRequest,
- collection : Collection ) -> str:
- collection_data = CollectionManager().get_collection_data(
- collection = collection,
- )
- context = {
- 'collection_data': collection_data,
- }
- template = get_template( 'collection/collection_view.html' )
- return template.render( context, request = request )
class EditStartView( View ):
@@ -90,7 +62,7 @@ class EditStartView( View ):
# state mode.
if request.view_parameters.view_mode.is_editing:
- raise NotImplementedError( 'Not yet handling bad edit context' )
+ return bad_request_response( request, message = 'Edit mode already started.' )
request.view_parameters.view_mode = ViewMode.EDIT
request.view_parameters.to_session( request )
@@ -125,223 +97,16 @@ class EditDeleteView( View ):
def get(self, request, *args, **kwargs):
if request.view_parameters.view_type.is_location_view:
- return self.get_location_view_confirm_response( request )
+ return location_edit_views.LocationViewDeleteView().get( request, *args, **kwargs )
if request.view_parameters.view_type.is_collection:
- return self.get_collection_confirm_response( request )
+ return collection_edit_views.CollectionDeleteView().get( request, *args, **kwargs )
else:
return bad_request_response( request,
message = f'Bad view type "{request.view_parameters.view_type}".' )
-
- def get_location_view_confirm_response( self, request ):
- location_view_id = request.view_parameters.location_view_id
- try:
- location_view = LocationView.objects.select_related(
- 'location' ).get( id = location_view_id )
- except LocationView.DoesNotExist:
- message = f'Location view "{location_view_id}" does not exist.'
- logger.warning( message )
- return bad_request_response( request, message = message )
-
- context = {
- 'location_view': location_view,
- }
- return antinode.modal_from_template(
- request = request,
- template_name = 'edit/modals/delete_location_view_confirm.html',
- context = context,
- )
-
- def get_collection_confirm_response( self, request ):
- collection_id = request.view_parameters.collection_id
- try:
- collection = Collection.objects.get( id = collection_id )
- except Collection.DoesNotExist:
- message = f'Collection "{collection_id}" does not exist.'
- logger.warning( message )
- return bad_request_response( request, message = message )
-
- context = {
- 'collection': collection,
- }
- return antinode.modal_from_template(
- request = request,
- template_name = 'edit/modals/delete_collection_confirm.html',
- context = context,
- )
-
-
-@method_decorator( edit_required, name='dispatch' )
-class AddLocationViewView( View ):
-
- def get( self, request, *args, **kwargs ):
- context = {
- 'name_form': forms.NameForm(),
- }
- return antinode.modal_from_template(
- request = request,
- template_name = 'edit/modals/add_location_view.html',
- context = context,
- )
-
- def post( self, request, *args, **kwargs ):
- name_form = forms.NameForm( request.POST )
- if not name_form.is_valid():
- context = {
- 'name_form': name_form,
- }
- return antinode.modal_from_template(
- request = request,
- template_name = 'edit/modals/add_location_view.html',
- context = context,
- )
-
-
-
- # Move to helper class
- # Extend NameForm to add type dropdown
-
-
-
- location = self.get_location_for_new_location_view( request )
- if not location:
- return bad_request_response( request, message = 'No locations defined.' )
-
- last_location_view = location.views.order_by( '-order_id' ).first()
-
- location_view = LocationView.objects.create(
- location = location,
- location_view_type_str = LocationViewType.default(),
- name = name_form.cleaned_data.get('name'),
- svg_view_box_str = str( location.svg_view_box ),
- svg_rotate = Decimal( 0.0 ),
- order_id = last_location_view.order_id + 1,
- )
-
- request.view_parameters.view_type = ViewType.LOCATION_VIEW
- request.view_parameters.location_view_id = location_view.id
- request.view_parameters.to_session( request )
-
- redirect_url = reverse('home')
- return redirect( redirect_url )
-
- def get_location_for_new_location_view( self, request : HttpRequest ) -> Location:
- if request.view_parameters.location_view:
- return request.view_parameters.location_view.location
- return Location.objects.order_by( 'order_id' ).first()
-@method_decorator( edit_required, name='dispatch' )
-class AddCollectionView( View ):
-
- def get( self, request, *args, **kwargs ):
- context = {
- 'name_form': forms.NameForm(),
- }
- return antinode.modal_from_template(
- request = request,
- template_name = 'edit/modals/add_collection.html',
- context = context,
- )
-
- def post( self, request, *args, **kwargs ):
- name_form = forms.NameForm( request.POST )
- if not name_form.is_valid():
- context = {
- 'name_form': name_form,
- }
- return antinode.modal_from_template(
- request = request,
- template_name = 'edit/modals/add_location_view.html',
- context = context,
- )
-
- # Move to helper class
- # Extend NameForm to add type dropdown
-
-
-
- last_collection = Collection.objects.all().order_by( '-order_id' ).first()
-
- collection = Collection.objects.create(
- name = name_form.cleaned_data.get('name'),
- collection_type_str = CollectionType.default(),
- order_id = last_collection.order_id + 1,
- )
-
- request.view_parameters.view_type = ViewType.COLLECTION
- request.view_parameters.collection_id = collection.id
- request.view_parameters.to_session( request )
-
- redirect_url = reverse('home')
- return redirect( redirect_url )
-
-
-@method_decorator( edit_required, name='dispatch' )
-class DeleteLocationViewView( View ):
-
- def post( self, request, *args, **kwargs ):
- action = request.POST.get( 'action' )
- if action != 'confirm':
- return bad_request_response( request, message = 'Missing confirmation value.' )
-
- location_view_id = request.POST.get( 'location_view_id' )
- if not location_view_id:
- return bad_request_response( request, message = 'Missing location view id.' )
-
- try:
- location_view = LocationView.objects.select_related(
- 'location' ).get( id = location_view_id )
- except LocationView.DoesNotExist:
- message = f'Location view "{location_view_id}" does not exist.'
- logger.warning( message )
- return bad_request_response( request, message = message )
-
- location_view.delete()
-
- next_location_view = LocationView.objects.all().order_by( 'order_id' ).first()
- if next_location_view:
- request.view_parameters.location_view_id = next_location_view.id
- else:
- request.view_parameters.location_view_id = None
- request.view_parameters.to_session( request )
-
- redirect_url = reverse('home')
- return redirect( redirect_url )
-
-
-@method_decorator( edit_required, name='dispatch' )
-class DeleteCollectionView( View ):
-
- def post( self, request, *args, **kwargs ):
- action = request.POST.get( 'action' )
- if action != 'confirm':
- return bad_request_response( request, message = 'Missing confirmation value.' )
-
- collection_id = request.POST.get( 'collection_id' )
- if not collection_id:
- return bad_request_response( request, message = 'Missing collection id.' )
- try:
- collection = Collection.objects.get( id = collection_id )
- except Collection.DoesNotExist:
- message = f'Collection "{collection_id}" does not exist.'
- logger.warning( message )
- return bad_request_response( request, message = message )
-
- collection.delete()
-
- next_collection = Collection.objects.all().order_by( 'order_id' ).first()
- if next_collection:
- request.view_parameters.collection_id = next_collection.id
- else:
- request.view_parameters.collection_id = None
- request.view_parameters.to_session( request )
-
- redirect_url = reverse('home')
- return redirect( redirect_url )
-
-
@method_decorator( edit_required, name='dispatch' )
class EditDetailsView( View, EditViewMixin ):
@@ -354,70 +119,24 @@ class EditDetailsView( View, EditViewMixin ):
( item_type, item_id ) = self.parse_html_id( kwargs.get('html_id'))
if item_type == 'entity':
- return self.get_entity_details( request, entity_id = item_id )
+ return entity_edit_views.EntityDetailsView().get(
+ request = request,
+ entity_id = item_id,
+ )
+
if item_type == 'collection':
- return self.get_collection_details( request, collection_id = item_id )
- raise NotImplementedError( 'Not yet handling unknown edit detail type.' )
+ 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 ):
return self.get_edit_side_panel_response(
request = request,
template_name = 'edit/panes/default.html',
)
-
- def get_entity_details( self, request, entity_id : int ):
- try:
- entity = Entity.objects.get( id = entity_id )
- except Entity.DoesNotExist:
- raise NotImplementedError( 'Handling bad entity Id not yet implemented' )
-
- location_view = request.view_parameters.location_view
-
- svg_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 )
-
- context = {
- 'entity': entity,
- 'svg_position_form': svg_position_form,
- }
- return self.get_edit_side_panel_response(
- request = request,
- template_name = 'edit/panes/details_entity.html',
- context = context,
- )
-
- def get_collection_details( self, request, collection_id : int ):
- try:
- collection = Collection.objects.get( id = collection_id )
- except Collection.DoesNotExist:
- raise NotImplementedError( 'Handling bad collection Id not yet implemented' )
-
- location_view = request.view_parameters.location_view
-
- svg_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 )
-
- context = {
- 'collection': collection,
- 'svg_position_form': svg_position_form,
- }
- return self.get_edit_side_panel_response(
- request = request,
- template_name = 'edit/panes/details_collection.html',
- context = context,
- )
@method_decorator( edit_required, name='dispatch' )
@@ -429,12 +148,12 @@ class EditSvgPositionView( View, EditViewMixin ):
location_view = request.view_parameters.location_view
if item_type == 'entity':
- svg_position_model = self.get_entity_position(
+ svg_position_model = EntityHelpers.get_entity_position(
entity_id = item_id,
location = location_view.location,
)
elif item_type == 'collection':
- svg_position_model = self.get_collection_position(
+ svg_position_model = CollectionHelpers.get_collection_position(
collection_id = item_id,
location = location_view.location,
)
@@ -469,56 +188,17 @@ class EditSvgPositionView( View, EditViewMixin ):
set_attributes_map = set_attributes_map,
)
- def get_entity_position( self,
- entity_id : int,
- location : Location ):
- try:
- entity = Entity.objects.get( id = entity_id )
- except Entity.DoesNotExist:
- raise NotImplementedError( 'Handling bad entity Id not yet implemented' )
-
- entity_position = EntityPosition.objects.filter(
- entity = entity,
- location = location,
- ).first()
- if entity_position:
- return entity_position
- return EntityPosition(
- entity = entity,
- location = location,
- )
-
- def get_collection_position( self,
- collection_id : int,
- location : Location ):
- try:
- collection = Collection.objects.get( id = collection_id )
- except Collection.DoesNotExist:
- raise NotImplementedError( 'Handling bad collection Id not yet implemented' )
-
- collection_position = CollectionPosition.objects.filter(
- collection = collection,
- location = location,
- ).first()
- if collection_position:
- return collection_position
-
- return CollectionPosition(
- collection = collection,
- location = location,
- )
-
@method_decorator( edit_required, name='dispatch' )
class AddRemoveView( View, EditViewMixin ):
- def get(self, request, *args, **kwargs):
+ def get( self, request, *args, **kwargs ):
if request.view_parameters.view_type.is_location_view:
- return self.get_location_add_remove_response( request = request )
+ return location_edit_views.LocationViewAddRemoveItemView().get( request, *args, **kwargs )
if request.view_parameters.view_type.is_collection:
- return self.get_collection_add_remove_response( request = request )
+ return collection_edit_views.CollectionAddRemoveItemView().get( request, *args, **kwargs )
context = {
}
@@ -527,150 +207,5 @@ class AddRemoveView( View, EditViewMixin ):
template_name = 'edit/panes/default.html',
context = context,
)
-
- def get_location_add_remove_response( self, request ):
-
- location_view = request.view_parameters.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,
- 'collection_view_group': collection_view_group,
- }
- return self.get_edit_side_panel_response(
- request = request,
- template_name = 'edit/panes/add_remove_location.html',
- context = context,
- )
-
- def get_collection_add_remove_response( self, request ):
-
- collection = request.view_parameters.collection
-
- entity_collection_group_list = CollectionEditHelpers.create_entity_collection_group_list(
- collection = collection,
- )
-
- context = {
- 'entity_collection_group_list': entity_collection_group_list,
- }
- return self.get_edit_side_panel_response(
- request = request,
- template_name = 'edit/panes/add_remove_collection.html',
- context = context,
- )
-
-
-@method_decorator( edit_required, name='dispatch' )
-class EntityToggleLocationView( View, EditViewMixin ):
-
- def post(self, request, *args, **kwargs):
-
- location_view_id = kwargs.get('location_view_id')
- entity_id = kwargs.get('entity_id')
-
- entity = Entity.objects.get( id = entity_id )
- location_view = LocationView.objects.get( id = location_view_id )
- exists_in_view = LocationViewEditHelpers.toggle_entity_in_view(
- entity = entity,
- location_view = location_view,
- )
-
- context = {
- 'location_view': location_view,
- 'entity': entity,
- 'exists_in_view': exists_in_view,
- }
- template = get_template( 'edit/panes/entity_toggle_location.html' )
- main_content = template.render( context, request = request )
-
- location_view_content = self.render_location_view_content(
- request = request,
- location_view = location_view,
- )
- return antinode.response(
- main_content = main_content,
- insert_map = {
- DIVID['MAIN'] : location_view_content,
- },
- )
-
-@method_decorator( edit_required, name='dispatch' )
-class CollectionToggleLocationView( View, EditViewMixin ):
- def post(self, request, *args, **kwargs):
-
- location_view_id = kwargs.get('location_view_id')
- collection_id = kwargs.get('collection_id')
-
- collection = Collection.objects.get( id = collection_id )
- location_view = LocationView.objects.get( id = location_view_id )
- exists_in_view = LocationViewEditHelpers.toggle_collection_in_view(
- collection = collection,
- location_view = location_view,
- add_position_if_needed = True,
- )
-
- context = {
- 'location_view': location_view,
- 'collection': collection,
- 'exists_in_view': exists_in_view,
- }
- template = get_template( 'edit/panes/collection_toggle_location.html' )
- main_content = template.render( context, request = request )
-
- location_view_content = self.render_location_view_content(
- request = request,
- location_view = location_view,
- )
- return antinode.response(
- main_content = main_content,
- insert_map = {
- DIVID['MAIN'] : location_view_content,
- },
- )
-
-
-@method_decorator( edit_required, name='dispatch' )
-class EntityToggleCollectionView( View, EditViewMixin ):
-
- def post(self, request, *args, **kwargs):
-
- collection_id = kwargs.get('collection_id')
- entity_id = kwargs.get('entity_id')
-
- entity = Entity.objects.get( id = entity_id )
- collection = Collection.objects.get( id = collection_id )
- exists_in_collection = CollectionEditHelpers.toggle_entity_in_collection(
- entity = entity,
- collection = collection,
- )
-
- context = {
- 'collection': collection,
- 'entity': entity,
- 'exists_in_collection': exists_in_collection,
- }
- template = get_template( 'edit/panes/entity_toggle_collection.html' )
- main_content = template.render( context, request = request )
-
- collection_content = self.render_collection_content(
- request = request,
- collection = collection,
- )
- return antinode.response(
- main_content = main_content,
- insert_map = {
- DIVID['MAIN'] : collection_content,
- },
- )
-
-
-
diff --git a/src/hi/apps/entity/edit/__init__.py b/src/hi/apps/entity/edit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/hi/apps/entity/edit/urls.py b/src/hi/apps/entity/edit/urls.py
new file mode 100644
index 00000000..816c071d
--- /dev/null
+++ b/src/hi/apps/entity/edit/urls.py
@@ -0,0 +1,12 @@
+from django.urls import re_path
+
+from . import views
+
+
+urlpatterns = [
+
+ re_path( r'^entity/details/(?P<entity_id>\d+)$',
+ views.EntityDetailsView.as_view(),
+ name='entity_edit_entity_details' ),
+
+]
diff --git a/src/hi/apps/entity/edit/views.py b/src/hi/apps/entity/edit/views.py
new file mode 100644
index 00000000..1f086bf8
--- /dev/null
+++ b/src/hi/apps/entity/edit/views.py
@@ -0,0 +1,52 @@
+import logging
+
+from django.template.loader import get_template
+from django.utils.decorators import method_decorator
+from django.views.generic import View
+
+import hi.apps.common.antinode as antinode
+from hi.apps.entity.models import Entity, EntityPosition
+from hi.apps.location.forms import SvgPositionForm
+
+from hi.constants import DIVID
+from hi.decorators import edit_required
+from hi.views import bad_request_response, page_not_found_response
+
+
+logger = logging.getLogger(__name__)
+
+
+@method_decorator( edit_required, name='dispatch' )
+class EntityDetailsView( View ):
+
+ def get( self, request, *args, **kwargs ):
+ entity_id = kwargs.get( 'entity_id' )
+ if not entity_id:
+ return bad_request_response( request, message = 'Missing entity id in request.' )
+ try:
+ entity = Entity.objects.get( id = entity_id )
+ except Entity.DoesNotExist:
+ return page_not_found_response( request, message = f'No entity with id "{entity_id}".' )
+
+ location_view = request.view_parameters.location_view
+
+ svg_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 )
+
+ context = {
+ 'entity': entity,
+ 'svg_position_form': svg_position_form,
+ }
+ template = get_template( 'edit/panes/entity_details.html' )
+ content = template.render( context, request = request )
+ return antinode.response(
+ insert_map = {
+ DIVID['EDIT_ITEM']: content,
+ },
+ )
diff --git a/src/hi/apps/entity/helpers.py b/src/hi/apps/entity/helpers.py
new file mode 100644
index 00000000..531a133b
--- /dev/null
+++ b/src/hi/apps/entity/helpers.py
@@ -0,0 +1,26 @@
+from hi.apps.location.models import Location
+
+from .models import Entity, EntityPosition
+
+
+class EntityHelpers:
+
+ @classmethod
+ def get_entity_position( cls,
+ entity_id : int,
+ location : Location ) -> EntityPosition:
+ try:
+ entity = Entity.objects.get( id = entity_id )
+ except Entity.DoesNotExist:
+ return None
+
+ entity_position = EntityPosition.objects.filter(
+ entity = entity,
+ location = location,
+ ).first()
+ if entity_position:
+ return entity_position
+ return EntityPosition(
+ entity = entity,
+ location = location,
+ )
diff --git a/src/hi/apps/edit/templates/edit/panes/details_entity.html b/src/hi/apps/entity/templates/entity/edit/panes/entity_details.html
similarity index 100%
rename from src/hi/apps/edit/templates/edit/panes/details_entity.html
rename to src/hi/apps/entity/templates/entity/edit/panes/entity_details.html
diff --git a/src/hi/apps/entity/urls.py b/src/hi/apps/entity/urls.py
new file mode 100644
index 00000000..5c97928c
--- /dev/null
+++ b/src/hi/apps/entity/urls.py
@@ -0,0 +1,8 @@
+from django.urls import include, re_path
+
+
+urlpatterns = [
+
+ re_path( r'^edit/', include('hi.apps.entity.edit.urls' )),
+
+]
diff --git a/src/hi/apps/location/edit/__init__.py b/src/hi/apps/location/edit/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/src/hi/apps/edit/helpers_location_view.py b/src/hi/apps/location/edit/helpers.py
similarity index 99%
rename from src/hi/apps/edit/helpers_location_view.py
rename to src/hi/apps/location/edit/helpers.py
index e2949eba..bc083bf4 100644
--- a/src/hi/apps/edit/helpers_location_view.py
+++ b/src/hi/apps/location/edit/helpers.py
@@ -24,7 +24,7 @@ from .transient_models import (
)
-class LocationViewEditHelpers:
+class LocationEditHelpers:
@classmethod
def create_entity_view_group_list( cls, location_view : LocationView ) -> List[EntityViewGroup]:
diff --git a/src/hi/apps/edit/transient_models.py b/src/hi/apps/location/edit/transient_models.py
similarity index 72%
rename from src/hi/apps/edit/transient_models.py
rename to src/hi/apps/location/edit/transient_models.py
index 9608135b..3b4e9d16 100644
--- a/src/hi/apps/edit/transient_models.py
+++ b/src/hi/apps/location/edit/transient_models.py
@@ -34,19 +34,3 @@ class CollectionViewGroup:
location_view : LocationView
item_list : List[CollectionViewItem] = field( default_factory = list )
-
-
-@dataclass
-class EntityCollectionItem:
-
- entity : Entity
- exists_in_collection : bool
-
-
-@dataclass
-class EntityCollectionGroup:
-
- collection : Collection
- entity_type : EntityType
- item_list : List[EntityViewItem] = field( default_factory = list )
-
diff --git a/src/hi/apps/location/edit/urls.py b/src/hi/apps/location/edit/urls.py
new file mode 100644
index 00000000..9da8e39d
--- /dev/null
+++ b/src/hi/apps/location/edit/urls.py
@@ -0,0 +1,27 @@
+from django.urls import re_path
+
+from . import views
+
+
+urlpatterns = [
+
+ re_path( r'^location-view/add$',
+ views.LocationViewAddView.as_view(),
+ name='location_edit_location_view_add' ),
+
+ re_path( r'^location-view/delete$',
+ views.LocationViewDeleteView.as_view(),
+ name='location_edit_location_view_delete' ),
+
+ re_path( r'^location-view/add-remove-item$',
+ views.LocationViewAddRemoveItemView.as_view(),
+ name='location_edit_location_view_add_remove_item' ),
+
+ re_path( r'^location-view/entity/toggle/(?P<location_view_id>[\w\-]+)/(?P<entity_id>[\w\-]+)$',
+ views.LocationViewEntityToggleView.as_view(),
+ name='location_edit_location_view_entity_toggle' ),
+
+ re_path( r'^location-view/collection/toggle/(?P<location_view_id>[\w\-]+)/(?P<collection_id>[\w\-]+)$',
+ views.LocationViewEntityToggleCollectionView.as_view(),
+ name='location_edit_location_view_collection_toggle' ),
+]
diff --git a/src/hi/apps/location/edit/views.py b/src/hi/apps/location/edit/views.py
new file mode 100644
index 00000000..1cb1562d
--- /dev/null
+++ b/src/hi/apps/location/edit/views.py
@@ -0,0 +1,253 @@
+from decimal import Decimal
+import logging
+
+from django.http import HttpRequest
+from django.shortcuts import redirect
+from django.template.loader import get_template
+from django.urls import reverse
+from django.utils.decorators import method_decorator
+from django.views.generic import View
+
+from hi.apps.collection.models import Collection
+import hi.apps.common.antinode as antinode
+from hi.apps.edit.forms import NameForm
+from hi.apps.entity.models import Entity
+from hi.apps.location.enums import LocationViewType
+from hi.apps.location.location_view_manager import LocationViewManager
+from hi.apps.location.models import Location, LocationView
+from hi.decorators import edit_required
+from hi.enums import ViewType
+from hi.views import bad_request_response
+
+from hi.constants import DIVID
+
+from .helpers import LocationEditHelpers
+
+
+logger = logging.getLogger(__name__)
+
+
+@method_decorator( edit_required, name='dispatch' )
+class LocationViewAddView( View ):
+
+ def get( self, request, *args, **kwargs ):
+ context = {
+ 'name_form': NameForm(),
+ }
+ return antinode.modal_from_template(
+ request = request,
+ template_name = 'location/edit/modals/location_view_add.html',
+ context = context,
+ )
+
+ def post( self, request, *args, **kwargs ):
+ name_form = NameForm( request.POST )
+ if not name_form.is_valid():
+ context = {
+ 'name_form': name_form,
+ }
+ return antinode.modal_from_template(
+ request = request,
+ template_name = 'location/edit/modals/location_view_add.html',
+ context = context,
+ )
+
+
+
+
+ # Move to helper class
+ # Extend NameForm to add type dropdown
+
+
+
+ location = self.get_location_for_new_location_view( request )
+ if not location:
+ return bad_request_response( request, message = 'No locations defined.' )
+
+ last_location_view = location.views.order_by( '-order_id' ).first()
+
+ location_view = LocationView.objects.create(
+ location = location,
+ location_view_type_str = LocationViewType.default(),
+ name = name_form.cleaned_data.get('name'),
+ svg_view_box_str = str( location.svg_view_box ),
+ svg_rotate = Decimal( 0.0 ),
+ order_id = last_location_view.order_id + 1,
+ )
+
+ request.view_parameters.view_type = ViewType.LOCATION_VIEW
+ request.view_parameters.location_view_id = location_view.id
+ request.view_parameters.to_session( request )
+
+ redirect_url = reverse('home')
+ return redirect( redirect_url )
+
+ def get_location_for_new_location_view( self, request : HttpRequest ) -> Location:
+ if request.view_parameters.location_view:
+ return request.view_parameters.location_view.location
+ return Location.objects.order_by( 'order_id' ).first()
+
+
+@method_decorator( edit_required, name='dispatch' )
+class LocationViewDeleteView( View ):
+
+ def get(self, request, *args, **kwargs):
+ location_view_id = request.view_parameters.location_view_id
+ if not location_view_id:
+ return bad_request_response( request, message = 'No current location view found.' )
+
+ try:
+ location_view = LocationView.objects.select_related(
+ 'location' ).get( id = location_view_id )
+ except LocationView.DoesNotExist:
+ message = f'Location view "{location_view_id}" does not exist.'
+ logger.warning( message )
+ return bad_request_response( request, message = message )
+
+ context = {
+ 'location_view': location_view,
+ }
+ return antinode.modal_from_template(
+ request = request,
+ template_name = 'location/edit/modals/location_view_delete.html',
+ context = context,
+ )
+
+ def post( self, request, *args, **kwargs ):
+ action = request.POST.get( 'action' )
+ if action != 'confirm':
+ return bad_request_response( request, message = 'Missing confirmation value.' )
+
+ location_view_id = request.POST.get( 'location_view_id' )
+ if not location_view_id:
+ return bad_request_response( request, message = 'Missing location view id.' )
+
+ try:
+ location_view = LocationView.objects.select_related(
+ 'location' ).get( id = location_view_id )
+ except LocationView.DoesNotExist:
+ message = f'Location view "{location_view_id}" does not exist.'
+ logger.warning( message )
+ return bad_request_response( request, message = message )
+
+ location_view.delete()
+
+ next_location_view = LocationView.objects.all().order_by( 'order_id' ).first()
+ if next_location_view:
+ request.view_parameters.location_view_id = next_location_view.id
+ else:
+ request.view_parameters.location_view_id = None
+ request.view_parameters.to_session( request )
+
+ redirect_url = reverse('home')
+ return redirect( redirect_url )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class LocationViewAddRemoveItemView( View ):
+
+ def get(self, request, *args, **kwargs):
+
+ location_view = request.view_parameters.location_view
+
+ entity_view_group_list = LocationEditHelpers.create_entity_view_group_list(
+ location_view = location_view,
+ )
+ collection_view_group = LocationEditHelpers.create_collection_view_group(
+ location_view = location_view,
+ )
+
+ context = {
+ 'entity_view_group_list': entity_view_group_list,
+ 'collection_view_group': collection_view_group,
+ }
+ template = get_template( 'location/edit/panes/location_view_add_remove_item.html' )
+ content = template.render( context, request = request )
+ return antinode.response(
+ insert_map = {
+ DIVID['EDIT_ITEM']: content,
+ },
+ )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class LocationViewEntityToggleView( View ):
+
+ def post( self, request, *args, **kwargs ):
+
+ location_view_id = kwargs.get('location_view_id')
+ entity_id = kwargs.get('entity_id')
+
+ entity = Entity.objects.get( id = entity_id )
+ location_view = LocationView.objects.get( id = location_view_id )
+ exists_in_view = LocationEditHelpers.toggle_entity_in_view(
+ entity = entity,
+ location_view = location_view,
+ )
+
+ context = {
+ 'location_view': location_view,
+ 'entity': entity,
+ 'exists_in_view': exists_in_view,
+ }
+ template = get_template( 'location/edit/panes/location_view_entity_toggle.html' )
+ main_content = template.render( context, request = request )
+
+ location_view_data = LocationViewManager().get_location_view_data(
+ location_view = location_view,
+ )
+ context = {
+ 'location_view_data': location_view_data,
+ }
+ template = get_template( 'location/location_view.html' )
+ location_view_content = template.render( context, request = request )
+
+ return antinode.response(
+ main_content = main_content,
+ insert_map = {
+ DIVID['MAIN'] : location_view_content,
+ },
+ )
+
+
+@method_decorator( edit_required, name='dispatch' )
+class LocationViewEntityToggleCollectionView( View ):
+
+ def post(self, request, *args, **kwargs):
+
+ location_view_id = kwargs.get('location_view_id')
+ collection_id = kwargs.get('collection_id')
+
+ collection = Collection.objects.get( id = collection_id )
+ location_view = LocationView.objects.get( id = location_view_id )
+ exists_in_view = LocationEditHelpers.toggle_collection_in_view(
+ collection = collection,
+ location_view = location_view,
+ add_position_if_needed = True,
+ )
+
+ context = {
+ 'location_view': location_view,
+ 'collection': collection,
+ 'exists_in_view': exists_in_view,
+ }
+ template = get_template( 'location/edit/panes/location_view_collection_toggle.html' )
+ main_content = template.render( context, request = request )
+
+ location_view_data = LocationViewManager().get_location_view_data(
+ location_view = location_view,
+ )
+ context = {
+ 'location_view_data': location_view_data,
+ }
+ template = get_template( 'location/location_view.html' )
+ location_view_content = template.render( context, request = request )
+
+ return antinode.response(
+ main_content = main_content,
+ insert_map = {
+ DIVID['MAIN'] : location_view_content,
+ },
+ )
+
+
diff --git a/src/hi/apps/edit/templates/edit/modals/add_location_view.html b/src/hi/apps/location/templates/location/edit/modals/location_view_add.html
similarity index 87%
rename from src/hi/apps/edit/templates/edit/modals/add_location_view.html
rename to src/hi/apps/location/templates/location/edit/modals/location_view_add.html
index 63b8e935..adafb45f 100644
--- a/src/hi/apps/edit/templates/edit/modals/add_location_view.html
+++ b/src/hi/apps/location/templates/location/edit/modals/location_view_add.html
@@ -1,7 +1,7 @@
{% extends "modals/action_with_cancel.html" %}
{% block preamble %}
-<form action="{% url 'edit_add_location_view' %}" method="post"
+<form action="{% url 'location_edit_location_view_add' %}" method="post"
class="form" data-async="modal">
{% csrf_token %}
{% endblock %}
diff --git a/src/hi/apps/edit/templates/edit/modals/delete_location_view_confirm.html b/src/hi/apps/location/templates/location/edit/modals/location_view_delete.html
similarity index 87%
rename from src/hi/apps/edit/templates/edit/modals/delete_location_view_confirm.html
rename to src/hi/apps/location/templates/location/edit/modals/location_view_delete.html
index c61e4947..1f5a0e2c 100644
--- a/src/hi/apps/edit/templates/edit/modals/delete_location_view_confirm.html
+++ b/src/hi/apps/location/templates/location/edit/modals/location_view_delete.html
@@ -17,7 +17,7 @@ Delete Location View?
{% endblock %}
{% block action_right %}
-<form action="{% url 'edit_delete_location_view' %}" method="post" class="form"
+<form action="{% url 'location_edit_location_view_delete' %}" method="post" class="form"
data-async="true" >
{% csrf_token %}
<input type="hidden" name="location_view_id" value="{{ location_view.id }}" />
diff --git a/src/hi/apps/edit/templates/edit/panes/add_remove_location.html b/src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html
similarity index 51%
rename from src/hi/apps/edit/templates/edit/panes/add_remove_location.html
rename to src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html
index c209bfa1..606d475c 100644
--- a/src/hi/apps/edit/templates/edit/panes/add_remove_location.html
+++ b/src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html
@@ -4,7 +4,7 @@
<div class="">
<div class="">{{ entity_view_group.entity_type.label }}</div>
{% for entity_view_item in entity_view_group.item_list %}
- {% include "edit/panes/entity_toggle_location.html" with location_view=entity_view_group.location_view entity=entity_view_item.entity exists_in_view=entity_view_item.exists_in_view %}
+ {% include "location/edit/panes/location_view_entity_toggle.html" with location_view=entity_view_group.location_view entity=entity_view_item.entity exists_in_view=entity_view_item.exists_in_view %}
{% endfor %}
</div>
{% empty %}
@@ -14,6 +14,6 @@
<div class="">
<div class="">Collections</div>
{% for collection_view_item in collection_view_group.item_list %}
- {% include "edit/panes/collection_toggle_location.html" with location_view=collection_view_group.location_view collection=collection_view_item.collection exists_in_view=collection_view_item.exists_in_view %}
+ {% include "location/edit/panes/location_view_collection_toggle.html" with location_view=collection_view_group.location_view collection=collection_view_item.collection exists_in_view=collection_view_item.exists_in_view %}
{% endfor %}
</div>
diff --git a/src/hi/apps/edit/templates/edit/panes/collection_toggle_location.html b/src/hi/apps/location/templates/location/edit/panes/location_view_collection_toggle.html
similarity index 81%
rename from src/hi/apps/edit/templates/edit/panes/collection_toggle_location.html
rename to src/hi/apps/location/templates/location/edit/panes/location_view_collection_toggle.html
index 299ca262..e6c74b42 100644
--- a/src/hi/apps/edit/templates/edit/panes/collection_toggle_location.html
+++ b/src/hi/apps/location/templates/location/edit/panes/location_view_collection_toggle.html
@@ -2,7 +2,7 @@
class="d-flex justify-content-start">
<div class="">
<form method="POST" role="form"
- action="{% url 'edit_collection_toggle_location' location_view_id=location_view.id collection_id=collection.id %}"
+ action="{% url 'location_edit_location_view_collection_toggle' location_view_id=location_view.id collection_id=collection.id %}"
data-async="#hi-collection-toggle-location{{ collection.id }}" data-mode="replace" >
{% csrf_token %}
<input type="checkbox" id="collection-toggle-location-checkbox-{{ collection.id }}" name="checkbox_state"
diff --git a/src/hi/apps/edit/templates/edit/panes/entity_toggle_location.html b/src/hi/apps/location/templates/location/edit/panes/location_view_entity_toggle.html
similarity index 82%
rename from src/hi/apps/edit/templates/edit/panes/entity_toggle_location.html
rename to src/hi/apps/location/templates/location/edit/panes/location_view_entity_toggle.html
index 84506146..89f3f44c 100644
--- a/src/hi/apps/edit/templates/edit/panes/entity_toggle_location.html
+++ b/src/hi/apps/location/templates/location/edit/panes/location_view_entity_toggle.html
@@ -2,7 +2,7 @@
class="d-flex justify-content-start">
<div class="">
<form method="POST" role="form"
- action="{% url 'edit_entity_toggle_location' location_view_id=location_view.id entity_id=entity.id %}"
+ action="{% url 'location_edit_location_view_entity_toggle' location_view_id=location_view.id entity_id=entity.id %}"
data-async="#hi-entity-toggle-location-{{ entity.id }}" data-mode="replace" >
{% csrf_token %}
<input type="checkbox" id="entity-toggle-location-checkbox-{{ entity.id }}" name="checkbox_state"
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 cbdf3366..d2fbdfd3 100644
--- a/src/hi/apps/location/templates/location/location_view_buttons.html
+++ b/src/hi/apps/location/templates/location/location_view_buttons.html
@@ -9,7 +9,7 @@
{% endfor %}
{% if request.is_editing %}
<div class="col-1">
- <a href="{% url 'edit_add_location_view' %}"
+ <a href="{% url 'location_edit_location_view_add' %}"
class="btn btn-success btn-control" role="button"
data-async="modal" >
ADD
diff --git a/src/hi/apps/location/urls.py b/src/hi/apps/location/urls.py
index 47923e8e..7258c292 100644
--- a/src/hi/apps/location/urls.py
+++ b/src/hi/apps/location/urls.py
@@ -1,4 +1,4 @@
-from django.urls import re_path
+from django.urls import include, re_path
from . import views
@@ -12,5 +12,7 @@ urlpatterns = [
re_path( r'^view$',
views.LocationViewDefaultView.as_view(),
name='location_view_default'),
-
+
+ re_path( r'^edit/', include('hi.apps.location.edit.urls' )),
+
]
diff --git a/src/hi/templates/pages/internal_error.html b/src/hi/templates/pages/internal_error.html
new file mode 100644
index 00000000..08f03a62
--- /dev/null
+++ b/src/hi/templates/pages/internal_error.html
@@ -0,0 +1,5 @@
+{% extends "pages/error_base.html" %}
+
+{% block title %}
+<span id="hi-edit-required-page" >Internal Error</span>
+{% endblock %}
diff --git a/src/hi/templates/pages/method_not_allowed.html b/src/hi/templates/pages/method_not_allowed.html
new file mode 100644
index 00000000..4c161efc
--- /dev/null
+++ b/src/hi/templates/pages/method_not_allowed.html
@@ -0,0 +1,5 @@
+{% extends "pages/error_base.html" %}
+
+{% block title %}
+<span id="hi-edit-required-page" >Method Not Allowed</span>
+{% endblock %}
diff --git a/src/hi/templates/pages/not_authorized.html b/src/hi/templates/pages/not_authorized.html
new file mode 100644
index 00000000..3c695f37
--- /dev/null
+++ b/src/hi/templates/pages/not_authorized.html
@@ -0,0 +1,5 @@
+{% extends "pages/error_base.html" %}
+
+{% block title %}
+<span id="hi-edit-required-page" >Not Authorized</span>
+{% endblock %}
diff --git a/src/hi/templates/pages/page_not_found.html b/src/hi/templates/pages/page_not_found.html
new file mode 100644
index 00000000..e92e7e1a
--- /dev/null
+++ b/src/hi/templates/pages/page_not_found.html
@@ -0,0 +1,5 @@
+{% extends "pages/error_base.html" %}
+
+{% block title %}
+<span id="hi-edit-required-page" >Page Not Found</span>
+{% endblock %}
diff --git a/src/hi/templates/pages/transient_error.html b/src/hi/templates/pages/transient_error.html
new file mode 100644
index 00000000..8840e99b
--- /dev/null
+++ b/src/hi/templates/pages/transient_error.html
@@ -0,0 +1,5 @@
+{% extends "pages/error_base.html" %}
+
+{% block title %}
+<span id="hi-edit-required-page" >Transient Error</span>
+{% endblock %}
diff --git a/src/hi/urls.py b/src/hi/urls.py
index 63908fb7..19d68605 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'^entity/', include('hi.apps.entity.urls' )),
re_path( r'^collection/', include('hi.apps.collection.urls' )),
# Custom error pages