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 %}
{% endif %} {% endif %}
<td>DNF</td> <td>DNF</td>
<td>DNF</td>
<td> <td>
<a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/"> <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">
<i class="fas fa-search-plus fa-fw"></i></a> <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) r = getrower(request.user)
race = get_object_or_404(VirtualRace,pk=id) race = get_object_or_404(VirtualRace,pk=id)
raceid = race.id raceid = race.id
@@ -1007,40 +1008,46 @@ def virtualevent_disqualify_view(request,id=0,recordid=0):
try: try:
workout = Workout.objects.get(id=record.workoutid) workout = Workout.objects.get(id=record.workoutid)
except Workout.DoesNotExist: # pragma: no cover except Workout.DoesNotExist: # pragma: no cover
raise Http404("Workout not found") workout = None
g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime") script = ''
for i in g: # pragma: no cover div = ''
try: g = []
width,height = Image.open(i.filename).size mapscript = ''
i.width = width mapdiv = ''
i.height = height if workout is not None:
i.save() g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime")
except: for i in g: # pragma: no cover
pass 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 f1 = workout.csvfilename
rowdata = rdata(csvfile=f1) rowdata = rdata(csvfile=f1)
hascoordinates = 1 hascoordinates = 1
if rowdata != 0: if rowdata != 0:
try: try:
latitude = rowdata.df[' latitude'] latitude = rowdata.df[' latitude']
if not latitude.std(): # pragma: no cover if not latitude.std(): # pragma: no cover
hascoordinates = 0
except (KeyError, AttributeError): # pragma: no cover
hascoordinates = 0 hascoordinates = 0
except (KeyError, AttributeError): # pragma: no cover else: # pragma: no cover
hascoordinates = 0 hascoordinates = 0
else: # pragma: no cover
hascoordinates = 0
if hascoordinates: if hascoordinates:
mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'], mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'],
rowdata.df[' longitude'], rowdata.df[' longitude'],
workout.name) workout.name)
else: # pragma: no cover else: # pragma: no cover
mapscript = "" mapscript = ""
mapdiv = "" mapdiv = ""
breadcrumbs = [ breadcrumbs = [
{ {