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

Merge branch 'release/v8.12'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-21 21:17:39 +02:00
parent c184d63288 5c8253289c
commit 9c3c2ddf1d
2 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/interactiveplots.py
View File

@@ -254,6 +254,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
dates.append(dd) dates.append(dd)
dates_sorting.append(dd2) dates_sorting.append(dd2)
durations.append(du) durations.append(du)
types.append(w.workouttype) types.append(w.workouttype)
try: try:
rowers.append(w.user.user.first_name[0]+w.user.user.last_name[0]) rowers.append(w.user.user.first_name[0]+w.user.user.last_name[0])
@@ -272,13 +273,17 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
# add dates with no activity # add dates with no activity
while d<=enddate: while d<=enddate:
dd = d.strftime('%d')
dates.append(d.strftime('%m/%d')) dates.append(d.strftime('%m/%d'))
dates_sorting.append(d.strftime('%Y/%m/%d')) dates_sorting.append(d.strftime('%Y/%m/%d'))
durations.append(0) durations.append(0)
types.append('rower') types.append('rower')
rowers.append('Sander') rowers.append('Sander')
d += datetime.timedelta(days=1) d += datetime.timedelta(days=1)
df = pd.DataFrame({ df = pd.DataFrame({
'date':dates, 'date':dates,
'date_sorting':dates_sorting, 'date_sorting':dates_sorting,
@@ -288,7 +293,8 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
}) })
df.sort_values('date_sorting',inplace=True) df.sort_values('date_sorting',inplace=True)
p = Bar(df,values='duration', p = Bar(df,values='duration',
label = CatAttr(columns=['date'], sort=False), label = CatAttr(columns=['date'], sort=False),
xlabel='Date', xlabel='Date',

48
rowers/templates/list_workouts.html
View File

@@ -58,7 +58,17 @@ xo
<ul class="main-content"> <ul class="main-content">
<li> <li class="grid_2" style="min-height:200px;">
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
<script async="true" type="text/javascript">
Bokeh.set_log_level("info");
</script>
{{ interactiveplot |safe }}
{{ the_div |safe }}
</li>
<li class="grid_2">
<p> <p>
<form enctype="multipart/form-data" method="post"> <form enctype="multipart/form-data" method="post">
<table> <table>
@@ -81,18 +91,17 @@ xo
</input> </input>
</form> </form>
</p> </p>
</li> <p>
<li style="min-height:200px;"> {% if rankingonly and not team %}
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script> <a href="/rowers/list-workouts">
<script async="true" type="text/javascript"> <i class="far fa-star"></i>Show All Workouts
Bokeh.set_log_level("info"); </a>
</script> {% elif not team %}
<a href="/rowers/list-workouts/ranking">
{{ interactiveplot |safe }} <i class="fas fa-star"></i>Show Only Ranking Pieces
</a>
{{ the_div |safe }} {% endif %}
</li> </p>
<li>
<p> <p>
<span> <span>
{% if workouts.has_previous %} {% if workouts.has_previous %}
@@ -139,19 +148,6 @@ xo
</span> </span>
</p> </p>
</li> </li>
<li>
<p>
{% if rankingonly and not team %}
<a href="/rowers/list-workouts">
<i class="far fa-star"></i>Show All Workouts
</a>
{% elif not team %}
<a href="/rowers/list-workouts/ranking">
<i class="fas fa-star"></i>Show Only Ranking Pieces
</a>
{% endif %}
</p>
</li>
<li class="maxheight grid_4"> <li class="maxheight grid_4">
{% if workouts %} {% if workouts %}