Merge branch 'dev_cooperatic' into 2387-member-points

members/models.py

@@ -13,6 +13,7 @@ import pytz
 import locale
 import re
 import dateutil.parser
+from datetime import date
 
 
 
@@ -350,6 +351,23 @@ class CagetteMember(models.Model):
         return answer
 
     @staticmethod
+    def is_associated(id_parent):
+        api = OdooAPI()
+        cond = [['parent_id', '=', int(id_parent)]]
+        fields = ['id','name','parent_id','birthdate']
+        res = api.search_read('res.partner', cond, fields, 10, 0, 'id DESC')
+        already_have_adult_associated = False
+        for partner in res:
+            birthdate = partner['birthdate']
+            if(birthdate):
+                today = date.today()
+                date1 = datetime.datetime.strptime(birthdate, "%Y-%m-%d")
+                age = today.year - date1.year - ((today.month, today.day) < (date1.month, date1.day))
+                if age > 17 :
+                    already_have_adult_associated = True
+        return already_have_adult_associated
+
+    @staticmethod
     def finalize_coop_creation(post_data):
         """ Update coop data. """
         res = {}
@@ -505,13 +523,36 @@ class CagetteMember(models.Model):
                                 m.create_capital_subscription_invoice(post_data['shares_euros'], today)
                             res['bc'] = m.generate_base_and_barcode(post_data)
 
-                            # Create shift suscription
-                            shift_template = json.loads(post_data['shift_template'])
-                            shift_t_id = shift_template['data']['id']
-                            stype = shift_template['data']['type']
-                            res['shift'] = \
-                                m.create_coop_shift_subscription(shift_t_id, stype)
-                            # m.add_first_point(stype) # Not needed anymore
+                            # if the new member is associated with an already existing member 
+                            # then we put the state in "associated" and we create the "associated" member
+                            if 'is_associated_people' in post_data and 'parent_id' in post_data :
+                                fields = {}
+                                fields['cooperative_state'] = 'associated'
+                                api.update('res.partner', [partner_id], fields)
+                                associated_member = {
+                                    'email': post_data['_id'],
+                                    'name': name,
+                                    'birthdate': birthdate,
+                                    'sex': sex,
+                                    'street': post_data['address'],
+                                    'zip': post_data['zip'],
+                                    'city': post_data['city'],
+                                    'phone': format_phone_number(post_data['mobile']), # Because list view default show Phone and people mainly gives mobile
+                                    'barcode_rule_id': settings.COOP_BARCODE_RULE_ID,
+                                    'parent_id' : post_data['parent_id'],
+                                    'is_associated_people': True
+                                    }
+                                associated_member_id = api.create('res.partner', associated_member)
+                            # If it's an new associated member with a new partner. Link will be made by the user in BDM/admin
+                            # We add the associated member to the "associate" shift template so we can find them in Odoo
+                            elif 'is_associated_people' not in post_data or 'is_associated_people' in post_data and 'parent_id' not in post_data:
+                                # Create shift suscription if is not associated
+                                shift_template = json.loads(post_data['shift_template'])
+                                shift_t_id = shift_template['data']['id']
+                                stype = shift_template['data']['type']
+                                res['shift'] = \
+                                    m.create_coop_shift_subscription(shift_t_id, stype)
+                                # m.add_first_point(stype) # Not needed anymore
 
                             # Update couchdb do with new data
                             try:
@@ -864,6 +905,19 @@ class CagetteMember(models.Model):
 
         return res
 
+    def update_extra_shift_done(self, value):
+        api = OdooAPI()
+        res = {}
+
+        f = { 'extra_shift_done': value }
+        res_item = api.update('res.partner', [self.id], f)
+        res = {
+            'mid': self.id,
+            'update': res_item
+        }
+
+        return res
+
 class CagetteMembers(models.Model):
     """Class to manage operations on all members or part of them."""
 

members/static/css/inscriptions.css

@@ -26,3 +26,51 @@
 #mail_generation {position:absolute; bottom:30px;}
 
 #sex {padding: 0;}
+
+#existing_partner{
+    padding-right: 15px;
+    width: 45%;
+}
+#new_partner{
+    padding-left: 15px;
+    width: 45%;
+}
+#add_binome{
+    cursor: pointer;
+    text-decoration: underline;
+    font-weight: bold;
+}
+
+#existing_member_choice, #new_member_choice{
+    border: 1px solid black;
+    width: 40%;
+    cursor: pointer;
+    text-align: center;
+    max-width: 400px;
+    background-color: #e7e9ed;
+    color: black;
+    padding: 1rem 1.5rem;
+}
+#existing_member_choice:hover, #new_member_choice:hover{
+    background-color: #ccc;
+}
+
+
+
+.choice_active{
+    background-color: #0275d8 !important;
+    color: white !important;
+
+}
+
+#existing_member_choice{
+    margin-right: 15px;
+}
+
+.choice_button_area{
+    margin-bottom: 10px;
+}
+
+#associate_area{
+    margin-bottom: 15px;
+}
\ No newline at end of file

members/static/js/subscription_common.js

@@ -32,6 +32,15 @@ function display_current_coop_form() {
     let street2_input = form.find('[name="street2"]'),
         phone_input = form.find('[name="phone"]');
 
+    if (current_coop.parent_name) {
+        $('#associated_member').show();
+        if (current_coop.parent_id)
+            $('#associated_member_name').text(current_coop.parent_name);
+        else $('#associated_member_name').text(current_coop.parent_name + " ATTENTION à faire manuellement");
+    } else {
+        $('#associated_member').hide();
+    }
+
     chgt_shift_btn.hide();
     chgt_shift_btn.off('click', open_shift_choice);
     form.find('[name="firstname"]').val(current_coop.firstname);

members/urls.py

@@ -31,6 +31,7 @@ urlpatterns = [
     url(r'^latest_coop_id/$', views.latest_coop_id),
     url(r'^get/([0-9]+)$', views.get),
     url(r'^exists/([a-zA-Z0-9_\-\.\+@]+)$', views.exists),
+    url(r'^is_associated/([0-9]+)$', views.is_associated),
     url(r'^get_couchdb_odoo_markers/(.+)$', views.get_couchdb_odoo_markers),
     url(r'^menu/$', views.menu),
     url(r'^verify_final_state$', views.verify_final_state),

members/views.py

@@ -63,6 +63,10 @@ def exists(request, mail):
     answer = CagetteMember.exists(mail)
     return JsonResponse({'answer': answer})
 
+def is_associated(request, id_parent):
+    answer = CagetteMember.is_associated(id_parent)
+    return JsonResponse({'answer': answer})
+
 def getmemberimage(request, id):
     m = CagetteMember(id)
     call_res = m.get_image()
@@ -97,7 +101,9 @@ def inscriptions(request, type=1):
                'POUCHDB_VERSION': getattr(settings, 'POUCHDB_VERSION', ''),
                'max_chq_nb': getattr(settings, 'MAX_CHQ_NB', 12),
                'show_ftop_button': getattr(settings, 'SHOW_FTOP_BUTTON', True),
-               'db': settings.COUCHDB['dbs']['member']}
+               'db': settings.COUCHDB['dbs']['member'],
+               'ASSOCIATE_MEMBER_SHIFT' : getattr(settings, 'ASSOCIATE_MEMBER_SHIFT', '')
+               }
 
     response = HttpResponse(template.render(context, request))
     return response

members_space/static/css/members-space-my-info.css

@@ -54,6 +54,13 @@
     margin: 3rem 0;
 }
 
+#my_info .choose_makeups,
+#my_info .unsuscribed_form_link,
+#my_info .remove_future_registration {
+    font-size: 1.8rem;
+    word-break: normal;
+}
+
 #my_info #member_status_action,
 #my_info .member_shift_name_area,
 #my_info .member_coop_number_area {

members_space/static/css/members-space-shifts-exchange.css

@@ -90,6 +90,14 @@
     border-radius: 5px;
 }
 
+.delete_registration_button {
+    justify-content: center;
+    align-items: center;
+    margin: 0.75rem 15px;
+    color: #d9534f;
+    cursor: pointer;
+    display: none;
+}
 
 /* -- Calendar screen, makeups message */
 
@@ -113,6 +121,21 @@
     }
 }
 
+/* -- Calendar screen, can delete registrations message */
+
+#can_delete_future_registrations_area {
+    display: none;
+    align-self: center;
+    margin: 0 1rem 1rem 1rem;
+    padding: 1rem 1.25rem;
+}
+
+#can_delete_future_registrations_area button {
+    white-space: normal;
+    word-break: normal;
+    margin: 1rem;
+}
+
 /* -- Calendar screen, calendar */
 
 #calendar {
@@ -157,6 +180,19 @@ td{
     color: white;
 }
 
+.fc-event.shift_booked_makeup {
+    background-color: #f0ad4e;
+    cursor: auto;
+    border-color: #f0ad4e;
+}
+.fc-event.shift_booked_makeup td {
+    --fc-list-event-hover-bg-color:#f0ad4e;
+}
+
+.fc-list-event.shift_booked_makeup {
+    color: white;
+}
+
 #calendar .fc-list-table {
     table-layout: auto;
 }

members_space/static/css/members-space.css

@@ -166,6 +166,11 @@ body {
     font-size: 1.5rem;
 }
 
+.remove_future_registration {
+    display: none;
+    white-space: normal;
+}
+
 .unsuscribed_form_link {
     display: none;
     text-decoration: none;

members_space/static/js/members-space-faq.js

@@ -20,7 +20,7 @@ function init_faq() {
 }
 
 $(document).on('click', "#shift_exchange_btn", () => {
-        goto('echange-de-services');
+    goto('echange-de-services');
 });
 
 $(document).on('click', '.accordion', function() {

members_space/static/js/members-space-my-shifts.js

@@ -68,8 +68,7 @@ function prepare_server_data(data) {
 
         if (history_item.associate_registered == false || history_item.associate_registered == undefined) {
             history_item.associate_registered = "";
-        }
-        else {
+        } else {
             if (partner_data.associated_partner_id != "False") {
                 if (history_item.associate_registered==="partner") {
                     history_item.associate_registered = partner_data.name;

members_space/static/js/members-space.js

@@ -147,7 +147,7 @@ function prepare_shift_line_template(date_begin) {
 
     shift_line_template.find(".shift_line_date").text(f_date_shift_start);
     shift_line_template.find(".shift_line_time").text(datetime_shift_start.toLocaleTimeString("fr-fr", time_options));
-    
+
     return shift_line_template;
 }
 
@@ -158,6 +158,7 @@ function prepare_shift_line_template(date_begin) {
  */
 function init_my_info_data() {
     $(".choose_makeups").off();
+    $(".remove_future_registration").off();
     $(".unsuscribed_form_link").off();
 
     $(".member_shift_name").text(partner_data.regular_shift_name);
@@ -223,6 +224,13 @@ function init_my_info_data() {
         }
     }
 
+    if (partner_data.extra_shift_done > 0) {
+        $(".remove_future_registration").show();
+        $(".remove_future_registration").on('click', () => {
+            goto('echange-de-services');
+        });
+    }
+
     $(".member_coop_number").text(partner_data.barcode_base);
 }
 
@@ -257,7 +265,7 @@ $(document).ready(function() {
     // debouncing function from John Hann
     // http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
     var debounce = function (func, threshold, execAsap) {
-        var timeout;
+        var timeout = null;
 
         return function debounced () {
             var obj = this, args = arguments;

members_space/urls.py

@@ -12,5 +12,6 @@ urlpatterns = [
     url(r'^faqBDM$', views.faqBDM),
     url(r'^no_content$', views.no_content),
     url(r'^get_shifts_history$', views.get_shifts_history),
+    url(r'^offer_extra_shift$', views.offer_extra_shift),
     url(r'^.*', views.index)  # Urls unknown from the server will redirect to index
 ]

members_space/views.py

@@ -99,6 +99,7 @@ def index(request, exception=None):
                 partnerData["parent_id"] = partnerData["parent_id"][0]
                 md5_calc = hashlib.md5(partnerData['parent_create_date'].encode('utf-8')).hexdigest()
                 partnerData['parent_verif_token'] = md5_calc
+                partnerData['extra_shift_done'] = partnerData["parent_extra_shift_done"]
 
             else:
                 partnerData["parent_name"] = False
@@ -234,4 +235,13 @@ def get_shifts_history(request):
     date_from = getattr(settings, 'START_DATE_FOR_SHIFTS_HISTORY', '2018-01-01')
     res["data"] = m.get_shifts_history(partner_id, limit, offset, date_from)
 
-    return JsonResponse(res)
+    return JsonResponse(res)
\ No newline at end of file
+
+def offer_extra_shift(request):
+    res = {}
+    partner_id = int(request.POST['partner_id'])
+
+    m = CagetteMember(partner_id)
+    res = m.update_extra_shift_done(0)
+
+    return JsonResponse(res)

outils/config.md

@@ -129,6 +129,10 @@
 
         La Cagette use False to implement custom rules
 
+- ASSOCIATE_MEMBER_SHIFT = ''
+
+        Id number of the associate shift template
+
 ### Scales and labels files generation
 
 - DAV_PATH = '/data/dav/cagette'

outils/static/js/common.js

@@ -35,14 +35,15 @@ function get_shift_name(s_data) {
 
     if (s_data && s_data.week) {
         shift_name = weeks_name[s_data.week];
-        if (s_data.type == 2 && typeof manage_ftop != "undefined" && manage_ftop == true) {
+        if (s_data.type == 2 && typeof manage_ftop != "undefined" && manage_ftop == true && s_data.id != ASSOCIATE_MEMBER_SHIFT) {
             shift_name = 'Volant';
+        } else if(s_data.id == ASSOCIATE_MEMBER_SHIFT) {
+            shift_name = 'Binôme';
         } else {
             shift_name += s_data.day + ' - ' + s_data.begin;
             shift_name += ' - ' + s_data.place;
         }
     }
-
     return shift_name;
 }
 

shifts/models.py

@@ -38,17 +38,18 @@ class CagetteShift(models.Model):
                   'cooperative_state', 'final_standard_point', 'create_date',
                   'final_ftop_point', 'shift_type', 'leave_ids', 'makeups_to_do', 'barcode_base',
                   'street', 'street2', 'zip', 'city', 'mobile', 'phone', 'email',
-                  'is_associated_people', 'parent_id']
+                  'is_associated_people', 'parent_id', 'extra_shift_done']
         partnerData = self.o_api.search_read('res.partner', cond, fields, 1)
         
         if partnerData:
             partnerData = partnerData[0]
             if partnerData['is_associated_people']:
                 cond = [['id', '=', partnerData['parent_id'][0]]]
-                fields = ['create_date']
+                fields = ['create_date', 'extra_shift_done']
                 parentData = self.o_api.search_read('res.partner', cond, fields, 1)
                 if parentData:
                     partnerData['parent_create_date'] = parentData[0]['create_date']
+                    partnerData['parent_extra_shift_done'] = parentData[0]['extra_shift_done']
 
             if partnerData['shift_type'] == 'standard':
                 partnerData['in_ftop_team'] = False
@@ -91,7 +92,7 @@ class CagetteShift(models.Model):
     def get_shift_partner(self, id):
         """Récupère les shift du membre"""
         fields = ['date_begin', 'date_end','final_standard_point',
-                  'shift_id', 'shift_type','partner_id',  "id", "associate_registered"] # res.partner
+                  'shift_id', 'shift_type','partner_id',  "id", "associate_registered", "is_makeup"] # res.partner
         cond = [['partner_id.id', '=', id],['state', '=', 'open'],
                ['date_begin', '>', datetime.datetime.now().isoformat()]]
         shiftData = self.o_api.search_read('shift.registration', cond, fields, order ="date_begin ASC")

shifts/urls.py

@@ -15,6 +15,7 @@ urlpatterns = [
     url(r'^change_shift', views.change_shift),
     url(r'^affect_shift', views.affect_shift),
     url(r'^add_shift', views.add_shift),
+    url(r'^cancel_shift', views.cancel_shift),
     url(r'^request_delay', views.request_delay),
     url(r'^reset_members_positive_points', views.reset_members_positive_points)
 ]

shifts/views.py

@@ -101,8 +101,11 @@ def get_list_shift_calendar(request, partner_id):
     use_new_members_space = getattr(settings, 'USE_NEW_MEMBERS_SPACE', False) 
 
     listRegisterPartner = []
+    listMakeUpShift = []
     for v in registerPartner:
         listRegisterPartner.append(v['id'])
+        if v['is_makeup']:
+            listMakeUpShift.append(v['id'])
 
     start = request.GET.get('start')
     end = request.GET.get('end')
@@ -136,7 +139,10 @@ def get_list_shift_calendar(request, partner_id):
 
                 if len(l) > 0:
                     if use_new_members_space is True:
-                        event["classNames"] = ["shift_booked"]
+                        if set(value['registration_ids']) & set(listRegisterPartner) & set(listMakeUpShift):
+                            event["classNames"] = ["shift_booked_makeup"]
+                        else : 
+                            event["classNames"] = ["shift_booked"]
                     else:
                         event["className"] = "shift_booked"
                     event["changed"] = False
@@ -310,6 +316,37 @@ def add_shift(request):
     else:
         return HttpResponseForbidden()
 
+def cancel_shift(request):
+    """ Annule une présence à un shift """
+    if 'verif_token' in request.POST:
+        partner_id = int(request.POST.get('idPartner'))
+        if Verification.verif_token(request.POST.get('verif_token'), partner_id) is True:
+
+            cs = CagetteShift()
+            listRegister = [int(request.POST['idRegister'])]
+
+            try:
+                response = cs.cancel_shift(listRegister)
+
+                # decrement extra_shift_done if param exists
+                if 'extra_shift_done' in request.POST:
+                    target = int(request.POST["extra_shift_done"]) - 1
+
+                    # extra security
+                    if target < 0:
+                        target = 0
+
+                    cm = CagetteMember(partner_id)
+                    cm.update_extra_shift_done(target)
+
+                return JsonResponse({"res" : 'response'})
+            except Exception as e:
+                return JsonResponse({"error" : str(e)}, status=500)
+        else:
+            return HttpResponseForbidden()
+    else:
+        return HttpResponseForbidden()
+
 def request_delay(request):
     if 'verif_token' in request.POST:
         if Verification.verif_token(request.POST.get('verif_token'), int(request.POST.get('idPartner'))) is True:

templates/members/inscriptions.html

@@ -37,11 +37,11 @@
 
 <section class="center" id="new_coop">
    <div class="grid-1">
-     <div class="item-center">
+    <div class="">
       <h2 class="title">
       NOUVEAU MEMBRE
       </h2>
-     <form id="coop_create" lang="fr">
+    <form id="coop_create" lang="fr">
       {% if ask_for_sex %}
         <p>
           {% include "members/sex_input.html" %}
@@ -65,17 +65,58 @@
         <input type="number" min="1" placeholder="Nb de chèques" name="ch_qty" id="ch_qty" style="display:none;"/>
 
       </p>
+      
       {% if input_barcode %}
       <p>
         <input type="text" name="m_barcode" id="m_barcode" maxlength="13" size="13" placeholder="Code barre" autocomplete="off" required/>
       </p>
       {% endif %}
-      <button class="btn--primary">Valider</button>
-     </form>
-     </div>
-     <div id="mail_generation">
-     (*) L'adresse mail étant obligatoire, si le nouveau membre n'en a pas, veuillez en créer une en cliquant sur le bouton suivant : <a class="btn--info" id="generate_email">+</a>
-     </div>
+
+      {% if ASSOCIATE_MEMBER_SHIFT %}
+      <p id="add_binome" >+ Binomes (facultatif)</p>
+      <div id="associate_area" style="display:none;">
+        <div class="choice_button_area d-flex" >
+          <div id="existing_member_choice" class="member_choice">
+            A mettre en binome avec un.e membre existant.e
+          </div>
+          <div id="new_member_choice" class="member_choice">
+            A mettre en binome avec un.e nouveau membre
+          </div>
+        </div>
+        
+        <div id="existing_member_choice_action"  style="display:none;">
+          <input type="text" id="search_member_input" value="" placeholder="Nom ou numéro du coop..." >
+          <div class="btn--primary" id="search_member_button">Recherche</div>
+          <div class="search_member_results_area" style="display:none;">
+            <div class="search_results_text">
+              <p><i>Choisissez parmi les membres trouvés :</i></p>
+            </div>
+            <div class="search_member_results"></div>
+          </div>
+          <div class="chosen_associate_area" style="display:none;">
+            <div >
+              <p><i>Binôme choisit : </i></p>
+            </div>
+            <div class="chosen_associate"></div>
+          </div>
+        </div>
+        <div id="new_member_choice_action"  style="display:none;">
+          <div >
+            <div>
+              <input type="text" id="new_member_input" value="" placeholder="Nom du membre" >
+            </div>
+          </div> 
+        </div>
+      </div>
+      {% endif %}
+      <div>
+        <button class="btn--primary">Valider</button>
+      </div>
+    </form>
+      
+    <div id="mail_generation">
+    (*) L'adresse mail étant obligatoire, si le nouveau membre n'en a pas, veuillez en créer une en cliquant sur le bouton suivant : <a class="btn--info" id="generate_email">+</a>
+    </div>
   </div>
 </section>
 {% include "members/shift_template_choice.html" %}
@@ -119,6 +160,7 @@
         var couchdb_dbname = '{{db}}';
         var couchdb_server = '{{couchdb_server}}' + couchdb_dbname;
         var dbc = new PouchDB(couchdb_dbname);
+        var ASSOCIATE_MEMBER_SHIFT = '{{ASSOCIATE_MEMBER_SHIFT}}';
         var sync = PouchDB.sync(couchdb_dbname, couchdb_server, {
           live: true,
           retry: true,

templates/members/validation_form.html

@@ -60,6 +60,9 @@
                 <input type="text" name="m_barcode" id="m_barcode" disabled/>
               </p>
             {% endif %}
+            <div id="associated_member">
+                En binôme avec : <span id ="associated_member_name"></span>
+            </div>
         </div>
         <p class="buttons">
               <button class="btn--success" name="valider">Tout est bon</button>

templates/members_space/home.html

@@ -21,6 +21,9 @@
           <button type="button" class="btn--danger choose_makeups">
             Je sélectionne mes rattrapages
           </button>
+          <button type="button" class="btn--success remove_future_registration">
+            J'ai validé un service à deux, je peux supprimer une présence
+          </button>
         </div>
         <div class="member_shift_name_area">
           <span>Mon créneau : </span>

templates/members_space/index.html

@@ -36,18 +36,20 @@
     </div>
 
     <div id="selectable_shift_line_template">
-      <div class="d-flex">
+      <div class="d-flex shift_line_container">
         <div class="selectable_shift_line btn--primary">
           <input type="checkbox" class="checkbox">
           <div class="selectable_shift_line_text">
             <span class="shift_line_date"></span> - <span class="shift_line_time"></span>
           </div>
         </div>
-        <div class="affect_associate_registered button--warning">
-          
-        </div>
+        <div class="affect_associate_registered button--warning"></div>
       </div>
     </div>
+    
+    <div id="delete_registration_button_template">
+      <div class="delete_registration_button"><i class="fas fa-lg fa-trash"></i></div>
+    </div>
 
     <div id="modal_affect_shift">
       <div>Qui sera présent.e ?</div>
@@ -58,7 +60,6 @@
       <div id="shift_both" class=" btn--primary">
         Les deux
       </div>
-      
     </div>
 
     <div id="modal_shift_exchange_template">
@@ -74,10 +75,12 @@
 
     <div id="calendar_explaination_template"> 
       <h4>Légende du calendrier</h4>
-      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">06:00</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky">&nbsp;- 9/12</div></div></div></div></a>
-      <p>Un service colorié en noir : je suis déjà inscrit.e à ce service.</p>
       <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_less_alf"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">10:45</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky">&nbsp;- 3/12</div></div></div></div></a>
       <p>Un service colorié en bleu : je peux m'inscrire à ce service.</p>
+      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">06:00</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky">&nbsp;- 9/12</div></div></div></div></a>
+      <p>Un service colorié en noir : je suis déjà inscrit.e à ce service.</p>
+      <a class="example-event fc-daygrid-event fc-daygrid-block-event fc-h-event fc-event fc-event-start fc-event-end fc-event-future shift_booked_makeup"><div class="fc-event-main"><div class="fc-event-main-frame"><div class="fc-event-time">13:30</div><div class="fc-event-title-container"><div class="fc-event-title fc-sticky">&nbsp;- 7/12</div></div></div></div></a>
+      <p>Un service colorié en orange : je suis inscrit.e à un rattrapage sur ce service.</p>
       <p>3/12 <i class="arrow_explanation_numbers fas fa-arrow-right"></i> il y a déjà 3 places réservées à ce service sur 12 disponibles.
           <b>Plus le chiffre de gauche est petit, plus on a besoin de coopérateurs.rices à ce service !</b></p>
     </div>
@@ -140,7 +143,8 @@
     "associated_partner_name" : "{{partnerData.associated_partner_name}}",
     "verif_token" : "{{partnerData.verif_token}}",
     "leave_stop_date": "{{partnerData.leave_stop_date}}",
-    "comite": "{{partnerData.comite}}"
+    "comite": "{{partnerData.comite}}",
+    "extra_shift_done": parseInt("{{partnerData.extra_shift_done}}", 10)
   };
   var block_actions_for_attached_people = '{{block_actions_for_attached_people}}';
 </script>

templates/members_space/my_info.html

@@ -25,6 +25,9 @@
                             <button type="button" class="btn--danger choose_makeups">
                                 Je sélectionne mes rattrapages
                             </button>
+                            <button type="button" class="btn--success remove_future_registration">
+                                J'ai validé un service à deux, je peux supprimer une présence
+                            </button>
                         </div>
                     </div>
                 </div>

templates/members_space/shifts_exchange.html

@@ -35,6 +35,14 @@
             <span class="select_makeups_message_block">Je dois les sélectionner dans le calendrier. </span>
             <span class="select_makeups_message_block">Je ne peux pas échanger de service tant que je n'ai pas choisi mes rattrapages. </span>
         </div>
+        <div id="can_delete_future_registrations_area">
+            <button class="btn--success can_delete_future_registrations_button" id="delete_future_registration">
+                J'ai validé <span class="extra_shift_done"></span> service(s) à deux, je supprime un service futur
+            </button>
+            <button class="btn--success can_delete_future_registrations_button" id="offer_extra_shift">
+                Je souhaite donner <span class="extra_shift_done"></span> service(s) d'avance à la communauté
+            </button>
+        </div>
         <div id="calendar_top_info">
             <div id="partner_shifts_list">
                 <h4>Liste de mes services :</h4>