bdm admin: fix pts display issue when adding makeups to member

members/models.py

@@ -820,6 +820,11 @@ class CagetteMember(models.Model):
                         members.append(m)
 
             return CagetteMember.add_next_shifts_to_members(members)
+        elif search_type == "makeups_data":
+            fields = CagetteMember.m_short_default_fields
+            fields = fields + ['shift_type', 'makeups_to_do', 'display_ftop_points', 'display_std_points', 'shift_type']
+            return api.search_read('res.partner', cond, fields)
+              
         elif search_type == "shift_template_data":
             fields = CagetteMember.m_short_default_fields
             fields = fields + ['id', 'makeups_to_do', 'cooperative_state']

members/static/js/admin/manage_makeups.js

@@ -253,7 +253,9 @@ function update_members_makeups(member_ids, action) {
         data.push({
             member_id: mid,
             target_makeups_nb: makeups_members[member_index].makeups_to_do,
-            member_shift_type: makeups_members[member_index].shift_type
+            member_shift_type: makeups_members[member_index].shift_type,
+            display_ftop_points: makeups_members[member_index].display_ftop_points,
+            display_std_points: makeups_members[member_index].display_std_points
         });
     }
 
@@ -324,7 +326,9 @@ function display_possible_members() {
                         id: member.id,
                         name: member.name,
                         makeups_to_do: 0,
-                        shift_type: member.shift_type
+                        shift_type: member.shift_type,
+                        display_std_points: member.display_std_points,
+                        display_ftop_points: member.display_ftop_points
                     });
 
                     openModal(
@@ -375,16 +379,11 @@ $(document).ready(function() {
         let search_str = $('#search_member_input').val();
 
         $.ajax({
-            url: '/members/search/' + search_str,
+            url: '/members/search/' + search_str +'?search_type=makeups_data',
             dataType : 'json',
             success: function(data) {
                 members_search_results = [];
-
-                for (member of data.res) {
-                    if (member.is_member || member.is_associated_people) {
-                        members_search_results.push(member);
-                    }
-                }
+                members_search_results = data.res;
 
                 display_possible_members();
             },