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

Merge branch 'ent-9756-anadir-escalado-de-estados-a-op-masivas' into 'develop'

Browse Source 
Ent 9756 anadir escalado de estados a op masivas

See merge request artica/pandorafms!6079
This commit is contained in:
Matias Didier 2023-07-11 10:48:55 +00:00
commit f5f71531ee
2 changed files with 1477 additions and 1197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2645
pandora_console/godmode/massive/massive_edit_modules.php
View File

File diff suppressed because it is too large Load Diff

29
pandora_console/include/functions_html.php
View File

@ -1920,7 +1920,8 @@ function html_print_extended_select_for_unit(
$select_style=false, $select_style=false,
$unique_name=true, $unique_name=true,
$disabled=false, $disabled=false,
$no_change=0 $no_change=0,
$class='w100p'
) { ) {
global $config; global $config;
@ -1952,7 +1953,7 @@ function html_print_extended_select_for_unit(
ob_start(); ob_start();
echo '<div id="'.$uniq_name.'_default" class="w100p inline_line">'; echo '<div id="'.$uniq_name.'_default" class="'.$class.' inline_line">';
html_print_select( html_print_select(
$fields, $fields,
$uniq_name.'_select', $uniq_name.'_select',
@ -3923,6 +3924,14 @@ function html_print_table(&$table, $return=false)
} }
} }
if (isset($table->tdid)) {
foreach ($table->tdid as $keyrow => $tid) {
foreach ($tid as $key => $id) {
$tdid[$keyrow][$key] = $id;
}
}
}
if (isset($table->cellstyle)) { if (isset($table->cellstyle)) {
foreach ($table->cellstyle as $keyrow => $cstyle) { foreach ($table->cellstyle as $keyrow => $cstyle) {
foreach ($cstyle as $key => $cst) { foreach ($cstyle as $key => $cst) {
@ -4106,6 +4115,10 @@ function html_print_table(&$table, $return=false)
$colspan[$keyrow][$key] = ''; $colspan[$keyrow][$key] = '';
} }
if (!isset($tdid[$keyrow][$key])) {
$tdid[$keyrow][$key] = '';
}
if (!isset($rowspan[$keyrow][$key])) { if (!isset($rowspan[$keyrow][$key])) {
$rowspan[$keyrow][$key] = ''; $rowspan[$keyrow][$key] = '';
} }
@ -4126,10 +4139,16 @@ function html_print_table(&$table, $return=false)
$style[$key] = ''; $style[$key] = '';
} }
if ($class === 'datos5' && $key === 1) { if ($tdid[$keyrow][$key] !== '') {
$output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n"; $tid = $tdid[$keyrow][$key];
} else { } else {
$output .= '<td id="'.$tableid.'-'.$keyrow.'-'.$key.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n"; $tid = $tableid.'-'.$keyrow.'-'.$key;
}
if ($class === 'datos5' && $key === 1) {
$output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
} else {
$output .= '<td id="'.$tid.'" style="'.$cellstyle[$keyrow][$key].$style[$key].$valign[$key].$align[$key].$size[$key].$wrap[$key].'" '.$colspan[$keyrow][$key].' '.$rowspan[$keyrow][$key].' class="'.$class.' '.$cellclass[$keyrow][$key].'">'.$item.'</td>'."\n";
} }
} }