Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BO - Signalement] TAG NDE #2190

Merged
merged 1 commit into from
Feb 1, 2024
Merged

[BO - Signalement] TAG NDE #2190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/Controller/Back/SignalementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/Manager/SignalementManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down
2 changes: 1 addition & 1 deletion templates/_partials/_modal_edit_nde.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</div>
<div class="fr-radio-group">
<input type="radio" id="signalement-edit-nde-dpe-2" name="dpe" value='null' {% if signalementQualificationNDE.details and signalementQualificationNDE.details.DPE is null %}checked{% endif %}>
<label class="fr-label" for="signalement-edit-nde-dpe-2">Ne sais pas
<label class="fr-label" for="signalement-edit-nde-dpe-2">Ne sait pas
</label>
</div>
</div>
Expand Down
4 changes: 3 additions & 1 deletion templates/_partials/signalement/qualification.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' %}

Expand All @@ -26,5 +28,5 @@
{% if inlist %}
<br>
{% endif %}
<small class="fr-badge {% if inlist %}fr-badge--sm{% endif %} fr-badge--{{ typeBadge }} fr-badge--no-icon fr-mb-1v">{{ qualificationStatusLabel|replace({'Suspicion ': ''}) }}</small>
<small class="fr-badge {% if inlist %}fr-badge--sm{% endif %} fr-badge--{{ typeBadge }} fr-badge--no-icon fr-mb-1v">{{ qualificationStatusLabel|replace({'Suspicion ': '', ' à vérifier': '', ' avérée': ''}) }}</small>
{% endif %}
5 changes: 0 additions & 5 deletions templates/back/signalement/view/address-qualifications.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@

<div class="fr-col-12 fr-col-md-6">
<h3 class="fr-h5">Situation(s) suspectée(s) à la déclaration usager</h3>
{% if can_see_nde_qualification(signalementQualificationNDE) and is_granted('USER_SEE_NDE', app.user) %}
<small class="fr-badge fr-badge--info fr-badge--no-icon fr-mb-1v">
Non décence énergétique
</small>
{% endif %}
{% for qualificationStatusLabel in listQualificationStatusesLabelsCheck %}
{% include '_partials/signalement/qualification.html.twig' with { 'inlist': false } %}
{% endfor %}
Expand Down
Loading