Revize ac154afa

Re #8191 - fixed popup bug and refactoring

website/public/js/zcu-heatmap.js

@@ -404 +404 @@
 // eslint-disable-next-line no-unused-vars
 function setPreviousPageInPopup () {
   const countPagesInPopup = getCountPagesInPopup()
-  const newPage = currentPageInPopup
+  const page = currentPageInPopup
 
   currentPageInPopup = (currentPageInPopup + countPagesInPopup - 1) % countPagesInPopup
-  setPageContentInPopup(newPage)
+  setPageContentInPopup(page)
 }
 
 // eslint-disable-next-line no-unused-vars
 function setNextPageInPopup () {
   const countPagesInPopup = getCountPagesInPopup()
-  const newPage = currentPageInPopup
+  const page = currentPageInPopup
 
   currentPageInPopup = (currentPageInPopup + 1) % countPagesInPopup
-  setPageContentInPopup(newPage)
+  setPageContentInPopup(page)
 }
 
 function setPageContentInPopup (page) {
@@ -510 +510 @@
   )
 }
 
+const formatTime = (hours, twoDigitsHours = false) => {
+  return ((twoDigitsHours && hours < 10) ? '0' : '') + hours + ':00';
+}
+
 const updateHeaderControls = () => {
   $(`#time_${currentTime}`).prop('checked', true)
-  $('#dropdownMenuButtonTime').html((currentTime < 10 ? '0' : '') + `${currentTime}:00`)
+  $('#dropdownMenuButtonTime').html(formatTime(currentTime, true))
 }
 
 const setTimeline = () => {
-  $('#player-time > span').text(currentTime + ':00')
+  $('#player-time > span').text(formatTime(currentTime))
   $('#player-time').attr('class', 'time hour-' + currentTime)
 }
 
@@ -691 +695 @@
   if (mergedPoints.length) {
     heatmapLayer = L.heatLayer(mergedPoints, { max: max, minOpacity: 0.5, radius: 35, blur: 30 }).addTo(mymap)
   }
+
+  // timto vyresen bug #8191 - TODO: znamena to, ze muzeme smazat volani updatePopup() ve funkcich, kde se nejdriv vola drawHeatmap() a pak updatePopup()?
+  updatePopup()
 }
 
 /**
@@ -818 +825 @@
 
     if (hour !== currentTime) {
       elem.attr('class', 'time hour-' + hour)
-      $('#player-time span').html(hour + ':00')
+      $('#player-time span').html(formatTime(hour))
 
       onChangeHour(hour)
     }