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

PMCORE-3695

Browse Source
This commit is contained in:
Paula.Quispe
2022-04-18 11:27:05 -04:00
parent 9923c0f95c
commit a0ec1a238c
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Search.php
View File

@@ -91,13 +91,13 @@ class Search extends AbstractCases
// Filter by user who started // Filter by user who started
if ($this->getUserStartedId()) { if ($this->getUserStartedId()) {
// Get the case numbers related to this filter // Get the case numbers related to this filter
$result = Delegation::casesStartedBy($this->getUserStartedId(), $this->getOffset(), $this->getLimit()); $result = Delegation::casesStartedBy($this->getUserStartedId());
$query->specificCases($result); $query->specificCases($result);
} }
// Filter by user who completed // Filter by user who completed
if ($this->getUserCompletedId()) { if ($this->getUserCompletedId()) {
// Get the case numbers related to this filter // Get the case numbers related to this filter
$result = Delegation::casesCompletedBy($this->getUserCompletedId(), $this->getOffset(), $this->getLimit()); $result = Delegation::casesCompletedBy($this->getUserCompletedId());
$query->specificCases($result); $query->specificCases($result);
} }
// Filter by task // Filter by task

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

@@ -2131,12 +2131,10 @@ class Delegation extends Model
* Get cases completed by specific user * Get cases completed by specific user
* *
* @param int $userId * @param int $userId
* @param int $offset
* @param int $limit
* *
* @return array * @return array
*/ */
public static function casesCompletedBy(int $userId, int $offset = 0, int $limit = 15) public static function casesCompletedBy(int $userId)
{ {
// Get the case numbers related to this filter // Get the case numbers related to this filter
$query = Delegation::query()->select(['APP_NUMBER']); $query = Delegation::query()->select(['APP_NUMBER']);
@@ -2144,8 +2142,6 @@ class Delegation extends Model
$query->participated($userId); $query->participated($userId);
// Filter the last thread // Filter the last thread
$query->lastThread(); $query->lastThread();
// Apply the limit
$query->offset($offset)->limit($limit);
// Get the result // Get the result
$results = $query->get(); $results = $query->get();
@@ -2156,12 +2152,10 @@ class Delegation extends Model
* Get cases started by specific user * Get cases started by specific user
* *
* @param int $userId * @param int $userId
* @param int $offset
* @param int $limit
* *
* @return array * @return array
*/ */
public static function casesStartedBy(int $userId, int $offset = 0, int $limit = 15) public static function casesStartedBy(int $userId)
{ {
// Get the case numbers related to this filter // Get the case numbers related to this filter
$query = Delegation::query()->select(['APP_NUMBER']); $query = Delegation::query()->select(['APP_NUMBER']);
@@ -2169,8 +2163,6 @@ class Delegation extends Model
$query->participated($userId); $query->participated($userId);
// Filter the first thread // Filter the first thread
$query->caseStarted(); $query->caseStarted();
// Apply the limit
$query->offset($offset)->limit($limit);
// Get the result // Get the result
$results = $query->get(); $results = $query->get();