Private
Public Access
1
0

got redirects in wrapper working with messaging

This commit is contained in:
Sander Roosendaal
2018-10-23 18:36:07 +02:00
parent ffc9ae91e9
commit 464b5cf807
13 changed files with 221 additions and 145 deletions

View File

@@ -9,7 +9,7 @@ from django.forms.extras.widgets import SelectDateWidget
from django.utils import timezone,translation
from django.forms import ModelForm, Select
import dataprep
import types
import mytypes
import datetime
from django.forms import formset_factory
from utils import landingpages
@@ -83,7 +83,7 @@ class DocumentsForm(forms.Form):
choices=Workout.workouttypes)
boattype = forms.ChoiceField(required=True,
choices=types.boattypes,
choices=mytypes.boattypes,
label = "Boat Type")
@@ -589,8 +589,8 @@ class IntervalUpdateForm(forms.Form):
self.fields['type_%s' % i].widget.attrs['style'] = 'width:156px; height: 22px;'
self.fields['intervald_%s' % i].widget = forms.TimeInput(format='%H:%M:%S.%f')
boattypes = types.boattypes
workouttypes = types.workouttypes
boattypes = mytypes.boattypes
workouttypes = mytypes.workouttypes
ww = list(workouttypes)
ww.append(tuple(('all','All')))
workouttypes = tuple(ww)
@@ -616,7 +616,7 @@ class TrendFlexModalForm(forms.Form):
initial='all')
waterboattype = forms.MultipleChoiceField(choices=boattypes,
label='Water Boat Type',
initial = types.waterboattype)
initial = mytypes.waterboattype)
rankingonly = forms.BooleanField(initial=False,
label='Only Ranking Pieces',
required=False)
@@ -631,14 +631,14 @@ class StatsOptionsForm(forms.Form):
waterboattype = forms.MultipleChoiceField(choices=boattypes,
label='Water Boat Type',
widget=forms.CheckboxSelectMultiple(),
initial = types.waterboattype)
initial = mytypes.waterboattype)
def __init__(self, *args, **kwargs):
super(StatsOptionsForm, self).__init__(*args,**kwargs)
for type in types.checktypes:
for type in mytypes.checktypes:
self.fields[type] = forms.BooleanField(initial=True,required=False)
@@ -807,8 +807,8 @@ class WorkoutSessionSelectForm(forms.Form):
class RaceResultFilterForm(forms.Form):
boatclasses = (type for type in types.workouttypes if type[0] in types.otwtypes)
boatclassinitial = [t for t in types.otwtypes]
boatclasses = (type for type in mytypes.workouttypes if type[0] in mytypes.otwtypes)
boatclassinitial = [t for t in mytypes.otwtypes]
sexchoices = (
('female','Female'),
('male','Male'),
@@ -836,7 +836,7 @@ class RaceResultFilterForm(forms.Form):
boattype = forms.MultipleChoiceField(
choices=boattypes,
label='Boat Type',
initial=types.waterboattype,
initial=mytypes.waterboattype,
widget=forms.CheckboxSelectMultiple())
age_min = forms.IntegerField(label='Min Age',initial=16)