fix recap pdf

fix recap devis multi product
fix erreur stats thanato
2025-12-16 09:07:49 +03:00 · 2025-12-15 11:58:11 +03:00 · 2025-11-20 09:45:34 +03:00 · 2025-11-19 12:01:51 +03:00 · 2025-11-17 17:27:40 +03:00 · 2025-11-17 13:23:47 +03:00
8 changed files with 678 additions and 427 deletions
--- a/gestion/lib/Db/Bdd.php
+++ b/gestion/lib/Db/Bdd.php
@ -2615,7 +2615,7 @@ class Bdd
        return $data;
    }

-    private function getThanatoDevisListByDate($thanatoId, $date)
+    private function getThanatoDevisListByDateSave($thanatoId, $date)
    {
        $dateFormatted = $date->format('Y-m-d');
        $sql = "SELECT 
@ -2656,6 +2656,42 @@ class Bdd
        return $devisList;
    }

+    private function getThanatoDevisListByDate($thanatoId, $date)
+    {
+        $dateFormatted = $date->format('Y-m-d');
+        $sql = "SELECT 
+                    devis.id, 
+                    devis.date, 
+                    devis.mentions,
+                    devis.num as calendar_uuid,
+                    devis.id_defunt as id_defunt,
+                    devis.id_lieu as id_lieu,
+                    devis.id_client as id_client,
+                    devis.id_thanato as id_thanato, 
+                    thanato.nom as nom_thanato, 
+                    thanato.prenom as prenom_thanato,
+                    defunt.nom as nom_defunt,
+                    lieu.nom as nom_lieu,
+                    lieu.latitude as lieu_latitude,
+                    lieu.longitude as lieu_longitude,
+                    client.nom as nom_client,
+                    client.entreprise as client_entreprise,
+                    client.adresse as client_adresse
+                FROM ".$this->tableprefix."devis as devis
+                    LEFT JOIN ".$this->tableprefix."thanato as thanato on devis.id_thanato = thanato.id
+                    LEFT JOIN ".$this->tableprefix."lieu as lieu on devis.id_lieu = lieu.id
+                    LEFT JOIN ".$this->tableprefix."defunt as defunt on devis.id_defunt = defunt.id
+                    LEFT JOIN ".$this->tableprefix."client as client on devis.id_client = client.id
+                    WHERE devis.date = ? AND
+                    devis.id_thanato = ?
+                    ORDER BY devis.date ASC;";
+        $devisList = $this->execSQLNoJsonReturn(
+            $sql,
+            [$dateFormatted,$thanatoId]
+        );
+        return $devisList;
+    }
+
    public function getThanatoById($thanatoId)
    {
        $sql = "SELECT id, nom, prenom,fk_user_uuid FROM ".$this->tableprefix."thanato WHERE id = ? LIMIT 1;";
@ -3153,7 +3189,7 @@ class Bdd
        return 0;
    }

-    private function getClientFactureStatisticPerMonth($clientId, array $produitList)
+    private function getClientFactureStatisticPerMonthSave($clientId, array $produitList)
    {
        $currentYear = date('Y');
        $monthLists = range(1, 12);
@ -3174,12 +3210,11 @@ class Bdd
                LEFT JOIN ".$this->tableprefix."devis as devis on facture.id_devis = devis.id
                WHERE YEAR(facture.date_paiement) = ? AND 
                MONTH(facture.date_paiement) = ? AND 
-                devis.id_client = ? AND
-                (devis.mentions = ? OR devis.mentions = ?)
+                devis.id_client = ? 
                ORDER BY facture.date_paiement ASC;";
            $factureList = $this->execSQLNoJsonReturn(
                $sql,
-                [$currentYear,$monthValue,$clientId,DevisMentionConstant::FACTURED,DevisMentionConstant::FACTURED_FORMATTED]
+                [$currentYear,$monthValue,$clientId]
            );

            $factureDevisIds = [];
@ -3209,6 +3244,58 @@ class Bdd
        return $data;
    }

+    private function getClientFactureStatisticPerMonth($clientId, array $produitList, $clientGroupId = null)
+    {
+        $currentYear = date('Y');
+        $monthLists = range(1, 12);
+        $data = [] ;
+        foreach($monthLists as $monthValue) {
+            if(!isset($data[$monthValue])) {
+                $data[$monthValue] = [];
+            }
+            $sql = "SELECT
+                devis.id as devis_id,
+                devis.id_client as devis_client_id,
+                devis.date as devis_date,
+                devis.mentions as devis_mention
+                FROM ".$this->tableprefix."devis as devis
+                WHERE YEAR(devis.date) = ? AND 
+                MONTH(devis.date) = ? AND 
+                devis.id_client = ? 
+                ORDER BY devis.date ASC;";
+            $factureList = $this->execSQLNoJsonReturn(
+                $sql,
+                [$currentYear,$monthValue,$clientId]
+            );
+
+            $factureDevisIds = [];
+            foreach($factureList as $facture) {
+                $factureDevisIds[] = $facture['devis_id'];
+            }
+
+            $defuntCount = count($factureList);
+            $produitsPrice = 0;
+            $statisticForeachProductPerMonth = [];
+            foreach($produitList as $produit) {
+                if(!isset($statisticForeachProductPerMonth[$produit['id']])) {
+                    $statisticForeachProductPerMonth[$produit['id']] = 0;
+                }
+                $productTotalCount = $this->getDevisProductsQuantityByDevisListAndProductId($factureDevisIds, $produit['id']);
+                $prixUnitaire = is_null($clientGroupId) ? $produit["prix_unitaire"] : $this->getProductPriceByClientGroupId($clientGroupId, $produit['id']);
+                $totalWithoutVat = $productTotalCount * $prixUnitaire;
+                $statisticForeachProductPerMonth[$produit['id']] += $productTotalCount;
+                $produitsPrice += $totalWithoutVat;
+            }
+            $data[$monthValue] = [
+                "defunt_count" => $defuntCount,
+                "total_price" => $produitsPrice,
+                "year" => $currentYear,
+                "products" => $statisticForeachProductPerMonth
+            ];
+        }
+        return $data;
+    }
+
    public function getExportClientStatData(array $clientIds)
    {
        $data = [];
@ -3222,9 +3309,10 @@ class Bdd
            $client = $this->getClientById($clientId);
            if($client != null) {
                $clientName = trim($client["client_nom"]) . '-' .trim($client['client_entreprise']);
+                $clientGroupId = $client['fk_client_group_id'];
            }
            $data[$clientId]["client_name"] = $clientName;
-            $data[$clientId]["client_data"] = $this->getClientFactureStatisticPerMonth($clientId, $produitList);
+            $data[$clientId]["client_data"] = $this->getClientFactureStatisticPerMonth($clientId, $produitList, $clientGroupId);
        }
        return $data;
    }
--- a/gestion/lib/Service/Devis/DevisDataProcessor.php
+++ b/gestion/lib/Service/Devis/DevisDataProcessor.php
@ -85,9 +85,9 @@ class DevisDataProcessor
        }

        // Traitement identique aux factures
-        $produitsReferenceArray = array_unique($produitsReferenceArray);
+        // $produitsReferenceArray = array_unique($produitsReferenceArray);
        $produitsReferenceAsString = implode("-", $produitsReferenceArray);
-        $devis_temp['article'] = !empty($produitsReferenceAsString) ? $produitsReferenceAsString : 'SOINS';
+        $devis_temp['article'] = !empty($produitsReferenceAsString) ? $produitsReferenceAsString : '';

        $devis_temp['montant_tva'] = ($devis_temp['montant_htc'] * $devis_temp['tva']) / 100;
        $devis_temp['montant_ttc'] = $devis_temp['montant_tva'] + $devis_temp['montant_htc'];
--- a/gestion/lib/Service/Devis/DevisPdfGenerator.php
+++ b/gestion/lib/Service/Devis/DevisPdfGenerator.php
@ -81,16 +81,31 @@ class DevisPdfGenerator

    private function calculatePagination($totalItems)
    {
+        if ($totalItems <= 8) {
+            // Tout sur 1 page
            return [
-            'nb_pages' => ceil($totalItems / 12), // RÉDUIRE à 12 par page
-            'items_per_page' => 12,
+                'nb_pages' => 1,
+                'items_per_page' => 15,
+                'current_index' => 0
+            ];
+        }
+
+        // Réserver 8 items pour dernière page
+        $itemsAvantDernierePage = $totalItems - 8;
+        $nbPagesNormales = ceil($itemsAvantDernierePage / 15);
+
+        return [
+            'nb_pages' => $nbPagesNormales + 1,
+            'items_per_page' => 15,
            'current_index' => 0
        ];
    }

-    // VOICI LA FONCTION CORRIGÉE - 4 paramètres au lieu de 10
    private function generateSinglePage(PageContext $context, $num_page, &$pagination, &$totals)
    {
+        $startIndex = $pagination['current_index'];
+        $remainingItems = count($context->dataDevis) - $startIndex;
+
        $context->pdf->AddPage();
        $context->pdf->SetAutoPagebreak(false);
        $context->pdf->SetMargins(0, 0, 10);
@ -100,7 +115,17 @@ class DevisPdfGenerator
        $this->layoutManager->addClientInfoSection($context->pdf, $context->clientInfo, $context->dataDevis[0]);
        $this->layoutManager->addDocumentTitle($context->pdf, $context->dataDevis[0], $context->year);

-        $itemsToProcess = min($pagination['items_per_page'], count($context->dataDevis) - $pagination['current_index']);
+        // ✅ Calculer items
+        $isLastPage = ($num_page == $pagination['nb_pages']);
+        $hasAmounts = !$context->montant;
+
+        if ($isLastPage && $hasAmounts) {
+            // Dernière page avec totaux : max 8 items
+            $itemsToProcess = min(8, $remainingItems);
+        } else {
+            // Pages normales : 15 items
+            $itemsToProcess = min(15, $remainingItems);
+        }

        $config = [
            'pagination' => $pagination,
@ -111,7 +136,7 @@ class DevisPdfGenerator
            'sansMontant' => $context->montant
        ];

-        $this->tableRenderer->createDevisTable(
+        $finalY = $this->tableRenderer->createDevisTable(
            $context->pdf,
            $context->dataDevis,
            $config
--- a/gestion/lib/Service/Devis/DevisPdfLayoutManager.php
+++ b/gestion/lib/Service/Devis/DevisPdfLayoutManager.php
@ -63,17 +63,18 @@ class DevisPdfLayoutManager
        );
    }

-    public function addLegalFooter($pdf, $config)
+    public function addLegalFooter($pdf, $config, $tableEndY = 0)
    {
-        $y0 = 260;
+        $y0 = 280;
+
        $pageWidth = $pdf->GetPageWidth();

        $pdf->SetFont('Arial', '', 6);
-        $pdf->SetXY(1, $y0 + 4);
+        $pdf->SetXY(1, $y0);
        $pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->legal_one), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
-        $pdf->SetXY(1, $y0 + 8);
+        $pdf->SetXY(1, $y0 + 4);
        $pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->legal_two), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
-        $pdf->SetXY(1, $y0 + 12);
+        $pdf->SetXY(1, $y0 + 8);
        $pdf->Cell($pageWidth, 5, mb_convert_encoding(html_entity_decode($config->telephone), 'ISO-8859-1', 'UTF-8'), 0, 0, 'C');
    }

--- a/gestion/lib/Service/Devis/DevisPdfTableRenderer.php
+++ b/gestion/lib/Service/Devis/DevisPdfTableRenderer.php
@ -13,40 +13,59 @@ class DevisPdfTableRenderer
        $totals = &$config['totals'];
        $sansMontant = $config['sansMontant'] ?? false;

-        // Système de pagination comme les factures
-        $maxItemsPerPage = 22; // Nombre maximum d'éléments par page
        $startIndex = $pagination['current_index'];
        $itemsThisPage = min($itemsToProcess, count($dataDevis) - $startIndex);

-        $this->drawTableStructure($pdf, $numPage, $nbPage, $sansMontant);
+        $tableEndY = $this->drawTableStructure($pdf, $numPage, $nbPage, $sansMontant, $itemsThisPage);
        $this->addTableHeaders($pdf, $sansMontant);
        $this->populateTableData($pdf, $dataDevis, $startIndex, $itemsThisPage, $totals, $sansMontant);

-        // Totaux seulement sur la dernière page
        if ($numPage == $nbPage && !$sansMontant) {
-            $this->addTableTotals($pdf, $totals);
-        }
+            $finalY = $this->addTableTotals($pdf, $totals, $tableEndY);
+        } else {
+            $finalY = $tableEndY;
        }

-    private function drawTableStructure($pdf, $numPage, $nbPage, $sansMontant)
+        return $finalY;
+    }
+
+    private function drawTableStructure($pdf, $numPage, $nbPage, $sansMontant, $itemsOnPage)
    {
        $pdf->SetLineWidth(0.2);
-        $pdf->Rect(5, 105, 200, 130, "D");
+
+        $headerHeight = 10;
+        $rowHeight = 10;
+
+        $tableHeight = $headerHeight + ($itemsOnPage * $rowHeight);
+        $endY = 105 + $tableHeight;
+
+        $isLastPage = ($numPage == $nbPage);
+        $hasAmounts = !$sansMontant;
+
+        if ($isLastPage && $hasAmounts) {
+            // Dessiner 3 côtés seulement (haut, gauche, droite)
+            $pdf->Line(5, 105, 205, 105); // Haut
+            $pdf->Line(5, 105, 5, $endY); // Gauche
+            $pdf->Line(205, 105, 205, $endY); // Droite
+            // Pas de ligne du bas - elle sera tracée dans addTableTotals
+        } else {
+            // Dessiner rectangle complet
+            $pdf->Rect(5, 105, 200, $tableHeight, "D");
+        }
+
        $pdf->Line(5, 115, 205, 115);

-        $endY = ($numPage == $nbPage && !$sansMontant) ? 225 : 235;
-
        if (!$sansMontant) {
-            // Ajout de la colonne Thanatopracteur entre Défunt et H.T.
            $verticalLines = [24, 41, 58, 77, 102, 127, 147, 167, 178, 189];
        } else {
-            // Pour sans montant: ajout de Thanatopracteur à la fin
            $verticalLines = [27, 47, 67, 85, 110, 135, 160];
        }

        foreach ($verticalLines as $x) {
            $pdf->Line($x, 105, $x, $endY);
        }
+
+        return $endY;
    }

    private function addTableHeaders($pdf, $sansMontant)
@ -176,43 +195,44 @@ class DevisPdfTableRenderer
        }
    }

-    private function addTableTotals($pdf, $totals)
+    private function addTableTotals($pdf, $totals, $tableEndY)
    {
-        $pdf->Line(5, 225, 205, 225);
+        $totalEndY = $tableEndY + 8;
+
+        $pdf->SetLineWidth(0.2);
+
+        // Juste les lignes horizontales haut et bas
+        $pdf->Line(5, $tableEndY, 205, $tableEndY);
+        $pdf->Line(5, $totalEndY, 205, $totalEndY);
+
+        $pdf->Line(5, $tableEndY, 5, $totalEndY);
+        $pdf->Line(205, $tableEndY, 205, $totalEndY);
+
        $pdf->SetFont('Arial', 'B', 8);

-        // Alignement des totaux avec les colonnes HT, TVA, TTC avec espaces entre les valeurs
-        $pdf->SetXY(5, 225);
+        $pdf->SetXY(5, $tableEndY);
        $pdf->Cell(162, 8, 'TOTAL', 0, 0, 'C');

-        // POSITIONS avec espaces entre les valeurs - plus d'espace entre HT et TVA
-        $pdf->SetXY(167, 225);
+        $pdf->SetXY(167, $tableEndY);
        $pdf->Cell(9, 8, number_format($totals['ht'], 2, '.', '') . chr(128), 0, 0, 'R');

-        $pdf->SetXY(181, 225);
+        $pdf->SetXY(181, $tableEndY);
        $pdf->Cell(9, 8, number_format($totals['tva'], 2, '.', '') . chr(128), 0, 0, 'R');

-        $pdf->SetXY(189, 225);
+        $pdf->SetXY(189, $tableEndY);
        $pdf->Cell(16, 8, number_format($totals['ttc'], 2, '.', '') . chr(128), 0, 0, 'R');

-        // CADRE TOTAL TTC - Cadre encore plus agrandi
-        $pdf->SetXY(170, 241);
+        $cadreY = $totalEndY + 3;
+
+        $pdf->SetXY(170, $cadreY + 1);
        $pdf->Cell(19, 6, 'TOTAL TTC', 0, 0, 'C');

-        $pdf->SetXY(189, 241);
+        $pdf->SetXY(189, $cadreY + 1);
        $pdf->Cell(16, 6, number_format($totals['ttc'], 2, '.', '') . chr(128), 0, 0, 'C');

-        // Cadre TOTAL TTC aligné avec la fin du tableau (205)
-        $lines = [
-            [170, 240, 170, 248],   // Ligne verticale gauche (déplacée de 173 à 170 pour agrandir)
-            [189, 240, 189, 248],   // Ligne de séparation (alignée avec colonne T.T.C)
-            [205, 240, 205, 248],   // Ligne verticale droite (alignée avec fin du tableau)
-            [170, 240, 205, 240],   // Ligne horizontale haute
-            [170, 248, 205, 248]    // Ligne horizontale basse
-        ];
+        $pdf->Rect(170, $cadreY, 35, 8, 'D');
+        $pdf->Line(189, $cadreY, 189, $cadreY + 8);

-        foreach ($lines as $line) {
-            $pdf->Line($line[0], $line[1], $line[2], $line[3]);
-        }
+        return $cadreY + 8;
    }
 }
--- a/gestion/lib/Service/ExportClientStatisticService.php
+++ b/gestion/lib/Service/ExportClientStatisticService.php
@ -30,7 +30,8 @@ use OCA\Gestion\Db\Bdd;
 use OCA\Gestion\Helpers\FileExportHelpers;
 use Psr\Log\LoggerInterface;

-class ExportClientStatisticService {
+class ExportClientStatisticService
+{
    /** @var Bdd */
    private $gestionBdd;

@ -39,24 +40,27 @@ class ExportClientStatisticService {

    public function __construct(
        Bdd $gestionBdd,
-		LoggerInterface $logger) {
+        LoggerInterface $logger
+    ) {
        $this->logger = $logger;
        $this->gestionBdd = $gestionBdd;
    }

-    public function getFileName(array $clientIds){
+    public function getFileName(array $clientIds)
+    {
        $filename = "";
        $clients = $this->gestionBdd->getClientsByClientsID($clientIds);
-        foreach($clients as $client){
+        foreach($clients as $client) {
            $filename .= $client['client_nom'] . '-' . $client['client_entreprise'] . '--';
        }
        $filename = rtrim($filename, '-');
-		$filename = str_replace(' ','-', $filename);
-		$filename = str_replace('&nbsp;','-', $filename);
+        $filename = str_replace(' ', '-', $filename);
+        $filename = str_replace('&nbsp;', '-', $filename);
        return $filename;
    }

-    public function getExportClientFileHeader(): string{
+    public function getExportClientFileHeader(): string
+    {
        $fileHeader =
        'CLIENT'.';'.
        'MOIS'.';'.
@ -64,37 +68,39 @@ class ExportClientStatisticService {
        'NB DE DEFUNTS'.';';

        $produitList = $this->gestionBdd->getProduitsListAsArray();
-		foreach($produitList as $produit){
+        foreach($produitList as $produit) {
            $fileHeader .= FileExportHelpers::FormatTextForExport($produit['reference']).';';
        }
        $fileHeader .= 'TOTAL HT'.';'."\n";
        return $fileHeader;
    }

-    public function populateExportDataIntoFileContent(array $exportData,string $fileContent): string{
-		foreach($exportData as $clientId => $clientData){
+    public function populateExportDataIntoFileContent(array $exportData, string $fileContent): string
+    {
+        foreach($exportData as $clientId => $clientData) {
            $clientName = $clientData["client_name"];
            $clientStatPerMonth = $clientData["client_data"];
            $totalPrice = 0;
-			if(!empty($clientStatPerMonth)){
-				foreach($clientStatPerMonth as $month => $stat){
+            if(!empty($clientStatPerMonth)) {
+                foreach($clientStatPerMonth as $month => $stat) {
                    $stat["client_name"] = $clientName;
-					$totalPrice+=$stat["total_price"];
-					$fileContent = $this->populateClientStatDataIntoFileContent($fileContent,$month,$stat);
+                    $totalPrice += $stat["total_price"];
+                    $fileContent = $this->populateClientStatDataIntoFileContent($fileContent, $month, $stat);
                }
-				$fileContent = $this->populateTotalPriceIntoFileContent($fileContent,$totalPrice,count($stat["products"]));
+                $fileContent = $this->populateTotalPriceIntoFileContent($fileContent, $totalPrice, count($stat["products"]));
            }
        }
        return $fileContent;
    }

-	private function populateTotalPriceIntoFileContent(string $fileContent,$totalPrice,$productsCount){
+    private function populateTotalPriceIntoFileContent(string $fileContent, $totalPrice, $productsCount)
+    {
        $fileContent = $fileContent.
        ''.';'.
        ''.';'.
        ''.';'.
        ''.';';
-		while($productsCount > 0){
+        while($productsCount > 0) {
            $fileContent .= ''.';';
            $productsCount--;
        }
@ -102,10 +108,12 @@ class ExportClientStatisticService {
        return $fileContent;
    }

-	private function populateClientStatDataIntoFileContent(string $fileContent,$month,array $statPerMonth){
+    private function populateClientStatDataIntoFileContent(string $fileContent, $month, array $statPerMonth)
+    {
        $yearValue = $statPerMonth["year"];
        $defuntCount = $statPerMonth["defunt_count"];
        $products = $statPerMonth["products"];
+        $priceTotal = $statPerMonth["total_price"];

        $fileContent = $fileContent.
        FileExportHelpers::FormatTextForExport($statPerMonth['client_name']).';'.
@ -113,10 +121,10 @@ class ExportClientStatisticService {
        "$yearValue".';'.
        "$defuntCount".';';

-		foreach($products as $productCount){
+        foreach($products as $productCount) {
            $fileContent .= "$productCount".";";
        }
-		$fileContent .= "\n";
+        $fileContent .= "$priceTotal".';'."\n";
        return $fileContent;

    }
--- a/gestion/lib/Service/ExportThanatoStatisticService.php
+++ b/gestion/lib/Service/ExportThanatoStatisticService.php
@ -34,7 +34,8 @@ use OCA\Gestion\Constants\BddConstant;
 use OCA\Gestion\Helpers\FileExportHelpers;
 use OCA\Gestion\Constants\AbsenceTypeConstant;

-class ExportThanatoStatisticService {
+class ExportThanatoStatisticService
+{
    /** @var Bdd */
    private $gestionBdd;

@ -50,43 +51,45 @@ class ExportThanatoStatisticService {
        Bdd $gestionBdd,
        LoggerInterface $logger,
        IRootFolder $rootFolder,
-		GeoService $geoService) {
+        GeoService $geoService
+    ) {
        $this->geoService = $geoService;
        $this->rootFolder = $rootFolder;
        $this->logger = $logger;
        $this->gestionBdd = $gestionBdd;
    }

-	private function getFilename($thanatoName,$thanatoLastName,$month,$year){
+    private function getFilename($thanatoName, $thanatoLastName, $month, $year)
+    {
        $filename = "$year-$month-";
        $filename .= $thanatoName . '-' . $thanatoLastName;
-		$filename = str_replace(' ','-', $filename);
-		$filename = str_replace('&nbsp;','-', $filename);
+        $filename = str_replace(' ', '-', $filename);
+        $filename = str_replace('&nbsp;', '-', $filename);
        return $filename;
    }

-	private function exportThanatoStatistic($thanatoId,$month,$year,$idNextcloud){
+    private function exportThanatoStatistic($thanatoId, $month, $year, $idNextcloud)
+    {
        $thanato = $this->gestionBdd->getThanatoById($thanatoId);
-		if($thanato == null){
+        if($thanato == null) {
            return null;
        }
-		$exportData = $this->gestionBdd->getExportThanatoStatisticData($thanatoId,$month,$year);
-		if(empty($exportData)){
+        $exportData = $this->gestionBdd->getExportThanatoStatisticData($thanatoId, $month, $year);
+        if(empty($exportData)) {
            return null;
        }
        $defaultConfig = json_decode($this->gestionBdd->getConfiguration(BddConstant::DEFAULT_ADMIN_ID_NEXTCLOUD));
        $racineFolder = html_entity_decode($defaultConfig[0]->path).'/';
        $thanatoFolder = $racineFolder.'STATISTIQUES/THANATOS/';
        $fileHeader = $this->getExportThanatoFileHeader();
-		$fileContent = $this->populateExportDataIntoFileContent($exportData,$fileHeader);
+        $fileContent = $this->populateExportDataIntoFileContent($exportData, $fileHeader);
        $storage = $this->rootFolder->getUserFolder($idNextcloud);
-		try{
+        try {
            $storage->newFolder($thanatoFolder);
-		}
-		catch(\OCP\Files\NotPermittedException $e) { 
+        } catch(\OCP\Files\NotPermittedException $e) {

        }
-		$filename = $this->getFilename($thanato["nom"],$thanato["prenom"],$month,$year);
+        $filename = $this->getFilename($thanato["nom"], $thanato["prenom"], $month, $year);
        $fileNamePath = $thanatoFolder."STAT-THANATO-" . $filename . '.csv';
        $storage->newFile($fileNamePath);
        $file = $storage->get($fileNamePath);
@ -94,20 +97,22 @@ class ExportThanatoStatisticService {
        return $fileNamePath;
    }

-	public function exportThanatosListStatistic(array $thanatoIds,$month,$year,$idNextcloud){
+    public function exportThanatosListStatistic(array $thanatoIds, $month, $year, $idNextcloud)
+    {
        $filenames = [];
-		foreach($thanatoIds as $thanatoId){
-			$filename = $this->exportThanatoStatistic($thanatoId,$month,$year,$idNextcloud);
-			if($filename != null){
+        foreach($thanatoIds as $thanatoId) {
+            $filename = $this->exportThanatoStatistic($thanatoId, $month, $year, $idNextcloud);
+            if($filename != null) {
                $filenames[] = $filename;
            }
        }
        return $filenames;
    }

-    public function getExportThanatoFileHeader(): string{
+    public function getExportThanatoFileHeader(): string
+    {
        $fileHeader =
-		'FACTURE'.';'.
+        'DEVIS'.';'.
        'THANATOPRACTEUR'.';'.
        'DATE'.';'.
        'HEURE DE DEBUT'.';'.
@ -133,20 +138,23 @@ class ExportThanatoStatisticService {
        return $fileHeader;
    }

-	private function populateNoDevisDataInADay(string $fileContent,$leave){
+    private function populateNoDevisDataInADay(string $fileContent, $leave)
+    {
        $startTimeValue = "";
        $endTimeValue = "";
        $leaveValue = "Non";
-		if($leave["onLeave"]){
+        $restValue = "Non";      // AJOUTER CETTE LIGNE
+        $diseaseValue = "Non";   // AJOUTER CETTE LIGNE
+        if($leave["onLeave"]) {
            $startTimeValue = $leave["startTime"];
            $endTimeValue = $leave["endTime"];
-			if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE){
+            if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE) {
                $leaveValue = "Oui";
            }
-			if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE){
+            if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE) {
                $diseaseValue = "Oui";
            }
-			if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST){
+            if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST) {
                $restValue = "Oui";
            }
        }
@ -176,7 +184,8 @@ class ExportThanatoStatisticService {
        return $fileContent;
    }

-	public function populateExportDataIntoFileContent(array $exportData,string $fileContent): string{
+    public function populateExportDataIntoFileContent(array $exportData, string $fileContent): string
+    {

        $g_totalDistance = 0;
        $g_totalDevisHours = 0;
@ -187,7 +196,7 @@ class ExportThanatoStatisticService {
        $g_totalRestHours = 0;
        $g_totalDevisCount = 0;

-		foreach($exportData as $devisDate => $devisData){
+        foreach($exportData as $devisDate => $devisData) {
            $totalDevisHours = 0;
            $totalWorkedHours = 8;
            $totalLeaveHours = 0;
@ -197,27 +206,26 @@ class ExportThanatoStatisticService {
            $totalDevisCount = 0;
            $totalTravelingHoursBetweenDevisLocation = 0;
            $hasDevisInTheCurrentDate = $devisData['hasDevis'];
-			if($hasDevisInTheCurrentDate === false){
+            if($hasDevisInTheCurrentDate === false) {
                $leaves = $devisData["leaves"];
-				foreach($leaves as $leave){
-					$fileContent = $this->populateNoDevisDataInADay($fileContent,$leave);
-					if($leave["onLeave"]){
+                foreach($leaves as $leave) {
+                    $fileContent = $this->populateNoDevisDataInADay($fileContent, $leave);
+                    if($leave["onLeave"]) {
                        $totalLeaveHoursInsideWorkingHours = $leave["totalWorkedHours"];
-						if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE ){
+                        if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE) {
                            $totalLeaveHours += $totalLeaveHoursInsideWorkingHours;
                        }
-						if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST){
+                        if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST) {
                            $totalRestHours += $totalLeaveHoursInsideWorkingHours;
                        }
-						if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE){
+                        if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE) {
                            $totalDiseaseHours += $totalLeaveHoursInsideWorkingHours;
                        }
                    }
                }
                $totalAbsenceHours = $totalLeaveHours + $totalRestHours + $totalDiseaseHours;
                $totalWorkedHours -= $totalAbsenceHours;
-			}
-			else{
+            } else {
                $totalDevisCount += count($devisData["devisId"]);
                $routeLines = $this->gestionBdd->getRouteLinesByDevisIdList($devisData["devisId"]);
                $totalDistanceAndTotalTravelingHoursBetweenDevis = $this->geoService->getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines($routeLines);
@ -225,23 +233,23 @@ class ExportThanatoStatisticService {
                $totalTravelingHoursBetweenDevisLocation = $totalDistanceAndTotalTravelingHoursBetweenDevis["totalTravelingHours"];
                $devisList = $devisData["devis"];
                $leaves = $devisData["leaves"];
-				if(!empty($devisList)){
-					foreach($devisList as $devis){
-						$fileContent = $this->populateDevisDataIntoThanatoExportFileContent($fileContent,$devis);
+                if(!empty($devisList)) {
+                    foreach($devisList as $devis) {
+                        $fileContent = $this->populateDevisDataIntoThanatoExportFileContent($fileContent, $devis);
                        $totalDevisHours += $devis["totalHours"];
                    }
                }
-				foreach($leaves as $leave){
-					$fileContent = $this->populateNoDevisDataInADay($fileContent,$leave);
-					if($leave["onLeave"]){
+                foreach($leaves as $leave) {
+                    $fileContent = $this->populateNoDevisDataInADay($fileContent, $leave);
+                    if($leave["onLeave"]) {
                        $totalLeaveHoursInsideWorkingHours = $leave["totalWorkedHours"];
-						if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE){
+                        if($leave["absenceTypeKey"] == AbsenceTypeConstant::LEAVE) {
                            $totalLeaveHours += $totalLeaveHoursInsideWorkingHours;
                        }
-						if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST){
+                        if($leave["absenceTypeKey"] == AbsenceTypeConstant::REST) {
                            $totalRestHours += $totalLeaveHoursInsideWorkingHours;
                        }
-						if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE){
+                        if($leave["absenceTypeKey"] == AbsenceTypeConstant::DISEASE) {
                            $totalDiseaseHours += $totalLeaveHoursInsideWorkingHours;
                        }
                    }
@ -258,7 +266,8 @@ class ExportThanatoStatisticService {
                $totalLeaveHours,
                $totalTravelingHoursBetweenDevisLocation,
                $totalDiseaseHours,
-				$totalRestHours,$totalDevisCount
+                $totalRestHours,
+                $totalDevisCount
            );

            $g_totalDistance += $totalDistance;
@ -279,13 +288,15 @@ class ExportThanatoStatisticService {
            $g_totalLeaveHours,
            $g_totalTravelingHoursBetweenDevisLocation,
            $g_totalDiseaseHours,
-            $g_totalRestHours,$g_totalDevisCount
+            $g_totalRestHours,
+            $g_totalDevisCount
        );

        return $fileContent;
    }

-	private function populateLastRecapForTheLine(string $fileContent,$distance,$totalDevisHours,$totalWorkedHours,$totalLeaveHours,$totalTravelingHours  ,$totalDiseaseHours = 0,$totalRestHours = 0,$totalDevisCount = 0){
+    private function populateLastRecapForTheLine(string $fileContent, $distance, $totalDevisHours, $totalWorkedHours, $totalLeaveHours, $totalTravelingHours, $totalDiseaseHours = 0, $totalRestHours = 0, $totalDevisCount = 0)
+    {
        $fileContent = $fileContent.
        ''.';'.
        ''.';'.
@ -312,7 +323,8 @@ class ExportThanatoStatisticService {
        return $fileContent;
    }

-	private function getFormatDevisProduitsAsString($devisProduits){
+    private function getFormatDevisProduitsAsString($devisProduits)
+    {
        $result = '';
        foreach ($devisProduits as $produit) {
            $result .= $produit['produit_reference'] . '-' . $produit['produit_description'] . '--';
@ -322,7 +334,8 @@ class ExportThanatoStatisticService {
        return $result;
    }

-	private function populateDevisDataIntoThanatoExportFileContent(string $fileContent,array $devis){
+    private function populateDevisDataIntoThanatoExportFileContentSave(string $fileContent, array $devis)
+    {
        $produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]);
        $factureNum = $devis["facture_num"] ?? $devis["facture_on_group_num"] ?? "";
        $fileContent = $fileContent.
@ -352,4 +365,36 @@ class ExportThanatoStatisticService {
        return $fileContent;

    }
+
+    private function populateDevisDataIntoThanatoExportFileContent(string $fileContent, array $devis)
+    {
+        $produitAsString = $this->getFormatDevisProduitsAsString($devis["produits"]);
+        $devisNum = (string)($devis["calendar_uuid"] ?? "");
+
+        $fileContent = $fileContent.
+                    FileExportHelpers::FormatTextForExport($devisNum).';'.
+                    FileExportHelpers::FormatTextForExport(($devis['nom_thanato'] ?? '') . ' ' . ($devis['prenom_thanato'] ?? '')).';'.
+                    FileExportHelpers::FormatTextForExport($devis["date"] ?? "").';'.
+                    FileExportHelpers::FormatTextForExport($devis["startTime"] ?? "").';'.
+                    FileExportHelpers::FormatTextForExport($devis["endTime"] ?? "").';'.
+                    FileExportHelpers::FormatTextForExport($produitAsString).';'.
+                    FileExportHelpers::FormatTextForExport($devis["dayType"] ?? "").';'.
+                    'Non'.';'.
+                    ''.';'.
+                    ''.';'.
+                    FileExportHelpers::FormatTextForExport($devis["nom_defunt"] ?? "").';'.  // ICI
+                    FileExportHelpers::FormatTextForExport($devis["nom_lieu"] ?? "").';'.
+                    FileExportHelpers::FormatTextForExport($devis["nom_client"] ?? "").';'.
+                    FileExportHelpers::FormatTextForExport($devis["client_adresse"] ?? "").';'.
+                    ''.';'.
+                    ''.';'.
+                    ''.';'.
+                    ''.';'.
+                    ''.';'.
+                    ''.';'.
+                    ''.';'.
+                    ''.';'."\n";
+
+        return $fileContent;
+    }
 }
--- a/gestion/lib/Service/GeoService.php
+++ b/gestion/lib/Service/GeoService.php
@ -30,28 +30,31 @@ use Exception;
 use OCA\Gestion\Constants\GeoConstant;
 use OCA\Gestion\Helpers\GeoHelpers;

-class GeoService {
-
-	public function __construct() {
+class GeoService
+{
+    public function __construct()
+    {
    }

    /**
     * Calcul la distance entre les deux points à vol d'oiseau
     */
-    private function getDistanceInKmBetweenTwoPoints($lat1, $lon1, $lat2, $lon2) {
+    private function getDistanceInKmBetweenTwoPoints($lat1, $lon1, $lat2, $lon2)
+    {
        $R = 6371; // Rayon moyen de la Terre en kilomètres
        $dLat = deg2rad($lat2 - $lat1);
        $dLon = deg2rad($lon2 - $lon1);
-        $a = sin($dLat/2) * sin($dLat/2) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * sin($dLon/2) * sin($dLon/2);
-        $c = 2 * atan2(sqrt($a), sqrt(1-$a));
+        $a = sin($dLat / 2) * sin($dLat / 2) + cos(deg2rad($lat1)) * cos(deg2rad($lat2)) * sin($dLon / 2) * sin($dLon / 2);
+        $c = 2 * atan2(sqrt($a), sqrt(1 - $a));
        $d = $R * $c;
        return round($d, 2);
    }

-    private function getTravelingHourBetweenTwoPoints(array $origin,array $destination,$mode = "driving"){
+    private function getTravelingHourBetweenTwoPoints(array $origin, array $destination, $mode = "driving")
+    {
        $baseUrl = "https://api.geoapify.com/v1/routing";
-        $originPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($origin["latitude"],$origin["longitude"]);
-        $destinationPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($destination["latitude"],$destination["longitude"]);
+        $originPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($origin["latitude"], $origin["longitude"]);
+        $destinationPoints = GeoHelpers::getPointsTextFromLatitudeAndLongitude($destination["latitude"], $destination["longitude"]);

        $fullUrl = $baseUrl."?waypoints=$originPoints|$destinationPoints&mode=$mode&apiKey=9e23d93e7f454c988344f9171bf867aa";
        $curl = curl_init();
@ -79,39 +82,39 @@ class GeoService {
                $travelTimeHours = round($travelTimeHours, 2);
                return $travelTimeHours;
            }
-        }
-        catch(Exception $e){
+        } catch(Exception $e) {
            return 0;
        }
    }

-    public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines(array $routeLines){
+    public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLinesSave(array $routeLines)
+    {
        $distanceCumul =  0;
        $totalTravelingHoursBetweenTwoDevisLocation = 0;
-        $lastPoint = NULL;
-        for ($i=0; $i < sizeof($routeLines); $i++) {
+        $lastPoint = null;
+        for ($i = 0; $i < sizeof($routeLines); $i++) {
            $currentDistance = 0;
-            if($routeLines[$i]['lieu_id'] != NULL){
+            if($routeLines[$i]['lieu_id'] != null) {
                $lastPoint = $routeLines[$i];
            }
-            if($lastPoint['lieu_id'] != NULL && $routeLines[$i+1]['lieu_id'] != NULL){
+            if($lastPoint['lieu_id'] != null && $routeLines[$i + 1]['lieu_id'] != null) {
                $currentDistance = $this->getDistanceInKmBetweenTwoPoints(
                    floatval(value: $lastPoint['latitude']),
                    floatval($lastPoint['longitude']),
-                    floatval($routeLines[$i+1]['latitude']), 
-                    floatval($routeLines[$i+1]['longitude'])
+                    floatval($routeLines[$i + 1]['latitude']),
+                    floatval($routeLines[$i + 1]['longitude'])
                );
-                $targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i+1]["source"] != "siege";
-                if($targetIsBetweenTwoDevisLocation){
+                $targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i + 1]["source"] != "siege";
+                if($targetIsBetweenTwoDevisLocation) {
                    $originPoints = [
                        "latitude" => $lastPoint["latitude"],
                        "longitude" => $lastPoint["longitude"]
                    ];
                    $destinationPoints = [
-                        "latitude" => $routeLines[$i+1]["latitude"],
-                        "longitude" => $routeLines[$i+1]["longitude"]
+                        "latitude" => $routeLines[$i + 1]["latitude"],
+                        "longitude" => $routeLines[$i + 1]["longitude"]
                    ];
-                    $totalTravelingHoursBetweenTwoDevisLocation+= $this->getTravelingHourBetweenTwoPoints(
+                    $totalTravelingHoursBetweenTwoDevisLocation += $this->getTravelingHourBetweenTwoPoints(
                        $originPoints,
                        $destinationPoints,
                        GeoConstant::DRIVING_MODE
@ -125,4 +128,65 @@ class GeoService {
            "totalTravelingHours" => $totalTravelingHoursBetweenTwoDevisLocation
        ];
    }
+
+    public function getTotalDistanceAndTotalTravelingHoursBetweenDevisLocationByRouteLines(array $routeLines)
+    {
+        $distanceCumul =  0;
+        $totalTravelingHoursBetweenTwoDevisLocation = 0;
+        $lastPoint = null;
+
+        for ($i = 0; $i < sizeof($routeLines); $i++) {
+            $currentDistance = 0;
+
+            // Vérifier que l'élément actuel existe
+            if(!isset($routeLines[$i])) {
+                continue;
+            }
+
+            if($routeLines[$i]['lieu_id'] != null) {
+                $lastPoint = $routeLines[$i];
+            }
+
+            // Vérifier que $i+1 existe ET que $lastPoint n'est pas null
+            if($lastPoint !== null &&
+               isset($routeLines[$i + 1]) &&
+               isset($lastPoint['lieu_id']) &&
+               isset($routeLines[$i + 1]['lieu_id']) &&
+               $lastPoint['lieu_id'] != null &&
+               $routeLines[$i + 1]['lieu_id'] != null) {
+
+                $currentDistance = $this->getDistanceInKmBetweenTwoPoints(
+                    floatval($lastPoint['latitude']),
+                    floatval($lastPoint['longitude']),
+                    floatval($routeLines[$i + 1]['latitude']),
+                    floatval($routeLines[$i + 1]['longitude'])
+                );
+
+                $targetIsBetweenTwoDevisLocation = $lastPoint['source'] != "siege" && $routeLines[$i + 1]["source"] != "siege";
+
+                if($targetIsBetweenTwoDevisLocation) {
+                    $originPoints = [
+                        "latitude" => $lastPoint["latitude"],
+                        "longitude" => $lastPoint["longitude"]
+                    ];
+                    $destinationPoints = [
+                        "latitude" => $routeLines[$i + 1]["latitude"],
+                        "longitude" => $routeLines[$i + 1]["longitude"]
+                    ];
+                    $totalTravelingHoursBetweenTwoDevisLocation += $this->getTravelingHourBetweenTwoPoints(
+                        $originPoints,
+                        $destinationPoints,
+                        GeoConstant::DRIVING_MODE
+                    );
+                }
+            }
+
+            $distanceCumul += $currentDistance;
+        }
+
+        return [
+            "totalDistance" => round($distanceCumul, 2),
+            "totalTravelingHours" => round($totalTravelingHoursBetweenTwoDevisLocation, 2)
+        ];
+    }
 }
Author	SHA1	Message	Date
Tolotsoa	d2bb1a9cc6	fix recap pdf	2025-12-16 09:07:49 +03:00
Tolotsoa	8cacac1efc	fix recap devis multi product	2025-12-15 11:58:11 +03:00
Tolotsoa	a28b7f6ea6	fix erreur stats thanato	2025-11-20 09:45:34 +03:00
Tolotsoa	03784fd8e6	fix stats devis thanato	2025-11-19 12:01:51 +03:00
Tolotsoa	411cc2d5a8	fix statistique client calcul total HT	2025-11-17 17:27:40 +03:00
Tolotsoa	34717b772d	fix statistique pas de filtre mentions	2025-11-17 13:23:47 +03:00
Tolotsoa	b6ea2550bc	fix statistique not status	2025-11-17 13:10:37 +03:00
Tolotsoa	65d13d70f9	fix statistiques	2025-11-17 12:41:49 +03:00