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

BUG 10458 Error creating report table with currency text field SOLVED

Browse Source 
- not taken into account the types of mask and separators in fields currency and percentage
- was add validation.
- In fields currency and percentage was changed FLOAT -> DOUBLE.
This commit is contained in:
Marco Antonio Nina
2013-01-28 10:20:24 -04:00
parent ebf743b69d
commit c29a299ddf
3 changed files with 92 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,40 @@ require_once 'classes/model/om/BaseAdditionalTables.php';
*
* @package workflow.engine.classes.model
*/
function validateType ($value, $type)
{
switch ($type) {
case 'INTEGER':
$value = str_replace(",", "", $value);
$value = str_replace(".", "", $value);
break;
case 'FLOAT':
case 'DOUBLE':
$pos = strrpos($value, ",");
$pos = ($pos === false) ? 0 : $pos;
$posPoint = strrpos($value, ".");
$posPoint = ($posPoint === false) ? 0 : $posPoint;
if ($pos > $posPoint) {
$value2 = substr($value, $pos+1);
$value1 = substr($value, 0, $pos);
$value1 = str_replace(".", "", $value1);
$value = $value1.".".$value2;
} else {
$value2 = substr($value, $posPoint+1);
$value1 = substr($value, 0, $posPoint);
$value1 = str_replace(",", "", $value1);
$value = $value1.".".$value2;
}
break;
default:
break;
}
return $value;
}
class AdditionalTables extends BaseAdditionalTables
{
public $fields = array();
@@ -669,8 +703,35 @@ class AdditionalTables extends BaseAdditionalTables
switch ($row['ADD_TAB_TYPE']) {
//switching by report table type
case 'NORMAL':
require_once 'classes/model/Fields.php';
$criteriaField = new Criteria('workflow');
$criteriaField->add(FieldsPeer::ADD_TAB_UID, $row['ADD_TAB_UID']);
$datasetField = FieldsPeer::doSelectRS($criteriaField);
$datasetField->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$fieldType = array();
while ($datasetField->next()) {
$rowfield = $datasetField->getRow();
switch ($rowfield['FLD_TYPE']) {
case 'FLOAT':
case 'DOUBLE':
case 'INTEGER':
$fieldType[] = array($rowfield['FLD_NAME']=>$rowfield['FLD_TYPE']);
break;
default:
break;
}
}
// parsing empty values to null
foreach ($caseData as $i => $v) {
foreach ($fieldType as $key => $value) {
foreach ($value as $keys => $values) {
if ( strtoupper ( $i) == $keys) {
$v = validateType ($v, $values);
unset($key);
}
}
}
$caseData[$i] = $v === '' ? null : $v;
}