Merge branch '2865-email-bdm-deletion' into 'dev_cooperatic'

2865-email-bdm-deletion

See merge request !158

members/admin.py

@@ -556,8 +556,11 @@ def get_member_info(request, id):
             member = member[0]
             parent = None
             if member['parent_id']:
-                parent = api.search_read('res.partner', [['id', '=', int(member['parent_id'][0])]], ['barcode_base'])[0]
-                member['parent_barcode_base'] = parent['barcode_base']
+                res_parent = api.search_read('res.partner', [['id', '=', int(member['parent_id'][0])]], ['barcode_base', 'email'])
+                if res_parent:
+                    parent = res_parent[0]
+                    member['parent_barcode_base'] = parent['barcode_base']
+                    member['parent_email'] = parent['email']
             res['member'] = member
             response = JsonResponse(res)
         else:
@@ -804,8 +807,3 @@ def delete_pair(request):
         return response
     else:
         return JsonResponse({"message": "Method Not Allowed"}, status=405)
-
-def get_attached_members(request):
-    """ Récupération des membres qui doivent faire des rattrapages """
-    res = CagetteMembers.get_attached_members()
-    return JsonResponse({ 'res' : res })

members/static/css/admin/manage_attached.css

@@ -118,5 +118,19 @@
 }
 
 /* Modale */
-.attached-members .member div {width: 50px; display: inline-block;}
-.attached-members .member div.name {width: 80%;}
\ No newline at end of file
+.attached-members .member div {width: 50px; display: inline-block; margin: 1rem 0;}
+.attached-members .member div.name {width: 100%; position: relative;}
+.attached-members .member div.select_after_unattached_state {
+    position: absolute;
+    right:5rem;
+    top:0;
+    bottom:0;
+    margin: 0;
+    display:flex;
+    justify-content: center ;
+    align-items: center;
+}
+
+.attached-members .member .after_unattached_state {
+    cursor: pointer;
+}
\ No newline at end of file

members/static/js/admin/manage_attached.js

@@ -4,6 +4,9 @@ var childId = null;
 var parentName = null;
 var childName = null;
 
+var parentEmail = null;
+var childEmail = null;
+
 const possible_cooperative_state = {
     suspended: "Rattrapage",
     exempted: "Exempté.e",
@@ -237,6 +240,14 @@ function confirmDeletion(childId) {
 
     modalContent.find("#parentName").text(parentName);
     modalContent.find("#childName").text(childName);
+
+    if (parentEmail != false) {
+        modalContent.find("#parentEmail").text(parentEmail)
+    }
+    if (childEmail != false) {
+        modalContent.find("#childEmail").text(childEmail)
+    }
+
     modalContent = modalContent.html();
     openModal(modalContent, () => {
         if (is_time_to('delete_pair')) {
@@ -438,8 +449,14 @@ $(document).ready(function() {
             traditional: true,
             contentType: "application/json; charset=utf-8",
             success: function(data) {
-                parentName = data.member.parent_barcode_base + ' - ' + data.member.parent_name;
+                if (data.member.parent_barcode_base !== undefined) {
+                    parentName = data.member.parent_barcode_base + ' - ' + data.member.parent_name;
+                } else {
+                    parentName = data.member.parent_name;
+                }
+                parentEmail = data.member.parent_email;
                 childName = data.member.barcode_base + ' - ' + data.member.name;
+                childEmail = data.member.email;
                 confirmDeletion(childId);
             },
             error: function(data) {

templates/members/admin/manage_attached_delete_pair.html

@@ -18,16 +18,28 @@
   <div id="confirmModal">
       <h3>Le binôme est sur le point d'être désolidarisé</h3>
       <br />
+      Êtes-vous sûr.e de vouloir désolidariser :
       <div>
-        Êtes-vous sur de vouloir désolidariser
+       
         <div class="attached-members">
             <div class="member">
-                <div class="name"><strong><span id="parentName"></span></strong> (titulaire)</div> 
-                <div><input type="checkbox" name="parent_gone" class="after_unattached_state" /></div>
+                <div class="name">
+                    <strong><span id="parentName"></span></strong> (titulaire)<br />
+                    <i><span id="parentEmail"></span></i>
+                    <div class="select_after_unattached_state">
+                        <input type="checkbox" name="parent_gone" class="after_unattached_state" />
+                    </div>
+                </div> 
             </div>
+            et
             <div class="member">
-                <div class="name"><strong><span id="childName"></span></strong></div>
-                <div><input type="checkbox" name="child_gone" class="after_unattached_state" /></div>
+                <div class="name">
+                    <strong><span id="childName"></span></strong><br />
+                    <i><span id="childEmail"></span></i>
+                    <div class="select_after_unattached_state">
+                        <input type="checkbox" name="child_gone" class="after_unattached_state" />
+                    </div>
+                </div>
             </div>
         </div>
       </div>