From 299923ef45e88632f12394d50fb2e17b37acbac9 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 10:17:59 +0100
Subject: [PATCH] # 86 Viewport jump Compensation

* adds direct jump of viewport on related-data action (create/delete)
* adds comment field to log.html as 'details'
---
 .../compensation/includes/deadlines.html      |  2 +-
 .../detail/compensation/view.html             | 37 ++++++++--------
 compensation/urls/compensation.py             |  1 +
 compensation/views/compensation.py            | 42 ++++++++++++++++---
 templates/log.html                            |  8 +++-
 5 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
index 4ca109f7..8897483e 100644
--- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
@@ -50,7 +50,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 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
                     </button>
                     {% endif %}
diff --git a/compensation/templates/compensation/detail/compensation/view.html b/compensation/templates/compensation/detail/compensation/view.html
index c210986a..7b167658 100644
--- a/compensation/templates/compensation/detail/compensation/view.html
+++ b/compensation/templates/compensation/detail/compensation/view.html
@@ -118,26 +118,27 @@
         </div>
     </div>
     <hr>
-
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/states-before.html' %}
+    <div id="related_data">
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/states-before.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/states-after.html' %}
+            </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/states-after.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/actions.html' %}
+            </div>
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/deadlines.html' %}
+            </div>
         </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/actions.html' %}
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/deadlines.html' %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-sm-12 col-md-12 col-lg-6">
-            {% include 'compensation/detail/compensation/includes/documents.html' %}
+        <div class="row">
+            <div class="col-sm-12 col-md-12 col-lg-6">
+                {% include 'compensation/detail/compensation/includes/documents.html' %}
+            </div>
         </div>
     </div>
 
diff --git a/compensation/urls/compensation.py b/compensation/urls/compensation.py
index f169bb9e..9c23117b 100644
--- a/compensation/urls/compensation.py
+++ b/compensation/urls/compensation.py
@@ -23,6 +23,7 @@ urlpatterns = [
     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/new', deadline_new_view, name="new-deadline"),
+    path('<id>/deadline/<deadline_id>/remove', deadline_remove_view, name='deadline-remove'),
     path('<id>/report', report_view, name='report'),
 
     # Documents
diff --git a/compensation/views/compensation.py b/compensation/views/compensation.py
index 009eaf82..43bdf8ce 100644
--- a/compensation/views/compensation.py
+++ b/compensation/views/compensation.py
@@ -13,6 +13,7 @@ from intervention.models import Intervention
 from konova.contexts import BaseContext
 from konova.decorators import *
 from konova.forms import RemoveModalForm, SimpleGeomForm
+from konova.models import Deadline
 from konova.sub_settings.context_settings import TAB_TITLE_IDENTIFIER
 from konova.utils.documents import get_document, remove_document
 from konova.utils.generators import generate_qr_code
@@ -276,7 +277,8 @@ def new_document_view(request: HttpRequest, id: str):
     form = NewCompensationDocumentForm(request.POST or None, request.FILES or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Document added")
+        msg_success=_("Document added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -345,7 +347,8 @@ def state_new_view(request: HttpRequest, id: str):
     form = NewStateModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("State added")
+        msg_success=_("State added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -366,7 +369,8 @@ def action_new_view(request: HttpRequest, id: str):
     form = NewActionModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Action added")
+        msg_success=_("Action added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -387,7 +391,31 @@ def deadline_new_view(request: HttpRequest, id: str):
     form = NewDeadlineModalForm(request.POST or None, instance=comp, request=request)
     return form.process_request(
         request,
-        msg_success=_("Deadline added")
+        msg_success=_("Deadline added"),
+        redirect_url=reverse("compensation:detail", args=(id,)) + "#related_data"
+    )
+
+
+@login_required
+@default_group_required
+@shared_access_required(Compensation, "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("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -409,7 +437,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("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
@@ -431,7 +460,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("compensation:detail", args=(id,)) + "#related_data"
     )
 
 
diff --git a/templates/log.html b/templates/log.html
index acc2ee67..a5195870 100644
--- a/templates/log.html
+++ b/templates/log.html
@@ -3,12 +3,15 @@
     <table class="table table-hover">
         <thead>
             <tr>
-                <th scope="col">
+                <th scope="col" class="w-25">
                     {% trans 'Timestamp' %}
                 </th>
                 <th scope="col">
                     {% trans 'Action' %}
                 </th>
+                <th scope="col">
+                    {% trans 'Details' %}
+                </th>
                 <th scope="col">
                     {% trans 'User' %}
                 </th>
@@ -23,6 +26,9 @@
                 <td>
                     {{ entry.action_humanize}}
                 </td>
+                <td>
+                    {{ entry.comment|default_if_none:"-" }}
+                </td>
                 <td>
                     {{entry.user}}
                 </td>