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

Merged in bugfix/PMCORE-3110 (pull request #7980)

Browse Source 
PMCORE-3110

Approved-by: Julio Cesar Laura Avendaño
This commit is contained in:
Paula Quispe
2021-07-14 14:23:53 +00:00
committed by Julio Cesar Laura Avendaño
parent b4f519d0f2 97f67cda1e
commit 6cb105fce7
5 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1275,6 +1275,34 @@ class AbstractCases implements CasesInterface
if (!empty($properties['caseTitle'])) {
$this->setCaseTitle($properties['caseTitle']);
}
/** Apply filters related to INBOX */
// Filter date related to delegate from
if (get_class($this) === Inbox::class && !empty($properties['delegateFrom'])) {
$this->setDelegateFrom($properties['delegateFrom']);
}
// Filter date related to delegate to
if (get_class($this) === Inbox::class && !empty($properties['delegateTo'])) {
$this->setDelegateTo($properties['delegateTo']);
}
/** Apply filters related to PAUSED */
// Filter date related to delegate from
if (get_class($this) === Paused::class && !empty($properties['delegateFrom'])) {
$this->setDelegateFrom($properties['delegateFrom']);
}
// Filter date related to delegate to
if (get_class($this) === Paused::class && !empty($properties['delegateTo'])) {
$this->setDelegateTo($properties['delegateTo']);
}
/** Apply filters related to UNASSIGNED */
// Filter date related to delegate from
if (get_class($this) === Unassigned::class && !empty($properties['delegateFrom'])) {
$this->setDelegateFrom($properties['delegateFrom']);
}
// Filter date related to delegate to
if (get_class($this) === Unassigned::class && !empty($properties['delegateTo'])) {
$this->setDelegateTo($properties['delegateTo']);
}
/** Apply filters related to MY CASES */
// My cases filter: started, in-progress, completed, supervising
if (get_class($this) === Participated::class && !empty($properties['filter'])) {

9
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php
View File

@@ -79,6 +79,15 @@ class Inbox extends AbstractCases
$query->appUid($this->getCaseUid());
}
// Specific delegate date from
if (!empty($this->getDelegateFrom())) {
$query->delegateDateFrom($this->getDelegateFrom());
}
// Specific delegate date to
if (!empty($this->getDelegateTo())) {
$query->delegateDateTo($this->getDelegateTo());
}
return $query;
}

9
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php
View File

@@ -78,6 +78,15 @@ class Paused extends AbstractCases
$query->appUid($this->getCaseUid());
}
// Specific delegate date from
if (!empty($this->getDelegateFrom())) {
$query->delegateDateFrom($this->getDelegateFrom());
}
// Specific delegate date to
if (!empty($this->getDelegateTo())) {
$query->delegateDateTo($this->getDelegateTo());
}
return $query;
}

9
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php
View File

@@ -79,6 +79,15 @@ class Unassigned extends AbstractCases
$query->appUid($this->getCaseUid());
}
// Specific delegate date from
if (!empty($this->getDelegateFrom())) {
$query->delegateDateFrom($this->getDelegateFrom());
}
// Specific delegate date to
if (!empty($this->getDelegateTo())) {
$query->delegateDateTo($this->getDelegateTo());
}
return $query;
}

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

@@ -109,6 +109,8 @@ class Home extends Api
* @param int $process
* @param int $task
* @param string $caseTitle
* @param string $delegateFrom
* @param string $delegateTo
* @param string $filterCases
* @param string $paged
* @param string $sort
@@ -125,6 +127,8 @@ class Home extends Api
int $process = 0,
int $task = 0,
string $caseTitle = '',
string $delegateFrom = '',
string $delegateTo = '',
string $filterCases = '',
string $paged = '0,15',
string $sort = 'APP_NUMBER,DESC'
@@ -135,6 +139,8 @@ class Home extends Api
$properties = [];
$properties['caseNumber'] = $caseNumber;
$properties['caseTitle'] = $caseTitle;
$properties['delegateFrom'] = $delegateFrom;
$properties['delegateTo'] = $delegateTo;
$properties['filterCases'] = $filterCases;
$properties['process'] = $process;
$properties['task'] = $task;
@@ -167,6 +173,8 @@ class Home extends Api
* @param int $process
* @param int $task
* @param string $caseTitle
* @param string $delegateFrom
* @param string $delegateTo
* @param string $filterCases
* @param string $paged
* @param string $sort
@@ -183,6 +191,8 @@ class Home extends Api
int $process = 0,
int $task = 0,
string $caseTitle = '',
string $delegateFrom = '',
string $delegateTo = '',
string $filterCases = '',
string $paged = '0,15',
string $sort = 'APP_NUMBER,DESC'
@@ -193,6 +203,8 @@ class Home extends Api
$properties = [];
$properties['caseNumber'] = $caseNumber;
$properties['caseTitle'] = $caseTitle;
$properties['delegateFrom'] = $delegateFrom;
$properties['delegateTo'] = $delegateTo;
$properties['filterCases'] = $filterCases;
$properties['process'] = $process;
$properties['task'] = $task;
@@ -227,6 +239,8 @@ class Home extends Api
* @param int $process
* @param int $task
* @param string $caseTitle
* @param string $delegateFrom
* @param string $delegateTo
* @param string $filterCases
* @param string $paged
* @param string $sort
@@ -243,6 +257,8 @@ class Home extends Api
int $process = 0,
int $task = 0,
string $caseTitle = '',
string $delegateFrom = '',
string $delegateTo = '',
string $filterCases = '',
string $paged = '0,15',
string $sort = 'APP_NUMBER,DESC'
@@ -253,6 +269,8 @@ class Home extends Api
$properties = [];
$properties['caseNumber'] = $caseNumber;
$properties['caseTitle'] = $caseTitle;
$properties['delegateFrom'] = $delegateFrom;
$properties['delegateTo'] = $delegateTo;
$properties['filterCases'] = $filterCases;
$properties['process'] = $process;
$properties['task'] = $task;