diff --git a/workflow/engine/methods/cases/casesDemo.php b/workflow/engine/methods/cases/casesDemo.php index 644ddff14..49d16a868 100755 --- a/workflow/engine/methods/cases/casesDemo.php +++ b/workflow/engine/methods/cases/casesDemo.php @@ -1,170 +1,178 @@ -. - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - -try { - -$rows[] = array ( 'uid' => 'char', 'name' => 'char', 'age' => 'integer', 'balance' => 'float' ); -$rows[] = array ( 'uid' => 11, 'name' => 'john', 'age' => 44, 'balance' => 123423 ); -$rows[] = array ( 'uid' => 22, 'name' => 'bobby', 'age' => 33, 'balance' => 23456 ); -$rows[] = array ( 'uid' => 33, 'name' => 'Dan', 'age' => 22, 'balance' => 34567 ); -$rows[] = array ( 'uid' => 33, 'name' => 'Mike', 'age' => 21, 'balance' => 4567 ); -$rows[] = array ( 'uid' => 44, 'name' => 'Paul', 'age' => 22, 'balance' => 567 ); -$rows[] = array ( 'uid' => 55, 'name' => 'Will', 'age' => 23, 'balance' => 67 ); -$rows[] = array ( 'uid' => 66, 'name' => 'Ernest', 'age' => 24, 'balance' => 7 ); -$rows[] = array ( 'uid' => 77, 'name' => 'Albert', 'age' => 25, 'balance' => 84567 ); -$rows[] = array ( 'uid' => 88, 'name' => 'Sue', 'age' => 26, 'balance' => 94567 ); -$rows[] = array ( 'uid' => 99, 'name' => 'Freddy', 'age' => 22, 'balance' => 04567 ); - -$_DBArray['user'] = $rows; -$_SESSION['_DBArray'] = $_DBArray; -//krumo ( $_DBArray ); - - G::LoadClass( 'ArrayPeer'); - $c = new Criteria ('dbarray'); - $c->setDBArrayTable('user'); -// $c->add ( 'user.age', 22 , Criteria::GREATER_EQUAL ); -// $c->add ( 'user.age', 22 , Criteria::EQUAL ); - $c->add ( 'user.name', '%au%' , Criteria::LIKE ); -// $c->add ( 'user.balance', 3456 , Criteria::GREATER_EQUAL ); - $c->addAscendingOrderByColumn ('name'); - - $G_MAIN_MENU = 'processmaker'; - $G_ID_MENU_SELECTED = 'CASES'; - $G_PUBLISH = new Publisher; -// $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/casesDemo', $c ); - //$G_PUBLISH->AddContent('smarty', 'cases/casesDemo', '', '', $Fields); -// G::RenderPage( "publish" ); -//die; - -/* Includes */ -G::LoadClass('pmScript'); -G::LoadClass('case'); -G::LoadClass('derivation'); -$oCase = new Cases (); -$appUid = isset ($_SESSION['APPLICATION']) ? $_SESSION['APPLICATION'] : ''; -$appFields = $oCase->loadCase( $appUid ); - -$Fields['APP_UID'] = $appFields['APP_UID']; -$Fields['APP_NUMBER'] = $appFields['APP_NUMBER']; -$Fields['APP_STATUS'] = $appFields['APP_STATUS']; -$Fields['STATUS'] = $appFields['STATUS']; -$Fields['APP_TITLE'] = $appFields['TITLE']; -$Fields['PRO_UID'] = $appFields['PRO_UID']; -$Fields['APP_PARALLEL'] = $appFields['APP_PARALLEL']; -$Fields['APP_INIT_USER'] = $appFields['APP_INIT_USER']; -$Fields['APP_CUR_USER'] = $appFields['APP_CUR_USER']; -$Fields['APP_DATA'] = $appFields['APP_DATA']; -$Fields['CREATOR'] = $appFields['CREATOR']; -$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 ); -$oUser = new Users(); -$oUser->load( $appFields['APP_CUR_USER'] ); -$Fields['CUR_USER'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); - -$threads = $oCase->GetAllThreads ($appFields['APP_UID']); -$Fields['THREADS'] = $threads; -$Fields['CANT_THREADS'] = count($threads); - -$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 ); - if ($val['USR_UID'] != -1) { - $oUser->load( $val['USR_UID'] ); - $delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); - } - else { - $delegations[$key]['USR_NAME'] = 'Unknow user (Sub-Process User)'; - } -} -$Fields['CANT_DELEGATIONS'] = count($delegations); -$Fields['DELEGATIONS'] = $delegations; - -require_once 'classes/model/AppDelay.php'; -$oCriteria = new Criteria('workflow'); -$oCriteria->addSelectColumn(AppDelayPeer::APP_THREAD_INDEX); -$oCriteria->addSelectColumn(AppDelayPeer::APP_DEL_INDEX); -$oCriteria->addSelectColumn(AppDelayPeer::APP_TYPE); -$oCriteria->addSelectColumn(AppDelayPeer::APP_STATUS); -$oCriteria->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_USER); -$oCriteria->addSelectColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE); -$oCriteria->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_USER); -$oCriteria->addSelectColumn(AppDelayPeer::APP_DISABLE_ACTION_DATE); -$oCriteria->add(AppDelayPeer::APP_UID, $appUid); -$oCriteria->addAscendingOrderByColumn(AppDelayPeer::APP_TYPE); -$oCriteria->addAscendingOrderByColumn(AppDelayPeer::APP_ENABLE_ACTION_DATE); -$oDataset = AppDelayPeer::doSelectRS($oCriteria); -$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); -$oDataset->next(); -$aDelays = array(); -while ($aRow = $oDataset->getRow()) { - $aDelays[] = $aRow; - $oDataset->next(); -} -$Fields['DELAYS'] = $aDelays; -$Fields['CANT_DELAYS'] = count($aDelays); - -require_once 'classes/model/SubApplication.php'; -$oCriteria = new Criteria('workflow'); -$oCriteria->addSelectColumn(SubApplicationPeer::APP_UID ); -$oCriteria->addSelectColumn(SubApplicationPeer::APP_PARENT ); -$oCriteria->addSelectColumn(SubApplicationPeer::DEL_INDEX_PARENT ); -$oCriteria->addSelectColumn(SubApplicationPeer::DEL_THREAD_PARENT); -$oCriteria->addSelectColumn(SubApplicationPeer::SA_STATUS ); -$oCriteria->addSelectColumn(SubApplicationPeer::SA_INIT_DATE ); -$oCriteria->addSelectColumn(SubApplicationPeer::SA_FINISH_DATE); -$oCriteria->addSelectColumn(ApplicationPeer::APP_NUMBER); -$oCriteria->add(SubApplicationPeer::APP_UID, $appUid); -$oCriteria->addJoin(ApplicationPeer::APP_UID, SubApplicationPeer::APP_PARENT, Criteria::LEFT_JOIN); -$oCriteria->addAscendingOrderByColumn(SubApplicationPeer::APP_UID); -$oDataset = SubApplicationPeer::doSelectRS($oCriteria); -$oDataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); -$oDataset->next(); -$aSubprocess = array(); -while ($aRow = $oDataset->getRow()) { - $aSubprocess[] = $aRow; - $oDataset->next(); -} -$Fields['SUBAPPLICATIONS'] = $aSubprocess; -$Fields['CANT_SUBAPPLICATIONS'] = count($aSubprocess); - - /* Render page */ - $G_MAIN_MENU = 'processmaker'; - $G_ID_MENU_SELECTED = 'CASES'; - $G_PUBLISH = new Publisher; - //$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/casesDemo', $c ); - $G_PUBLISH->AddContent('smarty', 'cases/casesDemo', '', '', $Fields); - G::RenderPage( "publish" ); - -} -catch ( Exception $e ){ - $G_PUBLISH = new Publisher; - $aMessage['MESSAGE'] = $e->getMessage(); - $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); - G::RenderPage('publish'); +. + * + * For more information, contact Colosa Inc, 2566 Le Jeune Rd., + * Coral Gables, FL, 33134, USA, or email info@colosa.com. + */ + +try { + + $rows[] = array ('uid' => 'char','name' => 'char','age' => 'integer','balance' => 'float' + ); + $rows[] = array ('uid' => 11,'name' => 'john','age' => 44,'balance' => 123423 + ); + $rows[] = array ('uid' => 22,'name' => 'bobby','age' => 33,'balance' => 23456 + ); + $rows[] = array ('uid' => 33,'name' => 'Dan','age' => 22,'balance' => 34567 + ); + $rows[] = array ('uid' => 33,'name' => 'Mike','age' => 21,'balance' => 4567 + ); + $rows[] = array ('uid' => 44,'name' => 'Paul','age' => 22,'balance' => 567 + ); + $rows[] = array ('uid' => 55,'name' => 'Will','age' => 23,'balance' => 67 + ); + $rows[] = array ('uid' => 66,'name' => 'Ernest','age' => 24,'balance' => 7 + ); + $rows[] = array ('uid' => 77,'name' => 'Albert','age' => 25,'balance' => 84567 + ); + $rows[] = array ('uid' => 88,'name' => 'Sue','age' => 26,'balance' => 94567 + ); + $rows[] = array ('uid' => 99,'name' => 'Freddy','age' => 22,'balance' => 04567 + ); + + $_DBArray['user'] = $rows; + $_SESSION['_DBArray'] = $_DBArray; + //krumo ( $_DBArray ); + G::LoadClass( 'ArrayPeer' ); + $c = new Criteria( 'dbarray' ); + $c->setDBArrayTable( 'user' ); + // $c->add ( 'user.age', 22 , Criteria::GREATER_EQUAL ); + // $c->add ( 'user.age', 22 , Criteria::EQUAL ); + $c->add( 'user.name', '%au%', Criteria::LIKE ); + // $c->add ( 'user.balance', 3456 , Criteria::GREATER_EQUAL ); + $c->addAscendingOrderByColumn( 'name' ); + + $G_MAIN_MENU = 'processmaker'; + $G_ID_MENU_SELECTED = 'CASES'; + $G_PUBLISH = new Publisher(); + // $G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/casesDemo', $c ); + //$G_PUBLISH->AddContent('smarty', 'cases/casesDemo', '', '', $Fields); + // G::RenderPage( "publish" ); + //die; + + + /* Includes */ + G::LoadClass( 'pmScript' ); + G::LoadClass( 'case' ); + G::LoadClass( 'derivation' ); + $oCase = new Cases(); + $appUid = isset( $_SESSION['APPLICATION'] ) ? $_SESSION['APPLICATION'] : ''; + $appFields = $oCase->loadCase( $appUid ); + + $Fields['APP_UID'] = $appFields['APP_UID']; + $Fields['APP_NUMBER'] = $appFields['APP_NUMBER']; + $Fields['APP_STATUS'] = $appFields['APP_STATUS']; + $Fields['STATUS'] = $appFields['STATUS']; + $Fields['APP_TITLE'] = $appFields['TITLE']; + $Fields['PRO_UID'] = $appFields['PRO_UID']; + $Fields['APP_PARALLEL'] = $appFields['APP_PARALLEL']; + $Fields['APP_INIT_USER'] = $appFields['APP_INIT_USER']; + $Fields['APP_CUR_USER'] = $appFields['APP_CUR_USER']; + $Fields['APP_DATA'] = $appFields['APP_DATA']; + $Fields['CREATOR'] = $appFields['CREATOR']; + $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 ); + $oUser = new Users(); + $oUser->load( $appFields['APP_CUR_USER'] ); + $Fields['CUR_USER'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); + + $threads = $oCase->GetAllThreads( $appFields['APP_UID'] ); + $Fields['THREADS'] = $threads; + $Fields['CANT_THREADS'] = count( $threads ); + + $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 ); + if ($val['USR_UID'] != - 1) { + $oUser->load( $val['USR_UID'] ); + $delegations[$key]['USR_NAME'] = $oUser->getUsrFirstname() . ' ' . $oUser->getUsrLastname(); + } else { + $delegations[$key]['USR_NAME'] = 'Unknow user (Sub-Process User)'; + } + } + $Fields['CANT_DELEGATIONS'] = count( $delegations ); + $Fields['DELEGATIONS'] = $delegations; + + require_once 'classes/model/AppDelay.php'; + $oCriteria = new Criteria( 'workflow' ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_THREAD_INDEX ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_DEL_INDEX ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_TYPE ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_STATUS ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_ENABLE_ACTION_USER ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_ENABLE_ACTION_DATE ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_DISABLE_ACTION_USER ); + $oCriteria->addSelectColumn( AppDelayPeer::APP_DISABLE_ACTION_DATE ); + $oCriteria->add( AppDelayPeer::APP_UID, $appUid ); + $oCriteria->addAscendingOrderByColumn( AppDelayPeer::APP_TYPE ); + $oCriteria->addAscendingOrderByColumn( AppDelayPeer::APP_ENABLE_ACTION_DATE ); + $oDataset = AppDelayPeer::doSelectRS( $oCriteria ); + $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oDataset->next(); + $aDelays = array (); + while ($aRow = $oDataset->getRow()) { + $aDelays[] = $aRow; + $oDataset->next(); + } + $Fields['DELAYS'] = $aDelays; + $Fields['CANT_DELAYS'] = count( $aDelays ); + + require_once 'classes/model/SubApplication.php'; + $oCriteria = new Criteria( 'workflow' ); + $oCriteria->addSelectColumn( SubApplicationPeer::APP_UID ); + $oCriteria->addSelectColumn( SubApplicationPeer::APP_PARENT ); + $oCriteria->addSelectColumn( SubApplicationPeer::DEL_INDEX_PARENT ); + $oCriteria->addSelectColumn( SubApplicationPeer::DEL_THREAD_PARENT ); + $oCriteria->addSelectColumn( SubApplicationPeer::SA_STATUS ); + $oCriteria->addSelectColumn( SubApplicationPeer::SA_INIT_DATE ); + $oCriteria->addSelectColumn( SubApplicationPeer::SA_FINISH_DATE ); + $oCriteria->addSelectColumn( ApplicationPeer::APP_NUMBER ); + $oCriteria->add( SubApplicationPeer::APP_UID, $appUid ); + $oCriteria->addJoin( ApplicationPeer::APP_UID, SubApplicationPeer::APP_PARENT, Criteria::LEFT_JOIN ); + $oCriteria->addAscendingOrderByColumn( SubApplicationPeer::APP_UID ); + $oDataset = SubApplicationPeer::doSelectRS( $oCriteria ); + $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); + $oDataset->next(); + $aSubprocess = array (); + while ($aRow = $oDataset->getRow()) { + $aSubprocess[] = $aRow; + $oDataset->next(); + } + $Fields['SUBAPPLICATIONS'] = $aSubprocess; + $Fields['CANT_SUBAPPLICATIONS'] = count( $aSubprocess ); + + /* Render page */ + $G_MAIN_MENU = 'processmaker'; + $G_ID_MENU_SELECTED = 'CASES'; + $G_PUBLISH = new Publisher(); + //$G_PUBLISH->AddContent( 'propeltable', 'paged-table', 'cases/casesDemo', $c ); + $G_PUBLISH->AddContent( 'smarty', 'cases/casesDemo', '', '', $Fields ); + G::RenderPage( "publish" ); + +} catch (Exception $e) { + $G_PUBLISH = new Publisher(); + $aMessage['MESSAGE'] = $e->getMessage(); + $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', $aMessage ); + G::RenderPage( 'publish' ); } diff --git a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php index 58db609e5..9952e4472 100644 --- a/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php +++ b/workflow/engine/methods/cases/casesGenerateDocumentPage_Ajax.php @@ -74,7 +74,6 @@ function casesShowOuputDocumentExist ($url) if ($actionAjax == 'casesGenerateDocumentPage') { global $G_PUBLISH; - $oHeadPublisher = & headPublisher::getSingleton(); G::loadClass( 'configuration' ); $conf = new Configurations(); @@ -128,7 +127,6 @@ if ($actionAjax == 'generateDocumentGrid_Ajax') { if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) { $dateFormat = $generalConfCasesList['casesListDateFormat']; } - $newDir = '/tmp/test/directory'; $r = G::verifyPath( $newDir ); $r->data = $aProcesses; diff --git a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php index b89da3608..89ec3695f 100644 --- a/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php +++ b/workflow/engine/methods/cases/casesHistoryDynaformPage_Ajax.php @@ -121,7 +121,6 @@ body { } if ($actionAjax == 'showDynaformListHistory') { - //!dataIndex $_POST["APP_UID"] = $_REQUEST["APP_UID"]; $_POST["DYN_UID"] = $_REQUEST["DYN_UID"]; @@ -141,7 +140,6 @@ body { diff --git a/workflow/engine/methods/cases/casesList_Ajax.php b/workflow/engine/methods/cases/casesList_Ajax.php index 8b454572e..378e69b90 100755 --- a/workflow/engine/methods/cases/casesList_Ajax.php +++ b/workflow/engine/methods/cases/casesList_Ajax.php @@ -27,7 +27,6 @@ require_once 'classes/model/AppThread.php'; require_once 'classes/model/AppDelay.php'; require_once 'classes/model/Process.php'; require_once 'classes/model/Task.php'; - require_once ("classes/model/AppCacheView.php"); require_once ("classes/model/AppDelegation.php"); require_once ("classes/model/AdditionalTables.php"); @@ -74,12 +73,9 @@ if ($actionAjax == "processListExtJs") { } $del = DBAdapter::getStringDelimiter(); $conds = array (); - $conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID - ); - $conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del - ); - $conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del - ); + $conds[] = array (ProcessPeer::PRO_UID,ContentPeer::CON_ID); + $conds[] = array (ContentPeer::CON_CATEGORY,$del . 'PRO_TITLE' . $del); + $conds[] = array (ContentPeer::CON_LANG,$del . $lang . $del); $cProcess->addJoinMC( $conds, Criteria::LEFT_JOIN ); $cProcess->add( ProcessPeer::PRO_STATUS, 'ACTIVE' ); $oDataset = ProcessPeer::doSelectRS( $cProcess ); diff --git a/workflow/engine/methods/cases/casesMenuLoader.php b/workflow/engine/methods/cases/casesMenuLoader.php index 6641b6cb9..def25208e 100755 --- a/workflow/engine/methods/cases/casesMenuLoader.php +++ b/workflow/engine/methods/cases/casesMenuLoader.php @@ -1,9 +1,7 @@ validatePost (); - /* @author Alvaro Campos Sanchez */ /* Includes */ G::LoadClass( 'case' ); @@ -39,11 +38,7 @@ $Fields['APP_DATA'] = array_merge( $Fields['APP_DATA'], (array) $_POST['form'] ) #here we must verify if is a debug session $trigger_debug_session = $_SESSION['TRIGGER_DEBUG']['ISSET']; #here we must verify if is a debugg session - - #trigger debug routines... - - //cleaning debug variables $_SESSION['TRIGGER_DEBUG']['ERRORS'] = Array (); $_SESSION['TRIGGER_DEBUG']['DATA'] = Array (); diff --git a/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php b/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php index 8b879cd01..4428bfa96 100755 --- a/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php +++ b/workflow/engine/methods/cases/casesSchedulerLog_Ajax.php @@ -10,6 +10,7 @@ * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the diff --git a/workflow/engine/methods/cases/casesStartPage.php b/workflow/engine/methods/cases/casesStartPage.php index 7b8529e05..9cee81578 100755 --- a/workflow/engine/methods/cases/casesStartPage.php +++ b/workflow/engine/methods/cases/casesStartPage.php @@ -13,8 +13,6 @@ global $RBAC; switch ($page) { case "startCase": $oHeadPublisher->addExtJsScript( 'cases/casesStartCase', true ); //adding a javascript file .js - - $oHeadPublisher->addContent( 'cases/casesStartCase' ); //adding a html file .html. G::LoadClass( 'configuration' ); $c = new Configurations(); @@ -43,6 +41,5 @@ switch ($page) { break; } - G::RenderPage( 'publish', 'extJs' ); diff --git a/workflow/engine/methods/cases/casesStartPage_Ajax.php b/workflow/engine/methods/cases/casesStartPage_Ajax.php index 37eefa9fb..65ea77ced 100755 --- a/workflow/engine/methods/cases/casesStartPage_Ajax.php +++ b/workflow/engine/methods/cases/casesStartPage_Ajax.php @@ -92,10 +92,7 @@ function getProcessList () $tempTreeChild['otherAttributes'] = array_merge( $processInfoChild, $proData[$processInfoChild['pro_uid']], $calendar->getCalendarFor( $processInfoChild['uid'], $processInfoChild['uid'], $processInfoChild['uid'] ) ); $tempTreeChild['otherAttributes']['PRO_TAS_TITLE'] = str_replace( ")", "", str_replace( "(", "", trim( str_replace( $tempTreeChild['otherAttributes']['PRO_TITLE'], "", $tempTreeChild['otherAttributes']["value"] ) ) ) ); $tempTreeChild['qtip'] = $tempTreeChild['otherAttributes']['PRO_DESCRIPTION']; - //$tempTree['cls']='file'; - - $tempTreeChildren[] = $tempTreeChild; } } @@ -289,16 +286,10 @@ function getSimpleDashboardData () $Criteria->addSelectColumn( AppCacheViewPeer::USR_UID ); $Criteria->addSelectColumn( AppCacheViewPeer::APP_THREAD_STATUS ); - $Criteria->add( AppCacheViewPeer::APP_STATUS, array ("TO_DO","DRAFT" - ), CRITERIA::IN ); - $Criteria->add( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged,"" - ), CRITERIA::IN ); - + $Criteria->add( AppCacheViewPeer::APP_STATUS, array ("TO_DO","DRAFT"), CRITERIA::IN ); + $Criteria->add( AppCacheViewPeer::USR_UID, array ($sUIDUserLogged,""), CRITERIA::IN ); $Criteria->add( AppCacheViewPeer::DEL_FINISH_DATE, null, Criteria::ISNULL ); - //$Criteria->add ( AppCacheViewPeer::APP_THREAD_STATUS, 'OPEN' ); - - $Criteria->add( AppCacheViewPeer::DEL_THREAD_STATUS, 'OPEN' ); //execute the query diff --git a/workflow/engine/methods/cases/casesToRevisePanelExtJs.php b/workflow/engine/methods/cases/casesToRevisePanelExtJs.php index 8a7514daa..7ddda8a4e 100755 --- a/workflow/engine/methods/cases/casesToRevisePanelExtJs.php +++ b/workflow/engine/methods/cases/casesToRevisePanelExtJs.php @@ -1,6 +1,7 @@ assign( 'TRANSLATIONS', $TRANSLATIONS); //translations diff --git a/workflow/engine/methods/cases/casesToReviseTreeContent.php b/workflow/engine/methods/cases/casesToReviseTreeContent.php index ea7631550..7f89f3a75 100755 --- a/workflow/engine/methods/cases/casesToReviseTreeContent.php +++ b/workflow/engine/methods/cases/casesToReviseTreeContent.php @@ -1,5 +1,4 @@ addDescendingOrderByColumn( LogCasesSchedulerPeer::EXEC_HOUR ); $oDataset = LogCasesSchedulerPeer::doSelectRS( $oCriteria ); $oDataset->setFetchmode( ResultSet::FETCHMODE_ASSOC ); - //$oDataset = LogCasesSchedulerPeer::doSelectRS ( $oCriteria ); //$oDataset->setFetchmode ( ResultSet::FETCHMODE_ASSOC ); - - $addTables = Array (); while ($oDataset->next()) { $addTables[] = $oDataset->getRow(); } - //$oLogCasesScheduler = new LogCasesScheduler(); //$arrData = $oLogCasesScheduler->getAll(); - echo '{results: ' . $results . ', rows: ' . G::json_encode( $addTables ) . '}'; diff --git a/workflow/engine/methods/cases/debug_triggers.php b/workflow/engine/methods/cases/debug_triggers.php index 8e8adaacb..2d1ecfeba 100755 --- a/workflow/engine/methods/cases/debug_triggers.php +++ b/workflow/engine/methods/cases/debug_triggers.php @@ -4,7 +4,6 @@ if (isset( $_SESSION['TRIGGER_DEBUG']['info'] )) { } else { $aTriggers[0] = $_SESSION['TRIGGER_DEBUG']; } - //print_r($aTriggers);die; $triggersList = Array (); @@ -21,8 +20,6 @@ foreach ($aTriggers as $aTrigger) { //$t_code = str_replace('"', '\'',$t_code); //$t_code = addslashes($t_code); //$t_code = Only1br($t_code); - - //highlighting the trigger code using the geshi third party library G::LoadThirdParty( 'geshi', 'geshi' ); $geshi = new GeSHi( $aTrigger['TRIGGERS_VALUES'][$index]['TRI_WEBBOT'], 'php' ); @@ -65,9 +62,7 @@ foreach ($DEBUG_ERRORS as $error) { ]}'; */ - $triggersRet->total = count( $triggersList ); $triggersRet->data = $triggersList; - echo G::json_encode( $triggersRet ); diff --git a/workflow/engine/methods/cases/debug_vars.php b/workflow/engine/methods/cases/debug_vars.php index 980e70dfa..5c4a3a0fa 100755 --- a/workflow/engine/methods/cases/debug_vars.php +++ b/workflow/engine/methods/cases/debug_vars.php @@ -1,15 +1,12 @@ loadCase( $_SESSION['APPLICATION'] ); - $aVars = Array (); for ($i = 0; $i < count( $_SESSION['TRIGGER_DEBUG']['DATA'] ); $i ++) { $aVars[$_SESSION['TRIGGER_DEBUG']['DATA'][$i]['key']] = $_SESSION['TRIGGER_DEBUG']['DATA'][$i]['value']; @@ -86,10 +83,8 @@ switch ($request) { if (isset( $_POST['filter'] ) && $_POST['filter'] == 'sys') { $aVars = G::getSystemConstants(); } - ksort( $aVars ); $return_object->totalCount = 1; - foreach ($aVars as $i => $var) { if (is_array( $var ) || is_object( $var )) { $aVars[$i] = print_r( $var, true ); diff --git a/workflow/engine/methods/cases/index.php b/workflow/engine/methods/cases/index.php index 12163259d..c020c4a37 100755 --- a/workflow/engine/methods/cases/index.php +++ b/workflow/engine/methods/cases/index.php @@ -20,6 +20,7 @@ * * For more information, contact Colosa Inc, 2566 Le Jeune Rd., * Coral Gables, FL, 33134, USA, or email info@colosa.com. + * */ //$newFile = str_replace ( 'index.php', 'cases_List.php' , __FILE__ ) ; $newFile = str_replace( 'index.php', 'main.php', __FILE__ ); diff --git a/workflow/engine/methods/cases/open.php b/workflow/engine/methods/cases/open.php index 8ce6740aa..ca624cfef 100755 --- a/workflow/engine/methods/cases/open.php +++ b/workflow/engine/methods/cases/open.php @@ -83,6 +83,5 @@ $oHeadPublisher->assign( '_APP_NUM', '#: ' . $case['APP_NUMBER'] ); $oHeadPublisher->assign( '_ENV_CURRENT_DATE', $conf->getSystemDate( date( 'Y-m-d' ) ) ); $oHeadPublisher->assign( '_ENV_CURRENT_DATE_NO_FORMAT', date( 'Y-m-d' ) ); $oHeadPublisher->assign( 'idfirstform', is_null( $oStep ) ? '' : $oStep->getStepUidObj() ); - G::RenderPage( 'publish', 'extJs' ); diff --git a/workflow/engine/methods/cases/proxyCasesList.php b/workflow/engine/methods/cases/proxyCasesList.php index c723b56ad..bbc7f837d 100755 --- a/workflow/engine/methods/cases/proxyCasesList.php +++ b/workflow/engine/methods/cases/proxyCasesList.php @@ -18,7 +18,6 @@ $dateTo = isset( $_POST["dateTo"] ) ? substr( $_POST["dateTo"], 0, 10 ) : ""; try { $result = ""; - $userUid = (isset( $_SESSION["USER_LOGGED"] ) && $_SESSION["USER_LOGGED"] != "") ? $_SESSION["USER_LOGGED"] : null; $user = ($user == "CURRENT_USER") ? $userUid : $user; diff --git a/workflow/engine/methods/cases/proxyProcessList.php b/workflow/engine/methods/cases/proxyProcessList.php index d2ec4330d..365a2affb 100755 --- a/workflow/engine/methods/cases/proxyProcessList.php +++ b/workflow/engine/methods/cases/proxyProcessList.php @@ -8,7 +8,6 @@ $option = ''; if (isset( $_GET['t'] )) $option = $_GET['t']; try { - G::LoadClass( "BasePeer" ); require_once ("classes/model/Process.php"); require_once ("classes/model/AppCacheView.php"); diff --git a/workflow/engine/methods/cases/proxyReassignCasesList.php b/workflow/engine/methods/cases/proxyReassignCasesList.php index ee9bc953f..163aa866e 100755 --- a/workflow/engine/methods/cases/proxyReassignCasesList.php +++ b/workflow/engine/methods/cases/proxyReassignCasesList.php @@ -21,8 +21,7 @@ $allTasUids = array (); // getting all App Uids and task Uids foreach ($sentUids as $sentUid) { $aItem = explode( '|', $sentUid ); - $allUidsRecords[] = array ('APP_UID' => $aItem[0],'TAS_UID' => $aItem[1],'DEL_INDEX' => $aItem[2] - ); + $allUidsRecords[] = array ('APP_UID' => $aItem[0],'TAS_UID' => $aItem[1],'DEL_INDEX' => $aItem[2]); } $sReassignFromUser = isset( $_POST['user'] ) ? $_POST['user'] : ''; @@ -55,8 +54,8 @@ foreach ($allUidsRecords as $aRecord) { foreach ($aCaseUsers as $aCaseUser) { if ($aCaseUser['USR_UID'] != $sReassignFromUser) { $aCaseUserRecord = $oUser->load( $aCaseUser['USR_UID'] ); - $aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME'] - ); // . ' (' . $aCaseUserRecord['USR_USERNAME'] + $aUsersInvolved[] = array ('userUid' => $aCaseUser['USR_UID'],'userFullname' => $aCaseUserRecord['USR_FIRSTNAME'] . ' ' . $aCaseUserRecord['USR_LASTNAME']); + // . ' (' . $aCaseUserRecord['USR_USERNAME'] } } } diff --git a/workflow/engine/methods/cases/proxyReassignUsersList.php b/workflow/engine/methods/cases/proxyReassignUsersList.php index 6cbbb776d..372c3122a 100755 --- a/workflow/engine/methods/cases/proxyReassignUsersList.php +++ b/workflow/engine/methods/cases/proxyReassignUsersList.php @@ -1,7 +1,5 @@ next(); $row = $rs->getRow(); } - $serverResponse[] = array ('TAS_TITLE' => $aData->APP_TAS_TITLE,'REASSIGNED_CASES' => $currentCasesReassigned - ); + $serverResponse[] = array ('TAS_TITLE' => $aData->APP_TAS_TITLE,'REASSIGNED_CASES' => $currentCasesReassigned); } - $serverResponse['TOTAL'] = $casesReassignedCount; echo G::json_encode( $serverResponse ); diff --git a/workflow/engine/methods/cases/summary.php b/workflow/engine/methods/cases/summary.php index c9e151de5..b22371795 100755 --- a/workflow/engine/methods/cases/summary.php +++ b/workflow/engine/methods/cases/summary.php @@ -69,8 +69,7 @@ try { } catch (Exception $error) { global $G_PUBLISH; $G_PUBLISH = new Publisher(); - $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => $error->getMessage() - ) ); + $G_PUBLISH->AddContent( 'xmlform', 'xmlform', 'login/showMessage', '', array ('MESSAGE' => $error->getMessage()) ); G::RenderPage( 'publish', 'blank' ); die(); } diff --git a/workflow/engine/methods/dashboard/main.php b/workflow/engine/methods/dashboard/main.php index 209c0b172..f334d0e69 100644 --- a/workflow/engine/methods/dashboard/main.php +++ b/workflow/engine/methods/dashboard/main.php @@ -12,22 +12,22 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . + * along with this program. If not, see . * * For more information, contact Colosa Inc, 2566 Le Jeune Rd., * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * */ -$RBAC->requirePermissions('PM_DASHBOARD'); +$RBAC->requirePermissions( 'PM_DASHBOARD' ); -$G_MAIN_MENU = 'processmaker'; -$G_ID_MENU_SELECTED = 'DASHBOARD'; +$G_MAIN_MENU = 'processmaker'; +$G_ID_MENU_SELECTED = 'DASHBOARD'; + +$G_PUBLISH = new Publisher(); +$G_PUBLISH->AddContent( 'view', 'dashboard/load' ); +G::RenderPage( 'publish' ); -$G_PUBLISH = new Publisher; -$G_PUBLISH->AddContent('view', 'dashboard/load'); -G::RenderPage('publish');