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

PM-1412

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2015-02-19 10:05:12 -04:00
parent c5925e3888
commit c6c8a5de6a
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -1611,6 +1611,35 @@ class pmTablesProxy extends HttpProxyController
} }
$oDataset->next(); $oDataset->next();
} }
// getting bpmn projects
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(BpmnProcessPeer::PRJ_UID);
$oCriteria->add(BpmnProcessPeer::PRJ_UID, $proUid);
$oDataset = BpmnProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro'));
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$row = $oDataset->getRow();
if (isset($row["PRJ_UID"])) {
$oCriteria = new Criteria('workflow');
$oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_UID);
$oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_NAME);
$oCriteria->addSelectColumn(ProcessVariablesPeer::VAR_FIELD_TYPE);
$oCriteria->add(ProcessVariablesPeer::PRJ_UID, $row["PRJ_UID"]);
$oDataset = ProcessVariablesPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$index = 0;
while ($oDataset->next()) {
$row = $oDataset->getRow();
array_push($fields, array(
"FIELD_UID" => $row["VAR_NAME"] . "-" . $row["VAR_FIELD_TYPE"],
"FIELD_NAME" => $row["VAR_NAME"],
"FIELD_VALIDATE" => "any",
"_index" => $index ++,
"_isset" => true
));
}
}
sort( $fields ); sort( $fields );

25
workflow/engine/templates/pmTables/editReport.js
View File

@@ -1667,6 +1667,31 @@ function mapPMFieldType(id)
sizeField='255'; sizeField='255';
break; break;
case 'string':
typeField='VARCHAR';
sizeField='255';
break;
case 'integer':
typeField='INTEGER';
sizeField='11';
break;
case 'float':
typeField='FLOAT';
sizeField='11';
break;
case 'boolean':
typeField='INTEGER';
sizeField='1';
break;
case 'date':
typeField='VARCHAR';
sizeField='255';
break;
case 'datetime':
typeField='VARCHAR';
sizeField='255';
break;
default: default:
typeField='TEXT'; typeField='TEXT';
sizeField=''; sizeField='';