Revize d5a16eb6

Re #7330 grid pro správu uživatelů a formuláře

app/AdminModule/component/User/UserEditForm.latte

@@ +1 @@
+<div class="row">
+    <div class="col-4">
+        {form form class=> 'form'}
+            <div class="alert alert-danger" n:if="$form->hasErrors()">
+                <ul class="ul-alert">
+                    <li n:foreach="$form->errors as $error">{$error}</li>
+                </ul>
+            </div>
+
+            <div class="row mt-2">
+                <div class="col-4">
+                    {label \App\Model\Repository\UserRepository::COLUMN_USERNAME class => 'label-required'}
+                </div>
+                <div class="col-8">
+                    {input \App\Model\Repository\UserRepository::COLUMN_USERNAME class => 'form-control'}
+                </div>
+            </div>
+            <div class="row mt-2">
+                <div class="col-4">
+                    {label \App\Model\Repository\UserRepository::COLUMN_LOGIN class => 'label-required'}
+                </div>
+                <div class="col-8">
+                    {input \App\Model\Repository\UserRepository::COLUMN_LOGIN class => 'form-control'}
+                </div>
+            </div>
+            <div class="row mt-2">
+                <div class="col-4">
+                    {label \App\Model\Repository\UserRepository::COLUMN_PASSWORD class => 'label-required'}
+                </div>
+                <div class="col-8">
+                    {input \App\Model\Repository\UserRepository::COLUMN_PASSWORD class => 'form-control'}
+                </div>
+            </div>
+            <div class="row mt-2">
+                <div class="col-4">
+                    {label \App\AdminModule\Components\UserEditForm::PASSWORD_CONFIRM class => 'label-required'}
+                </div>
+                <div class="col-8">
+                    {input \App\AdminModule\Components\UserEditForm::PASSWORD_CONFIRM class => 'form-control'}
+                </div>
+            </div>
+            <div class="row mt-2">
+                <div class="col-4">
+                    {label \App\Model\Repository\UserRoleRepository::COLUMN_ROLE_ID  class => 'label-required'}
+                </div>
+                <div class="col-8">
+                    {input \App\Model\Repository\UserRoleRepository::COLUMN_ROLE_ID class => 'form-control'}
+                </div>
+            </div>
+            <div class="row mt-2">
+                <div class="col-4">
+                    {label \App\Model\Repository\UserRepository::COLUMN_EMAIL}
+                </div>
+                <div class="col-8">
+                    {input \App\Model\Repository\UserRepository::COLUMN_EMAIL class => 'form-control'}
+                </div>
+            </div>
+
+            <div class="row">
+                <div class="col-8 offset-4">
+                    {input submit class => 'form-control btn btn-success mt-4'}
+                </div>
+            </div>
+        {/form}
+    </div>
+</div>

app/AdminModule/component/User/UserEditForm.php

@@ +1 @@
+<?php
+
+
+namespace App\AdminModule\Components;
+
+
+use App\Enum\EFlashMessage;
+use App\Model\Facade\UserFacade;
+use App\Model\Repository\RoleRepository;
+use App\Model\Repository\UserRepository;
+use App\Model\Repository\UserRoleRepository;
+use Nette\Application\UI\Control;
+use Nette\Application\UI\Form;
+
+class UserEditForm extends Control
+{
+    const PASSWORD_CONFIRM = 'password_confirm';
+
+    /** @var Form  */
+    private $form;
+
+    /** @var int ID uživatele */
+    private $userId;
+
+    /**
+     * @var UserRepository
+     */
+    private $userRepository;
+    /**
+     * @var UserRoleRepository
+     */
+    private $userRoleRepository;
+    /**
+     * @var RoleRepository
+     */
+    private $roleRepository;
+    /**
+     * @var UserFacade
+     */
+    private $userFacade;
+
+    public function __construct(UserRepository $userRepository,
+                                UserRoleRepository $userRoleRepository,
+                                RoleRepository $roleRepository,
+                                UserFacade $userFacade
+    )
+    {
+        parent::__construct();
+
+        $this->roleRepository = $roleRepository;
+
+        $this->userId = NULL;
+        $this->form = new Form;
+        $this->userRepository = $userRepository;
+        $this->userRoleRepository = $userRoleRepository;
+        $this->userFacade = $userFacade;
+    }
+
+    public function render()
+    {
+        $this->template->setFile(__DIR__ . '/UserEditForm.latte');
+        $this->template->render();
+    }
+
+    public function createComponentForm()
+    {
+        $this->form->addText(UserRepository::COLUMN_USERNAME, 'Uživatelské jméno');
+        $this->form->addText(UserRepository::COLUMN_LOGIN, 'Login')
+            ->setRequired(TRUE);
+
+        $password = $this->form->addPassword(UserRepository::COLUMN_PASSWORD, 'Heslo');
+        $passwordConfirm = $this->form->addPassword(self::PASSWORD_CONFIRM, 'Potvrzení hesla')
+            ->addRule(Form::EQUAL, 'Hesla se musejí shodovat.', $this->form[UserRepository::COLUMN_PASSWORD]);
+
+        if (empty($this->userId))
+        {
+            $password->setRequired(TRUE);
+            $passwordConfirm->setRequired(TRUE);
+        } else
+        {
+            $password->setRequired(FALSE);
+            $passwordConfirm->setRequired(FALSE);
+        }
+
+        $this->form->addSelect(UserRoleRepository::COLUMN_ROLE_ID, 'Role uživatele', $this->getRoles())
+            ->setPrompt('- Vyberte roli -')
+            ->addRule(Form::REQUIRED, '%label musí být vybrána.', TRUE);
+        $this->form->addText(UserRepository::COLUMN_EMAIL, 'E-mail')
+            ->addRule(Form::EMAIL, 'Prvek %label musí obsahovat validní e-mail.')
+            ->setRequired(FALSE);
+
+        $this->form->setDefaults($this->getDefaults());
+
+        $submitText = empty($this->userId) ? 'Přidat uživatele' : 'Upravit uživatele';
+        $this->form->addSubmit('submit', $submitText);
+
+        $this->form->onValidate[] = [$this, 'formValidate'];
+        $this->form->onSuccess[] = [$this, 'formSuccess'];
+
+        return $this->form;
+    }
+
+    /**
+     * Validace formuláře
+     *
+     * @param Form $form
+     */
+    public function formValidate(Form $form)
+    {
+        $values = $form->getValues();
+
+        // Vkládáme nového uživatele - kontrola existujícího loginu
+        if (empty($this->userId))
+        {
+            if ($this->userRepository->findByLogin($values->{UserRepository::COLUMN_LOGIN}))
+            {
+                $form->addError('Uživatel se zadaným loginem již existuje.');
+            }
+        }
+    }
+
+    public function formSuccess(Form $form)
+    {
+        $result = $this->userFacade->saveUser($form->getValues(true), $this->userId);
+
+        if ($result)
+        {
+            $this->presenter->flashMessage('Uživatel byl úspěšně upraven.', EFlashMessage::SUCCESS);
+            $this->presenter->redirect('User:edit', ['id' => $result->{UserRepository::COLUMN_ID}]);
+        } else
+        {
+            $this->presenter->flashMessage('Uživatele se nepodařilo upravit.', EFlashMessage::ERROR);
+        }
+    }
+
+    /**
+     * Nastaví uživatele do formuláře, pro předvyplnění hodnot formuláře
+     *
+     * @param int $userId
+     */
+    public function setUser(int $userId)
+    {
+        $this->userId = $userId;
+    }
+
+    /**
+     * Vrací hodnoty z databáze při upravování existujícího uživatele
+     *
+     * @return array
+     */
+    private function getDefaults()
+    {
+        $defaultValues = array();
+
+        if(!empty($this->userId))
+        {
+            $userSelection = $this->userRepository->findById($this->userId);
+            $userRow = $userSelection->fetch();
+
+            if ($userRow)
+            {
+                $defaultValues = $userRow->toArray();
+                $roleRow = $userRow->related(UserRoleRepository::TABLE_NAME, UserRoleRepository::COLUMN_USER_ID)->fetch();
+
+                $defaultValues[UserRoleRepository::COLUMN_ROLE_ID] = $roleRow ? $roleRow->{UserRoleRepository::COLUMN_ROLE_ID} : NULL;
+            }
+        }
+
+        return $defaultValues;
+    }
+
+    /**
+     * Vrací možné role uživatele
+     *
+     * @return array
+     */
+    private function getRoles()
+    {
+        return $this->roleRepository->findAll()->fetchPairs(RoleRepository::COLUMN_ID, RoleRepository::COLUMN_NAME);
+    }
+}
+
+interface IUserEditFormFactory
+{
+    /**
+     * @return UserEditForm
+     */
+    public function create();
+}

app/AdminModule/component/User/UserGrid.php

@@ +1 @@
+<?php
+
+
+namespace App\AdminModule\Components;
+
+
+use App\Model\Repository\UserRepository;
+use App\Utils\DataGrid\DataGrid;
+use Ublaboo\DataGrid\Exception\DataGridException;
+
+class UserGrid extends DataGrid
+{
+    /**
+     * @var UserRepository
+     */
+    private $userRepository;
+
+    public function __construct(UserRepository $userRepository)
+    {
+        $this->userRepository = $userRepository;
+
+        parent::__construct(NULL, NULL);
+    }
+
+    /**
+     * Abstraktní metoda, slouží k nastavení primárního klíče a nastavení datasource
+     *  1. $this->setPrimaryKey();
+     *  2. $this->setDataSource();
+     *
+     * @throws DataGridException
+     */
+    public function init()
+    {
+        $this->setPrimaryKey(UserRepository::COLUMN_ID);
+        $this->setDataSource($this->userRepository->findAll());
+    }
+
+    /**
+     * Definice sloupečků, akcí, vyhledávácích filtrů gridu
+     *
+     * @throws DataGridException
+     */
+    public function define()
+    {
+        // Definice sloupečků
+        $this->addColumnNumber(UserRepository::COLUMN_ID, 'ID')->setDefaultHide(TRUE);
+        $this->addColumnText(UserRepository::COLUMN_USERNAME, 'Uživatel');
+        $this->addColumnText(UserRepository::COLUMN_LOGIN, 'Login');
+        $this->addColumnText(UserRepository::COLUMN_EMAIL, 'Email');
+
+        // Definice filtrů
+        $this->addFilterText(UserRepository::COLUMN_USERNAME, 'Uživatel');
+        $this->addFilterText(UserRepository::COLUMN_LOGIN, 'Login');
+        $this->addFilterText(UserRepository::COLUMN_EMAIL, 'Email');
+
+        // Akce
+        $this->addAction('edit', 'upravit', 'User:edit', ['id' => UserRepository::COLUMN_ID])
+            ->setTitle('Editovat');
+
+        $this->addAction('delete', 'smazat', 'deleteUser!', ['id' => UserRepository::COLUMN_ID])
+            ->setConfirm('Opravdu chcete uživatele "%s" odstranit?', UserRepository::COLUMN_LOGIN)
+            ->setTitle('Odstranit')
+            ->setClass('btn btn-xs btn-danger ajax');
+
+        $this->setDefaultPerPage(20);
+    }
+}
+
+interface IUserGridFactory
+{
+    /**
+     * @return UserGrid
+     */
+    public function create();
+}

app/AdminModule/presenters/UserPresenter.php

@@ +1 @@
+<?php
+
+
+namespace App\AdminModule\Presenters;
+
+
+use App\AdminModule\Components\IUserEditFormFactory;
+use App\AdminModule\Components\IUserGridFactory;
+use App\Model\Facade\UserFacade;
+
+class UserPresenter extends BaseAdminPresenter
+{
+    /**
+     * @var IUserGridFactory
+     */
+    private $userGridFactory;
+    /**
+     * @var IUserEditFormFactory
+     */
+    private $userEditFormFactory;
+    /**
+     * @var UserFacade
+     */
+    private $userFacade;
+
+    public function __construct(IUserGridFactory $userGridFactory,
+                                IUserEditFormFactory $userEditFormFactory,
+                                UserFacade $userFacade
+    )
+    {
+        parent::__construct();
+
+        $this->userGridFactory = $userGridFactory;
+        $this->userEditFormFactory = $userEditFormFactory;
+        $this->userFacade = $userFacade;
+    }
+
+    public function actionAdd(){}
+
+    public function actionEdit(int $id)
+    {
+        $this['userEditForm']->setUser($id);
+    }
+
+    public function handleDeleteUser(int $id)
+    {
+        if ($this->isAjax())
+        {
+            $this->userFacade->deleteUser($id);
+            $this['userGrid']->reload();
+        }
+    }
+
+    public function createComponentUserGrid()
+    {
+        return $this->userGridFactory->create();
+    }
+
+    public function createComponentUserEditForm()
+    {
+        return $this->userEditFormFactory->create();
+    }
+}

app/AdminModule/templates/@layout.latte

@@ -6 +6 @@
     <title>{ifset title}{include title|stripHtml} | {/ifset}Old Babylonian Text Corpus</title>
 
     <!-- jQuery -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
-            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+    <script src="https://code.jquery.com/jquery-3.4.0.min.js"
+            integrity="sha256-BJeo0qm959uMBGb65z40ejJYGSgR7REI4+CW1fNKwOg="
             crossorigin="anonymous"></script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.js"
@@ -96 +96 @@
     <!-- <li class="nav-item"><a n:href="Default:default" n:class="nav-link, $presenter->isLinkCurrent('Default:*') ? active" title="Users">
             Users </a></li> -->
 
-    <li class="nav-item"><a href="#" class="nav-link" title="Users">
+    <li class="nav-item"><a n:href="User:default" n:class="nav-link, $presenter->isLinkCurrent('User:*') ? active" title="Users">
             Users </a></li>
-    <li class="nav-item"><a href="#" class="nav-link active" title="Groups">
+    <li class="nav-item"><a href="#" class="nav-link" title="Groups">
             Groups </a></li>
     <li class="nav-item"><a href="#" class="nav-link" title="Rules">
             Rules </a></li>
@@ -126 +126 @@
 
 <!--Content-->
 <div class="content">
-    <div n:foreach="$flashes as $flash" n:class="alert, 'alert-' . $flash->type">{$flash->message}</div>
+    <div n:foreach="$flashes as $flash" n:class="alert, 'alert-' . $flash->type, alert-dismissible, fade, show" role="alert">
+        {$flash->message}
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+        </button>
+    </div>
 
     {include content}
 </div>

app/AdminModule/templates/User/add.latte

@@ +1 @@
+{block content}
+<div class="row">
+    <div class="col-11">
+        <h4>Administrace - Nový uživatel</h4>
+    </div>
+    <div class="col-1">
+        <a n:href="User:default" class="btn btn-sm btn-success"><span class="fa fa-fw fa-list"></span> Seznam uživatelů</a>
+    </div>
+</div>
+{control userEditForm}

app/AdminModule/templates/User/default.latte

@@ +1 @@
+{block content}
+<div class="row">
+    <div class="col-11">
+        <h4>Administrace - Seznam uživatelů</h4>
+    </div>
+    <div class="col-1">
+        <a n:href="User:add" class="btn btn-sm btn-success"><span class="fa fa-fw fa-plus"></span> Přidat uživatele</a>
+    </div>
+</div>
+<div class="row">
+    <div class="col-10 offset-1">
+        {control userGrid}
+    </div>
+</div>

app/AdminModule/templates/User/edit.latte

@@ +1 @@
+{block content}
+<div class="row">
+    <div class="col-11">
+        <h4>Administrace - Editace uživatele</h4>
+    </div>
+    <div class="col-1">
+        <a n:href="User:default" class="btn btn-sm btn-success"><span class="fa fa-fw fa-list"></span> Seznam uživatelů</a>
+    </div>
+</div>
+{control userEditForm}

app/FrontModule/component/Login/LoginForm.latte

@@ -1 @@
-<div class="col-3">
-    {form form class => 'form'}
-        {label \App\Model\Repository\UserRepository::COLUMN_LOGIN}
-        {input \App\Model\Repository\UserRepository::COLUMN_LOGIN class => 'form-control'}
+<div class="row">
+    <div class="col-3">
+        {form form class => 'form'}
+            {label \App\Model\Repository\UserRepository::COLUMN_LOGIN}
+            {input \App\Model\Repository\UserRepository::COLUMN_LOGIN class => 'form-control'}
 
-        {label \App\Model\Repository\UserRepository::COLUMN_PASSWORD}
-        {input \App\Model\Repository\UserRepository::COLUMN_PASSWORD class => 'form-control'}
+            {label \App\Model\Repository\UserRepository::COLUMN_PASSWORD}
+            {input \App\Model\Repository\UserRepository::COLUMN_PASSWORD class => 'form-control'}
 
-        {input submit class => 'form-control btn btn-success mt-4'}
-    {/form}
+            {input submit class => 'form-control btn btn-success mt-4'}
+        {/form}
+    </div>
 </div>

app/FrontModule/templates/@layout.latte

@@ -6 +6 @@
     <title>{ifset title}{include title|stripHtml} | {/ifset}Old Babylonian Text Corpus</title>
 
     <!-- jQuery -->
-    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
-            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
+    <script src="https://code.jquery.com/jquery-3.4.0.min.js"
+            integrity="sha256-BJeo0qm959uMBGb65z40ejJYGSgR7REI4+CW1fNKwOg="
             crossorigin="anonymous"></script>
 
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.js"

app/config/components.neon

@@ -1 +1 @@
 services:
     # Gridy
     - App\FrontModule\Components\IExampleGirdFactory
+    - App\AdminModule\Components\IUserGridFactory
 
     # Formuláře
-    - App\FrontModule\Components\ILoginFormFactory
+    - App\FrontModule\Components\ILoginFormFactory
+    - App\AdminModule\Components\IUserEditFormFactory

app/config/model.neon

@@ -14 +14 @@
     - App\Model\Repository\TransliterationRepository
     - App\Model\Repository\UserLogRepository
     - App\Model\Repository\UserRepository
-    - App\Model\Repository\UserRoleRepository
+    - App\Model\Repository\UserRoleRepository
+
+    - App\Model\Facade\UserFacade

app/model/facade/UserFacade.php

@@ +1 @@
+<?php
+
+
+namespace App\Model\Facade;
+
+use App\AdminModule\Components\UserEditForm;
+use App\Model\Repository\UserRepository;
+use App\Model\Repository\UserRoleRepository;
+use Nette\Utils\ArrayHash;
+
+class UserFacade
+{
+    /**
+     * @var UserRepository
+     */
+    private $userRepository;
+    /**
+     * @var UserRoleRepository
+     */
+    private $userRoleRepository;
+
+    public function __construct(UserRepository $userRepository,
+                                UserRoleRepository $userRoleRepository
+    )
+    {
+        $this->userRepository = $userRepository;
+        $this->userRoleRepository = $userRoleRepository;
+    }
+
+    /**
+     * Uloží informace o uživateli do DB
+     *
+     * @param array $values : hodnoty z formuláře UserEditForm
+     * @param int|null $userId : ID uživatele, pokud se edituje
+     * @return bool|false|int|\Nette\Database\Table\ActiveRow
+     */
+    public function saveUser(array $values, int $userId = NULL)
+    {
+        $roleId = $values[UserRoleRepository::COLUMN_ROLE_ID];
+        unset($values[UserRoleRepository::COLUMN_ROLE_ID]);
+        unset($values[UserEditForm::PASSWORD_CONFIRM]);
+
+        if (empty($values[UserRepository::COLUMN_PASSWORD]))
+        {
+            unset($values[UserRepository::COLUMN_PASSWORD]);
+        } else
+        {
+            $values[UserRepository::COLUMN_PASSWORD] = md5($values[UserRepository::COLUMN_PASSWORD]);
+        }
+
+        if (!empty($userId))
+        {
+            $userRow = $this->userRepository->findById($userId)->fetch();
+
+            if ($userRow)
+            {
+                $userRow->update($values);
+            }
+
+            $roleRow = $userRow->related(UserRoleRepository::TABLE_NAME, UserRoleRepository::COLUMN_USER_ID)->fetch();
+
+            if ($roleRow)
+            {
+                $roleRow->update([UserRoleRepository::COLUMN_ROLE_ID => $roleId]);
+            }
+        } else
+        {
+            $userRow = $this->userRepository->insert($values);
+            $this->userRoleRepository->addNew($userRow->{UserRepository::COLUMN_ID}, $roleId);
+        }
+
+        return $userRow;
+    }
+
+    /**
+     * Odstraní uživatele
+     *
+     * @param int $userId
+     * @return int
+     */
+    public function deleteUser(int $userId)
+    {
+        return $this->userRepository->delete($userId);
+    }
+}

app/model/repository/UserRepository.php

@@ -34 +34 @@
     {
         return $this->findBy([self::COLUMN_LOGIN => $login])->fetch();
     }
+
+    /**
+     * Nalezne uživatele v DB podle jeho ID
+     *
+     * @param int $id
+     * @return \Nette\Database\Table\Selection
+     */
+    public function findById(int $id)
+    {
+        return $this->findBy([self::COLUMN_ID => $id]);
+    }
 }

app/model/repository/UserRoleRepository.php

@@ -16 +16 @@
     /** Sloupečky tabulky */
     const COLUMN_USER_ID = 'user_id';
     const COLUMN_ROLE_ID = 'role_id';
+
+    /**
+     * Přiřadí roli novému uživateli
+     *
+     * @param int $userId
+     * @param int $roleId
+     * @return bool|int|\Nette\Database\Table\ActiveRow
+     */
+    public function addNew(int $userId, int $roleId)
+    {
+        return $this->insert(
+            [
+                UserRoleRepository::COLUMN_USER_ID => $userId,
+                UserRoleRepository::COLUMN_ROLE_ID => $roleId
+            ]
+        );
+    }
 }

www/css/admin/style.css

@@ -106 +106 @@
     background-color: #003366;
     border-color: #003366;
     color: #FAFAFA;
+}
+
+.label-required{
+    font-weight: bold;
+}
+
+.ul-alert{
+    margin-bottom: 0;
 }