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

replaced len with count() on a few queries

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-31 18:32:58 +01:00
parent 9d6eabca19
commit df80860ed1
4 changed files with 248 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rowers/alerts.py
View File

@@ -13,7 +13,7 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
if manager.rower != rower:
if rower not in coach_getcoachees(manager.rower):
return 0,'You are not allowed to create this alert'
m = Condition(
metric = measured['metric'],
value1 = measured['value1'],
@@ -22,7 +22,7 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
)
m.save()
alert = Alert(name=name,
manager=manager,
rower=rower,
@@ -46,7 +46,7 @@ def create_alert(manager, rower, measured,period=7, emailalert=True,
value2 = f['value2'],
condition = f['condition']
)
m.save()
alert.filter.add(m)
@@ -79,7 +79,7 @@ def alert_add_filters(alert,filters):
m.save()
alert.filter.add(m)
return 1
# get alert stats
@@ -104,7 +104,7 @@ def alert_get_stats(alert,nperiod=0):
if df.empty:
return {
'workouts':len(workouts),
'workouts':workouts.count(),
'startdate':startdate,
'enddate':enddate,
'nr_strokes':0,
@@ -139,7 +139,7 @@ def alert_get_stats(alert,nperiod=0):
df.dropna(inplace=True,axis=0)
else:
return {
'workouts':len(workouts),
'workouts':workouts.count(),
'startdate':startdate,
'enddate':enddate,
'nr_strokes':0,
@@ -150,11 +150,11 @@ def alert_get_stats(alert,nperiod=0):
'median_q': 0,
'standard_dev': 0,
}
# count strokes
nr_strokes = len(df)
# count qualifying
if alert.measured.condition == '>':
@@ -164,7 +164,7 @@ def alert_get_stats(alert,nperiod=0):
mask = df[alert.measured.metric] < alert.measured.value1
df2 = df[mask].copy()
elif alert.measured.condition == 'between':
mask = df[alert.measured.metric] > alert.measured.value1
mask = df[alert.measured.metric] > alert.measured.value1
mask2 = df[alert.measured.metric] < alert.measured.value2
df2 = df[mask & mask2].copy()
else:
@@ -181,9 +181,9 @@ def alert_get_stats(alert,nperiod=0):
median_q = df2[alert.measured.metric].median()
median = df[alert.measured.metric].median()
std = df[alert.measured.metric].std()
return {
'workouts':len(workouts),
'workouts':workouts.count(),
'startdate':startdate,
'enddate':enddate,
'nr_strokes':nr_strokes,