fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in cochalo/processmaker (pull request #199)

Browse Source 
Arreglo de notice en REPORT TABLE
This commit is contained in:
erik ao
2014-02-17 15:36:18 -04:00
parent 4205dc1f0c 920435d837
commit ff76a525e5
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/BusinessModel/Table.php
View File

@@ -259,13 +259,12 @@ class Table
$columnsStd = array(); $columnsStd = array();
foreach ($columns as $i => $column) { foreach ($columns as $i => $column) {
if (isset($columns[$i]['fld_dyn'])) { if (isset($columns[$i]['fld_dyn'])) {
$columns[$i]['fld_dyn'] = ($reportFlag) ? $columns[$i]['fld_dyn'] : '';
$columns[$i]['field_dyn'] = $columns[$i]['fld_dyn']; $columns[$i]['field_dyn'] = $columns[$i]['fld_dyn'];
unset($columns[$i]['fld_dyn']); unset($columns[$i]['fld_dyn']);
} else { } else {
$columns[$i]['fld_dyn'] = ''; $columns[$i]['fld_dyn'] = '';
} }
$columns[$i]['fld_dyn'] = ($reportFlag) ? $columns[$i]['fld_dyn'] : '';
if (isset($columns[$i]['fld_name'])) { if (isset($columns[$i]['fld_name'])) {
$columns[$i]['field_name'] = $columns[$i]['fld_name']; $columns[$i]['field_name'] = $columns[$i]['fld_name'];
} }
@@ -717,8 +716,8 @@ class Table
$aFields['PRO_UID'] = $pro_uid; $aFields['PRO_UID'] = $pro_uid;
if (isset( $rep_tab_type ) && $rep_tab_type == 'GRID') { if (isset( $rep_tab_type ) && $rep_tab_type == 'GRID') {
$this->dynUid = $rep_tab_grid; list ($gridName, $gridId) = explode( '-', $rep_tab_grid );
$dynFields = $this->_getDynafields($pro_uid, 'grid', $rep_tab_grid); $dynFields = $this->_getDynafields($pro_uid, 'grid', $gridId);
} else { } else {
$dynFields = $this->_getDynafields($pro_uid, 'xmlform'); $dynFields = $this->_getDynafields($pro_uid, 'xmlform');
} }
@@ -753,7 +752,7 @@ class Table
$oCriteria->add( \DynaformPeer::DYN_TYPE, $type ); $oCriteria->add( \DynaformPeer::DYN_TYPE, $type );
if ($rep_tab_grid != '') { if ($rep_tab_grid != '') {
$oCriteria->add( \DynaformPeer::DYN_UID, $this->dynUid ); $oCriteria->add( \DynaformPeer::DYN_UID, $rep_tab_grid );
} }
$oDataset = \DynaformPeer::doSelectRS( $oCriteria ); $oDataset = \DynaformPeer::doSelectRS( $oCriteria );
@@ -1022,6 +1021,7 @@ class Table
G::loadSystem('dynaformhandler'); G::loadSystem('dynaformhandler');
$grids = array(); $grids = array();
$namesGrid = array();
$aFieldsNames = array(); $aFieldsNames = array();
$oCriteria = new \Criteria( 'workflow' ); $oCriteria = new \Criteria( 'workflow' );
@@ -1041,14 +1041,18 @@ class Table
$fieldType = $arrayNode['type']; $fieldType = $arrayNode['type'];
if ($fieldType == 'grid') { if ($fieldType == 'grid') {
if (! in_array( $fieldName, $aFieldsNames )) { if (! in_array( $fieldName, $aFieldsNames )) {
$namesGrid[] = $fieldName;
$grids[] = str_replace( $pro_uid . '/', '', $arrayNode['xmlgrid']); $grids[] = str_replace( $pro_uid . '/', '', $arrayNode['xmlgrid']);
} }
} }
} }
} }
if (!in_array($rep_tab_grid, $grids)) { $find = array_search($rep_tab_grid, $grids);
if ($find === false) {
throw (new \Exception("The property rep_tab_grid: '$rep_tab_grid', is incorrect.")); throw (new \Exception("The property rep_tab_grid: '$rep_tab_grid', is incorrect."));
} else {
$rep_tab_grid = $namesGrid[$find] . '-' . $rep_tab_grid;
} }
return $rep_tab_grid; return $rep_tab_grid;
} }