From d4c44a139b613bbc945f4ef63793d69c759b5425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Sun, 24 Dec 2017 12:56:52 +0100
Subject: [PATCH 01/11] =?UTF-8?q?refactoring,=20vytvo=C5=99en=C3=AD=20e-ma?=
 =?UTF-8?q?ilu=20p=C5=99i=20zm=C4=9Bn=C4=9B=20vlastn=C3=ADch=20pol=C3=AD?=
 =?UTF-8?q?=20(#445),=20logika=20do=20ProgramService=20(#421),=20mo=C5=BEn?=
 =?UTF-8?q?ost=20ur=C4=8Dit=20komu=20se=20pos=C3=ADlaj=C3=AD=20automatick?=
 =?UTF-8?q?=C3=A9=20e-maily?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../presenters/MailingPresenter.php           |  10 +-
 .../presenters/MaturityPresenter.php          |  23 ++--
 .../components/DocumentTagsGridControl.php    |   4 +
 .../components/DocumentsGridControl.php       |   4 +
 .../CMSModule/components/FaqGridControl.php   |   6 +
 .../CMSModule/components/NewsGridControl.php  |   4 +
 .../CMSModule/components/PagesGridControl.php |  16 ++-
 app/AdminModule/CMSModule/forms/FaqForm.php   |   1 +
 app/AdminModule/CMSModule/forms/PageForm.php  |  11 +-
 .../components/CustomInputsGridControl.php    |   9 +-
 .../components/DiscountsGridControl.php       |   6 +-
 .../components/PlacePointsGridControl.php     |   2 +
 .../components/SubeventsGridControl.php       |   5 +-
 .../forms/ApplicationForm.php                 |   2 +
 .../forms/CustomInputForm.php                 |   1 +
 .../forms/DiscountForm.php                    |   4 +-
 .../ConfigurationModule/forms/MailingForm.php |   8 +-
 .../ConfigurationModule/forms/PaymentForm.php |  10 +-
 .../forms/PaymentProofForm.php                |   2 +
 .../forms/PlaceDescriptionForm.php            |   2 +
 .../ConfigurationModule/forms/ProgramForm.php |   2 +
 .../ConfigurationModule/forms/SeminarForm.php |   2 +
 .../forms/SkautIsEventForm.php                |  11 +-
 .../forms/SubeventForm.php                    |   9 +-
 .../forms/SubeventsForm.php                   |   2 +
 .../ConfigurationModule/forms/WebForm.php     |   3 +
 .../forms/templates/discount_form.latte       |   9 +-
 .../presenters/ApplicationPresenter.php       |   1 +
 .../presenters/ConfigurationBasePresenter.php |   4 +-
 .../presenters/DiscountsPresenter.php         |   1 -
 .../presenters/MailingPresenter.php           |   3 +-
 .../presenters/PaymentPresenter.php           |   1 -
 .../components/MailHistoryGridControl.php     |   1 -
 .../components/MailTemplatesGridControl.php   |  38 ++++++-
 .../MailingModule/forms/EditTemplateForm.php  |  22 +++-
 .../MailingModule/forms/SendForm.php          |   4 +
 .../presenters/templates/Templates/edit.latte |   4 +-
 .../ProgramAttendeesGridControl.php           |  16 ++-
 .../components/ProgramBlocksGridControl.php   |   6 +
 .../ProgramCategoriesGridControl.php          |  23 +++-
 .../components/RoomScheduleGridControl.php    |   5 +-
 .../components/RoomsGridControl.php           |   5 +
 .../ProgramModule/forms/BlockForm.php         |  14 ++-
 .../presenters/BlocksPresenter.php            |   5 +
 .../components/ApplicationsGridControl.php    |  65 ++++++-----
 .../components/RolesGridControl.php           |  18 ++-
 .../components/UsersGridControl.php           |  58 ++++++----
 app/AdminModule/forms/AddLectorForm.php       |   1 +
 app/AdminModule/forms/EditRoleForm.php        |  21 +++-
 .../forms/EditUserPersonalDetailsForm.php     |  10 +-
 app/AdminModule/forms/EditUserSeminarForm.php |  17 ++-
 app/AdminModule/presenters/AclPresenter.php   |  10 +-
 .../presenters/AdminBasePresenter.php         |   1 +
 app/AdminModule/presenters/UsersPresenter.php |  15 ++-
 .../templates/Dashboard/default.latte         |  42 ++++---
 .../presenters/templates/Users/detail.latte   |   4 +-
 .../templates/includes/main_menu.latte        |   3 +-
 .../presenters/SchedulePresenter.php          |   8 ++
 app/ApiModule/services/ScheduleService.php    |   7 +-
 .../presenters/InstallPresenter.php           |   7 ++
 .../components/ApplicationContentControl.php  |   4 +
 .../components/ApplicationsGridControl.php    |  93 ++++++++--------
 .../components/PlaceContentControl.php        |   1 +
 .../components/ProgramsContentControl.php     |   1 +
 .../templates/application_content.latte       |   4 +-
 .../templates/lectors_content.latte           |   2 +-
 .../forms/AdditionalInformationForm.php       |   5 +-
 app/WebModule/forms/ApplicationForm.php       |  28 +++--
 app/WebModule/forms/FaqForm.php               |   1 +
 app/WebModule/presenters/ProfilePresenter.php |  12 +-
 app/WebModule/presenters/WebBasePresenter.php |   2 +-
 app/config/config.neon                        |   2 -
 app/lang/admin.cs_CZ.neon                     |   9 +-
 app/lang/common.cs_CZ.neon                    |   3 +
 app/model/ACL/PermissionRepository.php        |   2 +
 app/model/ACL/RoleRepository.php              |  43 +++++---
 app/model/CMS/Content/Content.php             |  16 +--
 app/model/CMS/Content/ImageContent.php        |  14 +--
 app/model/CMS/FaqRepository.php               |   3 +
 app/model/CMS/NewsRepository.php              |   1 +
 app/model/CMS/PageRepository.php              |   3 +
 app/model/Mailing/Template.php                |  91 ++++++++++++++-
 app/model/Mailing/TemplateVariable.php        |   1 -
 app/model/Program/BlockRepository.php         |  39 ++-----
 app/model/Program/ProgramRepository.php       |  86 +++------------
 .../CustomInput/CustomInputRepository.php     |   6 +-
 .../Settings/CustomInput/CustomSelect.php     |   2 +-
 app/model/Settings/SettingsRepository.php     |  32 +++---
 app/model/Structure/SubeventRepository.php    |  22 +++-
 app/model/User/ApplicationRepository.php      |   1 -
 app/model/User/User.php                       |  30 ++---
 app/presenters/AuthPresenter.php              |  10 +-
 app/services/ApplicationService.php           |  22 ++--
 app/services/Authenticator.php                |  11 +-
 app/services/DatabaseService.php              |  12 +-
 app/services/DiscountService.php              |  51 +++++----
 app/services/ExcelExportService.php           |  56 ++++++----
 app/services/ExcelResponse.php                |   1 +
 app/services/FilesService.php                 |   6 +-
 app/services/MailService.php                  |  20 +++-
 app/services/PdfExportService.php             |  10 +-
 app/services/ProgramService.php               | 104 +++++++++++++++++-
 app/services/SkautIsEventService.php          |  11 +-
 app/services/SkautIsService.php               |   3 +-
 app/services/UserService.php                  |  75 ++++++++++++-
 migrations/Version20171223230501.php          |  30 +++++
 migrations/Version20171223233147.php          |  23 ++++
 migrations/Version20171224074439.php          |  24 ++++
 108 files changed, 1115 insertions(+), 521 deletions(-)
 create mode 100644 migrations/Version20171223230501.php
 create mode 100644 migrations/Version20171223233147.php
 create mode 100644 migrations/Version20171224074439.php

diff --git a/app/ActionModule/presenters/MailingPresenter.php b/app/ActionModule/presenters/MailingPresenter.php
index 8fd79553f..c66451689 100644
--- a/app/ActionModule/presenters/MailingPresenter.php
+++ b/app/ActionModule/presenters/MailingPresenter.php
@@ -6,8 +6,6 @@
 use App\Model\ACL\Resource;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
-use App\Model\Structure\SubeventRepository;
-use Nette\Application\Responses\TextResponse;
 
 
 /**
@@ -27,6 +25,8 @@ class MailingPresenter extends ActionBasePresenter
     /**
      * Ověří e-mail semináře.
      * @param $code
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function actionVerify($code)
     {
@@ -38,15 +38,13 @@ public function actionVerify($code)
             $this->settingsRepository->setValue(Settings::SEMINAR_EMAIL_VERIFICATION_CODE, NULL);
 
             $this->flashMessage('admin.configuration.mailing_email_verification_success', 'success');
-        }
-        else {
+        } else {
             $this->flashMessage('admin.configuration.mailing_email_verification_error', 'danger');
         }
 
         if ($this->user->isAllowed(Resource::CONFIGURATION, Permission::MANAGE)) {
             $this->redirect(':Admin:Configuration:Mailing:default');
-        }
-        else {
+        } else {
             $this->redirect(':Web:Page:default');
         }
     }
diff --git a/app/ActionModule/presenters/MaturityPresenter.php b/app/ActionModule/presenters/MaturityPresenter.php
index de4f8792b..19833ef27 100644
--- a/app/ActionModule/presenters/MaturityPresenter.php
+++ b/app/ActionModule/presenters/MaturityPresenter.php
@@ -2,8 +2,6 @@
 
 namespace App\ActionModule\Presenters;
 
-use App\Model\ACL\Permission;
-use App\Model\ACL\Resource;
 use App\Model\ACL\Role;
 use App\Model\ACL\RoleRepository;
 use App\Model\Enums\ApplicationState;
@@ -12,12 +10,11 @@
 use App\Model\Program\ProgramRepository;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
-use App\Model\Structure\SubeventRepository;
 use App\Model\User\ApplicationRepository;
 use App\Model\User\UserRepository;
 use App\Services\MailService;
+use App\Services\ProgramService;
 use Doctrine\Common\Collections\ArrayCollection;
-use Nette\Application\Responses\TextResponse;
 
 
 /**
@@ -63,6 +60,12 @@ class MaturityPresenter extends ActionBasePresenter
      */
     public $mailService;
 
+    /**
+     * @var ProgramService
+     * @inject
+     */
+    public $programService;
+
 
     /**
      * Zkontroluje splatnost přihlášek.
@@ -84,7 +87,7 @@ public function actionCheck()
 
             //zrušení registrace
             if ($cancelRegistration !== NULL && $cancelRegistrationDate > $maturityDate) {
-                $this->userRepository->getEntityManager()->transactional(function($em) use($application) {
+                $this->userRepository->getEntityManager()->transactional(function ($em) use ($application) {
                     if ($application->isFirst()) {
                         $user = $application->getUser();
 
@@ -95,24 +98,22 @@ public function actionCheck()
                         }
                         $this->userRepository->save($user);
 
-                        $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$user]), '', Template::REGISTRATION_CANCELED, [
+                        $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
                             TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
                         ]);
-                    }
-                    else {
+                    } else {
                         $application->setState(ApplicationState::CANCELED_NOT_PAID);
                         $this->applicationRepository->save($application);
                     }
 
-                    $this->programRepository->updateUserPrograms($application->getUser());
-                    $this->userRepository->save($application->getUser());
+                    $this->programService->updateUserPrograms($application->getUser());
                 });
                 continue;
             }
 
             //připomenutí splatnosti
             if ($maturityReminder !== NULL && $maturityReminderDate == $maturityDate) {
-                $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$application->getUser()]), '', Template::MATURITY_REMINDER, [
+                $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::MATURITY_REMINDER, [
                     TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                     TemplateVariable::APPLICATION_MATURITY => $maturityDate->format('j. n. Y')
                 ]);
diff --git a/app/AdminModule/CMSModule/components/DocumentTagsGridControl.php b/app/AdminModule/CMSModule/components/DocumentTagsGridControl.php
index 20c0f2ba8..c76401f97 100644
--- a/app/AdminModule/CMSModule/components/DocumentTagsGridControl.php
+++ b/app/AdminModule/CMSModule/components/DocumentTagsGridControl.php
@@ -48,6 +48,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentDocumentTagsGrid($name)
     {
@@ -96,6 +97,7 @@ public function createComponentDocumentTagsGrid($name)
     /**
      * Zpracuje přidání štítku dokumentu.
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function add($values)
     {
@@ -114,6 +116,7 @@ public function add($values)
      * Zpracuje úpravu štítku dokumentu.
      * @param $id
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function edit($id, $values)
     {
@@ -131,6 +134,7 @@ public function edit($id, $values)
     /**
      * Zpracuje odstranění štítku dokumentu.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
diff --git a/app/AdminModule/CMSModule/components/DocumentsGridControl.php b/app/AdminModule/CMSModule/components/DocumentsGridControl.php
index e97e5b512..421aec391 100644
--- a/app/AdminModule/CMSModule/components/DocumentsGridControl.php
+++ b/app/AdminModule/CMSModule/components/DocumentsGridControl.php
@@ -64,6 +64,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentDocumentsGrid($name)
     {
@@ -153,6 +154,7 @@ public function createComponentDocumentsGrid($name)
     /**
      * Zpracuje přidání dokumentu.
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function add($values)
     {
@@ -179,6 +181,7 @@ public function add($values)
      * Zpracuje úpravu dokumentu.
      * @param $id
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function edit($id, $values)
     {
@@ -208,6 +211,7 @@ public function edit($id, $values)
     /**
      * Zpracuje odstranění dokumentu.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
diff --git a/app/AdminModule/CMSModule/components/FaqGridControl.php b/app/AdminModule/CMSModule/components/FaqGridControl.php
index 3a108314f..6d0116461 100644
--- a/app/AdminModule/CMSModule/components/FaqGridControl.php
+++ b/app/AdminModule/CMSModule/components/FaqGridControl.php
@@ -46,6 +46,8 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentFaqGrid($name)
     {
@@ -96,6 +98,7 @@ public function createComponentFaqGrid($name)
     /**
      * Zpracuje odstranění otázky.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -112,6 +115,7 @@ public function handleDelete($id)
      * @param $item_id
      * @param $prev_id
      * @param $next_id
+     * @throws \Nette\Application\AbortException
      */
     public function handleSort($item_id, $prev_id, $next_id)
     {
@@ -132,6 +136,8 @@ public function handleSort($item_id, $prev_id, $next_id)
      * Změní viditelnost otázky.
      * @param $id
      * @param $public
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function changeStatus($id, $public)
     {
diff --git a/app/AdminModule/CMSModule/components/NewsGridControl.php b/app/AdminModule/CMSModule/components/NewsGridControl.php
index 3b4988548..1d10019db 100644
--- a/app/AdminModule/CMSModule/components/NewsGridControl.php
+++ b/app/AdminModule/CMSModule/components/NewsGridControl.php
@@ -46,6 +46,8 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentNewsGrid($name)
     {
@@ -91,6 +93,7 @@ public function createComponentNewsGrid($name)
     /**
      * Zpracuje odstranění aktuality.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -106,6 +109,7 @@ public function handleDelete($id)
      * Změní připíchnutí aktuality.
      * @param $id
      * @param $pinned
+     * @throws \Nette\Application\AbortException
      */
     public function changePinned($id, $pinned)
     {
diff --git a/app/AdminModule/CMSModule/components/PagesGridControl.php b/app/AdminModule/CMSModule/components/PagesGridControl.php
index 3e17576a2..0545990fb 100644
--- a/app/AdminModule/CMSModule/components/PagesGridControl.php
+++ b/app/AdminModule/CMSModule/components/PagesGridControl.php
@@ -54,6 +54,8 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentPagesGrid($name)
     {
@@ -162,6 +164,8 @@ public function createComponentPagesGrid($name)
     /**
      * Zpracuje přidání stránky.
      * @param $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function add($values)
     {
@@ -182,6 +186,8 @@ public function add($values)
      * Zpracuje upravení stránky.
      * @param $id
      * @param $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function edit($id, $values)
     {
@@ -203,6 +209,8 @@ public function edit($id, $values)
     /**
      * Zpracuje odstranění stránky.
      * @param $id
+     * @throws \App\Model\Page\PageException
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -219,6 +227,7 @@ public function handleDelete($id)
      * @param $item_id
      * @param $prev_id
      * @param $next_id
+     * @throws \Nette\Application\AbortException
      */
     public function handleSort($item_id, $prev_id, $next_id)
     {
@@ -239,15 +248,18 @@ public function handleSort($item_id, $prev_id, $next_id)
      * Změní viditelnost stránky.
      * @param $id
      * @param $public
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function changeStatus($id, $public)
     {
         $p = $this->getPresenter();
 
-        if ($this->pageRepository->findById($id)->getSlug() == '/' && !$public) {
+        $page = $this->pageRepository->findById($id);
+
+        if ($page->getSlug() == '/' && !$public) {
             $p->flashMessage('admin.cms.pages_change_public_denied', 'danger');
         } else {
-            $page = $this->pageRepository->findById($id);
             $page->setPublic($public);
             $this->pageRepository->save($page);
 
diff --git a/app/AdminModule/CMSModule/forms/FaqForm.php b/app/AdminModule/CMSModule/forms/FaqForm.php
index 23f2930a6..fc864e2a9 100644
--- a/app/AdminModule/CMSModule/forms/FaqForm.php
+++ b/app/AdminModule/CMSModule/forms/FaqForm.php
@@ -108,6 +108,7 @@ public function create($id, $userId)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/CMSModule/forms/PageForm.php b/app/AdminModule/CMSModule/forms/PageForm.php
index 543c5135d..2dae8c11d 100644
--- a/app/AdminModule/CMSModule/forms/PageForm.php
+++ b/app/AdminModule/CMSModule/forms/PageForm.php
@@ -31,24 +31,24 @@ class PageForm extends UI\Control
      * @var int
      */
     public $id;
-
+    
     /**
      * Upravovaná stránka.
      * @var Page
      */
     private $page;
-
+    
     /**
      * Upravovaná oblast.
      * @var string
      */
     public $area;
-
+    
     /**
      * Událost při uložení formuláře.
      */
     public $onPageSave;
-
+    
     /**
      * Událost při chybě ukládání stránky.
      */
@@ -119,6 +119,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @return Form
+     * @throws \App\Model\Page\PageException
      */
     public function createComponentForm()
     {
@@ -168,6 +169,8 @@ public function createComponentForm()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Page\PageException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/components/CustomInputsGridControl.php b/app/AdminModule/ConfigurationModule/components/CustomInputsGridControl.php
index 3ab1c39c5..a79f6444c 100644
--- a/app/AdminModule/ConfigurationModule/components/CustomInputsGridControl.php
+++ b/app/AdminModule/ConfigurationModule/components/CustomInputsGridControl.php
@@ -2,13 +2,10 @@
 
 namespace App\AdminModule\ConfigurationModule\Components;
 
-use App\Model\Settings\CustomInput\CustomCheckbox;
 use App\Model\Settings\CustomInput\CustomInput;
 use App\Model\Settings\CustomInput\CustomInputRepository;
-use App\Model\Settings\CustomInput\CustomText;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
-use Nette\Application\UI\Form;
 use Ublaboo\DataGrid\DataGrid;
 
 
@@ -50,6 +47,8 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentCustomInputsGrid($name)
     {
@@ -103,6 +102,7 @@ public function createComponentCustomInputsGrid($name)
     /**
      * Zpracuje odstranění vlastního pole.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -119,6 +119,7 @@ public function handleDelete($id)
      * @param $item_id
      * @param $prev_id
      * @param $next_id
+     * @throws \Nette\Application\AbortException
      */
     public function handleSort($item_id, $prev_id, $next_id)
     {
@@ -139,6 +140,8 @@ public function handleSort($item_id, $prev_id, $next_id)
      * Změní povinnost pole.
      * @param $id
      * @param $mandatory
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function changeMandatory($id, $mandatory)
     {
diff --git a/app/AdminModule/ConfigurationModule/components/DiscountsGridControl.php b/app/AdminModule/ConfigurationModule/components/DiscountsGridControl.php
index 75817add8..3bb256eb9 100644
--- a/app/AdminModule/ConfigurationModule/components/DiscountsGridControl.php
+++ b/app/AdminModule/ConfigurationModule/components/DiscountsGridControl.php
@@ -2,14 +2,12 @@
 
 namespace App\AdminModule\ConfigurationModule\Components;
 
-use App\Model\Enums\ConditionOperator;
-use App\Model\Structure\Discount;
+
 use App\Model\Structure\DiscountRepository;
 use App\Model\Structure\SubeventRepository;
 use App\Services\DiscountService;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
-use Nette\Forms\Form;
 use Nette\Utils\Html;
 use Ublaboo\DataGrid\DataGrid;
 
@@ -63,6 +61,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentDiscountsGrid($name)
     {
@@ -103,6 +102,7 @@ public function createComponentDiscountsGrid($name)
     /**
      * Zpracuje odstranění slevy.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
diff --git a/app/AdminModule/ConfigurationModule/components/PlacePointsGridControl.php b/app/AdminModule/ConfigurationModule/components/PlacePointsGridControl.php
index e7c48955e..6127e603d 100644
--- a/app/AdminModule/ConfigurationModule/components/PlacePointsGridControl.php
+++ b/app/AdminModule/ConfigurationModule/components/PlacePointsGridControl.php
@@ -46,6 +46,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentPlacePointsGrid($name)
     {
@@ -87,6 +88,7 @@ public function createComponentPlacePointsGrid($name)
     /**
      * Zpracuje odstranění mapového bodu.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
diff --git a/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php b/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php
index a8bd0e949..dd7009f30 100644
--- a/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php
+++ b/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php
@@ -53,6 +53,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentSubeventsGrid($name)
     {
@@ -108,6 +109,7 @@ function ($row) {
     /**
      * Zpracuje odstranění podakce.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -116,8 +118,7 @@ public function handleDelete($id)
         if ($subevent->getBlocks()->isEmpty()) {
             $this->subeventRepository->remove($subevent);
             $this->getPresenter()->flashMessage('admin.configuration.subevents_deleted', 'success');
-        }
-        else {
+        } else {
             $this->getPresenter()->flashMessage('admin.configuration.subevents_deleted_error', 'danger');
         }
 
diff --git a/app/AdminModule/ConfigurationModule/forms/ApplicationForm.php b/app/AdminModule/ConfigurationModule/forms/ApplicationForm.php
index ceca22800..42767651f 100644
--- a/app/AdminModule/ConfigurationModule/forms/ApplicationForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/ApplicationForm.php
@@ -37,6 +37,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -64,6 +65,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/CustomInputForm.php b/app/AdminModule/ConfigurationModule/forms/CustomInputForm.php
index c386bb2d0..ac54f1087 100644
--- a/app/AdminModule/ConfigurationModule/forms/CustomInputForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/CustomInputForm.php
@@ -100,6 +100,7 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/DiscountForm.php b/app/AdminModule/ConfigurationModule/forms/DiscountForm.php
index 13040fa94..b0f088b75 100644
--- a/app/AdminModule/ConfigurationModule/forms/DiscountForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/DiscountForm.php
@@ -34,7 +34,6 @@ class DiscountForm extends UI\Control
      * Událost při uložení formuláře.
      */
     public $onSave;
-
     /**
      * Událost při chybě podmínky.
      */
@@ -148,8 +147,7 @@ public function processForm(Form $form, \stdClass $values)
             $this->discountRepository->save($this->discount);
 
             $this->onSave($this);
-        }
-        else
+        } else
             $this->onConditionError($this);
     }
 }
diff --git a/app/AdminModule/ConfigurationModule/forms/MailingForm.php b/app/AdminModule/ConfigurationModule/forms/MailingForm.php
index 53748d7d6..c348123c2 100644
--- a/app/AdminModule/ConfigurationModule/forms/MailingForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/MailingForm.php
@@ -10,7 +10,6 @@
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\MailService;
-use Doctrine\Common\Collections\ArrayCollection;
 use Nette;
 use Nette\Application\LinkGenerator;
 use Nette\Application\UI\Form;
@@ -68,6 +67,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
      * Vytvoří formulář.
      * @param $id
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create($id)
     {
@@ -98,6 +98,10 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws Nette\Application\UI\InvalidLinkException
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function processForm(Form $form, \stdClass $values)
     {
@@ -109,7 +113,7 @@ public function processForm(Form $form, \stdClass $values)
 
             $link = $this->linkGenerator->link('Action:Mailing:verify', ['code' => $verificationCode]);
 
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection(), $values['seminarEmail'],
+            $this->mailService->sendMailFromTemplate(NULL, $values['seminarEmail'],
                 Template::EMAIL_VERIFICATION, [
                     TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                     TemplateVariable::EMAIL_VERIFICATION_LINK => $link],
diff --git a/app/AdminModule/ConfigurationModule/forms/PaymentForm.php b/app/AdminModule/ConfigurationModule/forms/PaymentForm.php
index cdcb682f7..918919536 100644
--- a/app/AdminModule/ConfigurationModule/forms/PaymentForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/PaymentForm.php
@@ -19,14 +19,14 @@
  */
 class PaymentForm extends UI\Control
 {
-    /** @var BaseForm */
-    private $baseFormFactory;
-
     /**
      * Událost při uložení formuláře.
      */
     public $onSave;
 
+    /** @var BaseForm */
+    private $baseFormFactory;
+ 
     /** @var SettingsRepository */
     private $settingsRepository;
 
@@ -61,6 +61,7 @@ public function render()
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function createComponentForm()
     {
@@ -137,11 +138,12 @@ public function createComponentForm()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
         $this->settingsRepository->setValue(Settings::ACCOUNT_NUMBER, $values['accountNumber']);
-        $this->settingsRepository->setValue(Settings::VARIABLE_SYMBOL_CODE,  $values['variableSymbolCode']);
+        $this->settingsRepository->setValue(Settings::VARIABLE_SYMBOL_CODE, $values['variableSymbolCode']);
         $this->settingsRepository->setValue(Settings::MATURITY_TYPE, $values['maturityType']);
 
         if (array_key_exists('maturityDate', $values))
diff --git a/app/AdminModule/ConfigurationModule/forms/PaymentProofForm.php b/app/AdminModule/ConfigurationModule/forms/PaymentProofForm.php
index 3cc5a5060..2cc958d74 100644
--- a/app/AdminModule/ConfigurationModule/forms/PaymentProofForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/PaymentProofForm.php
@@ -38,6 +38,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -78,6 +79,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/PlaceDescriptionForm.php b/app/AdminModule/ConfigurationModule/forms/PlaceDescriptionForm.php
index b98777620..606a0108e 100644
--- a/app/AdminModule/ConfigurationModule/forms/PlaceDescriptionForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/PlaceDescriptionForm.php
@@ -37,6 +37,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -61,6 +62,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/ProgramForm.php b/app/AdminModule/ConfigurationModule/forms/ProgramForm.php
index 073d56a9e..b3bb93ea5 100644
--- a/app/AdminModule/ConfigurationModule/forms/ProgramForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/ProgramForm.php
@@ -45,6 +45,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -100,6 +101,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/SeminarForm.php b/app/AdminModule/ConfigurationModule/forms/SeminarForm.php
index 25db7e897..9f69258e8 100644
--- a/app/AdminModule/ConfigurationModule/forms/SeminarForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/SeminarForm.php
@@ -45,6 +45,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -88,6 +89,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/SkautIsEventForm.php b/app/AdminModule/ConfigurationModule/forms/SkautIsEventForm.php
index a3edceed4..397c75dfb 100644
--- a/app/AdminModule/ConfigurationModule/forms/SkautIsEventForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/SkautIsEventForm.php
@@ -8,7 +8,6 @@
 use App\Model\Settings\SettingsRepository;
 use App\Services\SkautIsEventEducationService;
 use App\Services\SkautIsEventGeneralService;
-use App\Services\SkautIsService;
 use Nette;
 use Nette\Application\UI\Form;
 
@@ -27,9 +26,6 @@ class SkautIsEventForm extends Nette\Object
     /** @var SettingsRepository */
     private $settingsRepository;
 
-    /** @var SkautIsService */
-    private $skautIsService;
-
     /** @var SkautIsEventGeneralService */
     private $skautIsEventGeneralService;
 
@@ -41,7 +37,8 @@ class SkautIsEventForm extends Nette\Object
      * SkautIsEventForm constructor.
      * @param BaseForm $baseForm
      * @param SettingsRepository $settingsRepository
-     * @param SkautIsService $skautIsService
+     * @param SkautIsEventGeneralService $skautIsEventGeneralService
+     * @param SkautIsEventEducationService $skautIsEventEducationService
      */
     public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepository,
                                 SkautIsEventGeneralService $skautIsEventGeneralService,
@@ -56,6 +53,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -95,6 +93,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
@@ -102,7 +101,7 @@ public function processForm(Form $form, \stdClass $values)
         $eventName = NULL;
         $eventType = $values['skautisEventType'];
 
-        switch($eventType) {
+        switch ($eventType) {
             case SkautIsEventType::GENERAL:
                 $eventId = $values['skautisEventGeneral'];
                 $eventName = $this->skautIsEventGeneralService->getEventDisplayName($eventId);
diff --git a/app/AdminModule/ConfigurationModule/forms/SubeventForm.php b/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
index dc8add933..d57605e18 100644
--- a/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
@@ -43,6 +43,7 @@ public function __construct(BaseForm $baseFormFactory, SubeventRepository $subev
      * Vytvoří formulář.
      * @param $id
      * @return Form
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function create($id)
     {
@@ -71,8 +72,7 @@ public function create($id)
                 ->addRule(Form::MIN, 'admin.configuration.subevents_capacity_low', $this->subeventRepository->countApprovedUsersInSubevent($this->subevent));
 
             $subeventsOptions = $this->subeventRepository->getSubeventsWithoutSubeventOptions($this->subevent->getId());
-        }
-        else {
+        } else {
             $nameText->addRule(Form::IS_NOT_IN, 'admin.configuration.subevents_name_exists', $this->subeventRepository->findAllNames());
             $capacityText
                 ->addCondition(Form::FILLED)
@@ -83,7 +83,6 @@ public function create($id)
         }
 
 
-
         $incompatibleSubeventsSelect = $form->addMultiSelect('incompatibleSubevents', 'admin.configuration.subevents_incompatible_subevents', $subeventsOptions);
 
         $requiredSubeventsSelect = $form->addMultiSelect('requiredSubevents', 'admin.configuration.subevents_required_subevents', $subeventsOptions);
@@ -149,6 +148,7 @@ public function processForm(Form $form, \stdClass $values)
      * @param $field
      * @param $args
      * @return bool
+     * @throws \Doctrine\DBAL\ConnectionException
      */
     public function validateIncompatibleAndRequiredCollision($field, $args)
     {
@@ -159,8 +159,7 @@ public function validateIncompatibleAndRequiredCollision($field, $args)
 
         if ($this->subevent) {
             $editedSubevent = $this->subevent;
-        }
-        else {
+        } else {
             $editedSubevent = new Subevent();
             $editedSubevent->setName(md5(mt_rand()));
             $this->subeventRepository->save($editedSubevent);
diff --git a/app/AdminModule/ConfigurationModule/forms/SubeventsForm.php b/app/AdminModule/ConfigurationModule/forms/SubeventsForm.php
index de180eb85..debddc502 100644
--- a/app/AdminModule/ConfigurationModule/forms/SubeventsForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/SubeventsForm.php
@@ -37,6 +37,7 @@ public function __construct(BaseForm $baseForm, SettingsRepository $settingsRepo
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -59,6 +60,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/WebForm.php b/app/AdminModule/ConfigurationModule/forms/WebForm.php
index 1aa9121de..3ecc89fa6 100644
--- a/app/AdminModule/ConfigurationModule/forms/WebForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/WebForm.php
@@ -52,6 +52,7 @@ public function __construct(BaseForm $baseFormFactory, PageRepository $pageRepos
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create()
     {
@@ -87,6 +88,8 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws Nette\Utils\UnknownImageFileException
+     * @throws \App\Model\Settings\SettingsException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/ConfigurationModule/forms/templates/discount_form.latte b/app/AdminModule/ConfigurationModule/forms/templates/discount_form.latte
index 05a9fccd7..19d9f8bf8 100644
--- a/app/AdminModule/ConfigurationModule/forms/templates/discount_form.latte
+++ b/app/AdminModule/ConfigurationModule/forms/templates/discount_form.latte
@@ -40,7 +40,7 @@
 
         buttonAnd.on('click', function () {
             condition.val(condition.val() + 'and|');
-            conditionText.val(conditionText.val() + ' ' + {_common.condition_operator.and} + ' ');
+            conditionText.val(conditionText.val() + ' ' + {_common.condition_operator.and} +' ');
 
             buttonSubevent.removeClass('disabled');
             buttonAnd.addClass('disabled');
@@ -51,7 +51,7 @@
 
         buttonOr.on('click', function () {
             condition.val(condition.val() + 'or|');
-            conditionText.val(conditionText.val() + ' ' + {_common.condition_operator.or} + ' ');
+            conditionText.val(conditionText.val() + ' ' + {_common.condition_operator.or} +' ');
 
             buttonSubevent.removeClass('disabled');
             buttonAnd.addClass('disabled');
@@ -134,7 +134,8 @@
                     <ul class="dropdown-menu">
                         {foreach $subevents as $subevent}
                             <li>
-                                <a href="#" class="button-subevents" data-id="{$subevent->getId()}" data-name="{$subevent->getName()}">
+                                <a href="#" class="button-subevents" data-id="{$subevent->getId()}"
+                                   data-name="{$subevent->getName()}">
                                     {$subevent->getName()}
                                 </a>
                             </li>
@@ -145,7 +146,7 @@
                 <a href="#" id="button-and" class="btn btn-default">{_common.condition_operator.and}</a>
                 <a href="#" id="button-or" class="btn btn-default">{_common.condition_operator.or}</a>
 
-                <a href="#" id="button-left-parenthesis"  class="btn btn-default">(</a>
+                <a href="#" id="button-left-parenthesis" class="btn btn-default">(</a>
                 <a href="#" id="button-right-parenthesis" class="btn btn-default">)</a>
             </div>
 
diff --git a/app/AdminModule/ConfigurationModule/presenters/ApplicationPresenter.php b/app/AdminModule/ConfigurationModule/presenters/ApplicationPresenter.php
index db2bfd591..8255f4abd 100644
--- a/app/AdminModule/ConfigurationModule/presenters/ApplicationPresenter.php
+++ b/app/AdminModule/ConfigurationModule/presenters/ApplicationPresenter.php
@@ -60,6 +60,7 @@ protected function createComponentCustomInputsGrid()
 
     /**
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     protected function createComponentApplicationForm()
     {
diff --git a/app/AdminModule/ConfigurationModule/presenters/ConfigurationBasePresenter.php b/app/AdminModule/ConfigurationModule/presenters/ConfigurationBasePresenter.php
index df94b7f4d..9ca8644ce 100644
--- a/app/AdminModule/ConfigurationModule/presenters/ConfigurationBasePresenter.php
+++ b/app/AdminModule/ConfigurationModule/presenters/ConfigurationBasePresenter.php
@@ -15,14 +15,12 @@
  */
 abstract class ConfigurationBasePresenter extends AdminBasePresenter
 {
-    protected $resource = Resource::CONFIGURATION;
-
     /**
      * @var SubeventRepository
      * @inject
      */
     public $subeventRepository;
-
+    protected $resource = Resource::CONFIGURATION;
 
     public function startup()
     {
diff --git a/app/AdminModule/ConfigurationModule/presenters/DiscountsPresenter.php b/app/AdminModule/ConfigurationModule/presenters/DiscountsPresenter.php
index c68707a7d..016e787dd 100644
--- a/app/AdminModule/ConfigurationModule/presenters/DiscountsPresenter.php
+++ b/app/AdminModule/ConfigurationModule/presenters/DiscountsPresenter.php
@@ -5,7 +5,6 @@
 use App\AdminModule\ConfigurationModule\Components\IDiscountsGridControlFactory;
 use App\AdminModule\ConfigurationModule\Forms\DiscountForm;
 use App\AdminModule\ConfigurationModule\Forms\IDiscountFormFactory;
-use Nette\Forms\Form;
 
 
 /**
diff --git a/app/AdminModule/ConfigurationModule/presenters/MailingPresenter.php b/app/AdminModule/ConfigurationModule/presenters/MailingPresenter.php
index 7ab13d997..733c2b6fb 100644
--- a/app/AdminModule/ConfigurationModule/presenters/MailingPresenter.php
+++ b/app/AdminModule/ConfigurationModule/presenters/MailingPresenter.php
@@ -29,7 +29,8 @@ class MailingPresenter extends ConfigurationBasePresenter
     public $settingsRepository;
 
 
-    public function renderDefault() {
+    public function renderDefault()
+    {
         $this->template->waiting = $this->settingsRepository->getValue(Settings::SEMINAR_EMAIL_VERIFICATION_CODE) !== NULL;
     }
 
diff --git a/app/AdminModule/ConfigurationModule/presenters/PaymentPresenter.php b/app/AdminModule/ConfigurationModule/presenters/PaymentPresenter.php
index 69e5212da..839918ef5 100644
--- a/app/AdminModule/ConfigurationModule/presenters/PaymentPresenter.php
+++ b/app/AdminModule/ConfigurationModule/presenters/PaymentPresenter.php
@@ -3,7 +3,6 @@
 namespace App\AdminModule\ConfigurationModule\Presenters;
 
 use App\AdminModule\ConfigurationModule\Forms\IPaymentFormFactory;
-use App\AdminModule\ConfigurationModule\Forms\PaymentForm;
 use App\AdminModule\ConfigurationModule\Forms\PaymentProofForm;
 use Nette\Application\UI\Form;
 
diff --git a/app/AdminModule/MailingModule/components/MailHistoryGridControl.php b/app/AdminModule/MailingModule/components/MailHistoryGridControl.php
index 447c3163d..2924a313b 100644
--- a/app/AdminModule/MailingModule/components/MailHistoryGridControl.php
+++ b/app/AdminModule/MailingModule/components/MailHistoryGridControl.php
@@ -2,7 +2,6 @@
 
 namespace App\AdminModule\MailingModule\Components;
 
-use App\Model\Mailing\Mail;
 use App\Model\Mailing\MailRepository;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
diff --git a/app/AdminModule/MailingModule/components/MailTemplatesGridControl.php b/app/AdminModule/MailingModule/components/MailTemplatesGridControl.php
index e1db460d3..bfc2968e9 100644
--- a/app/AdminModule/MailingModule/components/MailTemplatesGridControl.php
+++ b/app/AdminModule/MailingModule/components/MailTemplatesGridControl.php
@@ -2,8 +2,7 @@
 
 namespace App\AdminModule\MailingModule\Components;
 
-use App\Model\Mailing\Mail;
-use App\Model\Mailing\MailRepository;
+
 use App\Model\Mailing\TemplateRepository;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
@@ -48,12 +47,15 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentMailTemplatesGrid($name)
     {
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
         $grid->setDataSource($this->templateRepository->createQueryBuilder('t'));
+        $grid->setDefaultSort(['type' => 'ASC']);
         $grid->setPagination(FALSE);
 
         $grid->addColumnText('type', 'admin.mailing.templates_type')
@@ -61,6 +63,12 @@ public function createComponentMailTemplatesGrid($name)
                 return $this->translator->translate('common.mailing.template_type.' . $row->getType());
             });
 
+        $grid->addColumnText('system', 'admin.mailing.templates_system')
+            ->setReplacement([
+                '0' => $this->translator->translate('admin.common.no'),
+                '1' => $this->translator->translate('admin.common.yes')
+            ]);
+
         $grid->addColumnStatus('active', 'admin.mailing.templates_active')
             ->addOption(FALSE, 'admin.mailing.templates_active_inactive')
             ->setClass('btn-danger')
@@ -70,6 +78,18 @@ public function createComponentMailTemplatesGrid($name)
             ->endOption()
             ->onChange[] = [$this, 'changeActive'];
 
+        $grid->addColumnText('sendToUser', 'admin.mailing.templates_send_to_user')
+            ->setReplacement([
+                '0' => $this->translator->translate('admin.common.no'),
+                '1' => $this->translator->translate('admin.common.yes')
+            ]);
+
+        $grid->addColumnText('sendToOrganizer', 'admin.mailing.templates_send_to_organizer')
+            ->setReplacement([
+                '0' => $this->translator->translate('admin.common.no'),
+                '1' => $this->translator->translate('admin.common.yes')
+            ]);
+
         $grid->addAction('edit', 'admin.common.edit', 'Templates:edit');
     }
 
@@ -77,16 +97,22 @@ public function createComponentMailTemplatesGrid($name)
      * Aktivuje/deaktivuje automatický e-mail.
      * @param $id
      * @param $active
+     * @throws \Nette\Application\AbortException
      */
     public function changeActive($id, $active)
     {
+        $p = $this->getPresenter();
+
         $template = $this->templateRepository->findById($id);
 
-        $template->setActive($active);
-        $this->templateRepository->save($template);
+        if ($template->isSystem() && !$active) {
+            $p->flashMessage('admin.mailing.templates_change_active_denied', 'danger');
+        } else {
+            $template->setActive($active);
+            $this->templateRepository->save($template);
 
-        $p = $this->getPresenter();
-        $p->flashMessage('admin.mailing.templates_changed_active', 'success');
+            $p->flashMessage('admin.mailing.templates_changed_active', 'success');
+        }
 
         if ($p->isAjax()) {
             $p->redrawControl('flashes');
diff --git a/app/AdminModule/MailingModule/forms/EditTemplateForm.php b/app/AdminModule/MailingModule/forms/EditTemplateForm.php
index 8f0915c0f..de4824fb4 100644
--- a/app/AdminModule/MailingModule/forms/EditTemplateForm.php
+++ b/app/AdminModule/MailingModule/forms/EditTemplateForm.php
@@ -3,15 +3,10 @@
 namespace App\AdminModule\MailingModule\Forms;
 
 use App\AdminModule\Forms\BaseForm;
-use App\Model\ACL\Role;
-use App\Model\ACL\RoleRepository;
 use App\Model\Mailing\Template;
 use App\Model\Mailing\TemplateRepository;
-use App\Model\User\UserRepository;
-use App\Services\MailService;
 use Nette;
 use Nette\Application\UI\Form;
-use Nette\Mail\SendException;
 
 
 /**
@@ -58,7 +53,13 @@ public function create($id)
 
         $form->addHidden('id');
 
-        $form->addCheckbox('active', 'admin.mailing.templates_active');
+        $form->addCheckbox('active', 'admin.mailing.templates_active_form');
+
+        $form->addCheckbox('sendToUser', 'admin.mailing.templates_send_to_user_form')
+            ->setDisabled($this->template->isSystem());
+
+        $form->addCheckbox('sendToOrganizer', 'admin.mailing.templates_send_to_organizer_form')
+            ->setDisabled($this->template->isSystem());
 
         $form->addText('subject', 'admin.mailing.templates_subject')
             ->addRule(Form::FILLED, 'admin.mailing.templates_subject_empty');
@@ -77,6 +78,8 @@ public function create($id)
         $form->setDefaults([
             'id' => $id,
             'active' => $this->template->isActive(),
+            'sendToUser' => $this->template->isSendToUser(),
+            'sendToOrganizer' => $this->template->isSendToOrganizer(),
             'subject' => $this->template->getSubject(),
             'text' => $this->template->getText()
         ]);
@@ -97,6 +100,13 @@ public function processForm(Form $form, \stdClass $values)
     {
         if (!$form['cancel']->isSubmittedBy()) {
             $this->template->setActive($values['active']);
+
+            if (array_key_exists('sendToUser', $values))
+                $this->template->setSendToUser($values['sendToUser']);
+
+            if (array_key_exists('sendToOrganizer', $values))
+                $this->template->setSendToOrganizer($values['sendToOrganizer']);
+
             $this->template->setSubject($values['subject']);
             $this->template->setText($values['text']);
 
diff --git a/app/AdminModule/MailingModule/forms/SendForm.php b/app/AdminModule/MailingModule/forms/SendForm.php
index 907320413..223b98dc2 100644
--- a/app/AdminModule/MailingModule/forms/SendForm.php
+++ b/app/AdminModule/MailingModule/forms/SendForm.php
@@ -57,6 +57,7 @@ public function __construct(BaseForm $baseFormFactory, MailService $mailService,
     /**
      * Vytvoří formulář.
      * @return Form
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function create()
     {
@@ -100,6 +101,9 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/MailingModule/presenters/templates/Templates/edit.latte b/app/AdminModule/MailingModule/presenters/templates/Templates/edit.latte
index 2b1f74d75..0e3d3c57f 100644
--- a/app/AdminModule/MailingModule/presenters/templates/Templates/edit.latte
+++ b/app/AdminModule/MailingModule/presenters/templates/Templates/edit.latte
@@ -21,7 +21,9 @@
                 <ul class="list-group">
                     {foreach $editedTemplate->getVariables() as $variable}
                         <li class="list-group-item">
-                            <strong>%{$translator->translate('common.mailing.variable_name.' . $variable->getName())}%</strong>
+                            <strong>
+                                %{$translator->translate('common.mailing.variable_name.' . $variable->getName())}%
+                            </strong>
                             -
                             {$translator->translate('common.mailing.variable_description.' . $variable->getName())}
                         </li>
diff --git a/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php b/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
index a6f75218f..a2b9254e2 100644
--- a/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
+++ b/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
@@ -14,7 +14,6 @@
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\MailService;
-use Doctrine\Common\Collections\ArrayCollection;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
 use Nette\Http\Session;
@@ -99,6 +98,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentProgramAttendeesGrid($name)
     {
@@ -197,6 +197,10 @@ public function createComponentProgramAttendeesGrid($name)
     /**
      * Přihlásí uživatele na program.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function handleRegister($id)
     {
@@ -215,7 +219,7 @@ public function handleRegister($id)
             $editedUser->addProgram($program);
             $this->userRepository->save($editedUser);
 
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$editedUser]), '', Template::PROGRAM_REGISTERED, [
+            $this->mailService->sendMailFromTemplate($editedUser, '', Template::PROGRAM_REGISTERED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                 TemplateVariable::PROGRAM_NAME => $program->getBlock()->getName()
             ]);
@@ -234,6 +238,10 @@ public function handleRegister($id)
     /**
      * Odhlásí uživatele z programu.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function handleUnregister($id)
     {
@@ -250,7 +258,7 @@ public function handleUnregister($id)
             $editedUser->removeProgram($program);
             $this->userRepository->save($editedUser);
 
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$editedUser]), '', Template::PROGRAM_UNREGISTERED, [
+            $this->mailService->sendMailFromTemplate($editedUser, '', Template::PROGRAM_UNREGISTERED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                 TemplateVariable::PROGRAM_NAME => $program->getBlock()->getName()
             ]);
@@ -269,6 +277,7 @@ public function handleUnregister($id)
     /**
      * Hromadně přihlásí program uživatelům.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupRegister(array $ids)
     {
@@ -294,6 +303,7 @@ public function groupRegister(array $ids)
     /**
      * Hromadně odhlásí program uživatelům.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupUnregister(array $ids)
     {
diff --git a/app/AdminModule/ProgramModule/components/ProgramBlocksGridControl.php b/app/AdminModule/ProgramModule/components/ProgramBlocksGridControl.php
index 797484428..963b1843e 100644
--- a/app/AdminModule/ProgramModule/components/ProgramBlocksGridControl.php
+++ b/app/AdminModule/ProgramModule/components/ProgramBlocksGridControl.php
@@ -101,6 +101,9 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentProgramBlocksGrid($name)
     {
@@ -206,6 +209,7 @@ public function createComponentProgramBlocksGrid($name)
     /**
      * Odstraní programový blok.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -227,6 +231,7 @@ public function handleDelete($id)
      * Změní povinnost bloku.
      * @param $id
      * @param $mandatory
+     * @throws \Nette\Application\AbortException
      */
     public function changeMandatory($id, $mandatory)
     {
@@ -277,6 +282,7 @@ public function changeMandatory($id, $mandatory)
     /**
      * Hromadně vyexportuje seznam uživatelů, kteří mají blok zapsaný.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupExportBlocksAttendees(array $ids)
     {
diff --git a/app/AdminModule/ProgramModule/components/ProgramCategoriesGridControl.php b/app/AdminModule/ProgramModule/components/ProgramCategoriesGridControl.php
index 5a64a0862..07374d745 100644
--- a/app/AdminModule/ProgramModule/components/ProgramCategoriesGridControl.php
+++ b/app/AdminModule/ProgramModule/components/ProgramCategoriesGridControl.php
@@ -8,6 +8,7 @@
 use App\Model\Program\CategoryRepository;
 use App\Model\Program\ProgramRepository;
 use App\Model\User\UserRepository;
+use App\Services\ProgramService;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
 use Nette\Application\UI\Form;
@@ -36,6 +37,9 @@ class ProgramCategoriesGridControl extends Control
     /** @var ProgramRepository */
     private $programRepository;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * ProgramCategoriesGridControl constructor.
@@ -44,10 +48,11 @@ class ProgramCategoriesGridControl extends Control
      * @param RoleRepository $roleRepository
      * @param UserRepository $userRepository
      * @param ProgramRepository $programRepository
+     * @param ProgramService $programService
      */
     public function __construct(Translator $translator, CategoryRepository $categoryRepository,
                                 RoleRepository $roleRepository, UserRepository $userRepository,
-                                ProgramRepository $programRepository)
+                                ProgramRepository $programRepository, ProgramService $programService)
     {
         parent::__construct();
 
@@ -56,6 +61,7 @@ public function __construct(Translator $translator, CategoryRepository $category
         $this->roleRepository = $roleRepository;
         $this->userRepository = $userRepository;
         $this->programRepository = $programRepository;
+        $this->programService = $programService;
     }
 
     /**
@@ -69,6 +75,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentProgramCategoriesGrid($name)
     {
@@ -132,6 +139,7 @@ public function createComponentProgramCategoriesGrid($name)
     /**
      * Zpracuje přidání kategorie.
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function add($values)
     {
@@ -152,18 +160,20 @@ public function add($values)
      * Zpracuje úpravu kategorie.
      * @param $id
      * @param $values
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function edit($id, $values)
     {
         $category = $this->categoryRepository->findById($id);
 
-        $this->categoryRepository->getEntityManager()->transactional(function($em) use($category, $values) {
+        $this->categoryRepository->getEntityManager()->transactional(function ($em) use ($category, $values) {
             $category->setName($values['name']);
             $category->setRegisterableRoles($this->roleRepository->findRolesByIds($values['registerableRoles']));
 
             $this->categoryRepository->save($category);
 
-            $this->programRepository->updateUsersPrograms($this->userRepository->findAll());
+            $this->programService->updateUsersPrograms($this->userRepository->findAll());
 
             $this->categoryRepository->save($category);
         });
@@ -175,16 +185,17 @@ public function edit($id, $values)
     /**
      * Odstraní kategorii.
      * @param $id
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function handleDelete($id)
     {
         $category = $this->categoryRepository->findById($id);
 
-        $this->categoryRepository->getEntityManager()->transactional(function($em) use($category) {
+        $this->categoryRepository->getEntityManager()->transactional(function ($em) use ($category) {
             $this->categoryRepository->remove($category);
 
-            $this->programRepository->updateUsersPrograms($this->userRepository->findAll());
-            $this->programRepository->getEntityManager()->flush();
+            $this->programService->updateUsersPrograms($this->userRepository->findAll());
         });
 
         $this->getPresenter()->flashMessage('admin.program.categories_deleted', 'success');
diff --git a/app/AdminModule/ProgramModule/components/RoomScheduleGridControl.php b/app/AdminModule/ProgramModule/components/RoomScheduleGridControl.php
index 33a348063..eeeac5594 100644
--- a/app/AdminModule/ProgramModule/components/RoomScheduleGridControl.php
+++ b/app/AdminModule/ProgramModule/components/RoomScheduleGridControl.php
@@ -8,7 +8,6 @@
 use App\Services\ExcelExportService;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
-use Nette\Application\UI\Form;
 use Ublaboo\DataGrid\DataGrid;
 
 
@@ -67,6 +66,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentRoomScheduleGrid($name)
     {
@@ -103,7 +103,8 @@ function ($row) {
         $grid->addToolbarButton('exportRoomsSchedule!', 'admin.program.rooms_schedule_download_schedule');
     }
 
-    public function handleExportRoomsSchedule() {
+    public function handleExportRoomsSchedule()
+    {
         $this->room = $this->roomRepository->findById($this->getPresenter()->getParameter('id'));
 
         $response = $this->excelExportService->exportRoomSchedule($this->room, 'harmonogram-mistnosti.xlsx');
diff --git a/app/AdminModule/ProgramModule/components/RoomsGridControl.php b/app/AdminModule/ProgramModule/components/RoomsGridControl.php
index a02efddda..d8c77355f 100644
--- a/app/AdminModule/ProgramModule/components/RoomsGridControl.php
+++ b/app/AdminModule/ProgramModule/components/RoomsGridControl.php
@@ -67,6 +67,7 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentRoomsGrid($name)
     {
@@ -136,6 +137,7 @@ public function createComponentRoomsGrid($name)
     /**
      * Zpracuje přidání místnosti.
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function add($values)
     {
@@ -156,6 +158,7 @@ public function add($values)
      * Zpracuje úpravu místnosti.
      * @param $id
      * @param $values
+     * @throws \Nette\Application\AbortException
      */
     public function edit($id, $values)
     {
@@ -175,6 +178,7 @@ public function edit($id, $values)
     /**
      * Odstraní místnost.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -189,6 +193,7 @@ public function handleDelete($id)
     /**
      * Hromadně vyexportuje harmonogramy místností.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupExportRoomsSchedules(array $ids)
     {
diff --git a/app/AdminModule/ProgramModule/forms/BlockForm.php b/app/AdminModule/ProgramModule/forms/BlockForm.php
index 6dd75deb6..04ddbafa7 100644
--- a/app/AdminModule/ProgramModule/forms/BlockForm.php
+++ b/app/AdminModule/ProgramModule/forms/BlockForm.php
@@ -14,6 +14,7 @@
 use App\Model\Structure\SubeventRepository;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
+use App\Services\ProgramService;
 use Nette;
 use Nette\Application\UI\Form;
 
@@ -65,6 +66,9 @@ class BlockForm extends Nette\Object
     /** @var SubeventRepository */
     private $subeventRepository;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * BlockForm constructor.
@@ -75,11 +79,12 @@ class BlockForm extends Nette\Object
      * @param SettingsRepository $settingsRepository
      * @param ProgramRepository $programRepository
      * @param SubeventRepository $subeventRepository
+     * @param ProgramService $programService
      */
     public function __construct(BaseForm $baseFormFactory, BlockRepository $blockRepository,
                                 UserRepository $userRepository, CategoryRepository $categoryRepository,
                                 SettingsRepository $settingsRepository, ProgramRepository $programRepository,
-                                SubeventRepository $subeventRepository)
+                                SubeventRepository $subeventRepository, ProgramService $programService)
     {
         $this->baseFormFactory = $baseFormFactory;
         $this->blockRepository = $blockRepository;
@@ -88,6 +93,7 @@ public function __construct(BaseForm $baseFormFactory, BlockRepository $blockRep
         $this->settingsRepository = $settingsRepository;
         $this->programRepository = $programRepository;
         $this->subeventRepository = $subeventRepository;
+        $this->programService = $programService;
     }
 
     /**
@@ -95,6 +101,7 @@ public function __construct(BaseForm $baseFormFactory, BlockRepository $blockRep
      * @param $id
      * @param $userId
      * @return Form
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function create($id, $userId)
     {
@@ -205,11 +212,12 @@ public function create($id, $userId)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Throwable
      */
     public function processForm(Form $form, \stdClass $values)
     {
         if (!$form['cancel']->isSubmittedBy()) {
-            $this->blockRepository->getEntityManager()->transactional(function($em) use($values) {
+            $this->blockRepository->getEntityManager()->transactional(function ($em) use ($values) {
                 if (!$this->block) {
                     if (!$this->settingsRepository->getValue(Settings::IS_ALLOWED_ADD_BLOCK))
                         return;
@@ -262,7 +270,7 @@ public function processForm(Form $form, \stdClass $values)
                 if ($oldMandatory == $this->block->getMandatory() && (
                         $this->block->getCategory() !== $oldCategory) || ($this->block->getSubevent() !== $oldSubevent)
                 ) {
-                    $this->programRepository->updateUsersPrograms($this->userRepository->findAll());
+                    $this->programService->updateUsersPrograms($this->userRepository->findAll());
                 }
 
                 $this->blockRepository->save($this->block);
diff --git a/app/AdminModule/ProgramModule/presenters/BlocksPresenter.php b/app/AdminModule/ProgramModule/presenters/BlocksPresenter.php
index 412cd3a44..6c69d1b37 100644
--- a/app/AdminModule/ProgramModule/presenters/BlocksPresenter.php
+++ b/app/AdminModule/ProgramModule/presenters/BlocksPresenter.php
@@ -68,6 +68,7 @@ public function renderDefault()
 
     /**
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
      */
     public function renderDetail($id)
     {
@@ -81,6 +82,7 @@ public function renderDetail($id)
 
     /**
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function renderEdit($id)
     {
@@ -97,6 +99,7 @@ public function renderEdit($id)
     /**
      * Zobrazí přehled účastníků u vybraného programu.
      * @param $programId
+     * @throws \Nette\Application\AbortException
      */
     public function handleShowAttendees($programId)
     {
@@ -113,6 +116,8 @@ public function handleShowAttendees($programId)
     /**
      * Odstraní vybraný program.
      * @param $programId
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function handleDeleteProgram($programId)
     {
diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index d0e31cfa2..2564c1906 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -11,7 +11,6 @@
 use App\Model\Program\ProgramRepository;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
-use App\Model\Structure\Subevent;
 use App\Model\Structure\SubeventRepository;
 use App\Model\User\Application;
 use App\Model\User\ApplicationRepository;
@@ -21,6 +20,7 @@
 use App\Services\Authenticator;
 use App\Services\MailService;
 use App\Services\PdfExportService;
+use App\Services\ProgramService;
 use Doctrine\Common\Collections\ArrayCollection;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
@@ -71,6 +71,9 @@ class ApplicationsGridControl extends Control
     /** @var PdfExportService */
     private $pdfExportService;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * ApplicationsGridControl constructor.
@@ -85,13 +88,14 @@ class ApplicationsGridControl extends Control
      * @param SettingsRepository $settingsRepository
      * @param Authenticator $authenticator
      * @param PdfExportService $pdfExportService
+     * @param ProgramService $programService
      */
     public function __construct(Translator $translator, ApplicationRepository $applicationRepository,
                                 UserRepository $userRepository, RoleRepository $roleRepository,
                                 SubeventRepository $subeventRepository, ApplicationService $applicationService,
                                 ProgramRepository $programRepository, MailService $mailService,
                                 SettingsRepository $settingsRepository, Authenticator $authenticator,
-                                PdfExportService $pdfExportService)
+                                PdfExportService $pdfExportService, ProgramService $programService)
     {
         parent::__construct();
 
@@ -106,6 +110,7 @@ public function __construct(Translator $translator, ApplicationRepository $appli
         $this->settingsRepository = $settingsRepository;
         $this->authenticator = $authenticator;
         $this->pdfExportService = $pdfExportService;
+        $this->programService = $programService;
     }
 
     /**
@@ -119,6 +124,8 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentApplicationsGrid($name)
     {
@@ -177,22 +184,22 @@ public function createComponentApplicationsGrid($name)
 
 
         $grid->addInlineAdd()->onControlAdd[] = function ($container) {
-            $rolesSelect = $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
+            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
                 ->setAttribute('class', 'datagrid-multiselect');
 
             if ($this->subeventRepository->explicitSubeventsExists()) {
-                $subeventsSelect = $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredSubeventsOptionsWithCapacity($this->user))
+                $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredSubeventsOptionsWithCapacity($this->user))
                     ->setAttribute('class', 'datagrid-multiselect');
             }
         };
         $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
 
         $grid->addInlineEdit()->onControlAdd[] = function ($container) {
-            $rolesSelect = $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
+            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
                 ->setAttribute('class', 'datagrid-multiselect');
 
             if ($this->subeventRepository->explicitSubeventsExists()) {
-                $subeventsSelect = $container->addMultiSelect('subevents', '', $this->subeventRepository->getSubeventsOptionsWithCapacity())
+                $container->addMultiSelect('subevents', '', $this->subeventRepository->getSubeventsOptionsWithCapacity())
                     ->setAttribute('class', 'datagrid-multiselect');
             }
 
@@ -229,7 +236,7 @@ public function createComponentApplicationsGrid($name)
         $grid->addAction('generatePaymentProofCash', 'admin.users.users_applications_download_payment_proof_cash');
         $grid->allowRowsAction('generatePaymentProofCash', function ($item) {
             return $item->getState() == ApplicationState::PAID
-                &&$item->getPaymentMethod() == PaymentType::CASH
+                && $item->getPaymentMethod() == PaymentType::CASH
                 && $item->getPaymentDate();
         });
 
@@ -265,6 +272,9 @@ public function createComponentApplicationsGrid($name)
     /**
      * Zpracuje přidání podakcí.
      * @param $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function add($values)
     {
@@ -282,8 +292,7 @@ public function add($values)
                 $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
                 $this->redirect('this');
             }
-        }
-        else {
+        } else {
             if ($this->validateRolesEmpty($selectedRoles)) {
                 $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
                 $this->redirect('this');
@@ -307,7 +316,7 @@ public function add($values)
 
 
         //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($selectedRoles, $selectedSubevents) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents) {
             $application = new Application();
 
             if ($this->user->getApplications()->isEmpty()) {
@@ -334,8 +343,7 @@ public function add($values)
             $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
             $this->applicationRepository->save($application);
 
-            $this->programRepository->updateUserPrograms($this->user);
-            $this->userRepository->save($this->user);
+            $this->programService->updateUserPrograms($this->user);
         });
 
         $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
@@ -346,6 +354,9 @@ public function add($values)
      * Zpracuje úpravu přihlášky.
      * @param $id
      * @param $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function edit($id, $values)
     {
@@ -364,8 +375,7 @@ public function edit($id, $values)
                 $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
                 $this->redirect('this');
             }
-        }
-        else {
+        } else {
             if ($this->validateRolesEmpty($selectedRoles)) {
                 $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
                 $this->redirect('this');
@@ -386,14 +396,14 @@ public function edit($id, $values)
                 $this->redirect('this');
             }
 
-            if(!$this->validateSubeventsRegistered($selectedSubevents, $this->user, $application->getId())) {
+            if (!$this->validateSubeventsRegistered($selectedSubevents, $this->user, $application->getId())) {
                 $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
                 $this->redirect('this');
             }
         }
 
         //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($selectedRoles, $selectedSubevents, $application, $values) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents, $application, $values) {
             $oldPaymentDate = $application->getPaymentDate();
 
             if ($application->isFirst()) {
@@ -429,11 +439,10 @@ public function edit($id, $values)
                 $this->applicationRepository->save($application);
             }
 
-            $this->programRepository->updateUserPrograms($this->user);
-            $this->userRepository->save($this->user);
+            $this->programService->updateUserPrograms($this->user);
 
             if ($values['paymentDate'] !== NULL && $oldPaymentDate === NULL) {
-                $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$this->user]), '', Template::PAYMENT_CONFIRMED, [
+                $this->mailService->sendMailFromTemplate($this->user, '', Template::PAYMENT_CONFIRMED, [
                     TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                     TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
                 ]);
@@ -471,12 +480,14 @@ public function handleGeneratePaymentProofBank($id)
     /**
      * Odhlásí uživatele ze semináře.
      * @param $id
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function handleCancelRegistration($id)
     {
         $user = $this->applicationRepository->findById($id)->getUser();
 
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($user) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user) {
             $user->setRoles(new ArrayCollection([$this->roleRepository->findBySystemName(Role::NONREGISTERED)]));
             $user->setApproved(TRUE);
             foreach ($user->getApplications() as $application) {
@@ -484,10 +495,9 @@ public function handleCancelRegistration($id)
             }
             $this->userRepository->save($user);
 
-            $this->programRepository->updateUserPrograms($user);
-            $this->userRepository->save($user);
+            $this->programService->updateUserPrograms($user);
 
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$user]), '', Template::REGISTRATION_CANCELED, [
+            $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
             ]);
         });
@@ -499,18 +509,19 @@ public function handleCancelRegistration($id)
     /**
      * Zruší přihlášku.
      * @param $id
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function handleCancelApplication($id)
     {
         $application = $this->applicationRepository->findById($id);
         $user = $application->getUser();
 
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($application, $user) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $user) {
             $application->setState(ApplicationState::CANCELED);
             $this->applicationRepository->save($application);
 
-            $this->programRepository->updateUserPrograms($user);
-            $this->userRepository->save($user);
+            $this->programService->updateUserPrograms($user);
         });
 
         $this->getPresenter()->flashMessage('admin.users.users_applications_application_canceled', 'success');
@@ -533,6 +544,7 @@ private function validateSubeventsEmpty($selectedSubevents)
      * Ověří obsazenost podakcí.
      * @param $selectedSubevents
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     private function validateSubeventsCapacities($selectedSubevents)
     {
@@ -572,6 +584,7 @@ private function validateSubeventsRegistered($selectedSubevents, User $user, $ap
      * Ověří obsazenost rolí.
      * @param $selectedRoles
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     private function validateRolesCapacities($selectedRoles)
     {
diff --git a/app/AdminModule/components/RolesGridControl.php b/app/AdminModule/components/RolesGridControl.php
index 32a53be90..f3bd28c7c 100644
--- a/app/AdminModule/components/RolesGridControl.php
+++ b/app/AdminModule/components/RolesGridControl.php
@@ -6,6 +6,7 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\Program\ProgramRepository;
 use App\Model\User\UserRepository;
+use App\Services\ProgramService;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
 use Ublaboo\DataGrid\DataGrid;
@@ -30,6 +31,9 @@ class RolesGridControl extends Control
     /** @var ProgramRepository */
     private $programRepository;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * RolesGridControl constructor.
@@ -37,9 +41,10 @@ class RolesGridControl extends Control
      * @param RoleRepository $roleRepository
      * @param UserRepository $userRepository
      * @param ProgramRepository $programRepository
+     * @param ProgramService $programService
      */
     public function __construct(Translator $translator, RoleRepository $roleRepository, UserRepository $userRepository,
-                                ProgramRepository $programRepository)
+                                ProgramRepository $programRepository, ProgramService $programService)
     {
         parent::__construct();
 
@@ -47,6 +52,7 @@ public function __construct(Translator $translator, RoleRepository $roleReposito
         $this->roleRepository = $roleRepository;
         $this->userRepository = $userRepository;
         $this->programRepository = $programRepository;
+        $this->programService = $programService;
     }
 
     /**
@@ -60,6 +66,8 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentRolesGrid($name)
     {
@@ -136,6 +144,8 @@ function ($row) {
     /**
      * Zpracuje odstranění role.
      * @param $id
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function handleDelete($id)
     {
@@ -143,7 +153,7 @@ public function handleDelete($id)
 
         $usersInRole = $this->userRepository->findAllInRole($role);
 
-        $this->roleRepository->getEntityManager()->transactional(function($em) use($role, $usersInRole) {
+        $this->roleRepository->getEntityManager()->transactional(function ($em) use ($role, $usersInRole) {
             $this->roleRepository->remove($role);
 
             foreach ($usersInRole as $user) {
@@ -154,8 +164,7 @@ public function handleDelete($id)
                 }
             }
 
-            $this->programRepository->updateUsersPrograms($this->userRepository->findAll());
-            $this->programRepository->getEntityManager()->flush();
+            $this->programService->updateUsersPrograms($this->userRepository->findAll());
         });
 
         $this->getPresenter()->flashMessage('admin.acl.roles_deleted', 'success');
@@ -166,6 +175,7 @@ public function handleDelete($id)
      * Změní registrovatelnost role.
      * @param $id
      * @param $registerable
+     * @throws \Nette\Application\AbortException
      */
     public function changeRegisterable($id, $registerable)
     {
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index e0027a4e7..fb41e49a7 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -8,7 +8,6 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\Enums\ApplicationState;
 use App\Model\Enums\PaymentType;
-use App\Model\Mailing\Mail;
 use App\Model\Mailing\Template;
 use App\Model\Mailing\TemplateVariable;
 use App\Model\Program\BlockRepository;
@@ -24,8 +23,8 @@
 use App\Services\ExcelExportService;
 use App\Services\MailService;
 use App\Services\PdfExportService;
+use App\Services\ProgramService;
 use App\Services\UserService;
-use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\Query\Expr;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
@@ -90,6 +89,9 @@ class UsersGridControl extends Control
     /** @var UserService */
     private $userService;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * UsersGridControl constructor.
@@ -108,6 +110,7 @@ class UsersGridControl extends Control
      * @param ApplicationRepository $applicationRepository
      * @param ApplicationService $applicationService
      * @param UserService $userService
+     * @param ProgramService $programService
      */
     public function __construct(Translator $translator, UserRepository $userRepository,
                                 SettingsRepository $settingsRepository, CustomInputRepository $customInputRepository,
@@ -115,7 +118,8 @@ public function __construct(Translator $translator, UserRepository $userReposito
                                 BlockRepository $blockRepository, PdfExportService $pdfExportService,
                                 ExcelExportService $excelExportService, MailService $mailService, Session $session,
                                 SubeventRepository $subeventRepository, ApplicationRepository $applicationRepository,
-                                ApplicationService $applicationService, UserService $userService)
+                                ApplicationService $applicationService, UserService $userService,
+                                ProgramService $programService)
     {
         parent::__construct();
 
@@ -133,6 +137,7 @@ public function __construct(Translator $translator, UserRepository $userReposito
         $this->applicationRepository = $applicationRepository;
         $this->applicationService = $applicationService;
         $this->userService = $userService;
+        $this->programService = $programService;
 
         $this->session = $session;
         $this->sessionSection = $session->getSection('srs');
@@ -149,6 +154,9 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridColumnStatusException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentUsersGrid($name)
     {
@@ -307,7 +315,7 @@ public function createComponentUsersGrid($name)
                 if (!$row->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS) || !$row->isApproved())
                     return NULL;
 
-                $unregisteredMandatoryBlocksNames = $this->blockRepository->findUserMandatoryNotRegisteredNames($row);
+                $unregisteredMandatoryBlocksNames = $this->programService->getUnregisteredUserMandatoryBlocksNames($row);
                 $unregisteredMandatoryBlocksNamesText = implode(', ', $unregisteredMandatoryBlocksNames);
                 return Html::el('span')
                     ->setAttribute('data-toggle', 'tooltip')
@@ -365,6 +373,7 @@ public function createComponentUsersGrid($name)
     /**
      * Zpracuje odstranění uživatele.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function handleDelete($id)
     {
@@ -381,6 +390,8 @@ public function handleDelete($id)
      * Změní stav uživatele.
      * @param $id
      * @param $approved
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function changeApproved($id, $approved)
     {
@@ -424,6 +435,7 @@ public function changeApproved($id, $approved)
      * Změní účast uživatele na semináři.
      * @param $id
      * @param $attended
+     * @throws \Nette\Application\AbortException
      */
     public function changeAttended($id, $attended)
     {
@@ -445,6 +457,8 @@ public function changeAttended($id, $attended)
     /**
      * Hromadně schválí uživatele.
      * @param array $ids
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
      */
     public function groupApprove(array $ids)
     {
@@ -505,6 +519,9 @@ public function groupApprove(array $ids)
      * Hromadně nastaví role.
      * @param array $ids
      * @param $value
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function groupChangeRoles(array $ids, $value)
     {
@@ -540,27 +557,10 @@ public function groupChangeRoles(array $ids, $value)
         }
 
         if (!$error) {
-            $this->userRepository->getEntityManager()->transactional(function($em) use($selectedRoles, $users, $p) {
+            $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $p) {
                 foreach ($users as $user) {
-                    $user->setRoles($selectedRoles);
-                    $this->userRepository->save($user);
-
-                    foreach ($user->getApplications() as $application) {
-                        $fee = $this->applicationService->countFee($selectedRoles, $application->getSubevents(),
-                            $application->isFirst()
-                        );
-
-                        $application->setFee($fee);
-                        $application->setState($fee == 0 || $application->getPaymentDate()
-                            ? ApplicationState::PAID
-                            : ApplicationState::WAITING_FOR_PAYMENT);
-
-                        $this->applicationRepository->save($application);
-                    }
+                    $this->userService->changeRoles($user, $selectedRoles, TRUE);
                 }
-
-                $this->programRepository->updateUsersPrograms($users->toArray());
-                $this->userRepository->getEntityManager()->flush();
             });
 
             $p->flashMessage('admin.users.users_group_action_changed_roles', 'success');
@@ -571,6 +571,7 @@ public function groupChangeRoles(array $ids, $value)
     /**
      * Hromadně označí uživatele jako zúčastněné.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupMarkAttended(array $ids)
     {
@@ -591,6 +592,10 @@ public function groupMarkAttended(array $ids)
      * Hromadně označí uživatele jako zaplacené dnes.
      * @param array $ids
      * @param $value
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function groupMarkPaidToday(array $ids, $value)
     {
@@ -604,7 +609,7 @@ public function groupMarkPaidToday(array $ids, $value)
                     $application->setState(ApplicationState::PAID);
                     $this->applicationRepository->save($application);
 
-                    $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$user]), '', Template::PAYMENT_CONFIRMED, [
+                    $this->mailService->sendMailFromTemplate($user, '', Template::PAYMENT_CONFIRMED, [
                         TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                         TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
                     ]);
@@ -626,6 +631,7 @@ public function groupMarkPaidToday(array $ids, $value)
     /**
      * Hromadně vygeneruje potvrzení o zaplacení.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupGeneratePaymentProofs(array $ids)
     {
@@ -636,6 +642,7 @@ public function groupGeneratePaymentProofs(array $ids)
     /**
      * Hromadně vyexportuje seznam uživatelů.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupExportUsers(array $ids)
     {
@@ -660,6 +667,7 @@ public function handleExportUsers()
     /**
      * Hromadně vyexportuje seznam uživatelů s rolemi.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupExportRoles(array $ids)
     {
@@ -685,6 +693,7 @@ public function handleExportRoles()
     /**
      * Hromadně vyexportuje seznam uživatelů s podakcemi a programy podle kategorií.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupExportSubeventsAndCategories(array $ids)
     {
@@ -709,6 +718,7 @@ public function handleExportSubeventsAndCategories()
     /**
      * Hromadně vyexportuje harmonogramy uživatelů.
      * @param array $ids
+     * @throws \Nette\Application\AbortException
      */
     public function groupExportSchedules(array $ids)
     {
diff --git a/app/AdminModule/forms/AddLectorForm.php b/app/AdminModule/forms/AddLectorForm.php
index 3e60edd9c..24a5464c0 100644
--- a/app/AdminModule/forms/AddLectorForm.php
+++ b/app/AdminModule/forms/AddLectorForm.php
@@ -107,6 +107,7 @@ public function create()
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws Nette\Utils\UnknownImageFileException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/forms/EditRoleForm.php b/app/AdminModule/forms/EditRoleForm.php
index 04262a4b2..3c12e6f3a 100644
--- a/app/AdminModule/forms/EditRoleForm.php
+++ b/app/AdminModule/forms/EditRoleForm.php
@@ -9,6 +9,7 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\CMS\PageRepository;
 use App\Model\Program\ProgramRepository;
+use App\Services\ProgramService;
 use Nette;
 use Nette\Application\UI\Form;
 
@@ -42,6 +43,9 @@ class EditRoleForm extends Nette\Object
     /** @var ProgramRepository */
     private $programRepository;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * EditRoleForm constructor.
@@ -50,22 +54,26 @@ class EditRoleForm extends Nette\Object
      * @param PageRepository $pageRepository
      * @param PermissionRepository $permissionRepository
      * @param ProgramRepository $programRepository
+     * @param ProgramService $programService
      */
     public function __construct(BaseForm $baseFormFactory, RoleRepository $roleRepository,
                                 PageRepository $pageRepository, PermissionRepository $permissionRepository,
-                                ProgramRepository $programRepository)
+                                ProgramRepository $programRepository, ProgramService $programService)
     {
         $this->baseFormFactory = $baseFormFactory;
         $this->roleRepository = $roleRepository;
         $this->pageRepository = $pageRepository;
         $this->permissionRepository = $permissionRepository;
         $this->programRepository = $programRepository;
+        $this->programService = $programService;
     }
 
     /**
      * Vytvoří formulář.
      * @param $id
      * @return Form
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function create($id)
     {
@@ -180,11 +188,12 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Throwable
      */
     public function processForm(Form $form, \stdClass $values)
     {
         if (!$form['cancel']->isSubmittedBy()) {
-            $this->roleRepository->getEntityManager()->transactional(function($em) use($values) {
+            $this->roleRepository->getEntityManager()->transactional(function ($em) use ($values) {
                 $capacity = $values['capacity'] !== '' ? $values['capacity'] : NULL;
 
                 $this->role->setName($values['name']);
@@ -208,8 +217,7 @@ public function processForm(Form $form, \stdClass $values)
 
                 $this->roleRepository->save($this->role);
 
-                $this->programRepository->updateUsersPrograms($this->role->getUsers());
-                $this->roleRepository->save($this->role);
+                $this->programService->updateUsersPrograms($this->role->getUsers());
             });
         }
     }
@@ -217,6 +225,8 @@ public function processForm(Form $form, \stdClass $values)
     /**
      * Vrátí možná oprávnění jako možnosti pro select.
      * @return array
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     private function preparePermissionsOptions()
     {
@@ -249,6 +259,8 @@ private function preparePermissionsOptions()
      * @param $optionsGroup
      * @param $permissionName
      * @param $resourceName
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     private function preparePermissionOption(&$optionsGroup, $permissionName, $resourceName)
     {
@@ -261,6 +273,7 @@ private function preparePermissionOption(&$optionsGroup, $permissionName, $resou
      * @param $field
      * @param $args
      * @return bool
+     * @throws \Doctrine\DBAL\ConnectionException
      */
     public function validateIncompatibleAndRequiredCollision($field, $args)
     {
diff --git a/app/AdminModule/forms/EditUserPersonalDetailsForm.php b/app/AdminModule/forms/EditUserPersonalDetailsForm.php
index 629f0156d..91fc4c725 100644
--- a/app/AdminModule/forms/EditUserPersonalDetailsForm.php
+++ b/app/AdminModule/forms/EditUserPersonalDetailsForm.php
@@ -2,15 +2,6 @@
 
 namespace App\AdminModule\Forms;
 
-use App\Model\ACL\Role;
-use App\Model\ACL\RoleRepository;
-use App\Model\Program\ProgramRepository;
-use App\Model\Settings\CustomInput\CustomInput;
-use App\Model\Settings\CustomInput\CustomInputRepository;
-use App\Model\Settings\SettingsRepository;
-use App\Model\User\CustomInputValue\CustomCheckboxValue;
-use App\Model\User\CustomInputValue\CustomInputValueRepository;
-use App\Model\User\CustomInputValue\CustomTextValue;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\FilesService;
@@ -139,6 +130,7 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws Nette\Utils\UnknownImageFileException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/AdminModule/forms/EditUserSeminarForm.php b/app/AdminModule/forms/EditUserSeminarForm.php
index de5f0a518..ac43e8bc8 100644
--- a/app/AdminModule/forms/EditUserSeminarForm.php
+++ b/app/AdminModule/forms/EditUserSeminarForm.php
@@ -12,7 +12,7 @@
 use App\Model\User\CustomInputValue\CustomTextValue;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
-use function GuzzleHttp\Promise\queue;
+use App\Services\ProgramService;
 use Nette;
 use Nette\Application\UI\Form;
 
@@ -49,6 +49,9 @@ class EditUserSeminarForm extends Nette\Object
     /** @var ProgramRepository */
     private $programRepository;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * EditUserSeminarForm constructor.
@@ -58,11 +61,13 @@ class EditUserSeminarForm extends Nette\Object
      * @param CustomInputValueRepository $customInputValueRepository
      * @param SettingsRepository $settingsRepository
      * @param ProgramRepository $programRepository
+     * @param ProgramService $programService
      */
     public function __construct(BaseForm $baseFormFactory, UserRepository $userRepository,
                                 CustomInputRepository $customInputRepository,
                                 CustomInputValueRepository $customInputValueRepository,
-                                SettingsRepository $settingsRepository, ProgramRepository $programRepository)
+                                SettingsRepository $settingsRepository, ProgramRepository $programRepository,
+                                ProgramService $programService)
     {
         $this->baseFormFactory = $baseFormFactory;
         $this->userRepository = $userRepository;
@@ -70,6 +75,7 @@ public function __construct(BaseForm $baseFormFactory, UserRepository $userRepos
         $this->customInputValueRepository = $customInputValueRepository;
         $this->settingsRepository = $settingsRepository;
         $this->programRepository = $programRepository;
+        $this->programService = $programService;
     }
 
     /**
@@ -147,11 +153,12 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Throwable
      */
     public function processForm(Form $form, \stdClass $values)
     {
         if (!$form['cancel']->isSubmittedBy()) {
-            $this->userRepository->getEntityManager()->transactional(function($em) use($values) {
+            $this->userRepository->getEntityManager()->transactional(function ($em) use ($values) {
                 $this->user->setApproved($values['approved']);
                 $this->user->setAttended($values['attended']);
 
@@ -192,9 +199,7 @@ public function processForm(Form $form, \stdClass $values)
 
                 $this->userRepository->save($this->user);
 
-                $this->programRepository->updateUserPrograms($this->user);
-
-                $this->userRepository->save($this->user);
+                $this->programService->updateUserPrograms($this->user);
             });
         }
     }
diff --git a/app/AdminModule/presenters/AclPresenter.php b/app/AdminModule/presenters/AclPresenter.php
index 6284f30fc..32cae09e3 100644
--- a/app/AdminModule/presenters/AclPresenter.php
+++ b/app/AdminModule/presenters/AclPresenter.php
@@ -20,32 +20,29 @@
 class AclPresenter extends AdminBasePresenter
 {
     protected $resource = Resource::ACL;
-
+    
     /**
      * @var AddRoleForm
      * @inject
      */
     public $addRoleFormFactory;
-
     /**
      * @var EditRoleForm
      * @inject
      */
     public $editRoleFormFactory;
-
     /**
      * @var IRolesGridControlFactory
      * @inject
      */
     public $rolesGridControlFactory;
-
     /**
      * @var Authenticator
      * @inject
      */
     public $authenticator;
 
-
+    
     public function startup()
     {
         parent::startup();
@@ -66,6 +63,7 @@ public function renderEdit($id)
     /**
      * Zapne testování role.
      * @param $id
+     * @throws \Nette\Application\AbortException
      */
     public function actionTest($id)
     {
@@ -106,6 +104,8 @@ protected function createComponentAddRoleForm()
 
     /**
      * @return \Nette\Application\UI\Form
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     protected function createComponentEditRoleForm()
     {
diff --git a/app/AdminModule/presenters/AdminBasePresenter.php b/app/AdminModule/presenters/AdminBasePresenter.php
index fd13091b6..f7c3e34a7 100644
--- a/app/AdminModule/presenters/AdminBasePresenter.php
+++ b/app/AdminModule/presenters/AdminBasePresenter.php
@@ -139,6 +139,7 @@ public function beforeRender()
     /**
      * Kontroluje oprávnění uživatele a případně jej přesměruje.
      * @param $permission
+     * @throws \Nette\Application\AbortException
      */
     public function checkPermission($permission)
     {
diff --git a/app/AdminModule/presenters/UsersPresenter.php b/app/AdminModule/presenters/UsersPresenter.php
index e0e15f405..0d11c782c 100644
--- a/app/AdminModule/presenters/UsersPresenter.php
+++ b/app/AdminModule/presenters/UsersPresenter.php
@@ -27,49 +27,42 @@
 class UsersPresenter extends AdminBasePresenter
 {
     protected $resource = Resource::USERS;
-
+    
     /**
      * @var IUsersGridControlFactory
      * @inject
      */
     public $usersGridControlFactory;
-
     /**
      * @var AddLectorForm
      * @inject
      */
     public $addLectorFormFactory;
-
     /**
      * @var EditUserPersonalDetailsForm
      * @inject
      */
     public $editUserPersonalDetailsFormFactory;
-
     /**
      * @var EditUserSeminarForm
      * @inject
      */
     public $editUserSeminarFormFactory;
-
     /**
      * @var IApplicationsGridControlFactory
      * @inject
      */
     public $applicationsGridControlFactory;
-
     /**
      * @var PdfExportService
      * @inject
      */
     public $pdfExportService;
-
     /**
      * @var ExcelExportService
      * @inject
      */
     public $excelExportService;
-
     /**
      * @var CustomInputRepository
      * @inject
@@ -77,6 +70,9 @@ class UsersPresenter extends AdminBasePresenter
     public $customInputRepository;
 
 
+    /**
+     * @throws \Nette\Application\AbortException
+     */
     public function startup()
     {
         parent::startup();
@@ -121,6 +117,7 @@ public function handleSearch($text)
 
     /**
      * Zobrazí formulář pro editaci osobních údajů uživatele.
+     * @throws \Nette\Application\AbortException
      */
     public function handleEditPersonalDetails()
     {
@@ -135,6 +132,7 @@ public function handleEditPersonalDetails()
 
     /**
      * Zobrazí formulář pro editaci údajů o účasti uživatele na semináři.
+     * @throws \Nette\Application\AbortException
      */
     public function handleEditSeminar()
     {
@@ -149,6 +147,7 @@ public function handleEditSeminar()
 
     /**
      * Zobrazí formulář pro editaci údajů o platbě uživatele.
+     * @throws \Nette\Application\AbortException
      */
     public function handleEditPayment()
     {
diff --git a/app/AdminModule/presenters/templates/Dashboard/default.latte b/app/AdminModule/presenters/templates/Dashboard/default.latte
index 64a0ef95f..c2a652b84 100644
--- a/app/AdminModule/presenters/templates/Dashboard/default.latte
+++ b/app/AdminModule/presenters/templates/Dashboard/default.latte
@@ -70,7 +70,8 @@
 
                                 {if $user->isAllowed($resourceProgram, $permissionManageCategories)}
                                     <div class="col-sm-2 col-xs-2">
-                                        <a href="{plink Program:Categories:default}" class="btn btn-default btn-sm btn-block">
+                                        <a href="{plink Program:Categories:default}"
+                                           class="btn btn-default btn-sm btn-block">
                                             <span class="fa fa-2x fa-flag"></span>
                                             <br>
                                             {_admin.program.menu_categories}
@@ -80,7 +81,8 @@
 
                                 {if $user->isAllowed($resourceProgram, $permissionManageRooms)}
                                     <div class="col-sm-2 col-xs-2">
-                                        <a href="{plink Program:Rooms:default}" class="btn btn-default btn-sm btn-block">
+                                        <a href="{plink Program:Rooms:default}"
+                                           class="btn btn-default btn-sm btn-block">
                                             <span class="fa fa-2x fa-home"></span>
                                             <br>
                                             {_admin.program.menu_rooms}
@@ -144,7 +146,8 @@
                         <div class="panel-body">
                             <div class="row">
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Mailing:Templates:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Mailing:Templates:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-envelope-o"></span>
                                         <br>
                                         {_admin.mailing.menu_templates}
@@ -181,7 +184,8 @@
                         <div class="panel-body">
                             <div class="row">
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Seminar:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Seminar:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-calendar-o"></span>
                                         <br>
                                         {_admin.configuration.menu_seminar}
@@ -189,7 +193,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Program:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Program:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-calendar"></span>
                                         <br>
                                         {_admin.configuration.menu_program}
@@ -197,7 +202,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Subevents:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Subevents:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-calendar"></span>
                                         <br>
                                         {_admin.configuration.menu_subevents}
@@ -206,7 +212,8 @@
 
                                 {if $explicitSubeventsExists}
                                     <div class="col-sm-2 col-xs-2">
-                                        <a href="{plink Configuration:Discounts:default}" class="btn btn-default btn-sm btn-block">
+                                        <a href="{plink Configuration:Discounts:default}"
+                                           class="btn btn-default btn-sm btn-block">
                                             <span class="fa fa-2x fa-money"></span>
                                             <br>
                                             {_admin.configuration.menu_discounts}
@@ -215,7 +222,8 @@
                                 {/if}
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Payment:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Payment:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-money"></span>
                                         <br>
                                         {_admin.configuration.menu_payment}
@@ -223,7 +231,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Application:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Application:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-id-card-o"></span>
                                         <br>
                                         {_admin.configuration.menu_application}
@@ -231,7 +240,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Place:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Place:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-home"></span>
                                         <br>
                                         {_admin.configuration.menu_place}
@@ -239,7 +249,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Mailing:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Mailing:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-envelope-o"></span>
                                         <br>
                                         {_admin.configuration.menu_mailing}
@@ -247,7 +258,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:SkautIs:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:SkautIs:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-refresh"></span>
                                         <br>
                                         {_admin.configuration.menu_skautis}
@@ -255,7 +267,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:Web:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:Web:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-file-text-o"></span>
                                         <br>
                                         {_admin.configuration.menu_web}
@@ -263,7 +276,8 @@
                                 </div>
 
                                 <div class="col-sm-2 col-xs-2">
-                                    <a href="{plink Configuration:System:default}" class="btn btn-default btn-sm btn-block">
+                                    <a href="{plink Configuration:System:default}"
+                                       class="btn btn-default btn-sm btn-block">
                                         <span class="fa fa-2x fa-cog"></span>
                                         <br>
                                         {_admin.configuration.menu_system}
diff --git a/app/AdminModule/presenters/templates/Users/detail.latte b/app/AdminModule/presenters/templates/Users/detail.latte
index 7e11943a3..ed8eda920 100644
--- a/app/AdminModule/presenters/templates/Users/detail.latte
+++ b/app/AdminModule/presenters/templates/Users/detail.latte
@@ -80,7 +80,9 @@
                     {if $detailUser->isExternal()}
                         <tr>
                             <td></td>
-                            <td><a n:href="editPersonalDetails!" class="btn btn-default ajax">{_admin.common.edit}</a></td>
+                            <td>
+                                <a n:href="editPersonalDetails!" class="btn btn-default ajax">{_admin.common.edit}</a>
+                            </td>
                         </tr>
                     {/if}
                 </table>
diff --git a/app/AdminModule/presenters/templates/includes/main_menu.latte b/app/AdminModule/presenters/templates/includes/main_menu.latte
index 6227dac16..56f056a51 100644
--- a/app/AdminModule/presenters/templates/includes/main_menu.latte
+++ b/app/AdminModule/presenters/templates/includes/main_menu.latte
@@ -82,7 +82,8 @@
                                     </a>
                                 </li>
                                 <li>
-                                    <a class="dropdown-item" href="{plink :Web:Profile:default}#collapsePersonalDetails">
+                                    <a class="dropdown-item"
+                                       href="{plink :Web:Profile:default}#collapsePersonalDetails">
                                         <span class="fa fa-fw fa-user"></span>
                                         {_admin.common.profile}
                                     </a>
diff --git a/app/ApiModule/presenters/SchedulePresenter.php b/app/ApiModule/presenters/SchedulePresenter.php
index 67ee41a12..f85d36519 100644
--- a/app/ApiModule/presenters/SchedulePresenter.php
+++ b/app/ApiModule/presenters/SchedulePresenter.php
@@ -112,6 +112,8 @@ public function actionGetCalendarConfig()
     /**
      * Uloží nebo vytvoří program.
      * @param $data
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function actionSaveProgram($data)
     {
@@ -127,6 +129,8 @@ public function actionSaveProgram($data)
     /**
      * Smaže program.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function actionRemoveProgram($id)
     {
@@ -140,6 +144,8 @@ public function actionRemoveProgram($id)
     /**
      * Přihlásí program uživateli.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function actionAttendProgram($id)
     {
@@ -153,6 +159,8 @@ public function actionAttendProgram($id)
     /**
      * Odhlásí program uživateli.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function actionUnattendProgram($id)
     {
diff --git a/app/ApiModule/services/ScheduleService.php b/app/ApiModule/services/ScheduleService.php
index d2b33ebaa..37125a1eb 100644
--- a/app/ApiModule/services/ScheduleService.php
+++ b/app/ApiModule/services/ScheduleService.php
@@ -10,7 +10,6 @@
 use App\ApiModule\DTO\Schedule\ResponseDTO;
 use App\Model\ACL\Permission;
 use App\Model\ACL\Resource;
-use App\Model\Enums\ApplicationState;
 use App\Model\Program\Block;
 use App\Model\Program\BlockRepository;
 use App\Model\Program\Program;
@@ -107,6 +106,7 @@ public function getProgramsAdmin()
     /**
      * Vrací podrobnosti o programech, ke kterým má uživatel přístup, pro použití v kalendáři pro výběr programů.
      * @return ProgramDetailDTO[]
+     * @throws \App\Model\Settings\SettingsException
      */
     public function getProgramsWeb()
     {
@@ -162,6 +162,7 @@ public function getRooms()
     /**
      * Vrací nastavení pro FullCalendar.
      * @return CalendarConfigDTO
+     * @throws \App\Model\Settings\SettingsException
      */
     public function getCalendarConfig()
     {
@@ -184,6 +185,7 @@ public function getCalendarConfig()
      * Uloží nebo vytvoří program.
      * @param ProgramSaveDTO $programSaveDTO
      * @return ResponseDTO
+     * @throws \App\Model\Settings\SettingsException
      */
     public function saveProgram(ProgramSaveDTO $programSaveDTO)
     {
@@ -237,6 +239,7 @@ public function saveProgram(ProgramSaveDTO $programSaveDTO)
      * Smaže program.
      * @param $programId
      * @return ResponseDTO
+     * @throws \App\Model\Settings\SettingsException
      */
     public function removeProgram($programId)
     {
@@ -269,6 +272,7 @@ public function removeProgram($programId)
      * Přihlásí program uživateli.
      * @param $programId
      * @return ResponseDTO
+     * @throws \App\Model\Settings\SettingsException
      */
     public function attendProgram($programId)
     {
@@ -318,6 +322,7 @@ public function attendProgram($programId)
      * Odhlásí program uživateli.
      * @param $programId
      * @return ResponseDTO
+     * @throws \App\Model\Settings\SettingsException
      */
     public function unattendProgram($programId)
     {
diff --git a/app/InstallModule/presenters/InstallPresenter.php b/app/InstallModule/presenters/InstallPresenter.php
index 50fcd96f6..41dd89375 100644
--- a/app/InstallModule/presenters/InstallPresenter.php
+++ b/app/InstallModule/presenters/InstallPresenter.php
@@ -51,6 +51,7 @@ class InstallPresenter extends InstallBasePresenter
 
     /**
      * Zobrazení první stránky průvodce.
+     * @throws \Nette\Application\AbortException
      */
     public function renderDefault()
     {
@@ -71,6 +72,7 @@ public function renderDefault()
 
     /**
      * Vytvoření schéma databáze a počátečních dat.
+     * @throws \Exception
      */
     public function handleImportSchema()
     {
@@ -91,6 +93,8 @@ public function handleImportSchema()
 
     /**
      * Zobrazení stránky pro vytvoření administrátora.
+     * @throws SettingsException
+     * @throws \Nette\Application\AbortException
      */
     public function renderAdmin()
     {
@@ -126,6 +130,7 @@ public function renderAdmin()
 
     /**
      * Otestování připojení ke skautIS, přesměrování na přihlašovací stránku.
+     * @throws \Nette\Application\AbortException
      */
     public function handleCreateAdmin()
     {
@@ -138,6 +143,7 @@ public function handleCreateAdmin()
 
     /**
      * Zobrazení stránky po úspěšné instalaci.
+     * @throws \Nette\Application\AbortException
      */
     public function renderFinish()
     {
@@ -153,6 +159,7 @@ public function renderFinish()
 
     /**
      * Zobrazení stránky pokud byla instalace dokončena dříve.
+     * @throws \Nette\Application\AbortException
      */
     public function renderInstalled()
     {
diff --git a/app/WebModule/components/ApplicationContentControl.php b/app/WebModule/components/ApplicationContentControl.php
index 68949e2ba..817ede16e 100644
--- a/app/WebModule/components/ApplicationContentControl.php
+++ b/app/WebModule/components/ApplicationContentControl.php
@@ -66,6 +66,8 @@ public function __construct(ApplicationForm $applicationFormFactory, Authenticat
 
     /**
      * @param $content
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function render($content)
     {
@@ -96,6 +98,8 @@ public function render($content)
 
     /**
      * @return \Nette\Application\UI\Form
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     protected function createComponentApplicationForm()
     {
diff --git a/app/WebModule/components/ApplicationsGridControl.php b/app/WebModule/components/ApplicationsGridControl.php
index 7a15cfdb0..2681cd92f 100644
--- a/app/WebModule/components/ApplicationsGridControl.php
+++ b/app/WebModule/components/ApplicationsGridControl.php
@@ -21,6 +21,8 @@
 use App\Services\Authenticator;
 use App\Services\MailService;
 use App\Services\PdfExportService;
+use App\Services\ProgramService;
+use App\Services\UserService;
 use Doctrine\Common\Collections\ArrayCollection;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
@@ -71,6 +73,12 @@ class ApplicationsGridControl extends Control
     /** @var PdfExportService */
     private $pdfExportService;
 
+    /** @var ProgramService */
+    private $programService;
+
+    /** @var UserService */
+    private $userService;
+
 
     /**
      * ApplicationsGridControl constructor.
@@ -85,13 +93,16 @@ class ApplicationsGridControl extends Control
      * @param SettingsRepository $settingsRepository
      * @param Authenticator $authenticator
      * @param PdfExportService $pdfExportService
+     * @param ProgramService $programService
+     * @param UserService $userService
      */
     public function __construct(Translator $translator, ApplicationRepository $applicationRepository,
                                 UserRepository $userRepository, RoleRepository $roleRepository,
                                 SubeventRepository $subeventRepository, ApplicationService $applicationService,
                                 ProgramRepository $programRepository, MailService $mailService,
                                 SettingsRepository $settingsRepository, Authenticator $authenticator,
-                                PdfExportService $pdfExportService)
+                                PdfExportService $pdfExportService, ProgramService $programService,
+                                UserService $userService)
     {
         parent::__construct();
 
@@ -106,6 +117,8 @@ public function __construct(Translator $translator, ApplicationRepository $appli
         $this->settingsRepository = $settingsRepository;
         $this->authenticator = $authenticator;
         $this->pdfExportService = $pdfExportService;
+        $this->programService = $programService;
+        $this->userService = $userService;
     }
 
     /**
@@ -119,6 +132,9 @@ public function render()
     /**
      * Vytvoří komponentu.
      * @param $name
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Ublaboo\DataGrid\Exception\DataGridException
      */
     public function createComponentApplicationsGrid($name)
     {
@@ -170,7 +186,7 @@ public function createComponentApplicationsGrid($name)
 
         if ($this->applicationService->isAllowedAddSubevents($this->user)) {
             $grid->addInlineAdd()->onControlAdd[] = function ($container) {
-                $subeventsSelect = $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredExplicitOptionsWithCapacity($this->user))
+                $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredExplicitOptionsWithCapacity($this->user))
                     ->setAttribute('class', 'datagrid-multiselect')
                     ->addRule(Form::FILLED, 'web.profile.applications_subevents_empty');
             };
@@ -180,7 +196,7 @@ public function createComponentApplicationsGrid($name)
 
         if ($this->applicationService->isAllowedEditFirstApplication($this->user)) {
             $grid->addInlineEdit()->onControlAdd[] = function ($container) {
-                $rolesSelect = $container->addMultiSelect('roles', '', $this->roleRepository->getRegisterableNowOrUsersOptionsWithCapacity($this->user))
+                $container->addMultiSelect('roles', '', $this->roleRepository->getRegisterableNowOrUsersOptionsWithCapacity($this->user))
                     ->setAttribute('class', 'datagrid-multiselect')
                     ->addRule(Form::FILLED, 'web.profile.applications_roles_empty');
 
@@ -190,7 +206,7 @@ public function createComponentApplicationsGrid($name)
                     else
                         $options = $this->subeventRepository->getExplicitOptionsWithCapacity();
 
-                    $subeventsSelect = $container->addMultiSelect('subevents', '', $options)
+                    $container->addMultiSelect('subevents', '', $options)
                         ->setAttribute('class', 'datagrid-multiselect');
                 }
             };
@@ -235,6 +251,9 @@ public function createComponentApplicationsGrid($name)
     /**
      * Zpracuje přidání podakcí.
      * @param $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function add($values)
     {
@@ -291,7 +310,7 @@ public function add($values)
         }
 
         //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($selectedSubevents) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedSubevents) {
             $application = new Application();
             $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
             $application->setUser($this->user);
@@ -309,11 +328,10 @@ public function add($values)
             $this->user->addApplication($application);
             $this->userRepository->save($this->user);
 
-            $this->programRepository->updateUserPrograms($this->user);
-            $this->userRepository->save($this->user);
+            $this->programService->updateUserPrograms($this->user);
 
             //zaslani potvrzovaciho e-mailu
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$this->user]), '', Template::SUBEVENT_ADDED, [
+            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENT_ADDED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                 TemplateVariable::USERS_SUBEVENTS => $this->user->getSubeventsText()
             ]);
@@ -327,6 +345,9 @@ public function add($values)
      * Zpracuje úpravu přihlášky.
      * @param $id
      * @param $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function edit($id, $values)
     {
@@ -431,24 +452,8 @@ public function edit($id, $values)
             }
         }
 
-        //pokud si uživatel přidá roli, která vyžaduje schválení, stane se neschválený
-        $approved = TRUE;
-        if ($approved) {
-            foreach ($selectedRoles as $role) {
-                if (!$role->isApprovedAfterRegistration() && !$this->user->getRoles()->contains($role)) {
-                    $approved = FALSE;
-                    break;
-                }
-            }
-        }
-
         //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($id, $selectedRoles, $selectedSubevents, $approved, $values) {
-            $this->user->setRoles($selectedRoles);
-            $this->user->setApproved($approved);
-            $this->userRepository->save($this->user);
-
-            $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($id, $selectedRoles, $selectedSubevents, $values) {
             $application = $this->applicationRepository->findById($id);
 
             if ($this->subeventRepository->explicitSubeventsExists() && !empty($values['subevents']))
@@ -456,29 +461,18 @@ public function edit($id, $values)
             else
                 $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
 
-            $application->setFee($fee);
-            $application->setState($fee == 0 || $application->getPaymentDate()
-                ? ApplicationState::PAID
-                : ApplicationState::WAITING_FOR_PAYMENT);
-            $this->applicationRepository->save($application);
+            $this->userService->changeRoles($this->user, $selectedRoles);
 
-            $this->programRepository->updateUserPrograms($this->user);
-            $this->userRepository->save($this->user);
+            $this->programService->updateUserPrograms($this->user);
 
             //zaslani potvrzovaciho e-mailu
-            $rolesNames = [];
-            foreach ($this->user->getRoles() as $role) {
-                $rolesNames[] = $role->getName();
-            }
-
             $subeventsNames = [];
             foreach ($this->user->getSubevents() as $subevent) {
                 $subeventsNames[] = $subevent->getName();
             }
 
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$this->user]), '', Template::REGISTRATION_CHANGED, [
+            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENTS_CHANGED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                TemplateVariable::USERS_ROLES => implode(', ', $rolesNames),
                 TemplateVariable::USERS_SUBEVENTS => implode(', ', $subeventsNames)
             ]);
 
@@ -504,13 +498,17 @@ public function handleGeneratePaymentProofBank($id)
     /**
      * Odhlásí uživatele ze semináře.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function handleCancelRegistration($id)
     {
         $application = $this->applicationRepository->findById($id);
 
         if ($this->applicationService->isAllowedCancelApplication($application)) {
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$application->getUser()]), '', Template::REGISTRATION_CANCELED, [
+            $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::REGISTRATION_CANCELED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
             ]);
 
@@ -519,8 +517,7 @@ public function handleCancelRegistration($id)
             $this->userRepository->remove($application->getUser());
 
             $p->redirect(':Auth:logout');
-        }
-        else {
+        } else {
             $this->redirect('this');
         }
     }
@@ -528,6 +525,9 @@ public function handleCancelRegistration($id)
     /**
      * Zruší přihlášku.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function handleCancelApplication($id)
     {
@@ -540,8 +540,7 @@ public function handleCancelApplication($id)
                 $application->setState(ApplicationState::CANCELED);
                 $this->applicationRepository->save($application);
 
-                $this->programRepository->updateUserPrograms($user);
-                $this->userRepository->save($user);
+                $this->programService->updateUserPrograms($user);
             });
 
             $this->getPresenter()->flashMessage('web.profile.applications_application_canceled', 'success');
@@ -561,11 +560,12 @@ private function validateSubeventsEmpty($selectedSubevents)
             return FALSE;
         return TRUE;
     }
-
+    
     /**
      * Ověří kapacitu rolí.
      * @param $selectedRoles
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function validateRolesCapacities($selectedRoles)
     {
@@ -615,7 +615,7 @@ public function validateRolesRequired($selectedRoles, Role $testRole)
 
         return TRUE;
     }
-
+    
     /**
      * Ověří registrovatelnost rolí.
      * @param $selectedRoles
@@ -634,6 +634,7 @@ public function validateRolesRegisterable($selectedRoles)
      * Ověří kapacitu podakcí.
      * @param $selectedSubevents
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function validateSubeventsCapacities($selectedSubevents)
     {
diff --git a/app/WebModule/components/PlaceContentControl.php b/app/WebModule/components/PlaceContentControl.php
index 9c1a9cb64..5cd14a68c 100644
--- a/app/WebModule/components/PlaceContentControl.php
+++ b/app/WebModule/components/PlaceContentControl.php
@@ -37,6 +37,7 @@ public function __construct(SettingsRepository $settingsRepository, PlacePointRe
 
     /**
      * @param $content
+     * @throws \App\Model\Settings\SettingsException
      */
     public function render($content)
     {
diff --git a/app/WebModule/components/ProgramsContentControl.php b/app/WebModule/components/ProgramsContentControl.php
index 414da2751..fc5c8053f 100644
--- a/app/WebModule/components/ProgramsContentControl.php
+++ b/app/WebModule/components/ProgramsContentControl.php
@@ -55,6 +55,7 @@ public function __construct(UserRepository $userRepository, RoleRepository $role
 
     /**
      * @param $content
+     * @throws \App\Model\Settings\SettingsException
      */
     public function render($content)
     {
diff --git a/app/WebModule/components/templates/application_content.latte b/app/WebModule/components/templates/application_content.latte
index e3ef9acf0..acd13cd58 100644
--- a/app/WebModule/components/templates/application_content.latte
+++ b/app/WebModule/components/templates/application_content.latte
@@ -26,8 +26,8 @@
 
                 {if $explicitSubeventsExists}
                     <script>
-                        $(function(){
-                            $("select[name='roles[]']").on("change", function() {
+                        $(function () {
+                            $("select[name='roles[]']").on("change", function () {
                                 changeSubeventsRequired();
                             });
                             changeSubeventsRequired();
diff --git a/app/WebModule/components/templates/lectors_content.latte b/app/WebModule/components/templates/lectors_content.latte
index 081413e35..5e56b9558 100644
--- a/app/WebModule/components/templates/lectors_content.latte
+++ b/app/WebModule/components/templates/lectors_content.latte
@@ -24,7 +24,7 @@
 
                                     {if $lector->getAbout()}
                                         <tr>
-                                            <th >{_web.lectors_content.about_me}</th>
+                                            <th>{_web.lectors_content.about_me}</th>
                                             <td>{$lector->getAbout()}</td>
                                         </tr>
                                     {/if}
diff --git a/app/WebModule/forms/AdditionalInformationForm.php b/app/WebModule/forms/AdditionalInformationForm.php
index daf8161e0..6f8431581 100644
--- a/app/WebModule/forms/AdditionalInformationForm.php
+++ b/app/WebModule/forms/AdditionalInformationForm.php
@@ -2,7 +2,6 @@
 
 namespace App\WebModule\Forms;
 
-use App\Model\Enums\ApplicationState;
 use App\Model\Settings\CustomInput\CustomInput;
 use App\Model\Settings\CustomInput\CustomInputRepository;
 use App\Model\User\CustomInputValue\CustomCheckboxValue;
@@ -69,6 +68,7 @@ public function __construct(BaseForm $baseFormFactory, UserRepository $userRepos
      * Vytvoří formulář.
      * @param $id
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
      */
     public function create($id)
     {
@@ -130,10 +130,11 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Throwable
      */
     public function processForm(Form $form, \stdClass $values)
     {
-        $this->userRepository->getEntityManager()->transactional(function($em) use($values) {
+        $this->userRepository->getEntityManager()->transactional(function ($em) use ($values) {
             if ($this->applicationService->isAllowedEditCustomInputs()) {
                 foreach ($this->customInputRepository->findAllOrderedByPosition() as $customInput) {
                     $customInputValue = $this->user->getCustomInputValue($customInput);
diff --git a/app/WebModule/forms/ApplicationForm.php b/app/WebModule/forms/ApplicationForm.php
index 7859b13c3..08c20d127 100644
--- a/app/WebModule/forms/ApplicationForm.php
+++ b/app/WebModule/forms/ApplicationForm.php
@@ -24,6 +24,7 @@
 use App\Model\User\UserRepository;
 use App\Services\ApplicationService;
 use App\Services\MailService;
+use App\Services\ProgramService;
 use App\Services\SkautIsService;
 use Doctrine\Common\Collections\ArrayCollection;
 use Nette;
@@ -90,6 +91,9 @@ class ApplicationForm extends Nette\Object
     /** @var ApplicationService */
     private $applicationService;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * ApplicationForm constructor.
@@ -105,6 +109,7 @@ class ApplicationForm extends Nette\Object
      * @param SubeventRepository $subeventRepository
      * @param ApplicationRepository $applicationRepository
      * @param ApplicationService $applicationService
+     * @param ProgramService $programService
      */
     public function __construct(BaseForm $baseFormFactory, UserRepository $userRepository,
                                 RoleRepository $roleRepository, CustomInputRepository $customInputRepository,
@@ -112,7 +117,7 @@ public function __construct(BaseForm $baseFormFactory, UserRepository $userRepos
                                 ProgramRepository $programRepository, SkautIsService $skautIsService,
                                 SettingsRepository $settingsRepository, MailService $mailService,
                                 SubeventRepository $subeventRepository, ApplicationRepository $applicationRepository,
-                                ApplicationService $applicationService)
+                                ApplicationService $applicationService, ProgramService $programService)
     {
         $this->baseFormFactory = $baseFormFactory;
         $this->userRepository = $userRepository;
@@ -126,12 +131,15 @@ public function __construct(BaseForm $baseFormFactory, UserRepository $userRepos
         $this->subeventRepository = $subeventRepository;
         $this->applicationRepository = $applicationRepository;
         $this->applicationService = $applicationService;
+        $this->programService = $programService;
     }
 
     /**
      * Vytvoří formulář.
      * @param $id
      * @return Form
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function create($id)
     {
@@ -214,10 +222,11 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Throwable
      */
     public function processForm(Form $form, \stdClass $values)
     {
-        $this->applicationRepository->getEntityManager()->transactional(function($em) use($values) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($values) {
             if (array_key_exists('sex', $values))
                 $this->user->setSex($values['sex']);
             if (array_key_exists('firstName', $values))
@@ -308,8 +317,7 @@ public function processForm(Form $form, \stdClass $values)
             $this->userRepository->save($this->user);
 
             //prihlaseni automaticke prihlasovanych programu
-            $this->programRepository->updateUserPrograms($this->user);
-            $this->userRepository->save($this->user);
+            $this->programService->updateUserPrograms($this->user);
 
             //aktualizace udaju ve skautis
             try {
@@ -336,7 +344,7 @@ public function processForm(Form $form, \stdClass $values)
             $editRegistrationTo = $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO);
 
             //odeslani potvrzovaciho mailu
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$this->user]), '', Template::REGISTRATION, [
+            $this->mailService->sendMailFromTemplate($this->user, '', Template::REGISTRATION, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                 TemplateVariable::EDIT_REGISTRATION_TO => $editRegistrationTo !== NULL ? $editRegistrationTo->format('j. n. Y') : '',
                 TemplateVariable::APPLICATION_MATURITY => $application->getMaturityDate() !== NULL ? $application->getMaturityDate()->format('j. n. Y') : '',
@@ -372,10 +380,11 @@ private function addCustomInputs(Form $form)
                 $custom->addRule(Form::FILLED, 'web.application_content.custom_input_empty');
         }
     }
-
+    
     /**
      * Přidá select pro výběr podakcí.
      * @param Form $form
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     private function addSubeventsSelect(Form $form)
     {
@@ -436,6 +445,7 @@ private function addSubeventsSelect(Form $form)
     /**
      * Přidá select pro výběr rolí.
      * @param Form $form
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     private function addRolesSelect(Form $form)
     {
@@ -514,12 +524,13 @@ private function addArrivalDeparture(Form $form)
         $form->addDateTimePicker('departure', 'web.application_content.departure')
             ->setOption('id', 'departureInput');
     }
-
+    
     /**
      * Ověří kapacity podakcí.
      * @param $field
      * @param $args
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function validateSubeventsCapacities($field, $args)
     {
@@ -537,6 +548,7 @@ public function validateSubeventsCapacities($field, $args)
      * @param $field
      * @param $args
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function validateRolesCapacities($field, $args)
     {
@@ -666,7 +678,7 @@ public function toggleSubeventsRequired($field, $args)
                 return TRUE;
         return FALSE;
     }
-
+    
     /**
      * Přepne zobrazení polí pro příjzed a odjezd.
      * @param IControl $control
diff --git a/app/WebModule/forms/FaqForm.php b/app/WebModule/forms/FaqForm.php
index 1f2adbe03..9335ad61b 100644
--- a/app/WebModule/forms/FaqForm.php
+++ b/app/WebModule/forms/FaqForm.php
@@ -72,6 +72,7 @@ public function create($id)
      * Zpracuje formulář.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function processForm(Form $form, \stdClass $values)
     {
diff --git a/app/WebModule/presenters/ProfilePresenter.php b/app/WebModule/presenters/ProfilePresenter.php
index 3a7336d15..b8486d92a 100644
--- a/app/WebModule/presenters/ProfilePresenter.php
+++ b/app/WebModule/presenters/ProfilePresenter.php
@@ -2,11 +2,7 @@
 
 namespace App\WebModule\Presenters;
 
-use App\Model\ACL\Role;
 use App\Model\Enums\PaymentType;
-use App\Model\Mailing\Template;
-use App\Model\Mailing\TemplateVariable;
-use App\Model\Settings\Settings;
 use App\Model\Structure\SubeventRepository;
 use App\Services\ApplicationService;
 use App\Services\Authenticator;
@@ -16,9 +12,6 @@
 use App\WebModule\Components\IApplicationsGridControlFactory;
 use App\WebModule\Forms\AdditionalInformationForm;
 use App\WebModule\Forms\PersonalDetailsForm;
-use App\WebModule\Forms\RolesForm;
-use App\WebModule\Forms\SubeventsForm;
-use Doctrine\Common\Collections\ArrayCollection;
 use Nette\Application\UI\Form;
 
 
@@ -85,6 +78,9 @@ class ProfilePresenter extends WebBasePresenter
     public $applicationService;
 
 
+    /**
+     * @throws \Nette\Application\AbortException
+     */
     public function startup()
     {
         parent::startup();
@@ -103,6 +99,8 @@ public function renderDefault()
 
     /**
      * Vyexportuje rozvrh uživatele.
+     * @throws \Nette\Application\AbortException
+     * @throws \PHPExcel_Exception
      */
     public function actionExportSchedule()
     {
diff --git a/app/WebModule/presenters/WebBasePresenter.php b/app/WebModule/presenters/WebBasePresenter.php
index e543edeb8..728332bc8 100644
--- a/app/WebModule/presenters/WebBasePresenter.php
+++ b/app/WebModule/presenters/WebBasePresenter.php
@@ -102,7 +102,7 @@ protected function createComponentJs()
     {
         return $this->webLoader->createJavaScriptLoader('web');
     }
-
+    
     public function startup()
     {
         parent::startup();
diff --git a/app/config/config.neon b/app/config/config.neon
index 481efdca7..d3a9cbedc 100644
--- a/app/config/config.neon
+++ b/app/config/config.neon
@@ -119,7 +119,6 @@ services:
             doctrine.repositoryEntity: App\Model\Mailing\Template
     blockRepository:
         class: App\Model\Program\BlockRepository
-        inject: yes
         tags:
             doctrine.repositoryEntity: App\Model\Program\Block
     categoryRepository:
@@ -128,7 +127,6 @@ services:
             doctrine.repositoryEntity: App\Model\Program\Category
     programRepository:
         class: App\Model\Program\ProgramRepository
-        inject: yes
         tags:
             doctrine.repositoryEntity: App\Model\Program\Program
     roomRepository:
diff --git a/app/lang/admin.cs_CZ.neon b/app/lang/admin.cs_CZ.neon
index e65265ca3..7dcdfdc88 100644
--- a/app/lang/admin.cs_CZ.neon
+++ b/app/lang/admin.cs_CZ.neon
@@ -428,10 +428,17 @@ mailing:
 
     templates_heading: "Automatické e-maily"
     templates_type: "Šablona e-mailu"
-    templates_active: "aktivní"
+    templates_system: "Systémový"
+    templates_active: "Aktivní"
+    templates_active_form: "aktivní"
     templates_active_active: "Aktivní"
     templates_active_inactive: "Neaktivní"
+    templates_send_to_user: "Zaslat uživateli"
+    templates_send_to_user_form: "zaslat uživateli"
+    templates_send_to_organizer: "Zaslat pořadateli"
+    templates_send_to_organizer_form: "zaslat pořadateli"
     templates_changed_active: "E-mail byl úspěšně aktivován/deaktivován."
+    templates_change_active_denied: "Systémový e-mail nemůže být deaktivován."
     templates_subject: "Předmět"
     templates_text: "Text"
     templates_variables: "Dostupné proměnné"
diff --git a/app/lang/common.cs_CZ.neon b/app/lang/common.cs_CZ.neon
index 22e99de9a..326c5edee 100644
--- a/app/lang/common.cs_CZ.neon
+++ b/app/lang/common.cs_CZ.neon
@@ -191,6 +191,7 @@ mailing:
         program_registered: "Přihlášení na program"
         program_unregistered: "Odhlášení z programu"
         email_verification: "Ověření změny e-mailu semináře"
+        custom_input_value_changed: "Potvrzení změny vlastních polí"
 
     variable_name:
         seminar_name: "nazev-seminare"
@@ -204,6 +205,7 @@ mailing:
         edit_registration_to: "zmena-registrace-do"
         bank_account: "cislo-uctu"
         email_verification_link: "overovaci-odkaz"
+        user: "uzivatel"
 
     variable_description:
         seminar_name: "název semináře"
@@ -217,3 +219,4 @@ mailing:
         edit_registration_to: "odhlášení, změna rolí a změna podakcí povolena do"
         bank_account: "číslo účtu"
         email_verification_link: "ověřovací odkaz"
+        user: "jméno uživatele"
diff --git a/app/model/ACL/PermissionRepository.php b/app/model/ACL/PermissionRepository.php
index 421c3a736..2a1387264 100644
--- a/app/model/ACL/PermissionRepository.php
+++ b/app/model/ACL/PermissionRepository.php
@@ -57,6 +57,8 @@ public function findPermissionsIds($permissions)
      * @param $permissionName
      * @param $resourceName
      * @return Permission
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findByPermissionAndResourceName($permissionName, $resourceName)
     {
diff --git a/app/model/ACL/RoleRepository.php b/app/model/ACL/RoleRepository.php
index ba8030f16..797039c0d 100644
--- a/app/model/ACL/RoleRepository.php
+++ b/app/model/ACL/RoleRepository.php
@@ -3,6 +3,7 @@
 namespace App\Model\ACL;
 
 use App\Model\User\User;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Kdyby\Doctrine\EntityRepository;
 use Kdyby\Translation\Translator;
@@ -60,6 +61,7 @@ public function findBySystemName($name)
     /**
      * Vrací id naposledy přidané role.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastId()
     {
@@ -109,7 +111,7 @@ public function findAllRegisterable()
 
     /**
      * Vrací role s omezenou kapacitou.
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function findAllWithLimitedCapacity()
     {
@@ -120,7 +122,7 @@ public function findAllWithLimitedCapacity()
 
     /**
      * Vrací role, u kterých se eviduje příjezd a odjezd.
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function findAllWithArrivalDeparture()
     {
@@ -131,7 +133,7 @@ public function findAllWithArrivalDeparture()
 
     /**
      * Vrací role, u kterých je cena počítána podle podakcí.
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function findAllWithSubevents()
     {
@@ -143,7 +145,7 @@ public function findAllWithSubevents()
     /**
      * Vrací role podle id.
      * @param $ids
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection
      */
     public function findRolesByIds($ids)
     {
@@ -153,22 +155,11 @@ public function findRolesByIds($ids)
         return $this->matching($criteria);
     }
 
-    /**
-     * Vrací počet volných míst v roli nebo null u rolí s neomezenou kapacitou.
-     * @param Role $role
-     * @return int|null
-     */
-    public function countUnoccupiedInRole(Role $role)
-    {
-        if ($role->getCapacity() === NULL)
-            return NULL;
-        return $role->getCapacity() - $this->countApprovedUsersInRole($role);
-    }
-
     /**
      * Vrací počet volných míst v rolích nebo null u rolí s neomezenou kapacitou.
      * @param $roles
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countUnoccupiedInRoles($roles)
     {
@@ -179,10 +170,24 @@ public function countUnoccupiedInRoles($roles)
         return $counts;
     }
 
+    /**
+     * Vrací počet volných míst v roli nebo null u rolí s neomezenou kapacitou.
+     * @param Role $role
+     * @return int|null
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function countUnoccupiedInRole(Role $role)
+    {
+        if ($role->getCapacity() === NULL)
+            return NULL;
+        return $role->getCapacity() - $this->countApprovedUsersInRole($role);
+    }
+
     /**
      * Vrací počet schválených uživatelů v roli.
      * @param Role $role
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countApprovedUsersInRole(Role $role)
     {
@@ -202,7 +207,7 @@ public function countApprovedUsersInRole(Role $role)
     public function countApprovedUsersInRoles($roles)
     {
         return $this->createQueryBuilder('r')
-            ->select('r.name, r.capacity', 'COUNT(u.id) AS usersCount')
+            ->select('r.name, r.capacity, COUNT(u.id) AS usersCount')
             ->leftJoin('r.users', 'u', 'WITH', 'u.approved = true')
             ->where('r.id IN (:ids)')->setParameter('ids', $this->findRolesIds($roles))
             ->groupBy('r.id')
@@ -247,6 +252,7 @@ public function getRolesWithoutRoleOptions($roleId)
     /**
      * Vrací seznam rolí s obsazenostmi jako možnosti pro select.
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getRegisterableNowOptionsWithCapacity()
     {
@@ -295,6 +301,7 @@ public function findAllRegisterableNowOrderedByName()
      * obsazenosti, jako možnosti pro select.
      * @param User $user
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getRegisterableNowOrUsersOptionsWithCapacity(User $user)
     {
@@ -376,6 +383,7 @@ public function getRolesWithoutRolesOptions(array $withoutRoles)
      * Vrací seznam rolí bez vybraných rolí, s informací o obsazenosti, jako možnosti pro select.
      * @param array $withoutRoles
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles)
     {
@@ -410,6 +418,7 @@ public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles)
      * Vrací seznam rolí bez vybraných rolí, s informací o počtu uživatelů, jako možnosti pro select.
      * @param array $withoutRoles
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getRolesWithoutRolesOptionsWithUsersCount(array $withoutRoles)
     {
diff --git a/app/model/CMS/Content/Content.php b/app/model/CMS/Content/Content.php
index c1c419d31..42f37b117 100644
--- a/app/model/CMS/Content/Content.php
+++ b/app/model/CMS/Content/Content.php
@@ -275,14 +275,6 @@ public function setPosition($position)
         $this->position = $position;
     }
 
-    /**
-     * @return string
-     */
-    public function getContentFormName()
-    {
-        return $this->type . "_" . $this->id;
-    }
-
     /**
      * Přidá do formuláře pro editaci stránky formulář pro úpravu obsahu.
      * @param Form $form
@@ -313,6 +305,14 @@ public function addContentForm(Form $form)
         return $form;
     }
 
+    /**
+     * @return string
+     */
+    public function getContentFormName()
+    {
+        return $this->type . "_" . $this->id;
+    }
+
     /**
      * Zpracuje při uložení stránky část formuláře týkající se obsahu.
      * @param Form $form
diff --git a/app/model/CMS/Content/ImageContent.php b/app/model/CMS/Content/ImageContent.php
index aebfdc941..8721ef0d0 100644
--- a/app/model/CMS/Content/ImageContent.php
+++ b/app/model/CMS/Content/ImageContent.php
@@ -21,22 +21,22 @@
 class ImageContent extends Content implements IContent
 {
     protected $type = Content::IMAGE;
-
+    
     /**
      * Zarovnání vlevo.
      */
     const LEFT = 'left';
-
+    
     /**
      * Zarovnání vpravo.
      */
     const RIGHT = 'right';
-
+    
     /**
      * Zarovnání na střed, bez obtékání.
      */
     const CENTER = 'center';
-
+    
     public static $aligns = [
         self::LEFT,
         self::RIGHT,
@@ -76,7 +76,6 @@ class ImageContent extends Content implements IContent
      */
     private $filesService;
 
-
     /**
      * @param FilesService $filesService
      */
@@ -84,7 +83,7 @@ public function injectFilesService(FilesService $filesService)
     {
         $this->filesService = $filesService;
     }
-
+    
     /**
      * @return array
      */
@@ -211,6 +210,7 @@ public function addContentForm(Form $form)
      * Zpracuje při uložení stránky část formuláře týkající se obsahu.
      * @param Form $form
      * @param \stdClass $values
+     * @throws \Nette\Utils\UnknownImageFileException
      */
     public function contentFormSucceeded(Form $form, \stdClass $values)
     {
@@ -269,7 +269,7 @@ private function prepareAlignOptions()
             $options[$align] = 'common.align.' . $align;
         return $options;
     }
-
+    
     /**
      * Vygeneruje cestu pro uložení obrázku.
      * @param $file
diff --git a/app/model/CMS/FaqRepository.php b/app/model/CMS/FaqRepository.php
index 8d79e72be..168b1973b 100644
--- a/app/model/CMS/FaqRepository.php
+++ b/app/model/CMS/FaqRepository.php
@@ -26,6 +26,7 @@ public function findById($id)
     /**
      * Vrací id poslední otázky.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastId()
     {
@@ -38,6 +39,7 @@ public function findLastId()
     /**
      * Vrací poslední pozici.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastPosition()
     {
@@ -59,6 +61,7 @@ public function findPublishedOrderedByPosition()
     /**
      * Uloží otázku.
      * @param Faq $faq
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function save(Faq $faq)
     {
diff --git a/app/model/CMS/NewsRepository.php b/app/model/CMS/NewsRepository.php
index a3b06f8de..52224a2da 100644
--- a/app/model/CMS/NewsRepository.php
+++ b/app/model/CMS/NewsRepository.php
@@ -26,6 +26,7 @@ public function findById($id)
     /**
      * Vrací id poslední aktuality.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastId()
     {
diff --git a/app/model/CMS/PageRepository.php b/app/model/CMS/PageRepository.php
index 515bfa9b6..7a89896df 100644
--- a/app/model/CMS/PageRepository.php
+++ b/app/model/CMS/PageRepository.php
@@ -56,6 +56,7 @@ public function findPublishedOrderedByPosition()
     /**
      * Vrací poslední pozici stránky.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastPosition()
     {
@@ -153,6 +154,7 @@ public function getPagesOptions()
     /**
      * Uloží stránku.
      * @param Page $page
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function save(Page $page)
     {
@@ -166,6 +168,7 @@ public function save(Page $page)
     /**
      * Odstraní stránku.
      * @param Page $page
+     * @throws \App\Model\Page\PageException
      */
     public function remove(Page $page)
     {
diff --git a/app/model/Mailing/Template.php b/app/model/Mailing/Template.php
index 05ea63ca3..743d1d5fa 100644
--- a/app/model/Mailing/Template.php
+++ b/app/model/Mailing/Template.php
@@ -31,11 +31,6 @@ class Template
      */
     const REGISTRATION_CANCELED = 'registration_canceled';
 
-    /**
-     * Potvrzení změny registrace.
-     */
-    const REGISTRATION_CHANGED = 'registration_changed';
-
     /**
      * Potvrzení přidání podakcí.
      */
@@ -62,10 +57,25 @@ class Template
     const PROGRAM_UNREGISTERED = 'program_unregistered';
 
     /**
-     * Ověření e-mailu.
+     * Ověření e-mailu pro mailing.
      */
     const EMAIL_VERIFICATION = 'email_verification';
 
+    /**
+     * Potvrzení změny vlastního pole.
+     */
+    const CUSTOM_INPUT_VALUE_CHANGED = 'custom_input_value_changed';
+
+    /**
+     * Potvrzení změny rolí.
+     */
+    const ROLES_CHANGED = 'roles_changed';
+
+    /**
+     * Potvrzení změny podakcí.
+     */
+    const SUBEVENTS_CHANGED = 'subevents_changed';
+
 
     use Identifier;
 
@@ -104,6 +114,27 @@ class Template
      */
     protected $variables;
 
+    /**
+     * Zaslat uživateli.
+     * @ORM\Column(type="boolean")
+     * @var bool
+     */
+    protected $sendToUser;
+
+    /**
+     * Zaslat pořadateli.
+     * @ORM\Column(type="boolean")
+     * @var bool
+     */
+    protected $sendToOrganizer;
+
+    /**
+     * Systémový e-mail. Nelze u něj měnit příjemce.
+     * @ORM\Column(type="boolean")
+     * @var bool
+     */
+    protected $system;
+
 
     /**
      * Template constructor.
@@ -200,4 +231,52 @@ public function setVariables($variables)
     {
         $this->variables = $variables;
     }
+
+    /**
+     * @return bool
+     */
+    public function isSendToUser()
+    {
+        return $this->sendToUser;
+    }
+
+    /**
+     * @param bool $sendToUser
+     */
+    public function setSendToUser($sendToUser)
+    {
+        $this->sendToUser = $sendToUser;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSendToOrganizer()
+    {
+        return $this->sendToOrganizer;
+    }
+
+    /**
+     * @param bool $sendToOrganizer
+     */
+    public function setSendToOrganizer($sendToOrganizer)
+    {
+        $this->sendToOrganizer = $sendToOrganizer;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSystem()
+    {
+        return $this->system;
+    }
+
+    /**
+     * @param bool $system
+     */
+    public function setSystem($system)
+    {
+        $this->system = $system;
+    }
 }
diff --git a/app/model/Mailing/TemplateVariable.php b/app/model/Mailing/TemplateVariable.php
index d714b5cc7..c34b09bb5 100644
--- a/app/model/Mailing/TemplateVariable.php
+++ b/app/model/Mailing/TemplateVariable.php
@@ -71,7 +71,6 @@ class TemplateVariable
     const EMAIL_VERIFICATION_LINK = 'email_verification_link';
 
 
-
     use Identifier;
 
     /**
diff --git a/app/model/Program/BlockRepository.php b/app/model/Program/BlockRepository.php
index 5f0e14c86..d45d4e1ce 100644
--- a/app/model/Program/BlockRepository.php
+++ b/app/model/Program/BlockRepository.php
@@ -2,8 +2,7 @@
 
 namespace App\Model\Program;
 
-use App\Model\User\User;
-use App\Model\User\UserRepository;
+
 use Doctrine\Common\Collections\Criteria;
 use Kdyby\Doctrine\EntityRepository;
 
@@ -16,18 +15,6 @@
  */
 class BlockRepository extends EntityRepository
 {
-    /** @var UserRepository */
-    private $userRepository;
-
-
-    /**
-     * @param UserRepository $userRepository
-     */
-    public function injectUserRepository(UserRepository $userRepository)
-    {
-        $this->userRepository = $userRepository;
-    }
-
     /**
      * Vrací blok podle id.
      * @param $id
@@ -41,6 +28,7 @@ public function findById($id)
     /**
      * Vrací poslední id.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastId()
     {
@@ -127,14 +115,14 @@ public function findByLikeNameOrderedByName($text, $unassignedOnly = FALSE)
     }
 
     /**
-     * Vrací názvy bloků, které jsou pro uživatele povinné, ale není na ně přihlášený.
+     * Vrací bloky, které jsou pro uživatele povinné a není na ně přihlášený.
      * @param User $user
+     * @param $categoriesIds
+     * @param $subevents
      * @return array
      */
-    public function findUserMandatoryNotRegisteredNames($user)
+    public function findMandatoryForCategoriesAndSubevents($user, $categoriesIds, $subevents)
     {
-        $registerableCategoriesIds = $this->userRepository->findRegisterableCategoriesIdsByUser($user);
-
         $usersBlocks = $this->createQueryBuilder('b')
             ->select('b')
             ->leftJoin('b.programs', 'p')
@@ -144,10 +132,8 @@ public function findUserMandatoryNotRegisteredNames($user)
             ->getQuery()
             ->getResult();
 
-        $usersSubevents = $user->getSubevents();
-
         $qb = $this->createQueryBuilder('b')
-            ->select('b.name')
+            ->select('b')
             ->leftJoin('b.category', 'c')
             ->where($this->createQueryBuilder()->expr()->orX(
                 'c.id IN (:ids)',
@@ -155,8 +141,8 @@ public function findUserMandatoryNotRegisteredNames($user)
             ))
             ->andWhere('b.subevent IN (:usersSubevents)')
             ->andWhere('b.mandatory > 0')
-            ->setParameter('ids', $registerableCategoriesIds)
-            ->setParameter('usersSubevents', $usersSubevents);
+            ->setParameter('ids', $categoriesIds)
+            ->setParameter('usersSubevents', $subevents);
 
         if (!empty($usersBlocks)) {
             $qb = $qb
@@ -164,11 +150,8 @@ public function findUserMandatoryNotRegisteredNames($user)
                 ->setParameter('usersBlocks', $usersBlocks);
         }
 
-        $names = $qb
-            ->getQuery()
-            ->getScalarResult();
-
-        return array_map('current', $names);
+        return $qb->getQuery()
+            ->getResult();
     }
 
     /**
diff --git a/app/model/Program/ProgramRepository.php b/app/model/Program/ProgramRepository.php
index f676a512c..0b36c7392 100644
--- a/app/model/Program/ProgramRepository.php
+++ b/app/model/Program/ProgramRepository.php
@@ -2,11 +2,7 @@
 
 namespace App\Model\Program;
 
-use App\Model\ACL\Permission;
-use App\Model\ACL\Resource;
 use App\Model\User\User;
-use App\Model\User\UserRepository;
-use Doctrine\Common\Collections\ArrayCollection;
 use Kdyby\Doctrine\EntityRepository;
 
 
@@ -18,18 +14,6 @@
  */
 class ProgramRepository extends EntityRepository
 {
-    /** @var UserRepository */
-    private $userRepository;
-
-
-    /**
-     * @param UserRepository $userRepository
-     */
-    public function injectUserRepository(UserRepository $userRepository)
-    {
-        $this->userRepository = $userRepository;
-    }
-
     /**
      * Vrací program podle id.
      * @param $id
@@ -72,36 +56,6 @@ public function findProgramsIds($programs)
         }, $programs->toArray());
     }
 
-    /**
-     * Vrací programy, na které se uživatel může přihlásit.
-     * @param User $user
-     * @return array
-     */
-    public function findUserAllowed($user)
-    {
-        if (!$user->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS))
-            return [];
-
-        $registerableCategoriesIds = $this->userRepository->findRegisterableCategoriesIdsByUser($user);
-
-        $registerableSubeventsIds = [];
-
-        foreach ($user->getNotCanceledApplications() as $application) {
-            foreach ($application->getSubevents() as $subevent)
-                $registerableSubeventsIds[] = $subevent->getId();
-        }
-
-        return $this->createQueryBuilder('p')
-            ->select('p')
-            ->join('p.block', 'b')
-            ->leftJoin('b.category', 'c')
-            ->leftJoin('b.subevent', 's')
-            ->where('(b.category IS NULL OR c.id IN (:cids))')->setParameter('cids', $registerableCategoriesIds)
-            ->andWhere('s.id IN (:sids)')->setParameter('sids', $registerableSubeventsIds)
-            ->getQuery()
-            ->getResult();
-    }
-
     /**
      * Vrací programy, na které je uživatel zapsaný a jsou v danné kategorii.
      * @param User $user
@@ -234,33 +188,21 @@ public function hasOverlappingAutoRegisterProgram(Program $program, \DateTime $s
     }
 
     /**
-     * Aktualizuje programy uživatele (odhlásí nepovolené a přihlásí automaticky přihlašované).
-     * @param User $user
-     */
-    public function updateUserPrograms(User $user)
-    {
-        $this->updateUsersPrograms([$user]);
-    }
-
-    /**
-     * Aktualizuje programy uživatelů (odhlásí nepovolené a přihlásí automaticky přihlašované).
-     * @param $users
+     * Vrací programy povolené pro kategorie a podakce.
+     * @param $categoriesIds
+     * @param $subeventsIds
+     * @return array
      */
-    public function updateUsersPrograms($users)
+    public function findAllowedForCategoriesAndSubevents($categoriesIds, $subeventsIds)
     {
-        foreach ($users as $user) {
-            $oldUsersPrograms = $user->getPrograms();
-            $userAllowedPrograms = $this->findUserAllowed($user);
-
-            $newUsersPrograms = new ArrayCollection();
-
-            foreach ($userAllowedPrograms as $userAllowedProgram) {
-                if ($userAllowedProgram->getBlock()->getMandatory() == 2 || $oldUsersPrograms->contains($userAllowedProgram))
-                    $newUsersPrograms->add($userAllowedProgram);
-            }
-
-            $oldUsersPrograms->clear();
-            $user->setPrograms($newUsersPrograms);
-        }
+        return $this->createQueryBuilder('p')
+            ->select('p')
+            ->join('p.block', 'b')
+            ->leftJoin('b.category', 'c')
+            ->leftJoin('b.subevent', 's')
+            ->where('(b.category IS NULL OR c.id IN (:cids))')->setParameter('cids', $categoriesIds)
+            ->andWhere('s.id IN (:sids)')->setParameter('sids', $subeventsIds)
+            ->getQuery()
+            ->getResult();
     }
 }
diff --git a/app/model/Settings/CustomInput/CustomInputRepository.php b/app/model/Settings/CustomInput/CustomInputRepository.php
index 876b4a00c..60e324d20 100644
--- a/app/model/Settings/CustomInput/CustomInputRepository.php
+++ b/app/model/Settings/CustomInput/CustomInputRepository.php
@@ -33,10 +33,11 @@ public function findAllOrderedByPosition()
             ->getQuery()
             ->getResult();
     }
-
+    
     /**
      * Vrátí pozici posledního pole.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function findLastPosition()
     {
@@ -45,10 +46,11 @@ public function findLastPosition()
             ->getQuery()
             ->getSingleScalarResult();
     }
-
+    
     /**
      * Uloží pole.
      * @param CustomInput $input
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function save(CustomInput $input)
     {
diff --git a/app/model/Settings/CustomInput/CustomSelect.php b/app/model/Settings/CustomInput/CustomSelect.php
index b5a45ec29..feb146e0b 100644
--- a/app/model/Settings/CustomInput/CustomSelect.php
+++ b/app/model/Settings/CustomInput/CustomSelect.php
@@ -52,7 +52,7 @@ public function prepareSelectOptions()
             $options[NULL] = '';
 
         $optionaArray = explode(', ', $this->options);
-        for($i = 0; $i < count($optionaArray); $i++)
+        for ($i = 0; $i < count($optionaArray); $i++)
             $options[$i] = $optionaArray[$i];
 
         return $options;
diff --git a/app/model/Settings/SettingsRepository.php b/app/model/Settings/SettingsRepository.php
index 9d888df16..5bfe24b51 100644
--- a/app/model/Settings/SettingsRepository.php
+++ b/app/model/Settings/SettingsRepository.php
@@ -56,11 +56,12 @@ public function getValue($item)
     }
 
     /**
-     * Vrátí hodnotu položky typu datum.
+     * Vrátí hodnotu položky typu datum a čas.
      * @param $item
      * @return \DateTime
+     * @throws SettingsException
      */
-    public function getDateValue($item)
+    public function getDateTimeValue($item)
     {
         $value = $this->getValue($item);
         if ($value === NULL)
@@ -69,16 +70,17 @@ public function getDateValue($item)
     }
 
     /**
-     * Vrátí hodnotu položky typu datum a čas.
+     * Nastavení hodnoty položky typu datum.
      * @param $item
-     * @return \DateTime
+     * @param \DateTime|null $value
+     * @throws SettingsException
      */
-    public function getDateTimeValue($item)
+    public function setDateValue($item, $value)
     {
-        $value = $this->getValue($item);
         if ($value === NULL)
-            return NULL;
-        return new \DateTime($value);
+            $this->setValue($item, NULL);
+        else
+            $this->setValue($item, $value->format('Y-m-d'));
     }
 
     /**
@@ -100,22 +102,24 @@ public function setValue($item, $value)
     }
 
     /**
-     * Nastavení hodnoty položky typu datum.
+     * Vrátí hodnotu položky typu datum.
      * @param $item
-     * @param \DateTime|null $value
+     * @return \DateTime
+     * @throws SettingsException
      */
-    public function setDateValue($item, $value)
+    public function getDateValue($item)
     {
+        $value = $this->getValue($item);
         if ($value === NULL)
-            $this->setValue($item, NULL);
-        else
-            $this->setValue($item, $value->format('Y-m-d'));
+            return NULL;
+        return new \DateTime($value);
     }
 
     /**
      * Nastavení hodnoty položky typu datum a čas.
      * @param $item
      * @param \DateTime|null $value
+     * @throws SettingsException
      */
     public function setDateTimeValue($item, $value)
     {
diff --git a/app/model/Structure/SubeventRepository.php b/app/model/Structure/SubeventRepository.php
index 9a542dd64..ae42e70c6 100644
--- a/app/model/Structure/SubeventRepository.php
+++ b/app/model/Structure/SubeventRepository.php
@@ -114,7 +114,7 @@ public function findSubeventsIds($subevents)
             return $o->getId();
         }, $subevents->toArray());
     }
-
+    
     /**
      * Vrací podakce s omezenou kapacitou.
      * @return Collection
@@ -130,6 +130,7 @@ public function findAllWithLimitedCapacity()
      * Vrací počet volných míst v podakci nebo null u podakce s neomezenou kapacitou.
      * @param Subevent $subevent
      * @return int|null
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countUnoccupiedInSubevent(Subevent $subevent)
     {
@@ -142,6 +143,7 @@ public function countUnoccupiedInSubevent(Subevent $subevent)
      * Vrací počet volných míst v podakcích nebo null u podakcí s neomezenou kapacitou.
      * @param $subevents
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countUnoccupiedInSubevents($subevents)
     {
@@ -156,6 +158,7 @@ public function countUnoccupiedInSubevents($subevents)
      * Vrací počet schválených uživatelů v podakci.
      * @param Subevent $subevent
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countApprovedUsersInSubevent(Subevent $subevent)
     {
@@ -172,6 +175,7 @@ public function countApprovedUsersInSubevent(Subevent $subevent)
     /**
      * Vrací počet vytvořených podakcí.
      * @return int
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function countExplicitSubevents()
     {
@@ -185,12 +189,13 @@ public function countExplicitSubevents()
     /**
      * Vrací, zda jsou vytvořeny podakce.
      * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function explicitSubeventsExists()
     {
         return $this->countExplicitSubevents() > 0;
     }
-
+    
     /**
      * Vrací seznam podakcí jako možnosti pro select.
      * @return array
@@ -235,7 +240,8 @@ public function getSubeventsWithoutSubeventOptions($subeventId)
      * Vrací seznam podakcí, jako možnosti pro select
      * @return array
      */
-    public function getExplicitOptions() {
+    public function getExplicitOptions()
+    {
         $subevents = $this->createQueryBuilder('s')
             ->where('s.implicit = FALSE')
             ->orderBy('s.name')
@@ -252,8 +258,10 @@ public function getExplicitOptions() {
     /**
      * Vrací seznam podakcí, s informací o obsazenosti, jako možnosti pro select
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getSubeventsOptionsWithCapacity() {
+    public function getSubeventsOptionsWithCapacity()
+    {
         $subevents = $this->createQueryBuilder('s')
             ->orderBy('s.name')
             ->getQuery()
@@ -276,8 +284,10 @@ public function getSubeventsOptionsWithCapacity() {
     /**
      * Vrací seznam podakcí, s informací o obsazenosti, jako možnosti pro select
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getExplicitOptionsWithCapacity() {
+    public function getExplicitOptionsWithCapacity()
+    {
         $subevents = $this->createQueryBuilder('s')
             ->where('s.implicit = FALSE')
             ->orderBy('s.name')
@@ -302,6 +312,7 @@ public function getExplicitOptionsWithCapacity() {
      * Vrací seznam podakcí, kromě podakcí uživatele, s informací o obsazenosti, jako možnosti pro select.
      * @param User $user
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getNonRegisteredSubeventsOptionsWithCapacity(User $user)
     {
@@ -338,6 +349,7 @@ public function getNonRegisteredSubeventsOptionsWithCapacity(User $user)
      * Vrací seznam podakcí, kromě podakcí uživatele, s informací o obsazenosti, jako možnosti pro select.
      * @param User $user
      * @return array
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getNonRegisteredExplicitOptionsWithCapacity(User $user)
     {
diff --git a/app/model/User/ApplicationRepository.php b/app/model/User/ApplicationRepository.php
index e29597495..c3c245b30 100644
--- a/app/model/User/ApplicationRepository.php
+++ b/app/model/User/ApplicationRepository.php
@@ -3,7 +3,6 @@
 namespace App\Model\User;
 
 use App\Model\Enums\ApplicationState;
-use App\Model\Settings\SettingsRepository;
 use Kdyby\Doctrine\EntityRepository;
 
 
diff --git a/app/model/User/User.php b/app/model/User/User.php
index 4b8a79b3d..4a6f9f446 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -6,7 +6,6 @@
 use App\Model\ACL\Resource;
 use App\Model\ACL\Role;
 use App\Model\Enums\ApplicationState;
-use App\Model\Enums\PaymentType;
 use App\Model\Program\Block;
 use App\Model\Program\Program;
 use App\Model\Settings\CustomInput\CustomInput;
@@ -15,9 +14,7 @@
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\PersistentCollection;
-use function GuzzleHttp\Psr7\str;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
-use Nette\DateTime;
 
 
 /**
@@ -386,14 +383,15 @@ public function isInRole(Role $role)
     {
         return $this->roles->filter(function ($item) use ($role) {
                 return $item == $role;
-        })->count() != 0;
+            })->count() != 0;
     }
 
     /**
      * Vrátí role uživatele oddělené čárkou.
      * @return string
      */
-    public function getRolesText() {
+    public function getRolesText()
+    {
         $rolesNames = [];
         foreach ($this->roles as $role) {
             $rolesNames[] = $role->getName();
@@ -785,7 +783,8 @@ public function setMember($member)
      * Je bez skautIS účtu?
      * @return bool
      */
-    public function isExternal() {
+    public function isExternal()
+    {
         return $this->username === NULL;
     }
 
@@ -965,6 +964,14 @@ public function getState()
         return $this->state;
     }
 
+    /**
+     * @param string $state
+     */
+    public function setState($state)
+    {
+        $this->state = $state;
+    }
+
     /**
      * Vrátí adresu uživatele.
      * @return null|string
@@ -976,14 +983,6 @@ public function getAddress()
         return $this->street . ', ' . $this->city . ', ' . $this->postcode;
     }
 
-    /**
-     * @param string $state
-     */
-    public function setState($state)
-    {
-        $this->state = $state;
-    }
-
     /**
      * @return bool
      */
@@ -1260,7 +1259,8 @@ public function getSubevents()
      * Vrátí podakce uživatele oddělené čárkou.
      * @return string
      */
-    public function getSubeventsText() {
+    public function getSubeventsText()
+    {
         $subeventsNames = [];
         foreach ($this->getSubevents() as $subevent) {
             $subeventsNames[] = $subevent->getName();
diff --git a/app/presenters/AuthPresenter.php b/app/presenters/AuthPresenter.php
index 07f18057d..d333b14ec 100644
--- a/app/presenters/AuthPresenter.php
+++ b/app/presenters/AuthPresenter.php
@@ -9,7 +9,6 @@
 use App\Model\User\UserRepository;
 use App\Services\MailService;
 use App\Services\SkautIsService;
-use Doctrine\Common\Collections\ArrayCollection;
 
 
 /**
@@ -48,6 +47,11 @@ class AuthPresenter extends BasePresenter
     /**
      * Přesměruje na přihlašovací stránku skautIS, nastaví přihlášení.
      * @param null $backlink
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
+     * @throws \Nette\Security\AuthenticationException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function actionLogin($backlink = NULL)
     {
@@ -63,7 +67,7 @@ public function actionLogin($backlink = NULL)
         if ($this->user->identity->data['firstLogin']) {
             $user = $this->userRepository->findById($this->user->id);
 
-            $this->mailService->sendMailFromTemplate(new ArrayCollection(), new ArrayCollection([$user]), '', Template::SIGN_IN, [
+            $this->mailService->sendMailFromTemplate($user, '', Template::SIGN_IN, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
             ]);
         }
@@ -88,6 +92,8 @@ public function actionLogout()
     /**
      * Provede přesměrování po úspěšném přihlášení, v závislosti na nastavení, nastavení role nebo returnUrl.
      * @param $returnUrl
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Nette\Application\AbortException
      */
     private function redirectAfterLogin($returnUrl)
     {
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index ce09ea798..554602de9 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -75,7 +75,8 @@ public function __construct(SettingsRepository $settingsRepository, ApplicationR
      * @return string
      * @throws \App\Model\Settings\SettingsException
      */
-    public function generateVariableSymbol(Application $application) {
+    public function generateVariableSymbol(Application $application)
+    {
         $variableSymbolCode = $this->settingsRepository->getValue(Settings::VARIABLE_SYMBOL_CODE);
         return $variableSymbolCode . str_pad($application->getId(), 6, '0', STR_PAD_LEFT);
     }
@@ -85,7 +86,8 @@ public function generateVariableSymbol(Application $application) {
      * @return \DateTime|null
      * @throws \App\Model\Settings\SettingsException
      */
-    public function countMaturityDate() {
+    public function countMaturityDate()
+    {
         switch ($this->settingsRepository->getValue(Settings::MATURITY_TYPE)) {
             case MaturityType::DATE:
                 return $this->settingsRepository->getDateValue(Settings::MATURITY_DATE);
@@ -108,7 +110,8 @@ public function countMaturityDate() {
      * @param bool $first
      * @return int
      */
-    public function countFee($roles, $subevents, $first = TRUE) {
+    public function countFee($roles, $subevents, $first = TRUE)
+    {
         $fee = 0;
 
         if ($roles !== NULL) {
@@ -123,12 +126,10 @@ public function countFee($roles, $subevents, $first = TRUE) {
                         }
                         $subeventsFeeRole = TRUE;
                     }
-                }
-                //neplatici role
+                } //neplatici role
                 elseif ($role->getFee() == 0) {
                     return 0;
-                }
-                //role s pevnym poplatkem
+                } //role s pevnym poplatkem
                 elseif ($first) {
                     $fee += $role->getFee();
                 }
@@ -145,6 +146,7 @@ public function countFee($roles, $subevents, $first = TRUE) {
      * @param User $user
      * @return bool
      * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function isAllowedAddSubevents(User $user)
     {
@@ -158,6 +160,7 @@ public function isAllowedAddSubevents(User $user)
      * Může uživatel upravovat první přihlášku?
      * @param User $user
      * @return bool
+     * @throws \App\Model\Settings\SettingsException
      */
     public function isAllowedEditFirstApplication(User $user)
     {
@@ -169,6 +172,7 @@ public function isAllowedEditFirstApplication(User $user)
      * Je uživateli povoleno zrušit přihlášku?
      * @param Application $application
      * @return bool
+     * @throws \App\Model\Settings\SettingsException
      */
     public function isAllowedCancelApplication(Application $application)
     {
@@ -179,8 +183,10 @@ public function isAllowedCancelApplication(Application $application)
     /**
      * Může uživatel upravovat vlastní pole přihlášky?
      * @return bool
+     * @throws \App\Model\Settings\SettingsException
      */
-    public function isAllowedEditCustomInputs() {
+    public function isAllowedEditCustomInputs()
+    {
         return $this->settingsRepository->getDateValue(Settings::EDIT_CUSTOM_INPUTS_TO) >= (new \DateTime())->setTime(0, 0);
     }
 }
diff --git a/app/services/Authenticator.php b/app/services/Authenticator.php
index c3831c2a3..615d5e976 100644
--- a/app/services/Authenticator.php
+++ b/app/services/Authenticator.php
@@ -19,6 +19,9 @@
  */
 class Authenticator extends Nette\Object implements NS\IAuthenticator
 {
+    /** @var SkautIsService */
+    protected $skautIsService;
+
     /** @var UserRepository */
     private $userRepository;
 
@@ -28,9 +31,6 @@ class Authenticator extends Nette\Object implements NS\IAuthenticator
     /** @var SettingsRepository */
     private $settingsRepository;
 
-    /** @var SkautIsService */
-    protected $skautIsService;
-
     /** @var FilesService */
     private $filesService;
 
@@ -129,8 +129,7 @@ private function updateUserFromSkautIS(User $user, $skautISUser)
                 $path = User::PHOTO_PATH . "/" . $fileName;
                 $this->filesService->create($path, $photo->PhotoNormalContent);
                 $user->setPhoto($fileName);
-            }
-            else {
+            } else {
                 $user->setPhoto(NULL);
             }
             $user->setPhotoUpdate($photoUpdate);
@@ -140,7 +139,7 @@ private function updateUserFromSkautIS(User $user, $skautISUser)
     /**
      * Aktualizuje role přihlášeného uživatele.
      * @param $user
-     * @param null $testRole
+     * @param Role $testRole
      */
     public function updateRoles($user, $testRole = NULL)
     {
diff --git a/app/services/DatabaseService.php b/app/services/DatabaseService.php
index ce7a488a8..1d20127f0 100644
--- a/app/services/DatabaseService.php
+++ b/app/services/DatabaseService.php
@@ -22,11 +22,6 @@ class DatabaseService
      */
     public $application;
 
-    /**
-     * @var Cache
-     */
-    protected $cache;
-
     /**
      * @var Container
      */
@@ -37,7 +32,12 @@ class DatabaseService
      */
     public $dir;
 
+    /**
+     * @var Cache
+     */
+    protected $cache;
 
+    
     /**
      * DatabaseService constructor.
      * @param string $dir
@@ -71,7 +71,7 @@ public function update()
                         'command' => 'migrations:migrate',
                         '--no-interaction' => TRUE
                     ]);
-                    $result = $this->application->run($input, $output);
+                    $this->application->run($input, $output);
                 }
                 return TRUE;
             });
diff --git a/app/services/DiscountService.php b/app/services/DiscountService.php
index 6c7f5c980..71a67576d 100644
--- a/app/services/DiscountService.php
+++ b/app/services/DiscountService.php
@@ -64,7 +64,8 @@ public function __construct(DiscountRepository $discountRepository, SubeventRepo
      * @param $selectedSubeventsIds
      * @return int
      */
-    public function countDiscount($selectedSubeventsIds) {
+    public function countDiscount($selectedSubeventsIds)
+    {
         $totalDiscount = 0;
 
         foreach ($this->discountRepository->findAll() as $discount) {
@@ -74,8 +75,7 @@ public function countDiscount($selectedSubeventsIds) {
 
             try {
                 $this->parseExpression($result);
-            }
-            catch (InvalidArgumentException $exception) {
+            } catch (InvalidArgumentException $exception) {
                 continue;
             }
 
@@ -91,15 +91,15 @@ public function countDiscount($selectedSubeventsIds) {
      * @param $condition
      * @return bool
      */
-    public function validateCondition($condition) {
+    public function validateCondition($condition)
+    {
         $this->tokenize($condition);
 
         $this->selectedSubeventsIds = [];
 
         try {
             $this->parseExpression($result);
-        }
-        catch (InvalidArgumentException $exception) {
+        } catch (InvalidArgumentException $exception) {
             return FALSE;
         }
 
@@ -111,7 +111,8 @@ public function validateCondition($condition) {
      * @param $condition
      * @return string
      */
-    public function convertConditionToText($condition) {
+    public function convertConditionToText($condition)
+    {
         $this->tokenize($condition);
 
         $text = '';
@@ -141,7 +142,8 @@ public function convertConditionToText($condition) {
         return $text;
     }
 
-    private function tokenize($condition) {
+    private function tokenize($condition)
+    {
         $tokens = explode('|', $condition);
 
         $this->symbols = [];
@@ -155,35 +157,40 @@ private function tokenize($condition) {
         $this->currentSymbol = 0;
     }
 
-    private function nextSymbol() {
+    private function nextSymbol()
+    {
         $this->currentSymbol++;
     }
 
-    private function symbol() {
+    private function symbol()
+    {
         return $this->symbols[$this->currentSymbol]['symbol'];
     }
 
-    private function symbolValue() {
+    private function symbolValue()
+    {
         return $this->symbols[$this->currentSymbol]['value'];
     }
 
-    private function accept($symbol) {
+    private function accept($symbol)
+    {
         if ($this->symbol() == $symbol)
             $this->nextSymbol();
         else
             throw new InvalidArgumentException;
     }
 
-    private function acceptSubevent(&$sValue) {
+    private function acceptSubevent(&$sValue)
+    {
         if ($this->symbol() == Discount::SUBEVENT_ID && $this->subeventRepository->findById($this->symbolValue()) !== NULL) {
             $sValue = in_array($this->symbolValue(), $this->selectedSubeventsIds) ? 1 : 0;
             $this->nextSymbol();
-        }
-        else
+        } else
             throw new InvalidArgumentException;
     }
 
-    private function parseExpression(&$sValue) {
+    private function parseExpression(&$sValue)
+    {
         switch ($this->symbol()) {
             case Discount::SUBEVENT_ID:
             case Discount::LEFT_PARENTHESIS:
@@ -197,7 +204,8 @@ private function parseExpression(&$sValue) {
         }
     }
 
-    private function parseExpression_($dValue, &$sValue) {
+    private function parseExpression_($dValue, &$sValue)
+    {
         switch ($this->symbol()) {
             case Discount::OPERATOR_OR:
                 $this->accept(Discount::OPERATOR_OR);
@@ -216,7 +224,8 @@ private function parseExpression_($dValue, &$sValue) {
         }
     }
 
-    private function parseTerm(&$sValue) {
+    private function parseTerm(&$sValue)
+    {
         switch ($this->symbol()) {
             case Discount::SUBEVENT_ID:
             case Discount::LEFT_PARENTHESIS:
@@ -230,7 +239,8 @@ private function parseTerm(&$sValue) {
         }
     }
 
-    private function parseTerm_($dValue, &$sValue) {
+    private function parseTerm_($dValue, &$sValue)
+    {
         switch ($this->symbol()) {
             case Discount::OPERATOR_AND:
                 $this->accept(Discount::OPERATOR_AND);
@@ -250,7 +260,8 @@ private function parseTerm_($dValue, &$sValue) {
         }
     }
 
-    private function parseFactor(&$sValue) {
+    private function parseFactor(&$sValue)
+    {
         switch ($this->symbol()) {
             case Discount::SUBEVENT_ID:
                 $this->acceptSubevent($sValue);
diff --git a/app/services/ExcelExportService.php b/app/services/ExcelExportService.php
index 116fbf107..13b5881cd 100644
--- a/app/services/ExcelExportService.php
+++ b/app/services/ExcelExportService.php
@@ -51,6 +51,9 @@ class ExcelExportService extends Nette\Object
     /** @var ProgramRepository */
     private $programRepository;
 
+    /** @var ProgramService */
+    private $programService;
+
 
     /**
      * ExcelExportService constructor.
@@ -61,11 +64,12 @@ class ExcelExportService extends Nette\Object
      * @param SubeventRepository $subeventRepository
      * @param CategoryRepository $categoryRepository
      * @param ProgramRepository $programRepository
+     * @param ProgramService $programService
      */
     public function __construct(Translator $translator, CustomInputRepository $customInputRepository,
                                 BlockRepository $blockRepository, UserService $userService,
                                 SubeventRepository $subeventRepository, CategoryRepository $categoryRepository,
-                                ProgramRepository $programRepository)
+                                ProgramRepository $programRepository, ProgramService $programService)
     {
         $this->phpExcel = new \PHPExcel();
 
@@ -76,6 +80,7 @@ public function __construct(Translator $translator, CustomInputRepository $custo
         $this->subeventRepository = $subeventRepository;
         $this->categoryRepository = $categoryRepository;
         $this->programRepository = $programRepository;
+        $this->programService = $programService;
     }
 
     /**
@@ -84,6 +89,7 @@ public function __construct(Translator $translator, CustomInputRepository $custo
      * @param $roles
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
     public function exportUsersRoles($users, $roles, $filename)
     {
@@ -118,11 +124,24 @@ public function exportUsersRoles($users, $roles, $filename)
         return new ExcelResponse($this->phpExcel, $filename);
     }
 
+    /**
+     * Vyexportuje harmonogram uživatele.
+     * @param $user
+     * @param $filename
+     * @return ExcelResponse
+     * @throws \PHPExcel_Exception
+     */
+    public function exportUserSchedule($user, $filename)
+    {
+        return $this->exportUsersSchedules([$user], $filename);
+    }
+
     /**
      * Vyexportuje harmonogramy uživatelů, každý uživatel na zvlástním listu.
      * @param $users
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
     public function exportUsersSchedules($users, $filename)
     {
@@ -177,14 +196,15 @@ public function exportUsersSchedules($users, $filename)
     }
 
     /**
-     * Vyexportuje harmonogram uživatele.
-     * @param $user
+     * Vyexportuje harmonogram místnosti.
+     * @param Room $room
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
-    public function exportUserSchedule($user, $filename)
+    public function exportRoomSchedule(Room $room, $filename)
     {
-        return $this->exportUsersSchedules([$user], $filename);
+        return $this->exportRoomsSchedules([$room], $filename);
     }
 
     /**
@@ -192,8 +212,10 @@ public function exportUserSchedule($user, $filename)
      * @param $rooms
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
-    public function exportRoomsSchedules($rooms, $filename) {
+    public function exportRoomsSchedules($rooms, $filename)
+    {
         $this->phpExcel->removeSheetByIndex(0);
         $sheetNumber = 0;
 
@@ -241,21 +263,11 @@ public function exportRoomsSchedules($rooms, $filename) {
         return new ExcelResponse($this->phpExcel, $filename);
     }
 
-    /**
-     * Vyexportuje harmonogram místnosti.
-     * @param Room $room
-     * @param $filename
-     * @return ExcelResponse
-     */
-    public function exportRoomSchedule(Room $room, $filename)
-    {
-        return $this->exportRoomsSchedules([$room], $filename);
-    }
-
     /**
      * @param Collection|User[] $users
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
     public function exportUsersList($users, $filename)
     {
@@ -418,7 +430,7 @@ public function exportUsersList($users, $filename)
 
             $sheet->setCellValueByColumnAndRow($column++, $row,
                 ($user->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS) && $user->isApproved())
-                    ? implode(', ', $this->blockRepository->findUserMandatoryNotRegisteredNames($user))
+                    ? implode(', ', $this->programService->getUnregisteredUserMandatoryBlocksNames($user))
                     : ''
             );
 
@@ -441,8 +453,7 @@ public function exportUsersList($users, $filename)
                             $value = $customInputValue->getValueOption();
                             break;
                     }
-                }
-                else
+                } else
                     $value = '';
 
                 $sheet->setCellValueByColumnAndRow($column++, $row, $value);
@@ -458,8 +469,10 @@ public function exportUsersList($users, $filename)
      * @param Collection|User[] $users
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
-    public function exportUsersSubeventsAndCategories($users, $filename) {
+    public function exportUsersSubeventsAndCategories($users, $filename)
+    {
         $sheet = $this->phpExcel->getSheet(0);
 
         $row = 1;
@@ -543,6 +556,7 @@ public function exportUsersSubeventsAndCategories($users, $filename) {
      * @param Collection|Block[] $blocks
      * @param $filename
      * @return ExcelResponse
+     * @throws \PHPExcel_Exception
      */
     public function exportBlocksAttendees($blocks, $filename)
     {
diff --git a/app/services/ExcelResponse.php b/app/services/ExcelResponse.php
index 2a6b5467f..af97e9727 100644
--- a/app/services/ExcelResponse.php
+++ b/app/services/ExcelResponse.php
@@ -34,6 +34,7 @@ public function __construct(\PHPExcel $phpExcel, $filename)
     /**
      * @param Nette\Http\IRequest $httpRequest
      * @param Nette\Http\IResponse $httpResponse
+     * @throws \PHPExcel_Writer_Exception
      */
     public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $httpResponse)
     {
diff --git a/app/services/FilesService.php b/app/services/FilesService.php
index e15e4d23c..18673873a 100644
--- a/app/services/FilesService.php
+++ b/app/services/FilesService.php
@@ -60,16 +60,17 @@ public function create($path, $content)
         if (!is_dir($dirname))
             mkdir($dirname, 0755, TRUE);
 
-        $file = fopen($absPath, 'wb' );
+        $file = fopen($absPath, 'wb');
         fwrite($file, $content);
         fclose($file);
     }
 
-     /**
+    /**
      * Změní velikost obrázku.
      * @param $path
      * @param $width
      * @param $height
+     * @throws Nette\Utils\UnknownImageFileException
      */
     public function resizeImage($path, $width, $height)
     {
@@ -84,6 +85,7 @@ public function resizeImage($path, $width, $height)
      * @param $path
      * @param $width
      * @param $height
+     * @throws Nette\Utils\UnknownImageFileException
      */
     public function resizeAndCropImage($path, $width, $height)
     {
diff --git a/app/services/MailService.php b/app/services/MailService.php
index eadb36270..cca45a179 100644
--- a/app/services/MailService.php
+++ b/app/services/MailService.php
@@ -77,6 +77,9 @@ public function __construct(MailFactory $mailFactory, SettingsRepository $settin
      * @param $subject
      * @param $text
      * @param bool $automatic
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function sendMail($recipientsRoles, $recipientsUsers, $copy, $subject, $text, $automatic = FALSE)
     {
@@ -116,18 +119,29 @@ public function sendMail($recipientsRoles, $recipientsUsers, $copy, $subject, $t
 
     /**
      * Rozešle e-mail podle šablony.
-     * @param $recipientsRoles
-     * @param $recipientsUsers
+     * @param $recipientUser
      * @param $copy
      * @param $type
      * @param $parameters
      * @param bool $automatic
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
-    public function sendMailFromTemplate($recipientsRoles, $recipientsUsers, $copy, $type, $parameters, $automatic = TRUE)
+    public function sendMailFromTemplate($recipientUser, $copy, $type, $parameters, $automatic = TRUE)
     {
         $template = $this->templateRepository->findByType($type);
 
         if ($template->isActive()) {
+            $recipientsRoles = new ArrayCollection();
+            $recipientsUsers = new ArrayCollection();
+
+            if ($template->isSendToUser())
+                $recipientsUsers->add($recipientUser);
+
+            if ($template->isSendToOrganizer())
+                $copy = $this->settingsRepository->getValue(Settings::SEMINAR_EMAIL);
+
             $subject = $template->getSubject();
             $text = $template->getText();
 
diff --git a/app/services/PdfExportService.php b/app/services/PdfExportService.php
index a3a282b5d..675b2706d 100644
--- a/app/services/PdfExportService.php
+++ b/app/services/PdfExportService.php
@@ -93,14 +93,14 @@ public function generateUsersPaymentProof(User $user, $filename)
         $this->fpdi->Output($filename, 'D');
         exit;
     }
-
+    
     private function prepareUsersPaymentProof(User $user)
     {
         foreach ($user->getApplications() as $application) {
             $this->prepareApplicationsPaymentProof($application);
         }
     }
-
+    
     /**
      * Vygeneruje doklady o zaplacení pro více uživatelů.
      * @param $users
@@ -123,6 +123,7 @@ private function prepareUsersPaymentProofs($users)
     /**
      * Vytvoří stránku s příjmovýchm dokladem.
      * @param Application $application
+     * @throws \App\Model\Settings\SettingsException
      */
     private function addIncomeProofPage(Application $application)
     {
@@ -151,10 +152,11 @@ private function addIncomeProofPage(Application $application)
 
         $this->fpdi->Text(40, 111, iconv('UTF-8', 'WINDOWS-1250', "účastnický poplatek {$this->settingsRepository->getValue(Settings::SEMINAR_NAME)}"));
     }
-
+    
     /**
      * Vytvoří stránku s potvrzením o přijetí platby.
      * @param Application $application
+     * @throws \App\Model\Settings\SettingsException
      */
     private function addAccountProofPage(Application $application)
     {
@@ -189,7 +191,7 @@ private function configureForIncomeProof()
         $template = $this->fpdi->importPage(1, '/MediaBox');
         $this->template = $template;
     }
-
+    
     /**
      * Nastaví šablonu pro potvrzení o přijetí platby.
      */
diff --git a/app/services/ProgramService.php b/app/services/ProgramService.php
index da0635490..143a76feb 100644
--- a/app/services/ProgramService.php
+++ b/app/services/ProgramService.php
@@ -2,9 +2,16 @@
 
 namespace App\Services;
 
+use App\Model\ACL\Permission;
+use App\Model\ACL\Resource;
 use App\Model\Enums\RegisterProgramsType;
+use App\Model\Program\BlockRepository;
+use App\Model\Program\ProgramRepository;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
+use App\Model\User\User;
+use App\Model\User\UserRepository;
+use Doctrine\Common\Collections\ArrayCollection;
 use Nette;
 
 
@@ -18,25 +25,42 @@ class ProgramService extends Nette\Object
     /** @var SettingsRepository */
     private $settingsRepository;
 
+    /** @var ProgramRepository */
+    private $programRepository;
+
+    /** @var BlockRepository */
+    private $blockRepository;
+
+    /** @var UserRepository */
+    private $userRepository;
+
 
     /**
      * ProgramService constructor.
      * @param SettingsRepository $settingsRepository
+     * @param ProgramRepository $programRepository
+     * @param BlockRepository $blockRepository
+     * @param UserRepository $userRepository
      */
-    public function __construct(SettingsRepository $settingsRepository)
+    public function __construct(SettingsRepository $settingsRepository, ProgramRepository $programRepository,
+                                BlockRepository $blockRepository, UserRepository $userRepository)
     {
         $this->settingsRepository = $settingsRepository;
+        $this->programRepository = $programRepository;
+        $this->blockRepository = $blockRepository;
+        $this->userRepository = $userRepository;
     }
 
     /**
      * Je povoleno zapisování programů?
      * @return bool
+     * @throws \App\Model\Settings\SettingsException
      */
     public function isAllowedRegisterPrograms()
     {
-        return $this->settingsRepository->getValue(Settings::REGISTER_PROGRAMS_TYPE) ==  RegisterProgramsType::ALLOWED
+        return $this->settingsRepository->getValue(Settings::REGISTER_PROGRAMS_TYPE) == RegisterProgramsType::ALLOWED
             || (
-                $this->settingsRepository->getValue(Settings::REGISTER_PROGRAMS_TYPE) ==  RegisterProgramsType::ALLOWED_FROM_TO
+                $this->settingsRepository->getValue(Settings::REGISTER_PROGRAMS_TYPE) == RegisterProgramsType::ALLOWED_FROM_TO
                 && ($this->settingsRepository->getDateTimeValue(Settings::REGISTER_PROGRAMS_FROM) === NULL
                     || $this->settingsRepository->getDateTimeValue(Settings::REGISTER_PROGRAMS_FROM) <= new \DateTime())
                 && ($this->settingsRepository->getDateTimeValue(Settings::REGISTER_PROGRAMS_TO) === NULL
@@ -44,4 +68,78 @@ public function isAllowedRegisterPrograms()
                 )
             );
     }
+
+    /**
+     * Aktualizuje programy uživatele (odhlásí nepovolené a přihlásí automaticky přihlašované).
+     * @param User $user
+     */
+    public function updateUserPrograms(User $user)
+    {
+        $this->updateUsersPrograms([$user]);
+    }
+
+    /**
+     * Aktualizuje programy uživatelů (odhlásí nepovolené a přihlásí automaticky přihlašované).
+     * @param User[] $users
+     */
+    public function updateUsersPrograms($users)
+    {
+        foreach ($users as $user) {
+            $oldUsersPrograms = $user->getPrograms();
+            $userAllowedPrograms = $this->getUserAllowedPrograms($user);
+
+            $newUsersPrograms = new ArrayCollection();
+
+            foreach ($userAllowedPrograms as $userAllowedProgram) {
+                if ($userAllowedProgram->getBlock()->getMandatory() == 2 || $oldUsersPrograms->contains($userAllowedProgram))
+                    $newUsersPrograms->add($userAllowedProgram);
+            }
+
+            $oldUsersPrograms->clear();
+            $user->setPrograms($newUsersPrograms);
+            $this->userRepository->save($user);
+        }
+    }
+
+    /**
+     * Vrací programy, na které se uživatel může přihlásit.
+     * @param User $user
+     * @return array
+     */
+    public function getUserAllowedPrograms($user)
+    {
+        if (!$user->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS))
+            return [];
+
+        $registerableCategoriesIds = $this->userRepository->findRegisterableCategoriesIdsByUser($user);
+
+        $registeredSubeventsIds = [];
+
+        foreach ($user->getNotCanceledApplications() as $application) {
+            foreach ($application->getSubevents() as $subevent)
+                $registeredSubeventsIds[] = $subevent->getId();
+        }
+
+        return $this->programRepository->findAllowedForCategoriesAndSubevents($registerableCategoriesIds, $registeredSubeventsIds);
+    }
+
+    /**
+     * Vrací názvy bloků, které jsou pro uživatele povinné, ale není na ně přihlášený.
+     * @param User $user
+     * @return array
+     */
+    public function getUnregisteredUserMandatoryBlocksNames($user)
+    {
+        $registerableCategoriesIds = $this->userRepository->findRegisterableCategoriesIdsByUser($user);
+        $usersSubevents = $user->getSubevents();
+
+        $unregisteredBlocks = $this->blockRepository->findMandatoryForCategoriesAndSubevents($user, $registerableCategoriesIds, $usersSubevents);
+
+        $names = [];
+        foreach ($unregisteredBlocks as $block)
+            $names[] = $block->getName();
+
+        return $names;
+    }
+
 }
diff --git a/app/services/SkautIsEventService.php b/app/services/SkautIsEventService.php
index 3ca9e649c..0bc82182d 100644
--- a/app/services/SkautIsEventService.php
+++ b/app/services/SkautIsEventService.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace App\Services;
+
 use App\Model\User\User;
 use Skautis\Skautis;
 use Skautis\Wsdl\WsdlException;
@@ -50,7 +51,8 @@ public function syncEventParticipants($eventId, array $participants)
      * @param $eventId
      * @return string
      */
-    public function getEventDisplayName($eventId) {
+    public function getEventDisplayName($eventId)
+    {
         return $this->getEventDetail($eventId)->DisplayName;
     }
 
@@ -65,7 +67,8 @@ abstract public function isEventDraft($eventId);
      * Vrací seznam neuzavřených akcí pro select.
      * @return array
      */
-    public function getEventsOptions() {
+    public function getEventsOptions()
+    {
         $options = [];
         try {
             foreach ($this->getDraftEvents() as $e)
@@ -81,7 +84,7 @@ public function getEventsOptions() {
      * @return mixed
      */
     abstract protected function getEventDetail($eventId);
-
+    
     /**
      * Vrátí všehny účastníky skautIS akce.
      * @param $eventId
@@ -101,7 +104,7 @@ abstract protected function insertParticipant($participantId, $eventId);
      * @param $participantId
      */
     abstract protected function deleteParticipant($participantId);
-
+    
     /**
      * Vrací seznam neuzavřených akcí.
      * @return mixed
diff --git a/app/services/SkautIsService.php b/app/services/SkautIsService.php
index b1babc99f..6cc8e2203 100644
--- a/app/services/SkautIsService.php
+++ b/app/services/SkautIsService.php
@@ -4,7 +4,6 @@
 
 use Nette;
 use Skautis\Skautis;
-use Skautis\Wsdl\WsdlException;
 
 
 /**
@@ -90,7 +89,7 @@ public function getPersonDetail($personId)
             'ID' => $personId
         ]);
     }
-
+    
     public function getPersonPhoto($personId, $size)
     {
         return $this->skautIs->org->PersonPhoto([
diff --git a/app/services/UserService.php b/app/services/UserService.php
index d856c51b8..e39bdb6f7 100644
--- a/app/services/UserService.php
+++ b/app/services/UserService.php
@@ -2,7 +2,13 @@
 
 namespace App\Services;
 
+use App\Model\Enums\ApplicationState;
+use App\Model\Mailing\Template;
+use App\Model\Mailing\TemplateVariable;
+use App\Model\Settings\Settings;
+use App\Model\User\ApplicationRepository;
 use App\Model\User\User;
+use App\Model\User\UserRepository;
 use Kdyby\Translation\Translator;
 use Nette;
 
@@ -17,14 +23,81 @@ class UserService extends Nette\Object
     /** @var Translator */
     private $translator;
 
+    /** @var ProgramService */
+    private $programService;
+
+    /** @var UserRepository */
+    private $userRepository;
+
+    /** @var ApplicationRepository */
+    private $applicationRepository;
+
 
     /**
      * UserService constructor.
      * @param Translator $translator
+     * @param ProgramService $programService
+     * @param UserRepository $userRepository
+     * @param ApplicationRepository $applicationRepository
      */
-    public function __construct(Translator $translator)
+    public function __construct(Translator $translator, ProgramService $programService, UserRepository $userRepository,
+                                ApplicationRepository $applicationRepository)
     {
         $this->translator = $translator;
+        $this->programService = $programService;
+        $this->userRepository = $userRepository;
+        $this->applicationRepository = $applicationRepository;
+    }
+
+    /**
+     * Změní role uživatele.
+     * @param User $user
+     * @param $roles
+     * @param bool $approved
+     */
+    public function changeRoles(User $user, $roles, $approved = FALSE)
+    {
+        if (!$approved && $user->isApproved()) {
+            foreach ($roles as $role) {
+                if (!$role->isApprovedAfterRegistration() && !$user->isInRole($role)) {
+                    $user->setApproved(FALSE);
+                    break;
+                }
+            }
+        }
+
+        $user->setRoles($roles);
+
+        $this->userRepository->save($user);
+
+        foreach ($user->getApplications() as $application) {
+            $fee = $this->applicationService->countFee($roles, $application->getSubevents(), $application->isFirst());
+
+            $application->setFee($fee);
+            $application->setState($fee == 0 || $application->getPaymentDate()
+                ? ApplicationState::PAID
+                : ApplicationState::WAITING_FOR_PAYMENT);
+
+            $this->applicationRepository->save($application);
+        }
+
+        $this->programService->updateUserPrograms($user);
+
+        //zaslání potvrzovacího e-mailu
+        $rolesNames = [];
+        foreach ($this->user->getRoles() as $role) {
+            $rolesNames[] = $role->getName();
+        }
+
+        $this->mailService->sendMailFromTemplate($this->user, '', Template::ROLES_CHANGED, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+            TemplateVariable::USERS_ROLES => implode(', ', $rolesNames)
+        ]);
+    }
+
+    public function cancelRegistration()
+    {
+        //TODO
     }
 
     /**
diff --git a/migrations/Version20171223230501.php b/migrations/Version20171223230501.php
new file mode 100644
index 000000000..6bfc3a01f
--- /dev/null
+++ b/migrations/Version20171223230501.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171223230501 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE mail_template ADD send_to_user TINYINT(1) NOT NULL, ADD send_to_organizer TINYINT(1) NOT NULL');
+
+        $this->addSql('INSERT INTO `mail_template_variable` (`id`, `name`) VALUES (NULL, \'user\')');
+
+        $this->addSql('INSERT INTO `mail_template` (`id`, `type`, `subject`, `text`, `active`) VALUES (NULL, \'custom_input_value_changed\', \'%nazev-seminare%: změna vlastních polí\', \'Uživatel %uzivatel% si aktualizoval údaje ve vlastních polích přihlášky.\', \'1\')');
+
+        $this->addSql('INSERT INTO `template_template_variable` (`template_id`, `template_variable_id`) VALUES (\'11\', \'1\')');
+        $this->addSql('INSERT INTO `template_template_variable` (`template_id`, `template_variable_id`) VALUES (\'11\', \'12\')');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171223233147.php b/migrations/Version20171223233147.php
new file mode 100644
index 000000000..7220e29f8
--- /dev/null
+++ b/migrations/Version20171223233147.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171223233147 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('UPDATE `mail_template` SET `send_to_user`=1');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171224074439.php b/migrations/Version20171224074439.php
new file mode 100644
index 000000000..ecb153802
--- /dev/null
+++ b/migrations/Version20171224074439.php
@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171224074439 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE mail_template ADD system TINYINT(1) NOT NULL');
+        $this->addSql('UPDATE `mail_template` SET `send_to_user` = 0, `system` = 1 WHERE `mail_template`.`id` = 10');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

From 4c9ae9add4fa7586a7978510ca0d8281d1e6c944 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Sun, 24 Dec 2017 21:03:08 +0100
Subject: [PATCH 02/11] uprava modelu pro historizaci (#405) a upravu podakci
 (#415)

---
 .../components/UsersGridControl.php           |  9 +-
 app/config/config.neon                        |  4 +
 app/model/User/Application.php                | 87 +++++++++++++++++--
 app/model/User/ApplicationRepository.php      | 14 ---
 app/model/User/User.php                       | 10 ++-
 app/model/User/VariableSymbol.php             | 51 +++++++++++
 app/model/User/VariableSymbolRepository.php   | 24 +++++
 migrations/Version20171224193507.php          | 27 ++++++
 migrations/Version20171224194026.php          | 25 ++++++
 migrations/Version20171224200017.php          | 25 ++++++
 10 files changed, 249 insertions(+), 27 deletions(-)
 create mode 100644 app/model/User/VariableSymbol.php
 create mode 100644 app/model/User/VariableSymbolRepository.php
 create mode 100644 migrations/Version20171224193507.php
 create mode 100644 migrations/Version20171224194026.php
 create mode 100644 migrations/Version20171224200017.php

diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index fb41e49a7..8e288bba3 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -268,8 +268,8 @@ public function createComponentUsersGrid($name)
 
         $grid->addColumnText('variableSymbol', 'admin.users.users_variable_symbol', 'variableSymbolsText')
             ->setFilterText()
-            ->setCondition(function ($qb, $value) {
-                $qb->join('u.applications', 'aVariableSymbol')
+            ->setCondition(function ($qb, $value) { //TODO
+                $qb->join('u.applications', 'aVariableSymbol')->join('aVariableSymbol.variableSymbol')
                     ->andWhere('aVariableSymbol.variableSymbol LIKE :variableSymbol')
                     ->setParameter(':variableSymbol', $value . '%');
             });
@@ -281,12 +281,9 @@ public function createComponentUsersGrid($name)
 
         $grid->addColumnDateTime('lastPaymentDate', 'admin.users.users_last_payment_date');
 
-        //        $grid->addColumnDateTime('incomeProofPrintedDate', 'admin.users.users_income_proof_printed_date')
-        //            ->setSortable();
-
         $grid->addColumnDateTime('firstApplicationDate', 'admin.users.users_first_application_date')
             ->setSortable()
-            ->setSortableCallback(function ($qb, $sort) {
+            ->setSortableCallback(function ($qb, $sort) { //TODO
                 $qb->leftJoin('u.applications', 'aFirstApplicationDate', Expr\Join::WITH, 'aFirstApplicationDate.first = true')
                     ->orderBy('aFirstApplicationDate.applicationDate', $sort['firstApplicationDate']);
             })
diff --git a/app/config/config.neon b/app/config/config.neon
index d3a9cbedc..381615ced 100644
--- a/app/config/config.neon
+++ b/app/config/config.neon
@@ -158,6 +158,10 @@ services:
         class: App\Model\User\ApplicationRepository
         tags:
             doctrine.repositoryEntity: App\Model\User\Application
+    variableSymbolRepository:
+        class: App\Model\User\VariableSymbolRepository
+        tags:
+            doctrine.repositoryEntity: App\Model\User\VariableSymbol
     userRepository:
         class: App\Model\User\UserRepository
         tags:
diff --git a/app/model/User/Application.php b/app/model/User/Application.php
index 092caa961..e6026d964 100644
--- a/app/model/User/Application.php
+++ b/app/model/User/Application.php
@@ -25,6 +25,13 @@ class Application
      */
     protected $user;
 
+    /**
+     * Role.
+     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
+     * @var ArrayCollection
+     */
+    protected $roles;
+
     /**
      * Podakce.
      * @ORM\ManyToMany(targetEntity="\App\Model\Structure\Subevent", inversedBy="applications", cascade={"persist"})
@@ -41,8 +48,8 @@ class Application
 
     /**
      * Variabilní symbol.
-     * @ORM\Column(type="string", nullable=true)
-     * @var string
+     * @ORM\ManyToOne(targetEntity="VariableSymbol", cascade={"persist"})
+     * @var VariableSymbol
      */
     protected $variableSymbol;
 
@@ -95,6 +102,26 @@ class Application
      */
     protected $first = TRUE;
 
+    /**
+     * @ORM\ManyToOne(targetEntity="User", cascade={"persist"})
+     * @var User
+     */
+    protected $createdBy;
+
+    /**
+     * Platnost záznamu od.
+     * @ORM\Column(type="datetime")
+     * @var \DateTime
+     */
+    protected $validFrom;
+
+    /**
+     * Platnost záznamu do.
+     * @ORM\Column(type="datetime")
+     * @var \DateTime
+     */
+    protected $validTo;
+
 
     /**
      * Application constructor.
@@ -186,17 +213,17 @@ public function setFee($fee)
     }
 
     /**
-     * @return string
+     * @return VariableSymbol|null
      */
-    public function getVariableSymbol()
+    public function getVariableSymbol(): ?VariableSymbol
     {
         return $this->variableSymbol;
     }
 
     /**
-     * @param string $variableSymbol
+     * @param VariableSymbol $variableSymbol
      */
-    public function setVariableSymbol($variableSymbol)
+    public function setVariableSymbol(VariableSymbol $variableSymbol)
     {
         $this->variableSymbol = $variableSymbol;
     }
@@ -312,4 +339,52 @@ public function setFirst($first)
     {
         $this->first = $first;
     }
+
+    /**
+     * @return User
+     */
+    public function getCreatedBy(): User
+    {
+        return $this->createdBy;
+    }
+
+    /**
+     * @param User $createdBy
+     */
+    public function setCreatedBy(User $createdBy)
+    {
+        $this->createdBy = $createdBy;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getValidFrom(): \DateTime
+    {
+        return $this->validFrom;
+    }
+
+    /**
+     * @param \DateTime $validFrom
+     */
+    public function setValidFrom(\DateTime $validFrom)
+    {
+        $this->validFrom = $validFrom;
+    }
+
+    /**
+     * @return \DateTime
+     */
+    public function getValidTo(): \DateTime
+    {
+        return $this->validTo;
+    }
+
+    /**
+     * @param \DateTime $validTo
+     */
+    public function setValidTo(\DateTime $validTo)
+    {
+        $this->validTo = $validTo;
+    }
 }
diff --git a/app/model/User/ApplicationRepository.php b/app/model/User/ApplicationRepository.php
index c3c245b30..1d0f6a9d9 100644
--- a/app/model/User/ApplicationRepository.php
+++ b/app/model/User/ApplicationRepository.php
@@ -35,20 +35,6 @@ public function findWaitingForPaymentApplications()
             ->getResult();
     }
 
-    /**
-     * Vrací true, pokud existuje přihláška s tímto variabilním symbolem.
-     * @param $variableSymbol
-     * @return bool
-     */
-    public function variableSymbolExists($variableSymbol)
-    {
-        $res = $this->createQueryBuilder('a')
-            ->where('a.variableSymbol = :vs')->setParameter('vs', $variableSymbol)
-            ->getQuery()
-            ->getResult();
-        return !empty($res);
-    }
-
     /**
      * Uloží přihlášku.
      * @param Application $application
diff --git a/app/model/User/User.php b/app/model/User/User.php
index 4a6f9f446..93318b235 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -183,6 +183,13 @@ class User
      */
     protected $skautISPersonId;
 
+    /**
+     * Datum prvního přihlášení.
+     * @ORM\Column(type="datetime", nullable=true)
+     * @var \DateTime
+     */
+    protected $firstLogin;
+
     /**
      * Datum posledního přihlášení.
      * @ORM\Column(type="datetime", nullable=true)
@@ -1319,7 +1326,8 @@ public function getVariableSymbolsText()
     {
         $variableSymbols = [];
         foreach ($this->applications as $application)
-            $variableSymbols[] = $application->getVariableSymbol();
+            if ($application->getVariableSymbol())
+                $variableSymbols[] = $application->getVariableSymbol()->getVariableSymbol();
         return implode(', ', $variableSymbols);
     }
 }
diff --git a/app/model/User/VariableSymbol.php b/app/model/User/VariableSymbol.php
new file mode 100644
index 000000000..a816f1753
--- /dev/null
+++ b/app/model/User/VariableSymbol.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Model\User;
+
+use Doctrine\ORM\Mapping as ORM;
+use Kdyby\Doctrine\Entities\Attributes\Identifier;
+
+
+/**
+ * Entita variabilní symbol.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ * @ORM\Entity(repositoryClass="VariableSymbolRepository")
+ * @ORM\Table(name="variable_symbol")
+ */
+class VariableSymbol
+{
+    use Identifier;
+
+    /**
+     * Variabilní symbol.
+     * @ORM\Column(type="string", nullable=true)
+     * @var string
+     */
+    protected $variableSymbol;
+
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVariableSymbol(): string
+    {
+        return $this->variableSymbol;
+    }
+
+    /**
+     * @param string $variableSymbol
+     */
+    public function setVariableSymbol(string $variableSymbol)
+    {
+        $this->variableSymbol = $variableSymbol;
+    }
+}
\ No newline at end of file
diff --git a/app/model/User/VariableSymbolRepository.php b/app/model/User/VariableSymbolRepository.php
new file mode 100644
index 000000000..5fc4f3ebe
--- /dev/null
+++ b/app/model/User/VariableSymbolRepository.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Model\User;
+
+use Kdyby\Doctrine\EntityRepository;
+
+
+/**
+ * Třída spravující variabilní symboly.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class VariableSymbolRepository extends EntityRepository
+{
+    /**
+     * Uloží variabilní symbol.
+     * @param VariableSymbol $variableSymbol
+     */
+    public function save(VariableSymbol $variableSymbol)
+    {
+        $this->_em->persist($variableSymbol);
+        $this->_em->flush();
+    }
+}
diff --git a/migrations/Version20171224193507.php b/migrations/Version20171224193507.php
new file mode 100644
index 000000000..98957f209
--- /dev/null
+++ b/migrations/Version20171224193507.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171224193507 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('CREATE TABLE variable_symbol (id INT AUTO_INCREMENT NOT NULL, variable_symbol VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE application ADD created_by_id INT DEFAULT NULL, ADD valid_from DATETIME NOT NULL, ADD valid_to DATETIME NOT NULL');
+        $this->addSql('ALTER TABLE application ADD CONSTRAINT FK_A45BDDC1B03A8386 FOREIGN KEY (created_by_id) REFERENCES user (id)');
+        $this->addSql('CREATE INDEX IDX_A45BDDC1B03A8386 ON application (created_by_id)');
+        $this->addSql('ALTER TABLE user ADD first_login DATETIME DEFAULT NULL');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171224194026.php b/migrations/Version20171224194026.php
new file mode 100644
index 000000000..b85b28ab1
--- /dev/null
+++ b/migrations/Version20171224194026.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171224194026 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE application ADD variable_symbol_id INT DEFAULT NULL, DROP variable_symbol');
+        $this->addSql('ALTER TABLE application ADD CONSTRAINT FK_A45BDDC125813A9D FOREIGN KEY (variable_symbol_id) REFERENCES variable_symbol (id)');
+        $this->addSql('CREATE INDEX IDX_A45BDDC125813A9D ON application (variable_symbol_id)');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171224200017.php b/migrations/Version20171224200017.php
new file mode 100644
index 000000000..8adab04b1
--- /dev/null
+++ b/migrations/Version20171224200017.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171224200017 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('CREATE TABLE application_role (application_id INT NOT NULL, role_id INT NOT NULL, INDEX IDX_A085E2E23E030ACD (application_id), INDEX IDX_A085E2E2D60322AC (role_id), PRIMARY KEY(application_id, role_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE application_role ADD CONSTRAINT FK_A085E2E23E030ACD FOREIGN KEY (application_id) REFERENCES application (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE application_role ADD CONSTRAINT FK_A085E2E2D60322AC FOREIGN KEY (role_id) REFERENCES role (id) ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

From d8eeeeab97ef180e8d887dca4903af13fa8fd524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Sun, 24 Dec 2017 21:05:23 +0100
Subject: [PATCH 03/11] kompatibilita od 7.1

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index f51f0ce74..93bb7f949 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "skaut/SRS",
 
     "require": {
-        "php": ">=5.6",
+        "php": ">=7.1",
         "nette/nette": "^2.4",
 
         "kdyby/doctrine": "^3.2",

From 104ea45fb43aa7184b416e0fe9223b3c77a65842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Tue, 26 Dec 2017 01:56:37 +0100
Subject: [PATCH 04/11] uprava podakci, historizace - prihlaska, zmena roli

---
 .../ProgramAttendeesGridControl.php           |   3 +-
 .../components/ApplicationsGridControl.php    |  10 +-
 .../components/UsersGridControl.php           |   2 +-
 app/AdminModule/presenters/AclPresenter.php   |   9 +-
 .../components/ApplicationsGridControl.php    | 719 +++++++-----------
 .../templates/application_content.latte       |   9 +-
 app/WebModule/forms/ApplicationForm.php       | 212 ++----
 app/WebModule/forms/RolesForm.php             | 202 +++++
 app/WebModule/presenters/ProfilePresenter.php |  43 +-
 .../templates/Profile/default.latte           |   3 +
 app/config/config.neon                        |  11 +
 app/lang/common.cs_CZ.neon                    |   1 +
 app/lang/web.cs_CZ.neon                       |  20 +-
 app/model/ACL/Permission.php                  |   7 +-
 app/model/ACL/PermissionRepository.php        |  31 +-
 app/model/ACL/Resource.php                    |   7 +-
 app/model/ACL/Role.php                        | 197 ++---
 app/model/ACL/RoleRepository.php              |  34 +-
 app/model/CMS/Content/CapacitiesContent.php   |   7 +-
 app/model/CMS/Content/DocumentContent.php     |   7 +-
 app/model/CMS/Content/UsersContent.php        |   7 +-
 app/model/CMS/Document/Document.php           |   7 +-
 app/model/CMS/Document/Tag.php                |   5 +-
 app/model/CMS/Page.php                        |  11 +-
 app/model/Mailing/Mail.php                    |  13 +-
 app/model/Mailing/Template.php                |   7 +-
 app/model/Program/Block.php                   |  11 +-
 app/model/Program/BlockRepository.php         |  22 +-
 app/model/Program/Category.php                |  13 +-
 app/model/Program/CategoryRepository.php      |  19 +
 app/model/Program/Program.php                 |   9 +-
 app/model/Program/ProgramRepository.php       |  18 +-
 app/model/Program/Room.php                    |   3 +-
 .../Settings/CustomInput/CustomInput.php      |   7 +-
 app/model/Settings/SettingsRepository.php     |  70 +-
 app/model/Structure/Subevent.php              | 118 ++-
 app/model/Structure/SubeventRepository.php    |   6 +-
 .../User/{ => Application}/Application.php    | 121 ++-
 .../ApplicationRepository.php                 |   1 +
 .../User/Application/RolesApplication.php     |  67 ++
 .../RolesApplicationRepository.php            |  15 +
 .../User/Application/SubeventsApplication.php |  67 ++
 .../SubeventsApplicationRepository.php        |  15 +
 app/model/User/User.php                       | 206 +++--
 app/model/User/UserRepository.php             |  24 +-
 app/model/enums/ApplicationState.php          |   5 +
 app/services/ApplicationService.php           | 433 +++++++++--
 app/services/ProgramService.php               |  55 +-
 app/services/UserService.php                  |  51 --
 app/utils/Validators.php                      | 174 +++++
 migrations/Version20171225090913.php          |  25 +
 migrations/Version20171225091539.php          |  24 +
 migrations/Version20171225144953.php          |  23 +
 53 files changed, 1957 insertions(+), 1229 deletions(-)
 create mode 100644 app/WebModule/forms/RolesForm.php
 rename app/model/User/{ => Application}/Application.php (82%)
 rename app/model/User/{ => Application}/ApplicationRepository.php (96%)
 create mode 100644 app/model/User/Application/RolesApplication.php
 create mode 100644 app/model/User/Application/RolesApplicationRepository.php
 create mode 100644 app/model/User/Application/SubeventsApplication.php
 create mode 100644 app/model/User/Application/SubeventsApplicationRepository.php
 create mode 100644 app/utils/Validators.php
 create mode 100644 migrations/Version20171225090913.php
 create mode 100644 migrations/Version20171225091539.php
 create mode 100644 migrations/Version20171225144953.php

diff --git a/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php b/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
index a2b9254e2..139961236 100644
--- a/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
+++ b/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
@@ -127,7 +127,8 @@ public function createComponentProgramAttendeesGrid($name)
                 ->innerJoin('a.subevents', 's')
                 ->where('per.name = :permission')
                 ->andWhere('s.id = :sid')
-                ->andWhere('(a.state = \'' . ApplicationState::PAID . '\' OR a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\')')
+                ->andWhere('(a.state = \'' . ApplicationState::PAID . '\' OR a.state = \'' . ApplicationState::PAID_FREE
+                    . '\' OR a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\')')
                 ->setParameter('pid', $program->getId())
                 ->setParameter('permission', Permission::CHOOSE_PROGRAMS)
                 ->setParameter('sid', $program->getBlock()->getSubevent()->getId())
diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index 2564c1906..fb13dcd07 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -17,7 +17,6 @@
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\ApplicationService;
-use App\Services\Authenticator;
 use App\Services\MailService;
 use App\Services\PdfExportService;
 use App\Services\ProgramService;
@@ -62,9 +61,6 @@ class ApplicationsGridControl extends Control
     /** @var SettingsRepository */
     private $settingsRepository;
 
-    /** @var Authenticator */
-    private $authenticator;
-
     /** @var User */
     private $user;
 
@@ -86,7 +82,6 @@ class ApplicationsGridControl extends Control
      * @param ProgramRepository $programRepository
      * @param MailService $mailService
      * @param SettingsRepository $settingsRepository
-     * @param Authenticator $authenticator
      * @param PdfExportService $pdfExportService
      * @param ProgramService $programService
      */
@@ -94,8 +89,8 @@ public function __construct(Translator $translator, ApplicationRepository $appli
                                 UserRepository $userRepository, RoleRepository $roleRepository,
                                 SubeventRepository $subeventRepository, ApplicationService $applicationService,
                                 ProgramRepository $programRepository, MailService $mailService,
-                                SettingsRepository $settingsRepository, Authenticator $authenticator,
-                                PdfExportService $pdfExportService, ProgramService $programService)
+                                SettingsRepository $settingsRepository, PdfExportService $pdfExportService,
+                                ProgramService $programService)
     {
         parent::__construct();
 
@@ -108,7 +103,6 @@ public function __construct(Translator $translator, ApplicationRepository $appli
         $this->programRepository = $programRepository;
         $this->mailService = $mailService;
         $this->settingsRepository = $settingsRepository;
-        $this->authenticator = $authenticator;
         $this->pdfExportService = $pdfExportService;
         $this->programService = $programService;
     }
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index 8e288bba3..f5422e2a0 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -368,7 +368,7 @@ public function createComponentUsersGrid($name)
     }
 
     /**
-     * Zpracuje odstranění uživatele.
+     * Zpracuje odstranění externího uživatele.
      * @param $id
      * @throws \Nette\Application\AbortException
      */
diff --git a/app/AdminModule/presenters/AclPresenter.php b/app/AdminModule/presenters/AclPresenter.php
index 32cae09e3..7cfc28f3d 100644
--- a/app/AdminModule/presenters/AclPresenter.php
+++ b/app/AdminModule/presenters/AclPresenter.php
@@ -7,7 +7,6 @@
 use App\AdminModule\Forms\EditRoleForm;
 use App\Model\ACL\Permission;
 use App\Model\ACL\Resource;
-use App\Services\Authenticator;
 use Nette\Forms\Form;
 
 
@@ -36,13 +35,11 @@ class AclPresenter extends AdminBasePresenter
      * @inject
      */
     public $rolesGridControlFactory;
+
+
     /**
-     * @var Authenticator
-     * @inject
+     * @throws \Nette\Application\AbortException
      */
-    public $authenticator;
-
-    
     public function startup()
     {
         parent::startup();
diff --git a/app/WebModule/components/ApplicationsGridControl.php b/app/WebModule/components/ApplicationsGridControl.php
index 2681cd92f..88e00f8bb 100644
--- a/app/WebModule/components/ApplicationsGridControl.php
+++ b/app/WebModule/components/ApplicationsGridControl.php
@@ -15,6 +15,8 @@
 use App\Model\Structure\SubeventRepository;
 use App\Model\User\Application;
 use App\Model\User\ApplicationRepository;
+use App\Model\User\RolesApplicationRepository;
+use App\Model\User\SubeventsApplication;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\ApplicationService;
@@ -23,6 +25,7 @@
 use App\Services\PdfExportService;
 use App\Services\ProgramService;
 use App\Services\UserService;
+use App\Utils\Validators;
 use Doctrine\Common\Collections\ArrayCollection;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
@@ -79,6 +82,12 @@ class ApplicationsGridControl extends Control
     /** @var UserService */
     private $userService;
 
+    /** @var Validators */
+    private $validators;
+
+    /** @var RolesApplicationRepository */
+    private $rolesApplicationRepository;
+
 
     /**
      * ApplicationsGridControl constructor.
@@ -102,7 +111,8 @@ public function __construct(Translator $translator, ApplicationRepository $appli
                                 ProgramRepository $programRepository, MailService $mailService,
                                 SettingsRepository $settingsRepository, Authenticator $authenticator,
                                 PdfExportService $pdfExportService, ProgramService $programService,
-                                UserService $userService)
+                                UserService $userService, Validators $validators,
+                                RolesApplicationRepository $rolesApplicationRepository)
     {
         parent::__construct();
 
@@ -119,6 +129,8 @@ public function __construct(Translator $translator, ApplicationRepository $appli
         $this->pdfExportService = $pdfExportService;
         $this->programService = $programService;
         $this->userService = $userService;
+        $this->validators = $validators;
+        $this->rolesApplicationRepository = $rolesApplicationRepository;
     }
 
     /**
@@ -140,109 +152,94 @@ public function createComponentApplicationsGrid($name)
     {
         $this->user = $this->userRepository->findById($this->getPresenter()->getUser()->getId());
 
+        $explicitSubeventsExists = $this->subeventRepository->explicitSubeventsExists();
+        $userHasFixedFeeRole = $this->user->hasFixedFeeRole();
+
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
-        $grid->setDataSource($this->applicationRepository->createQueryBuilder('a')
+
+        if (!$explicitSubeventsExists)
+            $qb = $this->rolesApplicationRepository;
+        elseif (!$userHasFixedFeeRole)
+            $qb = $this->subeventsApplicationRepository;
+        else
+            $qb = $this->applicationRepository;
+
+        $qb = $qb->createQueryBuilder('a')
             ->join('a.user', 'u')
-            ->where('u.id = ' . $this->user->getId())
-        );
+            ->where('u = :user')
+            ->andWhere('a.validTo IS NULL')
+            ->setParameter('user', $this->user);
+
+        $grid->setDataSource($qb);
         $grid->setPagination(FALSE);
+        $grid->setDefaultSort(['applicationDate', 'ASC']);
 
         $grid->addColumnDateTime('applicationDate', 'web.profile.applications_application_date')
             ->setFormat('j. n. Y H:i');
 
-        $grid->addColumnText('roles', 'web.profile.applications_roles')
-            ->setRenderer(function ($row) {
-                if (!$row->isFirst())
-                    return "";
-
-                $roles = [];
-                foreach ($row->getUser()->getRoles() as $role) {
-                    $roles[] = $role->getName();
-                }
-                return implode(", ", $roles);
-            });
+        if ($userHasFixedFeeRole)
+        $grid->addColumnText('roles', 'web.profile.applications_roles', 'rolesText');
 
-        if ($this->subeventRepository->explicitSubeventsExists()) {
+        if ($explicitSubeventsExists)
             $grid->addColumnText('subevents', 'web.profile.applications_subevents', 'subeventsText');
-        }
 
         $grid->addColumnNumber('fee', 'web.profile.applications_fee');
 
-        $grid->addColumnText('variable_symbol', 'web.profile.applications_variable_symbol');
+        $grid->addColumnText('variable_symbol', 'web.profile.applications_variable_symbol', 'variableSymbolText');
 
         $grid->addColumnDateTime('maturityDate', 'web.profile.applications_maturity_date')
             ->setFormat('j. n. Y');
 
         $grid->addColumnText('state', 'web.profile.applications_state')
-            ->setRenderer(function ($row) {
-                $state = $this->translator->translate('common.application_state.' . $row->getState());
-
-                if ($row->getState() == ApplicationState::PAID && $row->getPaymentDate() !== NULL)
-                    $state .= ' (' . $row->getPaymentDate()->format('j. n. Y') . ')';
-
-                return $state;
+            ->setRenderer(function (Application $row) {
+                return $this->applicationService->getStateText($row);
             });
 
-        if ($this->applicationService->isAllowedAddSubevents($this->user)) {
-            $grid->addInlineAdd()->onControlAdd[] = function ($container) {
-                $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredExplicitOptionsWithCapacity($this->user))
-                    ->setAttribute('class', 'datagrid-multiselect')
-                    ->addRule(Form::FILLED, 'web.profile.applications_subevents_empty');
-            };
-            $grid->getInlineAdd()->setText($this->translator->translate('web.profile.applications_add_subevents'));
-            $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
-        }
+        if ($explicitSubeventsExists) {
+            if ($this->applicationService->isAllowedAddApplication($this->user)) {
+                $grid->addInlineAdd()->onControlAdd[] = function ($container) {
+                    $options = $this->subeventRepository->getNonRegisteredExplicitOptionsWithCapacity($this->user);
+                    $container->addMultiSelect('subevents', '', $options)
+                        ->setAttribute('class', 'datagrid-multiselect')
+                        ->addRule(Form::FILLED, 'web.profile.applications_subevents_empty');
+                };
+                $grid->getInlineAdd()->setText($this->translator->translate('web.profile.applications_add_subevents'));
+                $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
+            }
 
-        if ($this->applicationService->isAllowedEditFirstApplication($this->user)) {
             $grid->addInlineEdit()->onControlAdd[] = function ($container) {
-                $container->addMultiSelect('roles', '', $this->roleRepository->getRegisterableNowOrUsersOptionsWithCapacity($this->user))
+                $options = $this->subeventRepository->getExplicitOptionsWithCapacity();
+                $container->addMultiSelect('subevents', '', $options)
                     ->setAttribute('class', 'datagrid-multiselect')
-                    ->addRule(Form::FILLED, 'web.profile.applications_roles_empty');
-
-                if ($this->subeventRepository->explicitSubeventsExists()) {
-                    if ($this->user->getSubevents()->contains($this->subeventRepository->findImplicit()))
-                        $options = $this->subeventRepository->getSubeventsOptionsWithCapacity();
-                    else
-                        $options = $this->subeventRepository->getExplicitOptionsWithCapacity();
-
-                    $container->addMultiSelect('subevents', '', $options)
-                        ->setAttribute('class', 'datagrid-multiselect');
-                }
+                    ->addRule(Form::FILLED, 'web.profile.applications_subevents_empty');
             };
             $grid->getInlineEdit()->setText($this->translator->translate('web.profile.applications_edit'));
-            $grid->getInlineEdit()->onSetDefaults[] = function ($container, $item) {
+            $grid->getInlineEdit()->onSetDefaults[] = function ($container, SubeventsApplication $item) {
                 $container->setDefaults([
-                    'roles' => $this->roleRepository->findRolesIds($item->getUser()->getRoles()),
                     'subevents' => $this->subeventRepository->findSubeventsIds($item->getSubevents())
                 ]);
             };
             $grid->getInlineEdit()->onSubmit[] = [$this, 'edit'];
+            $grid->allowRowsInlineEdit(function(Application $item) {
+                return $item->getType() == Application::SUBEVENTS;
+            });
         }
 
         $grid->addAction('generatePaymentProofBank', 'web.profile.applications_download_payment_proof');
-        $grid->allowRowsAction('generatePaymentProofBank', function ($item) {
+        $grid->allowRowsAction('generatePaymentProofBank', function (Application $item) {
             return $item->getState() == ApplicationState::PAID
                 && $item->getPaymentMethod() == PaymentType::BANK
                 && $item->getPaymentDate();
         });
 
-        $grid->addAction('cancelRegistration', 'web.profile.applications_cancel_registration')
-            ->addAttributes([
-                'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('web.profile.applications_cancel_registration_confirm')
-            ])->setClass('btn btn-xs btn-danger');
-        $grid->allowRowsAction('cancelRegistration', function ($item) {
-            return $item->isFirst() && $this->applicationService->isAllowedCancelApplication($item);
-        });
-
         $grid->addAction('cancelApplication', 'web.profile.applications_cancel_application')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
                 'data-content' => $this->translator->translate('web.profile.applications_cancel_application_confirm')
             ])->setClass('btn btn-xs btn-danger');
-        $grid->allowRowsAction('cancelApplication', function ($item) {
-            return !$item->isFirst() && $this->applicationService->isAllowedCancelApplication($item);
+        $grid->allowRowsAction('cancelApplication', function (Application $item) {
+            return $item->getType() == Application::SUBEVENTS;
         });
 
         $grid->setColumnsSummary(['fee']);
@@ -257,88 +254,69 @@ public function createComponentApplicationsGrid($name)
      */
     public function add($values)
     {
-        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-        $selectedAndUsersSubevents = $this->user->getSubevents();
-        foreach ($selectedSubevents as $subevent)
-            $selectedAndUsersSubevents->add($subevent);
-
-        //kontrola podakci
-        if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-            $this->getPresenter()->flashMessage('web.profile.applications_subevents_empty', 'danger');
-            $this->redirect('this');
-        }
-
-        if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
-            $this->redirect('this');
-        }
-
-        foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
-            $incompatibleSubevents = $subevent->getIncompatibleSubevents();
-            if (count($incompatibleSubevents) > 0 && !$this->validateSubeventsIncompatible($selectedAndUsersSubevents, $subevent)) {
-                $messageThis = $subevent->getName();
-
-                $incompatibleSubeventsNames = [];
-                foreach ($incompatibleSubevents as $incompatibleSubevent) {
-                    $incompatibleSubeventsNames[] = $incompatibleSubevent->getName();
-                }
-                $messageOthers = implode(', ', $incompatibleSubeventsNames);
-
-                $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
-                    ['subevent' => $messageThis, 'incompatibleSubevents' => $messageOthers]
-                );
-                $this->getPresenter()->flashMessage($message, 'danger');
-                $this->redirect('this');
-            }
-
-            $requiredSubevents = $subevent->getRequiredSubeventsTransitive();
-            if (count($requiredSubevents) > 0 && !$this->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
-                $messageThis = $subevent->getName();
-
-                $requiredSubeventsNames = [];
-                foreach ($requiredSubevents as $requiredSubevent) {
-                    $requiredSubeventsNames[] = $requiredSubevent->getName();
-                }
-                $messageOthers = implode(', ', $requiredSubeventsNames);
-
-                $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
-                    ['subevent' => $messageThis, 'requiredSubevents' => $messageOthers]
-                );
-                $this->getPresenter()->flashMessage($message, 'danger');
-                $this->redirect('this');
-            }
-        }
-
-        //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedSubevents) {
-            $application = new Application();
-            $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
-            $application->setUser($this->user);
-            $application->setSubevents($selectedSubevents);
-            $application->setApplicationDate(new \DateTime());
-            $application->setMaturityDate($this->applicationService->countMaturityDate());
-            $application->setFee($fee);
-            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-            $application->setFirst(FALSE);
-            $this->applicationRepository->save($application);
-
-            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
-            $this->applicationRepository->save($application);
-
-            $this->user->addApplication($application);
-            $this->userRepository->save($this->user);
-
-            $this->programService->updateUserPrograms($this->user);
-
-            //zaslani potvrzovaciho e-mailu
-            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENT_ADDED, [
-                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                TemplateVariable::USERS_SUBEVENTS => $this->user->getSubeventsText()
-            ]);
-        });
-
-        $this->getPresenter()->flashMessage('web.profile.applications_add_subevents_successful', 'success');
-        $this->redirect('this');
+//        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+//        $selectedAndUsersSubevents = $this->user->getSubevents();
+//        foreach ($selectedSubevents as $subevent)
+//            $selectedAndUsersSubevents->add($subevent);
+//
+//        //kontrola podakci
+//        if (!$this->validators->validateSubeventsEmpty($selectedSubevents)) {
+//            $this->getPresenter()->flashMessage('web.profile.applications_subevents_empty', 'danger');
+//            $this->redirect('this');
+//        }
+//
+//        if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
+//            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
+//            $this->redirect('this');
+//        }
+//
+//        foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
+//            if (!$this->validators->validateSubeventsIncompatible($selectedAndUsersSubevents, $subevent)) {
+//                $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
+//                    ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
+//                );
+//                $this->getPresenter()->flashMessage($message, 'danger');
+//                $this->redirect('this');
+//            }
+//            if (!$this->validators->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
+//                $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
+//                    ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
+//                );
+//                $this->getPresenter()->flashMessage($message, 'danger');
+//                $this->redirect('this');
+//            }
+//        }
+//
+//        //zpracovani zmen
+//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedSubevents) {
+//            $application = new Application();
+//            $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
+//            $application->setUser($this->user);
+//            $application->setSubevents($selectedSubevents);
+//            $application->setApplicationDate(new \DateTime());
+//            $application->setMaturityDate($this->applicationService->countMaturityDate());
+//            $application->setFee($fee);
+//            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
+//            $application->setFirst(FALSE);
+//            $this->applicationRepository->save($application);
+//
+//            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
+//            $this->applicationRepository->save($application);
+//
+//            $this->user->addApplication($application);
+//            $this->userRepository->save($this->user);
+//
+//            $this->programService->updateUserPrograms($this->user);
+//
+//            //zaslani potvrzovaciho e-mailu
+//            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENT_ADDED, [
+//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+//                TemplateVariable::USERS_SUBEVENTS => $this->user->getSubeventsText()
+//            ]);
+//        });
+//
+//        $this->getPresenter()->flashMessage('web.profile.applications_add_subevents_successful', 'success');
+//        $this->redirect('this');
     }
 
     /**
@@ -351,136 +329,136 @@ public function add($values)
      */
     public function edit($id, $values)
     {
-        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-
-        //kontrola roli
-        if (!$this->validateRolesCapacities($selectedRoles)) {
-            $this->getPresenter()->flashMessage('web.profile.applications_roles_capacity_occupied', 'danger');
-            $this->redirect('this');
-        }
-
-        if (!$this->validateRolesRegisterable($selectedRoles)) {
-            $this->getPresenter()->flashMessage('web.profile.applications_role_is_not_registerable', 'danger');
-            $this->redirect('this');
-        }
-
-        foreach ($this->roleRepository->findAllRegisterableNowOrUsersOrderedByName($this->user) as $role) {
-            $incompatibleRoles = $role->getIncompatibleRoles();
-            if (count($incompatibleRoles) > 0 && !$this->validateRolesIncompatible($selectedRoles, $role)) {
-                $messageThis = $role->getName();
-
-                $incompatibleRolesNames = [];
-                foreach ($incompatibleRoles as $incompatibleRole) {
-                    $incompatibleRolesNames[] = $incompatibleRole->getName();
-                }
-                $messageOthers = implode(', ', $incompatibleRolesNames);
-
-                $message = $this->translator->translate('web.profile.applications_incompatible_roles_selected', NULL,
-                    ['role' => $messageThis, 'incompatibleRoles' => $messageOthers]
-                );
-                $this->getPresenter()->flashMessage($message, 'danger');
-                $this->redirect('this');
-            }
-
-            $requiredRoles = $role->getRequiredRolesTransitive();
-            if (count($requiredRoles) > 0 && !$this->validateRolesRequired($selectedRoles, $role)) {
-                $messageThis = $role->getName();
-
-                $requiredRolesNames = [];
-                foreach ($requiredRoles as $requiredRole) {
-                    $requiredRolesNames[] = $requiredRole->getName();
-                }
-                $messageOthers = implode(', ', $requiredRolesNames);
-
-                $message = $this->translator->translate('web.profile.applications_required_roles_not_selected', NULL,
-                    ['role' => $messageThis, 'requiredRoles' => $messageOthers]
-                );
-                $this->getPresenter()->flashMessage($message, 'danger');
-                $this->redirect('this');
-            }
-        }
-
-
-        if ($this->subeventRepository->explicitSubeventsExists()) {
-            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-
-            //kontrola podakci
-            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-                $this->getPresenter()->flashMessage('web.profile.applications_subevents_empty', 'danger');
-                $this->redirect('this');
-            }
-
-            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-                $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
-                $this->redirect('this');
-            }
-
-            foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
-                $incompatibleSubevents = $subevent->getIncompatibleSubevents();
-                if (count($incompatibleSubevents) > 0 && !$this->validateSubeventsIncompatible($selectedSubevents, $subevent)) {
-                    $messageThis = $subevent->getName();
-
-                    $incompatibleSubeventsNames = [];
-                    foreach ($incompatibleSubevents as $incompatibleSubevent) {
-                        $incompatibleSubeventsNames[] = $incompatibleSubevent->getName();
-                    }
-                    $messageOthers = implode(', ', $incompatibleSubeventsNames);
-
-                    $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
-                        ['subevent' => $messageThis, 'incompatibleSubevents' => $messageOthers]
-                    );
-                    $this->getPresenter()->flashMessage($message, 'danger');
-                    $this->redirect('this');
-                }
-
-                $requiredSubevents = $subevent->getRequiredSubeventsTransitive();
-                if (count($requiredSubevents) > 0 && !$this->validateSubeventsRequired($selectedSubevents, $subevent)) {
-                    $messageThis = $subevent->getName();
-
-                    $requiredSubeventsNames = [];
-                    foreach ($requiredSubevents as $requiredSubevent) {
-                        $requiredSubeventsNames[] = $requiredSubevent->getName();
-                    }
-                    $messageOthers = implode(', ', $requiredSubeventsNames);
-
-                    $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
-                        ['subevent' => $messageThis, 'requiredSubevents' => $messageOthers]
-                    );
-                    $this->getPresenter()->flashMessage($message, 'danger');
-                    $this->redirect('this');
-                }
-            }
-        }
-
-        //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($id, $selectedRoles, $selectedSubevents, $values) {
-            $application = $this->applicationRepository->findById($id);
-
-            if ($this->subeventRepository->explicitSubeventsExists() && !empty($values['subevents']))
-                $application->setSubevents($selectedSubevents);
-            else
-                $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
-
-            $this->userService->changeRoles($this->user, $selectedRoles);
-
-            $this->programService->updateUserPrograms($this->user);
-
-            //zaslani potvrzovaciho e-mailu
-            $subeventsNames = [];
-            foreach ($this->user->getSubevents() as $subevent) {
-                $subeventsNames[] = $subevent->getName();
-            }
-
-            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENTS_CHANGED, [
-                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                TemplateVariable::USERS_SUBEVENTS => implode(', ', $subeventsNames)
-            ]);
-
-            $this->authenticator->updateRoles($this->getPresenter()->getUser());
-        });
-
-        $this->getPresenter()->flashMessage('web.profile.applications_edit_successful', 'success');
-        $this->redirect('this');
+//        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
+//
+//        //kontrola roli
+//        if (!$this->validateRolesCapacities($selectedRoles)) {
+//            $this->getPresenter()->flashMessage('web.profile.applications_roles_capacity_occupied', 'danger');
+//            $this->redirect('this');
+//        }
+//
+//        if (!$this->validateRolesRegisterable($selectedRoles)) {
+//            $this->getPresenter()->flashMessage('web.profile.applications_role_is_not_registerable', 'danger');
+//            $this->redirect('this');
+//        }
+//
+//        foreach ($this->roleRepository->findAllRegisterableNowOrUsersOrderedByName($this->user) as $role) {
+//            $incompatibleRoles = $role->getIncompatibleRoles();
+//            if (count($incompatibleRoles) > 0 && !$this->validateRolesIncompatible($selectedRoles, $role)) {
+//                $messageThis = $role->getName();
+//
+//                $incompatibleRolesNames = [];
+//                foreach ($incompatibleRoles as $incompatibleRole) {
+//                    $incompatibleRolesNames[] = $incompatibleRole->getName();
+//                }
+//                $messageOthers = implode(', ', $incompatibleRolesNames);
+//
+//                $message = $this->translator->translate('web.profile.applications_incompatible_roles_selected', NULL,
+//                    ['role' => $messageThis, 'incompatibleRoles' => $messageOthers]
+//                );
+//                $this->getPresenter()->flashMessage($message, 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            $requiredRoles = $role->getRequiredRolesTransitive();
+//            if (count($requiredRoles) > 0 && !$this->validateRolesRequired($selectedRoles, $role)) {
+//                $messageThis = $role->getName();
+//
+//                $requiredRolesNames = [];
+//                foreach ($requiredRoles as $requiredRole) {
+//                    $requiredRolesNames[] = $requiredRole->getName();
+//                }
+//                $messageOthers = implode(', ', $requiredRolesNames);
+//
+//                $message = $this->translator->translate('web.profile.applications_required_roles_not_selected', NULL,
+//                    ['role' => $messageThis, 'requiredRoles' => $messageOthers]
+//                );
+//                $this->getPresenter()->flashMessage($message, 'danger');
+//                $this->redirect('this');
+//            }
+//        }
+//
+//
+//        if ($this->subeventRepository->explicitSubeventsExists()) {
+//            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+//
+//            //kontrola podakci
+//            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
+//                $this->getPresenter()->flashMessage('web.profile.applications_subevents_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
+//                $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
+//                $incompatibleSubevents = $subevent->getIncompatibleSubevents();
+//                if (count($incompatibleSubevents) > 0 && !$this->validateSubeventsIncompatible($selectedSubevents, $subevent)) {
+//                    $messageThis = $subevent->getName();
+//
+//                    $incompatibleSubeventsNames = [];
+//                    foreach ($incompatibleSubevents as $incompatibleSubevent) {
+//                        $incompatibleSubeventsNames[] = $incompatibleSubevent->getName();
+//                    }
+//                    $messageOthers = implode(', ', $incompatibleSubeventsNames);
+//
+//                    $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
+//                        ['subevent' => $messageThis, 'incompatibleSubevents' => $messageOthers]
+//                    );
+//                    $this->getPresenter()->flashMessage($message, 'danger');
+//                    $this->redirect('this');
+//                }
+//
+//                $requiredSubevents = $subevent->getRequiredSubeventsTransitive();
+//                if (count($requiredSubevents) > 0 && !$this->validateSubeventsRequired($selectedSubevents, $subevent)) {
+//                    $messageThis = $subevent->getName();
+//
+//                    $requiredSubeventsNames = [];
+//                    foreach ($requiredSubevents as $requiredSubevent) {
+//                        $requiredSubeventsNames[] = $requiredSubevent->getName();
+//                    }
+//                    $messageOthers = implode(', ', $requiredSubeventsNames);
+//
+//                    $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
+//                        ['subevent' => $messageThis, 'requiredSubevents' => $messageOthers]
+//                    );
+//                    $this->getPresenter()->flashMessage($message, 'danger');
+//                    $this->redirect('this');
+//                }
+//            }
+//        }
+//
+//        //zpracovani zmen
+//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($id, $selectedRoles, $selectedSubevents, $values) {
+//            $application = $this->applicationRepository->findById($id);
+//
+//            if ($this->subeventRepository->explicitSubeventsExists() && !empty($values['subevents']))
+//                $application->setSubevents($selectedSubevents);
+//            else
+//                $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
+//
+//            $this->userService->changeRoles($this->user, $selectedRoles);
+//
+//            $this->programService->updateUserPrograms($this->user);
+//
+//            //zaslani potvrzovaciho e-mailu
+//            $subeventsNames = [];
+//            foreach ($this->user->getSubevents() as $subevent) {
+//                $subeventsNames[] = $subevent->getName();
+//            }
+//
+//            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENTS_CHANGED, [
+//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+//                TemplateVariable::USERS_SUBEVENTS => implode(', ', $subeventsNames)
+//            ]);
+//
+//            $this->authenticator->updateRoles($this->getPresenter()->getUser());
+//        });
+//
+//        $this->getPresenter()->flashMessage('web.profile.applications_edit_successful', 'success');
+//        $this->redirect('this');
     }
 
     /**
@@ -495,33 +473,6 @@ public function handleGeneratePaymentProofBank($id)
         );
     }
 
-    /**
-     * Odhlásí uživatele ze semináře.
-     * @param $id
-     * @throws \App\Model\Settings\SettingsException
-     * @throws \Nette\Application\AbortException
-     * @throws \Ublaboo\Mailing\Exception\MailingException
-     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
-     */
-    public function handleCancelRegistration($id)
-    {
-        $application = $this->applicationRepository->findById($id);
-
-        if ($this->applicationService->isAllowedCancelApplication($application)) {
-            $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::REGISTRATION_CANCELED, [
-                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
-            ]);
-
-            $p = $this->getPresenter();
-
-            $this->userRepository->remove($application->getUser());
-
-            $p->redirect(':Auth:logout');
-        } else {
-            $this->redirect('this');
-        }
-    }
-
     /**
      * Zruší přihlášku.
      * @param $id
@@ -531,158 +482,22 @@ public function handleCancelRegistration($id)
      */
     public function handleCancelApplication($id)
     {
-        $application = $this->applicationRepository->findById($id);
-
-        if ($this->applicationService->isAllowedCancelApplication($application)) {
-            $user = $application->getUser();
-
-            $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $user) {
-                $application->setState(ApplicationState::CANCELED);
-                $this->applicationRepository->save($application);
-
-                $this->programService->updateUserPrograms($user);
-            });
-
-            $this->getPresenter()->flashMessage('web.profile.applications_application_canceled', 'success');
-        }
-
-        $this->redirect('this');
-    }
-
-    /**
-     * Ověří, že je vybrána alespoň jedna podakce.
-     * @param $selectedSubevents
-     * @return bool
-     */
-    private function validateSubeventsEmpty($selectedSubevents)
-    {
-        if ($selectedSubevents->isEmpty())
-            return FALSE;
-        return TRUE;
-    }
-    
-    /**
-     * Ověří kapacitu rolí.
-     * @param $selectedRoles
-     * @return bool
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function validateRolesCapacities($selectedRoles)
-    {
-        foreach ($selectedRoles as $role) {
-            if ($role->hasLimitedCapacity()) {
-                if ($this->roleRepository->countUnoccupiedInRole($role) < 1 && !$this->user->isInRole($role))
-                    return FALSE;
-            }
-        }
-        return TRUE;
-    }
-
-    /**
-     * Ověří kompatibilitu rolí.
-     * @param $selectedRoles
-     * @param $testRole
-     * @return bool
-     */
-    public function validateRolesIncompatible($selectedRoles, Role $testRole)
-    {
-        if (!$selectedRoles->contains($testRole))
-            return TRUE;
-
-        foreach ($testRole->getIncompatibleRoles() as $incompatibleRole) {
-            if ($selectedRoles->contains($incompatibleRole))
-                return FALSE;
-        }
-
-        return TRUE;
-    }
-
-    /**
-     * Ověří výběr vyžadovaných rolí.
-     * @param $selectedRoles
-     * @param $testRole
-     * @return bool
-     */
-    public function validateRolesRequired($selectedRoles, Role $testRole)
-    {
-        if (!$selectedRoles->contains($testRole))
-            return TRUE;
-
-        foreach ($testRole->getRequiredRolesTransitive() as $requiredRole) {
-            if (!$selectedRoles->contains($requiredRole))
-                return FALSE;
-        }
-
-        return TRUE;
-    }
-    
-    /**
-     * Ověří registrovatelnost rolí.
-     * @param $selectedRoles
-     * @return bool
-     */
-    public function validateRolesRegisterable($selectedRoles)
-    {
-        foreach ($selectedRoles as $role) {
-            if (!$role->isRegisterableNow() && !$this->user->isInRole($role))
-                return FALSE;
-        }
-        return TRUE;
-    }
-
-    /**
-     * Ověří kapacitu podakcí.
-     * @param $selectedSubevents
-     * @return bool
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function validateSubeventsCapacities($selectedSubevents)
-    {
-        foreach ($selectedSubevents as $subevent) {
-            if ($subevent->hasLimitedCapacity()) {
-                if ($this->subeventRepository->countUnoccupiedInSubevent($subevent) < 1 && !$this->user->hasSubevent($subevent))
-                    return FALSE;
-            }
-        }
-        return TRUE;
-    }
-
-    /**
-     * Ověří kompatibilitu podakcí.
-     * @param $selectedSubevents
-     * @param Subevent $testSubevent
-     * @return bool
-     */
-    public function validateSubeventsIncompatible($selectedSubevents, Subevent $testSubevent)
-    {
-        if (!$selectedSubevents->contains($testSubevent))
-            return TRUE;
-
-        foreach ($testSubevent->getIncompatibleSubevents() as $incompatibleSubevent) {
-            if ($selectedSubevents->contains($incompatibleSubevent))
-                return FALSE;
-        }
-
-        return TRUE;
-    }
-
-    /**
-     * Ověří výběr vyžadovaných podakcí.
-     * @param $selectedSubevents
-     * @param Subevent $testSubevent
-     * @return bool
-     */
-    public function validateSubeventsRequired($selectedSubevents, Subevent $testSubevent)
-    {
-        if (!$selectedSubevents->contains($testSubevent))
-            return TRUE;
-
-        foreach ($testSubevent->getRequiredSubeventsTransitive() as $requiredSubevent) {
-            if (!$selectedSubevents->contains($requiredSubevent))
-                return FALSE;
-        }
-
-        return TRUE;
+//        $application = $this->applicationRepository->findById($id);
+//
+//        if ($this->applicationService->isAllowedCancelApplication($application)) {
+//            $user = $application->getUser();
+//
+//            $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $user) {
+//                $application->setState(ApplicationState::CANCELED);
+//                $this->applicationRepository->save($application);
+//
+//                $this->programService->updateUserPrograms($user);
+//            });
+//
+//            $this->getPresenter()->flashMessage('web.profile.applications_application_canceled', 'success');
+//        }
+//
+//        $this->redirect('this');
     }
 }
 
diff --git a/app/WebModule/components/templates/application_content.latte b/app/WebModule/components/templates/application_content.latte
index acd13cd58..7fcc2093f 100644
--- a/app/WebModule/components/templates/application_content.latte
+++ b/app/WebModule/components/templates/application_content.latte
@@ -71,6 +71,7 @@
 
                         <br><br>
 
+                        {*TODO tabulka s přehledem cen*}
                         <table class="table table-bordered table-striped" style="background-color: #ffffff">
                             <thead>
                                 <tr>
@@ -90,16 +91,14 @@
                                     <tr>
                                         <td>{$application->getApplicationDate()->format('j. n. Y')}</td>
                                         <td>
-                                            {if $application->isFirst()}
-                                                {$dbuser->getRolesText()}
-                                            {/if}
+
                                         </td>
                                         {if $subeventsExists}
                                             <td>{$application->getSubeventsText()}</td>
                                         {/if}
                                         <td>{$application->getFee()}</td>
-                                        <td>{$application->getVariableSymbol()}</td>
-                                        <td>{$application->getMaturityDate()->format('j. n. Y')}</td>
+                                        <td>{$application->getVariableSymbolText()}</td>
+                                        {*<td>{$application->getMaturityDate()->format('j. n. Y')}</td>*}
                                         <td>{_'common.application_state.'.$application->getState()}</td>
                                     </tr>
                                 {/foreach}
diff --git a/app/WebModule/forms/ApplicationForm.php b/app/WebModule/forms/ApplicationForm.php
index 08c20d127..0cd43873c 100644
--- a/app/WebModule/forms/ApplicationForm.php
+++ b/app/WebModule/forms/ApplicationForm.php
@@ -26,6 +26,7 @@
 use App\Services\MailService;
 use App\Services\ProgramService;
 use App\Services\SkautIsService;
+use App\Utils\Validators;
 use Doctrine\Common\Collections\ArrayCollection;
 use Nette;
 use Nette\Application\UI\Form;
@@ -94,6 +95,9 @@ class ApplicationForm extends Nette\Object
     /** @var ProgramService */
     private $programService;
 
+    /** @var Validators */
+    private $validators;
+
 
     /**
      * ApplicationForm constructor.
@@ -117,7 +121,8 @@ public function __construct(BaseForm $baseFormFactory, UserRepository $userRepos
                                 ProgramRepository $programRepository, SkautIsService $skautIsService,
                                 SettingsRepository $settingsRepository, MailService $mailService,
                                 SubeventRepository $subeventRepository, ApplicationRepository $applicationRepository,
-                                ApplicationService $applicationService, ProgramService $programService)
+                                ApplicationService $applicationService, ProgramService $programService,
+                                Validators $validators)
     {
         $this->baseFormFactory = $baseFormFactory;
         $this->userRepository = $userRepository;
@@ -132,6 +137,7 @@ public function __construct(BaseForm $baseFormFactory, UserRepository $userRepos
         $this->applicationRepository = $applicationRepository;
         $this->applicationService = $applicationService;
         $this->programService = $programService;
+        $this->validators = $validators;
     }
 
     /**
@@ -243,23 +249,6 @@ public function processForm(Form $form, \stdClass $values)
             $this->user->setPostcode($values['postcode']);
             $this->user->setState($values['state']);
 
-            //role
-            if (array_key_exists('roles', $values))
-                $roles = $this->roleRepository->findRolesByIds($values['roles']);
-            else
-                $roles = $this->roleRepository->findAllRegisterableNowOrderedByName();
-
-            $this->user->removeRole($this->roleRepository->findBySystemName(Role::NONREGISTERED));
-
-            foreach ($roles as $role) {
-                if (!$role->isApprovedAfterRegistration()) {
-                    $this->user->setApproved(FALSE);
-                    break;
-                }
-            }
-
-            $this->user->setRoles($roles);
-
             //vlastni pole
             foreach ($this->customInputRepository->findAll() as $customInput) {
                 $customInputValue = $this->user->getCustomInputValue($customInput);
@@ -295,31 +284,18 @@ public function processForm(Form $form, \stdClass $values)
             if (array_key_exists('departure', $values))
                 $this->user->setDeparture($values['departure']);
 
+            //role
+            if (array_key_exists('roles', $values))
+                $roles = $this->roleRepository->findRolesByIds($values['roles']);
+            else
+                $roles = $this->roleRepository->findAllRegisterableNowOrderedByName();
+
             //podakce
             $subevents = $this->subeventRepository->explicitSubeventsExists() && !empty($values['subevents'])
                 ? $this->subeventRepository->findSubeventsByIds($values['subevents'])
                 : new ArrayCollection([$this->subeventRepository->findImplicit()]);
 
-            $application = new Application();
-            $fee = $this->applicationService->countFee($roles, $subevents);
-            $application->setUser($this->user);
-            $application->setSubevents($subevents);
-            $application->setApplicationDate(new \DateTime());
-            $application->setMaturityDate($this->applicationService->countMaturityDate());
-            $application->setFee($fee);
-            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-            $this->applicationRepository->save($application);
-
-            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
-            $this->applicationRepository->save($application);
-
-            $this->user->addApplication($application);
-            $this->userRepository->save($this->user);
-
-            //prihlaseni automaticke prihlasovanych programu
-            $this->programService->updateUserPrograms($this->user);
-
-            //aktualizace udaju ve skautis
+            //aktualizace udaju ve skautIS
             try {
                 $this->skautIsService->updatePersonBasic(
                     $this->user->getSkautISPersonId(),
@@ -341,17 +317,8 @@ public function processForm(Form $form, \stdClass $values)
                 $this->onSkautIsError();
             }
 
-            $editRegistrationTo = $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO);
-
-            //odeslani potvrzovaciho mailu
-            $this->mailService->sendMailFromTemplate($this->user, '', Template::REGISTRATION, [
-                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                TemplateVariable::EDIT_REGISTRATION_TO => $editRegistrationTo !== NULL ? $editRegistrationTo->format('j. n. Y') : '',
-                TemplateVariable::APPLICATION_MATURITY => $application->getMaturityDate() !== NULL ? $application->getMaturityDate()->format('j. n. Y') : '',
-                TemplateVariable::APPLICATION_FEE => $application->getFee(),
-                TemplateVariable::APPLICATION_VARIABLE_SYMBOL => $application->getVariableSymbol(),
-                TemplateVariable::BANK_ACCOUNT => $this->settingsRepository->getValue(Settings::ACCOUNT_NUMBER)
-            ]);
+            //vytvoreni prihlasky
+            $this->applicationService->register($this->user, $roles, $subevents, $this->user);
         });
     }
 
@@ -403,37 +370,19 @@ private function addSubeventsSelect(Form $form)
 
             //generovani chybovych hlasek pro vsechny kombinace podakci
             foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
-                $incompatibleSubevents = $subevent->getIncompatibleSubevents();
-                if (count($incompatibleSubevents) > 0) {
-                    $messageThis = $subevent->getName();
-
-                    $incompatibleSubeventsNames = [];
-                    foreach ($incompatibleSubevents as $incompatibleSubevent) {
-                        $incompatibleSubeventsNames[] = $incompatibleSubevent->getName();
-                    }
-                    $messageOthers = implode(', ', $incompatibleSubeventsNames);
-
+                if (!$subevent->getIncompatibleSubevents()-isEmpty()) {
                     $subeventsSelect->addRule([$this, 'validateSubeventsIncompatible'],
                         $form->getTranslator()->translate('web.application_content.incompatible_subevents_selected', NULL,
-                            ['subevent' => $messageThis, 'incompatibleSubevents' => $messageOthers]
+                            ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
                         ),
                         [$subevent]
                     );
                 }
 
-                $requiredSubevents = $subevent->getRequiredSubeventsTransitive();
-                if (count($requiredSubevents) > 0) {
-                    $messageThis = $subevent->getName();
-
-                    $requiredSubeventsNames = [];
-                    foreach ($requiredSubevents as $requiredSubevent) {
-                        $requiredSubeventsNames[] = $requiredSubevent->getName();
-                    }
-                    $messageOthers = implode(', ', $requiredSubeventsNames);
-
+                if (!$subevent->getRequiredSubeventsTransitive()->isEmpty()) {
                     $subeventsSelect->addRule([$this, 'validateSubeventsRequired'],
                         $form->getTranslator()->translate('web.application_content.required_subevents_not_selected', NULL,
-                            ['subevent' => $messageThis, 'requiredSubevents' => $messageOthers]
+                            ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
                         ),
                         [$subevent]
                     );
@@ -460,37 +409,19 @@ private function addRolesSelect(Form $form)
 
         //generovani chybovych hlasek pro vsechny kombinace roli
         foreach ($this->roleRepository->findAllRegisterableNowOrUsersOrderedByName($this->user) as $role) {
-            $incompatibleRoles = $role->getIncompatibleRoles();
-            if (count($incompatibleRoles) > 0) {
-                $messageThis = $role->getName();
-
-                $incompatibleRolesNames = [];
-                foreach ($incompatibleRoles as $incompatibleRole) {
-                    $incompatibleRolesNames[] = $incompatibleRole->getName();
-                }
-                $messageOthers = implode(', ', $incompatibleRolesNames);
-
+            if (!$role->getIncompatibleRoles()->isEmpty()) {
                 $rolesSelect->addRule([$this, 'validateRolesIncompatible'],
                     $form->getTranslator()->translate('web.application_content.incompatible_roles_selected', NULL,
-                        ['role' => $messageThis, 'incompatibleRoles' => $messageOthers]
+                        ['role' => $role->getName(), 'incompatibleRoles' => $role->getIncompatibleRolesText()]
                     ),
                     [$role]
                 );
             }
 
-            $requiredRoles = $role->getRequiredRolesTransitive();
-            if (count($requiredRoles) > 0) {
-                $messageThis = $role->getName();
-
-                $requiredRolesNames = [];
-                foreach ($requiredRoles as $requiredRole) {
-                    $requiredRolesNames[] = $requiredRole->getName();
-                }
-                $messageOthers = implode(', ', $requiredRolesNames);
-
+            if (!$role->getRequiredRolesTransitive()->isEmpty()) {
                 $rolesSelect->addRule([$this, 'validateRolesRequired'],
                     $form->getTranslator()->translate('web.application_content.required_roles_not_selected', NULL,
-                        ['role' => $messageThis, 'requiredRoles' => $messageOthers]
+                        ['role' => $role->getName(), 'requiredRoles' => $role->getRequiredRolesTransitiveText()]
                     ),
                     [$role]
                 );
@@ -532,15 +463,10 @@ private function addArrivalDeparture(Form $form)
      * @return bool
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function validateSubeventsCapacities($field, $args)
+    public function validateSubeventsCapacities($field, $args): bool
     {
-        foreach ($this->subeventRepository->findSubeventsByIds($field->getValue()) as $subevent) {
-            if ($subevent->hasLimitedCapacity()) {
-                if ($this->subeventRepository->countUnoccupiedInSubevent($subevent) < 1)
-                    return FALSE;
-            }
-        }
-        return TRUE;
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($field->getVaLue());
+        return $this->validators->validateSubeventsCapacities($selectedSubevents, $this->user);
     }
 
     /**
@@ -550,15 +476,10 @@ public function validateSubeventsCapacities($field, $args)
      * @return bool
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function validateRolesCapacities($field, $args)
+    public function validateRolesCapacities($field, $args): bool
     {
-        foreach ($this->roleRepository->findRolesByIds($field->getValue()) as $role) {
-            if ($role->hasLimitedCapacity()) {
-                if ($this->roleRepository->countUnoccupiedInRole($role) < 1)
-                    return FALSE;
-            }
-        }
-        return TRUE;
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        return $this->validators->validateRolesCapacities($selectedRoles, $this->user);
     }
 
     /**
@@ -567,20 +488,11 @@ public function validateRolesCapacities($field, $args)
      * @param $args
      * @return bool
      */
-    public function validateSubeventsIncompatible($field, $args)
+    public function validateSubeventsIncompatible($field, $args): bool
     {
-        $selectedSubeventsIds = $field->getValue();
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($field->getValue());
         $testSubevent = $args[0];
-
-        if (!in_array($testSubevent->getId(), $selectedSubeventsIds))
-            return TRUE;
-
-        foreach ($testSubevent->getIncompatibleSubevents() as $incompatibleSubevent) {
-            if (in_array($incompatibleSubevent->getId(), $selectedSubeventsIds))
-                return FALSE;
-        }
-
-        return TRUE;
+        return $this->validators->validateSubeventsIncompatible($selectedSubevents, $testSubevent);
     }
 
     /**
@@ -589,20 +501,11 @@ public function validateSubeventsIncompatible($field, $args)
      * @param $args
      * @return bool
      */
-    public function validateSubeventsRequired($field, $args)
+    public function validateSubeventsRequired($field, $args): bool
     {
-        $selectedSubeventsIds = $field->getValue();
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($field->getValue());
         $testSubevent = $args[0];
-
-        if (!in_array($testSubevent->getId(), $selectedSubeventsIds))
-            return TRUE;
-
-        foreach ($testSubevent->getRequiredSubeventsTransitive() as $requiredSubevent) {
-            if (!in_array($requiredSubevent->getId(), $selectedSubeventsIds))
-                return FALSE;
-        }
-
-        return TRUE;
+        return $this->validators->validateSubeventsRequired($selectedSubevents, $testSubevent);
     }
 
     /**
@@ -611,20 +514,11 @@ public function validateSubeventsRequired($field, $args)
      * @param $args
      * @return bool
      */
-    public function validateRolesIncompatible($field, $args)
+    public function validateRolesIncompatible($field, $args): bool
     {
-        $selectedRolesIds = $field->getValue();
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
         $testRole = $args[0];
-
-        if (!in_array($testRole->getId(), $selectedRolesIds))
-            return TRUE;
-
-        foreach ($testRole->getIncompatibleRoles() as $incompatibleRole) {
-            if (in_array($incompatibleRole->getId(), $selectedRolesIds))
-                return FALSE;
-        }
-
-        return TRUE;
+        return $this->validators->validateRolesIncompatible($selectedRoles, $testRole);
     }
 
     /**
@@ -633,20 +527,11 @@ public function validateRolesIncompatible($field, $args)
      * @param $args
      * @return bool
      */
-    public function validateRolesRequired($field, $args)
+    public function validateRolesRequired($field, $args): bool
     {
-        $selectedRolesIds = $field->getValue();
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
         $testRole = $args[0];
-
-        if (!in_array($testRole->getId(), $selectedRolesIds))
-            return TRUE;
-
-        foreach ($testRole->getRequiredRolesTransitive() as $requiredRole) {
-            if (!in_array($requiredRole->getId(), $selectedRolesIds))
-                return FALSE;
-        }
-
-        return TRUE;
+        return $this->validators->validateRolesRequired($selectedRoles, $testRole);
     }
 
     /**
@@ -655,13 +540,10 @@ public function validateRolesRequired($field, $args)
      * @param $args
      * @return bool
      */
-    public function validateRolesRegisterable($field, $args)
+    public function validateRolesRegisterable($field, $args): bool
     {
-        foreach ($this->roleRepository->findRolesByIds($field->getValue()) as $role) {
-            if (!$role->isRegisterableNow())
-                return FALSE;
-        }
-        return TRUE;
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        return $this->validators->validateRolesRegisterable($selectedRoles, $this->user);
     }
 
     /**
@@ -670,7 +552,7 @@ public function validateRolesRegisterable($field, $args)
      * @param $args
      * @return bool
      */
-    public function toggleSubeventsRequired($field, $args)
+    public function toggleSubeventsRequired($field, $args): bool
     {
         $rolesWithSubevents = $this->roleRepository->findRolesIds($this->roleRepository->findAllWithSubevents());
         foreach ($field->getValue() as $roleId)
@@ -684,7 +566,7 @@ public function toggleSubeventsRequired($field, $args)
      * @param IControl $control
      * @return bool
      */
-    public static function toggleArrivalDeparture(IControl $control)
+    public static function toggleArrivalDeparture(IControl $control): bool
     {
         return FALSE;
     }
diff --git a/app/WebModule/forms/RolesForm.php b/app/WebModule/forms/RolesForm.php
new file mode 100644
index 000000000..1d373e015
--- /dev/null
+++ b/app/WebModule/forms/RolesForm.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace App\WebModule\Forms;
+
+use App\Model\ACL\RoleRepository;
+use App\Model\Program\ProgramRepository;
+use App\Model\User\User;
+use App\Model\User\UserRepository;
+use App\Services\ApplicationService;
+use App\Utils\Validators;
+use Nette;
+use Nette\Application\UI\Form;
+
+
+/**
+ * Formulář pro změnu rolí.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class RolesForm extends Nette\Object
+{
+    /**
+     * Přihlášený uživatel.
+     * @var User
+     */
+    private $user;
+
+    /** @var BaseForm */
+    private $baseFormFactory;
+
+    /** @var UserRepository */
+    private $userRepository;
+
+    /** @var RoleRepository */
+    private $roleRepository;
+
+    /** @var ApplicationService */
+    private $applicationService;
+
+    /** @var Validators */
+    private $validators;
+
+
+    /**
+     * RolesForm constructor.
+     * @param BaseForm $baseFormFactory
+     * @param UserRepository $userRepository
+     * @param RoleRepository $roleRepository
+     * @param ApplicationService $applicationService
+     */
+    public function __construct(BaseForm $baseFormFactory, UserRepository $userRepository,
+                                RoleRepository $roleRepository, ApplicationService $applicationService,
+                                Validators $validators)
+    {
+        $this->baseFormFactory = $baseFormFactory;
+        $this->userRepository = $userRepository;
+        $this->roleRepository = $roleRepository;
+        $this->applicationService = $applicationService;
+        $this->validators = $validators;
+    }
+
+    /**
+     * Vytvoří formulář.
+     * @param $id
+     * @return Form
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function create($id)
+    {
+        $this->user = $this->userRepository->findById($id);
+
+        $form = $this->baseFormFactory->create();
+
+        $form->addHidden('id');
+
+        $rolesSelect = $form->addMultiSelect('roles', 'web.profile.roles')->setItems(
+            $this->roleRepository->getRegisterableNowOrUsersOptionsWithCapacity($this->user)
+        )
+            ->addRule(Form::FILLED, 'web.profile.roles_empty')
+            ->addRule([$this, 'validateRolesCapacities'], 'web.profile.roles_capacity_occupied')
+            ->addRule([$this, 'validateRolesRegisterable'], 'web.profile.role_is_not_registerable')
+            ->setDisabled(!$this->applicationService->isAllowedEditRegistration($this->user));
+
+        foreach ($this->roleRepository->findAllRegisterableNowOrUsersOrderedByName($this->user) as $role) {
+            if (!$role->getIncompatibleRoles()->isEmpty()) {
+                $rolesSelect->addRule([$this, 'validateRolesIncompatible'],
+                    $form->getTranslator()->translate('web.profile.incompatible_roles_selected', NULL,
+                        ['role' => $role->getName(), 'incompatibleRoles' => $role->getIncompatibleRolesText()]
+                    ),
+                    [$role]
+                );
+            }
+            if (!$role->getRequiredRolesTransitive()->isEmpty()) {
+                $rolesSelect->addRule([$this, 'validateRolesRequired'],
+                    $form->getTranslator()->translate('web.profile.required_roles_not_selected', NULL,
+                        ['role' => $role->getName(), 'requiredRoles' => $role->getRequiredRolesTransitiveText()]
+                    ),
+                    [$role]
+                );
+            }
+        }
+
+        $submitButton = $form->addSubmit('submit', 'web.profile.change_roles');
+
+        $cancelRegistrationButton = $form->addSubmit('cancelRegistration', 'web.profile.cancel_registration')
+            ->setAttribute('class', 'btn-danger');
+
+        if ($this->applicationService->isAllowedEditRegistration($this->user)) {
+            $submitButton
+                ->setAttribute('data-toggle', 'confirmation')
+                ->setAttribute('data-content', $form->getTranslator()->translate('web.profile.change_roles_confirm'));
+            $cancelRegistrationButton
+                ->setAttribute('data-toggle', 'confirmation')
+                ->setAttribute('data-content', $form->getTranslator()->translate('web.profile.cancel_registration_confirm'));
+        } else {
+            $submitButton
+                ->setDisabled()
+                ->setAttribute('data-toggle', 'tooltip')
+                ->setAttribute('title', $form->getTranslator()->translate('web.profile.change_roles_disabled'));
+            $cancelRegistrationButton
+                ->setDisabled()
+                ->setAttribute('data-toggle', 'tooltip')
+                ->setAttribute('title', $form->getTranslator()->translate('web.profile.cancel_registration_disabled'));
+        }
+        $form->setDefaults([
+            'id' => $id,
+            'roles' => $this->roleRepository->findRolesIds($this->user->getRoles())
+        ]);
+        $form->onSuccess[] = [$this, 'processForm'];
+        return $form;
+    }
+
+    /**
+     * Zpracuje formulář.
+     * @param Form $form
+     * @param \stdClass $values
+     * @throws \Throwable
+     */
+    public function processForm(Form $form, \stdClass $values)
+    {
+        if ($form['submit']->isSubmittedBy()) {
+            $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
+            $this->applicationService->updateRoles($this->user, $selectedRoles, $this->user);
+        } elseif ($form['cancelRegistration']->isSubmittedBy()) {
+            $this->applicationService->cancelRegistration($this->user, $this->user);
+        }
+    }
+
+    /**
+     * Ověří kapacitu rolí.
+     * @param $field
+     * @param $args
+     * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function validateRolesCapacities($field, $args)
+    {
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        return $this->validators->validateRolesCapacities($selectedRoles, $this->user);
+    }
+
+    /**
+     * Ověří kompatibilitu rolí.
+     * @param $field
+     * @param $args
+     * @return bool
+     */
+    public function validateRolesIncompatible($field, $args)
+    {
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        $testRole = $args[0];
+
+        return $this->validators->validateRolesIncompatible($selectedRoles, $testRole);
+    }
+
+    /**
+     * Ověří výběr vyžadovaných rolí.
+     * @param $field
+     * @param $args
+     * @return bool
+     */
+    public function validateRolesRequired($field, $args)
+    {
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        $testRole = $args[0];
+
+        return $this->validators->validateRolesRequired($selectedRoles, $testRole);
+    }
+
+    /**
+     * Ověří registrovatelnost rolí.
+     * @param $field
+     * @param $args
+     * @return bool
+     */
+    public function validateRolesRegisterable($field, $args)
+    {
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        return $this->validators->validateRolesRegisterable($selectedRoles, $this->user);
+    }
+}
diff --git a/app/WebModule/presenters/ProfilePresenter.php b/app/WebModule/presenters/ProfilePresenter.php
index b8486d92a..5f5969ce6 100644
--- a/app/WebModule/presenters/ProfilePresenter.php
+++ b/app/WebModule/presenters/ProfilePresenter.php
@@ -12,6 +12,7 @@
 use App\WebModule\Components\IApplicationsGridControlFactory;
 use App\WebModule\Forms\AdditionalInformationForm;
 use App\WebModule\Forms\PersonalDetailsForm;
+use App\WebModule\Forms\RolesForm;
 use Nette\Application\UI\Form;
 
 
@@ -30,34 +31,34 @@ class ProfilePresenter extends WebBasePresenter
     public $personalDetailsFormFactory;
 
     /**
-     * @var IApplicationsGridControlFactory
+     * @var AdditionalInformationForm
      * @inject
      */
-    public $applicationsGridControlFactory;
+    public $additionalInformationFormFactory;
 
     /**
-     * @var AdditionalInformationForm
+     * @var RolesForm
      * @inject
      */
-    public $additionalInformationFormFactory;
+    public $rolesFormFactory;
 
     /**
-     * @var PdfExportService
+     * @var IApplicationsGridControlFactory
      * @inject
      */
-    public $pdfExportService;
+    public $applicationsGridControlFactory;
 
     /**
-     * @var ExcelExportService
+     * @var PdfExportService
      * @inject
      */
-    public $excelExportService;
+    public $pdfExportService;
 
     /**
-     * @var Authenticator
+     * @var ExcelExportService
      * @inject
      */
-    public $authenticator;
+    public $excelExportService;
 
     /**
      * @var SubeventRepository
@@ -77,6 +78,12 @@ class ProfilePresenter extends WebBasePresenter
      */
     public $applicationService;
 
+    /**
+     * @var Authenticator
+     * @inject
+     */
+    public $authenticator;
+
 
     /**
      * @throws \Nette\Application\AbortException
@@ -139,6 +146,22 @@ protected function createComponentAdditionalInformationForm()
         return $form;
     }
 
+    protected function createComponentRolesForm()
+    {
+        $form = $this->rolesFormFactory->create($this->user->id);
+
+        $form->onSuccess[] = function (Form $form, \stdClass $values) {
+            if ($form['submit']->isSubmittedBy())
+                $this->flashMessage('web.profile.roles_changed', 'success');
+            elseif ($form['cancelRegistration']->isSubmittedBy())
+                $this->flashMessage('web.profile.registration_canceled', 'success');
+
+            $this->authenticator->updateRoles($this->user);
+            $this->redirect('this#collapseSeminar');
+        };
+        return $form;
+    }
+
     protected function createComponentApplicationsGrid()
     {
         return $this->applicationsGridControlFactory->create();
diff --git a/app/WebModule/presenters/templates/Profile/default.latte b/app/WebModule/presenters/templates/Profile/default.latte
index 60d3f6fb1..51e016320 100644
--- a/app/WebModule/presenters/templates/Profile/default.latte
+++ b/app/WebModule/presenters/templates/Profile/default.latte
@@ -51,7 +51,10 @@
                         {/if}
                     </table>
 
+                    {control rolesForm}
+
                     <br>
+
                     {control applicationsGrid}
                 </div>
             </div>
diff --git a/app/config/config.neon b/app/config/config.neon
index 381615ced..3180fbea7 100644
--- a/app/config/config.neon
+++ b/app/config/config.neon
@@ -72,6 +72,8 @@ services:
     - App\Commands\ClearCacheCommand(%appDir%/..)
     - App\ApiModule\Services\ScheduleService
 
+    - App\Utils\Validators
+
     permissionRepository:
         class: App\Model\ACL\PermissionRepository
         tags:
@@ -158,6 +160,14 @@ services:
         class: App\Model\User\ApplicationRepository
         tags:
             doctrine.repositoryEntity: App\Model\User\Application
+    rolesApplicationRepository:
+        class: App\Model\User\RolesApplicationRepository
+        tags:
+            doctrine.repositoryEntity: App\Model\User\RolesApplication
+    subeventsApplicationRepository:
+        class: App\Model\User\SubeventsApplicationRepository
+        tags:
+            doctrine.repositoryEntity: App\Model\User\SubeventsApplication
     variableSymbolRepository:
         class: App\Model\User\VariableSymbolRepository
         tags:
@@ -192,6 +202,7 @@ services:
     - App\WebModule\Forms\ApplicationForm
     - App\WebModule\Forms\FaqForm
     - App\WebModule\Forms\PersonalDetailsForm
+    - App\WebModule\Forms\RolesForm
 
     - App\AdminModule\Components\IApplicationsGridControlFactory
     - App\AdminModule\Components\IRolesGridControlFactory
diff --git a/app/lang/common.cs_CZ.neon b/app/lang/common.cs_CZ.neon
index 326c5edee..7dd1dff2b 100644
--- a/app/lang/common.cs_CZ.neon
+++ b/app/lang/common.cs_CZ.neon
@@ -105,6 +105,7 @@ application_state:
     canceled_not_paid: "Zrušeno (nezaplaceno)"
     canceled: "Zrušeno"
     paid: "Zaplaceno"
+    paid_free: "Zaplaceno (zdarma)"
 
 condition_operator:
     and: "a"
diff --git a/app/lang/web.cs_CZ.neon b/app/lang/web.cs_CZ.neon
index 6e896fea2..de59ae67a 100644
--- a/app/lang/web.cs_CZ.neon
+++ b/app/lang/web.cs_CZ.neon
@@ -29,16 +29,24 @@ profile:
     nonregistered: "Neúčastníte se"
     unapproved: "Vaše registrace zatím nebyla potvrzena"
     account_number: "Poplatek uhraďte na účet"
+
+    roles: "Role"
+    required_roles_not_selected: "K roli %role% musíte mít vybrané role: %requiredRoles%."
+    incompatible_roles_selected: "Není možné kombinovat roli %role% s rolemi: %incompatibleRoles%."
+    roles_empty: "Musí být vybrána alespoň jedna role."
+    role_is_not_registerable: "Registrace do některé z rolí již není možná."
+    roles_capacity_occupied: "Všechna místa v některé roli jsou obsazena."
+    change_roles: "Změnit role"
     change_roles_confirm: "Pokud nová role vyžaduje schválení organizátora, budete Vám nastavena role \"Neschválený\". Opravdu chcete pokračovat?"
     change_roles_disabled: "Změna rolí již není možná nebo nejste na seminář registrováni."
+    roles_changed: "Role byly úspěšně změněny."
+    cancel_registration: "Odhlásit se ze semináře"
+    cancel_registration_confirm: "Opravdu se chcete odhlásit z celého semináře?"
+    cancel_registration_disabled: "Odhlášení již není možné nebo nejste na seminář registrováni."
+    registration_canceled: "Odhlášení ze semináře proběhlo úspěšně."
 
     applications_application_date: "Datum přihlášky"
     applications_roles: "Role"
-    applications_required_roles_not_selected: "K roli %role% musíte mít vybrané role: %requiredRoles%."
-    applications_incompatible_roles_selected: "Není možné kombinovat roli %role% s rolemi: %incompatibleRoles%."
-    applications_roles_empty: "Musí být vybrána alespoň jedna role."
-    applications_role_is_not_registerable: "Registrace do některé z rolí již není možná."
-    applications_roles_capacity_occupied: "Všechna místa v některé roli jsou obsazena."
     applications_subevents: "Podakce"
     applications_required_subevents_not_selected: "K podakci %subevent% musíte mít vybrané podakce: %requiredSubevents%."
     applications_incompatible_subevents_selected: "Není možné kombinovat podakci %subevent% s podakcemi: %incompatibleSubevents%."
@@ -52,8 +60,6 @@ profile:
     applications_add_subevents_successful: "Podakce byly úspěšně přidány."
     applications_edit: "Upravit přihlášku"
     applications_edit_successful: "Přihláška byla úspěšně upravena."
-    applications_cancel_registration: "Odhlásit se ze semináře"
-    applications_cancel_registration_confirm: "Opravdu se chcete odhlásit z celého semináře?"
     applications_cancel_application: "Zrušit přihlášku"
     applications_cancel_application_confirm: "Opravdu chcete zrušit dodatečnou přihlášku?"
     applications_application_canceled: "Dodatečná přihláška byla úspěšně zrušena."
diff --git a/app/model/ACL/Permission.php b/app/model/ACL/Permission.php
index 21ca523fa..7afbbfae9 100644
--- a/app/model/ACL/Permission.php
+++ b/app/model/ACL/Permission.php
@@ -3,6 +3,7 @@
 namespace App\Model\ACL;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -78,7 +79,7 @@ class Permission
     /**
      * Role s tímto oprávněním.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", mappedBy="permissions", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $roles;
 
@@ -127,7 +128,7 @@ public function setName($name)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRoles()
     {
@@ -143,7 +144,7 @@ public function getResource()
     }
 
     /**
-     * @param ArrayCollection $resource
+     * @param Collection $resource
      */
     public function setResource($resource)
     {
diff --git a/app/model/ACL/PermissionRepository.php b/app/model/ACL/PermissionRepository.php
index 2a1387264..abab23aba 100644
--- a/app/model/ACL/PermissionRepository.php
+++ b/app/model/ACL/PermissionRepository.php
@@ -2,6 +2,8 @@
 
 namespace App\Model\ACL;
 
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Kdyby\Doctrine\EntityRepository;
 
@@ -15,24 +17,25 @@ class PermissionRepository extends EntityRepository
 {
     /**
      * Vrací názvy všech oprávnění.
-     * @return array
+     * @return Collection|string[]
      */
-    public function findAllNames()
+    public function findAllNames(): Collection
     {
-        return $this->createQueryBuilder('p')
+        $result = $this->createQueryBuilder('p')
             ->select('p.name')
             ->addSelect('role.name AS roleName')->join('p.roles', 'role')
             ->addSelect('resource.name AS resourceName')->join('p.resource', 'resource')
             ->getQuery()
             ->getResult();
+        return new ArrayCollection($result);
     }
 
     /**
      * Vrací oprávnění podle id.
-     * @param $ids
-     * @return \Doctrine\Common\Collections\Collection
+     * @param int[] $ids
+     * @return Collection|Permission[]
      */
-    public function findPermissionsByIds($ids)
+    public function findPermissionsByIds(array $ids): Collection
     {
         $criteria = Criteria::create()
             ->where(Criteria::expr()->in('id', $ids))
@@ -42,25 +45,23 @@ public function findPermissionsByIds($ids)
 
     /**
      * Vrací id oprávnění.
-     * @param $permissions
+     * @param Collection $permissions
      * @return array
      */
-    public function findPermissionsIds($permissions)
+    public function findPermissionsIds(Collection $permissions): array
     {
-        return array_map(function ($o) {
-            return $o->getId();
-        }, $permissions->toArray());
+        return $permissions->map(function (Permission $permission) {return $permission->getId();})->toArray();
     }
 
     /**
      * Vrací oprávnění podle názvu oprávnění a prostředku.
-     * @param $permissionName
-     * @param $resourceName
-     * @return Permission
+     * @param string $permissionName
+     * @param string $resourceName
+     * @return Permission|null
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function findByPermissionAndResourceName($permissionName, $resourceName)
+    public function findByPermissionAndResourceName(string $permissionName, string $resourceName): ?Permission
     {
         return $this->createQueryBuilder('p')
             ->select('p')
diff --git a/app/model/ACL/Resource.php b/app/model/ACL/Resource.php
index 568ee5b8d..a5cee4063 100644
--- a/app/model/ACL/Resource.php
+++ b/app/model/ACL/Resource.php
@@ -3,6 +3,7 @@
 namespace App\Model\ACL;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -74,7 +75,7 @@ class Resource
     /**
      * Oprávnění s tímto prostředkem.
      * @ORM\OneToMany(targetEntity="\App\Model\ACL\Permission", mappedBy="resource", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $permissions;
 
@@ -114,7 +115,7 @@ public function setName($name)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getPermissions()
     {
@@ -122,7 +123,7 @@ public function getPermissions()
     }
 
     /**
-     * @param ArrayCollection $permissions
+     * @param Collection $permissions
      */
     public function setPermissions($permissions)
     {
diff --git a/app/model/ACL/Role.php b/app/model/ACL/Role.php
index db8eda409..d8fad92a8 100644
--- a/app/model/ACL/Role.php
+++ b/app/model/ACL/Role.php
@@ -5,6 +5,7 @@
 use App\Model\CMS\Page;
 use App\Model\Program\Category;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -94,21 +95,21 @@ class Role
     /**
      * Uživatelé v roli.
      * @ORM\ManyToMany(targetEntity="\App\Model\User\User", mappedBy="roles", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $users;
 
     /**
      * Oprávnění role.
      * @ORM\ManyToMany(targetEntity="Permission", inversedBy="roles", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $permissions;
 
     /**
      * Stránky, ke kterým má role přístup.
      * @ORM\ManyToMany(targetEntity="\App\Model\CMS\Page", mappedBy="roles", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $pages;
 
@@ -182,14 +183,14 @@ class Role
      *      joinColumns={@ORM\JoinColumn(name="role_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="incompatible_role_id", referencedColumnName="id")}
      *      )
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $incompatibleRoles;
 
     /**
      * Role vyžadující tuto roli.
      * @ORM\ManyToMany(targetEntity="Role", mappedBy="requiredRoles", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $requiredByRole;
 
@@ -200,14 +201,14 @@ class Role
      *      joinColumns={@ORM\JoinColumn(name="role_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="required_role_id", referencedColumnName="id")}
      *      )
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $requiredRoles;
 
     /**
      * Kategorie programů, na které se mohou účastníci v roli přihlásit.
      * @ORM\ManyToMany(targetEntity="\App\Model\Program\Category", mappedBy="registerableRoles", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $registerableCategories;
 
@@ -238,7 +239,7 @@ public function __construct($name)
     /**
      * @return int
      */
-    public function getId()
+    public function getId(): int
     {
         return $this->id;
     }
@@ -246,7 +247,7 @@ public function getId()
     /**
      * @return string
      */
-    public function getName()
+    public function getName(): string
     {
         return $this->name;
     }
@@ -254,7 +255,7 @@ public function getName()
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName(string $name): void
     {
         $this->name = $name;
     }
@@ -262,60 +263,52 @@ public function setName($name)
     /**
      * @return string
      */
-    public function getSystemName()
+    public function getSystemName(): ?string
     {
         return $this->systemName;
     }
 
     /**
-     * @param string $systemName
+     * @return Collection
      */
-    public function setSystemName($systemName)
-    {
-        $this->systemName = $systemName;
-    }
-
-    /**
-     * @return ArrayCollection
-     */
-    public function getUsers()
+    public function getUsers(): Collection
     {
         return $this->users;
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
-    public function getPermissions()
+    public function getPermissions(): Collection
     {
         return $this->permissions;
     }
 
     /**
-     * @param ArrayCollection $permissions
+     * @param Collection $permissions
      */
-    public function setPermissions($permissions)
+    public function setPermissions(Collection $permissions): void
     {
         $this->permissions = $permissions;
     }
 
-    public function addPermission($permission)
+    public function addPermission(Permission $permission): void
     {
         $this->permissions->add($permission);
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
-    public function getPages()
+    public function getPages(): Collection
     {
         return $this->pages;
     }
 
     /**
-     * @param ArrayCollection $pages
+     * @param Collection $pages
      */
-    public function setPages($pages)
+    public function setPages(Collection $pages): void
     {
         foreach ($this->getPages() as $page) {
             if (!$pages->contains($page))
@@ -328,7 +321,10 @@ public function setPages($pages)
         $this->pages = $pages;
     }
 
-    public function addPage(Page $page)
+    /**
+     * @param Page $page
+     */
+    public function addPage(Page $page): void
     {
         if (!$this->pages->contains($page))
             $page->addRole($this);
@@ -337,7 +333,7 @@ public function addPage(Page $page)
     /**
      * @return bool
      */
-    public function isSystem()
+    public function isSystem(): bool
     {
         return $this->system;
     }
@@ -345,7 +341,7 @@ public function isSystem()
     /**
      * @param bool $system
      */
-    public function setSystem($system)
+    public function setSystem(bool $system): void
     {
         $this->system = $system;
     }
@@ -353,7 +349,7 @@ public function setSystem($system)
     /**
      * @return bool
      */
-    public function isRegisterable()
+    public function isRegisterable(): bool
     {
         return $this->registerable;
     }
@@ -361,7 +357,7 @@ public function isRegisterable()
     /**
      * @param bool $registerable
      */
-    public function setRegisterable($registerable)
+    public function setRegisterable(bool $registerable): void
     {
         $this->registerable = $registerable;
     }
@@ -370,7 +366,7 @@ public function setRegisterable($registerable)
      * Vrací true, pokud je role v tuto chvíli registrovatelná.
      * @return bool
      */
-    public function isRegisterableNow()
+    public function isRegisterableNow(): bool
     {
         $now = new \DateTime();
         if ($this->registerable &&
@@ -384,7 +380,7 @@ public function isRegisterableNow()
     /**
      * @return bool
      */
-    public function isApprovedAfterRegistration()
+    public function isApprovedAfterRegistration(): bool
     {
         return $this->approvedAfterRegistration;
     }
@@ -392,7 +388,7 @@ public function isApprovedAfterRegistration()
     /**
      * @param bool $approvedAfterRegistration
      */
-    public function setApprovedAfterRegistration($approvedAfterRegistration)
+    public function setApprovedAfterRegistration(bool $approvedAfterRegistration): void
     {
         $this->approvedAfterRegistration = $approvedAfterRegistration;
     }
@@ -400,7 +396,7 @@ public function setApprovedAfterRegistration($approvedAfterRegistration)
     /**
      * @return \DateTime
      */
-    public function getRegisterableFrom()
+    public function getRegisterableFrom(): ?\DateTime
     {
         return $this->registerableFrom;
     }
@@ -408,7 +404,7 @@ public function getRegisterableFrom()
     /**
      * @param \DateTime $registerableFrom
      */
-    public function setRegisterableFrom($registerableFrom)
+    public function setRegisterableFrom(?\DateTime $registerableFrom): void
     {
         $this->registerableFrom = $registerableFrom;
     }
@@ -416,7 +412,7 @@ public function setRegisterableFrom($registerableFrom)
     /**
      * @return \DateTime
      */
-    public function getRegisterableTo()
+    public function getRegisterableTo(): ?\DateTime
     {
         return $this->registerableTo;
     }
@@ -424,7 +420,7 @@ public function getRegisterableTo()
     /**
      * @param \DateTime $registerableTo
      */
-    public function setRegisterableTo($registerableTo)
+    public function setRegisterableTo(?\DateTime $registerableTo): void
     {
         $this->registerableTo = $registerableTo;
     }
@@ -432,7 +428,7 @@ public function setRegisterableTo($registerableTo)
     /**
      * @return int
      */
-    public function getCapacity()
+    public function getCapacity(): ?int
     {
         return $this->capacity;
     }
@@ -440,7 +436,7 @@ public function getCapacity()
     /**
      * @param int $capacity
      */
-    public function setCapacity($capacity)
+    public function setCapacity(?int $capacity): void
     {
         $this->capacity = $capacity;
     }
@@ -448,7 +444,7 @@ public function setCapacity($capacity)
     /**
      * @return bool
      */
-    public function hasLimitedCapacity()
+    public function hasLimitedCapacity(): bool
     {
         return $this->capacity !== NULL;
     }
@@ -456,7 +452,7 @@ public function hasLimitedCapacity()
     /**
      * @return int
      */
-    public function getFee()
+    public function getFee(): ?int
     {
         return $this->fee;
     }
@@ -464,7 +460,7 @@ public function getFee()
     /**
      * @param int $fee
      */
-    public function setFee($fee)
+    public function setFee(?int $fee): void
     {
         $this->fee = $fee;
     }
@@ -472,7 +468,7 @@ public function setFee($fee)
     /**
      * @return bool
      */
-    public function isDisplayArrivalDeparture()
+    public function isDisplayArrivalDeparture(): bool
     {
         return $this->displayArrivalDeparture;
     }
@@ -480,7 +476,7 @@ public function isDisplayArrivalDeparture()
     /**
      * @param bool $displayArrivalDeparture
      */
-    public function setDisplayArrivalDeparture($displayArrivalDeparture)
+    public function setDisplayArrivalDeparture(bool $displayArrivalDeparture)
     {
         $this->displayArrivalDeparture = $displayArrivalDeparture;
     }
@@ -488,7 +484,7 @@ public function setDisplayArrivalDeparture($displayArrivalDeparture)
     /**
      * @return bool
      */
-    public function isSyncedWithSkautIS()
+    public function isSyncedWithSkautIS(): bool
     {
         return $this->syncedWithSkautIS;
     }
@@ -496,23 +492,23 @@ public function isSyncedWithSkautIS()
     /**
      * @param bool $syncedWithSkautIS
      */
-    public function setSyncedWithSkautIS($syncedWithSkautIS)
+    public function setSyncedWithSkautIS(bool $syncedWithSkautIS): void
     {
         $this->syncedWithSkautIS = $syncedWithSkautIS;
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection|Role[]
      */
-    public function getIncompatibleRoles()
+    public function getIncompatibleRoles(): Collection
     {
         return $this->incompatibleRoles;
     }
 
     /**
-     * @param ArrayCollection $incompatibleRoles
+     * @param Collection $incompatibleRoles
      */
-    public function setIncompatibleRoles($incompatibleRoles)
+    public function setIncompatibleRoles(Collection $incompatibleRoles): void
     {
         foreach ($this->getIncompatibleRoles() as $role) {
             if (!$incompatibleRoles->contains($role))
@@ -526,42 +522,58 @@ public function setIncompatibleRoles($incompatibleRoles)
         $this->incompatibleRoles = $incompatibleRoles;
     }
 
+    /**
+     * Vrací názvy všech nekompatibilních rolí.
+     */
+    public function getIncompatibleRolesText(): string
+    {
+        $incompatibleRolesNames = [];
+        foreach ($this->getIncompatibleRoles() as $incompatibleRole) {
+            $incompatibleRolesNames[] = $incompatibleRole->getName();
+        }
+        return implode(', ', $incompatibleRolesNames);
+    }
+
     /**
      * @param $role
      */
-    public function addIncompatibleRole($role)
+    public function addIncompatibleRole(Role $role): void
     {
         if (!$this->incompatibleRoles->contains($role))
             $this->incompatibleRoles->add($role);
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection|Role[]
      */
-    public function getRequiredByRole()
+    public function getRequiredByRole(): Collection
     {
         return $this->requiredByRole;
     }
 
     /**
      * Vrací všechny (tranzitivně) role, kterými je tato role vyžadována.
-     * @return array
+     * @return Collection|Role[]
      */
-    public function getRequiredByRoleTransitive()
+    public function getRequiredByRoleTransitive(): Collection
     {
-        $allRequiredByRole = [];
+        $allRequiredByRole = new ArrayCollection();
         foreach ($this->requiredByRole as $requiredByRole) {
             $this->getRequiredByRoleTransitiveRec($allRequiredByRole, $requiredByRole);
         }
         return $allRequiredByRole;
     }
 
-    private function getRequiredByRoleTransitiveRec(&$allRequiredByRole, $role)
+    /**
+     * @param Collection $allRequiredByRole
+     * @param Role $role
+     */
+    private function getRequiredByRoleTransitiveRec(Collection &$allRequiredByRole, Role $role): void
     {
-        if ($this == $role || in_array($role, $allRequiredByRole))
+        if ($this === $role || $allRequiredByRole->contains($role))
             return;
 
-        $allRequiredByRole[] = $role;
+        $allRequiredByRole->add($role);
 
         foreach ($role->requiredByRole as $requiredByRole) {
             $this->getRequiredByRoleTransitiveRec($allRequiredByRole, $requiredByRole);
@@ -569,17 +581,17 @@ private function getRequiredByRoleTransitiveRec(&$allRequiredByRole, $role)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
-    public function getRequiredRoles()
+    public function getRequiredRoles(): Collection
     {
         return $this->requiredRoles;
     }
 
     /**
-     * @param ArrayCollection $requiredRoles
+     * @param Collection $requiredRoles
      */
-    public function setRequiredRoles($requiredRoles)
+    public function setRequiredRoles(Collection $requiredRoles): void
     {
         $this->requiredRoles = $requiredRoles;
     }
@@ -587,7 +599,7 @@ public function setRequiredRoles($requiredRoles)
     /**
      * @param $role
      */
-    public function addRequiredRole($role)
+    public function addRequiredRole(Role $role): void
     {
         if (!$this->requiredRoles->contains($role))
             $this->requiredRoles->add($role);
@@ -595,23 +607,27 @@ public function addRequiredRole($role)
 
     /**
      * Vrací všechny (tranzitivně) vyžadované role.
-     * @return array
+     * @return Collection|Role[]
      */
-    public function getRequiredRolesTransitive()
+    public function getRequiredRolesTransitive(): Collection
     {
-        $allRequiredRoles = [];
+        $allRequiredRoles = new ArrayCollection();
         foreach ($this->requiredRoles as $requiredRole) {
             $this->getRequiredRolesTransitiveRec($allRequiredRoles, $requiredRole);
         }
         return $allRequiredRoles;
     }
 
-    private function getRequiredRolesTransitiveRec(&$allRequiredRoles, $role)
+    /**
+     * @param Collection $allRequiredRoles
+     * @param Role $role
+     */
+    private function getRequiredRolesTransitiveRec(Collection &$allRequiredRoles, Role $role): void
     {
-        if ($this == $role || in_array($role, $allRequiredRoles))
+        if ($this === $role || $allRequiredRoles->contains($role))
             return;
 
-        $allRequiredRoles[] = $role;
+        $allRequiredRoles->add($role);
 
         foreach ($role->requiredRoles as $requiredRole) {
             $this->getRequiredRolesTransitiveRec($allRequiredRoles, $requiredRole);
@@ -619,23 +635,26 @@ private function getRequiredRolesTransitiveRec(&$allRequiredRoles, $role)
     }
 
     /**
-     * @return ArrayCollection
+     * Vrací názvy všech vyžadovaných rolí.
      */
-    public function getRegisterableCategories()
+    public function getRequiredRolesTransitiveText(): string
     {
-        return $this->registerableCategories;
+        $requiredRolesNames = [];
+        foreach ($this->getRequiredRolesTransitive() as $requiredRole) {
+            $requiredRolesNames[] = $requiredRole->getName();
+        }
+        return implode(', ', $requiredRolesNames);
     }
 
-    //    //nefunguje z inverse side, zatim neni potreba
-    //    /**
-    //     * @param ArrayCollection $registerableCategories
-    //     */
-    //    public function setRegisterableCategories($registerableCategories)
-    //    {
-    //        $this->registerableCategories = $registerableCategories;
-    //    }
+    /**
+     * @return Collection|Category[]
+     */
+    public function getRegisterableCategories(): Collection
+    {
+        return $this->registerableCategories;
+    }
 
-    public function addRegisterableCategory(Category $category)
+    public function addRegisterableCategory(Category $category): void
     {
         if (!$this->registerableCategories->contains($category))
             $category->addRole($this);
@@ -644,7 +663,7 @@ public function addRegisterableCategory(Category $category)
     /**
      * @return string
      */
-    public function getRedirectAfterLogin()
+    public function getRedirectAfterLogin(): ?string
     {
         return $this->redirectAfterLogin;
     }
@@ -652,7 +671,7 @@ public function getRedirectAfterLogin()
     /**
      * @param string $redirectAfterLogin
      */
-    public function setRedirectAfterLogin($redirectAfterLogin)
+    public function setRedirectAfterLogin(?string $redirectAfterLogin): void
     {
         $this->redirectAfterLogin = $redirectAfterLogin;
     }
diff --git a/app/model/ACL/RoleRepository.php b/app/model/ACL/RoleRepository.php
index 797039c0d..31993a3ec 100644
--- a/app/model/ACL/RoleRepository.php
+++ b/app/model/ACL/RoleRepository.php
@@ -161,7 +161,7 @@ public function findRolesByIds($ids)
      * @return array
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function countUnoccupiedInRoles($roles)
+    public function countUnoccupiedInRoles($roles) : array
     {
         $counts = [];
         foreach ($roles as $role) {
@@ -176,7 +176,7 @@ public function countUnoccupiedInRoles($roles)
      * @return int|null
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function countUnoccupiedInRole(Role $role)
+    public function countUnoccupiedInRole(Role $role) : ?int
     {
         if ($role->getCapacity() === NULL)
             return NULL;
@@ -189,7 +189,7 @@ public function countUnoccupiedInRole(Role $role)
      * @return int
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function countApprovedUsersInRole(Role $role)
+    public function countApprovedUsersInRole(Role $role) : int
     {
         return $this->createQueryBuilder('r')
             ->select('COUNT(u.id)')
@@ -204,7 +204,7 @@ public function countApprovedUsersInRole(Role $role)
      * @param $roles
      * @return array
      */
-    public function countApprovedUsersInRoles($roles)
+    public function countApprovedUsersInRoles($roles) : array
     {
         return $this->createQueryBuilder('r')
             ->select('r.name, r.capacity, COUNT(u.id) AS usersCount')
@@ -221,7 +221,7 @@ public function countApprovedUsersInRoles($roles)
      * @param $roles
      * @return array
      */
-    public function findRolesIds($roles)
+    public function findRolesIds($roles) : array
     {
         return array_map(function ($o) {
             return $o->getId();
@@ -233,7 +233,7 @@ public function findRolesIds($roles)
      * @param $roleId
      * @return array
      */
-    public function getRolesWithoutRoleOptions($roleId)
+    public function getRolesWithoutRoleOptions($roleId) : array
     {
         $roles = $this->createQueryBuilder('r')
             ->select('r.id, r.name')
@@ -254,7 +254,7 @@ public function getRolesWithoutRoleOptions($roleId)
      * @return array
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getRegisterableNowOptionsWithCapacity()
+    public function getRegisterableNowOptionsWithCapacity() : array
     {
         $roles = $this->findAllRegisterableNowOrderedByName();
 
@@ -276,7 +276,7 @@ public function getRegisterableNowOptionsWithCapacity()
      * Vraci role, ktere jsou tuto chvíli registrovatelné, seřazené podle názvu.
      * @return array
      */
-    public function findAllRegisterableNowOrderedByName()
+    public function findAllRegisterableNowOrderedByName() : array
     {
         return $this->createQueryBuilder('r')
             ->select('r')
@@ -300,10 +300,10 @@ public function findAllRegisterableNowOrderedByName()
      * Vrací seznam rolí, které jsou v tuto chvíli registrovatelné nebo je uživatel má, s informací o jejich
      * obsazenosti, jako možnosti pro select.
      * @param User $user
-     * @return array
+     * @return Role[]
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getRegisterableNowOrUsersOptionsWithCapacity(User $user)
+    public function getRegisterableNowOrUsersOptionsWithCapacity(User $user) : array
     {
         $roles = $this->findAllRegisterableNowOrUsersOrderedByName($user);
 
@@ -324,9 +324,9 @@ public function getRegisterableNowOrUsersOptionsWithCapacity(User $user)
     /**
      * Vrací role, které jsou v tuto chvíli registrovatelné nebo je uživatel má, seřazené podle názvu.
      * @param User $user
-     * @return array
+     * @return Role[]
      */
-    public function findAllRegisterableNowOrUsersOrderedByName(User $user)
+    public function findAllRegisterableNowOrUsersOrderedByName(User $user) : array
     {
         return $this->createQueryBuilder('r')
             ->select('r')
@@ -355,7 +355,7 @@ public function findAllRegisterableNowOrUsersOrderedByName(User $user)
      * @param array $withoutRoles
      * @return array
      */
-    public function getRolesWithoutRolesOptions(array $withoutRoles)
+    public function getRolesWithoutRolesOptions(array $withoutRoles) : array
     {
         if (empty($withoutRoles))
             $roles = $this->createQueryBuilder('r')
@@ -385,7 +385,7 @@ public function getRolesWithoutRolesOptions(array $withoutRoles)
      * @return array
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles)
+    public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles) : array
     {
         if (empty($withoutRoles))
             $roles = $this->createQueryBuilder('r')
@@ -420,7 +420,7 @@ public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles)
      * @return array
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getRolesWithoutRolesOptionsWithUsersCount(array $withoutRoles)
+    public function getRolesWithoutRolesOptionsWithUsersCount(array $withoutRoles) : array
     {
         if (empty($withoutRoles))
             $roles = $this->createQueryBuilder('r')
@@ -450,7 +450,7 @@ public function getRolesWithoutRolesOptionsWithUsersCount(array $withoutRoles)
      * Uloží roli.
      * @param Role $role
      */
-    public function save(Role $role)
+    public function save(Role $role) : void
     {
         $this->_em->persist($role);
         $this->_em->flush();
@@ -460,7 +460,7 @@ public function save(Role $role)
      * Odstraní roli.
      * @param Role $role
      */
-    public function remove(Role $role)
+    public function remove(Role $role) : void
     {
         $this->_em->remove($role);
         $this->_em->flush();
diff --git a/app/model/CMS/Content/CapacitiesContent.php b/app/model/CMS/Content/CapacitiesContent.php
index f04215a3e..24960081d 100644
--- a/app/model/CMS/Content/CapacitiesContent.php
+++ b/app/model/CMS/Content/CapacitiesContent.php
@@ -6,6 +6,7 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\CMS\Page;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Nette\Application\UI\Form;
 
@@ -24,7 +25,7 @@ class CapacitiesContent extends Content implements IContent
     /**
      * Role, jejichž obsazenosti se vypíší.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $roles;
 
@@ -52,7 +53,7 @@ public function injectRoleRepository(RoleRepository $roleRepository)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRoles()
     {
@@ -60,7 +61,7 @@ public function getRoles()
     }
 
     /**
-     * @param ArrayCollection $roles
+     * @param Collection $roles
      */
     public function setRoles($roles)
     {
diff --git a/app/model/CMS/Content/DocumentContent.php b/app/model/CMS/Content/DocumentContent.php
index abe4af39a..298c65856 100644
--- a/app/model/CMS/Content/DocumentContent.php
+++ b/app/model/CMS/Content/DocumentContent.php
@@ -5,6 +5,7 @@
 use App\Model\CMS\Document\TagRepository;
 use App\Model\CMS\Page;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Nette\Application\UI\Form;
 
@@ -24,7 +25,7 @@ class DocumentContent extends Content implements IContent
     /**
      * Tagy dokumentů, které se zobrazí.
      * @ORM\ManyToMany(targetEntity="\App\Model\CMS\Document\Tag")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $tags;
 
@@ -52,7 +53,7 @@ public function injectTagRepository(TagRepository $tagRepository)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getTags()
     {
@@ -60,7 +61,7 @@ public function getTags()
     }
 
     /**
-     * @param ArrayCollection $tags
+     * @param Collection $tags
      */
     public function setTags($tags)
     {
diff --git a/app/model/CMS/Content/UsersContent.php b/app/model/CMS/Content/UsersContent.php
index 631da783b..e6b117c2a 100644
--- a/app/model/CMS/Content/UsersContent.php
+++ b/app/model/CMS/Content/UsersContent.php
@@ -6,6 +6,7 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\CMS\Page;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Nette\Application\UI\Form;
 
@@ -24,7 +25,7 @@ class UsersContent extends Content implements IContent
     /**
      * Role, jejichž uživatelé budou vypsáni.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $roles;
 
@@ -54,7 +55,7 @@ public function injectRoleRepository(RoleRepository $roleRepository)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRoles()
     {
@@ -62,7 +63,7 @@ public function getRoles()
     }
 
     /**
-     * @param ArrayCollection $roles
+     * @param Collection $roles
      */
     public function setRoles($roles)
     {
diff --git a/app/model/CMS/Document/Document.php b/app/model/CMS/Document/Document.php
index c7a3c6d57..132314293 100644
--- a/app/model/CMS/Document/Document.php
+++ b/app/model/CMS/Document/Document.php
@@ -3,6 +3,7 @@
 namespace App\Model\CMS\Document;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -27,7 +28,7 @@ class Document
     /**
      * Tagy dokumentu.
      * @ORM\ManyToMany(targetEntity="Tag", inversedBy="documents", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $tags;
 
@@ -77,7 +78,7 @@ public function getId()
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getTags()
     {
@@ -85,7 +86,7 @@ public function getTags()
     }
 
     /**
-     * @param ArrayCollection $tags
+     * @param Collection $tags
      */
     public function setTags($tags)
     {
diff --git a/app/model/CMS/Document/Tag.php b/app/model/CMS/Document/Tag.php
index 8bfbcec2b..6c5a1f025 100644
--- a/app/model/CMS/Document/Tag.php
+++ b/app/model/CMS/Document/Tag.php
@@ -3,6 +3,7 @@
 namespace App\Model\CMS\Document;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -22,7 +23,7 @@ class Tag
     /**
      * Dokumenty s tagem.
      * @ORM\ManyToMany(targetEntity="Document", mappedBy="tags", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $documents;
 
@@ -51,7 +52,7 @@ public function getId()
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getDocuments()
     {
diff --git a/app/model/CMS/Page.php b/app/model/CMS/Page.php
index 395634065..032ff85d1 100644
--- a/app/model/CMS/Page.php
+++ b/app/model/CMS/Page.php
@@ -6,6 +6,7 @@
 use App\Model\CMS\Content\Content;
 use App\Model\Page\PageException;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
@@ -54,7 +55,7 @@ class Page
     /**
      * Role, které mají na stránku přístup.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="pages", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $roles;
 
@@ -62,7 +63,7 @@ class Page
      * Obsahy na stránce.
      * @ORM\OneToMany(targetEntity="\App\Model\CMS\Content\Content", mappedBy="page", cascade={"persist"})
      * @ORM\OrderBy({"position" = "ASC"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $contents;
 
@@ -153,7 +154,7 @@ public function setPublic($public)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRoles()
     {
@@ -161,7 +162,7 @@ public function getRoles()
     }
 
     /**
-     * @param ArrayCollection $roles
+     * @param Collection $roles
      */
     public function setRoles($roles)
     {
@@ -179,7 +180,7 @@ public function addRole($role)
     /**
      * Vrací obsahy v oblasti.
      * @param null $area
-     * @return ArrayCollection|\Doctrine\Common\Collections\Collection
+     * @return Collection
      * @throws PageException
      */
     public function getContents($area = NULL)
diff --git a/app/model/Mailing/Mail.php b/app/model/Mailing/Mail.php
index 6c2dd7e06..a7d0e2d43 100644
--- a/app/model/Mailing/Mail.php
+++ b/app/model/Mailing/Mail.php
@@ -3,6 +3,7 @@
 namespace App\Model\Mailing;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -21,14 +22,14 @@ class Mail
     /**
      * Role, kterým byl e-mail odeslán.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $recipientRoles;
 
     /**
      * Uživatelé, kterém byl e-mail odeslán.
      * @ORM\ManyToMany(targetEntity="\App\Model\User\User")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $recipientUsers;
 
@@ -79,7 +80,7 @@ public function getId()
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRecipientRoles()
     {
@@ -87,7 +88,7 @@ public function getRecipientRoles()
     }
 
     /**
-     * @param ArrayCollection $recipientRoles
+     * @param Collection $recipientRoles
      */
     public function setRecipientRoles($recipientRoles)
     {
@@ -108,7 +109,7 @@ public function getRecipientRolesText()
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRecipientUsers()
     {
@@ -116,7 +117,7 @@ public function getRecipientUsers()
     }
 
     /**
-     * @param ArrayCollection $recipientUsers
+     * @param Collection $recipientUsers
      */
     public function setRecipientUsers($recipientUsers)
     {
diff --git a/app/model/Mailing/Template.php b/app/model/Mailing/Template.php
index 743d1d5fa..fb214fe30 100644
--- a/app/model/Mailing/Template.php
+++ b/app/model/Mailing/Template.php
@@ -3,6 +3,7 @@
 namespace App\Model\Mailing;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -110,7 +111,7 @@ class Template
     /**
      * Proměnné použitelné v šabloně.
      * @ORM\ManyToMany(targetEntity="\App\Model\Mailing\TemplateVariable")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $variables;
 
@@ -217,7 +218,7 @@ public function setActive($active)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getVariables()
     {
@@ -225,7 +226,7 @@ public function getVariables()
     }
 
     /**
-     * @param ArrayCollection $variables
+     * @param Collection $variables
      */
     public function setVariables($variables)
     {
diff --git a/app/model/Program/Block.php b/app/model/Program/Block.php
index f96655c53..ac59a986a 100644
--- a/app/model/Program/Block.php
+++ b/app/model/Program/Block.php
@@ -5,6 +5,7 @@
 use App\Model\Structure\Subevent;
 use App\Model\User\User;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -32,7 +33,7 @@ class Block
      * Programy v bloku.
      * @ORM\OneToMany(targetEntity="Program", mappedBy="block", cascade={"persist"})
      * @ORM\OrderBy({"start" = "ASC"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $programs;
 
@@ -133,7 +134,7 @@ public function setName($name)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getPrograms()
     {
@@ -141,7 +142,7 @@ public function getPrograms()
     }
 
     /**
-     * @param ArrayCollection $programs
+     * @param Collection $programs
      */
     public function setPrograms($programs)
     {
@@ -150,7 +151,7 @@ public function setPrograms($programs)
 
     /**
      * Vrací seznam účastníků bloku.
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getAttendees()
     {
@@ -338,7 +339,7 @@ public function isAllowed(User $user)
         }
 
         $tmp = FALSE;
-        foreach ($user->getNotCanceledApplications() as $application) {
+        foreach ($user->getNotCanceledSubeventsApplications() as $application) {
             if ($application->getSubevents()->contains($this->subevent)) {
                 $tmp = TRUE;
                 break;
diff --git a/app/model/Program/BlockRepository.php b/app/model/Program/BlockRepository.php
index d45d4e1ce..b1a6e6c3b 100644
--- a/app/model/Program/BlockRepository.php
+++ b/app/model/Program/BlockRepository.php
@@ -3,6 +3,9 @@
 namespace App\Model\Program;
 
 
+use App\Model\User\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Kdyby\Doctrine\EntityRepository;
 
@@ -117,18 +120,18 @@ public function findByLikeNameOrderedByName($text, $unassignedOnly = FALSE)
     /**
      * Vrací bloky, které jsou pro uživatele povinné a není na ně přihlášený.
      * @param User $user
-     * @param $categoriesIds
-     * @param $subevents
-     * @return array
+     * @param Collection $categories
+     * @param Collection $subevents
+     * @return Collection|Block[]
      */
-    public function findMandatoryForCategoriesAndSubevents($user, $categoriesIds, $subevents)
+    public function findMandatoryForCategoriesAndSubevents(User $user, Collection $categories, Collection $subevents): Collection
     {
         $usersBlocks = $this->createQueryBuilder('b')
             ->select('b')
             ->leftJoin('b.programs', 'p')
             ->leftJoin('p.attendees', 'u')
-            ->where('u.id = :uid')
-            ->setParameter('uid', $user->getId())
+            ->where('u = :user')
+            ->setParameter('user', $user)
             ->getQuery()
             ->getResult();
 
@@ -136,12 +139,12 @@ public function findMandatoryForCategoriesAndSubevents($user, $categoriesIds, $s
             ->select('b')
             ->leftJoin('b.category', 'c')
             ->where($this->createQueryBuilder()->expr()->orX(
-                'c.id IN (:ids)',
+                'c IN (:categories)',
                 'b.category IS NULL'
             ))
             ->andWhere('b.subevent IN (:usersSubevents)')
             ->andWhere('b.mandatory > 0')
-            ->setParameter('ids', $categoriesIds)
+            ->setParameter('categories', $categories)
             ->setParameter('usersSubevents', $subevents);
 
         if (!empty($usersBlocks)) {
@@ -150,8 +153,7 @@ public function findMandatoryForCategoriesAndSubevents($user, $categoriesIds, $s
                 ->setParameter('usersBlocks', $usersBlocks);
         }
 
-        return $qb->getQuery()
-            ->getResult();
+        return new ArrayCollection($qb->getQuery()->getResult());
     }
 
     /**
diff --git a/app/model/Program/Category.php b/app/model/Program/Category.php
index ed4f9215a..863c6da71 100644
--- a/app/model/Program/Category.php
+++ b/app/model/Program/Category.php
@@ -4,6 +4,7 @@
 
 use App\Model\ACL\Role;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -29,7 +30,7 @@ class Category
     /**
      * Role, které si mohou přihlašovat programy z kategorie.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="registerableCategories", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $registerableRoles;
 
@@ -37,7 +38,7 @@ class Category
      * Bloky v kategorii.
      * @ORM\OneToMany(targetEntity="Block", mappedBy="category", cascade={"persist"})
      * @ORM\OrderBy({"name" = "ASC"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $blocks;
 
@@ -76,7 +77,7 @@ public function setName($name)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRegisterableRoles()
     {
@@ -84,7 +85,7 @@ public function getRegisterableRoles()
     }
 
     /**
-     * @param ArrayCollection $registerableRoles
+     * @param Collection $registerableRoles
      */
     public function setRegisterableRoles($registerableRoles)
     {
@@ -101,7 +102,7 @@ public function addRole(Role $role)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getBlocks()
     {
@@ -109,7 +110,7 @@ public function getBlocks()
     }
 
     /**
-     * @param ArrayCollection $blocks
+     * @param Collection $blocks
      */
     public function setBlocks($blocks)
     {
diff --git a/app/model/Program/CategoryRepository.php b/app/model/Program/CategoryRepository.php
index f85408198..9be0bdf2b 100644
--- a/app/model/Program/CategoryRepository.php
+++ b/app/model/Program/CategoryRepository.php
@@ -2,6 +2,9 @@
 
 namespace App\Model\Program;
 
+use App\Model\User\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Kdyby\Doctrine\EntityRepository;
 
 
@@ -63,6 +66,22 @@ public function findOthersNames($id)
         return array_map('current', $names);
     }
 
+    /**
+     * Vrací kategorie, ze kterých si uživatel může vybírat programy.
+     * @param User $user
+     * @return Collection|Category[]
+     */
+    public function findUserAllowed(User $user): Collection
+    {
+        $result = $this->createQueryBuilder('c')
+            ->join('c.registerableRoles', 'r')
+            ->join('r.users', 'u')
+            ->where('u = :user')->setParameter('user', $user)
+            ->getQuery()
+            ->getResult();
+        return new ArrayCollection($result);
+    }
+
     /**
      * Vrací kategorie jako možnosti pro select.
      * @return array
diff --git a/app/model/Program/Program.php b/app/model/Program/Program.php
index 398d0ba67..fbc335dd0 100644
--- a/app/model/Program/Program.php
+++ b/app/model/Program/Program.php
@@ -4,6 +4,7 @@
 
 use App\Model\User\User;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -30,7 +31,7 @@ class Program
     /**
      * Účastníci programu.
      * @ORM\ManyToMany(targetEntity="\App\Model\User\User", mappedBy="programs", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $attendees;
 
@@ -82,7 +83,7 @@ public function setBlock($block)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getAttendees()
     {
@@ -90,9 +91,9 @@ public function getAttendees()
     }
 
     /**
-     * @param ArrayCollection $attendees
+     * @param Collection $attendees
      */
-    public function setAttendees($attendees)
+    public function setAttendees(Collection $attendees)
     {
         $this->removeAllAttendees();
         foreach ($attendees as $attendee) {
diff --git a/app/model/Program/ProgramRepository.php b/app/model/Program/ProgramRepository.php
index 0b36c7392..a6b6cffdf 100644
--- a/app/model/Program/ProgramRepository.php
+++ b/app/model/Program/ProgramRepository.php
@@ -3,6 +3,8 @@
 namespace App\Model\Program;
 
 use App\Model\User\User;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Kdyby\Doctrine\EntityRepository;
 
 
@@ -189,20 +191,22 @@ public function hasOverlappingAutoRegisterProgram(Program $program, \DateTime $s
 
     /**
      * Vrací programy povolené pro kategorie a podakce.
-     * @param $categoriesIds
-     * @param $subeventsIds
-     * @return array
+     * @param Collection $categories
+     * @param Collection $subevents
+     * @return Collection|Program[]
      */
-    public function findAllowedForCategoriesAndSubevents($categoriesIds, $subeventsIds)
+    public function findAllowedForCategoriesAndSubevents(Collection $categories, Collection $subevents): Collection
     {
-        return $this->createQueryBuilder('p')
+        $result = $this->createQueryBuilder('p')
             ->select('p')
             ->join('p.block', 'b')
             ->leftJoin('b.category', 'c')
             ->leftJoin('b.subevent', 's')
-            ->where('(b.category IS NULL OR c.id IN (:cids))')->setParameter('cids', $categoriesIds)
-            ->andWhere('s.id IN (:sids)')->setParameter('sids', $subeventsIds)
+            ->where('(b.category IS NULL OR c IN (:categories))')->setParameter('categories', $categories)
+            ->andWhere('s IN (:subevents)')->setParameter('subevents', $subevents)
             ->getQuery()
             ->getResult();
+
+        return new ArrayCollection($result);
     }
 }
diff --git a/app/model/Program/Room.php b/app/model/Program/Room.php
index 0360f375a..47d54d519 100644
--- a/app/model/Program/Room.php
+++ b/app/model/Program/Room.php
@@ -3,6 +3,7 @@
 namespace App\Model\Program;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -36,7 +37,7 @@ class Room
      * Programy v místnosti.
      * @ORM\OneToMany(targetEntity="Program", mappedBy="room", cascade={"persist"})
      * @ORM\OrderBy({"start" = "ASC"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $programs;
 
diff --git a/app/model/Settings/CustomInput/CustomInput.php b/app/model/Settings/CustomInput/CustomInput.php
index 5b249f527..2f9c244cc 100644
--- a/app/model/Settings/CustomInput/CustomInput.php
+++ b/app/model/Settings/CustomInput/CustomInput.php
@@ -3,6 +3,7 @@
 namespace App\Model\Settings\CustomInput;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -75,7 +76,7 @@ abstract class CustomInput
     /**
      * Hodnoty pole pro jednotlivé uživatele.
      * @ORM\OneToMany(targetEntity="\App\Model\User\CustomInputValue\CustomInputValue", mappedBy="input", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $customInputValues;
 
@@ -153,7 +154,7 @@ public function getType()
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getCustomInputValues()
     {
@@ -161,7 +162,7 @@ public function getCustomInputValues()
     }
 
     /**
-     * @param ArrayCollection $customInputValues
+     * @param Collection $customInputValues
      */
     public function setCustomInputValues($customInputValues)
     {
diff --git a/app/model/Settings/SettingsRepository.php b/app/model/Settings/SettingsRepository.php
index 5bfe24b51..efb77449c 100644
--- a/app/model/Settings/SettingsRepository.php
+++ b/app/model/Settings/SettingsRepository.php
@@ -55,10 +55,28 @@ public function getValue($item)
         return $value;
     }
 
+    /**
+     * Nastavení hodnoty položky.
+     * @param $item
+     * @param $value
+     * @throws SettingsException
+     */
+    public function setValue($item, $value)
+    {
+        $settings = $this->findOneBy(['item' => $item]);
+        if ($settings === NULL)
+            throw new SettingsException("Item {$item} was not found in table Settings.");
+
+        $settings->setValue($value);
+        $this->_em->flush();
+
+        $this->cache->save($item, $value);
+    }
+
     /**
      * Vrátí hodnotu položky typu datum a čas.
      * @param $item
-     * @return \DateTime
+     * @return \DateTime|null
      * @throws SettingsException
      */
     public function getDateTimeValue($item)
@@ -70,35 +88,31 @@ public function getDateTimeValue($item)
     }
 
     /**
-     * Nastavení hodnoty položky typu datum.
+     * Vrátí hodnotu položky typu datum a čas jako text.
      * @param $item
-     * @param \DateTime|null $value
+     * @return null|string
      * @throws SettingsException
      */
-    public function setDateValue($item, $value)
+    public function getDateTimeValueText($item): ?string
     {
+        $value = $this->getValue($item);
         if ($value === NULL)
-            $this->setValue($item, NULL);
-        else
-            $this->setValue($item, $value->format('Y-m-d'));
+            return NULL;
+        return (new \DateTime($value))->format('j. n. Y H:i');
     }
 
     /**
-     * Nastavení hodnoty položky.
+     * Nastavení hodnoty položky typu datum a čas.
      * @param $item
-     * @param $value
+     * @param \DateTime|null $value
      * @throws SettingsException
      */
-    public function setValue($item, $value)
+    public function setDateTimeValue($item, $value)
     {
-        $settings = $this->findOneBy(['item' => $item]);
-        if ($settings === NULL)
-            throw new SettingsException("Item {$item} was not found in table Settings.");
-
-        $settings->setValue($value);
-        $this->_em->flush();
-
-        $this->cache->save($item, $value);
+        if ($value === NULL)
+            $this->setValue($item, NULL);
+        else
+            $this->setValue($item, $value->format(\DateTime::ISO8601));
     }
 
     /**
@@ -116,17 +130,31 @@ public function getDateValue($item)
     }
 
     /**
-     * Nastavení hodnoty položky typu datum a čas.
+     * Vrátí hodnotu položky typu datum jako text.
+     * @param $item
+     * @return null|string
+     * @throws SettingsException
+     */
+    public function getDateValueText($item): ?string
+    {
+        $value = $this->getValue($item);
+        if ($value === NULL)
+            return NULL;
+        return (new \DateTime($value))->format('j. n. Y');
+    }
+
+    /**
+     * Nastavení hodnoty položky typu datum.
      * @param $item
      * @param \DateTime|null $value
      * @throws SettingsException
      */
-    public function setDateTimeValue($item, $value)
+    public function setDateValue($item, $value)
     {
         if ($value === NULL)
             $this->setValue($item, NULL);
         else
-            $this->setValue($item, $value->format(\DateTime::ISO8601));
+            $this->setValue($item, $value->format('Y-m-d'));
     }
 }
 
diff --git a/app/model/Structure/Subevent.php b/app/model/Structure/Subevent.php
index 02a87e272..644286daa 100644
--- a/app/model/Structure/Subevent.php
+++ b/app/model/Structure/Subevent.php
@@ -2,7 +2,9 @@
 
 namespace App\Model\Structure;
 
+use App\Model\ACL\Role;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -35,7 +37,7 @@ class Subevent
     /**
      * Přihlášky.
      * @ORM\ManyToMany(targetEntity="\App\Model\User\Application", mappedBy="subevents", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $applications;
 
@@ -43,7 +45,7 @@ class Subevent
      * Bloky v podakci.
      * @ORM\OneToMany(targetEntity="\App\Model\Program\Block", mappedBy="subevent", cascade={"persist"})
      * @ORM\OrderBy({"name" = "ASC"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $blocks;
 
@@ -68,14 +70,14 @@ class Subevent
      *      joinColumns={@ORM\JoinColumn(name="subevent_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="incompatible_subevent_id", referencedColumnName="id")}
      *      )
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $incompatibleSubevents;
 
     /**
      * Podakce vyžadující tuto podakci.
      * @ORM\ManyToMany(targetEntity="Subevent", mappedBy="requiredSubevents", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $requiredBySubevent;
 
@@ -86,7 +88,7 @@ class Subevent
      *      joinColumns={@ORM\JoinColumn(name="subevent_id", referencedColumnName="id")},
      *      inverseJoinColumns={@ORM\JoinColumn(name="required_subevent_id", referencedColumnName="id")}
      *      )
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $requiredSubevents;
 
@@ -106,7 +108,7 @@ public function __construct()
     /**
      * @return int
      */
-    public function getId()
+    public function getId() : int
     {
         return $this->id;
     }
@@ -114,7 +116,7 @@ public function getId()
     /**
      * @return string
      */
-    public function getName()
+    public function getName() : string
     {
         return $this->name;
     }
@@ -122,7 +124,7 @@ public function getName()
     /**
      * @param string $name
      */
-    public function setName($name)
+    public function setName(string $name) : void
     {
         $this->name = $name;
     }
@@ -130,7 +132,7 @@ public function setName($name)
     /**
      * @return bool
      */
-    public function isImplicit()
+    public function isImplicit() : bool
     {
         return $this->implicit;
     }
@@ -138,23 +140,23 @@ public function isImplicit()
     /**
      * @param bool $implicit
      */
-    public function setImplicit($implicit)
+    public function setImplicit(bool $implicit) : void
     {
         $this->implicit = $implicit;
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
-    public function getBlocks()
+    public function getBlocks() : Collection
     {
         return $this->blocks;
     }
 
     /**
-     * @param ArrayCollection $blocks
+     * @param Collection $blocks
      */
-    public function setBlocks($blocks)
+    public function setBlocks(Collection $blocks) : void
     {
         $this->blocks = $blocks;
     }
@@ -162,7 +164,7 @@ public function setBlocks($blocks)
     /**
      * @return int
      */
-    public function getFee()
+    public function getFee() : int
     {
         return $this->fee;
     }
@@ -170,7 +172,7 @@ public function getFee()
     /**
      * @param int $fee
      */
-    public function setFee($fee)
+    public function setFee(int $fee) : void
     {
         $this->fee = $fee;
     }
@@ -178,7 +180,7 @@ public function setFee($fee)
     /**
      * @return int
      */
-    public function getCapacity()
+    public function getCapacity() : ?int
     {
         return $this->capacity;
     }
@@ -186,7 +188,7 @@ public function getCapacity()
     /**
      * @param int $capacity
      */
-    public function setCapacity($capacity)
+    public function setCapacity(?int $capacity) : void
     {
         $this->capacity = $capacity;
     }
@@ -194,15 +196,15 @@ public function setCapacity($capacity)
     /**
      * @return bool
      */
-    public function hasLimitedCapacity()
+    public function hasLimitedCapacity() : bool
     {
         return $this->capacity !== NULL;
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection|Subevent[]
      */
-    public function getIncompatibleSubevents()
+    public function getIncompatibleSubevents() : Collection
     {
         return $this->incompatibleSubevents;
     }
@@ -210,7 +212,7 @@ public function getIncompatibleSubevents()
     /**
      * @param $incompatibleSubevents
      */
-    public function setIncompatibleSubevents($incompatibleSubevents)
+    public function setIncompatibleSubevents(Collection $incompatibleSubevents) : void
     {
         foreach ($this->getIncompatibleSubevents() as $subevent) {
             if (!$incompatibleSubevents->contains($subevent))
@@ -227,39 +229,56 @@ public function setIncompatibleSubevents($incompatibleSubevents)
     /**
      * @param $subevent
      */
-    public function addIncompatibleSubevent($subevent)
+    public function addIncompatibleSubevent(Subevent $subevent) : void
     {
         if (!$this->incompatibleSubevents->contains($subevent))
             $this->incompatibleSubevents->add($subevent);
     }
 
     /**
-     * @return ArrayCollection
+     * Vrací názvy všech nekompatibilních podakcí.
+     * @return string
+     */
+    public function getIncompatibleSubeventsText() : string
+    {
+        $incompatibleSubeventsNames = [];
+        foreach ($this->getIncompatibleSubevents() as $incompatibleSubevent) {
+            $incompatibleSubeventsNames[] = $incompatibleSubevent->getName();
+        }
+        return implode(', ', $incompatibleSubeventsNames);
+    }
+
+    /**
+     * @return Collection|Subevent[]
      */
-    public function getRequiredBySubevent()
+    public function getRequiredBySubevent() : Collection
     {
         return $this->requiredBySubevent;
     }
 
     /**
      * Vrací všechny (tranzitivně) podakce, kterými je tato podakce vyžadována.
-     * @return array
+     * @return Collection|Subevent[]
      */
-    public function getRequiredBySubeventTransitive()
+    public function getRequiredBySubeventTransitive() : Collection
     {
-        $allRequiredBySubevent = [];
+        $allRequiredBySubevent = new ArrayCollection();
         foreach ($this->requiredBySubevent as $requiredBySubevent) {
             $this->getRequiredBySubeventTransitiveRec($allRequiredBySubevent, $requiredBySubevent);
         }
         return $allRequiredBySubevent;
     }
 
-    private function getRequiredBySubeventTransitiveRec(&$allRequiredBySubevent, $subevent)
+    /**
+     * @param $allRequiredBySubevent
+     * @param $subevent
+     */
+    private function getRequiredBySubeventTransitiveRec(Collection &$allRequiredBySubevent, Subevent $subevent) : void
     {
-        if ($this == $subevent || in_array($subevent, $allRequiredBySubevent))
+        if ($this === $subevent || $allRequiredBySubevent->contains($subevent))
             return;
 
-        $allRequiredBySubevent[] = $subevent;
+        $allRequiredBySubevent->add($subevent);
 
         foreach ($subevent->requiredBySubevent as $requiredBySubevent) {
             $this->getRequiredBySubeventTransitiveRec($allRequiredBySubevent, $requiredBySubevent);
@@ -267,9 +286,9 @@ private function getRequiredBySubeventTransitiveRec(&$allRequiredBySubevent, $su
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection|Subevent[]
      */
-    public function getRequiredSubevents()
+    public function getRequiredSubevents() : Collection
     {
         return $this->requiredSubevents;
     }
@@ -277,7 +296,7 @@ public function getRequiredSubevents()
     /**
      * @param $requiredSubevents
      */
-    public function setRequiredSubevents($requiredSubevents)
+    public function setRequiredSubevents(Collection $requiredSubevents) : void
     {
         $this->requiredSubevents = $requiredSubevents;
     }
@@ -285,7 +304,7 @@ public function setRequiredSubevents($requiredSubevents)
     /**
      * @param $subevent
      */
-    public function addRequiredSubevent($subevent)
+    public function addRequiredSubevent(Subevent $subevent) : void
     {
         if (!$this->requiredSubevents->contains($subevent))
             $this->requiredSubevents->add($subevent);
@@ -293,26 +312,43 @@ public function addRequiredSubevent($subevent)
 
     /**
      * Vrací všechny (tranzitivně) vyžadované podakce.
-     * @return array
+     * @return Collection|Subevent[]
      */
-    public function getRequiredSubeventsTransitive()
+    public function getRequiredSubeventsTransitive() : Collection
     {
-        $allRequiredSubevents = [];
+        $allRequiredSubevents = new ArrayCollection();
         foreach ($this->requiredSubevents as $requiredSubevent) {
             $this->getRequiredSubeventsTransitiveRec($allRequiredSubevents, $requiredSubevent);
         }
         return $allRequiredSubevents;
     }
 
-    private function getRequiredSubeventsTransitiveRec(&$allRequiredSubevents, $subevent)
+    /**
+     * @param $allRequiredSubevents
+     * @param $subevent
+     */
+    private function getRequiredSubeventsTransitiveRec(Collection &$allRequiredSubevents, Subevent $subevent) : void
     {
-        if ($this == $subevent || in_array($subevent, $allRequiredSubevents))
+        if ($this === $subevent || $allRequiredSubevents->contains($subevent))
             return;
 
-        $allRequiredSubevents[] = $subevent;
+        $allRequiredSubevents->add($subevent);
 
         foreach ($subevent->requiredSubevents as $requiredSubevent) {
             $this->getRequiredSubeventsTransitiveRec($allRequiredSubevents, $requiredSubevent);
         }
     }
+
+    /**
+     * Vrací názvy všech vyžadovaných podakcí.
+     * @return string
+     */
+    public function getRequiredSubeventsTransitiveText() : string
+    {
+        $requiredSubeventsNames = [];
+        foreach ($this->getRequiredSubeventsTransitive() as $requiredSubevent) {
+            $requiredSubeventsNames[] = $requiredSubevent->getName();
+        }
+        return implode(', ', $requiredSubeventsNames);
+    }
 }
diff --git a/app/model/Structure/SubeventRepository.php b/app/model/Structure/SubeventRepository.php
index ae42e70c6..fa45fe77f 100644
--- a/app/model/Structure/SubeventRepository.php
+++ b/app/model/Structure/SubeventRepository.php
@@ -4,6 +4,7 @@
 
 use App\Model\Enums\ApplicationState;
 use App\Model\User\User;
+use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Kdyby\Doctrine\EntityRepository;
@@ -63,15 +64,16 @@ public function findAllNames()
 
     /**
      * Vrací vytvořené podakce, seřazené podle názvu.
-     * @return array
+     * @return Collection|Subevent[]
      */
     public function findAllExplicitOrderedByName()
     {
-        return $this->createQueryBuilder('s')
+        $result = $this->createQueryBuilder('s')
             ->where('s.implicit = FALSE')
             ->orderBy('s.name')
             ->getQuery()
             ->getResult();
+        return new ArrayCollection($result);
     }
 
     /**
diff --git a/app/model/User/Application.php b/app/model/User/Application/Application.php
similarity index 82%
rename from app/model/User/Application.php
rename to app/model/User/Application/Application.php
index e6026d964..988f07ab5 100644
--- a/app/model/User/Application.php
+++ b/app/model/User/Application/Application.php
@@ -3,19 +3,41 @@
 namespace App\Model\User;
 
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
 
 /**
- * Entita přihláška.
+ * Abstraktní entita přihláška.
  *
  * @author Jan Staněk <jan.stanek@skaut.cz>
  * @ORM\Entity(repositoryClass="ApplicationRepository")
  * @ORM\Table(name="application")
+ * @ORM\InheritanceType("SINGLE_TABLE")
+ * @ORM\DiscriminatorColumn(name="type", type="string")
+ * @ORM\DiscriminatorMap({
+ *     "roles_application" = "RolesApplication",
+ *     "subevents_application" = "SubeventsApplication"
+ * })
  */
-class Application
+abstract class Application
 {
+    /**
+     * Přihláška rolí.
+     */
+    const ROLES = "roles";
+
+    /**
+     * Přihláška na podakce.
+     */
+    const SUBEVENTS = "subevents";
+
+    /**
+     * Typ přihlášky.
+     */
+    protected $type;
+
     use Identifier;
 
     /**
@@ -28,14 +50,14 @@ class Application
     /**
      * Role.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $roles;
 
     /**
      * Podakce.
      * @ORM\ManyToMany(targetEntity="\App\Model\Structure\Subevent", inversedBy="applications", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $subevents;
 
@@ -95,13 +117,6 @@ class Application
      */
     protected $state;
 
-    /**
-     * První přihláška uživatele.
-     * @ORM\Column(type="boolean")
-     * @var bool
-     */
-    protected $first = TRUE;
-
     /**
      * @ORM\ManyToOne(targetEntity="User", cascade={"persist"})
      * @var User
@@ -117,26 +132,26 @@ class Application
 
     /**
      * Platnost záznamu do.
-     * @ORM\Column(type="datetime")
+     * @ORM\Column(type="datetime", nullable=true)
      * @var \DateTime
      */
     protected $validTo;
 
 
     /**
-     * Application constructor.
+     * @return int
      */
-    public function __construct()
+    public function getId()
     {
-        $this->subevents = new ArrayCollection();
+        return $this->id;
     }
 
     /**
-     * @return int
+     * @return string
      */
-    public function getId()
+    public function getType(): string
     {
-        return $this->id;
+        return $this->type;
     }
 
     /**
@@ -155,34 +170,6 @@ public function setUser($user)
         $this->user = $user;
     }
 
-    /**
-     * @return ArrayCollection
-     */
-    public function getSubevents()
-    {
-        return $this->subevents;
-    }
-
-    /**
-     * @param ArrayCollection $subevents
-     */
-    public function setSubevents($subevents)
-    {
-        $this->subevents = $subevents;
-    }
-
-    /**
-     * Vrací podakce oddělené čárkou.
-     * @return string
-     */
-    public function getSubeventsText()
-    {
-        $subeventsNames = [];
-        foreach ($this->subevents as $subevent)
-            $subeventsNames[] = $subevent->getName();
-        return implode(', ', $subeventsNames);
-    }
-
     /**
      * @return int
      */
@@ -213,13 +200,22 @@ public function setFee($fee)
     }
 
     /**
-     * @return VariableSymbol|null
+     * @return VariableSymbol
      */
-    public function getVariableSymbol(): ?VariableSymbol
+    public function getVariableSymbol(): VariableSymbol
     {
         return $this->variableSymbol;
     }
 
+    /**
+     * Vrací text variabilního symbolu.
+     * @return string
+     */
+    public function getVariableSymbolText(): string
+    {
+        return $this->variableSymbol->getVariableSymbol();
+    }
+
     /**
      * @param VariableSymbol $variableSymbol
      */
@@ -252,6 +248,15 @@ public function getMaturityDate()
         return $this->maturityDate;
     }
 
+    /**
+     * Vrací datum splastnosti jako text.
+     * @return string|null
+     */
+    public function getMaturityDateText(): ?string
+    {
+        return $this->maturityDate !== NULL ? $this->maturityDate->format('j. n. Y') : NULL;
+    }
+
     /**
      * @param \DateTime $maturityDate
      */
@@ -324,22 +329,6 @@ public function setState($state)
         $this->state = $state;
     }
 
-    /**
-     * @return mixed
-     */
-    public function isFirst()
-    {
-        return $this->first;
-    }
-
-    /**
-     * @param mixed $first
-     */
-    public function setFirst($first)
-    {
-        $this->first = $first;
-    }
-
     /**
      * @return User
      */
@@ -375,7 +364,7 @@ public function setValidFrom(\DateTime $validFrom)
     /**
      * @return \DateTime
      */
-    public function getValidTo(): \DateTime
+    public function getValidTo(): ?\DateTime
     {
         return $this->validTo;
     }
@@ -383,7 +372,7 @@ public function getValidTo(): \DateTime
     /**
      * @param \DateTime $validTo
      */
-    public function setValidTo(\DateTime $validTo)
+    public function setValidTo(?\DateTime $validTo)
     {
         $this->validTo = $validTo;
     }
diff --git a/app/model/User/ApplicationRepository.php b/app/model/User/Application/ApplicationRepository.php
similarity index 96%
rename from app/model/User/ApplicationRepository.php
rename to app/model/User/Application/ApplicationRepository.php
index 1d0f6a9d9..24b30db40 100644
--- a/app/model/User/ApplicationRepository.php
+++ b/app/model/User/Application/ApplicationRepository.php
@@ -31,6 +31,7 @@ public function findWaitingForPaymentApplications()
     {
         return $this->createQueryBuilder('a')
             ->where('a.state = :state')->setParameter('state', ApplicationState::WAITING_FOR_PAYMENT)
+            ->andWhere('a.validTo IS NULL')
             ->getQuery()
             ->getResult();
     }
diff --git a/app/model/User/Application/RolesApplication.php b/app/model/User/Application/RolesApplication.php
new file mode 100644
index 000000000..b91ed6137
--- /dev/null
+++ b/app/model/User/Application/RolesApplication.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Model\User;
+
+use App\Model\ACL\Role;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Kdyby\Doctrine\Entities\Attributes\Identifier;
+
+
+/**
+ * Entita přihláška rolí.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ * @ORM\Entity(repositoryClass="RolesApplicationRepository")
+ */
+class RolesApplication extends Application
+{
+    protected $type = Application::ROLES;
+
+    /**
+     * Role.
+     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
+     * @var Collection
+     */
+    protected $roles;
+
+
+    /**
+     * RolesApplication constructor.
+     */
+    public function __construct()
+    {
+        $this->subevents = new ArrayCollection();
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getRoles(): Collection
+    {
+        return $this->roles;
+    }
+
+    /**
+     * @param Collection $roles
+     */
+    public function setRoles(Collection $roles): void
+    {
+        $this->roles = $roles;
+    }
+
+    /**
+     * Vrací názvy rolí oddělené čárkou.
+     * @return string
+     */
+    public function getRolesText() : string
+    {
+        return implode(', ', $this->roles->map(function (Role $role) {return $role->getName();})->toArray());
+    }
+
+    public function getSubeventsText(): ?string
+    {
+        return NULL;
+    }
+}
diff --git a/app/model/User/Application/RolesApplicationRepository.php b/app/model/User/Application/RolesApplicationRepository.php
new file mode 100644
index 000000000..8c92bde35
--- /dev/null
+++ b/app/model/User/Application/RolesApplicationRepository.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Model\User;
+
+use Kdyby\Doctrine\EntityRepository;
+
+
+/**
+ * Třída spravující přihlášky rolí.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class RolesApplicationRepository extends EntityRepository
+{
+}
diff --git a/app/model/User/Application/SubeventsApplication.php b/app/model/User/Application/SubeventsApplication.php
new file mode 100644
index 000000000..6b82937b8
--- /dev/null
+++ b/app/model/User/Application/SubeventsApplication.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Model\User;
+
+use App\Model\Structure\Subevent;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+use Kdyby\Doctrine\Entities\Attributes\Identifier;
+
+
+/**
+ * Entita přihláška podakcí.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ * @ORM\Entity(repositoryClass="SubeventsApplicationRepository")
+ */
+class SubeventsApplication extends Application
+{
+    protected $type = Application::SUBEVENTS;
+
+    /**
+     * Podakce.
+     * @ORM\ManyToMany(targetEntity="\App\Model\Structure\Subevent", inversedBy="applications", cascade={"persist"})
+     * @var Collection
+     */
+    protected $subevents;
+
+
+    /**
+     * SubeventsApplication constructor.
+     */
+    public function __construct()
+    {
+        $this->subevents = new ArrayCollection();
+    }
+
+    /**
+     * @return Collection
+     */
+    public function getSubevents(): Collection
+    {
+        return $this->subevents;
+    }
+
+    /**
+     * @param Collection $subevents
+     */
+    public function setSubevents(Collection $subevents): void
+    {
+        $this->subevents = $subevents;
+    }
+
+    /**
+     * Vrací názvy podakcí oddělené čárkou.
+     * @return string
+     */
+    public function getSubeventsText() : string
+    {
+        return implode(', ', $this->subevents->map(function (Subevent $subevent) {return $subevent->getName();})->toArray());
+    }
+
+    public function getRolesText(): ?string
+    {
+        return NULL;
+    }
+}
diff --git a/app/model/User/Application/SubeventsApplicationRepository.php b/app/model/User/Application/SubeventsApplicationRepository.php
new file mode 100644
index 000000000..7a98d2f3a
--- /dev/null
+++ b/app/model/User/Application/SubeventsApplicationRepository.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Model\User;
+
+use Kdyby\Doctrine\EntityRepository;
+
+
+/**
+ * Třída spravující přihlášky podakcí.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class SubeventsApplicationRepository extends EntityRepository
+{
+}
diff --git a/app/model/User/User.php b/app/model/User/User.php
index 93318b235..f387655fb 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -11,6 +11,7 @@
 use App\Model\Settings\CustomInput\CustomInput;
 use App\Model\Structure\Subevent;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\PersistentCollection;
@@ -51,14 +52,14 @@ class User
     /**
      * Přihlášky.
      * @ORM\OneToMany(targetEntity="Application", mappedBy="user", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $applications;
 
     /**
      * Role.
      * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role", inversedBy="users", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $roles;
 
@@ -66,14 +67,14 @@ class User
      * Přihlášené programy.
      * @ORM\ManyToMany(targetEntity="\App\Model\Program\Program", inversedBy="attendees", cascade={"persist"})
      * @ORM\OrderBy({"start" = "ASC"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $programs;
 
     /**
      * Lektorované bloky.
      * @ORM\OneToMany(targetEntity="\App\Model\Program\Block", mappedBy="lector", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $lecturersBlocks;
 
@@ -270,7 +271,7 @@ class User
     /**
      * Hodnoty vlastních polí přihlášky.
      * @ORM\OneToMany(targetEntity="\App\Model\User\CustomInputValue\CustomInputValue", mappedBy="user", cascade={"persist"})
-     * @var ArrayCollection
+     * @var Collection
      */
     protected $customInputValues;
 
@@ -348,7 +349,7 @@ public function setEmail($email)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getRoles()
     {
@@ -356,7 +357,7 @@ public function getRoles()
     }
 
     /**
-     * @param ArrayCollection $roles
+     * @param Collection $roles
      */
     public function setRoles($roles)
     {
@@ -406,6 +407,15 @@ public function getRolesText()
         return implode(', ', $rolesNames);
     }
 
+    /**
+     * Vrací, zda má uživatel nějakou roli, která nemá cenu podle podakcí.
+     * @return bool
+     */
+    public function hasFixedFeeRole(): bool
+    {
+        return !$this->roles->forAll(function (int $key, Role $role) {return $role->getFee() === NULL;});
+    }
+
     /**
      * Má uživatel oprávnění k prostředku?
      * @param $resource
@@ -440,7 +450,7 @@ public function isAllowedModifyBlock(Block $block)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getApplications()
     {
@@ -454,54 +464,76 @@ public function addApplication($application)
     }
 
     /**
-     * Vrátí nezrušené přihlášky.
-     * @return ArrayCollection
+     * Vrátí platné přihlášky.
+     * @return Collection|Application[]
      */
-    public function getNotCanceledApplications()
+    public function getValidApplications(): Collection
     {
         $criteria = Criteria::create()
-            ->where(Criteria::expr()->orX(
-                Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT),
-                Criteria::expr()->eq('state', ApplicationState::PAID)
-            ));
+            ->where(Criteria::expr()->isNull('validTo'));
 
         return $this->applications->matching($criteria);
     }
 
     /**
-     * Vrátí zaplacené přihlášky.
-     * @return ArrayCollection
+     * Vrátí nezrušené přihlášky.
+     * @return Collection|Application[]
      */
-    public function getPaidApplications()
+    public function getNotCanceledApplications(): Collection
     {
         $criteria = Criteria::create()
-            ->where(Criteria::expr()->eq('state', ApplicationState::PAID));
+            ->where(Criteria::expr()->andX(
+                Criteria::expr()->isNull('validTo'),
+                Criteria::expr()->orX(
+                    Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT),
+                    Criteria::expr()->eq('state', ApplicationState::PAID),
+                    Criteria::expr()->eq('state', ApplicationState::PAID_FREE)
+                )
+            ));
 
         return $this->applications->matching($criteria);
     }
 
     /**
-     * Vrátí přihlášky čekající na platbu.
-     * @return ArrayCollection
+     * Vrátí nezrušené přihlášky na podakce.
+     * @return Collection|SubeventsApplication[]
      */
-    public function getWaitingForPaymentApplications()
+    public function getNotCanceledSubeventsApplications(): Collection
+    {
+        $applications = $this->getNotCanceledApplications();
+        return $applications->filter(function (Application $application) {
+            return $application->getType() == Application::SUBEVENTS;
+        });
+    }
+
+    /**
+     * Vrácí zaplacené přihlášky.
+     * @return Collection
+     */
+    public function getPaidApplications()
     {
         $criteria = Criteria::create()
-            ->where(Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT));
+            ->where(Criteria::expr()->andX(
+                Criteria::expr()->isNull('validTo'),
+                Criteria::expr()->eq('state', ApplicationState::PAID)
+            ));
 
         return $this->applications->matching($criteria);
     }
 
     /**
-     * Vrátí první přihlášku.
-     * @return Application
+     * Vrátí přihlášky čekající na platbu.
+     * @return Collection
      */
-    public function getFirstApplication()
+    public function getWaitingForPaymentApplications()
     {
         $criteria = Criteria::create()
-            ->where(Criteria::expr()->eq('first', TRUE));
+            ->where(Criteria::expr()->andX(
+                Criteria::expr()->isNull('validTo'),
+                Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT)
+            ));
 
-        return $this->applications->matching($criteria)->first();
+        return $this->applications->matching($criteria);
     }
 
     /**
@@ -511,17 +543,15 @@ public function getFirstApplication()
      */
     public function hasPaidSubevent(Subevent $subevent)
     {
-        $criteria = Criteria::create()->where(Criteria::expr()->eq('state', ApplicationState::PAID));
+        $subeventsApplications = $this->getNotCanceledSubeventsApplications();
 
-        foreach ($this->applications->matching($criteria) as $application) {
-            if ($application->getSubevents()->contains($subevent))
-                return TRUE;
-        }
-        return FALSE;
+        return $subeventsApplications->map(function (SubeventsApplication $application) {
+            return $application->getSubevents();
+        })->contains($subevent); //TODO kontrola
     }
 
     /**
-     * @param ArrayCollection $applications
+     * @param Collection $applications
      */
     public function setApplications($applications)
     {
@@ -529,7 +559,7 @@ public function setApplications($applications)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getPrograms()
     {
@@ -537,7 +567,7 @@ public function getPrograms()
     }
 
     /**
-     * @param ArrayCollection $programs
+     * @param Collection $programs
      */
     public function setPrograms($programs)
     {
@@ -545,7 +575,7 @@ public function setPrograms($programs)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getLecturersBlocks()
     {
@@ -553,7 +583,7 @@ public function getLecturersBlocks()
     }
 
     /**
-     * @param ArrayCollection $lecturersBlocks
+     * @param Collection $lecturersBlocks
      */
     public function setLecturersBlocks($lecturersBlocks)
     {
@@ -602,20 +632,6 @@ public function isApproved()
         return $this->approved;
     }
 
-    /**
-     * Má pouze automaticky schválené role?
-     * @return bool
-     */
-    public function isApprovedAfterRegistration()
-    {
-        foreach ($this->roles as $role) {
-            if (!$role->isApprovedAfterRegistration()) {
-                return FALSE;
-            }
-        }
-        return TRUE;
-    }
-
     /**
      * @param bool $approved
      */
@@ -1071,7 +1087,7 @@ public function setMembershipCategory($membershipCategory)
     }
 
     /**
-     * @return ArrayCollection
+     * @return Collection
      */
     public function getCustomInputValues()
     {
@@ -1079,7 +1095,7 @@ public function getCustomInputValues()
     }
 
     /**
-     * @param ArrayCollection $customInputValues
+     * @param Collection $customInputValues
      */
     public function setCustomInputValues($customInputValues)
     {
@@ -1163,24 +1179,6 @@ public function hasDisplayArrivalDepartureRole()
         return !$this->roles->matching($criteria)->isEmpty();
     }
 
-    /**
-     * Vrací kategorie, ze kterých si uživatel může přihlašovat programy.
-     * @param null $roles
-     * @return array
-     */
-    public function getRegisterableCategories($roles = NULL)
-    {
-        $categories = [];
-        if ($roles === NULL)
-            $roles = $this->roles;
-        foreach ($roles as $role) {
-            foreach ($role->getRegisterableCategories() as $category) {
-                $categories[] = $category;
-            }
-        }
-        return $categories;
-    }
-
     /**
      * Je uživatel platící?
      * @return bool
@@ -1223,7 +1221,7 @@ public function getFeeRemaining()
     public function getFirstApplicationDate()
     {
         $minDate = NULL;
-        foreach ($this->applications as $application) {
+        foreach ($this->getValidApplications() as $application) {
             if ($minDate === NULL || $minDate > $application->getApplicationDate())
                 $minDate = $application->getApplicationDate();
         }
@@ -1237,7 +1235,7 @@ public function getFirstApplicationDate()
     public function getLastPaymentDate()
     {
         $maxDate = NULL;
-        foreach ($this->applications as $application) {
+        foreach ($this->getValidApplications() as $application) {
             if ($maxDate === NULL || $maxDate < $application->getPaymentDate())
                 $maxDate = $application->getPaymentDate();
         }
@@ -1246,19 +1244,14 @@ public function getLastPaymentDate()
 
     /**
      * Vrací podakce uživatele.
-     * @return ArrayCollection
+     * @return Collection|Subevent[]
      */
-    public function getSubevents()
+    public function getSubevents(): Collection
     {
-        $subevents = new ArrayCollection();
-        foreach ($this->applications as $application) {
-            if ($application->getState() == ApplicationState::PAID
-                || $application->getState() == ApplicationState::WAITING_FOR_PAYMENT) {
-                foreach ($application->getSubevents() as $subevent) {
-                    $subevents->add($subevent);
-                }
-            }
-        }
+        $subevents = $this->getNotCanceledSubeventsApplications()->map(function (SubeventsApplication $application) {
+            return $application->getSubevents(); //TODO kontrola
+        });
+
         return $subevents;
     }
 
@@ -1266,13 +1259,10 @@ public function getSubevents()
      * Vrátí podakce uživatele oddělené čárkou.
      * @return string
      */
-    public function getSubeventsText()
+    public function getSubeventsText(): string
     {
-        $subeventsNames = [];
-        foreach ($this->getSubevents() as $subevent) {
-            $subeventsNames[] = $subevent->getName();
-        }
-        return implode(', ', $subeventsNames);
+        $subeventsNames = $this->getSubevents()->map(function (Subevent $subevent) {return $subevent->getName();});
+        return implode(', ', $subeventsNames->toArray());
     }
 
     /**
@@ -1289,19 +1279,9 @@ public function hasSubevent(Subevent $subevent)
      * Vrací zda uživatel zaplatil první registraci.
      * @return bool
      */
-    public function hasPaidFirstApplication()
+    public function hasPaidAnyApplication()
     {
-        $criteria = Criteria::create()->where(
-            Criteria::expr()->andX(
-                Criteria::expr()->eq('state', ApplicationState::PAID),
-                Criteria::expr()->eq('first', TRUE)
-            )
-        );
-
-        if ($this->applications->matching($criteria)->isEmpty())
-            return FALSE;
-
-        return TRUE;
+        return !$this->getPaidApplications()->isEmpty();
     }
 
     /**
@@ -1310,12 +1290,9 @@ public function hasPaidFirstApplication()
      */
     public function hasPaidEveryApplication()
     {
-        $criteria = Criteria::create()->where(Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT));
-
-        if ($this->applications->matching($criteria)->isEmpty())
-            return TRUE;
-
-        return FALSE;
+        return $this->getValidApplications()->forAll(function (int $key, Application $application) {
+            return $application->getState() != ApplicationState::WAITING_FOR_PAYMENT;
+        });
     }
 
     /**
@@ -1324,10 +1301,9 @@ public function hasPaidEveryApplication()
      */
     public function getVariableSymbolsText()
     {
-        $variableSymbols = [];
-        foreach ($this->applications as $application)
-            if ($application->getVariableSymbol())
-                $variableSymbols[] = $application->getVariableSymbol()->getVariableSymbol();
-        return implode(', ', $variableSymbols);
+        $variableSymbols = $this->getValidApplications()->map(function (Application $application) {
+            return $application->getVariableSymbolText();
+        });
+        return implode(', ', $variableSymbols->toArray());
     }
 }
diff --git a/app/model/User/UserRepository.php b/app/model/User/UserRepository.php
index 8e19c491b..2c13555f9 100644
--- a/app/model/User/UserRepository.php
+++ b/app/model/User/UserRepository.php
@@ -5,7 +5,10 @@
 use App\Model\ACL\Permission;
 use App\Model\ACL\Role;
 use App\Model\Enums\ApplicationState;
+use App\Model\Program\Category;
 use App\Model\Program\Program;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
 use Kdyby\Doctrine\EntityRepository;
 
@@ -155,7 +158,8 @@ public function findProgramAllowed(Program $program)
             ->innerJoin('a.subevents', 's')
             ->where('per.name = :permission')
             ->andWhere('s.id = :sid')
-            ->andWhere('(a.state = \'' . ApplicationState::PAID . '\' OR a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\')')
+            ->andWhere('(a.state = \'' . ApplicationState::PAID . '\' OR a.state = \'' . ApplicationState::PAID_FREE
+                . '\' OR a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\')')
             ->setParameter('pid', $program->getId())
             ->setParameter('permission', Permission::CHOOSE_PROGRAMS)
             ->setParameter('sid', $program->getBlock()->getSubevent()->getId());
@@ -211,22 +215,6 @@ public function getLectorsOptions()
         return $options;
     }
 
-    /**
-     * Vrací kategorie, ze kterých si uživatel může vybírat programy.
-     * @param User $user
-     * @return int[]
-     */
-    public function findRegisterableCategoriesIdsByUser(User $user)
-    {
-        return $this->createQueryBuilder('u')
-            ->select('c.id')
-            ->join('u.roles', 'r')
-            ->join('r.registerableCategories', 'c')
-            ->where('u.id = :id')->setParameter('id', $user->getId())
-            ->getQuery()
-            ->getScalarResult();
-    }
-
     /**
      * Uloží uživatele.
      * @param User $user
@@ -238,7 +226,7 @@ public function save(User $user)
     }
 
     /**
-     * Odstraní uživatele.
+     * Odstraní externího uživatele.
      * @param User $user
      */
     public function remove(User $user)
diff --git a/app/model/enums/ApplicationState.php b/app/model/enums/ApplicationState.php
index dd2b935c0..ee33d19ec 100644
--- a/app/model/enums/ApplicationState.php
+++ b/app/model/enums/ApplicationState.php
@@ -24,4 +24,9 @@ class ApplicationState
      * Zaplaceno.
      */
     const PAID = "paid";
+
+    /**
+     * Zaplaceno (zdarma).
+     */
+    const PAID_FREE = "paid_free";
 }
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index 554602de9..24ce8bed2 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -2,18 +2,32 @@
 
 namespace App\Services;
 
+use App\Model\ACL\Role;
 use App\Model\ACL\RoleRepository;
 use App\Model\Enums\ApplicationState;
 use App\Model\Enums\MaturityType;
+use App\Model\Mailing\Mail;
+use App\Model\Mailing\Template;
+use App\Model\Mailing\TemplateVariable;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
 use App\Model\Structure\DiscountRepository;
+use App\Model\Structure\Subevent;
 use App\Model\Structure\SubeventRepository;
 use App\Model\User\Application;
 use App\Model\User\ApplicationRepository;
+use App\Model\User\RolesApplication;
+use App\Model\User\SubeventsApplication;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
+use App\Model\User\VariableSymbol;
+use App\Model\User\VariableSymbolRepository;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use function foo\func;
+use Kdyby\Translation\Translator;
 use Nette;
+use Psr\Log\NullLogger;
 
 
 /**
@@ -44,6 +58,18 @@ class ApplicationService extends Nette\Object
     /** @var DiscountService */
     private $discountService;
 
+    /** @var VariableSymbolRepository */
+    private $variableSymbolRepository;
+
+    /** @var ProgramService */
+    private $programService;
+
+    /** @var MailService */
+    private $mailService;
+
+    /** @var Translator */
+    private $translator;
+
 
     /**
      * ApplicationService constructor.
@@ -54,11 +80,14 @@ class ApplicationService extends Nette\Object
      * @param RoleRepository $roleRepository
      * @param SubeventRepository $subeventRepository
      * @param DiscountService $discountService
+     * @param VariableSymbolRepository $variableSymbolRepository
+     * @param ProgramService $programService
      */
     public function __construct(SettingsRepository $settingsRepository, ApplicationRepository $applicationRepository,
                                 UserRepository $userRepository, DiscountRepository $discountRepository,
                                 RoleRepository $roleRepository, SubeventRepository $subeventRepository,
-                                DiscountService $discountService)
+                                DiscountService $discountService, VariableSymbolRepository $variableSymbolRepository,
+                                ProgramService $programService, MailService $mailService, Translator $translator)
     {
         $this->settingsRepository = $settingsRepository;
         $this->applicationRepository = $applicationRepository;
@@ -67,18 +96,295 @@ public function __construct(SettingsRepository $settingsRepository, ApplicationR
         $this->roleRepository = $roleRepository;
         $this->subeventRepository = $subeventRepository;
         $this->discountService = $discountService;
+        $this->variableSymbolRepository = $variableSymbolRepository;
+        $this->programService = $programService;
+        $this->mailService = $mailService;
+        $this->translator = $translator;
+    }
+
+    /**
+     * @param User $user
+     * @param Collection $roles
+     * @param Collection $subevents
+     * @param User $createdBy
+     * @param bool $approve
+     * @throws \Throwable
+     */
+    public function register(User $user, Collection $roles, Collection $subevents, User $createdBy,
+                             bool $approve = FALSE): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $subevents, $createdBy, $approve) {
+            $rolesApplication = $this->createRolesApplication($user, $roles, $createdBy, $approve);
+            $subeventsApplication = $this->createSubeventsApplication($user, $subevents, $createdBy);
+
+            $this->programService->updateUserPrograms($user);
+
+            $applicatonMaturity = "-";
+            $applicationFee = "0";
+            $applicationVariableSymbol = "-";
+
+            if ($rolesApplication->getFee() > 0 && $subeventsApplication->getFee() > 0) {
+                if ($rolesApplication->getMaturityDate())
+                    $applicatonMaturity = $rolesApplication->getMaturityDateText();
+                $applicationFee = $rolesApplication->getFee() . ", " . $subeventsApplication->getFee();
+                $applicationVariableSymbol = $rolesApplication->getVariableSymbolText() . ", " . $subeventsApplication->getVariableSymbolText();
+            } elseif ($rolesApplication->getFee() > 0) {
+                if ($rolesApplication->getMaturityDate())
+                    $applicatonMaturity = $rolesApplication->getMaturityDateText();
+                $applicationFee = $rolesApplication->getFee();
+                $applicationVariableSymbol = $rolesApplication->getVariableSymbolText();
+            } elseif ($subeventsApplication->getFee() > 0) {
+                if ($subeventsApplication->getMaturityDate())
+                    $applicatonMaturity = $subeventsApplication->getMaturityDateText();
+                $applicationFee = $subeventsApplication->getFee();
+                $applicationVariableSymbol = $subeventsApplication->getVariableSymbolText();
+            }
+
+            $editRegistrationToText = $this->settingsRepository->getDateValueText(Settings::EDIT_REGISTRATION_TO);
+
+            $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION, [
+                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+                TemplateVariable::EDIT_REGISTRATION_TO => $editRegistrationToText !== NULL ? $editRegistrationToText : '-',
+                TemplateVariable::APPLICATION_MATURITY => $applicatonMaturity,
+                TemplateVariable::APPLICATION_FEE => $applicationFee,
+                TemplateVariable::APPLICATION_VARIABLE_SYMBOL => $applicationVariableSymbol,
+                TemplateVariable::BANK_ACCOUNT => $this->settingsRepository->getValue(Settings::ACCOUNT_NUMBER)
+            ]);
+        });
+    }
+
+    /**
+     * @param User $user
+     * @param Collection $roles
+     * @param User $createdBy
+     * @throws \Throwable
+     */
+    public function updateRoles(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $createdBy, $approve) {
+            if ($approve) {
+                $user->setApproved(TRUE);
+            } else {
+                if ($user->isApproved()) {
+                    foreach ($roles as $role) {
+                        if (!$role->isApprovedAfterRegistration() && !$user->isInRole($role)) {
+                            $user->setApproved(FALSE);
+                            break;
+                        }
+                    }
+                } else {
+                    if ($roles->forAll(function (int $key, Role $role) {return $role->isApprovedAfterRegistration();}))
+                        $user->setApproved(TRUE);
+                }
+            }
+
+            $user->setRoles($roles);
+            $this->userRepository->save($user);
+
+            foreach ($user->getValidApplications() as $application) {
+                if ($application->getType() == Application::ROLES) {
+                    $application->setValidTo(new \DateTime());
+                    $this->applicationRepository->save($application);
+
+                    $newApplication = new RolesApplication();
+                    $newApplication->setUser($user);
+                    $newApplication->setRoles($roles);
+                    $newApplication->setApplicationDate($application->getApplicationDate());
+                    $newApplication->setFee($this->countRolesFee($roles));
+                    $newApplication->setMaturityDate($application->getMaturityDate());
+                    $newApplication->setState($this->getApplicationState($newApplication));
+                    $newApplication->setVariableSymbol($application->getVariableSymbol());
+                    $newApplication->setCreatedBy($createdBy);
+                    $newApplication->setValidFrom(new \DateTime());
+                    $this->applicationRepository->save($newApplication);
+
+                    $user->addApplication($newApplication);
+                } else {
+                    $fee = $this->countSubeventsFee($roles, $application->getSubevents());
+
+                    if ($application->getFee() != $fee) {
+                        $application->setValidTo(new \DateTime());
+                        $this->applicationRepository->save($application);
+
+                        $newApplication = new SubeventsApplication();
+                        $newApplication->setUser($user);
+                        $newApplication->setSubevents($application->getSubevents());
+                        $newApplication->setApplicationDate($application->getApplicationDate());
+                        $newApplication->setFee($fee);
+                        $newApplication->setMaturityDate($application->getMaturityDate());
+                        $newApplication->setState($this->getApplicationState($newApplication));
+                        $newApplication->setVariableSymbol($application->getVariableSymbol());
+                        $newApplication->setCreatedBy($createdBy);
+                        $newApplication->setValidFrom(new \DateTime());
+                        $this->applicationRepository->save($newApplication);
+
+                        $user->addApplication($newApplication);
+                    }
+                }
+            }
+
+            $this->userRepository->save($user);
+
+            $this->programService->updateUserPrograms($user);
+
+            //TODO mail
+//            $this->mailService->sendMailFromTemplate($user, '', Template::ROLES_CHANGED, [
+//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+//                TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {return $role->getName();})->toArray())
+//            ]);
+        });
+    }
+
+    /**
+     * @param User $user
+     * @param User $createdBy
+     * @throws \Throwable
+     */
+    public function cancelRegistration(User $user, User $createdBy): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $createdBy) {
+
+        });
+    }
+
+    /**
+     * @param User $user
+     * @param Collection $subevents
+     * @param User $createdBy
+     * @throws \Throwable
+     */
+    public function addSubevents(User $user, Collection $subevents, User $createdBy): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $subevents, $createdBy) {
+            //TODO
+        });
     }
 
     /**
-     * Vygeneruje variabilní symbol.
      * @param Application $application
-     * @return string
+     * @param Collection $subevents
+     * @param User $createdBy
+     * @throws \Throwable
+     */
+    public function updateSubevents(Application $application, Collection $subevents, User $createdBy): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $subevents, $createdBy) {
+            //TODO
+        });
+    }
+
+    /**
+     * @param Application $application
+     * @param User $createdBy
+     * @throws \Throwable
+     */
+    public function cancelSubevents(Application $application, User $createdBy): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $createdBy) {
+            //TODO
+        });
+    }
+
+    /**
+     * @param Application $application
+     * @param \DateTime $paymentDate
+     * @param string $paymentMethod
+     * @param User $createdBy
+     * @throws \Throwable
+     */
+    public function updatePayment(Application $application, \DateTime $paymentDate, string $paymentMethod,
+                                  User $createdBy): void
+    {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $paymentDate, $paymentMethod, $createdBy) {
+            //TODO
+        });
+    }
+
+    /**
+     * @param User $user
+     * @param Collection $roles
+     * @param User $createdBy
+     * @param bool $approve
+     * @return RolesApplication
      * @throws \App\Model\Settings\SettingsException
      */
-    public function generateVariableSymbol(Application $application)
+    private function createRolesApplication(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): RolesApplication
+    {
+        if ($user->isApproved() && !$approve) {
+            foreach ($roles as $role) {
+                if (!$role->isApprovedAfterRegistration()) {
+                    $user->setApproved(FALSE);
+                    break;
+                }
+            }
+        }
+
+        $user->setRoles($roles);
+        $this->userRepository->save($user);
+
+        $application = new RolesApplication();
+        $application->setUser($user);
+        $application->setRoles($roles);
+        $application->setApplicationDate(new \DateTime());
+        $application->setFee($this->countRolesFee($roles));
+        $application->setMaturityDate($this->countMaturityDate());
+        $application->setState($this->getApplicationState($application));
+        $application->setVariableSymbol($this->generateVariableSymbol());
+        $application->setCreatedBy($createdBy);
+        $application->setValidFrom(new \DateTime());
+        $this->applicationRepository->save($application);
+
+        $user->addApplication($application);
+        $this->userRepository->save($user);
+
+        return $application;
+    }
+
+    /**
+     * @param User $user
+     * @param Collection $subevents
+     * @param User $createdBy
+     * @return SubeventsApplication
+     * @throws \App\Model\Settings\SettingsException
+     */
+    private function createSubeventsApplication(User $user, Collection $subevents,
+                                               User $createdBy): SubeventsApplication
+    {
+        $application = new SubeventsApplication();
+        $application->setUser($user);
+        $application->setSubevents($subevents);
+        $application->setApplicationDate(new \DateTime());
+        $application->setFee($this->countSubeventsFee($user->getRoles(), $subevents));
+        $application->setMaturityDate($this->countMaturityDate());
+        $application->setState($this->getApplicationState($application));
+        $application->setVariableSymbol($this->generateVariableSymbol());
+        $application->setCreatedBy($createdBy);
+        $application->setValidFrom(new \DateTime());
+        $this->applicationRepository->save($application);
+
+        $user->addApplication($application);
+        $this->userRepository->save($user);
+
+        return $application;
+    }
+
+    /**
+     * @return VariableSymbol
+     * @throws \App\Model\Settings\SettingsException
+     */
+    private function generateVariableSymbol(): VariableSymbol
     {
         $variableSymbolCode = $this->settingsRepository->getValue(Settings::VARIABLE_SYMBOL_CODE);
-        return $variableSymbolCode . str_pad($application->getId(), 6, '0', STR_PAD_LEFT);
+
+        $variableSymbol = new VariableSymbol();
+        $this->variableSymbolRepository->save($variableSymbol);
+
+        $variableSymbolText = $variableSymbolCode . str_pad($variableSymbol->getId(), 6, '0', STR_PAD_LEFT);
+
+        $variableSymbol->setVariableSymbol($variableSymbolText);
+        $this->variableSymbolRepository->save($variableSymbol);
+
+        return $variableSymbol;
     }
 
     /**
@@ -86,7 +392,7 @@ public function generateVariableSymbol(Application $application)
      * @return \DateTime|null
      * @throws \App\Model\Settings\SettingsException
      */
-    public function countMaturityDate()
+    private function countMaturityDate()
     {
         switch ($this->settingsRepository->getValue(Settings::MATURITY_TYPE)) {
             case MaturityType::DATE:
@@ -104,79 +410,118 @@ public function countMaturityDate()
     }
 
     /**
-     * Vypočítá poplatek.
-     * @param $roles
-     * @param $subevents
-     * @param bool $first
+     * Vypočítá poplatek za role.
+     * @param Collection $roles
      * @return int
      */
-    public function countFee($roles, $subevents, $first = TRUE)
+    private function countRolesFee(Collection $roles)
     {
         $fee = 0;
 
-        if ($roles !== NULL) {
-            $subeventsFeeRole = FALSE;
+        foreach ($roles as $role) {
+            if ($role->getFee() === 0)
+                return 0;
+            elseif ($role->getFee() > 0)
+                $fee += $role->getFee();
+        }
 
-            foreach ($roles as $role) {
-                //cena podle podakci
-                if ($role->getFee() === NULL) {
-                    if ($subevents !== NULL && !$subeventsFeeRole) {
-                        foreach ($subevents as $subevent) {
-                            $fee += $subevent->getFee();
-                        }
-                        $subeventsFeeRole = TRUE;
-                    }
-                } //neplatici role
-                elseif ($role->getFee() == 0) {
-                    return 0;
-                } //role s pevnym poplatkem
-                elseif ($first) {
-                    $fee += $role->getFee();
+        return $fee;
+    }
+
+    /**
+     * Vypočítá poplatek za podakce přihlášky.
+     * @param Collection|Role[] $roles
+     * @param Collection|Subevent[] $subevents
+     * @return int
+     */
+    private function countSubeventsFee(Collection $roles, Collection $subevents)
+    {
+        $fee = 0;
+
+        foreach ($roles as $role) {
+            if ($role->getFee() === 0)
+                return 0;
+            elseif ($role->getFee() === NULL) {
+                foreach ($subevents as $subevent) {
+                    $fee += $subevent->getFee();
                 }
+                return $fee;
             }
         }
 
-        $fee -= $this->discountService->countDiscount($this->subeventRepository->findSubeventsIds($subevents));
-
         return $fee;
     }
 
     /**
-     * Může uživatel dodatečně přidávat podakce?
+     * @param Application $application
+     * @return string
+     */
+    private function getApplicationState(Application $application)
+    {
+        if ($application->getState() == ApplicationState::CANCELED)
+            return ApplicationState::CANCELED;
+
+        if ($application->getState() == ApplicationState::CANCELED_NOT_PAID)
+            return ApplicationState::CANCELED_NOT_PAID;
+
+        if ($application->getFee() == 0)
+            return ApplicationState::PAID_FREE;
+        elseif ($application->getPaymentDate())
+            return ApplicationState::PAID;
+        else
+            return ApplicationState::WAITING_FOR_PAYMENT;
+    }
+
+    /**
+     * Vrací stav přihlášky jako text.
+     * @param Application $application
+     * @return string
+     */
+    public function getStateText(Application $application): string
+    {
+        $state = $this->translator->translate('common.application_state.' . $application->getState());
+
+        if ($application->getState() == ApplicationState::PAID)
+            $state .= ' (' . $application->getPaymentDate()->format('j. n. Y') . ')';
+
+        return $state;
+    }
+
+    /**
+     * Může uživatel upravovat role?
      * @param User $user
      * @return bool
      * @throws \App\Model\Settings\SettingsException
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function isAllowedAddSubevents(User $user)
+    public function isAllowedEditRegistration(User $user)
     {
-        return $user->hasPaidFirstApplication()
-            && $this->subeventRepository->explicitSubeventsExists()
-            && $this->settingsRepository->getValue(Settings::IS_ALLOWED_ADD_SUBEVENTS_AFTER_PAYMENT)
+        return !$user->hasPaidAnyApplication()
             && $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO) >= (new \DateTime())->setTime(0, 0);
     }
 
     /**
-     * Může uživatel upravovat první přihlášku?
-     * @param User $user
+     * Je uživateli povoleno upravit nebo zrušit přihlášku?
+     * @param Application $application
      * @return bool
      * @throws \App\Model\Settings\SettingsException
      */
-    public function isAllowedEditFirstApplication(User $user)
+    public function isAllowedEditApplication(Application $application)
     {
-        return !$user->hasPaidFirstApplication()
+        return $application->getState() == ApplicationState::WAITING_FOR_PAYMENT
             && $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO) >= (new \DateTime())->setTime(0, 0);
     }
 
     /**
-     * Je uživateli povoleno zrušit přihlášku?
-     * @param Application $application
+     * Může uživatel dodatečně přidávat podakce?
+     * @param User $user
      * @return bool
      * @throws \App\Model\Settings\SettingsException
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function isAllowedCancelApplication(Application $application)
+    public function isAllowedAddApplication(User $user)
     {
-        return $application->getState() == ApplicationState::WAITING_FOR_PAYMENT
+        return $user->hasPaidEveryApplication()
+            && $this->settingsRepository->getValue(Settings::IS_ALLOWED_ADD_SUBEVENTS_AFTER_PAYMENT)
             && $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO) >= (new \DateTime())->setTime(0, 0);
     }
 
diff --git a/app/services/ProgramService.php b/app/services/ProgramService.php
index 143a76feb..8dd992d73 100644
--- a/app/services/ProgramService.php
+++ b/app/services/ProgramService.php
@@ -5,13 +5,17 @@
 use App\Model\ACL\Permission;
 use App\Model\ACL\Resource;
 use App\Model\Enums\RegisterProgramsType;
+use App\Model\Program\Block;
 use App\Model\Program\BlockRepository;
+use App\Model\Program\CategoryRepository;
+use App\Model\Program\Program;
 use App\Model\Program\ProgramRepository;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Nette;
 
 
@@ -34,6 +38,9 @@ class ProgramService extends Nette\Object
     /** @var UserRepository */
     private $userRepository;
 
+    /** @var CategoryRepository */
+    private $categoryRepository;
+
 
     /**
      * ProgramService constructor.
@@ -41,14 +48,17 @@ class ProgramService extends Nette\Object
      * @param ProgramRepository $programRepository
      * @param BlockRepository $blockRepository
      * @param UserRepository $userRepository
+     * @param CategoryRepository $categoryRepository
      */
     public function __construct(SettingsRepository $settingsRepository, ProgramRepository $programRepository,
-                                BlockRepository $blockRepository, UserRepository $userRepository)
+                                BlockRepository $blockRepository, UserRepository $userRepository,
+                                CategoryRepository $categoryRepository)
     {
         $this->settingsRepository = $settingsRepository;
         $this->programRepository = $programRepository;
         $this->blockRepository = $blockRepository;
         $this->userRepository = $userRepository;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -95,7 +105,6 @@ public function updateUsersPrograms($users)
                     $newUsersPrograms->add($userAllowedProgram);
             }
 
-            $oldUsersPrograms->clear();
             $user->setPrograms($newUsersPrograms);
             $this->userRepository->save($user);
         }
@@ -104,42 +113,38 @@ public function updateUsersPrograms($users)
     /**
      * Vrací programy, na které se uživatel může přihlásit.
      * @param User $user
-     * @return array
+     * @return Collection|Program[]
      */
-    public function getUserAllowedPrograms($user)
+    public function getUserAllowedPrograms($user): Collection
     {
         if (!$user->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS))
-            return [];
-
-        $registerableCategoriesIds = $this->userRepository->findRegisterableCategoriesIdsByUser($user);
-
-        $registeredSubeventsIds = [];
+            return new ArrayCollection();
 
-        foreach ($user->getNotCanceledApplications() as $application) {
-            foreach ($application->getSubevents() as $subevent)
-                $registeredSubeventsIds[] = $subevent->getId();
-        }
+        $registerableCategories = $this->categoryRepository->findUserAllowed($user);
+        $registeredSubevents = $user->getSubevents();
 
-        return $this->programRepository->findAllowedForCategoriesAndSubevents($registerableCategoriesIds, $registeredSubeventsIds);
+        return $this->programRepository->findAllowedForCategoriesAndSubevents($registerableCategories, $registeredSubevents);
     }
 
     /**
      * Vrací názvy bloků, které jsou pro uživatele povinné, ale není na ně přihlášený.
      * @param User $user
-     * @return array
+     * @return Collection|Block[]
      */
-    public function getUnregisteredUserMandatoryBlocksNames($user)
+    public function getUnregisteredUserMandatoryBlocks(User $user): Collection
     {
-        $registerableCategoriesIds = $this->userRepository->findRegisterableCategoriesIdsByUser($user);
-        $usersSubevents = $user->getSubevents();
-
-        $unregisteredBlocks = $this->blockRepository->findMandatoryForCategoriesAndSubevents($user, $registerableCategoriesIds, $usersSubevents);
-
-        $names = [];
-        foreach ($unregisteredBlocks as $block)
-            $names[] = $block->getName();
+        $registerableCategories = $this->categoryRepository->findUserAllowed($user);
+        $registeredSubevents = $user->getSubevents();
 
-        return $names;
+        return $this->blockRepository->findMandatoryForCategoriesAndSubevents($user, $registerableCategories, $registeredSubevents);
     }
 
+    /**
+     * @param User $user
+     * @return Collection|string[]
+     */
+    public function getUnregisteredUserMandatoryBlocksNames(User $user): Collection
+    {
+        return $this->getUnregisteredUserMandatoryBlocks($user)->map(function (Block $block) {return $block->getName();});
+    }
 }
diff --git a/app/services/UserService.php b/app/services/UserService.php
index e39bdb6f7..b99477c64 100644
--- a/app/services/UserService.php
+++ b/app/services/UserService.php
@@ -49,57 +49,6 @@ public function __construct(Translator $translator, ProgramService $programServi
         $this->applicationRepository = $applicationRepository;
     }
 
-    /**
-     * Změní role uživatele.
-     * @param User $user
-     * @param $roles
-     * @param bool $approved
-     */
-    public function changeRoles(User $user, $roles, $approved = FALSE)
-    {
-        if (!$approved && $user->isApproved()) {
-            foreach ($roles as $role) {
-                if (!$role->isApprovedAfterRegistration() && !$user->isInRole($role)) {
-                    $user->setApproved(FALSE);
-                    break;
-                }
-            }
-        }
-
-        $user->setRoles($roles);
-
-        $this->userRepository->save($user);
-
-        foreach ($user->getApplications() as $application) {
-            $fee = $this->applicationService->countFee($roles, $application->getSubevents(), $application->isFirst());
-
-            $application->setFee($fee);
-            $application->setState($fee == 0 || $application->getPaymentDate()
-                ? ApplicationState::PAID
-                : ApplicationState::WAITING_FOR_PAYMENT);
-
-            $this->applicationRepository->save($application);
-        }
-
-        $this->programService->updateUserPrograms($user);
-
-        //zaslání potvrzovacího e-mailu
-        $rolesNames = [];
-        foreach ($this->user->getRoles() as $role) {
-            $rolesNames[] = $role->getName();
-        }
-
-        $this->mailService->sendMailFromTemplate($this->user, '', Template::ROLES_CHANGED, [
-            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-            TemplateVariable::USERS_ROLES => implode(', ', $rolesNames)
-        ]);
-    }
-
-    public function cancelRegistration()
-    {
-        //TODO
-    }
-
     /**
      * @param User $user
      * @return string
diff --git a/app/utils/Validators.php b/app/utils/Validators.php
new file mode 100644
index 000000000..dcc84a001
--- /dev/null
+++ b/app/utils/Validators.php
@@ -0,0 +1,174 @@
+<?php
+
+namespace App\Utils;
+
+use App\Model\ACL\Role;
+use App\Model\ACL\RoleRepository;
+use App\Model\Structure\Subevent;
+use App\Model\Structure\SubeventRepository;
+use App\Model\User\User;
+use Doctrine\Common\Collections\Collection;
+
+
+/**
+ * Třída s vlastními validátory.
+ *
+ * @author Jan Staněk <jan.stanek@skaut.cz>
+ */
+class Validators
+{
+    /** @var RoleRepository */
+    private $roleRepository;
+
+    /** @var SubeventRepository */
+    private $subeventRepository;
+
+
+    /**
+     * Validators constructor.
+     */
+    public function __construct(RoleRepository $roleRepository, SubeventRepository $subeventRepository)
+    {
+        $this->roleRepository = $roleRepository;
+        $this->subeventRepository = $subeventRepository;
+    }
+
+    /**
+     * Ověří kapacitu rolí.
+     * @param Collection|Role[] $selectedRoles
+     * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function validateRolesCapacities(Collection $selectedRoles, User $user): bool
+    {
+        foreach ($selectedRoles as $role) {
+            if ($role->hasLimitedCapacity() && !$user->isInRole($role)
+                && $this->roleRepository->countUnoccupiedInRole($role) < 1)
+                    return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Ověří kompatibilitu rolí.
+     * @param Collection|Role[] $selectedRoles
+     * @param Role $testRole
+     * @return bool
+     */
+    public function validateRolesIncompatible(Collection $selectedRoles, Role $testRole): bool
+    {
+        if (!$selectedRoles->contains($testRole))
+            return TRUE;
+
+        foreach ($testRole->getIncompatibleRoles() as $incompatibleRole) {
+            if ($selectedRoles->contains($incompatibleRole))
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Ověří výběr vyžadovaných rolí.
+     * @param Collection|Role[] $selectedRoles
+     * @param Role $testRole
+     * @return bool
+     */
+    public function validateRolesRequired(Collection $selectedRoles, Role $testRole): bool
+    {
+        if (!$selectedRoles->contains($testRole))
+            return TRUE;
+
+        foreach ($testRole->getRequiredRolesTransitive() as $requiredRole) {
+            if (!$selectedRoles->contains($requiredRole))
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Ověří registrovatelnost rolí.
+     * @param Collection|Role[] $selectedRoles
+     * @param User $user
+     * @return bool
+     */
+    public function validateRolesRegisterable(Collection $selectedRoles, User $user): bool
+    {
+        foreach ($selectedRoles as $role) {
+            if (!$role->isRegisterableNow() && !$user->isInRole($role))
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Ověří, že je vybrána alespoň jedna podakce.
+     * @param $selectedSubevents
+     * @return bool
+     */
+    public function validateSubeventsEmpty(Collection $selectedSubevents): bool
+    {
+        if ($selectedSubevents->isEmpty())
+            return FALSE;
+        return TRUE;
+    }
+
+    /**
+     * Ověří kapacitu podakcí.
+     * @param Collection|Subevent[] $selectedSubevents
+     * @param User $user
+     * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function validateSubeventsCapacities(Collection $selectedSubevents, User $user): bool
+    {
+        foreach ($selectedSubevents as $subevent) {
+            if ($subevent->hasLimitedCapacity() && !$user->hasSubevent($subevent)
+                && $this->subeventRepository->countUnoccupiedInSubevent($subevent) < 1)
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Ověří kompatibilitu podakcí.
+     * @param Collection|Subevent[] $selectedSubevents
+     * @param Subevent $testSubevent
+     * @return bool
+     */
+    public function validateSubeventsIncompatible(Collection $selectedSubevents, Subevent $testSubevent): bool
+    {
+        if (!$selectedSubevents->contains($testSubevent))
+            return TRUE;
+
+        foreach ($testSubevent->getIncompatibleSubevents() as $incompatibleSubevent) {
+            if ($selectedSubevents->contains($incompatibleSubevent))
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+
+    /**
+     * Ověří výběr vyžadovaných podakcí.
+     * @param Collection|Subevent[] $selectedSubevents
+     * @param Subevent $testSubevent
+     * @return bool
+     */
+    public function validateSubeventsRequired(Collection $selectedSubevents, Subevent $testSubevent): bool
+    {
+        if (!$selectedSubevents->contains($testSubevent))
+            return TRUE;
+
+        foreach ($testSubevent->getRequiredSubeventsTransitive() as $requiredSubevent) {
+            if (!$selectedSubevents->contains($requiredSubevent))
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+}
\ No newline at end of file
diff --git a/migrations/Version20171225090913.php b/migrations/Version20171225090913.php
new file mode 100644
index 000000000..5a97f6985
--- /dev/null
+++ b/migrations/Version20171225090913.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171225090913 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('CREATE TABLE roles_application (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) NOT NULL, fee INT NOT NULL, application_date DATETIME NOT NULL, maturity_date DATE DEFAULT NULL, payment_method VARCHAR(255) DEFAULT NULL, payment_date DATE DEFAULT NULL, income_proof_printed_date DATE DEFAULT NULL, state VARCHAR(255) NOT NULL, valid_from DATETIME NOT NULL, valid_to DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE subevents_application (id INT AUTO_INCREMENT NOT NULL, type VARCHAR(255) NOT NULL, fee INT NOT NULL, application_date DATETIME NOT NULL, maturity_date DATE DEFAULT NULL, payment_method VARCHAR(255) DEFAULT NULL, payment_date DATE DEFAULT NULL, income_proof_printed_date DATE DEFAULT NULL, state VARCHAR(255) NOT NULL, valid_from DATETIME NOT NULL, valid_to DATETIME NOT NULL, PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE application ADD type VARCHAR(255) NOT NULL, DROP first');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171225091539.php b/migrations/Version20171225091539.php
new file mode 100644
index 000000000..cb67b6292
--- /dev/null
+++ b/migrations/Version20171225091539.php
@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171225091539 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('DROP TABLE roles_application');
+        $this->addSql('DROP TABLE subevents_application');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171225144953.php b/migrations/Version20171225144953.php
new file mode 100644
index 000000000..2bb924acb
--- /dev/null
+++ b/migrations/Version20171225144953.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171225144953 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE application CHANGE valid_to valid_to DATETIME DEFAULT NULL');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

From e0485d72b51f527c91c9e48bae1d1296c7fd8f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Tue, 26 Dec 2017 11:32:32 +0100
Subject: [PATCH 05/11] odhlaseni ze seminare, oprava prehledu uzivatelu a
 prehledu prihlasek

---
 .../components/ApplicationsGridControl.php    | 452 +++++++++---------
 .../components/UsersGridControl.php           |  41 +-
 app/ApiModule/services/ScheduleService.php    |   2 +-
 app/model/Mailing/Template.php                |   2 +-
 app/model/User/User.php                       |  50 +-
 app/services/ApplicationService.php           |  58 ++-
 app/services/ProgramService.php               |   9 +
 7 files changed, 328 insertions(+), 286 deletions(-)

diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index fb13dcd07..89f8c751e 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -129,32 +129,23 @@ public function createComponentApplicationsGrid($name)
         $grid->setTranslator($this->translator);
         $grid->setDataSource($this->applicationRepository->createQueryBuilder('a')
             ->join('a.user', 'u')
-            ->where('u.id = ' . $this->user->getId())
+            ->where('u = :user')
+            ->andWhere('a.validTo IS NULL')
+            ->setParameter('user', $this->user)
         );
         $grid->setPagination(FALSE);
+        $grid->setDefaultSort(['applicationDate', 'ASC']);
 
         $grid->addColumnDateTime('applicationDate', 'admin.users.users_applications_application_date')
             ->setFormat('j. n. Y H:i');
 
-        $grid->addColumnText('roles', 'admin.users.users_applications_roles')
-            ->setRenderer(function ($row) {
-                if (!$row->isFirst())
-                    return "";
+        $grid->addColumnText('roles', 'admin.users.users_applications_roles', 'rolesText');
 
-                $roles = [];
-                foreach ($row->getUser()->getRoles() as $role) {
-                    $roles[] = $role->getName();
-                }
-                return implode(", ", $roles);
-            });
-
-        if ($this->subeventRepository->explicitSubeventsExists()) {
-            $grid->addColumnText('subevents', 'admin.users.users_applications_subevents', 'subeventsText');
-        }
+        $grid->addColumnText('subevents', 'admin.users.users_applications_subevents', 'subeventsText');
 
         $grid->addColumnNumber('fee', 'admin.users.users_applications_fee');
 
-        $grid->addColumnText('variableSymbol', 'admin.users.users_applications_variable_symbol');
+        $grid->addColumnText('variableSymbol', 'admin.users.users_applications_variable_symbol', 'variableSymbolText');
 
         $grid->addColumnDateTime('maturityDate', 'admin.users.users_applications_maturity_date')
             ->setFormat('j. n. Y');
@@ -177,54 +168,54 @@ public function createComponentApplicationsGrid($name)
             });
 
 
-        $grid->addInlineAdd()->onControlAdd[] = function ($container) {
-            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
-                ->setAttribute('class', 'datagrid-multiselect');
-
-            if ($this->subeventRepository->explicitSubeventsExists()) {
-                $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredSubeventsOptionsWithCapacity($this->user))
-                    ->setAttribute('class', 'datagrid-multiselect');
-            }
-        };
-        $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
-
-        $grid->addInlineEdit()->onControlAdd[] = function ($container) {
-            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
-                ->setAttribute('class', 'datagrid-multiselect');
-
-            if ($this->subeventRepository->explicitSubeventsExists()) {
-                $container->addMultiSelect('subevents', '', $this->subeventRepository->getSubeventsOptionsWithCapacity())
-                    ->setAttribute('class', 'datagrid-multiselect');
-            }
-
-            $container->addText('variableSymbol', 'admin.users.users_variable_symbol')
-                ->addRule(Form::FILLED, 'admin.users.users_applications_variable_symbol_empty')
-                ->addRule(Form::PATTERN, 'admin.users.users_edit_variable_symbol_format', '^\d{1,10}$');
-
-            $paymentMethodSelect = $container->addSelect('paymentMethod', 'admin.users.users_payment_method', $this->preparePaymentMethodOptions());
-
-            $container->addDatePicker('paymentDate', 'admin.users.users_payment_date');
-
-            $paymentMethodSelect
-                ->addConditionOn($container['paymentDate'], Form::FILLED)
-                ->addRule(Form::FILLED, 'admin.users.users_applications_payment_method_empty');
-
-            $container->addDatePicker('incomeProofPrintedDate', 'admin.users.users_income_proof_printed_date');
-
-            $container->addDatePicker('maturityDate', 'admin.users.users_maturity_date');
-        };
-        $grid->getInlineEdit()->onSetDefaults[] = function ($container, $item) {
-            $container->setDefaults([
-                'roles' => $item->isFirst() ? $this->roleRepository->findRolesIds($item->getUser()->getRoles()) : NULL,
-                'subevents' => $this->subeventRepository->findSubeventsIds($item->getSubevents()),
-                'variableSymbol' => $item->getVariableSymbol(),
-                'paymentMethod' => $item->getPaymentMethod(),
-                'paymentDate' => $item->getPaymentDate(),
-                'incomeProofPrintedDate' => $item->getIncomeProofPrintedDate(),
-                'maturityDate' => $item->getMaturityDate()
-            ]);
-        };
-        $grid->getInlineEdit()->onSubmit[] = [$this, 'edit'];
+//        $grid->addInlineAdd()->onControlAdd[] = function ($container) {
+//            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
+//                ->setAttribute('class', 'datagrid-multiselect');
+//
+//            if ($this->subeventRepository->explicitSubeventsExists()) {
+//                $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredSubeventsOptionsWithCapacity($this->user))
+//                    ->setAttribute('class', 'datagrid-multiselect');
+//            }
+//        };
+//        $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
+//
+//        $grid->addInlineEdit()->onControlAdd[] = function ($container) {
+//            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
+//                ->setAttribute('class', 'datagrid-multiselect');
+//
+//            if ($this->subeventRepository->explicitSubeventsExists()) {
+//                $container->addMultiSelect('subevents', '', $this->subeventRepository->getSubeventsOptionsWithCapacity())
+//                    ->setAttribute('class', 'datagrid-multiselect');
+//            }
+//
+//            $container->addText('variableSymbol', 'admin.users.users_variable_symbol')
+//                ->addRule(Form::FILLED, 'admin.users.users_applications_variable_symbol_empty')
+//                ->addRule(Form::PATTERN, 'admin.users.users_edit_variable_symbol_format', '^\d{1,10}$');
+//
+//            $paymentMethodSelect = $container->addSelect('paymentMethod', 'admin.users.users_payment_method', $this->preparePaymentMethodOptions());
+//
+//            $container->addDatePicker('paymentDate', 'admin.users.users_payment_date');
+//
+//            $paymentMethodSelect
+//                ->addConditionOn($container['paymentDate'], Form::FILLED)
+//                ->addRule(Form::FILLED, 'admin.users.users_applications_payment_method_empty');
+//
+//            $container->addDatePicker('incomeProofPrintedDate', 'admin.users.users_income_proof_printed_date');
+//
+//            $container->addDatePicker('maturityDate', 'admin.users.users_maturity_date');
+//        };
+//        $grid->getInlineEdit()->onSetDefaults[] = function ($container, $item) {
+//            $container->setDefaults([
+//                'roles' => $item->isFirst() ? $this->roleRepository->findRolesIds($item->getUser()->getRoles()) : NULL,
+//                'subevents' => $this->subeventRepository->findSubeventsIds($item->getSubevents()),
+//                'variableSymbol' => $item->getVariableSymbol(),
+//                'paymentMethod' => $item->getPaymentMethod(),
+//                'paymentDate' => $item->getPaymentDate(),
+//                'incomeProofPrintedDate' => $item->getIncomeProofPrintedDate(),
+//                'maturityDate' => $item->getMaturityDate()
+//            ]);
+//        };
+//        $grid->getInlineEdit()->onSubmit[] = [$this, 'edit'];
 
 
         $grid->addAction('generatePaymentProofCash', 'admin.users.users_applications_download_payment_proof_cash');
@@ -246,8 +237,9 @@ public function createComponentApplicationsGrid($name)
                 'data-toggle' => 'confirmation',
                 'data-content' => $this->translator->translate('admin.users.users_applications_cancel_registration_confirm')
             ])->setClass('btn btn-xs btn-danger');
-        $grid->allowRowsAction('cancelRegistration', function ($item) {
-            return $item->isFirst();
+        $grid->allowRowsAction('cancelRegistration', function (Application $item) {
+            return $item->getType() == Application::ROLES
+                && !($item->getState() == ApplicationState::CANCELED || $item->getState() == ApplicationState::CANCELED_NOT_PAID);
         });
 
         $grid->addAction('cancelApplication', 'admin.users.users_applications_cancel_application')
@@ -255,9 +247,9 @@ public function createComponentApplicationsGrid($name)
                 'data-toggle' => 'confirmation',
                 'data-content' => $this->translator->translate('admin.users.users_applications_cancel_application_confirm')
             ])->setClass('btn btn-xs btn-danger');
-        $grid->allowRowsAction('cancelApplication', function ($item) {
-            return !$item->isFirst()
-                && ($item->getState() == ApplicationState::PAID || $item->getState() == ApplicationState::WAITING_FOR_PAYMENT);
+        $grid->allowRowsAction('cancelApplication', function (Application $item) {
+            return $item->getType() == Application::SUBEVENTS
+                && !($item->getState() == ApplicationState::CANCELED || $item->getState() == ApplicationState::CANCELED_NOT_PAID);
         });
 
         $grid->setColumnsSummary(['fee']);
@@ -272,76 +264,76 @@ public function createComponentApplicationsGrid($name)
      */
     public function add($values)
     {
-        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-        $selectedSubevents = NULL;
-
-        //kontrola roli
-        if ($this->user->getApplications()->isEmpty()) {
-            if (!$this->validateRolesEmpty($selectedRoles)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_empty', 'danger');
-                $this->redirect('this');
-            }
-
-            if (!$this->validateRolesCapacities($selectedRoles)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
-                $this->redirect('this');
-            }
-        } else {
-            if ($this->validateRolesEmpty($selectedRoles)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
-                $this->redirect('this');
-            }
-        }
-
-        if ($this->subeventRepository->explicitSubeventsExists()) {
-            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-
-            //kontrola podakci
-            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
-                $this->redirect('this');
-            }
-
-            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
-                $this->redirect('this');
-            }
-        }
-
-
-        //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents) {
-            $application = new Application();
-
-            if ($this->user->getApplications()->isEmpty()) {
-                $this->user->setRoles($selectedRoles);
-                $this->userRepository->save($this->user);
-                $application->setFirst(TRUE);
-                $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
-            } else {
-                $application->setFirst(FALSE);
-                $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
-            }
-
-            $application->setUser($this->user);
-            if ($this->subeventRepository->explicitSubeventsExists())
-                $application->setSubevents($selectedSubevents);
-            else
-                $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
-            $application->setApplicationDate(new \DateTime());
-            $application->setMaturityDate($this->applicationService->countMaturityDate());
-            $application->setFee($fee);
-            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-            $this->applicationRepository->save($application);
-
-            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
-            $this->applicationRepository->save($application);
-
-            $this->programService->updateUserPrograms($this->user);
-        });
-
-        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
-        $this->redirect('this');
+//        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
+//        $selectedSubevents = NULL;
+//
+//        //kontrola roli
+//        if ($this->user->getApplications()->isEmpty()) {
+//            if (!$this->validateRolesEmpty($selectedRoles)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            if (!$this->validateRolesCapacities($selectedRoles)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
+//                $this->redirect('this');
+//            }
+//        } else {
+//            if ($this->validateRolesEmpty($selectedRoles)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//        }
+//
+//        if ($this->subeventRepository->explicitSubeventsExists()) {
+//            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+//
+//            //kontrola podakci
+//            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
+//                $this->redirect('this');
+//            }
+//        }
+//
+//
+//        //zpracovani zmen
+//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents) {
+//            $application = new Application();
+//
+//            if ($this->user->getApplications()->isEmpty()) {
+//                $this->user->setRoles($selectedRoles);
+//                $this->userRepository->save($this->user);
+//                $application->setFirst(TRUE);
+//                $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
+//            } else {
+//                $application->setFirst(FALSE);
+//                $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
+//            }
+//
+//            $application->setUser($this->user);
+//            if ($this->subeventRepository->explicitSubeventsExists())
+//                $application->setSubevents($selectedSubevents);
+//            else
+//                $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
+//            $application->setApplicationDate(new \DateTime());
+//            $application->setMaturityDate($this->applicationService->countMaturityDate());
+//            $application->setFee($fee);
+//            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
+//            $this->applicationRepository->save($application);
+//
+//            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
+//            $this->applicationRepository->save($application);
+//
+//            $this->programService->updateUserPrograms($this->user);
+//        });
+//
+//        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
+//        $this->redirect('this');
     }
 
     /**
@@ -354,97 +346,97 @@ public function add($values)
      */
     public function edit($id, $values)
     {
-        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-
-        $application = $this->applicationRepository->findById($id);
-
-        //kontrola roli
-        if ($application->isFirst()) {
-            if (!$this->validateRolesEmpty($selectedRoles)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_empty', 'danger');
-                $this->redirect('this');
-            }
-
-            if (!$this->validateRolesCapacities($selectedRoles)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
-                $this->redirect('this');
-            }
-        } else {
-            if ($this->validateRolesEmpty($selectedRoles)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
-                $this->redirect('this');
-            }
-        }
-
-        if ($this->subeventRepository->explicitSubeventsExists()) {
-            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-
-            //kontrola podakci
-            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
-                $this->redirect('this');
-            }
-
-            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
-                $this->redirect('this');
-            }
-
-            if (!$this->validateSubeventsRegistered($selectedSubevents, $this->user, $application->getId())) {
-                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
-                $this->redirect('this');
-            }
-        }
-
-        //zpracovani zmen
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents, $application, $values) {
-            $oldPaymentDate = $application->getPaymentDate();
-
-            if ($application->isFirst()) {
-                $this->user->setRoles($selectedRoles);
-                $this->userRepository->save($this->user);
-            }
-
-            if ($this->subeventRepository->explicitSubeventsExists())
-                $application->setSubevents($selectedSubevents);
-            $application->setVariableSymbol($values['variableSymbol']);
-            $application->setPaymentMethod($values['paymentMethod']);
-            $application->setPaymentDate($values['paymentDate']);
-            $application->setIncomeProofPrintedDate($values['incomeProofPrintedDate']);
-            $application->setMaturityDate($values['maturityDate']);
-
-            if ($application->isFirst()) {
-                foreach ($this->user->getApplications() as $application) {
-                    if ($application->isFirst())
-                        $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
-                    else
-                        $fee = $this->applicationService->countFee($selectedRoles, $application->getSubevents(), FALSE);
-                    $application->setFee($fee);
-                    if ($application->getState() == ApplicationState::WAITING_FOR_PAYMENT || $application->getState() == ApplicationState::PAID)
-                        $application->setState($fee == 0 || $application->getPaymentDate() ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-                    $this->applicationRepository->save($application);
-                }
-            } else {
-                $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
-                $application->setFee($fee);
-                $application->setState($fee == 0 || $application->getPaymentDate()
-                    ? ApplicationState::PAID
-                    : ApplicationState::WAITING_FOR_PAYMENT);
-                $this->applicationRepository->save($application);
-            }
-
-            $this->programService->updateUserPrograms($this->user);
-
-            if ($values['paymentDate'] !== NULL && $oldPaymentDate === NULL) {
-                $this->mailService->sendMailFromTemplate($this->user, '', Template::PAYMENT_CONFIRMED, [
-                    TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                    TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
-                ]);
-            }
-        });
-
-        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
-        $this->redirect('this');
+//        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
+//
+//        $application = $this->applicationRepository->findById($id);
+//
+//        //kontrola roli
+//        if ($application->isFirst()) {
+//            if (!$this->validateRolesEmpty($selectedRoles)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            if (!$this->validateRolesCapacities($selectedRoles)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
+//                $this->redirect('this');
+//            }
+//        } else {
+//            if ($this->validateRolesEmpty($selectedRoles)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//        }
+//
+//        if ($this->subeventRepository->explicitSubeventsExists()) {
+//            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+//
+//            //kontrola podakci
+//            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
+//                $this->redirect('this');
+//            }
+//
+//            if (!$this->validateSubeventsRegistered($selectedSubevents, $this->user, $application->getId())) {
+//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
+//                $this->redirect('this');
+//            }
+//        }
+//
+//        //zpracovani zmen
+//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents, $application, $values) {
+//            $oldPaymentDate = $application->getPaymentDate();
+//
+//            if ($application->isFirst()) {
+//                $this->user->setRoles($selectedRoles);
+//                $this->userRepository->save($this->user);
+//            }
+//
+//            if ($this->subeventRepository->explicitSubeventsExists())
+//                $application->setSubevents($selectedSubevents);
+//            $application->setVariableSymbol($values['variableSymbol']);
+//            $application->setPaymentMethod($values['paymentMethod']);
+//            $application->setPaymentDate($values['paymentDate']);
+//            $application->setIncomeProofPrintedDate($values['incomeProofPrintedDate']);
+//            $application->setMaturityDate($values['maturityDate']);
+//
+//            if ($application->isFirst()) {
+//                foreach ($this->user->getApplications() as $application) {
+//                    if ($application->isFirst())
+//                        $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
+//                    else
+//                        $fee = $this->applicationService->countFee($selectedRoles, $application->getSubevents(), FALSE);
+//                    $application->setFee($fee);
+//                    if ($application->getState() == ApplicationState::WAITING_FOR_PAYMENT || $application->getState() == ApplicationState::PAID)
+//                        $application->setState($fee == 0 || $application->getPaymentDate() ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
+//                    $this->applicationRepository->save($application);
+//                }
+//            } else {
+//                $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
+//                $application->setFee($fee);
+//                $application->setState($fee == 0 || $application->getPaymentDate()
+//                    ? ApplicationState::PAID
+//                    : ApplicationState::WAITING_FOR_PAYMENT);
+//                $this->applicationRepository->save($application);
+//            }
+//
+//            $this->programService->updateUserPrograms($this->user);
+//
+//            if ($values['paymentDate'] !== NULL && $oldPaymentDate === NULL) {
+//                $this->mailService->sendMailFromTemplate($this->user, '', Template::PAYMENT_CONFIRMED, [
+//                    TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+//                    TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
+//                ]);
+//            }
+//        });
+//
+//        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
+//        $this->redirect('this');
     }
 
     /**
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index f5422e2a0..4cd0fde63 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -18,6 +18,7 @@
 use App\Model\Settings\SettingsRepository;
 use App\Model\Structure\SubeventRepository;
 use App\Model\User\ApplicationRepository;
+use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\ApplicationService;
 use App\Services\ExcelExportService;
@@ -26,6 +27,7 @@
 use App\Services\ProgramService;
 use App\Services\UserService;
 use Doctrine\ORM\Query\Expr;
+use Doctrine\ORM\QueryBuilder;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
 use Nette\Http\Session;
@@ -172,22 +174,22 @@ public function createComponentUsersGrid($name)
 
         $grid->addGroupMultiSelectAction('admin.users.users_group_action_change_roles',
             $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
-            ->onSelect[] = [$this, 'groupChangeRoles'];
+            ->onSelect[] = [$this, 'groupChangeRoles']; //TODO
 
         $grid->addGroupAction('admin.users.users_group_action_mark_attended')
             ->onSelect[] = [$this, 'groupMarkAttended'];
 
         $grid->addGroupAction('admin.users.users_group_action_mark_paid_today', $this->preparePaymentMethodOptionsWithoutEmpty())
-            ->onSelect[] = [$this, 'groupMarkPaidToday'];
+            ->onSelect[] = [$this, 'groupMarkPaidToday']; //TODO
 
         $grid->addGroupAction('admin.users.users_group_action_generate_payment_proofs')
             ->onSelect[] = [$this, 'groupGeneratePaymentProofs'];
 
         $grid->addGroupAction('admin.users.users_group_action_export_users')
-            ->onSelect[] = [$this, 'groupExportUsers'];
+            ->onSelect[] = [$this, 'groupExportUsers']; //TODO kontrola
 
         $grid->addGroupAction('admin.users.users_group_action_export_subevents_and_categories')
-            ->onSelect[] = [$this, 'groupExportSubeventsAndCategories'];
+            ->onSelect[] = [$this, 'groupExportSubeventsAndCategories']; //TODO kontrola
 
         $grid->addGroupAction('admin.users.users_group_action_export_roles')
             ->onSelect[] = [$this, 'groupExportRoles'];
@@ -246,14 +248,13 @@ public function createComponentUsersGrid($name)
                     ->setText($this->userService->getMembershipText($row));
             }, function ($row) {
                 return $row->getUnit() === NULL;
-            }
-            )
+            })
             ->setSortable()
             ->setFilterText();
 
         $grid->addColumnNumber('age', 'admin.users.users_age')
             ->setSortable()
-            ->setSortableCallback(function ($qb, $sort) {
+            ->setSortableCallback(function (QueryBuilder $qb, $sort) {
                 $sort = $sort['age'] == 'DESC' ? 'ASC' : 'DESC';
                 $qb->orderBy('u.birthdate', $sort);
             });
@@ -268,9 +269,10 @@ public function createComponentUsersGrid($name)
 
         $grid->addColumnText('variableSymbol', 'admin.users.users_variable_symbol', 'variableSymbolsText')
             ->setFilterText()
-            ->setCondition(function ($qb, $value) { //TODO
-                $qb->join('u.applications', 'aVariableSymbol')->join('aVariableSymbol.variableSymbol')
-                    ->andWhere('aVariableSymbol.variableSymbol LIKE :variableSymbol')
+            ->setCondition(function (QueryBuilder $qb, $value) { //TODO kontrola
+                $qb->join('u.applications', 'aVariableSymbol')
+                    ->join('aVariableSymbol.variableSymbol', 'avsVariableSymbol')
+                    ->andWhere('avsVariableSymbol.variableSymbol LIKE :variableSymbol')
                     ->setParameter(':variableSymbol', $value . '%');
             });
 
@@ -279,11 +281,11 @@ public function createComponentUsersGrid($name)
                 return $this->userService->getPaymentMethodText($row);
             });
 
-        $grid->addColumnDateTime('lastPaymentDate', 'admin.users.users_last_payment_date');
+        $grid->addColumnDateTime('lastPaymentDate', 'admin.users.users_last_payment_date'); //TODO kontrola
 
         $grid->addColumnDateTime('firstApplicationDate', 'admin.users.users_first_application_date')
             ->setSortable()
-            ->setSortableCallback(function ($qb, $sort) { //TODO
+            ->setSortableCallback(function ($qb, $sort) { //TODO kontrola
                 $qb->leftJoin('u.applications', 'aFirstApplicationDate', Expr\Join::WITH, 'aFirstApplicationDate.first = true')
                     ->orderBy('aFirstApplicationDate.applicationDate', $sort['firstApplicationDate']);
             })
@@ -308,21 +310,20 @@ public function createComponentUsersGrid($name)
             ->setTranslateOptions();
 
         $grid->addColumnText('unregisteredMandatoryBlocks', 'admin.users.users_not_registered_mandatory_blocks')
-            ->setRenderer(function ($row) {
-                if (!$row->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS) || !$row->isApproved())
+            ->setRenderer(function (User $row) {
+                if (!$row->isAllowedRegisterPrograms())
                     return NULL;
 
-                $unregisteredMandatoryBlocksNames = $this->programService->getUnregisteredUserMandatoryBlocksNames($row);
-                $unregisteredMandatoryBlocksNamesText = implode(', ', $unregisteredMandatoryBlocksNames);
+                $unregisteredUserMandatoryBlocks = $this->programService->getUnregisteredUserMandatoryBlocksNames($row);
                 return Html::el('span')
                     ->setAttribute('data-toggle', 'tooltip')
-                    ->setAttribute('title', $unregisteredMandatoryBlocksNamesText)
-                    ->setText(count($unregisteredMandatoryBlocksNames));
+                    ->setAttribute('title', implode(', ', $unregisteredUserMandatoryBlocks->toArray()))
+                    ->setText($unregisteredUserMandatoryBlocks->count());
             });
 
         foreach ($this->customInputRepository->findAllOrderedByPosition() as $customInput) {
             $grid->addColumnText('customInput' . $customInput->getId(), $this->truncate($customInput->getName(), 20))
-                ->setRenderer(function ($row) use ($customInput) {
+                ->setRenderer(function (User $row) use ($customInput) {
                     $customInputValue = $row->getCustomInputValue($customInput);
                     if ($customInputValue) {
                         switch ($customInputValue->getInput()->getType()) {
@@ -360,7 +361,7 @@ public function createComponentUsersGrid($name)
                 'data-toggle' => 'confirmation',
                 'data-content' => $this->translator->translate('admin.users.users_delete_confirm')
             ]);
-        $grid->allowRowsAction('delete', function ($item) {
+        $grid->allowRowsAction('delete', function (User $item) {
             return $item->isExternal();
         });
 
diff --git a/app/ApiModule/services/ScheduleService.php b/app/ApiModule/services/ScheduleService.php
index 37125a1eb..f654583a4 100644
--- a/app/ApiModule/services/ScheduleService.php
+++ b/app/ApiModule/services/ScheduleService.php
@@ -396,7 +396,7 @@ private function convertBlockToBlockDetailDTO(Block $block)
         $blockDetailDTO->setDescription($block->getDescription());
         $blockDetailDTO->setProgramsCount($block->getProgramsCount());
         $blockDetailDTO->setUserAttends($block->isAttendee($this->user));
-        $blockDetailDTO->setUserAllowed($block->isAllowed($this->user));
+        $blockDetailDTO->setUserAllowed($block->isAllowed($this->user)); //TODO kontrola povolení zapisování před zaplacením
 
         return $blockDetailDTO;
     }
diff --git a/app/model/Mailing/Template.php b/app/model/Mailing/Template.php
index fb214fe30..ee1e5214b 100644
--- a/app/model/Mailing/Template.php
+++ b/app/model/Mailing/Template.php
@@ -23,7 +23,7 @@ class Template
     const SIGN_IN = 'sign_in';
 
     /**
-     * Potvrzení automaticky registrace.
+     * Potvrzení registrace.
      */
     const REGISTRATION = 'registration';
 
diff --git a/app/model/User/User.php b/app/model/User/User.php
index f387655fb..4ddb05358 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -449,6 +449,14 @@ public function isAllowedModifyBlock(Block $block)
         return FALSE;
     }
 
+    /**
+     * @return bool
+     */
+    public function isAllowedRegisterPrograms()
+    {
+        return $this->isApproved() && $this->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS);
+    }
+
     /**
      * @return Collection
      */
@@ -521,6 +529,24 @@ public function getPaidApplications()
         return $this->applications->matching($criteria);
     }
 
+    /**
+     * Vrátí přihlášky, které jsou zaplacené nebo zdarma.
+     * @return Collection|Application[]
+     */
+    public function getPaidAndFreeApplications(): Collection
+    {
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->andX(
+                Criteria::expr()->isNull('validTo'),
+                Criteria::expr()->orX(
+                    Criteria::expr()->eq('state', ApplicationState::PAID),
+                    Criteria::expr()->eq('state', ApplicationState::PAID_FREE)
+                )
+            ));
+
+        return $this->applications->matching($criteria);
+    }
+
     /**
      * Vrátí přihlášky čekající na platbu.
      * @return Collection
@@ -543,11 +569,11 @@ public function getWaitingForPaymentApplications()
      */
     public function hasPaidSubevent(Subevent $subevent)
     {
-        $subeventsApplications = $this->getNotCanceledSubeventsApplications();
+        foreach ($this->getPaidAndFreeApplications() as $application)
+            if ($application->getType() == Application::SUBEVENTS && $application->getSubevents->contains($subevent))
+                return TRUE;
 
-        return $subeventsApplications->map(function (SubeventsApplication $application) {
-            return $application->getSubevents();
-        })->contains($subevent); //TODO kontrola
+        return FALSE;
     }
 
     /**
@@ -1169,12 +1195,8 @@ public function setPhotoUpdate($photoUpdate)
      */
     public function hasDisplayArrivalDepartureRole()
     {
-        $criteria = Criteria::create();
-
-        if ($this->roles instanceof PersistentCollection && $this->roles->isInitialized())
-            $criteria->where(Criteria::expr()->eq('displayArrivalDeparture', TRUE));
-        else
-            $criteria->where(Criteria::expr()->eq('display_arrival_departure', TRUE));  //problem s lazyloadingem u camelcase nazvu
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->eq('displayArrivalDeparture', TRUE));
 
         return !$this->roles->matching($criteria)->isEmpty();
     }
@@ -1248,9 +1270,11 @@ public function getLastPaymentDate()
      */
     public function getSubevents(): Collection
     {
-        $subevents = $this->getNotCanceledSubeventsApplications()->map(function (SubeventsApplication $application) {
-            return $application->getSubevents(); //TODO kontrola
-        });
+        $subevents = new ArrayCollection();
+
+        foreach ($this->getNotCanceledSubeventsApplications() as $application)
+            foreach ($application->getSubevents() as $subevent)
+                $subevents->add($subevent);
 
         return $subevents;
     }
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index 24ce8bed2..28ade6dff 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -183,41 +183,32 @@ public function updateRoles(User $user, Collection $roles, User $createdBy, bool
 
             foreach ($user->getValidApplications() as $application) {
                 if ($application->getType() == Application::ROLES) {
-                    $application->setValidTo(new \DateTime());
-                    $this->applicationRepository->save($application);
-
-                    $newApplication = new RolesApplication();
-                    $newApplication->setUser($user);
+                    $newApplication = clone $application;
                     $newApplication->setRoles($roles);
-                    $newApplication->setApplicationDate($application->getApplicationDate());
                     $newApplication->setFee($this->countRolesFee($roles));
-                    $newApplication->setMaturityDate($application->getMaturityDate());
                     $newApplication->setState($this->getApplicationState($newApplication));
-                    $newApplication->setVariableSymbol($application->getVariableSymbol());
                     $newApplication->setCreatedBy($createdBy);
                     $newApplication->setValidFrom(new \DateTime());
                     $this->applicationRepository->save($newApplication);
 
+                    $application->setValidTo(new \DateTime());
+                    $this->applicationRepository->save($application);
+
                     $user->addApplication($newApplication);
                 } else {
                     $fee = $this->countSubeventsFee($roles, $application->getSubevents());
 
                     if ($application->getFee() != $fee) {
-                        $application->setValidTo(new \DateTime());
-                        $this->applicationRepository->save($application);
-
-                        $newApplication = new SubeventsApplication();
-                        $newApplication->setUser($user);
-                        $newApplication->setSubevents($application->getSubevents());
-                        $newApplication->setApplicationDate($application->getApplicationDate());
+                        $newApplication = clone $application;
                         $newApplication->setFee($fee);
-                        $newApplication->setMaturityDate($application->getMaturityDate());
                         $newApplication->setState($this->getApplicationState($newApplication));
-                        $newApplication->setVariableSymbol($application->getVariableSymbol());
                         $newApplication->setCreatedBy($createdBy);
                         $newApplication->setValidFrom(new \DateTime());
                         $this->applicationRepository->save($newApplication);
 
+                        $application->setValidTo(new \DateTime());
+                        $this->applicationRepository->save($application);
+
                         $user->addApplication($newApplication);
                     }
                 }
@@ -243,7 +234,31 @@ public function updateRoles(User $user, Collection $roles, User $createdBy, bool
     public function cancelRegistration(User $user, User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $createdBy) {
+            $user->setApproved(TRUE);
+            $user->getRoles()->clear();
+            $user->addRole($this->roleRepository->findBySystemName(Role::NONREGISTERED));
+            $this->userRepository->save($user);
+
+            foreach ($user->getValidApplications() as $application) {
+                $newApplication = clone $application;
+                $newApplication->setState(ApplicationState::CANCELED);
+                $newApplication->setCreatedBy($createdBy);
+                $newApplication->setValidFrom(new \DateTime());
+                $this->applicationRepository->save($newApplication);
+
+                $application->setValidTo(new \DateTime());
+                $this->applicationRepository->save($application);
+            }
+
+            $this->userRepository->save($user);
 
+            $this->programService->updateUserPrograms($user);
+
+            //TODO mail
+//            $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
+//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+//                TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {return $role->getName();})->toArray())
+//            ]);
         });
     }
 
@@ -253,7 +268,7 @@ public function cancelRegistration(User $user, User $createdBy): void
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function addSubevents(User $user, Collection $subevents, User $createdBy): void
+    public function addSubeventsApplication(User $user, Collection $subevents, User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $subevents, $createdBy) {
             //TODO
@@ -266,7 +281,7 @@ public function addSubevents(User $user, Collection $subevents, User $createdBy)
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function updateSubevents(Application $application, Collection $subevents, User $createdBy): void
+    public function updateSubeventsApplication(Application $application, Collection $subevents, User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $subevents, $createdBy) {
             //TODO
@@ -278,7 +293,7 @@ public function updateSubevents(Application $application, Collection $subevents,
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function cancelSubevents(Application $application, User $createdBy): void
+    public function cancelSubeventsApplication(Application $application, User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $createdBy) {
             //TODO
@@ -495,7 +510,8 @@ public function getStateText(Application $application): string
      */
     public function isAllowedEditRegistration(User $user)
     {
-        return !$user->hasPaidAnyApplication()
+        return !$user->isInRole($this->roleRepository->findBySystemName(Role::NONREGISTERED))
+            && !$user->hasPaidAnyApplication()
             && $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO) >= (new \DateTime())->setTime(0, 0);
     }
 
diff --git a/app/services/ProgramService.php b/app/services/ProgramService.php
index 8dd992d73..7bb6a6a1b 100644
--- a/app/services/ProgramService.php
+++ b/app/services/ProgramService.php
@@ -147,4 +147,13 @@ public function getUnregisteredUserMandatoryBlocksNames(User $user): Collection
     {
         return $this->getUnregisteredUserMandatoryBlocks($user)->map(function (Block $block) {return $block->getName();});
     }
+
+    /**
+     * @param User $user
+     * @return string
+     */
+    public function getUnregisteredUserMandatoryBlocksNamesText(User $user): string
+    {
+        return implode(', ', $this->getUnregisteredUserMandatoryBlocksNames($user)->toArray());
+    }
 }

From b9fc81423cf47acd4402eef12c1fa7d7f9a70330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Tue, 26 Dec 2017 22:41:27 +0100
Subject: [PATCH 06/11] odhlaseni z administrace, zmena roli

---
 .../components/SubeventsGridControl.php       |  10 +-
 .../forms/SubeventForm.php                    |   2 +-
 .../components/ApplicationsGridControl.php    |  76 +---------
 .../components/RolesGridControl.php           |  10 +-
 .../components/UsersGridControl.php           | 139 +++++-------------
 app/AdminModule/forms/EditRoleForm.php        |   2 +-
 app/AdminModule/forms/EditUserSeminarForm.php |  90 +++++++++---
 app/AdminModule/presenters/UsersPresenter.php |  42 +++++-
 .../presenters/templates/Users/detail.latte   |  25 +++-
 .../components/ApplicationsGridControl.php    |   4 +-
 .../components/CapacitiesContentControl.php   |   2 +-
 app/WebModule/forms/RolesForm.php             |  13 +-
 app/lang/admin.cs_CZ.neon                     |  13 +-
 app/model/ACL/Role.php                        |  24 +++
 app/model/ACL/RoleRepository.php              |  58 +-------
 app/model/Structure/Subevent.php              |  35 +++++
 app/model/Structure/SubeventRepository.php    |  69 +--------
 app/model/User/Application/Application.php    |   9 ++
 app/model/User/User.php                       |  63 ++++----
 app/services/ApplicationService.php           |  93 ++++++------
 app/services/Authenticator.php                |   7 +-
 app/services/UserService.php                  |   6 +-
 app/utils/Validators.php                      |  26 +++-
 23 files changed, 373 insertions(+), 445 deletions(-)

diff --git a/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php b/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php
index dd7009f30..9579520a8 100644
--- a/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php
+++ b/app/AdminModule/ConfigurationModule/components/SubeventsGridControl.php
@@ -74,15 +74,7 @@ public function createComponentSubeventsGrid($name)
 
         $grid->addColumnNumber('fee', 'admin.configuration.subevents_fee');
 
-        $grid->addColumnText('capacity', 'admin.configuration.subevents_occupancy')
-            ->setRenderer(
-                function ($row) {
-                    $capacity = $row->getCapacity();
-                    if ($capacity === NULL)
-                        return $this->subeventRepository->countApprovedUsersInSubevent($row);
-                    return $this->subeventRepository->countApprovedUsersInSubevent($row) . "/" . $capacity;
-                }
-            );
+        $grid->addColumnText('capacity', 'admin.configuration.subevents_occupancy', 'occupancy_text');
 
         $grid->addToolbarButton('Subevents:add')
             ->setIcon('plus')
diff --git a/app/AdminModule/ConfigurationModule/forms/SubeventForm.php b/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
index d57605e18..fdbfb2b46 100644
--- a/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
@@ -69,7 +69,7 @@ public function create($id)
             $capacityText
                 ->addCondition(Form::FILLED)
                 ->addRule(Form::INTEGER, 'admin.configuration.subevents_capacity_format')
-                ->addRule(Form::MIN, 'admin.configuration.subevents_capacity_low', $this->subeventRepository->countApprovedUsersInSubevent($this->subevent));
+                ->addRule(Form::MIN, 'admin.configuration.subevents_capacity_low', $this->subevent->countUsers());
 
             $subeventsOptions = $this->subeventRepository->getSubeventsWithoutSubeventOptions($this->subevent->getId());
         } else {
diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index 89f8c751e..94745b909 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -232,16 +232,6 @@ public function createComponentApplicationsGrid($name)
                 && $item->getPaymentDate();
         });
 
-        $grid->addAction('cancelRegistration', 'admin.users.users_applications_cancel_registration')
-            ->addAttributes([
-                'data-toggle' => 'confirmation',
-                'data-content' => $this->translator->translate('admin.users.users_applications_cancel_registration_confirm')
-            ])->setClass('btn btn-xs btn-danger');
-        $grid->allowRowsAction('cancelRegistration', function (Application $item) {
-            return $item->getType() == Application::ROLES
-                && !($item->getState() == ApplicationState::CANCELED || $item->getState() == ApplicationState::CANCELED_NOT_PAID);
-        });
-
         $grid->addAction('cancelApplication', 'admin.users.users_applications_cancel_application')
             ->addAttributes([
                 'data-toggle' => 'confirmation',
@@ -252,7 +242,9 @@ public function createComponentApplicationsGrid($name)
                 && !($item->getState() == ApplicationState::CANCELED || $item->getState() == ApplicationState::CANCELED_NOT_PAID);
         });
 
-        $grid->setColumnsSummary(['fee']);
+        $grid->setColumnsSummary(['fee'], function(Application $item, $column) {
+            return $item->isCanceled() ? 0 : $item->getFee();
+        });
     }
 
     /**
@@ -463,35 +455,6 @@ public function handleGeneratePaymentProofBank($id)
         );
     }
 
-    /**
-     * Odhlásí uživatele ze semináře.
-     * @param $id
-     * @throws \Nette\Application\AbortException
-     * @throws \Throwable
-     */
-    public function handleCancelRegistration($id)
-    {
-        $user = $this->applicationRepository->findById($id)->getUser();
-
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user) {
-            $user->setRoles(new ArrayCollection([$this->roleRepository->findBySystemName(Role::NONREGISTERED)]));
-            $user->setApproved(TRUE);
-            foreach ($user->getApplications() as $application) {
-                $this->applicationRepository->remove($application);
-            }
-            $this->userRepository->save($user);
-
-            $this->programService->updateUserPrograms($user);
-
-            $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
-                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
-            ]);
-        });
-
-        $this->getPresenter()->flashMessage('admin.users.users_applications_registration_canceled', 'success');
-        $this->redirect('this');
-    }
-
     /**
      * Zruší přihlášku.
      * @param $id
@@ -537,7 +500,7 @@ private function validateSubeventsCapacities($selectedSubevents)
         if ($this->user->isApproved()) {
             foreach ($selectedSubevents as $subevent) {
                 if ($subevent->hasLimitedCapacity()) {
-                    if ($this->subeventRepository->countUnoccupiedInSubevent($subevent) < 1 && !$this->user->hasSubevent($subevent))
+                    if ($subevent->countUnoccupied() < 1 && !$this->user->hasSubevent($subevent))
                         return FALSE;
                 }
             }
@@ -566,37 +529,6 @@ private function validateSubeventsRegistered($selectedSubevents, User $user, $ap
         return TRUE;
     }
 
-    /**
-     * Ověří obsazenost rolí.
-     * @param $selectedRoles
-     * @return bool
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    private function validateRolesCapacities($selectedRoles)
-    {
-        if ($this->user->isApproved()) {
-            foreach ($selectedRoles as $role) {
-                if ($role->hasLimitedCapacity()) {
-                    if ($this->roleRepository->countUnoccupiedInRole($role) < 1 && !$this->user->isInRole($role))
-                        return FALSE;
-                }
-            }
-        }
-        return TRUE;
-    }
-
-    /**
-     * Ověří, že je vybrána alespoň jedna role.
-     * @param $selectedRoles
-     * @return bool
-     */
-    private function validateRolesEmpty($selectedRoles)
-    {
-        if ($selectedRoles->isEmpty())
-            return FALSE;
-        return TRUE;
-    }
-
     /**
      * Vrátí platební metody jako možnosti pro select.
      * @return array
diff --git a/app/AdminModule/components/RolesGridControl.php b/app/AdminModule/components/RolesGridControl.php
index f3bd28c7c..d92f89814 100644
--- a/app/AdminModule/components/RolesGridControl.php
+++ b/app/AdminModule/components/RolesGridControl.php
@@ -101,15 +101,7 @@ public function createComponentRolesGrid($name)
         $grid->addColumnDateTime('registerableTo', 'admin.acl.roles_registerable_to')
             ->setFormat('j. n. Y H:i');
 
-        $grid->addColumnText('occupancy', 'admin.acl.roles_occupancy')
-            ->setRenderer(
-                function ($row) {
-                    $capacity = $row->getCapacity();
-                    if ($capacity === NULL)
-                        return $this->roleRepository->countApprovedUsersInRole($row);
-                    return $this->roleRepository->countApprovedUsersInRole($row) . "/" . $capacity;
-                }
-            );
+        $grid->addColumnText('occupancy', 'admin.acl.roles_occupancy', 'occupancy_text');
 
         $grid->addColumnText('fee', 'admin.acl.roles_fee')
             ->setRendererOnCondition(function ($row) {
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index 4cd0fde63..95e849da4 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -388,45 +388,23 @@ public function handleDelete($id)
      * Změní stav uživatele.
      * @param $id
      * @param $approved
-     * @throws \Doctrine\ORM\NonUniqueResultException
      * @throws \Nette\Application\AbortException
      */
     public function changeApproved($id, $approved)
     {
         $user = $this->userRepository->findById($id);
-
-        $over = FALSE;
-        if ($approved && !$user->isApproved()) {
-            foreach ($user->getRoles() as $role) {
-                $count = $this->roleRepository->countUnoccupiedInRole($role);
-                if ($count !== NULL && $count < 1) {
-                    $over = TRUE;
-                    break;
-                }
-            }
-            if (!$over) {
-                foreach ($user->getSubevents() as $subevent) {
-                    $count = $this->subeventRepository->countUnoccupiedInSubevent($subevent);
-                    if ($count !== NULL && $count < 1) {
-                        $over = TRUE;
-                        break;
-                    }
-                }
-            }
-        }
+        $user->setApproved($approved);
+        $this->userRepository->save($user);
 
         $p = $this->getPresenter();
+        $p->flashMessage('admin.users.users_changed_approved', 'success');
 
-        if ($over) {
-            $p->flashMessage('admin.users.users_change_approved_error', 'danger');
+        if ($p->isAjax()) {
+            $p->redrawControl('flashes');
+            $this['usersGrid']->redrawItem($id);
         } else {
-            $user->setApproved($approved);
-            $this->userRepository->save($user);
-
-            $p->flashMessage('admin.users.users_changed_approved', 'success');
+            $this->redirect('this');
         }
-
-        $this->redirect('this');
     }
 
     /**
@@ -455,61 +433,18 @@ public function changeAttended($id, $attended)
     /**
      * Hromadně schválí uživatele.
      * @param array $ids
-     * @throws \Doctrine\ORM\NonUniqueResultException
      * @throws \Nette\Application\AbortException
      */
     public function groupApprove(array $ids)
     {
         $users = $this->userRepository->findUsersByIds($ids);
 
-        $rolesWithLimitedCapacity = $this->roleRepository->findAllWithLimitedCapacity();
-        $rolesUnoccupiedCounts = $this->roleRepository->countUnoccupiedInRoles($rolesWithLimitedCapacity);
-
-        $subeventsWithLimitedCapacity = $this->subeventRepository->findAllWithLimitedCapacity();
-        $subeventsUnoccupiedCounts = $this->subeventRepository->countUnoccupiedInSubevents($subeventsWithLimitedCapacity);
-
         foreach ($users as $user) {
-            if (!$user->isApproved()) {
-                foreach ($user->getRoles() as $role) {
-                    if ($role->hasLimitedCapacity())
-                        $rolesUnoccupiedCounts[$role->getId()]--;
-                }
-                foreach ($user->getSubevents() as $subevent) {
-                    if ($subevent->hasLimitedCapacity())
-                        $subeventsUnoccupiedCounts[$subevent->getId()]--;
-                }
-            }
-        }
-
-        $over = FALSE;
-        foreach ($rolesUnoccupiedCounts as $count) {
-            if ($count < 0) {
-                $over = TRUE;
-                break;
-            }
-        }
-        if (!$over) {
-            foreach ($subeventsUnoccupiedCounts as $count) {
-                if ($count < 0) {
-                    $over = TRUE;
-                    break;
-                }
-            }
-        }
-
-        $p = $this->getPresenter();
-
-        if ($over) {
-            $p->flashMessage('admin.users.users_group_action_approve_error', 'danger');
-        } else {
-            foreach ($users as $user) {
-                $user->setApproved(TRUE);
-                $this->userRepository->save($user);
-            }
-
-            $p->flashMessage('admin.users.users_group_action_approved', 'success');
+            $user->setApproved(TRUE);
+            $this->userRepository->save($user);
         }
 
+        $this->getPresenter()->flashMessage('admin.users.users_group_action_approved', 'success');
         $this->redirect('this');
     }
 
@@ -517,8 +452,6 @@ public function groupApprove(array $ids)
      * Hromadně nastaví role.
      * @param array $ids
      * @param $value
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     * @throws \Nette\Application\AbortException
      * @throws \Throwable
      */
     public function groupChangeRoles(array $ids, $value)
@@ -528,42 +461,46 @@ public function groupChangeRoles(array $ids, $value)
 
         $p = $this->getPresenter();
 
-        $error = FALSE;
-
         //neni vybrana zadna role
         if ($selectedRoles->isEmpty()) {
             $p->flashMessage('admin.users.users_group_action_change_roles_error_empty', 'danger');
-            $error = TRUE;
+            return;
         }
 
         //v rolich musi byt dostatek volnych mist
-        $unoccupiedCounts = $this->roleRepository->countUnoccupiedInRoles($selectedRoles);
-        foreach ($selectedRoles as $role) {
-            if ($role->hasLimitedCapacity()) {
-                foreach ($users as $user) {
-                    if ($user->isApproved() && !$user->isInRole($role))
-                        $unoccupiedCounts[$role->getId()]--;
-                }
-            }
-        }
-        foreach ($unoccupiedCounts as $count) {
-            if ($count < 0) {
-                $p->flashMessage('admin.users.users_group_action_change_roles_error_capacity', 'danger');
-                $error = TRUE;
-                break;
+        $capacitiesOk = $selectedRoles->forAll(function (int $key, Role $role) use ($users) {
+            if (!$role->hasLimitedCapacity())
+                return TRUE;
+
+            $capacityNeeded = $users->count();
+
+            if ($capacityNeeded <= $role->getCapacity())
+                return TRUE;
+
+            foreach ($users as $user) {
+                if ($user->isInRole($role))
+                    $capacityNeeded--;
             }
+
+            if ($capacityNeeded <= $role->getCapacity())
+                return TRUE;
+
+            return FALSE;
+        });
+
+        if (!$capacitiesOk) {
+            $p->flashMessage('admin.users.users_group_action_change_roles_error_capacity', 'danger');
+            return;
         }
 
-        if (!$error) {
-            $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $p) {
-                foreach ($users as $user) {
-                    $this->userService->changeRoles($user, $selectedRoles, TRUE);
-                }
-            });
+        $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $p) {
+            foreach ($users as $user) {
+                $this->applicationService->updateRoles($user, $selectedRoles, $this->userRepository->findById($p->getUser()->id),TRUE);
+            }
 
             $p->flashMessage('admin.users.users_group_action_changed_roles', 'success');
             $this->redirect('this');
-        }
+        });
     }
 
     /**
diff --git a/app/AdminModule/forms/EditRoleForm.php b/app/AdminModule/forms/EditRoleForm.php
index 3c12e6f3a..cd8aebe00 100644
--- a/app/AdminModule/forms/EditRoleForm.php
+++ b/app/AdminModule/forms/EditRoleForm.php
@@ -103,7 +103,7 @@ public function create($id)
             ->setAttribute('title', $form->getTranslator()->translate('admin.acl.roles_capacity_note'))
             ->addCondition(Form::FILLED)
             ->addRule(Form::INTEGER, 'admin.acl.roles_capacity_format')
-            ->addRule(Form::MIN, 'admin.acl.roles_capacity_low', $this->roleRepository->countApprovedUsersInRole($this->role));
+            ->addRule(Form::MIN, 'admin.acl.roles_capacity_low', $this->role->countUsers());
 
         $form->addCheckbox('approvedAfterRegistration', 'admin.acl.roles_approved_after_registration');
 
diff --git a/app/AdminModule/forms/EditUserSeminarForm.php b/app/AdminModule/forms/EditUserSeminarForm.php
index ac43e8bc8..a2ea8661b 100644
--- a/app/AdminModule/forms/EditUserSeminarForm.php
+++ b/app/AdminModule/forms/EditUserSeminarForm.php
@@ -2,6 +2,8 @@
 
 namespace App\AdminModule\Forms;
 
+use App\Model\ACL\Role;
+use App\Model\ACL\RoleRepository;
 use App\Model\Program\ProgramRepository;
 use App\Model\Settings\CustomInput\CustomInput;
 use App\Model\Settings\CustomInput\CustomInputRepository;
@@ -12,9 +14,12 @@
 use App\Model\User\CustomInputValue\CustomTextValue;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
+use App\Services\ApplicationService;
 use App\Services\ProgramService;
+use App\Utils\Validators;
 use Nette;
 use Nette\Application\UI\Form;
+use PhpCollection\Set;
 
 
 /**
@@ -43,14 +48,14 @@ class EditUserSeminarForm extends Nette\Object
     /** @var CustomInputValueRepository */
     private $customInputValueRepository;
 
-    /** @var SettingsRepository */
-    private $settingsRepository;
+    /** @var RoleRepository */
+    private $roleRepository;
 
-    /** @var ProgramRepository */
-    private $programRepository;
+    /** @var ApplicationService */
+    private $applicationService;
 
-    /** @var ProgramService */
-    private $programService;
+    /** @var Validators */
+    private $validators;
 
 
     /**
@@ -59,29 +64,29 @@ class EditUserSeminarForm extends Nette\Object
      * @param UserRepository $userRepository
      * @param CustomInputRepository $customInputRepository
      * @param CustomInputValueRepository $customInputValueRepository
-     * @param SettingsRepository $settingsRepository
-     * @param ProgramRepository $programRepository
-     * @param ProgramService $programService
+     * @param RoleRepository $roleRepository
+     * @param ApplicationService $applicationService
      */
     public function __construct(BaseForm $baseFormFactory, UserRepository $userRepository,
                                 CustomInputRepository $customInputRepository,
                                 CustomInputValueRepository $customInputValueRepository,
-                                SettingsRepository $settingsRepository, ProgramRepository $programRepository,
-                                ProgramService $programService)
+                                RoleRepository $roleRepository, ApplicationService $applicationService,
+                                Validators $validators)
     {
         $this->baseFormFactory = $baseFormFactory;
         $this->userRepository = $userRepository;
         $this->customInputRepository = $customInputRepository;
         $this->customInputValueRepository = $customInputValueRepository;
-        $this->settingsRepository = $settingsRepository;
-        $this->programRepository = $programRepository;
-        $this->programService = $programService;
+        $this->roleRepository = $roleRepository;
+        $this->applicationService = $applicationService;
+        $this->validators = $validators;
     }
 
     /**
      * Vytvoří formulář.
      * @param $id
      * @return Form
+     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function create($id)
     {
@@ -91,13 +96,18 @@ public function create($id)
 
         $form->addHidden('id');
 
+        $form->addMultiSelect('roles', 'admin.users.users_roles',
+            $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED]))
+            ->addRule(Form::FILLED, 'admin.users.users_edit_roles_empty')
+            ->addRule([$this, 'validateRolesNonregistered'], 'admin.users.users_edit_roles_nonregistered')
+            ->addRule([$this, 'validateRolesCapacities'], 'admin.users.users_edit_roles_occupied');
+
         $form->addCheckbox('approved', 'admin.users.users_approved_form');
 
         $form->addCheckbox('attended', 'admin.users.users_attended_form');
 
         if ($this->user->hasDisplayArrivalDepartureRole()) {
             $form->addDateTimePicker('arrival', 'admin.users.users_arrival');
-
             $form->addDateTimePicker('departure', 'admin.users.users_departure');
         }
 
@@ -135,6 +145,7 @@ public function create($id)
 
         $form->setDefaults([
             'id' => $id,
+            'roles' => $this->roleRepository->findRolesIds($this->user->getRoles()),
             'approved' => $this->user->isApproved(),
             'attended' => $this->user->isAttended(),
             'arrival' => $this->user->getArrival(),
@@ -157,8 +168,25 @@ public function create($id)
      */
     public function processForm(Form $form, \stdClass $values)
     {
-        if (!$form['cancel']->isSubmittedBy()) {
-            $this->userRepository->getEntityManager()->transactional(function ($em) use ($values) {
+        if(!$form['cancel']->isSubmittedBy()) {
+            $loggedUser = $this->userRepository->findById($form->getPresenter()->user->id);
+
+            $this->userRepository->getEntityManager()->transactional(function ($em) use ($values, $loggedUser) {
+                $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
+
+                $rolesChanged = TRUE;
+
+                if ($selectedRoles->count() == $this->user->getRoles()->count()) {
+                    $selectedRolesArray = $selectedRoles->map(function (Role $role) {return $role->getId();})->toArray();
+                    $usersRolesArray = $this->user->getRoles()->map(function (Role $role) {return $role->getId();})->toArray();
+
+                    if (array_diff($selectedRolesArray, $usersRolesArray) === array_diff($usersRolesArray, $selectedRolesArray))
+                        $rolesChanged = FALSE;
+                }
+
+                if ($rolesChanged)
+                    $this->applicationService->updateRoles($this->user, $selectedRoles,  $loggedUser);
+
                 $this->user->setApproved($values['approved']);
                 $this->user->setAttended($values['attended']);
 
@@ -198,9 +226,33 @@ public function processForm(Form $form, \stdClass $values)
                 $this->user->setNote($values['privateNote']);
 
                 $this->userRepository->save($this->user);
-
-                $this->programService->updateUserPrograms($this->user);
             });
         }
     }
+
+    /**
+     * Ověří, že není vybrána role "Neregistrovaný".
+     * @param $field
+     * @param $args
+     * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function validateRolesNonregistered($field, $args)
+    {
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        return $this->validators->validateRolesNonregistered($selectedRoles, $this->user);
+    }
+
+    /**
+     * Ověří kapacitu rolí.
+     * @param $field
+     * @param $args
+     * @return bool
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function validateRolesCapacities($field, $args)
+    {
+        $selectedRoles = $this->roleRepository->findRolesByIds($field->getValue());
+        return $this->validators->validateRolesCapacities($selectedRoles, $this->user);
+    }
 }
diff --git a/app/AdminModule/presenters/UsersPresenter.php b/app/AdminModule/presenters/UsersPresenter.php
index 0d11c782c..87c2054c6 100644
--- a/app/AdminModule/presenters/UsersPresenter.php
+++ b/app/AdminModule/presenters/UsersPresenter.php
@@ -13,6 +13,7 @@
 use App\Model\Enums\PaymentType;
 use App\Model\Settings\CustomInput\CustomInput;
 use App\Model\Settings\CustomInput\CustomInputRepository;
+use App\Services\ApplicationService;
 use App\Services\ExcelExportService;
 use App\Services\PdfExportService;
 use Nette\Application\UI\Form;
@@ -33,42 +34,55 @@ class UsersPresenter extends AdminBasePresenter
      * @inject
      */
     public $usersGridControlFactory;
+
     /**
      * @var AddLectorForm
      * @inject
      */
     public $addLectorFormFactory;
+
     /**
      * @var EditUserPersonalDetailsForm
      * @inject
      */
     public $editUserPersonalDetailsFormFactory;
+
     /**
      * @var EditUserSeminarForm
      * @inject
      */
     public $editUserSeminarFormFactory;
+
     /**
      * @var IApplicationsGridControlFactory
      * @inject
      */
     public $applicationsGridControlFactory;
+
     /**
      * @var PdfExportService
      * @inject
      */
     public $pdfExportService;
+
     /**
      * @var ExcelExportService
      * @inject
      */
     public $excelExportService;
+
     /**
      * @var CustomInputRepository
      * @inject
      */
     public $customInputRepository;
 
+    /**
+     * @var ApplicationService
+     * @inject
+     */
+    public $applicationService;
+
 
     /**
      * @throws \Nette\Application\AbortException
@@ -90,8 +104,10 @@ public function startup()
      */
     public function renderDetail($id)
     {
+        $user = $this->userRepository->findById($id);
+
         $this->template->sidebarVisible = TRUE;
-        $this->template->detailUser = $this->userRepository->findById($id);
+        $this->template->detailUser = $user;
 
         $this->template->customInputs = $this->customInputRepository->findAllOrderedByPosition();
         $this->template->customInputTypeText = CustomInput::TEXT;
@@ -103,6 +119,8 @@ public function renderDetail($id)
 
         $this->template->paymentMethodCash = PaymentType::CASH;
         $this->template->paymentMethodBank = PaymentType::BANK;
+
+        $this->template->registered = !$user->isInRole($this->roleRepository->findBySystemName(Role::NONREGISTERED));
     }
 
     /**
@@ -160,6 +178,20 @@ public function handleEditPayment()
         }
     }
 
+    /**
+     * @throws \Throwable
+     */
+    public function handleCancelRegistration()
+    {
+        $user = $this->userRepository->findById($this->getParameter('id'));
+        $loggedUser = $this->userRepository->findById($this->user->id);
+
+        $this->applicationService->cancelRegistration($user, $loggedUser);
+
+        $this->flashMessage('admin.users.users_registration_canceled', 'success');
+        $this->redirect('this');
+    }
+
     protected function createComponentUsersGrid()
     {
         return $this->usersGridControlFactory->create();
@@ -202,12 +234,10 @@ protected function createComponentEditUserSeminarForm()
         $form = $this->editUserSeminarFormFactory->create($this->getParameter('id'));
 
         $form->onSuccess[] = function (Form $form, \stdClass $values) {
-            if ($form['cancel']->isSubmittedBy()) {
-                $this->redirect('this');
-            } else {
+            if (!$form['cancel']->isSubmittedBy())
                 $this->flashMessage('admin.users.users_saved', 'success');
-                $this->redirect('this');
-            }
+
+            $this->redirect('this');
         };
 
         return $form;
diff --git a/app/AdminModule/presenters/templates/Users/detail.latte b/app/AdminModule/presenters/templates/Users/detail.latte
index ed8eda920..f968bc9db 100644
--- a/app/AdminModule/presenters/templates/Users/detail.latte
+++ b/app/AdminModule/presenters/templates/Users/detail.latte
@@ -101,6 +101,11 @@
                     <col class="col-sm-3 col-xs-3">
                     <col class="col-sm-9 col-xs-9">
 
+                    <tr>
+                        <th>{_admin.users.users_roles}</th>
+                        <td>{$detailUser->getRolesText()}</td>
+                    </tr>
+
                     <tr>
                         <th>{_admin.users.users_approved_detail}</th>
                         <td>{if $detailUser->isApproved()}
@@ -160,17 +165,29 @@
 
                     <tr>
                         <th>{_admin.users.users_about_me}</th>
-                        <td>{$detailUser->getAbout()}</td>
+                        <td>{$detailUser->getAbout()|breaklines}</td>
                     </tr>
 
                     <tr>
-                        <th>{_admin.users.users_private_note|breaklines}</th>
-                        <td>{$detailUser->getNote()}</td>
+                        <th>{_admin.users.users_private_note}</th>
+                        <td>{$detailUser->getNote()|breaklines}</td>
                     </tr>
 
                     <tr>
                         <td></td>
-                        <td><a n:href="editSeminar!" class="btn btn-default ajax">{_admin.common.edit}</a></td>
+                        <td>
+                            <a n:href="editSeminar!" class="btn btn-default ajax">{_admin.common.edit}</a>
+                            {if $registered}
+                                <a n:href="cancelRegistration!" class="btn btn-danger" data-toggle="confirmation"
+                                                                data-content="{_admin.users.users_cancel_registration_confirm}">
+                                    {_admin.users.users_cancel_registration}
+                                </a>
+                            {else}
+                                <a href="#" class="btn btn-danger" disabled="true">
+                                    {_admin.users.users_cancel_registration}
+                                </a>
+                            {/if}
+                        </td>
                     </tr>
                 </table>
             {else}
diff --git a/app/WebModule/components/ApplicationsGridControl.php b/app/WebModule/components/ApplicationsGridControl.php
index 88e00f8bb..47d2f91cd 100644
--- a/app/WebModule/components/ApplicationsGridControl.php
+++ b/app/WebModule/components/ApplicationsGridControl.php
@@ -242,7 +242,9 @@ public function createComponentApplicationsGrid($name)
             return $item->getType() == Application::SUBEVENTS;
         });
 
-        $grid->setColumnsSummary(['fee']);
+        $grid->setColumnsSummary(['fee'], function(Application $item, $column) {
+            return $item->isCanceled() ? 0 : $item->getFee();
+        });
     }
 
     /**
diff --git a/app/WebModule/components/CapacitiesContentControl.php b/app/WebModule/components/CapacitiesContentControl.php
index d4b53def7..111d72ff6 100644
--- a/app/WebModule/components/CapacitiesContentControl.php
+++ b/app/WebModule/components/CapacitiesContentControl.php
@@ -37,7 +37,7 @@ public function render($content)
         $template->setFile(__DIR__ . '/templates/capacities_content.latte');
 
         $template->heading = $content->getHeading();
-        $template->roles = $this->roleRepository->countApprovedUsersInRoles($content->getRoles());
+        $template->roles = $this->roleRepository->countUsersInRoles($content->getRoles());
 
         $template->render();
     }
diff --git a/app/WebModule/forms/RolesForm.php b/app/WebModule/forms/RolesForm.php
index 1d373e015..15a6f9d21 100644
--- a/app/WebModule/forms/RolesForm.php
+++ b/app/WebModule/forms/RolesForm.php
@@ -2,6 +2,7 @@
 
 namespace App\WebModule\Forms;
 
+use App\Model\ACL\Role;
 use App\Model\ACL\RoleRepository;
 use App\Model\Program\ProgramRepository;
 use App\Model\User\User;
@@ -141,8 +142,18 @@ public function processForm(Form $form, \stdClass $values)
     {
         if ($form['submit']->isSubmittedBy()) {
             $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
+
+            if ($selectedRoles->count() == $this->user->getRoles()->count()) {
+                $selectedRolesArray = $selectedRoles->map(function (Role $role) {return $role->getId();})->toArray();
+                $usersRolesArray = $this->user->getRoles()->map(function (Role $role) {return $role->getId();})->toArray();
+
+                if (array_diff($selectedRolesArray, $usersRolesArray) === array_diff($usersRolesArray, $selectedRolesArray))
+                    return;
+            }
+
             $this->applicationService->updateRoles($this->user, $selectedRoles, $this->user);
-        } elseif ($form['cancelRegistration']->isSubmittedBy()) {
+        }
+        elseif ($form['cancelRegistration']->isSubmittedBy()) {
             $this->applicationService->cancelRegistration($this->user, $this->user);
         }
     }
diff --git a/app/lang/admin.cs_CZ.neon b/app/lang/admin.cs_CZ.neon
index 7dcdfdc88..feeafc495 100644
--- a/app/lang/admin.cs_CZ.neon
+++ b/app/lang/admin.cs_CZ.neon
@@ -342,11 +342,15 @@ users:
     users_add_lector: "Přidat lektora"
     users_add_lector_heading: "Nový lektor"
     users_search_heading: "Vyhledání uživatele"
+    users_cancel_registration: "Odhlásit ze semináře"
+    users_cancel_registration_confirm: "Opravdu chcete uživatele odhlásit z celého semináře?"
+    users_registration_canceled: "Uživatel byl úspěšně odhlášen ze semináře."
+    users_edit_roles_empty: "Musí být vybrána alespoň jedna role."
+    users_edit_roles_occupied: "Všechna místa v některé roli jsou obsazena."
+    users_edit_roles_nonregistered: "Roli \"Nepřihlášený\" není možné nastavit, použijte odhlášení ze semináře."
+
     users_applications_application_date: "Datum přihlášky"
     users_applications_roles: "Role"
-    users_applications_roles_empty: "Musí být vybrána alespoň jedna role."
-    users_applications_roles_occupied: "Všechna místa v některé roli jsou obsazena."
-    users_applications_roles_not_empty: "Role je možné vybírat jen u první přihlášky."
     users_applications_subevents: "Podakce"
     users_applications_subevents_empty: "Musí být vybrána alespoň jedna podakce."
     users_applications_subevents_occupied: "Všechna místa na některé podakci jsou obsazena."
@@ -364,9 +368,6 @@ users:
     users_applications_saved: "Přihláška byla úspěšně uložena."
     users_applications_download_payment_proof_bank: "Stáhnout potvrzení o přijetí platby"
     users_applications_download_payment_proof_cash: "Stáhnout příjmový doklad"
-    users_applications_cancel_registration: "Odhlásit ze semináře"
-    users_applications_cancel_registration_confirm: "Opravdu chcete uživatele odhlásit z celého semináře?"
-    users_applications_registration_canceled: "Uživatel byl úspěšně odhlášen ze semináře."
     users_applications_cancel_application: "Zrušit přihlášku"
     users_applications_cancel_application_confirm: "Opravdu chcete zrušit dodatečnou přihlášku?"
     users_applications_application_canceled: "Dodatečná přihláška byla úspěšně zrušena."
diff --git a/app/model/ACL/Role.php b/app/model/ACL/Role.php
index d8fad92a8..b2538b593 100644
--- a/app/model/ACL/Role.php
+++ b/app/model/ACL/Role.php
@@ -675,4 +675,28 @@ public function setRedirectAfterLogin(?string $redirectAfterLogin): void
     {
         $this->redirectAfterLogin = $redirectAfterLogin;
     }
+
+    /**
+     * @return int
+     */
+    public function countUsers(): int
+    {
+        return $this->users->count();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function countUnoccupied(): ?int
+    {
+        return $this->capacity ? $this->capacity - $this->countUsers() : NULL;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOccupancyText(): string
+    {
+        return $this->capacity ? $this->countUsers() . '/' . $this->capacity : $this->countUsers();
+    }
 }
diff --git a/app/model/ACL/RoleRepository.php b/app/model/ACL/RoleRepository.php
index 31993a3ec..03612be07 100644
--- a/app/model/ACL/RoleRepository.php
+++ b/app/model/ACL/RoleRepository.php
@@ -156,59 +156,15 @@ public function findRolesByIds($ids)
     }
 
     /**
-     * Vrací počet volných míst v rolích nebo null u rolí s neomezenou kapacitou.
+     * Vrací role s počty uživatelů.
      * @param $roles
      * @return array
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function countUnoccupiedInRoles($roles) : array
-    {
-        $counts = [];
-        foreach ($roles as $role) {
-            $counts[$role->getId()] = $this->countUnoccupiedInRole($role);
-        }
-        return $counts;
-    }
-
-    /**
-     * Vrací počet volných míst v roli nebo null u rolí s neomezenou kapacitou.
-     * @param Role $role
-     * @return int|null
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function countUnoccupiedInRole(Role $role) : ?int
-    {
-        if ($role->getCapacity() === NULL)
-            return NULL;
-        return $role->getCapacity() - $this->countApprovedUsersInRole($role);
-    }
-
-    /**
-     * Vrací počet schválených uživatelů v roli.
-     * @param Role $role
-     * @return int
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function countApprovedUsersInRole(Role $role) : int
-    {
-        return $this->createQueryBuilder('r')
-            ->select('COUNT(u.id)')
-            ->leftJoin('r.users', 'u', 'WITH', 'u.approved = true')
-            ->where('r.id = :id')->setParameter('id', $role->getId())
-            ->getQuery()
-            ->getSingleScalarResult();
-    }
-
-    /**
-     * Vrací počet schválených uživatelů v rolích.
-     * @param $roles
-     * @return array
-     */
-    public function countApprovedUsersInRoles($roles) : array
+    public function countUsersInRoles($roles) : array
     {
         return $this->createQueryBuilder('r')
             ->select('r.name, r.capacity, COUNT(u.id) AS usersCount')
-            ->leftJoin('r.users', 'u', 'WITH', 'u.approved = true')
+            ->leftJoin('r.users', 'u')
             ->where('r.id IN (:ids)')->setParameter('ids', $this->findRolesIds($roles))
             ->groupBy('r.id')
             ->orderBy('r.name')
@@ -263,7 +219,7 @@ public function getRegisterableNowOptionsWithCapacity() : array
             if ($role->hasLimitedCapacity())
                 $options[$role->getId()] = $this->translator->translate('web.common.role_option', NULL, [
                     'role' => $role->getName(),
-                    'occupied' => $this->countApprovedUsersInRole($role),
+                    'occupied' => $role->countUsers(),
                     'total' => $role->getCapacity()
                 ]);
             else
@@ -312,7 +268,7 @@ public function getRegisterableNowOrUsersOptionsWithCapacity(User $user) : array
             if ($role->hasLimitedCapacity())
                 $options[$role->getId()] = $this->translator->translate('web.common.role_option', NULL, [
                     'role' => $role->getName(),
-                    'occupied' => $this->countApprovedUsersInRole($role),
+                    'occupied' => $role->countUsers(),
                     'total' => $role->getCapacity()
                 ]);
             else
@@ -405,7 +361,7 @@ public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles) : a
             if ($role->hasLimitedCapacity())
                 $options[$role->getId()] = $this->translator->translate('web.common.role_option', NULL, [
                     'role' => $role->getName(),
-                    'occupied' => $this->countApprovedUsersInRole($role),
+                    'occupied' => $role->countUsers(),
                     'total' => $role->getCapacity()
                 ]);
             else
@@ -438,7 +394,7 @@ public function getRolesWithoutRolesOptionsWithUsersCount(array $withoutRoles) :
         $options = [];
         foreach ($roles as $role) {
             $options[$role->getId()] = $this->translator->translate('admin.common.role_option',
-                $this->countApprovedUsersInRole($role), [
+                $role->countUsers(), [
                     'role' => $role->getName()
                 ]
             );
diff --git a/app/model/Structure/Subevent.php b/app/model/Structure/Subevent.php
index 644286daa..8e7d4edc6 100644
--- a/app/model/Structure/Subevent.php
+++ b/app/model/Structure/Subevent.php
@@ -5,6 +5,7 @@
 use App\Model\ACL\Role;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -351,4 +352,38 @@ public function getRequiredSubeventsTransitiveText() : string
         }
         return implode(', ', $requiredSubeventsNames);
     }
+
+    /**
+     * @return int
+     */
+    public function countUsers(): int
+    {
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->andX(
+                Criteria::expr()->isNull('validTo'),
+                Criteria::expr()->orX(
+                    Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT),
+                    Criteria::expr()->eq('state', ApplicationState::PAID),
+                    Criteria::expr()->eq('state', ApplicationState::PAID_FREE)
+                )
+            ));
+
+        return $this->applications->matching($criteria)->count();
+    }
+
+    /**
+     * @return int|null
+     */
+    public function countUnoccupied(): ?int
+    {
+        return $this->capacity ? $this->capacity - $this->countUsers() : NULL;
+    }
+
+    /**
+     * @return string
+     */
+    public function getOccupancyText(): string
+    {
+        return $this->capacity ? $this->countUsers() . '/' . $this->capacity : $this->countUsers();
+    }
 }
diff --git a/app/model/Structure/SubeventRepository.php b/app/model/Structure/SubeventRepository.php
index fa45fe77f..246cf1a36 100644
--- a/app/model/Structure/SubeventRepository.php
+++ b/app/model/Structure/SubeventRepository.php
@@ -117,63 +117,6 @@ public function findSubeventsIds($subevents)
         }, $subevents->toArray());
     }
     
-    /**
-     * Vrací podakce s omezenou kapacitou.
-     * @return Collection
-     */
-    public function findAllWithLimitedCapacity()
-    {
-        $criteria = Criteria::create()
-            ->where(Criteria::expr()->neq('capacity', NULL));
-        return $this->matching($criteria);
-    }
-
-    /**
-     * Vrací počet volných míst v podakci nebo null u podakce s neomezenou kapacitou.
-     * @param Subevent $subevent
-     * @return int|null
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function countUnoccupiedInSubevent(Subevent $subevent)
-    {
-        if ($subevent->getCapacity() === NULL)
-            return NULL;
-        return $subevent->getCapacity() - $this->countApprovedUsersInSubevent($subevent);
-    }
-
-    /**
-     * Vrací počet volných míst v podakcích nebo null u podakcí s neomezenou kapacitou.
-     * @param $subevents
-     * @return array
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function countUnoccupiedInSubevents($subevents)
-    {
-        $counts = [];
-        foreach ($subevents as $subevent) {
-            $counts[$subevent->getId()] = $this->countUnoccupiedInSubevent($subevent);
-        }
-        return $counts;
-    }
-
-    /**
-     * Vrací počet schválených uživatelů v podakci.
-     * @param Subevent $subevent
-     * @return int
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function countApprovedUsersInSubevent(Subevent $subevent)
-    {
-        return $this->createQueryBuilder('s')
-            ->select('COUNT(u.id)')
-            ->leftJoin('s.applications', 'a', 'WITH',
-                'a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\' OR a.state = \'' . ApplicationState::PAID . '\'')
-            ->leftJoin('a.user', 'u', 'WITH', 'u.approved = TRUE')
-            ->where('s.id = :id')->setParameter('id', $subevent->getId())
-            ->getQuery()
-            ->getSingleScalarResult();
-    }
-
     /**
      * Vrací počet vytvořených podakcí.
      * @return int
@@ -260,7 +203,6 @@ public function getExplicitOptions()
     /**
      * Vrací seznam podakcí, s informací o obsazenosti, jako možnosti pro select
      * @return array
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getSubeventsOptionsWithCapacity()
     {
@@ -274,7 +216,7 @@ public function getSubeventsOptionsWithCapacity()
             if ($subevent->hasLimitedCapacity())
                 $options[$subevent->getId()] = $this->translator->translate('web.common.subevent_option', NULL, [
                     'subevent' => $subevent->getName(),
-                    'occupied' => $this->countApprovedUsersInSubevent($subevent),
+                    'occupied' => $subevent->countUsers(),
                     'total' => $subevent->getCapacity()
                 ]);
             else
@@ -286,7 +228,6 @@ public function getSubeventsOptionsWithCapacity()
     /**
      * Vrací seznam podakcí, s informací o obsazenosti, jako možnosti pro select
      * @return array
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getExplicitOptionsWithCapacity()
     {
@@ -301,7 +242,7 @@ public function getExplicitOptionsWithCapacity()
             if ($subevent->hasLimitedCapacity())
                 $options[$subevent->getId()] = $this->translator->translate('web.common.subevent_option', NULL, [
                     'subevent' => $subevent->getName(),
-                    'occupied' => $this->countApprovedUsersInSubevent($subevent),
+                    'occupied' => $subevent->countUsers(),
                     'total' => $subevent->getCapacity()
                 ]);
             else
@@ -314,7 +255,6 @@ public function getExplicitOptionsWithCapacity()
      * Vrací seznam podakcí, kromě podakcí uživatele, s informací o obsazenosti, jako možnosti pro select.
      * @param User $user
      * @return array
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getNonRegisteredSubeventsOptionsWithCapacity(User $user)
     {
@@ -338,7 +278,7 @@ public function getNonRegisteredSubeventsOptionsWithCapacity(User $user)
             if ($subevent->hasLimitedCapacity())
                 $options[$subevent->getId()] = $this->translator->translate('web.common.subevent_option', NULL, [
                     'subevent' => $subevent->getName(),
-                    'occupied' => $this->countApprovedUsersInSubevent($subevent),
+                    'occupied' => $subevent->countUsers(),
                     'total' => $subevent->getCapacity()
                 ]);
             else
@@ -351,7 +291,6 @@ public function getNonRegisteredSubeventsOptionsWithCapacity(User $user)
      * Vrací seznam podakcí, kromě podakcí uživatele, s informací o obsazenosti, jako možnosti pro select.
      * @param User $user
      * @return array
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function getNonRegisteredExplicitOptionsWithCapacity(User $user)
     {
@@ -377,7 +316,7 @@ public function getNonRegisteredExplicitOptionsWithCapacity(User $user)
             if ($subevent->hasLimitedCapacity())
                 $options[$subevent->getId()] = $this->translator->translate('web.common.subevent_option', NULL, [
                     'subevent' => $subevent->getName(),
-                    'occupied' => $this->countApprovedUsersInSubevent($subevent),
+                    'occupied' => $subevent->countUsers(),
                     'total' => $subevent->getCapacity()
                 ]);
             else
diff --git a/app/model/User/Application/Application.php b/app/model/User/Application/Application.php
index 988f07ab5..999928a01 100644
--- a/app/model/User/Application/Application.php
+++ b/app/model/User/Application/Application.php
@@ -2,6 +2,7 @@
 
 namespace App\Model\User;
 
+use App\Model\Enums\ApplicationState;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -376,4 +377,12 @@ public function setValidTo(?\DateTime $validTo)
     {
         $this->validTo = $validTo;
     }
+
+    /**
+     * @return bool
+     */
+    public function isCanceled(): bool
+    {
+        return $this->state == ApplicationState::CANCELED || $this->state == ApplicationState::CANCELED_NOT_PAID;
+    }
 }
diff --git a/app/model/User/User.php b/app/model/User/User.php
index 4ddb05358..1d2784373 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -407,15 +407,6 @@ public function getRolesText()
         return implode(', ', $rolesNames);
     }
 
-    /**
-     * Vrací, zda má uživatel nějakou roli, která nemá cenu podle podakcí.
-     * @return bool
-     */
-    public function hasFixedFeeRole(): bool
-    {
-        return !$this->roles->forAll(function (int $key, Role $role) {return $role->getFee() === NULL;});
-    }
-
     /**
      * Má uživatel oprávnění k prostředku?
      * @param $resource
@@ -489,17 +480,9 @@ public function getValidApplications(): Collection
      */
     public function getNotCanceledApplications(): Collection
     {
-        $criteria = Criteria::create()
-            ->where(Criteria::expr()->andX(
-                Criteria::expr()->isNull('validTo'),
-                Criteria::expr()->orX(
-                    Criteria::expr()->eq('state', ApplicationState::WAITING_FOR_PAYMENT),
-                    Criteria::expr()->eq('state', ApplicationState::PAID),
-                    Criteria::expr()->eq('state', ApplicationState::PAID_FREE)
-                )
-            ));
-
-        return $this->applications->matching($criteria);
+        return $this->getValidApplications()->filter(function (Application $application) {
+            return !$application->isCanceled();
+        });
     }
 
     /**
@@ -508,8 +491,7 @@ public function getNotCanceledApplications(): Collection
      */
     public function getNotCanceledSubeventsApplications(): Collection
     {
-        $applications = $this->getNotCanceledApplications();
-        return $applications->filter(function (Application $application) {
+        return $this->getNotCanceledApplications()->filter(function (Application $application) {
             return $application->getType() == Application::SUBEVENTS;
         });
     }
@@ -562,20 +544,6 @@ public function getWaitingForPaymentApplications()
         return $this->applications->matching($criteria);
     }
 
-    /**
-     * Vrácí, zda má uživatel zaplacenou přihlášku s podakcí.
-     * @param Subevent $subevent
-     * @return bool
-     */
-    public function hasPaidSubevent(Subevent $subevent)
-    {
-        foreach ($this->getPaidAndFreeApplications() as $application)
-            if ($application->getType() == Application::SUBEVENTS && $application->getSubevents->contains($subevent))
-                return TRUE;
-
-        return FALSE;
-    }
-
     /**
      * @param Collection $applications
      */
@@ -1236,6 +1204,29 @@ public function getFeeRemaining()
         return $fee;
     }
 
+    /**
+     * Vrací, zda má uživatel nějakou roli, která nemá cenu podle podakcí.
+     * @return bool
+     */
+    public function hasFixedFeeRole(): bool
+    {
+        return $this->roles->exists(function (int $key, Role $role) {return $role->getFee() !== NULL;});
+    }
+
+    /**
+     * Vrácí, zda má uživatel zaplacenou přihlášku s podakcí.
+     * @param Subevent $subevent
+     * @return bool
+     */
+    public function hasPaidSubevent(Subevent $subevent)
+    {
+        foreach ($this->getPaidAndFreeApplications() as $application)
+            if ($application->getType() == Application::SUBEVENTS && $application->getSubevents->contains($subevent))
+                return TRUE;
+
+        return FALSE;
+    }
+
     /**
      * Vrací datum první přihlášky.
      * @return \DateTime|null
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index 28ade6dff..9f5bf80f3 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -6,7 +6,6 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\Enums\ApplicationState;
 use App\Model\Enums\MaturityType;
-use App\Model\Mailing\Mail;
 use App\Model\Mailing\Template;
 use App\Model\Mailing\TemplateVariable;
 use App\Model\Settings\Settings;
@@ -24,10 +23,8 @@
 use App\Model\User\VariableSymbolRepository;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
-use function foo\func;
 use Kdyby\Translation\Translator;
 use Nette;
-use Psr\Log\NullLogger;
 
 
 /**
@@ -162,45 +159,30 @@ public function register(User $user, Collection $roles, Collection $subevents, U
     public function updateRoles(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $createdBy, $approve) {
-            if ($approve) {
-                $user->setApproved(TRUE);
-            } else {
-                if ($user->isApproved()) {
-                    foreach ($roles as $role) {
-                        if (!$role->isApprovedAfterRegistration() && !$user->isInRole($role)) {
-                            $user->setApproved(FALSE);
-                            break;
-                        }
-                    }
-                } else {
-                    if ($roles->forAll(function (int $key, Role $role) {return $role->isApprovedAfterRegistration();}))
-                        $user->setApproved(TRUE);
-                }
-            }
+            $oldRoles = $user->getRoles();
 
             $user->setRoles($roles);
             $this->userRepository->save($user);
 
-            foreach ($user->getValidApplications() as $application) {
-                if ($application->getType() == Application::ROLES) {
-                    $newApplication = clone $application;
-                    $newApplication->setRoles($roles);
-                    $newApplication->setFee($this->countRolesFee($roles));
-                    $newApplication->setState($this->getApplicationState($newApplication));
-                    $newApplication->setCreatedBy($createdBy);
-                    $newApplication->setValidFrom(new \DateTime());
-                    $this->applicationRepository->save($newApplication);
-
-                    $application->setValidTo(new \DateTime());
-                    $this->applicationRepository->save($application);
-
-                    $user->addApplication($newApplication);
-                } else {
-                    $fee = $this->countSubeventsFee($roles, $application->getSubevents());
+            if ($oldRoles->contains($this->roleRepository->findBySystemName(Role::NONREGISTERED))) {
+                $this->createRolesApplication($user, $roles, $createdBy, $approve);
+                $this->createSubeventsApplication($user, new ArrayCollection([$this->subeventRepository->findImplicit()]), $createdBy);
+            } else {
+                if ($roles->forAll(function (int $key, Role $role) {
+                    return $role->isApprovedAfterRegistration();
+                })) {
+                    $user->setApproved(TRUE);
+                } elseif (!$approve && $roles->exists(function (int $key, Role $role) use ($oldRoles) {
+                        return !$role->isApprovedAfterRegistration() && !$oldRoles->contains($role);
+                    })) {
+                    $user->setApproved(FALSE);
+                }
 
-                    if ($application->getFee() != $fee) {
+                foreach ($user->getNotCanceledApplications() as $application) {
+                    if ($application->getType() == Application::ROLES) {
                         $newApplication = clone $application;
-                        $newApplication->setFee($fee);
+                        $newApplication->setRoles($roles);
+                        $newApplication->setFee($this->countRolesFee($roles));
                         $newApplication->setState($this->getApplicationState($newApplication));
                         $newApplication->setCreatedBy($createdBy);
                         $newApplication->setValidFrom(new \DateTime());
@@ -210,11 +192,27 @@ public function updateRoles(User $user, Collection $roles, User $createdBy, bool
                         $this->applicationRepository->save($application);
 
                         $user->addApplication($newApplication);
+                    } else {
+                        $fee = $this->countSubeventsFee($roles, $application->getSubevents());
+
+                        if ($application->getFee() != $fee) {
+                            $newApplication = clone $application;
+                            $newApplication->setFee($fee);
+                            $newApplication->setState($this->getApplicationState($newApplication));
+                            $newApplication->setCreatedBy($createdBy);
+                            $newApplication->setValidFrom(new \DateTime());
+                            $this->applicationRepository->save($newApplication);
+
+                            $application->setValidTo(new \DateTime());
+                            $this->applicationRepository->save($application);
+
+                            $user->addApplication($newApplication);
+                        }
                     }
                 }
-            }
 
-            $this->userRepository->save($user);
+                $this->userRepository->save($user);
+            }
 
             $this->programService->updateUserPrograms($user);
 
@@ -239,7 +237,7 @@ public function cancelRegistration(User $user, User $createdBy): void
             $user->addRole($this->roleRepository->findBySystemName(Role::NONREGISTERED));
             $this->userRepository->save($user);
 
-            foreach ($user->getValidApplications() as $application) {
+            foreach ($user->getNotCanceledApplications() as $application) {
                 $newApplication = clone $application;
                 $newApplication->setState(ApplicationState::CANCELED);
                 $newApplication->setCreatedBy($createdBy);
@@ -325,14 +323,11 @@ public function updatePayment(Application $application, \DateTime $paymentDate,
      */
     private function createRolesApplication(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): RolesApplication
     {
-        if ($user->isApproved() && !$approve) {
-            foreach ($roles as $role) {
-                if (!$role->isApprovedAfterRegistration()) {
-                    $user->setApproved(FALSE);
-                    break;
-                }
-            }
-        }
+        $user->setApproved(TRUE);
+        if (!$approve && $roles->exists(function (int $key, Role $role) {
+                return !$role->isApprovedAfterRegistration();
+            }))
+            $user->setApproved(FALSE);
 
         $user->setRoles($roles);
         $this->userRepository->save($user);
@@ -363,7 +358,7 @@ private function createRolesApplication(User $user, Collection $roles, User $cre
      * @throws \App\Model\Settings\SettingsException
      */
     private function createSubeventsApplication(User $user, Collection $subevents,
-                                               User $createdBy): SubeventsApplication
+                                                User $createdBy): SubeventsApplication
     {
         $application = new SubeventsApplication();
         $application->setUser($user);
@@ -464,6 +459,8 @@ private function countSubeventsFee(Collection $roles, Collection $subevents)
             }
         }
 
+        //TODO sleva
+
         return $fee;
     }
 
diff --git a/app/services/Authenticator.php b/app/services/Authenticator.php
index 615d5e976..36e088ad0 100644
--- a/app/services/Authenticator.php
+++ b/app/services/Authenticator.php
@@ -28,9 +28,6 @@ class Authenticator extends Nette\Object implements NS\IAuthenticator
     /** @var RoleRepository */
     private $roleRepository;
 
-    /** @var SettingsRepository */
-    private $settingsRepository;
-
     /** @var FilesService */
     private $filesService;
 
@@ -44,12 +41,10 @@ class Authenticator extends Nette\Object implements NS\IAuthenticator
      * @param FilesService $filesService
      */
     public function __construct(UserRepository $userRepository, RoleRepository $roleRepository,
-                                SettingsRepository $settingsRepository, SkautIsService $skautIsService,
-                                FilesService $filesService)
+                                SkautIsService $skautIsService, FilesService $filesService)
     {
         $this->userRepository = $userRepository;
         $this->roleRepository = $roleRepository;
-        $this->settingsRepository = $settingsRepository;
         $this->skautIsService = $skautIsService;
         $this->filesService = $filesService;
     }
diff --git a/app/services/UserService.php b/app/services/UserService.php
index b99477c64..b4bcba2b3 100644
--- a/app/services/UserService.php
+++ b/app/services/UserService.php
@@ -23,9 +23,6 @@ class UserService extends Nette\Object
     /** @var Translator */
     private $translator;
 
-    /** @var ProgramService */
-    private $programService;
-
     /** @var UserRepository */
     private $userRepository;
 
@@ -40,11 +37,10 @@ class UserService extends Nette\Object
      * @param UserRepository $userRepository
      * @param ApplicationRepository $applicationRepository
      */
-    public function __construct(Translator $translator, ProgramService $programService, UserRepository $userRepository,
+    public function __construct(Translator $translator, UserRepository $userRepository,
                                 ApplicationRepository $applicationRepository)
     {
         $this->translator = $translator;
-        $this->programService = $programService;
         $this->userRepository = $userRepository;
         $this->applicationRepository = $applicationRepository;
     }
diff --git a/app/utils/Validators.php b/app/utils/Validators.php
index dcc84a001..c32b55b76 100644
--- a/app/utils/Validators.php
+++ b/app/utils/Validators.php
@@ -33,17 +33,37 @@ public function __construct(RoleRepository $roleRepository, SubeventRepository $
         $this->subeventRepository = $subeventRepository;
     }
 
+    /**
+     * Ověří, že není vybrána role "Neregistrovaný".
+     * @param Collection|Role[] $selectedRoles
+     * @param User $user
+     * @return bool
+     */
+    public function validateRolesNonregistered(Collection $selectedRoles, User $user): bool
+    {
+        $nonregisteredRole = $this->roleRepository->findBySystemName(Role::NONREGISTERED);
+
+        if ($selectedRoles->contains($nonregisteredRole)) {
+            if ($user->isInRole($nonregisteredRole) && $selectedRoles->count() == 1)
+                return TRUE;
+            else
+                return FALSE;
+        }
+
+        return TRUE;
+    }
+
     /**
      * Ověří kapacitu rolí.
      * @param Collection|Role[] $selectedRoles
+     * @param User $user
      * @return bool
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function validateRolesCapacities(Collection $selectedRoles, User $user): bool
     {
         foreach ($selectedRoles as $role) {
             if ($role->hasLimitedCapacity() && !$user->isInRole($role)
-                && $this->roleRepository->countUnoccupiedInRole($role) < 1)
+                && $role->countUnoccupied() < 1)
                     return FALSE;
         }
 
@@ -127,7 +147,7 @@ public function validateSubeventsCapacities(Collection $selectedSubevents, User
     {
         foreach ($selectedSubevents as $subevent) {
             if ($subevent->hasLimitedCapacity() && !$user->hasSubevent($subevent)
-                && $this->subeventRepository->countUnoccupiedInSubevent($subevent) < 1)
+                && $subevent->countUnoccupied() < 1)
                 return FALSE;
         }
 

From 6b32c458867b1a60ea060de6ae263adfcfb5156d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Tue, 26 Dec 2017 22:58:58 +0100
Subject: [PATCH 07/11] provazani verzi prihlasek

---
 app/model/User/Application/Application.php | 37 ++++++++++++++--------
 app/services/ApplicationService.php        |  6 ++++
 migrations/Version20171226214906.php       | 23 ++++++++++++++
 migrations/Version20171226215255.php       | 30 ++++++++++++++++++
 4 files changed, 82 insertions(+), 14 deletions(-)
 create mode 100644 migrations/Version20171226214906.php
 create mode 100644 migrations/Version20171226215255.php

diff --git a/app/model/User/Application/Application.php b/app/model/User/Application/Application.php
index 999928a01..b823b80b5 100644
--- a/app/model/User/Application/Application.php
+++ b/app/model/User/Application/Application.php
@@ -41,6 +41,13 @@ abstract class Application
 
     use Identifier;
 
+    /**
+     * Id přihlášky.
+     * @ORM\Column(type="integer", nullable=true)
+     * @var int
+     */
+    protected $applicationId;
+
     /**
      * Uživatel.
      * @ORM\ManyToOne(targetEntity="User", inversedBy="applications", cascade={"persist"})
@@ -48,20 +55,6 @@ abstract class Application
      */
     protected $user;
 
-    /**
-     * Role.
-     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
-     * @var Collection
-     */
-    protected $roles;
-
-    /**
-     * Podakce.
-     * @ORM\ManyToMany(targetEntity="\App\Model\Structure\Subevent", inversedBy="applications", cascade={"persist"})
-     * @var Collection
-     */
-    protected $subevents;
-
     /**
      * Poplatek.
      * @ORM\Column(type="integer")
@@ -147,6 +140,22 @@ public function getId()
         return $this->id;
     }
 
+    /**
+     * @return int
+     */
+    public function getApplicationId(): int
+    {
+        return $this->applicationId;
+    }
+
+    /**
+     * @param int $applicationId
+     */
+    public function setApplicationId(int $applicationId): void
+    {
+        $this->applicationId = $applicationId;
+    }
+
     /**
      * @return string
      */
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index 9f5bf80f3..d5a9e85da 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -344,6 +344,9 @@ private function createRolesApplication(User $user, Collection $roles, User $cre
         $application->setValidFrom(new \DateTime());
         $this->applicationRepository->save($application);
 
+        $application->setApplicationId($application->getId());
+        $this->applicationRepository->save($application);
+
         $user->addApplication($application);
         $this->userRepository->save($user);
 
@@ -372,6 +375,9 @@ private function createSubeventsApplication(User $user, Collection $subevents,
         $application->setValidFrom(new \DateTime());
         $this->applicationRepository->save($application);
 
+        $application->setApplicationId($application->getId());
+        $this->applicationRepository->save($application);
+
         $user->addApplication($application);
         $this->userRepository->save($user);
 
diff --git a/migrations/Version20171226214906.php b/migrations/Version20171226214906.php
new file mode 100644
index 000000000..473f10239
--- /dev/null
+++ b/migrations/Version20171226214906.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171226214906 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('ALTER TABLE application ADD application_id INT DEFAULT NULL');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}
diff --git a/migrations/Version20171226215255.php b/migrations/Version20171226215255.php
new file mode 100644
index 000000000..26d332b11
--- /dev/null
+++ b/migrations/Version20171226215255.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171226215255 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('CREATE TABLE roles_application_role (roles_application_id INT NOT NULL, role_id INT NOT NULL, INDEX IDX_81291939DB4E35D (roles_application_id), INDEX IDX_8129193D60322AC (role_id), PRIMARY KEY(roles_application_id, role_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE subevents_application_subevent (subevents_application_id INT NOT NULL, subevent_id INT NOT NULL, INDEX IDX_71BC0FE777FDE691 (subevents_application_id), INDEX IDX_71BC0FE77A675502 (subevent_id), PRIMARY KEY(subevents_application_id, subevent_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE roles_application_role ADD CONSTRAINT FK_81291939DB4E35D FOREIGN KEY (roles_application_id) REFERENCES application (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE roles_application_role ADD CONSTRAINT FK_8129193D60322AC FOREIGN KEY (role_id) REFERENCES role (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE subevents_application_subevent ADD CONSTRAINT FK_71BC0FE777FDE691 FOREIGN KEY (subevents_application_id) REFERENCES application (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE subevents_application_subevent ADD CONSTRAINT FK_71BC0FE77A675502 FOREIGN KEY (subevent_id) REFERENCES subevent (id) ON DELETE CASCADE');
+        $this->addSql('DROP TABLE application_role');
+        $this->addSql('DROP TABLE application_subevent');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

From cd7b168d21f5adce7f4f327e0cd204b16621b2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 27 Dec 2017 00:29:09 +0100
Subject: [PATCH 08/11] opravy

---
 .../components/ApplicationsGridControl.php    |  2 +-
 .../components/UsersGridControl.php           | 69 +++++++++++--------
 .../components/ApplicationsGridControl.php    |  4 +-
 app/lang/admin.cs_CZ.neon                     |  6 +-
 app/model/User/User.php                       |  3 +-
 app/model/User/UserRepository.php             | 15 ----
 app/services/ApplicationService.php           |  2 +-
 7 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index 94745b909..30e33dab2 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -132,9 +132,9 @@ public function createComponentApplicationsGrid($name)
             ->where('u = :user')
             ->andWhere('a.validTo IS NULL')
             ->setParameter('user', $this->user)
+            ->orderBy('a.applicationId')
         );
         $grid->setPagination(FALSE);
-        $grid->setDefaultSort(['applicationDate', 'ASC']);
 
         $grid->addColumnDateTime('applicationDate', 'admin.users.users_applications_application_date')
             ->setFormat('j. n. Y H:i');
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index 95e849da4..19411d6a1 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -174,16 +174,16 @@ public function createComponentUsersGrid($name)
 
         $grid->addGroupMultiSelectAction('admin.users.users_group_action_change_roles',
             $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
-            ->onSelect[] = [$this, 'groupChangeRoles']; //TODO
+            ->onSelect[] = [$this, 'groupChangeRoles'];
 
         $grid->addGroupAction('admin.users.users_group_action_mark_attended')
             ->onSelect[] = [$this, 'groupMarkAttended'];
 
         $grid->addGroupAction('admin.users.users_group_action_mark_paid_today', $this->preparePaymentMethodOptionsWithoutEmpty())
-            ->onSelect[] = [$this, 'groupMarkPaidToday']; //TODO
+            ->onSelect[] = [$this, 'groupMarkPaidToday']; //TODO kontrola
 
         $grid->addGroupAction('admin.users.users_group_action_generate_payment_proofs')
-            ->onSelect[] = [$this, 'groupGeneratePaymentProofs'];
+            ->onSelect[] = [$this, 'groupGeneratePaymentProofs']; //TODO kontrola
 
         $grid->addGroupAction('admin.users.users_group_action_export_users')
             ->onSelect[] = [$this, 'groupExportUsers']; //TODO kontrola
@@ -192,10 +192,10 @@ public function createComponentUsersGrid($name)
             ->onSelect[] = [$this, 'groupExportSubeventsAndCategories']; //TODO kontrola
 
         $grid->addGroupAction('admin.users.users_group_action_export_roles')
-            ->onSelect[] = [$this, 'groupExportRoles'];
+            ->onSelect[] = [$this, 'groupExportRoles']; //TODO kontrola
 
         $grid->addGroupAction('admin.users.users_group_action_export_schedules')
-            ->onSelect[] = [$this, 'groupExportSchedules'];
+            ->onSelect[] = [$this, 'groupExportSchedules']; //TODO kontrola
 
 
         $grid->addColumnText('displayName', 'admin.users.users_name')
@@ -269,7 +269,7 @@ public function createComponentUsersGrid($name)
 
         $grid->addColumnText('variableSymbol', 'admin.users.users_variable_symbol', 'variableSymbolsText')
             ->setFilterText()
-            ->setCondition(function (QueryBuilder $qb, $value) { //TODO kontrola
+            ->setCondition(function (QueryBuilder $qb, $value) {
                 $qb->join('u.applications', 'aVariableSymbol')
                     ->join('aVariableSymbol.variableSymbol', 'avsVariableSymbol')
                     ->andWhere('avsVariableSymbol.variableSymbol LIKE :variableSymbol')
@@ -439,12 +439,17 @@ public function groupApprove(array $ids)
     {
         $users = $this->userRepository->findUsersByIds($ids);
 
-        foreach ($users as $user) {
-            $user->setApproved(TRUE);
-            $this->userRepository->save($user);
-        }
+        try {
+            $this->userRepository->getEntityManager()->transactional(function ($em) use ($users) {
+                foreach ($users as $user) {
+                    $user->setApproved(TRUE);
+                    $this->userRepository->save($user);
+                }
+            });
+
+            $this->getPresenter()->flashMessage('admin.users.users_group_action_approved', 'success');
+        } catch (\Throwable $exception) { }
 
-        $this->getPresenter()->flashMessage('admin.users.users_group_action_approved', 'success');
         $this->redirect('this');
     }
 
@@ -452,7 +457,7 @@ public function groupApprove(array $ids)
      * Hromadně nastaví role.
      * @param array $ids
      * @param $value
-     * @throws \Throwable
+     * @throws \Nette\Application\AbortException
      */
     public function groupChangeRoles(array $ids, $value)
     {
@@ -464,7 +469,7 @@ public function groupChangeRoles(array $ids, $value)
         //neni vybrana zadna role
         if ($selectedRoles->isEmpty()) {
             $p->flashMessage('admin.users.users_group_action_change_roles_error_empty', 'danger');
-            return;
+            $this->redirect('this');
         }
 
         //v rolich musi byt dostatek volnych mist
@@ -490,17 +495,20 @@ public function groupChangeRoles(array $ids, $value)
 
         if (!$capacitiesOk) {
             $p->flashMessage('admin.users.users_group_action_change_roles_error_capacity', 'danger');
-            return;
+            $this->redirect('this');
         }
 
-        $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $p) {
-            foreach ($users as $user) {
-                $this->applicationService->updateRoles($user, $selectedRoles, $this->userRepository->findById($p->getUser()->id),TRUE);
-            }
+        try {
+            $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $p) {
+                foreach ($users as $user) {
+                    $this->applicationService->updateRoles($user, $selectedRoles, $this->userRepository->findById($p->getUser()->id), TRUE);
+                }
+            });
 
             $p->flashMessage('admin.users.users_group_action_changed_roles', 'success');
-            $this->redirect('this');
-        });
+        } catch (\Throwable $exception) { }
+
+        $this->redirect('this');
     }
 
     /**
@@ -510,17 +518,20 @@ public function groupChangeRoles(array $ids, $value)
      */
     public function groupMarkAttended(array $ids)
     {
-        $this->userRepository->setAttended($ids);
+        $users = $this->userRepository->findUsersByIds($ids);
 
-        $p = $this->getPresenter();
-        $p->flashMessage('admin.users.users_group_action_marked_attended', 'success');
+        try {
+            $this->userRepository->getEntityManager()->transactional(function ($em) use ($users) {
+                foreach ($users as $user) {
+                    $user->setAttended(TRUE);
+                    $this->userRepository->save($user);
+                }
+            });
 
-        if ($p->isAjax()) {
-            $p->redrawControl('flashes');
-            $this['usersGrid']->reload();
-        } else {
-            $this->redirect('this');
-        }
+            $this->getPresenter()->flashMessage('admin.users.users_group_action_marked_attended', 'success');
+        } catch (\Throwable $exception) { }
+
+        $this->redirect('this');
     }
 
     /**
diff --git a/app/WebModule/components/ApplicationsGridControl.php b/app/WebModule/components/ApplicationsGridControl.php
index 47d2f91cd..11ccc0677 100644
--- a/app/WebModule/components/ApplicationsGridControl.php
+++ b/app/WebModule/components/ApplicationsGridControl.php
@@ -169,11 +169,11 @@ public function createComponentApplicationsGrid($name)
             ->join('a.user', 'u')
             ->where('u = :user')
             ->andWhere('a.validTo IS NULL')
-            ->setParameter('user', $this->user);
+            ->setParameter('user', $this->user)
+            ->orderBy('a.applicationId');
 
         $grid->setDataSource($qb);
         $grid->setPagination(FALSE);
-        $grid->setDefaultSort(['applicationDate', 'ASC']);
 
         $grid->addColumnDateTime('applicationDate', 'web.profile.applications_application_date')
             ->setFormat('j. n. Y H:i');
diff --git a/app/lang/admin.cs_CZ.neon b/app/lang/admin.cs_CZ.neon
index feeafc495..1f61ad6c3 100644
--- a/app/lang/admin.cs_CZ.neon
+++ b/app/lang/admin.cs_CZ.neon
@@ -288,7 +288,6 @@ users:
     users_approved_detail: "Schválený"
     users_approved_form: "schválený"
     users_changed_approved: "Stav uživatele byl úspěšně změněn."
-    users_change_approved_error: "Uživatel nebyl schválen, byla by překročena kapacita některé role nebo podakce."
     users_membership: "Členství"
     users_membership_no: "nečlen"
     users_membership_not_connected: "nepropojený účet"
@@ -323,7 +322,6 @@ users:
     users_saved: "Uživatel byl úspěšně uložen."
     users_group_action_approve: "Schválit"
     users_group_action_approved: "Vybraní uživatelé byli úspěšně schváleni."
-    users_group_action_approve_error: "Vybraní uživatelé nebyli schváleni, byla by překročena kapacita některé role nebo podakce."
     users_group_action_mark_paid_today: "Označit jako zaplacené dnes"
     users_group_action_marked_paid_today: "U vybraných platících uživatelů byly úspěšně nastaveny den zaplacení a platební metoda."
     users_group_action_mark_attended: "Označit jako přítomné"
@@ -395,7 +393,7 @@ acl:
     roles_registerable_to_note: "Pokud necháte datum prázdný, nebude konec registrace omezen."
     roles_capacity: "Kapacita"
     roles_capacity_format: "Zadejte číslo."
-    roles_capacity_low: "Kapacita nesmí být nižší než počet schválených uživatelů v roli."
+    roles_capacity_low: "Kapacita nesmí být nižší než počet uživatelů v roli."
     roles_capacity_note: "Pokud nechcete kapacitu omezovat, nechte pole prázdné."
     roles_occupancy: "Obsazenost"
     roles_fee_from_subevents_checkbox: "určit cenu podle podakcí"
@@ -511,7 +509,7 @@ configuration:
     subevents_fee_format: "Zadejte číslo."
     subevents_capacity: "Kapacita"
     subevents_capacity_format: "Zadejte číslo."
-    subevents_capacity_low: "Kapacita nesmí být nižší než počet schválených uživatelů přihlášených na podakci."
+    subevents_capacity_low: "Kapacita nesmí být nižší než počet uživatelů přihlášených na podakci."
     subevents_capacity_note: "Pokud nechcete kapacitu omezovat, nechte pole prázdné."
     subevents_occupancy: "Obsazenost"
     subevents_incompatible_subevents: "Neregistrovatelná s podakcemi"
diff --git a/app/model/User/User.php b/app/model/User/User.php
index 1d2784373..861ca8c70 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -469,7 +469,8 @@ public function addApplication($application)
     public function getValidApplications(): Collection
     {
         $criteria = Criteria::create()
-            ->where(Criteria::expr()->isNull('validTo'));
+            ->where(Criteria::expr()->isNull('validTo'))
+            ->orderBy(['applicationId' => 'ASC']);
 
         return $this->applications->matching($criteria);
     }
diff --git a/app/model/User/UserRepository.php b/app/model/User/UserRepository.php
index 2c13555f9..69109835a 100644
--- a/app/model/User/UserRepository.php
+++ b/app/model/User/UserRepository.php
@@ -243,19 +243,4 @@ public function remove(User $user)
         $this->_em->remove($user);
         $this->_em->flush();
     }
-
-    /**
-     * Nastaví uživatelům účast.
-     * @param $ids
-     * @param bool $value
-     */
-    public function setAttended($ids, $value = TRUE)
-    {
-        $this->createQueryBuilder('u')
-            ->update()
-            ->set('u.attended', $value)
-            ->where('u.id IN (:ids)')->setParameter('ids', $ids)
-            ->getQuery()
-            ->execute();
-    }
 }
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index d5a9e85da..04f06d407 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -159,7 +159,7 @@ public function register(User $user, Collection $roles, Collection $subevents, U
     public function updateRoles(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $createdBy, $approve) {
-            $oldRoles = $user->getRoles();
+            $oldRoles = clone $user->getRoles();
 
             $user->setRoles($roles);
             $this->userRepository->save($user);

From a13a0b5d8a44729587b04bb4b43cc77eab678cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 27 Dec 2017 16:54:32 +0100
Subject: [PATCH 09/11] upravy registrace

---
 .../presenters/MaturityPresenter.php          | 105 +++--
 .../MailingModule/forms/SendForm.php          |   2 +-
 .../components/ApplicationsGridControl.php    | 397 +++++-------------
 .../components/UsersGridControl.php           | 107 +++--
 app/AdminModule/forms/EditUserSeminarForm.php |  14 +-
 app/AdminModule/presenters/UsersPresenter.php |   3 +-
 .../components/ApplicationsGridControl.php    | 294 ++++---------
 app/WebModule/forms/RolesForm.php             |  13 +-
 app/lang/common.cs_CZ.neon                    |   4 +-
 app/model/ACL/Role.php                        |  15 +
 app/model/ACL/RoleRepository.php              |   2 +-
 app/model/Mailing/Template.php                |  19 +-
 app/model/User/Application/Application.php    |  20 +
 .../Application/ApplicationRepository.php     |  15 +-
 .../User/Application/RolesApplication.php     |   7 +-
 .../RolesApplicationRepository.php            |   3 +
 .../User/Application/SubeventsApplication.php |   7 +-
 .../SubeventsApplicationRepository.php        |   3 +
 app/model/User/User.php                       |  26 +-
 app/model/User/UserRepository.php             |  38 +-
 app/services/ApplicationService.php           | 243 ++++++++---
 app/services/PdfExportService.php             |  66 ++-
 app/services/SkautIsEventService.php          |   3 +-
 app/utils/Validators.php                      |  32 +-
 migrations/Version20171227152222.php          |  33 ++
 25 files changed, 711 insertions(+), 760 deletions(-)
 create mode 100644 migrations/Version20171227152222.php

diff --git a/app/ActionModule/presenters/MaturityPresenter.php b/app/ActionModule/presenters/MaturityPresenter.php
index 19833ef27..0c4be5a32 100644
--- a/app/ActionModule/presenters/MaturityPresenter.php
+++ b/app/ActionModule/presenters/MaturityPresenter.php
@@ -10,8 +10,13 @@
 use App\Model\Program\ProgramRepository;
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
+use App\Model\User\Application;
 use App\Model\User\ApplicationRepository;
+use App\Model\User\RolesApplication;
+use App\Model\User\RolesApplicationRepository;
+use App\Model\User\SubeventsApplicationRepository;
 use App\Model\User\UserRepository;
+use App\Services\ApplicationService;
 use App\Services\MailService;
 use App\Services\ProgramService;
 use Doctrine\Common\Collections\ArrayCollection;
@@ -66,9 +71,31 @@ class MaturityPresenter extends ActionBasePresenter
      */
     public $programService;
 
+    /**
+     * @var ApplicationService
+     * @inject
+     */
+    public $applicationService;
+
+    /**
+     * @var RolesApplicationRepository
+     * @inject
+     */
+    public $rolesApplicationRepository;
+
+    /**
+     * @var SubeventsApplicationRepository
+     * @inject
+     */
+    public $subeventsApplicationRepository;
+
 
     /**
      * Zkontroluje splatnost přihlášek.
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
+     * @throws \Ublaboo\Mailing\Exception\MailingException
+     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
      */
     public function actionCheck()
     {
@@ -80,44 +107,54 @@ public function actionCheck()
         if ($maturityReminder !== NULL)
             $maturityReminderDate = (new \DateTime())->setTime(0, 0)->modify('+' . $maturityReminder . ' days');
 
-        foreach ($this->applicationRepository->findWaitingForPaymentApplications() as $application) {
-            $maturityDate = $application->getMaturityDate();
-            if ($maturityDate === NULL)
-                continue;
-
-            //zrušení registrace
-            if ($cancelRegistration !== NULL && $cancelRegistrationDate > $maturityDate) {
-                $this->userRepository->getEntityManager()->transactional(function ($em) use ($application) {
-                    if ($application->isFirst()) {
-                        $user = $application->getUser();
-
-                        $user->setRoles(new ArrayCollection([$this->roleRepository->findBySystemName(Role::NONREGISTERED)]));
-                        $user->setApproved(TRUE);
-                        foreach ($user->getApplications() as $application) {
-                            $this->applicationRepository->remove($application);
+        foreach ($this->userRepository->findAllWithWaitingForPaymentApplication() as $user) {
+            $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $cancelRegistration, $cancelRegistrationDate, $maturityReminder, $maturityReminderDate) {
+                foreach ($user->getWaitingForPaymentRolesApplications() as $application) {
+                    if ($application->getType() == Application::ROLES) {
+                        $maturityDate = $application->getMaturityDate();
+                        if ($maturityDate === NULL)
+                            continue;
+
+                        if ($cancelRegistration !== NULL && $cancelRegistrationDate > $maturityDate) {
+                            $rolesWithoutFee = $user->getRoles()->filter(function (Role $role) {
+                                return $role->getFee() == 0;
+                            });
+
+                            if ($rolesWithoutFee->isEmpty()) {
+                                $this->applicationService->cancelRegistration($user, ApplicationState::CANCELED_NOT_PAID, NULL);
+                                return;
+                            } else {
+                                $this->applicationService->updateRoles($user, $rolesWithoutFee, NULL);
+                            }
                         }
-                        $this->userRepository->save($user);
+                    }
+                }
 
-                        $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
-                            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
-                        ]);
-                    } else {
-                        $application->setState(ApplicationState::CANCELED_NOT_PAID);
-                        $this->applicationRepository->save($application);
+                foreach ($user->getWaitingForPaymentSubeventsApplications() as $application) {
+                    if ($application->getType() == Application::SUBEVENTS) {
+                        $maturityDate = $application->getMaturityDate();
+                        if ($maturityDate === NULL)
+                            continue;
+
+                        if ($cancelRegistration !== NULL && $cancelRegistrationDate > $maturityDate) {
+                            $this->applicationService->cancelSubeventsApplication($application, ApplicationState::CANCELED_NOT_PAID, NULL);
+                        }
                     }
+                }
+
+                foreach ($user->getWaitingForPaymentApplications() as $application) {
+                    $maturityDate = $application->getMaturityDate();
+                    if ($maturityDate === NULL)
+                        continue;
 
-                    $this->programService->updateUserPrograms($application->getUser());
-                });
-                continue;
-            }
-
-            //připomenutí splatnosti
-            if ($maturityReminder !== NULL && $maturityReminderDate == $maturityDate) {
-                $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::MATURITY_REMINDER, [
-                    TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                    TemplateVariable::APPLICATION_MATURITY => $maturityDate->format('j. n. Y')
-                ]);
-            }
+                    if ($maturityReminder !== NULL && $maturityReminderDate == $maturityDate) {
+                        $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::MATURITY_REMINDER, [
+                            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+                            TemplateVariable::APPLICATION_MATURITY => $maturityDate->format('j. n. Y')
+                        ]);
+                    }
+                }
+            });
         }
     }
 }
diff --git a/app/AdminModule/MailingModule/forms/SendForm.php b/app/AdminModule/MailingModule/forms/SendForm.php
index 223b98dc2..ba9448ec3 100644
--- a/app/AdminModule/MailingModule/forms/SendForm.php
+++ b/app/AdminModule/MailingModule/forms/SendForm.php
@@ -64,7 +64,7 @@ public function create()
         $form = $this->baseFormFactory->create();
 
         $recipientRolesMultiSelect = $form->addMultiSelect('recipientRoles', 'admin.mailing.send_recipient_roles',
-            $this->roleRepository->getRolesWithoutRolesOptionsWithUsersCount([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]));
+            $this->roleRepository->getRolesWithoutRolesOptionsWithApprovedUsersCount([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]));
 
         $recipientUsersMultiSelect = $form->addMultiSelect('recipientUsers', 'admin.mailing.send_recipient_users',
             $this->userRepository->getUsersOptions())
diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index 30e33dab2..48841b1d5 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -2,14 +2,10 @@
 
 namespace App\AdminModule\Components;
 
-use App\Model\ACL\Role;
 use App\Model\ACL\RoleRepository;
 use App\Model\Enums\ApplicationState;
 use App\Model\Enums\PaymentType;
-use App\Model\Mailing\Template;
-use App\Model\Mailing\TemplateVariable;
 use App\Model\Program\ProgramRepository;
-use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
 use App\Model\Structure\SubeventRepository;
 use App\Model\User\Application;
@@ -20,7 +16,7 @@
 use App\Services\MailService;
 use App\Services\PdfExportService;
 use App\Services\ProgramService;
-use Doctrine\Common\Collections\ArrayCollection;
+use App\Utils\Validators;
 use Kdyby\Translation\Translator;
 use Nette\Application\UI\Control;
 use Nette\Application\UI\Form;
@@ -70,6 +66,9 @@ class ApplicationsGridControl extends Control
     /** @var ProgramService */
     private $programService;
 
+    /** @var Validators */
+    private $validators;
+
 
     /**
      * ApplicationsGridControl constructor.
@@ -90,7 +89,7 @@ public function __construct(Translator $translator, ApplicationRepository $appli
                                 SubeventRepository $subeventRepository, ApplicationService $applicationService,
                                 ProgramRepository $programRepository, MailService $mailService,
                                 SettingsRepository $settingsRepository, PdfExportService $pdfExportService,
-                                ProgramService $programService)
+                                ProgramService $programService, Validators $validators)
     {
         parent::__construct();
 
@@ -105,6 +104,7 @@ public function __construct(Translator $translator, ApplicationRepository $appli
         $this->settingsRepository = $settingsRepository;
         $this->pdfExportService = $pdfExportService;
         $this->programService = $programService;
+        $this->validators = $validators;
     }
 
     /**
@@ -125,6 +125,8 @@ public function createComponentApplicationsGrid($name)
     {
         $this->user = $this->userRepository->findById($this->getPresenter()->getParameter('id'));
 
+        $explicitSubeventsExists = $this->subeventRepository->explicitSubeventsExists();
+
         $grid = new DataGrid($this, $name);
         $grid->setTranslator($this->translator);
         $grid->setDataSource($this->applicationRepository->createQueryBuilder('a')
@@ -168,54 +170,55 @@ public function createComponentApplicationsGrid($name)
             });
 
 
-//        $grid->addInlineAdd()->onControlAdd[] = function ($container) {
-//            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
-//                ->setAttribute('class', 'datagrid-multiselect');
-//
-//            if ($this->subeventRepository->explicitSubeventsExists()) {
-//                $container->addMultiSelect('subevents', '', $this->subeventRepository->getNonRegisteredSubeventsOptionsWithCapacity($this->user))
-//                    ->setAttribute('class', 'datagrid-multiselect');
-//            }
-//        };
-//        $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
-//
-//        $grid->addInlineEdit()->onControlAdd[] = function ($container) {
-//            $container->addMultiSelect('roles', '', $this->roleRepository->getRolesWithoutRolesOptionsWithCapacity([Role::GUEST, Role::UNAPPROVED, Role::NONREGISTERED]))
-//                ->setAttribute('class', 'datagrid-multiselect');
-//
-//            if ($this->subeventRepository->explicitSubeventsExists()) {
-//                $container->addMultiSelect('subevents', '', $this->subeventRepository->getSubeventsOptionsWithCapacity())
-//                    ->setAttribute('class', 'datagrid-multiselect');
-//            }
-//
-//            $container->addText('variableSymbol', 'admin.users.users_variable_symbol')
-//                ->addRule(Form::FILLED, 'admin.users.users_applications_variable_symbol_empty')
-//                ->addRule(Form::PATTERN, 'admin.users.users_edit_variable_symbol_format', '^\d{1,10}$');
-//
-//            $paymentMethodSelect = $container->addSelect('paymentMethod', 'admin.users.users_payment_method', $this->preparePaymentMethodOptions());
-//
-//            $container->addDatePicker('paymentDate', 'admin.users.users_payment_date');
-//
-//            $paymentMethodSelect
-//                ->addConditionOn($container['paymentDate'], Form::FILLED)
-//                ->addRule(Form::FILLED, 'admin.users.users_applications_payment_method_empty');
-//
-//            $container->addDatePicker('incomeProofPrintedDate', 'admin.users.users_income_proof_printed_date');
-//
-//            $container->addDatePicker('maturityDate', 'admin.users.users_maturity_date');
-//        };
-//        $grid->getInlineEdit()->onSetDefaults[] = function ($container, $item) {
-//            $container->setDefaults([
-//                'roles' => $item->isFirst() ? $this->roleRepository->findRolesIds($item->getUser()->getRoles()) : NULL,
-//                'subevents' => $this->subeventRepository->findSubeventsIds($item->getSubevents()),
-//                'variableSymbol' => $item->getVariableSymbol(),
-//                'paymentMethod' => $item->getPaymentMethod(),
-//                'paymentDate' => $item->getPaymentDate(),
-//                'incomeProofPrintedDate' => $item->getIncomeProofPrintedDate(),
-//                'maturityDate' => $item->getMaturityDate()
-//            ]);
-//        };
-//        $grid->getInlineEdit()->onSubmit[] = [$this, 'edit'];
+        if ($explicitSubeventsExists) {
+            $grid->addInlineAdd()->onControlAdd[] = function ($container) {
+                $container->addMultiSelect('subevents', '',
+                    $this->subeventRepository->getNonRegisteredSubeventsOptionsWithCapacity($this->user)
+                )
+                    ->setAttribute('class', 'datagrid-multiselect')
+                    ->addRule(Form::FILLED, 'admin.users.users_applications_subevents_empty');
+            };
+            $grid->getInlineAdd()->onSubmit[] = [$this, 'add'];
+        }
+
+        $grid->addInlineEdit()->onControlAdd[] = function ($container) use ($explicitSubeventsExists) {
+            $container->addMultiSelect('subevents', '',
+                $this->subeventRepository->getSubeventsOptionsWithCapacity()
+            )
+                ->setAttribute('class', 'datagrid-multiselect')
+                ->addRule(Form::FILLED, 'admin.users.users_applications_subevents_empty');
+
+            $container->addText('variableSymbol', 'admin.users.users_variable_symbol')
+                ->addRule(Form::FILLED, 'admin.users.users_applications_variable_symbol_empty')
+                ->addRule(Form::PATTERN, 'admin.users.users_edit_variable_symbol_format', '^\d{1,10}$');
+
+            $paymentMethodSelect = $container->addSelect('paymentMethod', 'admin.users.users_payment_method',
+                $this->preparePaymentMethodOptions());
+
+            $paymentDateText = $container->addDatePicker('paymentDate', 'admin.users.users_payment_date');
+
+            $paymentMethodSelect
+                ->addConditionOn($paymentDateText, Form::FILLED)
+                ->addRule(Form::FILLED, 'admin.users.users_applications_payment_method_empty');
+
+            $container->addDatePicker('incomeProofPrintedDate', 'admin.users.users_income_proof_printed_date');
+
+            $container->addDatePicker('maturityDate', 'admin.users.users_maturity_date');
+        };
+        $grid->getInlineEdit()->onSetDefaults[] = function ($container, $item) {
+            $container->setDefaults([
+                'subevents' => $this->subeventRepository->findSubeventsIds($item->getSubevents()),
+                'variableSymbol' => $item->getVariableSymbol(),
+                'paymentMethod' => $item->getPaymentMethod(),
+                'paymentDate' => $item->getPaymentDate(),
+                'incomeProofPrintedDate' => $item->getIncomeProofPrintedDate(),
+                'maturityDate' => $item->getMaturityDate()
+            ]);
+        };
+        $grid->getInlineEdit()->onSubmit[] = [$this, 'edit'];
+        $grid->allowRowsInlineEdit(function(Application $item) {
+            return !$item->isCanceled();
+        });
 
 
         $grid->addAction('generatePaymentProofCash', 'admin.users.users_applications_download_payment_proof_cash');
@@ -238,11 +241,11 @@ public function createComponentApplicationsGrid($name)
                 'data-content' => $this->translator->translate('admin.users.users_applications_cancel_application_confirm')
             ])->setClass('btn btn-xs btn-danger');
         $grid->allowRowsAction('cancelApplication', function (Application $item) {
-            return $item->getType() == Application::SUBEVENTS
-                && !($item->getState() == ApplicationState::CANCELED || $item->getState() == ApplicationState::CANCELED_NOT_PAID);
+            return $item->getType() == Application::SUBEVENTS && !$item->isCanceled();
         });
 
-        $grid->setColumnsSummary(['fee'], function(Application $item, $column) {
+
+        $grid->setColumnsSummary(['fee'], function (Application $item, $column) {
             return $item->isCanceled() ? 0 : $item->getFee();
         });
     }
@@ -256,76 +259,24 @@ public function createComponentApplicationsGrid($name)
      */
     public function add($values)
     {
-//        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-//        $selectedSubevents = NULL;
-//
-//        //kontrola roli
-//        if ($this->user->getApplications()->isEmpty()) {
-//            if (!$this->validateRolesEmpty($selectedRoles)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            if (!$this->validateRolesCapacities($selectedRoles)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
-//                $this->redirect('this');
-//            }
-//        } else {
-//            if ($this->validateRolesEmpty($selectedRoles)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//        }
-//
-//        if ($this->subeventRepository->explicitSubeventsExists()) {
-//            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-//
-//            //kontrola podakci
-//            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
-//                $this->redirect('this');
-//            }
-//        }
-//
-//
-//        //zpracovani zmen
-//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents) {
-//            $application = new Application();
-//
-//            if ($this->user->getApplications()->isEmpty()) {
-//                $this->user->setRoles($selectedRoles);
-//                $this->userRepository->save($this->user);
-//                $application->setFirst(TRUE);
-//                $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
-//            } else {
-//                $application->setFirst(FALSE);
-//                $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
-//            }
-//
-//            $application->setUser($this->user);
-//            if ($this->subeventRepository->explicitSubeventsExists())
-//                $application->setSubevents($selectedSubevents);
-//            else
-//                $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
-//            $application->setApplicationDate(new \DateTime());
-//            $application->setMaturityDate($this->applicationService->countMaturityDate());
-//            $application->setFee($fee);
-//            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-//            $this->applicationRepository->save($application);
-//
-//            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
-//            $this->applicationRepository->save($application);
-//
-//            $this->programService->updateUserPrograms($this->user);
-//        });
-//
-//        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
-//        $this->redirect('this');
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+
+        if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
+            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
+            $this->redirect('this');
+        }
+
+        if (!$this->validators->validateSubeventsRegistered($selectedSubevents, $this->user)) {
+            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
+            $this->redirect('this');
+        }
+
+        $loggedUser = $this->userRepository->findById($this->getPresenter()->user->id);
+
+        $this->applicationService->addSubeventsApplication($this->user, $selectedSubevents, $loggedUser);
+
+        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
+        $this->redirect('this');
     }
 
     /**
@@ -338,120 +289,57 @@ public function add($values)
      */
     public function edit($id, $values)
     {
-//        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-//
-//        $application = $this->applicationRepository->findById($id);
-//
-//        //kontrola roli
-//        if ($application->isFirst()) {
-//            if (!$this->validateRolesEmpty($selectedRoles)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            if (!$this->validateRolesCapacities($selectedRoles)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_occupied', 'danger');
-//                $this->redirect('this');
-//            }
-//        } else {
-//            if ($this->validateRolesEmpty($selectedRoles)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_roles_not_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//        }
-//
-//        if ($this->subeventRepository->explicitSubeventsExists()) {
-//            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-//
-//            //kontrola podakci
-//            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            if (!$this->validateSubeventsRegistered($selectedSubevents, $this->user, $application->getId())) {
-//                $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
-//                $this->redirect('this');
-//            }
-//        }
-//
-//        //zpracovani zmen
-//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $selectedSubevents, $application, $values) {
-//            $oldPaymentDate = $application->getPaymentDate();
-//
-//            if ($application->isFirst()) {
-//                $this->user->setRoles($selectedRoles);
-//                $this->userRepository->save($this->user);
-//            }
-//
-//            if ($this->subeventRepository->explicitSubeventsExists())
-//                $application->setSubevents($selectedSubevents);
-//            $application->setVariableSymbol($values['variableSymbol']);
-//            $application->setPaymentMethod($values['paymentMethod']);
-//            $application->setPaymentDate($values['paymentDate']);
-//            $application->setIncomeProofPrintedDate($values['incomeProofPrintedDate']);
-//            $application->setMaturityDate($values['maturityDate']);
-//
-//            if ($application->isFirst()) {
-//                foreach ($this->user->getApplications() as $application) {
-//                    if ($application->isFirst())
-//                        $fee = $this->applicationService->countFee($selectedRoles, $selectedSubevents);
-//                    else
-//                        $fee = $this->applicationService->countFee($selectedRoles, $application->getSubevents(), FALSE);
-//                    $application->setFee($fee);
-//                    if ($application->getState() == ApplicationState::WAITING_FOR_PAYMENT || $application->getState() == ApplicationState::PAID)
-//                        $application->setState($fee == 0 || $application->getPaymentDate() ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-//                    $this->applicationRepository->save($application);
-//                }
-//            } else {
-//                $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
-//                $application->setFee($fee);
-//                $application->setState($fee == 0 || $application->getPaymentDate()
-//                    ? ApplicationState::PAID
-//                    : ApplicationState::WAITING_FOR_PAYMENT);
-//                $this->applicationRepository->save($application);
-//            }
-//
-//            $this->programService->updateUserPrograms($this->user);
-//
-//            if ($values['paymentDate'] !== NULL && $oldPaymentDate === NULL) {
-//                $this->mailService->sendMailFromTemplate($this->user, '', Template::PAYMENT_CONFIRMED, [
-//                    TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-//                    TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
-//                ]);
-//            }
-//        });
-//
-//        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
-//        $this->redirect('this');
+        $application = $this->applicationRepository->findById($id);
+
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+
+        if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
+            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
+            $this->redirect('this');
+        }
+
+        if (!$this->validators->validateSubeventsRegistered($selectedSubevents, $this->user, $application)) {
+            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
+            $this->redirect('this');
+        }
+
+        $loggedUser = $this->userRepository->findById($this->getPresenter()->user->id);
+
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $selectedSubevents, $values, $loggedUser) {
+            $this->applicationService->updateSubeventsApplication($application, $selectedSubevents, $loggedUser);
+            $this->applicationService->updatePayment($application, $values['variableSymbol'], $values['paymentMethod'],
+                $values['paymentDate'], $values['incomeProofPrintedDate'], $values['maturityDate'], $loggedUser);
+        });
+
+        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
+        $this->redirect('this');
     }
 
     /**
      * Vygeneruje příjmový pokladní doklad.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
     public function handleGeneratePaymentProofCash($id)
     {
         $this->pdfExportService->generateApplicationsPaymentProof(
-            $application = $this->applicationRepository->findById($id),
-            "prijmovy-pokladni-doklad.pdf"
+            $application = $this->applicationRepository->findById($id), "prijmovy-pokladni-doklad.pdf",
+            $this->userRepository->findById($this->getPresenter()->getUser()->id)
         );
     }
 
     /**
      * Vygeneruje potvrzení o přijetí platby.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
     public function handleGeneratePaymentProofBank($id)
     {
         $this->pdfExportService->generateApplicationsPaymentProof(
-            $application = $this->applicationRepository->findById($id),
-            "potvrzeni-o-prijeti-platby.pdf"
+            $application = $this->applicationRepository->findById($id), "potvrzeni-o-prijeti-platby.pdf",
+            $this->userRepository->findById($this->getPresenter()->getUser()->id)
         );
     }
 
@@ -464,69 +352,14 @@ public function handleGeneratePaymentProofBank($id)
     public function handleCancelApplication($id)
     {
         $application = $this->applicationRepository->findById($id);
-        $user = $application->getUser();
-
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $user) {
-            $application->setState(ApplicationState::CANCELED);
-            $this->applicationRepository->save($application);
-
-            $this->programService->updateUserPrograms($user);
-        });
-
-        $this->getPresenter()->flashMessage('admin.users.users_applications_application_canceled', 'success');
-        $this->redirect('this');
-    }
-
-    /**
-     * Ověří, že je vybrána alespoň jedna podakce.
-     * @param $selectedSubevents
-     * @return bool
-     */
-    private function validateSubeventsEmpty($selectedSubevents)
-    {
-        if ($selectedSubevents->isEmpty())
-            return FALSE;
-        return TRUE;
-    }
 
-    /**
-     * Ověří obsazenost podakcí.
-     * @param $selectedSubevents
-     * @return bool
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    private function validateSubeventsCapacities($selectedSubevents)
-    {
-        if ($this->user->isApproved()) {
-            foreach ($selectedSubevents as $subevent) {
-                if ($subevent->hasLimitedCapacity()) {
-                    if ($subevent->countUnoccupied() < 1 && !$this->user->hasSubevent($subevent))
-                        return FALSE;
-                }
-            }
+        if ($application->getType() == Application::SUBEVENTS && !$application->isCanceled()) {
+            $loggedUser = $this->userRepository->findById($this->getPresenter()->user->id);
+            $this->applicationService->cancelSubeventsApplication($application, ApplicationState::CANCELED, $loggedUser);
+            $this->getPresenter()->flashMessage('admin.users.users_applications_application_canceled', 'success');
         }
-        return TRUE;
-    }
 
-    /**
-     * Ověří, zda uživatel podakci již nemá.
-     * @param $selectedSubevents
-     * @param User $user
-     * @param $applicationId
-     * @return bool
-     */
-    private function validateSubeventsRegistered($selectedSubevents, User $user, $applicationId)
-    {
-        foreach ($selectedSubevents as $subevent) {
-            foreach ($user->getApplications() as $application) {
-                if ($application->getId() != $applicationId
-                    && ($application->getState() == ApplicationState::PAID
-                        || $application->getState() == ApplicationState::WAITING_FOR_PAYMENT)
-                    && $application->getSubevents()->contains($subevent))
-                    return FALSE;
-            }
-        }
-        return TRUE;
+        $this->redirect('this');
     }
 
     /**
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index 19411d6a1..9f9a5a3df 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -434,22 +434,20 @@ public function changeAttended($id, $attended)
      * Hromadně schválí uživatele.
      * @param array $ids
      * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function groupApprove(array $ids)
     {
         $users = $this->userRepository->findUsersByIds($ids);
 
-        try {
-            $this->userRepository->getEntityManager()->transactional(function ($em) use ($users) {
-                foreach ($users as $user) {
-                    $user->setApproved(TRUE);
-                    $this->userRepository->save($user);
-                }
-            });
-
-            $this->getPresenter()->flashMessage('admin.users.users_group_action_approved', 'success');
-        } catch (\Throwable $exception) { }
+        $this->userRepository->getEntityManager()->transactional(function ($em) use ($users) {
+            foreach ($users as $user) {
+                $user->setApproved(TRUE);
+                $this->userRepository->save($user);
+            }
+        });
 
+        $this->getPresenter()->flashMessage('admin.users.users_group_action_approved', 'success');
         $this->redirect('this');
     }
 
@@ -458,6 +456,7 @@ public function groupApprove(array $ids)
      * @param array $ids
      * @param $value
      * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function groupChangeRoles(array $ids, $value)
     {
@@ -498,16 +497,15 @@ public function groupChangeRoles(array $ids, $value)
             $this->redirect('this');
         }
 
-        try {
-            $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $p) {
-                foreach ($users as $user) {
-                    $this->applicationService->updateRoles($user, $selectedRoles, $this->userRepository->findById($p->getUser()->id), TRUE);
-                }
-            });
+        $loggedUser = $this->userRepository->findById($p->getUser()->id);
 
-            $p->flashMessage('admin.users.users_group_action_changed_roles', 'success');
-        } catch (\Throwable $exception) { }
+        $this->userRepository->getEntityManager()->transactional(function ($em) use ($selectedRoles, $users, $loggedUser) {
+            foreach ($users as $user) {
+                $this->applicationService->updateRoles($user, $selectedRoles, $loggedUser, TRUE);
+            }
+        });
 
+        $p->flashMessage('admin.users.users_group_action_changed_roles', 'success');
         $this->redirect('this');
     }
 
@@ -515,22 +513,20 @@ public function groupChangeRoles(array $ids, $value)
      * Hromadně označí uživatele jako zúčastněné.
      * @param array $ids
      * @throws \Nette\Application\AbortException
+     * @throws \Throwable
      */
     public function groupMarkAttended(array $ids)
     {
         $users = $this->userRepository->findUsersByIds($ids);
 
-        try {
-            $this->userRepository->getEntityManager()->transactional(function ($em) use ($users) {
-                foreach ($users as $user) {
-                    $user->setAttended(TRUE);
-                    $this->userRepository->save($user);
-                }
-            });
-
-            $this->getPresenter()->flashMessage('admin.users.users_group_action_marked_attended', 'success');
-        } catch (\Throwable $exception) { }
+        $this->userRepository->getEntityManager()->transactional(function ($em) use ($users) {
+            foreach ($users as $user) {
+                $user->setAttended(TRUE);
+                $this->userRepository->save($user);
+            }
+        });
 
+        $this->getPresenter()->flashMessage('admin.users.users_group_action_marked_attended', 'success');
         $this->redirect('this');
     }
 
@@ -538,40 +534,29 @@ public function groupMarkAttended(array $ids)
      * Hromadně označí uživatele jako zaplacené dnes.
      * @param array $ids
      * @param $value
-     * @throws \App\Model\Settings\SettingsException
      * @throws \Nette\Application\AbortException
-     * @throws \Ublaboo\Mailing\Exception\MailingException
-     * @throws \Ublaboo\Mailing\Exception\MailingMailCreationException
+     * @throws \Throwable
      */
     public function groupMarkPaidToday(array $ids, $value)
     {
-        foreach ($ids as $id) {
-            $user = $this->userRepository->findById($id);
-
-            foreach ($user->getApplications() as $application) {
-                if ($application->getState() == ApplicationState::WAITING_FOR_PAYMENT) {
-                    $application->setPaymentMethod($value);
-                    $application->setPaymentDate(new \DateTime());
-                    $application->setState(ApplicationState::PAID);
-                    $this->applicationRepository->save($application);
-
-                    $this->mailService->sendMailFromTemplate($user, '', Template::PAYMENT_CONFIRMED, [
-                        TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                        TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
-                    ]);
+        $users = $this->userRepository->findUsersByIds($ids);
+
+        $p = $this->getPresenter();
+
+        $loggedUser = $this->userRepository->findById($p->getUser()->id);
+
+        $this->userRepository->getEntityManager()->transactional(function ($em) use ($users, $value, $loggedUser) {
+            foreach ($users as $user) {
+                foreach ($user->getWaitingForPaymentApplications() as $application) {
+                    $this->applicationService->updatePayment($application, $application->getVariableSymbolText(),
+                        $value, new \DateTime(), $application->getIncomeProofPrintedDate(),
+                        $application->getMaturityDate(), $loggedUser);
                 }
             }
-        }
+        });
 
-        $p = $this->getPresenter();
         $p->flashMessage('admin.users.users_group_action_marked_paid_today', 'success');
-
-        if ($p->isAjax()) {
-            $p->redrawControl('flashes');
-            $this['usersGrid']->reload();
-        } else {
-            $this->redirect('this');
-        }
+        $this->redirect('this');
     }
 
     /**
@@ -598,6 +583,8 @@ public function groupExportUsers(array $ids)
 
     /**
      * Zpracuje export seznamu uživatelů.
+     * @throws \PHPExcel_Exception
+     * @throws \Nette\Application\AbortException
      */
     public function handleExportUsers()
     {
@@ -623,6 +610,8 @@ public function groupExportRoles(array $ids)
 
     /**
      * Zpracuje export seznamu uživatelů s rolemi.
+     * @throws \PHPExcel_Exception
+     * @throws \Nette\Application\AbortException
      */
     public function handleExportRoles()
     {
@@ -649,6 +638,8 @@ public function groupExportSubeventsAndCategories(array $ids)
 
     /**
      * Zpracuje export seznamu uživatelů s podakcemi a programy podle kategorií.
+     * @throws \PHPExcel_Exception
+     * @throws \Nette\Application\AbortException
      */
     public function handleExportSubeventsAndCategories()
     {
@@ -674,6 +665,8 @@ public function groupExportSchedules(array $ids)
 
     /**
      * Zpracuje export harmonogramů uživatelů.
+     * @throws \PHPExcel_Exception
+     * @throws \Nette\Application\AbortException
      */
     public function handleExportSchedules()
     {
@@ -688,12 +681,16 @@ public function handleExportSchedules()
 
     /**
      * Vygeneruje doklady o zaplacení.
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
     public function handleGeneratePaymentProofs()
     {
         $ids = $this->session->getSection('srs')->userIds;
         $users = $this->userRepository->findUsersByIds($ids);
-        $this->pdfExportService->generateUsersPaymentProofs($users, "doklady.pdf");
+        $this->pdfExportService->generateUsersPaymentProofs($users, "doklady.pdf",
+            $this->userRepository->findById($this->getPresenter()->getUser()->id)
+        );
     }
 
     /**
diff --git a/app/AdminModule/forms/EditUserSeminarForm.php b/app/AdminModule/forms/EditUserSeminarForm.php
index a2ea8661b..a383fe0a7 100644
--- a/app/AdminModule/forms/EditUserSeminarForm.php
+++ b/app/AdminModule/forms/EditUserSeminarForm.php
@@ -173,19 +173,7 @@ public function processForm(Form $form, \stdClass $values)
 
             $this->userRepository->getEntityManager()->transactional(function ($em) use ($values, $loggedUser) {
                 $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-
-                $rolesChanged = TRUE;
-
-                if ($selectedRoles->count() == $this->user->getRoles()->count()) {
-                    $selectedRolesArray = $selectedRoles->map(function (Role $role) {return $role->getId();})->toArray();
-                    $usersRolesArray = $this->user->getRoles()->map(function (Role $role) {return $role->getId();})->toArray();
-
-                    if (array_diff($selectedRolesArray, $usersRolesArray) === array_diff($usersRolesArray, $selectedRolesArray))
-                        $rolesChanged = FALSE;
-                }
-
-                if ($rolesChanged)
-                    $this->applicationService->updateRoles($this->user, $selectedRoles,  $loggedUser);
+                $this->applicationService->updateRoles($this->user, $selectedRoles,  $loggedUser);
 
                 $this->user->setApproved($values['approved']);
                 $this->user->setAttended($values['attended']);
diff --git a/app/AdminModule/presenters/UsersPresenter.php b/app/AdminModule/presenters/UsersPresenter.php
index 87c2054c6..4ea792924 100644
--- a/app/AdminModule/presenters/UsersPresenter.php
+++ b/app/AdminModule/presenters/UsersPresenter.php
@@ -10,6 +10,7 @@
 use App\Model\ACL\Permission;
 use App\Model\ACL\Resource;
 use App\Model\ACL\Role;
+use App\Model\Enums\ApplicationState;
 use App\Model\Enums\PaymentType;
 use App\Model\Settings\CustomInput\CustomInput;
 use App\Model\Settings\CustomInput\CustomInputRepository;
@@ -186,7 +187,7 @@ public function handleCancelRegistration()
         $user = $this->userRepository->findById($this->getParameter('id'));
         $loggedUser = $this->userRepository->findById($this->user->id);
 
-        $this->applicationService->cancelRegistration($user, $loggedUser);
+        $this->applicationService->cancelRegistration($user, ApplicationState::CANCELED, $loggedUser);
 
         $this->flashMessage('admin.users.users_registration_canceled', 'success');
         $this->redirect('this');
diff --git a/app/WebModule/components/ApplicationsGridControl.php b/app/WebModule/components/ApplicationsGridControl.php
index 11ccc0677..6fa6cec9f 100644
--- a/app/WebModule/components/ApplicationsGridControl.php
+++ b/app/WebModule/components/ApplicationsGridControl.php
@@ -196,6 +196,7 @@ public function createComponentApplicationsGrid($name)
                 return $this->applicationService->getStateText($row);
             });
 
+
         if ($explicitSubeventsExists) {
             if ($this->applicationService->isAllowedAddApplication($this->user)) {
                 $grid->addInlineAdd()->onControlAdd[] = function ($container) {
@@ -222,10 +223,11 @@ public function createComponentApplicationsGrid($name)
             };
             $grid->getInlineEdit()->onSubmit[] = [$this, 'edit'];
             $grid->allowRowsInlineEdit(function(Application $item) {
-                return $item->getType() == Application::SUBEVENTS;
+                return $this->applicationService->isAllowedEditApplication($item);
             });
         }
 
+
         $grid->addAction('generatePaymentProofBank', 'web.profile.applications_download_payment_proof');
         $grid->allowRowsAction('generatePaymentProofBank', function (Application $item) {
             return $item->getState() == ApplicationState::PAID
@@ -239,9 +241,10 @@ public function createComponentApplicationsGrid($name)
                 'data-content' => $this->translator->translate('web.profile.applications_cancel_application_confirm')
             ])->setClass('btn btn-xs btn-danger');
         $grid->allowRowsAction('cancelApplication', function (Application $item) {
-            return $item->getType() == Application::SUBEVENTS;
+            return $this->applicationService->isAllowedEditApplication($item);
         });
 
+
         $grid->setColumnsSummary(['fee'], function(Application $item, $column) {
             return $item->isCanceled() ? 0 : $item->getFee();
         });
@@ -256,69 +259,37 @@ public function createComponentApplicationsGrid($name)
      */
     public function add($values)
     {
-//        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-//        $selectedAndUsersSubevents = $this->user->getSubevents();
-//        foreach ($selectedSubevents as $subevent)
-//            $selectedAndUsersSubevents->add($subevent);
-//
-//        //kontrola podakci
-//        if (!$this->validators->validateSubeventsEmpty($selectedSubevents)) {
-//            $this->getPresenter()->flashMessage('web.profile.applications_subevents_empty', 'danger');
-//            $this->redirect('this');
-//        }
-//
-//        if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
-//            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
-//            $this->redirect('this');
-//        }
-//
-//        foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
-//            if (!$this->validators->validateSubeventsIncompatible($selectedAndUsersSubevents, $subevent)) {
-//                $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
-//                    ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
-//                );
-//                $this->getPresenter()->flashMessage($message, 'danger');
-//                $this->redirect('this');
-//            }
-//            if (!$this->validators->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
-//                $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
-//                    ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
-//                );
-//                $this->getPresenter()->flashMessage($message, 'danger');
-//                $this->redirect('this');
-//            }
-//        }
-//
-//        //zpracovani zmen
-//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($selectedSubevents) {
-//            $application = new Application();
-//            $fee = $this->applicationService->countFee($this->user->getRoles(), $selectedSubevents, FALSE);
-//            $application->setUser($this->user);
-//            $application->setSubevents($selectedSubevents);
-//            $application->setApplicationDate(new \DateTime());
-//            $application->setMaturityDate($this->applicationService->countMaturityDate());
-//            $application->setFee($fee);
-//            $application->setState($fee == 0 ? ApplicationState::PAID : ApplicationState::WAITING_FOR_PAYMENT);
-//            $application->setFirst(FALSE);
-//            $this->applicationRepository->save($application);
-//
-//            $application->setVariableSymbol($this->applicationService->generateVariableSymbol($application));
-//            $this->applicationRepository->save($application);
-//
-//            $this->user->addApplication($application);
-//            $this->userRepository->save($this->user);
-//
-//            $this->programService->updateUserPrograms($this->user);
-//
-//            //zaslani potvrzovaciho e-mailu
-//            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENT_ADDED, [
-//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-//                TemplateVariable::USERS_SUBEVENTS => $this->user->getSubeventsText()
-//            ]);
-//        });
-//
-//        $this->getPresenter()->flashMessage('web.profile.applications_add_subevents_successful', 'success');
-//        $this->redirect('this');
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+        $selectedAndUsersSubevents = clone $this->user->getSubevents();
+        foreach ($selectedSubevents as $subevent)
+            $selectedAndUsersSubevents->add($subevent);
+
+        if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
+            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
+            $this->redirect('this');
+        }
+
+        foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
+            if (!$this->validators->validateSubeventsIncompatible($selectedAndUsersSubevents, $subevent)) {
+                $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
+                    ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
+                );
+                $this->getPresenter()->flashMessage($message, 'danger');
+                $this->redirect('this');
+            }
+            if (!$this->validators->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
+                $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
+                    ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
+                );
+                $this->getPresenter()->flashMessage($message, 'danger');
+                $this->redirect('this');
+            }
+        }
+
+        $this->applicationService->addSubeventsApplication($this->user, $selectedSubevents, $this->user);
+
+        $this->getPresenter()->flashMessage('web.profile.applications_add_subevents_successful', 'success');
+        $this->redirect('this');
     }
 
     /**
@@ -331,147 +302,52 @@ public function add($values)
      */
     public function edit($id, $values)
     {
-//        $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-//
-//        //kontrola roli
-//        if (!$this->validateRolesCapacities($selectedRoles)) {
-//            $this->getPresenter()->flashMessage('web.profile.applications_roles_capacity_occupied', 'danger');
-//            $this->redirect('this');
-//        }
-//
-//        if (!$this->validateRolesRegisterable($selectedRoles)) {
-//            $this->getPresenter()->flashMessage('web.profile.applications_role_is_not_registerable', 'danger');
-//            $this->redirect('this');
-//        }
-//
-//        foreach ($this->roleRepository->findAllRegisterableNowOrUsersOrderedByName($this->user) as $role) {
-//            $incompatibleRoles = $role->getIncompatibleRoles();
-//            if (count($incompatibleRoles) > 0 && !$this->validateRolesIncompatible($selectedRoles, $role)) {
-//                $messageThis = $role->getName();
-//
-//                $incompatibleRolesNames = [];
-//                foreach ($incompatibleRoles as $incompatibleRole) {
-//                    $incompatibleRolesNames[] = $incompatibleRole->getName();
-//                }
-//                $messageOthers = implode(', ', $incompatibleRolesNames);
-//
-//                $message = $this->translator->translate('web.profile.applications_incompatible_roles_selected', NULL,
-//                    ['role' => $messageThis, 'incompatibleRoles' => $messageOthers]
-//                );
-//                $this->getPresenter()->flashMessage($message, 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            $requiredRoles = $role->getRequiredRolesTransitive();
-//            if (count($requiredRoles) > 0 && !$this->validateRolesRequired($selectedRoles, $role)) {
-//                $messageThis = $role->getName();
-//
-//                $requiredRolesNames = [];
-//                foreach ($requiredRoles as $requiredRole) {
-//                    $requiredRolesNames[] = $requiredRole->getName();
-//                }
-//                $messageOthers = implode(', ', $requiredRolesNames);
-//
-//                $message = $this->translator->translate('web.profile.applications_required_roles_not_selected', NULL,
-//                    ['role' => $messageThis, 'requiredRoles' => $messageOthers]
-//                );
-//                $this->getPresenter()->flashMessage($message, 'danger');
-//                $this->redirect('this');
-//            }
-//        }
-//
-//
-//        if ($this->subeventRepository->explicitSubeventsExists()) {
-//            $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
-//
-//            //kontrola podakci
-//            if (!$this->validateSubeventsEmpty($selectedSubevents)) {
-//                $this->getPresenter()->flashMessage('web.profile.applications_subevents_empty', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            if (!$this->validateSubeventsCapacities($selectedSubevents)) {
-//                $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
-//                $this->redirect('this');
-//            }
-//
-//            foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
-//                $incompatibleSubevents = $subevent->getIncompatibleSubevents();
-//                if (count($incompatibleSubevents) > 0 && !$this->validateSubeventsIncompatible($selectedSubevents, $subevent)) {
-//                    $messageThis = $subevent->getName();
-//
-//                    $incompatibleSubeventsNames = [];
-//                    foreach ($incompatibleSubevents as $incompatibleSubevent) {
-//                        $incompatibleSubeventsNames[] = $incompatibleSubevent->getName();
-//                    }
-//                    $messageOthers = implode(', ', $incompatibleSubeventsNames);
-//
-//                    $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
-//                        ['subevent' => $messageThis, 'incompatibleSubevents' => $messageOthers]
-//                    );
-//                    $this->getPresenter()->flashMessage($message, 'danger');
-//                    $this->redirect('this');
-//                }
-//
-//                $requiredSubevents = $subevent->getRequiredSubeventsTransitive();
-//                if (count($requiredSubevents) > 0 && !$this->validateSubeventsRequired($selectedSubevents, $subevent)) {
-//                    $messageThis = $subevent->getName();
-//
-//                    $requiredSubeventsNames = [];
-//                    foreach ($requiredSubevents as $requiredSubevent) {
-//                        $requiredSubeventsNames[] = $requiredSubevent->getName();
-//                    }
-//                    $messageOthers = implode(', ', $requiredSubeventsNames);
-//
-//                    $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
-//                        ['subevent' => $messageThis, 'requiredSubevents' => $messageOthers]
-//                    );
-//                    $this->getPresenter()->flashMessage($message, 'danger');
-//                    $this->redirect('this');
-//                }
-//            }
-//        }
-//
-//        //zpracovani zmen
-//        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($id, $selectedRoles, $selectedSubevents, $values) {
-//            $application = $this->applicationRepository->findById($id);
-//
-//            if ($this->subeventRepository->explicitSubeventsExists() && !empty($values['subevents']))
-//                $application->setSubevents($selectedSubevents);
-//            else
-//                $application->setSubevents(new ArrayCollection([$this->subeventRepository->findImplicit()]));
-//
-//            $this->userService->changeRoles($this->user, $selectedRoles);
-//
-//            $this->programService->updateUserPrograms($this->user);
-//
-//            //zaslani potvrzovaciho e-mailu
-//            $subeventsNames = [];
-//            foreach ($this->user->getSubevents() as $subevent) {
-//                $subeventsNames[] = $subevent->getName();
-//            }
-//
-//            $this->mailService->sendMailFromTemplate($this->user, '', Template::SUBEVENTS_CHANGED, [
-//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-//                TemplateVariable::USERS_SUBEVENTS => implode(', ', $subeventsNames)
-//            ]);
-//
-//            $this->authenticator->updateRoles($this->getPresenter()->getUser());
-//        });
-//
-//        $this->getPresenter()->flashMessage('web.profile.applications_edit_successful', 'success');
-//        $this->redirect('this');
+        $application = $this->applicationRepository->findById($id);
+
+        $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
+        $selectedAndUsersSubevents = clone $this->user->getSubevents();
+        foreach ($selectedSubevents as $subevent)
+            $selectedAndUsersSubevents->add($subevent);
+
+        if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
+            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
+            $this->redirect('this');
+        }
+
+        foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
+            if (!$this->validators->validateSubeventsIncompatible($selectedAndUsersSubevents, $subevent)) {
+                $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
+                    ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
+                );
+                $this->getPresenter()->flashMessage($message, 'danger');
+                $this->redirect('this');
+            }
+            if (!$this->validators->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
+                $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
+                    ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
+                );
+                $this->getPresenter()->flashMessage($message, 'danger');
+                $this->redirect('this');
+            }
+        }
+
+        $this->applicationService->updateSubeventsApplication($application, $selectedSubevents, $this->user);
+
+        $this->getPresenter()->flashMessage('web.profile.applications_edit_successful', 'success');
+        $this->redirect('this');
     }
 
     /**
      * Vygeneruje potvrzení o přijetí platby.
      * @param $id
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
     public function handleGeneratePaymentProofBank($id)
     {
         $this->pdfExportService->generateApplicationsPaymentProof(
-            $this->applicationRepository->findById($id),
-            "potvrzeni-o-prijeti-platby.pdf"
+            $this->applicationRepository->findById($id), "potvrzeni-o-prijeti-platby.pdf",
+            $this->userRepository->findById($this->getPresenter()->getUser()->id)
         );
     }
 
@@ -484,22 +360,14 @@ public function handleGeneratePaymentProofBank($id)
      */
     public function handleCancelApplication($id)
     {
-//        $application = $this->applicationRepository->findById($id);
-//
-//        if ($this->applicationService->isAllowedCancelApplication($application)) {
-//            $user = $application->getUser();
-//
-//            $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $user) {
-//                $application->setState(ApplicationState::CANCELED);
-//                $this->applicationRepository->save($application);
-//
-//                $this->programService->updateUserPrograms($user);
-//            });
-//
-//            $this->getPresenter()->flashMessage('web.profile.applications_application_canceled', 'success');
-//        }
-//
-//        $this->redirect('this');
+        $application = $this->applicationRepository->findById($id);
+
+        if ($this->applicationService->isAllowedEditApplication($application)) {
+            $this->applicationService->cancelSubeventsApplication($application, ApplicationState::CANCELED, $application->getUser());
+            $this->getPresenter()->flashMessage('web.profile.applications_application_canceled', 'success');
+        }
+
+        $this->redirect('this');
     }
 }
 
diff --git a/app/WebModule/forms/RolesForm.php b/app/WebModule/forms/RolesForm.php
index 15a6f9d21..733327f74 100644
--- a/app/WebModule/forms/RolesForm.php
+++ b/app/WebModule/forms/RolesForm.php
@@ -4,6 +4,7 @@
 
 use App\Model\ACL\Role;
 use App\Model\ACL\RoleRepository;
+use App\Model\Enums\ApplicationState;
 use App\Model\Program\ProgramRepository;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
@@ -142,19 +143,10 @@ public function processForm(Form $form, \stdClass $values)
     {
         if ($form['submit']->isSubmittedBy()) {
             $selectedRoles = $this->roleRepository->findRolesByIds($values['roles']);
-
-            if ($selectedRoles->count() == $this->user->getRoles()->count()) {
-                $selectedRolesArray = $selectedRoles->map(function (Role $role) {return $role->getId();})->toArray();
-                $usersRolesArray = $this->user->getRoles()->map(function (Role $role) {return $role->getId();})->toArray();
-
-                if (array_diff($selectedRolesArray, $usersRolesArray) === array_diff($usersRolesArray, $selectedRolesArray))
-                    return;
-            }
-
             $this->applicationService->updateRoles($this->user, $selectedRoles, $this->user);
         }
         elseif ($form['cancelRegistration']->isSubmittedBy()) {
-            $this->applicationService->cancelRegistration($this->user, $this->user);
+            $this->applicationService->cancelRegistration($this->user, ApplicationState::CANCELED, $this->user);
         }
     }
 
@@ -163,7 +155,6 @@ public function processForm(Form $form, \stdClass $values)
      * @param $field
      * @param $args
      * @return bool
-     * @throws \Doctrine\ORM\NonUniqueResultException
      */
     public function validateRolesCapacities($field, $args)
     {
diff --git a/app/lang/common.cs_CZ.neon b/app/lang/common.cs_CZ.neon
index 7dd1dff2b..bc72306fe 100644
--- a/app/lang/common.cs_CZ.neon
+++ b/app/lang/common.cs_CZ.neon
@@ -185,8 +185,8 @@ mailing:
         sign_in: "Potvrzení přihlášení se přes skautIS"
         registration: "Potvrzení registrace"
         registration_canceled: "Potvrzení zrušení registrace"
-        registration_changed: "Potvrzení změny registrace"
-        subevent_added: "Potvrzení přidání podakcí"
+        roles_changed: "Potvrzení změny rolí"
+        subevents_changed: "Potvrzení změny podakcí"
         payment_confirmed: "Potvrzení přijetí platby"
         maturity_reminder: "Připomínka splatnosti"
         program_registered: "Přihlášení na program"
diff --git a/app/model/ACL/Role.php b/app/model/ACL/Role.php
index b2538b593..6fe1ff034 100644
--- a/app/model/ACL/Role.php
+++ b/app/model/ACL/Role.php
@@ -6,6 +6,7 @@
 use App\Model\Program\Category;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\Mapping as ORM;
 use Kdyby\Doctrine\Entities\Attributes\Identifier;
 
@@ -276,6 +277,15 @@ public function getUsers(): Collection
         return $this->users;
     }
 
+    /**
+     * @return Collection
+     */
+    public function getApprovedUsers(): Collection
+    {
+        $criteria = Criteria::create()->where(Criteria::expr()->eq('approved', TRUE));
+        return $this->users->matching($criteria);
+    }
+
     /**
      * @return Collection
      */
@@ -684,6 +694,11 @@ public function countUsers(): int
         return $this->users->count();
     }
 
+    public function countApprovedUsers(): int
+    {
+        return $this->getApprovedUsers()->count();
+    }
+
     /**
      * @return int|null
      */
diff --git a/app/model/ACL/RoleRepository.php b/app/model/ACL/RoleRepository.php
index 03612be07..b51be592f 100644
--- a/app/model/ACL/RoleRepository.php
+++ b/app/model/ACL/RoleRepository.php
@@ -376,7 +376,7 @@ public function getRolesWithoutRolesOptionsWithCapacity(array $withoutRoles) : a
      * @return array
      * @throws \Doctrine\ORM\NonUniqueResultException
      */
-    public function getRolesWithoutRolesOptionsWithUsersCount(array $withoutRoles) : array
+    public function getRolesWithoutRolesOptionsWithApprovedUsersCount(array $withoutRoles) : array
     {
         if (empty($withoutRoles))
             $roles = $this->createQueryBuilder('r')
diff --git a/app/model/Mailing/Template.php b/app/model/Mailing/Template.php
index ee1e5214b..252a2d7c6 100644
--- a/app/model/Mailing/Template.php
+++ b/app/model/Mailing/Template.php
@@ -33,9 +33,14 @@ class Template
     const REGISTRATION_CANCELED = 'registration_canceled';
 
     /**
-     * Potvrzení přidání podakcí.
+     * Potvrzení změny rolí.
      */
-    const SUBEVENT_ADDED = 'subevent_added';
+    const ROLES_CHANGED = 'roles_changed';
+
+    /**
+     * Potvrzení změny podakcí.
+     */
+    const SUBEVENTS_CHANGED = 'subevents_changed';
 
     /**
      * Potvrzení přijetí platby.
@@ -67,16 +72,6 @@ class Template
      */
     const CUSTOM_INPUT_VALUE_CHANGED = 'custom_input_value_changed';
 
-    /**
-     * Potvrzení změny rolí.
-     */
-    const ROLES_CHANGED = 'roles_changed';
-
-    /**
-     * Potvrzení změny podakcí.
-     */
-    const SUBEVENTS_CHANGED = 'subevents_changed';
-
 
     use Identifier;
 
diff --git a/app/model/User/Application/Application.php b/app/model/User/Application/Application.php
index b823b80b5..a74771add 100644
--- a/app/model/User/Application/Application.php
+++ b/app/model/User/Application/Application.php
@@ -180,6 +180,26 @@ public function setUser($user)
         $this->user = $user;
     }
 
+    public function getRoles(): Collection
+    {
+        return new ArrayCollection();
+    }
+
+    public function getRolesText(): ?string
+    {
+        return NULL;
+    }
+
+    public function getSubevents(): Collection
+    {
+        return new ArrayCollection();
+    }
+
+    public function getSubeventsText(): ?string
+    {
+        return NULL;
+    }
+
     /**
      * @return int
      */
diff --git a/app/model/User/Application/ApplicationRepository.php b/app/model/User/Application/ApplicationRepository.php
index 24b30db40..1e9311007 100644
--- a/app/model/User/Application/ApplicationRepository.php
+++ b/app/model/User/Application/ApplicationRepository.php
@@ -3,6 +3,8 @@
 namespace App\Model\User;
 
 use App\Model\Enums\ApplicationState;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Kdyby\Doctrine\EntityRepository;
 
 
@@ -23,19 +25,6 @@ public function findById($id)
         return $this->findOneBy(['id' => $id]);
     }
 
-    /**
-     * Vrací přihlášky čekající na platbu.
-     * @return Application[]
-     */
-    public function findWaitingForPaymentApplications()
-    {
-        return $this->createQueryBuilder('a')
-            ->where('a.state = :state')->setParameter('state', ApplicationState::WAITING_FOR_PAYMENT)
-            ->andWhere('a.validTo IS NULL')
-            ->getQuery()
-            ->getResult();
-    }
-
     /**
      * Uloží přihlášku.
      * @param Application $application
diff --git a/app/model/User/Application/RolesApplication.php b/app/model/User/Application/RolesApplication.php
index b91ed6137..a79e9fc73 100644
--- a/app/model/User/Application/RolesApplication.php
+++ b/app/model/User/Application/RolesApplication.php
@@ -55,13 +55,8 @@ public function setRoles(Collection $roles): void
      * Vrací názvy rolí oddělené čárkou.
      * @return string
      */
-    public function getRolesText() : string
+    public function getRolesText(): ?string
     {
         return implode(', ', $this->roles->map(function (Role $role) {return $role->getName();})->toArray());
     }
-
-    public function getSubeventsText(): ?string
-    {
-        return NULL;
-    }
 }
diff --git a/app/model/User/Application/RolesApplicationRepository.php b/app/model/User/Application/RolesApplicationRepository.php
index 8c92bde35..7365c314f 100644
--- a/app/model/User/Application/RolesApplicationRepository.php
+++ b/app/model/User/Application/RolesApplicationRepository.php
@@ -2,6 +2,9 @@
 
 namespace App\Model\User;
 
+use App\Model\Enums\ApplicationState;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Kdyby\Doctrine\EntityRepository;
 
 
diff --git a/app/model/User/Application/SubeventsApplication.php b/app/model/User/Application/SubeventsApplication.php
index 6b82937b8..6724bd1cd 100644
--- a/app/model/User/Application/SubeventsApplication.php
+++ b/app/model/User/Application/SubeventsApplication.php
@@ -55,13 +55,8 @@ public function setSubevents(Collection $subevents): void
      * Vrací názvy podakcí oddělené čárkou.
      * @return string
      */
-    public function getSubeventsText() : string
+    public function getSubeventsText(): ?string
     {
         return implode(', ', $this->subevents->map(function (Subevent $subevent) {return $subevent->getName();})->toArray());
     }
-
-    public function getRolesText(): ?string
-    {
-        return NULL;
-    }
 }
diff --git a/app/model/User/Application/SubeventsApplicationRepository.php b/app/model/User/Application/SubeventsApplicationRepository.php
index 7a98d2f3a..32ea16dce 100644
--- a/app/model/User/Application/SubeventsApplicationRepository.php
+++ b/app/model/User/Application/SubeventsApplicationRepository.php
@@ -2,6 +2,9 @@
 
 namespace App\Model\User;
 
+use App\Model\Enums\ApplicationState;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
 use Kdyby\Doctrine\EntityRepository;
 
 
diff --git a/app/model/User/User.php b/app/model/User/User.php
index 861ca8c70..ce6956938 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -532,9 +532,9 @@ public function getPaidAndFreeApplications(): Collection
 
     /**
      * Vrátí přihlášky čekající na platbu.
-     * @return Collection
+     * @return Collection|Application[]
      */
-    public function getWaitingForPaymentApplications()
+    public function getWaitingForPaymentApplications(): Collection
     {
         $criteria = Criteria::create()
             ->where(Criteria::expr()->andX(
@@ -545,6 +545,28 @@ public function getWaitingForPaymentApplications()
         return $this->applications->matching($criteria);
     }
 
+    /**
+     * Vrátí přihlášky rolí čekající na platbu.
+     * @return Collection|RolesApplication[]
+     */
+    public function getWaitingForPaymentRolesApplications(): Collection
+    {
+        return $this->getWaitingForPaymentApplications()->filter(function (Application $application) {
+            return $application->getType() == Application::ROLES;
+        });
+    }
+
+    /**
+     * Vrátí přihlášky podakcí čekající na platbu.
+     * @return Collection|SubeventsApplication[]
+     */
+    public function getWaitingForPaymentSubeventsApplications(): Collection
+    {
+        return $this->getWaitingForPaymentApplications()->filter(function (Application $application) {
+            return $application->getType() == Application::SUBEVENTS;
+        });
+    }
+
     /**
      * @param Collection $applications
      */
diff --git a/app/model/User/UserRepository.php b/app/model/User/UserRepository.php
index 69109835a..cecb5d5b7 100644
--- a/app/model/User/UserRepository.php
+++ b/app/model/User/UserRepository.php
@@ -44,9 +44,9 @@ public function findBySkautISUserId($skautISUserId)
     /**
      * Vrací uživatele podle id.
      * @param $ids
-     * @return \Doctrine\Common\Collections\Collection
+     * @return Collection|User[]
      */
-    public function findUsersByIds($ids)
+    public function findUsersByIds($ids): Collection
     {
         $criteria = Criteria::create()
             ->where(Criteria::expr()->in('id', $ids));
@@ -77,6 +77,7 @@ public function findAllSyncedWithSkautIS()
         return $this->createQueryBuilder('u')
             ->join('u.roles', 'r')
             ->where('r.syncedWithSkautIS = true')
+            ->andWhere('u.external = false')
             ->getQuery()
             ->getResult();
     }
@@ -106,41 +107,41 @@ public function findAllInRoles($rolesIds)
             ->join('u.roles', 'r')
             ->where('r.id IN (:ids)')->setParameter('ids', $rolesIds)
             ->orderBy('u.displayName')
-            ->distinct()
             ->getQuery()
             ->getResult();
     }
 
     /**
-     * Vrací schválené uživatele v roli.
-     * @param $systemName
+     * Vrací schválené uživatele v rolích.
+     * @param $rolesIds
      * @return mixed
      */
-    public function findAllApprovedInRole($systemName)
+    public function findAllApprovedInRoles($rolesIds)
     {
         return $this->createQueryBuilder('u')
             ->join('u.roles', 'r')
-            ->where('r.systemName = :name')->setParameter('name', $systemName)
+            ->where('r.id IN (:ids)')->setParameter('ids', $rolesIds)
             ->andWhere('u.approved = true')
             ->orderBy('u.displayName')
-            ->getQuery()->execute();
+            ->getQuery()
+            ->getResult();
     }
 
     /**
-     * Vrací schválené uživatele v rolích.
-     * @param $rolesIds
-     * @return mixed
+     * Vrací uživatele s přihláškou čekající na zaplacení.
+     * @return Collection|User[]
      */
-    public function findAllApprovedInRoles($rolesIds)
+    public function findAllWithWaitingForPaymentApplication(): Collection
     {
-        return $this->createQueryBuilder('u')
-            ->join('u.roles', 'r')
-            ->where('r.id IN (:ids)')->setParameter('ids', $rolesIds)
-            ->andWhere('u.approved = true')
-            ->orderBy('u.displayName')
-            ->distinct()
+        $result = $this->createQueryBuilder('u')
+            ->join('u.applications', 'a')
+            ->where('a.validTo IS NULL')
+            ->andWhere('a.state = :state')
+            ->setParameter('state', ApplicationState::WAITING_FOR_PAYMENT)
             ->getQuery()
             ->getResult();
+
+        return new ArrayCollection($result);
     }
 
     /**
@@ -158,6 +159,7 @@ public function findProgramAllowed(Program $program)
             ->innerJoin('a.subevents', 's')
             ->where('per.name = :permission')
             ->andWhere('s.id = :sid')
+            ->andWhere('a.validTo IS NULL')
             ->andWhere('(a.state = \'' . ApplicationState::PAID . '\' OR a.state = \'' . ApplicationState::PAID_FREE
                 . '\' OR a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\')')
             ->setParameter('pid', $program->getId())
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index 04f06d407..dc88edf9b 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -9,6 +9,7 @@
 use App\Model\Mailing\Template;
 use App\Model\Mailing\TemplateVariable;
 use App\Model\Settings\Settings;
+use App\Model\Settings\SettingsException;
 use App\Model\Settings\SettingsRepository;
 use App\Model\Structure\DiscountRepository;
 use App\Model\Structure\Subevent;
@@ -25,6 +26,8 @@
 use Doctrine\Common\Collections\Collection;
 use Kdyby\Translation\Translator;
 use Nette;
+use Ublaboo\Mailing\Exception\MailingException;
+use Ublaboo\Mailing\Exception\MailingMailCreationException;
 
 
 /**
@@ -110,57 +113,71 @@ public function __construct(SettingsRepository $settingsRepository, ApplicationR
     public function register(User $user, Collection $roles, Collection $subevents, User $createdBy,
                              bool $approve = FALSE): void
     {
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $subevents, $createdBy, $approve) {
+        $rolesApplication = new RolesApplication();
+        $subeventsApplication = new SubeventsApplication();
+
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $subevents, $createdBy, $approve, &$rolesApplication, &$subeventsApplication) {
             $rolesApplication = $this->createRolesApplication($user, $roles, $createdBy, $approve);
             $subeventsApplication = $this->createSubeventsApplication($user, $subevents, $createdBy);
 
             $this->programService->updateUserPrograms($user);
+        });
 
-            $applicatonMaturity = "-";
-            $applicationFee = "0";
-            $applicationVariableSymbol = "-";
-
-            if ($rolesApplication->getFee() > 0 && $subeventsApplication->getFee() > 0) {
-                if ($rolesApplication->getMaturityDate())
-                    $applicatonMaturity = $rolesApplication->getMaturityDateText();
-                $applicationFee = $rolesApplication->getFee() . ", " . $subeventsApplication->getFee();
-                $applicationVariableSymbol = $rolesApplication->getVariableSymbolText() . ", " . $subeventsApplication->getVariableSymbolText();
-            } elseif ($rolesApplication->getFee() > 0) {
-                if ($rolesApplication->getMaturityDate())
-                    $applicatonMaturity = $rolesApplication->getMaturityDateText();
-                $applicationFee = $rolesApplication->getFee();
-                $applicationVariableSymbol = $rolesApplication->getVariableSymbolText();
-            } elseif ($subeventsApplication->getFee() > 0) {
-                if ($subeventsApplication->getMaturityDate())
-                    $applicatonMaturity = $subeventsApplication->getMaturityDateText();
-                $applicationFee = $subeventsApplication->getFee();
-                $applicationVariableSymbol = $subeventsApplication->getVariableSymbolText();
-            }
+        $applicatonMaturity = "-";
+        $applicationFee = "0";
+        $applicationVariableSymbol = "-";
+
+        if ($rolesApplication->getFee() > 0 && $subeventsApplication->getFee() > 0) {
+            if ($rolesApplication->getMaturityDate())
+                $applicatonMaturity = $rolesApplication->getMaturityDateText();
+            $applicationFee = $rolesApplication->getFee() . ", " . $subeventsApplication->getFee();
+            $applicationVariableSymbol = $rolesApplication->getVariableSymbolText() . ", "
+                . $subeventsApplication->getVariableSymbolText();
+        } elseif ($rolesApplication->getFee() > 0) {
+            if ($rolesApplication->getMaturityDate())
+                $applicatonMaturity = $rolesApplication->getMaturityDateText();
+            $applicationFee = $rolesApplication->getFee();
+            $applicationVariableSymbol = $rolesApplication->getVariableSymbolText();
+        } elseif ($subeventsApplication->getFee() > 0) {
+            if ($subeventsApplication->getMaturityDate())
+                $applicatonMaturity = $subeventsApplication->getMaturityDateText();
+            $applicationFee = $subeventsApplication->getFee();
+            $applicationVariableSymbol = $subeventsApplication->getVariableSymbolText();
+        }
 
-            $editRegistrationToText = $this->settingsRepository->getDateValueText(Settings::EDIT_REGISTRATION_TO);
+        $editRegistrationToText = $this->settingsRepository->getDateValueText(Settings::EDIT_REGISTRATION_TO);
 
-            $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION, [
-                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-                TemplateVariable::EDIT_REGISTRATION_TO => $editRegistrationToText !== NULL ? $editRegistrationToText : '-',
-                TemplateVariable::APPLICATION_MATURITY => $applicatonMaturity,
-                TemplateVariable::APPLICATION_FEE => $applicationFee,
-                TemplateVariable::APPLICATION_VARIABLE_SYMBOL => $applicationVariableSymbol,
-                TemplateVariable::BANK_ACCOUNT => $this->settingsRepository->getValue(Settings::ACCOUNT_NUMBER)
-            ]);
-        });
+        $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+            TemplateVariable::EDIT_REGISTRATION_TO => $editRegistrationToText !== NULL ? $editRegistrationToText : '-',
+            TemplateVariable::APPLICATION_MATURITY => $applicatonMaturity,
+            TemplateVariable::APPLICATION_FEE => $applicationFee,
+            TemplateVariable::APPLICATION_VARIABLE_SYMBOL => $applicationVariableSymbol,
+            TemplateVariable::BANK_ACCOUNT => $this->settingsRepository->getValue(Settings::ACCOUNT_NUMBER)
+        ]);
     }
 
     /**
      * @param User $user
      * @param Collection $roles
      * @param User $createdBy
+     * @return bool
      * @throws \Throwable
      */
     public function updateRoles(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): void
     {
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $createdBy, $approve) {
-            $oldRoles = clone $user->getRoles();
+        $oldRoles = clone $user->getRoles();
+
+        //pokud se role nezmenily, nic se neprovede
+        if ($roles->count() == $oldRoles->count()) {
+            $rolesArray = $roles->map(function (Role $role) {return $role->getId();})->toArray();
+            $oldRolesArray = $oldRoles->map(function (Role $role) {return $role->getId();})->toArray();
+
+            if (array_diff($rolesArray, $oldRolesArray) === array_diff($oldRolesArray, $rolesArray))
+                return;
+        }
 
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $roles, $createdBy, $approve, $oldRoles) {
             $user->setRoles($roles);
             $this->userRepository->save($user);
 
@@ -215,13 +232,12 @@ public function updateRoles(User $user, Collection $roles, User $createdBy, bool
             }
 
             $this->programService->updateUserPrograms($user);
-
-            //TODO mail
-//            $this->mailService->sendMailFromTemplate($user, '', Template::ROLES_CHANGED, [
-//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-//                TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {return $role->getName();})->toArray())
-//            ]);
         });
+
+        $this->mailService->sendMailFromTemplate($user, '', Template::ROLES_CHANGED, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+            TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {return $role->getName();})->toArray())
+        ]);
     }
 
     /**
@@ -229,9 +245,9 @@ public function updateRoles(User $user, Collection $roles, User $createdBy, bool
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function cancelRegistration(User $user, User $createdBy): void
+    public function cancelRegistration(User $user, string $state, User $createdBy): void
     {
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $createdBy) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $state, $createdBy) {
             $user->setApproved(TRUE);
             $user->getRoles()->clear();
             $user->addRole($this->roleRepository->findBySystemName(Role::NONREGISTERED));
@@ -239,7 +255,7 @@ public function cancelRegistration(User $user, User $createdBy): void
 
             foreach ($user->getNotCanceledApplications() as $application) {
                 $newApplication = clone $application;
-                $newApplication->setState(ApplicationState::CANCELED);
+                $newApplication->setState($state);
                 $newApplication->setCreatedBy($createdBy);
                 $newApplication->setValidFrom(new \DateTime());
                 $this->applicationRepository->save($newApplication);
@@ -251,13 +267,11 @@ public function cancelRegistration(User $user, User $createdBy): void
             $this->userRepository->save($user);
 
             $this->programService->updateUserPrograms($user);
-
-            //TODO mail
-//            $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
-//                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-//                TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {return $role->getName();})->toArray())
-//            ]);
         });
+
+        $this->mailService->sendMailFromTemplate($user, '', Template::REGISTRATION_CANCELED, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME)
+        ]);
     }
 
     /**
@@ -269,8 +283,15 @@ public function cancelRegistration(User $user, User $createdBy): void
     public function addSubeventsApplication(User $user, Collection $subevents, User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $subevents, $createdBy) {
-            //TODO
+            $this->createSubeventsApplication($user, $subevents, $createdBy);
+
+            $this->programService->updateUserPrograms($user);
         });
+
+        $this->mailService->sendMailFromTemplate($user, '', Template::SUBEVENTS_CHANGED, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+            TemplateVariable::USERS_SUBEVENTS => $user->getSubeventsText()
+        ]);
     }
 
     /**
@@ -279,11 +300,43 @@ public function addSubeventsApplication(User $user, Collection $subevents, User
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function updateSubeventsApplication(Application $application, Collection $subevents, User $createdBy): void
+    public function updateSubeventsApplication(SubeventsApplication $application, Collection $subevents, User $createdBy): void
     {
+        $oldSubevents = clone $application->getSubevents();
+
+        //pokud se podakce nezmenily, nic se neprovede
+        if ($subevents->count() == $oldSubevents->count()) {
+            $subeventsArray = $subevents->map(function (Role $role) {return $role->getId();})->toArray();
+            $oldSubeventsArray = $oldSubevents->map(function (Role $role) {return $role->getId();})->toArray();
+
+            if (array_diff($subeventsArray, $oldSubeventsArray) === array_diff($oldSubeventsArray, $subeventsArray))
+                return;
+        }
+
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $subevents, $createdBy) {
-            //TODO
+            $user = $application->getUser();
+
+            $newApplication = clone $application;
+            $newApplication->setSubevents($subevents);
+            $newApplication->setFee($this->countSubeventsFee($user->getRoles(), $subevents));
+            $newApplication->setState($this->getApplicationState($newApplication));
+            $newApplication->setCreatedBy($createdBy);
+            $newApplication->setValidFrom(new \DateTime());
+            $this->applicationRepository->save($newApplication);
+
+            $application->setValidTo(new \DateTime());
+            $this->applicationRepository->save($application);
+
+            $user->addApplication($newApplication);
+            $this->userRepository->save($user);
+
+            $this->programService->updateUserPrograms($user);
         });
+
+        $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::SUBEVENTS_CHANGED, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+            TemplateVariable::USERS_SUBEVENTS => $application->getUser()->getSubeventsText()
+        ]);
     }
 
     /**
@@ -291,26 +344,97 @@ public function updateSubeventsApplication(Application $application, Collection
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function cancelSubeventsApplication(Application $application, User $createdBy): void
+    public function cancelSubeventsApplication(SubeventsApplication $application, string $state, User $createdBy): void
     {
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $createdBy) {
-            //TODO
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $state, $createdBy) {
+            $user = $application->getUser();
+
+            $newApplication = clone $application;
+            $newApplication->setState($state);
+            $newApplication->setCreatedBy($createdBy);
+            $newApplication->setValidFrom(new \DateTime());
+            $this->applicationRepository->save($newApplication);
+
+            $application->setValidTo(new \DateTime());
+            $this->applicationRepository->save($application);
+
+            $user->addApplication($newApplication);
+            $this->userRepository->save($user);
+
+            $this->programService->updateUserPrograms($user);
         });
+
+        $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::SUBEVENTS_CHANGED, [
+            TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+            TemplateVariable::USERS_SUBEVENTS => $application->getUser()->getSubeventsText()
+        ]);
     }
 
     /**
      * @param Application $application
-     * @param \DateTime $paymentDate
+     * @param string $variableSymbol
      * @param string $paymentMethod
+     * @param \DateTime $paymentDate
+     * @param \DateTime $incomeProofPrintedDate
+     * @param \DateTime $maturityDate
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function updatePayment(Application $application, \DateTime $paymentDate, string $paymentMethod,
+    public function updatePayment(Application $application, string $variableSymbol, string $paymentMethod,
+                                  \DateTime $paymentDate, \DateTime $incomeProofPrintedDate, \DateTime $maturityDate,
                                   User $createdBy): void
     {
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $paymentDate, $paymentMethod, $createdBy) {
-            //TODO
+        $oldVariableSymbol = $application->getVariableSymbolText();
+        $oldPaymentMethod = $application->getPaymentMethod();
+        $oldPaymentDate = $application->getPaymentDate();
+        $oldIncomeProofPrintedDate = $application->getIncomeProofPrintedDate();
+        $oldMaturityDate = $application->getMaturityDate();
+
+        //pokud neni zmena, nic se neprovede
+        if ($variableSymbol == $oldVariableSymbol && $paymentMethod == $oldPaymentMethod
+            && $paymentDate == $oldPaymentDate && $incomeProofPrintedDate == $oldIncomeProofPrintedDate
+            && $maturityDate == $oldMaturityDate)
+            return;
+
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application,
+            $variableSymbol, $paymentMethod, $paymentDate, $incomeProofPrintedDate, $maturityDate, $createdBy) {
+            $user = $application->getUser();
+
+            $newApplication = clone $application;
+
+            if ($application->getVariableSymbolText() != $variableSymbol) {
+                $newVariableSymbol = new VariableSymbol();
+                $newVariableSymbol->setVariableSymbol($variableSymbol);
+                $this->variableSymbolRepository->save($newVariableSymbol);
+
+                $newApplication->setVariableSymbol($newVariableSymbol);
+            }
+
+            $newApplication->setPaymentMethod($paymentMethod);
+            $newApplication->setPaymentDate($paymentDate);
+            $newApplication->setIncomeProofPrintedDate($incomeProofPrintedDate);
+            $newApplication->setMaturityDate($maturityDate);
+
+            $newApplication->setState($this->getApplicationState($newApplication));
+            $newApplication->setCreatedBy($createdBy);
+            $newApplication->setValidFrom(new \DateTime());
+            $this->applicationRepository->save($newApplication);
+
+            $application->setValidTo(new \DateTime());
+            $this->applicationRepository->save($application);
+
+            $user->addApplication($newApplication);
+            $this->userRepository->save($user);
+
+            $this->programService->updateUserPrograms($user);
         });
+
+        if ($paymentDate !== NULL && $oldPaymentDate === NULL) {
+            $this->mailService->sendMailFromTemplate($this->user, '', Template::PAYMENT_CONFIRMED, [
+                TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
+                TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
+            ]);
+        }
     }
 
     /**
@@ -526,7 +650,8 @@ public function isAllowedEditRegistration(User $user)
      */
     public function isAllowedEditApplication(Application $application)
     {
-        return $application->getState() == ApplicationState::WAITING_FOR_PAYMENT
+        return $application->getType() == Application::SUBEVENTS && !$application->isCanceled()
+            && $application->getState() != ApplicationState::PAID
             && $this->settingsRepository->getDateValue(Settings::EDIT_REGISTRATION_TO) >= (new \DateTime())->setTime(0, 0);
     }
 
diff --git a/app/services/PdfExportService.php b/app/services/PdfExportService.php
index 675b2706d..de1a47711 100644
--- a/app/services/PdfExportService.php
+++ b/app/services/PdfExportService.php
@@ -35,6 +35,9 @@ class PdfExportService extends Nette\Object
     /** @var ApplicationRepository */
     private $applicationRepository;
 
+    /** @var ApplicationService */
+    private $applicationService;
+
 
     /**
      * PdfExportService constructor.
@@ -42,12 +45,14 @@ class PdfExportService extends Nette\Object
      * @param SettingsRepository $settingsRepository
      * @param ApplicationRepository $applicationRepository
      */
-    public function __construct($dir, SettingsRepository $settingsRepository, ApplicationRepository $applicationRepository)
+    public function __construct($dir, SettingsRepository $settingsRepository,
+                                ApplicationRepository $applicationRepository, ApplicationService $applicationService)
     {
         $this->dir = $dir;
 
         $this->settingsRepository = $settingsRepository;
         $this->applicationRepository = $applicationRepository;
+        $this->applicationService = $applicationService;
 
         $this->fpdi = new FPDI();
         $this->fpdi->fontpath = $dir . '/fonts/';
@@ -59,15 +64,24 @@ public function __construct($dir, SettingsRepository $settingsRepository, Applic
      * Vygeneruje doklad o zaplacení pro přihlášku.
      * @param Application $application
      * @param $filename
+     * @param User $createdBy
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
-    public function generateApplicationsPaymentProof(Application $application, $filename)
+    public function generateApplicationsPaymentProof(Application $application, $filename, User $createdBy)
     {
-        $this->prepareApplicationsPaymentProof($application);
+        $this->prepareApplicationsPaymentProof($application, $createdBy);
         $this->fpdi->Output($filename, 'D');
         exit;
     }
 
-    private function prepareApplicationsPaymentProof(Application $application)
+    /**
+     * @param Application $application
+     * @param User $createdBy
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
+     */
+    private function prepareApplicationsPaymentProof(Application $application, User $createdBy)
     {
         if ($application->getState() == ApplicationState::PAID) {
             if ($application->getPaymentMethod() == PaymentType::BANK)
@@ -75,9 +89,10 @@ private function prepareApplicationsPaymentProof(Application $application)
             else if ($application->getPaymentMethod() == PaymentType::CASH)
                 $this->addIncomeProofPage($application);
 
-            if (!$application->getIncomeProofPrintedDate() && $application->getPaymentDate()) {
-                $application->setIncomeProofPrintedDate(new \DateTime());
-                $this->applicationRepository->save($application);
+            if (!$application->getIncomeProofPrintedDate()) {
+                $this->applicationService->updatePayment($application, $application->getVariableSymbolText(),
+                    $application->getPaymentMethod(), $application->getPaymentDate(), new \DateTime(),
+                    $application->getMaturityDate(), $createdBy);
             }
         }
     }
@@ -86,37 +101,54 @@ private function prepareApplicationsPaymentProof(Application $application)
      * Vygeneruje doklady o zaplacení pro uživatele.
      * @param User $user
      * @param $filename
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
-    public function generateUsersPaymentProof(User $user, $filename)
+    public function generateUsersPaymentProof(User $user, $filename, User $createdBy)
     {
-        $this->prepareUsersPaymentProof($user);
+        $this->prepareUsersPaymentProof($user, $createdBy);
         $this->fpdi->Output($filename, 'D');
         exit;
     }
-    
-    private function prepareUsersPaymentProof(User $user)
+
+    /**
+     * @param User $user
+     * @param User $createdBy
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
+     */
+    private function prepareUsersPaymentProof(User $user, User $createdBy)
     {
         foreach ($user->getApplications() as $application) {
-            $this->prepareApplicationsPaymentProof($application);
+            $this->prepareApplicationsPaymentProof($application, $createdBy);
         }
     }
-    
+
     /**
      * Vygeneruje doklady o zaplacení pro více uživatelů.
      * @param $users
      * @param $filename
+     * @param User $createdBy
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
      */
-    public function generateUsersPaymentProofs($users, $filename)
+    public function generateUsersPaymentProofs($users, $filename, User $createdBy)
     {
-        $this->prepareUsersPaymentProofs($users);
+        $this->prepareUsersPaymentProofs($users, $createdBy);
         $this->fpdi->Output($filename, 'D');
         exit;
     }
 
-    private function prepareUsersPaymentProofs($users)
+    /**
+     * @param $users
+     * @param User $createdBy
+     * @throws \App\Model\Settings\SettingsException
+     * @throws \Throwable
+     */
+    private function prepareUsersPaymentProofs($users, User $createdBy)
     {
         foreach ($users as $user) {
-            $this->prepareUsersPaymentProof($user);
+            $this->prepareUsersPaymentProof($user, $createdBy);
         }
     }
 
diff --git a/app/services/SkautIsEventService.php b/app/services/SkautIsEventService.php
index 0bc82182d..a955e6910 100644
--- a/app/services/SkautIsEventService.php
+++ b/app/services/SkautIsEventService.php
@@ -41,8 +41,7 @@ public function syncEventParticipants($eventId, array $participants)
         }
 
         foreach ($participants as $p) {
-            if (!$p->isExternal())
-                $this->insertParticipant($p->getSkautISPersonId(), $eventId);
+            $this->insertParticipant($p->getSkautISPersonId(), $eventId);
         }
     }
 
diff --git a/app/utils/Validators.php b/app/utils/Validators.php
index c32b55b76..467ae0cb0 100644
--- a/app/utils/Validators.php
+++ b/app/utils/Validators.php
@@ -6,6 +6,7 @@
 use App\Model\ACL\RoleRepository;
 use App\Model\Structure\Subevent;
 use App\Model\Structure\SubeventRepository;
+use App\Model\User\Application;
 use App\Model\User\User;
 use Doctrine\Common\Collections\Collection;
 
@@ -124,18 +125,6 @@ public function validateRolesRegisterable(Collection $selectedRoles, User $user)
         return TRUE;
     }
 
-    /**
-     * Ověří, že je vybrána alespoň jedna podakce.
-     * @param $selectedSubevents
-     * @return bool
-     */
-    public function validateSubeventsEmpty(Collection $selectedSubevents): bool
-    {
-        if ($selectedSubevents->isEmpty())
-            return FALSE;
-        return TRUE;
-    }
-
     /**
      * Ověří kapacitu podakcí.
      * @param Collection|Subevent[] $selectedSubevents
@@ -191,4 +180,23 @@ public function validateSubeventsRequired(Collection $selectedSubevents, Subeven
 
         return TRUE;
     }
+
+    /**
+     * Ověří, zda uživatel podakci již nemá.
+     * @param Collection $selectedSubevents
+     * @param User $user
+     * @param Application|null $editedApplication
+     * @return bool
+     */
+    public function validateSubeventsRegistered(Collection $selectedSubevents, User $user,
+                                                Application $editedApplication = NULL): bool
+    {
+        foreach ($selectedSubevents as $subevent) {
+            foreach ($user->getNotCanceledSubeventsApplications() as $application) {
+                if ($application !== $editedApplication && $application->getSubevents()->contains($subevent))
+                    return FALSE;
+            }
+        }
+        return TRUE;
+    }
 }
\ No newline at end of file
diff --git a/migrations/Version20171227152222.php b/migrations/Version20171227152222.php
new file mode 100644
index 000000000..15bb13fb9
--- /dev/null
+++ b/migrations/Version20171227152222.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171227152222 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Byl/a jsi přihlášen/a na web akce: %nazev-seminare%. Toto přihlášení není registrací k účasti na akci. Pokud se chceš akce zúčastnit, tak se nezapomeň na webu zaregistrovat.\' WHERE `mail_template`.`id` = 1');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Byl/a jsi zaregistrován/a na akci: %nazev-seminare%. Nezapomeň zaplatit registrační poplatek. Více informací o platbě najdeš na webu ve svém profilu. Zrušit svou registraci můžeš přes web do: %zmena-registrace-do%.\' WHERE `mail_template`.`id` = 2');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Tvoje účast na akci: %nazev-seminare% byla zrušena. Pokud jde o omyl, tak se znovu zaregistruj na webu.\' WHERE `mail_template`.`id` = 3');
+        $this->addSql('UPDATE `mail_template` SET `type` = \'roles_changed\', `subject` = \'%nazev-seminare%: změna rolí\', `text` = \'Na akci: %nazev-seminare%, na kterou jsi se již dříve registroval/a, Ti byly změněny role. Tvoje stávájící role jsou: %role%.\' WHERE `mail_template`.`id` = 4');
+        $this->addSql('UPDATE `mail_template` SET `type` = \'subevents_changed\', `subject` = \'%nazev-seminare%: změna podakcí\', `text` = \'Na akci: %nazev-seminare%, na kterou jsi se již dříve registroval/a, Ti byly změněny podakce. Tvoje stávájící podakce jsou: %podakce%.\' WHERE `mail_template`.`id` = 5');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Tvůj poplatek za účast na akci: %nazev-seminare% byl přijat organizátorem. Po spuštění přihlašování na programy si budeš moci na webu vybírat jednotlivé programy.\' WHERE `mail_template`.`id` = 6');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Blíží se splatnost poplatku za Tvou účast na akci: %nazev-seminare%. Pokud neobdržíme Tvou platbu do: %splatnost%, tak bude Tvé místo uvolněno dalšímu zájemci.\' WHERE `mail_template`.`id` = 7');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Byl jsi přhlášen na program: \"%nazev-programu%\", zkontroluj si svůj rozvrh.\' WHERE `mail_template`.`id` = 8');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Byl jsi odhlášen z programu: \"%nazev-programu%\", zkontroluj si svůj rozvrh.\' WHERE `mail_template`.`id` = 9');
+        $this->addSql('UPDATE `mail_template` SET `text` = \'Uživateli: %uzivatel% byly aktualizovány údaje ve vlastních polích přihlášky.\' WHERE `mail_template`.`id` = 11');
+        $this->addSql('DELETE FROM `template_template_variable` WHERE `template_template_variable`.`template_id` = 4 AND `template_template_variable`.`template_variable_id` = 4');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

From a1788370de8b83cdd45c066c05abbf79cc4388ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 27 Dec 2017 22:47:43 +0100
Subject: [PATCH 10/11] uprava podakci

---
 .../forms/SubeventForm.php                    |  2 +-
 .../ProgramAttendeesGridControl.php           |  1 +
 .../components/ApplicationsGridControl.php    | 43 ++++++++++-----
 .../components/UsersGridControl.php           | 22 +++-----
 app/ApiModule/services/ScheduleService.php    |  6 +-
 .../components/ApplicationContentControl.php  | 18 +++++-
 .../components/ApplicationsGridControl.php    | 30 +++++++---
 .../templates/application_content.latte       | 19 ++++---
 app/WebModule/forms/ApplicationForm.php       |  2 +-
 app/lang/admin.cs_CZ.neon                     |  8 ++-
 app/model/Program/Program.php                 |  2 +-
 app/model/Structure/Subevent.php              |  3 +-
 app/model/User/Application/Application.php    | 55 ++++++++++++++++---
 .../User/Application/RolesApplication.php     | 32 -----------
 .../User/Application/SubeventsApplication.php | 32 -----------
 app/model/User/User.php                       | 34 +++++++-----
 app/model/User/UserRepository.php             |  7 +--
 app/services/ApplicationService.php           | 22 ++++----
 app/services/ExcelExportService.php           | 11 ++--
 app/services/PdfExportService.php             |  2 +-
 app/services/ProgramService.php               |  7 +--
 migrations/Version20171227203925.php          | 30 ++++++++++
 22 files changed, 218 insertions(+), 170 deletions(-)
 create mode 100644 migrations/Version20171227203925.php

diff --git a/app/AdminModule/ConfigurationModule/forms/SubeventForm.php b/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
index fdbfb2b46..2ad65719d 100644
--- a/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
+++ b/app/AdminModule/ConfigurationModule/forms/SubeventForm.php
@@ -61,7 +61,7 @@ public function create($id)
             ->setAttribute('title', $form->getTranslator()->translate('admin.configuration.subevents_capacity_note'));
 
         $form->addText('fee', 'admin.configuration.subevents_fee')
-            ->addCondition(Form::FILLED)
+            ->addRule(Form::FILLED, 'admin.configuration.subevents_fee_empty')
             ->addRule(Form::INTEGER, 'admin.configuration.subevents_fee_format');
 
         if ($this->subevent) {
diff --git a/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php b/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
index 139961236..88a9ed4f6 100644
--- a/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
+++ b/app/AdminModule/ProgramModule/components/ProgramAttendeesGridControl.php
@@ -127,6 +127,7 @@ public function createComponentProgramAttendeesGrid($name)
                 ->innerJoin('a.subevents', 's')
                 ->where('per.name = :permission')
                 ->andWhere('s.id = :sid')
+                ->andWhere('a.validTo IS NULL')
                 ->andWhere('(a.state = \'' . ApplicationState::PAID . '\' OR a.state = \'' . ApplicationState::PAID_FREE
                     . '\' OR a.state = \'' . ApplicationState::WAITING_FOR_PAYMENT . '\')')
                 ->setParameter('pid', $program->getId())
diff --git a/app/AdminModule/components/ApplicationsGridControl.php b/app/AdminModule/components/ApplicationsGridControl.php
index 48841b1d5..ea4b91f7f 100644
--- a/app/AdminModule/components/ApplicationsGridControl.php
+++ b/app/AdminModule/components/ApplicationsGridControl.php
@@ -185,8 +185,7 @@ public function createComponentApplicationsGrid($name)
             $container->addMultiSelect('subevents', '',
                 $this->subeventRepository->getSubeventsOptionsWithCapacity()
             )
-                ->setAttribute('class', 'datagrid-multiselect')
-                ->addRule(Form::FILLED, 'admin.users.users_applications_subevents_empty');
+                ->setAttribute('class', 'datagrid-multiselect');
 
             $container->addText('variableSymbol', 'admin.users.users_variable_symbol')
                 ->addRule(Form::FILLED, 'admin.users.users_applications_variable_symbol_empty')
@@ -205,10 +204,10 @@ public function createComponentApplicationsGrid($name)
 
             $container->addDatePicker('maturityDate', 'admin.users.users_maturity_date');
         };
-        $grid->getInlineEdit()->onSetDefaults[] = function ($container, $item) {
+        $grid->getInlineEdit()->onSetDefaults[] = function ($container, Application $item) {
             $container->setDefaults([
                 'subevents' => $this->subeventRepository->findSubeventsIds($item->getSubevents()),
-                'variableSymbol' => $item->getVariableSymbol(),
+                'variableSymbol' => $item->getVariableSymbolText(),
                 'paymentMethod' => $item->getPaymentMethod(),
                 'paymentDate' => $item->getPaymentDate(),
                 'incomeProofPrintedDate' => $item->getIncomeProofPrintedDate(),
@@ -261,13 +260,15 @@ public function add($values)
     {
         $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
 
+        $p = $this->getPresenter();
+
         if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
-            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
+            $p->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
             $this->redirect('this');
         }
 
         if (!$this->validators->validateSubeventsRegistered($selectedSubevents, $this->user)) {
-            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
+            $p->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
             $this->redirect('this');
         }
 
@@ -275,7 +276,7 @@ public function add($values)
 
         $this->applicationService->addSubeventsApplication($this->user, $selectedSubevents, $loggedUser);
 
-        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
+        $p->flashMessage('admin.users.users_applications_saved', 'success');
         $this->redirect('this');
     }
 
@@ -293,25 +294,41 @@ public function edit($id, $values)
 
         $selectedSubevents = $this->subeventRepository->findSubeventsByIds($values['subevents']);
 
+        $p = $this->getPresenter();
+
+        if ($application->getType() == Application::ROLES) {
+            if (!$selectedSubevents->isEmpty()) {
+                $p->flashMessage('admin.users.users_applications_subevents_not_empty', 'danger');
+                $this->redirect('this');
+            }
+        } else {
+            if ($selectedSubevents->isEmpty()) {
+                $p->flashMessage('admin.users.users_applications_subevents_empty', 'danger');
+                $this->redirect('this');
+            }
+        }
+
         if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
-            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
+            $p->flashMessage('admin.users.users_applications_subevents_occupied', 'danger');
             $this->redirect('this');
         }
 
         if (!$this->validators->validateSubeventsRegistered($selectedSubevents, $this->user, $application)) {
-            $this->getPresenter()->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
+            $p->flashMessage('admin.users.users_applications_subevents_registered', 'danger');
             $this->redirect('this');
         }
 
         $loggedUser = $this->userRepository->findById($this->getPresenter()->user->id);
 
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $selectedSubevents, $values, $loggedUser) {
-            $this->applicationService->updateSubeventsApplication($application, $selectedSubevents, $loggedUser);
-            $this->applicationService->updatePayment($application, $values['variableSymbol'], $values['paymentMethod'],
-                $values['paymentDate'], $values['incomeProofPrintedDate'], $values['maturityDate'], $loggedUser);
+            if ($application->getType() == Application::SUBEVENTS)
+                $this->applicationService->updateSubeventsApplication($application, $selectedSubevents, $loggedUser);
+            $this->applicationService->updatePayment($application, $values['variableSymbol'],
+                $values['paymentMethod'] ?: NULL, $values['paymentDate'],
+                $values['incomeProofPrintedDate'], $values['maturityDate'], $loggedUser);
         });
 
-        $this->getPresenter()->flashMessage('admin.users.users_applications_saved', 'success');
+        $p->flashMessage('admin.users.users_applications_saved', 'success');
         $this->redirect('this');
     }
 
diff --git a/app/AdminModule/components/UsersGridControl.php b/app/AdminModule/components/UsersGridControl.php
index 9f9a5a3df..0fb89025d 100644
--- a/app/AdminModule/components/UsersGridControl.php
+++ b/app/AdminModule/components/UsersGridControl.php
@@ -17,6 +17,7 @@
 use App\Model\Settings\Settings;
 use App\Model\Settings\SettingsRepository;
 use App\Model\Structure\SubeventRepository;
+use App\Model\User\Application;
 use App\Model\User\ApplicationRepository;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
@@ -180,22 +181,22 @@ public function createComponentUsersGrid($name)
             ->onSelect[] = [$this, 'groupMarkAttended'];
 
         $grid->addGroupAction('admin.users.users_group_action_mark_paid_today', $this->preparePaymentMethodOptionsWithoutEmpty())
-            ->onSelect[] = [$this, 'groupMarkPaidToday']; //TODO kontrola
+            ->onSelect[] = [$this, 'groupMarkPaidToday'];
 
         $grid->addGroupAction('admin.users.users_group_action_generate_payment_proofs')
-            ->onSelect[] = [$this, 'groupGeneratePaymentProofs']; //TODO kontrola
+            ->onSelect[] = [$this, 'groupGeneratePaymentProofs'];
 
         $grid->addGroupAction('admin.users.users_group_action_export_users')
-            ->onSelect[] = [$this, 'groupExportUsers']; //TODO kontrola
+            ->onSelect[] = [$this, 'groupExportUsers'];
 
         $grid->addGroupAction('admin.users.users_group_action_export_subevents_and_categories')
-            ->onSelect[] = [$this, 'groupExportSubeventsAndCategories']; //TODO kontrola
+            ->onSelect[] = [$this, 'groupExportSubeventsAndCategories'];
 
         $grid->addGroupAction('admin.users.users_group_action_export_roles')
-            ->onSelect[] = [$this, 'groupExportRoles']; //TODO kontrola
+            ->onSelect[] = [$this, 'groupExportRoles'];
 
         $grid->addGroupAction('admin.users.users_group_action_export_schedules')
-            ->onSelect[] = [$this, 'groupExportSchedules']; //TODO kontrola
+            ->onSelect[] = [$this, 'groupExportSchedules'];
 
 
         $grid->addColumnText('displayName', 'admin.users.users_name')
@@ -281,14 +282,9 @@ public function createComponentUsersGrid($name)
                 return $this->userService->getPaymentMethodText($row);
             });
 
-        $grid->addColumnDateTime('lastPaymentDate', 'admin.users.users_last_payment_date'); //TODO kontrola
+        $grid->addColumnDateTime('lastPaymentDate', 'admin.users.users_last_payment_date');
 
-        $grid->addColumnDateTime('firstApplicationDate', 'admin.users.users_first_application_date')
-            ->setSortable()
-            ->setSortableCallback(function ($qb, $sort) { //TODO kontrola
-                $qb->leftJoin('u.applications', 'aFirstApplicationDate', Expr\Join::WITH, 'aFirstApplicationDate.first = true')
-                    ->orderBy('aFirstApplicationDate.applicationDate', $sort['firstApplicationDate']);
-            })
+        $grid->addColumnDateTime('rolesApplicationDate', 'admin.users.users_roles_application_date')
             ->setFormat('j. n. Y H:i');
 
         $columnAttended = $grid->addColumnStatus('attended', 'admin.users.users_attended');
diff --git a/app/ApiModule/services/ScheduleService.php b/app/ApiModule/services/ScheduleService.php
index f654583a4..14b285576 100644
--- a/app/ApiModule/services/ScheduleService.php
+++ b/app/ApiModule/services/ScheduleService.php
@@ -110,7 +110,7 @@ public function getProgramsAdmin()
      */
     public function getProgramsWeb()
     {
-        $programs = $this->programRepository->findUserAllowed($this->user);
+        $programs = $this->programService->getUserAllowedPrograms($this->user);
         $programDetailDTOs = [];
         foreach ($programs as $program) {
             $programDetailDTO = $this->convertProgramToProgramDetailDTO($program);
@@ -295,7 +295,7 @@ public function attendProgram($programId)
             $responseDTO->setMessage($this->translator->translate('common.api.schedule_program_already_registered'));
         elseif ($program->getCapacity() !== NULL && $program->getCapacity() <= $program->getAttendeesCount())
             $responseDTO->setMessage($this->translator->translate('common.api.schedule_program_no_vacancies'));
-        elseif (!(new ArrayCollection($this->programRepository->findUserAllowed($this->user)))->contains($program))
+        elseif (!($this->programService->getUserAllowedPrograms($this->user))->contains($program))
             $responseDTO->setMessage($this->translator->translate('common.api.schedule_program_category_not_allowed'));
         elseif (count(
             array_intersect($this->programRepository->findBlockedProgramsIdsByProgram($program),
@@ -396,7 +396,7 @@ private function convertBlockToBlockDetailDTO(Block $block)
         $blockDetailDTO->setDescription($block->getDescription());
         $blockDetailDTO->setProgramsCount($block->getProgramsCount());
         $blockDetailDTO->setUserAttends($block->isAttendee($this->user));
-        $blockDetailDTO->setUserAllowed($block->isAllowed($this->user)); //TODO kontrola povolení zapisování před zaplacením
+        $blockDetailDTO->setUserAllowed($block->isAllowed($this->user));
 
         return $blockDetailDTO;
     }
diff --git a/app/WebModule/components/ApplicationContentControl.php b/app/WebModule/components/ApplicationContentControl.php
index 817ede16e..30b306ecb 100644
--- a/app/WebModule/components/ApplicationContentControl.php
+++ b/app/WebModule/components/ApplicationContentControl.php
@@ -82,15 +82,27 @@ public function render($content)
         $template->guestRole = $user->isInRole($this->roleRepository->findBySystemName(Role::GUEST)->getName());
         $template->testRole = Role::TEST;
 
+        $explicitSubeventsExists = $this->subeventRepository->explicitSubeventsExists();
+
         if ($user->isLoggedIn()) {
+            $dbuser = $this->userRepository->findById($user->id);
+            $userHasFixedFeeRole = $dbuser->hasFixedFeeRole();
+
             $template->unapprovedRole = $user->isInRole($this->roleRepository->findBySystemName(Role::UNAPPROVED)->getName());
             $template->nonregisteredRole = $user->isInRole($this->roleRepository->findBySystemName(Role::NONREGISTERED)->getName());
             $template->bankAccount = $this->settingsRepository->getValue(Settings::ACCOUNT_NUMBER);
-            $template->subeventsExists = $this->subeventRepository->explicitSubeventsExists();
-            $template->dbuser = $this->userRepository->findById($user->id);
+            $template->dbuser = $dbuser;
+            $template->userHasFixedFeeRole = $userHasFixedFeeRole;
+
+            $template->usersApplications = $explicitSubeventsExists && $userHasFixedFeeRole
+                ? $dbuser->getNotCanceledApplications()
+                : ($explicitSubeventsExists
+                    ? $dbuser->getNotCanceledSubeventsApplications()
+                    : $dbuser->getNotCanceledRolesApplications()
+                );
         }
 
-        $template->explicitSubeventsExists = $this->subeventRepository->explicitSubeventsExists();
+        $template->explicitSubeventsExists = $explicitSubeventsExists;
         $template->rolesWithSubevents = json_encode($this->roleRepository->findRolesIds($this->roleRepository->findAllWithSubevents()));
 
         $template->render();
diff --git a/app/WebModule/components/ApplicationsGridControl.php b/app/WebModule/components/ApplicationsGridControl.php
index 6fa6cec9f..be02d0cbb 100644
--- a/app/WebModule/components/ApplicationsGridControl.php
+++ b/app/WebModule/components/ApplicationsGridControl.php
@@ -17,6 +17,7 @@
 use App\Model\User\ApplicationRepository;
 use App\Model\User\RolesApplicationRepository;
 use App\Model\User\SubeventsApplication;
+use App\Model\User\SubeventsApplicationRepository;
 use App\Model\User\User;
 use App\Model\User\UserRepository;
 use App\Services\ApplicationService;
@@ -88,6 +89,9 @@ class ApplicationsGridControl extends Control
     /** @var RolesApplicationRepository */
     private $rolesApplicationRepository;
 
+    /** @var SubeventsApplicationRepository */
+    private $subeventsApplicationRepository;
+
 
     /**
      * ApplicationsGridControl constructor.
@@ -112,7 +116,8 @@ public function __construct(Translator $translator, ApplicationRepository $appli
                                 SettingsRepository $settingsRepository, Authenticator $authenticator,
                                 PdfExportService $pdfExportService, ProgramService $programService,
                                 UserService $userService, Validators $validators,
-                                RolesApplicationRepository $rolesApplicationRepository)
+                                RolesApplicationRepository $rolesApplicationRepository,
+                                SubeventsApplicationRepository $subeventsApplicationRepository)
     {
         parent::__construct();
 
@@ -131,6 +136,7 @@ public function __construct(Translator $translator, ApplicationRepository $appli
         $this->userService = $userService;
         $this->validators = $validators;
         $this->rolesApplicationRepository = $rolesApplicationRepository;
+        $this->subeventsApplicationRepository = $subeventsApplicationRepository;
     }
 
     /**
@@ -264,8 +270,10 @@ public function add($values)
         foreach ($selectedSubevents as $subevent)
             $selectedAndUsersSubevents->add($subevent);
 
+        $p = $this->getPresenter();
+
         if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
-            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
+            $p->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
             $this->redirect('this');
         }
 
@@ -274,21 +282,21 @@ public function add($values)
                 $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
                     ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
                 );
-                $this->getPresenter()->flashMessage($message, 'danger');
+                $p->flashMessage($message, 'danger');
                 $this->redirect('this');
             }
             if (!$this->validators->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
                 $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
                     ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
                 );
-                $this->getPresenter()->flashMessage($message, 'danger');
+                $p->flashMessage($message, 'danger');
                 $this->redirect('this');
             }
         }
 
         $this->applicationService->addSubeventsApplication($this->user, $selectedSubevents, $this->user);
 
-        $this->getPresenter()->flashMessage('web.profile.applications_add_subevents_successful', 'success');
+        $p->flashMessage('web.profile.applications_add_subevents_successful', 'success');
         $this->redirect('this');
     }
 
@@ -308,9 +316,13 @@ public function edit($id, $values)
         $selectedAndUsersSubevents = clone $this->user->getSubevents();
         foreach ($selectedSubevents as $subevent)
             $selectedAndUsersSubevents->add($subevent);
+        foreach ($application->getSubevents() as $subevent)
+            $selectedAndUsersSubevents->removeElement($subevent);
+
+        $p = $this->getPresenter();
 
         if (!$this->validators->validateSubeventsCapacities($selectedSubevents, $this->user)) {
-            $this->getPresenter()->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
+            $p->flashMessage('web.profile.applications_subevents_capacity_occupied', 'danger');
             $this->redirect('this');
         }
 
@@ -319,21 +331,21 @@ public function edit($id, $values)
                 $message = $this->translator->translate('web.profile.applications_incompatible_subevents_selected', NULL,
                     ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
                 );
-                $this->getPresenter()->flashMessage($message, 'danger');
+                $p->flashMessage($message, 'danger');
                 $this->redirect('this');
             }
             if (!$this->validators->validateSubeventsRequired($selectedAndUsersSubevents, $subevent)) {
                 $message = $this->translator->translate('web.profile.applications_required_subevents_not_selected', NULL,
                     ['subevent' => $subevent->getName(), 'requiredSubevents' => $subevent->getRequiredSubeventsTransitiveText()]
                 );
-                $this->getPresenter()->flashMessage($message, 'danger');
+                $p->flashMessage($message, 'danger');
                 $this->redirect('this');
             }
         }
 
         $this->applicationService->updateSubeventsApplication($application, $selectedSubevents, $this->user);
 
-        $this->getPresenter()->flashMessage('web.profile.applications_edit_successful', 'success');
+        $p->flashMessage('web.profile.applications_edit_successful', 'success');
         $this->redirect('this');
     }
 
diff --git a/app/WebModule/components/templates/application_content.latte b/app/WebModule/components/templates/application_content.latte
index 7fcc2093f..3bde460ec 100644
--- a/app/WebModule/components/templates/application_content.latte
+++ b/app/WebModule/components/templates/application_content.latte
@@ -71,13 +71,14 @@
 
                         <br><br>
 
-                        {*TODO tabulka s přehledem cen*}
                         <table class="table table-bordered table-striped" style="background-color: #ffffff">
                             <thead>
                                 <tr>
                                     <th>{_web.application_content.application_date}</th>
-                                    <th>{_web.application_content.application_roles}</th>
-                                    {if $subeventsExists}
+                                    {if $userHasFixedFeeRole}
+                                        <th>{_web.application_content.application_roles}</th>
+                                    {/if}
+                                    {if $explicitSubeventsExists}
                                         <th>{_web.application_content.application_subevents}</th>
                                     {/if}
                                     <th>{_web.application_content.application_fee}</th>
@@ -87,18 +88,18 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                {foreach $dbuser->getNotCanceledApplications() as $application}
+                                {foreach $usersApplications as $application}
                                     <tr>
                                         <td>{$application->getApplicationDate()->format('j. n. Y')}</td>
-                                        <td>
-
-                                        </td>
-                                        {if $subeventsExists}
+                                        {if $userHasFixedFeeRole}
+                                            <td>{$application->getRolesText()}</td>
+                                        {/if}
+                                        {if $explicitSubeventsExists}
                                             <td>{$application->getSubeventsText()}</td>
                                         {/if}
                                         <td>{$application->getFee()}</td>
                                         <td>{$application->getVariableSymbolText()}</td>
-                                        {*<td>{$application->getMaturityDate()->format('j. n. Y')}</td>*}
+                                        <td>{$application->getMaturityDate() ? $application->getMaturityDate()->format('j. n. Y') : ""}</td>
                                         <td>{_'common.application_state.'.$application->getState()}</td>
                                     </tr>
                                 {/foreach}
diff --git a/app/WebModule/forms/ApplicationForm.php b/app/WebModule/forms/ApplicationForm.php
index 0cd43873c..0309394a0 100644
--- a/app/WebModule/forms/ApplicationForm.php
+++ b/app/WebModule/forms/ApplicationForm.php
@@ -370,7 +370,7 @@ private function addSubeventsSelect(Form $form)
 
             //generovani chybovych hlasek pro vsechny kombinace podakci
             foreach ($this->subeventRepository->findAllExplicitOrderedByName() as $subevent) {
-                if (!$subevent->getIncompatibleSubevents()-isEmpty()) {
+                if (!$subevent->getIncompatibleSubevents()->isEmpty()) {
                     $subeventsSelect->addRule([$this, 'validateSubeventsIncompatible'],
                         $form->getTranslator()->translate('web.application_content.incompatible_subevents_selected', NULL,
                             ['subevent' => $subevent->getName(), 'incompatibleSubevents' => $subevent->getIncompatibleSubeventsText()]
diff --git a/app/lang/admin.cs_CZ.neon b/app/lang/admin.cs_CZ.neon
index 1f61ad6c3..cec0dc70d 100644
--- a/app/lang/admin.cs_CZ.neon
+++ b/app/lang/admin.cs_CZ.neon
@@ -303,7 +303,7 @@ users:
     users_fee_remaining: "Zbývá doplatit"
     users_payment_method: "Platební metoda"
     users_variable_symbol: "Variabilní symbol"
-    users_first_application_date: "Datum první přihlášky"
+    users_roles_application_date: "Datum přihlášení"
     users_last_payment_date: "Datum poslední platby"
     users_payment_date: "Zaplaceno dne"
     users_income_proof_printed_date: "Doklad vytištěn"
@@ -329,7 +329,7 @@ users:
     users_group_action_generate_payment_proofs: "Vygenerovat doklady o zaplacení"
     users_group_action_export_users: "Vyexportovat seznam uživatelů"
     users_group_action_export_subevents_and_categories: "Vyexportovat seznam uživatelů s podakcemi a programy podle kategorií"
-    users_group_action_export_roles: "Vyexportovat seznam s rolemi"
+    users_group_action_export_roles: "Vyexportovat seznam uživatelů s rolemi"
     users_group_action_export_schedules: "Vyexportovat harmonogramy"
     users_group_action_change_roles: "Nastavit role"
     users_group_action_changed_roles: "Vybraným uživatelům byly úspěšně nastaveny role."
@@ -351,6 +351,7 @@ users:
     users_applications_roles: "Role"
     users_applications_subevents: "Podakce"
     users_applications_subevents_empty: "Musí být vybrána alespoň jedna podakce."
+    users_applications_subevents_not_empty: "Nesmí být vybrána žádná podakce."
     users_applications_subevents_occupied: "Všechna místa na některé podakci jsou obsazena."
     users_applications_subevents_registered: "Na některou ze zvolených podakcí je uživatel již přihlášen."
     users_applications_fee: "Cena"
@@ -504,8 +505,9 @@ configuration:
     subevents_heading: "Podakce"
     subevents_name: "Název"
     subevents_name_empty: "Zadejte název."
-    subevents_implicit: "Skrytá"
+    subevents_implicit: "Systémová"
     subevents_fee: "Cena"
+    subevents_fee_empty: "Zadejte cenu."
     subevents_fee_format: "Zadejte číslo."
     subevents_capacity: "Kapacita"
     subevents_capacity_format: "Zadejte číslo."
diff --git a/app/model/Program/Program.php b/app/model/Program/Program.php
index fbc335dd0..1b81a10db 100644
--- a/app/model/Program/Program.php
+++ b/app/model/Program/Program.php
@@ -104,7 +104,7 @@ public function setAttendees(Collection $attendees)
     /**
      * @param $user
      */
-    public function addAttendee($user)
+    public function addAttendee(User $user)
     {
         if (!$this->attendees->contains($user)) {
             $this->attendees->add($user);
diff --git a/app/model/Structure/Subevent.php b/app/model/Structure/Subevent.php
index 8e7d4edc6..28faa223d 100644
--- a/app/model/Structure/Subevent.php
+++ b/app/model/Structure/Subevent.php
@@ -3,6 +3,7 @@
 namespace App\Model\Structure;
 
 use App\Model\ACL\Role;
+use App\Model\Enums\ApplicationState;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
@@ -37,7 +38,7 @@ class Subevent
 
     /**
      * Přihlášky.
-     * @ORM\ManyToMany(targetEntity="\App\Model\User\Application", mappedBy="subevents", cascade={"persist"})
+     * @ORM\ManyToMany(targetEntity="\App\Model\User\SubeventsApplication", mappedBy="subevents", cascade={"persist"})
      * @var Collection
      */
     protected $applications;
diff --git a/app/model/User/Application/Application.php b/app/model/User/Application/Application.php
index a74771add..240c7e052 100644
--- a/app/model/User/Application/Application.php
+++ b/app/model/User/Application/Application.php
@@ -2,7 +2,9 @@
 
 namespace App\Model\User;
 
+use App\Model\ACL\Role;
 use App\Model\Enums\ApplicationState;
+use App\Model\Structure\Subevent;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
@@ -55,6 +57,20 @@ abstract class Application
      */
     protected $user;
 
+    /**
+     * Role.
+     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
+     * @var Collection
+     */
+    protected $roles;
+
+    /**
+     * Podakce.
+     * @ORM\ManyToMany(targetEntity="\App\Model\Structure\Subevent", inversedBy="applications", cascade={"persist"})
+     * @var Collection
+     */
+    protected $subevents;
+
     /**
      * Poplatek.
      * @ORM\Column(type="integer")
@@ -131,6 +147,15 @@ abstract class Application
      */
     protected $validTo;
 
+    /**
+     * Application constructor.
+     */
+    public function __construct()
+    {
+        $this->roles = new ArrayCollection();
+        $this->subevents = new ArrayCollection();
+    }
+
 
     /**
      * @return int
@@ -180,24 +205,38 @@ public function setUser($user)
         $this->user = $user;
     }
 
+    /**
+     * @return Collection
+     */
     public function getRoles(): Collection
     {
-        return new ArrayCollection();
+        return $this->roles;
     }
 
-    public function getRolesText(): ?string
+    /**
+     * Vrací názvy rolí oddělené čárkou.
+     * @return string
+     */
+    public function getRolesText() : string
     {
-        return NULL;
+        return implode(', ', $this->roles->map(function (Role $role) {return $role->getName();})->toArray());
     }
 
+    /**
+     * @return Collection
+     */
     public function getSubevents(): Collection
     {
-        return new ArrayCollection();
+        return $this->subevents;
     }
 
-    public function getSubeventsText(): ?string
+    /**
+     * Vrací názvy podakcí oddělené čárkou.
+     * @return string
+     */
+    public function getSubeventsText() : string
     {
-        return NULL;
+        return implode(', ', $this->subevents->map(function (Subevent $subevent) {return $subevent->getName();})->toArray());
     }
 
     /**
@@ -362,7 +401,7 @@ public function setState($state)
     /**
      * @return User
      */
-    public function getCreatedBy(): User
+    public function getCreatedBy(): ?User
     {
         return $this->createdBy;
     }
@@ -370,7 +409,7 @@ public function getCreatedBy(): User
     /**
      * @param User $createdBy
      */
-    public function setCreatedBy(User $createdBy)
+    public function setCreatedBy(?User $createdBy)
     {
         $this->createdBy = $createdBy;
     }
diff --git a/app/model/User/Application/RolesApplication.php b/app/model/User/Application/RolesApplication.php
index a79e9fc73..e668b3265 100644
--- a/app/model/User/Application/RolesApplication.php
+++ b/app/model/User/Application/RolesApplication.php
@@ -19,29 +19,6 @@ class RolesApplication extends Application
 {
     protected $type = Application::ROLES;
 
-    /**
-     * Role.
-     * @ORM\ManyToMany(targetEntity="\App\Model\ACL\Role")
-     * @var Collection
-     */
-    protected $roles;
-
-
-    /**
-     * RolesApplication constructor.
-     */
-    public function __construct()
-    {
-        $this->subevents = new ArrayCollection();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getRoles(): Collection
-    {
-        return $this->roles;
-    }
 
     /**
      * @param Collection $roles
@@ -50,13 +27,4 @@ public function setRoles(Collection $roles): void
     {
         $this->roles = $roles;
     }
-
-    /**
-     * Vrací názvy rolí oddělené čárkou.
-     * @return string
-     */
-    public function getRolesText(): ?string
-    {
-        return implode(', ', $this->roles->map(function (Role $role) {return $role->getName();})->toArray());
-    }
 }
diff --git a/app/model/User/Application/SubeventsApplication.php b/app/model/User/Application/SubeventsApplication.php
index 6724bd1cd..9c286953c 100644
--- a/app/model/User/Application/SubeventsApplication.php
+++ b/app/model/User/Application/SubeventsApplication.php
@@ -19,29 +19,6 @@ class SubeventsApplication extends Application
 {
     protected $type = Application::SUBEVENTS;
 
-    /**
-     * Podakce.
-     * @ORM\ManyToMany(targetEntity="\App\Model\Structure\Subevent", inversedBy="applications", cascade={"persist"})
-     * @var Collection
-     */
-    protected $subevents;
-
-
-    /**
-     * SubeventsApplication constructor.
-     */
-    public function __construct()
-    {
-        $this->subevents = new ArrayCollection();
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getSubevents(): Collection
-    {
-        return $this->subevents;
-    }
 
     /**
      * @param Collection $subevents
@@ -50,13 +27,4 @@ public function setSubevents(Collection $subevents): void
     {
         $this->subevents = $subevents;
     }
-
-    /**
-     * Vrací názvy podakcí oddělené čárkou.
-     * @return string
-     */
-    public function getSubeventsText(): ?string
-    {
-        return implode(', ', $this->subevents->map(function (Subevent $subevent) {return $subevent->getName();})->toArray());
-    }
 }
diff --git a/app/model/User/User.php b/app/model/User/User.php
index ce6956938..c46dd7918 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -486,6 +486,17 @@ public function getNotCanceledApplications(): Collection
         });
     }
 
+    /**
+     * Vrátí nezrušené přihlášky na rolí.
+     * @return Collection|RolesApplication[]
+     */
+    public function getNotCanceledRolesApplications(): Collection
+    {
+        return $this->getNotCanceledApplications()->filter(function (Application $application) {
+            return $application->getType() == Application::ROLES;
+        });
+    }
+
     /**
      * Vrátí nezrušené přihlášky na podakce.
      * @return Collection|SubeventsApplication[]
@@ -614,7 +625,6 @@ public function addProgram(Program $program)
     {
         if (!$this->programs->contains($program)) {
             $this->programs->add($program);
-            $program->addAttendee($this);
         }
     }
 
@@ -634,11 +644,9 @@ public function removeProgram(Program $program)
      */
     public function hasProgramBlock(Block $block)
     {
-        $criteria = Criteria::create()->where(
-            Criteria::expr()->eq('block_id', $block->getId())
-        );
-
-        return !$this->programs->matching($criteria)->isEmpty();
+        return !$this->programs->filter(function (Program $program) use ($block) {
+            return $program->getBlock() === $block;
+        });
     }
 
     /**
@@ -1244,24 +1252,22 @@ public function hasFixedFeeRole(): bool
     public function hasPaidSubevent(Subevent $subevent)
     {
         foreach ($this->getPaidAndFreeApplications() as $application)
-            if ($application->getType() == Application::SUBEVENTS && $application->getSubevents->contains($subevent))
+            if ($application->getType() == Application::SUBEVENTS && $application->getSubevents()->contains($subevent))
                 return TRUE;
 
         return FALSE;
     }
 
     /**
-     * Vrací datum první přihlášky.
+     * Vrací datum přihlášení.
      * @return \DateTime|null
      */
-    public function getFirstApplicationDate()
+    public function getRolesApplicationDate()
     {
-        $minDate = NULL;
-        foreach ($this->getValidApplications() as $application) {
-            if ($minDate === NULL || $minDate > $application->getApplicationDate())
-                $minDate = $application->getApplicationDate();
+        foreach ($this->getNotCanceledRolesApplications() as $application) {
+            return $application->getApplicationDate();
         }
-        return $minDate;
+        return NULL;
     }
 
     /**
diff --git a/app/model/User/UserRepository.php b/app/model/User/UserRepository.php
index cecb5d5b7..1d2572f10 100644
--- a/app/model/User/UserRepository.php
+++ b/app/model/User/UserRepository.php
@@ -147,9 +147,9 @@ public function findAllWithWaitingForPaymentApplication(): Collection
     /**
      * Vrací uživatele, kteří se mohou na program přihlásit.
      * @param $program
-     * @return array
+     * @return Collection|User[]
      */
-    public function findProgramAllowed(Program $program)
+    public function findProgramAllowed(Program $program): Collection
     {
         $qb = $this->createQueryBuilder('u')
             ->leftJoin('u.programs', 'p', 'WITH', 'p.id = :pid')
@@ -172,8 +172,7 @@ public function findProgramAllowed(Program $program)
                 ->setParameter('cid', $program->getBlock()->getCategory()->getId());
         }
 
-        return $qb->getQuery()
-            ->getResult();
+        return new ArrayCollection($qb->getQuery()->getResult());
     }
 
     /**
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index dc88edf9b..af9cb060e 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -164,7 +164,7 @@ public function register(User $user, Collection $roles, Collection $subevents, U
      * @return bool
      * @throws \Throwable
      */
-    public function updateRoles(User $user, Collection $roles, User $createdBy, bool $approve = FALSE): void
+    public function updateRoles(User $user, Collection $roles, ?User $createdBy, bool $approve = FALSE): void
     {
         $oldRoles = clone $user->getRoles();
 
@@ -245,7 +245,7 @@ public function updateRoles(User $user, Collection $roles, User $createdBy, bool
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function cancelRegistration(User $user, string $state, User $createdBy): void
+    public function cancelRegistration(User $user, string $state, ?User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($user, $state, $createdBy) {
             $user->setApproved(TRUE);
@@ -306,8 +306,8 @@ public function updateSubeventsApplication(SubeventsApplication $application, Co
 
         //pokud se podakce nezmenily, nic se neprovede
         if ($subevents->count() == $oldSubevents->count()) {
-            $subeventsArray = $subevents->map(function (Role $role) {return $role->getId();})->toArray();
-            $oldSubeventsArray = $oldSubevents->map(function (Role $role) {return $role->getId();})->toArray();
+            $subeventsArray = $subevents->map(function (Subevent $subevent) {return $subevent->getId();})->toArray();
+            $oldSubeventsArray = $oldSubevents->map(function (Subevent $subevent) {return $subevent->getId();})->toArray();
 
             if (array_diff($subeventsArray, $oldSubeventsArray) === array_diff($oldSubeventsArray, $subeventsArray))
                 return;
@@ -344,7 +344,7 @@ public function updateSubeventsApplication(SubeventsApplication $application, Co
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function cancelSubeventsApplication(SubeventsApplication $application, string $state, User $createdBy): void
+    public function cancelSubeventsApplication(SubeventsApplication $application, string $state, ?User $createdBy): void
     {
         $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application, $state, $createdBy) {
             $user = $application->getUser();
@@ -380,8 +380,8 @@ public function cancelSubeventsApplication(SubeventsApplication $application, st
      * @param User $createdBy
      * @throws \Throwable
      */
-    public function updatePayment(Application $application, string $variableSymbol, string $paymentMethod,
-                                  \DateTime $paymentDate, \DateTime $incomeProofPrintedDate, \DateTime $maturityDate,
+    public function updatePayment(Application $application, string $variableSymbol, ?string $paymentMethod,
+                                  ?\DateTime $paymentDate, ?\DateTime $incomeProofPrintedDate, ?\DateTime $maturityDate,
                                   User $createdBy): void
     {
         $oldVariableSymbol = $application->getVariableSymbolText();
@@ -430,7 +430,7 @@ public function updatePayment(Application $application, string $variableSymbol,
         });
 
         if ($paymentDate !== NULL && $oldPaymentDate === NULL) {
-            $this->mailService->sendMailFromTemplate($this->user, '', Template::PAYMENT_CONFIRMED, [
+            $this->mailService->sendMailFromTemplate($application->getUser(), '', Template::PAYMENT_CONFIRMED, [
                 TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
                 TemplateVariable::APPLICATION_SUBEVENTS => $application->getSubeventsText()
             ]);
@@ -585,13 +585,13 @@ private function countSubeventsFee(Collection $roles, Collection $subevents)
                 foreach ($subevents as $subevent) {
                     $fee += $subevent->getFee();
                 }
-                return $fee;
+                break;
             }
         }
 
-        //TODO sleva
+        $discount = $this->discountService->countDiscount($this->subeventRepository->findSubeventsIds($subevents));
 
-        return $fee;
+        return $fee - $discount;
     }
 
     /**
diff --git a/app/services/ExcelExportService.php b/app/services/ExcelExportService.php
index 13b5881cd..1242fe864 100644
--- a/app/services/ExcelExportService.php
+++ b/app/services/ExcelExportService.php
@@ -421,17 +421,15 @@ public function exportUsersList($users, $filename)
 
             $sheet->setCellValueByColumnAndRow($column++, $row, $user->getLastPaymentDate() !== NULL ? $user->getLastPaymentDate()->format("j. n. Y") : '');
 
-            $sheet->setCellValueByColumnAndRow($column++, $row, $user->getFirstApplicationDate() !== NULL ? $user->getFirstApplicationDate()->format("j. n. Y") : '');
+            $sheet->setCellValueByColumnAndRow($column++, $row, $user->getRolesApplicationDate() !== NULL ? $user->getRolesApplicationDate()->format("j. n. Y") : '');
 
             $sheet->setCellValueByColumnAndRow($column++, $row, $user->isAttended()
                 ? $this->translator->translate('common.export.common.yes')
                 : $this->translator->translate('common.export.common.no')
             );
 
-            $sheet->setCellValueByColumnAndRow($column++, $row,
-                ($user->isAllowed(Resource::PROGRAM, Permission::CHOOSE_PROGRAMS) && $user->isApproved())
-                    ? implode(', ', $this->programService->getUnregisteredUserMandatoryBlocksNames($user))
-                    : ''
+            $sheet->setCellValueByColumnAndRow($column++, $row, $user->isAllowedRegisterPrograms()
+                    ? $this->programService->getUnregisteredUserMandatoryBlocksNamesText($user) : ''
             );
 
             foreach ($this->customInputRepository->findAllOrderedByPosition() as $customInput) {
@@ -522,8 +520,7 @@ public function exportUsersSubeventsAndCategories($users, $filename)
             $column = 0;
 
             $sheet->getCellByColumnAndRow($column++, $row)
-                ->setValueExplicit($user->getFirstApplication() ? $user->getFirstApplication()->getVariableSymbol() : '',
-                    PHPExcel_Cell_DataType::TYPE_STRING);
+                ->setValueExplicit($user->getVariableSymbolsText(), PHPExcel_Cell_DataType::TYPE_STRING);
 
             $sheet->setCellValueByColumnAndRow($column++, $row, $user->getFirstName());
 
diff --git a/app/services/PdfExportService.php b/app/services/PdfExportService.php
index de1a47711..d1c07a1e0 100644
--- a/app/services/PdfExportService.php
+++ b/app/services/PdfExportService.php
@@ -119,7 +119,7 @@ public function generateUsersPaymentProof(User $user, $filename, User $createdBy
      */
     private function prepareUsersPaymentProof(User $user, User $createdBy)
     {
-        foreach ($user->getApplications() as $application) {
+        foreach ($user->getNotCanceledApplications() as $application) {
             $this->prepareApplicationsPaymentProof($application, $createdBy);
         }
     }
diff --git a/app/services/ProgramService.php b/app/services/ProgramService.php
index 7bb6a6a1b..0747f3f23 100644
--- a/app/services/ProgramService.php
+++ b/app/services/ProgramService.php
@@ -95,17 +95,16 @@ public function updateUserPrograms(User $user)
     public function updateUsersPrograms($users)
     {
         foreach ($users as $user) {
-            $oldUsersPrograms = $user->getPrograms();
+            $oldUsersPrograms = clone $user->getPrograms();
             $userAllowedPrograms = $this->getUserAllowedPrograms($user);
 
-            $newUsersPrograms = new ArrayCollection();
+            $user->getPrograms()->clear();
 
             foreach ($userAllowedPrograms as $userAllowedProgram) {
                 if ($userAllowedProgram->getBlock()->getMandatory() == 2 || $oldUsersPrograms->contains($userAllowedProgram))
-                    $newUsersPrograms->add($userAllowedProgram);
+                    $user->addProgram($userAllowedProgram);
             }
 
-            $user->setPrograms($newUsersPrograms);
             $this->userRepository->save($user);
         }
     }
diff --git a/migrations/Version20171227203925.php b/migrations/Version20171227203925.php
new file mode 100644
index 000000000..84ea1bb80
--- /dev/null
+++ b/migrations/Version20171227203925.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace Migrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+class Version20171227203925 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
+
+        $this->addSql('CREATE TABLE application_role (application_id INT NOT NULL, role_id INT NOT NULL, INDEX IDX_A085E2E23E030ACD (application_id), INDEX IDX_A085E2E2D60322AC (role_id), PRIMARY KEY(application_id, role_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('CREATE TABLE application_subevent (application_id INT NOT NULL, subevent_id INT NOT NULL, INDEX IDX_FE263A6E3E030ACD (application_id), INDEX IDX_FE263A6E7A675502 (subevent_id), PRIMARY KEY(application_id, subevent_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB');
+        $this->addSql('ALTER TABLE application_role ADD CONSTRAINT FK_A085E2E23E030ACD FOREIGN KEY (application_id) REFERENCES application (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE application_role ADD CONSTRAINT FK_A085E2E2D60322AC FOREIGN KEY (role_id) REFERENCES role (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE application_subevent ADD CONSTRAINT FK_FE263A6E3E030ACD FOREIGN KEY (application_id) REFERENCES application (id) ON DELETE CASCADE');
+        $this->addSql('ALTER TABLE application_subevent ADD CONSTRAINT FK_FE263A6E7A675502 FOREIGN KEY (subevent_id) REFERENCES subevent (id) ON DELETE CASCADE');
+        $this->addSql('DROP TABLE roles_application_role');
+        $this->addSql('DROP TABLE subevents_application_subevent');
+    }
+
+    public function down(Schema $schema)
+    {
+    }
+}

From 4b1d45c3c91052336e1e4c58aa5b98978f2fe989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= <jan@jstanek.cz>
Date: Wed, 27 Dec 2017 22:58:20 +0100
Subject: [PATCH 11/11] php version, coding standard

---
 .travis.yml                         |  2 +-
 app/model/User/User.php             |  4 ++--
 app/model/User/VariableSymbol.php   |  2 +-
 app/services/ApplicationService.php | 37 ++++++++++++++++++-----------
 app/utils/Validators.php            |  2 +-
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e943a7d7a..c6e115821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: php
 
-php: 5.6
+php: 7.1
 
 before_install:
   - composer self-update
diff --git a/app/model/User/User.php b/app/model/User/User.php
index c46dd7918..8c3d270c5 100644
--- a/app/model/User/User.php
+++ b/app/model/User/User.php
@@ -390,8 +390,8 @@ public function removeRole(Role $role)
     public function isInRole(Role $role)
     {
         return $this->roles->filter(function ($item) use ($role) {
-                return $item == $role;
-            })->count() != 0;
+            return $item == $role;
+        })->count() != 0;
     }
 
     /**
diff --git a/app/model/User/VariableSymbol.php b/app/model/User/VariableSymbol.php
index a816f1753..06f3dd3bc 100644
--- a/app/model/User/VariableSymbol.php
+++ b/app/model/User/VariableSymbol.php
@@ -48,4 +48,4 @@ public function setVariableSymbol(string $variableSymbol)
     {
         $this->variableSymbol = $variableSymbol;
     }
-}
\ No newline at end of file
+}
diff --git a/app/services/ApplicationService.php b/app/services/ApplicationService.php
index af9cb060e..c83cbe623 100644
--- a/app/services/ApplicationService.php
+++ b/app/services/ApplicationService.php
@@ -9,7 +9,6 @@
 use App\Model\Mailing\Template;
 use App\Model\Mailing\TemplateVariable;
 use App\Model\Settings\Settings;
-use App\Model\Settings\SettingsException;
 use App\Model\Settings\SettingsRepository;
 use App\Model\Structure\DiscountRepository;
 use App\Model\Structure\Subevent;
@@ -26,8 +25,6 @@
 use Doctrine\Common\Collections\Collection;
 use Kdyby\Translation\Translator;
 use Nette;
-use Ublaboo\Mailing\Exception\MailingException;
-use Ublaboo\Mailing\Exception\MailingMailCreationException;
 
 
 /**
@@ -170,8 +167,12 @@ public function updateRoles(User $user, Collection $roles, ?User $createdBy, boo
 
         //pokud se role nezmenily, nic se neprovede
         if ($roles->count() == $oldRoles->count()) {
-            $rolesArray = $roles->map(function (Role $role) {return $role->getId();})->toArray();
-            $oldRolesArray = $oldRoles->map(function (Role $role) {return $role->getId();})->toArray();
+            $rolesArray = $roles->map(function (Role $role) {
+                return $role->getId();
+            })->toArray();
+            $oldRolesArray = $oldRoles->map(function (Role $role) {
+                return $role->getId();
+            })->toArray();
 
             if (array_diff($rolesArray, $oldRolesArray) === array_diff($oldRolesArray, $rolesArray))
                 return;
@@ -190,8 +191,8 @@ public function updateRoles(User $user, Collection $roles, ?User $createdBy, boo
                 })) {
                     $user->setApproved(TRUE);
                 } elseif (!$approve && $roles->exists(function (int $key, Role $role) use ($oldRoles) {
-                        return !$role->isApprovedAfterRegistration() && !$oldRoles->contains($role);
-                    })) {
+                    return !$role->isApprovedAfterRegistration() && !$oldRoles->contains($role);
+                })) {
                     $user->setApproved(FALSE);
                 }
 
@@ -236,7 +237,9 @@ public function updateRoles(User $user, Collection $roles, ?User $createdBy, boo
 
         $this->mailService->sendMailFromTemplate($user, '', Template::ROLES_CHANGED, [
             TemplateVariable::SEMINAR_NAME => $this->settingsRepository->getValue(Settings::SEMINAR_NAME),
-            TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {return $role->getName();})->toArray())
+            TemplateVariable::USERS_ROLES => implode(', ', $roles->map(function (Role $role) {
+                return $role->getName();
+            })->toArray())
         ]);
     }
 
@@ -306,8 +309,12 @@ public function updateSubeventsApplication(SubeventsApplication $application, Co
 
         //pokud se podakce nezmenily, nic se neprovede
         if ($subevents->count() == $oldSubevents->count()) {
-            $subeventsArray = $subevents->map(function (Subevent $subevent) {return $subevent->getId();})->toArray();
-            $oldSubeventsArray = $oldSubevents->map(function (Subevent $subevent) {return $subevent->getId();})->toArray();
+            $subeventsArray = $subevents->map(function (Subevent $subevent) {
+                return $subevent->getId();
+            })->toArray();
+            $oldSubeventsArray = $oldSubevents->map(function (Subevent $subevent) {
+                return $subevent->getId();
+            })->toArray();
 
             if (array_diff($subeventsArray, $oldSubeventsArray) === array_diff($oldSubeventsArray, $subeventsArray))
                 return;
@@ -396,8 +403,10 @@ public function updatePayment(Application $application, string $variableSymbol,
             && $maturityDate == $oldMaturityDate)
             return;
 
-        $this->applicationRepository->getEntityManager()->transactional(function ($em) use ($application,
-            $variableSymbol, $paymentMethod, $paymentDate, $incomeProofPrintedDate, $maturityDate, $createdBy) {
+        $this->applicationRepository->getEntityManager()->transactional(function ($em) use (
+            $application,
+            $variableSymbol, $paymentMethod, $paymentDate, $incomeProofPrintedDate, $maturityDate, $createdBy
+        ) {
             $user = $application->getUser();
 
             $newApplication = clone $application;
@@ -449,8 +458,8 @@ private function createRolesApplication(User $user, Collection $roles, User $cre
     {
         $user->setApproved(TRUE);
         if (!$approve && $roles->exists(function (int $key, Role $role) {
-                return !$role->isApprovedAfterRegistration();
-            }))
+            return !$role->isApprovedAfterRegistration();
+        }))
             $user->setApproved(FALSE);
 
         $user->setRoles($roles);
diff --git a/app/utils/Validators.php b/app/utils/Validators.php
index 467ae0cb0..cf4703b4a 100644
--- a/app/utils/Validators.php
+++ b/app/utils/Validators.php
@@ -199,4 +199,4 @@ public function validateSubeventsRegistered(Collection $selectedSubevents, User
         }
         return TRUE;
     }
-}
\ No newline at end of file
+}