fernando/luos
1
0
Fork 0
Code Releases Activity

Code Style

Browse Source
This commit is contained in:
Paula Quispe
2017-10-30 14:32:32 -04:00
parent b91c1584b8
commit dcfb954c4c
6 changed files with 69 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
View File

@@ -4,6 +4,7 @@ namespace ProcessMaker\BusinessModel;
use AbeConfiguration;
use AbeConfigurationPeer;
use AbeRequests;
use AbeRequestsPeer;
use AbeResponsesPeer;
use ApplicationPeer;
@@ -20,6 +21,7 @@ use ResultSet;
use SpoolRun;
use stdClass;
use UsersPeer;
use TaskPeer;
/**
* Description of ActionsByEmailService
@@ -390,7 +392,7 @@ class ActionsByEmail
$criteria->addSelectColumn(AbeConfigurationPeer::ABE_UID);
$criteria->addSelectColumn(AbeConfigurationPeer::PRO_UID);
$criteria->addSelectColumn(AbeConfigurationPeer::TAS_UID);
$criteria->addSelectColumn(TaskPeer::TAS_ID);
$criteria->addSelectColumn(AbeRequestsPeer::ABE_REQ_UID);
$criteria->addSelectColumn(AbeRequestsPeer::APP_UID);
$criteria->addSelectColumn(AbeRequestsPeer::DEL_INDEX);
@@ -399,19 +401,18 @@ class ActionsByEmail
$criteria->addSelectColumn(AbeRequestsPeer::ABE_REQ_BODY);
$criteria->addSelectColumn(AbeRequestsPeer::ABE_REQ_ANSWERED);
$criteria->addSelectColumn(AbeRequestsPeer::ABE_REQ_STATUS);
$criteria->addSelectColumn(AppDelegationPeer::DEL_FINISH_DATE);
$criteria->addSelectColumn(AppDelegationPeer::APP_NUMBER);
$criteria->addJoin(AbeConfigurationPeer::TAS_UID, TaskPeer::TAS_UID, Criteria::LEFT_JOIN);
$criteria->addJoin(AbeConfigurationPeer::ABE_UID, AbeRequestsPeer::ABE_UID, Criteria::LEFT_JOIN);
$conditions[] = [AbeRequestsPeer::APP_UID, AppDelegationPeer::APP_UID];
$conditions[] = [AbeRequestsPeer::DEL_INDEX, AppDelegationPeer::DEL_INDEX];
$criteria->addJoinMC($conditions, Criteria::LEFT_JOIN);
$criteria->add(AbeRequestsPeer::ABE_REQ_UID, $arrayData['REQ_UID']);
$criteria->addJoin(AbeRequestsPeer::ABE_UID, AbeConfigurationPeer::ABE_UID);
$criteria->addJoin(AppDelegationPeer::APP_UID, AbeRequestsPeer::APP_UID);
$criteria->addJoin(AppDelegationPeer::DEL_INDEX, AbeRequestsPeer::DEL_INDEX);
$resultRes = AbeRequestsPeer::doSelectRS($criteria);
$resultRes->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$resultRes->next();
$dataRes = Array();
$dataRes = [];
if ($dataRes = $resultRes->getRow()) {
if (is_null($dataRes['DEL_FINISH_DATE'])) {
@@ -431,13 +432,7 @@ class ActionsByEmail
$spool = new SpoolRun();
$spool->setConfig($aSetup);
//Load the TAS_ID
if (!isset($arrayData['TAS_ID'])) {
$task= new Task();
$taskId = $task->load($dataRes['TAS_UID'])['TAS_ID'];
}
$spool->create(array(
$spool->create([
'msg_uid' => '',
'app_uid' => $dataRes['APP_UID'],
'del_index' => $dataRes['DEL_INDEX'],
@@ -451,13 +446,12 @@ class ActionsByEmail
'app_msg_attach' => '',
'app_msg_template' => '',
'app_msg_status' => 'pending',
"tas_id" => $taskId,
"tas_id" => $dataRes['TAS_ID'],
"app_number" => isset($dataRes['APP_NUMBER']) ? $dataRes['APP_NUMBER'] : ''
));
]);
if ($spool->sendMail()) {
$dataRes['ABE_REQ_STATUS'] = 'SENT';
$message = G::LoadTranslation('ID_EMAIL_RESENT_TO') . ': ' . $dataRes['ABE_REQ_SENT_TO'];
} else {
$dataRes['ABE_REQ_STATUS'] = 'ERROR';
@@ -465,7 +459,7 @@ class ActionsByEmail
}
try {
$abeRequestsInstance = new \AbeRequests();
$abeRequestsInstance = new AbeRequests();
$abeRequestsInstance->createOrUpdate($dataRes);
} catch (Exception $error) {
throw $error;

4
workflow/engine/src/ProcessMaker/BusinessModel/Cases/InputDocument.php
View File

@@ -1145,7 +1145,6 @@ class InputDocument
* This function get all the supervisor's documents
* When the DEL_INDEX = 100000
*
* @param string $proUid, uid related to the process
* @param string $appUid, uid related to the case
* @param array $docType, can be INPUT, ATTACHED, OUTPUT
* @param array $docStatus, can be ACTIVE, DELETED
@@ -1153,7 +1152,7 @@ class InputDocument
* @return array $documents
* @throws Exception
*/
public function getSupervisorDocuments($proUid, $appUid, $docType = ['INPUT'], $docStatus = ['ACTIVE'])
public function getSupervisorDocuments($appUid, $docType = ['INPUT'], $docStatus = ['ACTIVE'])
{
try {
$criteria = new Criteria('workflow');
@@ -1161,7 +1160,6 @@ class InputDocument
$criteria->add(AppDocumentPeer::APP_DOC_TYPE, $docType, Criteria::IN);
$criteria->add(AppDocumentPeer::APP_DOC_STATUS, $docStatus, Criteria::IN);
$criteria->add(AppDocumentPeer::DEL_INDEX, 100000);
$criteria->add(ApplicationPeer::PRO_UID, $proUid);
$criteria->addJoin(AppDocumentPeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
$dataset = AppDocumentPeer::doSelectRS($criteria);
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);