From 82ff3bdf238096ee5c53d121745885ce3bafb91b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Thu, 18 Jul 2024 15:18:58 +0200 Subject: [PATCH] feat: new dispositions widget on admin dashboard --- src/Controller/Admin/IndexController.php | 5 ++++- .../_partials/_disposition_data.html.twig | 8 ++++++++ templates/admin/index.html.twig | 20 +++++++++++++++++++ templates/manager/index.html.twig | 13 +----------- 4 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 templates/_partials/_disposition_data.html.twig diff --git a/src/Controller/Admin/IndexController.php b/src/Controller/Admin/IndexController.php index d27dfa3..ad8fa7e 100644 --- a/src/Controller/Admin/IndexController.php +++ b/src/Controller/Admin/IndexController.php @@ -42,7 +42,9 @@ class IndexController extends AbstractController $newDocumentsCount = $uploadRepository->getCountByStatus(Upload::STATUS_NEW); $pendingDocumentsCount = $uploadRepository->getCountByStatus(Upload::STATUS_PENDING); - $overdueContracts = $this->entityManager->getRepository(Disposition::class)->findOverdueContracts(); + $dispositionRepository = $this->entityManager->getRepository(Disposition::class); + $overdueContracts = $dispositionRepository->findOverdueContracts(); + $newDispositions = $dispositionRepository->getNew(); return $this->render('admin/index.html.twig', [ 'applications' => $applications, @@ -56,6 +58,7 @@ class IndexController extends AbstractController 'newDocumentsCount' => $newDocumentsCount, 'pendingDocumentsCount' => $pendingDocumentsCount, 'overdueContracts' => $overdueContracts, + 'newDispositions' => $newDispositions, ]); } } \ No newline at end of file diff --git a/templates/_partials/_disposition_data.html.twig b/templates/_partials/_disposition_data.html.twig new file mode 100644 index 0000000..9d7fca3 --- /dev/null +++ b/templates/_partials/_disposition_data.html.twig @@ -0,0 +1,8 @@ +{% set assignment = disposition.assignment %} +{{ disposition.teamer.fullName(true) }} +{% include '_partials/_dot.html.twig' %} +{{ assignment.effectivePeriod.start|date('d.m.y') }} - {{ assignment.effectivePeriod.end|date('d.m.y') }} +{% include '_partials/_dot.html.twig' %} +{{ assignment.destination.hotel }} +{% include '_partials/_dot.html.twig' %} +{{ assignment.jobProfile.name }} diff --git a/templates/admin/index.html.twig b/templates/admin/index.html.twig index f715470..aeeab1d 100644 --- a/templates/admin/index.html.twig +++ b/templates/admin/index.html.twig @@ -36,6 +36,26 @@ {% endfor %} +
+

+ Neue Einteilungen +

+ +

Neue Dokumente diff --git a/templates/manager/index.html.twig b/templates/manager/index.html.twig index 41f09df..b01a187 100644 --- a/templates/manager/index.html.twig +++ b/templates/manager/index.html.twig @@ -1,16 +1,5 @@ {% extends 'manager/layout.html.twig' %} -{% macro dispositionData(disposition) %} - {% set assignment = disposition.assignment %} - {{ disposition.teamer.fullName(true) }} - {% include '_partials/_dot.html.twig' %} - {{ assignment.effectivePeriod.start|date('d.m.y') }} - {{ assignment.effectivePeriod.end|date('d.m.y') }} - {% include '_partials/_dot.html.twig' %} - {{ assignment.destination.hotel }} - {% include '_partials/_dot.html.twig' %} - {{ assignment.jobProfile.name }} -{% endmacro %} - {% block content %}