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

adding video charts

Browse Source
This commit is contained in:
Sander Roosendaal
2024-03-06 17:20:29 +01:00
parent d8a0cdc1c6
commit 92c133bbd5
14 changed files with 74 additions and 543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rowers/views/workoutviews.py
View File

@@ -126,8 +126,7 @@ def workout_video_view_mini(request, id=''):
hascoordinates = pd.Series(data['latitude']).std() > 0
# create map
if hascoordinates and mode == 'water':
mapscript, mapdiv = leaflet_chart_video(data['latitude'], data['longitude'],
w.name)
mapscript, mapdiv = leaflet_chart(data['latitude'], data['longitude'])
else:
mapscript, mapdiv = interactive_chart_video(data)
data['longitude'] = data['spm']
@@ -237,8 +236,7 @@ def workout_video_view(request, id=''):
hascoordinates = pd.Series(data['latitude']).std() > 0
# create map
if hascoordinates and mode == 'water':
mapscript, mapdiv = leaflet_chart_video(data['latitude'], data['longitude'],
w.name)
mapscript, mapdiv = leaflet_chart(data['latitude'], data['longitude'])
else:
mapscript, mapdiv = interactive_chart_video(data)
data['longitude'] = data['spm']
@@ -353,8 +351,7 @@ def workout_video_create_view(request, id=0):
# create map
if hascoordinates and mode == 'water':
mapscript, mapdiv = leaflet_chart_video(data['latitude'], data['longitude'],
w.name)
mapscript, mapdiv = leaflet_chart(data['latitude'], data['longitude'])
else:
mapscript, mapdiv = interactive_chart_video(data)
data['longitude'] = data['spm']
@@ -4141,7 +4138,7 @@ def workout_workflow_view(request, id):
if 'panel_map.html' in r.workflowmiddlepanel and rowhascoordinates(row):
rowdata = rdata(csvfile=row.csvfilename)
mapscript, mapdiv = leaflet_chart2(rowdata.df[' latitude'],
mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
rowdata.df[' longitude'],
row.name)
else:
@@ -4182,6 +4179,8 @@ def workout_workflow_view(request, id):
]
print(middleTemplates)
return render(request,
'workflow.html',
{
@@ -5063,7 +5062,7 @@ def workout_map_view(request, id=0):
hascoordinates = 0
if hascoordinates:
mapscript, mapdiv = leaflet_chart2(rowdata.df[' latitude'],
mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
rowdata.df[' longitude'],
w.name)
else:
@@ -5188,7 +5187,7 @@ def workout_uploadimage_view(request, id): # pragma: no cover
# Generic chart creation
@permission_required('workout.change_workout', fn=get_workout_by_opaqueid, raise_exception=True)
def workout_add_chart_view(request, id, plotnr=1):
w = get_workoutuser(id, request)
r = getrower(request.user)