diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php index 68d3a9240..bd66fc067 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/AbstractCases.php @@ -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'])) { diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php index 5f19e9d85..42901fcdb 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Inbox.php @@ -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; } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php index caf1d57a4..755e3a117 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Paused.php @@ -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; } diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php index 5a7e25fce..283cb5527 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases/Unassigned.php @@ -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; } diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Home.php b/workflow/engine/src/ProcessMaker/Services/Api/Home.php index 55322be93..fabed4940 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Home.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Home.php @@ -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;