prevent cancelling makeup from borne d'accueil in connected mode as point…

prevent cancelling makeup from borne d'accueil in connected mode as point decrementation does not work and therefore leads to bugs

members/static/js/members.js

@@ -578,8 +578,12 @@ function cancel_service_presence(mid, rid) {
         post_form(
             '/members/service_presence/',
             {'mid': mid, 'rid': rid, 'sid': sid, 'stid' : 0, 'cancel': true},
-            function(err) {
-                if (!err) {
+            function(err, response) {
+                if(err) {
+                    alert("Erreur inconnue")
+                } else if(response.res.error) {
+                        alert(response.res.error);
+                } else {
                     get_service_entry_data();
                 }
                 loading2.hide();

members/views.py

@@ -5,7 +5,7 @@ from outils.for_view_imports import *
 from members.models import CagetteMember
 from members.models import CagetteUser
 from members.models import CagetteMembers
-from shifts.models import CagetteServices, CagetteService
+from shifts.models import CagetteServices, CagetteService, CagetteShift
 from outils.forms import GenericExportMonthForm
 
 import datetime
@@ -321,6 +321,7 @@ def services_at_time(request, time, tz_offset):
 
 def record_service_presence(request):
     """Record service presence."""
+    cs = CagetteShift()
     res = {}
     try:
         rid = int(request.POST.get("rid", -1))  # registration id
@@ -364,8 +365,11 @@ def record_service_presence(request):
                         del m['shifts']
                         m['next_shift'] = next_shift
                     res['member'] = m
-            else: CagetteServices.reopen_registration(rid, overrided_date)
-                
+            elif cs.shift_is_makeup(rid):
+                res['error'] = "L'annulation d'une présence à un service de rattrapage depuis la borne d'accueil n'est pas supportée."
+                return JsonResponse({'res': res})
+            else:
+                CagetteServices.reopen_registration(rid, overrided_date)
     except Exception as e:
         res['error'] = str(e)
         coop_logger.error("Erreur record_service_presence : %s", str(e))