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;