createplan page

rowers/models.py

@@ -935,17 +935,31 @@ class TrainingTarget(models.Model):
         default=half_year_from_now)
     notes = models.TextField(max_length=300,blank=True)
 
+    def __unicode__(self):
+        date = self.date
+        name = self.name
+        ownerfirst = self.rower.user.first_name
+        ownerlast = self.rower.user.last_name
+
+        stri = u'{ownerfirst} {ownerlast} {d} {n}'.format(
+            ownerfirst = ownerfirst,
+            ownerlast = ownerlast,
+            d = date.strftime('%Y-%m-%d'),
+            n = name
+            )
+
+        return stri
+
 class TrainingTargetForm(ModelForm):
     class Meta:
         model = TrainingTarget
         fields = ['name','date','notes']
 
 	widgets = {
-	    'date': SelectDateWidget(
-                years=range(
-                    timezone.now().year-1,timezone.now().year+1)),
+	    'date': AdminDateWidget()
 	    }
 
+
 # SportTracks has a TrainingGoal like this
 #class TrainingGoal(models.Model):
 #    rower = models.ForeignKey(Rower)
@@ -976,14 +990,19 @@ class TrainingPlanForm(ModelForm):
         fields = ['name','target','startdate','enddate']
 
 	widgets = {
-	    'startdate': SelectDateWidget(
-                years=range(
-                    timezone.now().year-1,timezone.now().year+1)),
-	    'enddate': SelectDateWidget(
-                years=range(
-                    timezone.now().year-1,timezone.now().year+1)),
+	    'startdate': AdminDateWidget(),
+	    'enddate': AdminDateWidget()
 	    }
 
+    def __init__(self,*args, **kwargs):
+        targets = kwargs.pop('targets',None)
+        super(TrainingPlanForm, self).__init__(*args, **kwargs)
+
+        if targets:
+            targetchoices = [(x.id,x) for x in targets]
+            targetchoices.append((None,'---'))
+            self.fields['target'].choices = targetchoices
+            
     
 cycletypechoices = (
     ('filler','System Defined'),