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

more coverage related

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-23 14:18:13 +02:00
parent 99dfb171b5
commit e19158926d
10 changed files with 383 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rowers/forms.py
View File

@@ -51,10 +51,10 @@ class FlexibleDecimalField(forms.DecimalField):
pass
try:
dot_index = value.index('.')
except ValueError:
except ValueError: # pragma: no cover
pass
if value:
if comma_index > dot_index:
if comma_index > dot_index: # pragma: no cover
value = value.replace('.', '').replace(',', '.')
return super(FlexibleDecimalField, self).to_python(value)
@@ -362,7 +362,7 @@ class WorkFlowLeftPanelForm(forms.Form):
js = ['/admin/jsi18n/']
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs): # pragma: no cover
if 'instance' in kwargs:
r = kwargs.pop('instance')
panels = r.workflowleftpanel
@@ -395,7 +395,7 @@ class WorkFlowMiddlePanelForm(forms.Form):
}
js = ['/admin/jsi18n/']
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs): # pragma: no cover
if 'instance' in kwargs:
r = kwargs.pop('instance')
panels = r.workflowmiddlepanel
@@ -500,18 +500,18 @@ class UploadOptionsForm(forms.Form):
choices3 = [(0,'---')]
noregistrations = []
for ra in VirtualRace.objects.filter(registration_closure__gt=timezone.now(),sessiontype='race'):
for ra in VirtualRace.objects.filter(registration_closure__gt=timezone.now(),sessiontype='race'): # pragma: no cover
rs = VirtualRaceResult.objects.filter(race = ra,userid=r.id)
if rs.count()==0:
noregistrations.append((-ra.id,ra.name))
for ra in VirtualRace.objects.filter(registration_closure__gt=timezone.now(),sessiontype='indoorrace'):
for ra in VirtualRace.objects.filter(registration_closure__gt=timezone.now(),sessiontype='indoorrace'): # pragma: no cover
rs = IndoorVirtualRaceResult.objects.filter(race = ra,userid=r.id)
if rs.count()==0:
noregistrations.append((-ra.id,ra.name))
choices = choices3+choices1+choices2+noregistrations
if int(raceid) in [r.id for r in races]:
if int(raceid) in [r.id for r in races]: # pragma: no cover
therace = VirtualRace.objects.get(id=raceid)
self.fields['raceid'].initial = therace.id
if therace.sessiontype == 'race':
@@ -526,7 +526,7 @@ class UploadOptionsForm(forms.Form):
choices = [(r.id,str(r)) for r in registrations]
choices = choices+[(0,'---')]
if races:
if races: # pragma: no cover
self.fields['submitrace'].choices = choices
else:
del self.fields['submitrace']
@@ -920,7 +920,7 @@ class RegistrationFormUniqueEmail(RegistrationFormTermsOfService):
Validate that the supplied email address is unique for the
site.
"""
if User.objects.filter(email__iexact=self.cleaned_data['email']):
if User.objects.filter(email__iexact=self.cleaned_data['email']): # pragma: no cover
raise forms.ValidationError("This email address is already in use. Please supply a different email address.")
return self.cleaned_data['email']
@@ -949,7 +949,7 @@ class RegistrationFormSex(RegistrationFormUniqueEmail):
def clean_birthdate(self):
dob = self.cleaned_data['birthdate']
age = (timezone.now() - dob).days/365
if age < 16:
if age < 16: # pragma: no cover
raise forms.ValidationError('Must be at least 16 years old to register')
return self.cleaned_data['birthdate']
@@ -970,7 +970,7 @@ class RegistrationFormSex(RegistrationFormUniqueEmail):
# Time field supporting microseconds. Not used, I believe.
class MyTimeField(forms.TimeField):
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs): # pragma: no cover
super(MyTimeField, self).__init__(*args, **kwargs)
supports_microseconds = True
@@ -1085,7 +1085,7 @@ class StatsOptionsForm(forms.Form):
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs): # pragma: no cover
super(StatsOptionsForm, self).__init__(*args,**kwargs)
for type in mytypes.checktypes:
@@ -1128,7 +1128,7 @@ class PlanSelectForm(forms.Form):
class CourseSelectForm(forms.Form):
course = forms.ModelChoiceField(queryset=GeoCourse.objects.filter())
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs): # pragma: no cover
course = kwargs.pop('course',None)
manager = kwargs.pop('manager',None)
super(CourseSelectForm,self).__init__(*args,**kwargs)
@@ -1380,7 +1380,7 @@ class FusionMetricChoiceForm(ModelForm):
if df.loc[:,label].std() == 0:
try:
formaxlabels2.pop(label)
except KeyError:
except KeyError: # pragma: no cover
pass
metricchoices = list(sorted(formaxlabels2.items(), key = lambda x:x[1]))
@@ -1511,7 +1511,7 @@ class RaceResultFilterForm(forms.Form):
if len(theboatclasses)<= 1:
del self.fields['boatclass']
else:
else: # pragma: no cover
boatclasschoices = []
for choice in self.fields['boatclass'].choices:
if choice[0] in theboatclasses:
@@ -1522,7 +1522,7 @@ class RaceResultFilterForm(forms.Form):
try:
theboattypees = [record.boattype for record in records]
theboattypees = list(set(theboattypees))
except AttributeError:
except AttributeError: # pragma: no cover
theboattypees = []
if len(theboattypees)<= 1:
@@ -1540,7 +1540,7 @@ class RaceResultFilterForm(forms.Form):
if len(theweightcategoryes)<= 1:
del self.fields['weightcategory']
else:
else: # pragma: no cover
weightcategorychoices = []
for choice in self.fields['weightcategory'].choices:
if choice[0] in theweightcategoryes:
@@ -1553,7 +1553,7 @@ class RaceResultFilterForm(forms.Form):
if len(theadaptivecategoryes)<= 1:
del self.fields['adaptivecategory']
else:
else: # pragma: no cover
adaptivecategorychoices = []
for choice in self.fields['adaptivecategory'].choices:
if choice[0] in theadaptivecategoryes:
@@ -1622,7 +1622,7 @@ class PlannedSessionTeamForm(forms.Form):
self.fields['team'].queryset = Team.objects.filter(manager=user)
def clean(self):
if any(self.errors):
if any(self.errors): # pragma: no cover
return
cd = self.cleaned_data
@@ -1651,7 +1651,7 @@ def get_countries():
countries = VirtualRace.objects.order_by('country').values_list('country').distinct()
countries = tuple([(c[0],c[0]) for c in countries])
countries = countries+(('All','All'),)
except:
except: # pragma: no cover
countries = (('All','All'))
return countries