1
0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-28 20:33:00 +02:00

Replace ... by …

Signed-off-by: Emmy D'ANELLO <ynerant@crans.org>
This commit is contained in:
2022-08-29 11:17:17 +02:00
parent a69573ccdb
commit 3306aed6dc
36 changed files with 92 additions and 92 deletions

View File

@ -45,7 +45,7 @@ class WEIRegistrationForm(forms.ModelForm):
attrs={
'api_url': '/api/user/',
'name_field': 'username',
'placeholder': 'Nom ...',
'placeholder': 'Nom ',
},
),
"birth_date": DatePickerInput(options={'minDate': '1900-01-01',
@ -130,14 +130,14 @@ class WEIMembershipForm(forms.ModelForm):
Bus,
attrs={
'api_url': '/api/wei/bus/',
'placeholder': 'Bus ...',
'placeholder': 'Bus',
}
),
"team": Autocomplete(
BusTeam,
attrs={
'api_url': '/api/wei/team/',
'placeholder': 'Équipe ...',
'placeholder': 'Équipe',
},
resetable=True,
),
@ -167,7 +167,7 @@ class BusForm(forms.ModelForm):
WEIClub,
attrs={
'api_url': '/api/wei/club/',
'placeholder': 'WEI ...',
'placeholder': 'WEI',
},
),
}
@ -182,7 +182,7 @@ class BusTeamForm(forms.ModelForm):
Bus,
attrs={
'api_url': '/api/wei/bus/',
'placeholder': 'Bus ...',
'placeholder': 'Bus',
},
),
"color": ColorWidget(),

View File

@ -153,7 +153,7 @@ class BusTeam(models.Model):
class WEIRole(Role):
"""
A Role for the WEI can be bus chief, team chief, free electron, ...
A Role for the WEI can be bus chief, team chief, free electron,
"""
class Meta:
@ -258,7 +258,7 @@ class WEIRegistration(models.Model):
@property
def information(self):
"""
The information about the registration (the survey for the new members, the bus for the older members, ...)
The information about the registration (the survey for the new members, the bus for the older members,)
are stored in a dictionary that can evolve following the years. The dictionary is stored as a JSON string.
"""
return json.loads(self.information_json)

View File

@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block profile_content %}
<div class="card">
<div class="card-body">
<input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/bus/équipe ...">
<input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/bus/équipe">
<hr>
<div id="memberships_table">
@ -24,7 +24,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="card-footer text-center">
<a href="{% url 'wei:wei_registrations' pk=club.pk %}">
<button class="btn btn-block btn-info">{% trans "View unvalidated registrations..." %}</button>
<button class="btn btn-block btn-info">{% trans "View unvalidated registrations" %}</button>
</a>
<hr>
<a href="{% url 'wei:wei_memberships_pdf' wei_pk=club.pk %}" data-turbolinks="false">

View File

@ -8,7 +8,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block profile_content %}
<div class="card">
<div class="card-body">
<input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
<input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note">
<hr>
<div id="registrations_table">
@ -24,7 +24,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
<div class="card-footer text-center">
<a href="{% url 'wei:wei_memberships' pk=club.pk %}">
<button class="btn btn-block btn-info">{% trans "View validated memberships..." %}</button>
<button class="btn btn-block btn-info">{% trans "View validated memberships" %}</button>
</a>
</div>
</div>

View File

@ -1235,7 +1235,7 @@ class WEIAttributeBus1ANextView(LoginRequiredMixin, RedirectView):
raise Http404
wei = wei.get()
qs = WEIRegistration.objects.filter(wei=wei, membership__isnull=False, membership__bus__isnull=True)
qs = qs.filter(information_json__contains='selected_bus_pk') # not perfect, but works...
qs = qs.filter(information_json__contains='selected_bus_pk') # not perfect, but works
if qs.exists():
return reverse_lazy('wei:wei_bus_1A', args=(qs.first().pk, ))
return reverse_lazy('wei:wei_1A_list', args=(wei.pk, ))