Fixes for event management (#792)

* Clarify label

* More attendance table sort options

* Fix leader not being able to remove themselves

Author: gdaviet

collectives/models/event/role.py

@@ -95,15 +95,14 @@ def has_delete_rights(self, user: User) -> bool:
 
         return user.is_moderator() or self.is_supervisor(user)
 
-    def can_remove_leader(self, user: User, leader: User) -> bool:
+    def can_remove_leader(self, leader: User) -> bool:
         """
         Checks if an user may remove a leader from this event.
 
-        True if user has edit rights on this event, and the leader
-        is not the "main" leader
+        True if the leader is not the "main" leader
         """
 
-        return self.has_edit_rights(user) and leader.id != self.main_leader_id
+        return leader.id != self.main_leader_id
 
     def coleaders(self):
         """

collectives/routes/event.py

@@ -286,6 +286,12 @@ def view_event(event_id, name=""):
         payment_item_choice_form=payment_item_choice_form,
         question_form=question_form,
         sort_key=request.args.get("sort_key", "id"),
+        possible_sort_keys={
+            "user.last_name,user.first_name": "nom",
+            "user.first_name,user.last_name": "prénom",
+            "status,id": "statut",
+            "id": "ordre d'inscription",
+        },
     )
 
 
@@ -478,7 +484,7 @@ def _postvalidate_leaders_and_activities(
     # Check that we have not removed leaders that we don't have the right to
     removed_leaders = existing_leaders_set - new_leaders_set
     for removed_leader in removed_leaders:
-        if not event.can_remove_leader(current_user, removed_leader):
+        if not event.can_remove_leader(removed_leader):
             flash(
                 f"Impossible de supprimer l'encadrant: {removed_leader.full_name()}",
                 "error",

collectives/templates/event/editevent.html

@@ -187,7 +187,7 @@ <h4 class="heading-4">Informations</h4>
     </div>
     <div class="inline_field">
       {{form.include_leaders_in_counts}}
-      <label for="include_leaders_in_counts">Compter les encadrants dans les nombres max. de participants</label>
+      <label for="include_leaders_in_counts">Compter les encadrants de l'événement dans les nombres max. de participants</label>
     </div>
 
     <div class="dates">

collectives/templates/event/partials/admin.html

@@ -156,11 +156,15 @@ <h5 class="heading-5 collective-display--administration-title"> Liste des prése
             <thead>
                 <tr>
                     <th>
-        {%if sort_key == "id"%}
-            <a href="{{url_for('event.view_event', event_id=event.id, sort_key='user.first_name,user.last_name')}}#attendancelist" >Trier par nom</a>
-        {%else%}
-            <a href="{{url_for('event.view_event', event_id=event.id)}}#attendancelist" >Trier par ordre d'inscription</a>
-        {%endif%}
+                        Trier par :
+                        {%for key, key_name in possible_sort_keys.items()%}
+                            {%if key == sort_key%}
+                                {{key_name}}
+                            {%else%}
+                                <a href="{{url_for('event.view_event', event_id=event.id, sort_key=key)}}#attendancelist" >{{key_name}}</a>
+                            {%endif%}
+                            {% if not loop.last %} | {%endif%}
+                        {% endfor %}
                     </th>
                 </tr>
             </thead>