Revize 32b3fe21

Re #7505 možnost editace záznamů

app/AdminModule/component/Transliteration/TransliterationDataEditForm.latte

@@ -53 +53 @@
                                         <div id="{$name}" class="collapse{$show}">
                                             <div class="card-body">
                                                 <div n:multiplier="$name" n:class="row, mb-2">
-                                                    <div class="col-5">
+                                                    <input n:name="\App\Model\Repository\LineRepository::COLUMN_ID">
+                                                    <div class="col-2">
                                                         <input n:name="\App\Model\Repository\LineRepository::COLUMN_LINE_NUMBER" n:class="form-control, form-control-sm">
                                                     </div>
-                                                    <div class="col-5">
+                                                    <div class="col-8">
                                                         <input n:name="\App\Model\Repository\LineRepository::COLUMN_TRANSLITERATION" n:class="form-control, form-control-sm">
                                                     </div>
                                                     <div class="col-2">

app/AdminModule/component/Transliteration/TransliterationDataEditForm.php

@@ -16 +16 @@
 class TransliterationDataEditForm extends Control
 {
     /** @var int ID transliterace */
-    private $id;
+    private $id = NULL;
 
     /** @var array Pole objektů a typu povrch pro strom dat transliterace */
     private $containers;
 
+    /** @var array Pole s výchozími hodnotami při upravování */
     private $defaults;
 
     /**
@@ -52 +53 @@
         $containers = [];
 
         // Načtení typů objektů a typu povrchů do pole pro vykreslení v šabloně
-        foreach ($objectTypes as $objectType)
+        foreach ($objectTypes as $oId =>$objectType)
         {
-            $containers[$this->transliterationFacade->getInputName($objectType)]['title'] = $objectType;
+            $containers[$oId]['title'] = $objectType;
 
-            foreach ($surfaceTypes as $surfaceType)
+            foreach ($surfaceTypes as $sId => $surfaceType)
             {
-                $containers[$this->transliterationFacade->getInputName($objectType)][$this->transliterationFacade->getInputName($surfaceType)] = $surfaceType;
+                $containers[$oId][$sId] = $surfaceType;
             }
         }
 
@@ -100 +101 @@
                 {
                     $container->addInteger(LineRepository::COLUMN_LINE_NUMBER);
                     $container->addText(LineRepository::COLUMN_TRANSLITERATION);
+                    $container->addHidden(LineRepository::COLUMN_ID);
                 }, 0);
 
                 $multiplier->addCreateButton('Add line', 1, $redrawCallback);
@@ -118 +120 @@
 
     public function formSuccess(Form $form)
     {
-
+        $result = $this->transliterationFacade->saveTransliterationData($this->id, $form->getValues());
     }
 
     /**

app/model/facade/TransliterationFacade.php

@@ -9 +9 @@
 use App\Model\Repository\SurfaceRepository;
 use App\Model\Repository\SurfaceTypeRepository;
 use Nette\Database\Table\ActiveRow;
+use Nette\Utils\ArrayHash;
 
 class TransliterationFacade
 {
@@ -44 +45 @@
     /**
      * Uloží data transliterace
      *
-     * @param int $id
-     * @param array $values
+     * @param int|null $id : ID transliterace
+     * @param ArrayHash $formValues
      */
-    public function saveTransliterationData(int $id, array $values)
+    public function saveTransliterationData(int $id, ArrayHash $formValues)
     {
-
+        // Škaredý zanoření hodnot z formuláře v kontainerech :(
+        foreach ($formValues as $objectTypeId => $surfaceContainers)
+        {
+            foreach ($surfaceContainers as $surfaceTypeId => $inputs)
+            {
+                foreach ($inputs as $key => $values)
+                {
+                    $lineId = (int)$values->{LineRepository::COLUMN_ID};
+
+                    // Editace již existující řádky
+                    if (!empty($lineId))
+                    {
+                        $this->lineRepository->fetchById($lineId)->update($values);
+
+                    } else
+                    {
+                        $surface = $this->surfaceRepository->fetchSurface($id, $objectTypeId, $surfaceTypeId);
+
+                        if ($surface === FALSE)
+                        {
+                            // TODO: předělat do repository
+                            $surface = $this->surfaceRepository->insert(
+                                [
+                                    SurfaceRepository::COLUMN_SURFACE_TYPE_ID => $surfaceTypeId,
+                                    SurfaceRepository::COLUMN_OBJECT_TYPE_ID => $objectTypeId,
+                                    SurfaceRepository::COLUMN_TRANSLITERATION_ID => $id
+                                ]
+                            );
+                        }
+
+                        $values->{LineRepository::COLUMN_SURFACE_ID} = $surface->{SurfaceRepository::COLUMN_ID};
+                        $this->lineRepository->insert($values);
+                    }
+                }
+            }
+        }
     }
 
     /**
@@ -62 +98 @@
     {
         $surfaces = $this->surfaceRepository->findByTransliterationId($id)->fetchAll();
 
-        $surfaceTypes = $this->surfaceTypeRepository->fetchSurfaceTypes();
-        $objectTypes = $this->objectTypeRepository->fetchObjectTypes();
-
         $defaults = array();
 
         /** @var ActiveRow $surface */
@@ -77 +110 @@
                 continue;
             }
 
-            // Získání názvu typu povrchu a typu objektu
-            $surfaceType = $surfaceTypes[$surface->{SurfaceRepository::COLUMN_SURFACE_TYPE_ID}];
-            $objectType = $objectTypes[$surface->{SurfaceRepository::COLUMN_OBJECT_TYPE_ID}];
-
-            $objectName = $this->getInputName($objectType);
-            $surfaceName = $this->getInputName($surfaceType);
+            $objectId = $surface->{SurfaceRepository::COLUMN_OBJECT_TYPE_ID};
+            $surfaceId = $surface->{SurfaceRepository::COLUMN_SURFACE_TYPE_ID};
 
-            $defaults[$objectName][$surfaceName] = $lineRows;
+            $defaults[$objectId][$surfaceId] = $lineRows;
         }
 
         return $defaults;

app/model/repository/LineRepository.php

@@ -75 +75 @@
         return $adjacentLines;
     }
 
+    /**
+     * Vrací záznam řádku podle ID (z nějakého důvodu mi nefungovalo findRow);
+     *
+     * @param int $id : ID řádky
+     * @return false|\Nette\Database\Table\ActiveRow
+     */
+    public function fetchById(int $id)
+    {
+        return $this->findBy([self::COLUMN_ID => $id])->fetch();
+    }
+
 }

app/model/repository/ObjectTypeRepository.php

@@ -26 +26 @@
     {
         return $this->findAll()->fetchPairs(self::COLUMN_ID, self::COLUMN_OBJECT_TYPE);
     }
+
+    /**
+     * Vrací typ objektu podle názvu
+     *
+     * @param string $name
+     * @return false|\Nette\Database\Table\ActiveRow
+     */
+    public function fetchObjectTypeByName(string $name)
+    {
+        return $this->findBy([self::COLUMN_OBJECT_TYPE => $name])->fetch();
+    }
 }

app/model/repository/Repository.php

@@ -94 +94 @@
      * @param array $data
      * @return bool|int|Nette\Database\Table\ActiveRow
      */
-    public function insert(array $data)
+    public function insert($data)
     {
         return $this->getTable()->insert($data);
     }

app/model/repository/SurfaceRepository.php

@@ -30 +30 @@
     {
         return $this->findBy([self::COLUMN_TRANSLITERATION_ID => $id]);
     }
+
+    public function fetchSurface(int $transliterationId, int $objectTypeId, int $surfaceTypeId){
+        return $this->findBy(
+            [
+                self::COLUMN_TRANSLITERATION_ID => $transliterationId,
+                self::COLUMN_OBJECT_TYPE_ID => $objectTypeId,
+                self::COLUMN_SURFACE_TYPE_ID => $surfaceTypeId
+            ]
+        )->fetch();
+    }
 }