From e1865c726744558e38a7a8d4cb0447fee2700148 Mon Sep 17 00:00:00 2001
From: mpeltriaux <michel.peltriaux@sgdnord.rlp.de>
Date: Mon, 31 Jan 2022 12:21:42 +0100
Subject: [PATCH] #88 Extra biotope codes templates

* extends the detail view templates for all compensation related models to render extra CompensationState details as well
* reduces number of landing page news from 4 to 3
* improves .card-text in favor of .scroll-150
* improves .card font size
---
 .../detail/compensation/includes/states-after.html | 14 ++++++++++++--
 .../compensation/includes/states-before.html       | 14 ++++++++++++--
 .../detail/eco_account/includes/states-after.html  | 14 ++++++++++++--
 .../detail/eco_account/includes/states-before.html | 14 ++++++++++++--
 .../ema/detail/includes/states-after.html          | 14 ++++++++++++--
 .../ema/detail/includes/states-before.html         | 14 ++++++++++++--
 konova/static/css/konova.css                       | 13 ++++++-------
 konova/templates/konova/includes/comment_card.html |  2 +-
 konova/views.py                                    |  2 +-
 news/templates/news/dashboard-news.html            |  2 +-
 news/templates/news/index.html                     |  2 +-
 11 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/compensation/templates/compensation/detail/compensation/includes/states-after.html b/compensation/templates/compensation/detail/compensation/includes/states-after.html
index f8dd00a..3f0b4ee 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-after.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-after.html
@@ -29,9 +29,12 @@
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
+                <th class="w-25" scope="col">
+                    {% trans 'Biotope additional type' %}
+                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
@@ -48,8 +51,15 @@
                 <td class="align-middle">
                     {{ state.biotope_type }}
                 </td>
+                <td class="align-middle">
+                    {% for biotope_extra in state.biotope_extra_types.all %}
+                    <div class="mb-2" title="{{ biotope_extra }}">
+                        {{ biotope_extra.long_name }}
+                    </div>
+                    {% endfor %}
+                </td>
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/compensation/includes/states-before.html b/compensation/templates/compensation/detail/compensation/includes/states-before.html
index 39b5e03..168524c 100644
--- a/compensation/templates/compensation/detail/compensation/includes/states-before.html
+++ b/compensation/templates/compensation/detail/compensation/includes/states-before.html
@@ -29,9 +29,12 @@
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
+                <th class="w-25" scope="col">
+                    {% trans 'Biotope additional type' %}
+                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
@@ -48,8 +51,15 @@
                 <td class="align-middle">
                     {{ state.biotope_type }}
                 </td>
+                <td class="align-middle">
+                    {% for biotope_extra in state.biotope_extra_types.all %}
+                    <div class="mb-2" title="{{ biotope_extra }}">
+                        {{ biotope_extra.long_name }}
+                    </div>
+                    {% endfor %}
+                </td>
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-after.html b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
index eab29ad..2d9b32e 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-after.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-after.html
@@ -29,9 +29,12 @@
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
+                <th class="w-25" scope="col">
+                    {% trans 'Biotope additional type' %}
+                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
@@ -48,8 +51,15 @@
                 <td class="align-middle">
                     {{ state.biotope_type }}
                 </td>
+                <td class="align-middle">
+                    {% for biotope_extra in state.biotope_extra_types.all %}
+                    <div class="mb-2" title="{{ biotope_extra }}">
+                        {{ biotope_extra.long_name }}
+                    </div>
+                    {% endfor %}
+                </td>
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc-state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
diff --git a/compensation/templates/compensation/detail/eco_account/includes/states-before.html b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
index ea3df84..45ee416 100644
--- a/compensation/templates/compensation/detail/eco_account/includes/states-before.html
+++ b/compensation/templates/compensation/detail/eco_account/includes/states-before.html
@@ -29,9 +29,12 @@
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
+                <th class="w-25" scope="col">
+                    {% trans 'Biotope additional type' %}
+                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
@@ -48,8 +51,15 @@
                 <td class="align-middle">
                     {{ state.biotope_type }}
                 </td>
+                <td class="align-middle">
+                    {% for biotope_extra in state.biotope_extra_types.all %}
+                    <div class="mb-2" title="{{ biotope_extra }}">
+                        {{ biotope_extra.long_name }}
+                    </div>
+                    {% endfor %}
+                </td>
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'compensation:acc-state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
diff --git a/ema/templates/ema/detail/includes/states-after.html b/ema/templates/ema/detail/includes/states-after.html
index 0e6aa16..0cbb5fd 100644
--- a/ema/templates/ema/detail/includes/states-after.html
+++ b/ema/templates/ema/detail/includes/states-after.html
@@ -29,9 +29,12 @@
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
+                <th class="w-25" scope="col">
+                    {% trans 'Biotope additional type' %}
+                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
@@ -46,8 +49,15 @@
                 <td class="align-middle">
                     {{ state.biotope_type }}
                 </td>
+                <td class="align-middle">
+                    {% for biotope_extra in state.biotope_extra_types.all %}
+                    <div class="mb-2" title="{{ biotope_extra }}">
+                        {{ biotope_extra.long_name }}
+                    </div>
+                    {% endfor %}
+                </td>
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
diff --git a/ema/templates/ema/detail/includes/states-before.html b/ema/templates/ema/detail/includes/states-before.html
index 42c0eb1..61dbc0c 100644
--- a/ema/templates/ema/detail/includes/states-before.html
+++ b/ema/templates/ema/detail/includes/states-before.html
@@ -29,9 +29,12 @@
         <table class="table table-hover">
             <thead>
             <tr>
-                <th scope="col">
+                <th class="w-25" scope="col">
                     {% trans 'Biotope type' %}
                 </th>
+                <th class="w-25" scope="col">
+                    {% trans 'Biotope additional type' %}
+                </th>
                 <th scope="col">
                     {% trans 'Surface' %}
                 </th>
@@ -46,8 +49,15 @@
                 <td class="align-middle">
                     {{ state.biotope_type }}
                 </td>
+                <td class="align-middle">
+                    {% for biotope_extra in state.biotope_extra_types.all %}
+                    <div class="mb-2" title="{{ biotope_extra }}">
+                        {{ biotope_extra.long_name }}
+                    </div>
+                    {% endfor %}
+                </td>
                 <td class="align-middle">{{ state.surface|floatformat:2 }} m²</td>
-                <td>
+                <td class="align-middle">
                     {% if is_default_member and has_access  %}
                     <button data-form-url="{% url 'ema:state-remove' obj.id state.id %}" class="btn btn-default btn-modal" title="{% trans 'Remove state' %}">
                         {% fa5_icon 'trash' %}
diff --git a/konova/static/css/konova.css b/konova/static/css/konova.css
index a088cc3..6d882ec 100644
--- a/konova/static/css/konova.css
+++ b/konova/static/css/konova.css
@@ -121,18 +121,12 @@ a {
 
 .card{
     margin: 0 0.5rem 0.5rem 0;
-    font-size: 12px;
+    font-size: 0.9rem;
 }
 .card:hover{
     box-shadow: 1px 1px 3px var(--rlp-gray-light);
 }
 
-.card .card-text{
-    font-size: 12px;
-    max-height: 150px;
-    overflow: auto;
-}
-
 .qs-box{
     background-color: var(--rlp-red);
     color: white;
@@ -215,6 +209,11 @@ Overwrites bootstrap .btn:focus box shadow color
     color: var(--rlp-red);
 }
 
+.scroll-150{
+    max-height: 150px;
+    overflow: auto;
+}
+
 .scroll-300{
     max-height: 300px;
     overflow: auto;
diff --git a/konova/templates/konova/includes/comment_card.html b/konova/templates/konova/includes/comment_card.html
index 0cc91bf..a84f378 100644
--- a/konova/templates/konova/includes/comment_card.html
+++ b/konova/templates/konova/includes/comment_card.html
@@ -19,7 +19,7 @@
             </div>
         </div>
         <div class="card-body">
-            <div class="card-text font-italic">
+            <div class="scroll-150 font-italic">
                 {{obj.comment}}
             </div>
         </div>
diff --git a/konova/views.py b/konova/views.py
index abfea28..d46a022 100644
--- a/konova/views.py
+++ b/konova/views.py
@@ -60,7 +60,7 @@ def home_view(request: HttpRequest):
         unpublish_on__gte=now,
     ).order_by(
         "-publish_on"
-    )[:4]
+    )[:3]
 
     # First fetch all valid objects (undeleted, only newest versions)
     interventions = Intervention.objects.filter(
diff --git a/news/templates/news/dashboard-news.html b/news/templates/news/dashboard-news.html
index f6aa9c6..f462e10 100644
--- a/news/templates/news/dashboard-news.html
+++ b/news/templates/news/dashboard-news.html
@@ -10,7 +10,7 @@
                         {{msg.subject}}
                     </h6>
                     <small>{% trans 'Published on' %} {{msg.publish_on}}</small>
-                    <article class="card-text">{{msg.body|safe}}</article>
+                    <article class="scroll-150">{{msg.body|safe}}</article>
                 </div>
             </div>
         </div>
diff --git a/news/templates/news/index.html b/news/templates/news/index.html
index d4b1647..6521a1c 100644
--- a/news/templates/news/index.html
+++ b/news/templates/news/index.html
@@ -19,7 +19,7 @@
                             <small> {% trans 'Published on' %} {{msg.publish_on}}</small>
                         </h5>
                         <small></small>
-                        <article class="card-text">{{msg.body|safe}}</article>
+                        <article class="scroll-150">{{msg.body|safe}}</article>
                     </div>
                 </div>
             {% endfor %}