UI optimization and bug fix
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
Gregory Trullemans
parent
b2a786a1d9
commit
00ec7214e1
|
|
@ -52,7 +52,7 @@
|
|||
});
|
||||
</script>
|
||||
{% else %}
|
||||
<p>No mindstate recorded for this gymnast.</p>
|
||||
<p class="text-muted">No mindstate recorded for this gymnast.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="card-footer text-right text-muted pt-0">
|
||||
|
|
|
|||
|
|
@ -4,36 +4,37 @@
|
|||
<div class="card-header">
|
||||
<h4>Actives Routines</h4>
|
||||
</div>
|
||||
{% if ghr_list %}
|
||||
<div class="card-body pt-0 pb-0 pr-1 pl-1">
|
||||
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="routine_table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 8%" class="header text-left">Type</th>
|
||||
<th style="width: 30%" class="header text-left">Label</th>
|
||||
<th style="width: 15%" class="header text-left">From</th>
|
||||
<th style="width: 10%" class="header text-center">Diff.</th>
|
||||
<th style="width: 10%" class="header text-center">Level</th>
|
||||
<th style="width: 10%" class="header text-center">Rank</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for ghr in ghr_list %}
|
||||
<tr>
|
||||
<td class="text-center">{{ ghr.get_routine_type_display }}</td>
|
||||
<td class="text-left"><a href="{% url 'routine_details' ghr.routine.id %}">{{ ghr.routine.short_label }}</a></td>
|
||||
<td class="text-center">{{ ghr.datebegin | date:"d-m-Y"}}</td>
|
||||
<!-- <td class="text-center">{% if ghr.dateend %}{{ ghr.dateend | date:"d F Y" }}{% else %}… to now.{% endif %}</td> -->
|
||||
<td class="text-center">{{ ghr.routine.difficulty }}</td>
|
||||
<td class="text-center">{{ ghr.routine.level }}</td>
|
||||
<td class="text-center">{{ ghr.routine.rank }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="card-body pt-0 pb-0 pr-0 pl-0">
|
||||
{% if ghr_list %}
|
||||
<div class="pr-1 pl-1">
|
||||
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="routine_table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 8%" class="header text-left">Type</th>
|
||||
<th style="width: 30%" class="header text-left">Label</th>
|
||||
<th style="width: 15%" class="header text-left">From</th>
|
||||
<th style="width: 10%" class="header text-center">Diff.</th>
|
||||
<th style="width: 10%" class="header text-center">Level</th>
|
||||
<th style="width: 10%" class="header text-center">Rank</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for ghr in ghr_list %}
|
||||
<tr>
|
||||
<td class="text-center">{{ ghr.get_routine_type_display }}</td>
|
||||
<td class="text-left"><a href="{% url 'routine_details' ghr.routine.id %}">{{ ghr.routine.short_label }}</a></td>
|
||||
<td class="text-center">{{ ghr.datebegin | date:"d-m-Y"}}</td>
|
||||
<!-- <td class="text-center">{% if ghr.dateend %}{{ ghr.dateend | date:"d F Y" }}{% else %}… to now.{% endif %}</td> -->
|
||||
<td class="text-center">{{ ghr.routine.difficulty }}</td>
|
||||
<td class="text-center">{{ ghr.routine.level }}</td>
|
||||
<td class="text-center">{{ ghr.routine.rank }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% else %}
|
||||
<p class="text-muted">There are no routines associated to this gymnast.</p>
|
||||
<p class="pl-3 text-muted">There are no routines associated to this gymnast.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="card-footer text-right text-muted pt-0">
|
||||
|
|
@ -57,33 +58,34 @@
|
|||
<div class="card-header">
|
||||
<h4>Routine's statistics</h4>
|
||||
</div>
|
||||
<div class="card-body pt-0 pb-0 pr-1 pl-1">
|
||||
<div class="card-body pt-0 pb-0 pr-0 pl-0">
|
||||
{% if routine_done_list %}
|
||||
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="stats_table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 15%" class="header text-center">Date</th>
|
||||
<th style="width: 30%" class="header text-left">Routine</th>
|
||||
<th style="width: 8%" class="header text-center">Type</th>
|
||||
<th style="width: 10%" class="header text-center"># Try</th>
|
||||
<th style="width: 12%" class="header text-center"># Success</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for routinedone in routine_done_list %}
|
||||
<tr>
|
||||
<td class="text-center">{{ record.date | date:"d-m-Y"}}</td>
|
||||
<td class="text-left"><a href="{% url 'routine_details' record.routine.id %}">{{ record.routine.long_label }}</a></td>
|
||||
<td class="text-center">{{ record.get_routine_type_display }}</td>
|
||||
<td class="text-center">{{ record.number_of_try }}</td>
|
||||
<td class="text-center">{{ record.number_of_successes }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="pr-1 pl-1">
|
||||
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="stats_table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 15%" class="header text-center">Date</th>
|
||||
<th style="width: 30%" class="header text-left">Routine</th>
|
||||
<th style="width: 8%" class="header text-center">Type</th>
|
||||
<th style="width: 10%" class="header text-center"># Try</th>
|
||||
<th style="width: 12%" class="header text-center"># Success</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for routinedone in routine_done_list %}
|
||||
<tr>
|
||||
<td class="text-center">{{ routinedone.date | date:"d-m-Y"}}</td>
|
||||
<td class="text-left"><a href="{% url 'routine_details' routinedone.routine.id %}">{{ routinedone.routine.long_label }}</a></td>
|
||||
<td class="text-center">{{ routinedone.get_routine_type_display }}</td>
|
||||
<td class="text-center">{{ routinedone.number_of_try }}</td>
|
||||
<td class="text-center">{{ routinedone.number_of_successes }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
{% else %}
|
||||
<p class="text-muted">There are no routine's statistics associated to this gymnast.</p>
|
||||
<p class="pl-3 text-muted">There are no routine's statistics associated to this gymnast.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="card-footer text-right text-muted pt-0">
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<div class="card-header">
|
||||
<h4>Scores</h4>
|
||||
</div>
|
||||
{% if score_list %}
|
||||
<div class="card-body pt-0 pb-0 pr-0 pl-0">
|
||||
{% if score_list %}
|
||||
<div>
|
||||
<canvas id="chartjs_routine" class="chartjs" width="400" height="200"></canvas>
|
||||
</div>
|
||||
|
|
@ -92,11 +92,11 @@
|
|||
L2 <input type="checkbox" name="checkbox" class="bootstrap-switch" id="checkbox_l2" checked />
|
||||
L3 <input type="checkbox" name="checkbox" class="bootstrap-switch" id="checkbox_l3" checked />
|
||||
</div> -->
|
||||
{% else %}
|
||||
<p class="pl-3 text-muted">No score recorded for this gymnast.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{% else %}
|
||||
<p class="pl-3 text-muted">No score recorded for this gymnast.</p>
|
||||
{% endif %}
|
||||
<div class="card-footer text-right text-muted pt-0">
|
||||
{% if score_list %}
|
||||
<a href="{% url 'score_list_for_gymnast' gymnast_id %}">
|
||||
|
|
@ -126,9 +126,6 @@
|
|||
<!-- <canvas id="chartSimpleWithGradient"></canvas> -->
|
||||
<canvas id="chartjs_chrono" class="chartjs" width="400" height="200"></canvas>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if chrono_list %}
|
||||
<!-- <table class="table table-striped table-condensed tablesorter" id="chrono_table">
|
||||
<thead>
|
||||
<tr>
|
||||
|
|
|
|||
Loading…
Reference in New Issue