sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v10.67'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-12-07 14:35:58 +01:00
parent 6491a7ccab cb3afff3f4
commit 52d13cc34e
1 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
rowers/templates/embedded_video.html
View File

@@ -262,67 +262,81 @@
<input type="hidden" name="lock" id="lock" value="Lock"> <input type="hidden" name="lock" id="lock" value="Lock">
</li> </li>
{% endif %} {% endif %}
<li>
Data Time
<span id="datatime">
</span> seconds
</li>
<li>
Video Time
<span id="time">
</span> seconds
</li>
{% for id, metric in metrics.items %}
<li>
{{ metric.name }}
<span id="{{ id }}">
</span> {{ metric.unit }}
</li>
{% endfor %}
{% for group in metricsgroups %}
<li class="grid">
<canvas id="{{ group }}"></canvas>
</li>
{% endfor %}
</ul> </ul>
<p>&nbsp;</p> <p>&nbsp;</p>
<form enctype="multipart/form-data" action="" method="post"> <form enctype="multipart/form-data" action="" method="post">
<ul class="main-content"> <ul class="main-content">
{% if form and user.is_authenticated and user == workout.user.user %}
<li class="grid_2"> <li class="grid_2">
{% if form and user.is_authenticated and user == workout.user.user %}
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<table>
{{ metricsform.as_table }}
</table>
{% else %}
<input type="hidden" id="id_delay" value="{{ analysis.delay }}">
{% endif %}
{% if not analysis.id %} {% if not analysis.id %}
<input type="submit" name="reload_button" value="Reload"> <input type="submit" name="reload_button" value="Reload">
{% endif %} {% endif %}
<input type="submit" name="save_button" value="Save"> <input type="submit" name="save_button" value="Save">
{% if analysis and user.is_authenticated and user == analysis.workout.user.user %}
<p>
<a href="/rowers/video/{{ analysis.id }}/delete/">Delete Analysis</a>
</p>
{% endif %}
</li> </li>
<li class="grid_2">
<table> <li class="grid_2" >
{{ metricsform.as_table }} <ul class="main-content">
</table> <li class="grid_2">
Data Time
<span id="datatime">
</span> seconds
</li>
<li class="grid_2">
Video Time
<span id="time">
</span> seconds
</li>
{% for id, metric in metrics.items %}
<li class="grid_2">
{{ metric.name }}
<span id="{{ id }}">
</span> {{ metric.unit }}
</li>
{% endfor %}
{% for group in metricsgroups %}
<li class="grid_2">
<canvas id="{{ group }}"></canvas>
</li>
{% endfor %}
</ul>
</li> </li>
{% else %} </ul>
<input type="hidden" id="id_delay" value="{{ analysis.delay }}">
{% endif %}
<li>
{% if analysis and user.is_authenticated and user == analysis.workout.user.user %}
<p>
<a href="/rowers/video/{{ analysis.id }}/delete/">Delete Analysis</a>
</p>
{% endif %}
</li>
</ul>
</form> </form>
<script> <p>&nbsp;</p>
$(document).ready( function() {
// cookie reader <script>
function createCookie(name,value,days) { $(document).ready( function() {
if (days) { // cookie reader
var date = new Date(); function createCookie(name,value,days) {
date.setTime(date.getTime()+(days*24*60*60*1000)); if (days) {
var date = new Date();
date.setTime(date.getTime()+(days*24*60*60*1000));
var expires = "; expires="+date.toGMTString(); var expires = "; expires="+date.toGMTString();
} }
else var expires = ""; else var expires = "";