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

workflow view

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-11 16:36:29 +02:00
parent 64eb086695
commit 3b8c252cd8
11 changed files with 114 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/interactiveplots.py
View File

@@ -3509,7 +3509,8 @@ def thumbnail_flex_chart(rowdata,id=0,promember=0,
plot.sizing_mode = 'scale_width' # plot.sizing_mode = 'scale_width'
plot.sizing_mode = 'fixed'
plot.toolbar.logo = None plot.toolbar.logo = None
plot.toolbar_location = None plot.toolbar_location = None
#plot.yaxis.visible = False #plot.yaxis.visible = False

7
rowers/templates/flexthumbnails.html
View File

@@ -1,9 +1,8 @@
<h2>Flex Charts</h2> <h2>Flex Charts</h2>
<div id="id_thumbscripts"> <div id="id_thumbscripts">
</div> </div>
<div id="id_thumbs"> <ul class="main-content" id="id_thumbs">
{{ charts | safe }} {{ charts| safe }}
</div> </ul>

59
rowers/templates/panel_comments.html
View File

@@ -1,31 +1,34 @@
{% load rowerfilters %} {% load rowerfilters %}
{% load tz %} {% load tz %}
<div class="grid_6 suffix_3 alpha"> <ul class="main-content">
<table width=100%> <li class="grid_2">
<tr> <table width=100%>
{% localtime on %} <tr>
<th>Date/Time:</th><td>{{ workout.startdatetime|localtime}}</td> {% localtime on %}
{% endlocaltime %} <th>Date/Time:</th><td>{{ workout.startdatetime|localtime}}</td>
</tr><tr> {% endlocaltime %}
<th>Distance:</th><td>{{ workout.distance }}m</td> </tr><tr>
</tr><tr> <th>Distance:</th><td>{{ workout.distance }}m</td>
<th>Duration:</th><td>{{ workout.duration |durationprint:"%H:%M:%S.%f" }}</td> </tr><tr>
</tr><tr> <th>Duration:</th><td>{{ workout.duration |durationprint:"%H:%M:%S.%f" }}</td>
<th>Public link to this workout</th> </tr><tr>
<td> <th>Public link to this workout</th>
<a href="/rowers/workout/{{ workout.id }}">https://rowsandall.com/rowers/workout/{{ workout.id }}</a> <td>
</td> <a href="/rowers/workout/{{ workout.id }}">https://rowsandall.com/rowers/workout/{{ workout.id }}</a>
</tr><tr> </td>
<th>Comments</th> </tr><tr>
<td> <th>Comments</th>
<td>
<a href="/rowers/workout/{{ workout.id }}/comment">Comment ({{ aantalcomments }})</a> <a href="/rowers/workout/{{ workout.id }}/comment">Comment ({{ aantalcomments }})</a>
</td> </td>
</tr><tr> </tr><tr>
<th>Public link to interactive chart</th> <th>Public link to interactive chart</th>
<td> <td>
<a href="/rowers/workout/{{ workout.id }}/interactiveplot">https://rowsandall.com/rowers/workout/{{ workout.id }}/interactiveplot</a> <a href="/rowers/workout/{{ workout.id }}/interactiveplot">https://rowsandall.com/rowers/workout/{{ workout.id }}/interactiveplot</a>
<td> <td>
</tr> </tr>
</table> </table>
</div> </li>
</ul>

16
rowers/templates/panel_map.html
View File

@@ -1,9 +1,13 @@
<div style="height:100%;" id="theplot" class="grid_9 alpha flexplot"> <ul class="main-content">
{{ mapdiv|safe }} <li class="grid_2">
<div class="mapdiv">
{{ mapdiv|safe }}
{{ mapscript|safe }}
</div>
{{ mapscript|safe }}
</div>
</li>
</ul>

11
rowers/templates/panel_middlesocial.html
View File

@@ -1,14 +1,13 @@
<div class="grid_9"> <p>
<div class="grid_1 alpha">
<div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false"> <div class="fb-share-button" data-href="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-layout="button" data-size="small" data-mobile-iframe="false">
<a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a> <a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?u=https://rowsandall.com/rowers/workout/{{ workout.id }}">Share</a>
</div>
</div> </div>
<div class="grid_1 suffix_7 omega"> </p>
<a class="twitter-share-button" <p>
<a class="twitter-share-button"
href="https://twitter.com/intent/tweet" href="https://twitter.com/intent/tweet"
data-url="https://rowsandall.com/rowers/workout/{{ workout.id }}" data-url="https://rowsandall.com/rowers/workout/{{ workout.id }}"
data-text="@rowsandall #rowingdata">Tweet</a> data-text="@rowsandall #rowingdata">Tweet</a>
</div> </p>

6
rowers/templates/panel_shortcomment.html
View File

@@ -1,6 +1,7 @@
{% load rowerfilters %} {% load rowerfilters %}
{% load tz %} {% load tz %}
<div class="grid_6 suffix_3 alpha"> <ul class="main-content">
<li>
<table width=100%> <table width=100%>
<tr> <tr>
<th>Comments</th> <th>Comments</th>
@@ -10,4 +11,5 @@
</tr> </tr>
</table> </table>
</div> </li>
</ul>

21
rowers/templates/panel_statcharts.html
View File

@@ -1,11 +1,14 @@
{% if statcharts %} {% if statcharts %}
<h2>Static Charts</h2> <h2>Static Charts</h2>
{% for graph in statcharts %} <ul class="main-content">
<div id="thumb-container" class="grid_3 alpha"> {% for graph in statcharts %}
<a href="/rowers/graph/{{ graph.id }}/"> <li>
<img src="/{{ graph.filename }}" <a href="/rowers/graph/{{ graph.id }}/">
onerror="this.src='/static/img/rowingtimer.gif'" <img src="/{{ graph.filename }}"
alt="{{ graph.filename }}" width="180" height="150"></a> onerror="this.src='/static/img/rowingtimer.gif'"
</div> alt="{{ graph.filename }}" width="180" height="150">
{% endfor %} </a>
{% endif %} </li>
{% endfor %}
{% endif %}
</ul>

8
rowers/templates/panel_stats.html
View File

@@ -1,5 +1,3 @@
<div class="grid_2 alpha"> <p>
<p> <a class="button gray small" href="/rowers/workout/{{ workout.id }}/stats">Workout Stats</a>
<a class="button gray small" href="/rowers/workout/{{ workout.id }}/stats">Workout Stats</a> </p>
</p>
</div>

75
rowers/templates/workflow.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% load tz %} {% load tz %}
@@ -37,69 +37,44 @@
var counter=0; var counter=0;
$("#id_sitready").remove(); $("#id_sitready").remove();
$("#id_thumbs").append( $("#id_thumbs").append(
"<p>Click on the thumbnails to view the full chart.</p>"); "<li class=\"grid_4\"><p>Click on the thumbnails to view the full chart.</p></li>");
$.each(json, function(index, element) { $.each(json, function(index, element) {
console.log('adding thumbnail'); console.log('adding thumbnail');
var counter2 = counter+1; var counter2 = counter+1;
if (shownotes) {
$("#id_thumbs").append( $("#id_thumbs").append(
"<div class=\"grid_3 alpha\">"+ "<li>"+
"<big>"+counter2+"</big>"+ "<big>"+counter2+"</big>"+
"<div class=\"grid_3 tooltip\">"+
"<a href=\"/rowers/workout/"+workoutid+"/flexchart?favoritechart="+counter+"\">"+element.div+"</a>"+ "<a href=\"/rowers/workout/"+workoutid+"/flexchart?favoritechart="+counter+"\">"+element.div+"</a>"+
"<span class=\"tooltiptext\">"+element.notes+"</span>"+ "</li>");
"</div></div>");
} else {
$("#id_thumbs").append(
"<div class=\"grid_3 alpha\">"+
"<big>"+counter2+"</big>"+
"<div class=\"grid_3 tooltip\">"+
"<a href=\"/rowers/workout/"+workoutid+"/flexchart?favoritechart="+counter+"\">"+element.div+"</a>"+
"</div></div>");
}
$("#id_thumbscripts").append(element.script); $("#id_thumbscripts").append(element.script);
counter += 1; counter += 1;
});
}); });
});
}); });
</script> </script>
{% endblock %} {% endblock %}
{% block content %} {% block main %}
<div id="page" class="grid_12 alpha"> <h1>{{ workout.name }}</h1>
<div class="grid_10 prefix_2 alpha"> {% if workout.user.user != user %}
<h1>{{ workout.name }}</h1> <h2>{{ workout.user.user.first_name }} {{ workout.user.user.last_name }}</h2>
{% if workout.user.user != user %} {% endif %}
<h2>{{ workout.user.user.first_name }} {{ workout.user.user.last_name }}
{% endif %} {% block middle_panel %}
</div> {% for templateName in middleTemplates %}
<div id="leftpanel" class="grid_2 alpha"> {% include templateName %}
{% block left_panel %} {% endfor %}
<div class="grid_2 alpha"> {% endblock %}
<p> {% block right_panel %}
<a class="button gray small" href="/rowers/me/workflowconfig2">Configure this page</a> {% endblock %}
</p>
</div> {% endblock %}
{% for templateName in leftTemplates %}
{% include templateName %} {% block sidebar %}
{% endfor %} {% include 'menu_workout.html' %}
{% endblock %}
</div>
<div id="middlepanel" class="grid_9">
{% block middle_panel %}
{% for templateName in middleTemplates %}
<div class="grid_9">
{% include templateName %}
</div>
{% endfor %}
{% endblock %}
</div>
<div id="rightpanel" class="grid_1">
{% block right_panel %}
<p>&nbsp;</p>
{% endblock %}
</div>
{% endblock %} {% endblock %}

3
rowers/urls.py
View File

@@ -525,8 +525,7 @@ urlpatterns = [
url(r'^courses/(?P<id>\d+)$',views.course_view), url(r'^courses/(?P<id>\d+)$',views.course_view),
url(r'^courses/(?P<id>\d+)/map$',views.course_map_view), url(r'^courses/(?P<id>\d+)/map$',views.course_map_view),
# URLS to be created # URLS to be created
# url(r'^me/preferences$',views.user_preferences_view), url(r'^help$',TemplateView.as_view(template_name='help.html'), name='help'),
# url(r'^help$',views.user_preferences_view),TemplateView.as_view(template_name='help.html'), name='help'),
] ]

18
rowers/views.py
View File

@@ -8543,11 +8543,29 @@ def workout_workflow_view(request,id):
pass pass
breadcrumbs = [
{
'url':'/rowers/list-workouts',
'name':'Workouts'
},
{
'url':get_workout_default_page(request,id),
'name': str(row.id)
},
{
'url':reverse(workout_workflow_view,kwargs={'id':id}),
'name': 'View'
}
]
return render(request, return render(request,
'workflow.html', 'workflow.html',
{ {
'middleTemplates':middleTemplates, 'middleTemplates':middleTemplates,
'leftTemplates':leftTemplates, 'leftTemplates':leftTemplates,
'active':'nav-workouts',
'breadcrumbs':breadcrumbs,
'charts':charts, 'charts':charts,
'workout':row, 'workout':row,
'mapscript':mapscript, 'mapscript':mapscript,