Minor updates
This commit is contained in:
Gregory Trullemans
parent
ccc33efbba
commit
84427a49f0
|
|
@ -227,8 +227,6 @@
|
|||
<script src="{% static "js/plugins/jasny-bootstrap_3.1.3.min.js" %}"></script>
|
||||
<!-- Vector Map plugin, full documentation here: http://jvectormap.com/documentation/ -->
|
||||
<script src="{% static "js/plugins/jquery-jvectormap_2.0.4.js" %}"></script>
|
||||
<!-- Plugin for the Sliders, full documentation here: http://refreshless.com/nouislider/ -->
|
||||
<script src="{% static "js/plugins/nouislider_11.1.0.min.js" %}"></script>
|
||||
<!-- Notifications Plugin -->
|
||||
<script src="{% static "js/plugins/bootstrap-notify_3.1.5.js" %}"></script>
|
||||
<!-- Control Center for Black Dashboard: parallax effects, scripts for the example pages etc -->
|
||||
|
|
|
|||
|
|
@ -18,13 +18,14 @@
|
|||
<div class="col-sm-2 d-none d-sm-block"></div>
|
||||
<div class="col-4 col-sm-3 pr-0">Time</div>
|
||||
<div class="col-2 text-right pl-0">
|
||||
{% if intensity.time_quality <= 85.0 %}
|
||||
<span class="text-danger">{{ intensity.time_quality | floatformat:1 }}%</span>
|
||||
{% elif intensity.time_quality <= 95.0 %}
|
||||
<span class="text-warning">{{ intensity.time_quality | floatformat:1 }}%</span>
|
||||
{% else %}
|
||||
<span class="text-success">{{ intensity.time_quality | floatformat:1 }}%</span>
|
||||
{% endif %}
|
||||
{% if intensity.time_quality <= 85.0 %}
|
||||
<span class="text-danger">
|
||||
{% elif intensity.time_quality <= 95.0 %}
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
{{ intensity.time_quality | floatformat:1 }}%</span>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -33,13 +34,14 @@
|
|||
<div class="col-sm-2 d-none d-sm-block"></div>
|
||||
<div class="col-4 col-sm-3 pr-0">Diff.</div>
|
||||
<div class="col-2 text-right pl-0">
|
||||
{% if intensity.difficulty_quality <= 85.0 %}
|
||||
<span class="text-danger">{{ intensity.difficulty_quality | floatformat:1 }}%</span>
|
||||
{% elif intensity.difficulty_quality <= 95.0 %}
|
||||
<span class="text-warning">{{ intensity.difficulty_quality | floatformat:1 }}%</span>
|
||||
{% else %}
|
||||
<span class="text-success">{{ intensity.difficulty_quality | floatformat:1 }}%</span>
|
||||
{% endif %}
|
||||
{% if intensity.difficulty_quality <= 85.0 %}
|
||||
<span class="text-danger">
|
||||
{% elif intensity.difficulty_quality <= 95.0 %}
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
{{ intensity.difficulty_quality | floatformat:1 }}%</span>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -49,12 +51,13 @@
|
|||
<div class="col-4 col-sm-3 pr-0">Skill</div>
|
||||
<div class="col-2 text-right pl-0">
|
||||
{% if intensity.quantity_of_skill_quality <= 85.0 %}
|
||||
<span class="text-danger">{{ intensity.quantity_of_skill_quality | floatformat:1 }}%</span>
|
||||
<span class="text-danger">
|
||||
{% elif intensity.quantity_of_skill_quality <= 95.0 %}
|
||||
<span class="text-warning">{{ intensity.quantity_of_skill_quality | floatformat:1 }}%</span>
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">{{ intensity.quantity_of_skill_quality | floatformat:1 }}%</span>
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
{{ intensity.quantity_of_skill_quality | floatformat:1 }}%</span>
|
||||
</div>
|
||||
|
||||
|
||||
|
|
@ -64,27 +67,38 @@
|
|||
<div class="col-4 col-sm-3 pr-0">Passes</div>
|
||||
<div class="col-2 text-right pl-0">
|
||||
{% if intensity.number_of_passes_quality <= 85.0 %}
|
||||
<span class="text-danger">{{ intensity.number_of_passes_quality | floatformat:1 }}%</span>
|
||||
<span class="text-danger">
|
||||
{% elif intensity.number_of_passes_quality <= 95.0 %}
|
||||
<span class="text-warning">{{ intensity.number_of_passes_quality | floatformat:1 }}%</span>
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">{{ intensity.number_of_passes_quality | floatformat:1 }}%</span>
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
{{ intensity.number_of_passes_quality | floatformat:1 }}%</span>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col-6 col-sm-5 text-center">{{ intensity.number_of_gymnast }} gymnasts on trampoline</div>
|
||||
<div class="col-sm-2 d-none d-sm-block"></div>
|
||||
<div class="col-4 col-sm-3 pr-0"><b>Average</b></div>
|
||||
<div class="col-4 col-sm-3 pr-0">
|
||||
{% if intensity.average_training_quality <= 85.0 %}
|
||||
<span class="text-danger">
|
||||
{% elif intensity.average_training_quality <= 95.0 %}
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
Average</span>
|
||||
</div>
|
||||
<div class="col-2 text-right pl-0">
|
||||
<b>
|
||||
{% if intensity.average_training_quality <= 85.0 %}
|
||||
<span class="text-danger">{{ intensity.average_training_quality | floatformat:1 }}%</span>
|
||||
<span class="text-danger">
|
||||
{% elif intensity.average_training_quality <= 95.0 %}
|
||||
<span class="text-warning">{{ intensity.average_training_quality | floatformat:1 }}%</span>
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">{{ intensity.average_training_quality | floatformat:1 }}%</span>
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
{{ intensity.average_training_quality | floatformat:1 }}%</span>
|
||||
</b>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -105,16 +119,26 @@
|
|||
<div class="col-4 col-sm-3 pr-0">Diff/Skill</div>
|
||||
<div class="col-2 text-right pl-0">{{ intensity.average_difficulty_by_skill_in_unit | floatformat:3 }}</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-4 col-sm-3 pr-0">
|
||||
{% if intensity.passes_quality_for_gymnast >= 3 %}
|
||||
<span class="text-danger">
|
||||
{% elif intensity.passes_quality_for_gymnast == 2 %}
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
Time/passe</span>
|
||||
</div>
|
||||
<div class="col-2 text-right pl-0">
|
||||
<b>
|
||||
{% if intensity.passes_quality_for_gymnast >= 3 %}
|
||||
<span class="text-danger">{{ intensity.average_time_by_passe_readable }}</span>
|
||||
<span class="text-danger">
|
||||
{% elif intensity.passes_quality_for_gymnast == 2 %}
|
||||
<span class="text-warning">{{ intensity.average_time_by_passe_readable }}</span>
|
||||
<span class="text-warning">
|
||||
{% else %}
|
||||
<span class="text-success">{{ intensity.average_time_by_passe_readable }}</span>
|
||||
<span class="text-success">
|
||||
{% endif %}
|
||||
{{ intensity.average_time_by_passe_readable }}</span>
|
||||
</b>
|
||||
</div>
|
||||
|
||||
|
|
@ -132,8 +156,8 @@
|
|||
|
||||
|
||||
{% if intensity.to_markdown %}
|
||||
<div class="col-12 mt-3 pt-0">
|
||||
<h4 class="mb-0">More details</h4>
|
||||
<div class="col-12 mt-3 pt-0 text-justify">
|
||||
<p><b><u>Informations</u></b></p>
|
||||
{{ intensity.to_markdown | safe }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -7,13 +7,7 @@
|
|||
<div class="col-8">
|
||||
<h4 class="">
|
||||
{% if gymnast %}
|
||||
{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}
|
||||
<a href="{% url 'gymnast_details_tab' gymnast.id 'routine' %}">
|
||||
{% endif %}
|
||||
{{ gymnast }}
|
||||
{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}
|
||||
</a>
|
||||
{% endif %}'s
|
||||
{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}<a href="{% url 'gymnast_details_tab' gymnast.id 'routine' %}">{% endif %}{{ gymnast }}{% if gymnast.id in request.session.available_gymnast or request.user.is_superuser %}</a>{% endif %}'s
|
||||
{% endif %} Intensities
|
||||
</h4>
|
||||
</div>
|
||||
|
|
@ -70,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 %}
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@
|
|||
<div class="col-8 col-sm-8 col-md-8 col-lg-8 col-xl-6 {% if form.date.errors %}has-danger{% endif %}">
|
||||
{{ form.event }}
|
||||
{{ form.event_related }}
|
||||
{% if form.eventt.errors %}
|
||||
<label class="text-danger" for="id_eventt" id="event-error">
|
||||
{% for error in form.event.errors %}{{ error }}{% endfor %}
|
||||
</label>
|
||||
{% if form.event.errors %}
|
||||
<label class="text-danger" for="id_event" id="event-error">
|
||||
{% for error in form.event.errors %}{{ error }}{% endfor %}
|
||||
</label>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -52,7 +52,13 @@
|
|||
<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-3 col-sm-2 col-md-3 col-lg-2 {% if form.mindstate.errors %}has-danger{% endif %}">
|
||||
{{ form.mindstate }}
|
||||
{% if form.mindstate.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.mindstate.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
{% if form.mindstate.errors %}
|
||||
<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 pl-0 pr-0">
|
||||
<p class="text-muted text-form-info mb-0 mt-2"><small>(1: Very Bad - 10: Very Good)</small></p>
|
||||
|
|
@ -62,7 +68,13 @@
|
|||
<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-3 col-sm-2 col-md-3 col-lg-2 {% if form.sleep.errors %}has-danger{% endif %}">
|
||||
{{ form.sleep }}
|
||||
{% if form.sleep.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.sleep.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
{% if form.sleep.errors %}
|
||||
<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 pl-0 pr-0">
|
||||
<p class="text-muted text-form-info mb-0 mt-2"><small>(1: Very Bad - 10: Very Good)</small></p>
|
||||
|
|
@ -72,7 +84,13 @@
|
|||
<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-3 col-sm-2 col-md-3 col-lg-2 {% if form.stress.errors %}has-danger{% endif %}">
|
||||
{{ form.stress }}
|
||||
{% if form.stress.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.stress.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
{% if form.stress.errors %}
|
||||
<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 pl-0 pr-0">
|
||||
<p class="text-muted text-form-info mb-0 mt-2"><small>(1: Very Low - 10: Very High)</small></p>
|
||||
|
|
@ -82,7 +100,13 @@
|
|||
<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-3 col-sm-2 col-md-3 col-lg-2 {% if form.fatigue.errors %}has-danger{% endif %}">
|
||||
{{ form.fatigue }}
|
||||
{% if form.fatigue.errors %} <span class="btn btn-sm btn-danger-outline">{% for error in form.fatigue.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
{% if form.fatigue.errors %}
|
||||
<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 pl-0 pr-0">
|
||||
<p class="text-muted text-form-info mb-0 mt-2"><small>(1: Very Low - 10: Very High)</small></p>
|
||||
|
|
@ -92,7 +116,13 @@
|
|||
<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-3 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 %} <span class="btn btn-sm btn-danger-outline">{% for error in form.muscle_soreness.errors %}{{ error }}{% endfor %}</span>{% endif %}
|
||||
{% if form.muscle_soreness.errors %}
|
||||
<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 pl-0 pr-0">
|
||||
<p class="text-muted text-form-info mb-0 mt-2"><small>(1: Very Low - 10: Very High)</small></p>
|
||||
|
|
@ -202,4 +232,6 @@
|
|||
<script src="{% static "js/template_users/gymnast_autocomplete.js" %}"></script>
|
||||
<script src="{% static "js/template_users/event_autocomplete.js" %}"></script>
|
||||
{% endif %}
|
||||
|
||||
<link rel="stylesheet" href="{% static "js/plugins/nouislider/nouislider.css" %}" />
|
||||
{% endblock %}
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue