Revize dfe43218

+ validace

website/public/js/zcu-heatmap.js

@@ -223 +223 @@
     options += '<option value="' + value + '">' + key + '</option>\n'; 
   });
 
+  if (options === '') {
+    $('#submit-btn').prop('disabled', true);
+  }
+  else {
+    $('#submit-btn').prop('disabled', false);
+  }
+
   $('#type').empty().append(options);
   
 }

website/src/Controller/HeatmapController.php

@@ -13 +13 @@
     /**
      * @Route("/heatmap", name="heatmap")
      */
-    public function index(Request $request) {
+    public function index(Request $request, IOpenDataManager $manager) {
         $dataSet = new DataSet();
 
         $form = $this->createForm(DataSetType::class, $dataSet);
         $form->handleRequest($request);
 
-        // Todo validation
-        // $form->isValid()
         if ($form->isSubmitted()) {
             $dataSet = $form->getData();
+            $name = $manager->getXthAvailableCollectionByDay($dataSet->getType(), $dataSet->getDate());
+            if (false == $manager->isCollectionAvailable($name, $dataSet->getDate())) {
+                $form = $this->createForm(DataSetType::class, new DataSet());
+            }
         }
 
         return $this->render(

website/src/Entity/DataSet.php

@@ -17 +17 @@
     }
 
     public function setDate($date) {
-        $this->date = $date;
+        $this->date = date('dmY', strtotime($date));
     }
 
     public function getDate() {

website/src/IOpenDataManager.php

@@ -8 +8 @@
     public function getAvailableCollections();
 
     public function getAvailableCollectionsByDay($date);
+    
+    public function getXthAvailableCollectionByDay($index, $date);
+
+    public function isCollectionAvailable($name, $date);
+
+    public function getMaxCollectionNumberAtDay($name, $date);
 }

website/src/OpenDataManager.php

@@ -45 +45 @@
         $available = $this->getAvailableCollections();
         $index = 0;
         foreach ($available as $key => $value) {
-            $command = new Command(['listCollections' => 1, 'filter' => ['name' => $value['name'].$date]]);
-            $result = $this->manager->executeCommand('open-data-db', $command)->toArray();
-
-            if (false == empty($result) && false == array_key_exists($value['name'], $availableInDate)) {
+            if ($this->isCollectionAvailable($value['name'], $date) && false == array_key_exists($value['name'], $availableInDate)) {
                 $availableInDate[$value['name']] = $index++;
             }
         }
@@ -56 +53 @@
         return $availableInDate;
     }
 
+    public function getXthAvailableCollectionByDay($index, $date) {
+        $availableInDate = [];
+        $available = $this->getAvailableCollections();
+        $currentIndex = 0;
+
+        foreach ($available as $key => $value) {
+            if ($this->isCollectionAvailable($value['name'], $date) && false == array_key_exists($value['name'], $availableInDate)) {
+                if ($currentIndex == $index) {
+                    return $value['name'];
+                }
+                else {
+                    $currentIndex++;
+                }
+            }
+        }
+
+        return "";
+    }
+
+    public function isCollectionAvailable($name, $date) {
+
+        $command = new Command(['listCollections' => 1, 'filter' => ['name' => $name.$date]]);
+        $result = $this->manager->executeCommand('open-data-db', $command)->toArray();
+
+        return !empty($result);
+    }
+
     public function getMaxCollectionNumberAtDay($name, $date) {
         $max = $this->manager->executeQuery('open-data-db.'.$name.$date, new Query([], ['sort' => ['number' => -1], 'limit' => 1]));
 

website/templates/heatmap.html.twig

@@ -33 +33 @@
                   'type' : 'date',
                   'id' : 'date',
                   'attr' : {
-                    'max' : 'now'|date('d-m-Y'),
+                    'max' : 'now'|date('Y-m-d'),
                     'class' : 'form-control',                 
                     'onChange' : 'checkDataSetsAvailability("' ~ path('available') ~ '")'
                   }
@@ -71 +71 @@
                 {
                   'label' : 'Potvrdit výběr',
                   'type' : 'submit',
+                  'id' : 'submit-btn',
                   'attr' : {
                     'class': 'btn btn-secondary'
                   }