Merge pull request #527 from jan-stanek/vzdelavaci-akce-opravy

Vzdelavaci akce opravy

Author: Jan Staněk

app/AdminModule/ConfigurationModule/forms/SkautIsEventForm.php

@@ -9,8 +9,10 @@
 use App\Model\Settings\SettingsRepository;
 use App\Model\SkautIs\SkautIsCourse;
 use App\Model\SkautIs\SkautIsCourseRepository;
+use App\Model\Structure\SubeventRepository;
 use App\Services\SkautIsEventEducationService;
 use App\Services\SkautIsEventGeneralService;
+use Doctrine\Common\Collections\ArrayCollection;
 use Nette;
 use Nette\Application\UI\Form;
 
@@ -40,6 +42,9 @@ class SkautIsEventForm
     /** @var SkautIsEventEducationService */
     private $skautIsEventEducationService;
 
+    /** @var SubeventRepository */
+    private $subeventRepository;
+
 
     /**
      * SkautIsEventForm constructor.
@@ -48,17 +53,20 @@ class SkautIsEventForm
      * @param SkautIsCourseRepository $skautIsCourseRepository
      * @param SkautIsEventGeneralService $skautIsEventGeneralService
      * @param SkautIsEventEducationService $skautIsEventEducationService
+     * @param SubeventRepository $subeventRepository
      */
     public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepository,
                                 SkautIsCourseRepository $skautIsCourseRepository,
                                 SkautIsEventGeneralService $skautIsEventGeneralService,
-                                SkautIsEventEducationService $skautIsEventEducationService)
+                                SkautIsEventEducationService $skautIsEventEducationService,
+                                SubeventRepository $subeventRepository)
     {
         $this->baseFormFactory = $baseForm;
         $this->settingsRepository = $settingsRepository;
         $this->skautIsCourseRepository = $skautIsCourseRepository;
         $this->skautIsEventGeneralService = $skautIsEventGeneralService;
         $this->skautIsEventEducationService = $skautIsEventEducationService;
+        $this->subeventRepository = $subeventRepository;
     }
 
     /**
@@ -105,6 +113,7 @@ public function create(): Form
      * @param Form $form
      * @param \stdClass $values
      * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function processForm(Form $form, \stdClass $values): void
     {
@@ -122,13 +131,22 @@ public function processForm(Form $form, \stdClass $values): void
                 $eventId = $values['skautisEventEducation'];
                 $eventName = $this->skautIsEventEducationService->getEventDisplayName($eventId);
 
-                foreach ($this->skautIsEventEducationService->getEventCourses($eventId) as $course) {
+                $courses = $this->skautIsEventEducationService->getEventCourses($eventId);
+
+                foreach ($courses as $course) {
                     $skautIsCourse = new SkautIsCourse();
                     $skautIsCourse->setSkautIsCourseId($course->ID);
-                    $skautIsCourse->setName($course->DisplayName);
+                    $skautIsCourseName = $course->EventEducationType . (!empty($course->DisplayName) ? ' (' . $course->DisplayName . ')' : '');
+                    $skautIsCourse->setName($skautIsCourseName);
                     $this->skautIsCourseRepository->save($skautIsCourse);
                 }
 
+                if (count($courses) == 1 && !$this->subeventRepository->explicitSubeventsExists()) {
+                    $subevent = $this->subeventRepository->findImplicit();
+                    $subevent->setSkautIsCourses(new ArrayCollection($this->skautIsCourseRepository->findAll()));
+                    $this->subeventRepository->save($subevent);
+                }
+
                 break;
         }
 

app/AdminModule/components/UsersGridControl.php

@@ -619,6 +619,10 @@ public function groupInsertIntoSkautIs(array $ids, $value)
 
             case SkautIsEventType::EDUCATION:
                 $skautIsEventService = $this->skautIsEventEducationService;
+                if (!$skautIsEventService->isSubeventConnected()) {
+                    $p->flashMessage('admin.users.users_group_action_insert_into_skaut_is_error_subevent_not_connected', 'danger');
+                    $this->redirect('this');
+                }
                 break;
 
             default:

app/lang/admin.cs_CZ.neon

@@ -341,6 +341,7 @@ users:
     users_group_action_change_roles_error_capacity: "Role nebyly nastaveny, byla by překročena kapacita některé role."
     users_group_action_insert_into_skaut_is: "Vložit účastníky do skautIS"
     users_group_action_insert_into_skaut_is_error_not_connected: "Účastníci nebyli vloženi do skautIS, systém není propojen se žádnou akcí."
+    users_group_action_insert_into_skaut_is_error_subevent_not_connected: "Účastníci nebyli vloženi do skautIS, žádná podakce není propojena s žádným kurzem."
     users_group_action_insert_into_skaut_is_error_not_draft: "Účastníci nebyli vloženi do skautIS, akce byla uzavřena."
     users_group_action_insert_into_skaut_is_error_skaut_is: "Účastníci nebyli vloženi do skautIS, zkontrolujte, že pracujete v roli s právem přidávat účastníky akce."
     users_group_action_insert_into_skaut_is_error_not_draft_successful: "Účastníci byli úspěšně vloženi do skautIS."

app/services/SkautIsEventEducationService.php

@@ -2,6 +2,7 @@
 
 namespace App\Services;
 use App\Model\SkautIs\SkautIsCourseRepository;
+use App\Model\Structure\SubeventRepository;
 use App\Model\User\User;
 use Doctrine\Common\Collections\Collection;
 use Skautis\Skautis;
@@ -18,17 +19,23 @@ class SkautIsEventEducationService extends SkautIsEventService
     /** @var SkautIsCourseRepository */
     private $skautIsCourseRepository;
 
+    /** @var SubeventRepository */
+    private $subeventRepository;
+
 
     /**
      * SkautIsEventEducationService constructor.
      * @param Skautis $skautIs
      * @param SkautIsCourseRepository $skautIsCourseRepository
+     * @param SubeventRepository $subeventRepository
      */
-    public function __construct(Skautis $skautIs, SkautIsCourseRepository $skautIsCourseRepository)
+    public function __construct(Skautis $skautIs, SkautIsCourseRepository $skautIsCourseRepository,
+                                SubeventRepository $subeventRepository)
     {
         parent::__construct($skautIs);
 
         $this->skautIsCourseRepository = $skautIsCourseRepository;
+        $this->subeventRepository = $subeventRepository;
     }
 
     /**
@@ -117,6 +124,19 @@ public function getEventCourses(int $eventId)
         ]);
     }
 
+    /**
+     * Je nastaveno propojení alespoň jedné podakce se skautIS kurzem?
+     * @return bool
+     */
+    public function isSubeventConnected()
+    {
+        foreach ($this->subeventRepository->findAll() as $subevent) {
+            if (!$subevent->getSkautIsCourses()->isEmpty())
+                return TRUE;
+        }
+        return FALSE;
+    }
+
     /**
      * Vrací přihlášené účastníky kurzu.
      * @param $eventId