more progress on alerts

rowers/models.py

@@ -1025,21 +1025,28 @@ class Condition(models.Model):
     value2 = models.FloatField(default=0)
     condition = models.CharField(max_length=20,choices=conditionchoices,null=True)
 
+class ConditionEditForm(ModelForm):
+    class Meta:
+        model = Condition
+        fields = ['metric','condition','value1','value2']
+
+    
 rowchoices = []
 for key,value in mytypes.workouttypes:
     if key in mytypes.rowtypes:
         rowchoices.append((key,value))
 
+
     
 class Alert(models.Model):
-    name = models.CharField(max_length=150,verbose_name='Name',null=True,blank=True)
+    name = models.CharField(max_length=150,verbose_name='Alert Name',null=True,blank=True)
     manager = models.ForeignKey(User, on_delete=models.CASCADE)
     rower = models.ForeignKey(Rower, on_delete=models.CASCADE)
     measured = models.OneToOneField(Condition,verbose_name='Measuring',on_delete=models.CASCADE,
                                     related_name='measured')
     filter = models.ManyToManyField(Condition, related_name='filters',verbose_name='Filters')
     reststrokes = models.BooleanField(default=False,null=True,verbose_name='Include Rest Strokes')
-    period = models.IntegerField(default=7,verbose_name='Reporting Period')
+    period = models.IntegerField(default=7,verbose_name='Reporting Period (days)')
     next_run = models.DateField(default=timezone.now)
     emailalert = models.BooleanField(default=True,verbose_name='Send email alerts')
     workouttype = models.CharField(choices=rowchoices,max_length=50,
@@ -1058,7 +1065,10 @@ class Alert(models.Model):
 class AlertEditForm(ModelForm):
     class Meta:
         model = Alert
-        fields = ['name','measured','reststrokes','period','emailalert','workouttype']
+        fields = ['name','reststrokes','period','emailalert','workouttype']
+        widgets = {
+            'reststrokes':forms.CheckboxInput()
+            }
     
 class BasePlannedSessionFormSet(BaseFormSet):
     def clean(self):