Merge branch '2387-member-points' into 'dev_cooperatic'

2387 member points

See merge request !142

members/models.py

@@ -1146,7 +1146,7 @@ class CagetteMembers(models.Model):
     def get_makeups_members():
         api = OdooAPI()
         cond = [['makeups_to_do','>', 0]]
-        fields = ['id', 'name', 'makeups_to_do','shift_type']
+        fields = ['id', 'name', 'display_std_points', 'display_ftop_points', 'shift_type', 'makeups_to_do']
         res = api.search_read('res.partner', cond, fields)
         return res
 

members/static/js/admin/manage_makeups.js

@@ -69,6 +69,19 @@ function display_makeups_members() {
                 title: "Nom"
             },
             {
+                data: "shift_type",
+                title: "Nb de points",
+                className: "dt-body-center",
+                width: "10%",
+                render: function (data, type, row) {
+                    if (data == 'ftop') {
+                        return row.display_ftop_points
+                    } else if (data == 'standard') {
+                        return row.display_std_points 
+                    }
+                }
+            },
+            {
                 data: "makeups_to_do",
                 title: "Nb rattrapages",
                 className: "dt-body-center",