From 446c3e2848f01be6f6ffc4e17fbca644d3201d3f Mon Sep 17 00:00:00 2001 From: sebastien <dupuy@datakode.fr> Date: Tue, 10 Oct 2023 08:51:57 +0200 Subject: [PATCH] Correctif Bilan pour les indices de maturite. https://gitlab.adullact.net/soluris/madis/-/issues/825 --- .../Generator/Word/MaturityGenerator.php | 16 ++++++++++++++-- .../Generator/Word/OverviewGenerator.php | 3 +++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/Domain/Reporting/Generator/Word/MaturityGenerator.php b/src/Domain/Reporting/Generator/Word/MaturityGenerator.php index 6df0e0fd2..08befc3ed 100644 --- a/src/Domain/Reporting/Generator/Word/MaturityGenerator.php +++ b/src/Domain/Reporting/Generator/Word/MaturityGenerator.php @@ -35,7 +35,12 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator { public function addContextView(Section $section, array $data): void { - $section->addTitle('Contexte', 1); + if (isset($data['bilanReport']) && $data['bilanReport']) { + $section->addTitle('Évaluation de la mise en conformité', 2); + $section->addTitle('Contexte', 3); + } else { + $section->addTitle('Contexte', 1); + } $table = $section->addTable([ 'borderColor' => '006699', @@ -69,6 +74,10 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator public function addSyntheticView(Section $section, array $data): void { + if (isset($data['bilanReport']) && $data['bilanReport']) { + $section->addTitle("Résultat de l'évaluation", 3); + } + $maturityList = []; $domainsName = []; if (isset($data['old'])) { @@ -116,7 +125,10 @@ class MaturityGenerator extends AbstractGenerator implements ImpressionGenerator } } // Display - $section->addTitle('Vue d\'ensemble', 1); + if (!(isset($data['bilanReport']) && $data['bilanReport'])) { + $section->addTitle('Vue d\'ensemble', 1); + } + $this->addTable($section, $tableData, true, self::TABLE_ORIENTATION_HORIZONTAL); $section->addTextBreak(2); diff --git a/src/Domain/Reporting/Generator/Word/OverviewGenerator.php b/src/Domain/Reporting/Generator/Word/OverviewGenerator.php index 5b61bfe8a..4f0fe5d97 100644 --- a/src/Domain/Reporting/Generator/Word/OverviewGenerator.php +++ b/src/Domain/Reporting/Generator/Word/OverviewGenerator.php @@ -200,7 +200,10 @@ class OverviewGenerator extends AbstractGenerator ): void { $section->addTitle('Système de management des données à caractère personnel et conformité', 1); + $maturity['bilanReport'] = true; $this->maturityGenerator->addContextView($section, $maturity); + $this->maturityGenerator->addSyntheticView($section, $maturity); + $collectivity = $this->userProvider->getAuthenticatedUser()->getCollectivity(); if ($collectivity->isHasModuleConformiteTraitement()) { -- GitLab