From 132ffa856c5e2cf6dd616eae39cfdd43d03a0d23 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 10 Jun 2020 08:23:08 +0200
Subject: [PATCH] bug fix and fairer GPS comparisons

---
 rowers/interactiveplots.py | 14 ++++++-
 rowers/mytypes.py          |  3 +-
 rowers/views/racesviews.py | 82 +++++++++++++++++++++-----------------
 3 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index c993dd42..754c651c 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -261,6 +261,18 @@ def pretty_timedelta(secs):
 
     return '{}:{:02}:{:02}'.format(int(hours),int(minutes),int(seconds))
 
+def mapcolors(x):
+    try:
+        return mytypes.color_map[x]
+    except KeyError:
+        return mytypes.colors[-1]
+
+def maptypes(x):
+    try:
+        return mytypes.workouttypes_ordered[x]
+    except KeyError:
+        return 'Other'
+
 def interactive_workouttype_piechart(workouts):
     if len(workouts) == 0:
         return "","Not enough workouts to make a chart"
@@ -286,7 +298,7 @@ def interactive_workouttype_piechart(workouts):
 
 
     data = pd.DataFrame(data)
-    data['color'] = data['type'].apply(lambda x:mytypes.color_map[x])
+    data['color'] = data['type'].apply(lambda x:mapcolors(x))
     data['totaltime'] = data['value'].apply(lambda x:pretty_timedelta(x))
     data['type'] = data['type'].apply(lambda x:mytypes.workouttypes_ordered[x])
 
diff --git a/rowers/mytypes.py b/rowers/mytypes.py
index 294cb8bb..42538697 100644
--- a/rowers/mytypes.py
+++ b/rowers/mytypes.py
@@ -273,7 +273,8 @@ checktypes = [i[0] for i in workouttypes]
 from bokeh.palettes import Category10,Category20, Category20c
 
 
-colors = Category10[9]+Category20[19]+Category20c[19]
+#colors = Category10[9]
+colors = Category10[9]+list(set(Category20[19]+Category20c[19]))
 color_map = {checktypes[i]:colors[i] for i in range(len(checktypes))}
 
 workoutsources = (
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 09a3cb0e..1f6f4a33 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -1640,18 +1640,22 @@ def virtualevent_addboat_view(request,id=0):
                 race = race).exclude(userid = r.id)
 
             for otherrecord in otherrecords:
-                otheruser = Rower.objects.get(id=otherrecord.userid)
-                othername = otheruser.user.first_name+' '+otheruser.user.last_name
-                registeredname = r.user.first_name+' '+r.user.last_name
-                if otherrecord.emailnotifications:
-                    job = myqueue(
-                        queue,
-                        handle_sendemail_raceregistration,
-                        otheruser.user.email, othername,
-                        registeredname,
-                        race.name,
-                        race.id
-                    )
+                try:
+                    otheruser = Rower.objects.get(id=otherrecord.userid)
+                    othername = otheruser.user.first_name+' '+otheruser.user.last_name
+                    registeredname = r.user.first_name+' '+r.user.last_name
+                    if otherrecord.emailnotifications:
+                        job = myqueue(
+                            queue,
+                            handle_sendemail_raceregistration,
+                            otheruser.user.email, othername,
+                            registeredname,
+                            race.name,
+                            race.id
+                        )
+                except Rower.DoesNotExist:
+                    pass
+
 
             followers = VirtualRaceFollower.objects.filter(race = race)
 
@@ -1868,18 +1872,21 @@ def virtualevent_register_view(request,id=0):
                 race = race).exclude(userid = r.id)
 
             for otherrecord in otherrecords:
-                otheruser = Rower.objects.get(id=otherrecord.userid)
-                othername = otheruser.user.first_name+' '+otheruser.user.last_name
-                registeredname = r.user.first_name+' '+r.user.last_name
-                if otherrecord.emailnotifications:
-                    job = myqueue(
-                        queue,
-                        handle_sendemail_raceregistration,
-                        otheruser.user.email, othername,
-                        registeredname,
-                        race.name,
-                        race.id
-                    )
+                try:
+                    otheruser = Rower.objects.get(id=otherrecord.userid)
+                    othername = otheruser.user.first_name+' '+otheruser.user.last_name
+                    registeredname = r.user.first_name+' '+r.user.last_name
+                    if otherrecord.emailnotifications:
+                        job = myqueue(
+                            queue,
+                            handle_sendemail_raceregistration,
+                            otheruser.user.email, othername,
+                            registeredname,
+                            race.name,
+                            race.id
+                            )
+                except Rower.DoesNotExist:
+                    pass
 
             followers = VirtualRaceFollower.objects.filter(race = race)
 
@@ -2136,18 +2143,21 @@ def indoorvirtualevent_register_view(request,id=0):
                 race = race).exclude(userid = r.id)
 
             for otherrecord in otherrecords:
-                otheruser = Rower.objects.get(id=otherrecord.userid)
-                othername = otheruser.user.first_name+' '+otheruser.user.last_name
-                registeredname = r.user.first_name+' '+r.user.last_name
-                if otherrecord.emailnotifications:
-                    job = myqueue(
-                        queue,
-                        handle_sendemail_raceregistration,
-                        otheruser.user.email, othername,
-                        registeredname,
-                        race.name,
-                        race.id
-                    )
+                try:
+                    otheruser = Rower.objects.get(id=otherrecord.userid)
+                    othername = otheruser.user.first_name+' '+otheruser.user.last_name
+                    registeredname = r.user.first_name+' '+r.user.last_name
+                    if otherrecord.emailnotifications:
+                        job = myqueue(
+                            queue,
+                            handle_sendemail_raceregistration,
+                            otheruser.user.email, othername,
+                            registeredname,
+                            race.name,
+                            race.id
+                            )
+                except Rower.DoesNotExist:
+                    pass
 
             followers = VirtualRaceFollower.objects.filter(race = race)