From 312aa4cb05bbedb3aa9540feb5e6d8cfe1abc0eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20D=C4=9Bdi=C4=8D?= Date: Fri, 29 Sep 2023 18:01:25 +0200 Subject: [PATCH] Split participant export between participants and instructors --- .../CampModule/presenters/ParticipantPresenter.php | 9 +++++++-- .../Components/Participants/ParticipantList.php | 2 ++ .../Participants/templates/ParticipantList.latte | 4 ++-- .../EducationModule/presenters/ParticipantPresenter.php | 8 +++++--- .../EventModule/presenters/ParticipantPresenter.php | 9 +++++++-- .../Factories/Participants/IParticipantListFactory.php | 1 + app/model/DTO/Participant/ParticipatingPerson.php | 3 +++ app/model/Export/ExportService.php | 8 ++++++-- app/model/Export/templates/participantEducation.latte | 4 ++-- 9 files changed, 35 insertions(+), 13 deletions(-) diff --git a/app/AccountancyModule/CampModule/presenters/ParticipantPresenter.php b/app/AccountancyModule/CampModule/presenters/ParticipantPresenter.php index 32481eb997..8602dc5a52 100644 --- a/app/AccountancyModule/CampModule/presenters/ParticipantPresenter.php +++ b/app/AccountancyModule/CampModule/presenters/ParticipantPresenter.php @@ -17,6 +17,7 @@ use Model\Cashbook\ReadModel\Queries\CampParticipantListQuery; use Model\DTO\Participant\NonMemberParticipant; use Model\DTO\Participant\Participant; +use Model\DTO\Participant\ParticipatingPerson; use Model\DTO\Participant\UpdateParticipant; use Model\Event\Commands\Camp\ActivateAutocomputedParticipants; use Model\Event\SkautisCampId; @@ -100,8 +101,10 @@ public function handleActivateAutocomputedParticipants(int $aid): void $this->redirect('this'); } - public function actionExportExcel(int $aid): void + public function actionExportExcel(int $aid, string $exportType): void { + assert($exportType === ParticipatingPerson::PARTICIPANT); + try { $participantsDTO = $this->campParticipants(); $spreadsheet = $this->excelService->getCampParticipants($participantsDTO); @@ -164,8 +167,10 @@ protected function createComponentParticipantList(): ParticipantList return $control; } - public function actionExport(int $aid): void + public function actionExport(int $aid, string $exportType): void { + assert($exportType === ParticipatingPerson::PARTICIPANT); + try { $template = $this->exportService->getParticipants($aid, EventType::CAMP); $this->pdf->render($template, 'seznam-ucastniku.pdf', true); diff --git a/app/AccountancyModule/Components/Participants/ParticipantList.php b/app/AccountancyModule/Components/Participants/ParticipantList.php index 8d19add63d..f28ca13b36 100644 --- a/app/AccountancyModule/Components/Participants/ParticipantList.php +++ b/app/AccountancyModule/Components/Participants/ParticipantList.php @@ -62,6 +62,7 @@ public function __construct( protected bool $isAllowParticipantDelete, protected bool $isAllowShowUnits, protected string $title, + protected string $exportType, ) { } @@ -95,6 +96,7 @@ public function render(): void 'isAllowParticipantUpdate' => $this->isAllowParticipantUpdate, 'isAllowParticipantDelete' => $this->isAllowParticipantDelete, 'isAllowAnyAction' => $this->isAllowParticipantUpdate || $this->isAllowParticipantDelete, + 'exportType' => $this->exportType, ]); $this->template->render(); diff --git a/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte b/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte index fc5558de98..6c913e783e 100644 --- a/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte +++ b/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte @@ -71,10 +71,10 @@ $showUnits bool - zobrazovat číslo jednotky Exportovat…
- + PDF - + Excel diff --git a/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php b/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php index b4a22888d7..dce8d14763 100644 --- a/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php +++ b/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php @@ -12,6 +12,7 @@ use Model\Cashbook\ReadModel\Queries\EducationParticipantListQuery; use Model\DTO\Instructor\Instructor; use Model\DTO\Participant\Participant; +use Model\DTO\Participant\ParticipatingPerson; use Model\DTO\Participant\UpdateParticipant; use Model\ExcelService; use Model\ExportService; @@ -78,7 +79,7 @@ public function renderDefault(int $aid): void $this->redrawControl('contentSnip'); } - public function actionExportExcel(int $aid): void + public function actionExportExcel(int $aid, string $exportType): void { if ($this->event->getStartDate() === null) { $this->flashMessage('Bez vyplněného počátku akce nelze exportovat seznam účastníků, protože nelze dopočítat věk v době akce.', 'danger'); @@ -108,6 +109,7 @@ protected function createComponentInstructorList(): ParticipantList false, false, 'Seznam instruktorů', + ParticipatingPerson::INSTRUCTOR, ); $control->onUpdate[] = function (array $updates): void { @@ -152,10 +154,10 @@ protected function createComponentParticipantList(): ParticipantList return $control; } - public function actionExport(int $aid): void + public function actionExport(int $aid, string $exportType): void { try { - $template = $this->exportService->getParticipants($aid, EventType::EDUCATION); + $template = $this->exportService->getParticipants($aid, EventType::EDUCATION, $exportType); $this->pdf->render($template, 'seznam-ucastniku.pdf', false); } catch (PermissionException $ex) { $this->flashMessage('Nemáte oprávnění k záznamu osoby! (' . $ex->getMessage() . ')', 'danger'); diff --git a/app/AccountancyModule/EventModule/presenters/ParticipantPresenter.php b/app/AccountancyModule/EventModule/presenters/ParticipantPresenter.php index 45a41984c6..e19c509c4a 100644 --- a/app/AccountancyModule/EventModule/presenters/ParticipantPresenter.php +++ b/app/AccountancyModule/EventModule/presenters/ParticipantPresenter.php @@ -17,6 +17,7 @@ use Model\Cashbook\ReadModel\Queries\EventParticipantListQuery; use Model\DTO\Participant\NonMemberParticipant; use Model\DTO\Participant\Participant; +use Model\DTO\Participant\ParticipatingPerson; use Model\DTO\Participant\UpdateParticipant; use Model\ExcelService; use Model\ExportService; @@ -89,8 +90,10 @@ public function renderDefault(int $aid): void $this->redrawControl('contentSnip'); } - public function actionExportExcel(int $aid): void + public function actionExportExcel(int $aid, string $exportType): void { + assert($exportType === ParticipatingPerson::PARTICIPANT); + try { $participantsDTO = $this->eventParticipants(); $spreadsheet = $this->excelService->getGeneralParticipants($participantsDTO, $this->event->getStartDate()); @@ -154,8 +157,10 @@ protected function createComponentParticipantList(): ParticipantList return $control; } - public function actionExport(int $aid): void + public function actionExport(int $aid, string $exportType): void { + assert($exportType === ParticipatingPerson::PARTICIPANT); + try { $template = $this->exportService->getParticipants($aid, EventType::GENERAL); $this->pdf->render($template, 'seznam-ucastniku.pdf', false); diff --git a/app/AccountancyModule/Factories/Participants/IParticipantListFactory.php b/app/AccountancyModule/Factories/Participants/IParticipantListFactory.php index 6434660030..936c4a9e93 100644 --- a/app/AccountancyModule/Factories/Participants/IParticipantListFactory.php +++ b/app/AccountancyModule/Factories/Participants/IParticipantListFactory.php @@ -20,5 +20,6 @@ public function create( bool $isAllowParticipantDelete, bool $isAllowShowUnits = true, string $title = 'Seznam účastníků', + string $exportType = ParticipatingPerson::PARTICIPANT, ): ParticipantList; } diff --git a/app/model/DTO/Participant/ParticipatingPerson.php b/app/model/DTO/Participant/ParticipatingPerson.php index a763eeac55..a07ea8b687 100644 --- a/app/model/DTO/Participant/ParticipatingPerson.php +++ b/app/model/DTO/Participant/ParticipatingPerson.php @@ -23,6 +23,9 @@ class ParticipatingPerson { use SmartObject; + public const PARTICIPANT = 'participant'; + public const INSTRUCTOR = 'instructor'; + private Payment $paymentObj; public function __construct( diff --git a/app/model/Export/ExportService.php b/app/model/Export/ExportService.php index 4e60ed9db0..6520e24257 100644 --- a/app/model/Export/ExportService.php +++ b/app/model/Export/ExportService.php @@ -17,6 +17,7 @@ use Model\Cashbook\ReadModel\Queries\CategoriesSummaryQuery; use Model\Cashbook\ReadModel\Queries\ChitListQuery; use Model\Cashbook\ReadModel\Queries\EducationCashbookIdQuery; +use Model\Cashbook\ReadModel\Queries\EducationInstructorListQuery; use Model\Cashbook\ReadModel\Queries\EducationParticipantListQuery; use Model\Cashbook\ReadModel\Queries\EventCashbookIdQuery; use Model\Cashbook\ReadModel\Queries\EventParticipantListQuery; @@ -26,6 +27,7 @@ use Model\DTO\Cashbook\Cashbook; use Model\DTO\Cashbook\CategorySummary; use Model\DTO\Cashbook\Chit; +use Model\DTO\Participant\ParticipatingPerson; use Model\DTO\Participant\Statistics; use Model\Event\Camp; use Model\Event\Education; @@ -71,7 +73,7 @@ public function getNewPage(): string return ''; } - public function getParticipants(int $aid, string $type = EventType::GENERAL): string + public function getParticipants(int $aid, string $type = EventType::GENERAL, string $participantType = ParticipatingPerson::PARTICIPANT): string { if ($type === EventType::CAMP) { $templateFile = __DIR__ . '/templates/participantCamp.latte'; @@ -86,7 +88,9 @@ public function getParticipants(int $aid, string $type = EventType::GENERAL): st assert($education instanceof Education); $displayName = $education->getDisplayName(); $unitId = $education->getUnitId(); - $list = $this->queryBus->handle(new EducationParticipantListQuery($education->getId())); + $list = $participantType === ParticipatingPerson::INSTRUCTOR + ? $this->queryBus->handle(new EducationInstructorListQuery($education->getId())) + : $this->queryBus->handle(new EducationParticipantListQuery($education->getId())); } else { $templateFile = __DIR__ . '/templates/participant.latte'; $event = $this->queryBus->handle(new EventQuery(new SkautisEventId($aid))); diff --git a/app/model/Export/templates/participantEducation.latte b/app/model/Export/templates/participantEducation.latte index 25f38d8f25..c1347ae0e6 100644 --- a/app/model/Export/templates/participantEducation.latte +++ b/app/model/Export/templates/participantEducation.latte @@ -42,8 +42,8 @@ td { {$iterator->counter} {$p->displayName} - {if $p->street != ""}{$p->street}{else} {/if}{if $p->city != ""}, {$p->city}{/if}{if $p->postcode != ""}, {(string)$p->postcode|postCode}{/if} - {if $p->birthday !== null}{$p->birthday->format("d.m.Y")}{else} {/if} + {if property_exists($p, "street") && $p->street != ""}{$p->street}{else} {/if}{if property_exists($p, "city") && $p->city != ""}, {$p->city}{/if}{if property_exists($p, "postcode") && $p->postcode != ""}, {(string)$p->postcode|postCode}{/if} + {if property_exists($p, "birthday") && $p->birthday !== null}{$p->birthday->format("d.m.Y")}{else} {/if} {$p->payment|price:false} Kč