Replace shared dateForm.latte with a control

This has also allowed me to replace `{form $form}` with `{form date}`, similar work done previous commits. This works around efabrica-team/phpstan-latte#388.

Author: spaze

site/app/Admin/Presenters/TrainingsPresenter.php

@@ -7,14 +7,15 @@
 use MichalSpacekCz\Form\DeletePersonalDataFormFactory;
 use MichalSpacekCz\Form\TrainingApplicationAdminFormFactory;
 use MichalSpacekCz\Form\TrainingApplicationMultipleFormFactory;
-use MichalSpacekCz\Form\TrainingDateFormFactory;
 use MichalSpacekCz\Form\TrainingFileFormFactory;
 use MichalSpacekCz\Form\TrainingStatusesFormFactory;
 use MichalSpacekCz\Training\Applications;
 use MichalSpacekCz\Training\DateList\DateListOrder;
 use MichalSpacekCz\Training\DateList\TrainingApplicationsList;
 use MichalSpacekCz\Training\DateList\TrainingApplicationsListFactory;
 use MichalSpacekCz\Training\Dates\TrainingDate;
+use MichalSpacekCz\Training\Dates\TrainingDateInputs;
+use MichalSpacekCz\Training\Dates\TrainingDateInputsFactory;
 use MichalSpacekCz\Training\Dates\TrainingDates;
 use MichalSpacekCz\Training\Dates\UpcomingTrainingDates;
 use MichalSpacekCz\Training\Exceptions\TrainingApplicationDoesNotExistException;
@@ -70,7 +71,7 @@ public function __construct(
 		private readonly TrainingApplicationAdminFormFactory $trainingApplicationAdminFactory,
 		private readonly TrainingApplicationMultipleFormFactory $trainingApplicationMultipleFormFactory,
 		private readonly TrainingFileFormFactory $trainingFileFormFactory,
-		private readonly TrainingDateFormFactory $trainingDateFormFactory,
+		private readonly TrainingDateInputsFactory $trainingDateInputsFactory,
 		private readonly TrainingStatusesFormFactory $trainingStatusesFormFactory,
 		private readonly TrainingApplicationsListFactory $trainingApplicationsListFactory,
 		private readonly TrainingReviewInputsFactory $trainingReviewInputsFactory,
@@ -295,25 +296,15 @@ function (Html|string $message, string $type): never {
 	}
 
 
-	protected function createComponentEditDate(): Form
+	protected function createComponentEditTrainingDateInputs(): TrainingDateInputs
 	{
-		return $this->trainingDateFormFactory->create(
-			function (): never {
-				$this->flashMessage('Termín upraven');
-				$this->redirect($this->getAction(), $this->redirectParam);
-			},
-			$this->training,
-		);
+		return $this->trainingDateInputsFactory->createFor($this->training, $this->redirectParam);
 	}
 
 
-	protected function createComponentAddDate(): Form
+	protected function createComponentAddTrainingDateInputs(): TrainingDateInputs
 	{
-		return $this->trainingDateFormFactory->create(
-			function (): never {
-				$this->redirect('Trainings:');
-			},
-		);
+		return $this->trainingDateInputsFactory->create();
 	}
 
 

site/app/Admin/Presenters/templates/Trainings/date.latte

@@ -129,7 +129,7 @@
 <hr>
 <div id="upravit-termin">
 	<p><a href="#upravit-termin" class="open-container block separated">Upravit termín</a></p>
-	{include "common/dateForm.latte", form: editDate, id: upravit-termin-container}
+	{control editTrainingDateInputs upravit-termin-container}
 </div>
 <hr>
 <div id="ohlasy">

site/app/Admin/Presenters/templates/Trainings/default.latte

@@ -3,7 +3,7 @@
 <div n:foreach="$flashes as $flash" class="flash {$flash->type}"><strong>{$flash->message}</strong></div>
 <div id="pridat-termin">
 	<p><a href="#pridat-termin" class="open-container block">Přidat termín</a></p>
-	{include "common/dateForm.latte", form: addDate, id: pridat-termin-container}
+	{control addTrainingDateInputs pridat-termin-container}
 </div>
 <hr>
 {control trainingApplicationsList}

site/app/Form/TrainingDateFormFactory.php

@@ -35,11 +35,12 @@ public function __construct(
 
 
 	/**
-	 * @param callable(): void $onSuccess
+	 * @param callable(): void $onSuccessAdd
+	 * @param callable(): void $onSuccessEdit
 	 * @param TrainingDate|null $date
 	 * @return Form
 	 */
-	public function create(callable $onSuccess, ?TrainingDate $date = null): Form
+	public function create(callable $onSuccessAdd, callable $onSuccessEdit, ?TrainingDate $date = null): Form
 	{
 		$form = $this->factory->create();
 
@@ -144,7 +145,7 @@ public function create(callable $onSuccess, ?TrainingDate $date = null): Form
 			$this->setTrainingDate($form, $date, $submit);
 		}
 
-		$form->onSuccess[] = function (Form $form) use ($onSuccess, $date): void {
+		$form->onSuccess[] = function (Form $form) use ($onSuccessAdd, $onSuccessEdit, $date): void {
 			$values = $form->getValues();
 			if ($date) {
 				$this->trainingDates->update(
@@ -186,7 +187,7 @@ public function create(callable $onSuccess, ?TrainingDate $date = null): Form
 					$values->feedbackHref,
 				);
 			}
-			$onSuccess();
+			$date ? $onSuccessEdit() : $onSuccessAdd();
 		};
 
 		return $form;

site/app/Training/Dates/TrainingDateInputs.php

@@ -0,0 +1,42 @@
+<?php
+declare(strict_types = 1);
+
+namespace MichalSpacekCz\Training\Dates;
+
+use MichalSpacekCz\Application\UiControl;
+use MichalSpacekCz\Form\TrainingDateFormFactory;
+use Nette\Forms\Form;
+
+class TrainingDateInputs extends UiControl
+{
+
+	public function __construct(
+		private readonly TrainingDateFormFactory $trainingDateFormFactory,
+		private readonly ?TrainingDate $trainingDate,
+		private readonly ?int $redirectParam,
+	) {
+	}
+
+
+	public function render(string $htmlId): void
+	{
+		$this->template->id = $htmlId;
+		$this->template->render(__DIR__ . '/trainingDateInputs.latte');
+	}
+
+
+	protected function createComponentDate(): Form
+	{
+		return $this->trainingDateFormFactory->create(
+			function (): never {
+				$this->redirect('Trainings:');
+			},
+			function (): never {
+				$this->flashMessage('Termín upraven');
+				$this->getPresenter()->redirect($this->getPresenter()->getAction(), $this->redirectParam);
+			},
+			$this->trainingDate,
+		);
+	}
+
+}

site/app/Training/Dates/TrainingDateInputsFactory.php

@@ -0,0 +1,28 @@
+<?php
+declare(strict_types = 1);
+
+namespace MichalSpacekCz\Training\Dates;
+
+use MichalSpacekCz\Form\TrainingDateFormFactory;
+
+class TrainingDateInputsFactory
+{
+
+	public function __construct(
+		private readonly TrainingDateFormFactory $trainingDateFormFactory,
+	) {
+	}
+
+
+	public function createFor(TrainingDate $trainingDate, int $redirectParam): TrainingDateInputs
+	{
+		return new TrainingDateInputs($this->trainingDateFormFactory, $trainingDate, $redirectParam);
+	}
+
+
+	public function create(): TrainingDateInputs
+	{
+		return new TrainingDateInputs($this->trainingDateFormFactory, null, null);
+	}
+
+}

site/app/Admin/Presenters/templates/Trainings/common/dateForm.latte renamed to site/app/Training/Dates/trainingDateInputs.latte

@@ -1,4 +1,4 @@
-{form $form class => aligned}
+{form date class => aligned}
 	<div id="{$id}" n:class="!$form->hasErrors() ? hidden">
 		<table>
 			<tr><th>{label training /}</th><td>{input training}</td></tr>

site/config/services.neon

@@ -99,6 +99,7 @@ services:
 	- MichalSpacekCz\Training\CompanyTrainings
 	- MichalSpacekCz\Training\DateList\TrainingApplicationsListFactory
 	- MichalSpacekCz\Training\DateList\UpcomingTrainingDatesListFactory
+	- MichalSpacekCz\Training\Dates\TrainingDateInputsFactory
 	- MichalSpacekCz\Training\Dates\TrainingDateStatuses
 	- MichalSpacekCz\Training\Dates\TrainingDateFactory(texyFormatter: @texyFormatterNoPlaceholders)
 	- MichalSpacekCz\Training\Dates\TrainingDates