fernando/luos
1
0
Fork 0
Code Releases Activity

HOR-1344 Optimization: Lists tables

Browse Source
This commit is contained in:
qronald
2016-07-18 14:13:01 -04:00
parent ee750c0c12
commit 8f7501e2ce
24 changed files with 168 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -710,13 +710,8 @@ class Cases
$oCriteria->addSelectColumn( \AppDelegationPeer::TAS_UID );
$oCriteria->addSelectColumn(\AppDelegationPeer::DEL_INIT_DATE);
$oCriteria->addSelectColumn(\AppDelegationPeer::DEL_TASK_DUE_DATE);
$oCriteria->addAsColumn( 'TAS_TITLE', 'C1.CON_VALUE' );
$oCriteria->addAlias( "C1", 'CONTENT' );
$tasTitleConds = array ();
$tasTitleConds[] = array (\AppDelegationPeer::TAS_UID,'C1.CON_ID');
$tasTitleConds[] = array ('C1.CON_CATEGORY',$del . 'TAS_TITLE' . $del);
$tasTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del);
$oCriteria->addJoinMC( $tasTitleConds, \Criteria::LEFT_JOIN );
$oCriteria->addSelectColumn(\TaskPeer::TAS_TITLE);
$oCriteria->addJoin(\AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID);
$oCriteria->add( \AppDelegationPeer::APP_UID, $applicationUid );
$oCriteria->add( \AppDelegationPeer::USR_UID, $userUid );
$oCriteria->add( \AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' );

20
workflow/engine/src/ProcessMaker/BusinessModel/Light.php
View File

@@ -176,7 +176,6 @@ class Light
public function getTransferHistoryCriteria($sAppUid)
{
$c = new Criteria('workflow');
$c->addAsColumn('TAS_TITLE', 'TAS_TITLE.CON_VALUE');
$c->addSelectColumn(UsersPeer::USR_FIRSTNAME);
$c->addSelectColumn(UsersPeer::USR_LASTNAME);
$c->addSelectColumn(AppDelegationPeer::DEL_DELEGATE_DATE);
@@ -200,6 +199,7 @@ class Light
$c->addSelectColumn(AppDelegationPeer::DEL_INIT_DATE);
$c->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE);
$c->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE);
$c->addSelectColumn(\TaskPeer::TAS_TITLE);
//APP_DELEGATION LEFT JOIN USERS
$c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN);
@@ -212,14 +212,8 @@ class Light
$app[] = array(AppDelegationPeer::APP_UID, AppDelayPeer::APP_UID);
$c->addJoinMC($app, Criteria::LEFT_JOIN);
//LEFT JOIN CONTENT TAS_TITLE
$c->addAlias("TAS_TITLE", 'CONTENT');
$del = \DBAdapter::getStringDelimiter();
$appTitleConds = array();
$appTitleConds[] = array(AppDelegationPeer::TAS_UID, 'TAS_TITLE.CON_ID');
$appTitleConds[] = array('TAS_TITLE.CON_CATEGORY', $del . 'TAS_TITLE' . $del);
$appTitleConds[] = array('TAS_TITLE.CON_LANG', $del . SYS_LANG . $del);
$c->addJoinMC($appTitleConds, Criteria::LEFT_JOIN);
//LEFT JOIN TASK TAS_TITLE
$c->addJoin(AppDelegationPeer::TAS_UID, \TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
//WHERE
$c->add(AppDelegationPeer::APP_UID, $sAppUid);
@@ -320,11 +314,9 @@ class Light
$oContent = new \Content();
///we are looking for a pro title for this process $sproUid
$oCriteria = new \Criteria( 'workflow' );
$oCriteria->add( \ContentPeer::CON_CATEGORY, 'PRO_TITLE' );
$oCriteria->add( \ContentPeer::CON_LANG, 'en' );
$oCriteria->add( \ContentPeer::CON_ID, $sproUid );
$oDataset = \ContentPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode( \ResultSet::FETCHMODE_ASSOC );
$oCriteria->add(\ProcessPeer::PRO_UID, $sproUid);
$oDataset = \ProcessPeer::doSelectRS( $oCriteria );
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
$aRow = $oDataset->getRow();
if (!is_array($aRow)) {

12
workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php
View File

@@ -21,15 +21,7 @@ class Subprocess
$del = \DBAdapter::getStringDelimiter();
$oCriteria->add(SubProcessPeer::PRO_PARENT, $pro_uid);
$oCriteria->add(SubProcessPeer::TAS_PARENT, $tas_uid);
$oCriteria->addAsColumn('CON_VALUE', 'C1.CON_VALUE', 'CON_TITLE');
$oCriteria->addAlias("C1", 'CONTENT');
$tasTitleConds = array();
$tasTitleConds[] = array(SubProcessPeer::TAS_PARENT, 'C1.CON_ID' );
$tasTitleConds[] = array('C1.CON_CATEGORY', $del . 'TAS_TITLE' . $del );
$tasTitleConds[] = array('C1.CON_LANG', $del . SYS_LANG . $del );
$oCriteria->addJoinMC($tasTitleConds, \Criteria::LEFT_JOIN);
$oCriteria->addJoin(SubProcessPeer::TAS_PARENT, \TaskPeer::TAS_UID);
$oDataset = SubProcessPeer::doSelectRS($oCriteria);
$oDataset->setFetchmode(\ResultSet::FETCHMODE_ASSOC);
$oDataset->next();
@@ -41,7 +33,7 @@ class Subprocess
$response['spr_tas_parent'] = $aRow['tas_parent'];
$response['spr_pro'] = $aRow['pro_uid'];
$response['spr_tas'] = $aRow['tas_uid'];
$response['spr_name'] = $aRow['con_value'];
$response['spr_name'] = $aRow['tas_title'];
$response['spr_synchronous'] = $aRow['sp_synchronous'];
$response['spr_variables_out'] = unserialize($aRow['sp_variables_out']);
if ((int)$response['spr_synchronous'] === 1) {