From 9464fe3caffd3c58e3d5cc4f9cbd6cb5cd6b3321 Mon Sep 17 00:00:00 2001 From: Nanoy Date: Sun, 28 Apr 2019 13:30:07 +0200 Subject: [PATCH] Remove vice-president, grocer, brewer and add phoenixTM_responsible --- coopeV3/templatetags/vip.py | 22 +++---------------- preferences/admin.py | 2 +- preferences/forms.py | 4 +--- preferences/models.py | 12 ++-------- .../preferences/general_preferences.html | 12 ++-------- templates/footer.html | 14 +++--------- 6 files changed, 12 insertions(+), 54 deletions(-) diff --git a/coopeV3/templatetags/vip.py b/coopeV3/templatetags/vip.py index 9939623..d4266f1 100644 --- a/coopeV3/templatetags/vip.py +++ b/coopeV3/templatetags/vip.py @@ -12,14 +12,6 @@ def president(): gp,_ = GeneralPreferences.objects.get_or_create(pk=1) return gp.president -@register.simple_tag -def vice_president(): - """ - A tag which returns :attr:`preferences.models.GeneralPreferences.vice_president`. - """ - gp,_ = GeneralPreferences.objects.get_or_create(pk=1) - return gp.vice_president - @register.simple_tag def treasurer(): """ @@ -37,20 +29,12 @@ def secretary(): return gp.secretary @register.simple_tag -def brewer(): +def phoenix(): """ - A tag which returns :attr:`preferences.models.GeneralPreferences.brewer`. + A tag which returns :attr:`preferences.models.GeneralPreferences.phoenixTM_responsible`. """ gp,_ = GeneralPreferences.objects.get_or_create(pk=1) - return gp.brewer - -@register.simple_tag -def grocer(): - """ - A tag which returns :attr:`preferences.models.GeneralPreferences.grocer`. - """ - gp,_ = GeneralPreferences.objects.get_or_create(pk=1) - return gp.grocer + return gp.phoenixTM_responsible @register.simple_tag def global_message(): diff --git a/preferences/admin.py b/preferences/admin.py index 53a1ba0..1641d96 100644 --- a/preferences/admin.py +++ b/preferences/admin.py @@ -13,7 +13,7 @@ class GeneralPreferencesAdmin(SimpleHistoryAdmin): """ The admin class for :class:`Consumptions `. """ - list_display = ('is_active', 'president', 'vice_president', 'treasurer', 'secretary', 'brewer', 'grocer', 'use_pinte_monitoring', 'lost_pintes_allowed', 'floating_buttons', 'automatic_logout_time') + list_display = ('is_active', 'president', 'treasurer', 'secretary', 'phoenixTM_responsible', 'use_pinte_monitoring', 'lost_pintes_allowed', 'floating_buttons', 'automatic_logout_time') class PaymentMethodAdmin(SimpleHistoryAdmin): """ diff --git a/preferences/forms.py b/preferences/forms.py index 2b9604b..52a7dc6 100644 --- a/preferences/forms.py +++ b/preferences/forms.py @@ -31,11 +31,9 @@ class GeneralPreferencesForm(forms.ModelForm): 'global_message': forms.Textarea(attrs={'placeholder': 'Message global à afficher sur le site'}), 'active_message': forms.Textarea(attrs={'placeholder': 'Ce message s\'affichera si le site n\'est pas actif'}), 'president': forms.TextInput(attrs={'placeholder': 'Président'}), - 'vice_president': forms.TextInput(attrs={'placeholder': 'Vice-président'}), 'secretary': forms.TextInput(attrs={'placeholder': 'Secrétaire'}), 'treasurer': forms.TextInput(attrs={'placeholder': 'Trésorier'}), - 'brewer': forms.TextInput(attrs={'placeholder': 'Maître brasseur'}), - 'grocer': forms.TextInput(attrs={'placeholder': 'Epic épicier'}), + 'phoenixTM_responsible': forms.TextInput(attrs={'placeholder': 'Responsable Phœnix Technopôle Metz'}), 'home_text': forms.Textarea(attrs={'placeholder': 'Ce message sera affiché sur la page d\'accueil'}) } diff --git a/preferences/models.py b/preferences/models.py index 49c58ee..31409dd 100644 --- a/preferences/models.py +++ b/preferences/models.py @@ -64,10 +64,6 @@ class GeneralPreferences(models.Model): """ The name of the president """ - vice_president = models.CharField(max_length=255, blank=True, verbose_name="Vice Président") - """ - The name of the vice-president - """ treasurer = models.CharField(max_length=255, blank=True, verbose_name="Trésorier") """ The name of the treasurer @@ -76,13 +72,9 @@ class GeneralPreferences(models.Model): """ The name of the secretary """ - brewer = models.CharField(max_length=255, blank=True, verbose_name="Maître Brasseur") + phoenixTM_responsible = models.CharField(max_length=255, blank=True, verbose_name="Responsable Phœnix Technopôle Metz") """ - The name of the brewer - """ - grocer = models.CharField(max_length=255, blank=True, verbose_name="Épic Épicier") - """ - The name of the grocer + The name of the people in charge of the club """ use_pinte_monitoring = models.BooleanField(default=False, verbose_name="Suivi de pintes") """ diff --git a/preferences/templates/preferences/general_preferences.html b/preferences/templates/preferences/general_preferences.html index 14238a3..9b2328e 100644 --- a/preferences/templates/preferences/general_preferences.html +++ b/preferences/templates/preferences/general_preferences.html @@ -69,23 +69,15 @@ {{form.president}}
- {{form.vice_president}} + {{form.secretary}}
-
- {{form.secretary}} -
{{form.treasurer}}
-
-
- {{form.grocer}} -
-
- {{form.brewer}} + {{form.phoenixTM_responsible}}
diff --git a/templates/footer.html b/templates/footer.html index 9399c5b..6a8d26b 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -22,13 +22,9 @@ coopemetz@gmail.com - Prez + Président {% president %} - - V-Prez - {% vice_president %} - Trésorier {% treasurer %} @@ -38,12 +34,8 @@ {% secretary %} - Maitre brasseur - {% brewer %} - - - Epic Epicier - {% grocer %} + Responsable Phœnix Technopôle Metz + {% phoenix %}