diff --git a/resources/assets/js/components/search/AdvancedFilter.vue b/resources/assets/js/components/search/AdvancedFilter.vue index 32a453bfb..f0db3e859 100644 --- a/resources/assets/js/components/search/AdvancedFilter.vue +++ b/resources/assets/js/components/search/AdvancedFilter.vue @@ -104,6 +104,7 @@ :key="tag" :title="tag" :variant="tagVariant" + @click="onClickTag" class="mr-1" > @@ -530,6 +531,12 @@ export default { name: this.name, filters: this.filters }); + }, + /** + * On click tag handler + */ + onClickTag() { + this.$root.$emit('bv::hide::popover'); } } }; diff --git a/resources/assets/js/components/search/popovers/SearchPopover.vue b/resources/assets/js/components/search/popovers/SearchPopover.vue index f4ccab5ac..cf3c63e6d 100644 --- a/resources/assets/js/components/search/popovers/SearchPopover.vue +++ b/resources/assets/js/components/search/popovers/SearchPopover.vue @@ -8,7 +8,8 @@ ref="popover" triggers="click" placement="bottom" - class="popovercustom" + class="popovercustom" + @show="onshow" > @@ -512,7 +538,7 @@ export default { padding-right: 50px; } .v-user-cell { - display: inline-block; + display: inline-block; } .v-user-cell-ellipsis { white-space: nowrap; diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue index 5e8bd5629..91af32dcd 100644 --- a/resources/assets/js/home/CaseDetail.vue +++ b/resources/assets/js/home/CaseDetail.vue @@ -445,11 +445,11 @@ export default { let data = []; _.forEach(response, (v) => { data.push({ - TASK: { + TASK: [{ TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, - }, + }], CASE_TITLE: v.DEL_TITLE, ASSIGNEE: v.USR_FIRSTNAME + " " + v.USR_LASTNAME, STATUS: v.DEL_THREAD_STATUS, diff --git a/resources/assets/js/home/Draft.vue b/resources/assets/js/home/Draft.vue index 93de30cd4..3c9ad5725 100644 --- a/resources/assets/js/home/Draft.vue +++ b/resources/assets/js/home/Draft.vue @@ -31,10 +31,25 @@
+
+ {{ + nameFormatCases( + props.row.USR_FIRSTNAME, + props.row.USR_LASTNAME, + props.row.USR_USERNAME + ) + }} +
+
+ {{ props.row.DUE_DATE }} +
+
+ {{ props.row.DELEGATION_DATE }} +
{{ props.row.PRIORITY }}
-
@@ -69,11 +84,14 @@ export default { }, }, columns: [ - "detail", + "detail", "case_number", "case_title", "process_name", "task", + "current_user", + "due_date", + "delegation_date", "priority", "actions", ], @@ -86,9 +104,11 @@ export default { case_title: this.$i18n.t("ID_CASE_TITLE"), process_name: this.$i18n.t("ID_PROCESS_NAME"), task: this.$i18n.t("ID_TASK"), + current_user: this.$i18n.t("ID_CURRENT_USER"), + due_date: this.$i18n.t("ID_DUE_DATE"), + delegation_date: this.$i18n.t("ID_DELEGATION_DATE"), priority: this.$i18n.t("ID_PRIORITY"), actions: "", - detail: "", }, selectable: { mode: "single", @@ -162,11 +182,11 @@ export default { CASE_NUMBER: v.APP_NUMBER, CASE_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, - TASK: { + TASK: [{ TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, - }, + }], USR_FIRSTNAME: v.USR_FIRSTNAME, USR_LASTNAME: v.USR_LASTNAME, USR_USERNAME: v.USR_USERNAME, diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index c0dda6a10..778b8e5b9 100644 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -154,6 +154,7 @@ export default { this.pageName = item.item.title; } else { this.filters = []; + this.pageId = null; this.page = item.item.id || "MyCases"; } }, diff --git a/resources/assets/js/home/MyCases.vue b/resources/assets/js/home/MyCases.vue index 921766410..8ccbabff7 100644 --- a/resources/assets/js/home/MyCases.vue +++ b/resources/assets/js/home/MyCases.vue @@ -3,7 +3,7 @@ @@ -39,14 +39,12 @@ {{ props.row.DURATION }}
-
- - {{props.row.CASES_NOTES}} - unread messages +
+
- +
@@ -73,6 +71,7 @@ export default { data() { return { metrics: [], + title: this.$i18n.t('ID_MY_CASES'), filter: "CASES_INBOX", allView: [], filterHeader: "STARTED", @@ -203,7 +202,7 @@ export default { APP_UID: v.APP_UID, PRO_UID: v.PRO_UID, TAS_UID: v.TAS_UID, - CASES_NOTES: v.CASE_NOTES_COUNT + MESSAGE_COLOR: v.CASE_NOTES_COUNT > 0 ? "black":"silver" }); }); return data; @@ -403,6 +402,7 @@ export default { item: v.id, icon: info[v.id].icon, onClick: (obj) => { + that.title = obj.title; that.filterHeader = obj.item; that.$refs["vueTable"].getData(); }, @@ -411,6 +411,10 @@ export default { }); return data; }, + /** + * Open the case notes modal + * @param {object} data - needed to create the data + */ openComments(data) { let that = this; api.cases.open(_.extend({ ACTION: "todo" }, data)).then(() => { @@ -428,6 +432,12 @@ export default { }); } }, + /** + * Post notes event handler + */ + onPostNotes() { + this.$refs["vueTable"].getData(); + } }, }; diff --git a/resources/assets/js/home/Paused.vue b/resources/assets/js/home/Paused.vue index ea5bb1321..fc5362602 100644 --- a/resources/assets/js/home/Paused.vue +++ b/resources/assets/js/home/Paused.vue @@ -191,11 +191,11 @@ export default { CASE_NUMBER: v.APP_NUMBER, CASE_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, - TASK: { + TASK: [{ TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, - }, + }], USR_FIRSTNAME: v.USR_FIRSTNAME, USR_LASTNAME: v.USR_LASTNAME, USR_USERNAME: v.USR_USERNAME, diff --git a/resources/assets/js/home/Todo.vue b/resources/assets/js/home/Todo.vue index 803be80c6..ea63c6643 100644 --- a/resources/assets/js/home/Todo.vue +++ b/resources/assets/js/home/Todo.vue @@ -183,11 +183,11 @@ export default { CASE_NUMBER: v.APP_NUMBER, CASE_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, - TASK: { + TASK: [{ TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, - }, + }], USR_FIRSTNAME: v.USR_FIRSTNAME, USR_LASTNAME: v.USR_LASTNAME, USR_USERNAME: v.USR_USERNAME, diff --git a/resources/assets/js/home/Unassigned.vue b/resources/assets/js/home/Unassigned.vue index 270025cbe..cd90cfbe1 100644 --- a/resources/assets/js/home/Unassigned.vue +++ b/resources/assets/js/home/Unassigned.vue @@ -188,11 +188,11 @@ export default { CASE_NUMBER: v.APP_NUMBER, CASE_TITLE: v.DEL_TITLE, PROCESS_NAME: v.PRO_TITLE, - TASK: { + TASK: [{ TITLE: v.TAS_TITLE, CODE_COLOR: v.TAS_COLOR, COLOR: v.TAS_COLOR_LABEL, - }, + }], USR_FIRSTNAME: v.USR_FIRSTNAME, USR_LASTNAME: v.USR_LASTNAME, USR_USERNAME: v.USR_USERNAME, diff --git a/resources/assets/js/home/modal/ModalComments.vue b/resources/assets/js/home/modal/ModalComments.vue index f111f034d..d74e170d5 100644 --- a/resources/assets/js/home/modal/ModalComments.vue +++ b/resources/assets/js/home/modal/ModalComments.vue @@ -99,6 +99,8 @@ export default { that.attachDocuments = false; that.dataAttachedDocuments.items = []; that.getCasesNotes(); + this.$refs["modal-comments"].hide(); + this.$emit("postNotes"); } else { that.showAlert(response.data.message, "danger"); that.dataAttachedDocuments.items = [];