tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-13573-filtro-date-custom-de-inventario-vuelve-a-seconds-cada-vez-que-se-aplica' into 'develop'

Browse Source 
Ent 13573 Filtro Date custom de Inventario vuelve a seconds cada vez que se aplica

See merge request artica/pandorafms!7331
This commit is contained in:
Diego Muñoz-Reja 2024-05-06 11:47:07 +00:00
commit 1d07c05787
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pandora_console/include/functions_html.php
View File

@ -7942,6 +7942,7 @@ function html_print_select_date_range(
$date_format_js='yy/mm/dd', $date_format_js='yy/mm/dd',
$time_format_js='HH:mm:ss', $time_format_js='HH:mm:ss',
$id='', $id='',
$units_selected='1',
) { ) {
global $config; global $config;
@ -8136,7 +8137,7 @@ function html_print_select_date_range(
$output .= html_print_select( $output .= html_print_select(
$units, $units,
$name.'_units', $name.'_units',
'1', $units_selected,
'', '',
'', '',
0, 0,

11
pandora_console/operation/inventory/inventory.php
View File

@ -46,6 +46,7 @@ $date_init_less = (strtotime(date('Y/m/d')) - SECONDS_1DAY);
$date_init = get_parameter('date_init', date(DATE_FORMAT, $date_init_less)); $date_init = get_parameter('date_init', date(DATE_FORMAT, $date_init_less));
$time_init = get_parameter('time_init', date(TIME_FORMAT, $date_init_less)); $time_init = get_parameter('time_init', date(TIME_FORMAT, $date_init_less));
$datetime_init = strtotime($date_init.' '.$time_init); $datetime_init = strtotime($date_init.' '.$time_init);
$date_units = get_parameter('utimestamp_units');
if ($custom_date === '1') { if ($custom_date === '1') {
if ($datetime_init >= $datetime_end) { if ($datetime_init >= $datetime_end) {
$datetime_init = $date_init_less; $datetime_init = $date_init_less;
@ -55,7 +56,6 @@ if ($custom_date === '1') {
$date_end = date('Y/m/d H:i:s', $datetime_end); $date_end = date('Y/m/d H:i:s', $datetime_end);
$period = ($datetime_end - $datetime_init); $period = ($datetime_end - $datetime_init);
} else if ($custom_date === '2') { } else if ($custom_date === '2') {
$date_units = get_parameter('utimestamp_units');
$date_end = date('Y/m/d H:i:s'); $date_end = date('Y/m/d H:i:s');
$date_init = date('Y/m/d H:i:s', (strtotime($date_end) - ((int) $date_text * (int) $date_units))); $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - ((int) $date_text * (int) $date_units)));
$period = (strtotime($date_end) - strtotime($date_init)); $period = (strtotime($date_end) - strtotime($date_init));
@ -768,7 +768,14 @@ if (is_metaconsole() === false) {
date('H:i:s', $date_init), date('H:i:s', $date_init),
date('Y/m/d', $utimestamp), date('Y/m/d', $utimestamp),
date('H:i:s', $utimestamp), date('H:i:s', $utimestamp),
$date_text $date_text,
'w100p',
'Y/m/d',
'H:i:s',
'yy/mm/dd',
'HH:mm:ss',
'',
$date_units
) )
); );
} }