diff --git a/app/AccountancyModule/Components/Participants/EditParticipantDialog.php b/app/AccountancyModule/Components/Participants/EditParticipantDialog.php index 127e62217..be6fc9e98 100644 --- a/app/AccountancyModule/Components/Participants/EditParticipantDialog.php +++ b/app/AccountancyModule/Components/Participants/EditParticipantDialog.php @@ -9,6 +9,7 @@ use Assert\Assertion; use Closure; use Model\DTO\Participant\Participant; +use Model\DTO\Participant\ParticipatingPerson; use Model\DTO\Participant\UpdateParticipant; use function assert; @@ -21,7 +22,7 @@ final class EditParticipantDialog extends Dialog /** @var Closure[] */ public array $onUpdate = []; - /** @param array $participants */ + /** @param array $participants */ public function __construct(private array $participants, private bool $isAllowedDaysUpdate, private bool $isAccountAllowed, private bool $isRepaymentAllowed, private bool $isOnlineLogin) { } @@ -43,11 +44,12 @@ protected function createComponentForm(): BaseForm Assertion::keyExists($this->participants, $this->participantId); $participant = $this->participants[$this->participantId]; - assert($participant instanceof Participant); + assert($participant instanceof ParticipatingPerson); $form = new BaseForm(); if ($this->isAllowedDaysUpdate) { + assert($participant instanceof Participant); $days = $form->addInteger('days', 'Počet dní') ->setRequired('Musíte vyplnit počet dní') ->addRule(BaseForm::MIN, 'Minimální počet dní je %d', 0) @@ -87,7 +89,7 @@ protected function createComponentForm(): BaseForm $changes[UpdateParticipant::FIELD_PAYMENT] = $values['payment']; } - if ($this->isAllowedDaysUpdate && isset($values['days']) && $values['days'] !== $participant->getDays()) { + if ($this->isAllowedDaysUpdate && isset($values['days']) && $participant instanceof Participant && $values['days'] !== $participant->getDays()) { $changes[UpdateParticipant::FIELD_DAYS] = $values['days']; } @@ -99,7 +101,7 @@ protected function createComponentForm(): BaseForm $changes[UpdateParticipant::FIELD_IS_ACCOUNT] = $values['isAccount']; } - $this->onUpdate($this->participantId, $changes, $participant->isAccepted()); + $this->onUpdate($this->participantId, $changes, $participant instanceof Participant ? $participant->isAccepted() : null); $this->hide(); }; diff --git a/app/AccountancyModule/Components/Participants/ParticipantList.php b/app/AccountancyModule/Components/Participants/ParticipantList.php index a893fd9e6..6d3f9499e 100644 --- a/app/AccountancyModule/Components/Participants/ParticipantList.php +++ b/app/AccountancyModule/Components/Participants/ParticipantList.php @@ -7,6 +7,7 @@ use App\AccountancyModule\Components\BaseControl; use App\Forms\BaseForm; use Model\DTO\Participant\Participant; +use Model\DTO\Participant\ParticipatingPerson; use Model\DTO\Participant\UpdateParticipant; use Model\Participant\ParticipantNotFound; use Nette\Application\BadRequestException; @@ -53,7 +54,7 @@ final class ParticipantList extends BaseControl /** @persistent */ public string|null $sort = 'displayName'; - /** @param Participant[] $currentParticipants */ + /** @param ParticipatingPerson[] $currentParticipants */ public function __construct( public int $aid, private array $currentParticipants, @@ -63,6 +64,9 @@ public function __construct( protected bool $isAllowParticipantUpdate, protected bool $isAllowParticipantDelete, protected bool $isOnlineLogin, + protected bool $isAllowShowUnits, + protected string $title, + protected string $exportType, ) { } @@ -84,9 +88,11 @@ public function render(): void $this->template->setFile(__DIR__ . '/templates/ParticipantList.latte'); $this->template->setParameters([ 'aid' => $this->aid, + 'title' => $this->title, 'participants' => $this->currentParticipants, 'sort' => $this->sort, 'sortOptions' => $sortOptions, + 'isAllowShowUnits' => $this->isAllowShowUnits, 'showUnits' => $this->showUnits, 'isAllowDaysUpdate' => $this->isAllowDaysUpdate, 'isAllowRepayment' => $this->isAllowRepayment, @@ -94,12 +100,13 @@ public function render(): void 'isAllowParticipantUpdate' => $this->isAllowParticipantUpdate, 'isAllowParticipantDelete' => $this->isAllowParticipantDelete, 'isAllowAnyAction' => $this->isAllowParticipantUpdate || $this->isAllowParticipantDelete, + 'exportType' => $this->exportType, ]); $this->template->render(); } - /** @param Participant[] $participants */ + /** @param ParticipatingPerson[] $participants */ protected function sortParticipants(array &$participants, string $sort): void { if (! isset(self::SORT_OPTIONS[$sort])) { @@ -107,9 +114,9 @@ protected function sortParticipants(array &$participants, string $sort): void } if ($sort === 'displayName') { - $sortFunction = fn (Participant $a, Participant $b) => strcoll($a->{$sort}, $b->{$sort}); + $sortFunction = fn (ParticipatingPerson $a, ParticipatingPerson $b) => strcoll($a->{$sort}, $b->{$sort}); } else { - $sortFunction = fn (Participant $a, Participant $b) => $a->{$sort} <=> $b->{$sort}; + $sortFunction = fn (ParticipatingPerson $a, ParticipatingPerson $b) => $a->{$sort} <=> $b->{$sort}; } usort($participants, $sortFunction); @@ -144,7 +151,7 @@ public function handleRemove(int $participantId): void $this->onRemove([$participantId]); $this->currentParticipants = array_filter( $this->currentParticipants, - function (Participant $p) use ($participantId) { + function (ParticipatingPerson $p) use ($participantId) { return $p->getId() !== $participantId; }, ); @@ -167,7 +174,7 @@ protected function createComponentEditDialog(): EditParticipantDialog { $dialog = new EditParticipantDialog($this->participantsById(), $this->isAllowDaysUpdate, $this->isAllowIsAccount, $this->isAllowRepayment, $this->isOnlineLogin); - $dialog->onUpdate[] = function (int $participantId, array $fields, bool $isAccepted): void { + $dialog->onUpdate[] = function (int $participantId, array $fields, bool|null $isAccepted): void { $changes = []; foreach ($fields as $field => $value) { @@ -237,27 +244,29 @@ private function massEditSubmitted(SubmitButton $button): void foreach ($button->getForm()->getValues()->participantIds as $participantId) { $participant = $currentParticipants[$participantId] ?? throw new ParticipantNotFound('Cannot find participant from the given data'); + $isAccepted = $participant instanceof Participant ? $participant->isAccepted() : null; + if ($values['days'] !== null) { - if ($this->isOnlineLogin && ! $participant->isAccepted()) { + if ($this->isOnlineLogin && ! $isAccepted) { $participantUpdateError[] = $participant->displayName; } else { - $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_DAYS, $values['days'], $participant->isAccepted()); + $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_DAYS, $values['days'], $isAccepted); } } if ($values['payment'] !== null) { - $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_PAYMENT, $values['payment'], $participant->isAccepted()); + $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_PAYMENT, $values['payment'], $isAccepted); } if ($values['repayment'] !== null) { - $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_REPAYMENT, $values['repayment'], $participant->isAccepted()); + $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_REPAYMENT, $values['repayment'], $isAccepted); } if (in_array($values['isAccount'], [self::NO_ACTION, null])) { continue; } - $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_IS_ACCOUNT, $values['isAccount'], $participant->isAccepted()); + $changes[] = new UpdateParticipant($this->aid, $participantId, UpdateParticipant::FIELD_IS_ACCOUNT, $values['isAccount'], $isAccepted); } if (! empty($participantUpdateError)) { @@ -287,7 +296,7 @@ private function massRemoveSubmitted(SubmitButton $button): void $this->reload('Účastníci byli odebráni'); } - /** @return array Participant's indexed by their ID */ + /** @return array Participant's indexed by their ID */ private function participantsById(): array { $participants = []; diff --git a/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte b/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte index d70410699..6c913e783 100644 --- a/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte +++ b/app/AccountancyModule/Components/Participants/templates/ParticipantList.latte @@ -58,7 +58,7 @@ $showUnits bool - zobrazovat číslo jednotky {var $tabIndex = 1}
-

Seznam účastníků

+

{$title}

- + PDF - + Excel @@ -89,7 +89,7 @@ $showUnits bool - zobrazovat číslo jednotky {$label}
- + {$showUnits ? 'Skrýt' : 'Zobrazit'} jednotku diff --git a/app/AccountancyModule/EducationModule/presenters/CashbookPresenter.php b/app/AccountancyModule/EducationModule/presenters/CashbookPresenter.php index 3797721c5..799b6650f 100644 --- a/app/AccountancyModule/EducationModule/presenters/CashbookPresenter.php +++ b/app/AccountancyModule/EducationModule/presenters/CashbookPresenter.php @@ -17,6 +17,7 @@ use Model\Cashbook\ReadModel\Queries\CategoryListQuery; use Model\Cashbook\ReadModel\Queries\ChitListQuery; use Model\Cashbook\ReadModel\Queries\EducationCashbookIdQuery; +use Model\Cashbook\ReadModel\Queries\EducationInstructorIncomeQuery; use Model\Cashbook\ReadModel\Queries\EducationParticipantCategoryIdQuery; use Model\Cashbook\ReadModel\Queries\EducationParticipantIncomeQuery; use Model\Cashbook\ReadModel\Queries\FinalCashBalanceQuery; @@ -81,6 +82,9 @@ protected function createComponentCashbook(): CashbookControl protected function createComponentFormImportHpd(): BaseForm { $form = new BaseForm(); + $form->addRadioList('from', 'Od:', ['participant' => 'Od účastníků', 'instructor' => 'Od instruktorů']) + ->addRule($form::FILLED, 'Musíte vyplnit kategorii.') + ->setDefaultValue('participant'); $form->addRadioList('isAccount', 'Placeno:', ['N' => 'Hotově', 'Y' => 'Přes účet']) ->addRule($form::FILLED, 'Musíte vyplnit způsob platby.') ->setDefaultValue('N'); @@ -102,14 +106,16 @@ private function formImportHpdSubmitted(BaseForm $form): void $this->editableOnly(); $values = $form->getValues(); - $amount = $this->queryBus->handle(new EducationParticipantIncomeQuery(new SkautisEducationId($this->aid))); + $amount = $values->from === 'instructor' + ? $this->queryBus->handle(new EducationInstructorIncomeQuery(new SkautisEducationId($this->aid))) + : $this->queryBus->handle(new EducationParticipantIncomeQuery(new SkautisEducationId($this->aid))); if ($amount === 0.0) { $this->flashMessage('Nemáte žádné příjmy od účastníků, které by bylo možné importovat.', 'warning'); $this->redirect('default', ['aid' => $this->aid]); } - $purpose = 'úč. příspěvky ' . ($values->isAccount === 'Y' ? '- účet' : '- hotovost'); + $purpose = 'úč. příspěvky - ' . ($values->from === 'instructor' ? 'instruktoři' : 'účastníci') . ' - ' . ($values->isAccount === 'Y' ? 'účet' : 'hotovost'); $body = new ChitBody(null, $this->event->getStartDate(), null); $categoryId = $this->queryBus->handle( diff --git a/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php b/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php index 5a153806d..b3ef41870 100644 --- a/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php +++ b/app/AccountancyModule/EducationModule/presenters/ParticipantPresenter.php @@ -8,8 +8,11 @@ use App\AccountancyModule\ExcelResponse; use App\AccountancyModule\Factories\Participants\IParticipantListFactory; use Model\Auth\Resources\Education; +use Model\Cashbook\ReadModel\Queries\EducationInstructorListQuery; 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; @@ -76,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'); @@ -94,6 +97,37 @@ public function actionExportExcel(int $aid): void } } + protected function createComponentInstructorList(): ParticipantList + { + $control = $this->participantListFactory->create( + $this->aid, + $this->eventInstructors(), + false, + true, + true, + true, + false, + false, + false, + 'Seznam instruktorů', + ParticipatingPerson::INSTRUCTOR, + ); + + $control->onUpdate[] = function (array $updates): void { + foreach ($updates as $u) { + assert($u instanceof UpdateParticipant); + if (! in_array($u->getField(), UpdateParticipant::getEducationFields())) { + $this->flashMessage(sprintf('Nelze upravit pole: %s', $u->getField()), 'warning'); + $this->redirect('this'); + } + + $this->participants->update(EventType::EDUCATION(), $u); + } + }; + + return $control; + } + protected function createComponentParticipantList(): ParticipantList { $control = $this->participantListFactory->create( @@ -122,10 +156,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'); @@ -135,6 +169,12 @@ public function actionExport(int $aid): void $this->terminate(); } + /** @return Instructor[] */ + private function eventInstructors(): array + { + return $this->queryBus->handle(new EducationInstructorListQuery($this->event->getId())); + } + /** @return Participant[] */ private function eventParticipants(): array { diff --git a/app/AccountancyModule/EducationModule/templates/Cashbook/default.latte b/app/AccountancyModule/EducationModule/templates/Cashbook/default.latte index 534bfc20f..500d41019 100644 --- a/app/AccountancyModule/EducationModule/templates/Cashbook/default.latte +++ b/app/AccountancyModule/EducationModule/templates/Cashbook/default.latte @@ -6,7 +6,7 @@
-  Načíst příjmy od účastníků +  Načíst účastnické poplatky
@@ -27,7 +27,7 @@
-

Import příjmů od účastníků

+

Import účastnických poplatků

diff --git a/app/AccountancyModule/EducationModule/templates/Participant/default.latte b/app/AccountancyModule/EducationModule/templates/Participant/default.latte index ef374bf37..fd5a046ca 100644 --- a/app/AccountancyModule/EducationModule/templates/Participant/default.latte +++ b/app/AccountancyModule/EducationModule/templates/Participant/default.latte @@ -3,6 +3,12 @@ {block #content} {include ../header.latte} +
+
+ {control instructorList} +
+
+
{control participantList} diff --git a/app/AccountancyModule/EducationModule/templates/header.latte b/app/AccountancyModule/EducationModule/templates/header.latte index 01dae47ed..bce069f01 100644 --- a/app/AccountancyModule/EducationModule/templates/header.latte +++ b/app/AccountancyModule/EducationModule/templates/header.latte @@ -10,7 +10,7 @@
  • - Seznam účastníků + Seznam osob
  • educationId; + } + + public function getEducationName(): string + { + return $this->educationName; + } + + public function getInstructorType(): string + { + return $this->instructorType; + } + + public function getScoutExperience(): string + { + return $this->scoutExperience; + } + + public function getProfessionalExperience(): string + { + return $this->professionalExperience; + } + + public function getEventFocus(): string + { + return $this->eventFocus; + } +} diff --git a/app/model/DTO/Instructor/InstructorFactory.php b/app/model/DTO/Instructor/InstructorFactory.php new file mode 100644 index 000000000..53bd462b4 --- /dev/null +++ b/app/model/DTO/Instructor/InstructorFactory.php @@ -0,0 +1,32 @@ +getId(), + $participant->getPersonId(), + $participant->getFirstName(), + $participant->getLastName(), + $participant->getNickName(), + $participant->getEducationId(), + $participant->getEducationName(), + $participant->getInstructorType(), + $participant->getScoutExperience(), + $participant->getProfessionalExperience(), + $participant->getEventFocus(), + $participant->getPayment(), + ); + } +} diff --git a/app/model/DTO/Participant/Participant.php b/app/model/DTO/Participant/Participant.php index d4193771b..75239f50b 100644 --- a/app/model/DTO/Participant/Participant.php +++ b/app/model/DTO/Participant/Participant.php @@ -6,62 +6,42 @@ use Cake\Chronos\Date; use Model\Participant\Payment; -use Model\Utils\MoneyFactory; -use Nette\SmartObject; /** - * @property-read int $id - * @property-read int $personId - * @property-read string $firstName - * @property-read string $lastName - * @property-read string $nickName * @property-read int|null $age - * @property-read string $displayName + * @property-read Date|null $birthday + * @property-read string $unitRegistrationNumber * @property-read string $street * @property-read string $city * @property-read int $postcode - * @property-read Date|null $birthday - * @property-read string $unitRegistrationNumber - * @property-read float $payment - * @property-read float $repayment - * @property-read string $onAccount + * @property-read string $state + * @property-read string $unit * @property-read int $days * @property-read bool $isAccepted + * @property-read string $category */ -class Participant +class Participant extends ParticipatingPerson { - use SmartObject; - - private Payment $paymentObj; - - public function __construct(private int $id, private int $personId, private string $firstName, private string $lastName, private string|null $nickName = null, private int|null $age = null, private Date|null $birthday = null, private string $street, private string $city, private int $postcode, private string $state, private string $unit, private string $unitRegistrationNumber, private int $days, private bool $isAccepted, Payment $payment, private string|null $category = null) - { - $this->paymentObj = $payment; - } - - public function getId(): int - { - return $this->id; - } - - public function getPersonId(): int - { - return $this->personId; - } - - public function getFirstName(): string - { - return $this->firstName; - } - - public function getLastName(): string - { - return $this->lastName; - } - - public function getNickName(): string|null - { - return $this->nickName; + public function __construct( + int $id, + int $personId, + string $firstName, + string $lastName, + string|null $nickName = null, + private int|null $age = null, + private Date|null $birthday = null, + private string $street, + private string $city, + private int $postcode, + private string $state, + private string $unit, + private string $unitRegistrationNumber, + private int $days, + private bool $isAccepted, + Payment $payment, + private string|null $category = null, + ) { + parent::__construct($id, $personId, $firstName, $lastName, $nickName, $payment); } public function getAge(): int|null @@ -104,31 +84,11 @@ public function getUnit(): string return $this->unit; } - public function getDisplayName(): string - { - return $this->lastName . ' ' . $this->firstName . ($this->nickName !== null ? '(' . $this->nickName . ')' : ''); - } - public function getDays(): int { return $this->days; } - public function getPayment(): float - { - return MoneyFactory::toFloat($this->paymentObj->getPayment()); - } - - public function getRepayment(): float - { - return MoneyFactory::toFloat($this->paymentObj->getRepayment()); - } - - public function getOnAccount(): string - { - return $this->paymentObj->getAccount(); - } - public function getCategory(): string { return $this->category ?? ''; diff --git a/app/model/DTO/Participant/ParticipatingPerson.php b/app/model/DTO/Participant/ParticipatingPerson.php new file mode 100644 index 000000000..a07ea8b68 --- /dev/null +++ b/app/model/DTO/Participant/ParticipatingPerson.php @@ -0,0 +1,86 @@ +paymentObj = $payment; + } + + public function getId(): int + { + return $this->id; + } + + public function getPersonId(): int + { + return $this->personId; + } + + public function getFirstName(): string + { + return $this->firstName; + } + + public function getLastName(): string + { + return $this->lastName; + } + + public function getNickName(): string|null + { + return $this->nickName; + } + + public function getDisplayName(): string + { + return $this->lastName . ' ' . $this->firstName . ($this->nickName !== null ? '(' . $this->nickName . ')' : ''); + } + + public function getPayment(): float + { + return MoneyFactory::toFloat($this->paymentObj->getPayment()); + } + + public function getRepayment(): float + { + return MoneyFactory::toFloat($this->paymentObj->getRepayment()); + } + + public function getOnAccount(): string + { + return $this->paymentObj->getAccount(); + } +} diff --git a/app/model/DTO/Participant/UpdateParticipant.php b/app/model/DTO/Participant/UpdateParticipant.php index 41286b21f..c262287aa 100644 --- a/app/model/DTO/Participant/UpdateParticipant.php +++ b/app/model/DTO/Participant/UpdateParticipant.php @@ -11,7 +11,7 @@ class UpdateParticipant public const FIELD_REPAYMENT = 'repayment'; public const FIELD_IS_ACCOUNT = 'isAccount'; - public function __construct(private int $eventId, private int $participantId, private string $field, private string $value, private bool $isAccepted) + public function __construct(private int $eventId, private int $participantId, private string $field, private string $value, private bool|null $isAccepted) { } @@ -35,7 +35,7 @@ public function getValue(): string return $this->value; } - public function isAccepted(): bool + public function isAccepted(): bool|null { return $this->isAccepted; } diff --git a/app/model/Export/ExportService.php b/app/model/Export/ExportService.php index 608e775f5..cb8d93f6f 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; @@ -78,7 +80,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'; @@ -93,7 +95,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 25f38d8f2..c1347ae0e 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č diff --git a/app/model/Instructor/Factory/InstructorFactory.php b/app/model/Instructor/Factory/InstructorFactory.php new file mode 100644 index 000000000..a17fa5730 --- /dev/null +++ b/app/model/Instructor/Factory/InstructorFactory.php @@ -0,0 +1,35 @@ +\S+)\s+(?P[^(]+)(\((?P.*)\))?.*/', $skautisInstructor->Person, $matches); + + return new Instructor( + $skautisInstructor->ID, + $skautisInstructor->ID_Person, + $matches['first'], + $matches['last'], + $matches['nick'] ?? null, + $skautisInstructor->ID_EventEducation, + $skautisInstructor->Event, + $skautisInstructor->InstructorType, + $skautisInstructor->ScoutExperience, + $skautisInstructor->ProfessionalExperience, + $skautisInstructor->EventFocus, + $payment, + ); + } +} diff --git a/app/model/Instructor/Instructor.php b/app/model/Instructor/Instructor.php new file mode 100644 index 000000000..3d68e1028 --- /dev/null +++ b/app/model/Instructor/Instructor.php @@ -0,0 +1,91 @@ +id; + } + + public function getPersonId(): int + { + return $this->personId; + } + + public function getfirstName(): string + { + return $this->firstName; + } + + public function getLastName(): string + { + return $this->lastName; + } + + public function getNickname(): string + { + return $this->nickname; + } + + public function getEducationId(): int + { + return $this->educationId; + } + + public function getEducationName(): string + { + return $this->educationName; + } + + public function getInstructorType(): string + { + return $this->instructorType; + } + + public function getScoutExperience(): string + { + return $this->scoutExperience; + } + + public function getProfessionalExperience(): string + { + return $this->professionalExperience; + } + + public function getEventFocus(): string + { + return $this->eventFocus; + } + + public function getPayment(): Payment + { + return $this->payment; + } + + public function getDisplayName(): string + { + return $this->lastName . ' ' . $this->firstName . ($this->nickname !== null ? '(' . $this->nickname . ')' : ''); + } +} diff --git a/app/model/Instructor/ReadModel/Queries/EducationInstructorIncomeQuery.php b/app/model/Instructor/ReadModel/Queries/EducationInstructorIncomeQuery.php new file mode 100644 index 000000000..e70ead0db --- /dev/null +++ b/app/model/Instructor/ReadModel/Queries/EducationInstructorIncomeQuery.php @@ -0,0 +1,24 @@ +educationId = $eventId; + } + + public function getEducationId(): SkautisEducationId + { + return $this->educationId; + } +} diff --git a/app/model/Instructor/ReadModel/Queries/EducationInstructorListQuery.php b/app/model/Instructor/ReadModel/Queries/EducationInstructorListQuery.php new file mode 100644 index 000000000..25505a1c5 --- /dev/null +++ b/app/model/Instructor/ReadModel/Queries/EducationInstructorListQuery.php @@ -0,0 +1,24 @@ +educationId = $id; + } + + public function getEducationId(): SkautisEducationId + { + return $this->educationId; + } +} diff --git a/app/model/Instructor/ReadModel/QueryHandlers/EducationInstructorIncomeQueryHandler.php b/app/model/Instructor/ReadModel/QueryHandlers/EducationInstructorIncomeQueryHandler.php new file mode 100644 index 000000000..69e1fa4d0 --- /dev/null +++ b/app/model/Instructor/ReadModel/QueryHandlers/EducationInstructorIncomeQueryHandler.php @@ -0,0 +1,32 @@ +queryBus->handle(new EducationInstructorListQuery($query->getEducationId())); + + $totalInstructorIncome = 0.0; + foreach ($instructor as $p) { + assert($p instanceof Instructor); + $totalInstructorIncome += $p->getPayment(); + } + + return $totalInstructorIncome; + } +} diff --git a/app/model/Instructor/ReadModel/QueryHandlers/EducationInstructorListQueryHandler.php b/app/model/Instructor/ReadModel/QueryHandlers/EducationInstructorListQueryHandler.php new file mode 100644 index 000000000..552d7bd71 --- /dev/null +++ b/app/model/Instructor/ReadModel/QueryHandlers/EducationInstructorListQueryHandler.php @@ -0,0 +1,22 @@ +instructors->findByEducation($query->getEducationId()); + } +} diff --git a/app/model/Participant/ReadModel/Queries/EducationParticipantIncomeQuery.php b/app/model/Participant/ReadModel/Queries/EducationParticipantIncomeQuery.php index 6e686b21e..f08cf272a 100644 --- a/app/model/Participant/ReadModel/Queries/EducationParticipantIncomeQuery.php +++ b/app/model/Participant/ReadModel/Queries/EducationParticipantIncomeQuery.php @@ -4,6 +4,7 @@ namespace Model\Cashbook\ReadModel\Queries; +use Model\Cashbook\ReadModel\QueryHandlers\EducationParticipantIncomeQueryHandler; use Model\Event\SkautisEducationId; /** @see EducationParticipantIncomeQueryHandler */ diff --git a/app/model/Skautis/InstructorRepository.php b/app/model/Skautis/InstructorRepository.php new file mode 100644 index 000000000..cd4c6d370 --- /dev/null +++ b/app/model/Skautis/InstructorRepository.php @@ -0,0 +1,78 @@ +skautis->event->InstructorAll(['ID_EventEducation' => $id->toInt()]); + if (! is_array($instructors)) { + return []; // API returns empty object when there are no results + } + + $event = new Event($id->toInt(), EventType::EDUCATION()); + + return $this->processInstructors($instructors, $event); + } + + /** + * @param stdClass[] $instructorsSis + * + * @return InstructorDTO[] + */ + private function processInstructors(array $instructorsSis, Event $event): array + { + $eventPayments = $this->payments->findByEvent($event); + $instructors = []; + foreach ($instructorsSis as $p) { + if (array_key_exists($p->ID, $eventPayments)) { + $payment = $eventPayments[$p->ID]; + } else { + $payment = PaymentFactory::createDefault($p->ID, $event); + } + + $instructors[$p->ID] = InstructorFactory::create($p, $payment); + } + + /* + foreach (array_diff_key($eventPayments, $instructors) as $paymentToRemove) { + $this->payments->remove($paymentToRemove); //delete zaznam, protoze neexistuje k nemu ucastnik + } + */ + + usort( + $instructors, + fn (Instructor $one, Instructor $two) => strcoll($one->getDisplayName(), $two->getDisplayName()) + ); + + return array_map([InstructorDTOFactory::class, 'create'], $instructors); + } +} diff --git a/app/model/Skautis/ParticipantRepository.php b/app/model/Skautis/ParticipantRepository.php index 209398400..cf0427d6b 100644 --- a/app/model/Skautis/ParticipantRepository.php +++ b/app/model/Skautis/ParticipantRepository.php @@ -24,7 +24,7 @@ use Skautis\Wsdl\WsdlException; use stdClass; -use function array_diff_key; +//use function array_diff_key; use function array_key_exists; use function array_map; use function is_array; @@ -220,9 +220,11 @@ private function processParticipants(array $participantsSis, Event $event): arra $participants[$p->ID] = ParticipantFactory::create($p, $payment); } + /* foreach (array_diff_key($participantPayments, $participants) as $paymentToRemove) { $this->payments->remove($paymentToRemove); //delete zaznam, protoze neexistuje k nemu ucastnik } + */ usort( $participants,