Merge branch '2337-binome-access' into 'dev_cooperatic'

2337 binome access

See merge request !125

coops_configurations/config_lacagette.py

@@ -119,6 +119,7 @@ votre nom ou numéro ci-dessous
 UNSUBSCRIBED_FORM_LINK = 'https://docs.google.com/forms/d/e/1FAIpQLScWcpls-ruYIp7HdrjRF1B1TyuzdqhvlUIcUWynbEujfj3dTg/viewform'
 UNSUBSCRIBED_MSG = 'Vous êtes désincrit·e, merci de remplir <a href="https://docs.google.com/forms/d/e/1FAIpQLSfPiC2PkSem9x_B5M7LKpoFNLDIz0k0V5I2W3Mra9AnqnQunw/viewform">ce formulaire</a> pour vous réinscrire sur un créneau.<br />Vous pouvez également contacter le Bureau des Membres en remplissant <a href="https://docs.google.com/forms/d/e/1FAIpQLSeZP0m5-EXPVJxEKJk6EjwSyZJtnbiGdYDuAeFI3ENsHAOikg/viewform">ce formulaire</a>'
 CONFIRME_PRESENT_BTN = 'Clique ici pour valider ta présence'
+BLOCK_ACTIONS_FOR_ATTACHED_PEOPLE = False
 
 
 RECEPTION_PB = "Ici, vous pouvez signaler toute anomalie lors d'une réception, les produits non commandés, cassés ou pourris. \

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

@@ -55,7 +55,7 @@ $(document).ready(function() {
         toggleHeader();
     });
 
-    if (partner_data.is_associated_people === "True") {
+    if (partner_data.is_associated_people === "True" && block_actions_for_attached_people === "True") {
         $(".pairs_info").show();
     }
 });

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

@@ -6,10 +6,11 @@ var calendar = null,
  * A partner can exchange shifts if:
  *  - s.he doesn't have to choose a makeup shift
  *  - s.he's not an associated partner
+ *  - s.he's is an associated partner who is not blocked in his actions
  * @returns boolean
  */
 function can_exchange_shifts() {
-    return partner_data.makeups_to_do == 0 && partner_data.is_associated_people === "False";
+    return partner_data.makeups_to_do == 0 && (partner_data.is_associated_people === "False" || (partner_data.is_associated_people === "True" && block_actions_for_attached_people === "False"));
 }
 
 /**
@@ -19,7 +20,7 @@ function can_exchange_shifts() {
  * @returns boolean
  */
 function should_select_makeup() {
-    return partner_data.makeups_to_do > 0 && partner_data.is_associated_people === "False";
+    return partner_data.makeups_to_do == 0 && (partner_data.is_associated_people === "False" || (partner_data.is_associated_people === "True" && block_actions_for_attached_people === "False"));
 }
 
 /**
@@ -30,10 +31,19 @@ function add_or_change_shift(new_shift_id) {
     if (is_time_to('change_shift')) {
         setTimeout(openModal, 100); // loading on
 
-        tData = 'idNewShift=' + new_shift_id
-            +'&idPartner=' + partner_data.partner_id
-            + '&shift_type=' + partner_data.shift_type
-            + '&verif_token=' + partner_data.verif_token;
+        if (partner_data.is_associated_people === "False") {
+            tData = 'idNewShift=' + new_shift_id
+                +'&idPartner=' + partner_data.partner_id
+                + '&shift_type=' + partner_data.shift_type
+                + '&verif_token=' + partner_data.verif_token;
+        } else if(partner_data.is_associated_people === "True" && block_actions_for_attached_people === "False") {
+            tData = 'idNewShift=' + new_shift_id
+                +'&idPartner=' + partner_data.parent_id
+                + '&shift_type=' + partner_data.shift_type
+                + '&verif_token=' + partner_data.parent_verif_token;
+        } else {
+            return false;
+        }
 
         if (selected_shift === null) {
             tUrl = '/shifts/add_shift';
@@ -84,17 +94,37 @@ function add_or_change_shift(new_shift_id) {
 
                     // Redraw calendar
                     calendar.refetchEvents();
+                } else {
+                    closeModal();
+                    selected_shift = null;
+                    alert(`Une erreur est survenue. ` +
+                        `Il est néanmoins possible que la requête ait abouti, ` +
+                        `veuillez patienter quelques secondes puis vérifier vos services enregistrés.`);
+
+                     // Refectch shifts anyway, if registration/exchange was still succesful
+                    setTimeout(() => {
+                        load_partner_shifts(partner_data.concerned_partner_id)
+                        .then(init_shifts_list);
+                    }, 300);
                 }
             },
             error: function(error) {
                 closeModal();
                 selected_shift = null;
 
-                if (error.status === 400) {
+                if (error.status === 400 && error.msg === "Old service in less than 24hours.") {
                     alert(`Désolé ! Le service que tu souhaites échanger démarre dans moins de 24h. ` +
-                          `Afin de faciliter la logistique des services, il n'est plus possible de l'échanger. ` +
-                          `Si tu ne peux vraiment pas venir, tu seras noté.e absent.e à ton service. ` +
-                          `Tu devras alors sélectionner un service de rattrapage sur ton espace membre.`);
+                        `Afin de faciliter la logistique des services, il n'est plus possible de l'échanger. ` +
+                        `Si tu ne peux vraiment pas venir, tu seras noté.e absent.e à ton service. ` +
+                        `Tu devras alors sélectionner un service de rattrapage sur ton espace membre.`);
+                } else if (error.status === 500 && error.msg === "Fail to create shift") {
+                    alert(`Une erreur est survenue. ` +
+                        `Il est néanmoins possible que la requête ait abouti, ` +
+                        `veuillez patienter quelques secondes puis vérifier vos services enregistrés.`);
+                } else if (error.status === 400 && error.msg === "Bad arguments") {
+                    alert(`Une erreur est survenue. ` +
+                        `Il est néanmoins possible que la requête ait abouti, ` +
+                        `veuillez patienter quelques secondes puis vérifier vos services enregistrés.`);
                 } else {
                     alert(`Une erreur est survenue. ` +
                         `Il est néanmoins possible que la requête ait abouti, ` +
@@ -131,7 +161,7 @@ function init_shifts_list() {
             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));
 
-            if (!can_exchange_shifts()) {
+            if (!can_exchange_shifts() && block_actions_for_attached_people === "True") {
                 shift_line_template.find(".selectable_shift_line").removeClass("btn--primary");
                 shift_line_template.find(".selectable_shift_line").addClass("btn");
                 shift_line_template.find(".checkbox").prop("disabled", "disabled");

members_space/views.py

@@ -28,7 +28,8 @@ def index(request, exception=None):
 
     context = {
         'title': 'Espace Membre',
-        'COMPANY_LOGO': getattr(settings, 'COMPANY_LOGO', None)
+        'COMPANY_LOGO': getattr(settings, 'COMPANY_LOGO', None),
+        'block_actions_for_attached_people' : getattr(settings, 'BLOCK_ACTIONS_FOR_ATTACHED_PEOPLE', True)
     }
 
     template = loader.get_template('members_space/index.html')
@@ -96,6 +97,9 @@ def index(request, exception=None):
             if partnerData["parent_id"] is not False:
                 partnerData["parent_name"] = partnerData["parent_id"][1]
                 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
+
             else:
                 partnerData["parent_name"] = False
 

outils/config.md

@@ -321,6 +321,9 @@
 
         By default, is True. If False, tile showing explanations is not shown
 
+- BLOCK_ACTIONS_FOR_ATTACHED_PEOPLE = False
+        Attached people can or not change his services
+
 ### Reception
 
 - RECEPTION_ADD_ADMIN_MODE = True
@@ -376,7 +379,6 @@
 - AMNISTIE_DATE = "2021-11-24 00:00:00"
         In members_space history display a special activity about amnistie
 
-
 ### Miscellious
 
 - EXPORT_COMPTA_FORMAT = 'Quadratus'

outils/for_view_imports.py

@@ -6,6 +6,7 @@ from django.http import JsonResponse
 from django.http import HttpResponseNotFound
 from django.http import HttpResponseForbidden
 from django.http import HttpResponseServerError
+from django.http import HttpResponseBadRequest
 from django.template import loader
 from django.shortcuts import render
 from django.shortcuts import redirect

shifts/models.py

@@ -40,8 +40,16 @@ class CagetteShift(models.Model):
                   'street', 'street2', 'zip', 'city', 'mobile', 'phone', 'email',
                   'is_associated_people', 'parent_id']
         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']
+                parentData = self.o_api.search_read('res.partner', cond, fields, 1)
+                if parentData:
+                    partnerData['parent_create_date'] = parentData[0]['create_date']
+
             if partnerData['shift_type'] == 'standard':
                 partnerData['in_ftop_team'] = False
                 #  Because 'in_ftop_team' doesn't seem to be reset to False in Odoo

shifts/views.py

@@ -223,9 +223,11 @@ def change_shift(request):
 
                     response = {'result': True}
                 else:
-                    response = {'result': False}
+                    response = {'msg': "Fail to create shift"}
+                    return JsonResponse(response, status=500)
             else:
-                response = {'result': False}
+                response = {'msg': "Bad arguments"}
+                return JsonResponse(response, status=400)
             return JsonResponse(response)
         else:
             return HttpResponseForbidden()

templates/members_space/index.html

@@ -118,12 +118,14 @@
     "is_associated_people" : "{{partnerData.is_associated_people}}",
     "parent_id" : "{{partnerData.parent_id}}",
     "parent_name" : "{{partnerData.parent_name}}",
+    "parent_verif_token" : "{{partnerData.parent_verif_token}}",
     "associated_partner_id" : "{{partnerData.associated_partner_id}}",
     "associated_partner_name" : "{{partnerData.associated_partner_name}}",
     "verif_token" : "{{partnerData.verif_token}}",
     "leave_stop_date": "{{partnerData.leave_stop_date}}",
     "comite": "{{partnerData.comite}}"
-  }
+  };
+  var block_actions_for_attached_people = '{{block_actions_for_attached_people}}';
 </script>
 <script src="{% static "js/all_common.js" %}?v="></script>
 <script src="{% static "js/members-space-home.js" %}?v="></script>