From 086b1f9f1f3a36a8ae74ec8663b3592a70a50c7d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 17 Oct 2022 21:12:24 +0200
Subject: [PATCH 1/3] FAQ boatmovers verbetering

---
 boatmovers/templates/faq.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/boatmovers/templates/faq.html b/boatmovers/templates/faq.html
index ad3e9de3..be9c79f2 100644
--- a/boatmovers/templates/faq.html
+++ b/boatmovers/templates/faq.html
@@ -104,8 +104,9 @@ gepubliceerd met alleen de naam van de slagroeier.</p>
 
 <p>
 Dit betekent niet dat we niet open staan voor het toevoegen van nieuwe wedstrijden. Volg de “Add
-Race” link en vul de gegevens in. Wij krijgen dan een automatische email en gaan ernaar kijken.
-Kan ik ook een onderling duel aangaan met iemand en dan de uitslag mee laten tellen?</p>
+Race” link en vul de gegevens in. Wij krijgen dan een automatische email en gaan ernaar kijken.</p>
+
+<h1>Kan ik ook een onderling duel aangaan met iemand en dan de uitslag mee laten tellen?</h1>
 
 <p>
 Het is belangrijk dat de uitslag van de wedstrijd onafhankelijk te controleren is. Het makkelijkst is dus af

From bad7978e6fba348bbf1f290921fec0eabff8dea7 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 23 Oct 2022 15:40:56 +0200
Subject: [PATCH 2/3] small fixes

---
 rowers/dataroutines.py     | 15 ++++++++++++++-
 rowers/interactiveplots.py |  5 ++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 49fdb091..20181ada 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1262,7 +1262,20 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True, comp
         try:
             df = pd.read_parquet(csvfilenames[0], columns=columns)
             rowdata, row = getrowdata(id=ids[0])
-        except (OSError, ArrowInvalid, IndexError):
+        except (OSError, IndexError):
+            rowdata, row = getrowdata(id=ids[0])
+            if rowdata and len(rowdata.df):  # pragma: no cover
+                data = dataprep(
+                    rowdata.df, id=ids[0], bands=True, otwpower=True, barchart=True)
+                df = pd.read_parquet(csvfilenames[0], columns=columns)
+                #                df = dd.read_parquet(csvfilenames[0],
+                #                                     column=columns,engine='pyarrow',
+                #                )
+
+                # df = df.loc[:,~df.columns.duplicated()]
+            else:
+                df = pd.DataFrame()
+        except:
             rowdata, row = getrowdata(id=ids[0])
             if rowdata and len(rowdata.df):  # pragma: no cover
                 data = dataprep(
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 6f8e7097..cdf5060a 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -4197,7 +4197,10 @@ def instroke_interactive_chart(df,metric, workout, spm_min, spm_max,
 
     df_plot['high'].update(df_plot.pop('high 2'))
     df_plot['low'].update(df_plot.pop('low 2'))
-    df_plot.interpolate(axis=1,inplace=True)
+    try:
+        df_plot.interpolate(axis=1,inplace=True)
+    except TypeError:
+        pass
 
     TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,crosshair'
     plot = Figure(plot_width=920,tools=TOOLS,

From 88f39d5f3686b4ca78357d34ddcf52cafab75d75 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 23 Oct 2022 15:46:16 +0200
Subject: [PATCH 3/3] fixes

---
 rowers/templates/breakthroughemail.html | 4 ----
 rowers/templates/hardemail.html         | 6 +-----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/rowers/templates/breakthroughemail.html b/rowers/templates/breakthroughemail.html
index eb566d1e..5066131b 100644
--- a/rowers/templates/breakthroughemail.html
+++ b/rowers/templates/breakthroughemail.html
@@ -1,11 +1,7 @@
 {% extends "emailbase.html" %}
 
 {% block body %}
-{% if last_name %}
 <p>Dear <strong>{{ first_name }} {{ last_name }}</strong>,</p>
-{% else %}
-<p>Dear <strong>{{ first_name }}</strong>,</p>
-{% endif %}
 
 <p>
   Congratulations! Your recent workout has been analyzed
diff --git a/rowers/templates/hardemail.html b/rowers/templates/hardemail.html
index 00cb8c73..10f1b78d 100644
--- a/rowers/templates/hardemail.html
+++ b/rowers/templates/hardemail.html
@@ -1,11 +1,7 @@
 {% extends "emailbase.html" %}
 
 {% block body %}
-  {% if last_name %}
-  <p>Dear <strong>{{ first_name }} {{ last_name }}</strong>,</p>
-  {% else %}
-  <p>Dear <strong>{{ first_name }}</strong>,</p>
-  {% endif %}
+<p>Dear <strong>{{ first_name }} {{ last_name }}</strong>,</p>
 
 <p>
   Congratulations! Your recent workout has been analyzed