Revize 4cc90563

+ opravení generovaní dostupných datasetů, tak aby se při odeslání
formuláře stránky zachovali se zvolenými údaji
+ 0-9 hodin fix

website/src/Controller/HeatmapController.php

@@ -21 +21 @@
 
         // Todo validation
         // $form->isValid()
-        $dataSet = $form->getData();
         if ($form->isSubmitted()) {
             $dataSet = $form->getData();
         }

website/src/OpenDataManager.php

@@ -3 +3 @@
 namespace App\OpenData;
 
 use MongoDB\Driver\Query;
+use MongoDB\Driver\Command;
 use MongoDB\Driver\Manager;
 
 class OpenDataManager implements IOpenDataManager {
@@ -15 +16 @@
     }
 
     public function getCollectionDataByName($name, $date, $hour) {
-        $openData = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query(['date' => $date.$hour], []));
+        $valh = $hour < 10 ? '0'.$hour : $hour;
+        $openData = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query(['date' => $date.$valh], []));
 
         $openData->setTypeMap([
             'array' => 'array',
@@ -43 +45 @@
         $available = $this->getAvailableCollections();
         $index = 0;
         foreach ($available as $key => $value) {
-            $openData = $this->manager->executeQuery('open-data-db.'.$value['name'].$date, new Query([], []));
+            $command = new Command(['listCollections' => 1, 'filter' => ['name' => $value['name'].$date]]);
+            $result = $this->manager->executeCommand('open-data-db', $command)->toArray();
 
-            $openData->setTypeMap([
-                'array' => 'array',
-                'document' => 'array',
-                'root' => 'array',
-            ]);
-
-            if (false == empty($openData->toArray())) {
+            if (false == empty($result) && false == array_key_exists($value['name'], $availableInDate)) {
                 $availableInDate[$value['name']] = $index++;
             }
         }
@@ -68 +65 @@
             'root' => 'array',
         ]);
 
-        return $max->toArray()[0]['number'];
+        $result = $max->toArray();
+
+        return empty($result) ? 1 : $result[0]['number'];
     }
 }

website/src/Utils/Utils.php

@@ -8 +8 @@
 
         $index = 0;
         foreach ($datasets as $key => $value) {
-            $names[$value['name']] = $index++;
+            if (false == array_key_exists($value['name'], $names)) {
+                $names[$value['name']] = $index++;
+            }
         }
 
         return $names;

website/templates/heatmap.html.twig

@@ -41 +41 @@
             </li>
 
             <li class="nav-item">
-              {{ form_label(form.date, 'Vyberte čas') }}
+              {{ form_label(form.time, 'Vyberte čas') }}
               {{
                 form_widget(form.time, {
                   'id' : 'time',
@@ -53 +53 @@
             </li>
 
             <li class="nav-item">
-              {{ form_label(form.date, 'Vybrané datové sady') }}
+              {{ form_label(form.type, 'Vybrané datové sady') }}
               {{
                 form_widget(form.type, {
                   'id' : 'type',