strava import all & workout edit page small bug fix
This commit is contained in:
@@ -8894,6 +8894,8 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
|||||||
longitude = rowdata.df[' longitude']
|
longitude = rowdata.df[' longitude']
|
||||||
if not latitude.std():
|
if not latitude.std():
|
||||||
hascoordinates = 0
|
hascoordinates = 0
|
||||||
|
if not longitude.std():
|
||||||
|
hascoordinates = 0
|
||||||
except (KeyError,AttributeError):
|
except (KeyError,AttributeError):
|
||||||
hascoordinates = 0
|
hascoordinates = 0
|
||||||
|
|
||||||
@@ -8901,21 +8903,17 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
|
|||||||
hascoordinates = 0
|
hascoordinates = 0
|
||||||
|
|
||||||
|
|
||||||
|
mapscript = ""
|
||||||
|
mapdiv = ""
|
||||||
|
|
||||||
if hascoordinates:
|
if hascoordinates:
|
||||||
mapscript,mapdiv = leaflet_chart(rowdata.df[' latitude'],
|
try:
|
||||||
rowdata.df[' longitude'],
|
mapscript,mapdiv = leaflet_chart(
|
||||||
row.name)
|
rowdata.df[' latitude'],
|
||||||
|
rowdata.df[' longitude'],
|
||||||
#res = googlemap_chart(rowdata.df[' latitude'],
|
row.name)
|
||||||
# rowdata.df[' longitude'],
|
except KeyError:
|
||||||
# row.name)
|
pass
|
||||||
#gmscript = res[0]
|
|
||||||
#gmdiv = res[1]
|
|
||||||
|
|
||||||
else:
|
|
||||||
mapscript = ""
|
|
||||||
mapdiv = ""
|
|
||||||
|
|
||||||
|
|
||||||
# render page
|
# render page
|
||||||
if (len(g)<=3):
|
if (len(g)<=3):
|
||||||
@@ -9703,7 +9701,9 @@ def workout_getsporttracksworkout_all(request):
|
|||||||
request.user,sporttracksid)
|
request.user,sporttracksid)
|
||||||
data = res.json()
|
data = res.json()
|
||||||
|
|
||||||
id,message = add_workout_from_stdata(request.user,sporttracksid,data)
|
id,message = add_workout_from_stdata(
|
||||||
|
request.user,sporttracksid,data
|
||||||
|
)
|
||||||
if id==0:
|
if id==0:
|
||||||
messages.error(request,message)
|
messages.error(request,message)
|
||||||
|
|
||||||
@@ -9724,7 +9724,7 @@ def workout_getstravaworkout_all(request):
|
|||||||
if res == 1:
|
if res == 1:
|
||||||
messages.info(request,"Your workouts are being imported and should appear on the site in the next 15 minutes")
|
messages.info(request,"Your workouts are being imported and should appear on the site in the next 15 minutes")
|
||||||
else:
|
else:
|
||||||
messages.error(request,"Couldn't import Strava workout "+str(stravaid))
|
messages.error(request,"Couldn't import Strava workouts ")
|
||||||
|
|
||||||
url = reverse(workouts_view)
|
url = reverse(workouts_view)
|
||||||
return HttpResponseRedirect(url)
|
return HttpResponseRedirect(url)
|
||||||
|
|||||||
Reference in New Issue
Block a user