Merge branch 'feature/PMCORE-3049' of https://bitbucket.org/colosa/processmaker into taskmetrics

This commit is contained in:
Henry Jordan
2021-08-09 19:58:22 +00:00
12 changed files with 223 additions and 50 deletions

View File

@@ -8,10 +8,14 @@
<CasesFilter
:filters="filters"
:title="$t('ID_CASES_STATUS_TO_DO')"
:icon="icon"
@onRemoveFilter="onRemoveFilter"
@onUpdateFilters="onUpdateFilters"
/>
<multiview-header :data="dataMultiviewHeader" />
<multiview-header
:data="dataMultiviewHeader"
:dataSubtitle="dataSubtitle"
/>
<settings-popover :options="formatColumnSettings(options.headings)" target="pm-dr-column-settings" @onUpdateColumnSettings="onUpdateColumnSettings" :key="random+1" :selected="formatColumnSelected(columns)"/>
<v-server-table
v-if="typeView === 'GRID'"
@@ -266,6 +270,7 @@ export default {
"actions"
],
tableData: [],
icon:"fas fa-check-circle",
options: {
filterable: false,
headings: {
@@ -325,7 +330,8 @@ export default {
dataEllipsis: {
buttons: {}
},
showEllipsis: false
showEllipsis: false,
dataSubtitle: null
};
},
created() {
@@ -513,7 +519,7 @@ export default {
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.user_id}` : "",
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
return dataFormat;