#163 Checked icons improvement

* adds a second star icon on currently unchecked but previously checked entries
   --> can be detected easier for another check run
* simplifies some related code parts
* moves some translation string into message_templates.py
* enables session timeout after 60 minutes
* improves comment card layout sizing
* adds/updates translations

compensation/tables.py

@@ -5,17 +5,15 @@ Contact: michel.peltriaux@sgdnord.rlp.de
 Created on: 01.12.20
 
 """
-from user.models import User
+from konova.utils.message_templates import DATA_IS_UNCHECKED, DATA_CHECKED_ON_TEMPLATE, DATA_CHECKED_PREVIOUSLY_TEMPLATE
 from django.http import HttpRequest
 from django.template.loader import render_to_string
 from django.urls import reverse
 from django.utils.html import format_html
-from django.utils.timezone import localtime
 from django.utils.translation import gettext_lazy as _
 
 from compensation.filters import CompensationTableFilter, EcoAccountTableFilter
 from compensation.models import Compensation, EcoAccount
-from konova.sub_settings.django_settings import DEFAULT_DATE_TIME_FORMAT
 from konova.utils.tables import BaseTable, TableRenderMixin
 import django_tables2 as tables
 
@@ -111,16 +109,21 @@ class CompensationTable(BaseTable, TableRenderMixin):
         """
         html = ""
         checked = value is not None
-        tooltip = _("Not checked yet")
+        tooltip = DATA_IS_UNCHECKED
+        previously_checked = record.intervention.get_last_checked_action()
         if checked:
-            value = value.timestamp
-            value = localtime(value)
-            checked_on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
-            tooltip = _("Checked on {} by {}").format(checked_on, record.intervention.checked.user)
+            checked_on = value.get_timestamp_str_formatted()
+            tooltip = DATA_CHECKED_ON_TEMPLATE.format(checked_on, record.intervention.checked.user)
         html += self.render_checked_star(
             tooltip=tooltip,
             icn_filled=checked,
         )
+        if previously_checked and not checked:
+            checked_on = previously_checked.get_timestamp_str_formatted()
+            tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(checked_on, previously_checked.user)
+            html += self.render_previously_checked_star(
+                tooltip=tooltip,
+            )
         return format_html(html)
 
     def render_d(self, value, record: Compensation):
@@ -159,9 +162,7 @@ class CompensationTable(BaseTable, TableRenderMixin):
         recorded = value is not None
         tooltip = _("Not recorded yet")
         if recorded:
-            value = value.timestamp
-            value = localtime(value)
-            on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
+            on = value.get_timestamp_str_formatted()
             tooltip = _("Recorded on {} by {}").format(on, record.intervention.recorded.user)
         html += self.render_bookmark(
             tooltip=tooltip,
@@ -179,8 +180,6 @@ class CompensationTable(BaseTable, TableRenderMixin):
         Returns:
 
         """
-        if value is None:
-            value = User.objects.none()
         has_access = record.is_shared_with(self.user)
 
         html = self.render_icn(
@@ -318,9 +317,7 @@ class EcoAccountTable(BaseTable, TableRenderMixin):
         checked = value is not None
         tooltip = _("Not recorded yet. Can not be used for deductions, yet.")
         if checked:
-            value = value.timestamp
-            value = localtime(value)
-            on = value.strftime(DEFAULT_DATE_TIME_FORMAT)
+            on = value.get_timestamp_str_formatted()
             tooltip = _("Recorded on {} by {}").format(on, record.recorded.user)
         html += self.render_bookmark(
             tooltip=tooltip,

compensation/templates/compensation/detail/compensation/view.html

@@ -66,6 +66,11 @@
                                 <span>
                                     {% fa5_icon 'star' 'far' %}
                                 </span>
+                                {% if last_checked %}
+                                    <span class="rlp-gd-inv" title="{{last_checked_tooltip}}">
+                                        {% fa5_icon 'star' 'fas' %}
+                                    </span>
+                                {% endif %}
                             {% else %}
                                 <span class="check-star" title="{% trans 'Checked on '%} {{obj.intervention.checked.timestamp}} {% trans 'by' %} {{obj.intervention.checked.user}}">
                                     {% fa5_icon 'star' %}

compensation/views/compensation.py

@@ -23,7 +23,7 @@ from konova.utils.message_templates import FORM_INVALID, IDENTIFIER_REPLACED, DA
     CHECKED_RECORDED_RESET, COMPENSATION_ADDED_TEMPLATE, COMPENSATION_REMOVED_TEMPLATE, DOCUMENT_ADDED, \
     COMPENSATION_STATE_REMOVED, COMPENSATION_STATE_ADDED, COMPENSATION_ACTION_REMOVED, COMPENSATION_ACTION_ADDED, \
     DEADLINE_ADDED, DEADLINE_REMOVED, DOCUMENT_EDITED, COMPENSATION_STATE_EDITED, COMPENSATION_ACTION_EDITED, \
-    DEADLINE_EDITED, RECORDED_BLOCKS_EDIT, PARAMS_INVALID
+    DEADLINE_EDITED, RECORDED_BLOCKS_EDIT, PARAMS_INVALID, DATA_CHECKED_PREVIOUSLY_TEMPLATE
 from konova.utils.user_checks import in_group
 
 
@@ -217,8 +217,15 @@ def detail_view(request: HttpRequest, id: str):
 
     request = comp.set_status_messages(request)
 
+    last_checked = comp.intervention.get_last_checked_action()
+    last_checked_tooltip = ""
+    if last_checked:
+        last_checked_tooltip = DATA_CHECKED_PREVIOUSLY_TEMPLATE.format(last_checked.get_timestamp_str_formatted(), last_checked.user)
+
     context = {
         "obj": comp,
+        "last_checked": last_checked,
+        "last_checked_tooltip": last_checked_tooltip,
         "geom_form": geom_form,
         "parcels": parcels,
         "has_access": is_data_shared,