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

Correccion de CONSOLIDATED

Browse Source
This commit is contained in:
Brayan Pereyra
2015-03-24 17:42:13 -04:00
parent dba36ff8a5
commit 34fee16fef
8 changed files with 295 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
workflow/engine/classes/class.consolidatedCases.php
View File

@@ -2,87 +2,46 @@
G::LoadClass("pmFunctions"); G::LoadClass("pmFunctions");
G::LoadClass("reportTables"); G::LoadClass("reportTables");
class ConsolidatedCases class ConsolidatedCases
{ {
function cochalo ($data) function saveConsolidated ($data)
{ {
$sTasUid = $data['tas_uid']; $sTasUid = $data['tas_uid'];
$sDynUid = $data['dyn_uid']; $sDynUid = $data['dyn_uid'];
$sStatus = $data['status'];
$sProUid = $data['pro_uid']; $sProUid = $data['pro_uid'];
$sRepTabUid = $data['rep_uid']; $sRepTabUid = $data['rep_uid'];
$tableName = $data['table_name']; $tableName = $data['table_name'];
$title = $data['title']; $title = $data['title'];
$swOverwrite = $data['overwrite'];
$isBPMN = $data['isBPMN'];
if ($sStatus == "1" && $sDynUid != "") { if ($sRepTabUid != '') {
switch ($swOverwrite) { $rptUid = null;
case 1:
//Delete report table
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID); $criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
$criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName); $criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
$rsCriteria = ReportTablePeer::doSelectRS($criteria); $rsCriteria = ReportTablePeer::doSelectRS($criteria);
$rptUid = null;
if ($rsCriteria->next()) { if ($rsCriteria->next()) {
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
$rptUid = $row[0]; $rptUid = $row[0];
} }
$rpts = new ReportTables(); $rpts = new ReportTables();
if ($rptUid != null) { if ($rptUid != null) {
$rpts->deleteReportTable($rptUid); $rpts->deleteReportTable($rptUid);
} }
$sRepTabUid = ""; $sClassName = $tableName;
break; $sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
case 2:
//Delete table
$rpts = new ReportTables();
$rpts->dropTable($tableName, "wf");
$sRepTabUid = ""; @unlink($sPath . $sClassName . '.php');
break; @unlink($sPath . $sClassName . 'Peer.php');
@unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
@unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . '.php');
@unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . 'Peer.php');
$sRepTabUid = '';
} }
$criteria = new Criteria();
$criteria->addSelectColumn(ReportTablePeer::REP_TAB_UID);
//$criteria->add(ReportTablePeer::PRO_UID, $sProUid);
$criteria->add(ReportTablePeer::REP_TAB_NAME, $tableName);
$result = ReportTablePeer::doSelectRS($criteria);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if ($result->next()) {
$dataRes = $result->getRow();
if ($dataRes["REP_TAB_UID"] != $sRepTabUid) {
return 1;
}
} else {
//check if table $tableName exists
$con = Propel::getConnection("workflow");
$stmt = $con->createStatement();
$sql="SHOW TABLES";
$rs1 = $stmt->executeQuery($sql, ResultSet::FETCHMODE_NUM);
$rs1->next();
while ( is_array($row = $rs1->getRow() )) {
if ( $row[0] == $tableName ) {
return 2;
}
$rs1->next();
}
}
if ($isBPMN) {
$_POST['form']['PRO_UID'] = $sProUid; $_POST['form']['PRO_UID'] = $sProUid;
$_POST['form']['REP_TAB_UID'] = $sRepTabUid; $_POST['form']['REP_TAB_UID'] = $sRepTabUid;
$_POST['form']['REP_TAB_NAME'] = $tableName; $_POST['form']['REP_TAB_NAME'] = $tableName;
@@ -92,49 +51,22 @@ class ConsolidatedCases
$_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s"); $_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s");
$_POST['form']['REP_TAB_STATUS'] = 'ACTIVE'; $_POST['form']['REP_TAB_STATUS'] = 'ACTIVE';
$_POST['form']['REP_TAB_TITLE'] = $title; $_POST['form']['REP_TAB_TITLE'] = $title;
} else {
$_POST['form']['PRO_UID'] = $sProUid;
$_POST['form']['REP_TAB_UID'] = $sRepTabUid;
$_POST['form']['REP_TAB_NAME'] = $tableName;
$_POST['form']['REP_TAB_TYPE'] = "GRID";
$_POST['form']['REP_TAB_GRID'] = $sProUid . "-" . $sDynUid;
$_POST['form']['REP_TAB_CONNECTION'] = 'wf';
$_POST['form']['REP_TAB_CREATE_DATE'] = date("Y-m-d H:i:s");
$_POST['form']['REP_TAB_STATUS'] = 'ACTIVE';
$_POST['form']['REP_TAB_TITLE'] = $title;
}
$_POST['form']['FIELDS'] = array(); $_POST['form']['FIELDS'] = array();
G::LoadClass("reportTables"); G::LoadClass("reportTables");
$oReportTable = new ReportTable(); $oReportTable = new ReportTable();
//if (!isset($_POST['form']['REP_TAB_CONNECTION'])) {
// $_POST['form']['REP_TAB_CONNECTION'] = 'report';
//}
if ($_POST['form']['REP_TAB_UID'] != "") {
$aReportTable = $oReportTable->load($_POST['form']['REP_TAB_UID']);
$sOldTableName = $aReportTable['REP_TAB_NAME'];
$sOldConnection = $aReportTable['REP_TAB_CONNECTION'];
} else {
$sOldTableName = $_POST['form']['REP_TAB_NAME']; $sOldTableName = $_POST['form']['REP_TAB_NAME'];
$sOldConnection = $_POST['form']['REP_TAB_CONNECTION']; $sOldConnection = $_POST['form']['REP_TAB_CONNECTION'];
$_POST['form']['REP_TAB_TYPE'] = 'NORMAL';
$oReportTable->create($_POST['form']); $oReportTable->create($_POST['form']);
$_POST['form']['REP_TAB_UID'] = $oReportTable->getRepTabUid();
}
$_POST['form']['REP_TAB_TYPE'] = 'NORMAL'; $_POST['form']['REP_TAB_UID'] = $oReportTable->getRepTabUid();
$oReportTable->update($_POST['form']);
$oReportVar = new ReportVar(); $oReportVar = new ReportVar();
$oReportTables = new ReportTables(); $oReportTables = new ReportTables();
$oReportTables->deleteAllReportVars($_POST['form']['REP_TAB_UID']); $oReportTables->deleteAllReportVars($_POST['form']['REP_TAB_UID']);
$aFields = array(); $aFields = array();
if ($isBPMN) {
G::LoadClass("pmDynaform"); G::LoadClass("pmDynaform");
$pmDyna = new pmDynaform(array()); $pmDyna = new pmDynaform(array());
$pmDyna->fields["CURRENT_DYNAFORM"] = $sDynUid; $pmDyna->fields["CURRENT_DYNAFORM"] = $sDynUid;
@@ -144,19 +76,6 @@ class ConsolidatedCases
foreach ($fieldsDyna as $value) { foreach ($fieldsDyna as $value) {
$_POST['form']['FIELDS'][] = $value[0]->name . '-' . $value[0]->type; $_POST['form']['FIELDS'][] = $value[0]->name . '-' . $value[0]->type;
} }
} else {
$aAux = explode('-', $_POST['form']['REP_TAB_GRID']);
global $G_FORM;
require_once "classes/class.formBatchRouting.php";
$G_FORM = new FormBatchRouting($_POST["form"]["PRO_UID"] . PATH_SEP . $aAux[1], PATH_DYNAFORM, SYS_LANG, false);
$aAux = $G_FORM->getVars(false);
foreach ($aAux as $aField) {
$_POST['form']['FIELDS'][] = $aField['sName'] . '-' . $aField['sType'];
}
}
$aFieldsClases = array(); $aFieldsClases = array();
$i = 1; $i = 1;
@@ -178,6 +97,9 @@ class ConsolidatedCases
foreach ($_POST['form']['FIELDS'] as $sField) { foreach ($_POST['form']['FIELDS'] as $sField) {
$aField = explode('-', $sField); $aField = explode('-', $sField);
if ($aField[1] == 'title' || $aField[1] == 'submit') {
continue;
}
$i++; $i++;
$aFieldsClases[$i]['FLD_NAME'] = $aField[0]; $aFieldsClases[$i]['FLD_NAME'] = $aField[0];
$aFieldsClases[$i]['FLD_NULL'] = 'off'; $aFieldsClases[$i]['FLD_NULL'] = 'off';
@@ -232,56 +154,21 @@ class ConsolidatedCases
$oReportTables->dropTable($sOldTableName, $sOldConnection); $oReportTables->dropTable($sOldTableName, $sOldConnection);
$oReportTables->createTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields); $oReportTables->createTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields);
$oReportTables->populateTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields, $_POST['form']['PRO_UID'], ''); $oReportTables->populateTable($_POST['form']['REP_TAB_NAME'], $_POST['form']['REP_TAB_CONNECTION'], $_POST['form']['REP_TAB_TYPE'], $aFields, $_POST['form']['PRO_UID'], '');
$sRepTabUid = $_POST['form']['REP_TAB_UID']; $sRepTabUid = $_POST['form']['REP_TAB_UID'];
//clases
} else {
$oReportTables = new ReportTables();
if ($sRepTabUid != "") {
$oReportTables->deleteReportTable($sRepTabUid);
}
$sRepTabUid = "";
}
require_once ("classes/model/CaseConsolidatedPeer.php");
require_once ("classes/model/CaseConsolidated.php");
$oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid); $oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($sTasUid);
if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') { if (!(is_object($oCaseConsolidated)) || get_class($oCaseConsolidated) != 'CaseConsolidated') {
$oCaseConsolidated = new CaseConsolidated(); $oCaseConsolidated = new CaseConsolidated();
$oCaseConsolidated->setTasUid($sTasUid); $oCaseConsolidated->setTasUid($sTasUid);
} }
if ($sStatus == '1') {
$oCaseConsolidated->setConStatus('ACTIVE'); $oCaseConsolidated->setConStatus('ACTIVE');
} else {
$oCaseConsolidated->setConStatus('INACTIVE');
}
$oCaseConsolidated->setDynUid($sDynUid); $oCaseConsolidated->setDynUid($sDynUid);
$oCaseConsolidated->setRepTabUid($sRepTabUid); $oCaseConsolidated->setRepTabUid($sRepTabUid);
$oCaseConsolidated->save(); $oCaseConsolidated->save();
$sClassName = $tableName;//'__' . $sTasUid; $sClassName = $tableName;
$oAdditionalTables = new AdditionalTables();
if ($sStatus == '1') {
//$oAdditionalTables->createPropelClasses($sTableName, $sClassName, $aFields, $sAddTabUid)
//require_once 'classes/model/AdditionalTables.php';
//$oAdditionalTables = new AdditionalTables();
$oAdditionalTables = new AdditionalTables();//AdditionalTablesConsolidated
$oAdditionalTables->createPropelClasses($tableName, $sClassName, $aFieldsClases, $sTasUid); $oAdditionalTables->createPropelClasses($tableName, $sClassName, $aFieldsClases, $sTasUid);
} else {
$sPath = PATH_DB . SYS_SYS . PATH_SEP . 'classes' . PATH_SEP;
@unlink($sPath . $sClassName . '.php');
@unlink($sPath . $sClassName . 'Peer.php');
@unlink($sPath . PATH_SEP . 'map' . PATH_SEP . $sClassName . 'MapBuilder.php');
@unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . '.php');
@unlink($sPath . PATH_SEP . 'om' . PATH_SEP . 'Base' . $sClassName . 'Peer.php');
}
} }
} }

52
workflow/engine/classes/class.processMap.php
View File

@@ -1464,6 +1464,9 @@ class processMap
case 7: case 7:
$sFilename = 'tasks/tasks_Notifications.xml'; $sFilename = 'tasks/tasks_Notifications.xml';
break; break;
case 8:
$sFilename = 'tasks/tasks_Consolidated.xml';
break;
default: default:
//if the $iForm is not one of the defaults then search under Plugins for an extended property. By JHL Jan 18, 2011 //if the $iForm is not one of the defaults then search under Plugins for an extended property. By JHL Jan 18, 2011
$oPluginRegistry = & PMPluginRegistry::getSingleton(); $oPluginRegistry = & PMPluginRegistry::getSingleton();
@@ -1541,6 +1544,55 @@ class processMap
} }
} }
if ($iForm == 8) {
$oCaseConsolidated = CaseConsolidatedPeer::retrieveByPK($_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"]);
if ((is_object($oCaseConsolidated)) && get_class($oCaseConsolidated) == "CaseConsolidated") {
require_once ("classes/model/ReportTable.php");
$aFields["CON_STATUS"] = $oCaseConsolidated->getConStatus();
$aFields["DYN_UID"] = $oCaseConsolidated->getDynUid();
$aFields["REP_TAB_UID"] = $oCaseConsolidated->getRepTabUid();
$oReportTables = new ReportTable();
$oReportTables = $oReportTables->load($aFields["REP_TAB_UID"]);
if (count($oReportTables)>0) {
if ($oReportTables['REP_TAB_STATUS'] == 'ACTIVE') {
$aFields["TABLE_NAME"] = $oReportTables['REP_TAB_NAME'];
$aFields["TITLE"] = $oReportTables['REP_TAB_TITLE'];
}
}
}
$aFields["PRO_UID"] = $_SESSION["PROCESS"];
$aFields["TAS_UID"] = $_SESSION["cDhTajE2T2lxSkhqMzZUTXVacWYyNcKwV3A4eWYybDdyb1p3"]["TAS_UID"];
$aFields["SYS_LANG"] = SYS_LANG;
$aFields['INDEX'] = 0;
$aFields["TABLE_NAME_DEFAULT"] = "__" . $aFields["TAS_UID"];
$oCriteria = new Criteria("workflow");
$del = DBAdapter::getStringDelimiter();
$oCriteria->setDistinct();
$oCriteria->addSelectColumn(DynaformPeer::DYN_UID);
$oCriteria->addSelectColumn(ContentPeer::CON_VALUE);
$aConditions = array();
$aConditions[] = array(DynaformPeer::DYN_UID, ContentPeer::CON_ID);
$aConditions[] = array(ContentPeer::CON_CATEGORY, $del . "DYN_TITLE" . $del);
$aConditions[] = array(ContentPeer::CON_LANG, $del . "en" . $del);
$oCriteria->addJoinMC($aConditions, Criteria::LEFT_JOIN);
$oCriteria->add(DynaformPeer::PRO_UID, $_SESSION["PROCESS"]);
$oCriteria->add(DynaformPeer::DYN_TYPE, "grid");
$oCriteria->addAscendingOrderByColumn(ContentPeer::CON_VALUE);
$numRows = DynaformPeer::doCount($oCriteria);
if ($numRows == 0) {
echo "<div style=\"margin:1em;\"><strong>".G::LoadTranslation('ID_ALERT')."</strong><br />".G::LoadTranslation('ID_CONSOLIDATED_DYNAFORM_REQUIRED')."</div>";
die;
}
}
global $G_PUBLISH; global $G_PUBLISH;
G::LoadClass('xmlfield_InputPM'); G::LoadClass('xmlfield_InputPM');
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();

7
workflow/engine/controllers/designer.php
View File

@@ -54,8 +54,15 @@ class Designer extends Controller
$clientToken["client_id"] = $client['CLIENT_ID']; $clientToken["client_id"] = $client['CLIENT_ID'];
$clientToken["client_secret"] = $client['CLIENT_SECRET']; $clientToken["client_secret"] = $client['CLIENT_SECRET'];
$consolidated = 0;
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
$consolidated = 1;
}
$this->setVar('prj_uid', $proUid); $this->setVar('prj_uid', $proUid);
$this->setVar('app_uid', $appUid); $this->setVar('app_uid', $appUid);
$this->setVar('consolidated', $consolidated);
$this->setVar('prj_readonly', $proReadOnly); $this->setVar('prj_readonly', $proReadOnly);
$this->setVar('credentials', base64_encode(json_encode($clientToken))); $this->setVar('credentials', base64_encode(json_encode($clientToken)));
$this->setVar('isDebugMode', $debug); $this->setVar('isDebugMode', $debug);

7
workflow/engine/js/processmap/core/processmap.js
View File

@@ -1698,6 +1698,13 @@ var processmap=function(){
noClear : true noClear : true
}] }]
}; };
if (this.options.consolidated == '1') {
panel.tab.options.push({
title : _('ID_CONSOLIDATED_CASE_LIST'),
content : this.parent.closure({instance:this,method:iForm,args:[panel,index,8]}),
noClear : true
});
}
var taskOptions = this.data.db.taskOptions; var taskOptions = this.data.db.taskOptions;
this.loadExtendedProperties = function(){ this.loadExtendedProperties = function(){
for(i=0;i<taskOptions.length;i++){ for(i=0;i<taskOptions.length;i++){

9
workflow/engine/methods/processes/processes_Map.php
View File

@@ -79,6 +79,14 @@ $G_ID_SUB_MENU_SELECTED = '_';
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower ); $G_PUBLISH->AddContent( 'template', '', '', '', $oTemplatePower );
$consolidated = 1;
/*----------------------------------********---------------------------------*/
$licensedFeatures = & PMLicensedFeatures::getSingleton();
if ($licensedFeatures->verifyfeature('7TTeDBQeWRoZTZKYjh4eFpYUlRDUUEyVERPU3FxellWank=')) {
$consolidated = 1;
}
/*----------------------------------********---------------------------------*/
$oHeadPublisher = & headPublisher::getSingleton(); $oHeadPublisher = & headPublisher::getSingleton();
$oHeadPublisher->addScriptFile( '/jscore/dbConnections/main.js' ); $oHeadPublisher->addScriptFile( '/jscore/dbConnections/main.js' );
$oHeadPublisher->addScriptCode( ' $oHeadPublisher->addScriptCode( '
@@ -99,6 +107,7 @@ $oHeadPublisher->addScriptCode( '
dataServer :"processes_Ajax.php", dataServer :"processes_Ajax.php",
uid :"' . $processUID . '", uid :"' . $processUID . '",
lang :"' . SYS_LANG . '", lang :"' . SYS_LANG . '",
consolidated :"' . $consolidated . '",
theme :"processmaker", theme :"processmaker",
size :{w:pb.offsetWidth-10,h:pb.offsetHeight}, size :{w:pb.offsetWidth-10,h:pb.offsetHeight},
images_dir :"/jscore/processmap/core/images/" images_dir :"/jscore/processmap/core/images/"

63
workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
View File

@@ -31,6 +31,7 @@ class Consolidated
$criteria = new Criteria(); $criteria = new Criteria();
$criteria->addSelectColumn(CaseConsolidatedPeer::DYN_UID); $criteria->addSelectColumn(CaseConsolidatedPeer::DYN_UID);
$criteria->addSelectColumn(\ReportTablePeer::REP_TAB_NAME); $criteria->addSelectColumn(\ReportTablePeer::REP_TAB_NAME);
$criteria->addSelectColumn(\ReportTablePeer::REP_TAB_UID);
$criteria->addSelectColumn(ContentPeer::CON_VALUE); $criteria->addSelectColumn(ContentPeer::CON_VALUE);
$criteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS); $criteria->addSelectColumn(CaseConsolidatedPeer::CON_STATUS);
@@ -48,6 +49,7 @@ class Consolidated
$response = $dataset->getRow(); $response = $dataset->getRow();
} else { } else {
$response = array( $response = array(
'REP_TAB_UID' => '',
'REP_TAB_NAME' => '__' . $tas_uid, 'REP_TAB_NAME' => '__' . $tas_uid,
'CON_VALUE' => '__' . $tas_uid, 'CON_VALUE' => '__' . $tas_uid,
); );
@@ -445,22 +447,26 @@ class Consolidated
$xmlfrm = new \stdclass(); $xmlfrm = new \stdclass();
$xmlfrm->fields = array(); $xmlfrm->fields = array();
foreach ($fieldsDyna as $key => $value) { foreach ($fieldsDyna as $key => $value) {
//$temp = $value[0]; if ($value[0]->type == 'title' || $value[0]->type == 'submit') {
continue;
}
$temp = new \stdclass(); $temp = new \stdclass();
$temp->type = $value[0]->type; $temp->type = $value[0]->type;
$temp->label = $value[0]->label; $temp->label = $value[0]->label;
$temp->name = $value[0]->name; $temp->name = $value[0]->name;
$temp->required = $value[0]->required; $temp->required = (isset($value[0]->required)) ? $value[0]->required : 0;
$temp->mode = $value[0]->mode; $temp->mode = (isset($value[0]->mode)) ? $value[0]->mode : 'edit';
if (!empty($value[0]->options)) {
$temp->storeData = '['; $temp->storeData = '[';
foreach ($value[0]->options as $valueOption) { foreach ($value[0]->options as $valueOption) {
$temp->storeData .= '{"value":"' . $valueOption['value'] . '", "text":"' . $valueOption['value'] . '"},'; $temp->storeData .= '["' . $valueOption['value'] . '", "' . $valueOption['label'] . '"],';
} }
$temp->storeData = substr($temp->storeData,0,-1); $temp->storeData = substr($temp->storeData,0,-1);
$temp->storeData .= ']'; $temp->storeData .= ']';
}
$temp->readOnly = ($value[0]->mode == 'view') ? "0" : "1"; $temp->readOnly = ($temp->mode == 'view') ? "1" : "0";
$temp->colWidth = 200; $temp->colWidth = 200;
$xmlfrm->fields[] = $temp; $xmlfrm->fields[] = $temp;
} }
@@ -515,6 +521,8 @@ class Consolidated
case "dropdown": case "dropdown":
$dropList[] = $field->name; $dropList[] = $field->name;
$align = "left"; $align = "left";
if (empty($field->storeData)) {
$editor = "* new Ext.form.ComboBox({ $editor = "* new Ext.form.ComboBox({
id: \"cbo" . $field->name . "_" . $pro_uid . "\", id: \"cbo" . $field->name . "_" . $pro_uid . "\",
@@ -523,14 +531,18 @@ class Consolidated
/*store: comboStore,*/ /*store: comboStore,*/
store: new Ext.data.JsonStore({ store: new Ext.data.JsonStore({
data: " . htmlspecialchars_decode($field->storeData) . ", storeId: \"store" . $field->name . "_" . $pro_uid . "\",
proxy: new Ext.data.HttpProxy({
url: 'proxyDataCombobox'
}),
root: 'records',
fields: [{name: 'value'}, fields: [{name: 'value'},
{name: 'text'} {name: 'text'}
] ]
}), }),
triggerAction: 'all',
queryMode: 'local', mode: 'local',
editable: false, editable: false,
disabled: $fieldDisabled, disabled: $fieldDisabled,
lazyRender: false, lazyRender: false,
@@ -540,6 +552,35 @@ class Consolidated
$fieldValidate $fieldValidate
cls: \"\" cls: \"\"
}) *"; }) *";
} else {
$editor = "* new Ext.form.ComboBox({
id: \"cbo" . $field->name . "_" . $pro_uid . "\",
typeAhead: true,
autocomplete:true,
editable:false,
lazyRender:true,
mode:'local',
triggerAction:'all',
forceSelection:true,
valueField: 'value',
displayField: 'text',
store:new Ext.data.SimpleStore({
fields: [{name: 'value'},
{name: 'text'}],
data: " . htmlspecialchars_decode($field->storeData) . ",
sortInfo:{field:'text',direction:'ASC'}
}),
$fieldReadOnly
$fieldRequired
$fieldValidate
cls: \"\"
}) *";
}
$editor = eregi_replace("[\n|\r|\n\r]", ' ', $editor); $editor = eregi_replace("[\n|\r|\n\r]", ' ', $editor);
$width = $field->colWidth; $width = $field->colWidth;
@@ -789,7 +830,7 @@ class Consolidated
$width = $size; $width = $size;
$editor = "* new Ext.form.TextField({ $fieldReadOnly $fieldRequired $fieldValidate cls: \"\"}) *"; $editor = "* new Ext.form.TextField({ $fieldReadOnly $fieldRequired $fieldValidate cls: \"\"}) *";
if ($field->mode != "edit") { if ($field->mode != "edit" && $field->mode != "parent") {
$editor = null; $editor = null;
} }
@@ -930,11 +971,9 @@ class Consolidated
$array = array(); $array = array();
$array["form"] = $dataUpdate; $array["form"] = $dataUpdate;
$appUid = $array["form"]["APP_UID"]; $appUid = $array["form"]["APP_UID"];
$fields = $oCase->loadCase($appUid); $fields = $oCase->loadCase($appUid);
if (!isset($fields["DEL_INIT_DATE"])) { if (!isset($fields["DEL_INIT_DATE"])) {
$oCase->setDelInitDate($appUid, $delIndex); $oCase->setDelInitDate($appUid, $delIndex);
//$aFields = $oCase->loadCase($appUid, $delIndex); //$aFields = $oCase->loadCase($appUid, $delIndex);
@@ -949,6 +988,7 @@ class Consolidated
foreach ($array["form"] as $key => $value) { foreach ($array["form"] as $key => $value) {
$array["form"][$key] = (string)$array["form"][$key]; $array["form"][$key] = (string)$array["form"][$key];
} }
/*
$_POST['form'] = $array["form"]; $_POST['form'] = $array["form"];
if (!class_exists('Smarty')) { if (!class_exists('Smarty')) {
require_once(PATH_THIRDPARTY . 'smarty' . PATH_SEP . 'libs' . PATH_SEP . 'Smarty.class.php'); require_once(PATH_THIRDPARTY . 'smarty' . PATH_SEP . 'libs' . PATH_SEP . 'Smarty.class.php');
@@ -956,6 +996,7 @@ class Consolidated
$oForm = new \Form( $auxAppDataProcess . "/" . $dynaformUid , PATH_DYNAFORM ); $oForm = new \Form( $auxAppDataProcess . "/" . $dynaformUid , PATH_DYNAFORM );
$oForm->validatePost(); $oForm->validatePost();
$array["form"] = $_POST['form']; $array["form"] = $_POST['form'];
*/
$fields["APP_DATA"] = array_merge($fields["APP_DATA"], G::getSystemConstants()); $fields["APP_DATA"] = array_merge($fields["APP_DATA"], G::getSystemConstants());
$fields["APP_DATA"] = array_merge($fields["APP_DATA"], $array["form"]); $fields["APP_DATA"] = array_merge($fields["APP_DATA"], $array["form"]);

9
workflow/engine/src/ProcessMaker/BusinessModel/Task.php
View File

@@ -389,15 +389,12 @@ class Task
$dataConso = array( $dataConso = array(
'tas_uid' => $arrayProperty['TAS_UID'], 'tas_uid' => $arrayProperty['TAS_UID'],
'dyn_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'], 'dyn_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_dynaform'],
'status' => true,
'pro_uid' => $arrayProperty['PRO_UID'], 'pro_uid' => $arrayProperty['PRO_UID'],
'rep_uid' => '', 'rep_uid' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_report_table'],
'table_name' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_table'], 'table_name' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_table'],
'title' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_title'], 'title' => $arrayProperty['CONSOLIDATE_DATA']['consolidated_title']
'overwrite' => true,
'isBPMN' => true
); );
$consolidated->cochalo($dataConso); $consolidated->saveConsolidated($dataConso);
} }
$arrayResult["status"] = "OK"; $arrayResult["status"] = "OK";

2
workflow/engine/templates/designer/index.html
View File

@@ -20,6 +20,7 @@
<script type="text/javascript"> <script type="text/javascript">
var prj_uid = "{$prj_uid}"; var prj_uid = "{$prj_uid}";
var app_uid = "{$app_uid}"; var app_uid = "{$app_uid}";
var consolidated = "{$consolidated}";
var prj_readonly = "{$prj_readonly}"; var prj_readonly = "{$prj_readonly}";
var credentials = "{$credentials}"; var credentials = "{$credentials}";
</script> </script>
@@ -66,6 +67,7 @@
<script type="text/javascript"> <script type="text/javascript">
var prj_uid = "{$prj_uid}"; var prj_uid = "{$prj_uid}";
var app_uid = "{$app_uid}"; var app_uid = "{$app_uid}";
var consolidated = "{$consolidated}";
var prj_readonly = "{$prj_readonly}"; var prj_readonly = "{$prj_readonly}";
var credentials = "{$credentials}"; var credentials = "{$credentials}";
</script> </script>