Skip to content

Home Information - Your home, your data, organized.

Python

Redid side bar behavior for editing mode. Defaults to add/remove.

Anthony Cassandrab102e625fb91
diff --git a/src/hi/apps/collection/edit/views.py b/src/hi/apps/collection/edit/views.py
index 7cd0870c..a53ec509 100644
--- a/src/hi/apps/collection/edit/views.py
+++ b/src/hi/apps/collection/edit/views.py
@@ -131,14 +131,7 @@ class CollectionAddRemoveItemView( View ):
def get(self, request, *args, **kwargs):
collection = request.view_parameters.collection
-
- entity_collection_group_list = CollectionManager().create_entity_collection_group_list(
- collection = collection,
- )
-
- context = {
- 'entity_collection_group_list': entity_collection_group_list,
- }
+ context = self.get_add_remove_template_context( collection )
template = get_template( 'collection/edit/panes/collection_add_remove_item.html' )
content = template.render( context, request = request )
return antinode.response(
@@ -147,6 +140,15 @@ class CollectionAddRemoveItemView( View ):
},
)
+ @classmethod
+ def get_add_remove_template_context( self, collection : Collection ):
+ entity_collection_group_list = CollectionManager().create_entity_collection_group_list(
+ collection = collection,
+ )
+ return {
+ 'entity_collection_group_list': entity_collection_group_list,
+ }
+
@method_decorator( edit_required, name='dispatch' )
class CollectionEntityToggleView( View ):
diff --git a/src/hi/apps/collection/templates/collection/panes/collection_details.html b/src/hi/apps/collection/templates/collection/panes/collection_details.html
index 15673539..b6b235e4 100644
--- a/src/hi/apps/collection/templates/collection/panes/collection_details.html
+++ b/src/hi/apps/collection/templates/collection/panes/collection_details.html
@@ -1,4 +1,12 @@
-<h4><small>Collection:</small> {{ collection_detail_data.collection.name }}</h4>
+<div class="d-flex justify-content-between">
+ <div class="h5"><small>Collection:</small>{{ collection_detail_data.collection.name }}</div>
+ <div class="">
+ <a href="{% url 'edit_item_details_close' %}"
+ class="btn btn-tertiary" role="button" data-async="true">
+ X
+ </a>
+ </div>
+</div>
{% if collection_detail_data.location_item_position_form %}
<h5>Position</h5>
diff --git a/src/hi/apps/collection/views.py b/src/hi/apps/collection/views.py
index d611fd19..f39f01bf 100644
--- a/src/hi/apps/collection/views.py
+++ b/src/hi/apps/collection/views.py
@@ -5,6 +5,7 @@ from django.template.loader import get_template
from django.urls import reverse
from django.views.generic import View
+from hi.apps.collection.edit.views import CollectionAddRemoveItemView
import hi.apps.common.antinode as antinode
from hi.apps.common.utils import is_ajax
from hi.enums import ViewType
@@ -82,12 +83,11 @@ class CollectionView( HiGridView ):
side_template_name = None
if request.is_editing:
- collection_detail_data = CollectionManager().get_collection_detail_data(
- collection = collection,
- current_location_view = None,
- is_editing = request.is_editing,
+ context.update(
+ CollectionAddRemoveItemView.get_add_remove_template_context(
+ collection = collection,
+ )
)
- context['collection_detail_data'] = collection_detail_data
side_template_name = 'edit/panes/side.html'
return self.hi_grid_response(
diff --git a/src/hi/apps/common/templates/common/svg_file_form.html b/src/hi/apps/common/templates/common/svg_file_form.html
new file mode 100644
index 00000000..9f56f564
--- /dev/null
+++ b/src/hi/apps/common/templates/common/svg_file_form.html
@@ -0,0 +1,13 @@
+<p>
+ <label for="id_svg_file">{{ label }}</label>
+ <input type="file" name="svg_file" id="id_svg_file">
+ {{ svg_file_form.svg_file.errors }}
+</p>
+{% if svg_file_form.show_remove_dangerous_svg_items %}
+<p>
+ <div class="form-check">
+ {{ svg_file_form.remove_dangerous_svg_items }}
+ {{ svg_file_form.remove_dangerous_svg_items.label }}
+ </div>
+</p>
+{% endif %}
diff --git a/src/hi/apps/edit/templates/edit/panes/side.html b/src/hi/apps/edit/templates/edit/panes/side.html
index c827643b..2ad0ab2a 100644
--- a/src/hi/apps/edit/templates/edit/panes/side.html
+++ b/src/hi/apps/edit/templates/edit/panes/side.html
@@ -12,6 +12,10 @@
{% include "collection/panes/collection_details.html" %}
{% elif location_detail_data %}
{% include "location/panes/location_details.html" %}
+ {% elif entity_view_group_list and collection_view_group %}
+ {% include "location/edit/panes/location_view_add_remove_item.html" %}
+ {% elif entity_collection_group_list %}
+ {% include "collection/edit/panes/collection_add_remove_item.html" %}
{% endif %}
</div>
diff --git a/src/hi/apps/edit/urls.py b/src/hi/apps/edit/urls.py
index 51f33570..4a413909 100644
--- a/src/hi/apps/edit/urls.py
+++ b/src/hi/apps/edit/urls.py
@@ -13,8 +13,12 @@ urlpatterns = [
views.EditEndView.as_view(),
name='edit_end' ),
- re_path( r'^reorder-items$',
+ re_path( r'^item/reorder$',
views.ReorderItemsView.as_view(),
name='edit_reorder_items' ),
+ re_path( r'^item/details/close$',
+ views.ItemDetailsCloseView.as_view(),
+ name='edit_item_details_close' ),
+
]
diff --git a/src/hi/apps/edit/views.py b/src/hi/apps/edit/views.py
index 3b1d7c19..7b9ec0fa 100644
--- a/src/hi/apps/edit/views.py
+++ b/src/hi/apps/edit/views.py
@@ -52,6 +52,19 @@ class EditEndView( View ):
return redirect( redirect_url )
+@method_decorator( edit_required, name='dispatch' )
+class ItemDetailsCloseView( View ):
+
+ def get(self, request, *args, **kwargs ):
+ if request.view_parameters.view_type.is_location_view:
+ return location_edit_views.LocationViewAddRemoveItemView().get( request, *args, **kwargs )
+
+ elif request.view_parameters.view_type.is_collection:
+ return collection_edit_views.CollectionAddRemoveItemView().get( request, *args, **kwargs )
+
+ raise bad_request_response( request, 'Add/remove items not supported for current view type.' )
+
+
@method_decorator( edit_required, name='dispatch' )
class ReorderItemsView( View ):
diff --git a/src/hi/apps/entity/templates/entity/panes/entity_details.html b/src/hi/apps/entity/templates/entity/panes/entity_details.html
index aa24f4fd..c6b53c5a 100644
--- a/src/hi/apps/entity/templates/entity/panes/entity_details.html
+++ b/src/hi/apps/entity/templates/entity/panes/entity_details.html
@@ -1,4 +1,12 @@
-<h4>{{ entity_detail_data.entity.name }}</h4>
+<div class="d-flex justify-content-between">
+ <div class="h5"><small>Entity</small>: {{ entity_detail_data.entity.name }}</div>
+ <div class="">
+ <a href="{% url 'edit_item_details_close' %}"
+ class="btn btn-tertiary" role="button" data-async="true">
+ X
+ </a>
+ </div>
+</div>
{% if entity_detail_data.location_item_position_form %}
<h5>Position</h5>
diff --git a/src/hi/apps/location/edit/forms.py b/src/hi/apps/location/edit/forms.py
index 4e9994c6..b5643e0d 100644
--- a/src/hi/apps/location/edit/forms.py
+++ b/src/hi/apps/location/edit/forms.py
@@ -4,13 +4,35 @@ import os
from django import forms
from django.conf import settings
+from hi.apps.attribute.forms import AttributeForm
from hi.apps.common.svg_file_form import SvgFileForm
+from hi.apps.location.models import Location, LocationAttribute, LocationView
+
logger = logging.getLogger(__name__)
-class LocationAddForm( SvgFileForm ):
+class LocationSvgFileForm( SvgFileForm ):
+
+ def get_default_source_directory(self):
+ return os.path.join(
+ settings.BASE_DIR,
+ 'static',
+ 'img',
+ )
+
+ def get_default_basename(self):
+ return 'location-default.svg'
+
+ def get_media_destination_directory(self):
+ return 'location/svg'
+
+
+class LocationAddForm( LocationSvgFileForm ):
+ # N.B. When adding a Location, we use limited field options to
+ # keep it simpler.
+
name = forms.CharField(
label = 'Location Name',
required = True,
@@ -30,6 +52,58 @@ class LocationAddForm( SvgFileForm ):
return 'location/svg'
+class LocationEditForm( forms.ModelForm ):
+
+ # N.B. The svg file fields are managed separately with SvgFileForm due
+ # to special handling needed.
+
+ class Meta:
+ model = Location
+ fields = (
+ 'name',
+ 'order_id',
+ )
+
+
+class LocationAttributeForm( AttributeForm ):
+
+ class Meta:
+ model = LocationAttribute
+ fields = (
+ 'name',
+ 'value',
+ 'value_type_str',
+ )
+
+
+LocationAttributeFormset = forms.inlineformset_factory(
+ Location,
+ LocationAttribute,
+ form = LocationAttributeForm,
+ extra = 1,
+ max_num = 100,
+ absolute_max = 100,
+ can_delete = True,
+)
+
+
class LocationViewAddForm(forms.Form):
+ # N.B. When adding a LocationView, we use limited field options to keep
+ # it simpler.
+
name = forms.CharField()
+
+
+class LocationViewEditForm( forms.ModelForm ):
+
+ class Meta:
+ model = LocationView
+ fields = (
+ 'name',
+ 'order_id',
+ 'svg_view_box_str',
+ 'svg_rotate',
+ 'location_view_type_str',
+ )
+
diff --git a/src/hi/apps/location/edit/urls.py b/src/hi/apps/location/edit/urls.py
index f57fc6fa..daf3e96d 100644
--- a/src/hi/apps/location/edit/urls.py
+++ b/src/hi/apps/location/edit/urls.py
@@ -45,10 +45,6 @@ urlpatterns = [
views.LocationViewCollectionToggleView.as_view(),
name='location_edit_location_view_collection_toggle' ),
- re_path( r'^location-item/details/(?P<html_id>[\w\-]*)$',
- views.LocationItemDetailsView.as_view(),
- name='location_edit_location_item_details' ),
-
re_path( r'^location-item/position/(?P<html_id>[\w\-]+)$',
views.LocationItemPositionView.as_view(),
name='location_edit_location_item_position' ),
diff --git a/src/hi/apps/location/edit/views.py b/src/hi/apps/location/edit/views.py
index 35c4627f..4adb9909 100644
--- a/src/hi/apps/location/edit/views.py
+++ b/src/hi/apps/location/edit/views.py
@@ -2,28 +2,23 @@ from decimal import Decimal
import json
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
from hi.apps.collection.collection_manager import CollectionManager
-import hi.apps.collection.views as collection_views
from hi.apps.collection.models import Collection
import hi.apps.common.antinode as antinode
from hi.apps.common.svg_models import SvgViewBox
from hi.apps.entity.entity_manager import EntityManager
-import hi.apps.entity.views as entity_views
from hi.apps.entity.models import Entity
from hi.apps.location.forms import LocationItemPositionForm
from hi.apps.location.location_manager import LocationManager
from hi.apps.location.models import Location, LocationView
from hi.apps.location.svg_item_factory import SvgItemFactory
-import hi.apps.location.views as location_views
from hi.decorators import edit_required
from hi.enums import ItemType, ViewType
-from hi.hi_grid_view import HiGridView
from hi.views import (
bad_request_response,
internal_error_response,
@@ -288,14 +283,24 @@ class LocationViewDeleteView( View ):
redirect_url = reverse('home')
return antinode.redirect_response( redirect_url )
-
+
@method_decorator( edit_required, name='dispatch' )
class LocationViewAddRemoveItemView( View ):
def get(self, request, *args, **kwargs):
location_view = request.view_parameters.location_view
+ context = self.get_add_remove_template_context( location_view )
+ 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,
+ },
+ )
+ @classmethod
+ def get_add_remove_template_context( self, location_view : LocationView ):
location_manager = LocationManager()
entity_view_group_list = location_manager.create_entity_view_group_list(
location_view = location_view,
@@ -303,19 +308,11 @@ class LocationViewAddRemoveItemView( View ):
collection_view_group = location_manager.create_collection_view_group(
location_view = location_view,
)
-
- context = {
+ return {
'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 ):
@@ -397,47 +394,6 @@ class LocationViewCollectionToggleView( View ):
)
-@method_decorator( edit_required, name='dispatch' )
-class LocationItemDetailsView( HiGridView ):
-
- def get(self, request, *args, **kwargs):
-
- if not kwargs.get( ItemType.HTML_ID_ARG() ):
- return self.get_default_details( request )
-
- try:
- ( 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_views.EntityDetailsView().get(
- request = request,
- entity_id = item_id,
- )
-
- if item_type == ItemType.COLLECTION:
- return collection_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_collection:
- return collection_views.CollectionDetailsView().get(
- request = request,
- location_view_id = request.view_parameters.collection_id,
- )
- if not request.view_parameters.location_view_id:
- raise ValueError( 'No current location view was set.' )
- return location_views.LocationDetailsView().get(
- request = request,
- location_view_id = request.view_parameters.location_view_id,
- )
-
-
@method_decorator( edit_required, name='dispatch' )
class LocationItemPositionView( View ):
diff --git a/src/hi/apps/location/location_detail_data.py b/src/hi/apps/location/location_detail_data.py
index 93b3bf50..465b782f 100644
--- a/src/hi/apps/location/location_detail_data.py
+++ b/src/hi/apps/location/location_detail_data.py
@@ -1,10 +1,22 @@
from dataclasses import dataclass
+from hi.apps.common.svg_file_form import SvgFileForm
+from hi.apps.location.edit.forms import (
+ LocationAttributeFormset,
+ LocationEditForm,
+ LocationSvgFileForm,
+ LocationViewEditForm,
+)
from .models import Location, LocationView
@dataclass
class LocationDetailData:
- location : Location
- location_view : LocationView
+ location : Location
+ location_edit_form : LocationEditForm
+ location_attribute_formset : LocationAttributeFormset
+ location_svg_file_form : LocationSvgFileForm
+
+ location_view : LocationView
+ location_view_edit_form : LocationViewEditForm
diff --git a/src/hi/apps/location/location_manager.py b/src/hi/apps/location/location_manager.py
index e5ba209d..df3883f7 100644
--- a/src/hi/apps/location/location_manager.py
+++ b/src/hi/apps/location/location_manager.py
@@ -11,6 +11,7 @@ from hi.apps.collection.models import (
CollectionView,
)
from hi.apps.common.singleton import Singleton
+from hi.apps.common.svg_file_form import SvgFileForm
from hi.apps.common.svg_models import SvgViewBox
from hi.apps.entity.delegation_manager import DelegationManager
from hi.apps.entity.entity_manager import EntityManager
@@ -18,6 +19,12 @@ from hi.apps.entity.models import (
Entity,
EntityView,
)
+from hi.apps.location.edit.forms import (
+ LocationAttributeFormset,
+ LocationEditForm,
+ LocationSvgFileForm,
+ LocationViewEditForm,
+)
from .enums import LocationViewType
from .location_detail_data import LocationDetailData
@@ -84,7 +91,16 @@ class LocationManager(Singleton):
# TODO: Add attributes and other data
return LocationDetailData(
location = location_view.location,
+ location_edit_form = LocationEditForm( instance = location_view.location ),
+ location_attribute_formset = LocationAttributeFormset(
+ instance = location_view.location,
+ form_kwargs = {
+ 'is_editable': True,
+ },
+ ),
+ location_svg_file_form = LocationSvgFileForm( ),
location_view = location_view,
+ location_view_edit_form = LocationViewEditForm( instance = location_view ),
)
def create_location_view( self,
diff --git a/src/hi/apps/location/templates/location/edit/panes/location_add_form.html b/src/hi/apps/location/templates/location/edit/panes/location_add_form.html
index 910767e0..35e0b412 100644
--- a/src/hi/apps/location/templates/location/edit/panes/location_add_form.html
+++ b/src/hi/apps/location/templates/location/edit/panes/location_add_form.html
@@ -19,18 +19,4 @@
<p>
Optionally add an image (SVG format) showing your property and/or house layout. Skip this and we'll uses a predefined image for you. You'll be able to update this image later.
</p>
-
-<p>
- <label for="id_svg_file">Select an SVG file:</label>
- <input type="file" name="svg_file" id="id_svg_file">
- {{ location_add_form.svg_file.errors }}
-</p>
-
-{% if location_add_form.show_remove_dangerous_svg_items %}
-<p>
- <div class="form-check">
- {{ location_add_form.remove_dangerous_svg_items }}
- {{ location_add_form.remove_dangerous_svg_items.label }}
- </div>
-</p>
-{% endif %}
+{% include "common/svg_file_form.html" with svg_file_form=location_add_form label='Select an SVG file:' %}
diff --git a/src/hi/apps/location/templates/location/edit/panes/location_edit.html b/src/hi/apps/location/templates/location/edit/panes/location_edit.html
new file mode 100644
index 00000000..b6811012
--- /dev/null
+++ b/src/hi/apps/location/templates/location/edit/panes/location_edit.html
@@ -0,0 +1,33 @@
+<h5>Location</h5>
+<div>{{ location_detail_data.location.name }}</div>
+
+
+<form action="{% url 'location_edit_location_edit' location_id=location_detail_data.location.id %}" method="post" enctype="multipart/form-data"
+ class="form" data-async="modal">
+ {% csrf_token %}
+
+<div>
+{% include "location/edit/panes/location_edit_form.html" %}
+</div>
+
+<h5>Attributes</h5>
+TBD
+
+<button id="hi-add-location-button" type="submit" class="btn btn-info"
+ name="action" value="add">
+ UPDATE
+</button>
+</form>
+
+
+
+<h5>Order Index</h5>
+<div>{{ location_detail_data.location.order_id }}</div>
+
+<div>
+ <a href="{% url 'location_edit_location_delete' location_id=location_detail_data.location.id %}"
+ id="hi-delete-location-link" class="btn btn-danger btn-control" role="button"
+ data-async="true">
+ DELETE LOCATION AND ALL VIEWS
+ </a>
+</div>
diff --git a/src/hi/apps/location/templates/location/edit/panes/location_edit_form.html b/src/hi/apps/location/templates/location/edit/panes/location_edit_form.html
index 0e8fcc79..387e641d 100644
--- a/src/hi/apps/location/templates/location/edit/panes/location_edit_form.html
+++ b/src/hi/apps/location/templates/location/edit/panes/location_edit_form.html
@@ -17,20 +17,15 @@
</p>
<p>
- Optionally add an image (SVG format) showing your property and/or house layout. Skip this and we'll uses a predefined image for you. You'll be able to update this image later.
+ {{ location_edit_form.order_id.label }}
+ {{ location_edit_form.order_id }}
+ {{ location_edit_form.order_id.errors }}
</p>
-<p>
- <label for="id_svg_file">Select an SVG file:</label>
- <input type="file" name="svg_file" id="id_svg_file">
- {{ location_edit_form.svg_file.errors }}
-</p>
-
-{% if location_edit_form.show_remove_dangerous_svg_items %}
-<p>
- <div class="form-check">
- {{ location_edit_form.remove_dangerous_svg_items }}
- {{ location_edit_form.remove_dangerous_svg_items.label }}
- </div>
-</p>
+<div>
+ {% include "attribute/panes/attribute_form.html" with attribute_formset=location_attribute_formset %}
+</div>
+
+{% if location_svg_file_form %}
+{% include "common/svg_file_form.html" with svg_file_form=location_svg_file_form label='Replace SVG file:' %}
{% endif %}
diff --git a/src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html b/src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html
index 8538733a..863c0efd 100644
--- a/src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html
+++ b/src/hi/apps/location/templates/location/edit/panes/location_view_add_remove_item.html
@@ -1,4 +1,4 @@
-<div class="h5">Membership</div>
+<div class="h5">Item Management</div>
<div class="">
<a href="{% url 'entity_edit_entity_add' %}"
diff --git a/src/hi/apps/location/templates/location/edit/panes/location_view_edit.html b/src/hi/apps/location/templates/location/edit/panes/location_view_edit.html
new file mode 100644
index 00000000..945d6680
--- /dev/null
+++ b/src/hi/apps/location/templates/location/edit/panes/location_view_edit.html
@@ -0,0 +1,27 @@
+<h5>Location View</h5>
+<div>{{ location_detail_data.location_view.name }}</div>
+
+<form action="{% url 'location_edit_location_view_add' %}" method="post"
+ class="form" data-async="modal">
+ {% csrf_token %}
+
+ <div>
+ {% include "location/edit/panes/location_view_edit_form.html" %}
+ </div>
+
+ <button id="hi-add-location-view-button" type="submit" class="btn btn-info"
+ name="action" value="add">
+ UPDATE
+</button>
+</form>
+
+
+
+<div>
+ <a href="{% url 'location_edit_location_view_delete' location_view_id=location_detail_data.location_view.id %}"
+ id="hi-delete-location-view-link" class="btn btn-danger btn-control" role="button"
+ data-async="true">
+ DELETE THIS VIEW
+ </a>
+</div>
+
diff --git a/src/hi/apps/location/templates/location/edit/panes/side_header.html b/src/hi/apps/location/templates/location/edit/panes/side_header.html
index 8946352d..43298ccf 100644
--- a/src/hi/apps/location/templates/location/edit/panes/side_header.html
+++ b/src/hi/apps/location/templates/location/edit/panes/side_header.html
@@ -1,8 +1,3 @@
<div>
- <div class="">
- <a href="{% url 'location_edit_location_view_add_remove_item' %}"
- class="btn btn-tertiary btn-control" role="button" data-async="true">
- ADD/REMOVE {{ request.view_parameters.location_view.name }} ITEMS
- </a>
- </div>
+ <div class="h3">View: {{ location_view.name }} <small>[{{ location_view.location.name }}]</small></div>
</div>
diff --git a/src/hi/apps/location/templates/location/panes/location_details.html b/src/hi/apps/location/templates/location/panes/location_details.html
index ee098702..e42b6d2d 100644
--- a/src/hi/apps/location/templates/location/panes/location_details.html
+++ b/src/hi/apps/location/templates/location/panes/location_details.html
@@ -1,60 +1,11 @@
-<h5>Location View</h5>
-<div>{{ location_detail_data.location_view.name }}</div>
-
-
-<form action="{% url 'location_edit_location_view_add' %}" method="post"
- class="form" data-async="modal">
- {% csrf_token %}
-
-<div>
-{% include "location/edit/panes/location_view_edit_form.html" %}
-</div>
-
-<button id="hi-add-location-view-button" type="submit" class="btn btn-info"
- name="action" value="add">
- UPDATE
-</button>
-</form>
-
-
-
-<div>
- <a href="{% url 'location_edit_location_view_delete' location_view_id=location_detail_data.location_view.id %}"
- id="hi-delete-location-view-link" class="btn btn-danger btn-control" role="button"
- data-async="true">
- DELETE THIS VIEW
- </a>
-</div>
-
-<h5>Location</h5>
-<div>{{ location_detail_data.location.name }}</div>
-
-
-<form action="{% url 'location_edit_location_edit' location_id=location_detail_data.location.id %}" method="post" enctype="multipart/form-data"
- class="form" data-async="modal">
- {% csrf_token %}
-
-<div>
-{% include "location/edit/panes/location_edit_form.html" %}
-</div>
-
-<button id="hi-add-location-button" type="submit" class="btn btn-info"
- name="action" value="add">
- UPDATE
-</button>
-</form>
-
-
-<h5>Attributes</h5>
-TBD
-
-<h5>Order Index</h5>
-<div>{{ location_detail_data.location.order_id }}</div>
-
-<div>
- <a href="{% url 'location_edit_location_delete' location_id=location_detail_data.location.id %}"
- id="hi-delete-location-link" class="btn btn-danger btn-control" role="button"
- data-async="true">
- DELETE LOCATION AND ALL VIEWS
- </a>
-</div>
+<div class="d-flex justify-content-between">
+ <div></div>
+ <div class="">
+ <a href="{% url 'edit_item_details_close' %}"
+ class="btn btn-tertiary" role="button" data-async="true">
+ X
+ </a>
+ </div>
+</div>
+{% include "location/edit/panes/location_view_edit.html" %}
+{% include "location/edit/panes/location_edit.html" %}
diff --git a/src/hi/apps/location/urls.py b/src/hi/apps/location/urls.py
index 7e2a8ed1..a5159d7b 100644
--- a/src/hi/apps/location/urls.py
+++ b/src/hi/apps/location/urls.py
@@ -17,6 +17,14 @@ urlpatterns = [
views.LocationViewDefaultView.as_view(),
name='location_view_default'),
+ re_path( r'^item/details/(?P<html_id>[\w\-]+)$',
+ views.LocationItemDetailsView.as_view(),
+ name='location_item_details' ),
+
+ re_path( r'^details/(?P<location_view_id>\d*)$',
+ views.LocationViewDetailsView.as_view(),
+ name='location_details' ),
+
re_path( r'^edit/', include('hi.apps.location.edit.urls' )),
]
diff --git a/src/hi/apps/location/views.py b/src/hi/apps/location/views.py
index ac56647a..6c5011a7 100644
--- a/src/hi/apps/location/views.py
+++ b/src/hi/apps/location/views.py
@@ -5,11 +5,14 @@ from django.template.loader import get_template
from django.urls import reverse
from django.views.generic import View
+from hi.apps.collection.views import CollectionDetailsView
import hi.apps.common.antinode as antinode
from hi.apps.common.utils import is_ajax
+from hi.apps.entity.views import EntityDetailsView
+from hi.apps.location.edit.views import LocationViewAddRemoveItemView
from hi.constants import DIVID
-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
@@ -108,15 +111,17 @@ class LocationViewView( HiGridView ):
)
context = {
'is_async_request': is_ajax( request ),
+ 'location_view': location_view,
'location_view_data': location_view_data,
}
side_template_name = None
if request.is_editing:
- location_detail_data = LocationManager().get_location_detail_data(
- location_view = location_view,
+ context.update(
+ LocationViewAddRemoveItemView.get_add_remove_template_context(
+ location_view = location_view,
+ )
)
- context['location_detail_data'] = location_detail_data
side_template_name = 'edit/panes/side.html'
return self.hi_grid_response(
@@ -129,17 +134,50 @@ class LocationViewView( HiGridView ):
)
-class LocationDetailsView( View ):
+class LocationItemDetailsView( HiGridView ):
+
+ def get(self, request, *args, **kwargs):
+ try:
+ ( 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 EntityDetailsView().get(
+ request = request,
+ entity_id = item_id,
+ )
+
+ if item_type == ItemType.COLLECTION:
+ return CollectionDetailsView().get(
+ request = request,
+ collection_id = item_id,
+ )
+
+ return bad_request_response( request, message = 'Unknown item type "{item_type}".' )
+
+
+class LocationViewDetailsView( View ):
def get( 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.' )
- try:
- location_view = LocationView.objects.get( id = location_view_id )
- except LocationView.DoesNotExist:
- return page_not_found_response( request )
-
+ if location_view_id:
+ location_view_id = int(location_view_id)
+ default_location_view_id = request.view_parameters.location_view_id
+ if default_location_view_id:
+ default_location_view_id = int(default_location_view_id)
+
+ if not location_view_id and not default_location_view_id:
+ return bad_request_response( request, message = 'No location given and no default available.' )
+
+ if location_view_id and ( location_view_id != default_location_view_id ):
+ try:
+ location_view = LocationView.objects.get( id = location_view_id )
+ except LocationView.DoesNotExist:
+ return page_not_found_response( request )
+ else:
+ location_view = request.view_parameters.location_view
+
location_detail_data = LocationManager().get_location_detail_data(
location_view = location_view,
)
@@ -153,6 +191,3 @@ class LocationDetailsView( View ):
DIVID['EDIT_ITEM']: content,
},
)
-
-
-
diff --git a/src/hi/static/js/edit-svg-icon.js b/src/hi/static/js/edit-svg-icon.js
index 431590c6..2d43c404 100644
--- a/src/hi/static/js/edit-svg-icon.js
+++ b/src/hi/static/js/edit-svg-icon.js
@@ -274,7 +274,7 @@
moduleName: MODULE_NAME,
};
Hi.edit.eventBus.emit( Hi.edit.SELECTION_MADE_EVENT_NAME, data );
- AN.get( `${Hi.API_SHOW_DETAILS_URL}/${svgItemId}` );
+ AN.get( `${Hi.API_LOCATION_ITEM_DETAILS_URL}/${svgItemId}` );
}
function clearSelectedIconSvgGroup() {
diff --git a/src/hi/static/js/edit-svg-path.js b/src/hi/static/js/edit-svg-path.js
index 9ec447c8..c26b68f6 100644
--- a/src/hi/static/js/edit-svg-path.js
+++ b/src/hi/static/js/edit-svg-path.js
@@ -217,7 +217,7 @@
moduleName: MODULE_NAME,
};
Hi.edit.eventBus.emit( Hi.edit.SELECTION_MADE_EVENT_NAME, data );
- AN.get( `${Hi.API_SHOW_DETAILS_URL}/${svgItemId}` );
+ AN.get( `${Hi.API_LOCATION_ITEM_DETAILS_URL}/${svgItemId}` );
}
function clearSelectedPathSvgGroup() {
diff --git a/src/hi/static/js/main.js b/src/hi/static/js/main.js
index a7d221c8..c6c3c60f 100644
--- a/src/hi/static/js/main.js
+++ b/src/hi/static/js/main.js
@@ -13,7 +13,8 @@
DATA_TYPE_ATTR: 'data-type',
DATA_TYPE_ICON_VALUE: 'svg-icon',
DATA_TYPE_PATH_VALUE: 'svg-path',
- API_SHOW_DETAILS_URL: '/location/edit/location-item/details',
+ API_LOCATION_ITEM_DETAILS_URL: '/location/item/details',
+ API_LOCATION_DETAILS_URL: '/location/details',
generateUniqueId: function() {
return _generateUniqueId();
diff --git a/src/hi/static/js/svg-location.js b/src/hi/static/js/svg-location.js
index 066f76b3..7bfc231f 100644
--- a/src/hi/static/js/svg-location.js
+++ b/src/hi/static/js/svg-location.js
@@ -102,6 +102,9 @@
} else {
if ( gSvgTransformData.isDragging ) {
applyDrag( event );
+ } else {
+ if ( Hi.DEBUG ) { console.log( `Mouse up skipped [${MODULE_NAME}]` ); }
+ return;
}
}
gSvgTransformData = null;
@@ -153,11 +156,12 @@
event.stopImmediatePropagation();
return;
}
- gIgnoreCLick = false;
if ( $(event.target).hasClass( Hi.LOCATION_VIEW_SVG_CLASS ) ) {
if ( Hi.DEBUG ) { console.log( `Click [${MODULE_NAME}]`, event ); }
handleLocationViewSvgClick( event, event.target );
+ gSvgTransformData = null;
+ gSvgTransformType = SvgTransformType.MOVE;
event.preventDefault();
event.stopImmediatePropagation();
return;
@@ -251,7 +255,7 @@
moduleName: MODULE_NAME,
};
Hi.edit.eventBus.emit( Hi.edit.SELECTION_MADE_EVENT_NAME, data );
- AN.get( `${Hi.API_SHOW_DETAILS_URL}` );
+ AN.get( `${Hi.API_LOCATION_DETAILS_URL}` );
}
}