Merge branch 'ent-11900-16100-contador-de-items-en-distintas-vistas' into 'develop'

Ent 11900 16100 contador de items en distintas vistas

See merge request artica/pandorafms!6792
This commit is contained in:
Rafael Ameijeiras 2024-01-18 12:53:43 +00:00
commit d98c264640
6 changed files with 45 additions and 8 deletions

View File

@ -497,7 +497,12 @@ foreach ($actions as $action) {
$pagination = '';
if (isset($data)) {
html_print_table($table);
$pagination = ui_pagination($total_actions, $url, 0, 0, true, 'offset', false, '');
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
$pagination = ui_pagination($total_actions, $url, 0, 0, true, 'offset', $show_count, '');
} else {
ui_print_info_message(['no_close' => true, 'message' => __('No alert actions configured') ]);
}

View File

@ -1080,7 +1080,12 @@ foreach ($commands as $command) {
if (isset($data) === true && count($table->data) > 0) {
html_print_table($table);
$pagination = ui_pagination($total_commands, $url, 0, 0, true, 'offset', false, '');
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
$pagination = ui_pagination($total_commands, $url, 0, 0, true, 'offset', $show_count, '');
} else {
ui_print_info_message(
[

View File

@ -493,6 +493,11 @@ foreach ($templates as $template) {
$pagination = '';
if (isset($data) === true) {
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
html_print_table($table);
$pagination = ui_pagination(
$total_templates,
@ -501,7 +506,7 @@ if (isset($data) === true) {
0,
true,
'offset',
false,
$show_count,
''
);
} else {

View File

@ -1259,6 +1259,10 @@ switch ($action) {
$reports_table .= html_print_table($table, true);
$reports_table .= '<br></div>';
echo $reports_table;
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
$tablePagination = ui_pagination(
$total_reports,
@ -1267,7 +1271,7 @@ switch ($action) {
$pagination,
true,
'offset',
false
$show_count
);
} else {
ui_print_info_message(

View File

@ -1023,8 +1023,13 @@ foreach ($info as $user_id => $user_info) {
array_push($table->data, $data);
}
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
html_print_table($table);
$tablePagination = ui_pagination(count($info), false, 0, 0, true, 'offset', false, 'dataTables_paginate paging_simple_numbers');
$tablePagination = ui_pagination(count($info), false, 0, 0, true, 'offset', $show_count, 'dataTables_paginate paging_simple_numbers');
unset($table);
if ($is_management_allowed === true) {
if ($config['admin_can_add_user'] !== false) {

View File

@ -1451,7 +1451,12 @@ if ($autosearch) {
}
if ($count_modules > $config['block_size']) {
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count);
}
// Get number of elements of the pagination.
@ -2347,11 +2352,19 @@ if (empty($result) === false) {
array_push($table->data, $data);
}
echo '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
if (!defined('METACONSOLE')) {
echo '<div class="total_pages">'.sprintf(__('Total items: %s'), $count).'</div>';
}
html_print_table($table);
if ($count_modules > $config['block_size']) {
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', false);
$show_count = false;
if (is_metaconsole() === true) {
$show_count = true;
}
$tablePagination = ui_pagination($count_modules, false, $offset, 0, true, 'offset', $show_count);
}
} else {
ui_print_info_message(['no_close' => true, 'message' => __('Please apply a filter to display the data')]);