Merge branch '3878-reception-terminal-status' into 'dev_cooperatic'

3878-reception-terminal-status

See merge request !203

members/models.py

@@ -724,6 +724,10 @@ class CagetteMember(models.Model):
             fr_state = 'A jour'
         elif coop_state == 'exempted':
             fr_state = 'Exempté(e)'
+        elif coop_state == 'associated':
+            fr_state = 'En binôme'
+        elif coop_state == 'gone':
+            fr_state = 'Parti(e)'
         else:
             fr_state = 'Inconnu'
         return fr_state
@@ -793,6 +797,7 @@ class CagetteMember(models.Model):
             cond.append(['is_associated_people', '=', True])
         else:
             cond.append(['is_associated_people', '=', False])
+        cond.append(['cooperative_state', '!=', 'associated'])
         # cond.append(['cooperative_state', '!=', 'unsubscribed'])
         if search_type == "full" or search_type == 'members' or search_type == "manage_shift_registrations":
             fields = CagetteMember.m_default_fields

members/static/js/members.js

@@ -106,7 +106,7 @@ function fill_member_slide(member) {
 
         html_elts.status_explanation.html(explanation);
     }
-    if (member.cooperative_state == 'Désinscrit(e)') coop_info.addClass('b_red');
+    if (member.cooperative_state == 'Désinscrit(e)' || member.cooperative_state == 'Parti(e)') coop_info.addClass('b_red');
     else if (member.cooperative_state == 'En alerte' || member.cooperative_state == 'Délai accordé' || member.cooperative_state == 'Rattrapage') coop_info.addClass('b_orange');
 
     if (member.shifts.length > 0) {