From f057ca824cc75b72dbe26f8f8f2465568e003d3f Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Thu, 27 Jan 2022 20:05:58 +0100
Subject: [PATCH] Improve chronos details display

---
 templates/followup/chronos/list_details.html  | 28 +++++++++++++------
 ultron/followup/templatetags/__init__.py      |  0
 .../templatetags/get_value_at_index.py        |  7 +++++
 ultron/followup/views.py                      | 22 ++++++++-------
 4 files changed, 39 insertions(+), 18 deletions(-)
 create mode 100644 ultron/followup/templatetags/__init__.py
 create mode 100644 ultron/followup/templatetags/get_value_at_index.py

diff --git a/templates/followup/chronos/list_details.html b/templates/followup/chronos/list_details.html
index 43590f75aa..09b7c8efc5 100644
--- a/templates/followup/chronos/list_details.html
+++ b/templates/followup/chronos/list_details.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load get_value_at_index %}
 
 {% block content %}
 <div class="card mb-0">
@@ -7,27 +8,31 @@
         <h4 class="card-title"> Chrono from {{ date_begin | date:'d-m-Y' }} to {{ date_end | date:'d-m-Y' }}</h4>
     </div>
     <div class="card-body pb-0 mb-0">
-        <div class="row mr-1 ml-1 pb-0 mb-0">
-            <div class="col-md-4">
-                <table class="table tablesorter table-striped" data-sort="table" id="chrono_values_table">
+        <div class="row pb-0 mb-0">
+            <div class="col-md-5">
+                <table class="table table-condensed" id="chrono_values_table">
                 {% for chrono in chrono_list %}
                 <tr>
                     {% for detail in chrono.details.all %}
-                        <td>{{ detail.value }}</td>
+                        {% with max_value=max_values|get_value_at_index:forloop.counter0 %}
+                        {% with min_value=min_values|get_value_at_index:forloop.counter0 %}
+                            <td class="{% if max_value.max_score == detail.value %}table-success{% endif %}{% if min_value.min_score == detail.value %}table-danger{% endif %}">{{ detail.value | floatformat:2 }}</td>
+                        {% endwith %}
+                        {% endwith %}
                     {% endfor %}
-                    <td class="text-right"><b>{{ chrono.score }}</b></td>
+                    <td class="text-right"><b>{{ chrono.score | floatformat:2 }}</b></td>
                 </tr>
                 {% endfor %}
                 <tr>
                     {% for element in average_values %}
-                        <td><b>{{ element.avg_score | floatformat:3 }}</b></td>
+                        <td><b>{{ element.avg_score | floatformat:2 }}</b></td>
                     {% endfor %}
                     <td class="text-right"><b></b></td>
                 </tr>
                 </table>
             </div>
-            <div class="col-md-8 offset-md-1 alert {% if request.session.template == 0 %}skill-info{% else %}alert-secondary{% endif %} mr-0 pb-0 pl-1 pr-1">
-                <canvas id="chartjs_chrono" class="chartjs" width="800" height="400"></canvas>
+            <div class="col-md-7 alert {% if request.session.template == 0 %}skill-info{% else %}alert-secondary{% endif %}">
+                <canvas id="chartjs_chrono" class="chartjs"></canvas>
             </div>
         </div>
     </div>
@@ -37,6 +42,13 @@
 
 {% block footerscript %}
 <script type="text/javascript">
+    // $('#chrono_values_table').DataTable({
+    //     paging: false,
+    //     searching: false,
+    //     ordering:  false,
+    //     "bInfo" : false,
+    // });
+
     var ctx = document.getElementById("chartjs_chrono").getContext("2d");
     var gradient_stroke_1 = ctx.createLinearGradient(0, 450, 0, 0);
 
diff --git a/ultron/followup/templatetags/__init__.py b/ultron/followup/templatetags/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/ultron/followup/templatetags/get_value_at_index.py b/ultron/followup/templatetags/get_value_at_index.py
new file mode 100644
index 0000000000..7f056154bb
--- /dev/null
+++ b/ultron/followup/templatetags/get_value_at_index.py
@@ -0,0 +1,7 @@
+from django import template
+
+register = template.Library()
+
+@register.filter
+def get_value_at_index(list, index):
+    return list[index]
\ No newline at end of file
diff --git a/ultron/followup/views.py b/ultron/followup/views.py
index b960aa4355..1465f1a325 100644
--- a/ultron/followup/views.py
+++ b/ultron/followup/views.py
@@ -62,27 +62,29 @@ def average_jump_chrono_details(request, gymnast_id, routine_type=1, date_begin=
     gymnast = get_object_or_404(Gymnast, pk=gymnast_id)
 
     base_queryset = ChronoDetails.objects \
-        .filter(chrono__gymnast=gymnast_id, chrono__chrono_type=routine_type, chrono__date__gte=date_begin, chrono__date__lte=date_end)
+        .filter(chrono__gymnast=gymnast_id, chrono__chrono_type=routine_type, chrono__date__gte=date_begin, chrono__date__lte=date_end) \
+        .values('order') \
 
     average_values = base_queryset \
-        .values('order') \
         .annotate(avg_score=Avg('value')) \
         .order_by('order')
-    # print(average_values)
+
     max_values = base_queryset \
-        .values('order') \
         .annotate(max_score=Max('value')) \
         .order_by('order')
-    # print(max_values)
+
     min_values = base_queryset \
-        .values('order') \
         .annotate(min_score=Min('value')) \
         .order_by('order')
-    # print(min_values)
 
-    # value_list = base_queryset.order_by('chrono', 'order')
+    # stat_values = ChronoDetails.objects \
+    #     .filter(chrono__gymnast=gymnast_id, chrono__chrono_type=routine_type, chrono__date__gte=date_begin, chrono__date__lte=date_end) \
+    #     .values('order') \
+    #     .annotate(avg_score=Avg('value'), max_score=Max('value'), min_score=Min('value')) \
+    #     .order_by('order')
+    # print(stat_values)
+
     chrono_list = Chrono.objects.filter(gymnast=gymnast_id, date__gte=date_begin, date__lte=date_end, chrono_type=routine_type)
-    # print(chrono_list)
 
     context = {
         "gymnast": gymnast,
@@ -91,7 +93,7 @@ def average_jump_chrono_details(request, gymnast_id, routine_type=1, date_begin=
         "average_values": average_values,
         "max_values": max_values,
         "min_values": min_values,
-        "chrono_list": chrono_list
+        "chrono_list": chrono_list,
     }
     return render(request, "followup/chronos/list_details.html", context)