up: NoteController
* add error if user doesn't select referral when trying to add new note * Finalize note editing
This commit is contained in:
parent
e601727514
commit
4859aa23b8
@ -78,6 +78,10 @@ class NoteController extends AbstractController
|
|||||||
#[Route('/add-note/{referralId}', name: 'app_add_note')]
|
#[Route('/add-note/{referralId}', name: 'app_add_note')]
|
||||||
public function addNote(#[CurrentUser()] User $user, Request $request, ?string $referralId = null): Response
|
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 */
|
/** @var Referral $referral */
|
||||||
$referral = $this->entityManager->getRepository(Referral::class)->find($referralId);
|
$referral = $this->entityManager->getRepository(Referral::class)->find($referralId);
|
||||||
$this->entityManager->getRepository(Referral::class)->populateNotes($referral);
|
$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
|
public function editNote(string $noteId, string $noteType, #[CurrentUser()] User $user, Request $request): Response
|
||||||
{
|
{
|
||||||
$form = null;
|
$form = null;
|
||||||
|
$members = [];
|
||||||
|
|
||||||
/** @var VisitNote|StandardNote $note */
|
/** @var VisitNote|StandardNote $note */
|
||||||
if ($noteType == 'visit') {
|
if ($noteType == 'visit') {
|
||||||
|
/** @var VisitNote $note */
|
||||||
$note = $this->entityManager->getRepository(VisitNote::class)->find($noteId);
|
$note = $this->entityManager->getRepository(VisitNote::class)->find($noteId);
|
||||||
$members = $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()]);
|
$members = $this->entityManager->getRepository(Member::class)->getMembersByCaseAndNote($note->getReferral()->getMemberCase(), $note);
|
||||||
$form = $this->createForm(VisitNoteFormType::class, $note, ['members' => $members]);
|
|
||||||
|
$form = $this->createForm(VisitNoteFormType::class, $note, [
|
||||||
|
'members' => $members,
|
||||||
|
//'members' => $this->entityManager->getRepository(Member::class)->findBy(['memberCase' => $note->getReferral()->getMemberCase()])
|
||||||
|
]);
|
||||||
} elseif ($noteType == 'standard') {
|
} elseif ($noteType == 'standard') {
|
||||||
$note = $this->entityManager->getRepository(StandardNote::class)->find($noteId);
|
$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(
|
return $this->render(
|
||||||
@ -182,7 +194,8 @@ class NoteController extends AbstractController
|
|||||||
'note' => $note,
|
'note' => $note,
|
||||||
'referral' => $note->getReferral(),
|
'referral' => $note->getReferral(),
|
||||||
'form' => $form,
|
'form' => $form,
|
||||||
'noteType' => $noteType
|
'noteType' => $noteType,
|
||||||
|
'members' => $members,
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user