Revize 42c20ae6

Re #7575 , Re #7572 Refaktoring importu/exportu

app/AdminModule/component/Transliteration/TransliterationGrid.php

@@ -15 +15 @@
 use App\Utils\DataGrid\DataGrid;
 use Nette\Database\Table\ActiveRow;
 use Nette\Database\Table\Selection;
+use Tracy\Debugger;
 use Ublaboo\DataGrid\Exception\DataGridException;
 
 class TransliterationGrid extends DataGrid
@@ -249 +250 @@
     private function exportData($dataSource, $grid)
     {
         $exportData = [];
-        /** @var ActiveRow $activeRow */
-        foreach ($dataSource as $activeRow)
+
+        try
         {
-            $lines = $this->lineRepository->getAllLinesForTransliteration($activeRow->getPrimary());
-            $chapterLines = [];
-            foreach ($lines as $line)
+            /** @var ActiveRow $activeRow */
+            foreach ($dataSource as $activeRow)
             {
-                $chapterLines[$line->object_type][$line->surface_type][] = array('transliteration' => $line->transliteration, 'line_number' => $line->line_number);
+                //Přeskočí transliterace které nejsou přiřazené k žádné knížce
+                if(!$activeRow->ref('id_book'))
+                {
+                    continue;
+                }
+                $lines = $this->lineRepository->getAllLinesForTransliteration($activeRow->getPrimary());
+                $chapterLines = [];
+                foreach ($lines as $line)
+                {
+                    $chapterLines[$line->object_type][$line->surface_type][] = array('transliteration' => $line->transliteration, 'line_number' => $line->line_number);
+                }
+                $exportData[] = [
+                    'bookName' => $activeRow->ref('id_book')->book_abrev,
+                    'chapter' => $activeRow->chapter,
+                    'transliterationData' => $chapterLines
+                ];
             }
-            $exportData[] = [
-                'bookName' => $activeRow->ref('id_book')->book_abrev,
-                'chapter' => $activeRow->chapter,
-                'transliterationData' => $chapterLines
-            ];
-        }
 
-        $uniqueBooks = array_unique(array_map(function ($i) { return $i['bookName']; }, $exportData));
+            $uniqueBooks = array_unique(array_map(function ($i) { return $i['bookName']; }, $exportData));
+
+            $currentDate = new \DateTime();
+            $exportFileName =  'text-export-' .
+                $currentDate->format('Y-m-d-H-i-s') .
+                self::EXPORT_FILE_TYPE;
 
-        $currentDate = new \DateTime();
-        $exportFileName =  'text-export-' .
-            $currentDate->format('Y-m-d-H-i-s') .
-            self::EXPORT_FILE_TYPE;
-        try
-        {
             if (!file_exists(self::EXPORT_FILE_PATH)) {
                 mkdir(self::EXPORT_FILE_PATH, 0777, true);
             }
@@ -321 +329 @@
         catch (\Exception $e)
         {
             $this->presenter->flashMessage('There was an error creating the export file', EFlashMessage::ERROR);
+            Debugger::log($e, 'export-error');
         }
 
         $this->presenter->flashMessage('There was an error downloading the export file', EFlashMessage::ERROR);

app/AdminModule/component/Transport/ExportForm.latte

@@ -1 @@
-{control form}

app/AdminModule/component/Transport/ExportForm.php

@@ -1 @@
-<?php
-
-namespace App\AdminModule\Components;
-
-use App\Utils\Form;
-use Nette\Application\UI\Control;
-
-class ExportForm extends Control
-{
-
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-
-    public function render()
-    {
-        $this->template->setFile(__DIR__ . '/ExportForm.latte');
-        $this->template->render();
-    }
-
-    public function createComponentForm()
-    {
-        $form = new Form();
-
-        $form->addButton('export', 'Export něco...');
-
-        return $form;
-    }
-}
-
-interface IExportFormFactory
-{
-    /**
-     * @return ExportForm
-     */
-    public function create();
-}

app/AdminModule/presenters/TransportPresenter.php

@@ -16 +16 @@
     /** @var IImportFormFactory */
     private $importFormFactory;
 
-    /** @var IExportFormFactory */
-    private $exportFormFactory;
-
     /** @var SurfaceTypeRepository */
     private $surfaceTypeRepository;
 
@@ -32 +29 @@
     private $transportModel;
 
     public function __construct(IImportFormFactory $importFormFactory,
-                                IExportFormFactory $exportFormFactory,
                                 SurfaceTypeRepository $surfaceTypeRepository,
                                 ObjectTypeRepository $objectTypeRepository,
                                 TransportFacade $transportFacade,
@@ -41 +37 @@
     {
         parent::__construct();
         $this->importFormFactory = $importFormFactory;
-        $this->exportFormFactory = $exportFormFactory;
         $this->surfaceTypeRepository = $surfaceTypeRepository;
         $this->objectTypeRepository = $objectTypeRepository;
         $this->transportFacade = $transportFacade;
@@ -99 +94 @@
     {
         return $this->importFormFactory->create();
     }
-
-    public function createComponentExportForm()
-    {
-        return $this->exportFormFactory->create();
-    }
 }

app/AdminModule/templates/Transport/default.latte

@@ -10 +10 @@
         </div>
     </div>
 
-{*    <div class="row mt-5">*}
-{*        <div class="col-3">*}
-{*            <fieldset>*}
-{*                <legend>Text export</legend>*}
-{*                {control exportForm}*}
-{*            </fieldset>*}
-{*        </div>*}
-{*    </div>*}
+    <div class="row mt-5">
+        <span>You can export selected texts using the export button in <a n:href="Transliteration:">Transliteration list</a> (Top right corner of the list).</span>
+    </div>
 {/block}

app/config/components.neon

@@ -23 +23 @@
     - App\AdminModule\Components\ITransliterationEditFormFactory
     - App\AdminModule\Components\ITransliterationDataEditFormFactory
     - App\AdminModule\Components\IImportFormFactory
-    - App\AdminModule\Components\IExportFormFactory
 
     - App\FrontModule\Components\IKeyboard
     - App\FrontModule\Components\ITransliterationSearchResultListFactory

app/enum/ESurfaceTypes.php

@@ -45 +45 @@
 
         return "&" . self::$exportFileAbbrev[$type] . "$";
     }
+
+    public static function getSurfaceTypeFromAbbrev($abbrev)
+    {
+        $type = array_search($abbrev, self::$exportFileAbbrev);
+        if(!$type)
+        {
+            $type = self::OBVERSE;
+        }
+        return $type;
+    }
 }

app/model/facade/TransportFacade.php

@@ -64 +64 @@
                 {
                     $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
+                foreach ($chapters as $chapter => $surfaces)
                 {
                     $transliterationId = $this->getTransliterationIdCurrentBookChapter($bookId, trim(explode(" ", $chapter)[0]));
                     if (!$transliterationId)
@@ -81 +73 @@
                         if (isset($chapterReg[1]))
                         {
                             $chapterReg[1] = str_replace(array('(', ')'), '', $chapterReg[1]);
-                            $this->transliterationRepository->insert([
+                            $transliteration = $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);
+                            if($transliteration)
+                            {
+                                $transliterationId = $transliteration->getPrimary();
+                            }
+                            else continue;
+//                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
                         } else
                         {
-                            $this->transliterationRepository->insert([
+                            $transliteration = $this->transliterationRepository->insert([
                                 TransliterationRepository::COLUMN_BOOK_ID => $bookId,
                                 TransliterationRepository::COLUMN_CHAPTER => $chapterReg[0]
                             ]);
-                            $transliterationId = $this->context->getInsertId(TransliterationRepository::COLUMN_ID);
+                            if($transliteration)
+                            {
+                                $transliterationId = $transliteration->getPrimary();
+                            }
+                            else continue;
+//                            $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
+                    foreach ($surfaces as $surface => $values)
                     {
                         $surfaceId = $this->getSurfaceIdByCurrentTransSurfType($transliterationId, $surface);
                         if (!$surfaceId)
@@ -115 +109 @@
                                 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
+                        foreach ($values as $line)
                         {
                             $lineId = $this->getLineIdByCurrentSurfLineNum($surfaceId, (explode(' ', $line)[0]));
                             if (!$lineId)
@@ -141 +127 @@
                                 ]);
                             }
                         }
-                        catch (\Exception $exception)
-                        {
-                            \Tracy\Debugger::log('Nepodařil se uložit nová řádka (line) transliterace. Chyba: ' . $exception->getMessage(), 'transport-facade');
-                            return FALSE;
-                        }
                     }
                 }
+            } catch (\Exception $exception)
+            {
+                \Tracy\Debugger::log($exception, 'transport-facade');
+                return FALSE;
             }
         }
         return TRUE;

app/utils/TextParser.php

@@ -3 +3 @@
 
 namespace App\Utils;
 
+use App\Enum\ESurfaceTypes;
+
 class TextParser
 {
     private $textFile;
@@ -75 +77 @@
     /** Funkce pro transformaci zkratek surfaceType na jejich příslušná idčka v db */
     private function transformAbbrev($abbrev)
     {
-        switch ($abbrev) {
-            case "rev.":
-                return array_search("reverse", $this->surfaceTypes);
-            case "u.e.":
-                return array_search("upper edge", $this->surfaceTypes);
-            case "lo.e.":
-                return array_search("lower edge", $this->surfaceTypes);
-            case "le.e.":
-                return array_search("left edge", $this->surfaceTypes);
-            // Domnenky, v test souborech se nenachazi -> udelat podle toho export
-            case "r.e.":
-                return array_search("right edge", $this->surfaceTypes);
-            case "s.i.1":
-                return array_search("seal impression 1", $this->surfaceTypes);
-            case "s.i.2":
-                return array_search("seal impression 2", $this->surfaceTypes);
-            case "s.i.3":
-                return array_search("seal impression 3", $this->surfaceTypes);
-            case "s.i.4":
-                return array_search("seal impression 4", $this->surfaceTypes);
-            case "s.i.5":
-                return array_search("seal impression 5", $this->surfaceTypes);
-            case "s.i.6":
-                return array_search("seal impression 6", $this->surfaceTypes);
-            case "s.i.7":
-                return array_search("seal impression 7", $this->surfaceTypes);
-            case "s.i.8":
-                return array_search("seal impression 8", $this->surfaceTypes);
-            default:
-                return array_search("obverse", $this->surfaceTypes);
-        }
+        return array_search(ESurfaceTypes::getSurfaceTypeFromAbbrev($abbrev), $this->surfaceTypes);
     }
 
     public function getTextFile()