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

PMC-8

Browse Source
This commit is contained in:
Andrea Adamczyk
2019-03-11 12:32:10 -04:00
parent b0de0221ef
commit f8fe785b17
6 changed files with 168 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
workflow/engine/controllers/appProxy.php
View File

@@ -1,4 +1,6 @@
<?php
use ProcessMaker\Util\DateTime;
if (!isset($_SESSION['USER_LOGGED'])) {
$response = new stdclass();
$response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
@@ -23,15 +25,22 @@ class AppProxy extends HttpProxyController
* @param int $httpData->start
* @param int $httpData->limit
* @param string $httpData->appUid (optionalif it is not passed try use $_SESSION['APPLICATION'])
* @return array containg the case notes
* @return array containing the case notes
*
* @see workflow/engine/methods/cases/open.php
* @see workflow/engine/methods/cases/casesListExtJs.php
* @see workflow/engine/methods/cases/casesConsolidatedListExtJs.php
*
* @link https://wiki.processmaker.com/3.2/Case_Notes
* @link https://wiki.processmaker.com/3.2/Cases/Case_Notes
*/
function getNotesList ($httpData)
function getNotesList($httpData)
{
if (!isset($_SESSION['USER_LOGGED'])) {
$response = new stdclass();
$response->message = G::LoadTranslation('ID_LOGIN_AGAIN');
$response->lostSession = true;
print G::json_encode( $response );
print G::json_encode($response);
die();
}
@@ -66,8 +75,7 @@ class AppProxy extends HttpProxyController
$httpData->pro = $caseLoad['PRO_UID'];
}
if(!isset($httpData->pro) || empty($httpData->pro) )
{
if (!isset($httpData->pro) || empty($httpData->pro)) {
$proUid = $_SESSION['PROCESS'];
} else {
$proUid = $httpData->pro;
@@ -80,12 +88,15 @@ class AppProxy extends HttpProxyController
}
$usrUid = $_SESSION['USER_LOGGED'];
$respView = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, "VIEW", $delIndex);
$respView = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, "VIEW", $delIndex);
$respBlock = $case->getAllObjectsFrom($proUid, $appUid, $tasUid, $usrUid, "BLOCK", $delIndex);
if ($respView['CASES_NOTES'] == 0 && $respBlock['CASES_NOTES'] == 0) {
return array ('totalCount' => 0,'notes' => array (),'noPerms' => 1
);
return [
'totalCount' => 0,
'notes' => [],
'noPerms' => 1
];
}
$usrUid = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : "";
@@ -93,6 +104,12 @@ class AppProxy extends HttpProxyController
$response = $appNotes->getNotesList($appUid, '', $httpData->start, $httpData->limit);
$response = AppNotes::applyHtmlentitiesInNotes($response);
$iterator = 0;
foreach ($response['array']['notes'] as $value) {
$response ['array']['notes'][$iterator]['NOTE_DATE'] = DateTime::convertUtcToTimeZone($value['NOTE_DATE']);
$iterator++;
}
require_once("classes/model/Application.php");
$oApplication = new Application();
$aApplication = $oApplication->Load($appUid);

67
workflow/engine/controllers/home.php
View File

@@ -1,6 +1,7 @@
<?php
use ProcessMaker\Core\System;
use ProcessMaker\Util\DateTime;
/**
* Home controller
@@ -359,6 +360,29 @@ class Home extends Controller
$this->render();
}
/**
* Get the cases information
*
* @param string $type
* @param integer $start
* @param integer $limit
* @param string $user
* @param string $filter
* @param string $search
* @param string $process
* @param string $status
* @param string $dateFrom
* @param string $dateTo
* @param string $callback
* @param string $dir
* @param string $sort
* @param string $category
* @return array
*
* @see \Home->appAdvancedSearch()
* @see \Home->appList()
* @see \Home->getApps()
*/
public function getAppsData(
$type,
$start = null,
@@ -404,10 +428,10 @@ class Home extends Controller
$solrEnabled = false;
if ((
$type == "todo" || $type == "draft" || $type == "paused" || $type == "sent" ||
$type == "selfservice" || $type == "unassigned" || $type == "search"
) &&
(($solrConf = System::solrEnv()) !== false)
$type == "todo" || $type == "draft" || $type == "paused" || $type == "sent" ||
$type == "selfservice" || $type == "unassigned" || $type == "search"
) &&
(($solrConf = System::solrEnv()) !== false)
) {
$ApplicationSolrIndex = new AppSolr(
$solrConf["solr_enabled"],
@@ -443,21 +467,21 @@ class Home extends Controller
$category
);
} else {
$dataList['userId'] = $user;
$dataList['userUid'] = $this->userUid;
$dataList['start'] = $start;
$dataList['limit'] = $limit;
$dataList['filter'] = $filter;
$dataList['search'] = $search;
$dataList['process'] = $process;
$dataList['status'] = $status;
$dataList['userId'] = $user;
$dataList['userUid'] = $this->userUid;
$dataList['start'] = $start;
$dataList['limit'] = $limit;
$dataList['filter'] = $filter;
$dataList['search'] = $search;
$dataList['process'] = $process;
$dataList['status'] = $status;
$dataList['dateFrom'] = $dateFrom;
$dataList['dateTo'] = $dateTo;
$dataList['dateTo'] = $dateTo;
$dataList['callback'] = $callback;
$dataList['dir'] = $dir;
$dataList['sort'] = $sort;
$dataList['dir'] = $dir;
$dataList['sort'] = $sort;
$dataList['category'] = $category;
$dataList['action'] = $type;
$dataList['action'] = $type;
$dataList['dir'] = 'DESC';
/*----------------------------------********---------------------------------*/
if (true) {
@@ -527,8 +551,9 @@ class Home extends Controller
$generalConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '');
$cases['data'][$i]['DEL_DELEGATE_DATE'] = '';
if (!empty(config("system.workspace"))) {
if (isset( $generalConfCasesList['casesListDateFormat'] ) && ! empty( $generalConfCasesList['casesListDateFormat'] )) {
$cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE'], 'casesListDateFormat');
if (isset($generalConfCasesList['casesListDateFormat']) && !empty($generalConfCasesList['casesListDateFormat'])) {
$cases['data'][$i]['DEL_DELEGATE_DATE'] = $conf->getSystemDate($row['DEL_DELEGATE_DATE'],
'casesListDateFormat');
}
}
if ($cases['data'][$i]['DEL_DELEGATE_DATE'] == '') {
@@ -542,6 +567,12 @@ class Home extends Controller
$notes = $appNotes->getNotesList($row['APP_UID'], '', $notesStart, $notesLimit);
$notes = AppNotes::applyHtmlentitiesInNotes($notes);
$iterator = 0;
foreach ($notes['array']['notes'] as $val) {
$notes ['array']['notes'][$iterator]['NOTE_DATE'] = DateTime::convertUtcToTimeZone($val['NOTE_DATE']);
$iterator++;
}
$notes = $notes['array'];
$cases['data'][$i]['NOTES_COUNT'] = $notes['totalCount'];