ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

[WEI] Update survey words 

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
This commit is contained in:
Yohann D'ANELLO 2021-08-26 00:11:24 +02:00
parent 41a0b3a1c1
commit 802a6c68cb
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wei/forms/registration.py
View File

@ -138,7 +138,7 @@ class WEIMembershipForm(forms.ModelForm):
class BusForm(forms.ModelForm): class BusForm(forms.ModelForm):
class Meta: class Meta:
model = Bus model = Bus
exclude = ('information_json',) fields = '__all__'
widgets = { widgets = {
"wei": Autocomplete( "wei": Autocomplete(
WEIClub, WEIClub,

23
apps/wei/forms/surveys/wei2021.py
View File

@ -10,14 +10,16 @@ from django.utils.translation import gettext_lazy as _
from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation from .base import WEISurvey, WEISurveyInformation, WEISurveyAlgorithm, WEIBusInformation
from ...models import Bus from ...models import Bus
WORDS = [
# TODO: Use new words '13 organisé', '3ième mi temps', 'Années 2000', 'Apéro', 'BBQ', 'BP', 'Beauf', 'Binge drinking', 'Bon enfant',
WORDS = ['Rap', 'Retro', 'DJ', 'Rock', 'Jazz', 'Chansons Populaires', 'Chansons Paillardes', 'Pop', 'Fanfare', 'Cartouche', 'Catacombes', 'Chansons paillardes', 'Chansons populaires', 'Chanteur', 'Chartreuse', 'Chill',
'Biere', 'Pastis', 'Vodka', 'Cocktails', 'Eau', 'Sirop', 'Jus de fruit', 'Binge Drinking', 'Rhum', 'Core', 'DJ', 'Dancefloor', 'Danse', 'David Guetta', 'Disco', 'Eau de vie', 'Électro', 'Escalade', 'Familial',
'Eau de vie', 'Apéro', 'Morning beer', 'Huit-six', 'Jeux de societé', 'Jeux de cartes', 'Danse', 'Karaoké', 'Fanfare', 'Fracassage', 'Féria', 'Hard rock', 'Hoeggarden', 'House', 'Huit-six', 'IPA', 'Inclusif', 'Inferno',
'Bière Pong', 'Poker', 'Loup Garou', 'Films', "Jeux d'alcool", 'Sport', 'Rangées de cul', 'Chips', 'BBQ', 'Introverti', 'Jager bomb', 'Jazz', 'Jeux d\'alcool', 'Jeux de rôles', 'Jeux vidéo', 'Jul', 'Jus de fruit',
'Kebab', 'Saucisse', 'Vegan', 'Vege', 'LGBTIQ+', 'Dab', 'Solitaire', 'Séducteur', 'Sociale', 'Chanteur', 'Karaoké', 'LGBTQI+', 'Lady Gaga', 'Loup garou', 'Morning beer', 'Métal', 'Nuit blanche', 'Ovalie', 'Psychedelic',
'Se lacher', 'Chill', 'Débile', 'Beauf', 'Bon enfant'] 'Pétanque', 'Rave', 'Reggae', 'Rhum', 'Ricard', 'Rock', 'Rosé', 'Rétro', 'Séducteur', 'Techno', 'Thérapie taxi',
'Théâtre', 'Trap', 'Turn up', 'Underground', 'Volley', 'Wati B', 'Zinédine Zidane',
]
class WEISurveyForm2021(forms.Form): class WEISurveyForm2021(forms.Form):
@ -59,9 +61,12 @@ class WEIBusInformation2021(WEIBusInformation):
""" """
For each word, the bus has a score For each word, the bus has a score
""" """
scores: dict
def __init__(self, bus): def __init__(self, bus):
self.scores = {}
for word in WORDS: for word in WORDS:
setattr(self, word, 0.0) self.scores[word] = 0.0
super().__init__(bus) super().__init__(bus)

4
apps/wei/models.py
View File

@ -96,7 +96,7 @@ class Bus(models.Model):
""" """
Store information as a JSON string Store information as a JSON string
""" """
self.information_json = json.dumps(information) self.information_json = json.dumps(information, indent=2)
def __str__(self): def __str__(self):
return self.name return self.name
@ -260,7 +260,7 @@ class WEIRegistration(models.Model):
""" """
Store information as a JSON string Store information as a JSON string
""" """
self.information_json = json.dumps(information) self.information_json = json.dumps(information, indent=2)
@property @property
def is_validated(self): def is_validated(self):

2
apps/wei/views.py
View File

@ -344,6 +344,8 @@ class BusUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["club"] = self.object.wei context["club"] = self.object.wei
context["information"] = CurrentSurvey.get_algorithm_class().get_bus_information(self.object)
self.object.save()
return context return context
def get_form(self, form_class=None): def get_form(self, form_class=None):