tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3130-Visualizacion-erronea-columna-eventos' into 'develop' 

modified event list visualization

See merge request artica/pandorafms!2018
This commit is contained in:
vgilc 2018-11-30 12:51:22 +01:00
parent dcacd53d5b 8371e75757
commit 654f3a5021
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pandora_console/operation/events/events.build_table.php
View File

@ -164,14 +164,6 @@ else {
$table->align[$i] = 'left';
$i++;
}
if ($fields == 'estado') {
$table->head[$i] = __('Status') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'status')),
'sort'
);
$table->align[$i] = 'left';
$i++;
}
if ($fields == 'id_evento') {
$table->head[$i] = __('Event ID') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'event_id')),
@ -341,6 +333,18 @@ else {
$i++;
}
}
if (in_array('estado', $show_fields)) {
$table->head[$i] = '<span style="white-space: nowrap;">'.__('Status') . html_print_sort_arrows(
array_merge($params, array('sort_field' => 'status')),
'sort'
).'</span>';
$table->align[$i] = 'left';
$table->style[$i] = 'white-space: nowrap !important; width: 1px !important;';
$i++;
}
if ($i != 0 && $allow_action) {
$table->head[$i] = __('Action');
$table->align[$i] = 'left';
@ -491,14 +495,6 @@ else {
$table->cellclass[count($table->data)][$i] = $myclass;
$i++;
}
if ($fields == 'estado') {
$data[$i] = html_print_image ($img_st, true,
array ("class" => "image_status",
"title" => $title_st,
"id" => 'status_img_'.$event["id_evento"]));
$table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3;';
$i++;
}
if ($fields == 'id_evento') {
$data[$i] = $event["id_evento"];
$table->cellclass[count($table->data)][$i] = $myclass;
@ -777,6 +773,15 @@ else {
$i++;
}
}
if (in_array('estado', $show_fields)) {
$data[$i] = html_print_image ($img_st, true,
array ("class" => "image_status",
"title" => $title_st,
"id" => 'status_img_'.$event["id_evento"]));
$table->cellstyle[count($table->data)][$i] = 'background: #F3F3F3; white-space: nowrap; width: 1px;';
$i++;
}
if ($i != 0 && $allow_action) {
//Actions