[BO - Formulaire pro] Faire l'onglet Adresse

assets/scripts/app-back-bo.ts

@@ -25,6 +25,7 @@ import './vanilla/controllers/back_archived_users_index/back_archived_users_inde
 import './vanilla/controllers/back_auto_affectation_rule/form_auto_affectation_rule.js'
 import './vanilla/controllers/back_partner_index/back_partner_index.js';
 import './vanilla/controllers/back_partner_view/form_partner.js';
+import './vanilla/controllers/back_signalement_form/back_signalement_form.js';
 import './vanilla/controllers/back_signalement_view/back_view_signalement.js';
 import './vanilla/controllers/back_signalement_view/form_upload_documents.js';
 import './vanilla/controllers/back_signalement_view/input_autocomplete_bailleur.js';

assets/scripts/vanilla/controllers/back_signalement_form/back_signalement_form.js

@@ -0,0 +1,84 @@
+import { attacheAutocompleteAddressEvent } from '../../services/component_search_address'
+
+if (document?.querySelector('#bo-form-signalement-address')) {
+  initBoFormSignalementAddress()
+}
+
+function initBoFormSignalementAddress() {
+  const boFormSignalementAddress = document?.querySelector('#bo-form-signalement-address')
+  const inputAdresse = document?.querySelector('#signalement_address_adresseCompleteOccupant')
+  const inputForceSave = document?.querySelector('#signalement_address_forceSave')
+  attacheAutocompleteAddressEvent(inputAdresse)
+
+  const modaleDuplicate = document.querySelector('#fr-modal-duplicate')
+  const modaleDuplicateContainer = document.querySelector('#fr-modal-duplicate-container')
+  const modaleDuplicateOpenLink = document.querySelector('#fr-modal-duplicate-open-duplicates')
+  const modaleDuplicateIgnoreButton = document.querySelector('#fr-modal-duplicate-ignore-duplicates')
+
+  const manualAddressSwitcher = document?.querySelector('#bo-signalement-manual-address-switcher')
+  const manualAddressContainer = document?.querySelector('#bo-form-signalement-manual-address-container')
+  const manualAddressAddress = document?.querySelector('#signalement_address_adresseOccupant')
+  const manualAddressInputs = document.querySelectorAll('.bo-form-signalement-manual-address');
+  const hasManualAddressValues = Array.from(manualAddressInputs).some(input => input.value !== '')
+
+  manualAddressSwitcher?.addEventListener('click', (event) => {
+    event.preventDefault()
+    if (manualAddressContainer.classList.contains('fr-hidden')) {
+      manualAddressContainer.classList.remove('fr-hidden')
+      manualAddressSwitcher.textContent = 'Rechercher une adresse'
+      inputAdresse.value = ''
+      inputAdresse.disabled = true
+      manualAddressAddress.focus()
+    } else {
+      manualAddressContainer.classList.add('fr-hidden')
+      manualAddressSwitcher.textContent = 'Saisir une adresse manuellement'
+      manualAddressInputs.forEach(input => input.value = '');
+      inputAdresse.disabled = false
+      inputAdresse.focus()
+    }
+  })
+
+  if(inputAdresse.value == '' && hasManualAddressValues) {
+    manualAddressSwitcher.click()
+  }
+
+  boFormSignalementAddress.addEventListener('submit', async (event) => {
+    event.preventDefault()
+    const formData = new FormData(event.target)
+    const submitButton = event.submitter;
+    formData.append(submitButton.name, submitButton.value);
+
+    fetch(event.target.action, {method: 'POST', body: formData}).then(response => {
+      if (response.ok) {
+        response.json().then((response) => {
+          if (response.redirect) {
+            const currentUrl = window.location.href.split('#')[0];
+            const newUrl = response.url.split('#')[0];
+            window.location.href = response.url;
+            if (currentUrl === newUrl) {
+              window.location.reload(true);
+            }
+          } else {
+            document.querySelector("#tabpanel-adresse-panel").innerHTML = response.tabContent
+            document.querySelector('#tabpanel-adresse').scrollIntoView({ behavior: 'smooth' });
+            initBoFormSignalementAddress()
+            if(response.hasDuplicates){
+              modaleDuplicateContainer.innerHTML = response.duplicateContent
+              modaleDuplicateOpenLink.href = response.linkDuplicates
+              dsfr(modaleDuplicate).modal.disclose();
+            }
+          }
+        });
+    } else {
+      const errorHtml = '<div class="fr-alert fr-alert--error" role="alert"><p class="fr-alert__title">Une erreur est survenue lors de la soumission du formulaire, veuillez rafraichir la page.</p></div>';
+      document.querySelector("#tabpanel-adresse-panel").innerHTML = errorHtml; 
+    }
+    })
+  })
+
+  modaleDuplicateIgnoreButton?.addEventListener('click', (event) => {
+    inputForceSave.value = 1
+    document.querySelector('#signalement_address_save').click()
+  });
+
+}

assets/styles/histologe.scss

@@ -180,6 +180,9 @@ legend.required::after, label.required::after {
     position: relative;
     left: 3px;
 }
+.text-required {
+    color: var(--red-marianne-425-625);
+}
 .fr-fieldset__content .fr-checkbox-group input[type="checkbox"] + label.required::after,
 .fr-fieldset__content .fr-radio-group:not(.fr-radio-rich) input[type="radio"] + label.required::after {
     position: absolute;
@@ -769,6 +772,7 @@ ul.fr-autocomplete-list {
 }
 .fr-address-group-container {
     position: relative;
+    z-index: 100;
     .fr-address-group {
         position: absolute;
         width: 100%;

migrations/Version20250210092800.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250210092800 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add is_logement_vacant column to signalement table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE signalement ADD is_logement_vacant TINYINT(1) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE signalement DROP is_logement_vacant');
+    }
+}

src/Controller/Back/SignalementCreateController.php

@@ -2,15 +2,27 @@
 
 namespace App\Controller\Back;
 
+use App\Entity\Enum\SignalementStatus;
+use App\Entity\Signalement;
+use App\Form\SignalementAddressType;
+use App\Manager\SignalementManager;
+use App\Repository\SignalementRepository;
+use App\Service\Signalement\SignalementBoManager;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 #[Route('/bo/signalement')]
 class SignalementCreateController extends AbstractController
 {
     public function __construct(
+        private readonly SignalementBoManager $signalementBoManager,
+        private readonly SignalementManager $signalementManager,
         #[Autowire(env: 'FEATURE_BO_SIGNALEMENT_CREATE')]
         bool $featureSignalementCreate,
     ) {
@@ -19,9 +31,109 @@ public function __construct(
         }
     }
 
-    #[Route('/create', name: 'back_signalement_create', methods: 'GET')]
+    #[Route('/drafts', name: 'back_signalement_drafts', methods: ['GET'])]
+    public function showDrafts(
+        SignalementRepository $signalementRepository,
+    ): Response {
+        $drafts = $signalementRepository->findBy([
+            'createdBy' => $this->getUser(),
+            'statut' => [SignalementStatus::DRAFT, SignalementStatus::NEED_VALIDATION],
+        ],
+            ['createdAt' => 'DESC']
+        );
+
+        return $this->render('back/signalement_create/drafts.html.twig', [
+            'drafts' => $drafts,
+        ]);
+    }
+
+    #[Route('/create', name: 'back_signalement_create', methods: ['GET'])]
     public function createSignalement(
     ): Response {
-        return $this->render('back/signalement_create/index.html.twig');
+        $signalement = new Signalement();
+        $formAddress = $this->createForm(SignalementAddressType::class, $signalement, ['action' => $this->generateUrl('back_signalement_form_address')]);
+
+        return $this->render('back/signalement_create/index.html.twig', [
+            'formAddress' => $formAddress,
+            'signalement' => $signalement,
+        ]);
+    }
+
+    #[Route('/edit-draft/{uuid:signalement}', name: 'back_signalement_edit_draft', methods: ['GET'])]
+    public function editSignalement(
+        Signalement $signalement,
+    ): Response {
+        $this->denyAccessUnlessGranted('SIGN_EDIT_DRAFT', $signalement);
+        $formAddress = $this->createForm(SignalementAddressType::class, $signalement, [
+            'action' => $this->generateUrl('back_signalement_form_address_edit', ['uuid' => $signalement->getUuid()]),
+        ]);
+
+        return $this->render('back/signalement_create/index.html.twig', [
+            'formAddress' => $formAddress,
+            'signalement' => $signalement,
+        ]);
+    }
+
+    #[Route('/bo-form-address/{uuid:signalement}', name: 'back_signalement_form_address_edit', methods: ['POST'])]
+    public function editFormAddress(
+        Signalement $signalement,
+        Request $request,
+        SignalementRepository $signalementRepository,
+        EntityManagerInterface $entityManager,
+    ): Response {
+        $this->denyAccessUnlessGranted('SIGN_EDIT_DRAFT', $signalement);
+
+        return $this->submitFormAddressHandler($signalement, $request, $signalementRepository, $entityManager);
+    }
+
+    #[Route('/bo-form-address', name: 'back_signalement_form_address', methods: ['POST'])]
+    public function createFormAddress(
+        Request $request,
+        SignalementRepository $signalementRepository,
+        EntityManagerInterface $entityManager,
+    ): JsonResponse {
+        $signalement = new Signalement();
+
+        return $this->submitFormAddressHandler($signalement, $request, $signalementRepository, $entityManager);
+    }
+
+    private function submitFormAddressHandler(
+        Signalement $signalement,
+        Request $request,
+        SignalementRepository $signalementRepository,
+        EntityManagerInterface $entityManager,
+    ): JsonResponse {
+        $entityManager->beginTransaction();
+        $action = $signalement->getId() ? $this->generateUrl('back_signalement_form_address_edit', ['uuid' => $signalement->getUuid()]) : $this->generateUrl('back_signalement_form_address');
+        $form = $this->createForm(SignalementAddressType::class, $signalement, ['action' => $action]);
+        $form->handleRequest($request);
+        $hasDuplicates = false;
+        $duplicateContent = '';
+        $linkDuplicates = '';
+        $duplicates = [];
+        if ($form->isSubmitted() && $form->isValid() && $this->signalementBoManager->formAddressManager($form, $signalement)) {
+            if ($form->get('forceSave')->isEmpty() && $duplicates = $signalementRepository->findOnSameAddress($signalement)) {
+                $hasDuplicates = true;
+                $duplicateContent = $this->renderView('back/signalement_create/_modal_duplicate_content.html.twig', ['duplicates' => $duplicates]);
+                $linkDuplicates = $this->generateUrl('back_signalements_index', [
+                    'searchTerms' => $signalement->getAdresseOccupant(),
+                    'communes[]' => $signalement->getCpOccupant(),
+                ], UrlGeneratorInterface::ABSOLUTE_URL);
+            } else {
+                $this->signalementManager->save($signalement);
+                $entityManager->commit();
+                if ($form->get('draft')->isClicked()) { // @phpstan-ignore-line
+                    $this->addFlash('success', 'Le brouillon est bien enregistré, n\'oubliez pas de le terminer !');
+                    $url = $this->generateUrl('back_signalement_drafts', [], UrlGeneratorInterface::ABSOLUTE_URL);
+                } else {
+                    $url = $this->generateUrl('back_signalement_edit_draft', ['uuid' => $signalement->getUuid(), '_fragment' => 'logement'], UrlGeneratorInterface::ABSOLUTE_URL);
+                }
+
+                return $this->json(['redirect' => true, 'url' => $url]);
+            }
+        }
+        $tabContent = $this->renderView('back/signalement_create/tabs/tab-adresse.html.twig', ['form' => $form]);
+
+        return $this->json(['tabContent' => $tabContent, 'hasDuplicates' => $hasDuplicates, 'duplicateContent' => $duplicateContent, 'linkDuplicates' => $linkDuplicates]);
     }
 }

src/Entity/Signalement.php

@@ -89,6 +89,9 @@ class Signalement implements EntityHistoryInterface, EntityHistoryCollectionInte
     #[ORM\Column(type: 'boolean', nullable: true)]
     private ?bool $isBailEnCours = null;
 
+    #[ORM\Column(type: 'boolean', nullable: true)]
+    private ?bool $isLogementVacant = null;
+
     #[ORM\Column(type: 'date', nullable: true)]
     private ?\DateTimeInterface $dateEntree = null;
 
@@ -187,14 +190,16 @@ class Signalement implements EntityHistoryInterface, EntityHistoryCollectionInte
     private ?string $mailOccupant = null;
 
     #[ORM\Column(type: 'string', length: 100, nullable: true)]
+    #[Assert\Length(max: 100, groups: ['bo_step_address'])]
     private ?string $adresseOccupant = null;
 
     #[ORM\Column(type: 'string', length: 5, nullable: true)]
     #[Assert\NotBlank]
-    #[Assert\Regex(pattern: '/^[0-9]{5}$/', message: 'Le code postal doit être composé de 5 chiffres.')]
+    #[Assert\Regex(pattern: '/^[0-9]{5}$/', message: 'Le code postal doit être composé de 5 chiffres.', groups: ['Default', 'bo_step_address'])]
     private ?string $cpOccupant = null;
 
     #[ORM\Column(type: 'string', length: 100, nullable: true)]
+    #[Assert\Length(max: 100, groups: ['bo_step_address'])]
     private ?string $villeOccupant = null;
 
     #[ORM\Column(type: 'string', length: 50, nullable: true)]
@@ -243,15 +248,19 @@ class Signalement implements EntityHistoryInterface, EntityHistoryCollectionInte
     private ?string $codeProcedure = null;
 
     #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Assert\Length(max: 5, groups: ['bo_step_address'])]
     private ?string $etageOccupant = null;
 
     #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Assert\Length(max: 3, groups: ['bo_step_address'])]
     private ?string $escalierOccupant = null;
 
     #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Assert\Length(max: 5, groups: ['bo_step_address'])]
     private ?string $numAppartOccupant = null;
 
     #[ORM\Column(type: 'string', length: 255, nullable: true)]
+    #[Assert\Length(max: 255, groups: ['bo_step_address'])]
     private ?string $adresseAutreOccupant = null;
 
     #[ORM\Column(type: 'string', length: 255, nullable: true)]
@@ -393,13 +402,13 @@ class Signalement implements EntityHistoryInterface, EntityHistoryCollectionInte
     private ?TypeCompositionLogement $typeCompositionLogement = null;
 
     #[ORM\Column(type: 'situation_foyer', nullable: true)]
-    private ?SituationFoyer $situationFoyer;
+    private ?SituationFoyer $situationFoyer = null;
 
     #[ORM\Column(type: 'information_procedure', nullable: true)]
-    private ?InformationProcedure $informationProcedure;
+    private ?InformationProcedure $informationProcedure = null;
 
     #[ORM\Column(type: 'information_complementaire', nullable: true)]
-    private ?InformationComplementaire $informationComplementaire;
+    private ?InformationComplementaire $informationComplementaire = null;
 
     #[ORM\ManyToMany(targetEntity: DesordreCategorie::class, inversedBy: 'signalement', cascade: ['persist'])]
     #[ORM\JoinTable(name: 'desordre_categorie_signalement')]
@@ -744,6 +753,18 @@ public function setIsBailEnCours(?bool $isBailEnCours): self
         return $this;
     }
 
+    public function getIsLogementVacant(): ?bool
+    {
+        return $this->isLogementVacant;
+    }
+
+    public function setIsLogementVacant(?bool $isLogementVacant): self
+    {
+        $this->isLogementVacant = $isLogementVacant;
+
+        return $this;
+    }
+
     public function getDateEntree(): ?\DateTimeInterface
     {
         return $this->dateEntree;
@@ -2073,7 +2094,7 @@ public function setCreatedFrom(?SignalementDraft $createdFrom): self
 
     public function getProfileDeclarant(): ?ProfileDeclarant
     {
-        if (null !== $this->createdFrom) {
+        if (null !== $this->createdFrom || null !== $this->createdBy) {
             return $this->profileDeclarant;
         }