From 2574b6da75cacd76087e40bc2360868a567f3beb Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Mon, 18 Oct 2021 14:02:48 +0000 Subject: [PATCH] PMCORE-3438: Paused > Different view to Unpaused a Case when the List or Card View is activated. --- .../assets/js/home/CustomCaseList/CustomCaseList.vue | 10 ++++++++-- .../assets/js/home/CustomCaseList/defaultMixins.js | 8 +++++++- resources/assets/js/home/Paused/defaultMixins.js | 2 +- resources/assets/js/home/Unassigned/defaultMixins.js | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue index c88a84b92..1b5cbed53 100644 --- a/resources/assets/js/home/CustomCaseList/CustomCaseList.vue +++ b/resources/assets/js/home/CustomCaseList/CustomCaseList.vue @@ -686,7 +686,13 @@ export default { } else if (self.clickCount === 2) { clearTimeout(self.singleClickTimer); self.clickCount = 0; - self.openCase(event.row); + if (this.data.pageParent === "paused") { + self.showModalUnpauseCase(event.row); + } else if(this.data.pageParent === "unassigned") { + self.claimCase(event.row); + } else { + self.openCase(event.row); + } } }, /** @@ -979,7 +985,7 @@ export default { } this.data.settings = newData.settings; this.filters = {}; - this.typeView = newData.settings.view.typeView; + this.typeView = newData.settings && newData.settings.view ? newData.settings.view.typeView : this.typeView; } if (this.typeView === "GRID" && this.$refs["vueTable"]) { if (newData && newData.settings && newData.settings.orderBy) { diff --git a/resources/assets/js/home/CustomCaseList/defaultMixins.js b/resources/assets/js/home/CustomCaseList/defaultMixins.js index 906f98d69..a28054249 100644 --- a/resources/assets/js/home/CustomCaseList/defaultMixins.js +++ b/resources/assets/js/home/CustomCaseList/defaultMixins.js @@ -59,7 +59,13 @@ export default { optionsVueView: { limit: 10, dblClick: (event, item, options) => { - this.openCase(item); + if (this.data.pageParent === "paused") { + this.showModalUnpauseCase(item); + } else if(this.data.pageParent === "unassigned") { + this.claimCase(item); + } else { + this.openCase(item); + } }, headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), diff --git a/resources/assets/js/home/Paused/defaultMixins.js b/resources/assets/js/home/Paused/defaultMixins.js index 09d157b4d..a84f77070 100644 --- a/resources/assets/js/home/Paused/defaultMixins.js +++ b/resources/assets/js/home/Paused/defaultMixins.js @@ -47,7 +47,7 @@ export default { optionsVueView: { limit: 10, dblClick: (event, item, options) => { - this.openCase(item); + this.showModalUnpauseCase(item); }, headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"), diff --git a/resources/assets/js/home/Unassigned/defaultMixins.js b/resources/assets/js/home/Unassigned/defaultMixins.js index c8ed8c93a..2fd0b2853 100644 --- a/resources/assets/js/home/Unassigned/defaultMixins.js +++ b/resources/assets/js/home/Unassigned/defaultMixins.js @@ -47,7 +47,7 @@ export default { optionsVueList: { limit: 10, dblClick: (event, item, options) => { - this.openCase(item); + this.claimCase(item); }, headings: { case_number: this.$i18n.t("ID_MYCASE_NUMBER"),