diff --git a/resources/assets/js/api/Menu.js b/resources/assets/js/api/Menu.js index 6b5d5ab6c..1ffcd2b0a 100644 --- a/resources/assets/js/api/Menu.js +++ b/resources/assets/js/api/Menu.js @@ -25,5 +25,22 @@ export let menu = { "Accept-Language": window.config.SYS_LANG } }); + }, + /** + * Get the counter of a specific task + * @param {string} task + * @returns + */ + getTooltip(task) { + return axios.get( + window.config.SYS_SERVER_API + + '/api/1.0/' + + window.config.SYS_WORKSPACE + + '/home/'+ task +'/counter', { + headers: { + 'Authorization': 'Bearer ' + window.config.SYS_CREDENTIALS.accessToken, + "Accept-Language": window.config.SYS_LANG + } + }); } }; diff --git a/resources/assets/js/components/headers/MultiviewHeader.vue b/resources/assets/js/components/headers/MultiviewHeader.vue index d7402e3aa..b858cea47 100644 --- a/resources/assets/js/components/headers/MultiviewHeader.vue +++ b/resources/assets/js/components/headers/MultiviewHeader.vue @@ -2,21 +2,33 @@
-
- -
+ + + + +
@@ -24,7 +36,10 @@ diff --git a/resources/assets/js/home/CaseDetail.vue b/resources/assets/js/home/CaseDetail.vue index 4bb75d8ae..60f033310 100644 --- a/resources/assets/js/home/CaseDetail.vue +++ b/resources/assets/js/home/CaseDetail.vue @@ -35,8 +35,8 @@
{{ props.row.CASE_TITLE }}
-
- {{ props.row.ASSIGNEE }} +
+
{{ props.row.STATUS }} @@ -114,6 +114,7 @@ import ModalCancelCase from "../home/modal/ModalCancelCase.vue"; import ModalNewRequest from "./ModalNewRequest.vue"; import ModalClaimCase from "./modal/ModalClaimCase.vue"; import TaskCell from "../components/vuetable/TaskCell.vue"; +import CurrentUserCell from "../components/vuetable/CurrentUserCell.vue" import utils from "./../utils/utils"; import Api from "../api/index"; @@ -131,7 +132,8 @@ export default { ButtonFleft, ModalNewRequest, ModalClaimCase, - TaskCell + TaskCell, + CurrentUserCell }, props: {}, data() { @@ -153,7 +155,7 @@ export default { columns: [ "task", "case_title", - "assignee", + "current_user", "status", "due_date", "actions" @@ -164,7 +166,7 @@ export default { headings: { task: this.$i18n.t("ID_TASK"), case_title: this.$i18n.t("ID_CASE_TITLE"), - assignee: this.$i18n.t("ID_CURRENT_USER"), + current_user: this.$i18n.t("ID_CURRENT_USER"), status: this.$i18n.t("ID_STATUS"), due_date: this.$i18n.t("ID_DUE_DATE"), actions: this.$i18n.t("ID_ACTIONS") @@ -500,15 +502,7 @@ export default { }, ], CASE_TITLE: v.DEL_TITLE, - ASSIGNEE: - v.USR_ID !== 0 - ? utils.userNameDisplayFormat({ - userName: v.USR_USERNAME, - firstName: v.USR_LASTNAME, - lastName: v.USR_LASTNAME, - format: window.config.FORMATS.format || null - }) - : this.$i18n.t("ID_UNASSIGNED"), + USER_DATA: this.formatUser(v.user_tooltip), STATUS: v.DEL_THREAD_STATUS, DUE_DATE: v.DEL_TASK_DUE_DATE, TASK_COLOR: v.TAS_COLOR_LABEL, @@ -520,6 +514,31 @@ export default { }); return data; }, + /** + * Format user information to show + */ + formatUser(data) { + var dataFormat = [], + userDataFormat; + userDataFormat = data.usr_id ? + utils.userNameDisplayFormat({ + userName: data.usr_firstname, + firstName: data.usr_lastname, + lastName: data.usr_username, + format: window.config.FORMATS.format || null + }) + : this.$i18n.t("ID_UNASSIGNED"); + dataFormat.push({ + USERNAME_DISPLAY_FORMAT: userDataFormat !== "" ? userDataFormat : this.$i18n.t("ID_UNASSIGNED"), + EMAIL: data.usr_email, + POSITION: data.usr_position, + AVATAR: userDataFormat !== this.$i18n.t("ID_UNASSIGNED") ? window.config.SYS_SERVER_AJAX + + window.config.SYS_URI + + `users/users_ViewPhotoGrid?pUID=${data.usr_id}` : "", + UNASSIGNED: userDataFormat !== this.$i18n.t("ID_UNASSIGNED") ? true : false + }); + return dataFormat; + }, /** * Show the alert message * @param {string} message - message to be displayen in the body diff --git a/resources/assets/js/home/Draft/Draft.vue b/resources/assets/js/home/Draft/Draft.vue index e9d167a85..045b077b3 100644 --- a/resources/assets/js/home/Draft/Draft.vue +++ b/resources/assets/js/home/Draft/Draft.vue @@ -5,10 +5,14 @@ - + - + @@ -101,7 +103,11 @@ export default { filter: "CASES_INBOX", allView: [], filterHeader: "STARTED", + filterHeaderObject: { + icon:"fas fa-inbox" + }, headers: [], + random: _.random(0,1000000000), newCase: { title: this.$i18n.t("ID_NEW_CASE"), class: "btn-success", @@ -533,6 +539,8 @@ export default { that.filterHeader = obj.item; that.$refs["vueTable"].setPage(1); // Reset the page when change the header filter that.$refs["vueTable"].getData(); + that.filterHeaderObject = obj; + that.random = _.random(0,1000000000); }, class: info[v.id].class }); diff --git a/resources/assets/js/home/Paused/Paused.vue b/resources/assets/js/home/Paused/Paused.vue index 7a8935e41..2a9dfd5cf 100644 --- a/resources/assets/js/home/Paused/Paused.vue +++ b/resources/assets/js/home/Paused/Paused.vue @@ -6,10 +6,14 @@ - + - +