From d8ca4a8a63c37518adfe86a9853c8f7c7c6d26be Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 31 May 2020 17:22:44 +0200 Subject: [PATCH 1/2] part of models.py and admin.py --- rowers/admin.py | 14 +++++++------- rowers/models.py | 26 +++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rowers/admin.py b/rowers/admin.py index 18364c3e..d2e9b731 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -12,7 +12,7 @@ from .models import ( WorkoutComment,C2WorldClassAgePerformance,PlannedSession, GeoCourse,GeoPolygon,GeoPoint,VirtualRace,VirtualRaceResult, PaidPlan,IndoorVirtualRaceResult,ShareKey, -# CourseStandard,StandardCollection, + CourseStandard,StandardCollection, ) # Register your models here so you can use them in the Admin module @@ -142,11 +142,11 @@ class IndoorVirtualRaceResultAdmin(admin.ModelAdmin): class PaidPlanAdmin(admin.ModelAdmin): list_display = ('name','shortname','price','paymenttype','paymentprocessor','external_id') -#class StandardCollectionAdmin(admin.ModelAdmin): -# list_display = ('name','manager') +class StandardCollectionAdmin(admin.ModelAdmin): + list_display = ('name','manager') -#class CourseStandardAdmin(admin.ModelAdmin): -# list_display = ('name','standardcollection') +class CourseStandardAdmin(admin.ModelAdmin): + list_display = ('name','standardcollection') admin.site.unregister(User) admin.site.register(User,UserAdmin) @@ -167,5 +167,5 @@ admin.site.register(VirtualRaceResult, VirtualRaceResultAdmin) admin.site.register(IndoorVirtualRaceResult, IndoorVirtualRaceResultAdmin) admin.site.register(PaidPlan,PaidPlanAdmin) admin.site.register(ShareKey,ShareKeyAdmin) -#admin.site.register(CourseStandard,CourseStandardAdmin) -#admin.site.register(StandardCollection,StandardCollectionAdmin) +admin.site.register(CourseStandard,CourseStandardAdmin) +admin.site.register(StandardCollection,StandardCollectionAdmin) diff --git a/rowers/models.py b/rowers/models.py index 6d0774c3..c960c261 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2253,8 +2253,8 @@ class VirtualRace(PlannedSession): contact_email = models.EmailField(max_length=254, validators=[validate_email],blank=True) -# coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL, -# verbose_name='Standard Times',blank=True) + coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL, + verbose_name='Standard Times',blank=True,default=None) def __str__(self): @@ -2458,7 +2458,7 @@ class IndoorVirtualRaceForm(ModelForm): self.fields['sessionunit'].initial = 'm' if timezone: self.fields['timezone'].initial = timezone -# self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) + self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) def clean(self): cd = self.cleaned_data @@ -2562,7 +2562,7 @@ class VirtualRaceForm(ModelForm): 'registration_closure', 'evaluation_closure', 'course', -# 'coursestandards', + 'coursestandards', 'comment', 'contact_phone', 'contact_email', @@ -2586,7 +2586,7 @@ class VirtualRaceForm(ModelForm): def __init__(self,*args,**kwargs): super(VirtualRaceForm, self).__init__(*args, **kwargs) self.fields['course'].queryset = GeoCourse.objects.all().order_by("country","name") -# self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) + self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) def clean(self): @@ -2932,12 +2932,12 @@ class VirtualRaceResult(models.Model): adaptiveclass = models.CharField(default="None",max_length=50, choices=mytypes.adaptivetypes, verbose_name="Adaptive Class") -# skillclass = models.CharField(default="Open",max_length=50, -# verbose_name="Skill Class") + skillclass = models.CharField(default="Open",max_length=50, + verbose_name="Skill Class") race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) -# points = models.IntegerField(default=0) + points = models.IntegerField(default=0) boatclass = models.CharField(choices=boatclasses, max_length=40, default='water', @@ -2958,7 +2958,7 @@ class VirtualRaceResult(models.Model): startsecond = models.FloatField(default=0) endsecond = models.FloatField(default=0) -# referencespeed = models.FloatField(default=5.0) + referencespeed = models.FloatField(default=5.0) # entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL, # verbose_name='Group') @@ -3015,13 +3015,13 @@ class IndoorVirtualRaceResult(models.Model): adaptiveclass = models.CharField(default="None",max_length=50, choices=mytypes.adaptivetypes, verbose_name="Adaptive Class") -# skillclass = models.CharField(default="Open",max_length=50, -# verbose_name="Skill Class") + skillclass = models.CharField(default="Open",max_length=50, + verbose_name="Skill Class") race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) -# referencespeed = models.FloatField(default=5.0) -# points = models.IntegerField(default=0) + referencespeed = models.FloatField(default=5.0) + points = models.IntegerField(default=0) boatclass = models.CharField(choices=boatclasses, max_length=40, default='rower', From e54183a029e47b9aeccda4f207fd0f130d74e74b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 31 May 2020 17:25:56 +0200 Subject: [PATCH 2/2] fix --- rowers/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/models.py b/rowers/models.py index c960c261..2ea9d71b 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2424,7 +2424,7 @@ class IndoorVirtualRaceForm(ModelForm): 'registration_closure', 'evaluation_closure', 'comment', -# 'coursestandards', + 'coursestandards', 'contact_phone', 'contact_email', ]