From ee4e4db1c6e31b701b501c0d574a3087cf057fc5 Mon Sep 17 00:00:00 2001
From: henry jordan <jonathan.quispe@processmaker.com>
Date: Wed, 15 Jun 2022 15:03:28 +0000
Subject: [PATCH 1/2] PMCORE-3871

update
---
 resources/assets/js/home/MyCases/MyCases.vue | 30 ++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue
index 05ddf10e2..85b034145 100644
--- a/resources/assets/js/home/MyCases/MyCases.vue
+++ b/resources/assets/js/home/MyCases/MyCases.vue
@@ -80,6 +80,7 @@
             ref="modal-comments"
             @postNotes="onPostNotes"
         ></ModalComments>
+        <ModalClaimCase ref="modal-claim-case" @claimCatch="claimCatch"></ModalClaimCase>
     </div>
 </template>
 
@@ -87,6 +88,7 @@
 import HeaderCounter from "../../components/home/HeaderCounter.vue";
 import ButtonFleft from "../../components/home/ButtonFleft.vue";
 import ModalNewRequest from "../ModalNewRequest.vue";
+import ModalClaimCase from "../modal/ModalClaimCase.vue";
 import MyCasesFilter from "../../components/search/MyCasesFilter";
 import ModalComments from "../modal/ModalComments.vue";
 import GroupedCell from "../../components/vuetable/GroupedCell.vue";
@@ -106,6 +108,7 @@ export default {
         ModalNewRequest,
         GroupedCell,
         ModalComments,
+        ModalClaimCase,
         ThreadTitleCell,
     },
     props: ["defaultOption", "settings"],
@@ -293,6 +296,13 @@ export default {
                     refresh: false,
                     });
                     this.$emit("cleanDefaultOption");
+
+                    api.cases.pendingtask({APP_NUMBER:params.openapplicationuid}).then((response) => {
+                        if (response.data && response.data[0] && response.data[0]['USR_ID'] == 0) {
+                            this.claimCase(response.data[0]);
+                        }
+                    })
+
                 }
             }
         },
@@ -758,6 +768,26 @@ export default {
                     id: this.id
                 });
             }
+        },
+        /**
+         * Claim case
+         *
+         * @param {object} item
+         */
+        claimCase(item) {
+            let that = this;
+            api.cases.open(_.extend({ ACTION: "unassigned" }, item)).then(() => {
+                api.cases.cases_open(_.extend({ ACTION: "todo" }, item)).then(() => {
+                that.$refs["modal-claim-case"].data = item;
+                that.$refs["modal-claim-case"].show();
+                });
+            });
+        },
+        /**
+         * Claim catch error handler message
+         */
+        claimCatch(message) {
+            this.showAlert(message, "danger");
         }
     },
 };

From 5b4600636b9f33552f3d562d5eb29e9904154acd Mon Sep 17 00:00:00 2001
From: henry jordan <jonathan.quispe@processmaker.com>
Date: Wed, 22 Jun 2022 16:05:04 +0000
Subject: [PATCH 2/2] direct case link - case:paused

Update observations

update
---
 resources/assets/js/home/MyCases/MyCases.vue             | 4 +---
 resources/assets/js/home/Paused/Paused.vue               | 4 ++--
 resources/assets/js/home/Unassigned/Unassigned.vue       | 5 +++++
 workflow/engine/src/ProcessMaker/BusinessModel/Cases.php | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/home/MyCases/MyCases.vue b/resources/assets/js/home/MyCases/MyCases.vue
index 85b034145..8f9f48427 100644
--- a/resources/assets/js/home/MyCases/MyCases.vue
+++ b/resources/assets/js/home/MyCases/MyCases.vue
@@ -296,13 +296,11 @@ export default {
                     refresh: false,
                     });
                     this.$emit("cleanDefaultOption");
-
                     api.cases.pendingtask({APP_NUMBER:params.openapplicationuid}).then((response) => {
                         if (response.data && response.data[0] && response.data[0]['USR_ID'] == 0) {
                             this.claimCase(response.data[0]);
                         }
-                    })
-
+                    });
                 }
             }
         },
diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue
index 3b4d22da3..95526f6c1 100644
--- a/resources/assets/js/home/Paused/Paused.vue
+++ b/resources/assets/js/home/Paused/Paused.vue
@@ -411,7 +411,7 @@ export default {
   },
   mounted() {
     let that = this;
-    // force to open case
+    // force to open case paused
     this.openDefaultCase();
     Event.$on('vue-tables.paused.sorted', function (data) {
       that.$emit("updateSettings", {
@@ -475,7 +475,7 @@ export default {
         if(this.defaultOption) {
             params = utils.getAllUrlParams(this.defaultOption);
             if (params && params.app_uid && params.del_index) {
-                this.openCase({
+                this.showModalUnpauseCase({
                     APP_UID: params.app_uid,
                     DEL_INDEX: params.del_index
                 });
diff --git a/resources/assets/js/home/Unassigned/Unassigned.vue b/resources/assets/js/home/Unassigned/Unassigned.vue
index 1cd17335f..20535a2ee 100644
--- a/resources/assets/js/home/Unassigned/Unassigned.vue
+++ b/resources/assets/js/home/Unassigned/Unassigned.vue
@@ -458,6 +458,11 @@ export default {
                     refresh: true
                 };
                 this.$emit("cleanDefaultOption");
+                api.cases.pendingtask({APP_NUMBER:params.openapplicationuid}).then((response) => {
+                    if (response.data && response.data.length == 1 && response.data[0] && response.data[0]['USR_ID'] == 0) {
+                        this.claimCase(response.data[0]);
+                    }
+                });
                 this.onUpdateFilters(filter);
             }
         }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index 91f771ef7..c3081217f 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -2551,7 +2551,7 @@ class Cases
             // Filter specific case
             $query->case($caseNumber);
             // Filter specific index
-            if (is_int($index)) {
+            if ($index > 0) {
                 $query->index($index);
             }
             $results = $query->get();