several bug fixes related to makeups (+cleaning)

members/admin.py

@@ -391,8 +391,8 @@ def update_members_makeups(request):
         # Perform checks and compute some data in a loop on members.
         cs = CagetteShift()
         api = OdooAPI()
-        unsubscription_limit = api.get_system_param('lacagette_membership.points_limit_to_get_unsubscribed')
-        error = []
+        unsubscription_limit = int(api.get_system_param('lacagette_membership.points_limit_to_get_unsubscribed'))
+        error = {}
         for member_data in members_data:
             cm = CagetteMember(int(member_data["member_id"]))
             target_makeups_nb = int(member_data["target_makeups_nb"])
@@ -417,7 +417,7 @@ def update_members_makeups(request):
                                   "associé.")
                 return JsonResponse(error, status=400)
             # Save computed data in member_data. It will be useful to update makeups and points.
-            members_data[member_data["member_id"]]["points_diff"] = - makeup_change_count
+            member_data["points_diff"] = - makeup_change_count
 
         # Update makeups and points
         res["res"] = []
@@ -466,6 +466,9 @@ def update_members_makeups_core(members_data, res = None):
             # (and this triggers status update in odoo).
             if res:
                 res["res"].append(update_makeups_res)
+        else:
+            if res:
+                res["res"].append({'mid': int(member_data["member_id"])})
 
         data = {
             'name': "Admin BDM - " + member_data["description"],
@@ -806,7 +809,7 @@ def create_pair(request):
             child_makeups += len(child_scheduled_makeups)
             parent_makeups += parent_scheduled_makeups_length
 
-            unsubscription_limit = api.get_system_param('lacagette_membership.points_limit_to_get_unsubscribed')
+            unsubscription_limit = int(api.get_system_param('lacagette_membership.points_limit_to_get_unsubscribed'))
             min_total_points = unsubscription_limit + 1
             max_total_makeups = - min_total_points
 

members/models.py

@@ -141,7 +141,7 @@ class CagetteMember(models.Model):
         res = self.o_api.search_read('res.partner', cond, fields)
 
         if res and len(res) == 1:
-            return res[0][points_field]
+            return int(res[0][points_field])
         else:
             return None
 

members/static/js/admin/manage_makeups.js

@@ -339,14 +339,10 @@ function update_members_makeups(member_ids, action, description) {
             closeModal();
         },
         error: function(data) {
-            err = {msg: "erreur serveur pour incrémenter ou décrémenter les rattrapages", ctx: 'update_members_makeups'};
-            if (typeof data.responseJSON != 'undefined' && typeof data.responseJSON.error != 'undefined') {
-                err.msg += ' : ' + data.responseJSON.error;
-            }
+            err = {msg: data.responseJSON.error, ctx: 'update_members_makeups'};
             report_JS_error(err, 'members_admin-manage_makeups');
-
             closeModal();
-            alert('Erreur serveur pour incrémenter ou décrémenter les rattrapages. Veuillez contacter le service informatique.');
+            alert(data.responseJSON.error);
         }
     });
 }

members/urls.py

@@ -71,7 +71,6 @@ urlpatterns = [
     url(r'^admin/manage_attached/create_pair$', admin.create_pair),
     url(r'^admin/manage_attached/delete_pair$', admin.delete_pair),
     url(r'^get_makeups_members$', admin.get_makeups_members),
-    url(r'^update_members_makeups$', admin.update_members_makeups),
     url(r'^get_member_info/(\d+)$', admin.get_member_info),
     url(r'^get_attached_members$', admin.get_attached_members),
     # External login 

shifts/models.py

@@ -357,7 +357,7 @@ class CagetteShift(models.Model):
     def get_member_makeups_to_do(self, partner_id):
         cond = [['id', '=', partner_id]]
         fields = ['makeups_to_do']
-        return self.o_api.search_read('res.partner', cond, fields)[0]["makeups_to_do"]
+        return int(self.o_api.search_read('res.partner', cond, fields)[0]["makeups_to_do"])
 
 
     def update_counter_event(self, fields):