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

PMCORE-3379

Browse Source
This commit is contained in:
Andrea Adamczyk
2021-09-29 16:28:55 -04:00
parent 6ed4ae566f
commit 436e1e0b04
3 changed files with 270 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/src/ProcessMaker/BusinessModel/Cases/Participated.php
View File

@@ -122,22 +122,26 @@ class Participated extends AbstractCases
$query->joinUser();
// Join with application
$query->joinApplication();
// Scope to Participated
$query->participated($this->getUserId());
// Add filter
$filter = $this->getParticipatedStatus();
switch ($filter) {
case 'STARTED':
// Scope to Participated
$query->participated($this->getUserId());
// Scope that search for the STARTED by user: DRAFT, TO_DO, CANCELED AND COMPLETED
$query->caseStarted();
break;
case 'IN_PROGRESS':
// Scope to Participated
$query->participated($this->getUserId());
// Only cases in progress: TO_DO without DRAFT
$query->caseTodo();
// Group by AppNumber
$query->groupBy('APP_NUMBER');
break;
case 'COMPLETED':
// Scope to Participated User
$query->participatedUser($this->getUserId());
// Scope that search for the COMPLETED
$query->caseCompleted();
// Scope to set the last thread
@@ -280,22 +284,26 @@ class Participated extends AbstractCases
$query = Delegation::query()->select();
// Join with application
$query->joinApplication();
// Scope that sets the queries for Participated
$query->participated($this->getUserId());
// Get filter
$filter = $this->getParticipatedStatus();
switch ($filter) {
case 'STARTED':
// Scope that sets the queries for Participated
$query->participated($this->getUserId());
// Scope that search for the STARTED by user: DRAFT, TO_DO, CANCELED AND COMPLETED
$query->caseStarted();
break;
case 'IN_PROGRESS':
// Scope that sets the queries for Participated
$query->participated($this->getUserId());
// Only distinct APP_NUMBER
$query->distinct();
// Scope for only TO_DO cases
$query->caseTodo();
break;
case 'COMPLETED':
// Scope that sets the queries for Participated
$query->participatedUser($this->getUserId());
// Scope that search for the COMPLETED
$query->caseCompleted();
// Scope to set the last thread

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

@@ -1050,6 +1050,25 @@ class Delegation extends Model
return $query;
}
/**
* Scope a participated user in the case
*
* @param \Illuminate\Database\Eloquent\Builder $query
* @param int $user
*
* @return \Illuminate\Database\Eloquent\Builder
*/
public function scopeParticipatedUser($query, $user)
{
// Scope to set the user who participated in the case
$query->whereIn('APP_DELEGATION.APP_NUMBER', function ($query) use ($user) {
$query->select('APP_NUMBER')->from('APP_DELEGATION')
->where('USR_ID', $user)->distinct();
});
return $query;
}
/**
* Get specific cases unassigned that the user can view
*