Merge branch 'develop' into ent-13411-mejorar-visualizacion-de-selector-de-items-de-informe-en-tema-oscuro
This commit is contained in:
commit
f69143d943
|
@ -4044,6 +4044,10 @@ function reporting_html_historical_data($table, $item, $pdf=0)
|
||||||
__('Date'),
|
__('Date'),
|
||||||
__('Data'),
|
__('Data'),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$table1->headStyle['Date'] = 'text-align: center;';
|
||||||
|
$table1->headStyle['Data'] = 'text-align: center;';
|
||||||
|
|
||||||
$table1->data = [];
|
$table1->data = [];
|
||||||
foreach ($item['data'] as $data) {
|
foreach ($item['data'] as $data) {
|
||||||
if (!is_numeric($data[__('Data')])) {
|
if (!is_numeric($data[__('Data')])) {
|
||||||
|
@ -4098,6 +4102,13 @@ function reporting_html_historical_data($table, $item, $pdf=0)
|
||||||
$table1->titleclass = 'title_table_pdf';
|
$table1->titleclass = 'title_table_pdf';
|
||||||
$table1->titlestyle = 'text-align:left;';
|
$table1->titlestyle = 'text-align:left;';
|
||||||
|
|
||||||
|
// Center every row
|
||||||
|
foreach ($table1->data[0] as $k => $v) {
|
||||||
|
for ($i = 0; $i < count($table1->data); $i++){
|
||||||
|
$table1->cellstyle[$i][$k] = 'text-align: center;';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return html_print_table($table1, true);
|
return html_print_table($table1, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4129,6 +4140,10 @@ function reporting_html_database_serialized($table, $item, $pdf=0)
|
||||||
__('Date'),
|
__('Date'),
|
||||||
__('Data'),
|
__('Data'),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$table1->headStyle['Date'] = 'text-align: center;';
|
||||||
|
$table1->headStyle['Data'] = 'text-align: center;';
|
||||||
|
|
||||||
if (!empty($item['keys'])) {
|
if (!empty($item['keys'])) {
|
||||||
$table1->head = array_merge($table1->head, $item['keys']);
|
$table1->head = array_merge($table1->head, $item['keys']);
|
||||||
}
|
}
|
||||||
|
@ -4169,6 +4184,14 @@ function reporting_html_database_serialized($table, $item, $pdf=0)
|
||||||
$table1->title = $item['title'];
|
$table1->title = $item['title'];
|
||||||
$table1->titleclass = 'title_table_pdf';
|
$table1->titleclass = 'title_table_pdf';
|
||||||
$table1->titlestyle = 'text-align:left;';
|
$table1->titlestyle = 'text-align:left;';
|
||||||
|
|
||||||
|
// Center every row
|
||||||
|
foreach ($table1->data[0] as $k => $v) {
|
||||||
|
for ($i = 0; $i < count($table1->data); $i++){
|
||||||
|
$table1->cellstyle[$i][$k] = 'text-align: center;';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return html_print_table(
|
return html_print_table(
|
||||||
$table1,
|
$table1,
|
||||||
true
|
true
|
||||||
|
@ -4195,9 +4218,7 @@ function reporting_html_last_value($table, $item, $pdf=0)
|
||||||
$table_data->width = '100%';
|
$table_data->width = '100%';
|
||||||
$table_data->class = 'info_table';
|
$table_data->class = 'info_table';
|
||||||
$table_data->headstyle = [];
|
$table_data->headstyle = [];
|
||||||
$table_data->headstyle[0] = 'text-align: left;';
|
|
||||||
$table_data->style = [];
|
$table_data->style = [];
|
||||||
$table_data->style[0] = 'text-align: left;';
|
|
||||||
$table_data->head = [
|
$table_data->head = [
|
||||||
__('Name'),
|
__('Name'),
|
||||||
__('Date'),
|
__('Date'),
|
||||||
|
@ -4205,6 +4226,11 @@ function reporting_html_last_value($table, $item, $pdf=0)
|
||||||
__('Status'),
|
__('Status'),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
$table_data->headStyle['Name'] = 'text-align: center;';
|
||||||
|
$table_data->headStyle['Date'] = 'text-align: center;';
|
||||||
|
$table_data->headStyle['Data'] = 'text-align: center;';
|
||||||
|
$table_data->headStyle['Status'] = 'text-align: center;';
|
||||||
|
|
||||||
$table_data->data = [];
|
$table_data->data = [];
|
||||||
$table_data->data[1][0] = $item['data']['agent_name'];
|
$table_data->data[1][0] = $item['data']['agent_name'];
|
||||||
$table_data->data[1][0] .= ' / ';
|
$table_data->data[1][0] .= ' / ';
|
||||||
|
@ -4329,6 +4355,11 @@ function reporting_html_last_value($table, $item, $pdf=0)
|
||||||
true
|
true
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
|
// Center every row
|
||||||
|
for ($i = 0; $i < 4; $i++) {
|
||||||
|
$table_data->cellstyle['1'][$i] = 'text-align: center;';
|
||||||
|
}
|
||||||
|
|
||||||
return html_print_table(
|
return html_print_table(
|
||||||
$table_data,
|
$table_data,
|
||||||
true
|
true
|
||||||
|
@ -6398,6 +6429,14 @@ function reporting_html_sql($table, $item, $pdf=0)
|
||||||
$table2->title = $item['title'];
|
$table2->title = $item['title'];
|
||||||
$table2->titleclass = 'title_table_pdf';
|
$table2->titleclass = 'title_table_pdf';
|
||||||
$table2->titlestyle = 'text-align:left;';
|
$table2->titlestyle = 'text-align:left;';
|
||||||
|
|
||||||
|
// Center every row
|
||||||
|
foreach ($table2->data[0] as $k => $v) {
|
||||||
|
for ($i = 0; $i < count($table2->data); $i++){
|
||||||
|
$table2->cellstyle[$i][$k] = 'text-align: center;';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$return_pdf .= html_print_table(
|
$return_pdf .= html_print_table(
|
||||||
$table2,
|
$table2,
|
||||||
true
|
true
|
||||||
|
|
|
@ -2075,6 +2075,15 @@ li.agent-autocomplete-li-text-color a {
|
||||||
color: #333 !important;
|
color: #333 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Datepicker */
|
||||||
|
#ui-datepicker-div .ui-datepicker-header,
|
||||||
|
#ui-datepicker-div .ui-datepicker-header select option,
|
||||||
|
.ui-datepicker-calendar th,
|
||||||
|
.ui-datepicker-calendar th * {
|
||||||
|
background-color: var(--secondary-color);
|
||||||
|
color: var(--text-color) !important;
|
||||||
|
}
|
||||||
|
|
||||||
select option:checked {
|
select option:checked {
|
||||||
background-color: var(--tertiary-color);
|
background-color: var(--tertiary-color);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue