From f538dc849e7b079193d48a3784f6715bc50d1a14 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 26 Feb 2019 22:11:28 +0100 Subject: [PATCH] first holoview chart --- .ipynb_checkpoints/Untitled-checkpoint.ipynb | 6 + rowers/interactiveplots.py | 240 ++++++++++++++++--- rowers/management/commands/processemail.py | 18 +- rowers/polarstuff.py | 12 +- rowers/tasks.py | 5 +- rowers/templates/flexchart3otw.html | 4 +- rowers/templates/list_workouts.html | 2 +- rowers/tests/test_plans.py | 4 +- rowers/tests/testdata/testdata.csv.gz | Bin 12543 -> 12543 bytes rowers/tpstuff.py | 2 +- rowers/views/analysisviews.py | 6 +- rowers/views/workoutviews.py | 11 +- templates/newbase.html | 4 +- 13 files changed, 250 insertions(+), 64 deletions(-) create mode 100644 .ipynb_checkpoints/Untitled-checkpoint.ipynb diff --git a/.ipynb_checkpoints/Untitled-checkpoint.ipynb b/.ipynb_checkpoints/Untitled-checkpoint.ipynb new file mode 100644 index 00000000..2fd64429 --- /dev/null +++ b/.ipynb_checkpoints/Untitled-checkpoint.ipynb @@ -0,0 +1,6 @@ +{ + "cells": [], + "metadata": {}, + "nbformat": 4, + "nbformat_minor": 2 +} diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 4ba94626..e5d3f049 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -20,11 +20,6 @@ from bokeh.palettes import Dark2_8 as palette import itertools from bokeh.plotting import figure, ColumnDataSource, Figure,curdoc from bokeh.models import CustomJS,Slider, TextInput,BoxAnnotation -try: - from bokeh.charts import Histogram,HeatMap,Area,BoxPlot,Bar - from bokeh.charts.attributes import CatAttr -except: - pass from bokeh.resources import CDN,INLINE from bokeh.embed import components @@ -60,6 +55,7 @@ import math import numpy as np import pandas as pd import holoviews as hv +from holoviews import opts from pytz import timezone as tz,utc from django.utils.timezone import get_current_timezone from django.utils.timezone import activate @@ -85,17 +81,6 @@ from rowers.utils import lbstoN from rowers.datautils import p0 import rowers.datautils as datautils -watermarkurl = "/static/img/logo7.png" -watermarksource = ColumnDataSource(dict( - url = [watermarkurl],)) - -watermarkrange = Range1d(start=0,end=1) -watermarkalpha = 0.6 -watermarkx = 0.99 -watermarky = 0.01 -watermarkw = 184 -watermarkh = 35 -watermarkanchor = 'bottom_right' def errorbar(fig, x, y, source=ColumnDataSource(), xerr=False, yerr=False, color='black', @@ -204,6 +189,17 @@ def interactive_boxchart(datadf,fieldname,extratitle=''): # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} @@ -320,21 +316,43 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): df.sort_values('date_sorting',inplace=True) - df.to_csv('~/s/data.csv') - - p = hv.Bars(df,values='duration', -# label = CatAttr(columns=['date'], sort=False), - xlabel='Date', - ylabel='Time', - title='Activity {d1} to {d2}'.format( + hv.extension('bokeh') + + table = hv.Table(df,[('date','Date'),('type','Workout Type')],[('duration','Duration')]) + + bars=table.to.bars(['date','type'],['duration']) + bars.opts( + opts.Bars(color=hv.Cycle('Category20'), show_legend=True, stacked=True, + tools=['hover'], width=600, xrotation=90)) + + + p = hv.render(bars) + + p.title.text = 'Activity {d1} to {d2}'.format( d1 = startdate.strftime("%Y-%m-%d"), d2 = enddate.strftime("%Y-%m-%d"), - ), - stack=stack, - plot_width=350, - plot_height=250, - toolbar_location = None, - ) + ) + p.plot_width=350 + p.plot_height=250 + p.toolbar_location = None + + +# p = hv.Bars(df,values='duration', +# label = CatAttr(columns=['date'], sort=False), +# xlabel='Date', +# ylabel='Time', +# title='Activity {d1} to {d2}'.format( +# d1 = startdate.strftime("%Y-%m-%d"), +# d2 = enddate.strftime("%Y-%m-%d"), +# ), +# stack=stack, +# plot_width=350, +# plot_height=250, +# toolbar_location = None, +# ) + + + # for legend in p.legend: @@ -354,13 +372,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): #p.yaxis.axis_label = 'Minutes' - try: - p = renderer.get_plot(p).state - script, div = components(p) - except: - script = '' - div = '' - + script,div = components(p) return script,div def interactive_forcecurve(theworkouts,workstrokesonly=False): @@ -454,6 +466,17 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False): toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -764,6 +787,17 @@ def fitnessmetric_chart(fitnessmetrics,user,workoutmode='rower'): x_axis_type='datetime') # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} @@ -850,6 +884,17 @@ def interactive_histoall(theworkouts): ) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} @@ -1599,6 +1644,17 @@ def interactive_otwcpchart(powerdf,promember=0,rowername=""): toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -1888,6 +1944,17 @@ def interactive_cpchart(rower,thedistances,thesecs,theavpower, toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -2195,6 +2262,17 @@ def interactive_chart(id=0,promember=0,intervaldata = {}): tools=TOOLS) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} @@ -2388,6 +2466,17 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', toolbar_sticky=False,plot_width=920) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} @@ -2617,6 +2706,17 @@ def interactive_cum_flex_chart2(theworkouts,promember=0, toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -2847,6 +2947,19 @@ def interactive_flex_chart2(id=0,promember=0, plottype='line', workstrokesonly=False): + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' + + #rowdata,row = dataprep.getrowdata_db(id=id) columns = [xparam,yparam1,yparam2, 'ftime','distance','fpace', @@ -3036,6 +3149,17 @@ def interactive_flex_chart2(id=0,promember=0, # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -3647,6 +3771,17 @@ def interactive_bar_chart(id=0,promember=0): tools=TOOLS) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -3816,6 +3951,17 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -4068,6 +4214,17 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm', toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' @@ -4199,6 +4356,17 @@ def interactive_otw_advanced_pace_chart(id=0,promember=0): toolbar_sticky=False) # add watermark + watermarkurl = "/static/img/logo7.png" + watermarksource = ColumnDataSource(dict( + url = [watermarkurl],)) + + watermarkrange = Range1d(start=0,end=1) + watermarkalpha = 0.6 + watermarkx = 0.99 + watermarky = 0.01 + watermarkw = 184 + watermarkh = 35 + watermarkanchor = 'bottom_right' plot.extra_y_ranges = {"watermark": watermarkrange} plot.extra_x_ranges = {"watermark": watermarkrange} plot.sizing_mode = 'scale_width' diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index 7bf213f7..ea187d00 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -57,7 +57,7 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False): except AttributeError: filename = fileobj[6:] if testing: - print 'Attribute Error', filename + print('Attribute Error', filename) # test if file exists and is not empty @@ -66,11 +66,11 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False): line = fop.readline() except (IOError, UnicodeEncodeError): if testing: - print 'IOError',filename,'media/'+filename + print('IOError',filename,'media/'+filename) return 0 if testing: - print 'Creating workout from email' + print('Creating workout from email') # set user if rower.user.is_staff and 'username' in uploadoptions: @@ -102,7 +102,7 @@ def processattachment(rower, fileobj, title, uploadoptions,testing=False): pass if testing: - print 'Workout id = {workoutid}'.format(workoutid=workoutid) + print('Workout id = {workoutid}'.format(workoutid=workoutid)) if workoutid[0]: link = settings.SITE_URL+reverse( @@ -242,17 +242,17 @@ class Command(BaseCommand): testing=testing ) except: - print "Bad ZIP file" - print attachment.document.name + print("Bad ZIP file") + print(attachment.document.name) else: # move attachment and make workout if testing: try: - print name + print(name) except UnicodeEncodeError: - print "Unicode Error" + print("Unicode Error") try: - print attachment.document + print(attachment.document) except UnicodeEncodeError: pass diff --git a/rowers/polarstuff.py b/rowers/polarstuff.py index 3057c59b..6e251328 100644 --- a/rowers/polarstuff.py +++ b/rowers/polarstuff.py @@ -73,8 +73,11 @@ def get_token(code): secret=POLAR_CLIENT_SECRET ) - headers = { 'Authorization': 'Basic %s' % base64.b64encode(auth_string) } - + try: + headers = { 'Authorization': 'Basic %s' % base64.b64encode(auth_string) } + except TypeError: + headers = { 'Authorization': 'Basic %s' % base64.b64encode(bytes(auth_string,'utf-8')) } + response = requests.post("https://polarremote.com/v2/oauth2/token", data=post_data, headers=headers) @@ -116,7 +119,10 @@ def get_polar_notifications(): secret=POLAR_CLIENT_SECRET ) - headers = { 'Authorization': 'Basic %s' % base64.b64encode(auth_string) } + try: + headers = { 'Authorization': 'Basic %s' % base64.b64encode(auth_string) } + except TypeError: + headers = { 'Authorization': 'Basic %s' % base64.b64encode(bytes(auth_string,'utf-8')) } response = requests.get(url, headers=headers) diff --git a/rowers/tasks.py b/rowers/tasks.py index 1b00357d..7b3ad6e9 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1657,7 +1657,10 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename, except IOError: row = rdata(f2 + '.gz', rower=rr) - haspower = row.df[' Power (watts)'].mean() > 50 + try: + haspower = row.df[' Power (watts)'].mean() > 50 + except TypeError: + haspower = True nr_rows = len(row.df) if (plotnr in [1, 2, 4, 5, 8, 11, 9, 12]) and (nr_rows > 1200): diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 2eb32cf0..aa45a735 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -11,8 +11,8 @@ {{ js_res | safe }} {{ css_res| safe }} - - + + diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index b4066432..fff5afdb 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -59,7 +59,7 @@
  • - + diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py index 653b277b..6034a616 100644 --- a/rowers/tests/test_plans.py +++ b/rowers/tests/test_plans.py @@ -259,7 +259,7 @@ class SessionLinkTest(TestCase): plannedsessionstuple = [] for ps in pss: - sessiontpl = (ps.id,ps.__unicode__()) + sessiontpl = (ps.id,ps.__str__()) plannedsessionstuple.append(sessiontpl) plannedsessionstuple = tuple(plannedsessionstuple) @@ -270,7 +270,7 @@ class SessionLinkTest(TestCase): choices = [] for w in self.user_workouts: - wtpl = (w.id,w.__unicode__()) + wtpl = (w.id,w.__str__()) choices.append(wtpl) workoutdata['choices'] = tuple(choices) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index cad981ca794bb85233b405dddaf4ab522945cae9..3098c1b69ebecf455efddc569bb0f26102b13177 100644 GIT binary patch delta 16 XcmeyL_& {% analytical_head_top %} - - + +