diff --git a/resources/assets/js/admin/settings/customCaseList/Tables.vue b/resources/assets/js/admin/settings/customCaseList/Tables.vue index 3c86a5342..acd9e8fac 100755 --- a/resources/assets/js/admin/settings/customCaseList/Tables.vue +++ b/resources/assets/js/admin/settings/customCaseList/Tables.vue @@ -12,9 +12,9 @@ ref="table" >
-
- -
+
+ +
@@ -279,42 +279,51 @@ export default { updateDataEllipsis(data) { let that = this; this.showEllipsis = !this.showEllipsis; - if (this.showEllipsis) { - this.dataEllipsis = { - buttons: { - note: { - name: "edit", - icon: "far fa-edit", - fn: function() { - that.editCustomCaseList(data); - } - }, - open: { - name: "delete", - icon: "far fa-trash-alt", - color: "red", - fn: function() { - that.showModalDelete(data); - } - }, - reassign: { - name: "download", - icon: "fas fa-arrow-circle-down", - fn: function() { - that.downloadCaseList(data); - } - }, - preview: { - name: "preview", - icon: "fas fa-tv", - color: "green", - fn: function() { - that.showPreview(data); - } + this.dataEllipsis = { + buttons: { + note: { + name: "edit", + icon: "far fa-edit", + fn: function() { + that.editCustomCaseList(data); + } + }, + open: { + name: "delete", + icon: "far fa-trash-alt", + color: "red", + fn: function() { + that.showModalDelete(data); + } + }, + reassign: { + name: "download", + icon: "fas fa-arrow-circle-down", + fn: function() { + that.downloadCaseList(data); + } + }, + preview: { + name: "preview", + icon: "fas fa-tv", + color: "green", + fn: function() { + that.showPreview(data); } } } } + if (this.showEllipsis) { + for (let ellipsis in this.$refs) { + if (!ellipsis.indexOf('ellipsis')) { + if (ellipsis !== 'ellipsis' + data.APP_UID) { + this.$refs[ellipsis].hideActionButtons(); + } + } + } + this.showEllipsis = false; + } + }, importCustomCaseList() { this.$refs["modal-import"].show(); @@ -323,6 +332,9 @@ export default { }; diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 73722595b..779d9c0e0 100755 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -118,8 +118,8 @@ slot="actions" slot-scope="props" > -
- +
+
@@ -888,36 +888,44 @@ export default { * Show options in the ellipsis * @param {object} data */ - updateDataEllipsis(data) { + updateDataEllipsis(data, view = false) { let that = this; this.showEllipsis = !this.showEllipsis; - if (this.showEllipsis) { - this.dataEllipsis = { - buttons: { - note: { - name: "case note", - icon: "far fa-comments", - fn: function() { - that.openComments(data); - } - }, - play: { - name: "play case", - icon: "far fa-play-circle", - fn: function() { - that.showModalUnpauseCase(data); - } - }, - reassign: { - name: "reassign case", - icon: "fas fa-undo", - fn: function() { - that.showModalReassign(data); - } + this.dataEllipsis = { + buttons: { + note: { + name: "case note", + icon: "far fa-comments", + fn: function() { + that.openComments(data); + } + }, + play: { + name: "play case", + icon: "far fa-play-circle", + fn: function() { + that.showModalUnpauseCase(data); + } + }, + reassign: { + name: "reassign case", + icon: "fas fa-undo", + fn: function() { + that.showModalReassign(data); } } } } + if (this.showEllipsis && view) { + for (let ellipsis in this.$refs) { + if (!ellipsis.indexOf('ellipsis')) { + if (ellipsis !== 'ellipsis' + data.APP_UID) { + this.$refs[ellipsis].hideActionButtons(); + } + } + } + this.showEllipsis = false; + } }, /** * Show the alert message @@ -973,6 +981,9 @@ export default { };