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

Merge branch 'releases/release-h2f' of https://gitlab.com/ezwaytechnology/nextcloud_custom_apps into releases/release-h2f

Browse Source
This commit is contained in:
Narindra ezway 2025-03-28 18:00:43 +03:00
commit 452e363877
4 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gestion/lib/Controller/PageController.php
View File

@ -2599,7 +2599,7 @@ class PageController extends Controller {
* *
*/ */
public function exportThanatoStatistic($thanatoIdsToExport){ public function exportThanatoStatistic($thanatoIdsToExport,$month,$year){
if(empty($thanatoIdsToExport)){ if(empty($thanatoIdsToExport)){
return ""; return "";
} }

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

@ -3273,7 +3273,7 @@ class Bdd {
} }
private function getDevisTalkRoomClientContent($clientPrenom){ private function getDevisTalkRoomClientContent($clientPrenom){
$message = ". Pour PF: "; $message = "Pour PF: ";
$clientNameContent = "aucun"; $clientNameContent = "aucun";
$clientPrenomIsSet = $clientPrenom != null && $clientPrenom != "" && $clientPrenom != "-"; $clientPrenomIsSet = $clientPrenom != null && $clientPrenom != "" && $clientPrenom != "-";
if($clientPrenomIsSet){ if($clientPrenomIsSet){
@ -3295,8 +3295,16 @@ class Bdd {
} }
$calendarData = $this->getCalendarDataByCalendarObjectUuid($devis->num); $calendarData = $this->getCalendarDataByCalendarObjectUuid($devis->num);
$devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData); $devisTimeValue = VCalendarHelpers::GetStartAndEndTimeFromVCalendarString($calendarData);
$devis->startTime = $devisTimeValue["startTime"]; $startTimeValueWithMinutes = "";
$devis->endTime = $devisTimeValue["endTime"]; $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 = $this->getDevisProduits($devisId);
$devisProducts = json_encode($devisProducts); $devisProducts = json_encode($devisProducts);
$devisProducts = json_decode($devisProducts); $devisProducts = json_decode($devisProducts);
@ -3308,7 +3316,7 @@ class Bdd {
if(empty($devisProducts)){ if(empty($devisProducts)){
return ""; return "";
} }
$productMessage = ". ACTE A FAIRE : "; $productMessage = "ACTE A FAIRE : ";
foreach($devisProducts as $product){ foreach($devisProducts as $product){
$productMessage.= html_entity_decode($product->produit_reference).", "; $productMessage.= html_entity_decode($product->produit_reference).", ";
} }
@ -3326,19 +3334,24 @@ class Bdd {
$devisDate = $devisDate->format('d/m/Y'); $devisDate = $devisDate->format('d/m/Y');
$message = "NOUVELLE INTERVENTION: "; $message = "NOUVELLE INTERVENTION: ";
$message .= html_entity_decode($devis->nom_defunt) . ' '; $message .= html_entity_decode($devis->nom_defunt) . ' ';
$message .= 'le '.$devisDate. ' '; $message .= '
$message .= 'à '.$devis->startTime. ' '; le '.$devisDate;
$message .= 'à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin); $message .= ' à '.$devis->startTime. ' ';
$message .= '
à '.html_entity_decode($devis->lieu). ' '. html_entity_decode($devis->adresse_soin);
$clientMessageContent = $this->getDevisTalkRoomClientContent($devis->prenom); $clientMessageContent = $this->getDevisTalkRoomClientContent($devis->prenom);
$message .= $clientMessageContent; $message .= '
'.$clientMessageContent;
$productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products); $productMessage = $this->getDevisTalkRoomProductSectionMessage($devis->products);
$message .= $productMessage; $message .= '
'.$productMessage;
$comment = "aucun"; $comment = "aucun";
if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){ if(strtolower($devis->comment) != "commentaire" && $devis->comment != ""){
$comment = html_entity_decode($devis->comment); $comment = html_entity_decode($devis->comment);
} }
$message .= ". COMMENTAIRES: ".$comment.". "; $message .= "
COMMENTAIRES: ".$comment;
$locationCodes = [ $locationCodes = [
"Code portail" => $devis->portal_code, "Code portail" => $devis->portal_code,
"Code alarme" => $devis->alarm_code, "Code alarme" => $devis->alarm_code,
@ -3353,7 +3366,8 @@ class Bdd {
$locationCodeMessageContent .= $label. ": ".$value.". "; $locationCodeMessageContent .= $label. ": ".$value.". ";
} }
$locationCodeMessageContent = trim($locationCodeMessageContent); $locationCodeMessageContent = trim($locationCodeMessageContent);
$message .= $locationCodeMessageContent; $message .= '
'.$locationCodeMessageContent;
return $message; return $message;
} }

4
gestion/lib/Helpers/VCalendarHelpers.php
View File

@ -40,6 +40,8 @@ class VCalendarHelpers
$endTimeValue = ""; $endTimeValue = "";
$totalHours = 0; $totalHours = 0;
$totalWorkedHours = 0; $totalWorkedHours = 0;
$dateStart = null;
$dateEnd = null;
if($vCalendarString != ""){ if($vCalendarString != ""){
$dateStart = self::GetDateStartOrDateEndFromVCalendarString("DTSTART", $vCalendarString); $dateStart = self::GetDateStartOrDateEndFromVCalendarString("DTSTART", $vCalendarString);
if($dateStart != null){ if($dateStart != null){
@ -53,6 +55,8 @@ class VCalendarHelpers
$totalWorkedHours = DateHelpers::GetWorkingHoursBetweenDatetimeEndAndDatetimeStart($dateEnd,$dateStart); $totalWorkedHours = DateHelpers::GetWorkingHoursBetweenDatetimeEndAndDatetimeStart($dateEnd,$dateStart);
} }
return [ return [
"datetimeStart" => $dateStart,
"datetimeEnd" => $dateEnd,
"startTime" => $startTimeValue, "startTime" => $startTimeValue,
"endTime" => $endTimeValue, "endTime" => $endTimeValue,
"totalHours" => $totalHours, "totalHours" => $totalHours,

8
gestion/lib/Service/ExportThanatoStatisticService.php
View File

@ -160,8 +160,8 @@ class ExportThanatoStatisticService {
''.';'. ''.';'.
DateHelpers::getPublicHolidayText($leave['isPublicHoliday']).';'. DateHelpers::getPublicHolidayText($leave['isPublicHoliday']).';'.
$leaveValue.';'. $leaveValue.';'.
$diseaseValue.';'.
$restValue.';'. $restValue.';'.
$diseaseValue.';'.
''.';'. ''.';'.
''.';'. ''.';'.
''.';'. ''.';'.
@ -203,7 +203,8 @@ class ExportThanatoStatisticService {
} }
} }
} }
$totalWorkedHours -= $totalLeaveHours - $totalRestHours - $totalDiseaseHours; $totalAbsenceHours = $totalLeaveHours + $totalRestHours + $totalDiseaseHours;
$totalWorkedHours -= $totalAbsenceHours;
} }
else{ else{
$routeLines = $this->gestionBdd->getRouteLinesByDevisIdList($devisData["devisId"]); $routeLines = $this->gestionBdd->getRouteLinesByDevisIdList($devisData["devisId"]);
@ -233,7 +234,8 @@ class ExportThanatoStatisticService {
} }
} }
} }
$totalWorkedHours -= $totalLeaveHours - $totalRestHours - $totalDiseaseHours; $totalAbsenceHours = $totalLeaveHours + $totalRestHours + $totalDiseaseHours;
$totalWorkedHours -= $totalAbsenceHours;
} }
$fileContent = $this->populateLastRecapForTheLine( $fileContent = $this->populateLastRecapForTheLine(
$fileContent, $fileContent,