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

PMCORE-4004: Solving last comments

Browse Source
This commit is contained in:
Luciana Nuñez
2022-12-06 12:37:01 -04:00
parent 2c1e09c084
commit e97ae0f917
4 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/api/Cases.js Normal file → Executable file
View File

@@ -240,7 +240,7 @@ export let cases = {
}); });
}, },
/** /**
* get the list of users to re-assign * Get the list of users to re-assign
* @param {*} data * @param {*} data
* @returns * @returns
*/ */

4
resources/assets/js/home/CaseDetail.vue
View File

@@ -727,9 +727,7 @@ export default {
* @param {string} data * @param {string} data
*/ */
changeFlagSupervising(data) { changeFlagSupervising(data) {
if (data === 'SUPERVISING'){ this.flagSupervising = (data === 'SUPERVISING');
this.flagSupervising = true;
}
}, },
/** /**
* Claim case * Claim case

17
workflow/engine/src/ProcessMaker/BusinessModel/Cases.php Normal file → Executable file
View File

@@ -2787,21 +2787,17 @@ class Cases
if ($type === 'SELF_SERVICE' && $variable !== '') { if ($type === 'SELF_SERVICE' && $variable !== '') {
$variable = substr($variable, 2); $variable = substr($variable, 2);
$case = new ClassesCases(); $fields = ModelApplication::where('APP_UID', '=', $appUid)->first();
$app = new ModelApplication(); $data = ClassesCases::unserializeData($fields->APP_DATA);
$fields = $app::where('APP_UID', '=', $appUid)->first();
$data = $case::unserializeData($fields->APP_DATA);
$row = []; $row = [];
$groups = new GroupUser();
$groupwf = new Groupwf();
if (!empty($data[$variable])) { if (!empty($data[$variable])) {
foreach ($data[$variable] as $uid) { foreach ($data[$variable] as $uid) {
$group = $groupwf::where('GRP_UID', '=', $uid)->first(); $group = Groupwf::where('GRP_UID', '=', $uid)->first();
if (!empty($group)) { if (!empty($group)) {
$users = $groups::where('GRP_UID', '=', $uid)->get()->toArray(); $usersOfGroup = GroupUser::where('GRP_UID', '=', $uid)->get()->toArray();
foreach ($users as $data) { foreach ($usersOfGroup as $data) {
$row[] = $data['USR_UID']; $row[] = $data['USR_UID'];
} }
} else { } else {
@@ -2810,10 +2806,9 @@ class Cases
} }
} }
$user = new User();
$users = []; $users = [];
foreach ($row as $data) { foreach ($row as $data) {
$obj = $user::where('USR_UID', '=', $data)->Active()->first(); $obj = User::where('USR_UID', '=', $data)->Active()->first();
if (!is_null($obj) && $obj->USR_USERNAME !== "") { if (!is_null($obj) && $obj->USR_USERNAME !== "") {
$users[] = $obj; $users[] = $obj;
} }

4
workflow/engine/src/ProcessMaker/Services/Api/Cases.php Normal file → Executable file
View File

@@ -1038,7 +1038,7 @@ class Cases extends Api
} }
/** /**
* User case supervisor permissions * Verify if current user is a supervisor
* *
* @url GET /:appNumber/supervisor * @url GET /:appNumber/supervisor
* *
@@ -1093,8 +1093,6 @@ class Cases extends Api
} }
} }
/** /**
* Get users to reassign or assign * Get users to reassign or assign
* *