From 4ae931e38bdd1683ee35640e9c624d09d893d8f7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 23 May 2020 16:24:18 +0200 Subject: [PATCH] bug fixes --- rowers/views/racesviews.py | 63 ++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 27 deletions(-) diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index b0d2c9d7..ee812a89 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -742,40 +742,49 @@ def virtualevent_withdrawresult_view(request,id=0,recordid=0): else: form = DisqualificationForm(request.POST) - workout = Workout.objects.get(id=record.workoutid) + try: + workout = Workout.objects.get(id=record.workoutid) + g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime") + for i in g: + try: + width,height = Image.open(i.filename).size + i.width = width + i.height = height + i.save() + except: + pass - g = GraphImage.objects.filter(workout=workout).order_by("-creationdatetime") - for i in g: - 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(f1) - hascoordinates = 1 - if rowdata != 0: - try: - latitude = rowdata.df[' latitude'] - if not latitude.std(): + f1 = workout.csvfilename + rowdata = rdata(f1) + hascoordinates = 1 + if rowdata != 0: + try: + latitude = rowdata.df[' latitude'] + if not latitude.std(): + hascoordinates = 0 + except (KeyError, AttributeError): hascoordinates = 0 - except (KeyError, AttributeError): + else: hascoordinates = 0 - else: - hascoordinates = 0 - if hascoordinates: - mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'], - rowdata.df[' longitude'], - workout.name) - else: + if hascoordinates: + mapscript, mapdiv = leaflet_chart(rowdata.df[' latitude'], + rowdata.df[' longitude'], + workout.name) + else: + mapscript = "" + mapdiv = "" + except Workout.DoesNotExist: mapscript = "" mapdiv = "" + workout = None + script = "" + div = "" + g = None + + breadcrumbs = [ {