From 7c64e898f4528470cb81d23dbe7ee952bc72aa4e Mon Sep 17 00:00:00 2001
From: relikd <info@relikd.de>
Date: Sun, 8 Oct 2023 17:27:54 +0200
Subject: [PATCH] feat: show upcoming traits

---
 app/base/models/person.py             | 6 ++++++
 app/base/static/css/style.css         | 5 ++++-
 app/base/templates/person_detail.html | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/base/models/person.py b/app/base/models/person.py
index cc95b4c..b0fff95 100755
--- a/app/base/models/person.py
+++ b/app/base/models/person.py
@@ -85,6 +85,12 @@ class Person(models.Model):
         return self.traits_at_date(datetime.now()).values_list(
             'pk', 'trait__key', 'trait__label')
 
+    @property
+    def upcoming_attributes(self):
+        today = datetime.now()
+        return self.traits.filter(Q(valid_from__gt=today)).values_list(
+            'pk', 'trait__key', 'trait__label', 'valid_from')
+
     @property
     def current_checkin(self):
         return Booking.currently_open_checkin(self)
diff --git a/app/base/static/css/style.css b/app/base/static/css/style.css
index f4dc05c..fe22955 100755
--- a/app/base/static/css/style.css
+++ b/app/base/static/css/style.css
@@ -223,7 +223,10 @@ table.clickable tbody>tr:hover>td {
 }
 
 .border1 {
-  border: 1px solid
+  border: 1px solid;
+}
+.border1d {
+  border: 1px dashed;
 }
 .font-sm {
   font-size: 90%
diff --git a/app/base/templates/person_detail.html b/app/base/templates/person_detail.html
index 79afdc4..58e1faf 100755
--- a/app/base/templates/person_detail.html
+++ b/app/base/templates/person_detail.html
@@ -18,6 +18,10 @@
           {% for attr in object.attributes|dictsort:2 %}
           <a class="badge text-primary border1" href="{% url 'trait-mapping:detail' attr.0 %}">{{ attr.2 }}</a>
           {% endfor %}
+          {% for attr in object.upcoming_attributes|dictsort:3 %}
+          <span class="small text-secondary">, ab {{ attr.3|date:'d.m.' }}:</span>
+          <a class="badge text-primary border1d" href="{% url 'trait-mapping:detail' attr.0 %}">{{ attr.2 }}</a>
+          {% endfor %}
           <a class="badge bg-secondary" href="{% url 'trait-mapping:create' %}{{ back_query_w_user }}" title="Attribut hinzufügen"><i class="fas fa-plus"></i></a>
           <a class="small text-secondary" href="{% url 'trait-mapping:list' %}{{ back_query_w_user }}">(alle anzeigen)</a>
         </div>