From 7fb02823e6af12187e810488080dbe4e9be800ce Mon Sep 17 00:00:00 2001 From: Moritz Date: Sun, 20 Mar 2022 00:48:35 +0100 Subject: [PATCH] =?UTF-8?q?Anreise=20in=20Krieseninterventionsliste=20hinz?= =?UTF-8?q?u=20gef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jdav_web/members/models.py | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/jdav_web/members/models.py b/jdav_web/members/models.py index 0613a7d..c275c93 100644 --- a/jdav_web/members/models.py +++ b/jdav_web/members/models.py @@ -13,12 +13,11 @@ import os from dateutil.relativedelta import relativedelta -GEMEINSCHAFTS_TOUR = 0 -FUEHRUNGS_TOUR = 1 -AUSBILDUNGS_TOUR = 2 +GEMEINSCHAFTS_TOUR = MUSKELKRAFT_ANREISE = 0 +FUEHRUNGS_TOUR = OEFFENTLICHE_ANREISE = 1 +AUSBILDUNGS_TOUR = FAHRGEMEINSCHAFT_ANREISE = 2 HOST = os.environ.get('DJANGO_ALLOWED_HOST', 'localhost:8000').split(",")[0] - class ActivityCategory(models.Model): """ Describes one kind of activity @@ -202,6 +201,10 @@ class MemberList(models.Model): (AUSBILDUNGS_TOUR, 'Ausbildung')) # verbose_name is overriden by form, label is set in admin.py tour_type = models.IntegerField(choices=tour_type_choices) + tour_approach_choices = ((MUSKELKRAFT_ANREISE, 'Muskelkraft'), + (OEFFENTLICHE_ANREISE, 'Öffentliche VM'), + (FAHRGEMEINSCHAFT_ANREISE, 'Fahrgemeinschaften')) + tour_approach = models.IntegerField(choices=tour_approach_choices) activity = models.ManyToManyField(ActivityCategory, default=None, verbose_name=_('Categories')) difficulty_choices = [(1, _('easy')), (2, _('medium')), (3, _('hard'))] @@ -224,6 +227,14 @@ class MemberList(models.Model): else: return "Gemeinschaftstour" + def get_tour_approach(self): + if self.tour_approach == MUSKELKRAFT_ANREISE: + return "Muskelkraft" + elif self.tour_approach == OEFFENTLICHE_ANREISE: + return "Öffentliche VM" + else: + return "Fahrgemeinschaften" + def get_absolute_url(self): return reverse('admin:members_memberlist_change', args=[str(self.id)]) @@ -281,6 +292,10 @@ class Freizeit(models.Model): (AUSBILDUNGS_TOUR, 'Ausbildung')) # verbose_name is overriden by form, label is set in admin.py tour_type = models.IntegerField(choices=tour_type_choices) + tour_approach_choices = ((MUSKELKRAFT_ANREISE, 'Muskelkraft'), + (OEFFENTLICHE_ANREISE, 'Öffentliche VM'), + (FAHRGEMEINSCHAFT_ANREISE, 'Fahrgemeinschaften')) + tour_approach = models.IntegerField(choices=tour_approach_choices) activity = models.ManyToManyField(ActivityCategory, default=None, verbose_name=_('Categories')) difficulty_choices = [(1, _('easy')), (2, _('medium')), (3, _('hard'))] @@ -304,6 +319,14 @@ class Freizeit(models.Model): else: return "Gemeinschaftstour" + def get_tour_approach(self): + if self.tour_approach == MUSKELKRAFT_ANREISE: + return "Muskelkraft" + elif self.tour_approach == OEFFENTLICHE_ANREISE: + return "Öffentliche VM" + else: + return "Fahrgemeinschaften" + def get_absolute_url(self): return reverse('admin:members_freizeit_change', args=[str(self.id)])