From e97ae0f9176232e968c816af7c64e79ba3b6b777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luciana=20Nu=C3=B1ez?= <luciana.nunez@processmaker.com>
Date: Tue, 6 Dec 2022 12:37:01 -0400
Subject: [PATCH] PMCORE-4004: Solving last comments

---
 resources/assets/js/api/Cases.js                |  2 +-
 resources/assets/js/home/CaseDetail.vue         |  4 +---
 .../src/ProcessMaker/BusinessModel/Cases.php    | 17 ++++++-----------
 .../src/ProcessMaker/Services/Api/Cases.php     |  4 +---
 4 files changed, 9 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 resources/assets/js/api/Cases.js
 mode change 100644 => 100755 workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
 mode change 100644 => 100755 workflow/engine/src/ProcessMaker/Services/Api/Cases.php

diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js
old mode 100644
new mode 100755
index f522e9ca1..13d737ffb
--- a/resources/assets/js/api/Cases.js
+++ b/resources/assets/js/api/Cases.js
@@ -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 
      * @returns
      */
diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue
index dde49e1f5..2a56d5022 100755
--- a/resources/assets/js/home/CaseDetail.vue
+++ b/resources/assets/js/home/CaseDetail.vue
@@ -727,9 +727,7 @@ export default {
      * @param {string} data
      */
      changeFlagSupervising(data) {
-      if (data === 'SUPERVISING'){
-        this.flagSupervising = true;
-      }
+        this.flagSupervising = (data === 'SUPERVISING');
     },  
     /**
      * Claim case
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
old mode 100644
new mode 100755
index 9430d8fb1..9cf14b4f8
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -2787,21 +2787,17 @@ class Cases
 
         if ($type === 'SELF_SERVICE' && $variable !== '') {
             $variable = substr($variable, 2);
-            $case = new ClassesCases();
-            $app = new ModelApplication();
-            $fields = $app::where('APP_UID', '=', $appUid)->first();
-            $data = $case::unserializeData($fields->APP_DATA);
+            $fields = ModelApplication::where('APP_UID', '=', $appUid)->first();
+            $data = ClassesCases::unserializeData($fields->APP_DATA);
 
             $row = [];
-            $groups = new GroupUser();
-            $groupwf = new Groupwf();
             
             if (!empty($data[$variable])) {
                 foreach ($data[$variable] as $uid) {
-                    $group = $groupwf::where('GRP_UID', '=', $uid)->first();
+                    $group = Groupwf::where('GRP_UID', '=', $uid)->first();
                     if (!empty($group)) {
-                        $users = $groups::where('GRP_UID', '=', $uid)->get()->toArray();
-                        foreach ($users as $data) {
+                        $usersOfGroup = GroupUser::where('GRP_UID', '=', $uid)->get()->toArray();
+                        foreach ($usersOfGroup as $data) {
                             $row[] = $data['USR_UID'];
                         }
                     } else {
@@ -2810,10 +2806,9 @@ class Cases
                 }
             }
             
-            $user = new User();
             $users = [];
             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 !== "") {
                     $users[] = $obj;
                 }
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php
old mode 100644
new mode 100755
index 60c459d79..7785394a0
--- a/workflow/engine/src/ProcessMaker/Services/Api/Cases.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Cases.php
@@ -1038,7 +1038,7 @@ class Cases extends Api
     }
     
     /**
-     * User case supervisor permissions
+     * Verify if current user is a supervisor
      *
      * @url GET /:appNumber/supervisor
      *
@@ -1093,8 +1093,6 @@ class Cases extends Api
         }
     }
 
-
-
     /**
      * Get users to reassign or assign
      *