From 4075f6cf7814689a8acf22d14ab11ebaf5a65121 Mon Sep 17 00:00:00 2001
From: Emmy D'Anello <emmy.danello@animath.fr>
Date: Mon, 20 Feb 2023 00:38:57 +0100
Subject: [PATCH] Add vaccine sheet field, closes #18

---
 apps/registration/tables.py                         |  2 +-
 .../templates/registration/user_detail.html         | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

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 %}
                     <dd class="col-sm-6"><a href="mailto:{{ email }}">{{ email }}</a></dd>
                 {% endwith %}
-            {% elif user_object.registration.is_admin %}
-                <dt class="col-sm-6 text-right">{% trans "Admin:" %}</dt>
-                <dd class="col-sm-6">{{ user_object.registration.is_admin|yesno }}</dd>
             {% elif user_object.registration.coachregistration or user_object.registration.is_volunteer %}
                 <dt class="col-sm-6 text-right">{% trans "Profesional activity:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.professional_activity }}</dd>
+
+                {% if user_object.registration.is_volunteer %}
+                    <dt class="col-sm-6 text-right">{% trans "Admin:" %}</dt>
+                    <dd class="col-sm-6">{{ user_object.registration.is_admin|yesno }}</dd>
+                {% endif %}
             {% endif %}
 
             <dt class="col-sm-6 text-right">{% trans "Grant Animath to contact me in the future about other actions:" %}</dt>
@@ -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())