From 23d7e8632b59e065aa81ac0f3d0bd062b7047550 Mon Sep 17 00:00:00 2001
From: Thomas Rupprecht <rupprecht.thomas@gmail.com>
Date: Thu, 17 Nov 2022 18:49:25 +0100
Subject: [PATCH] javascript improvements use `const` instead of `var`/`let`
 use `$(function () { ... })` instead of `$(document).ready(function () { ...
 })` unify codestyle

---
 includes/pages/user_shifts.php            |  6 +--
 includes/sys_form.php                     |  8 ++--
 includes/view/PublicDashboard_view.php    |  4 +-
 includes/view/UserDriverLicenses_view.php | 10 ++---
 resources/assets/js/countdown.js          | 52 +++++++++++------------
 resources/assets/js/forms.js              | 22 +++++-----
 resources/assets/js/sticky-headers.js     | 12 +++---
 7 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php
index c2922a76..468120d4 100644
--- a/includes/pages/user_shifts.php
+++ b/includes/pages/user_shifts.php
@@ -278,7 +278,7 @@ function view_user_shifts()
                     __('Angeltypes') . '<sup>1</sup>',
                     [
                         button(
-                            'javascript: checkOwnTypes(\'selection_types\', ' . json_encode($ownTypes) . ')',
+                            'javascript:checkOwnTypes(\'selection_types\', ' . json_encode($ownTypes) . ')',
                             __('Own'),
                             'd-print-none'
                         ),
@@ -365,8 +365,8 @@ function make_select($items, $selected, $name, $title = null, $additionalButtons
     }
 
     $buttons = [];
-    $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', true)', __('All'), 'd-print-none');
-    $buttons[] = button('javascript: checkAll(\'selection_' . $name . '\', false)', __('None'), 'd-print-none');
+    $buttons[] = button('javascript:checkAll(\'selection_' . $name . '\', true)', __('All'), 'd-print-none');
+    $buttons[] = button('javascript:checkAll(\'selection_' . $name . '\', false)', __('None'), 'd-print-none');
     $buttons = array_merge($buttons, $additionalButtons);
 
     $html .= buttons($buttons);
diff --git a/includes/sys_form.php b/includes/sys_form.php
index 06f72f45..735d03a7 100644
--- a/includes/sys_form.php
+++ b/includes/sys_form.php
@@ -38,12 +38,12 @@ function form_spinner($name, $label, $value)
             </button>
         </div>
         <script type="text/javascript">
-            $(\'#spinner-' . $name . '-down\').click(function() {
-                let spinner = $(\'#spinner-' . $name . '\');
+            $(\'#spinner-' . $name . '-down\').click(function () {
+                const spinner = $(\'#spinner-' . $name . '\');
                 spinner.val(parseInt(spinner.val()) - 1);
             });
-            $(\'#spinner-' . $name . '-up\').click(function() {
-                let spinner = $(\'#spinner-' . $name . '\');
+            $(\'#spinner-' . $name . '-up\').click(function () {
+                const spinner = $(\'#spinner-' . $name . '\');
                 spinner.val(parseInt(spinner.val()) + 1);
             });
         </script>
diff --git a/includes/view/PublicDashboard_view.php b/includes/view/PublicDashboard_view.php
index a4a9944a..c5822f0a 100644
--- a/includes/view/PublicDashboard_view.php
+++ b/includes/view/PublicDashboard_view.php
@@ -42,8 +42,8 @@ function public_dashboard_view($stats, $free_shifts)
                     stats(__('Angels currently working'), $stats['angels-working'], 'default'),
                     stats(__('Hours to be worked'), $stats['hours-to-work'], 'default'),
                     '<script>
-                    $(function() {
-                        setInterval(function() {
+                    $(function () {
+                        setInterval(function () {
                             $(\'#content .wrapper\').load(window.location.href + \' #public-dashboard\');
                         }, 60000);
                     })
diff --git a/includes/view/UserDriverLicenses_view.php b/includes/view/UserDriverLicenses_view.php
index c9056982..0f7fe150 100644
--- a/includes/view/UserDriverLicenses_view.php
+++ b/includes/view/UserDriverLicenses_view.php
@@ -53,15 +53,15 @@ function UserDriverLicense_edit_view($user_source, $user_driver_license)
         ]),
         '
         <script type="text/javascript">
-            $(function() {
-                let checkbox = $(\'#wants_to_drive\');
-                if(checkbox.is(\':checked\'))
+            $(function () {
+                const checkbox = $(\'#wants_to_drive\');
+                if (checkbox.is(\':checked\'))
                     $(\'#driving_license\').show();
                 else
                     $(\'#driving_license\').hide();
 
-                checkbox.click(function() {
-                if($(\'#wants_to_drive\').is(\':checked\'))
+                checkbox.click(function () {
+                if ($(\'#wants_to_drive\').is(\':checked\'))
                     $(\'#driving_license\').show();
                 else
                     $(\'#driving_license\').hide();
diff --git a/resources/assets/js/countdown.js b/resources/assets/js/countdown.js
index debd8fb5..99f7166b 100644
--- a/resources/assets/js/countdown.js
+++ b/resources/assets/js/countdown.js
@@ -1,35 +1,35 @@
 const lang = document.documentElement.getAttribute('lang');
 
 const templateFuture = 'in %value %unit';
-const templatePast = lang === "en"
+const templatePast = lang === 'en'
     ? '%value %unit ago'
     : 'vor %value %unit';
 
-const yearUnits = lang === "en"
-    ? ["year", "years"]
-    : ["Jahr", "Jahren"];
+const yearUnits = lang === 'en'
+    ? ['year', 'years']
+    : ['Jahr', 'Jahren'];
 
-const monthUnits = lang === "en"
-    ? ["month", "months"]
-    : ["Monat", "Monaten"];
+const monthUnits = lang === 'en'
+    ? ['month', 'months']
+    : ['Monat', 'Monaten'];
 
-const dayUnits = lang === "en"
-    ? ["day", "days"]
-    : ["Tag", "Tagen"];
+const dayUnits = lang === 'en'
+    ? ['day', 'days']
+    : ['Tag', 'Tagen'];
 
-const hourUnits = lang === "en"
-    ? ["hour", "hours"]
-    : ["Stunde", "Stunden"];
+const hourUnits = lang === 'en'
+    ? ['hour', 'hours']
+    : ['Stunde', 'Stunden'];
 
-const minuteUnits = lang === "en"
-    ? ["minute", "minutes"]
-    : ["Minute", "Minuten"];
+const minuteUnits = lang === 'en'
+    ? ['minute', 'minutes']
+    : ['Minute', 'Minuten'];
 
-const secondUnits = lang === "en"
-    ? ["second", "seconds"]
-    : ["Sekunde", "Sekunden"];
+const secondUnits = lang === 'en'
+    ? ['second', 'seconds']
+    : ['Sekunde', 'Sekunden'];
 
-const nowString = lang === "en" ? "now" : "jetzt";
+const nowString = lang === 'en' ? 'now' : 'jetzt';
 
 const secondsHour = 60 * 60;
 
@@ -56,8 +56,8 @@ function formatFromNow(timestamp) {
             const template = ago ? templatePast : templateFuture;
             const unit = value === 1 ? singular : plural;
             return template
-                .replace("%value", value)
-                .replace("%unit", unit);
+                .replace('%value', value)
+                .replace('%unit', unit);
         }
     }
 
@@ -67,11 +67,11 @@ function formatFromNow(timestamp) {
 /**
  * Initialises all countdown fields on the page.
  */
-$(document).ready(function () {
+$(function () {
     $.each($('[data-countdown-ts]'), function (i, e) {
-        var span = $(e);
-        const timestamp = span.data("countdown-ts");
-        var text = span.html();
+        const span = $(e);
+        const timestamp = span.data('countdown-ts');
+        const text = span.html();
         span.html(text.replace('%c', formatFromNow(timestamp)));
         setInterval(function () {
             span.html(text.replace('%c', formatFromNow(timestamp)));
diff --git a/resources/assets/js/forms.js b/resources/assets/js/forms.js
index 91cf2ae8..25668f01 100644
--- a/resources/assets/js/forms.js
+++ b/resources/assets/js/forms.js
@@ -1,5 +1,5 @@
-require('select2')
-import { formatDay, formatTime } from "./date";
+require('select2');
+import { formatDay, formatTime } from './date';
 
 /**
  * Sets all checkboxes to the wanted state
@@ -42,7 +42,7 @@ global.setInput = (from, to) => {
     const toTime = $('#end_time');
 
     if (!fromDay || !fromTime || !toDay || !toTime) {
-        console.warn("cannot set input date because of missing field");
+        console.warn('cannot set input date because of missing field');
         return;
     }
 
@@ -56,13 +56,13 @@ global.setInput = (from, to) => {
 global.setDay = (days) => {
     days = days || 0;
 
-    var from = new Date();
+    const from = new Date();
     from.setHours(0, 0, 0, 0);
 
     // add days, Date handles the overflow
     from.setDate(from.getDate() + days);
 
-    var to = new Date(from);
+    const to = new Date(from);
     to.setHours(23, 59);
 
     setInput(from, to);
@@ -71,8 +71,8 @@ global.setDay = (days) => {
 global.setHours = (hours) => {
     hours = hours || 1;
 
-    var from = new Date();
-    var to = new Date(from);
+    const from = new Date();
+    const to = new Date(from);
 
     // convert hours to add to milliseconds (60 minutes * 60 seconds * 1000 for milliseconds)
     const msToAdd = hours * 60 * 60 * 1000;
@@ -101,13 +101,13 @@ $(function () {
  */
 $(function () {
     $('.input-group.time').each(function () {
-        var elem = $(this);
+        const elem = $(this);
         elem.find('button').on('click', function () {
             const now = new Date();
-            var input = elem.children('input').first();
+            const input = elem.children('input').first();
             input.val(formatTime(now));
-            var daySelector = $('#' + input.attr('id').replace('time', 'day'));
-            var days = daySelector.children('option');
+            const daySelector = $('#' + input.attr('id').replace('time', 'day'));
+            const days = daySelector.children('option');
             const yyyyMMDD = formatDay(now);
             days.each(function (i) {
                 if ($(days[i]).val() === yyyyMMDD) {
diff --git a/resources/assets/js/sticky-headers.js b/resources/assets/js/sticky-headers.js
index a8e139af..e227d59d 100644
--- a/resources/assets/js/sticky-headers.js
+++ b/resources/assets/js/sticky-headers.js
@@ -1,11 +1,11 @@
 /**
  * Enables the fixed headers and time lane for the shift-calendar and datatables
  */
-$(document).ready(function () {
+$(function () {
     if ($('.shift-calendar').length) {
-        var timeLanes = $('.shift-calendar .time');
-        var headers = $('.shift-calendar .header');
-        var topReference = $('.container-fluid .row');
+        const timeLanes = $('.shift-calendar .time');
+        const headers = $('.shift-calendar .header');
+        const topReference = $('.container-fluid .row');
         timeLanes.css({
             'position': 'relative',
             'z-index': 999
@@ -16,8 +16,8 @@ $(document).ready(function () {
         });
         $(window).scroll(
             function () {
-                var top = headers.parent().offset().top;
-                var left = 15;
+                const top = headers.parent().offset().top;
+                const left = 15;
                 timeLanes.css({
                     'left': Math.max(0, $(window).scrollLeft() - left) + 'px'
                 });