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

conflicts: merge develop

Browse Source
This commit is contained in:
Paula Quispe
2021-12-02 11:58:33 -04:00
parent 2813e32d03 5c4787ac20
commit 2a850ede19
45 changed files with 1433 additions and 1141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
resources/assets/js/admin/Modals/ModalPreview.vue
View File

@@ -29,12 +29,7 @@
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
<CurrentUserCell :data="props.row.USER_DATA" />
</div>
<div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -110,8 +105,7 @@ export default {
DRAFT: this.$i18n.t("ID_IN_DRAFT"),
PAUSED: this.$i18n.t("ID_PAUSED"),
UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
},
showUserTooltip: true
}
}
},
mounted() {
@@ -256,29 +250,31 @@ export default {
formatUser(data) {
var dataFormat = [],
userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
} else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
this.showUserTooltip = false;
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
} else {
this.showUserTooltip = false;
dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
switch (data.key_name) {
case 'user_tooltip':
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false,
SHOW_TOOLTIP: true
});
break;
case 'dummy_task':
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
break;
default:
dataFormat = "";
break;
}
return dataFormat;
}

15
resources/assets/js/components/vuetable/CurrentUserCell.vue
View File

@@ -1,5 +1,5 @@
<template>
<div v-if="data.length" class="grouped-cell">
<div v-if="showTooltip" class="grouped-cell">
<div v-for="(item, index) in data" v-bind:key="item.TITLE" class="d-flex">
<div class="avatar" :id="id + index">
<b-avatar
@@ -36,6 +36,11 @@
</div>
</div>
</div>
<div v-else class="grouped-cell">
<span class="col ellipsis">
{{ data }}
</span>
</div>
</template>
<script>
@@ -47,6 +52,14 @@ export default {
id: "avatar-" + _.random(1000000)
};
},
computed: {
/**
* Verify if data is an array.
*/
showTooltip() {
return typeof this.data !== 'string'
}
},
methods: {
/**
* Generates the mail link

2
resources/assets/js/components/vuetable/TaskCell.vue
View File

@@ -11,7 +11,7 @@
<i class="fas fa-square"></i>
</div>
<b-popover
v-if="item.DELAYED_TITLE && item.DELAYED_MSG"
v-if="item.DELAYED_TITLE || item.DELAYED_MSG"
:target="statusId + index"
triggers="hover"
placement="top"

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

@@ -524,7 +524,8 @@ export default {
DEL_INDEX: v.DEL_INDEX,
PRO_UID: v.PRO_UID,
TAS_UID: v.TAS_UID,
UNASSIGNED: v.UNASSIGNED
UNASSIGNED: v.UNASSIGNED,
USR_ID: v.USR_ID
});
});
return data;
@@ -578,7 +579,7 @@ export default {
* @param {object} data
*/
onClick(data) {
if (data.row.UNASSIGNED) {
if (data.row.UNASSIGNED && data.row.USR_ID === 0) {
this.claimCase(data.row);
} else {
this.$emit("onUpdateDataCase", {

70
resources/assets/js/home/CustomCaseList/CustomCaseList.vue
View File

@@ -65,12 +65,7 @@
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
<CurrentUserCell :data="props.row.USER_DATA" />
</div>
<div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -154,12 +149,7 @@
{{ props["item"]["PRIORITY"] }}
</span>
<span v-else-if="column === 'send_by'" class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
<CurrentUserCell :data="props.item.USER_DATA" />
</span>
<span v-else class="v-card-text-light">
{{ props["item"][column] }}
@@ -216,12 +206,7 @@
{{ props["item"]["PRIORITY"] }}
</span>
<span v-else-if="column === 'send_by'" class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
<CurrentUserCell :data="props.item.USER_DATA" />
</span>
<span v-else class="v-card-text-light">
{{ props["item"][column] }}
@@ -933,32 +918,31 @@ export default {
formatUser(data) {
var dataFormat = [],
userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null,
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR:
userDataFormat !== ""
? window.config.SYS_SERVER_AJAX +
switch (data.key_name) {
case 'user_tooltip':
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}`
: "",
UNASSIGNED: userDataFormat !== "" ? true : false,
});
} else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
this.showUserTooltip = false;
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
} else {
this.showUserTooltip = false;
dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false,
SHOW_TOOLTIP: true
});
break;
case 'dummy_task':
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
break;
default:
dataFormat = "";
break;
}
return dataFormat;
},

15
resources/assets/js/home/CustomCaseList/defaultMixins.js
View File

@@ -229,7 +229,20 @@ export default {
* Return the columns for table - concat with field "detail" "actions"
*/
getTableColumns(columns) {
return _.concat(["detail"], columns, ["actions"]);
return _.concat(["detail"], this.removeDefaultColumns(columns), ["actions"]);
},
/**
* Remove the default columns, 'detail' and 'actions'
* @param {Array} columns
*/
removeDefaultColumns(columns) {
if (columns[0] === 'detail') {
columns.shift()
}
if (columns[columns.length - 1] === 'actions') {
columns.pop();
}
return columns;
},
/**
* Return options for Table

64
resources/assets/js/home/Inbox/Inbox.vue
View File

@@ -56,12 +56,7 @@
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div>
<div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -164,12 +159,7 @@
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span>
</div>
</VueCardView>
@@ -258,12 +248,7 @@
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span>
</div>
</VueListView>
@@ -418,7 +403,6 @@ export default {
},
showEllipsis: false,
dataSubtitle: null,
showUserTooltip: true
};
},
created() {
@@ -631,29 +615,31 @@ export default {
formatUser(data) {
var dataFormat = [],
userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
} else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
this.showUserTooltip = false;
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
} else {
this.showUserTooltip = false;
dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
switch (data.key_name) {
case 'user_tooltip':
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false,
SHOW_TOOLTIP: true
});
break;
case 'dummy_task':
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
break;
default:
dataFormat = "";
break;
}
return dataFormat;
},

68
resources/assets/js/home/Paused/Paused.vue
View File

@@ -55,12 +55,7 @@
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div>
<div slot="current_user" slot-scope="props">
{{ props.row.USERNAME_DISPLAY_FORMAT }}
@@ -163,12 +158,7 @@
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span>
</div>
</VueCardView>
@@ -257,12 +247,7 @@
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span>
</div>
</VueListView>
@@ -417,8 +402,7 @@ export default {
buttons: {}
},
showEllipsis: false,
dataSubtitle: null,
showUserTooltip: true
dataSubtitle: null
};
},
created() {
@@ -626,30 +610,32 @@ export default {
formatUser(data) {
var dataFormat = [],
userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
} else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
this.showUserTooltip = false;
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
} else {
this.showUserTooltip = false;
dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
}
switch (data.key_name) {
case 'user_tooltip':
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false,
SHOW_TOOLTIP: true
});
break;
case 'dummy_task':
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
break;
default:
dataFormat = "";
break;
}
return dataFormat;
},
/**

66
resources/assets/js/home/Unassigned/Unassigned.vue
View File

@@ -53,12 +53,7 @@
<TaskCell :data="props.row.TASK" />
</div>
<div slot="send_by" slot-scope="props">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.row.USER_DATA" />
</template>
<template v-else>
{{ props.row.USER_DATA }}
</template>
</div>
<div slot="due_date" slot-scope="props">
{{ props.row.DUE_DATE }}
@@ -158,12 +153,7 @@
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span>
</div>
</VueCardView>
@@ -252,12 +242,7 @@
>{{ props["headings"][props.column] }} :</span
>
<span class="v-card-text-light">
<template v-if="showUserTooltip" >
<CurrentUserCell :data="props.item.USER_DATA" />
</template>
<template v-else>
{{ props.item.USER_DATA }}
</template>
</span>
</div>
</VueListView>
@@ -409,8 +394,7 @@ export default {
buttons: {}
},
showEllipsis: false,
dataSubtitle: null,
showUserTooltip: true
dataSubtitle: null
};
},
mounted() {
@@ -583,29 +567,31 @@ export default {
formatUser(data) {
var dataFormat = [],
userDataFormat;
if (data.user_tooltip && !_.isEmpty(data.user_tooltip)) {
this.showUserTooltip = true;
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false
});
} else if (data.dummy_task && !_.isEmpty(data.dummy_task)) {
this.showUserTooltip = false;
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
} else {
this.showUserTooltip = false;
dataFormat = this.$i18n.t("ID_ANONYMOUS_USER");
switch (data.key_name) {
case 'user_tooltip':
userDataFormat = utils.userNameDisplayFormat({
userName: data.user_tooltip.usr_firstname,
firstName: data.user_tooltip.usr_lastname,
lastName: data.user_tooltip.usr_username,
format: window.config.FORMATS.format || null
});
dataFormat.push({
USERNAME_DISPLAY_FORMAT: userDataFormat,
EMAIL: data.user_tooltip.usr_email,
POSITION: data.user_tooltip.usr_position,
AVATAR: userDataFormat !== "" ? window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`users/users_ViewPhotoGrid?pUID=${data.user_tooltip.usr_id}` : "",
UNASSIGNED: userDataFormat !== "" ? true : false,
SHOW_TOOLTIP: true
});
break;
case 'dummy_task':
dataFormat = data.dummy_task.type + ': ' + data.dummy_task.name;
break;
default:
dataFormat = "";
break;
}
return dataFormat;
},