slambert/Thanasoft-Hytha
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into production

Browse Source
This commit is contained in:
Tiavina 2025-06-10 15:30:32 +03:00
commit 024df6bcd8
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gestion/lib/Db/Bdd.php
View File

@ -2541,11 +2541,20 @@ class Bdd {
}
}
$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;