From fda68b555fd978fbeffbad4cbd8fc6051cfd0303 Mon Sep 17 00:00:00 2001 From: Dorian Lesbre <dorian.lesbre@gmail.com> Date: Wed, 17 Mar 2021 19:53:40 +0100 Subject: [PATCH] Removed mugs --- home/forms.py | 12 +++++++----- home/models.py | 2 +- home/templates/admin.html | 4 ++-- home/views.py | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/home/forms.py b/home/forms.py index 953fd56..9b3f5d9 100644 --- a/home/forms.py +++ b/home/forms.py @@ -10,15 +10,17 @@ class InscriptionForm(FormRenderMixin, forms.ModelForm): class Meta: model = InterludesParticipant fields = ( - "school", "sleeps", "mug", + "school", "sleeps", # "mug", "meal_friday_evening", "meal_saturday_morning", "meal_saturday_midday", "meal_saturday_evening", "meal_sunday_morning", "meal_sunday_midday", ) - field_groups = [["school"], ["sleeps"], ["mug"], [ - "meal_friday_evening", "meal_saturday_morning", "meal_saturday_midday", - "meal_saturday_evening", "meal_sunday_morning", "meal_sunday_midday", - ]] + field_groups = [["school"], ["sleeps"], #["mug"], + [ + "meal_friday_evening", "meal_saturday_morning", "meal_saturday_midday", + "meal_saturday_evening", "meal_sunday_morning", "meal_sunday_midday", + ] + ] def save(self, *args, commit=True, **kwargs): participant = super().save(*args, commit=False, **kwargs) diff --git a/home/models.py b/home/models.py index e8522cc..67f0004 100644 --- a/home/models.py +++ b/home/models.py @@ -113,7 +113,7 @@ class InterludesParticipant(models.Model): sleeps = models.BooleanField("dormir sur place", default=False) - mug = models.BooleanField("commander une tasse", default=False) + # mug = models.BooleanField("commander une tasse", default=False) def __str__(self) -> str: return "{} {} ({})".format(self.user.first_name, self.user.last_name, self.school) diff --git a/home/templates/admin.html b/home/templates/admin.html index 5281991..a2b895d 100644 --- a/home/templates/admin.html +++ b/home/templates/admin.html @@ -86,10 +86,10 @@ </div> <div class="flex wrap lines"> - <div class="stat"> + <!--<div class="stat"> <div class="qty">Tasses</div> <div class="nb_small">{{ metrics.mugs }}</div> - </div> + </div>--> <div class="stat"> <div class="qty">Dormeurs</div> <div class="nb_small">{{ metrics.sleeps }}</div> diff --git a/home/views.py b/home/views.py index 0f44c57..d95a447 100644 --- a/home/views.py +++ b/home/views.py @@ -154,7 +154,7 @@ class AdminView(SuperuserRequiredMixin, TemplateView): meal6 = registered.filter(meal_sunday_midday=True).count() meals = meal1 + meal2 + meal3 + meal4 + meal5 + meal6 - mugs = registered.filter(mug=True).count() + # mugs = registered.filter(mug=True).count() sleeps = registered.filter(sleeps=True).count() return metrics -- GitLab