Revize ce045025

Re #7510 kompletní import, bugfixy v parseru+preview, js na anti-spam uploadu

app/AdminModule/component/Transport/ImportForm.php

@@ -46 +46 @@
         }
     }
 
-    public function formSuccess(Form $form)
+    public function formSuccess()
     {
         $this->presenter->forward('Transport:previewImport', $this->parser);
     }

app/AdminModule/presenters/TransportPresenter.php

@@ -4 +4 @@
 
 use App\AdminModule\Components\IExportFormFactory;
 use App\AdminModule\Components\IImportFormFactory;
+use App\Enum\EFlashMessage;
+use App\Model\Facade\TransportFacade;
 use App\Model\Repository\ObjectTypeRepository;
 use App\Model\Repository\SurfaceTypeRepository;
 use App\Utils\TextParser;
 
 class TransportPresenter extends BaseUserPresenter
 {
-    /** @var IImportFormFactory  */
+    /** @var IImportFormFactory */
     private $importFormFactory;
 
-    /** @var IExportFormFactory  */
+    /** @var IExportFormFactory */
     private $exportFormFactory;
 
     /** @var SurfaceTypeRepository */
@@ -22 +24 @@
     /** @var ObjectTypeRepository */
     private $objectTypeRepository;
 
+    /** @var TransportFacade */
+    private $transportFacade;
+
     public function __construct(
         IImportFormFactory $importFormFactory,
         IExportFormFactory $exportFormFactory,
         SurfaceTypeRepository $surfaceTypeRepository,
-        ObjectTypeRepository $objectTypeRepository
+        ObjectTypeRepository $objectTypeRepository,
+        TransportFacade $transportFacade
     )
     {
         parent::__construct();
@@ -34 +40 @@
         $this->exportFormFactory = $exportFormFactory;
         $this->surfaceTypeRepository = $surfaceTypeRepository;
         $this->objectTypeRepository = $objectTypeRepository;
+        $this->transportFacade = $transportFacade;
     }
 
-    public function actionPreviewImport(TextParser $parser){
+    /**
+     * View pro zobrazení importovaných dat před uložením do databáze
+     * @param TextParser $parser
+     */
+    public function renderPreviewImport(TextParser $parser)
+    {
         $objectTypes = $this->objectTypeRepository->fetchObjectTypes();
         $surfaceTypes = $this->surfaceTypeRepository->fetchSurfaceTypes();
         $parser->setTypes($objectTypes, $surfaceTypes);
 
-        $this->template->fileName = $parser->textFile->getName();
-        $this->template->parsedFile = $parser->parseText();
+        // Potřebuju to jako persistentní data do další akce presenteru
+        $_SESSION['parsedText'] = $parser->parseText();
+
+        $this->template->fileName = $parser->getTextFile()->getName();
+        $this->template->parsedFile = $_SESSION['parsedText'];
         $this->template->transliterationNum = $this->countTransliterations();
         $this->template->surfaces = $surfaceTypes;
     }
 
-    public function countTransliterations(){
-        $num=0;
-        foreach ($this->template->parsedFile as $book){
+    /** Uloží data z textového souboru do databáze
+     * @throws \Nette\Application\AbortException
+     */
+    public function actionConfirmPreview()
+    {
+        $result = $this->transportFacade->saveImportedData($_SESSION['parsedText']);
+        $_SESSION['parsedText'] = null;
+
+        if ($result) {
+            $this->presenter->flashMessage('All data were imported successfully.', EFlashMessage::SUCCESS);
+        } else {
+            $this->presenter->flashMessage('There was an error when importing data.', EFlashMessage::ERROR);
+        }
+
+        $this->redirect("Transport:");
+    }
+
+    /** Počítá počet importovaných transliterací */
+    public function countTransliterations()
+    {
+        $num = 0;
+        foreach ($this->template->parsedFile as $book) {
             $num += count($book);
         }
         return $num;

app/AdminModule/templates/Transport/previewImport.latte

@@ -4 +4 @@
             <div class="display-5">Preview of import: {$fileName}</div>
         </div>
         <div class="col-2 text-right">
-            <a n:href="Transport:confirmPreview" class="btn btn-sm btn-success"><span class="fa fa-fw fa-check"></span> Confirm
-                preview</a>
+            <a id="confirmation" n:href="Transport:confirmPreview" class="btn btn-sm btn-success"><span class="fa fa-fw fa-check"></span>
+                Confirm preview</a>
         </div>
     </div>
-    <div class="row col-8">
+    <div class="row col-8 mb-3">
         Imported {$transliterationNum} transliterations
     </div>
 
-    <div class="mt-5 p-3 col-8" style="border: 1px solid #c8c8c8;border-radius: 5px">
-        <div class="col-12 display-5" n:foreach="$parsedFile as $book=>$chapters">Book {$book}</div>
-        <div class="row" n:foreach="$chapters as $chapter=>$references">
-            <div class="col-12 mt-3">
-                <fieldset style="background-color: #f7f7dd">
-                    <legend style="background-color: #f7f7dd">Chapter {$chapter}</legend>
-                    <div n:foreach="$references as $reference=>$element">
-                        <i>{$surfaces[$reference]}</i><br>
-                        {foreach $element as $value}
-                            {$value}.<br>
-                        {/foreach}
-                        {if !(end($references) == $element)}<hr>{/if}
+    <div class="p-3 col-8" style="border: 1px solid #c8c8c8;border-radius: 5px">
+        {foreach $parsedFile as $book=>$chapters}
+            <div class="col-12 display-5 mt-3">Book {$book}</div>
+            {foreach $chapters as $chapter=>$references}
+                <div class="row">
+                    <div class="col-12 mb-3">
+                        <fieldset style="background-color: #f7f7dd">
+                            <legend style="background-color: #f7f7dd">Chapter {$chapter}</legend>
+                            <div n:foreach="$references as $reference=>$element">
+                                <i>{$surfaces[$reference]}</i><br>
+                                {foreach $element as $value}
+                                    {$value}.<br>
+                                {/foreach}
+                                {if !(end($references) == $element)}
+                                    <hr>{/if}
+                            </div>
+                        </fieldset>
                     </div>
-                </fieldset>
-            </div>
-        </div>
+                </div>
+            {/foreach}
+        {/foreach}
     </div>
-    <button onclick="toTop()" class="btn btn-sm btn-info mt-2 col-8"><span class="fa fa-fw fa-arrow-up"></span> Back to top</button>
+    <button onclick="toTop()" class="btn btn-sm btn-info mt-2 col-8"><span class="fa fa-fw fa-arrow-up"></span> Back to
+        top
+    </button>
 {/block}
 
 {block scripts}
     <script>
         function toTop() {
-            window.scrollTo(0,0);
+            window.scrollTo(0, 0);
         }
+
+        $(document).ready(function () {
+            $('#confirmation').click(function () {
+                $('#confirmation').addClass('disabled');
+            });
+        });
     </script>
 {/block}

app/config/model.neon

@@ -20 +20 @@
     #Facade
     - App\Model\Facade\UserFacade
     - App\Model\Facade\TransliterationFacade
+    - App\Model\Facade\TransportFacade
 
     #Sessions
     - App\Model\TransliterationSearchModel

app/model/facade/TransportFacade.php

@@ +1 @@
+<?php
+
+
+namespace App\Model\Facade;
+
+use App\Model\Repository\BookRepository;
+use App\Model\Repository\LineRepository;
+use App\Model\Repository\SurfaceRepository;
+use App\Model\Repository\TransliterationRepository;
+use Nette\Database\Context;
+use Nette\Database\Table\ActiveRow;
+
+/**
+ * Class TransportFacade sloužící pro import/export práce s db
+ * @package App\Model\Facade
+ */
+class TransportFacade
+{
+    /** @var BookRepository */
+    private $bookRepository;
+
+    /** @var TransliterationRepository */
+    private $transliterationRepository;
+
+    /** @var SurfaceRepository */
+    private $surfaceRepository;
+
+    /** @var LineRepository */
+    private $lineRepository;
+
+    /** @var Context */
+    private $context;
+
+
+    public function __construct(BookRepository $bookRepository,
+                                TransliterationRepository $transliterationRepository,
+                                SurfaceRepository $surfaceRepository,
+                                LineRepository $lineRepository,
+                                Context $context
+    )
+    {
+        $this->bookRepository = $bookRepository;
+        $this->transliterationRepository = $transliterationRepository;
+        $this->surfaceRepository = $surfaceRepository;
+        $this->lineRepository = $lineRepository;
+        $this->context = $context;
+    }
+
+    /**
+     * Uloží data transliterace z importu
+     *
+     * @param $data
+     * @return bool
+     */
+    public function saveImportedData($data)
+    {
+        // Škaredý zanoření hodnot z dat v importu :( Tohle bude pro db náročný
+        foreach ($data as $book => $chapters) {
+            try {
+                $bookId = $this->getBookIdByName($book);
+                if (!$bookId) {
+                    $bookId = $this->bookRepository->insert([BookRepository::COLUMN_BOOK_ABREV => $book])->getPrimary();
+                }
+            } catch (\Exception $exception) {
+                \Tracy\Debugger::log('Nepodařila se uložit nová kniha. Chyba: ' . $exception->getMessage(), 'transport-facade');
+                return FALSE;
+            }
+            foreach ($chapters as $chapter => $surfaces) {
+                try {
+                    $transliterationId = $this->getTransliterationIdCurrentBookChapter($bookId, trim(explode(" ", $chapter)[0]));
+                    if (!$transliterationId) {
+                        $chapterReg = explode(" ", $chapter);
+                        if (isset($chapterReg[1])) {
+                            $chapterReg[1] = str_replace(array('(', ')'), '', $chapterReg[1]);
+                            $this->transliterationRepository->insert([
+                                TransliterationRepository::COLUMN_BOOK_ID => $bookId,
+                                TransliterationRepository::COLUMN_CHAPTER => $chapterReg[0],
+                                TransliterationRepository::COLUMN_REG_NO => $chapterReg[1]
+                            ]);
+                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
+                        } else {
+                            $this->transliterationRepository->insert([
+                                TransliterationRepository::COLUMN_BOOK_ID => $bookId,
+                                TransliterationRepository::COLUMN_CHAPTER => $chapterReg[0]
+                            ]);
+                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
+                        }
+                    }
+                } catch (\Exception $exception) {
+                    \Tracy\Debugger::log('Nepodařila se uložit nová transliterace. Chyba: ' . $exception->getMessage(), 'transport-facade');
+                    return FALSE;
+                }
+                foreach ($surfaces as $surface => $values) {
+                    try {
+                        $surfaceId = $this->getSurfaceIdByCurrentTransSurfType($transliterationId, $surface);
+                        if (!$surfaceId) {
+                            $surfaceId = $this->surfaceRepository->insert([
+                                SurfaceRepository::COLUMN_TRANSLITERATION_ID => $transliterationId,
+                                SurfaceRepository::COLUMN_SURFACE_TYPE_ID => $surface,
+                                SurfaceRepository::COLUMN_OBJECT_TYPE_ID => 1
+                            ])->getPrimary();
+                        }
+                    } catch (\Exception $exception) {
+                        \Tracy\Debugger::log('Nepodařil se uložit nový surface. Chyba: ' . $exception->getMessage(), 'transport-facade');
+                        return FALSE;
+                    }
+
+                    foreach ($values as $line) {
+                        try {
+                            $lineId = $this->getLineIdByCurrentSurfLineNum($surfaceId, (explode(' ', $line)[0]));
+                            if (!$lineId) {
+                                $lineId = $this->lineRepository->insert([
+                                    LineRepository::COLUMN_SURFACE_ID => $surfaceId,
+                                    LineRepository::COLUMN_LINE_NUMBER => (explode(' ', $line)[0]),
+                                    LineRepository::COLUMN_TRANSLITERATION => substr(strchr($line, " "), 1),
+                                ])->{LineRepository::COLUMN_ID};
+                            } else {
+                                $this->lineRepository->fetchById($lineId)->update([
+                                    LineRepository::COLUMN_TRANSLITERATION => substr(strchr($line, " "), 1)
+                                ]);
+                            }
+                        } catch (\Exception $exception) {
+                            \Tracy\Debugger::log('Nepodařil se uložit nová řádka (line) transliterace. Chyba: ' . $exception->getMessage(), 'transport-facade');
+                            return FALSE;
+                        }
+                    }
+                }
+            }
+        }
+        return TRUE;
+    }
+
+
+    /**
+     * Vrací id knihy podle jména zkratky
+     * @param $bookName
+     * @return bool|mixed|ActiveRow
+     */
+    public
+    function getBookIdByName(string $bookName)
+    {
+        $book = $this->bookRepository->getBookByBookAbbrev($bookName)->fetch();
+        if (!empty($book)) {
+            return $book->getPrimary();
+        } else {
+            return false;
+        }
+    }
+
+
+    private
+    function getTransliterationIdCurrentBookChapter(int $bookId, string $chapterName)
+    {
+        $transliteration = $this->transliterationRepository->getTransliterationByChapterNameAndBookId($bookId, $chapterName)->fetch();
+        if (!empty($transliteration)) {
+            return $transliteration->getPrimary();
+        } else {
+            return false;
+        }
+    }
+
+    private function getSurfaceIdByCurrentTransSurfType(int $transliterationId, int $surfaceId)
+    {
+        $surface = $this->surfaceRepository->getSurfaceByTransliterationIdAndSurfaceTypeId($transliterationId, $surfaceId)->fetch();
+
+        if (!empty($surface)) {
+            return $surface->getPrimary();
+        } else {
+            return false;
+        }
+    }
+
+    private function getLineIdByCurrentSurfLineNum(int $surfaceId, $lineNum)
+    {
+        $line = $this->lineRepository->getLineBySurfaceIdAndLineNumber($surfaceId, $lineNum)->fetch();
+        if (!empty($line)) {
+            return $line->{LineRepository::COLUMN_ID};
+        } else {
+            return false;
+        }
+    }
+}

app/model/repository/BookRepository.php

@@ -38 +38 @@
         return $this->findAll()->where(self::COLUMN_BOOK_ABREV . ' LIKE', '%' . $bookName . '%');
     }
 
+    /**
+     * Vrací pouze jednu knihu podle book_abrev jelikož jsou unique
+     * @param string $bookName
+     * @return \Nette\Database\Table\Selection
+     */
+    public function getBookByBookAbbrev(string $bookName){
+        return $this->findBy([self::COLUMN_BOOK_ABREV => $bookName]);
+    }
+
     /**
      * Vrátí všechny abbrev
      *

app/model/repository/LineRepository.php

@@ -97 +97 @@
         return $this->findBy([self::COLUMN_ID => $lineIds])->delete();
     }
 
+    public function getLineBySurfaceIdAndLineNumber(int $surfaceId, $lineNum)
+    {
+        return $this->findBy([self::COLUMN_SURFACE_ID => $surfaceId, self::COLUMN_LINE_NUMBER => $lineNum]);
+    }
+
 }

app/model/repository/SurfaceRepository.php

@@ -40 +40 @@
             ]
         )->fetch();
     }
+
+    public function getSurfaceByTransliterationIdAndSurfaceTypeId(int $transliterationId, int $surfaceId)
+    {
+        return $this->findBy([self::COLUMN_TRANSLITERATION_ID => $transliterationId, self::COLUMN_SURFACE_TYPE_ID => $surfaceId]);
+    }
 }

app/model/repository/TransliterationRepository.php

@@ -212 +212 @@
                   WHERE t.id_transliteration = ?", $id
         )->fetch();
     }
+
+    public function getTransliterationByChapterNameAndBookId(int $bookId, string $chapterName){
+        return $this->findBy([self::COLUMN_BOOK_ID => $bookId, self::COLUMN_CHAPTER => $chapterName]);
+    }
 }

app/utils/TextParser.php

@@ -5 +5 @@
 
 class TextParser
 {
-    public $textFile;
+    private $textFile;
     private $objectTypes;
     private $surfaceTypes;
 
@@ -14 +14 @@
         $this->textFile = $file;
     }
 
+    /** Rozparsuje importovaný text */
     public function parseText()
     {
         $array = explode("\n", file_get_contents($this->textFile));
         $array = array_map('trim', $array);
 
+        $nextBook = true;
         $output = array();
         $currentBook = "";
         $currentChapter = "";
@@ -26 +28 @@
 
         //TODO kontrola a parsovani object types (tablet, envelope)
         foreach ($array as $value) {
-            if ($value[0] == '|' && !is_numeric($value[1])) {
+            Debugger::barDump($value);
+            if (strlen($value)==0){
+                $nextBook = true;
+            }
+            elseif ($value[0] == '|' && $nextBook) {
                 $currentBook = substr($value, 1);
                 $currentChapter = "";
                 $currentSurface = $this->transformAbbrev("obverse");
+                $nextBook = false;
             }
-            elseif ($value[0] == '|' && is_numeric($value[1])){
-                $currentChapter = substr($value, 1);
-                $currentSurface = $this->transformAbbrev("obverse");
-            }else{
+            elseif ($value[0] == '|'){
+                // TYPÍIIIIIČO ono to může být i tady... k posrání. Odděleno '-', jakože pro jistotu demence (OBTR => "15 (T.R.4020) - le.e.")
+                $withRef = explode(" - ", substr($value, 1));
+                if(isset($withRef[1])){
+                    $currentChapter = trim(substr($value, 1, strripos($value, "-")-1));
+                    $currentSurface = $this->transformAbbrev(trim($withRef[1]));
+                }else{
+                    $currentChapter = substr($value, 1);
+                    $currentSurface = $this->transformAbbrev("obverse");
+                }
+            }
+            else{
                 if (strchr($value, '$')) {
                     $output[$currentBook][$currentChapter][$currentSurface][] = trim(substr($value,0,stripos($value,"&")));
                     $currentSurface = $this->transformAbbrev(substr(strchr($value, "&"),1, -1));
@@ -47 +62 @@
         return $output;
     }
 
-    /** Nejvíc kontrola souboru*/
+    /** Nejvíc kontrola souboru, kontroluje zda soubor existuje a zda aspoň začátek souboru vyhovuje formátu */
     public function isFileParsable()
     {
         if (file_exists($this->textFile)) {
@@ -68 +83 @@
         $this->surfaceTypes = $surfaces;
     }
 
+    /** Funkce pro transformaci zkratek surfaceType na jejich příslušná idčka v db */
     private function transformAbbrev($abbrev){
         switch ($abbrev){
             case "rev.":
@@ -101 +117 @@
                 return array_search("obverse", $this->surfaceTypes);
         }
     }
+
+    public function getTextFile(){
+        return $this->textFile;
+    }
 }

www/css/admin/style.css

@@ -103 +103 @@
     padding: 0 1rem;
 }
 
-li.nav-item .active{
+li.nav-item .active {
     background-color: #003366;
     border-color: #003366;
     color: #FAFAFA;
 }
 
-.ul-alert{
+.ul-alert {
     margin-bottom: 0;
 }
 
-.required{
+.required {
     font-weight: bold;
+}
+
+.disabled {
+    pointer-events: none;
+    cursor: default;
 }