Bug fix

Refactor URL
Bug fix in template
2022-10-13 21:45:05 +02:00 · 2022-10-13 21:45:05 +02:00 · 2022-10-13 21:45:05 +02:00 · 2022-10-13 21:45:05 +02:00 · 2022-10-13 21:45:05 +02:00 · 2022-10-13 21:45:05 +02:00
9 changed files with 495 additions and 12 deletions
--- a/templates/followup/chronos/details.html
+++ b/templates/followup/chronos/details.html
@ -4,7 +4,7 @@
 <div class="card mb-0">
    <div class="card-header">
        <h3 class="mb-0"><a href="{% url 'gymnast_details_tab' chrono.gymnast.id 'scores' %}">{{ chrono.gymnast }}</a></h3>
-        <h4 class="card-title"> Chrono {{ chrono.date | date:'d-m-Y' }}</h4>
+        <h4 class="card-title"> Chrono of {{ chrono.date | date:'d N Y' }}</h4>
    </div>
    <div class="card-body pb-0 mb-0">
        <div class="row mr-1 ml-1 pb-0 mb-0">
@ -23,7 +23,7 @@
                </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>
+                <canvas id="chartjs_chrono_details" class="chartjs" width="800" height="400"></canvas>
            </div>
        </div>
    </div>
@ -33,7 +33,7 @@

 {% block footerscript %}
 <script type="text/javascript">
-    var ctx = document.getElementById("chartjs_chrono").getContext("2d");
+    var ctx = document.getElementById("chartjs_chrono_details").getContext("2d");
    var gradient_stroke_1 = ctx.createLinearGradient(0, 450, 0, 0);

    gradient_stroke_1.addColorStop(1, 'rgba(255, 99, 132, 0.4)');
@ -41,16 +41,24 @@
    gradient_stroke_1.addColorStop(0.5, 'rgba(255, 99, 132, 0.2)');
    gradient_stroke_1.addColorStop(0.25, 'rgba(255, 99, 132, 0)');

-    new Chart(document.getElementById("chartjs_chrono"), {
+    new Chart(document.getElementById("chartjs_chrono_details"), {
        type: 'line',
        data: {
-            labels: [{% for detail in chrono.details.all %}{{ detail.order }}, {% endfor %}],
+            labels: [
+                {% for detail in chrono.details.all %}
+                    {{ detail.order }},
+                {% endfor %}
+            ],
            datasets: [{
-                data: [{% for detail in chrono.details.all %}{{ detail.value }}, {% endfor %}],
-                pointBackgroundColor: 'rgb(255, 99, 132)',
-                borderColor: 'rgb(255, 99, 132)',
                backgroundColor: gradient_stroke_1,
+                borderColor: 'rgb(255, 99, 132)',
+                pointBackgroundColor: 'rgb(255, 99, 132)',
                fill: true,
+                data: [
+                    {% for detail in chrono.details.all %}
+                        {{ detail.value }},
+                    {% endfor %}
+                ],
            }]
        },
        options: {
--- a/templates/followup/chronos/list.html
+++ b/templates/followup/chronos/list.html
@ -40,6 +40,10 @@
                                    <a href="{% url 'chrono_update' chrono.id %}">
                                        <span class="tim-icons icon-pencil text-warning"></span>
                                    </a>
+                                    &nbsp;
+                                    <a href="{% url 'jump_chrono_values_create_or_update' chrono.id %}">
+                                        <span class="far fa-search-plus text-warning"></span>
+                                    </a>
                                </td>
                                <td>
                                    {% if chrono.details.all %}
--- a/templates/followup/chronos/list_details.html
+++ b/templates/followup/chronos/list_details.html
@ -0,0 +1,112 @@
+{% extends "base.html" %}
+{% load get_value_at_index %}
+
+{% block content %}
+<div class="card mb-0">
+    <div class="card-header">
+        <h3 class="mb-0"><a href="{% url 'gymnast_details_tab' gymnast.id 'scores' %}">{{ gymnast }}</a></h3>
+        Chrono from <i>{{ date_begin | date:'j M Y' }}</i> to <i>{{ date_end | date:'j M Y' }}</i>
+    </div>
+    <div class="card-body pb-0 mb-0">
+        <div class="row pb-0 mb-0">
+            {% if chrono_list %}
+            <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 %}
+                            {% with stat_value=stat_values|get_value_at_index:forloop.counter0 %}
+                                <td class="{% if stat_value.max_score == detail.value %}cell-success{% endif %}{% if stat_value.min_score == detail.value %}cell-danger{% endif %}">{{ detail.value | floatformat:2 }}</td>
+                            {% endwith %}
+                        {% endfor %}
+                        <td class="text-right"><b>{{ chrono.score | floatformat:2 }}</b></td>
+                    </tr>
+                    {% endfor %}
+                    <tr>
+                        {% for value in stat_values %}
+                            <td><b>{{ value.avg_score | floatformat:2 }}</b></td>
+                        {% endfor %}
+                        <td class="text-right"><b></b></td>
+                    </tr>
+                    <!-- <tr>
+                        {% for value in stat_values %}
+                            <td><b>{{ value.min_score | floatformat:2 }}</b></td>
+                        {% endfor %}
+                        <td class="text-right"><b></b></td>
+                    </tr><tr>
+                        {% for value in stat_values %}
+                            <td><b>{{ value.max_score | floatformat:2 }}</b></td>
+                        {% endfor %}
+                        <td class="text-right"><b></b></td> -->
+                    </tr>
+                </table>
+            </div>
+            <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>
+            {% else %}
+            <div class="col-md-5">
+                No chrono with the selected criteria.
+                <br />
+                <br />
+            </div>
+            {% endif %}
+        </div>
+    </div>
+</div>
+
+{% endblock %}
+
+{% 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);
+
+    gradient_stroke_1.addColorStop(1, 'rgba(255, 99, 132, 0.4)');
+    gradient_stroke_1.addColorStop(0.75, 'rgba(255, 99, 132, 0.3)');
+    gradient_stroke_1.addColorStop(0.5, 'rgba(255, 99, 132, 0.2)');
+    gradient_stroke_1.addColorStop(0.25, 'rgba(255, 99, 132, 0)');
+
+    new Chart(document.getElementById("chartjs_chrono"), {
+        type: 'line',
+        data: {
+            labels: [
+                {% for value in stat_values %}
+                    {{ value.avg_score | floatformat:3 }},
+                {% endfor %}
+            ],
+            datasets: [{
+                data: [
+                    {% for value in stat_values %}
+                        {{ value.avg_score | floatformat:3 }},
+                    {% endfor %}
+                ],
+                pointBackgroundColor: 'rgb(255, 99, 132)',
+                borderColor: 'rgb(255, 99, 132)',
+                backgroundColor: gradient_stroke_1,
+                fill: true,
+            }]
+        },
+        options: {
+            // scales: {
+            //     yAxes: [{
+            //         ticks: {
+            //             suggestedMin: {{ min_value }},
+            //             suggestedMax: {{ max_value }},
+            //         }
+            //     }]
+            // },
+            legend: {
+                display: false,
+            }
+        },
+    });
+</script>
+{% endblock %}
--- a/templates/followup/notes/details.html
+++ b/templates/followup/notes/details.html
@ -3,7 +3,7 @@
 {% block content %}
 <div class="card mb-0">
    <div class="card-header">
-        <h3 class="mb-0"><a href="{% url 'gymnast_details_tab' note.gymnast.id 'event' %}">{{ note.gymnast }}</a></h3>
+        <h3 class="mb-0"><a href="{% url 'gymnast_details_tab' note.gymnast.id 'scores' %}">{{ note.gymnast }}</a></h3>
        <h4 class="card-title"> Note of {{ note.created_at | date:'d-m-Y' }}</h4>
    </div>
    <div class="card-body pb-0 mb-0">
--- a/templates/people/gymnasts/list_events_and_notes.html
+++ b/templates/people/gymnasts/list_events_and_notes.html
@ -0,0 +1,204 @@
+{% load has_group %}
+
+<div class="row justify-content-center ml-1">
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header">
+                <h4>Next events</h4>
+            </div>
+            <div class="card-body pt-0">
+                {% if next_event_list %}
+                    <table class="table tablesorter table-condensed table-striped" id="next_events">
+                        <thead>
+                            <tr>
+                                <th style="width: 3%"></th>
+                                <th style="width: 25%" class='header text-left'>Name</th>
+                                <th style="width: 24%" class='header text-left'>Type</th>
+                                <th style="width: 9%" class='header text-center'>Date</th>
+                                <th style="width: 7%" class='header text-center'># weeks</th>
+                                <th style="width: 30%" class='header text-left'>Place</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for event in next_event_list %}
+                            <tr>
+                                <td class="text-left">
+                                    <a href="{% url 'event_update' event.id %}">
+                                        &nbsp;<span class="tim-icons icon-pencil text-warning"></span>
+                                    </a>
+                                </td>
+                                <td class="text-left"><a href="{% url 'event_details' event.id %}">{{ event.name }}</a></td>
+                                <td class="text-left">{{ event.event_type.name }}</td>
+                                <td class="text-center">{{ event.date_begin | date:"d-m-Y"}}</td>
+                                <td class="text-center">{% if event.number_of_week_from_today < 0 %}{{event.number_of_week_from_today}}{% else %}<span class="text-{% if event.number_of_week_from_today > 12 %}success{% elif event.number_of_week_from_today > 9 %}info{% elif event.number_of_week_from_today > 6 %}warning{% else %}danger{% endif %}"><b>{{event.number_of_week_from_today}}</b></span>{% endif %}</td>
+                                <td class="text-left"><a href="{% url 'place_details' event.place.id %}">{{ event.place.name }}</a></td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                {% else %}
+                    <p class="text-muted">No next event associated to this gymnast.</p>
+                {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script type="text/javascript">
+        $(document).ready(function(){
+            $('#next_events').tablesorter({
+                dateFormat: "uk",
+                headers: {
+                    0: { sorter: false },      // disable first column
+                },
+                sortList: [[3,0]]
+            });
+        });
+    </script>
+</div>
+
+<div class="row justify-content-center ml-1">
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header">
+                <h4>Notes</h4>
+            </div>
+            <div class="card-body pt-0">
+                {% if last_notes_list %}
+                <table class="table tablesorter table-condensed table-striped" id="notes">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th class='header text-center'>Date</th>
+                            <th class='header text-center'>Coach</th>
+                            <!-- <th class='header text-left'>Place</th> -->
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for note in last_notes_list %}
+                        <tr>
+                            <td class="text-left">
+                                <a href="{% url 'note_update' note.id %}">
+                                    <span class="tim-icons icon-pencil text-warning"></span>
+                                </a>
+                            </td>
+                            <td class="text-left"><a href="{% url 'note_details' note.id %}">{{ note.created_at | date:"d-m-Y" }}</a></td>
+                            <td class="text-left">{{ note.coach }}</td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+                {% else %}
+                    <p class="text-muted">No note for this gymnast.</p>
+                {% endif %}
+            </div>
+            <div class="card-footer text-right text-muted pt-0">
+                {% if request.user|has_group:"trainer" %}
+                    <a href="{% url 'note_create_for_gymnast' gymnast_id %}">
+                        <button type="submit" value="add" class="btn btn-icon btn-warning ">
+                            <i class="tim-icons icon-simple-add"></i>
+                        </button>
+                    </a>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        $('#notes').tablesorter({
+            dateFormat: "uk",
+            headers: {
+                0: { sorter: false },      // disable first column
+            },
+            sortList: [[3,1]],
+        });
+    });
+</script>
+
+{% if previous_events %}
+<div class="row justify-content-center ml-3 pr-0">
+    <div class="col-md-12 pr-0">
+        <div class="card">
+            <div class="card-header">
+                <h4>Previous event</h4>
+            </div>
+            <div class="card-body">
+                <table class="table" id="previous_events">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th class='header text-left'>Event's name</th>
+                            <th class='header text-left'>Type</th>
+                            <th class='header text-center'>Date</th>
+                            <th class='header text-center'># weeks</th>
+                            <th class='header text-left'>Place</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for event in previous_event %}
+                        <tr>
+                            <td class="text-left">
+                                <a href="{% url 'event_update' event.id %}">
+                                    <span class="tim-icons icon-pencil text-warning"></span>
+                                </a>
+                            </td>
+                            <td class="text-left"><a href="{% url 'event_details' event.id %}">{{ event.name }}</a></td>
+                            <td class="text-left">{{ event.event_type.name }}</td>
+                            <td class="text-center">{{ event.date_begin | date:"d-m-Y"}}</td>
+                            <td class="text-center">{{ event.number_of_week_from_today }}</td>
+                            <td class="text-left"><a href="{% url 'place_details' event.place.id %}">{{ event.place.name }}</a></td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-12 pr-0">
+        <div class="card">
+            <div class="card-header">
+                <h4>Last notes</h4>
+            </div>
+            <div class="card-body">
+                <table class="table" id="previous_events">
+                    <thead>
+                        <tr>
+                            <th></th>
+                            <th class='header text-center'>Date</th>
+                            <th class='header text-center'>Coach</th>
+                            <!-- <th class='header text-left'>Place</th> -->
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for note in last_notes_list %}
+                        <tr>
+                            <td class="text-left">
+                                <a href="{% url 'note_update' note.id %}">
+                                    <span class="tim-icons icon-pencil text-warning"></span>
+                                </a>
+                            </td>
+                            <td class="text-left"><a href="{% url 'note_details' note.id %}">{{ note.created_at | date:"d-m-Y" }}</a></td>
+                            <td class="text-left">{{ note.coach }}</td>
+                        </tr>
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+        $('#previous_events').tablesorter({
+            dateFormat: "uk",
+            headers: {
+                0: { sorter: false },      // disable first column
+            },
+            sortList: [[3,1]],
+        });
+    });
+</script>
+{% endif %}
--- a/templates/people/gymnasts/tab_skill.html
+++ b/templates/people/gymnasts/tab_skill.html
@ -203,7 +203,7 @@
                    {% endif %}

                    {% if skill_chained %}
-                    <div class="tab-pane {% if skill_without_help and not skill_whith_help and not planified_skill %}active{% endif %}" id="skill_chained">
+                    <div class="tab-pane {% if skill_chained and not skill_without_help and not skill_whith_help and not planified_skill %}active{% endif %}" id="skill_chained">
                        <table class="table table-striped table-condensed tablesorter" id="table_skill_chained">
                            <thead>
                                <tr>
--- a/ultron/followup/tests_urls.py
+++ b/ultron/followup/tests_urls.py
@ -15,7 +15,7 @@ class URLTestCase(TestCase):
        self.assertEqual(resolve("/follow-up/chrono/details/1/add/").view_name, 'jump_chrono_values_create_or_update')
        self.assertEqual(resolve("/follow-up/chrono/add_jump_chrono_value/").view_name, 'add_jump_chrono_value')
        self.assertEqual(resolve("/follow-up/chrono/remove_jump_chrono_value/").view_name, 'remove_jump_chrono_value')
-        self.assertEqual(resolve("/follow-up/chrono/detailed_score_for_date_range/1/").view_name, 'average_jump_chrono_details')
+        self.assertEqual(resolve("/follow-up/chrono/detailed_score_for_date_range/1/1/2022-09-01/2022-09-20/").view_name, 'average_jump_chrono_details_between_two_date')

        # Learned Skill URL
        self.assertEqual(resolve("/follow-up/learnedskill/add/").view_name, 'learnedskill_create')
--- a/ultron/followup/urls.py
+++ b/ultron/followup/urls.py
@ -18,6 +18,19 @@ urlpatterns = [
    ),
    path(r"chrono/edit/<int:chrono_id>/", views.chrono_create_or_update, name="chrono_update"),
    path(r"chrono/details/<int:chrono_id>/", views.jump_chrono_details, name="jump_chrono_details"),
+    path(r"chrono/details/<int:chrono_id>/add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"),
+    path(
+        r"chrono/add_jump_chrono_value/",
+        views.add_jump_chrono_value,
+        name="add_jump_chrono_value"
+    ),
+    path(
+        r"chrono/remove_jump_chrono_value/",
+        views.remove_jump_chrono_value,
+        name="remove_jump_chrono_value"
+    ),
+    path(r"chrono/range/<str:date_begin>/<str:date_end>/gymnast/<int:gymnast_id>/routine_type<int:routine_type>/", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"),
+    path(r"chrono/season/<str:season>/week/<str:week_number>/gymnast/<int:gymnast_id>/routine_type/<int:routine_type>/", views.average_jump_chrono_details_for_week_of_season, name="average_jump_chrono_details_for_week_of_season"),


    path(r"note/", views.note_listing, name="note_list"),
--- a/ultron/followup/views.py
+++ b/ultron/followup/views.py
@ -37,14 +37,26 @@ from .forms import (
    NumberOfRoutineDoneForm,
 )

+from ultron.tools.date_week_transition import (
+    from_date_to_week_number,
+    from_week_number_to_date,
+)
+
+from ultron.tools.models import Season
+
 from datetime import date, datetime
 import pendulum
+import re


@login_required
@require_http_methods(["GET"])
 def jump_chrono_details(request, chrono_id):
-    """Récupère toutes les informations d'un chrono"""
+    """Récupère toutes les informations d'un chrono
+
+    Args:
+        chrono_id   (int)   identifiant chrono
+    """

    chrono = get_object_or_404(Chrono, pk=chrono_id)

@ -63,6 +75,136 @@ def jump_chrono_details(request, chrono_id):
    return render(request, "followup/chronos/details.html", context)


+@login_required
+@require_http_methods(["GET"])
+def average_jump_chrono_details_for_week_of_season(request, gymnast_id, routine_type=1, season=None, week_number=1):
+    """ Récupère tout les chronos entre deux date pour un gymnaste et un type de série
+
+    Args:
+        gymnast_id      int     Identifiant d'un gymnaste
+        routine_type    int     Type de série (cf. ultron/followup/models.py > ROUTINE_CHOICE)
+        season          string  Saison sous forme "xxxx-xxxy"
+        week_number     int     numéro de semaine (1, …, 52)
+    """
+    today = pendulum.now().date()
+    week_number = int(week_number)
+
+    if week_number > 52:
+        week_number = 52
+
+    if week_number < 1:
+        week_number = 1
+
+    season = Season(season)
+    date_begin, date_end = from_week_number_to_date(season.label, week_number)
+
+    return average_jump_chrono_details_between_two_date(
+        request,
+        gymnast_id,
+        routine_type, date_begin.strftime('%Y-%m-%d'),
+        date_end.strftime('%Y-%m-%d')
+    )
+
+
+@login_required
+@require_http_methods(["GET"])
+def average_jump_chrono_details_between_two_date(request, gymnast_id, routine_type=1, date_begin=None, date_end=None):
+    """Récupère tout les chronos entre deux date pour un gymnaste et un type de série
+
+    Args:
+        gymnast_id      int     Identifiant d'un gymnaste
+        routine_type    int     Type de série (cf. ultron/followup/models.py > ROUTINE_CHOICE)
+        date_begin      date    Date de début
+        date_end        date    Date de fin
+    """
+
+    if date_end:
+        try:
+            date_end = datetime.strptime(date_end, '%Y-%m-%d').date()
+        except (ValueError, TypeError):
+            date_end = pendulum.now().date()
+    else:
+        date_end = pendulum.now().date()
+
+    if date_begin:
+        try:
+            date_begin = datetime.strptime(date_begin, '%Y-%m-%d').date()
+        except (ValueError, TypeError):
+            date_begin = datetime(date_end.year, 9, 1)
+    else:
+        date_begin = datetime(date_end.year, 9, 1)
+
+    gymnast = get_object_or_404(Gymnast, pk=gymnast_id)
+
+    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')
+
+    chrono_list = Chrono.objects.filter(gymnast=gymnast_id, date__gte=date_begin, date__lte=date_end, chrono_type=routine_type)
+
+    context = {
+        "gymnast": gymnast,
+        "date_begin": date_begin,
+        "date_end": date_end,
+        "chrono_list": chrono_list,
+        "stat_values": stat_values,
+    }
+    return render(request, "followup/chronos/list_details.html", context)
+
+
+@require_http_methods(["POST"])
+def remove_jump_chrono_value(request):
+    """
+    Recoit trois informations permettant d'ajouter le chrono d'un saut à un chrono
+    """
+    chrono_id = request.POST.get("chrono_id", None)
+    order = request.POST.get("order", None)
+    chrono = get_object_or_404(Chrono, pk=chrono_id)
+    row, deleted = ChronoDetails.objects.filter(chrono=chrono, order=order).delete()
+    return HttpResponse(200, (row, deleted))
+
+
+@require_http_methods(["POST"])
+def add_jump_chrono_value(request):
+    """
+    Recoit trois informations permettant d'ajouter le chrono d'un saut à un chrono
+    """
+    chrono_id = request.POST.get("chrono_id", None)
+    order = request.POST.get("order", None)
+    value = request.POST.get("value", None)
+
+    chrono = get_object_or_404(Chrono, pk=chrono_id)
+    row, created = ChronoDetails.objects.get_or_create(
+        chrono=chrono, order=order, value=value
+    )
+
+    return HttpResponse(200, (row, created))
+
+
+@login_required
+@require_http_methods(["GET"])
+def jump_chrono_values_create_or_update(request, chrono_id):
+    """
+    Ajoute des scores de saut à un chrono.
+
+    Args:
+        chrono_id   (int)   identifiant chrono
+    """
+
+    chrono = get_object_or_404(Chrono, pk=chrono_id)
+    jump_list = chrono.details.all()
+    number_of_jump = jump_list.count()
+    context = {
+        "chrono": chrono,
+        "jump_list": jump_list,
+        "number_of_jump": number_of_jump,
+        "score_type": chrono.score_type,
+    }
+    return render(request, "followup/chronos/add_details.html", context)
+
+
@login_required
@require_http_methods(["GET"])
 def chrono_listing(request, gymnast_id=None):