Optimise list for smartphone

jarvis/followup/templates/chronos/list.html

@@ -20,15 +20,17 @@
             </div>
         </div>
     </div>
-    <div class="card-body">
+    <div class="card-body vh-100">
         <div class="table-responsive">
             {% if chrono_list %}
             <table class="table table-striped tablesorter" id="chrono_table">
                 <thead>
                     <tr>
-                        <th style="width: 5%">&nbsp;</th>
-                        <th style="width: 10%" class="header">Date</th>
-                        <th style="width: 25%" class="header text-left">Gymnast</th>
+                        <th style="width: 6%">&nbsp;</th>
+                        <th style="width: 12%" class="header">Date</th>
+                        {% if not gymnast %}
+                            <th style="width: 25%" class="header text-left">Gymnast</th>
+                        {% endif %}
                         <th style="width: 25%" class="header text-left">Routine</th>
                         <th style="width: 15%" class="header">Type</th>
                         <th style="width: 10%" class="header text-center">Score</th>
@@ -47,17 +49,19 @@
                                 <span class="far fa-search-plus text-warning"></span>
                             </a>
                         </td>
-                        <td>{% if chrono.details.all %}<a href="{% url 'jump_chrono_details' chrono.id %}">{% endif %}{{ chrono.date | date:"d-m-Y" }}{% if chrono.details.all %}</a>{% endif %}</td>
-                        <td class="text-left">
-                            <a href="{% url 'gymnast_details_tab' chrono.gymnast.id 'scores' %}">
-                                {{ chrono.gymnast }}
-                            </a>
-                        </td>
+                        <td>{% if chrono.details.all %}<a href="{% url 'jump_chrono_details' chrono.id %}">{% endif %}{{ chrono.date | date:"j-n-Y" }}{% if chrono.details.all %}</a>{% endif %}</td>
+                        {% if not gymnast %}
+                            <td class="text-left">
+                                <a href="{% url 'gymnast_details_tab' chrono.gymnast.id 'scores' %}">
+                                    {{ chrono.gymnast }}
+                                </a>
+                            </td>
+                        {% endif %}
                         <td class="text-left">
                             {% if chrono.routine %}
-                            {{ chrono.routine.long_label }}
+                                {{ chrono.routine.long_label }}
                             {% else %}
-                            {{ chrono.get_chrono_type_display }}
+                                {{ chrono.get_chrono_type_display }}
                             {% endif %}
                         </td>
                         <td>{{ chrono.get_score_type_display }}</td>
@@ -87,7 +91,7 @@
         });
 
         $('#chrono_table').DataTable({
-            scrollY: 475,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/heightweight/create.html

@@ -7,7 +7,7 @@
     <div class="col-12 col-sm-12 col-md-8 col-lg-6 col-xl-6">
         <div class="card">
             <div class="card-header">
-                <h4 class="">{% if heightweight_id %}Edit{% else %}Add{% endif %} height/weight couple</h4>
+                <h4 class="">{% if heightweight_id %}Edit{% else %}Add{% endif %} height/weight</h4>
             </div>
             <div class="card-body">
                 {% if form.errors %}
@@ -21,7 +21,7 @@
                     {% csrf_token %}
 
                     <div class="form-group row ">
-                        <label for="id_gymnast" class="col-3 col-sm-2 col-form-label">Gymnast <span  class="text-danger"><b>*</b></span></label>
+                        <label for="id_gymnast" class="col-3 col-sm-3 col-form-label">Gymnast <span  class="text-danger"><b>*</b></span></label>
                         <div
                             class="col-9 col-sm-9 col-md-9 col-lg-6 col-lg-8 col-xl-8  {% if form.jumper.errors %}has-danger{% endif %}">
                             {% if request.user|has_group:"trainer" %}
@@ -36,34 +36,34 @@
                     </div>
 
                     <div class="form-group row ">
-                        <label for="id_date" class="col-3 col-sm-2 col-form-label">Date <span
+                        <label for="id_date" class="col-3 col-sm-3 col-form-label">Date <span
                                 class="text-danger"><b>*</b></span></label>
-                        <div class="col-6 col-sm-3 col-md-5 col-lg-4 col-xl-3 {% if form.date.errors %}has-danger{% endif %}">
+                        <div class="col-6 col-sm-3 col-md-4 col-lg-4 col-xl-3 {% 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_height" class="col-3 col-sm-2 col-form-label">Height <span
+                        <label for="id_height" class="col-3 col-sm-3 col-form-label">Height <span
                                 class="text-danger"><b>*</b></span></label>
-                        <div class="col-6 col-sm-3 col-md-3 col-lg-3 {% if form.height.errors %}has-danger{% endif %}">
+                        <div class="col-4 col-sm-3 col-md-3 col-lg-3 {% if form.height.errors %}has-danger{% endif %}">
                             {{ form.height }}
                             {% if form.height.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.height.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_hips_height" class="col-3 col-sm-2 col-form-label">Hips Height</label>
+                        <label for="id_hips_height" class="col-3 col-sm-3 col-form-label">Hips Height</label>
                         <div
-                            class="col-6 col-sm-3 col-md-3 col-lg-3 {% if form.hips_height.errors %}has-danger{% endif %}">
+                            class="col-4 col-sm-3 col-md-3 col-lg-3 {% if form.hips_height.errors %}has-danger{% endif %}">
                             {{ form.hips_height }}
                             {% if form.hips_height.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.hips_height.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_weight" class="col-3 col-sm-2 col-form-label">Weight <span
+                        <label for="id_weight" class="col-3 col-sm-3 col-form-label">Weight <span
                                 class="text-danger"><b>*</b></span></label>
-                        <div class="col-6 col-sm-3 col-md-3 col-lg-3 {% if form.weight.errors %}has-danger{% endif %}">
+                        <div class="col-4 col-sm-3 col-md-3 col-lg-3 {% if form.weight.errors %}has-danger{% endif %}">
                             {{ form.weight }}
                             {% if form.weight.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.weight.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>

jarvis/followup/templates/heightweight/list.html

@@ -6,10 +6,10 @@
     <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
         <div class="card">
             <div class="card-header row">
-                <div class="col-8">
+                <div class="col-10 pr-0">
                     <h4 class="">Height/Weight list {% if gymnast %}for <a href="{% url 'gymnast_details_tab' gymnast.id 'physiological' %}"><i>{{ gymnast }}</i></a>{% endif %}</h4>
                 </div>
-                <div class="col-1 ml-auto">
+                <div class="col-2 ml-auto pl-0">
                     <div class="text-right">
                         {% if request.user|has_group:"trainer" %}
                         <a href="{% if gymnast %}{% url 'heightweight_create_for_gymnast' gymnast.id %}{% else %}{% url 'heightweight_create' %}{% endif %}">
@@ -21,18 +21,20 @@
                     </div>
                 </div>
             </div>
-            <div class="card-body">
+            <div class="card-body pt-1">
                 {% if heightweight_list %}
                 <table class="table tablesorter table-striped mb-0" data-sort="table" id="heightweight_table">
                     <thead>
                         <tr>
                             <th></th>
                             <th class="header text-left">Date</th>
+                            {% if not gymnast %}
                             <th class="header text-left">Gymnast</th>
-                            <th class="header text-left">Height</th>
-                            <th class="header text-left">Hips height</th>
-                            <th class="header text-left">Weight</th>
-                            <th class="header text-left">BMI</th>
+                            {% endif %}
+                            <th class="header text-center">Height</th>
+                            <th class="header text-center">Hips height</th>
+                            <th class="header text-center">Weight</th>
+                            <th class="header text-center">BMI</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -43,12 +45,14 @@
                                     <span class="tim-icons icon-pencil text-warning"></span>
                                 </a>
                             </td>
-                            <td class="text-left">{{ heightweight.date | date:"d-m-Y" }}</td>
+                            <td class="text-left">{{ heightweight.date | date:"j-n-Y" }}</td>
+                            {% if not gymnast %}
                             <td class="text-left"><a href="{% url 'gymnast_details' heightweight.gymnast.id %}">{{ heightweight.gymnast }}</a></td>
-                            <td>{{ heightweight.height }}</td>
-                            <td>{% if heightweight.hips_height == None %}-{% else %}{{ heightweight.hips_height }}{% endif %}</td>
-                            <td>{{ heightweight.weight }}</td>
-                            <td>
+                            {% endif %}
+                            <td class="text-right">{{ heightweight.height }}</td>
+                            <td class="text-right">{% if heightweight.hips_height == None %}-{% else %}{{ heightweight.hips_height }}{% endif %}</td>
+                            <td class="text-right">{{ heightweight.weight }}</td>
+                            <td class="text-right">
                                 {% if gymnast %}
                                     {% if gymnast.gender == 0 %}
                                         {% if heightweight.bmi < 19 %}
@@ -104,7 +108,7 @@
         });
 
         $('#heightweight_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/injuries/list.html

@@ -85,7 +85,7 @@
         });
 
         $('#injury_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             paging: false,
             searching: false,
             ordering: false,

jarvis/followup/templates/intensities/create.html

@@ -29,6 +29,7 @@
                             {% 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_time" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Time <span class="text-danger"><b>*</b></span></label>
                         <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.time.errors %}has-danger{% endif %}">
@@ -36,6 +37,14 @@
                             {% if form.time.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.time.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
+                    <div class="form-group row ">
+                        <label for="id_theorical_time" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Theorical time <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.theorical_time.errors %}has-danger{% endif %}">
+                            {{ form.theorical_time }}
+                            {% if form.theorical_time.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.theorical_time.errors %}{{ error }}{% endfor %}</span>{% endif %}
+                        </div>
+                    </div>
+
                     <div class="form-group row ">
                         <label for="id_difficulty" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Difficulty <span class="text-danger"><b>*</b></span></label>
                         <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.difficulty.errors %}has-danger{% endif %}">
@@ -43,13 +52,28 @@
                             {% if form.difficulty.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
+                    <div class="form-group row ">
+                        <label for="id_difficulty_asked" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label">Difficulty <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.difficulty_asked.errors %}has-danger{% endif %}">
+                            {{ form.difficulty_asked }}
+                            {% if form.difficulty_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.difficulty_asked.errors %}{{ error }}{% endfor %}</span>{% endif %}
+                        </div>
+                    </div>
+
                     <div class="form-group row ">
                         <label for="id_quantity_of_skill" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of skill <span class="text-danger"><b>*</b></span></label>
                         <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.quantity_of_skill.errors %}has-danger{% endif %}">
                             {{ form.quantity_of_skill }}
                             {% if form.quantity_of_skill.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
+                    </div><div class="form-group row ">
+                        <label for="id_quantity_of_skill_asked" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of skill asked<span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.quantity_of_skill_asked.errors %}has-danger{% endif %}">
+                            {{ form.quantity_of_skill_asked }}
+                            {% if form.quantity_of_skill_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.quantity_of_skill_asked.errors %}{{ error }}{% endfor %}</span>{% endif %}
+                        </div>
                     </div>
+
                     <div class="form-group row ">
                         <label for="id_number_of_passes" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of passes <span class="text-danger"><b>*</b></span></label>
                         <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_passes.errors %}has-danger{% endif %}">
@@ -57,12 +81,29 @@
                             {% if form.number_of_passes.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
                     </div>
+                    <div class="form-group row ">
+                        <label for="id_number_of_passes_asked" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of passes asked<span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_passes_asked.errors %}has-danger{% endif %}">
+                            {{ form.number_of_passes_asked }}
+                            {% if form.number_of_passes_asked.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_passes_asked.errors %}{{ error }}{% endfor %}</span>{% endif %}
+                        </div>
+                    </div>
+
+                    <div class="form-group row ">
+                        <label for="id_number_of_gymnast" class="col-4 col-sm-2 col-md-2 col-lg-2 col-xl-2 col-form-label"># of gymnast<span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.number_of_gymnast.errors %}has-danger{% endif %}">
+                            {{ form.number_of_gymnast }}
+                            {% if form.number_of_gymnast.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.number_of_gymnast.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</label>
                         <div class="col-5 col-sm-10 col-md-10 col-lg-10 col-xl-10 {% if form.id_informations.errors %}has-danger{% endif %}">
                             {{ form.informations }}
                         </div>
                     </div>
+
                     <div class="form-group text-center">
                         <input type="submit" value="{% if note_id %}Save{% else %}Add{% endif %}"
                             class="btn btn-warning" />

jarvis/followup/templates/intensities/details.html

@@ -61,7 +61,7 @@
                 <div class="col-2"></div>
                 <div class="col-sm-2 d-none d-sm-block"></div>
                 <div class="col-4 col-sm-3 pr-0">Time/passe</div>
-                <div class="col-2 text-right">
+                <div class="col-2 text-right pl-0">
                     <b>
                         {% if intensity.mean_time_by_passe > 4.13 %}
                             <span class="text-danger">{{ intensity.mean_time_by_passe | floatformat:3 }}</span>

jarvis/followup/templates/intensities/list.html

@@ -121,7 +121,7 @@
         });
 
         $('#intensity_table').DataTable({
-            scrollY: 475,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/notes/list.html

@@ -65,7 +65,7 @@
         });
 
         $('#chrono_table').DataTable({
-            scrollY: 475,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/routinedone/list.html

@@ -79,7 +79,7 @@
         });
 
         $('#routine_done_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/scores/list.html

@@ -27,7 +27,9 @@
                     <thead>
                         <tr>
                             <th></th>
+                            {% if not gymnast %}
                             <th class="header text-left">Gymnast</th>
+                            {% endif %}
                             <th class="header text-left">Event</th>
                             <th class="header text-left">Date</th>
                             <th class="header text-left">Routine</th>
@@ -47,9 +49,11 @@
                                     <span class="tim-icons icon-pencil text-warning"></span>
                                 </a>
                             </td>
+                            {% if not gymnast %}
                             <td><a href="{% url 'gymnast_details' score.gymnast.id %}">{{ score.gymnast }}</a></td>
+                            {% endif %}
                             <td><a href="{% url 'event_details' score.event.id %}">{{ score.event.name }}</a></td>
-                            <td>{{ score.event.date_begin | date:"d-m-Y" }}</td>
+                            <td>{{ score.event.date_begin | date:"j-n-Y" }}</td>
                             <td>{{ score.get_routine_type_display }}</td>
                             <td class="text-right">{{ score.point_execution }}</td>
                             <td class="text-right">{{ score.point_difficulty }}</td>
@@ -85,7 +89,7 @@
         });
 
         $('#score_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/seasoninformations/list.html

@@ -78,7 +78,7 @@
         });
 
         $('#score_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/followup/templates/wellbeing/create.html

@@ -13,8 +13,8 @@
                 <form action="{% if wellbeing_id %}{% url 'wellbeing_update' wellbeing_id %}{% else %}{% url 'wellbeing_create' %}{% endif %}" method="post" class="form-horizontal" id="formulaire" name="formulaire">
                     {% csrf_token %}
                     <div class="form-group row ">
-                        <label for="id_gymnast" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Gymnast <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-8 col-sm-9 col-md-9 col-lg-6 col-lg-8 col-xl-8 {% if form.jumper.errors %}has-danger{% endif %}">
+                        <label for="id_gymnast" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Gymnast <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-8 col-sm-9 col-md-8 col-lg-8 col-lg-8 col-xl-9 {% if form.jumper.errors %}has-danger{% endif %}">
                             {% if request.user|has_group:"trainer" %}
                                 {{ form.gymnast }}
                                 {{ form.gymnast_related }}
@@ -30,14 +30,14 @@
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_date" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Date <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-5 col-sm-3 col-md-3 col-lg-4 col-xl-3 {% if form.date.errors %}has-danger{% endif %}">
+                        <label for="id_date" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Date <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-3 col-md-4 col-lg-4 col-xl-3 {% 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_event" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Event</label>
+                        <label for="id_event" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Event</label>
                         <div class="col-8 col-sm-8 col-md-8 col-lg-8 col-xl-9 {% if form.date.errors %}has-danger{% endif %}">
                             {{ form.event }}
                             {{ form.event_related }}
@@ -49,60 +49,60 @@
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_mindstate" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Mind State <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.mindstate.errors %}has-danger{% endif %}">
+                        <label for="id_mindstate" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Mind State <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-2 col-md-3 col-lg-2 {% if form.mindstate.errors %}has-danger{% endif %}">
                             {{ form.mindstate }}
                             {% if form.mindstate.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.mindstate.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
-                        <div class="col-4 col-sm-3 col-md-5 col-lg-5">
-                            <p class="text-muted">(1: Very Bad - 10: Very Good)</p>
+                        <div class="col-4 col-sm-3 col-md-5 col-lg-5 pl-0 pr-0">
+                            <p class="text-muted text-form-info mb-0 mt-2">(1: Very Bad - 10: Very Good)</p>
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_sleep" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Sleep <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.sleep.errors %}has-danger{% endif %}">
+                        <label for="id_sleep" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Sleep <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-2 col-md-3 col-lg-2 {% if form.sleep.errors %}has-danger{% endif %}">
                             {{ form.sleep }}
                             {% if form.sleep.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.sleep.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
-                        <div class="col-4 col-sm-3 col-md-5 col-lg-5">
-                            <p class="text-muted">(1: Very Bad - 10: Very Good)</p>
+                        <div class="col-4 col-sm-3 col-md-5 col-lg-5 pl-0 pr-0">
+                            <p class="text-muted text-form-info mb-0 mt-2">(1: Very Bad - 10: Very Good)</p>
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_stress" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Stress <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.stress.errors %}has-danger{% endif %}">
+                        <label for="id_stress" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Stress <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-2 col-md-3 col-lg-2 {% if form.stress.errors %}has-danger{% endif %}">
                             {{ form.stress }}
                             {% if form.stress.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.stress.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
-                        <div class="col-4 col-sm-3 col-md-5 col-lg-5">
-                            <p class="text-muted">(1: Very Low - 10: Very High)</p>
+                        <div class="col-4 col-sm-3 col-md-5 col-lg-5 pl-0 pr-0">
+                            <p class="text-muted text-form-info mb-0 mt-2">(1: Very Low - 10: Very High)</p>
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_fatigue" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Fatigue <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.fatigue.errors %}has-danger{% endif %}">
+                        <label for="id_fatigue" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Fatigue <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-2 col-md-3 col-lg-2 {% if form.fatigue.errors %}has-danger{% endif %}">
                             {{ form.fatigue }}
                             {% if form.fatigue.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.fatigue.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
-                        <div class="col-4 col-sm-3 col-md-5 col-lg-5">
-                            <p class="text-muted">(1: Very Low - 10: Very High)</p>
+                        <div class="col-4 col-sm-3 col-md-5 col-lg-5 pl-0 pr-0">
+                            <p class="text-muted text-form-info mb-0 mt-2">(1: Very Low - 10: Very High)</p>
                         </div>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_muscle_soreness" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Muscle Soreness <span class="text-danger"><b>*</b></span></label>
-                        <div class="col-5 col-sm-3 col-md-3 col-lg-2 {% if form.muscle_soreness.errors %}has-danger{% endif %}">
+                        <label for="id_muscle_soreness" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Muscle Soreness <span class="text-danger"><b>*</b></span></label>
+                        <div class="col-5 col-sm-2 col-md-3 col-lg-2 {% if form.muscle_soreness.errors %}has-danger{% endif %}">
                             {{ form.muscle_soreness }}
                             {% if form.muscle_soreness.errors %}&nbsp;<span class="btn btn-sm btn-danger-outline">{% for error in form.muscle_soreness.errors %}{{ error }}{% endfor %}</span>{% endif %}
                         </div>
-                        <div class="col-4 col-sm-3 col-md-5 col-lg-5">
-                            <p class="text-muted">(1: Very Low - 10: Very High)</p>
+                        <div class="col-4 col-sm-3 col-md-5 col-lg-5 pl-0 pr-0">
+                            <p class="text-muted text-form-info mb-0 mt-2">(1: Very Low - 10: Very High)</p>
                         </div>
                     </div>
                     <div class="form-group row">
                         <label class="col-12 text-center text-danger" id="note_info"><b>Merci de donner des détails concernant les scores.</b></label>
                     </div>
                     <div class="form-group row ">
-                        <label for="id_information" class="col-4 col-sm-2 col-md-4 col-lg-4 col-xl-3 col-form-label">Informations <span class="text-danger" id="span_info_required"><b>*</b></span></label>
+                        <label for="id_information" class="col-4 col-sm-3 col-md-4 col-lg-4 col-xl-3 col-form-label">Informations <span class="text-danger" id="span_info_required"><b>*</b></span></label>
                         <div class="col-8 col-sm-8 col-md-8 col-lg-8 col-xl-9 {% if form.id_information.errors %}has-danger{% endif %}">
                             {{ form.informations }}
                         </div>

jarvis/followup/templates/wellbeing/list.html

@@ -6,10 +6,10 @@
     <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
         <div class="card">
             <div class="card-header row">
-                <div class="col-8">
+                <div class="col-10 pr-0">
                     <h4 class="">Well being list {% if gymnast %}for <a href="{% url 'gymnast_details_tab' gymnast.id 'physiological' %}"><i>{{ gymnast }}</i></a>{% endif %}</h4>
                 </div>
-                <div class="col-1 ml-auto">
+                <div class="col-2 ml-auto pl-0">
                     <div class="text-right">
                         {% if request.user|has_group:"trainer" %}
                         <a href="{% if gymnast %}{% url 'wellbeing_create_for_gymnast' gymnast.id %}{% else %}{% url 'wellbeing_create' %}{% endif %}">
@@ -28,7 +28,9 @@
                         <tr>
                             <th></th>
                             <th class="header text-left">Date</th>
+                            {% if not gymnast %}
                             <th class="header text-left">Gymnast</th>
+                            {% endif %}
                             <th class="header text-center">Mindstate</th>
                             <th class="header text-center">Sleep</th>
                             <th class="header text-center">Stress</th>
@@ -44,10 +46,16 @@
                                     <span class="tim-icons icon-pencil text-warning"></span>
                                 </a>
                             </td>
-                            <td class="text-left"><a href="{% url 'wellbeing_details' wellbeing.id %}">{{ wellbeing.date | date:"d-m-Y" }}</a></td>
+                            <td class="text-left">
+                                <a href="{% url 'wellbeing_details' wellbeing.id %}">{{ wellbeing.date | date:"j-n-Y" }}</a>
+                            </td>
+                            {% if not gymnast %}
                             <td class="text-left">
                                 <a href="{% url 'gymnast_details_tab' wellbeing.gymnast.id 'physiological' %}">
-                                    {{ wellbeing.gymnast }}</td>
+                                    {{ wellbeing.gymnast }}
+                                </a>
+                            </td>
+                            {% endif %}
                             <td class="text-right">
                                 {% if wellbeing.mindstate < 5%}<b><span class="text-danger">{% endif %}
                                     {{ wellbeing.mindstate }}
@@ -98,7 +106,7 @@
         });
 
         $('#mindstate_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/location/templates/places/list.html

@@ -78,7 +78,7 @@
         });
 
         $('#place_table').DataTable({
-            scrollY: 475,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/objective/templates/combinations/list.html

@@ -89,7 +89,7 @@
         });
 
         $('#routine_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/objective/templates/skills/list.html

@@ -75,7 +75,7 @@
         })
 
         $('#skill_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/people/templates/gymnasts/details.html

@@ -75,8 +75,8 @@
 </div>
 
 <div class="row">
-    <div class="col-3 col-sm-1 col-md-1 col-lg-1 col-xl-1">
-        <ul class="nav nav-pills nav-pills-primary nav-pills-icons flex-column">
+    <div class="col-12 col-sm-1 col-md-1 col-lg-1 col-xl-1">
+        <ul class="nav nav-pills nav-pills-primary nav-pills-icons justify-content-center">
 
             <li class="nav-item">
                 <a class="nav-link get-info{% if tab is None or tab == 'level' %} active{% endif %}" data-toggle="tab" href="#skill" data-ref="#skill" data-url="skill/" id="display_skill">

jarvis/people/templates/gymnasts/list.html

@@ -81,7 +81,7 @@
         });
 
         $('#gymnast_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

jarvis/people/templates/gymnasts/tabs/tab_documents.html

@@ -14,7 +14,7 @@
                 <p class="text-muted">(Under construction)</p>
                 <br />
                 <h5>Evaluation</h5>
-                <p><a href="{% url 'gymnast_report_evaluation' gymnast.id %}">Report</a></p>
+                <p class="text-muted">(Under construction)</p>
             </div>
         </div>
     </div>

jarvis/people/views.py

@@ -260,11 +260,16 @@ def gymnast_display_physiological(request, gymnast_id):
     Args:
         gymnast_id  (int)    identifiant du gymnast
     """
-    injuries_list = Injury.objects.filter(gymnast=gymnast_id).order_by("date")
-    wellbeing_list = WellBeing.objects.filter(gymnast=gymnast_id).order_by("date")
-    height_weight_list = HeightWeight.objects.filter(gymnast=gymnast_id).order_by(
-        "date"
-    )
+    start_date = pendulum.now().date().subtract(months=6)
+    injuries_list = Injury.objects.filter(
+        gymnast=gymnast_id, date__gte=start_date
+    ).order_by("date")
+    wellbeing_list = WellBeing.objects.filter(
+        gymnast=gymnast_id, date__gte=start_date
+    ).order_by("date")
+    height_weight_list = HeightWeight.objects.filter(
+        gymnast=gymnast_id, date__gte=start_date
+    ).order_by("date")
 
     context = {
         "injuries_list": injuries_list,
@@ -286,8 +291,11 @@ def gymnast_display_scores_chrono(request, gymnast_id):
     Args:
         gymnast_id  (int)    identifiant du gymnast
     """
+    start_date = pendulum.now().date().subtract(months=6)
     score_list = Point.objects.filter(gymnast=gymnast_id).order_by("-event__date_begin")
-    chrono_list = Chrono.objects.filter(gymnast=gymnast_id).order_by("date")
+    chrono_list = Chrono.objects.filter(
+        gymnast=gymnast_id, date__gte=start_date
+    ).order_by("date")
     base_queryset = chrono_list.values("date").annotate(score_avg=Avg("tof"))
 
     context = {

jarvis/planning/templates/events/list.html

@@ -87,7 +87,7 @@
         });
 
         $('#event_table').DataTable({
-            scrollY: 500,
+            scrollY: '50vh',
             scrollCollapse: true,
             paging: false,
             searching: false,

static/css/jarvis.css

@@ -90,6 +90,11 @@ textarea.form-control {
     color: #0CA3E0 !important;
 }
 
+.text-form-info {
+    font-weight: lighter !important;
+    font-size: 12px;
+}
+
 .progress-bar-primary {
     background: #ba54f5;
     background-image: -webkit-linear-gradient(to bottom left, #ba54f5, #e14eca, #ba54f5);