Refactor URL

templates/followup/accidents/list.html

@@ -40,7 +40,7 @@
                                 </a>
                             </td>
                             <td class="text-left"><a href="{% url 'accident_details' accident.id %}">{{ accident.date | date:"d-m-Y" }}</a></td>
-                            <td class="text-left"><a href="{% url 'gymnast_details' accident.gymnast.id %}">{{ accident.gymnast }}</a></td>
+                            <td class="text-left"><a href="{% url 'gymnast_details_tab' accident.gymnast.id 'physiological' %}">{{ accident.gymnast }}</a></td>
                             <td class="text-left">
                                 {% if accident.skill %}
                                     <a href="{% url 'skill_details' accident.skill.id %}">{{ accident.skill }}</a>

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: {

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 %}

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 %}

templates/followup/learnedskills/create.html

@@ -42,10 +42,10 @@
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_type" class="col-4 col-sm-3 col-form-label">Type</label>
-                        <div class="col-8 col-sm-4 col-md-3 {% if form.type.errors %}has-danger{% endif %}">
-                            {{ form.cando }}
-                            {% if form.cando.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.cando.errors %}{{error}}{% endfor %}</span>{% endif %}
+                        <label for="id_learning_step" class="col-4 col-sm-3 col-form-label">Learning step</label>
+                        <div class="col-8 col-sm-4 col-md-3 {% if form.learning_step.errors %}has-danger{% endif %}">
+                            {{ form.learning_step }}
+                            {% if form.learning_step.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.learning_step.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     {% if plan_id %}

templates/followup/notes/create.html

@@ -22,7 +22,14 @@
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Informations</label>
+                        <label for="id_date" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Date <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-8 col-sm-6 col-md-4 col-lg-4 col-xl-4 {% if form.date.errors %}has-danger{% endif %}">
+                            {{ form.date }}
+                            {% if form.date.errors %}<span class="btn btn-sm btn-danger-outline">{% for error in form.date.errors %}{{error}}{% endfor %}</span>{% endif %}
+                        </div>
+                    </div>
+                    <div class="form-group row ">
+                        <label for="id_information" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Informations <span class="text-danger"><b>*</b></span></label>
                         <div class="col-8 col-sm-10 col-md-10 col-lg-10 col-xl-10 {% if form.id_informations.errors %}has-danger{% endif %}">
                             {{ form.informations }}
                         </div>

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">

templates/followup/plan/create.html

@@ -41,10 +41,10 @@
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_type" class="col-4 col-sm-3 col-form-label">Type</label>
-                        <div class="col-8 col-sm-4 col-md-3 {% if form.type.errors %}has-danger{% endif %}">
-                            {{ form.cando }}
-                            {% if form.cando.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.cando.errors %}{{error}}{% endfor %}</span>{% endif %}
+                        <label for="id_learning_step" class="col-4 col-sm-3 col-form-label">Learning step</label>
+                        <div class="col-8 col-sm-4 col-md-3 {% if form.learning_step.errors %}has-danger{% endif %}">
+                            {{ form.learning_step }}
+                            {% if form.learning_step.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.learning_step.errors %}{{error}}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     <div class="form-group text-center">

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 %}

templates/people/gymnasts/tab_skill.html

@@ -451,7 +451,7 @@
                 data: {
                     gymnast_id: $(this).data('gymnastid'),
                     skill_id: $(this).data('skillid'),
-                    cando: $(this).data('link'),
+                    learning_step: $(this).data('link'),
                     csrfmiddlewaretoken: '{{ csrf_token }}'
                 },
                 type: 'POST',

templates/ultron/dashboard/dashboard.html

@@ -11,7 +11,7 @@
                 <h4 class=""><i class="icon-primary fal fa-laugh-wink"></i> Hi {{ user.username }} !</h4>
             </div>
             <div class="card-body">
-                Welcome to Ultron v0.55 <span class="text-muted">(last update : 7-10-2022)</span><br />
+                Welcome to Ultron v0.57 <span class="text-muted">(last update : 12-10-2022)</span><br />
                 This application is here to help us to manage the gymnasts (evolution, evaluation, routines, scores, …). This tool is not perfect so feel free to make improvement proposals, bug reports, … by sending me an <a href="mailto:gregory@flyingacrobaticstrampoline.be">email</a>.<br/>
                 <br/>
             </div>

ultron/followup/admin.py

@@ -25,7 +25,7 @@ class ChronoAdmin(admin.ModelAdmin):
     model = Chrono
 
     list_display = ("date", "gymnast", "tof", "chrono_type")
-    readonly_fields = ('created_at', 'updated_at')
+    readonly_fields = ('season', 'week_number', 'created_at', 'updated_at')
     list_filter = ("chrono_type",)
     autocomplete_fields = ("gymnast",)
     date_hierarchy = "date"
@@ -46,12 +46,12 @@ class ChronoDetailsAdmin(admin.ModelAdmin):
 class LearnedSkillAdmin(admin.ModelAdmin):
     model = LearnedSkill
 
-    list_display = ("gymnast", "skill", "cando", "date")
-    readonly_fields = ('created_at', 'updated_at')
+    list_display = ("gymnast", "skill", "learning_step", "date")
+    readonly_fields = ('season', 'week_number', 'created_at', 'updated_at')
     list_filter = (
         ('gymnast', RelatedDropdownFilter),
         ('skill', RelatedDropdownFilter),
-        "cando"
+        "learning_step"
     )
     search_fields = ("gymnast", "skill")
     autocomplete_fields = ("gymnast", "skill")
@@ -89,7 +89,7 @@ class AccidentAdmin(admin.ModelAdmin):
     model = Accident
 
     fields = ("date", "gymnast", "skill", "informations")  # educative
-    readonly_fields = ('created_at', 'updated_at')
+    readonly_fields = ('season', 'week_number', 'created_at', 'updated_at')
     list_display = ("date", "gymnast", "skill")  # educative
     list_filter = ("date",)
     date_hierarchy = "date"
@@ -101,7 +101,7 @@ class MindStateAdmin(admin.ModelAdmin):
     model = MindState
 
     fields = ("gymnast", "date", "score", "informations")
-    readonly_fields = ('created_at', 'updated_at')
+    readonly_fields = ('season', 'week_number', 'created_at', 'updated_at')
     list_display = ("date", "gymnast", "score")
     list_filter = (
         "date",
@@ -145,6 +145,7 @@ class HeightWeightAdmin(admin.ModelAdmin):
     model = HeightWeight
 
     list_display = ("gymnast", "height", "hips_height", "weight", "date")
+    readonly_fields = ('season', 'week_number')
     list_filter = (
         ('gymnast', RelatedDropdownFilter),
     )
@@ -156,7 +157,7 @@ class PlanAdmin(admin.ModelAdmin):
     model = Plan
 
     list_display = ("gymnast", "date", "educative")
-    readonly_fields = ('created_at', 'updated_at')
+    readonly_fields = ('season', 'week_number', 'created_at', 'updated_at')
     list_filter = (
         ('gymnast', RelatedDropdownFilter),
         ('educative', RelatedDropdownFilter),
@@ -175,7 +176,7 @@ class NoteAdmin(admin.ModelAdmin):
     model = Note
 
     list_display = ("gymnast", "coach")
-    readonly_fields = ('created_at', 'updated_at')
+    readonly_fields = ('season', 'week_number', 'created_at', 'updated_at')
     list_filter = (
         ('gymnast', RelatedDropdownFilter),
         ('coach', RelatedDropdownFilter),

ultron/followup/forms.py

@@ -52,7 +52,7 @@ class ChronoForm(forms.ModelForm):
 class LearnedSkillForm(forms.ModelForm):
     class Meta:
         model = LearnedSkill
-        fields = ("gymnast", "skill", "cando", "date")
+        fields = ("gymnast", "skill", "learning_step", "date")
         widgets = {
             "gymnast": forms.HiddenInput(),
             "skill": forms.HiddenInput(),
@@ -63,7 +63,7 @@ class LearnedSkillForm(forms.ModelForm):
                     "value": date.today().strftime("%Y-%m-%d"),
                 }
             ),
-            "cando": forms.Select(attrs={"class": "form-control selectpicker"}),
+            "learning_step": forms.Select(attrs={"class": "form-control selectpicker"}),
         }
 
     gymnast_related = forms.CharField(
@@ -441,7 +441,7 @@ class PlanForm(forms.ModelForm):
 
     class Meta:
         model = Plan
-        fields = ("date", "gymnast", "educative", "cando", "is_done")
+        fields = ("date", "gymnast", "educative", "learning_step", "is_done")
         widgets = {
             "gymnast": forms.HiddenInput(),
             "educative": forms.HiddenInput(),
@@ -452,7 +452,7 @@ class PlanForm(forms.ModelForm):
                     "value": date.today().strftime("%Y-%m-%d"),
                 }
             ),
-            "cando": forms.Select(attrs={"class": "form-control selectpicker"}),
+            "learning_step": forms.Select(attrs={"class": "form-control selectpicker"}),
             "is_done": forms.CheckboxInput(
                 attrs={"class": "form-control form-check-input ml-0 mt-0"}
             ),
@@ -484,11 +484,18 @@ class PlanForm(forms.ModelForm):
 class NoteForm(forms.ModelForm):
     class Meta:
         model = Note
-        fields = ("gymnast", "coach", "status", "informations")
+        fields = ("gymnast", "coach", "status", "informations", "date")
         widgets = {
             "gymnast": forms.HiddenInput(),
             "coach": forms.HiddenInput(),
             "status": forms.Select(attrs={"class": "form-control selectpicker"}),
+            "date": forms.TextInput(
+                attrs={
+                    "class": "form-control datepicker",
+                    "placeholder": date.today().strftime("%Y-%m-%d"),
+                    "value": date.today().strftime("%Y-%m-%d"),
+                }
+            ),
             "informations": forms.Textarea(
                 attrs={
                     "class": "form-control",

ultron/followup/migrations/0025_note_date_note_season_note_week_number.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.1.1 on 2022-10-12 08:37
+
+from django.db import migrations, models
+import ultron.tools.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("followup", "0024_rename_note_type_note_status"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="note",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AddField(
+            model_name="note",
+            name="season",
+            field=models.CharField(default="2022-2023", max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="note",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1),
+            preserve_default=False,
+        ),
+    ]

ultron/followup/migrations/0026_alter_note_season_alter_note_week_number.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.1 on 2022-10-12 08:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("followup", "0025_note_date_note_season_note_week_number"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="note",
+            name="season",
+            field=models.CharField(editable=False, max_length=9),
+        ),
+        migrations.AlterField(
+            model_name="note",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(editable=False),
+        ),
+    ]

ultron/followup/migrations/0027_accident_season_accident_week_number_chrono_season_and_more.py

@@ -0,0 +1,147 @@
+# Generated by Django 4.1.1 on 2022-10-12 09:03
+
+from django.db import migrations, models
+import ultron.tools.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("followup", "0026_alter_note_season_alter_note_week_number"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="accident",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="accident",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="chrono",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="chrono",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="heightweight",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="heightweight",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="learnedskill",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="learnedskill",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="mindstate",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="mindstate",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="numberofroutinedone",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="numberofroutinedone",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="plan",
+            name="season",
+            field=models.CharField(default="2022-2023", editable=False, max_length=9),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="plan",
+            name="week_number",
+            field=models.PositiveSmallIntegerField(default=1, editable=False),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="accident",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="chrono",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="heightweight",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="learnedskill",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mindstate",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="numberofroutinedone",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="plan",
+            name="date",
+            field=models.DateField(
+                default=ultron.tools.models.get_default_date, verbose_name="Date"
+            ),
+        ),
+    ]

ultron/followup/migrations/0028_rename_cando_learnedskill_learning_step_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.1.1 on 2022-10-12 15:12
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("objective", "0013_alter_skill_position"),
+        ("people", "0004_gymnast_email_trainer"),
+        (
+            "followup",
+            "0027_accident_season_accident_week_number_chrono_season_and_more",
+        ),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="learnedskill",
+            old_name="cando",
+            new_name="learning_step",
+        ),
+        migrations.RenameField(
+            model_name="plan",
+            old_name="cando",
+            new_name="learning_step",
+        ),
+        migrations.AlterUniqueTogether(
+            name="learnedskill",
+            unique_together={("gymnast", "skill", "date", "learning_step")},
+        ),
+    ]

ultron/followup/models.py

@@ -4,7 +4,7 @@ User = get_user_model()
 
 from datetime import date
 
-from ultron.tools.models import Markdownizable
+from ultron.tools.models import Markdownizable, Seasonisable
 from ultron.people.models import Gymnast
 from ultron.planning.models import Event
 from ultron.objective.models import Educative, Skill, Routine
@@ -21,7 +21,7 @@ ROUTINE_CHOICE = (
     (8, "R4S"),
 )
 
-CAN_DO_TYPE_CHOICES = (
+LEARNING_STEP_CHOICES = (
     (0, "No"),
     (1, "With help"),
     (2, "Without help"),
@@ -30,7 +30,7 @@ CAN_DO_TYPE_CHOICES = (
 )
 
 
-class Chrono(models.Model):
+class Chrono(Seasonisable):
     """
     Représente les chronos (de chandelles ou de série) enregistrés pour un(e) gymnaste.
     """
@@ -68,7 +68,6 @@ class Chrono(models.Model):
     )
     score = models.DecimalField(max_digits=5, decimal_places=3)
     tof = models.DecimalField(max_digits=5, decimal_places=3, blank=True, null=True)
-    date = models.DateField(default=date.today, verbose_name="Date")
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
@@ -102,7 +101,7 @@ class ChronoDetails(models.Model):
     value = models.DecimalField(max_digits=5, decimal_places=3)
 
 
-class Accident(Markdownizable):
+class Accident(Markdownizable, Seasonisable):
     """
     La classe `Accident` permet d'indiquer qu'un gymnaste a eu un accident, en liaison avec un
     skill ou non.
@@ -128,7 +127,6 @@ class Accident(Markdownizable):
         blank=True,
         null=True,
     )
-    date = models.DateField(verbose_name="Date")
     nb_week_off = models.SmallIntegerField(
         blank=True, null=True, verbose_name="# week off"
     )
@@ -142,7 +140,7 @@ class Accident(Markdownizable):
         )
 
 
-class LearnedSkill(models.Model):
+class LearnedSkill(Seasonisable):
     """
     Représente la capacité d'un gymnaste à savori faire un skill de la ligne d'apprentissage.
     """
@@ -150,7 +148,7 @@ class LearnedSkill(models.Model):
     class Meta:
         verbose_name = "Learned Skill"
         verbose_name_plural = "Learned Skills"
-        unique_together = ("gymnast", "skill", "date", "cando")
+        unique_together = ("gymnast", "skill", "date", "learning_step")
 
     gymnast = models.ForeignKey(
         Gymnast,
@@ -164,15 +162,14 @@ class LearnedSkill(models.Model):
         related_name="known_by",
         on_delete=models.CASCADE,
     )
-    cando = models.PositiveSmallIntegerField(
-        choices=CAN_DO_TYPE_CHOICES, verbose_name="Can do type"
+    learning_step = models.PositiveSmallIntegerField(
+        choices=LEARNING_STEP_CHOICES, verbose_name="Can do type"
     )
-    date = models.DateField(default=date.today, verbose_name="Date")
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
 
 
-class Plan(models.Model):
+class Plan(Seasonisable):
     """
     Classe représentant les objectifs qu'un gymnaste devra savoir faire pour une date donnée.
     """
@@ -195,9 +192,8 @@ class Plan(models.Model):
         related_name="plan",
         on_delete=models.CASCADE,
     )
-    date = models.DateField(default=date.today, verbose_name="Date")
-    cando = models.PositiveSmallIntegerField(
-        choices=CAN_DO_TYPE_CHOICES, verbose_name="Can do type", default=3
+    learning_step = models.PositiveSmallIntegerField(
+        choices=LEARNING_STEP_CHOICES, verbose_name="Can do type", default=3
     )
     is_done = models.BooleanField(default=0)
     created_at = models.DateTimeField(auto_now_add=True)
@@ -243,7 +239,7 @@ class Point(models.Model):
         )
 
 
-class MindState(Markdownizable):
+class MindState(Markdownizable, Seasonisable):
     """
     Représente l'état d'esprit psychologique d'un gymnaste
     """
@@ -251,7 +247,6 @@ class MindState(Markdownizable):
     gymnast = models.ForeignKey(
         Gymnast, on_delete=models.CASCADE, default=None, related_name="mindstate"
     )
-    date = models.DateField(default=date.today, verbose_name="Date")
     event = models.ForeignKey(
         Event,
         on_delete=models.SET_NULL,
@@ -302,7 +297,7 @@ class GymnastHasRoutine(models.Model):
         return "%s - %s : %s" % (self.gymnast, self.routine_type, self.routine)
 
 
-class NumberOfRoutineDone(models.Model):
+class NumberOfRoutineDone(Seasonisable):
     """
     Classe permettant de suivre le nombre de séries faites par le gymnaste.
     """
@@ -332,7 +327,6 @@ class NumberOfRoutineDone(models.Model):
     number_of_successes = models.PositiveSmallIntegerField(
         verbose_name="number of successes", default=0
     )
-    date = models.DateField(default=date.today, verbose_name="Date")
 
     def __str__(self):
         return "%s - %s (%s) : %s | %s" % (
@@ -344,7 +338,7 @@ class NumberOfRoutineDone(models.Model):
         )
 
 
-class HeightWeight(models.Model):
+class HeightWeight(Seasonisable):
     """
     Classe permettant de suivre le poids et la taille d'un gymnaste
     """
@@ -363,13 +357,12 @@ class HeightWeight(models.Model):
     height = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Height")
     hips_height = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Hips height")
     weight = models.DecimalField(max_digits=4, decimal_places=1, verbose_name="Weight")
-    date = models.DateField(default=date.today, verbose_name="Date")
 
     def __str__(self):
         return "%s : %s/%s - %s" % (self.gymnast, self.height, self.hips_height, self.weight)
 
 
-class Note(Markdownizable):
+class Note(Markdownizable, Seasonisable):
     """
     Notes relatives à un gymnaste
     """

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')

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"),

ultron/followup/views.py

@@ -37,14 +37,25 @@ from .forms import (
     NumberOfRoutineDoneForm,
 )
 
+from ultron.tools.date_week_transition import (
+    is_valid_season,
+    from_date_to_week_number,
+    from_week_number_to_date,
+)
+
 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 +74,137 @@ 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
+
+    if season is None or not is_valid_season(season):
+        season = str(today.year) + "-" + str(today.year + 1)
+
+    date_begin, date_end = from_week_number_to_date(season, 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):
@@ -160,8 +302,6 @@ def note_create_or_update(request, note_id=None, gymnast_id=None):
             data["gymnast"] = gymnast_id
             data["gymnast_related"] = str(gymnast)
 
-    # print(data)
-
     if request.method == "POST":
         form = NoteForm(request.POST, instance=note)
 
@@ -224,13 +364,13 @@ def gymnast_learn_skill(request):
     # utiliser un FORM pour cette fonction.
     gymnast_id = request.POST.get("gymnast_id", None)
     skill_id = request.POST.get("skill_id", None)
-    cando = request.POST.get("cando", 0)
+    learning_step = request.POST.get("learning_step", 0)
 
     if gymnast_id and skill_id:
         gymnast = get_object_or_404(Gymnast, pk=gymnast_id)
         skill = Skill.objects.get(pk=skill_id)
         learned_skill = LearnedSkill(
-            gymnast=gymnast, skill=skill, cando=cando, date=datetime.now()
+            gymnast=gymnast, skill=skill, learning_step=learning_step, date=datetime.now()
         )
         learned_skill.save()
         return HttpResponse(status=200)

ultron/people/templatetags/skill_doughnut.py

@@ -12,14 +12,14 @@ def generate_skill_doughnut(gymnast_id):
     with help or no) à la dernière date connue et les renvoie pour en faire un graphique.
     """
     base_queryset = LearnedSkill.objects.filter(gymnast=gymnast_id).order_by("-date")
-    
+
     total = 0
     skills_capacity = [0] * 5
     checked_skills = set()
     for learned_skill in base_queryset:
         if learned_skill not in checked_skills:
             checked_skills.add(learned_skill)
-            skills_capacity[learned_skill.cando] += 1
+            skills_capacity[learned_skill.learning_step] += 1
             total += 1
 
     nb_skill = Skill.objects.all().count()

ultron/people/views.py

@@ -477,26 +477,26 @@ def gymnast_display_skill(request, gymnast_id):
         ).exclude(known_by__gymnast=gymnast.id)
 
     skill_whith_help = (
-        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__cando=1)
-        .exclude(known_by__gymnast=gymnast.id, known_by__cando__gte=2)
+        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__learning_step=1)
+        .exclude(known_by__gymnast=gymnast.id, known_by__learning_step__gte=2)
         .distinct()
     )
 
     skill_without_help = (
-        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__cando=2)
-        .exclude(known_by__gymnast=gymnast.id, known_by__cando=3)
+        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__learning_step=2)
+        .exclude(known_by__gymnast=gymnast.id, known_by__learning_step=3)
         .distinct()
     )
 
     skill_not_chained = (
-        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__cando=2)
-        .exclude(known_by__gymnast=gymnast.id, known_by__cando=3)
+        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__learning_step=2)
+        .exclude(known_by__gymnast=gymnast.id, known_by__learning_step=3)
         .distinct()
     )
 
     skill_chained = (
-        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__cando=3)
-        .exclude(known_by__gymnast=gymnast.id, known_by__cando=4)
+        Skill.objects.filter(known_by__gymnast=gymnast_id, known_by__learning_step=3)
+        .exclude(known_by__gymnast=gymnast.id, known_by__learning_step=4)
         .distinct()
     )
 

ultron/tools/date_week_transition.py

@@ -4,53 +4,6 @@ vice-versa (de numéro de semaine en date).
 """
 
 import pendulum
-import re
-
-
-def is_valid_season(season):
-    """ Test si une chaine de caractère correspond bien à une saison
-
-    Args:
-        season  string  saison sous la forme "xxxx-xxxy"
-
-    Returns:
-        bool            vrai si la chaine de caractère correspond à une saison.
-
-    Examples:
-        >>> from ultron.tools.date_week_transition import is_valid_season
-        >>> is_valid_season("2022-2023")
-        >>> True
-
-        >>> is_valid_season("2022-2024")
-        >>> False
-
-        >>> is_valid_season("2024-2023")
-        >>> False
-
-        >>> is_valid_season("1358-5682")
-        >>> False
-
-        >>> is_valid_season("fgkrs-gkml")
-        >>> False
-
-        >>> is_valid_season("drgnldsjgklfdtngl")
-        >>> False
-    """
-    dash_position = season.find("-")
-    if dash_position < 0:
-        return False
-
-    pattern = "^[0-9]{4}-[0-9]{4}$"
-    if not re.search(pattern, season):
-        return False
-
-    first_year = int(season[:dash_position])
-    second_year = int(season[dash_position + 1:])
-
-    if first_year != second_year - 1:
-        return False
-
-    return True
 
 
 def from_week_number_to_date(season, week_number):
@@ -126,6 +79,8 @@ def from_date_to_week_number(the_date=None):
 
     if the_date is None:
         the_date = pendulum.today().date()
+    else:
+        the_date = pendulum.parse(the_date.strftime("%Y%m%d"))
 
     number_of_year_week = the_date.week_of_year
     if the_date.month >= 9: # nouvelle saison

ultron/tools/models.py

@@ -4,8 +4,93 @@ from django.db import models
 from django.utils import timezone
 
 from datetime import date
+from .date_week_transition import (
+    get_number_of_weeks_between,
+    from_date_to_week_number,
+)
 import markdown
-from .date_week_transition import get_number_of_weeks_between
+import pendulum
+import re
+
+class Season:
+    """ Class pour représenter une saison """
+    def __init__(self, label=None):
+        self.label = label
+        if not self.is_valid():
+            the_date = pendulum.today().date()
+            if the_date.month >= 9: # nouvelle saison
+                self.label = str(the_date.year) + "-" + str(the_date.year + 1)
+            else:
+                self.label = str(the_date.year - 1) + "-" + str(the_date.year)
+
+    def is_valid(self):
+        """ Test si une chaine de caractère correspond bien à une saison
+
+        Args:
+            season  string  saison sous la forme "xxxx-xxxy"
+
+        Returns:
+            bool            vrai si la chaine de caractère correspond à une saison.
+
+        Examples:
+            >>> from ultron.tools.date_week_transition import is_valid_season
+            >>> is_valid_season("2022-2023")
+            >>> True
+
+            >>> is_valid_season("2022-2024")
+            >>> False
+
+            >>> is_valid_season("2024-2023")
+            >>> False
+
+            >>> is_valid_season("1358-5682")
+            >>> False
+
+            >>> is_valid_season("fgkrs-gkml")
+            >>> False
+
+            >>> is_valid_season("drgnldsjgklfdtngl")
+            >>> False
+        """
+        dash_position = self.label.find("-")
+        if dash_position < 0:
+            return False
+
+        pattern = "^[0-9]{4}-[0-9]{4}$"
+        if not re.search(pattern, self.label):
+            return False
+
+        first_year = int(self.label[:dash_position])
+        second_year = int(self.label[dash_position + 1:])
+
+        if first_year != second_year - 1:
+            return False
+
+        return True
+
+
+def get_default_date():
+    return pendulum.now().date()
+
+
+class Seasonisable(models.Model):
+    """ """
+    class Meta:
+        abstract = True
+
+    date = models.DateField(default=get_default_date, verbose_name="Date")
+    season = models.CharField(max_length=9, editable=False)
+    week_number = models.PositiveSmallIntegerField(editable=False)
+
+    def save(self, *args, **kwargs):
+        """ Calcule les valeurs `season` et `week_number` sur base d'une date lors de l'
+        enregistrement d'un object enfant.
+        """
+        if self.date is None:
+            self.date = get_default_date()
+        self.season, self.week_number = from_date_to_week_number(self.date)
+        super().save(*args, **kwargs)
+
 
 class TemporizableQuerySet(models.QuerySet):
     """

ultron/tools/pdf_generator.py

@@ -7,7 +7,7 @@ from statistics import mean
 import pendulum
 import yaml
 from django.conf import settings
-from django.db.models import Max, Q
+from django.db.models import F, Max, Q
 
 from PIL import Image
 from reportlab.lib import colors
@@ -16,8 +16,15 @@ from reportlab.lib.styles import getSampleStyleSheet
 from reportlab.lib.units import cm
 from reportlab.pdfgen.canvas import Canvas
 from reportlab.platypus import Paragraph, Table, TableStyle
-from ultron.followup.models import (Accident, Chrono, HeightWeight, MindState,
-                                    Plan, Point)
+from ultron.followup.models import (
+    Accident,
+    Chrono,
+    HeightWeight,
+    MindState,
+    Plan,
+    Point
+)
+from ultron.followup.models import LEARNING_STEP_CHOICES
 from ultron.objective.models import Skill
 from ultron.people.models import Gymnast
 from ultron.planning.models import Event
@@ -533,36 +540,29 @@ class GymnastReportDocument(PDFDocument):
         )
         self.add_vspace(-3)
 
+        # le double F ne fonctionne qu'en précisant le distinct, sinon ca dédouble les résultats.
+        # qui lui même ne fonctionne que sur un champ présent dans le `order_by` (que le premier champ ?)
+        #
         planified_skills = (
             Skill.objects.filter(plan__gymnast=gymnast.id)
             .filter(
                 Q(plan__is_done=False)
                 | Q(plan__date__gte=date.today())
             )
-            .order_by("-plan__date").distinct()[:6]
+            # .annotate(plan_date=F("plan__date"))
+            .annotate(plan_date=F("plan__date"), learning_step=F("plan__learning_step"))
+            .order_by("notation", "-plan__date").distinct('notation')[:6]
         )
 
-        print(planified_skills)
-
-        # Ne permet pas de récupérer que les skill, or je voudrais bien.
-        # planified_skills = (
-        #     Plan.objects.filter(gymnast=gymnast.id)
-        #     .filter(
-        #         Q(is_done=False)
-        #         | Q(date__gte=date.today())
-        #     )
-        #     .order_by("-date")[:6]
-        # )
-
         if planified_skills:
             for planified_skill in planified_skills:
                 self.add_new_line(
-                    X, planified_skill.skill.short_label + " (" + planified_skill.skill.notation + ") for (todo: compute deadline)"
+                    X, planified_skill.short_label + " " + str(LEARNING_STEP_CHOICES[planified_skill.learning_step][1]).lower() + " (" + planified_skill.notation + ") for " + planified_skill.plan_date.strftime("%d-%m-%Y")
                 )
         else:
             self.add_new_line(
             X,
-            "No next skill to learn.",
+            "No next skill to learn plannified.",
         )
 
     def add_gymnast_next_events(self, gymnast):

ultron/tools/tests_date_week_transition.py

@@ -5,7 +5,6 @@ from datetime import datetime
 import pytz
 
 from ultron.tools.date_week_transition import (
-    is_valid_season,
     from_date_to_week_number,
     from_week_number_to_date,
     get_number_of_weeks_between,
@@ -14,16 +13,7 @@ from ultron.tools.date_week_transition import (
 import pendulum
 
 
-class URLTestCase(TestCase):
-
-    def test_is_valid_season(self):
-        self.assertEqual(is_valid_season("2022-2023"), True)
-        self.assertEqual(is_valid_season("2022-2024"), False)
-        self.assertEqual(is_valid_season("2024-2023"), False)
-        self.assertEqual(is_valid_season("1358-5682"), False)
-        self.assertEqual(is_valid_season("fgkrs-gkml"), False)
-        self.assertEqual(is_valid_season("drgnldsjgklfdtngl"), False)
-        self.assertEqual(is_valid_season("12675353878354"), False)
+class FunctionTestCase(TestCase):
 
     def test_from_week_number_to_date(self):
         timezone = pytz.timezone("UTC")

ultron/tools/tests_models.py

@@ -0,0 +1,56 @@
+""" Test des models """
+
+from django.test import TestCase
+from .models import Season
+import pendulum
+
+
+class ModelTestCase(TestCase):
+
+    def test_init_season(self):
+        season = Season("2022-2023")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+        season = Season("2022-2024")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+        season = Season("2024-2023")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+        season = Season("1358-5682")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+        season = Season("fgkrs-gkml")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+        season = Season("drgnldsjgklfdtngl")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+        season = Season("12675353878354")
+        self.assertEqual(season.is_valid(), True)
+        self.assertEqual(season.label, "2022-2023")
+
+    def test_season_is_valid(self):
+        season = Season("2022-2023")
+        self.assertEqual(season.is_valid(), True)
+
+        season.label = "2022-2024"
+        self.assertEqual(season.is_valid(), False)
+
+        season.label = "1358-5682"
+        self.assertEqual(season.is_valid(), False)
+
+        season.label = "fgkrs-gkml"
+        self.assertEqual(season.is_valid(), False)
+
+        season.label = "drgnldsjgklfdtngl"
+        self.assertEqual(season.is_valid(), False)
+
+        season.label = "drgnldsjgklfdtngl"
+        self.assertEqual(season.is_valid(), False)