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

PMC-75

Browse Source
This commit is contained in:
Paula Quispe
2018-11-28 08:41:32 -04:00
parent 0b841721a5
commit 12db864b84
3 changed files with 43 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -3863,6 +3863,12 @@ msgstr "Case Tracker Properties Saved Successfully"
msgid "The case {APP_NUMBER} was reactivated successfully!" msgid "The case {APP_NUMBER} was reactivated successfully!"
msgstr "The case {APP_NUMBER} was reactivated successfully!" msgstr "The case {APP_NUMBER} was reactivated successfully!"
# TRANSLATION
# LABEL/ID_CASE_RESPONSE_NOT_AVAILABLE
#: LABEL/ID_CASE_RESPONSE_NOT_AVAILABLE
msgid "No response available, please review the case information"
msgstr "No response available, please review the case information"
# TRANSLATION # TRANSLATION
# LABEL/ID_CASE_ROUTED_TO # LABEL/ID_CASE_ROUTED_TO
#: LABEL/ID_CASE_ROUTED_TO #: LABEL/ID_CASE_ROUTED_TO

1
workflow/engine/data/mysql/insert.sql
View File

@@ -57451,6 +57451,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ) VALUES
( 'LABEL','ID_CASE_REACTIVATED_SUCCESSFULLY','en','The case {APP_NUMBER} was reactivated successfully!','2014-01-15') , ( 'LABEL','ID_CASE_REACTIVATED_SUCCESSFULLY','en','The case {APP_NUMBER} was reactivated successfully!','2014-01-15') ,
( 'LABEL','ID_CASE_RESPONSE_NOT_AVAILABLE','en','No response available, please review the case information','2018-03-02') ,
( 'LABEL','ID_CASE_ROUTED_TO','en','Case routed to','2017-06-02') , ( 'LABEL','ID_CASE_ROUTED_TO','en','Case routed to','2017-06-02') ,
( 'LABEL','ID_CASE_SCHEDULER','en','Case Scheduler','2014-01-15') , ( 'LABEL','ID_CASE_SCHEDULER','en','Case Scheduler','2014-01-15') ,
( 'LABEL','ID_CASE_SCHEDULER_CLASSIC','en','Case Scheduler (classic processes)','2017-10-13') , ( 'LABEL','ID_CASE_SCHEDULER_CLASSIC','en','Case Scheduler (classic processes)','2017-10-13') ,

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

@@ -4,30 +4,26 @@ namespace ProcessMaker\BusinessModel;
use AbeConfiguration; use AbeConfiguration;
use AbeConfigurationPeer; use AbeConfigurationPeer;
use AppMessage;
use AbeRequests; use AbeRequests;
use AbeRequestsPeer; use AbeRequestsPeer;
use AbeResponsesPeer; use AbeResponsesPeer;
use ApplicationPeer;
use AppDelegation; use AppDelegation;
use AppDelegationPeer; use AppDelegationPeer;
use AppMessage;
use Criteria; use Criteria;
use DynaformPeer;
use EmailServerPeer; use EmailServerPeer;
use Exception; use Exception;
use G; use G;
use Publisher;
use ProcessMaker\BusinessModel\EmailServer;
use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use PmDynaform; use PmDynaform;
use PMLicensedFeatures; use PMLicensedFeatures;
use ProcessPeer; use ProcessMaker\Core\System;
use ProcessMaker\Plugins\PluginRegistry;
use Publisher;
use ResultSet; use ResultSet;
use SpoolRun; use SpoolRun;
use Users as ClassUsers;
use stdClass; use stdClass;
use UsersPeer; use Users as ClassUsers;
use TaskPeer;
/** /**
* Description of ActionsByEmailService * Description of ActionsByEmailService
@@ -543,48 +539,54 @@ class ActionsByEmail
/** /**
* Get the decision from Actions By Email by BPMN dynaform * Get the decision from Actions By Email by BPMN dynaform
* @param array $arrayData *
* @param array $dataRes
* *
* @return string $message * @return string $message
*/ */
public function viewFormBpmn(array $dataRes) public function viewFormBpmn(array $dataRes)
{ {
$_SESSION['CURRENT_DYN_UID'] = trim($dataRes['DYN_UID']); $_SESSION['CURRENT_DYN_UID'] = trim($dataRes['DYN_UID']);
$configuration['DYN_UID'] = trim($dataRes['DYN_UID']); $configuration['DYN_UID'] = trim($dataRes['DYN_UID']);
$configuration['CURRENT_DYNAFORM'] = trim($dataRes['DYN_UID']); $configuration['CURRENT_DYNAFORM'] = trim($dataRes['DYN_UID']);
$configuration['PRO_UID'] = trim($dataRes['PRO_UID']); $configuration['PRO_UID'] = trim($dataRes['PRO_UID']);
$criteriaD = new Criteria(); $criteriaD = new Criteria();
$criteriaD->addSelectColumn(\DynaformPeer::DYN_CONTENT); $criteriaD->addSelectColumn(DynaformPeer::DYN_CONTENT);
$criteriaD->addSelectColumn(\DynaformPeer::PRO_UID); $criteriaD->addSelectColumn(DynaformPeer::PRO_UID);
$criteriaD->add(\DynaformPeer::DYN_UID, trim($dataRes['DYN_UID'])); $criteriaD->add(DynaformPeer::DYN_UID, trim($dataRes['DYN_UID']));
$resultD = \DynaformPeer::doSelectRS($criteriaD); $resultD = DynaformPeer::doSelectRS($criteriaD);
$resultD->setFetchmode(ResultSet::FETCHMODE_ASSOC); $resultD->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$resultD->next(); $resultD->next();
$configuration = $resultD->getRow(); $configuration = $resultD->getRow();
$field = new \stdClass(); $field = new stdClass();
$field->type = '';
$field->label = '';
$field->options = [];
$obj = new PmDynaform($configuration); $obj = new PmDynaform($configuration);
$message = G::LoadTranslation('ID_CASE_RESPONSE_NOT_AVAILABLE');
if ($dataRes['ABE_RES_DATA'] !== '') { if ($dataRes['ABE_RES_DATA'] !== '') {
$value = unserialize($dataRes['ABE_RES_DATA']); $value = unserialize($dataRes['ABE_RES_DATA']);
$actionField = str_replace(array('@@','@#','@=','@%','@?','@$'), '', $dataRes['ABE_ACTION_FIELD']); $actionField = str_replace(['@@', '@#', '@=', '@%', '@?', '@$'], '', $dataRes['ABE_ACTION_FIELD']);
$variables = G::json_decode($configuration['DYN_CONTENT'], true); $variables = G::json_decode($configuration['DYN_CONTENT'], true);
if (is_array($value)) { if (is_array($value)) {
if(isset($variables['items'][0]['items'])) { if (isset($variables['items'][0]['items'])) {
$fields = $variables['items'][0]['items']; $fields = $variables['items'][0]['items'];
} }
} else { } else {
if(isset($variables['items'][0]['items'])) { if (isset($variables['items'][0]['items'])) {
$fields = $variables['items'][0]['items']; $fields = $variables['items'][0]['items'];
foreach ($fields as $key => $row) { foreach ($fields as $key => $row) {
foreach($row as $var) { foreach ($row as $var) {
if(isset($var['variable'])) { if (isset($var['variable'])) {
if ($var['variable'] === $actionField) { if ($var['variable'] === $actionField) {
$field->label = isset($var['label']) ? $var['label'] : ''; $field->label = isset($var['label']) ? $var['label'] : '';
$field->type = isset($var['type']) ? $var['type'] : ''; $field->type = isset($var['type']) ? $var['type'] : '';
$values = $var['options']; $values = $var['options'];
foreach ($values as $val){ foreach ($values as $val) {
$field->options[$val['value']] = $val['value']; $field->options[$val['value']] = $val['value'];
} }
} }
@@ -592,22 +594,22 @@ class ActionsByEmail
} }
} }
} }
$message = '';
switch ($field->type) { switch ($field->type) {
case 'dropdown': case 'dropdown':
case 'radiogroup': case 'radiogroup':
case 'radio': case 'radio':
$message .= $field->label . ': '; $message = $field->label . ': ';
$message .= $field->options[$value]; $message .= $field->options[$value];
break; break;
case 'yesno': case 'yesno':
$message .= $field->label . ': '; $message = $field->label . ': ';
$message .= ($value == 1) ? G::loadTranslation('ID_YES') : G::loadTranslation('ID_NO'); $message .= $value == 1 ? G::LoadTranslation('ID_YES') : G::LoadTranslation('ID_NO');
break; break;
case 'checkgroup': case 'checkgroup':
case 'checkbox': case 'checkbox':
$message .= $field->label . ': '; $message = $field->label . ': ';
$message .= ($value == 'On') ? G::loadTranslation('ID_CHECK') : G::loadTranslation('ID_UNCHECK'); $message .= $value == 'On' ? G::LoadTranslation('ID_CHECK') : G::LoadTranslation('ID_UNCHECK');
break; break;
} }
} }