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

Merge branch 'fixes/fix-stat-features' into releases/release-h2f

Browse Source
This commit is contained in:
Tiavina 2025-03-28 16:48:21 +03:00
commit f252f931d7
2 changed files with 6 additions and 4 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)){
return "";
}

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

@ -160,8 +160,8 @@ class ExportThanatoStatisticService {
''.';'.
DateHelpers::getPublicHolidayText($leave['isPublicHoliday']).';'.
$leaveValue.';'.
$diseaseValue.';'.
$restValue.';'.
$diseaseValue.';'.
''.';'.
''.';'.
''.';'.
@ -203,7 +203,8 @@ class ExportThanatoStatisticService {
}
}
}
$totalWorkedHours -= $totalLeaveHours - $totalRestHours - $totalDiseaseHours;
$totalAbsenceHours = $totalLeaveHours + $totalRestHours + $totalDiseaseHours;
$totalWorkedHours -= $totalAbsenceHours;
}
else{
$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,