some improvements on alerts

rowers/management/commands/processalerts.py

@@ -44,24 +44,7 @@ class Command(BaseCommand):
             stats = alerts.alert_get_stats(alert)
 
             # 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
             job = myqueue(queue,handle_send_email_alert,

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

rowers/templates/alert_stats.html

@@ -14,9 +14,10 @@
 
 <ul class="main-content">
     
-  <li class="grid_2">
+  <li class="grid_4">
     <h2>Alert</h2>
     <p>{{ alert }}</p>
+    <p>{{ alert.description }}</p>
     <p>This is a page under construction. Currently with minimal information</p>
   </li>
   {% for key, value in stats.items %}

templates/.#newbase.html

@@ -1 +0,0 @@
-sander@sander-pc.7043:1566497359