From 77b59db56fd7a4017b117a4ba990d4dbee7100cd Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Wed, 2 Feb 2022 12:54:45 +0100
Subject: [PATCH] # 86 Comment field length

* removes comment field length limit
* adds improvements for rendering large comments
---
 compensation/forms/modalForms.py                 |  3 +--
 .../detail/compensation/includes/actions.html    |  9 +++++++--
 .../detail/compensation/includes/deadlines.html  |  6 +++++-
 .../detail/compensation/includes/documents.html  |  8 ++++++--
 .../detail/eco_account/includes/actions.html     | 10 +++++++---
 .../detail/eco_account/includes/deadlines.html   |  8 ++++++--
 .../detail/eco_account/includes/documents.html   |  8 ++++++--
 ema/templates/ema/detail/includes/actions.html   |  8 ++++++--
 ema/templates/ema/detail/includes/deadlines.html |  8 ++++++--
 ema/templates/ema/detail/includes/documents.html |  8 ++++++--
 .../intervention/detail/includes/documents.html  |  8 ++++++--
 .../intervention/detail/includes/payments.html   |  8 ++++++--
 .../intervention/detail/includes/revocation.html |  8 ++++++--
 konova/templatetags/ksp_filters.py               | 16 ++++++++++++++++
 templates/base.html                              |  2 +-
 15 files changed, 91 insertions(+), 27 deletions(-)

diff --git a/compensation/forms/modalForms.py b/compensation/forms/modalForms.py
index dd9f4c70..9e7419b6 100644
--- a/compensation/forms/modalForms.py
+++ b/compensation/forms/modalForms.py
@@ -346,10 +346,9 @@ class NewActionModalForm(BaseModalForm):
     )
     comment = forms.CharField(
         required=False,
-        max_length=200,
         label=_("Comment"),
         label_suffix=_(""),
-        help_text=_("Additional comment, maximum {} letters").format(200),
+        help_text=_("Additional comment"),
         widget=forms.Textarea(
             attrs={
                 "rows": 5,
diff --git a/compensation/templates/compensation/detail/compensation/includes/actions.html b/compensation/templates/compensation/detail/compensation/includes/actions.html
index 648e777a..129673ef 100644
--- a/compensation/templates/compensation/detail/compensation/includes/actions.html
+++ b/compensation/templates/compensation/detail/compensation/includes/actions.html
@@ -1,4 +1,5 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
+
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -55,7 +56,11 @@
                     {% endfor %}
                 </td>
                 <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
diff --git a/compensation/templates/compensation/detail/compensation/includes/deadlines.html b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
index 8897483e..dcf3894a 100644
--- a/compensation/templates/compensation/detail/compensation/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/compensation/includes/deadlines.html
@@ -47,7 +47,11 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
                 <td>
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
diff --git a/compensation/templates/compensation/detail/compensation/includes/documents.html b/compensation/templates/compensation/detail/compensation/includes/documents.html
index 7e958f6d..108db76c 100644
--- a/compensation/templates/compensation/detail/compensation/includes/documents.html
+++ b/compensation/templates/compensation/detail/compensation/includes/documents.html
@@ -45,8 +45,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/actions.html b/compensation/templates/compensation/detail/eco_account/includes/actions.html
index 67dd2bbf..b4701744 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/actions.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/actions.html
@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -36,7 +36,7 @@
                 <th scope="col">
                     {% trans 'Comment' %}
                 </th>
-                {% if default_member and has_access %}
+                {% if is_default_member and has_access %}
                     <th scope="col">
                         {% trans 'Action' %}
                     </th>
@@ -55,7 +55,11 @@
                     {% endfor %}
                 </td>
                 <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
diff --git a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
index a1764df8..b57c4ad0 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/deadlines.html
@@ -45,8 +45,12 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:deadline-remove' obj.id deadline.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove deadline' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/documents.html b/compensation/templates/compensation/detail/eco_account/includes/documents.html
index f6376f46..3c8d89aa 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/documents.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/documents.html
@@ -43,8 +43,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/ema/templates/ema/detail/includes/actions.html b/ema/templates/ema/detail/includes/actions.html
index fcd1d274..7425e3c3 100644
--- a/ema/templates/ema/detail/includes/actions.html
+++ b/ema/templates/ema/detail/includes/actions.html
@@ -1,4 +1,4 @@
-{% load i18n l10n fontawesome_5 humanize %}
+{% load i18n l10n fontawesome_5 humanize ksp_filters %}
 <div id="actions" class="card">
     <div class="card-header rlp-r">
         <div class="row">
@@ -53,7 +53,11 @@
                     {% endfor %}
                 </td>
                 <td class="align-middle">{{ action.amount|floatformat:2|intcomma }} {{ action.unit_humanize }}</td>
-                <td class="align-middle">{{ action.comment|default_if_none:"" }}</td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ action.comment }}
+                    </div>
+                </td>
                 <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:action-remove' obj.id action.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove action' %}">
diff --git a/ema/templates/ema/detail/includes/deadlines.html b/ema/templates/ema/detail/includes/deadlines.html
index cfce5095..83ba4067 100644
--- a/ema/templates/ema/detail/includes/deadlines.html
+++ b/ema/templates/ema/detail/includes/deadlines.html
@@ -45,8 +45,12 @@
                     {% trans deadline.type_humanized %}
                 </td>
                 <td class="align-middle">{{ deadline.date|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ deadline.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ deadline.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <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' %}
diff --git a/ema/templates/ema/detail/includes/documents.html b/ema/templates/ema/detail/includes/documents.html
index 96a24a67..3218917c 100644
--- a/ema/templates/ema/detail/includes/documents.html
+++ b/ema/templates/ema/detail/includes/documents.html
@@ -43,8 +43,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/intervention/templates/intervention/detail/includes/documents.html b/intervention/templates/intervention/detail/includes/documents.html
index cc0c9a17..b8e8ab39 100644
--- a/intervention/templates/intervention/detail/includes/documents.html
+++ b/intervention/templates/intervention/detail/includes/documents.html
@@ -45,8 +45,12 @@
                         {{ doc.title }}
                     </a>
                 </td>
-                <td class="align-middle">{{ doc.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ doc.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'intervention:remove-doc' doc.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove document' %}">
                         {% fa5_icon 'trash' %}
diff --git a/intervention/templates/intervention/detail/includes/payments.html b/intervention/templates/intervention/detail/includes/payments.html
index 4277eb25..641f2c2f 100644
--- a/intervention/templates/intervention/detail/includes/payments.html
+++ b/intervention/templates/intervention/detail/includes/payments.html
@@ -47,8 +47,12 @@
                     {{ pay.amount|floatformat:2 }} €
                 </td>
                 <td class="align-middle">{{ pay.due_on|default_if_none:"---" }}</td>
-                <td class="align-middle">{{ pay.comment }}</td>
-                <td>
+                <td class="align-middle">
+                    <div class="scroll-150">
+                        {{ pay.comment }}
+                    </div>
+                </td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:pay:remove' pay.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove payment' %}">
                         {% fa5_icon 'trash' %}
diff --git a/intervention/templates/intervention/detail/includes/revocation.html b/intervention/templates/intervention/detail/includes/revocation.html
index cc3e7b3e..66e89261 100644
--- a/intervention/templates/intervention/detail/includes/revocation.html
+++ b/intervention/templates/intervention/detail/includes/revocation.html
@@ -56,8 +56,12 @@
                             </a>
                         {% endif %}
                     </td>
-                    <td class="align-middle">{{ rev.comment }}</td>
-                    <td>
+                    <td class="align-middle">
+                        <div class="scroll-150">
+                            {{ rev.comment }}
+                        </div>
+                    </td>
+                    <td class="align-middle">
                         {% if is_default_member and has_access  %}
                         <button data-form-url="{% url 'intervention:remove-revocation' rev.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove revocation' %}">
                             {% fa5_icon 'trash' %}
diff --git a/konova/templatetags/ksp_filters.py b/konova/templatetags/ksp_filters.py
index f311a538..f7820933 100644
--- a/konova/templatetags/ksp_filters.py
+++ b/konova/templatetags/ksp_filters.py
@@ -52,3 +52,19 @@ def default_if_zero(val1, val2):
 
     """
     return val1 if val1 > 0 else val2
+
+
+@register.filter("shorten")
+def shorten(val, length):
+    """ Returns val shortened to the first number of length character
+
+    Args:
+        val (str): The value
+        length (int): The number of characters left
+
+    Returns:
+
+    """
+    if val is not None and len(val) > length:
+        val = f"{val[:length]}..."
+    return val
diff --git a/templates/base.html b/templates/base.html
index 2f5e5b24..ccbd8f9f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -23,7 +23,7 @@
             {% include 'navbars/navbar.html' %}
         {% endblock %}
     </header>
-    <div class="container-fluid mt-3 px-5">
+    <div class="container-fluid mt-3">
         <div class="">
         {% for message in messages %}
             <div class="row alert alert-{{ message.tags }}">