diff --git a/src/Controller/Back/SignalementController.php b/src/Controller/Back/SignalementController.php index f1fcad4a9..0fb853af9 100755 --- a/src/Controller/Back/SignalementController.php +++ b/src/Controller/Back/SignalementController.php @@ -162,10 +162,7 @@ public function viewSignalement( $listQualificationStatusesLabelsCheck = []; if (null !== $signalement->getSignalementQualifications()) { foreach ($signalement->getSignalementQualifications() as $qualification) { - if ( - Qualification::NON_DECENCE_ENERGETIQUE !== $qualification->getQualification() - && !$qualification->isPostVisite() - ) { + if (!$qualification->isPostVisite()) { $listQualificationStatusesLabelsCheck[] = $qualification->getStatus()->label(); } } diff --git a/src/Manager/SignalementManager.php b/src/Manager/SignalementManager.php index 98334b29e..4cca1632e 100644 --- a/src/Manager/SignalementManager.php +++ b/src/Manager/SignalementManager.php @@ -269,13 +269,13 @@ public function updateFromSignalementQualification( $signalement = $signalementQualification->getSignalement(); // // mise à jour du signalement if (QualificationNDERequest::RADIO_VALUE_AFTER_2023 === $qualificationNDERequest->getDateEntree() - && $signalement->getDateEntree()->format('Y') < '2023' + && ($signalement->getDateEntree()->format('Y') < '2023' || null === $signalement->getDateEntree()) ) { $signalement->setDateEntree(new \DateTimeImmutable(QualificationNDERequest::RADIO_VALUE_AFTER_2023)); } if (QualificationNDERequest::RADIO_VALUE_BEFORE_2023 === $qualificationNDERequest->getDateEntree() - && $signalement->getDateEntree()->format('Y') >= '2023' + && ($signalement->getDateEntree()->format('Y') >= '2023' || null === $signalement->getDateEntree()) ) { $signalement->setDateEntree(new \DateTimeImmutable(QualificationNDERequest::RADIO_VALUE_BEFORE_2023)); } diff --git a/templates/_partials/_modal_edit_nde.html.twig b/templates/_partials/_modal_edit_nde.html.twig index 38656eb40..131d27169 100755 --- a/templates/_partials/_modal_edit_nde.html.twig +++ b/templates/_partials/_modal_edit_nde.html.twig @@ -77,7 +77,7 @@
-
diff --git a/templates/_partials/signalement/qualification.html.twig b/templates/_partials/signalement/qualification.html.twig index fcc1aa710..754811676 100755 --- a/templates/_partials/signalement/qualification.html.twig +++ b/templates/_partials/signalement/qualification.html.twig @@ -9,6 +9,8 @@ or qualificationStatusLabel is same as 'Suspicion Manquement à la salubrité' or qualificationStatusLabel is same as 'Suspicion Non décence/RSD' or qualificationStatusLabel is same as 'Suspicion RSD' + or qualificationStatusLabel is same as 'Non décence énergétique à vérifier' + or qualificationStatusLabel is same as 'Non décence énergétique avérée' or qualificationStatusLabel is same as 'Non décence' or qualificationStatusLabel is same as 'RSD' %} @@ -26,5 +28,5 @@ {% if inlist %}
{% endif %} - {{ qualificationStatusLabel|replace({'Suspicion ': ''}) }} + {{ qualificationStatusLabel|replace({'Suspicion ': '', ' à vérifier': '', ' avérée': ''}) }} {% endif %} \ No newline at end of file diff --git a/templates/back/signalement/view/address-qualifications.html.twig b/templates/back/signalement/view/address-qualifications.html.twig index 3bfa10c5f..a40ece300 100755 --- a/templates/back/signalement/view/address-qualifications.html.twig +++ b/templates/back/signalement/view/address-qualifications.html.twig @@ -29,11 +29,6 @@

Situation(s) suspectée(s) à la déclaration usager

- {% if can_see_nde_qualification(signalementQualificationNDE) and is_granted('USER_SEE_NDE', app.user) %} - - Non décence énergétique - - {% endif %} {% for qualificationStatusLabel in listQualificationStatusesLabelsCheck %} {% include '_partials/signalement/qualification.html.twig' with { 'inlist': false } %} {% endfor %}