Commit 309ef85b authored by Zar's avatar Zar

Sex setting modification on profil and matmatronche

parent 42f5773f
Pipeline #2096 failed with stage
in 7 minutes and 30 seconds
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-10-09 20:24
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [("core", "0032_auto_20190909_0043")]
operations = [
migrations.AlterField(
model_name="user",
name="sex",
field=models.CharField(
blank=True,
choices=[("MAN", "Man"), ("WOMAN", "Woman")],
max_length=10,
null=True,
verbose_name="sex",
),
)
]
......@@ -201,9 +201,10 @@ class User(AbstractBaseUser):
)
sex = models.CharField(
_("sex"),
max_length=10,
max_length=20,
null=True,
blank=True,
choices=[("MAN", _("Man")), ("WOMAN", _("Woman"))],
default="MAN",
)
tshirt_size = models.CharField(
_("tshirt size"),
......
......@@ -41,7 +41,7 @@ msgstr "code postal"
msgid "country"
msgstr "pays"
#: accounting/models.py:66 core/models.py:258
#: accounting/models.py:66 core/models.py:259
msgid "phone"
msgstr "téléphone"
......@@ -531,7 +531,7 @@ msgid "Effective amount"
msgstr "Montant effectif"
#: accounting/templates/accounting/club_account_details.jinja:36
#: sith/settings.py:421
#: sith/settings.py:422
msgid "Closed"
msgstr "Fermé"
......@@ -2068,75 +2068,75 @@ msgstr "Homme"
msgid "Woman"
msgstr "Femme"
#: core/models.py:209
#: core/models.py:210
msgid "tshirt size"
msgstr "taille de tshirt"
#: core/models.py:212
#: core/models.py:213
msgid "-"
msgstr "-"
#: core/models.py:213
#: core/models.py:214
msgid "XS"
msgstr "XS"
#: core/models.py:214
#: core/models.py:215
msgid "S"
msgstr "S"
#: core/models.py:215
#: core/models.py:216
msgid "M"
msgstr "M"
#: core/models.py:216
#: core/models.py:217
msgid "L"
msgstr "L"
#: core/models.py:217
#: core/models.py:218
msgid "XL"
msgstr "XL"
#: core/models.py:218
#: core/models.py:219
msgid "XXL"
msgstr "XXL"
#: core/models.py:219
#: core/models.py:220
msgid "XXXL"
msgstr "XXXL"
#: core/models.py:227
#: core/models.py:228
msgid "Student"
msgstr "Étudiant"
#: core/models.py:228
#: core/models.py:229
msgid "Administrative agent"
msgstr "Personnel administratif"
#: core/models.py:229
#: core/models.py:230
msgid "Teacher"
msgstr "Enseignant"
#: core/models.py:230
#: core/models.py:231
msgid "Agent"
msgstr "Personnel"
#: core/models.py:231
#: core/models.py:232
msgid "Doctor"
msgstr "Doctorant"
#: core/models.py:232
#: core/models.py:233
msgid "Former student"
msgstr "Ancien étudiant"
#: core/models.py:233
#: core/models.py:234
msgid "Service"
msgstr "Service"
#: core/models.py:239
#: core/models.py:240
msgid "department"
msgstr "département"
#: core/models.py:246
#: core/models.py:247
msgid "dpt option"
msgstr "Filière"
......@@ -2144,43 +2144,43 @@ msgstr "Filière"
msgid "semester"
msgstr "semestre"
#: core/models.py:249
#: core/models.py:250
msgid "quote"
msgstr "citation"
#: core/models.py:250
#: core/models.py:251
msgid "school"
msgstr "école"
#: core/models.py:252
#: core/models.py:253
msgid "promo"
msgstr "promo"
#: core/models.py:255
#: core/models.py:256
msgid "forum signature"
msgstr "signature du forum"
#: core/models.py:257
#: core/models.py:258
msgid "second email address"
msgstr "adresse email secondaire"
#: core/models.py:259
#: core/models.py:260
msgid "parent phone"
msgstr "téléphone des parents"
#: core/models.py:262
#: core/models.py:263
msgid "parent address"
msgstr "adresse des parents"
#: core/models.py:265
#: core/models.py:266
msgid "is subscriber viewable"
msgstr "profil visible par les cotisants"
#: core/models.py:480
#: core/models.py:481
msgid "A user with that username already exists"
msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
#: core/models.py:618 core/templates/core/macros.jinja:72
#: core/models.py:619 core/templates/core/macros.jinja:72
#: core/templates/core/macros.jinja:74 core/templates/core/macros.jinja:75
#: core/templates/core/user_detail.jinja:79
#: core/templates/core/user_detail.jinja:80
......@@ -2198,7 +2198,7 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
msgid "Profile"
msgstr "Profil"
#: core/models.py:742
#: core/models.py:743
msgid "Visitor"
msgstr "Visiteur"
......@@ -2393,8 +2393,8 @@ msgstr "S'enregister"
#: forum/templates/forum/macros.jinja:171
#: forum/templates/forum/macros.jinja:175
#: matmat/templates/matmat/search_form.jinja:37
#: matmat/templates/matmat/search_form.jinja:47
#: matmat/templates/matmat/search_form.jinja:58
#: matmat/templates/matmat/search_form.jinja:46
#: matmat/templates/matmat/search_form.jinja:56
#: pedagogy/templates/pedagogy/guide.jinja:29
msgid "Search"
msgstr "Recherche"
......@@ -2475,7 +2475,7 @@ msgstr "Photos"
#: eboutic/templates/eboutic/eboutic_main.jinja:24
#: eboutic/templates/eboutic/eboutic_makecommand.jinja:8
#: eboutic/templates/eboutic/eboutic_payment_result.jinja:4
#: sith/settings.py:376 sith/settings.py:384
#: sith/settings.py:377 sith/settings.py:385
msgid "Eboutic"
msgstr "Eboutic"
......@@ -4725,12 +4725,12 @@ msgid "Washing and drying"
msgstr "Lavage et séchage"
#: launderette/templates/launderette/launderette_book.jinja:27
#: sith/settings.py:583
#: sith/settings.py:584
msgid "Washing"
msgstr "Lavage"
#: launderette/templates/launderette/launderette_book.jinja:31
#: sith/settings.py:583
#: sith/settings.py:584
msgid "Drying"
msgstr "Séchage"
......@@ -4794,7 +4794,7 @@ msgstr "Recherche par profil"
msgid "Inverted search"
msgstr "Recherche inversée"
#: matmat/templates/matmat/search_form.jinja:50
#: matmat/templates/matmat/search_form.jinja:49
msgid "Quick search"
msgstr "Recherche rapide"
......@@ -5207,352 +5207,352 @@ msgstr "Anglais"
msgid "French"
msgstr "Français"
#: sith/settings.py:350
#: sith/settings.py:351
msgid "TC"
msgstr "TC"
#: sith/settings.py:351
#: sith/settings.py:352
msgid "IMSI"
msgstr "IMSI"
#: sith/settings.py:352
#: sith/settings.py:353
msgid "IMAP"
msgstr "IMAP"
#: sith/settings.py:353
#: sith/settings.py:354
msgid "INFO"
msgstr "INFO"
#: sith/settings.py:354
#: sith/settings.py:355
msgid "GI"
msgstr "GI"
#: sith/settings.py:355 sith/settings.py:439
#: sith/settings.py:356 sith/settings.py:440
msgid "E"
msgstr "E"
#: sith/settings.py:356
#: sith/settings.py:357
msgid "EE"
msgstr "EE"
#: sith/settings.py:357
#: sith/settings.py:358
msgid "GESC"
msgstr "GESC"
#: sith/settings.py:358
#: sith/settings.py:359
msgid "GMC"
msgstr "GMC"
#: sith/settings.py:359
#: sith/settings.py:360
msgid "MC"
msgstr "MC"
#: sith/settings.py:360
#: sith/settings.py:361
msgid "EDIM"
msgstr "EDIM"
#: sith/settings.py:361
#: sith/settings.py:362
msgid "Humanities"
msgstr "Humanités"
#: sith/settings.py:362
#: sith/settings.py:363
msgid "N/A"
msgstr "N/A"
#: sith/settings.py:366 sith/settings.py:373 sith/settings.py:390
#: sith/settings.py:367 sith/settings.py:374 sith/settings.py:391
msgid "Check"
msgstr "Chèque"
#: sith/settings.py:367 sith/settings.py:375 sith/settings.py:391
#: sith/settings.py:368 sith/settings.py:376 sith/settings.py:392
msgid "Cash"
msgstr "Espèces"
#: sith/settings.py:368
#: sith/settings.py:369
msgid "Transfert"
msgstr "Virement"
#: sith/settings.py:381
#: sith/settings.py:382
msgid "Belfort"
msgstr "Belfort"
#: sith/settings.py:382
#: sith/settings.py:383
msgid "Sevenans"
msgstr "Sevenans"
#: sith/settings.py:383
#: sith/settings.py:384
msgid "Montbéliard"
msgstr "Montbéliard"
#: sith/settings.py:409
#: sith/settings.py:410
msgid "Free"
msgstr "Libre"
#: sith/settings.py:410
#: sith/settings.py:411
msgid "CS"
msgstr "CS"
#: sith/settings.py:411
#: sith/settings.py:412
msgid "TM"
msgstr "TM"
#: sith/settings.py:412
#: sith/settings.py:413
msgid "OM"
msgstr "OM"
#: sith/settings.py:413
#: sith/settings.py:414
msgid "QC"
msgstr "QC"
#: sith/settings.py:414
#: sith/settings.py:415
msgid "EC"
msgstr "EC"
#: sith/settings.py:415
#: sith/settings.py:416
msgid "RN"
msgstr "RN"
#: sith/settings.py:416
#: sith/settings.py:417
msgid "ST"
msgstr "ST"
#: sith/settings.py:417
#: sith/settings.py:418
msgid "EXT"
msgstr "EXT"
#: sith/settings.py:422
#: sith/settings.py:423
msgid "Autumn"
msgstr "Automne"
#: sith/settings.py:423
#: sith/settings.py:424
msgid "Spring"
msgstr "Printemps"
#: sith/settings.py:424
#: sith/settings.py:425
msgid "Autumn and spring"
msgstr "Automne et printemps"
#: sith/settings.py:430
#: sith/settings.py:431
msgid "German"
msgstr "Allemant"
#: sith/settings.py:431
#: sith/settings.py:432
msgid "Spanich"
msgstr "Espagnol"
#: sith/settings.py:435
#: sith/settings.py:436
msgid "A"
msgstr "A"
#: sith/settings.py:436
#: sith/settings.py:437
msgid "B"
msgstr "B"
#: sith/settings.py:437
#: sith/settings.py:438
msgid "C"
msgstr "C"
#: sith/settings.py:438
#: sith/settings.py:439
msgid "D"
msgstr "D"
#: sith/settings.py:440
#: sith/settings.py:441
msgid "FX"
msgstr "FX"
#: sith/settings.py:441
#: sith/settings.py:442
msgid "F"
msgstr "F"
#: sith/settings.py:442
#: sith/settings.py:443
msgid "Abs"
msgstr "Abs"
#: sith/settings.py:471
#: sith/settings.py:472
msgid "One semester"
msgstr "Un semestre, 15 €"
#: sith/settings.py:472
#: sith/settings.py:473
msgid "Two semesters"
msgstr "Deux semestres, 28 €"
#: sith/settings.py:474
#: sith/settings.py:475
msgid "Common core cursus"
msgstr "Cursus tronc commun, 45 €"
#: sith/settings.py:478
#: sith/settings.py:479
msgid "Branch cursus"
msgstr "Cursus branche, 45 €"
#: sith/settings.py:479
#: sith/settings.py:480
msgid "Alternating cursus"
msgstr "Cursus alternant, 30 €"
#: sith/settings.py:480
#: sith/settings.py:481
msgid "Honorary member"
msgstr "Membre honoraire, 0 €"
#: sith/settings.py:481
#: sith/settings.py:482
msgid "Assidu member"
msgstr "Membre d'Assidu, 0 €"
#: sith/settings.py:482
#: sith/settings.py:483
msgid "Amicale/DOCEO member"
msgstr "Membre de l'Amicale/DOCEO, 0 €"
#: sith/settings.py:483
#: sith/settings.py:484
msgid "UT network member"
msgstr "Cotisant du réseau UT, 0 €"
#: sith/settings.py:484
#: sith/settings.py:485
msgid "CROUS member"
msgstr "Membres du CROUS, 0 €"
#: sith/settings.py:485
#: sith/settings.py:486
msgid "Sbarro/ESTA member"
msgstr "Membre de Sbarro ou de l'ESTA, 15 €"
#: sith/settings.py:487
#: sith/settings.py:488
msgid "One semester Welcome Week"
msgstr "Un semestre Welcome Week"
#: sith/settings.py:491
#: sith/settings.py:492
msgid "Two months for free"
msgstr "Deux mois gratuits"
#: sith/settings.py:492
#: sith/settings.py:493
msgid "Eurok's volunteer"
msgstr "Bénévole Eurockéennes"
#: sith/settings.py:494
#: sith/settings.py:495
msgid "Six weeks for free"
msgstr "6 semaines gratuites"
#: sith/settings.py:498
#: sith/settings.py:499
msgid "One day"
msgstr "Un jour"
#: sith/settings.py:501
#: sith/settings.py:502
msgid "One semester (-20%)"
msgstr "Un semestre (-20%), 12 €"
#: sith/settings.py:506
#: sith/settings.py:507
msgid "Two semesters (-20%)"
msgstr "Deux semestres (-20%), 22 €"
#: sith/settings.py:511
#: sith/settings.py:512
msgid "Common core cursus (-20%)"
msgstr "Cursus tronc commun (-20%), 36 €"
#: sith/settings.py:516
#: sith/settings.py:517
msgid "Branch cursus (-20%)"
msgstr "Cursus branche (-20%), 36 €"
#: sith/settings.py:521
#: sith/settings.py:522
msgid "Alternating cursus (-20%)"
msgstr "Cursus alternant (-20%), 24 €"
#: sith/settings.py:543
#: sith/settings.py:544
msgid "President"
msgstr "Président"
#: sith/settings.py:544
#: sith/settings.py:545
msgid "Vice-President"
msgstr "Vice-Président"
#: sith/settings.py:545
#: sith/settings.py:546
msgid "Treasurer"
msgstr "Trésorier"
#: sith/settings.py:546
#: sith/settings.py:547
msgid "Communication supervisor"
msgstr "Responsable communication"
#: sith/settings.py:547
#: sith/settings.py:548
msgid "Secretary"
msgstr "Secrétaire"
#: sith/settings.py:548
#: sith/settings.py:549
msgid "IT supervisor"
msgstr "Responsable info"
#: sith/settings.py:549
#: sith/settings.py:550
msgid "Board member"
msgstr "Membre du bureau"
#: sith/settings.py:550
#: sith/settings.py:551
msgid "Active member"
msgstr "Membre actif"
#: sith/settings.py:551
#: sith/settings.py:552
msgid "Curious"
msgstr "Curieux"
#: sith/settings.py:587
#: sith/settings.py:588
msgid "A new poster needs to be moderated"
msgstr "Une nouvelle affiche a besoin d'être modérée"
#: sith/settings.py:588
#: sith/settings.py:589
msgid "A new mailing list needs to be moderated"
msgstr "Une nouvelle mailing list a besoin d'être modérée"
#: sith/settings.py:591
#: sith/settings.py:592
msgid "A new pedagogy comment has been signaled for moderation"
msgstr ""
"Un nouveau commentaire de la pédagogie a été signalé pour la modération"
#: sith/settings.py:593
#: sith/settings.py:594
#, python-format
msgid "There are %s fresh news to be moderated"
msgstr "Il y a %s nouvelles toutes fraîches à modérer"
#: sith/settings.py:594
#: sith/settings.py:595
msgid "New files to be moderated"
msgstr "Nouveaux fichiers à modérer"
#: sith/settings.py:595
#: sith/settings.py:596
#, python-format
msgid "There are %s pictures to be moderated in the SAS"
msgstr "Il y a %s photos à modérer dans le SAS"
#: sith/settings.py:596
#: sith/settings.py:597
msgid "You've been identified on some pictures"
msgstr "Vous avez été identifié sur des photos"
#: sith/settings.py:597
#: sith/settings.py:598
#, python-format
msgid "You just refilled of %s €"
msgstr "Vous avez rechargé votre compte de %s€"
#: sith/settings.py:598
#: sith/settings.py:599
#, python-format
msgid "You just bought %s"
msgstr "Vous avez acheté %s"
#: sith/settings.py:599
#: sith/settings.py:600
msgid "You have a notification"
msgstr "Vous avez une notification"
#: sith/settings.py:611
#: sith/settings.py:612
msgid "Success!"
msgstr "Succès !"
#: sith/settings.py:612
#: sith/settings.py:613
msgid "Fail!"
msgstr "Échec !"
#: sith/settings.py:613
#: sith/settings.py:614
msgid "You successfully posted an article in the Weekmail"
msgstr "Article posté avec succès dans le Weekmail"
#: sith/settings.py:614
#: sith/settings.py:615
msgid "You successfully edited an article in the Weekmail"
msgstr "Article édité avec succès dans le Weekmail"
#: sith/settings.py:615
#: sith/settings.py:616
msgid "You successfully sent the Weekmail"
msgstr "Weekmail envoyé avec succès"
#: sith/settings.py:623
#: sith/settings.py:624
msgid "AE tee-shirt"
msgstr "Tee-shirt AE"
......@@ -6100,6 +6100,9 @@ msgstr "Vous ne pouvez plus écrire de commentaires, la date est passée."
msgid "Maximum characters: %(max_length)s"
msgstr "Nombre de caractères max: %(max_length)s"
#~ msgid "Sex"
#~ msgstr "Sexe"
#~ msgid "ENERGIE"
#~ msgstr "ENERGIE"
......
......@@ -43,7 +43,6 @@
{{ form.phone.errors }}
<label for="{{ form.phone.id_for_label }}">{{ form.phone.label }}</label>
{{ form.phone }}
{{ form.sex.as_hidden() }}
<p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
</p>
</form>
......@@ -53,7 +52,6 @@
<p>
{{ form.quick.errors }}
<label for="{{ form.quick.id_for_label }}">{{ form.quick.label }}</label>
{{ form.sex.as_hidden() }}
{{ form.quick }}
<p><input type="submit" value="{% trans %}Search{% endtrans %}" /></p>
</p>
......
......@@ -69,17 +69,6 @@ class SearchForm(forms.ModelForm):
"phone": PhoneNumberInternationalFallbackWidget,
}
sex = forms.ChoiceField(
choices=[
("MAN", _("Man")),
("WOMAN", _("Woman")),
("INDIFFERENT", _("Indifferent")),
],
widget=forms.RadioSelect,
initial="INDIFFERENT",
label=_("Sex"),
)
quick = forms.CharField(label=_("Last/First name or nickname"), max_length=255)
def __init__(self, *args, **kwargs):
......@@ -150,7 +139,7 @@ class SearchFormListView(FormerSubscriberMixin, SingleObjectMixin, ListView):
search_dict = {}
for key, value in self.valid_form.items():
if key not in ("phone", "quick") and not (
value == "" or value is None or value == "INDIFFERENT"
value == "" or value is None
):
search_dict[key + "__icontains"] = value
q = q.filter(**search_dict).all()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment