From 6b5f0ad32e2a023659154a7d3c2741943d9ef53d Mon Sep 17 00:00:00 2001
From: narindraezway <narindra@ezway-technology.com>
Date: Thu, 5 Jun 2025 10:57:41 +0300
Subject: [PATCH 1/2] remove text orthogrph

---
 gestion/lib/Service/InvoicePdfHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gestion/lib/Service/InvoicePdfHandler.php b/gestion/lib/Service/InvoicePdfHandler.php
index 1a274b9..9609380 100644
--- a/gestion/lib/Service/InvoicePdfHandler.php
+++ b/gestion/lib/Service/InvoicePdfHandler.php
@@ -204,7 +204,7 @@ class InvoicePdfHandler extends FPDF
         $this->Cell(0, $this->interLigneHeader, trim(FileExportHelpers::FormatTextForExport($this->factureData['client_adress_city'])));
         $clientInfoYAxis += $this->interLigneHeader;
         $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
-        $this->Cell(0, $this->interLigneHeader,'Siret6: ' . $this->factureData['siret']);
+        $this->Cell(0, $this->interLigneHeader,'Siret: ' . $this->factureData['siret']);
         $clientInfoYAxis += $this->interLigneHeader;
         $this->SetXY($clientInfoXAxis, $clientInfoYAxis);
         $this->Cell(0, $this->interLigneHeader, FileExportHelpers::FormatTextForExport('Mail : ') . $this->factureData['client_mail']);

From 81a4f9a786c8b2eb788389f4e1e522f48c762388 Mon Sep 17 00:00:00 2001
From: Tiavina <tiavina@ezway-technology.com>
Date: Tue, 10 Jun 2025 15:29:43 +0300
Subject: [PATCH 2/2] add minutes into statistics

---
 gestion/lib/Db/Bdd.php | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/gestion/lib/Db/Bdd.php b/gestion/lib/Db/Bdd.php
index 2c6ac9d..8eaa7a1 100644
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@@ -2540,12 +2540,21 @@ class Bdd {
                                 $absenceTypeLabel = VCalendarPropertyConstant::ABSENCE_TYPES_KEYS_VALUES[$absenceTypeKey]; ;
                             }
                         }
+
+                        $startTimeValueWithMinutes = "";
+                        $endTimeValueWithMinutes = "";
+                        if($leaveTime["datetimeStart"]){
+                            $startTimeValueWithMinutes = $leaveTime["datetimeStart"]->format('H\hi');
+                        }
+                        if($leaveTime["datetimeEnd"]){
+                            $endTimeValueWithMinutes = $leaveTime["datetimeEnd"]->format('H\hi');
+                        }
                         
 
                         $devisListPerThanatoPerDate[$currentDateFormatted]["leaves"][] = [
                             "onLeave" => true,
-                            "startTime" => $leaveTime["startTime"],
-                            "endTime" => $leaveTime["endTime"],
+                            "startTime" => $startTimeValueWithMinutes,
+                            "endTime" => $endTimeValueWithMinutes,
                             "thanatoName"=>$thanatoName,
                             "date" => $currentDateFormatted,
                             "totalHours" => $leaveTime["totalHours"],
@@ -2578,6 +2587,14 @@ class Bdd {
                 $thanatoLeavesThisDay = $this->getThanatoLeaveByCalendarAndDate($thanatoCalendarId,$currentDate);
                 foreach($thanatoLeavesThisDay as $currentLeave){
                     $leaveTime = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($currentLeave['calendardata']);
+                    $startTimeValueWithMinutes = "";
+                    $endTimeValueWithMinutes = "";
+                    if($leaveTime["datetimeStart"]){
+                        $startTimeValueWithMinutes = $leaveTime["datetimeStart"]->format('H\hi');
+                    }
+                    if($leaveTime["datetimeEnd"]){
+                        $endTimeValueWithMinutes = $leaveTime["datetimeEnd"]->format('H\hi');
+                    }
                     $absenceType = VCalendarHelpers::GetValueFromKeyInVCalendarString(VCalendarPropertyConstant::ABSENCE_TYPE,$currentLeave['calendardata']);
                     $absenceTypeKey = null;
                     $absenceTypeLabel = null;
@@ -2594,8 +2611,8 @@ class Bdd {
                     }
                     $devisListPerThanatoPerDate[$currentDateFormatted]["leaves"][] = [
                         "onLeave" => true,
-                        "startTime" => $leaveTime["startTime"],
-                        "endTime" => $leaveTime["endTime"],
+                        "startTime" => $startTimeValueWithMinutes,
+                        "endTime" => $endTimeValueWithMinutes,
                         "thanatoName"=>$thanatoName,
                         "date" => $currentDateFormatted,
                         "totalHours" => $leaveTime["totalHours"],
@@ -2682,8 +2699,16 @@ class Bdd {
     public function setDevisStartAndEndTime($devis){
         $calendarData = $this->getCalendarDataByCalendarObjectUuid($devis["calendar_uuid"]);
         $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;
         $devis["totalHours"] = $devisTimeValue["totalHours"];
         $devis["totalWorkedHours"] = $devisTimeValue["totalWorkedHours"];
         return $devis;