diff --git a/apps/registration/tables.py b/apps/registration/tables.py index 770279b..fa89fe1 100644 --- a/apps/registration/tables.py +++ b/apps/registration/tables.py @@ -19,7 +19,7 @@ class RegistrationTable(tables.Table): ) def order_type(self, queryset, desc): - types = ["-volunteerregistration__admin", "volunteerregistration", "participantregistration"] + types = ["volunteerregistration", "-volunteerregistration__admin", "participantregistration"] return queryset.order_by(*(("-" if desc else "") + t for t in types)), True class Meta: diff --git a/apps/registration/templates/registration/user_detail.html b/apps/registration/templates/registration/user_detail.html index 54af4b2..0ea24a6 100644 --- a/apps/registration/templates/registration/user_detail.html +++ b/apps/registration/templates/registration/user_detail.html @@ -116,12 +116,14 @@ {% with user_object.registration.responsible_email as email %}
{{ email }}
{% endwith %} - {% elif user_object.registration.is_admin %} -
{% trans "Admin:" %}
-
{{ user_object.registration.is_admin|yesno }}
{% elif user_object.registration.coachregistration or user_object.registration.is_volunteer %}
{% trans "Profesional activity:" %}
{{ user_object.registration.professional_activity }}
+ + {% if user_object.registration.is_volunteer %} +
{% trans "Admin:" %}
+
{{ user_object.registration.is_admin|yesno }}
+ {% endif %} {% endif %}
{% trans "Grant Animath to contact me in the future about other actions:" %}
@@ -219,6 +221,11 @@ if (!modalBody.html().trim()) modalBody.load("{% url "registration:upload_user_health_sheet" pk=user_object.registration.pk %} #form-content"); }); + $('button[data-target="#uploadVaccineSheetModal"]').click(function() { + let modalBody = $("#uploadVaccineSheetModal div.modal-body"); + if (!modalBody.html().trim()) + modalBody.load("{% url "registration:upload_user_vaccine_sheet" pk=user_object.registration.pk %} #form-content"); + }); $('button[data-target="#uploadParentalAuthorizationModal"]').click(function() { let modalBody = $("#uploadParentalAuthorizationModal div.modal-body"); if (!modalBody.html().trim())