From 1088c91c3a0ce3b98ae81ff20da50b882159fe0a Mon Sep 17 00:00:00 2001 From: Thomas Zilio Date: Tue, 20 Oct 2020 09:47:01 +0200 Subject: [PATCH] Correzioni minori --- assets/src/js/functions/dates.js | 24 ++++++++++--------- .../statistiche_articoli/manage_prezzi.php | 2 +- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/assets/src/js/functions/dates.js b/assets/src/js/functions/dates.js index a051517cb..3193549ed 100755 --- a/assets/src/js/functions/dates.js +++ b/assets/src/js/functions/dates.js @@ -33,25 +33,26 @@ function getCalendarIcons(){ function initDateInput(input) { let date_format = dateFormatMoment(globals.date_format); let calendar_icons = getCalendarIcons(); + let $input = $(input); $(input).datetimepicker({ format: date_format, locale: globals.locale, icons: calendar_icons, useCurrent: false, - minDate: moment($this.attr('min-date')).isValid() ? $this.attr('min-date') : false, - maxDate: moment($this.attr('max-date')).isValid() ? $this.attr('max-date') : false, + minDate: moment($input.attr('min-date')).isValid() ? $input.attr('min-date') : false, + maxDate: moment($input.attr('max-date')).isValid() ? $input.attr('max-date') : false, }); return true; } function initTimestampInput(input) { - let $this = $(input); + let $input = $(input); let timestamp_format = dateFormatMoment(globals.timestamp_format); let calendar_icons = getCalendarIcons(); - $this.datetimepicker({ + $input.datetimepicker({ format: timestamp_format, locale: globals.locale, icons: calendar_icons, @@ -63,16 +64,16 @@ function initTimestampInput(input) { horizontal: 'left', vertical: 'auto' }, - minDate: moment($this.attr('min-date')).isValid() ? $this.attr('min-date') : false, - maxDate: moment($this.attr('max-date')).isValid() ? $this.attr('max-date') : false, + minDate: moment($input.attr('min-date')).isValid() ? $input.attr('min-date') : false, + maxDate: moment($input.attr('max-date')).isValid() ? $input.attr('max-date') : false, }); // fix per timestamp-picker non visibile con la classe table-responsive - $this.on("dp.show", function (e) { + $input.on("dp.show", function (e) { $('#tecnici > div').removeClass('table-responsive'); }); - $this.on("dp.hide", function (e) { + $input.on("dp.hide", function (e) { $('#tecnici > div').addClass('table-responsive'); }); @@ -80,17 +81,18 @@ function initTimestampInput(input) { } function initTimeInput(input) { + let $input = $(input); let time_format = dateFormatMoment(globals.time_format); let calendar_icons = getCalendarIcons(); - $(input).datetimepicker({ + $input.datetimepicker({ format: time_format, locale: globals.locale, icons: calendar_icons, useCurrent: false, stepping: 5, - minDate: moment($this.attr('min-date')).isValid() ? $this.attr('min-date') : false, - maxDate: moment($this.attr('max-date')).isValid() ? $this.attr('max-date') : false, + minDate: moment($input.attr('min-date')).isValid() ? $input.attr('min-date') : false, + maxDate: moment($input.attr('max-date')).isValid() ? $input.attr('max-date') : false, }); return true; diff --git a/plugins/statistiche_articoli/manage_prezzi.php b/plugins/statistiche_articoli/manage_prezzi.php index 2d99de8bf..61f6ce94a 100755 --- a/plugins/statistiche_articoli/manage_prezzi.php +++ b/plugins/statistiche_articoli/manage_prezzi.php @@ -32,7 +32,7 @@ $prezzo_max = $prezzi['max']; $prezzo_medio = $prezzi['media']; $oscillazione = $prezzo_max['prezzo'] - $prezzo_min['prezzo']; -$oscillazione_percentuale = $oscillazione * 100 / $prezzo_medio ?: 0; +$oscillazione_percentuale = $prezzo_medio ? $oscillazione * 100 / $prezzo_medio : 0; $data_min = strtotime($prezzo_min['data']); $data_max = strtotime($prezzo_max['data']);