ryan/cmtracker
1
0
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

remove notificationCount, convert to use Libs::getMessages method, change datetime creation to use company timezone

Browse Source
This commit is contained in:
Ryan Prather
2025-01-10 13:33:33 +00:00
parent 2d7b7e6d12
commit 02fcb0cc54
8 changed files with 125 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Controller/NoteController.php
View File

@@ -18,6 +18,7 @@ use App\Enums\ReferralServiceType;
use App\Form\StandardNoteFormType;
use App\Form\VisitNoteFormType;
use App\Libs\Breadcrumb;
use App\Libs\Libs;
use App\Libs\NavList;
use DateTime;
use DateTimeZone;
@@ -37,8 +38,6 @@ class NoteController extends AbstractController
*/
private array $msgs;
private int $notificationCount;
public function __construct(
private EntityManagerInterface $entityManager,
private array $navLinks = [],
@@ -47,14 +46,29 @@ class NoteController extends AbstractController
$this->navLinks['case_notes'] = NavList::PRESENT_LINK;
}
#[Route('/list-notes/', name: 'app_list_notes')]
public function listNotes(#[CurrentUser()] User $user, Request $request): Response
#[Route('/list-notes/{caseId?null}', name: 'app_list_notes')]
public function listNotes(string $caseId = null, #[CurrentUser()] User $user, Request $request): Response
{
$this->msgs = $this->entityManager->getRepository(Messages::class)->getUnreadMessages($user);
$this->notificationCount = $this->entityManager->getRepository(Messages::class)->getUnreadMessageCount($user);
$this->msgs = Libs::getMessages($user, $this->entityManager);
/** @var UserCase[] $cases */
$cases = $this->entityManager->getRepository(UserCase::class)->findBy(['user' => $user]);
$caseNotes = null;
$case = null;
if ($caseId != 'null') {
$case = $this->entityManager->getRepository(MemberCase::class)->find($caseId);
$params = [
'case' => $case,
'referral' => null,
'startDate' => null,
'endDate' => null,
];
$caseNotes = array_merge(
$this->entityManager->getRepository(VisitNote::class)->filterNotes($user, $params),
$this->entityManager->getRepository(StandardNote::class)->filterNotes($user, $params),
);
}
return $this->render(
'internal/cases/notes/list-notes.html.twig',
@@ -66,7 +80,8 @@ class NoteController extends AbstractController
],
'notifications' => $this->msgs,
'cases' => $cases,
'notificationCount' => $this->notificationCount,
'caseNotes' => $caseNotes,
'case' => $case,
]
)
);
@@ -78,8 +93,7 @@ class NoteController extends AbstractController
/** @var Referral $referral */
$referral = $this->entityManager->getRepository(Referral::class)->find($referralId);
$this->entityManager->getRepository(Referral::class)->populateNotes($referral);
$this->msgs = $this->entityManager->getRepository(Messages::class)->getUnreadMessages($user);
$this->notificationCount = $this->entityManager->getRepository(Messages::class)->getUnreadMessageCount($user);
$this->msgs = Libs::getMessages($user, $this->entityManager);
$members = $this->entityManager->getRepository(Member::class)->findBy(['caseId' => $referral->getMemberCase()]);
$defaultMethod = NoteMethod::BILLABLE;
@@ -126,7 +140,6 @@ class NoteController extends AbstractController
'form' => $form,
'default_method' => $defaultMethod,
'default_location' => $defaultLocation,
'notificationCount' => $this->notificationCount,
]
)
);
@@ -135,8 +148,8 @@ class NoteController extends AbstractController
#[Route('/edit-note/{noteType}/{noteId}', name: 'app_edit_note')]
public function editNote(string $noteId, string $noteType, #[CurrentUser()] User $user, Request $request): Response
{
$this->msgs = $this->entityManager->getRepository(Messages::class)->getUnreadMessages($user);
$this->notificationCount = $this->entityManager->getRepository(Messages::class)->getUnreadMessageCount($user);
$this->msgs = Libs::getMessages($user, $this->entityManager);
$form = null;
/** @var VisitNote|StandardNote $note */
@@ -159,7 +172,6 @@ class NoteController extends AbstractController
new Breadcrumb($this->generateUrl('app_list_notes'), 'List Notes')
],
'notifications' => $this->msgs,
'notificationCount' => $this->notificationCount,
'note' => $note,
'referral' => $note->getReferral(),
'form' => $form,
@@ -178,11 +190,11 @@ class NoteController extends AbstractController
$case = null;
if ($request->getPayload()->get('startDate')) {
$startDate = new DateTime($request->getPayload()->get('startDate'), new DateTimeZone('America/Indiana/Indianapolis'));
$startDate = new DateTime($request->getPayload()->get('startDate'), new DateTimeZone($_ENV['COMPANY_TIMEZONE']));
}
if ($request->getPayload()->get('endDate')) {
$endDate = new DateTime($request->getPayload()->get('endDate'), new DateTimeZone('America/Indiana/Indianapolis'));
$endDate = new DateTime($request->getPayload()->get('endDate'), new DateTimeZone($_ENV['COMPANY_TIMEZONE']));
}
if ($request->getPayload()->get('referral')) {