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

PM-784 La ordenacion no funciona con los datos de tipo real, decimal, double, y float al ver la Data en PMTables SOLVED

Browse Source
This commit is contained in:
Julio Cesar Laura
2014-10-24 12:32:30 -04:00
parent a6ff2c20b0
commit 8da2ba79a4
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -200,7 +200,7 @@ class AdditionalTables extends BaseAdditionalTables
'APP_UID' => '', 'APP_UID' => '',
'SHD_DATE' => date('Y-m-d H:i:s'))); 'SHD_DATE' => date('Y-m-d H:i:s')));
*/ */
G::auditLog("CreatePmtable", "PM Table Name: ".$aData['ADD_TAB_NAME']); G::auditLog("CreatePmtable", "PM Table Name: ".$aData['ADD_TAB_NAME']);
return $aData['ADD_TAB_UID']; return $aData['ADD_TAB_UID'];
} else { } else {
@@ -404,11 +404,11 @@ class AdditionalTables extends BaseAdditionalTables
*/ */
$types = array('DECIMAL', 'DOUBLE', 'FLOAT', 'REAL'); $types = array('DECIMAL', 'DOUBLE', 'FLOAT', 'REAL');
if ($keyOrderUppercase == true) { if ($keyOrderUppercase) {
foreach ($aData['FIELDS'] as $aField) { foreach ($aData['FIELDS'] as $aField) {
$field = '$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');'; $field = '$oCriteria->addSelectColumn(' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ');';
if (in_array($aField['FLD_TYPE'], $types)) { if (in_array($aField['FLD_TYPE'], $types)) {
$field = '$oCriteria->addAsColumn("' . $aField['FLD_NAME'] . '", "round(" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . ", 2)" );'; $field = '$oCriteria->addAsColumn("' . $aField['FLD_NAME'] . '", "round(" . ' . $sClassPeerName . '::' . $aField['FLD_NAME'] . ' . ", ' . ($aField['FLD_TYPE'] == 'DOUBLE' ? '8' : '2') . ')");';
} }
eval($field); eval($field);
/*if ($aField['FLD_KEY'] == '1') { /*if ($aField['FLD_KEY'] == '1') {
@@ -446,9 +446,17 @@ class AdditionalTables extends BaseAdditionalTables
if (isset($_POST['sort'])) { if (isset($_POST['sort'])) {
if ($_POST['dir'] == 'ASC') { if ($_POST['dir'] == 'ASC') {
eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::' . $_POST['sort'] . ');'); if ($keyOrderUppercase) {
eval('$oCriteria->addAscendingOrderByColumn("' . $_POST['sort'] . '");');
} else {
eval('$oCriteria->addAscendingOrderByColumn(' . $sClassPeerName . '::' . $_POST['sort'] . ');');
}
} else { } else {
eval('$oCriteria->addDescendingOrderByColumn(' . $sClassPeerName . '::' . $_POST['sort'] . ');'); if ($keyOrderUppercase) {
eval('$oCriteria->addDescendingOrderByColumn("' . $_POST['sort'] . '");');
} else {
eval('$oCriteria->addDescendingOrderByColumn(' . $sClassPeerName . '::' . $_POST['sort'] . ');');
}
} }
} }