ynerant/plateforme-tfjm2
1
0
Fork 0
mirror of https://gitlab.com/animath/si/plateforme.git synced 2025-08-16 03:30:01 +02:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:c500a735d84e9bb8bc418fae6e1b0713db272277
Branches Tags
ynerant:dev ynerant:main ynerant:docs
...
compare: ynerant:d4111126c70f77c4f69842f8f7dd5be25176cf67
Branches Tags
ynerant:dev ynerant:main ynerant:docs

3 Commits
c500a735d8 ... d4111126c7

Author SHA1 Message Date
Yohann D'ANELLO
d4111126c7 Download all authorizations -> Download all *submitted* authorizations 2021-01-24 23:42:59 +01:00
Yohann D'ANELLO
8212568fee The user detail page is on a separate page since custom JS can't be loaded 2021-01-24 23:40:05 +01:00
Yohann D'ANELLO
6898e9413a Fix user detail for children 2021-01-24 23:37:55 +01:00
3 changed files with 6 additions and 16 deletions
Expand all files Collapse all files

2
apps/participation/templates/participation/team_detail.html
View File

@@ -103,7 +103,7 @@
<div class="text-center">
<a class="btn btn-info" href="{% url "participation:team_authorizations" pk=team.pk %}" data-turbolinks="false">
<i class="fas fa-file-archive"></i> {% trans "Download all authorizations" %}
<i class="fas fa-file-archive"></i> {% trans "Download all submitted authorizations" %}
</a>
</div>
</div>

16
apps/registration/templates/registration/user_detail.html
View File

@@ -65,8 +65,8 @@
</dd>
{% endif %}
{% if user_object.registration.studentregistration and user_object.registration.participation.tournament and not user_object.registration.participation.tournament.remote %}
{% if user_object.registration.under_18 %}
{% if user_object.registration.studentregistration %}
{% if user_object.registration.under_18 and user_object.registration.team.participation.tournament and not user_object.registration.team.participation.tournament.remote %}
<dt class="col-sm-6 text-right">{% trans "Health sheet:" %}</dt>
<dd class="col-sm-6">
{% if user_object.registration.health_sheet %}
@@ -150,7 +150,7 @@
</div>
{% if user.pk == user_object.pk or user.registration.is_admin %}
<div class="card-footer text-center">
<button class="btn btn-primary" data-toggle="modal" data-target="#updateUserModal">{% trans "Update" %}</button>
<a class="btn btn-primary" href="{% url "registration:update_user" pk=user_object.pk %}">{% trans "Update" %}</a>
{% if user.registration.is_admin %}
<a class="btn btn-info" href="{% url "registration:user_impersonate" pk=user_object.pk %}">{% trans "Impersonate" %}</a>
{% endif %}
@@ -158,11 +158,6 @@
{% endif %}
</div>
{% trans "Update user" as modal_title %}
{% trans "Update" as modal_button %}
{% url "registration:update_user" pk=user_object.pk as modal_action %}
{% include "base_modal.html" with modal_id="updateUser" %}
{% if user_object.registration.team and not user_object.registration.team.participation.valid %}
{% trans "Upload photo authorization" as modal_title %}
{% trans "Upload" as modal_button %}
@@ -196,11 +191,6 @@
{% block extrajavascript %}
<script>
$(document).ready(function() {
$('button[data-target="#updateUserModal"]').click(function() {
let modalBody = $("#updateUserModal div.modal-body");
if (!modalBody.html().trim())
modalBody.load("{% url "registration:update_user" pk=user_object.pk %} #form-content");
});
{% if user_object.registration.team and not user_object.registration.team.participation.valid %}
$('button[data-target="#uploadPhotoAuthorizationModal"]').click(function() {
let modalBody = $("#uploadPhotoAuthorizationModal div.modal-body");

4
locale/fr/LC_MESSAGES/django.po
View File

@@ -794,8 +794,8 @@ msgid "Replace"
msgstr "Remplacer"
#: apps/participation/templates/participation/team_detail.html:106
msgid "Download all authorizations"
msgstr "Télécharger toutes les autorisations"
msgid "Download all submitted authorizations"
msgstr "Télécharger toutes les autorisations soumises"
#: apps/participation/templates/participation/team_detail.html:113
#: apps/participation/templates/participation/team_detail.html:180