diff --git a/rowers/models.py b/rowers/models.py index e8a6f2b6..8ab4eb1f 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2987,7 +2987,7 @@ class VirtualRaceResult(models.Model): verbose_name="Adaptive Class") skillclass = models.CharField(default="Open",max_length=50, verbose_name="Skill Class") - race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) + race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE,related_name='entries') duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) points = models.FloatField(default=0) diff --git a/rowers/serializers.py b/rowers/serializers.py index 234804ac..2ff7f038 100644 --- a/rowers/serializers.py +++ b/rowers/serializers.py @@ -84,27 +84,36 @@ class StandardCollectionSerializer(serializers.ModelSerializer): 'standards' ) -class EntrySerializer(serializers.ModelSerializer): + + + + + + + +class ShortEntrySerializer(serializers.ModelSerializer): entrycategory = CourseStandardSerializer(read_only=True) class Meta: model = VirtualRaceResult fields = ( 'id', + 'username', 'teamname', - 'adaptiveclass', - 'skillclass', - 'race', - 'distance', - 'duration', - 'points', 'boattype', 'sex', 'age', + 'adaptiveclass', + 'skillclass', + 'coursecompleted', + 'distance', + 'duration', + 'points', 'entrycategory', ) class VirtualRaceSerializer(serializers.ModelSerializer): coursestandards = StandardCollectionSerializer(read_only=True) + entries = ShortEntrySerializer(many=True,read_only=True) class Meta: model = VirtualRace fields = ( @@ -118,6 +127,7 @@ class VirtualRaceSerializer(serializers.ModelSerializer): 'timezone', 'contact_phone', 'contact_email', + 'entries', 'coursestandards', ) @@ -141,7 +151,6 @@ class EntrySerializer(serializers.ModelSerializer): 'entrycategory', ) - class WorkoutSerializer(serializers.ModelSerializer): class Meta: model = Workout