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

Merge branch 'feature/alerts' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-08-22 21:15:08 +02:00
parent 324c017f35 e19555e39a
commit f71f1e4898
9 changed files with 49 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/management/commands/processalerts.py
+1 -18
View File
@@ -44,24 +44,7 @@ class Command(BaseCommand):
stats = alerts.alert_get_stats(alert) stats = alerts.alert_get_stats(alert)
# explanatorytexts # explanatorytexts
if alert.measured.condition == 'between': othertexts = [alert.description()]
description = 'This alert measures strokes where {metric} is between {value1} and {value2}.'.format(
metric = alert.measured.metric,
value1 = alert.measured.value1,
value2 = alert.measured.value2,
)
elif alert.measured.condition == '<':
description = 'This alert measures strokes where {metric} is smaller than {value1}.'.format(
metric = alert.measured.metric,
value1 = alert.measured.value1,
)
else:
description = 'This alert measures strokes where {metric} is larger than {value1}.'.format(
metric = alert.measured.metric,
value1 = alert.measured.value1,
)
othertexts = [description]
# send email # send email
job = myqueue(queue,handle_send_email_alert, job = myqueue(queue,handle_send_email_alert,
rowers/models.py
+25 -1
View File
@@ -1072,9 +1072,10 @@ class Alert(models.Model):
def __str__(self): def __str__(self):
metricdict = {key:value for (key,value) in parchoicesy1}
stri = u'Alert {name} on {metric} for {workouttype} - running on {first_name} every {period} days'.format( stri = u'Alert {name} on {metric} for {workouttype} - running on {first_name} every {period} days'.format(
name = self.name, name = self.name,
metric = self.measured.metric, metric = metricdict[self.measured.metric],
workouttype = self.workouttype, workouttype = self.workouttype,
first_name = self.rower.user.first_name, first_name = self.rower.user.first_name,
period = self.period, period = self.period,
@@ -1082,6 +1083,29 @@ class Alert(models.Model):
return stri return stri
def description(self):
metricdict = {key:value for (key,value) in parchoicesy1}
if self.measured.condition == 'between':
description = 'This alert measures strokes where {metric} is between {value1} and {value2}.'.format(
metric = metricdict[self.measured.metric],
value1 = self.measured.value1,
value2 = self.measured.value2,
)
elif self.measured.condition == '<':
description = 'This alert measures strokes where {metric} is smaller than {value1}.'.format(
metric = metricdict[self.measured.metric],
value1 = self.measured.value1,
)
else:
description = 'This alert measures strokes where {metric} is larger than {value1}.'.format(
metric = metricdict[self.measured.metric],
value1 = self.measured.value1,
)
return description
class AlertEditForm(ModelForm): class AlertEditForm(ModelForm):
class Meta: class Meta:
model = Alert model = Alert
rowers/templates/alert_stats.html
+2 -1
View File
@@ -14,9 +14,10 @@
<ul class="main-content"> <ul class="main-content">
<li class="grid_2"> <li class="grid_4">
<h2>Alert</h2> <h2>Alert</h2>
<p>{{ alert }}</p> <p>{{ alert }}</p>
<p>{{ alert.description }}</p>
<p>This is a page under construction. Currently with minimal information</p> <p>This is a page under construction. Currently with minimal information</p>
</li> </li>
{% for key, value in stats.items %} {% for key, value in stats.items %}
rowers/templates/failed_jobs.html
+1 -1
View File
@@ -38,5 +38,5 @@
{% block sidebar %} {% block sidebar %}
{% include 'menu_analytics.html' %} {% include 'menu_profile.html' %}
{% endblock %} {% endblock %}
rowers/templates/landingpage.html
+5
View File
@@ -10,6 +10,11 @@
<html> <html>
<head> <head>
<title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title> <title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title>
<link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon" />
<link rel="icon" sizes="32x32" href="/static/img/favicon-32x32.png" type="image/png"/>
<link rel="icon" sizes="64x64" href="/static/img/favicon-64x64.png" type="image/png"/>
<link rel="icon" sizes="192x192" href="/static/img/favicon-192x192.png" type="image/png"/>
<link rel="icon" sizes="16x16" href="/static/img/favicon-16x16.png" type="image/png"/>
{% block og_image %} {% block og_image %}
<meta property="og:image" content="https://rowsandall.com/static/img/logo_r.png" /> <meta property="og:image" content="https://rowsandall.com/static/img/logo_r.png" />
<meta property="og:image:secure_url" content="https://rowsandall.com/static/img/logo_r.png" /> <meta property="og:image:secure_url" content="https://rowsandall.com/static/img/logo_r.png" />
rowers/templates/menu_payments.html
+5
View File
@@ -33,6 +33,11 @@
<i class="fas fa-credit-card fa-fw"></i>&nbsp;Transactions <i class="fas fa-credit-card fa-fw"></i>&nbsp;Transactions
</a> </a>
</li> </li>
<li id="manage-jobs">
<a href="/rowers/failedjobs/">
<i class="fas fa-tasks fa-fw"></i>&nbsp;Failed Tasks
</a>
</li>
{% endif %} {% endif %}
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->
rowers/templates/menu_profile.html
+5
View File
@@ -33,6 +33,11 @@
<i class="fas fa-credit-card fa-fw"></i>&nbsp;Transactions <i class="fas fa-credit-card fa-fw"></i>&nbsp;Transactions
</a> </a>
</li> </li>
<li id="manage-jobs">
<a href="/rowers/failedjobs/">
<i class="fas fa-tasks fa-fw"></i>&nbsp;Failed Tasks
</a>
</li>
{% endif %} {% endif %}
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->
rowers/tests/testdata/testdata.csv.gz
Vendored
BIN
View File
Binary file not shown.
templates/newbasefront.html
+5 -3
View File
@@ -29,9 +29,11 @@
<script src="/static/cookielaw/js/cookielaw.js"></script> <script src="/static/cookielaw/js/cookielaw.js"></script>
{% analytical_head_top %} {% analytical_head_top %}
<link rel="stylesheet" href="/static/css/bokeh-0.12.3.min.css" type="text/css" /> <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
<link rel="stylesheet" href="/static/css/bokeh-widgets-0.12.3.min.css" type="text/css" /> <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="/static/admin/css/forms.css"/>
<link rel="stylesheet" type="text/css" href="/static/admin/css/widgets.css"/>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" >
<link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="/static/img/favicon.ico" type="image/x-icon" />
<link rel="icon" sizes="32x32" href="/static/img/favicon-32x32.png" type="image/png"/> <link rel="icon" sizes="32x32" href="/static/img/favicon-32x32.png" type="image/png"/>
<link rel="icon" sizes="64x64" href="/static/img/favicon-64x64.png" type="image/png"/> <link rel="icon" sizes="64x64" href="/static/img/favicon-64x64.png" type="image/png"/>