From e8161077a61419144a8a33fa2ee8c2fb9c471198 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 22 Aug 2019 20:59:30 +0200 Subject: [PATCH 1/2] favicon on landing page --- rowers/templates/failed_jobs.html | 2 +- rowers/templates/landingpage.html | 5 +++++ rowers/templates/menu_payments.html | 5 +++++ rowers/templates/menu_profile.html | 5 +++++ rowers/tests/testdata/testdata.csv.gz | Bin 12642 -> 12642 bytes templates/.#newbase.html | 1 + templates/newbasefront.html | 8 +++++--- 7 files changed, 22 insertions(+), 4 deletions(-) create mode 120000 templates/.#newbase.html diff --git a/rowers/templates/failed_jobs.html b/rowers/templates/failed_jobs.html index 1bc330ef..42080a36 100644 --- a/rowers/templates/failed_jobs.html +++ b/rowers/templates/failed_jobs.html @@ -38,5 +38,5 @@ {% block sidebar %} -{% include 'menu_analytics.html' %} +{% include 'menu_profile.html' %} {% endblock %} diff --git a/rowers/templates/landingpage.html b/rowers/templates/landingpage.html index 53c1f62c..a0dcbe33 100644 --- a/rowers/templates/landingpage.html +++ b/rowers/templates/landingpage.html @@ -10,6 +10,11 @@ {% block title %}Rowsandall Rowing Data Analytics{% endblock %} + + + + + {% block og_image %} diff --git a/rowers/templates/menu_payments.html b/rowers/templates/menu_payments.html index 91940095..bad5cd53 100644 --- a/rowers/templates/menu_payments.html +++ b/rowers/templates/menu_payments.html @@ -33,6 +33,11 @@  Transactions +
  • + +  Failed Tasks + +
    • {% endif %} diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html index e3702374..bdeb6f54 100644 --- a/rowers/templates/menu_profile.html +++ b/rowers/templates/menu_profile.html @@ -33,6 +33,11 @@  Transactions +
  • + +  Failed Tasks + +
    • {% endif %} diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index fce0cb2890a10611ebb45b90418584d97911d03a..a46986b1a8491dddb3360345d27418302c31d074 100644 GIT binary patch delta 16 XcmaEq^eBm4zMF$X|4!US_Gm)@IO+xW delta 16 XcmaEq^eBm4zMF&Nx^B!y_Gm)@IbH?s diff --git a/templates/.#newbase.html b/templates/.#newbase.html new file mode 120000 index 00000000..837f4c99 --- /dev/null +++ b/templates/.#newbase.html @@ -0,0 +1 @@ +sander@sander-pc.7043:1566497359 \ No newline at end of file diff --git a/templates/newbasefront.html b/templates/newbasefront.html index 99275c14..44650e51 100644 --- a/templates/newbasefront.html +++ b/templates/newbasefront.html @@ -29,9 +29,11 @@ {% analytical_head_top %} - - - + + + + + From e19555e39a03e3accbd6cc9cc191bc62dd07696f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 22 Aug 2019 21:14:33 +0200 Subject: [PATCH 2/2] some improvements on alerts --- rowers/management/commands/processalerts.py | 19 +-------------- rowers/models.py | 26 ++++++++++++++++++++- rowers/templates/alert_stats.html | 3 ++- templates/.#newbase.html | 1 - 4 files changed, 28 insertions(+), 21 deletions(-) delete mode 120000 templates/.#newbase.html diff --git a/rowers/management/commands/processalerts.py b/rowers/management/commands/processalerts.py index 6c0034c0..08e39bcc 100644 --- a/rowers/management/commands/processalerts.py +++ b/rowers/management/commands/processalerts.py @@ -44,24 +44,7 @@ class Command(BaseCommand): stats = alerts.alert_get_stats(alert) # explanatorytexts - if alert.measured.condition == 'between': - 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] + othertexts = [alert.description()] # send email job = myqueue(queue,handle_send_email_alert, diff --git a/rowers/models.py b/rowers/models.py index 4c26ccd7..ec2f772e 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1072,9 +1072,10 @@ class Alert(models.Model): 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( name = self.name, - metric = self.measured.metric, + metric = metricdict[self.measured.metric], workouttype = self.workouttype, first_name = self.rower.user.first_name, period = self.period, @@ -1082,6 +1083,29 @@ class Alert(models.Model): 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 Meta: model = Alert diff --git a/rowers/templates/alert_stats.html b/rowers/templates/alert_stats.html index 713716f9..fb950332 100644 --- a/rowers/templates/alert_stats.html +++ b/rowers/templates/alert_stats.html @@ -14,9 +14,10 @@
      -
    • +

    • Alert

      {{ alert }}

      +

      {{ alert.description }}

      This is a page under construction. Currently with minimal information

      • {% for key, value in stats.items %} diff --git a/templates/.#newbase.html b/templates/.#newbase.html deleted file mode 120000 index 837f4c99..00000000 --- a/templates/.#newbase.html +++ /dev/null @@ -1 +0,0 @@ -sander@sander-pc.7043:1566497359 \ No newline at end of file