tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 16:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

#12001 fixed filter in inventary

Browse Source
This commit is contained in:
Daniel Cebrian 2023-09-19 16:22:58 +02:00
parent f5c4ce872b
commit 1465400fb6
1 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,55 +32,65 @@ use PandoraFMS\Enterprise\Metaconsole\Node;
require_once $config['homedir'].'/include/functions_users.php'; require_once $config['homedir'].'/include/functions_users.php';
require_once $config['homedir'].'/include/functions_inventory.php'; require_once $config['homedir'].'/include/functions_inventory.php';
// Get different date to search the report.
$utimestamp = (int) get_parameter('date_end', 0);
$datetime_end = strtotime($utimestamp.' '.$time_end);
// Calculate new inteval for all reports. // Calculate new inteval for all reports.
$date_end = get_parameter('date_end', 0);
$time_end = get_parameter('time_end');
$datetime_end = strtotime($date_end.' '.$time_end);
$custom_date = get_parameter('custom_date', 0); $custom_date = get_parameter('custom_date', 0);
$date = get_parameter('date', SECONDS_1DAY); $range = get_parameter('utimestamp', SECONDS_1DAY);
$date_text = get_parameter('date_text', SECONDS_1DAY); $date_text = get_parameter('utimestamp_text', SECONDS_1DAY);
$date_init_less = (strtotime(date('Y-m-j')) - SECONDS_1DAY); $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);
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;
} }
$date_init = date('Y/m/d H:i:s', $datetime_init);
$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('date_units'); $date_units = get_parameter('utimestamp_units');
$utimestamp = date('Y/m/d H:i:s'); $date_end = date('Y/m/d H:i:s');
$date_start = date('Y/m/d H:i:s', (strtotime($utimestamp) - ($date_text * $date_units))); $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - ((int) $date_text * (int) $date_units)));
$period = (strtotime($utimestamp) - strtotime($date_start)); $period = (strtotime($date_end) - strtotime($date_init));
} else if (in_array($date, ['this_week', 'this_month', 'past_week', 'past_month'])) { } else if (in_array($range, ['this_week', 'this_month', 'past_week', 'past_month'])) {
if ($date === 'this_week') { if ($range === 'this_week') {
$monday = date('Y/m/d', strtotime('last monday')); $monday = date('Y/m/d', strtotime('last monday'));
$sunday = date('Y/m/d', strtotime($monday.' +6 days')); $sunday = date('Y/m/d', strtotime($monday.' +6 days'));
$period = (strtotime($sunday) - strtotime($monday)); $period = (strtotime($sunday) - strtotime($monday));
$date_init = $monday; $date_init = $monday;
$utimestamp = $sunday; $date_end = $sunday;
} else if ($date === 'this_month') { } else if ($range === 'this_month') {
$utimestamp = date('Y/m/d', strtotime('last day of this month')); $date_end = date('Y/m/d', strtotime('last day of this month'));
$first_of_month = date('Y/m/d', strtotime('first day of this month')); $first_of_month = date('Y/m/d', strtotime('first day of this month'));
$period = (strtotime($utimestamp) - strtotime($first_of_month)); $date_init = $first_of_month;
} else if ($date === 'past_month') { $period = (strtotime($date_end) - strtotime($first_of_month));
$utimestamp = date('Y/m/d', strtotime('last day of previous month')); } else if ($range === 'past_month') {
$date_end = date('Y/m/d', strtotime('last day of previous month'));
$first_of_month = date('Y/m/d', strtotime('first day of previous month')); $first_of_month = date('Y/m/d', strtotime('first day of previous month'));
$period = (strtotime($utimestamp) - strtotime($first_of_month)); $date_init = $first_of_month;
} else if ($date === 'past_week') { $period = (strtotime($date_end) - strtotime($first_of_month));
$utimestamp = date('Y-m-d', strtotime('sunday', strtotime('last week'))); } else if ($range === 'past_week') {
$first_of_week = date('Y-m-d', strtotime('monday', strtotime('last week'))); $date_end = date('Y/m/d', strtotime('sunday', strtotime('last week')));
$period = (strtotime($utimestamp) - strtotime($first_of_week)); $first_of_week = date('Y/m/d', strtotime('monday', strtotime('last week')));
$date_init = $first_of_week;
$period = (strtotime($date_end) - strtotime($first_of_week));
} }
} else { } else {
$utimestamp = date('Y/m/d H:i:s'); $date_end = date('Y/m/d H:i:s');
$date_start = date('Y/m/d H:i:s', (strtotime($utimestamp) - $date)); $date_init = date('Y/m/d H:i:s', (strtotime($date_end) - $range));
$period = (strtotime($utimestamp) - strtotime($date_start)); $period = (strtotime($date_end) - strtotime($date_init));
} }
$date_init = strtotime($date_init);
$utimestamp = strtotime($date_end);
if (is_ajax() === true) { if (is_ajax() === true) {
$get_csv_url = (bool) get_parameter('get_csv_url'); $get_csv_url = (bool) get_parameter('get_csv_url');
$get_data_basic_info = (bool) get_parameter('get_data_basic_info'); $get_data_basic_info = (bool) get_parameter('get_data_basic_info');
@ -383,7 +393,6 @@ $inventory_id_group = (int) get_parameter('id_group');
$inventory_search_string = (string) get_parameter('search_string'); $inventory_search_string = (string) get_parameter('search_string');
$order_by_agent = (bool) get_parameter('order_by_agent'); $order_by_agent = (bool) get_parameter('order_by_agent');
$export = (string) get_parameter('export'); $export = (string) get_parameter('export');
$utimestamp = (int) get_parameter('utimestamp');
$submit_filter = (bool) get_parameter('srcbutton'); $submit_filter = (bool) get_parameter('srcbutton');
$pagination_url_parameters = [ $pagination_url_parameters = [
@ -667,7 +676,6 @@ $params['input_name'] = 'agent';
$params['value'] = $inventory_agent; $params['value'] = $inventory_agent;
$params['selectbox_id'] = 'module_inventory_general_view'; $params['selectbox_id'] = 'module_inventory_general_view';
$params['javascript_is_function_select'] = true; $params['javascript_is_function_select'] = true;
$params['javascript_function_action_after_select'] = 'this.form.submit';
$params['use_hidden_input_idagent'] = true; $params['use_hidden_input_idagent'] = true;
$params['print_hidden_input_idagent'] = true; $params['print_hidden_input_idagent'] = true;
$params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent'; $params['hidden_input_idagent_id'] = 'hidden-autocomplete_id_agent';
@ -734,10 +742,10 @@ if (is_metaconsole() === false) {
'utimestamp', 'utimestamp',
true, true,
get_parameter('utimestamp', SECONDS_1DAY), get_parameter('utimestamp', SECONDS_1DAY),
$date_init, date('Y/m/d', $date_init),
$time_init, date('H:i:s', $date_init),
date('Y/m/d'), date('Y/m/d', $utimestamp),
date('H:i:s'), date('H:i:s', $utimestamp),
$date_text $date_text
) )
); );