added adaptive classes (not tested)

rowers/views.py

@@ -1045,6 +1045,7 @@ def rower_register_view(request):
             sex = form.cleaned_data['sex']
             birthdate = form.cleaned_data['birthdate']
             weightcategory = form.cleaned_data['weightcategory']
+            adaptiveclass = form.cleaned_data['adaptiveclass']
             nextpage = request.POST['next']
 	    theuser = User.objects.create_user(username,password=password)
 	    theuser.first_name = first_name
@@ -1053,7 +1054,8 @@ def rower_register_view(request):
 	    theuser.save()
 
 	    therower = Rower(user=theuser,sex=sex,birthdate=birthdate,
-                             weightcategory=weightcategory)
+                             weightcategory=weightcategory,
+                             adaptiveclass=adaptiveclass)
 
 	    therower.save()
 
@@ -3382,6 +3384,7 @@ def addmanual_view(request):
 	    workouttype = form.cleaned_data['workouttype']
 	    duration = form.cleaned_data['duration']
             weightcategory = form.cleaned_data['weightcategory']
+            adaptiveclass = form.cleaned_data['adaptiveclass']
 	    distance = form.cleaned_data['distance']
 	    notes = form.cleaned_data['notes']
             thetimezone = form.cleaned_data['timezone']
@@ -3431,6 +3434,7 @@ def addmanual_view(request):
                                                 distance,
                                                 duration,startdatetime,
                                                 weightcategory=weightcategory,
+                                                adaptiveclass=adaptiveclass,
                                                 avghr=avghr,
                                                 rankingpiece=rankingpiece,
                                                 avgpwr=avgpwr,
@@ -3450,6 +3454,7 @@ def addmanual_view(request):
                 w.rankingpiece = rankingpiece
                 w.privacy = privacy
                 w.weightcategory = weightcategory
+                w.adaptiveclass = adaptiveclass
                 w.notes = notes
                 w.plannedsession = ps
                 w.name = name
@@ -3567,7 +3572,8 @@ def rankings_view(request,theuser=0,
             worldclasspower = int(metrics.getagegrouprecord(
                 age,
                 sex=r.sex,
-                weightcategory=r.weightcategory
+                weightcategory=r.weightcategory,
+                adaptiveclass=r.adaptiveclass,
             ))
         else:
             worldclasspower = None
@@ -10044,6 +10050,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 	    starttime = form.cleaned_data['starttime']
 	    workouttype = form.cleaned_data['workouttype']
             weightcategory = form.cleaned_data['weightcategory']
+            adaptiveclass = form.cleaned_data['adaptiveclass']
 	    duration = form.cleaned_data['duration']
 	    distance = form.cleaned_data['distance']
             private = form.cleaned_data['private']
@@ -10108,6 +10115,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
             row.startdatetime = startdatetime
             row.workouttype = workouttype
             row.weightcategory = weightcategory
+            row.adaptiveclass = adaptiveclass
             row.notes = notes
             row.duration = duration
             row.distance = distance
@@ -13137,6 +13145,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
             last_name = ucd['last_name']
             email = ucd['email']
             sex = cd['sex']
+            adaptiveclass = cd['adaptiveclass']
             defaultlandingpage = cd['defaultlandingpage']
             weightcategory = cd['weightcategory']
             birthdate = cd['birthdate']
@@ -13160,6 +13169,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
             u.save()
             r.defaulttimezone=defaulttimezone
             r.weightcategory = weightcategory
+            r.adaptiveclass = adaptiveclass
             r.getemailnotifications = getemailnotifications
             r.getimportantemails = getimportantemails
             r.defaultlandingpage = defaultlandingpage
@@ -13440,6 +13450,7 @@ def rower_prefs_view(request,userid=0,message=""):
             sex = cd['sex']
             defaultlandingpage = cd['defaultlandingpage']
             weightcategory = cd['weightcategory']
+            adaptiveclass = cd['adaptiveclass']
             birthdate = cd['birthdate']
             showfavoritechartnotes = cd['showfavoritechartnotes']
             getemailnotifications = cd['getemailnotifications']
@@ -13461,6 +13472,7 @@ def rower_prefs_view(request,userid=0,message=""):
             u.save()
             r.defaulttimezone=defaulttimezone
             r.weightcategory = weightcategory
+            r.adaptiveclass = adaptiveclass
             r.getemailnotifications = getemailnotifications
             r.getimportantemails = getimportantemails
             r.defaultlandingpage = defaultlandingpage
@@ -16379,6 +16391,11 @@ def virtualevent_view(request,id=0):
             except KeyError:
                 weightcategory = ['hwt','lwt']
 
+            try:
+                adaptiveclass = cd['adaptiveclass']
+            except KeyError:
+                adaptiveclass = ['None','PR1','PR2','PR3','FES']
+
             if race.sessiontype == 'race':
                 results = resultobj.objects.filter(
                     race=race,
@@ -16387,6 +16404,7 @@ def virtualevent_view(request,id=0):
                     boattype__in=boattype,
                     sex__in=sex,
                     weightcategory__in=weightcategory,
+                    adaptiveclass__in=adaptiveclass,
                     age__gte=age_min,
                     age__lte=age_max
                 ).order_by("duration")
@@ -16397,6 +16415,7 @@ def virtualevent_view(request,id=0):
                     boatclass__in=boatclass,
                     sex__in=sex,
                     weightcategory__in=weightcategory,
+                    adaptiveclass__in=adaptiveclass,
                     age__gte=age_min,
                     age__lte=age_max
                 ).order_by("duration","-distance")
@@ -16411,6 +16430,7 @@ def virtualevent_view(request,id=0):
                     boatclass__in=boatclass,
                     sex__in=sex,
                     weightcategory__in=weightcategory,
+                    adaptiveclass__in=adaptiveclass,
                     age__gte=age_min,
                     age__lte=age_max
                 )
@@ -16525,6 +16545,7 @@ def virtualevent_addboat_view(request,id=0):
             boattype = cd['boattype']
             boatclass = cd['boatclass']
             weightcategory = cd['weightcategory']
+            adaptiveclass = cd['adaptiveclass']
             age = cd['age']
             mix = cd['mix']
 
@@ -16569,6 +16590,7 @@ def virtualevent_addboat_view(request,id=0):
                     l = r.user.last_name
                 ),
                 weightcategory=weightcategory,
+                adaptiveclass=adaptiveclass,
                 duration=datetime.time(0,0),
                 boattype=boattype,
                 boatclass=boatclass,
@@ -16599,6 +16621,7 @@ def virtualevent_addboat_view(request,id=0):
         initial = {
             'age': calculate_age(r.birthdate),
             'weightcategory': r.weightcategory,
+            'adaptiveclass': r.adaptiveclass,
             }
         
         form = VirtualRaceResultForm(initial=initial)
@@ -16682,6 +16705,7 @@ def virtualevent_register_view(request,id=0):
             boattype = cd['boattype']
             boatclass = cd['boatclass']
             weightcategory = cd['weightcategory']
+            adaptiveclass = cd['adaptiveclass']
             age = cd['age']
             mix = cd['mix']
 
@@ -16705,6 +16729,7 @@ def virtualevent_register_view(request,id=0):
                     l = r.user.last_name
                 ),
                 weightcategory=weightcategory,
+                adaptiveclass=adaptiveclass,
                 duration=datetime.time(0,0),
                 boatclass=boatclass,
                 boattype=boattype,
@@ -16751,6 +16776,7 @@ def virtualevent_register_view(request,id=0):
         initial = {
             'age': calculate_age(r.birthdate),
             'weightcategory': r.weightcategory,
+            'adaptiveclass': r.adaptiveclass,
             }
         
         form = VirtualRaceResultForm(initial=initial)
@@ -16873,6 +16899,7 @@ def indoorvirtualevent_register_view(request,id=0):
             cd = form.cleaned_data
             teamname = cd['teamname']
             weightcategory = cd['weightcategory']
+            adaptiveclass = cd['adaptiveclass']
             age = cd['age']
             boatclass = cd['boatclass']
 
@@ -16894,6 +16921,7 @@ def indoorvirtualevent_register_view(request,id=0):
                     l = r.user.last_name
                 ),
                 weightcategory=weightcategory,
+                adaptiveclass=adaptiveclass,
                 duration=datetime.time(0,0),
                 boatclass=boatclass,
                 coursecompleted=False,
@@ -16939,6 +16967,7 @@ def indoorvirtualevent_register_view(request,id=0):
         initial = {
             'age': calculate_age(r.birthdate),
             'weightcategory': r.weightcategory,
+            'adaptiveclass': r.adaptiveclass,
             }
         
         form = IndoorVirtualRaceResultForm(initial=initial)