From 35f9f34c0204b73a20af40384ac48b0d2786a3a5 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Wed, 2 Apr 2025 12:19:35 +0300
Subject: [PATCH] add minutes into talk message

---
 gestion/lib/Db/Bdd.php                   | 14 +++++++++++---
 gestion/lib/Helpers/VCalendarHelpers.php |  4 ++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index ccb5e60..d6b1fa9 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -3840,8 +3840,16 @@ class Bdd {
         }
         $calendarData = $this->getCalendarDataByCalendarObjectUuid($devis->num);
         $devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData);
-        $devis->startTime = $devisTimeValue["startTime"];
-        $devis->endTime = $devisTimeValue["endTime"];
+        $startTimeValueWithMinutes = "";
+        $endTimeValueWithMinutes = "";
+        if($devisTimeValue["datetimeStart"]){
+            $startTimeValueWithMinutes = $devisTimeValue["datetimeStart"]->format('H\hi');
+        }
+        if($devisTimeValue["datetimeEnd"]){
+            $endTimeValueWithMinutes = $devisTimeValue["datetimeEnd"]->format('H\hi');
+        }
+        $devis->startTime = $startTimeValueWithMinutes;
+        $devis->endTime = $endTimeValueWithMinutes;
         $devisProducts = $this->getDevisProduits($devisId);
         $devisProducts = json_encode($devisProducts);
         $devisProducts = json_decode($devisProducts);
@@ -3885,7 +3893,7 @@ class Bdd {
         $message .= html_entity_decode($devis->nom_defunt);
         $message .= '
 le '.$devisDate;
-        $message .= 'à '.$devis->startTime. ' ';
+        $message .= ' à '.$devis->startTime. ' ';
         $message .= '
 à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin);
 
diff --git a/gestion/lib/Helpers/VCalendarHelpers.php b/gestion/lib/Helpers/VCalendarHelpers.php
index 2b4f9d6..411ad18 100644
--- a/gestion/lib/Helpers/VCalendarHelpers.php
+++ b/gestion/lib/Helpers/VCalendarHelpers.php
@@ -41,6 +41,8 @@ class VCalendarHelpers
         $endTimeValue = "";
         $totalHours = 0;
         $totalWorkedHours = 0;
+        $dateStart = null;
+        $dateEnd = null;
         if($vCalendarString != ""){
             $dateStart = self::GetDateStartOrDateEndFromVCalendarString("DTSTART", $vCalendarString);
             if($dateStart != null){
@@ -54,6 +56,8 @@ class VCalendarHelpers
             $totalWorkedHours = DateHelpers::GetWorkingHoursBetweenDatetimeEndAndDatetimeStart($dateEnd,$dateStart);
         }
         return [
+            "datetimeStart" => $dateStart,
+            "datetimeEnd" => $dateEnd,
             "startTime" => $startTimeValue,
             "endTime"  => $endTimeValue,
             "totalHours" => $totalHours,