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

Completing changes

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2021-04-12 20:17:16 +00:00
parent f6c0d4045a
commit 69cb0ab535
3 changed files with 49 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/config/schema.xml
View File

@@ -418,6 +418,9 @@
<index-column name="APP_UID"/>
<index-column name="APP_MSG_SEND_DATE"/>
</index>
<index name="indexAppMsgDate">
<index-column name="APP_MSG_DATE"/>
</index>
</table>
<table name="APP_OWNER">
<vendor type="mysql">

48
workflow/engine/methods/mails/emailsAjax.php
View File

@@ -1,5 +1,8 @@
<?php
use ProcessMaker\Model\Application;
use ProcessMaker\Model\Process;
use ProcessMaker\Model\Task;
use ProcessMaker\Plugins\PluginRegistry;
use ProcessMaker\Exception\RBACException;
use ProcessMaker\Util\DateTime;
@@ -32,7 +35,7 @@ switch ($req) {
$filterBy = (isset($_REQUEST['filterBy'])) ? $_REQUEST['filterBy'] : 'ALL';
$criteria = new Criteria();
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_UID);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_ID);
$criteria->addSelectColumn(AppMessagePeer::APP_UID);
$criteria->addSelectColumn(AppMessagePeer::DEL_INDEX);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_TYPE);
@@ -45,14 +48,9 @@ switch ($req) {
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_SEND_DATE);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_SHOW_MESSAGE);
$criteria->addSelectColumn(AppMessagePeer::APP_MSG_ERROR);
/*$criteria->addSelectColumn(ApplicationPeer::PRO_UID);
$criteria->addSelectColumn(ApplicationPeer::APP_TITLE);
$criteria->addSelectColumn(ApplicationPeer::APP_NUMBER);*/
$criteria->addSelectColumn(ProcessPeer::PRO_TITLE);
//$criteria->addSelectColumn(TaskPeer::TAS_TITLE);
//$criteria->addJoin(AppMessagePeer::APP_UID, ApplicationPeer::APP_UID, Criteria::LEFT_JOIN);
//$criteria->addJoin(AppMessagePeer::TAS_ID, TaskPeer::TAS_ID, Criteria::LEFT_JOIN);
$criteria->addJoin(AppMessagePeer::PRO_ID, ProcessPeer::PRO_ID, Criteria::LEFT_JOIN);
$criteria->addSelectColumn(AppMessagePeer::APP_NUMBER);
$criteria->addSelectColumn(AppMessagePeer::PRO_ID);
$criteria->addSelectColumn(AppMessagePeer::TAS_ID);
//Status can be: All, Participated, Pending, Failed
if (!empty($msgStatusId)) {
@@ -129,11 +127,43 @@ switch ($req) {
$index = 1;
$content = new Content();
$tasTitleDefault = G::LoadTranslation('ID_TASK_NOT_RELATED');
$cases = [];
$processes = [];
$tasks = [];
while ($result->next()) {
$row = $result->getRow();
$row['APP_MSG_STATUS'] = ucfirst($row['APP_MSG_STATUS']);
$row['APP_MSG_DATE'] = DateTime::convertUtcToTimeZone($row['APP_MSG_DATE']);
// Complete data with information from another tables
if ($row['APP_NUMBER'] > 0) {
if (!isset($cases[$row['APP_NUMBER']])) {
$record = Application::query()->select(['APP_TITLE'])->where('APP_NUMBER', '=', $row['APP_NUMBER'])->get()->toArray();
if (!empty($record[0]['APP_TITLE'])) {
$cases[$row['APP_NUMBER']] = $record[0]['APP_TITLE'];
}
}
$row['APP_TITLE'] = $cases[$row['APP_NUMBER']] ?? '';
}
if ($row['PRO_ID'] > 0) {
if (!isset($processes[$row['PRO_ID']])) {
$record = Process::query()->select(['PRO_TITLE'])->where('PRO_ID', '=', $row['PRO_ID'])->get()->toArray();
if (!empty($record[0]['PRO_TITLE'])) {
$processes[$row['PRO_ID']] = $record[0]['PRO_TITLE'];
}
}
$row['PRO_TITLE'] = $processes[$row['PRO_ID']] ?? '';
}
if ($row['TAS_ID'] > 0) {
if (!isset($tasks[$row['TAS_ID']])) {
$record = Task::query()->select(['TAS_TITLE'])->where('TAS_ID', '=', $row['TAS_ID'])->get()->toArray();
if (!empty($record[0]['TAS_TITLE'])) {
$tasks[$row['TAS_ID']] = $record[0]['TAS_TITLE'];
}
}
$row['TAS_TITLE'] = $tasks[$row['TAS_ID']] ?? '';
}
switch ($filterBy) {
case 'CASES':
if ($row['DEL_INDEX'] != 0) {

14
workflow/engine/templates/mails/emailList.js
View File

@@ -31,22 +31,22 @@ Ext.onReady(function(){
);
var columnRenderer = function(data, metadata, record, rowIndex,columnIndex, store) {
if(metadata.id == PMExt.emailConst.taskColumn.name){
if((PMExt.emailConst.appMsgTypeWithoutTask.includes(record.data.APP_MSG_TYPE)) || (PMExt.emailConst.appMsgTypeWithConditionalTask.includes(record.data.APP_MSG_TYPE) && record.data.DEL_INDEX == 0)){
if (record.data.TAS_ID == '0') {
data = PMExt.emailConst.taskColumn.defaultValue;
}
}
if(metadata.id == PMExt.emailConst.caseColumn.name){
if(PMExt.emailConst.appMsgTypeWithoutCase.includes(record.data.APP_MSG_TYPE)){
if (record.data.APP_NUMBER == '0') {
data = PMExt.emailConst.caseColumn.defaultValue;
}
}
if(metadata.id == PMExt.emailConst.processColumn.name){
if(PMExt.emailConst.appMsgTypeWithoutProcess.includes(record.data.APP_MSG_TYPE)){
if(metadata.id == PMExt.emailConst.processColumn.name) {
if (record.data.PRO_ID == '0') {
data = PMExt.emailConst.processColumn.defaultValue;
}
}
if(metadata.id == PMExt.emailConst.numberColumn.name){
if(PMExt.emailConst.appMsgTypeWithoutNumber.includes(record.data.APP_MSG_TYPE)){
if (record.data.APP_NUMBER == '0') {
data = PMExt.emailConst.numberColumn.defaultValue;
}
}
@@ -288,8 +288,8 @@ Ext.onReady(function(){
{name : 'APP_MSG_UID'},
{name : 'APP_UID'},
{name : 'DEL_INDEX'},
{name : 'PRO_UID'},
{name : 'TAS_UID'},
{name : 'PRO_ID'},
{name : 'TAS_ID'},
{name : 'APP_NUMBER'},
{name : 'PRO_TITLE'},
{name : 'TAS_TITLE'},