# 86 Viewport jump EcoAccount/EMA

* adds direct jump of viewport on related-data action (create/delete)

ema/models/ema.py

@@ -11,6 +11,7 @@ from django.contrib import messages
 from django.db import models
 from django.db.models import QuerySet
 from django.http import HttpRequest
+from django.urls import reverse
 
 from compensation.models import AbstractCompensation
 from ema.managers import EmaManager
@@ -119,6 +120,14 @@ class Ema(AbstractCompensation, ShareableObjectMixin, RecordableObjectMixin):
         is_ready = is_recorded
         return is_ready
 
+    def get_share_link(self):
+        """ Returns the share url for the object
+
+        Returns:
+
+        """
+        return reverse("ema:share", args=(self.id, self.access_token))
+
 
 class EmaDocument(AbstractDocument):
     """

ema/templates/ema/detail/includes/deadlines.html

@@ -48,7 +48,7 @@
                 <td class="align-middle">{{ deadline.comment }}</td>
                 <td>
                     {% if is_default_member and has_access  %}
-                    <button data-form-url="{% url 'deadline-remove' deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
+                    <button data-form-url="{% url 'ema:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}

ema/templates/ema/detail/view.html

@@ -95,26 +95,27 @@
         </div>
     </div>
     <hr>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'ema/detail/includes/documents.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'ema/detail/includes/documents.html' %}
+            </div>
         </div>
     </div>
 

ema/urls.py

@@ -23,12 +23,12 @@ urlpatterns = [
     path('<id>/action/new', action_new_view, name='new-action'),
     path('<id>/state/<state_id>/remove', state_remove_view, name='state-remove'),
     path('<id>/action/<action_id>/remove', action_remove_view, name='action-remove'),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
     path('<id>/deadline/new', deadline_new_view, name="new-deadline"),
     path('<id>/share/<token>', share_view, name='share'),
     path('<id>/share', create_share_view, name='share-create'),
 
     # Documents
-    # Document remove route can be found in konova/urls.py
     path('<id>/document/new/', document_new_view, name='new-doc'),
     path('document/<doc_id>', get_document_view, name='get-doc'),
     path('document/<doc_id>/remove/', remove_document_view, name='remove-doc'),

ema/views.py

@@ -15,6 +15,7 @@ from konova.contexts import BaseContext
 from konova.decorators import conservation_office_group_required, shared_access_required
 from ema.models import Ema, EmaDocument
 from konova.forms import RemoveModalForm, SimpleGeomForm, RecordModalForm
+from konova.models import Deadline
 from konova.settings import DEFAULT_GROUP, ZB_GROUP, ETS_GROUP
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
@@ -290,7 +291,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=_("State added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -311,7 +313,8 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=_("Action added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -332,7 +335,8 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=_("Deadline added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -352,7 +356,8 @@ def document_new_view(request: HttpRequest, id: str):
     form = NewEmaDocumentForm(request.POST or None, request.FILES or None, instance=ema, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=_("Document added"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -422,7 +427,8 @@ def state_remove_view(request: HttpRequest, id: str, state_id: str):
     form = RemoveModalForm(request.POST or None, instance=state, request=request)
     return form.process_request(
         request,
-        msg_success=_("State removed")
+        msg_success=_("State removed"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -444,7 +450,8 @@ def action_remove_view(request: HttpRequest, id: str, action_id: str):
     form = RemoveModalForm(request.POST or None, instance=action, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action removed")
+        msg_success=_("Action removed"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -564,4 +571,27 @@ def create_share_view(request: HttpRequest, id: str):
     return form.process_request(
         request,
         msg_success=_("Share settings updated")
+    )
+
+
+@login_required
+@conservation_office_group_required
+@shared_access_required(Ema, "id")
+def deadline_remove_view(request: HttpRequest, id: str, deadline_id: str):
+    """ Renders a form for removing deadlines from a compensation
+
+    Args:
+        request (HttpRequest): The incoming request
+        id (str): The compensation's id
+        deadline_id (str): The deadline's id
+
+    Returns:
+
+    """
+    deadline = get_object_or_404(Deadline, id=deadline_id)
+    form = RemoveModalForm(request.POST or None, instance=deadline, request=request)
+    return form.process_request(
+        request,
+        msg_success=_("Deadline removed"),
+        redirect_url=reverse("ema:detail", args=(id,)) + "#related_data"
     )