Merge branch 'ent-9069-schedule-downtime-poner-decente-el-filtro' into 'develop'
Ent 9069 schedule downtime poner decente el filtro See merge request artica/pandorafms!5398
This commit is contained in:
commit
2be4dc7960
|
@ -290,7 +290,7 @@ $search_text = (string) get_parameter('search_text');
|
||||||
$date_from = (string) get_parameter('date_from');
|
$date_from = (string) get_parameter('date_from');
|
||||||
$date_to = (string) get_parameter('date_to');
|
$date_to = (string) get_parameter('date_to');
|
||||||
$execution_type = (string) get_parameter('execution_type');
|
$execution_type = (string) get_parameter('execution_type');
|
||||||
$show_archived = (bool) get_parameter('archived');
|
$show_archived = (bool) get_parameter_switch('archived', false);
|
||||||
$agent_id = (int) get_parameter('agent_id');
|
$agent_id = (int) get_parameter('agent_id');
|
||||||
$agent_name = (string) ((empty($agent_id) === false) ? get_parameter('agent_name') : '');
|
$agent_name = (string) ((empty($agent_id) === false) ? get_parameter('agent_name') : '');
|
||||||
$module_id = (int) get_parameter('module_name_hidden');
|
$module_id = (int) get_parameter('module_name_hidden');
|
||||||
|
@ -313,12 +313,20 @@ $table_form = new StdClass();
|
||||||
$table_form->class = 'databox filters';
|
$table_form->class = 'databox filters';
|
||||||
$table_form->width = '100%';
|
$table_form->width = '100%';
|
||||||
$table_form->rowstyle = [];
|
$table_form->rowstyle = [];
|
||||||
|
$table_form->cellstyle[0] = ['width: 100px;'];
|
||||||
|
$table_form->cellstyle[1] = ['width: 100px;'];
|
||||||
|
$table_form->cellstyle[1][2] = 'display: flex; align-items: center;';
|
||||||
|
$table_form->cellstyle[2] = ['width: 100px;'];
|
||||||
|
$table_form->cellstyle[3] = ['text-align: right;'];
|
||||||
|
$table_form->colspan[3][0] = 3;
|
||||||
$table_form->data = [];
|
$table_form->data = [];
|
||||||
|
|
||||||
$row = [];
|
$row = [];
|
||||||
|
|
||||||
// Search text.
|
// Search text.
|
||||||
$row[] = __('Search').' '.html_print_input_text(
|
$row[] = __('Search');
|
||||||
|
|
||||||
|
$row[] = html_print_input_text(
|
||||||
'search_text',
|
'search_text',
|
||||||
$search_text,
|
$search_text,
|
||||||
'',
|
'',
|
||||||
|
@ -356,7 +364,8 @@ $execution_type_fields = [
|
||||||
'periodically' => __('Periodically'),
|
'periodically' => __('Periodically'),
|
||||||
'cron' => __('Cron'),
|
'cron' => __('Cron'),
|
||||||
];
|
];
|
||||||
$row[] = __('Execution type').' '.html_print_select(
|
$row[] = __('Execution type');
|
||||||
|
$row[] = html_print_select(
|
||||||
$execution_type_fields,
|
$execution_type_fields,
|
||||||
'execution_type',
|
'execution_type',
|
||||||
$execution_type,
|
$execution_type,
|
||||||
|
@ -368,11 +377,11 @@ $row[] = __('Execution type').' '.html_print_select(
|
||||||
false
|
false
|
||||||
);
|
);
|
||||||
// Show past downtimes.
|
// Show past downtimes.
|
||||||
$row[] = __('Show past downtimes').' '.html_print_checkbox(
|
$row[] = __('Show past downtimes').' '.html_print_switch(
|
||||||
'archived',
|
[
|
||||||
1,
|
'name' => 'archived',
|
||||||
$show_archived,
|
'value' => $show_archived,
|
||||||
true
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
$table_form->data[] = $row;
|
$table_form->data[] = $row;
|
||||||
|
@ -388,8 +397,8 @@ $params['return'] = true;
|
||||||
$params['print_hidden_input_idagent'] = true;
|
$params['print_hidden_input_idagent'] = true;
|
||||||
$params['hidden_input_idagent_name'] = 'agent_id';
|
$params['hidden_input_idagent_name'] = 'agent_id';
|
||||||
$params['hidden_input_idagent_value'] = $agent_id;
|
$params['hidden_input_idagent_value'] = $agent_id;
|
||||||
$agent_input = __('Agent').' '.ui_print_agent_autocomplete_input($params);
|
$row[] = __('Agent');
|
||||||
$row[] = $agent_input;
|
$row[] = ui_print_agent_autocomplete_input($params);
|
||||||
|
|
||||||
// Module.
|
// Module.
|
||||||
$row[] = __('Module').' '.html_print_autocomplete_modules(
|
$row[] = __('Module').' '.html_print_autocomplete_modules(
|
||||||
|
@ -402,6 +411,10 @@ $row[] = __('Module').' '.html_print_autocomplete_modules(
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
|
|
||||||
|
$table_form->data[] = $row;
|
||||||
|
|
||||||
|
$row = [];
|
||||||
|
|
||||||
$row[] = html_print_submit_button(
|
$row[] = html_print_submit_button(
|
||||||
__('Search'),
|
__('Search'),
|
||||||
'search',
|
'search',
|
||||||
|
|
Loading…
Reference in New Issue