[BO - Signalement] Rapport de visite non modifiable

src/Controller/Back/SignalementFileController.php

@@ -107,7 +107,7 @@ public function deleteFileSignalement(
     ): JsonResponse {
         $this->denyAccessUnlessGranted('FILE_DELETE', $signalement);
         if ($this->isCsrfTokenValid('signalement_delete_file_'.$signalement->getId(), $request->get('_token'))) {
-            if ($uploadHandlerService->deleteFile($signalement, $type, $filename, $fileRepository)) {
+            if ($uploadHandlerService->deleteSignalementFile($signalement, $type, $filename, $fileRepository)) {
                 return $this->json(['response' => 'success']);
             }
         }

src/Controller/Back/SignalementVisitesController.php

@@ -3,6 +3,7 @@
 namespace App\Controller\Back;
 
 use App\Dto\Request\Signalement\VisiteRequest;
+use App\Entity\Intervention;
 use App\Entity\Signalement;
 use App\Entity\User;
 use App\Event\InterventionCreatedEvent;
@@ -13,6 +14,7 @@
 use App\Repository\InterventionRepository;
 use App\Service\Files\FilenameGenerator;
 use App\Service\UploadHandlerService;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
@@ -330,6 +332,26 @@ public function editVisiteFromSignalement(
         return $this->redirectToRoute('back_signalement_view', ['uuid' => $signalement->getUuid()]);
     }
 
+    #[Route('/{uuid}/visites/{intervention}/delete-rapport', name: 'back_signalement_visite_deleterapport')]
+    public function deleteRapportVisiteFromSignalement(
+        Signalement $signalement,
+        Intervention $intervention,
+        Request $request,
+        EntityManagerInterface $entityManager,
+        UploadHandlerService $uploadHandlerService,
+    ): Response {
+        if (!$this->isCsrfTokenValid('delete_rapport', $request->get('_token')) || $intervention->getSignalement()->getId() !== $signalement->getId() || $intervention->getFiles()->isEmpty()) {
+            return $this->redirectToRoute('back_signalement_view', ['uuid' => $signalement->getUuid()]);
+        }
+        $file = $intervention->getFiles()->first();
+        $uploadHandlerService->deleteFileInBucket($file);
+        $entityManager->remove($file);
+        $entityManager->flush();
+        $this->addFlash('success', 'Le rapport de visite a bien été supprimé.');
+
+        return $this->redirectToRoute('back_signalement_view', ['uuid' => $signalement->getUuid()]);
+    }
+
     private function validateRequest(VisiteRequest $visiteRequest, ValidatorInterface $validator): string
     {
         $errorMessage = '';

src/Service/UploadHandlerService.php

@@ -120,7 +120,7 @@ private function movePhotoVariants(string $filename): void
         $this->moveFilePath($distantFolder.$variantNames[ImageManipulationHandler::SUFFIX_THUMB]);
     }
 
-    public function deleteFile(Signalement $signalement, string $type, string $filename, FileRepository $fileRepository)
+    public function deleteSignalementFile(Signalement $signalement, string $type, string $filename, FileRepository $fileRepository): bool
     {
         $fileType = 'documents' === $type ? File::FILE_TYPE_DOCUMENT : File::FILE_TYPE_PHOTO;
 
@@ -133,17 +133,7 @@ function (File $file) use ($fileType, $filename) {
 
         if (!$fileCollection->isEmpty()) {
             $file = $fileCollection->current();
-            if ($this->fileStorage->fileExists($file->getFilename())) {
-                $this->fileStorage->delete($file->getFilename());
-            }
-            $variantNames = ImageManipulationHandler::getVariantNames($filename);
-            if ($this->fileStorage->fileExists($variantNames[ImageManipulationHandler::SUFFIX_RESIZE])) {
-                $this->fileStorage->delete($variantNames[ImageManipulationHandler::SUFFIX_RESIZE]);
-            }
-            if ($this->fileStorage->fileExists($variantNames[ImageManipulationHandler::SUFFIX_THUMB])) {
-                $this->fileStorage->delete($variantNames[ImageManipulationHandler::SUFFIX_THUMB]);
-            }
-
+            $this->deleteFileInBucket($file);
             $fileRepository->remove($file, true);
 
             return true;
@@ -152,6 +142,20 @@ function (File $file) use ($fileType, $filename) {
         return false;
     }
 
+    public function deleteFileInBucket(File $file): void
+    {
+        if ($this->fileStorage->fileExists($file->getFilename())) {
+            $this->fileStorage->delete($file->getFilename());
+        }
+        $variantNames = ImageManipulationHandler::getVariantNames($file->getFilename());
+        if ($this->fileStorage->fileExists($variantNames[ImageManipulationHandler::SUFFIX_RESIZE])) {
+            $this->fileStorage->delete($variantNames[ImageManipulationHandler::SUFFIX_RESIZE]);
+        }
+        if ($this->fileStorage->fileExists($variantNames[ImageManipulationHandler::SUFFIX_THUMB])) {
+            $this->fileStorage->delete($variantNames[ImageManipulationHandler::SUFFIX_THUMB]);
+        }
+    }
+
     public function uploadFromFilename(string $filename): ?string
     {
         $this->logger->info($filename);

templates/back/signalement/view/visites/visite-item.html.twig

@@ -60,16 +60,18 @@
                 {% endif %}
             {% endif %}
         </div>
-        <div class="fr-mb-3v">
-            <strong>Rapport :</strong>
+        <div class="fr-mb-3v fr-display-inline-flex">
+            <strong>Rapport : </strong>
             {% if signalement.interventions is empty or intervention.files is empty %}
-                <span class="fr-badge fr-badge--no-icon" title="Non disponible">Non disponible</span>
+                <span class="fr-badge fr-badge--no-icon" title="Non disponible">Non disponible</span> 
             {% else %}
                 <a href="{{ asset('_up/'~intervention.files[0].filename)~'/' ~ signalement.uuid }}"
-                    class="fr-btn fr-btn--sm fr-fi-file-line fr-btn--icon-left"
-                   title="Afficher le document"
-                   rel="noopener"
-                   target="_blank">Voir le rapport de visite</a>
+                    class="fr-btn fr-btn--sm"
+                    title="Afficher le document"
+                    rel="noopener"
+                    target="_blank">
+                    <span aria-hidden="true" class="fr-fi-file-line fr-icon--sm"></span> Voir le rapport de visite
+                </a>
             {% endif %}
         </div>
     </div>

templates/back/signalement/view/visites/visites-form-confirm-fields.html.twig

@@ -104,4 +104,16 @@
     </legend>
     <input type="file" accept="application/*" name="visite-{{ formType }}[rapport]">
 </fieldset>
+{% elseif intervention is defined and intervention.files|length %}
+<fieldset class="fr-fieldset fr-fieldset--inline fr-mb-5v">
+	<ul class="fr-btns-group fr-btns-group--inline-sm fr-btns-group--sm">
+		<li>
+			<a href="{{ asset('_up/'~intervention.files[0].filename)~'/' ~ intervention.signalement.uuid }}" class="fr-btn" title="Afficher le document" rel="noopener" target="_blank">Voir le rapport de visite
+			</a>
+		</li>
+		<li>
+			<a href="{{ path('back_signalement_visite_deleterapport',{uuid:intervention.signalement.uuid, intervention:intervention.id}) }}?_token={{ csrf_token('delete_rapport') }}" title="Supprimer le rapport" class="fr-btn fr-btn--secondary fr-background--white fr-fi-delete-line "></a>
+		</li>
+	</ul>
+</fieldset>
 {% endif %}