Sulley
/
Jarvis
1
0
Fork 0
Code Issues 19 Pull Requests 1 Projects Releases Wiki Activity

Update ChartJS, update jquery, …

This commit is contained in:
Gregory Trullemans 2024-04-23 10:15:36 +02:00
parent 0687b57e12
commit 6084bfd15e
10 changed files with 189 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jarvis/core/templates/base.html
View File

@ -43,14 +43,14 @@
<link href='https://api.mapbox.com/mapbox.js/v3.2.0/mapbox.css' rel='stylesheet' />
<!-- Core JS Files -->
<script src="{% static "js/core/jquery-3.6.0.min.js" %}"></script>
<script src="{% static "js/core/jquery_3.7.1.min.js" %}"></script>
<script src="{% static "js/core/popper.min.js" %}"></script>
<script src="{% static "js/core/bootstrap.min.js" %}"></script>
<!-- Chart JS -->
<script src="{% static "js/plugins/momentjs/moment_2.29.1.min.js" %}"></script>
<script src="{% static "js/plugins/momentjs/moment_locale_en-gb.js" %}"></script>
<script src="{% static "js/plugins/chartjs/chartjs_3.9.1.min.js" %}"></script>
<script src="{% static "js/plugins/chartjs/chartjs_4.4.2.min.js" %}"></script>
<script src="{% static "js/plugins/chartjs/chartjs-adapter-moment_1.0.0.js" %}"></script>
<!-- DataTables -->

74
jarvis/followup/templates/chronos/list.html
View File

@ -178,29 +178,41 @@
{% if chrono_list %}
var timeFormat = 'DD-MM-YYYY';
var ctx = document.getElementById('chart_chrono').getContext('2d');
var gradient_stroke_1 = ctx.createLinearGradient(0, 230, 0, 50);
var gradient_stroke_2 = ctx.createLinearGradient(0, 230, 0, 50);
var gradient_stroke_3 = ctx.createLinearGradient(0, 230, 0, 50);
var gradient_stroke_4 = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_1.addColorStop(0.75, 'rgba(75, 192, 192, 0.3)');
gradient_stroke_1.addColorStop(0.5, 'rgba(75, 192, 192, 0.2)');
gradient_stroke_1.addColorStop(0.25, 'rgba(75, 192, 192, 0)');
var border_color_pink = 'rgb(255, 99, 132)';
var gradient_stroke_pink = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_pink.addColorStop(1, 'rgba(255, 99, 132, 0.4)');
gradient_stroke_pink.addColorStop(0.75, 'rgba(255, 99, 132, 0.3)');
gradient_stroke_pink.addColorStop(0.5, 'rgba(255, 99, 132, 0.2)');
gradient_stroke_pink.addColorStop(0.25, 'rgba(255, 99, 132, 0)');
gradient_stroke_2.addColorStop(1, 'rgba(255, 99, 132, 0.4)');
gradient_stroke_2.addColorStop(0.75, 'rgba(255, 99, 132, 0.3)');
gradient_stroke_2.addColorStop(0.5, 'rgba(255, 99, 132, 0.2)');
gradient_stroke_2.addColorStop(0.25, 'rgba(255, 99, 132, 0)');
var border_color_orange = 'rgb(255, 159, 64)';
var gradient_stroke_orange = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_orange.addColorStop(1, 'rgba(255, 159, 64, 0.4)');
gradient_stroke_orange.addColorStop(0.75, 'rgba(255, 159, 64, 0.3)');
gradient_stroke_orange.addColorStop(0.5, 'rgba(255, 159, 64, 0.2)');
gradient_stroke_orange.addColorStop(0.25, 'rgba(255, 159, 64, 0)');
gradient_stroke_3.addColorStop(1, 'rgba(255, 159, 64, 0.4)');
gradient_stroke_3.addColorStop(0.75, 'rgba(255, 159, 64, 0.3)');
gradient_stroke_3.addColorStop(0.5, 'rgba(255, 159, 64, 0.2)');
gradient_stroke_3.addColorStop(0.25, 'rgba(255, 159, 64, 0)');
var border_color_green = 'rgb(75, 192, 192)';
var gradient_stroke_green = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_green.addColorStop(1, 'rgba(75, 192, 192, 0.4)');
gradient_stroke_green.addColorStop(0.75, 'rgba(75, 192, 192, 0.3)');
gradient_stroke_green.addColorStop(0.5, 'rgba(75, 192, 192, 0.2)');
gradient_stroke_green.addColorStop(0.25, 'rgba(75, 192, 192, 0)');
gradient_stroke_4.addColorStop(1, 'rgba(54, 162, 235, 0.4)');
gradient_stroke_4.addColorStop(0.75, 'rgba(54, 162, 235, 0.3)');
gradient_stroke_4.addColorStop(0.5, 'rgba(54, 162, 235, 0.2)');
gradient_stroke_4.addColorStop(0.25, 'rgba(54, 162, 235, 0)');
var border_color_blue = 'rgb(54, 162, 235)';
var gradient_stroke_blue = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_blue.addColorStop(1, 'rgba(54, 162, 235, 0.4)');
gradient_stroke_blue.addColorStop(0.75, 'rgba(54, 162, 235, 0.3)');
gradient_stroke_blue.addColorStop(0.5, 'rgba(54, 162, 235, 0.2)');
gradient_stroke_blue.addColorStop(0.25, 'rgba(54, 162, 235, 0)');
var border_color_yellow = 'rgb(255, 205, 86)';
var gradient_stroke_yellow = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_yellow.addColorStop(1, 'rgba(255, 205, 86, 0.4)');
gradient_stroke_yellow.addColorStop(0.75, 'rgba(255, 205, 86, 0.3)');
gradient_stroke_yellow.addColorStop(0.5, 'rgba(255, 205, 86, 0.2)');
gradient_stroke_yellow.addColorStop(0.25, 'rgba(255, 205, 86, 0)');
var straightjump_values = [
{% for chrono in chrono_10c %}
@ -244,9 +256,9 @@
{
label: '10 |',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_1,
borderColor: 'rgb(75, 192, 192)',
pointBackgroundColor: 'rgb(75, 192, 192)',
backgroundColor: gradient_stroke_pink,
borderColor: border_color_pink,
pointBackgroundColor: border_color_pink,
fill: true,
data: straightjump_values,
},
@ -255,9 +267,9 @@
{
label: 'Q1R1',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_2,
borderColor: 'rgb(255, 99, 132)',
pointBackgroundColor: 'rgb(255, 99, 132)',
backgroundColor: gradient_stroke_orange,
borderColor: border_color_orange,
pointBackgroundColor: border_color_orange,
fill: true,
data: compulsory_routine_values,
},
@ -266,9 +278,9 @@
{
label: 'Q1R2',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_3,
borderColor: 'rgb(255, 159, 64)',
pointBackgroundColor: 'rgb(255, 159, 64)',
backgroundColor: gradient_stroke_green,
borderColor: border_color_green,
pointBackgroundColor: border_color_green,
fill: true,
data: volontary_routine_values,
},
@ -277,9 +289,9 @@
{
label: 'Q2R1',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_4,
borderColor: 'rgb(255, 205, 86)',
pointBackgroundColor: 'rgb(255, 205, 86)',
backgroundColor: gradient_stroke_blue,
borderColor: border_color_blue,
pointBackgroundColor: border_color_blue,
fill: true,
data: final_routine_values,
},

20
jarvis/followup/templates/intensities/list.html
View File

@ -34,11 +34,11 @@
<th style="width: 18%" class="header text-left">Gymnast</th>
{% endif %}
<th style="width: 7%" class="header text-center">Time</th>
<th style="width: 7%" class="header text-center">Diff</th>
<th style="width: 7%" class="header text-center">Skill</th>
<th style="width: 7%" class="header text-center">Passe</th>
<th style="width: 7%" class="header text-center">Quality</th>
<th style="width: 7%" class="header text-center">Time (%)</th>
<th style="width: 7%" class="header text-center">Diff (%)</th>
<th style="width: 7%" class="header text-center">Skill (%)</th>
<th style="width: 7%" class="header text-center">Passe (%)</th>
<th style="width: 7%" class="header text-center">Quality (%)</th>
<th style="width: 7%" class="header text-center">T/p</th><!-- Time by passe -->
<th style="width: 7%" class="header text-center">D/p</th><!-- Difficulty by passe -->
@ -64,10 +64,10 @@
</td>
{% endif %}
<td class="text-center">{{ intensity.time_quality | floatformat:0 }}%</td>
<td class="text-center">{{ intensity.difficulty_quality | floatformat:0 }}%</td>
<td class="text-center">{{ intensity.quantity_of_skill_quality | floatformat:0 }}%</td>
<td class="text-center">{{ intensity.number_of_passes_quality | floatformat:0 }}%</td>
<td class="text-center">{{ intensity.time_quality | floatformat:0 }}</td>
<td class="text-center">{{ intensity.difficulty_quality | floatformat:0 }}</td>
<td class="text-center">{{ intensity.quantity_of_skill_quality | floatformat:0 }}</td>
<td class="text-center">{{ intensity.number_of_passes_quality | floatformat:0 }}</td>
<td class="text-center">
<b>
{% if intensity.average_training_quality <= 85.0 %}
@ -77,7 +77,7 @@
{% else %}
<span class="text-success">
{% endif %}
{{ intensity.average_training_quality | floatformat:1 }}%</span>
{{ intensity.average_training_quality | floatformat:1 }}</span>
</b>
</td>

11
jarvis/followup/templates/wellbeing/create.html
View File

@ -161,6 +161,17 @@
var fatigue_slider = document.getElementById("id_fatigue");
var muscle_soreness_slider = document.getElementById("id_muscle_soreness");
// mindstate_slider.min = 1;
// mindstate_slider.value = 5;
// sleep_slider.min = 1;
// sleep_slider.value = 5;
// stress_slider.min = 1;
// stress_slider.value = 5;
// fatigue_slider.min = 1;
// fatigue_slider.value = 5;
// muscle_soreness_slider.min = 1;
// muscle_soreness_slider.value = 5;
var output_sleep = document.getElementById("sleep_value");
var output_mindstate = document.getElementById("mindstate_value");
var output_stress = document.getElementById("stress_value");

11
jarvis/people/templates/gymnasts/tabs/tab_height_weight_wellbeing_injury.html
View File

@ -88,7 +88,7 @@
<tr>
<th style="width: 2%"></th>
<th class="header text-center" style="width: 8%">Date</th>
<th class="header text-left" style="width: 8%">Mechanism</th>
<th class="header text-center" style="width: 8%">Mechanism</th>
<th class="header text-left" style="width: 27%">Type</th>
<th class="header text-left" style="width: 25%">Location</th>
<th class="header text-left" style="width: 12%">Side</th>
@ -105,11 +105,16 @@
</a>
</td>
<td class="text-right"><a href="{% url 'injury_details' injury.id %}">{{ injury.date | date:"d-m-Y" }}</a></td>
<td class="text-left">{{ injury.get_mechanism_display }}</td>
<td class="text-center">{{ injury.get_mechanism_display }}</td>
<td class="text-left">{{ injury.get_injury_type_display }}</td>
<td class="text-left">{{ injury.get_location_display }}</td>
<td class="text-left">{{ injury.get_body_side_display }}</td>
<td class="text-left">{% if injury.skill %}<a href="{% url 'skill_details' injury.skill.id %}">{{ injury.skill }}</a>{% else %}-{% endif %}</td>
<td class="text-left">
{% if injury.skill %}
<a href="{% url 'skill_details' injury.skill.id %}">
{{ injury.skill.notation }}
</a>
{% else %}-{% endif %}</td>
<td class="text-center">{{ injury.nb_week_off }}</td>
</tr>
{% endfor %}

156
jarvis/people/templates/gymnasts/tabs/tab_routines_scores.html
View File

@ -148,7 +148,11 @@
{% for ghr in ghr_list %}
<tr>
<td class="text-center">{{ ghr.get_routine_type_display }}</td>
<td class="text-left"><a href="{% url 'combination_details' ghr.routine.id %}">{{ ghr.routine.short_label }}</a></td>
<td class="text-left">
<a href="{% url 'combination_details' ghr.routine.id %}">
{{ ghr.routine.short_label }}
</a>
</td>
<td class="text-center">{{ ghr.date_begin | date:"d-m-Y"}}</td>
<td class="text-center"><b>{{ ghr.routine.difficulty }}</b></td>
</tr>
@ -223,20 +227,26 @@
var gradient_stroke_2 = ctx.createLinearGradient(0, 230, 0, 50);
var gradient_stroke_3 = ctx.createLinearGradient(0, 230, 0, 50);
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)');
var border_color_pink = 'rgb(255, 99, 132)';
var gradient_stroke_pink = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_pink.addColorStop(1, 'rgba(255, 99, 132, 0.4)');
gradient_stroke_pink.addColorStop(0.75, 'rgba(255, 99, 132, 0.3)');
gradient_stroke_pink.addColorStop(0.5, 'rgba(255, 99, 132, 0.2)');
gradient_stroke_pink.addColorStop(0.25, 'rgba(255, 99, 132, 0)');
gradient_stroke_2.addColorStop(1, 'rgba(255, 159, 64, 0.4)');
gradient_stroke_2.addColorStop(0.75, 'rgba(255, 159, 64, 0.3)');
gradient_stroke_2.addColorStop(0.5, 'rgba(255, 159, 64, 0.2)');
gradient_stroke_2.addColorStop(0.25, 'rgba(255, 159, 64, 0)');
var border_color_orange = 'rgb(255, 159, 64)';
var gradient_stroke_orange = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_orange.addColorStop(1, 'rgba(255, 159, 64, 0.4)');
gradient_stroke_orange.addColorStop(0.75, 'rgba(255, 159, 64, 0.3)');
gradient_stroke_orange.addColorStop(0.5, 'rgba(255, 159, 64, 0.2)');
gradient_stroke_orange.addColorStop(0.25, 'rgba(255, 159, 64, 0)');
gradient_stroke_3.addColorStop(1, 'rgba(54, 162, 235, 0.4)');
gradient_stroke_3.addColorStop(0.75, 'rgba(54, 162, 235, 0.3)');
gradient_stroke_3.addColorStop(0.5, 'rgba(54, 162, 235, 0.2)');
gradient_stroke_3.addColorStop(0.25, 'rgba(54, 162, 235, 0)');
var border_color_green = 'rgb(75, 192, 192)';
var gradient_stroke_green = ctx.createLinearGradient(0, 230, 0, 50);
gradient_stroke_green.addColorStop(1, 'rgba(75, 192, 192, 0.4)');
gradient_stroke_green.addColorStop(0.75, 'rgba(75, 192, 192, 0.3)');
gradient_stroke_green.addColorStop(0.5, 'rgba(75, 192, 192, 0.2)');
gradient_stroke_green.addColorStop(0.25, 'rgba(75, 192, 192, 0)');
var compulsory_routine_scrore = [
{% for score in score_routine1_list %}
@ -271,9 +281,9 @@
{
label: 'Q1R1',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_1,
borderColor: 'rgb(255, 99, 132)',
pointBackgroundColor: 'rgb(255, 99, 132)',
backgroundColor: gradient_stroke_pink,
borderColor: border_color_pink,
pointBackgroundColor: border_color_pink,
fill: true,
data: compulsory_routine_scrore
},
@ -283,9 +293,9 @@
{
label: 'Q1R2',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_2,
borderColor: 'rgb(255, 159, 64)',
pointBackgroundColor: 'rgb(255, 159, 64)',
backgroundColor: gradient_stroke_orange,
borderColor: border_color_orange,
pointBackgroundColor: border_color_orange,
fill: true,
data: voluntary_routine_scrore
},
@ -295,9 +305,9 @@
{
label: 'Q2R1',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_3,
borderColor: 'rgb(54, 162, 235)',
pointBackgroundColor: 'rgb(54, 162, 235)',
backgroundColor: border_color_green,
borderColor: border_color_green,
pointBackgroundColor: border_color_green,
fill: true,
data: final_routine_scrore
},
@ -377,86 +387,104 @@
gradient_stroke_yellow.addColorStop(0.25, 'rgba(255, 205, 86, 0)');
{% if routine_one_done_list %}
var routine_one_try = [
var routine_one = [
{% for routine_done in routine_one_done_list %}
{
x: '{{ routine_done.date | date:"d-m-Y" }}',
y: '{{ routine_done.number_of_try }}'
y: {% widthratio routine_done.number_of_successes routine_done.number_of_try 100 %}
},
{% endfor %}
];
var routine_one_success = [
{% for routine_done in routine_one_done_list %}
{
x: '{{ routine_done.date | date:"d-m-Y" }}',
y: '{{ routine_done.number_of_successes }}'
},
{% endfor %}
];
// var routine_one_try = [
// {% for routine_done in routine_one_done_list %}
// {
// x: '{{ routine_done.date | date:"d-m-Y" }}',
// y: '{{ routine_done.number_of_try }}'
// },
// {% endfor %}
// ];
// var routine_one_success = [
// {% for routine_done in routine_one_done_list %}
// {
// x: '{{ routine_done.date | date:"d-m-Y" }}',
// y: '{{ routine_done.number_of_successes }}'
// },
// {% endfor %}
// ];
{% endif %}
{% if routine_two_done_list %}
var routine_two_done = [
var routine_two = [
{% for routine_done in routine_two_done_list %}
{
x: '{{ routine_done.date | date:"d-m-Y" }}',
y: '{{ routine_done.number_of_try }}'
y: {% widthratio routine_done.number_of_successes routine_done.number_of_try 100 %}
},
{% endfor %}
];
var routine_two_success = [
{% for routine_done in routine_two_done_list %}
{
x: '{{ routine_done.date | date:"d-m-Y" }}',
y: '{{ routine_done.number_of_successes }}'
},
{% endfor %}
];
// var routine_two_done = [
// {% for routine_done in routine_two_done_list %}
// {
// x: '{{ routine_done.date | date:"d-m-Y" }}',
// y: '{{ routine_done.number_of_try }}'
// },
// {% endfor %}
// ];
// var routine_two_success = [
// {% for routine_done in routine_two_done_list %}
// {
// x: '{{ routine_done.date | date:"d-m-Y" }}',
// y: '{{ routine_done.number_of_successes }}'
// },
// {% endfor %}
// ];
{% endif %}
var score_values = {
datasets: [
{% if routine_one_done_list %}
{
label: 'Q1R1 Try',
label: 'Q1R1',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_pink,
borderColor: border_color_pink,
pointBackgroundColor: border_color_pink,
fill: true,
data: routine_one_try,
},
{
label: 'Q1R1 success',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_orange,
borderColor: border_color_orange,
pointBackgroundColor: border_color_orange,
fill: true,
data: routine_one_success,
data: routine_one,
},
// {
// label: 'Q1R1 success',
// cubicInterpolationMode: 'monotone',
// backgroundColor: gradient_stroke_orange,
// borderColor: border_color_orange,
// pointBackgroundColor: border_color_orange,
// fill: true,
// data: routine_one_success,
// },
{% endif %}
{% if routine_two_done_list %}
{
label: 'Q1R2 Try',
label: 'Q1R2',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_green,
borderColor: border_color_green,
pointBackgroundColor: border_color_green,
fill: true,
data: routine_two_done,
},
{
label: 'Q1R2 Success',
cubicInterpolationMode: 'monotone',
backgroundColor: gradient_stroke_blue,
borderColor: border_color_blue,
pointBackgroundColor: border_color_blue,
fill: true,
data: routine_two_success,
data: routine_two,
},
// {
// label: 'Q1R2 Success',
// cubicInterpolationMode: 'monotone',
// backgroundColor: gradient_stroke_blue,
// borderColor: border_color_blue,
// pointBackgroundColor: border_color_blue,
// fill: true,
// data: routine_two_success,
// },
{% endif %}
],
}

2
static/js/core/jquery_3.7.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

1
static/js/plugins/chartjs/chart.umd.js.map Normal file
View File

File diff suppressed because one or more lines are too long

13
static/js/plugins/chartjs/chartjs_3.9.1.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
static/js/plugins/chartjs/chartjs_4.4.2.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long