Skip to content

Commit 1398880

Browse files
committed
feat: aggiunti due nuovi filtri data
1 parent b316f20 commit 1398880

2 files changed

Lines changed: 8 additions & 0 deletions

File tree

assets/src/js/functions/dates.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ function start_complete_calendar(id, callback) {
130130
ranges[globals.translations.thisYear] = [moment().startOf('year'), moment().endOf('year')];
131131
ranges[globals.translations.lastYear] = [moment().subtract(1, 'year').startOf('year'), moment().subtract(1, 'year').endOf('year')];
132132
ranges[globals.translations.lastYear_thisYear] = [moment().subtract(1, 'year').startOf('year'), moment().endOf('year')];
133+
ranges[globals.translations.lastDays] = [moment().subtract(365, 'day'), moment()];
134+
ranges[globals.translations.customSettings] = [globals.start_date_settings_formatted, globals.end_date_settings_formatted];
133135

134136
var format = dateFormatMoment(globals.date_format);
135137
$(id).daterangepicker({

include/top.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
'thisYear' => tr("Quest'anno"),
120120
'lastYear' => tr('Anno scorso'),
121121
'lastYear_thisYear' => tr("Quest'anno + prec."),
122+
'lastDays' => tr('Ultimi 365 giorni'),
123+
'customSettings' => tr('Da impostazioni'),
122124
'apply' => tr('Applica'),
123125
'cancel' => tr('Annulla'),
124126
'from' => tr('Da'),
@@ -233,8 +235,12 @@
233235
234236
start_date: "'.$_SESSION['period_start'].'",
235237
start_date_formatted: "'.Translator::dateToLocale($_SESSION['period_start']).'",
238+
start_date_settings: "'.Translator::dateToEnglish(setting('Inizio periodo calendario')).'",
239+
start_date_settings_formatted: "'.setting('Inizio periodo calendario').'",
236240
end_date: "'.$_SESSION['period_end'].'",
237241
end_date_formatted: "'.Translator::dateToLocale($_SESSION['period_end']).'",
242+
end_date_settings: "'.Translator::dateToEnglish(setting('Fine periodo calendario')).'",
243+
end_date_settings_formatted: "'.setting('Fine periodo calendario').'",
238244
minute_stepping: '.setting('Numero di minuti di avanzamento delle sessioni delle attività').',
239245
240246
collapse_plugin_sidebar: '.($has_plugins ? intval(setting('Nascondere la barra dei plugin di default')) : 1).',

0 commit comments

Comments
 (0)