From 14ee565ae9c988a1435ac5b333e89e78f69c8569 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 29 Apr 2019 22:31:22 +0200
Subject: [PATCH] tested

---
 rowers/dataprep.py                    |  13 ++++++++-----
 rowers/tests/testdata/testdata.csv.gz | Bin 12523 -> 12523 bytes
 rowers/views/analysisviews.py         |   5 ++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 4cd30c5e..cb22cecc 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -221,12 +221,15 @@ def filter_df(datadf, fieldname, value, largerthan=True):
     except KeyError:
         return datadf
 
-    if largerthan:
-        mask = datadf[fieldname] < value
-    else:
-        mask = datadf[fieldname] >= value
+    try:
+        if largerthan:
+            mask = datadf[fieldname] < value
+        else:
+            mask = datadf[fieldname] >= value
 
-    datadf.loc[mask, fieldname] = np.nan
+        datadf.loc[mask, fieldname] = np.nan
+    except TypeError:
+        pass
 
     return datadf
 
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 93a865ec40b792573b032b75dee9993606effb20..20280fc0c84c94701633a70d122f83f49c4c79ad 100644
GIT binary patch
delta 15
WcmaEz_&SkIzMF%CEq){0Qv(1oKLv^a

delta 15
WcmaEz_&SkIzMF%i(|jY_Qv(1qi3Q~V

diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index ff1fe142..127dd18d 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -3155,7 +3155,10 @@ def multiflex_data(request,userid=0,
     datadf['date'].replace(datemapping,inplace=True)
 
     today = datetime.date.today()
-    datadf['days ago'] = map(lambda x : x.days, datadf.date - today)
+    try:
+        datadf['days ago'] = map(lambda x : x.days, datadf.date - today)
+    except TypeError:
+        datadf['days ago'] = 0
 
     if groupby != 'date':
         try: