fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-3258:UI Change label to "Case Thread Title" and location with "Process Name" Column

Browse Source
This commit is contained in:
fabio
2021-08-30 21:16:27 -04:00
parent d6aae5e289
commit e23119e0d9
8 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/assets/js/components/menu/CustomSidebarMenuItem.vue
View File

@@ -309,7 +309,9 @@ export default {
var i; var i;
for (i = 0; i < data.length; i += 1) { for (i = 0; i < data.length; i += 1) {
if (that.item.page && that.item.page === data[i].id) { if (that.item.page && that.item.page === data[i].id) {
that.$refs.tooltip.setHighlight() if (that.$refs.tooltip) {
that.$refs.tooltip.setHighlight()
}
} }
} }
}); });

10
resources/assets/js/components/utils/CustomTooltip.vue
View File

@@ -1,6 +1,6 @@
<template> <template>
<span <span
:id="`label-${data.page}`" :id="`label-${data.id}`"
@mouseover="hoverHandler" @mouseover="hoverHandler"
v-b-tooltip.hover v-b-tooltip.hover
@mouseleave="unhoverHandler" @mouseleave="unhoverHandler"
@@ -8,9 +8,9 @@
> >
{{ data.title }} {{ data.title }}
<b-tooltip <b-tooltip
:target="`label-${data.page}`" :target="`label-${data.id}`"
triggers="hoverHandler" triggers="hoverHandler"
:ref="`tooltip-${data.page}`" :ref="`tooltip-${data.id}`"
> >
{{ labelTooltip }} {{ labelTooltip }}
</b-tooltip> </b-tooltip>
@@ -50,7 +50,7 @@ export default {
* Reset the delay and hide the tooltip * Reset the delay and hide the tooltip
*/ */
unhoverHandler() { unhoverHandler() {
let key = `tooltip-${this.data.page}`; let key = `tooltip-${this.data.id}`;
this.labelTooltip = ""; this.labelTooltip = "";
this.$refs[key].$emit("close"); this.$refs[key].$emit("close");
clearTimeout(this.hovering); clearTimeout(this.hovering);
@@ -61,7 +61,7 @@ export default {
setTooltip() { setTooltip() {
let that = this; let that = this;
api.menu.getTooltip(that.data.page).then((response) => { api.menu.getTooltip(that.data.page).then((response) => {
let key = `tooltip-${that.data.page}`; let key = `tooltip-${that.data.id}`;
that.labelTooltip = response.data.label; that.labelTooltip = response.data.label;
that.$refs[key].$emit("open"); that.$refs[key].$emit("open");
that.isHighlight = false; that.isHighlight = false;

20
resources/assets/js/components/vuetable/ThreadTitleCell.vue Normal file
View File

@@ -0,0 +1,20 @@
<template>
<div class="title-cell">
<div
v-for="item in data"
:key="item.del_id"
class="d-flex mb-3"
>
<p>
{{ item.thread_title }}
</p>
</div>
</div>
</template>
<script>
export default {
name: "ThreadTitleCell",
props: ["data"]
}
</script>

18
resources/assets/js/home/AdvancedSearch/AdvancedSearch.vue
View File

@@ -43,8 +43,8 @@
<div slot="case_number" slot-scope="props"> <div slot="case_number" slot-scope="props">
{{ props.row.CASE_NUMBER }} {{ props.row.CASE_NUMBER }}
</div> </div>
<div slot="case_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.CASE_TITLE }} <ThreadTitleCell :data="props.row.THREAD_TITLE" />
</div> </div>
<div slot="case_status" slot-scope="props"> <div slot="case_status" slot-scope="props">
{{ props.row.APP_STATUS }} {{ props.row.APP_STATUS }}
@@ -89,6 +89,7 @@ import AdvancedFilter from "../../components/search/AdvancedFilter";
import TaskCell from "../../components/vuetable/TaskCell.vue"; import TaskCell from "../../components/vuetable/TaskCell.vue";
import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue"; import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue";
import ModalComments from "../modal/ModalComments.vue"; import ModalComments from "../modal/ModalComments.vue";
import ThreadTitleCell from "../../components/vuetable/ThreadTitleCell.vue"
import api from "../../api/index"; import api from "../../api/index";
import utils from "../../utils/utils"; import utils from "../../utils/utils";
import defaultMixin from "./defaultMixins.js"; import defaultMixin from "./defaultMixins.js";
@@ -102,7 +103,8 @@ export default {
ModalNewRequest, ModalNewRequest,
TaskCell, TaskCell,
CurrentUserCell, CurrentUserCell,
ModalComments ModalComments,
ThreadTitleCell,
}, },
props: ["id", "name", "filters"], props: ["id", "name", "filters"],
data() { data() {
@@ -127,9 +129,9 @@ export default {
}, },
columns: [ columns: [
"case_number", "case_number",
"case_title",
"status",
"process_name", "process_name",
"status",
"thread_title",
"task", "task",
"current_user", "current_user",
"start_date", "start_date",
@@ -142,9 +144,9 @@ export default {
filterable: false, filterable: false,
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
case_title: this.$i18n.t("ID_CASE_TITLE"),
status: this.$i18n.t("ID_STATUS"),
process_name: this.$i18n.t("ID_PROCESS_NAME"), process_name: this.$i18n.t("ID_PROCESS_NAME"),
status: this.$i18n.t("ID_STATUS"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
current_user: this.$i18n.t("ID_CURRENT_USER"), current_user: this.$i18n.t("ID_CURRENT_USER"),
start_date: this.$i18n.t("ID_START_DATE"), start_date: this.$i18n.t("ID_START_DATE"),
@@ -257,7 +259,7 @@ export default {
_.forEach(response, (v) => { _.forEach(response, (v) => {
data.push({ data.push({
CASE_NUMBER: v.APP_NUMBER, CASE_NUMBER: v.APP_NUMBER,
CASE_TITLE: v.DEL_TITLE, THREAD_TITLE: v.THREAD_TITLES,
PROCESS_NAME: v.PRO_TITLE, PROCESS_NAME: v.PRO_TITLE,
TASK: this.formatTasks(v.THREAD_TASKS), TASK: this.formatTasks(v.THREAD_TASKS),
USER_DATA: this.formatUser(v.THREAD_USERS), USER_DATA: this.formatUser(v.THREAD_USERS),

10
resources/assets/js/home/CaseDetail.vue
View File

@@ -32,8 +32,8 @@
<div slot="task" slot-scope="props"> <div slot="task" slot-scope="props">
<TaskCell :data="props.row.TASK" /> <TaskCell :data="props.row.TASK" />
</div> </div>
<div slot="case_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.CASE_TITLE }} {{ props.row.THREAD_TITLE }}
</div> </div>
<div slot="current_user" slot-scope="props"> <div slot="current_user" slot-scope="props">
<CurrentUserCell :data="props.row.USER_DATA" /> <CurrentUserCell :data="props.row.USER_DATA" />
@@ -160,7 +160,7 @@ export default {
}, },
columns: [ columns: [
"task", "task",
"case_title", "thread_title",
"current_user", "current_user",
"status", "status",
"due_date", "due_date",
@@ -171,7 +171,7 @@ export default {
options: { options: {
headings: { headings: {
task: this.$i18n.t("ID_TASK"), task: this.$i18n.t("ID_TASK"),
case_title: this.$i18n.t("ID_CASE_TITLE"), thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
current_user: this.$i18n.t("ID_CURRENT_USER"), current_user: this.$i18n.t("ID_CURRENT_USER"),
status: this.$i18n.t("ID_STATUS"), status: this.$i18n.t("ID_STATUS"),
due_date: this.$i18n.t("ID_DUE_DATE"), due_date: this.$i18n.t("ID_DUE_DATE"),
@@ -510,7 +510,7 @@ export default {
COLOR: v.TAS_COLOR_LABEL COLOR: v.TAS_COLOR_LABEL
}, },
], ],
CASE_TITLE: v.DEL_TITLE, THREAD_TITLE: v.DEL_TITLE,
USER_DATA: this.formatUser(v.user_tooltip), USER_DATA: this.formatUser(v.user_tooltip),
STATUS: v.DEL_THREAD_STATUS, STATUS: v.DEL_THREAD_STATUS,
DUE_DATE: v.DEL_TASK_DUE_DATE, DUE_DATE: v.DEL_TASK_DUE_DATE,

12
resources/assets/js/home/MyCases/MyCases.vue
View File

@@ -44,8 +44,8 @@
<div slot="case_number" slot-scope="props"> <div slot="case_number" slot-scope="props">
{{ props.row.CASE_NUMBER }} {{ props.row.CASE_NUMBER }}
</div> </div>
<div slot="case_title" slot-scope="props"> <div slot="thread_title" slot-scope="props">
{{ props.row.CASE_TITLE }} <ThreadTitleCell :data="props.row.THREAD_TITLE" />
</div> </div>
<div slot="process_name" slot-scope="props"> <div slot="process_name" slot-scope="props">
{{ props.row.PROCESS_NAME }} {{ props.row.PROCESS_NAME }}
@@ -87,6 +87,7 @@ import ModalNewRequest from "../ModalNewRequest.vue";
import MyCasesFilter from "../../components/search/MyCasesFilter"; import MyCasesFilter from "../../components/search/MyCasesFilter";
import ModalComments from "../modal/ModalComments.vue"; import ModalComments from "../modal/ModalComments.vue";
import GroupedCell from "../../components/vuetable/GroupedCell.vue"; import GroupedCell from "../../components/vuetable/GroupedCell.vue";
import ThreadTitleCell from "../../components/vuetable/ThreadTitleCell.vue"
import api from "../../api/index"; import api from "../../api/index";
import utils from "../../utils/utils"; import utils from "../../utils/utils";
import defaultMixins from "./defaultMixins"; import defaultMixins from "./defaultMixins";
@@ -102,6 +103,7 @@ export default {
ModalNewRequest, ModalNewRequest,
GroupedCell, GroupedCell,
ModalComments, ModalComments,
ThreadTitleCell,
}, },
props: ["defaultOption", "settings"], props: ["defaultOption", "settings"],
data() { data() {
@@ -144,8 +146,8 @@ export default {
? this.settings.columns ? this.settings.columns
: [ : [
"case_number", "case_number",
"case_title",
"process_name", "process_name",
"thread_title",
"pending_taks", "pending_taks",
"status", "status",
"start_date", "start_date",
@@ -158,8 +160,8 @@ export default {
filterable: false, filterable: false,
headings: { headings: {
case_number: this.$i18n.t("ID_MYCASE_NUMBER"), case_number: this.$i18n.t("ID_MYCASE_NUMBER"),
case_title: this.$i18n.t("ID_CASE_TITLE"),
process_name: this.$i18n.t("ID_PROCESS_NAME"), process_name: this.$i18n.t("ID_PROCESS_NAME"),
thread_title: this.$i18n.t('ID_CASE_THREAD_TITLE'),
pending_taks: this.$i18n.t("ID_PENDING_TASKS"), pending_taks: this.$i18n.t("ID_PENDING_TASKS"),
status: this.$i18n.t("ID_CASESLIST_APP_STATUS"), status: this.$i18n.t("ID_CASESLIST_APP_STATUS"),
start_date: this.$i18n.t("ID_START_DATE"), start_date: this.$i18n.t("ID_START_DATE"),
@@ -420,7 +422,7 @@ export default {
_.forEach(response, (v) => { _.forEach(response, (v) => {
data.push({ data.push({
CASE_NUMBER: v.APP_NUMBER, CASE_NUMBER: v.APP_NUMBER,
CASE_TITLE: v.DEL_TITLE, THREAD_TITLE: v.THREAD_TITLES,
PROCESS_NAME: v.PRO_TITLE, PROCESS_NAME: v.PRO_TITLE,
STATUS: v.APP_STATUS, STATUS: v.APP_STATUS,
START_DATE: v.APP_CREATE_DATE_LABEL || "", START_DATE: v.APP_CREATE_DATE_LABEL || "",

4
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -3548,8 +3548,8 @@ msgstr "Case Uid"
# TRANSLATION # TRANSLATION
# LABEL/ID_CASE_THREAD_TITLE # LABEL/ID_CASE_THREAD_TITLE
#: LABEL/ID_CASE_THREAD_TITLE #: LABEL/ID_CASE_THREAD_TITLE
msgid "Case thread title" msgid "Case Thread Title"
msgstr "Case thread title" msgstr "Case Thread Title"
# TRANSLATION # TRANSLATION
# LABEL/ID_CASES # LABEL/ID_CASES

2
workflow/engine/data/mysql/insert.sql
View File

@@ -57397,7 +57397,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_CASELIST_CAN_NOT_BE_IMPORTED_THE_PMTABLE_NOT_EXIST','en','Custom Case List {0} can not be imported because the PM Table does not exist in this Workspace.','2021-08-20') , ( 'LABEL','ID_CASELIST_CAN_NOT_BE_IMPORTED_THE_PMTABLE_NOT_EXIST','en','Custom Case List {0} can not be imported because the PM Table does not exist in this Workspace.','2021-08-20') ,
( 'LABEL','ID_CASE_DELETE_SUCCESFULLY','en','The Case was deleted successfully.','2020-01-08') , ( 'LABEL','ID_CASE_DELETE_SUCCESFULLY','en','The Case was deleted successfully.','2020-01-08') ,
( 'LABEL','ID_CASE_UID','en','Case Uid','2021-04-04') , ( 'LABEL','ID_CASE_UID','en','Case Uid','2021-04-04') ,
( 'LABEL','ID_CASE_THREAD_TITLE','en','Case thread title','2021-08-27') , ( 'LABEL','ID_CASE_THREAD_TITLE','en','Case Thread Title','2021-08-27') ,
( 'LABEL','ID_CASES','en','HOME','2014-01-15') , ( 'LABEL','ID_CASES','en','HOME','2014-01-15') ,
( 'LABEL','ID_CASES1','en','Cases','2015-12-15') , ( 'LABEL','ID_CASES1','en','Cases','2015-12-15') ,
( 'LABEL','ID_CASES_DELETE_SUCCESFULLY','en','All Cases were deleted successfully.','2020-01-08') , ( 'LABEL','ID_CASES_DELETE_SUCCESFULLY','en','All Cases were deleted successfully.','2020-01-08') ,