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 @@