Private
Public Access
1
0

fix for disqualification with nonexisting workout

This commit is contained in:
Sander Roosendaal
2021-09-27 19:50:46 +02:00
parent ead4663131
commit 27bc739e34
2 changed files with 36 additions and 28 deletions

View File

@@ -426,6 +426,7 @@
{% endif %}
{% endif %}
<td>DNF</td>
<td>DNF</td>
<td>
<a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">
<i class="fas fa-search-plus fa-fw"></i></a>

View File

@@ -955,6 +955,7 @@ def virtualevent_disqualify_view(request,id=0,recordid=0):
r = getrower(request.user)
race = get_object_or_404(VirtualRace,pk=id)
raceid = race.id
@@ -1007,40 +1008,46 @@ def virtualevent_disqualify_view(request,id=0,recordid=0):
try:
workout = Workout.objects.get(id=record.workoutid)
except Workout.DoesNotExist: # pragma: no cover
raise Http404("Workout not found")
workout = None
g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime")
for i in g: # pragma: no cover
try:
width,height = Image.open(i.filename).size
i.width = width
i.height = height
i.save()
except:
pass
script = ''
div = ''
g = []
mapscript = ''
mapdiv = ''
if workout is not None:
g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime")
for i in g: # pragma: no cover
try:
width,height = Image.open(i.filename).size
i.width = width
i.height = height
i.save()
except:
pass
script, div = interactive_chart(record.workoutid)
script, div = interactive_chart(record.workoutid)
f1 = workout.csvfilename
rowdata = rdata(csvfile=f1)
hascoordinates = 1
if rowdata != 0:
try:
latitude = rowdata.df[' latitude']
if not latitude.std(): # pragma: no cover
f1 = workout.csvfilename
rowdata = rdata(csvfile=f1)
hascoordinates = 1
if rowdata != 0:
try:
latitude = rowdata.df[' latitude']
if not latitude.std(): # pragma: no cover
hascoordinates = 0
except (KeyError, AttributeError): # pragma: no cover
hascoordinates = 0
except (KeyError, AttributeError): # pragma: no cover
else: # pragma: no cover
hascoordinates = 0
else: # pragma: no cover
hascoordinates = 0
if hascoordinates:
mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
rowdata.df[' longitude'],
workout.name)
else: # pragma: no cover
mapscript = ""
mapdiv = ""
if hascoordinates:
mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
rowdata.df[' longitude'],
workout.name)
else: # pragma: no cover
mapscript = ""
mapdiv = ""
breadcrumbs = [
{