Update UI
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
9148c2b8e2
commit
8753e30b1d
|
@ -77,7 +77,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-12 col-sm-2 col-md-2 col-lg-1">
|
<div class="col-12 col-sm-1 col-md-1 col-lg-1 col-xl-1">
|
||||||
<!--
|
<!--
|
||||||
color-classes: "nav-pills-primary", "nav-pills-info", "nav-pills-success", "nav-pills-warning","nav-pills-danger"
|
color-classes: "nav-pills-primary", "nav-pills-info", "nav-pills-success", "nav-pills-warning","nav-pills-danger"
|
||||||
-->
|
-->
|
||||||
|
@ -85,29 +85,29 @@
|
||||||
|
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link get-info{% if tab is None or tab == 'level' %} active{% endif %}" data-toggle="tab" href="#statistics" data-ref="#statistics" data-url="statistics/" id="display_statistics">
|
<a class="nav-link get-info{% if tab is None or tab == 'level' %} active{% endif %}" data-toggle="tab" href="#statistics" data-ref="#statistics" data-url="statistics/" id="display_statistics">
|
||||||
<i class="tim-icons icon-sound-wave"></i> Level
|
<i class="tim-icons icon-sound-wave"></i> <!-- Level -->
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link get-info{% if tab == 'routine' %} active{% endif %}" data-toggle="tab" href="#routine" data-ref="#routine" data-url="routine/" id="display_routines">
|
<a class="nav-link get-info{% if tab == 'routine' %} active{% endif %}" data-toggle="tab" href="#routine" data-ref="#routine" data-url="routine/" id="display_routines">
|
||||||
<i class="tim-icons icon-components"></i> Routines
|
<i class="tim-icons icon-components"></i> <!-- Routines -->
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link get-info{% if tab == 'scores' %} active{% endif %}" data-toggle="tab" href="#scores" data-ref="#scores" data-url="scores_chrono/" id="display_scores_chrono">
|
<a class="nav-link get-info{% if tab == 'scores' %} active{% endif %}" data-toggle="tab" href="#scores" data-ref="#scores" data-url="scores_chrono/" id="display_scores_chrono">
|
||||||
<i class="fal fa-crosshairs"></i> Scores
|
<i class="fal fa-crosshairs"></i> <!-- Scores -->
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link get-info{% if tab == 'physiological' %} active{% endif %}" data-toggle="tab" href="#physiological" data-ref="#physiological" data-url="physiological/" id="display_physiological">
|
<a class="nav-link get-info{% if tab == 'physiological' %} active{% endif %}" data-toggle="tab" href="#physiological" data-ref="#physiological" data-url="physiological/" id="display_physiological">
|
||||||
<i class="fal fa-stethoscope"></i> Physical
|
<i class="fal fa-stethoscope"></i> <!-- Physical -->
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item">
|
<li class="nav-item">
|
||||||
<a class="nav-link get-info{% if tab == 'event' %} active{% endif %}" data-toggle="tab" href="#event" data-ref="#event" data-url="event/" id="display_event">
|
<a class="nav-link get-info{% if tab == 'event' %} active{% endif %}" data-toggle="tab" href="#event" data-ref="#event" data-url="event/" id="display_event">
|
||||||
<i class="fal fa-calendar-day"></i> Events
|
<i class="fal fa-calendar-day"></i> <!-- Events -->
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -54,3 +54,15 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<script type="text/javascript">
|
||||||
|
$(document).ready(function() {
|
||||||
|
$('[data-sort="table"]').tablesorter({
|
||||||
|
headers: {
|
||||||
|
0: { sorter: false }, // disable first column
|
||||||
|
},
|
||||||
|
dateFormat: "uk",
|
||||||
|
sortList: [[2,1], ]
|
||||||
|
})
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
|
@ -306,6 +306,7 @@
|
||||||
var ctx = document.getElementById("chartjs_chrono").getContext("2d");
|
var ctx = document.getElementById("chartjs_chrono").getContext("2d");
|
||||||
var gradient_stroke_1 = ctx.createLinearGradient(0, 230, 0, 50);
|
var gradient_stroke_1 = ctx.createLinearGradient(0, 230, 0, 50);
|
||||||
var gradient_stroke_2 = 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);
|
||||||
|
|
||||||
gradient_stroke_1.addColorStop(1, 'rgba(75, 192, 192, 0.4)');
|
gradient_stroke_1.addColorStop(1, 'rgba(75, 192, 192, 0.4)');
|
||||||
gradient_stroke_1.addColorStop(0.75, 'rgba(75, 192, 192, 0.3)');
|
gradient_stroke_1.addColorStop(0.75, 'rgba(75, 192, 192, 0.3)');
|
||||||
|
|
|
@ -197,6 +197,14 @@
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
var ctx = document.getElementById("chartjs_mindstate").getContext("2d");
|
||||||
|
var gradient_stroke_1 = ctx.createLinearGradient(0, 230, 0, 50);
|
||||||
|
|
||||||
|
gradient_stroke_1.addColorStop(1, 'rgba(75, 192, 192, 0.4)');
|
||||||
|
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)');
|
||||||
|
|
||||||
new Chart(document.getElementById("chartjs_mindstate"),{
|
new Chart(document.getElementById("chartjs_mindstate"),{
|
||||||
type: 'line',
|
type: 'line',
|
||||||
data:{
|
data:{
|
||||||
|
@ -204,8 +212,8 @@
|
||||||
{% if mindstate_list %}
|
{% if mindstate_list %}
|
||||||
{
|
{
|
||||||
label: 'Mindstate',
|
label: 'Mindstate',
|
||||||
backgroundColor: gradientStroke_1,
|
backgroundColor: gradient_stroke_1,
|
||||||
borderColor: 'rgb(255, 99, 132)',
|
borderColor: 'rgb(75, 192, 192)',
|
||||||
fill: true,
|
fill: true,
|
||||||
data: [
|
data: [
|
||||||
{% for state in mindstate_list %}
|
{% for state in mindstate_list %}
|
||||||
|
|
Loading…
Reference in New Issue