DAV-KA/django-dav-events
1
0
Fork 0
Code Issues 24 Pull Requests Actions Releases Wiki Activity

try to make pylint happy
All checks were successful
buildbot/tox Build done.
Details

Browse Source
This commit is contained in:
heinzel
2022-06-08 00:08:09 +02:00
parent 8610e2a557
commit 98a6fc3ce7
60 changed files with 565 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
dav_registration/views.py
View File

@@ -23,7 +23,7 @@ class RootView(generic.RedirectView):
def get(self, request, *args, **kwargs):
purge_registrations()
return super(RootView, self).get(request, *args, **kwargs)
return super().get(request, *args, **kwargs)
class EventListView(generic.ListView):
@@ -33,14 +33,14 @@ class EventListView(generic.ListView):
def get_queryset(self):
today = datetime.date.today()
filter = Q(flags__status__code__in=('publishing', 'publishing_web', 'publishing_facebook',
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
# filter &= Q(registration_closed=False)
# filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
filter_exp = Q(flags__status__code__in=('publishing', 'publishing_web', 'publishing_facebook',
'published', 'published_web', 'published_facebook'))
filter_exp &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter_exp &= Q(first_day__gte=today)
# filter_exp &= Q(registration_closed=False)
# filter_exp &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = self.model.objects.filter(filter).order_by('first_day', 'number').distinct()
qs = self.model.objects.filter(filter_exp).order_by('first_day', 'number').distinct()
return qs
@@ -52,14 +52,14 @@ class EventDetailView(generic.DetailView):
def get_queryset(self):
today = datetime.date.today()
filter = Q(flags__status__code__in=('publishing', 'publishing_web', 'publishing_facebook',
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
# filter &= Q(registration_closed=False)
# filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
filter_exp = Q(flags__status__code__in=('publishing', 'publishing_web', 'publishing_facebook',
'published', 'published_web', 'published_facebook'))
filter_exp &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter_exp &= Q(first_day__gte=today)
# filter_exp &= Q(registration_closed=False)
# filter_exp &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = self.model.objects.filter(filter).distinct()
qs = self.model.objects.filter(filter_exp).distinct()
return qs
@@ -74,72 +74,72 @@ class RegistrationView(generic.CreateView):
def get_queryset(self):
today = datetime.date.today()
filter = Q(flags__status__code__in=('publishing', 'publishing_web', 'publishing_facebook',
'published', 'published_web', 'published_facebook'))
filter &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter &= Q(first_day__gte=today)
filter &= Q(registration_closed=False)
filter &= Q(deadline__isnull=True) | Q(deadline__gte=today)
filter_exp = Q(flags__status__code__in=('publishing', 'publishing_web', 'publishing_facebook',
'published', 'published_web', 'published_facebook'))
filter_exp &= Q(planned_publication_date__isnull=True) | Q(planned_publication_date__lte=today)
filter_exp &= Q(first_day__gte=today)
filter_exp &= Q(registration_closed=False)
filter_exp &= Q(deadline__isnull=True) | Q(deadline__gte=today)
qs = Event.objects.filter(filter).distinct()
qs = Event.objects.filter(filter_exp).distinct()
return qs
def get_initial(self):
initials = super(RegistrationView, self).get_initial()
initials = super().get_initial()
return initials
def get_form(self, form_class=None):
form = super(RegistrationView, self).get_form(form_class)
form = super().get_form(form_class)
event = self.get_object()
experience_label = form.fields['experience'].label
experience_help_text = form.fields['experience'].help_text
if event.sport == 'B':
experience_label = _(u'Eigene Bergerfahrung')
experience_label = _('Eigene Bergerfahrung')
elif event.sport == 'K' and event.terrain == 'alpine':
experience_label = _(u'Eigene Fels- und Bergerfahrung')
experience_label = _('Eigene Fels- und Bergerfahrung')
if event.level == 'beginner':
experience_help_text = u'%s<br /> %s<br /> %s' % (
_(u'Warst du schon mal im Gebirge klettern?'),
_(u'In welchem Schwierigkeitsgrad hast du Spaß?'),
_(u'Bist du schon mal vorgestiegen?')
experience_help_text = '%s<br /> %s<br /> %s' % (
_('Warst du schon mal im Gebirge klettern?'),
_('In welchem Schwierigkeitsgrad hast du Spaß?'),
_('Bist du schon mal vorgestiegen?')
)
else:
experience_help_text = u'%s<br /> %s<br /> %s' % (
_(u'In welchen Klettergebieten/Touren warst du bisher unterwegs?'),
_(u'In welchem Schwierigkeitsgrad hast du im Vorstieg Spaß?'),
_(u'Wie waren die Touren abgesichert, in denen du dich noch wohlgefühlt hast?')
experience_help_text = '%s<br /> %s<br /> %s' % (
_('In welchen Klettergebieten/Touren warst du bisher unterwegs?'),
_('In welchem Schwierigkeitsgrad hast du im Vorstieg Spaß?'),
_('Wie waren die Touren abgesichert, in denen du dich noch wohlgefühlt hast?')
)
elif event.sport == 'K':
experience_label = _(u'Eigene Klettererfahrung')
experience_label = _('Eigene Klettererfahrung')
if event.level == 'beginner':
experience_help_text = u'%s<br /> %s<br /> %s' % (
_(u'Warst du schon mal am Fels klettern?'),
_(u'In welchem Schwierigkeitsgrad hast du Spaß?'),
_(u'Bist du schon mal vorgestiegen?')
experience_help_text = '%s<br /> %s<br /> %s' % (
_('Warst du schon mal am Fels klettern?'),
_('In welchem Schwierigkeitsgrad hast du Spaß?'),
_('Bist du schon mal vorgestiegen?')
)
else:
experience_help_text = u'%s<br /> %s<br /> %s' % (
_(u'In welchen Klettergebieten warst du bisher unterwegs?'),
_(u'In welchem Schwierigkeitsgrad hast du im Vorstieg Spaß?'),
_(u'Wie waren die Touren abgesichert, in denen du dich noch wohlgefühlt hast?')
experience_help_text = '%s<br /> %s<br /> %s' % (
_('In welchen Klettergebieten warst du bisher unterwegs?'),
_('In welchem Schwierigkeitsgrad hast du im Vorstieg Spaß?'),
_('Wie waren die Touren abgesichert, in denen du dich noch wohlgefühlt hast?')
)
elif event.sport == 'M':
experience_label = _(u'Eigene MTB-Erfahrung')
experience_help_text = u'%s' % (
_(u'Was für Touren bist du schon gefahren?')
experience_label = _('Eigene MTB-Erfahrung')
experience_help_text = '%s' % (
_('Was für Touren bist du schon gefahren?')
)
if event.level != 'beginner':
experience_help_text += u'<br /> %s' % (
_(u'Single-Trail-Schwierigkeit (S0-S5) bei der du dich wohl fühlst?')
experience_help_text += '<br /> %s' % (
_('Single-Trail-Schwierigkeit (S0-S5) bei der du dich wohl fühlst?')
)
elif event.sport == 'S':
experience_label = _(u'Eigene Skitouren- und Bergerfahrung')
experience_label = _('Eigene Skitouren- und Bergerfahrung')
elif event.sport == 'W':
experience_help_text += u'<br /> %s' % (
_(u'Kann frei gelassen werden.')
experience_help_text += '<br /> %s' % (
_('Kann frei gelassen werden.')
)
form.fields['experience'].label = experience_label
@@ -150,7 +150,7 @@ class RegistrationView(generic.CreateView):
return form
def get_context_data(self, **kwargs):
context = super(RegistrationView, self).get_context_data(**kwargs)
context = super().get_context_data(**kwargs)
event = self.get_object()
context['event'] = event
context['privacy_policy'] = app_config.settings.privacy_policy
@@ -158,16 +158,16 @@ class RegistrationView(generic.CreateView):
return context
def form_valid(self, form):
r = super(RegistrationView, self).form_valid(form)
r = super().form_valid(form)
self.request.session['registration_id'] = form.instance.pk
message = _(u'Deine Anmeldung wurde erfolgreich gespeichert.')
message = _('Deine Anmeldung wurde erfolgreich gespeichert.')
messages.success(self.request, message)
return r
def post(self, request, *args, **kwargs):
if 'registration_id' in request.session:
del request.session['registration_id']
return super(RegistrationView, self).post(request, *args, **kwargs)
return super().post(request, *args, **kwargs)
class RegistrationSuccessView(generic.DetailView):