Revize bb2d43b5

Re #8159 - frontend bugfixes and refactoring

website/public/js/zcu-heatmap.js

@@ -71 +71 @@
   className: className
 }).setLatLng([lat / num, lng / num])
 
-const genPopUp = (datasetName, place, number, sum, currentPos, maxPos) => {
-  const header = `<strong>${datasetName}</strong><div id="place-info">${place}</div>`
-  const currentNum = `<span id="digit-info">${number}</span>`
-  // eslint-disable-next-line eqeqeq
-  const sumNum = `<span id="total-info" style="font-size: large">${(sum && (sum != number)) ? '/' + sum : ''}</span>`
-  const digitInfo = `<div id="number-info">${currentNum}${sumNum}</div>`
+const genPopUp = (datasetName, place, count, sum, currentPos, maxPos) => {
+  const popupHeader = `
+    <strong>${datasetName}</strong>
+    <div id="place-info">${place}</div>`
+  const popupData = `
+    <div id="number-info">
+      <span id="digit-info">${count}</span>
+      <span id="total-info">${(sum && (sum != count)) ? '/' + sum : ''}</span>
+    </div>`
   const { previousButton, nextButton, posInfo } = genPopUpControlButtons(currentPos, maxPos)
+
   return `
-  ${header}
-  ${digitInfo}
+  ${popupHeader}
+  ${popupData}
   ${genPopUpControls(maxPos > 1 ? [previousButton, posInfo, nextButton] : null)}
   `
 }
@@ -110 +114 @@
     inDebounce = setTimeout(() => func.apply(context, args), delay)
   }
 }
+
 const onValueChangeRegister = () => {
   $('#date').change(function () {
     data = []
     loadCurrentTimeHeatmap(dataSourceRoute, positionsSourceRoute)
-    console.log('VAL:', $(this).val())
     const date = new Date($(this).val())
     $('#player-date').html(`${date.getDate()}. ${date.getMonth() + 1}. ${date.getFullYear()}`)
+    changeUrl()
   })
+
   $('#dataset-dropdown-time input[type="radio"]').each(function () {
     $(this).change(function () {
       currentTime = $(this).val()
       updateHeaderControls()
       setTimeline()
       drawHeatmap(data[currentTime])
+      changeUrl()
     })
   })
+
   $('input[type=checkbox]').each(function () {
     $(this).change(
       debounce(() => onCheckboxClicked(this), 1000)
     )
   })
 }
+
 /**
  * Initialize leaflet map on start position which can be default or set based on user action
  */
@@ -330 +339 @@
 
 function updateHeaderControls () {
   $(`#time_${currentTime}`).prop('checked', true)
-  $('#dropdownMenuButton-time').html(currentTime >= 10 ? `${currentTime}:00` : `0${currentTime}:00`)
+  $('#dropdownMenuButtonTime').html((currentTime < 10 ? '0' : '') + `${currentTime}:00`)
 }
 
 function setTimeline () {