Revize 94fce7fe

Úpravy po mergi

app/AdminModule/component/Transliteration/TransliterationEditForm.php

@@ -141 +141 @@
         $multiplier->addCreateButton('Add', 1, $redrawCallback);
         $multiplier->addRemoveButton('Remove', $redrawCallback);
 
-        if($this->transliterationId != null){
-            $this->form->addSelect(TransliterationRepository::COLUMN_BOOK_ID, 'Book', $this->bookRepository->getBookAbbrevForSelect());
-            $this->form->setDefaults($this->getDefaults());
-        }
-
         $this->form->addSubmit('submit', 'Save');
 
+        $this->form->setDefaults($this->getDefaults());
+
         $this->form->onValidate[] = [$this, 'formValidate'];
         $this->form->onSuccess[] = [$this, 'formSuccess'];
 
@@ -209 +206 @@
      */
     private function getDefaults()
     {
+        $array = [];
+
         if($this->transliterationId != null){
             $array = $this->transliterationRepository->findRow($this->transliterationId)->toArray();
             $references = $this->litReferenceRepository->findByTransliterationId($this->transliterationId)->fetchAll();
@@ -217 +216 @@
             {
                 $array['references'][] = $activeRow->toArray();
             }
-
-            return $array;
         }
+
+        return $array;
     }
 
 }

app/AdminModule/component/Transliteration/TransliterationNewForm.latte

@@ -35 +35 @@
                             <div id="{\App\AdminModule\Components\TransliterationNewForm::BOOK_NEW_ID}">
                                 <div class="row mb-2">
                                     <div class="col-4">
-                                        {label $form['bookContainer'][\App\Model\Repository\BookRepository::COLUMN_BOOK_ABREV], class => 'required'}
+                                        {label $form['bookContainer'][\App\Model\Repository\BookRepository::COLUMN_BOOK_ABBREV], class => 'required'}
                                     </div>
                                     <div class="col-8">
-                                        {input $form['bookContainer'][\App\Model\Repository\BookRepository::COLUMN_BOOK_ABREV]}
+                                        {input $form['bookContainer'][\App\Model\Repository\BookRepository::COLUMN_BOOK_ABBREV]}
                                     </div>
                                 </div>
 

app/AdminModule/component/Transliteration/TransliterationNewForm.php

@@ -148 +148 @@
                 ->toggle(self::BOOK_NEW_ID)
             ->endCondition();
 
-        $bookContainer->addSelect(TransliterationRepository::COLUMN_BOOK_ID, 'Book', $this->bookRepository->getBookAbbrevForSelect());
+        $bookContainer->addSelect(TransliterationRepository::COLUMN_BOOK_ID, 'Book', $this->bookRepository->getBooksAbbrevForSelect());
 
-        $bookContainer->addText(BookRepository::COLUMN_BOOK_ABREV, 'Abbreviation')
+        $bookContainer->addText(BookRepository::COLUMN_BOOK_ABBREV, 'Abbreviation')
             ->addConditionOn($this->form['bookContainer']['book'], Form::EQUAL, self::BOOK_NEW)
             ->addRule(Form::REQUIRED, 'Field %label is required', TRUE);
         $bookContainer->addText(BookRepository::COLUMN_BOOK_AUTHOR, 'Author');

app/FrontModule/component/ExampleGrid.php

@@ -1 @@
-<?php
-
-
-namespace App\FrontModule\Components;
-
-
-use App\Utils\DataGrid\DataGrid;
-use App\Model\Repository\LineRepository;
-use Ublaboo\DataGrid\Exception\DataGridException;
-
-/**
- * Ukázkový datagrid, bude smazán při předání
- *  - všechny možnosti použití gridu lze vidět na
- *  https://gitlab.com/Fifal/dvm/blob/21afc037e3604093197e140defc05925df0b8c28/web-project/app/components/variant/VariantGrid.php
- *
- * @package App\Components
- */
-class ExampleGrid extends DataGrid
-{
-    /** @var LineRepository */
-    private $lineRepository;
-
-    public function __construct(LineRepository $lineRepository)
-    {
-        $this->lineRepository = $lineRepository;
-
-        parent::__construct();
-    }
-
-    /**
-     * 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(LineRepository::COLUMN_ID);
-        $this->setDataSource($this->lineRepository->findAll());
-    }
-
-    /**
-     * Definice sloupečků, akcí, vyhledávácích filtrů gridu
-     *
-     * @throws DataGridException
-     */
-    public function define()
-    {
-        $this->addColumnNumber(LineRepository::COLUMN_ID, "ID");
-        $this->addColumnText(LineRepository::COLUMN_TRANSLITERATION, "Transliterace");
-        $this->addFilterText(LineRepository::COLUMN_TRANSLITERATION, "Transliterace");
-
-        $this->addAction(LineRepository::COLUMN_TRANSLITERATION, "Smazat");
-    }
-}
-
-interface IExampleGirdFactory
-{
-    /**
-     * Funkce create je implementována již v předkovi
-     *
-     * @return ExampleGrid
-     */
-    public function create();
-}

app/FrontModule/presenters/HomepagePresenter.php

@@ -3 +3 @@
 namespace App\FrontModule\Presenters;
 
 use App\FrontModule\Components\IUserSettingsFormFactory;
-use App\FrontModule\Components\IExampleGirdFactory;
 use App\FrontModule\Components\ILoginFormFactory;
 use App\Enum\EFlashMessage;
 use Nette;
@@ -11 +10 @@
 
 final class HomepagePresenter extends Nette\Application\UI\Presenter
 {
-    /** @var IExampleGirdFactory  */
-    private $exampleGridFactory;
     /** @var ILoginFormFactory */
     private $loginFormFactory;
 
     /** @var IUserSettingsFormFactory */
     private $userSettingsFormFactory;
 
-    public function __construct(IExampleGirdFactory $exampleGridFactory,
-                                ILoginFormFactory $loginFormFactory,
+    public function __construct(ILoginFormFactory $loginFormFactory,
                                 IUserSettingsFormFactory $userSettingsFormFactory
     )
     {
         parent::__construct();
 
-        $this->exampleGridFactory = $exampleGridFactory;
         $this->loginFormFactory = $loginFormFactory;
         $this->userSettingsFormFactory = $userSettingsFormFactory;
     }
@@ -79 +74 @@
     public function createComponentUserSettingsForm(){
         return $this->userSettingsFormFactory->create();
     }
-
-    /**
-     * Vytvoření ukázkového gridu
-     */
-    public function createComponentDataGrid()
-    {
-        return $this->exampleGridFactory->create();
-    }
 }

app/config/components.neon

@@ -1 +1 @@
 services:
     # Gridy
-    - App\FrontModule\Components\IExampleGirdFactory
     - App\AdminModule\Components\IUserGridFactory
     - App\AdminModule\Components\IMuseumGridFactory
     - App\AdminModule\Components\IObjectTypeGridFactory

app/templates/@menu.latte

@@ -16 +16 @@
             <a n:class="nav-link, $presenter->isLinkCurrent(':Front:Contact:default') ? active" n:href=":Front:Contact:default">Contact & members</a>
         </li>
         <li class="nav-item">
-            <a n:class="nav-link, $presenter->isLinkCurrent(':Admin:Transliteration:*') ? active" n:href=":Admin:Transliteration:new">Input new text</a>
+            <a n:class="nav-link, $presenter->isLinkCurrent(':Admin:Transliteration:new') ? active" n:href=":Admin:Transliteration:new">Input new text</a>
         </li>
         {if $user->loggedIn && ($user->isInRole(\App\Enum\EUserRole::ADMIN) || $user->isInRole(\App\Enum\EUserRole::USER))}
             <li class="nav-item">