From 964a7aa6a5479ee1774fdb3b972de50d44bce350 Mon Sep 17 00:00:00 2001
From: Narindra ezway <narindra@ezway-technology.com>
Date: Tue, 1 Apr 2025 10:50:08 +0300
Subject: [PATCH 1/2] adjust layout of absence type selection in EditSidebar

---
 calendar/src/views/EditSidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/calendar/src/views/EditSidebar.vue b/calendar/src/views/EditSidebar.vue
index f34e917..3afe408 100644
--- a/calendar/src/views/EditSidebar.vue
+++ b/calendar/src/views/EditSidebar.vue
@@ -105,7 +105,7 @@
 
 			
 
-			<div style='display:flex ;margin-left: 8px;'>
+			<div style='margin-top: 13px; display:flex ;margin-left: 8px;'>
 				<div style='width:70%'>
 					<PropertySelectAbsenceType 
 						:value="absenceType"

From cbdc047514986d9dde9dbaf70099eecfa6d44488 Mon Sep 17 00:00:00 2001
From: Narindra ezway <narindra@ezway-technology.com>
Date: Tue, 1 Apr 2025 11:48:00 +0300
Subject: [PATCH 2/2] refactor email body formatting in GestionService

---
 gestion/lib/Service/GestionService.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/gestion/lib/Service/GestionService.php b/gestion/lib/Service/GestionService.php
index 0622663..9340132 100644
--- a/gestion/lib/Service/GestionService.php
+++ b/gestion/lib/Service/GestionService.php
@@ -536,15 +536,12 @@ class GestionService {
 		    $this->userConnectedStorage->getFullPath("/");
             $subject = "Piece jointe";
             $body = "
-            <p>Bonjour.</p> 
-            <p>Vous trouverez ci-dessous l'email et le(s) pièce(s) jointe(s) de  « $defunt_nom ».</p> 
-            <p>Vous en souhaitant bonne réception</p> 
+                <p>Bonjour.</p> 
+                <p>Vous trouverez ci-dessous l'email et le(s) pièce(s) jointe(s) de « $defunt_nom ».</p> 
+                <p>Vous en souhaitant bonne réception</p> 
 
-            <div>{$emailBody['subject']}</div>
-            <div>{$emailBody['body']}</div>
-            
-            
-            ";
+                <div>" . ($emailBody['subject'] ?? '') . "</div>
+                <div>" . ($emailBody['body'] ?? '') . "</div>";
             
             $message = $this->mailer->createMessage();
             $message->setSubject($subject);