sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v9.83' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-29 22:31:43 +02:00
parent 369f6f47e3 14ee565ae9
commit 2ef418fd22
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/dataprep.py
+3
View File
@@ -221,12 +221,15 @@ def filter_df(datadf, fieldname, value, largerthan=True):
except KeyError: except KeyError:
return datadf return datadf
try:
if largerthan: if largerthan:
mask = datadf[fieldname] < value mask = datadf[fieldname] < value
else: else:
mask = datadf[fieldname] >= value mask = datadf[fieldname] >= value
datadf.loc[mask, fieldname] = np.nan datadf.loc[mask, fieldname] = np.nan
except TypeError:
pass
return datadf return datadf
rowers/tests/testdata/testdata.csv.gz
Vendored
BIN
View File
Binary file not shown.
rowers/views/analysisviews.py
+3
View File
@@ -3155,7 +3155,10 @@ def multiflex_data(request,userid=0,
datadf['date'].replace(datemapping,inplace=True) datadf['date'].replace(datemapping,inplace=True)
today = datetime.date.today() today = datetime.date.today()
try:
datadf['days ago'] = map(lambda x : x.days, datadf.date - today) datadf['days ago'] = map(lambda x : x.days, datadf.date - today)
except TypeError:
datadf['days ago'] = 0
if groupby != 'date': if groupby != 'date':
try: try: