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

Merged in feature/PMCORE-2314-PQ (pull request #7658)

Browse Source 
PMCORE-2314: Observations

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Paula Quispe
2020-12-19 00:44:55 +00:00
committed by Julio Cesar Laura Avendaño
parent d8067c9812 80b7864781
commit b1ca8edd47
4 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
workflow/engine/methods/cases/cases_Ajax.php
View File

@@ -542,17 +542,17 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
G::RenderPage('publish', 'raw'); G::RenderPage('publish', 'raw');
break; break;
case 'getCasesInputDocuments': case 'getCasesInputDocuments':
$arrayToTranslation = array( $arrayToTranslation = [
"INPUT" => G::LoadTranslation("ID_INPUT_DB"), "INPUT" => G::LoadTranslation("ID_INPUT_DB"),
"OUTPUT" => G::LoadTranslation("ID_OUTPUT_DB"), "OUTPUT" => G::LoadTranslation("ID_OUTPUT_DB"),
"ATTACHED" => G::LoadTranslation("ID_ATTACHED_DB") "ATTACHED" => G::LoadTranslation("ID_ATTACHED_DB")
); ];
$oCase = new Cases(); $case = new Cases();
$fields = $oCase->loadCase($_POST['appUid']); $fields = $case->loadCase($_POST['appUid']);
$sProcessUID = $fields['PRO_UID']; $proUid = $fields['PRO_UID'];
$aProcesses = []; $processes = [];
$criteria = $oCase->getAllUploadedDocumentsCriteria( $criteria = $case->getAllUploadedDocumentsCriteria(
$sProcessUID, $proUid,
$_POST['appUid'], $_POST['appUid'],
'', '',
$_SESSION['USER_LOGGED'], $_SESSION['USER_LOGGED'],
@@ -574,20 +574,20 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$result = $rs->getRow(); $result = $rs->getRow();
$result["TYPE"] = (array_key_exists($result["TYPE"], $arrayToTranslation)) ? $arrayToTranslation[$result["TYPE"]] : $result["TYPE"]; $result["TYPE"] = (array_key_exists($result["TYPE"], $arrayToTranslation)) ? $arrayToTranslation[$result["TYPE"]] : $result["TYPE"];
$result['CREATE_DATE'] = DateTime::convertUtcToTimeZone($result['CREATE_DATE']); $result['CREATE_DATE'] = DateTime::convertUtcToTimeZone($result['CREATE_DATE']);
$aProcesses[] = $result; $processes[] = $result;
} }
$r = new stdclass(); $r = new stdclass();
$r->data = $aProcesses; $r->data = $processes;
$r->totalCount = $totalCount; $r->totalCount = $totalCount;
echo Bootstrap::json_encode($r); echo Bootstrap::json_encode($r);
break; break;
case 'getCasesOutputDocuments': case 'getCasesOutputDocuments':
$oCase = new Cases(); $case = new Cases();
$fields = $oCase->loadCase($_POST['appUid']); $fields = $case->loadCase($_POST['appUid']);
$sProcessUID = $fields['PRO_UID']; $proUid = $fields['PRO_UID'];
$aProcesses = array(); $processes = [];
$c = $oCase->getAllGeneratedDocumentsCriteria( $c = $case->getAllGeneratedDocumentsCriteria(
$sProcessUID, $proUid,
$_POST['appUid'], $_POST['appUid'],
'', '',
$_SESSION['USER_LOGGED'], $_SESSION['USER_LOGGED'],
@@ -606,7 +606,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$result["FILEPDFEXIST"] = ($result["FILEPDF"]); $result["FILEPDFEXIST"] = ($result["FILEPDF"]);
$result["DELETE_FILE"] = (isset($result['ID_DELETE']) && $result['ID_DELETE'] == 'Delete') ? true : false; $result["DELETE_FILE"] = (isset($result['ID_DELETE']) && $result['ID_DELETE'] == 'Delete') ? true : false;
$result['CREATE_DATE'] = DateTime::convertUtcToTimeZone($result['CREATE_DATE']); $result['CREATE_DATE'] = DateTime::convertUtcToTimeZone($result['CREATE_DATE']);
$aProcesses[] = $result; $processes[] = $result;
$rs->next(); $rs->next();
$totalCount++; $totalCount++;
} }
@@ -615,7 +615,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
try { try {
$globaleneralConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', ''); $globaleneralConfCasesList = $conf->getConfiguration('ENVIRONMENT_SETTINGS', '');
} catch (Exception $e) { } catch (Exception $e) {
$generalConfCasesList = array(); $generalConfCasesList = [];
} }
$dateFormat = ""; $dateFormat = "";
$varFlag = isset($generalConfCasesList['casesListDateFormat']); $varFlag = isset($generalConfCasesList['casesListDateFormat']);
@@ -623,7 +623,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
$dateFormat = $generalConfCasesList['casesListDateFormat']; $dateFormat = $generalConfCasesList['casesListDateFormat'];
} }
$r = new stdclass(); $r = new stdclass();
$r->data = $aProcesses; $r->data = $processes;
$r->totalCount = $totalCount; $r->totalCount = $totalCount;
$r->dataFormat = $dateFormat; $r->dataFormat = $dateFormat;
echo Bootstrap::json_encode($r); echo Bootstrap::json_encode($r);

1
workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php
View File

@@ -946,7 +946,6 @@ class AbstractCases implements CasesInterface
return $this->dueTo; return $this->dueTo;
} }
/** /**
* Set order by column * Set order by column
* *

2
workflow/engine/src/ProcessMaker/Model/Delegation.php
View File

@@ -453,7 +453,6 @@ class Delegation extends Model
public function scopeCasesTo($query, int $to) public function scopeCasesTo($query, int $to)
{ {
return $query->where('APP_DELEGATION.APP_NUMBER', '<=', $to); return $query->where('APP_DELEGATION.APP_NUMBER', '<=', $to);
} }
/** /**
@@ -969,7 +968,6 @@ class Delegation extends Model
* @param \Illuminate\Database\Eloquent\Builder $query * @param \Illuminate\Database\Eloquent\Builder $query
* @param int $userId * @param int $userId
* @param int $taskId * @param int $taskId
* @param int $caseNumber
* *
* @return \Illuminate\Database\Eloquent\Builder * @return \Illuminate\Database\Eloquent\Builder
*/ */

11
workflow/engine/src/ProcessMaker/Services/Api/Home.php
View File

@@ -561,8 +561,6 @@ class Home extends Api
* *
* @return array * @return array
* *
* @throws Exception
*
* @access protected * @access protected
* @class AccessControl {@permission PM_CASES} * @class AccessControl {@permission PM_CASES}
*/ */
@@ -637,25 +635,24 @@ class Home extends Api
public function getTasksCounters() public function getTasksCounters()
{ {
$result = []; $result = [];
$usrUid = $this->getUserId(); $usrUid = $this->getUserId();
$usrId = User::find($usrUid)->first()->USR_ID; $usrId = User::find($usrUid)->first()->USR_ID;
// For inbox
$inbox = new Inbox(); $inbox = new Inbox();
$inbox->setUserUid($usrUid); $inbox->setUserUid($usrUid);
$inbox->setUserId($usrId); $inbox->setUserId($usrId);
$result['todo'] = $inbox->getCounter(); $result['todo'] = $inbox->getCounter();
// For draft
$draft = new Draft(); $draft = new Draft();
$draft->setUserUid($usrUid); $draft->setUserUid($usrUid);
$draft->setUserId($usrId); $draft->setUserId($usrId);
$result['draft'] = $draft->getCounter(); $result['draft'] = $draft->getCounter();
// For Paused
$paused = new Paused(); $paused = new Paused();
$paused->setUserUid($usrUid); $paused->setUserUid($usrUid);
$paused->setUserId($usrId); $paused->setUserId($usrId);
$result['paused'] = $paused->getCounter(); $result['paused'] = $paused->getCounter();
// For Unassigned
$unassigned = new Unassigned(); $unassigned = new Unassigned();
$unassigned->setUserUid($usrUid); $unassigned->setUserUid($usrUid);
$unassigned->setUserId($usrId); $unassigned->setUserId($usrId);