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

fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-17 20:58:02 +02:00
parent a744aac332
commit e764daeee1
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/templates/menu_workout.html
View File

@@ -49,6 +49,11 @@
</li> </li>
--> -->
{% if user.is_authenticated and workout|may_edit:request %} {% if user.is_authenticated and workout|may_edit:request %}
<li id="chart-image">
<a href="/rowers/workout/{{ workout.id }}/image">
<i class="fas fa-file-image fa-fw"></i>&nbsp;Upload Image
</a>
</li>
<li id="workout-delete"> <li id="workout-delete">
<a href="/rowers/workout/{{ workout.id }}/delete"> <a href="/rowers/workout/{{ workout.id }}/delete">
<i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete <i class="fas fa-trash-alt fa-fw"></i>&nbsp;Delete
@@ -117,11 +122,6 @@
</a> </a>
</li> </li>
{% endif %} {% endif %}
<li id="chart-image">
<a href="/rowers/workout/{{ workout.id }}/image">
<i class="fas fa-file-image fa-fw"></i>&nbsp;Upload Image
</a>
</li>
</ul> </ul>
</li> </li>
<li class="has-children" id="export"> <li class="has-children" id="export">

32
rowers/templates/summary_edit.html
View File

@@ -87,6 +87,38 @@
</pre> </pre>
</p> </p>
</li> </li>
<li class="grid_2">
<h1>Detailed Summary Edit</h1>
<p>This is still experimental and there are known bugs. Use at your own risk. Nothing is stored permanently until you hit Save on the summary above. You can use the restore original button to restore the original values.</p>
<form enctype="multipart/form-data" action="/rowers/workout/{{ workout.id }}/editintervals" method="post">
<table width=100%>
<thead>
<tr>
<th>#</th><th>Time</th><th>Distance</th><th>Type</th>
</tr>
</thead>
<tbody>
{% for i in nrintervals|times %}
<tr>
<td>{{ i }}&nbsp;</td>
<td>
{% get_field_id i "intervalt_" detailform %}
</td>
<td>
{% get_field_id i "intervald_" detailform %}
</td>
<td>
{% get_field_id i "type_" detailform %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
{% csrf_token %}
<input type="hidden" name="nrintervals" value={{ nrintervals }}>
<input class="button green" type="submit" value="Update">
</form>
</li>
<li class="grid_4"> <li class="grid_4">
<h1 id="howto">Interval Shorthand How-To</h1> <h1 id="howto">Interval Shorthand How-To</h1>
<p>This is a quick way to enter the intervals using a special mini-language.</p> <p>This is a quick way to enter the intervals using a special mini-language.</p>

6
rowers/views.py
View File

@@ -11961,7 +11961,11 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
rowdata.updateintervaldata(ivalues,iunits,itypes,iresults=iresults) rowdata.updateintervaldata(ivalues,iunits,itypes,iresults=iresults)
intervalstats = rowdata.allstats() intervalstats = rowdata.allstats()
row.summary = intervalstats row.summary = intervalstats
row.notes += "\n"+s try:
row.notes += "\n"+s
except TypeError:
pass
row.save() row.save()
rowdata.write_csv(f1,gzip=True) rowdata.write_csv(f1,gzip=True)
dataprep.update_strokedata(id,rowdata.df) dataprep.update_strokedata(id,rowdata.df)