fix merge conflict

members/admin.py

@@ -385,14 +385,24 @@ def delete_shift_registration(request):
     is_connected_user = CagetteUser.are_credentials_ok(request)
     if is_connected_user is True:
         data = json.loads(request.body.decode())
-        shift_registration_id = int(data["shift_registration_id"])
         member_id = int(data["member_id"])
-
-        m = CagetteShift()
-        res["res"] = m.cancel_shift([shift_registration_id])
+        shift_registration_id = int(data["shift_registration_id"])
+        shift_is_makeup = data["shift_is_makeup"]
 
         # Note: 'upcoming_registration_count' in res.partner won't change because the _compute method
         #       in odoo counts canceled shift registrations.
+        m = CagetteShift()
+        res["cancel_shift"] = m.cancel_shift([shift_registration_id])
+
+        if shift_is_makeup is True:
+            fields = {
+                'name': "Admin BDM - Suppression d'un rattrapage",
+                'shift_id': False,
+                'type': data["member_shift_type"],
+                'partner_id': member_id,
+                'point_qty': 1
+            }
+            res["update_counter"] = m.update_counter_event(fields)
 
         response = JsonResponse(res, safe=False)
     else:

members/static/css/admin/manage_shift_registrations.css

@@ -38,6 +38,10 @@
     padding-top: 0.755em;
 }
 
+.makeup_row {
+    background-color: #ffc854 !important;
+}
+
 /* Search membres area */
 #search_member_area {
     margin-top: 30px;

members/static/css/inscriptions.css

@@ -23,6 +23,57 @@
 [data-week="4"] {border: 2px #eed000 solid;}
 
 #new_coop [name="email"] {width:25em;}
+#new_coop{
+    max-width: 75%;
+}
 #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/css/member.css

@@ -44,8 +44,9 @@ h1 .member_name {font-weight: bold;}
 .members_list {list-style: none;}
 .members_list li {display:block;margin-bottom:5px;}
 
-.members_list li.btn--inverse {background: #449d44; cursor:not-allowed; color: #FFF; }
+.members_list li.btn--inverse {background: #449d44; color: #FFF; }
 .members_list li.btn--inverse.late {background-color: #de9b00; color: white}
+.members_list li.btn--inverse.both {background-color: #0275d8 ; color: white}
 
 #service_entry_success {font-size: x-large;}
 #service_entry_success .explanations {margin: 25px 0; font-size: 18px;}
@@ -64,7 +65,7 @@ h1 .member_name {font-weight: bold;}
  #service_en_cours .info a {line-height: 24px; font-size:14px; margin-top:15px;}
  .outside_list a {margin-left:15px;}
  #rattrapage_1 .advice {margin-top:15px;}
- .btn.present {background:#50C878;}
+ .btn.present {background:#50C878; color: white !important; font-weight: bold;}
  .btn.return {background: #ff3333; color:#FFF !important; margin-top:25px;}
 
 .msg-big {font-size: xx-large; background: #fff; padding:25px; text-align: center;}

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",

members/static/js/admin/manage_shift_registrations.js

@@ -88,17 +88,29 @@ function display_member_shifts() {
             "sLoadingRecords": "Chargement en cours...",
             "sZeroRecords":    "Aucun élément à afficher",
             "sEmptyTable":     "Aucun futur service pour ce.tte membre"
-        }
+        },
+        createdRow: function(row, rdata) {
+            if (rdata.is_makeup === true) {
+                $(row).addClass("makeup_row");
+                $(row).prop('title', 'Ce service est un rattrapage');
+            }
+        },
     });
 
     $('#member_shifts_table').on('click', 'tbody td .delete_shift_registration', function () {
         const row_data = member_shifts_table.row($(this).parents('tr')).data();
         const shift_reg_id = row_data.id;
+        const shift_is_makeup = row_data.is_makeup;
+
+        let msg = `<p>Enlever la présence de <b>${member.name}</b> au service du <b>${row_data.shift_id[1]}</b> ?</p>`;
+        if (shift_is_makeup === true) {
+            msg += `<p><i class="fas fa-exclamation-triangle"></i> Ce service est un rattrapage. Le supprimer ajoutera un point au compteur de ce.tte membre.</p>`;
+        } 
 
         openModal(
-            `Enlever la présence de ${member.name} au service du ${row_data.shift_id[1]} ?`,
+            msg,
             () => {
-                delete_shift_registration(shift_reg_id);
+                delete_shift_registration(shift_reg_id, shift_is_makeup);
             },
             "Confirmer",
             false
@@ -109,13 +121,16 @@ function display_member_shifts() {
 /**
  * Send request to delete shift registration
  * @param {Int} shift_reg_id Id of the shift_registration to delete
+ * @param {Boolean} shift_is_makeup Is the shift a makeup?
  */
-function delete_shift_registration(shift_reg_id) {
+function delete_shift_registration(shift_reg_id, shift_is_makeup) {
     openModal();
 
     data = {
         member_id: selected_member.id,
-        shift_registration_id: shift_reg_id
+        member_shift_type: selected_member.shift_type,
+        shift_registration_id: shift_reg_id,
+        shift_is_makeup: shift_is_makeup
     };
 
     $.ajax({

members/static/js/members.js

@@ -31,12 +31,14 @@ var search_field = $('input[name="search_string"]');
 var shift_title = $('#current_shift_title');
 var shift_members = $('#current_shift_members');
 var service_validation = $('#service_validation');
+var associated_service_validation = $('#associated_service_validation');
 var validation_last_call = 0;
 var rattrapage_wanted = $('[data-next="rattrapage_1"]');
 var webcam_is_attached = false;
 var photo_advice = $('#photo_advice');
 var photo_studio = $('#photo_studio');
 var coop_info = $('.coop-info');
+var service_data = null;
 
 const missed_begin_msg = $('#missed_begin_msg').html();
 
@@ -264,7 +266,7 @@ function get_simple_service_name(s) {
 }
 
 function move_service_validation_to(page) {
-    service_validation.find('.btn').data('stid', '0');
+    service_data.stid=0;
     page.find('.validation_wrapper')
         .append(service_validation.detach());
 }
@@ -285,10 +287,14 @@ function fill_service_entry(s) {
             var li_data = "";
 
             if (e.state == "done") {
+                li_data = ' data-rid="'+e.id+'" data-mid="'+e.partner_id[0]+'"';
                 li_class += "--inverse";
                 if (e.is_late == true) {
                     li_class += " late";
                 }
+                if (e.associate_registered=='both') {
+                    li_class += " both";
+                }
             } else {
                 li_data = ' data-rid="'+e.id+'" data-mid="'+e.partner_id[0]+'"';
             }
@@ -321,13 +327,29 @@ function clean_service_entry() {
 function fill_service_validation(rid, coop_num_name, coop_id) {
     var coop_name_elts = coop_num_name.split(' - ');
 
+    for (member of loaded_services[0].members) {
+        if (member.id ==rid) {
+            if (member.associate_name) {
+                pages.service_entry_validation.find('#service_validation').hide();
+                pages.service_entry_validation.find('#associated_service_validation').show();
+                pages.service_entry_validation.find('#associated_btn').text(member.associate_name);
+                pages.service_entry_validation.find('#partner_btn').text(member.partner_name);
+
+            } else {
+                pages.service_entry_validation.find('#associated_service_validation').hide();
+                pages.service_entry_validation.find('#service_validation').show();
+
+            }
+        }
+    }
+    service_data={
+        rid: rid,
+        sid: selected_service.id,
+        mid: coop_id};
+
+
     pages.service_entry_validation.find('span.member_name').text(coop_name_elts[1]);
     move_service_validation_to(pages.service_entry_validation);
-    service_validation.find('.btn')
-        .data('rid', rid)
-        .data('sid', selected_service.id)
-        .data('mid', coop_id);
-
 }
 
 function select_possible_service() {
@@ -372,7 +394,6 @@ function get_service_entry_data() {
         dataType : 'json'
     })
         .done(function(rData) {
-        //console.log(rData);
             info_place.text('');
             var page_title = pages.service_entry.find('h1');
 
@@ -397,6 +418,7 @@ function get_service_entry_data() {
                         page_title.text('Quel est ton service ?');
 
                     } else {
+                        loaded_services = rData.res;
                         fill_service_entry(rData.res[0]);
                     }
                 }
@@ -443,22 +465,21 @@ function fill_service_entry_sucess(member) {
 
 }
 
-function record_service_presence() {
+function record_service_presence(e) {
     var d = new Date();
     var elapsed_since_last_call = d.getTime() - validation_last_call;
 
-    if (elapsed_since_last_call > 10000) {
+    if (elapsed_since_last_call > 1000) {
         loading2.show();
         validation_last_call = d.getTime();
-        var clicked = service_validation.find('.btn');
-        var rid = clicked.data('rid');
-        var mid = clicked.data('mid');
-        var sid = clicked.data('sid');
-        var stid = clicked.data('stid');
+        var rid = service_data.rid;
+        var mid = service_data.mid;
+        var sid = service_data.sid;
+        var stid = service_data.stid;
 
         post_form(
             '/members/service_presence/',
-            {'mid': mid, 'rid': rid, 'sid': sid, 'stid' : stid},
+            {'mid': mid, 'rid': rid, 'sid': sid, 'stid' : stid, 'cancel': false, 'type': e.data.type},
             function(err, rData) {
                 if (!err) {
                     var res = rData.res;
@@ -480,6 +501,28 @@ function record_service_presence() {
     }
 }
 
+function cancel_service_presence(mid, rid) {
+    var d = new Date();
+    var elapsed_since_last_call = d.getTime() - validation_last_call;
+
+    if (elapsed_since_last_call > 1000) {
+        loading2.show();
+        validation_last_call = d.getTime();
+        var sid = selected_service.id;
+
+        post_form(
+            '/members/service_presence/',
+            {'mid': mid, 'rid': rid, 'sid': sid, 'stid' : 0, 'cancel': true},
+            function(err) {
+                if (!err) {
+                    get_service_entry_data();
+                }
+                loading2.hide();
+            }
+        );
+    }
+}
+
 function fill_rattrapage_2() {
     pages.rattrapage_2.find('span.member_name').text(current_displayed_member.name);
     var msg = "Bienvenue pour ton rattrapage !";
@@ -494,13 +537,11 @@ function fill_rattrapage_2() {
         msg = "Tu es en désincrit.e ... La situation doit être réglée avez le Bureau des Membres";
     } else {
         move_service_validation_to(pages.rattrapage_2);
-
-
-        service_validation.find('.btn')
-            .data('rid', 0)
-            .data('sid', selected_service.id)
-            .data('stid', shift_ticket_id)
-            .data('mid', current_displayed_member.id);
+        service_data = {
+            rid : 0,
+            sid : selected_service.id,
+            stid : shift_ticket_id,
+            mid : current_displayed_member.id};
     }
     pages.rattrapage_2.find('h2').text(msg);
 
@@ -641,7 +682,10 @@ $('.btn[data-next]').click(function() {
 
 });
 
-service_validation.on("click", ".btn", record_service_presence);
+service_validation.on("click", ".btn", {type:'normal'}, record_service_presence);
+associated_service_validation.on("click", "#associated_btn", {type:'associate'}, record_service_presence);
+associated_service_validation.on("click", "#partner_btn", {type:'partner'}, record_service_presence);
+associated_service_validation.on("click", "#both_btn", {type:'both'}, record_service_presence);
 
 shift_members.on("click", '.btn[data-rid]', function() {
     var clicked = $(this);
@@ -653,6 +697,14 @@ shift_members.on("click", '.btn[data-rid]', function() {
 
 });
 
+shift_members.on("click", '.btn--inverse', function() {
+    var clicked = $(this);
+    var rid = clicked.data('rid');
+    var mid = clicked.data('mid');
+
+    cancel_service_presence(mid, rid);
+});
+
 pages.shopping_entry.on('css', function() {
     photo_advice.hide();
     photo_studio.hide();

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
@@ -277,6 +283,9 @@ def record_service_presence(request):
         mid = int(request.POST.get("mid", 0))  # member id
         sid = int(request.POST.get("sid", 0))  # shift id
         stid = int(request.POST.get("stid", 0))  # shift_ticket_id
+        cancel = request.POST.get("cancel") == 'true'
+        typeAction = str(request.POST.get("type"))
+
         app_env = getattr(settings, 'APP_ENV', "prod")
         if (rid > -1 and mid > 0):
             overrided_date = ""
@@ -286,28 +295,31 @@ def record_service_presence(request):
                 if o_date:
                     overrided_date = re.sub(r'(%20)',' ', o_date.group(1))
 
-            # rid = 0 => C'est un rattrapage, sur le service
-            if sid > 0 and stid > 0:
-                # Add member to service and take presence into account
-                res['rattrapage'] = CagetteServices.record_rattrapage(mid, sid, stid)
-                if res['rattrapage'] is True:
-                    res['update'] = 'ok'
-            else:
-                if (CagetteServices.registration_done(rid, overrided_date) is True):
-                    res['update'] = 'ok'
+            if(not cancel):
+                # rid = 0 => C'est un rattrapage, sur le service
+                if sid > 0 and stid > 0:
+                    # Add member to service and take presence into account
+                    res['rattrapage'] = CagetteServices.record_rattrapage(mid, sid, stid, typeAction)
+                    if res['rattrapage'] is True:
+                        res['update'] = 'ok'
                 else:
-                    res['update'] = 'ko'
-            if res['update'] == 'ok':
-                members = CagetteMember.search('id', mid)
-                m = members[0]
-                for k in ['image_medium', 'barcode', 'barcode_base']:
-                    del m[k]
-                next_shift = {}
-                if len(m['shifts']) > 0:
-                    next_shift = m['shifts'][0]
-                    del m['shifts']
-                    m['next_shift'] = next_shift
-                res['member'] = m
+                    if (CagetteServices.registration_done(rid, overrided_date, typeAction) is True):
+                        res['update'] = 'ok'
+                    else:
+                        res['update'] = 'ko'
+                if res['update'] == 'ok':
+                    members = CagetteMember.search('id', mid)
+                    m = members[0]
+                    for k in ['image_medium', 'barcode', 'barcode_base']:
+                        del m[k]
+                    next_shift = {}
+                    if len(m['shifts']) > 0:
+                        next_shift = m['shifts'][0]
+                        del m['shifts']
+                        m['next_shift'] = next_shift
+                    res['member'] = m
+            else: CagetteServices.reopen_registration(rid, overrided_date)
+                
     except Exception as e:
         res['error'] = str(e)
     return JsonResponse({'res': res})

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

@@ -64,14 +64,39 @@
     }
 }
 
+.shift_line_container {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    flex-wrap: wrap;
+}
+
+.shift_line_extra_actions {
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: nowrap;
+}
+
+@media screen and (max-width:768px) {
+    .shift_line_container {
+        flex-direction: column;
+    }
+
+    .shift_line_extra_actions {
+        width: 100%;
+    }
+    
+    .affect_associate_registered {
+        margin: 0.5rem 0;
+    }
+}
+
+
 .selectable_shift_line {
     min-width: 325px;
     display: flex;
     align-items: center;
-    margin-left: 15px;
-    margin: 0.75rem 0;
     border-radius: 5px;
-    margin-right: 15px;
 }
 
 .selectable_shift_line .checkbox {
@@ -85,11 +110,31 @@
 .affect_associate_registered {
     display: flex;
     align-items: center;
-    margin-left: 15px;
-    margin: 0.75rem 0;
     border-radius: 5px;
 }
 
+@media screen and (min-width:768px) {
+    .selectable_shift_line {
+        margin: 0 15px;
+    }
+
+    .affect_associate_registered {
+        margin-left: 15px;
+    }
+}
+
+.selectable_shift{
+    margin: 1rem 0;
+}
+
+.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 +158,21 @@
     }
 }
 
+/* -- Calendar screen, can delete registrations message */
+
+#can_delete_future_registrations_area {
+    display: none;
+    justify-content: center;
+    align-items: center;
+    margin: 0 1rem 1rem 1rem;
+}
+
+#can_delete_future_registrations_area button {
+    white-space: normal;
+    word-break: normal;
+    margin: 1rem;
+}
+
 /* -- Calendar screen, calendar */
 
 #calendar {
@@ -157,6 +217,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;
 }
@@ -204,4 +277,14 @@ td{
 #calendar_explaination_button {
     max-width: 60%;
     margin: 2rem auto 0.5rem auto;
+}
+
+/* -- Assign shift modal */
+
+.modal_affect_shift_buttons {
+    margin: 1rem 0;
+}
+
+.assign_shift_button {
+    margin: 0.25rem;
 }
\ No newline at end of file

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

@@ -211,7 +211,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;
 }
 
@@ -222,6 +222,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);
@@ -286,6 +287,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);
 }
 
@@ -317,7 +325,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

@@ -102,6 +102,8 @@ def index(request, exception=None):
                 partnerData['makeups_to_do'] = partnerData['parent_makeups_to_do']
                 partnerData['date_delay_stop'] = partnerData['parent_date_delay_stop']
                 partnerData['can_have_delay'] = cs.member_can_have_delay(int(partnerData["parent_id"]))
+                partnerData['extra_shift_done'] = partnerData["parent_extra_shift_done"]
+
             else:
                 partnerData["parent_name"] = False
                 partnerData['can_have_delay'] = cs.member_can_have_delay(int(partner_id))
@@ -235,4 +237,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/css/common.css

@@ -7,7 +7,8 @@
 .red {color:#FF0000;}
 .b_red, .b_less_than_25pc {background:#ff3333 !important;}
 .loading {background-image: url("/static/img/ajax-loader.gif"); background-repeat:no-repeat;}
-.loading2 {display: none;}
+.loading2 {display: none; position:absolute; top:-20px;}
+.loading2-container {position:relative;}
 
 body {background: #fff; margin:5px;}
 a, a:active, a:focus,

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,19 +38,20 @@ 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', 'makeups_to_do', 'date_delay_stop']
+                fields = ['create_date', 'makeups_to_do', 'date_delay_stop', '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_makeups_to_do'] = parentData[0]['makeups_to_do']
                     partnerData['parent_date_delay_stop'] = parentData[0]['date_delay_stop']
+                    partnerData['parent_extra_shift_done'] = parentData[0]['extra_shift_done']
 
             if partnerData['shift_type'] == 'standard':
                 partnerData['in_ftop_team'] = False
@@ -93,7 +94,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")
@@ -368,4 +369,8 @@ class CagetteShift(models.Model):
 
     def member_can_have_delay(self, partner_id):
         """ Can a member have a delay? """
-        return self.o_api.execute('res.partner', 'can_have_extension', [partner_id])
+        return self.o_api.execute('res.partner', 'can_have_extension', [partner_id])
\ No newline at end of file
+
+    def update_counter_event(self, fields):
+        """ Add/remove points """
+        return self.o_api.create('shift.counter.event', fields)
\ No newline at end of file

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/index.html

@@ -178,9 +178,23 @@
         <section id="service_validation" class="col-6 grid-6 has-gutter">
             <div class="col-2"></div>
             <a class="col-2 btn present">{{CONFIRME_PRESENT_BTN|safe}}</a>
-            <span class="loading2"><img width="75" src="/static/img/Pedro_luis_romani_ruiz.gif" alt="Chargement en cours...." /></span>
-            <div class="col-2"></div>
+            <div class="col-2 loading2-container">
+              <span class="loading2"><img width="75" src="/static/img/Pedro_luis_romani_ruiz.gif" alt="Chargement en cours...." /></span>
+            </div>
         </section>
+        <div id="associated_service_validation">
+          <p class="col-6 txtcenter">Qui est présent à ce service ?</p>
+          <section class="col-6 grid-5 has-gutter">
+            <div class="col-1"></div>
+            <a id="associated_btn" class=" btn present">Membre</a>
+            <a id="partner_btn" class=" btn present">Associé</a>
+            <a id="both_btn" class=" btn present">Les deux</a>
+            <div class="col-1 loading2-container">
+              <span class="loading2"><img width="75" src="/static/img/Pedro_luis_romani_ruiz.gif" alt="Chargement en cours...." /></span>
+            </div>
+          </section>
+        </div>
+        
     </div>
     <div class="col-2"></div>
     <a class="btn col-2 return" data-next="service_entry">Retour</a>

templates/members/inscriptions.html

@@ -37,11 +37,11 @@
 
 <section class="center" id="new_coop">
    <div class="grid-1">
-     <div class="item-center">
+    <div class="item-center">
       <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,29 +36,36 @@
     </div>
 
     <div id="selectable_shift_line_template">
-      <div class="d-flex">
+      <div class="d-flex shift_line_container selectable_shift">
         <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 class="shift_line_extra_actions">
+          <div class="affect_associate_registered">
+            
+          </div>
         </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>
-      <div id="shift_partner" class="btn--primary">
-      </div>
-      <div id="shift_associate" class=" btn--primary">
-      </div>
-      <div id="shift_both" class=" btn--primary">
-        Les deux
+      <div class="modal_affect_shift_buttons">
+        <div id="shift_partner" class="btn--primary assign_shift_button">
+        </div>
+        <div id="shift_associate" class=" btn--primary assign_shift_button">
+        </div>
+        <div id="shift_both" class=" btn--primary assign_shift_button">
+          Les deux
+        </div>
       </div>
-      
     </div>
 
     <div id="modal_shift_exchange_template">
@@ -74,10 +81,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 +149,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>