From 8f7501e2ce25e8ce060ae056ecc5daab565b1897 Mon Sep 17 00:00:00 2001 From: qronald Date: Mon, 18 Jul 2016 14:13:01 -0400 Subject: [PATCH] HOR-1344 Optimization: Lists tables --- workflow/engine/classes/class.AppSolr.php | 38 +++------ workflow/engine/classes/class.case.php | 84 +++++-------------- workflow/engine/classes/class.pmFunctions.php | 15 +++- workflow/engine/classes/class.processMap.php | 57 +++++-------- workflow/engine/classes/class.report.php | 55 +++--------- workflow/engine/classes/class.wsBase.php | 12 +-- .../engine/classes/model/AdditionalTables.php | 9 +- workflow/engine/classes/model/AppEvent.php | 28 ++----- .../engine/classes/model/ListCanceled.php | 24 +++--- .../engine/classes/model/ListCompleted.php | 16 ++-- workflow/engine/classes/model/ListInbox.php | 40 +++------ workflow/engine/classes/model/ListPaused.php | 24 +++--- .../engine/classes/model/ListUnassigned.php | 20 ++--- workflow/engine/classes/model/Step.php | 6 +- workflow/engine/controllers/appProxy.php | 11 ++- workflow/engine/methods/cases/casesDemo.php | 8 +- .../methods/cases/casesStartPage_Ajax.php | 6 +- workflow/engine/methods/mails/emailsAjax.php | 15 +--- .../methods/processes/processes_Save.php | 4 +- workflow/engine/methods/users/users_Ajax.php | 10 +-- .../methods/users/users_ReassignCases.php | 11 +-- .../src/ProcessMaker/BusinessModel/Cases.php | 9 +- .../src/ProcessMaker/BusinessModel/Light.php | 20 ++--- .../ProcessMaker/BusinessModel/Subprocess.php | 12 +-- 24 files changed, 168 insertions(+), 366 deletions(-) diff --git a/workflow/engine/classes/class.AppSolr.php b/workflow/engine/classes/class.AppSolr.php index 4d41c9077..937f2406b 100755 --- a/workflow/engine/classes/class.AppSolr.php +++ b/workflow/engine/classes/class.AppSolr.php @@ -834,7 +834,7 @@ class AppSolr $c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME'); $c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID'); - $c->addAsColumn ('APP_TAS_TITLE', 'ctastitle.CON_VALUE'); + $c->addAsColumn ('APP_TAS_TITLE', TaskPeer::TAS_TITLE); $c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS'); $c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE); @@ -853,7 +853,6 @@ class AppSolr $c->addAlias ('u', 'USERS'); $c->addAlias ('uprev', 'USERS'); $c->addAlias ('adprev', 'APP_DELEGATION'); - $c->addAlias ('ctastitle', 'CONTENT'); $c->addAlias ('at', 'APP_THREAD'); $aConditions = array (); @@ -880,14 +879,9 @@ class AppSolr 'adprev.DEL_INDEX' ); $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); - - $aConditions = array (); - $aConditions [] = array ( - AppDelegationPeer::TAS_UID, - 'ctastitle.CON_ID' - ); - $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); - + + $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID); + $aConditions = array (); $aConditions [] = array ( 'adprev.USR_UID', @@ -908,10 +902,7 @@ class AppSolr $c->add (AppDelegationPeer::APP_UID, $aappUIDs, Criteria::IN ); //$c->add (AppDelegationPeer::DEL_INDEX, $delIndex); - - $c->add ('ctastitle.CON_CATEGORY', 'TAS_TITLE'); - $c->add ('ctastitle.CON_LANG', 'en'); - + $rs = AppDelegationPeer::doSelectRS ($c); $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC); // echo $c->toString(); @@ -954,7 +945,7 @@ class AppSolr $c->addAsColumn ('USR_PREV_LAST', 'uprev.USR_LASTNAME'); $c->addAsColumn ('PREVIOUS_USR_UID', 'uprev.USR_UID'); - $c->addAsColumn ('APP_TAS_TITLE', 'ctastitle.CON_VALUE'); + $c->addAsColumn ('APP_TAS_TITLE', TaskPeer::TAS_TITLE); $c->addAsColumn ('APP_THREAD_STATUS', 'at.APP_THREAD_STATUS'); $c->addSelectColumn (AppDelegationPeer::APP_OVERDUE_PERCENTAGE); @@ -973,7 +964,6 @@ class AppSolr $c->addAlias ('u', 'USERS'); $c->addAlias ('uprev', 'USERS'); $c->addAlias ('adprev', 'APP_DELEGATION'); - $c->addAlias ('ctastitle', 'CONTENT'); $c->addAlias ('at', 'APP_THREAD'); $aConditions = array (); @@ -993,14 +983,9 @@ class AppSolr 'adprev.DEL_INDEX' ); $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); - - $aConditions = array (); - $aConditions [] = array ( - AppDelegationPeer::TAS_UID, - 'ctastitle.CON_ID' - ); - $c->addJoinMC ($aConditions, Criteria::LEFT_JOIN); - + + $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID); + $aConditions = array (); $aConditions [] = array ( 'adprev.USR_UID', @@ -1021,10 +1006,7 @@ class AppSolr $c->add (AppDelegationPeer::APP_UID, $appUID); $c->add (AppDelegationPeer::DEL_INDEX, $delIndex); - - $c->add ('ctastitle.CON_CATEGORY', 'TAS_TITLE'); - $c->add ('ctastitle.CON_LANG', 'en'); - + $rs = AppDelegationPeer::doSelectRS ($c); $rs->setFetchmode (ResultSet::FETCHMODE_ASSOC); // echo $c->toString(); diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php index 43c19299a..b11a43739 100755 --- a/workflow/engine/classes/class.case.php +++ b/workflow/engine/classes/class.case.php @@ -204,7 +204,7 @@ class Cases $c->addSelectColumn(ProcessPeer::PRO_TITLE); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); - $c->addAscendingOrderByColumn('PRO_TITLE'); + $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE); $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE); $rs = TaskPeer::doSelectRS($c); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -303,8 +303,8 @@ class Cases $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); - $c->addAscendingOrderByColumn('PRO_TITLE'); - $c->addAscendingOrderByColumn('TAS_TITLE'); + $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE); + $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE); $rs = TaskPeer::doSelectRS($c); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -413,8 +413,8 @@ class Cases $c->addSelectColumn(ProcessPeer::PRO_TITLE); $c->addJoin (TaskPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->add(TaskPeer::TAS_UID, $tasks, Criteria::IN); - $c->addAscendingOrderByColumn('PRO_TITLE'); - $c->addAscendingOrderByColumn('TAS_TITLE'); + $c->addAscendingOrderByColumn(ProcessPeer::PRO_TITLE); + $c->addAscendingOrderByColumn(TaskPeer::TAS_TITLE); $rs = TaskPeer::doSelectRS($c); $rs->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rs->next(); @@ -2521,7 +2521,6 @@ class Cases 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); @@ -2545,6 +2544,7 @@ class Cases $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); @@ -2557,14 +2557,8 @@ class Cases $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); @@ -2673,7 +2667,7 @@ class Cases $c->addSelectColumn(UsersPeer::USR_UID); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addSelectColumn(ApplicationPeer::APP_STATUS); - $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); + $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); $c->addAsColumn( @@ -2682,24 +2676,17 @@ class Cases APP_LAST_USER.USR_FIRSTNAME)" ); - $c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_LAST_USER", 'USERS'); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); + $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); - $del = DBAdapter::getStringDelimiter(); - $proTitleConds = array(); - $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); - $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); - $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del); - $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN); - $prevConds = array(); $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID'); $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS); @@ -2903,26 +2890,17 @@ class Cases $c->addSelectColumn(UsersPeer::USR_UID); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addSelectColumn(ApplicationPeer::APP_STATUS); - $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); + $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE); - $c->addAlias("PRO_TITLE", 'CONTENT'); - $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); + $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); - $del = DBAdapter::getStringDelimiter(); - // - $proTitleConds = array(); - $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); - $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); - $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del); - $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN); - $c->add(AppDelegationPeer::USR_UID, ''); $c->add(AppDelegationPeer::TAS_UID, $aTasks, Criteria::IN); break; @@ -3057,16 +3035,13 @@ class Cases $c->addSelectColumn(ApplicationPeer::APP_STATUS); if ($titles) { $c->addSelectColumn(ApplicationPeer::APP_TITLE); - $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); + $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE); } //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); $c->addAsColumn( 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"); - if ($titles) { - $c->addAlias("PRO_TITLE", 'CONTENT'); - } $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_LAST_USER", 'USERS'); @@ -3078,12 +3053,7 @@ class Cases $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); if ($titles) { - $del = DBAdapter::getStringDelimiter(); - $proTitleConds = array(); - $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); - $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); - $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del); - $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN); + $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); } $prevConds = array(); @@ -3142,30 +3112,23 @@ class Cases $c->addSelectColumn(UsersPeer::USR_UID); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addSelectColumn(ApplicationPeer::APP_STATUS); - $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); + $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); $c->addAsColumn( 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)"); - $c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_LAST_USER", 'USERS'); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); + $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); - $del = DBAdapter::getStringDelimiter(); - $proTitleConds = array(); - $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); - $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); - $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del); - $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN); - $prevConds = array(); $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID'); $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS); @@ -5343,7 +5306,9 @@ class Cases $appDelegation = AppDelegationPeer::retrieveByPK($applicationUid, $aTask['DEL_INDEX']); if (!is_null($appDelegation)) { - $arrayData2['TAS_TITLE'] = Content::load('TAS_TITLE', '', $appDelegation->getTasUid(), SYS_LANG); + $oTask = new Task(); + $aTask = $oTask->load($appDelegation->getTasUid()); + $arrayData2['TAS_TITLE'] = $aTask['TAS_TITLE']; $arrayData2['DEL_TASK_DUE_DATE'] = $appDelegation->getDelTaskDueDate(); } } else { @@ -6706,31 +6671,24 @@ class Cases $c->addSelectColumn(UsersPeer::USR_UID); $c->addAsColumn('APP_CURRENT_USER', "CONCAT(USERS.USR_LASTNAME, ' ', USERS.USR_FIRSTNAME)"); $c->addSelectColumn(ApplicationPeer::APP_STATUS); - $c->addAsColumn('APP_PRO_TITLE', 'PRO_TITLE.CON_VALUE'); + $c->addAsColumn('APP_PRO_TITLE', ProcessPeer::PRO_TITLE); $c->addAsColumn('APP_TAS_TITLE', TaskPeer::TAS_TITLE); //$c->addAsColumn('APP_DEL_PREVIOUS_USER', 'APP_LAST_USER.USR_USERNAME'); $c->addAsColumn( 'APP_DEL_PREVIOUS_USER', "CONCAT(APP_LAST_USER.USR_LASTNAME, ' ', APP_LAST_USER.USR_FIRSTNAME)" ); - $c->addAlias("PRO_TITLE", 'CONTENT'); $c->addAlias("APP_PREV_DEL", 'APP_DELEGATION'); $c->addAlias("APP_LAST_USER", 'USERS'); $c->addJoin(ApplicationPeer::APP_UID, AppDelegationPeer::APP_UID, Criteria::LEFT_JOIN); + $c->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $appThreadConds[] = array(ApplicationPeer::APP_UID, AppThreadPeer::APP_UID); $appThreadConds[] = array(AppDelegationPeer::DEL_INDEX, AppThreadPeer::DEL_INDEX); $c->addJoinMC($appThreadConds, Criteria::LEFT_JOIN); $c->addJoin(AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN); - $del = DBAdapter::getStringDelimiter(); - $proTitleConds = array(); - $proTitleConds[] = array(ApplicationPeer::PRO_UID, 'PRO_TITLE.CON_ID'); - $proTitleConds[] = array('PRO_TITLE.CON_CATEGORY', $del . 'PRO_TITLE' . $del); - $proTitleConds[] = array('PRO_TITLE.CON_LANG', $del . SYS_LANG . $del); - $c->addJoinMC($proTitleConds, Criteria::LEFT_JOIN); - $prevConds = array(); $prevConds[] = array(ApplicationPeer::APP_UID, 'APP_PREV_DEL.APP_UID'); $prevConds[] = array('APP_PREV_DEL.DEL_INDEX', AppDelegationPeer::DEL_PREVIOUS); diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php index c3f555bc6..5ce6775e7 100755 --- a/workflow/engine/classes/class.pmFunctions.php +++ b/workflow/engine/classes/class.pmFunctions.php @@ -3252,7 +3252,20 @@ function PMFGetGroupUID($groupName) */ function PMFGetTaskUID($taskName, $proUid = null) { - return PMFGetUidFromText($taskName, 'TAS_TITLE', $proUid); + $oCriteria = new Criteria('workflow'); + $oCriteria->addSelectColumn(TaskPeer::TAS_UID); + $oCriteria->add(TaskPeer::TAS_TITLE, $taskName); + if(!is_null($proUid)){ + $oCriteria->add(TaskPeer::PRO_UID, $proUid); + } + $oDataset = TaskPeer::doSelectRS($oCriteria); + $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); + $uids = array(); + while ($row = $oDataset->getRow()) { + $uids[] = $row['TAS_UID']; + $oDataset->next(); + } + return $uids; } /** diff --git a/workflow/engine/classes/class.processMap.php b/workflow/engine/classes/class.processMap.php index 6d68a6416..676684fe2 100755 --- a/workflow/engine/classes/class.processMap.php +++ b/workflow/engine/classes/class.processMap.php @@ -123,18 +123,9 @@ class processMap $oTask->label = htmlentities($aRow1['TAS_TITLE'], ENT_QUOTES, 'UTF-8'); } else { $oCriteria = new Criteria('workflow'); - $del = DBAdapter::getStringDelimiter(); $oCriteria->add(SubProcessPeer::PRO_PARENT, $aRow1['PRO_UID']); $oCriteria->add(SubProcessPeer::TAS_PARENT, $aRow1['TAS_UID']); - - $oCriteria->addAsColumn('TAS_TITLE', 'C1.CON_VALUE'); - $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); $oDatasetX = SubProcessPeer::doSelectRS($oCriteria, Propel::getDbConnection('workflow_ro')); $oDatasetX->setFetchmode(ResultSet::FETCHMODE_ASSOC); $oDatasetX->next(); @@ -4574,7 +4565,7 @@ class processMap { try { $oTask = new Task(); - $oNewTask = new StdClass(); + $oNewTask = new stdClass(); $oNewTask->label = G::LoadTranslation('ID_SUBPROCESS'); $oNewTask->uid = $oTask->create(array('PRO_UID' => $sProcessUID, 'TAS_TITLE' => $oNewTask->label, 'TAS_POSX' => $iX, 'TAS_POSY' => $iY, 'TAS_TYPE' => 'SUBPROCESS' )); //$oJSON = new Services_JSON(); @@ -4653,18 +4644,13 @@ class processMap //print'
';print_r($_DBArray['NewCase']);print'
'; $oCriteria = new Criteria('workflow'); $del = DBAdapter::getStringDelimiter(); + $oCriteria->addSelectColumn(TaskPeer::TAS_UID); + $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE); + $oCriteria->addSelectColumn(SubProcessPeer::SP_VARIABLES_OUT); $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID); $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID); $oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID); - - $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(); @@ -4673,8 +4659,7 @@ class processMap $aRow['TASKS'] = $aRow['TAS_UID']; //print "
".$aRow['TASKS']."
"; //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; - $aRow['TAS_TITLE'] = $aRow['CON_VALUE']; - $aRow['SPROCESS_NAME'] = $aRow['CON_VALUE']; + $aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; $SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']); if (is_array($SP_VARIABLES_OUT)) { $i = 1; @@ -6037,17 +6022,13 @@ class processMap } //print'
';print_r($_DBArray['NewCase']);print'
'; $oCriteria = new Criteria('workflow'); - $del = DBAdapter::getStringDelimiter(); + $oCriteria->addSelectColumn(TaskPeer::TAS_UID); + $oCriteria->addSelectColumn(TaskPeer::TAS_TITLE); + $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE); $oCriteria->add(SubProcessPeer::PRO_PARENT, $sProcessUID); $oCriteria->add(SubProcessPeer::TAS_PARENT, $sTaskUID); - - $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, Criteria::LEFT_JOIN); + $oCriteria->addJoin(SubProcessPeer::PRO_PARENT, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $oDataset = SubProcessPeer::doSelectRS($oCriteria); $oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); @@ -6065,11 +6046,7 @@ class processMap $aRow['TASKS'] = $aRow['TAS_UID']; //print "
".$aRow['TASKS']."
"; //$aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; - $aRow['TAS_TITLE'] = $aRow['CON_VALUE']; - $aRow['SPROCESS_NAME'] = $aRow['CON_VALUE']; - $lang = defined('SYS_LANG') ? SYS_LANG : 'en'; - $aRow['PRO_TITLE'] = Content::load('PRO_TITLE', '', $aRow['PRO_UID'], $lang); - + $aRow['SPROCESS_NAME'] = $aRow['TAS_TITLE']; if ($sType == 0) { $SP_VARIABLES_OUT = unserialize($aRow['SP_VARIABLES_OUT']); if (is_array($SP_VARIABLES_OUT)) { @@ -7037,8 +7014,12 @@ class processMap $aFields['OP_ACTION'] = $aRows['OP_ACTION']; $lang = defined('SYS_LANG') ? SYS_LANG : 'en'; - $aFields['TASK_TARGET_NAME'] = Content::load('TAS_TITLE', '', $aRows['TAS_UID'], $lang); - $aFields['TASK_SOURCE_NAME'] = Content::load('TAS_TITLE', '', $aRows['OP_TASK_SOURCE'], $lang); + $oTask = new Task(); + $aTask = $oTask->load($aRows['TAS_UID']); + $aFields['TASK_TARGET_NAME'] = $aTask['TAS_TITLE']; + $oTask = new Task(); + $aTask = $oTask->load($aRows['OP_TASK_SOURCE']); + $aFields['TASK_SOURCE_NAME'] = $aTask['TAS_TITLE']; $oUser = UsersPeer::retrieveByPK($aRows['USR_UID']); if (!is_null($oUser)) { $aFields['USR_FULLNAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); diff --git a/workflow/engine/classes/class.report.php b/workflow/engine/classes/class.report.php index 0800a9825..4f06e5ba9 100755 --- a/workflow/engine/classes/class.report.php +++ b/workflow/engine/classes/class.report.php @@ -53,24 +53,15 @@ class Report require_once 'classes/model/AppDelegation.php'; require_once 'classes/model/Application.php'; $oCriteria = new Criteria( 'workflow' ); - $del = DBAdapter::getStringDelimiter(); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); + $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" ); - $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); - $oCriteria->addAlias( "C1", 'CONTENT' ); - $proTitleConds = array (); - $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID' - ); - $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del - ); - $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN ); + $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); - $oCriteria->addGroupByColumn( 'C1.CON_VALUE' ); + $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); @@ -119,20 +110,12 @@ class Report $del = DBAdapter::getStringDelimiter(); $oCriteria->addSelectColumn( UsersPeer::USR_UID ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); + $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "TOTALDUR", "SUM(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "PROMEDIO", "AVG(" . AppDelegationPeer::DEL_DURATION . ")" ); - $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); - $oCriteria->addAlias( "C1", 'CONTENT' ); - $proTitleConds = array (); - $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID' - ); - $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del - ); - $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN ); + $oCriteria->addJoin (AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin( AppDelegationPeer::USR_UID, UsersPeer::USR_UID, Criteria::LEFT_JOIN ); //$oCriteria->add(AppDelegationPeer::DEL_DURATION, $from, Criteria::GREATER_EQUAL); //$oCriteria->add(AppDelegationPeer::DEL_DURATION, $to, Criteria::LESS_EQUAL); @@ -144,7 +127,7 @@ class Report } $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); - $oCriteria->addGroupByColumn( 'C1.CON_VALUE' ); + $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); @@ -245,18 +228,10 @@ class Report $oCriteria = new Criteria( 'workflow' ); $del = DBAdapter::getStringDelimiter(); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); + $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); - $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); - $oCriteria->addAlias( "C1", 'CONTENT' ); - $proTitleConds = array (); - $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID' - ); - $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del - ); - $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN ); + $oCriteria->addJoin (AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); $oDataset = AppDelegationPeer::doSelectRS( $oCriteria ); @@ -389,20 +364,12 @@ class Report $oCriteria = new Criteria( 'workflow' ); $del = DBAdapter::getStringDelimiter(); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); + $oCriteria->addSelectColumn(ProcessPeer::PRO_TITLE); $oCriteria->addAsColumn( "MIN", "MIN(" . AppDelegationPeer::DEL_DURATION . ")" ); $oCriteria->addAsColumn( "MAX", "MAX(" . AppDelegationPeer::DEL_DURATION . ")" ); - $oCriteria->addAsColumn( 'PRO_TITLE', 'C1.CON_VALUE' ); - $oCriteria->addAlias( "C1", 'CONTENT' ); - $proTitleConds = array (); - $proTitleConds[] = array (AppDelegationPeer::PRO_UID,'C1.CON_ID' - ); - $proTitleConds[] = array ('C1.CON_CATEGORY',$del . 'PRO_TITLE' . $del - ); - $proTitleConds[] = array ('C1.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $proTitleConds, Criteria::LEFT_JOIN ); + $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); - $oCriteria->addGroupByColumn( 'C1.CON_VALUE' ); + $oCriteria->addGroupByColumn(ProcessPeer::PRO_TITLE); $oCriteria->add( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $from . ' 00:00:00', Criteria::GREATER_EQUAL )->addAnd( $oCriteria->getNewCriterion( AppDelegationPeer::DEL_INIT_DATE, $to . ' 23:59:59', Criteria::LESS_EQUAL ) ) ); diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php index 77e06a99e..dc915c550 100755 --- a/workflow/engine/classes/class.wsBase.php +++ b/workflow/engine/classes/class.wsBase.php @@ -2766,18 +2766,10 @@ class wsBase $result = array (); try { $oCriteria = new Criteria( 'workflow' ); - $del = DBAdapter::getStringDelimiter(); $oCriteria->addSelectColumn( AppDelegationPeer::DEL_INDEX ); $oCriteria->addSelectColumn( AppDelegationPeer::TAS_UID ); - - $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, $caseId ); $oCriteria->add( AppDelegationPeer::DEL_THREAD_STATUS, 'OPEN' ); $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php index 723c2ce77..b573939da 100755 --- a/workflow/engine/classes/model/AdditionalTables.php +++ b/workflow/engine/classes/model/AdditionalTables.php @@ -1055,15 +1055,14 @@ class AdditionalTables extends BaseAdditionalTables //now get the labels for all process, using an array of Uids, $c = new Criteria('workflow'); //$c->add ( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); - $c->add(ContentPeer::CON_LANG, defined('SYS_LANG') ? SYS_LANG : 'en', Criteria::EQUAL); - $c->add(ContentPeer::CON_ID, $proUids, Criteria::IN); - - $dt = ContentPeer::doSelectRS($c); + $c->add(ProcessPeer::PRO_UID, $proUids, Criteria::IN); + $dt = ProcessPeer::doSelectRS($c); $dt->setFetchmode(ResultSet::FETCHMODE_ASSOC); while ($dt->next()) { $row = $dt->getRow(); - $procDetails[$row['CON_ID']][$row['CON_CATEGORY']] = $row['CON_VALUE']; + $procDetails[$row['PRO_UID']]['PRO_TITLE'] = $row['PRO_TITLE']; + $procDetails[$row['PRO_UID']]['PRO_DESCRIPTION'] = $row['PRO_DESCRIPTION']; } foreach ($addTables as $i => $addTable) { diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php index 8e0d1f4d1..a88113fae 100755 --- a/workflow/engine/classes/model/AppEvent.php +++ b/workflow/engine/classes/model/AppEvent.php @@ -126,13 +126,10 @@ class AppEvent extends BaseAppEvent $oCriteria->addSelectColumn( EventPeer::EVN_WHEN_OCCURS ); $oCriteria->addSelectColumn( EventPeer::EVN_ACTION ); $oCriteria->addSelectColumn( ApplicationPeer::APP_TITLE ); + $oCriteria->addSelectColumn( TaskPeer::TAS_TITLE ); + $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE ); $oCriteria->addAsColumn( 'EVN_DESCRIPTION', 'C1.CON_VALUE' ); - $oCriteria->addAsColumn( 'TAS_TITLE', 'C2.CON_VALUE' ); - $oCriteria->addAsColumn( 'PRO_TITLE', 'C4.CON_VALUE' ); $oCriteria->addAlias( 'C1', 'CONTENT' ); - $oCriteria->addAlias( 'C2', 'CONTENT' ); - $oCriteria->addAlias( 'C3', 'CONTENT' ); - $oCriteria->addAlias( 'C4', 'CONTENT' ); $oCriteria->addJoin( AppEventPeer::EVN_UID, EventPeer::EVN_UID, Criteria::LEFT_JOIN ); $del = DBAdapter::getStringDelimiter(); $aConditions = array (); @@ -149,24 +146,9 @@ class AppEvent extends BaseAppEvent $aConditions[] = array (AppEventPeer::DEL_INDEX,AppDelegationPeer::DEL_INDEX ); $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); - $aConditions = array (); - $aConditions[] = array (AppDelegationPeer::TAS_UID,'C2.CON_ID' - ); - $aConditions[] = array ('C2.CON_CATEGORY',$del . 'TAS_TITLE' . $del - ); - $aConditions[] = array ('C2.CON_LANG',$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); + $oCriteria->addJoin(AppDelegationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN); $oCriteria->addJoin(AppEventPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN); - $aConditions = array (); - $aConditions[] = array (AppDelegationPeer::PRO_UID,'C4.CON_ID' - ); - $aConditions[] = array ('C4.CON_CATEGORY',$del . 'PRO_TITLE' . $del - ); - $aConditions[] = array ('C4.CON_LANG',$del . SYS_LANG . $del - ); - - $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); + $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID, Criteria::LEFT_JOIN); $oCriteria->add( AppEventPeer::EVN_UID, '', Criteria::NOT_EQUAL ); if ($sProcessUid != '') { $oCriteria->add( EventPeer::PRO_UID, $sProcessUid ); @@ -298,7 +280,7 @@ class AppEvent extends BaseAppEvent $oPMScript = new PMScript(); $task = new Task(); - $taskFields = $task->Load( $aRow['TAS_UID'] ); + $taskFields = $task->load( $aRow['TAS_UID'] ); $aFields['APP_DATA']['APP_NUMBER'] = $aFields['APP_NUMBER']; $aFields['APP_DATA']['TAS_TITLE'] = $taskFields['TAS_TITLE']; $aFields['APP_DATA']['DEL_TASK_DUE_DATE'] = $aRow['DEL_TASK_DUE_DATE']; diff --git a/workflow/engine/classes/model/ListCanceled.php b/workflow/engine/classes/model/ListCanceled.php index 9ecdd0712..a581c1c1c 100644 --- a/workflow/engine/classes/model/ListCanceled.php +++ b/workflow/engine/classes/model/ListCanceled.php @@ -34,15 +34,13 @@ class ListCanceled extends BaseListCanceled { $data['APP_TITLE'] = $aRow['APP_TITLE']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); + $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL); + $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; + $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE']; $criteria = new Criteria(); $criteria->addSelectColumn(AppDelegationPeer::TAS_UID); @@ -52,7 +50,7 @@ class ListCanceled extends BaseListCanceled { $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); @@ -66,22 +64,20 @@ class ListCanceled extends BaseListCanceled { $criteria->addSelectColumn(AppDelegationPeer::USR_UID); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); $data['DEL_PREVIOUS_USR_UID'] = $aRow['USR_UID']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(TaskPeer::TAS_TITLE); + $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL); + $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE']; $criteria = new Criteria(); $criteria->addSelectColumn(UsersPeer::USR_USERNAME); diff --git a/workflow/engine/classes/model/ListCompleted.php b/workflow/engine/classes/model/ListCompleted.php index 39f353a84..062d4a463 100644 --- a/workflow/engine/classes/model/ListCompleted.php +++ b/workflow/engine/classes/model/ListCompleted.php @@ -45,27 +45,23 @@ class ListCompleted extends BaseListCompleted $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); + $criteria->add(ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL); $dataset = ContentPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; + $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); + $criteria->addSelectColumn(TaskPeer::TAS_TITLE); + $criteria->add(TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL); $dataset = ContentPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE']; $criteria = new Criteria(); diff --git a/workflow/engine/classes/model/ListInbox.php b/workflow/engine/classes/model/ListInbox.php index 02b265dc9..50f8eeace 100644 --- a/workflow/engine/classes/model/ListInbox.php +++ b/workflow/engine/classes/model/ListInbox.php @@ -256,15 +256,14 @@ class ListInbox extends BaseListInbox $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_DEF_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(TaskPeer::TAS_TITLE); + $criteria->addSelectColumn(TaskPeer::TAS_DEF_TITLE); + $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - if ($aRow['CON_VALUE'] == '') { + if ($aRow['TAS_DEF_TITLE'] == '') { $criteria = new Criteria(); $criteria->addSelectColumn(ApplicationPeer::APP_TITLE); $criteria->add( ApplicationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); @@ -272,38 +271,23 @@ class ListInbox extends BaseListInbox $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRowApp = $dataset->getRow(); - $aRow['CON_VALUE'] = $aRowApp['APP_TITLE']; + $aRow['TAS_DEF_TITLE'] = $aRowApp['APP_TITLE']; } - $data['APP_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TITLE'] = $aRow['TAS_DEF_TITLE']; + $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); + $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL ); + $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; - - - $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); - $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); - $dataset->next(); - $aRow = $dataset->getRow(); - $data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; - + $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE']; $data['DEL_PRIORITY'] = $this->getTaskPriority($data['TAS_UID'], $data['PRO_UID'], $data["APP_UID"]); - $data['APP_PREVIOUS_USER'] = ''; if ($data['DEL_PREVIOUS_USR_UID'] != '') { $criteria = new Criteria(); diff --git a/workflow/engine/classes/model/ListPaused.php b/workflow/engine/classes/model/ListPaused.php index 60be556db..d259d48e1 100644 --- a/workflow/engine/classes/model/ListPaused.php +++ b/workflow/engine/classes/model/ListPaused.php @@ -34,15 +34,13 @@ class ListPaused extends BaseListPaused { $data['APP_TITLE'] = $aRow['APP_TITLE']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); + $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL ); + $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; + $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE']; $criteria = new Criteria(); $criteria->addSelectColumn(AppDelegationPeer::USR_UID); @@ -53,7 +51,7 @@ class ListPaused extends BaseListPaused { $criteria->addSelectColumn(AppDelegationPeer::DEL_PREVIOUS); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $data['DEL_INDEX'], Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); @@ -68,7 +66,7 @@ class ListPaused extends BaseListPaused { $criteria->addSelectColumn(AppDelegationPeer::USR_UID); $criteria->add( AppDelegationPeer::APP_UID, $data['APP_UID'], Criteria::EQUAL ); $criteria->add( AppDelegationPeer::DEL_INDEX, $delPrevious, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $dataset = AppDelegationPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); @@ -88,15 +86,13 @@ class ListPaused extends BaseListPaused { $data['DEL_PREVIOUS_USR_LASTNAME'] = $aRow['USR_LASTNAME']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(TaskPeer::TAS_TITLE); + $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE']; $criteria = new Criteria(); $criteria->addSelectColumn(UsersPeer::USR_USERNAME); diff --git a/workflow/engine/classes/model/ListUnassigned.php b/workflow/engine/classes/model/ListUnassigned.php index f143e38b8..26aadf3bc 100644 --- a/workflow/engine/classes/model/ListUnassigned.php +++ b/workflow/engine/classes/model/ListUnassigned.php @@ -111,27 +111,23 @@ class ListUnassigned extends BaseListUnassigned $data = array_merge($data, $aRow); $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['PRO_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); + $criteria->add( ProcessPeer::PRO_UID, $data['PRO_UID'], Criteria::EQUAL ); + $dataset = ProcessPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_PRO_TITLE'] = $aRow['CON_VALUE']; + $data['APP_PRO_TITLE'] = $aRow['PRO_TITLE']; $criteria = new Criteria(); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add( ContentPeer::CON_ID, $data['TAS_UID'], Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE', Criteria::EQUAL ); - $criteria->add( ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL ); - $dataset = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(TaskPeer::TAS_TITLE); + $criteria->add( TaskPeer::TAS_UID, $data['TAS_UID'], Criteria::EQUAL ); + $dataset = TaskPeer::doSelectRS($criteria); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->next(); $aRow = $dataset->getRow(); - $data['APP_TAS_TITLE'] = $aRow['CON_VALUE']; + $data['APP_TAS_TITLE'] = $aRow['TAS_TITLE']; $data['APP_PREVIOUS_USER'] = ''; diff --git a/workflow/engine/classes/model/Step.php b/workflow/engine/classes/model/Step.php index 57f1bbd09..6a4834266 100755 --- a/workflow/engine/classes/model/Step.php +++ b/workflow/engine/classes/model/Step.php @@ -418,14 +418,12 @@ class Step extends BaseStep $res = array(); $oCriteria = new Criteria(); $oCriteria->addSelectColumn( StepPeer::TAS_UID ); - $oCriteria->addSelectColumn( ContentPeer::CON_VALUE ); $oCriteria->addSelectColumn( StepPeer::STEP_POSITION ); + $oCriteria->addAsColumn('CON_VALUE', TaskPeer::TAS_TITLE); $oCriteria->add( StepPeer::PRO_UID, $proUid ); $oCriteria->add( StepPeer::STEP_UID_OBJ, $dynUid ); $oCriteria->add( StepPeer::STEP_TYPE_OBJ, 'DYNAFORM' ); - $oCriteria->add( ContentPeer::CON_CATEGORY, 'TAS_TITLE'); - $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG); - $oCriteria->addJoin( StepPeer::TAS_UID, ContentPeer::CON_ID, Criteria::INNER_JOIN); + $oCriteria->addJoin( StepPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::INNER_JOIN); $oDataset = StepPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); while($oDataset->next()) { diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php index dae89ea0e..59734e78e 100644 --- a/workflow/engine/controllers/appProxy.php +++ b/workflow/engine/controllers/appProxy.php @@ -98,9 +98,10 @@ class AppProxy extends HttpProxyController $appNotes = new AppNotes(); $response = $appNotes->getNotesList( $appUid, '', $httpData->start, $httpData->limit ); - require_once ("classes/model/Content.php"); - $content = new Content(); - $response['array']['appTitle'] = $content->load('APP_TITLE', '', $appUid, SYS_LANG); + require_once ("classes/model/Application.php"); + $oApplication = new Application(); + $aApplication = $oApplication->Load($appUid); + $response['array']['appTitle'] = $aApplication['APP_TITLE']; return $response['array']; } @@ -292,7 +293,9 @@ class AppProxy extends HttpProxyController // note added by krlos pacha carlos[at]colosa[dot]com //getting this field if it doesn't exist. Related 7994 bug - $taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : Content::Load( "TAS_TITLE", "", $applicationFields['TAS_UID'], SYS_LANG ); + $oTask = new \Task(); + $aTasks = $oTask->load($applicationFields['TAS_UID']); + $taskData['TAS_TITLE'] = (array_key_exists( 'TAS_TITLE', $taskData )) ? $taskData['TAS_TITLE'] : $aTasks["TAS_TITLE"]; $data[] = array ("label" => $labelsCurrentTaskProperties["TAS_TITLE"], "value" => htmlentities($taskData["TAS_TITLE"], ENT_QUOTES, "UTF-8"), "section" => $labelTitleCurrentTasks["TITLE2"]); $data[] = array ('label' => $labelsCurrentTaskProperties['CURRENT_USER'],'value' => $currentUser,'section' => $labelTitleCurrentTasks['TITLE2']); $data[] = array ('label' => $labelsCurrentTaskProperties['DEL_DELEGATE_DATE'],'value' => $applicationFields['DEL_DELEGATE_DATE'],'section' => $labelTitleCurrentTasks['TITLE2']); diff --git a/workflow/engine/methods/cases/casesDemo.php b/workflow/engine/methods/cases/casesDemo.php index 4d9a9f98c..589b94255 100755 --- a/workflow/engine/methods/cases/casesDemo.php +++ b/workflow/engine/methods/cases/casesDemo.php @@ -79,7 +79,9 @@ try { $Fields['APP_PIN'] = $appFields['APP_PIN']; $Fields['APP_PROC_CODE'] = $appFields['APP_PROC_CODE']; - $Fields['PRO_TITLE'] = Content::load( 'PRO_TITLE', '', $appFields['PRO_UID'], SYS_LANG ); + $objProc = new Process(); + $aProc = $objProc->load($appFields['PRO_UID']); + $Fields['PRO_TITLE'] = $aProc['PRO_TITLE']; $oUser = new Users(); $oUser->load( $appFields['APP_CUR_USER'] ); $Fields['CUR_USER'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); @@ -91,7 +93,9 @@ try { $Fields['CANT_APP_DATA'] = count( $Fields['APP_DATA'] ); $delegations = $oCase->GetAllDelegations( $appFields['APP_UID'] ); foreach ($delegations as $key => $val) { - $delegations[$key]['TAS_TITLE'] = Content::load( 'TAS_TITLE', '', $val['TAS_UID'], SYS_LANG ); + $objTask = new Task(); + $aTask = $objTask->load($val['TAS_UID']); + $delegations[$key]['TAS_TITLE'] = $aTask['TAS_TITLE']; if ($val['USR_UID'] != - 1) { $oUser->load( $val['USR_UID'] ); $delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index 4095ee3ce..f14364444 100755 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -172,10 +172,8 @@ function lookinginforContentProcess ($sproUid) $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 ); + $oCriteria->add( ProcessPeer::PRO_UID, $sproUid ); + $oDataset = ProcessPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->next(); $aRow = $oDataset->getRow(); diff --git a/workflow/engine/methods/mails/emailsAjax.php b/workflow/engine/methods/mails/emailsAjax.php index 45bc34cc5..4c26f1159 100644 --- a/workflow/engine/methods/mails/emailsAjax.php +++ b/workflow/engine/methods/mails/emailsAjax.php @@ -83,9 +83,7 @@ switch($req){ $criteria->addSelectColumn(ApplicationPeer::PRO_UID); $criteria->addSelectColumn(ApplicationPeer::APP_NUMBER); - - $criteria->addAsColumn('PRO_TITLE', 'C2.CON_VALUE'); - $criteria->addAlias('C2', 'CONTENT'); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); if ($emailStatus != '') { $criteria->add( AppMessagePeer::APP_MSG_STATUS, $emailStatus); @@ -129,16 +127,7 @@ switch($req){ $criteria->setOffset($start); } $criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID); - - $conditions = array(); - $conditions[] = array(ApplicationPeer::PRO_UID, 'C2.CON_ID'); - $conditions[] = array( - 'C2.CON_CATEGORY', DBAdapter::getStringDelimiter() . 'PRO_TITLE' . DBAdapter::getStringDelimiter() - ); - $conditions[] = array( - 'C2.CON_LANG', DBAdapter::getStringDelimiter() . SYS_LANG . DBAdapter::getStringDelimiter() - ); - $criteria->addJoinMC($conditions, Criteria::LEFT_JOIN); + $criteria->addJoin(ApplicationPeer::PRO_UID, ProcessPeer::PRO_UID); $result = AppMessagePeer::doSelectRS($criteria); $result->setFetchmode(ResultSet::FETCHMODE_ASSOC); $data = Array(); diff --git a/workflow/engine/methods/processes/processes_Save.php b/workflow/engine/methods/processes/processes_Save.php index cca4e590e..13d90973c 100755 --- a/workflow/engine/methods/processes/processes_Save.php +++ b/workflow/engine/methods/processes/processes_Save.php @@ -40,9 +40,7 @@ switch ($function) { $snameProcess = urldecode( $_POST['NAMEPROCESS'] ); $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( 'COUNT(*) AS PROCESS' ); - $oCriteria->add( ContentPeer::CON_CATEGORY, 'PRO_TITLE' ); - $oCriteria->add( ContentPeer::CON_LANG, SYS_LANG ); - $oCriteria->add( ContentPeer::CON_VALUE, $snameProcess ); + $oCriteria->add(ProcessPeer::PRO_TITLE, $snameProcess); $oDataset = ContentPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); $oDataset->next(); diff --git a/workflow/engine/methods/users/users_Ajax.php b/workflow/engine/methods/users/users_Ajax.php index b697993b7..d517b980a 100644 --- a/workflow/engine/methods/users/users_Ajax.php +++ b/workflow/engine/methods/users/users_Ajax.php @@ -210,17 +210,15 @@ try { $objectPermision = $doSelectRS->getRow(); if (isset($objectPermision["USR_UID"])) { $criteria = new Criteria("workflow"); - $criteria->addSelectColumn(ContentPeer::CON_VALUE); - $criteria->add(ContentPeer::CON_CATEGORY, 'PRO_TITLE', Criteria::EQUAL); - $criteria->add(ContentPeer::CON_ID, $objectPermision["PRO_UID"], Criteria::EQUAL); - $criteria->add(ContentPeer::CON_LANG, SYS_LANG, Criteria::EQUAL); - $doSelectRS = ContentPeer::doSelectRS($criteria); + $criteria->addSelectColumn(ProcessPeer::PRO_TITLE); + $criteria->add(ProcessPeer::PRO_UID, $objectPermision["PRO_UID"], Criteria::EQUAL); + $doSelectRS = ProcessPeer::doSelectRS($criteria); $doSelectRS->setFetchmode(ResultSet::FETCHMODE_ASSOC); $doSelectRS->next(); $content = $doSelectRS->getRow(); echo G::json_encode(array( "status" => 'ERROR', - "message" => G::LoadTranslation('ID_USER_CANT_BE_DELETED_FOR_THE_PROCESS', array('processTitle' => isset($content["CON_VALUE"]) ? $content["CON_VALUE"] : $objectPermision['PRO_UID'])) + "message" => G::LoadTranslation('ID_USER_CANT_BE_DELETED_FOR_THE_PROCESS', array('processTitle' => isset($content["PRO_TITLE"]) ? $content["PRO_TITLE"] : $objectPermision['PRO_UID'])) )); break; } diff --git a/workflow/engine/methods/users/users_ReassignCases.php b/workflow/engine/methods/users/users_ReassignCases.php index 0491387ae..fa14c2a0a 100755 --- a/workflow/engine/methods/users/users_ReassignCases.php +++ b/workflow/engine/methods/users/users_ReassignCases.php @@ -73,16 +73,9 @@ try { require_once 'classes/model/AppDelegation.php'; $oCriteria = new Criteria( 'workflow' ); $oCriteria->addSelectColumn( AppDelegationPeer::PRO_UID ); + $oCriteria->addSelectColumn( ProcessPeer::PRO_TITLE ); $oCriteria->addSelectColumn( 'COUNT(' . AppDelegationPeer::PRO_UID . ') AS CANTITY' ); - $oCriteria->addAsColumn( 'PRO_TITLE', ContentPeer::CON_VALUE ); - $aConditions = array (); - $aConditions[] = array (AppDelegationPeer::PRO_UID,ContentPeer::CON_ID - ); - $aConditions[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del - ); - $aConditions[] = array (ContentPeer::CON_LANG,$del . SYS_LANG . $del - ); - $oCriteria->addJoinMC( $aConditions, Criteria::LEFT_JOIN ); + $oCriteria->addJoin(AppDelegationPeer::PRO_UID, ProcessPeer::PRO_UID); $oCriteria->add( AppDelegationPeer::USR_UID, $_POST['USR_UID'] ); $oCriteria->add( AppDelegationPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); $oCriteria->addGroupByColumn( AppDelegationPeer::PRO_UID ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php index 418a09032..4b7b2d56b 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php @@ -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' ); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php index ce0eb08e3..802a21a72 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php @@ -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)) { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php b/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php index 46c40c785..73323c004 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Subprocess.php @@ -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) {