stats report alert

rowers/models.py

@@ -881,9 +881,12 @@ class Rower(models.Model):
     def save(self, *args, **kwargs):
         try:
             for group in self.coachinggroups.all():
-                coach = Rower.objects.get(mycoachgroup=group)
-                if coach.rowerplan == 'freecoach':
-                    self.coachinggroups.remove(group)
+                try:
+                    coach = Rower.objects.get(mycoachgroup=group)
+                    if coach.rowerplan == 'freecoach':
+                        self.coachinggroups.remove(group)
+                except Rower.DoesNotExist:
+                    pass
         except ValueError:
             pass
         
@@ -1093,6 +1096,11 @@ class Alert(models.Model):
 
         return stri
 
+    def metricname(self):
+        metricdict = {key:value for (key,value) in parchoicesy1}
+
+        return metricdict[self.measured.metric]
+
     def description(self):
         metricdict = {key:value for (key,value) in parchoicesy1}
         
@@ -1115,6 +1123,24 @@ class Alert(models.Model):
 
         return description
             
+    def shortdescription(self):
+        metricdict = {key:value for (key,value) in parchoicesy1}
+        
+        if self.measured.condition == 'between':
+            description = '{value1} < {metric} < {value2}'.format(
+                metric = self.measured.metric,
+                value1 = self.measured.value1,
+                value2 = self.measured.value2,
+            )
+        else:
+            description = '{metric} {condition} {value1}'.format(
+                metric = self.measured.metric,
+                value1 = self.measured.value1,
+                condition = self.measured.condition
+            )
+
+        return description
+            
 
 class AlertEditForm(ModelForm):
     class Meta: