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

Merge branch 'develop' into feature/forcemanagement

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-17 14:38:45 +02:00
parent 55049532e4 79474f79b9
commit 5dbb0145fc
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/interactiveplots.py
View File

@@ -890,7 +890,7 @@ def leaflet_chart2(lat,lon,name=""):
) )
div = """ div = """
<div id="map_canvas" style="width: 100%; height: 400px;"><p>&nbsp;</p></div> <div id="map_canvas" style="width: 100%; height: 100%; min-height: 100vh"><p>&nbsp;</p></div>
""" """

5
rowers/templates/map_view.html
View File

@@ -29,14 +29,13 @@
</script> </script>
<style> <style>
/* Need this to get the page in "desktop mode"; not having an infinite height.*/ /* Need this to get the page in "desktop mode"; not having an infinite height.*/
html, body {height: 100%; margin:5px;} html, body, #mymap {height: 100%; margin:5px;}
</style> </style>
<div id="workouts" class="grid_12 alpha"> <div id="workouts" class="grid_12 alpha">
<h1>Map View</h1>
{% if user.is_authenticated and mayedit %} {% if user.is_authenticated and mayedit %}
<div class="grid_2 alpha"> <div class="grid_2 alpha">
@@ -52,7 +51,7 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
<div id="theplot" class="grid_12 alpha flexplot"> <div style="height:100%;" id="theplot" class="grid_12 alpha flexplot">
{{ mapdiv|safe }} {{ mapdiv|safe }}

4
rowers/views.py
View File

@@ -6439,6 +6439,10 @@ def workout_map_view(request,id=0):
mapscript,mapdiv = leaflet_chart2(rowdata.df[' latitude'], mapscript,mapdiv = leaflet_chart2(rowdata.df[' latitude'],
rowdata.df[' longitude'], rowdata.df[' longitude'],
row.name) row.name)
else:
mapscript = ""
mapdiv = ""
mayedit=0 mayedit=0
if not request.user.is_anonymous(): if not request.user.is_anonymous():
r = getrower(request.user) r = getrower(request.user)