sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'feature/adminmodel' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-31 17:28:26 +02:00
parent 947b5a1d09 e54183a029
commit ff87be2b0c
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/admin.py
View File

@@ -12,7 +12,7 @@ from .models import (
WorkoutComment,C2WorldClassAgePerformance,PlannedSession, WorkoutComment,C2WorldClassAgePerformance,PlannedSession,
GeoCourse,GeoPolygon,GeoPoint,VirtualRace,VirtualRaceResult, GeoCourse,GeoPolygon,GeoPoint,VirtualRace,VirtualRaceResult,
PaidPlan,IndoorVirtualRaceResult,ShareKey, PaidPlan,IndoorVirtualRaceResult,ShareKey,
# CourseStandard,StandardCollection, CourseStandard,StandardCollection,
) )
# Register your models here so you can use them in the Admin module # 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): class PaidPlanAdmin(admin.ModelAdmin):
list_display = ('name','shortname','price','paymenttype','paymentprocessor','external_id') list_display = ('name','shortname','price','paymenttype','paymentprocessor','external_id')
#class StandardCollectionAdmin(admin.ModelAdmin): class StandardCollectionAdmin(admin.ModelAdmin):
# list_display = ('name','manager') list_display = ('name','manager')
#class CourseStandardAdmin(admin.ModelAdmin): class CourseStandardAdmin(admin.ModelAdmin):
# list_display = ('name','standardcollection') list_display = ('name','standardcollection')
admin.site.unregister(User) admin.site.unregister(User)
admin.site.register(User,UserAdmin) admin.site.register(User,UserAdmin)
@@ -167,5 +167,5 @@ admin.site.register(VirtualRaceResult, VirtualRaceResultAdmin)
admin.site.register(IndoorVirtualRaceResult, IndoorVirtualRaceResultAdmin) admin.site.register(IndoorVirtualRaceResult, IndoorVirtualRaceResultAdmin)
admin.site.register(PaidPlan,PaidPlanAdmin) admin.site.register(PaidPlan,PaidPlanAdmin)
admin.site.register(ShareKey,ShareKeyAdmin) admin.site.register(ShareKey,ShareKeyAdmin)
#admin.site.register(CourseStandard,CourseStandardAdmin) admin.site.register(CourseStandard,CourseStandardAdmin)
#admin.site.register(StandardCollection,StandardCollectionAdmin) admin.site.register(StandardCollection,StandardCollectionAdmin)

28
rowers/models.py
View File

@@ -2253,8 +2253,8 @@ class VirtualRace(PlannedSession):
contact_email = models.EmailField(max_length=254, contact_email = models.EmailField(max_length=254,
validators=[validate_email],blank=True) validators=[validate_email],blank=True)
# coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL, coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL,
# verbose_name='Standard Times',blank=True) verbose_name='Standard Times',blank=True,default=None)
def __str__(self): def __str__(self):
@@ -2424,7 +2424,7 @@ class IndoorVirtualRaceForm(ModelForm):
'registration_closure', 'registration_closure',
'evaluation_closure', 'evaluation_closure',
'comment', 'comment',
# 'coursestandards', 'coursestandards',
'contact_phone', 'contact_phone',
'contact_email', 'contact_email',
] ]
@@ -2458,7 +2458,7 @@ class IndoorVirtualRaceForm(ModelForm):
self.fields['sessionunit'].initial = 'm' self.fields['sessionunit'].initial = 'm'
if timezone: if timezone:
self.fields['timezone'].initial = 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): def clean(self):
cd = self.cleaned_data cd = self.cleaned_data
@@ -2562,7 +2562,7 @@ class VirtualRaceForm(ModelForm):
'registration_closure', 'registration_closure',
'evaluation_closure', 'evaluation_closure',
'course', 'course',
# 'coursestandards', 'coursestandards',
'comment', 'comment',
'contact_phone', 'contact_phone',
'contact_email', 'contact_email',
@@ -2586,7 +2586,7 @@ class VirtualRaceForm(ModelForm):
def __init__(self,*args,**kwargs): def __init__(self,*args,**kwargs):
super(VirtualRaceForm, self).__init__(*args, **kwargs) super(VirtualRaceForm, self).__init__(*args, **kwargs)
self.fields['course'].queryset = GeoCourse.objects.all().order_by("country","name") 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): def clean(self):
@@ -2932,12 +2932,12 @@ class VirtualRaceResult(models.Model):
adaptiveclass = models.CharField(default="None",max_length=50, adaptiveclass = models.CharField(default="None",max_length=50,
choices=mytypes.adaptivetypes, choices=mytypes.adaptivetypes,
verbose_name="Adaptive Class") verbose_name="Adaptive Class")
# skillclass = models.CharField(default="Open",max_length=50, skillclass = models.CharField(default="Open",max_length=50,
# verbose_name="Skill Class") verbose_name="Skill Class")
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
duration = models.TimeField(default=datetime.time(1,0)) duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0) distance = models.IntegerField(default=0)
# points = models.IntegerField(default=0) points = models.IntegerField(default=0)
boatclass = models.CharField(choices=boatclasses, boatclass = models.CharField(choices=boatclasses,
max_length=40, max_length=40,
default='water', default='water',
@@ -2958,7 +2958,7 @@ class VirtualRaceResult(models.Model):
startsecond = models.FloatField(default=0) startsecond = models.FloatField(default=0)
endsecond = 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, # entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL,
# verbose_name='Group') # verbose_name='Group')
@@ -3015,13 +3015,13 @@ class IndoorVirtualRaceResult(models.Model):
adaptiveclass = models.CharField(default="None",max_length=50, adaptiveclass = models.CharField(default="None",max_length=50,
choices=mytypes.adaptivetypes, choices=mytypes.adaptivetypes,
verbose_name="Adaptive Class") verbose_name="Adaptive Class")
# skillclass = models.CharField(default="Open",max_length=50, skillclass = models.CharField(default="Open",max_length=50,
# verbose_name="Skill Class") verbose_name="Skill Class")
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
duration = models.TimeField(default=datetime.time(1,0)) duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0) distance = models.IntegerField(default=0)
# referencespeed = models.FloatField(default=5.0) referencespeed = models.FloatField(default=5.0)
# points = models.IntegerField(default=0) points = models.IntegerField(default=0)
boatclass = models.CharField(choices=boatclasses, boatclass = models.CharField(choices=boatclasses,
max_length=40, max_length=40,
default='rower', default='rower',