From 4859aa23b8abe58e8e676c85ce556b3258d96190 Mon Sep 17 00:00:00 2001
From: Ryan Prather <ryan@rkprather.com>
Date: Sun, 9 Feb 2025 18:11:48 -0500
Subject: [PATCH] up: NoteController

* add error if user doesn't select referral when trying to add new note
* Finalize note editing
---
 src/Controller/Case/NoteController.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Controller/Case/NoteController.php b/src/Controller/Case/NoteController.php
index a5bc721..f785e71 100644
--- a/src/Controller/Case/NoteController.php
+++ b/src/Controller/Case/NoteController.php
@@ -78,6 +78,10 @@ class NoteController extends AbstractController
     #[Route('/add-note/{referralId}', name: 'app_add_note')]
     public function addNote(#[CurrentUser()] User $user, Request $request, ?string $referralId = null): Response
     {
+        if (substr($referralId, 0, 4) == 'case') {
+            throw $this->createNotFoundException('Select Referral from dropdown');
+        }
+
         /** @var Referral $referral */
         $referral = $this->entityManager->getRepository(Referral::class)->find($referralId);
         $this->entityManager->getRepository(Referral::class)->populateNotes($referral);
@@ -158,16 +162,24 @@ class NoteController extends AbstractController
     public function editNote(string $noteId, string $noteType, #[CurrentUser()] User $user, Request $request): Response
     {
         $form = null;
+        $members = [];
 
         /** @var VisitNote|StandardNote $note */
         if ($noteType == 'visit') {
+            /** @var VisitNote $note */
             $note = $this->entityManager->getRepository(VisitNote::class)->find($noteId);
-            $members = $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()]);
-            $form = $this->createForm(VisitNoteFormType::class, $note, ['members' => $members]);
+            $members = $this->entityManager->getRepository(Member::class)->getMembersByCaseAndNote($note->getReferral()->getMemberCase(), $note);
+
+            $form = $this->createForm(VisitNoteFormType::class, $note, [
+                'members' => $members,
+                //'members' => $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()])
+            ]);
         } elseif ($noteType == 'standard') {
             $note = $this->entityManager->getRepository(StandardNote::class)->find($noteId);
-            $members = $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()]);
-            $form = $this->createForm(StandardNoteFormType::class, $note, ['members' => $members]);
+            
+            $form = $this->createForm(StandardNoteFormType::class, $note, [
+                'members' => $members,
+            ]);
         }
 
         return $this->render(
@@ -182,7 +194,8 @@ class NoteController extends AbstractController
                     'note' => $note,
                     'referral' => $note->getReferral(),
                     'form' => $form,
-                    'noteType' => $noteType
+                    'noteType' => $noteType,
+                    'members' => $members,
                 ]
             )
         );