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

This commit is contained in:
2025-01-10 13:33:33 +00:00
parent 2d7b7e6d12
commit 02fcb0cc54
8 changed files with 125 additions and 120 deletions

View File

@ -7,6 +7,7 @@ use App\Entity\ReferralSource;
use App\Entity\User;
use App\Form\ReferralSourceFormType;
use App\Libs\Breadcrumb;
use App\Libs\Libs;
use App\Libs\NavList;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@ -24,8 +25,6 @@ class ReferralSourceController extends AbstractController
*/
private array $msgs;
private int $notificationCount;
public function __construct(
private EntityManagerInterface $entityManager,
private array $navList = []
@ -38,9 +37,8 @@ class ReferralSourceController extends AbstractController
public function listReferralSources(#[CurrentUser()] User $user): Response
{
$this->denyAccessUnlessGranted('ROLE_ADMIN');
$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);
$sources = $this->entityManager->getRepository(ReferralSource::class)->retrieveOrderedList();
return $this->render(
@ -50,7 +48,6 @@ class ReferralSourceController extends AbstractController
[
'sources' => $sources,
'notifications' => $this->msgs,
'notificationCount' => $this->notificationCount,
'breadcrumbs' => [
new Breadcrumb($this->generateUrl('app_referral_source'), 'Referral Sources')
]
@ -63,9 +60,8 @@ class ReferralSourceController extends AbstractController
public function addSource(Request $request, #[CurrentUser()] User $user): Response
{
$this->denyAccessUnlessGranted('ROLE_ADMIN');
$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);
$rs = new ReferralSource();
$form = $this->createForm(ReferralSourceFormType::class, $rs);
@ -89,7 +85,6 @@ class ReferralSourceController extends AbstractController
[
'form' => $form,
'notifications' => $this->msgs,
'notificationCount' => $this->notificationCount,
'breadcrumbs' => [
new Breadcrumb($this->generateUrl('app_referral_source'), 'Referral Sources'),
new Breadcrumb($this->generateUrl('app_add_source'), 'Add Source')
@ -103,9 +98,8 @@ class ReferralSourceController extends AbstractController
public function editSource(Request $request, #[CurrentUser()] User $user, string $id): Response
{
$this->denyAccessUnlessGranted('ROLE_ADMIN');
$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);
$rs = $this->entityManager->getRepository(ReferralSource::class)->find($id);
$form = $this->createForm(ReferralSourceFormType::class, $rs);
@ -130,7 +124,6 @@ class ReferralSourceController extends AbstractController
'form' => $form,
'rs' => $rs,
'notifications' => $this->msgs,
'notificationCount' => $this->notificationCount,
'breadcrumbs' => [
new Breadcrumb($this->generateUrl('app_referral_source'), 'Referral Sources'),
new Breadcrumb($this->generateUrl('app_edit_source', ['id' => $id]), 'Edit Source')