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

Merged in feature/PMCORE-3090 (pull request #7991)

Browse Source 
PMCORE-3090

Approved-by: Rodrigo Quelca
This commit is contained in:
Fabio Guachalla
2021-07-26 17:44:51 +00:00
committed by Rodrigo Quelca
parent a0b9605d92 ac4814d28d
commit 377fcd1cdb
13 changed files with 499 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@@ -10946,6 +10946,21 @@
"resolved": "https://registry.npmjs.org/vue-upload-component/-/vue-upload-component-2.8.20.tgz",
"integrity": "sha512-zrnJvULu4rnZe36Ib2/AZrI/h/mmNbUJZ+acZD652PyumzbvjCOQeYHe00sGifTdYjzzS66CwhTT+ubZ2D0Aow=="
},
"vuedraggable": {
"version": "2.24.3",
"resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
"integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
"requires": {
"sortablejs": "1.10.2"
},
"dependencies": {
"sortablejs": {
"version": "1.10.2",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
"integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
}
}
},
"vuejs-auto-complete": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/vuejs-auto-complete/-/vuejs-auto-complete-0.9.0.tgz",

6
resources/assets/js/api/Api.js
View File

@@ -70,7 +70,10 @@ const services = {
USERS: "/home/users",
TASKS: "/home/tasks",
CATEGORIES: "/home/categories",
DEBUG_STATUS: "/home/process-debug-status?processUid={prj_uid}"
DEBUG_STATUS: "/home/process-debug-status?processUid={prj_uid}",
PAUSE_CASE: "/cases/{app_uid}/pause",
REASSIGN_CASE: "/cases/{app_uid}/reassign-case",
REASSIGN_USERS: "/light/userstoreassign/{task_uid}"
};
export default {
@@ -260,6 +263,7 @@ export default {
url,
credentials = window.config.SYS_CREDENTIALS,
workspace = window.config.SYS_WORKSPACE,
lang = window.config.SYS_LANG,
server = window.config.SYS_SERVER_API;
url = this.getUrl(_.extend(keys, credentials, { server }, { workspace }), service);

43
resources/assets/js/api/Cases.js
View File

@@ -151,6 +151,26 @@ export let cases = {
window.config.SYS_URI +
`cases/ajaxListener`, params);
},
/**
* Pause case with endpoint
* @param {*} data
* @returns
*/
pauseCase(data) {
return Api.update({
service: "PAUSE_CASE",
data: {
unpaused_date: data.unpausedDate,
unpaused_time: data.unpausedTime,
index: data.DEL_INDEX,
reason: data.reasonPause,
sendMail: data.notifyUser
},
keys: {
app_uid: data.APP_UID
}
});
},
/**
* Unpause case with endpoint
* @param {*} data
@@ -165,6 +185,29 @@ export let cases = {
}
});
},
getUserReassign(data) {
return Api.get({
service: "REASSIGN_USERS",
data: {},
keys: {
task_uid: data.TAS_UID
}
});
},
reassingCase(data) {
return Api.update({
service: "REASSIGN_CASE",
data: {
usr_uid_target: data.userSelected,
del_index: data.DEL_INDEX,
reason: data.reasonReassign,
sendMail: data.notifyUser
},
keys: {
app_uid: data.APP_UID
}
});
},
/**
* Claim case with endpoint
* @param {*} data

3
resources/assets/js/components/utils/ellipsis.vue
View File

@@ -4,6 +4,7 @@
<div
class="v-inline"
v-show="showActions"
ref="ellipsis"
>
<div class="buttonGroup">
<b-button
@@ -91,7 +92,7 @@ export default {
position: relative;
flex-direction: row-reverse;
width: 0px;
z-index: 999999;
z-index: 999;
display: inline-flex !important;
}
.btn-outline-info {

9
resources/assets/js/home/Draft/Draft.vue
View File

@@ -487,6 +487,7 @@ export default {
},
/**
* Show options in the ellipsis
* @param {object} data
*/
updateDataEllipsis(data) {
let that = this;
@@ -497,12 +498,16 @@ export default {
open: {
name: "open",
icon: "far fa-edit",
fn: function() {console.log(data.APP_UID);}
fn: function() {
that.openCase(data);
}
},
note: {
name: "case note",
icon: "far fa-comments",
fn: function() {console.log("comments");}
fn: function() {
that.openCaseDetail(data);
}
},
}
}

83
resources/assets/js/home/Inbox/Todo.vue
View File

@@ -2,6 +2,8 @@
<div id="v-todo" ref="v-todo" class="v-container-todo">
<button-fleft :data="newCase"></button-fleft>
<modal-new-request ref="newRequest"></modal-new-request>
<ModalPauseCase ref="modal-pause-case"></ModalPauseCase>
<ModalReassignCase ref="modal-reassign-case"></ModalReassignCase>
<CasesFilter
:filters="filters"
:title="$t('ID_CASES_STATUS_TO_DO')"
@@ -48,9 +50,9 @@
</div>
<div slot="priority" slot-scope="props">{{ props.row.PRIORITY }}</div>
<div slot="actions" slot-scope="props">
<button class="btn btn-success btn-sm" @click="openCase(props.row)">
{{ $t("ID_OPEN_CASE") }}
</button>
<div @click="updateDataEllipsis(props.row)">
<ellipsis ref="ellipsis" v-if="dataEllipsis" :data="dataEllipsis"> </ellipsis>
</div>
</div>
</v-server-table>
<VueCardView
@@ -59,8 +61,8 @@
ref="vueCardView"
>
<div slot="detail" slot-scope="props">
<div class="v-pm-card-info" @click="openCaseDetail(props.item)">
<i class="fas fa-info-circle"></i>
<div @click="updateDataEllipsis(props.row)">
<ellipsis v-if="dataEllipsis" :data="dataEllipsis"> </ellipsis>
</div>
</div>
<div slot="case_number" slot-scope="props" class="v-card-text">
@@ -181,6 +183,10 @@ import MultiviewHeader from "../../components/headers/MultiviewHeader.vue";
import VueCardView from "../../components/dataViews/vueCardView/VueCardView.vue";
import VueListView from "../../components/dataViews/vueListView/VueListView.vue";
import defaultMixins from "./defaultMixins";
import Ellipsis from '../../components/utils/ellipsis.vue';
import ModalPauseCase from '../modal/ModalPauseCase.vue';
import ModalReassignCase from '../modal/ModalReassignCase.vue';
export default {
name: "Todo",
@@ -193,7 +199,10 @@ export default {
CasesFilter,
MultiviewHeader,
VueCardView,
VueListView
VueListView,
Ellipsis,
ModalPauseCase,
ModalReassignCase,
},
props: ["defaultOption", "filters"],
data() {
@@ -273,6 +282,10 @@ export default {
PAUSED: this.$i18n.t("ID_PAUSED"),
UNASSIGNED: this.$i18n.t("ID_UNASSIGNED"),
},
dataEllipsis: {
buttons: {}
},
showEllipsis: false
};
},
created() {
@@ -507,6 +520,64 @@ export default {
this.$refs["vueListView"].getData();
}
},
/**
* Show modal to pause a case
* @param {objec} data
*/
showModalPause(data) {
this.$refs["modal-pause-case"].data = data;
this.$refs["modal-pause-case"].show();
},
/**
* Show modal to reassign a case
* @param {objec} data
*/
showModalReassign(data) {
this.$refs["modal-reassign-case"].data = data;
this.$refs["modal-reassign-case"].show();
},
/**
* Show options in the ellipsis
* @param {objec} data
*/
updateDataEllipsis(data) {
let that = this;
this.showEllipsis = !this.showEllipsis;
if (this.showEllipsis) {
this.dataEllipsis = {
buttons: {
open: {
name: "open",
icon: "far fa-edit",
fn: function() {
that.openCase(data)
}
},
note: {
name: "case note",
icon: "far fa-comments",
fn: function() {
that.openCaseDetail(data);
}
},
reassign: {
name: "reassign case",
icon: "fas fa-undo",
fn: function() {
that.showModalReassign(data);
}
},
pause: {
name: "pause case",
icon: "far fa-pause-circle",
fn: function() {
that.showModalPause(data);
}
}
}
}
}
},
},
};
</script>

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

@@ -2,6 +2,7 @@
<div id="v-paused" ref="v-paused" class="v-container-paused">
<button-fleft :data="newCase"></button-fleft>
<modal-new-request ref="newRequest"></modal-new-request>
<ModalReassignCase ref="modal-reassign-case"></ModalReassignCase>
<CasesFilter
:filters="filters"
:title="$t('ID_PAUSED')"
@@ -184,6 +185,7 @@ import VueCardView from "../../components/dataViews/vueCardView/VueCardView.vue"
import VueListView from "../../components/dataViews/vueListView/VueListView.vue";
import defaultMixins from "./defaultMixins";
import Ellipsis from '../../components/utils/ellipsis.vue';
import ModalReassignCase from '../modal/ModalReassignCase.vue';
export default {
name: "Paused",
@@ -198,7 +200,8 @@ export default {
Ellipsis,
MultiviewHeader,
VueCardView,
VueListView
VueListView,
ModalReassignCase,
},
props: ["defaultOption", "filters"],
data() {
@@ -515,8 +518,17 @@ export default {
this.$refs["vueListView"].getData();
}
},
/**
* Show modal to reassign a case
* @param {object} data
*/
showModalReassign(data) {
this.$refs["modal-reassign-case"].data = data;
this.$refs["modal-reassign-case"].show();
},
/**
* Show options in the ellipsis
* @param {object} data
*/
updateDataEllipsis(data) {
let that = this;
@@ -527,17 +539,23 @@ export default {
note: {
name: "case note",
icon: "far fa-comments",
fn: function() {console.log("comments");}
fn: function() {
that.openCaseDetail(data);
}
},
play: {
name: "play case",
icon: "far fa-play-circle",
fn: function() {console.log("play case");}
fn: function() {
that.showModalUnpauseCase(data);
}
},
reassign: {
name: "reassign case",
icon: "fas fa-redo",
fn: function() {console.log("reassign case");}
icon: "fas fa-undo",
fn: function() {
that.showModalReassign(data);
}
}
}
}

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

@@ -162,6 +162,7 @@
</div>
</VueListView>
<ModalClaimCase ref="modal-claim-case"></ModalClaimCase>
<ModalPauseCase ref="modal-pause-case"></ModalPauseCase>
</div>
</template>
@@ -179,6 +180,7 @@ import MultiviewHeader from "../../components/headers/MultiviewHeader.vue";
import VueCardView from "../../components/dataViews/vueCardView/VueCardView.vue";
import VueListView from "../../components/dataViews/vueListView/VueListView.vue";
import defaultMixins from "./defaultMixins";
import ModalPauseCase from '../modal/ModalPauseCase.vue';
export default {
name: "Unassigned",
@@ -193,7 +195,8 @@ export default {
Ellipsis,
MultiviewHeader,
VueCardView,
VueListView
VueListView,
ModalPauseCase,
},
props: ["defaultOption", "filters"],
data() {
@@ -486,17 +489,16 @@ export default {
}
},
/**
* set data by default in the ellipsis component
* Show modal to pause a case
* @param {objec} data
*/
setDataEllipsis() {
this.dataEllipsis = {
showNote: true,
showPause: true,
showClaim: true
}
showModalPause(data) {
this.$refs["modal-pause-case"].data = data;
this.$refs["modal-pause-case"].show();
},
/**
* Show options in the ellipsis
* @param {object} data
*/
updateDataEllipsis(data) {
let that = this;
@@ -507,17 +509,23 @@ export default {
note: {
name: "case note",
icon: "far fa-comments",
fn: function() {console.log("comments");}
fn: function() {
that.openCaseDetail(data);
}
},
pause: {
name: "pause case",
icon: "far fa-pause-circle",
fn: function() {console.log("pause case");}
fn: function() {
that.showModalPause(data);
}
},
claim: {
name: "claim case",
icon: "fas fa-briefcase",
fn: function() {console.log("claim case");}
fn: function() {
that.claimCase(data);
}
}
}
}

163
resources/assets/js/home/modal/ModalPauseCase.vue Normal file
View File

@@ -0,0 +1,163 @@
<template>
<div>
<b-modal
ref="modal-pause-case"
hide-footer
size="lg"
>
<template v-slot:modal-title>
{{ $t('ID_PAUSE_CASE') }}
<i class="far fa-pause-circle"></i>
</template>
<b-container fluid>
<b-row class="my-1">
<b-col sm="3">
<label for="pauseDate">{{ $t('ID_PAUSE_DATE') }}</label>
</b-col>
<b-col sm="5">
<b-form-datepicker
disabled
id="pauseDate"
class="mb-2"
v-model="pauseData.pauseDate"
:locale="locale"
:date-format-options="{ year: 'numeric', month: 'numeric', day: 'numeric' }"
></b-form-datepicker>
</b-col>
<b-col sm="4">
<input type="time" id="pauseTime" v-model="pauseData.pauseTime" class="form-control" disabled>
</b-col>
</b-row>
<b-row class="my-1">
<b-col sm="3">
<label for="unpauseDate">{{ $t('ID_UNPAUSE_DATE') }}</label>
</b-col>
<b-col sm="5">
<b-form-datepicker
id="unpauseDate"
class="mb-2"
v-model="pauseData.unpauseDate"
:locale="locale"
:min="minDate"
:date-format-options="{ year: 'numeric', month: 'numeric', day: 'numeric' }"
></b-form-datepicker>
</b-col>
<b-col sm="4">
<input type="time" v-model="pauseData.unpauseTime" id="unpauseTime" class="form-control">
</b-col>
</b-row>
<b-row class="my-1">
<b-col sm="3">
<label for="reasonPause">{{ $t('ID_REASON_PAUSE') }}</label>
</b-col>
<b-col sm="9">
<b-form-textarea
id="reasonPause"
v-model="pauseData.reasonPause"
rows="3"
max-rows="6"
></b-form-textarea>
</b-col>
</b-row>
<b-row>
<b-col sm="3">
<label for="notifyUser">{{ $t('ID_NOTIFY_USERS_CASE') }}</label>
</b-col>
<b-col sm="8">
<b-form-checkbox v-model="pauseData.nofitfyUser" id="notifyUser" name="notifyUser" switch>
</b-form-checkbox>
</b-col>
</b-row>
</b-container>
<div class="modal-footer">
<div class="float-right">
<b-button
variant="danger"
data-dismiss="modal"
@click="cancel"
>
{{ $t("ID_CANCEL") }}
</b-button>
<b-button
variant="success"
@click="pauseCase"
>
{{ $t("ID_PAUSE") }}
</b-button>
</div>
</div>
</b-modal>
</div>
</template>
<script>
import api from "./../../api/index";
export default {
name: "ModalPauseCase",
components: {},
props: {},
mounted() {},
data() {
return {
data: null,
locale: 'en-US',
pauseData: {
unpauseDate: '',
unpauseTime: '',
reasonPause: '',
nofitfyUser: '',
pauseDate: '',
pauseTime: ''
},
minDate: '',
};
},
methods: {
classBtn(cls) {
return "btn v-btn-request " + cls;
},
show() {
this.setDateTime();
this.$refs["modal-pause-case"].show();
},
cancel() {
this.$refs["modal-pause-case"].hide();
},
/**
* Set DateTime with current time as default
*/
setDateTime() {
var now = new Date(),
nextDay = new Date(now.getFullYear(), now.getMonth(), now.getDate() + 1),
today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
this.minDate = nextDay;
this.pauseData.pauseDate = today;
this.pauseData.pauseTime = now.getHours() + ":" + now.getMinutes();
},
/**
* Pause the case
*/
pauseCase() {
let that = this;
this.data.unpausedDate = this.pauseData.unpauseDate;
this.data.unpausedTime = this.pauseData.unpauseTime;
this.data.nofitfyUser = this.pauseData.nofitfyUser;
this.data.reasonPause = this.pauseData.reasonPause;
api.cases.pauseCase(this.data).then((response) => {
if (response.statusText == "OK") {
that.$refs["modal-pause-case"].hide();
that.$parent.$refs["vueTable"].getData();
}
});
},
},
};
</script>
<style>
</style>

134
resources/assets/js/home/modal/ModalReassignCase.vue Normal file
View File

@@ -0,0 +1,134 @@
<template>
<div>
<b-modal
ref="modal-reassign-case"
hide-footer
size="lg"
>
<template v-slot:modal-title>
{{ $t('ID_REASSIGN_CASE') }}
<i class="fas fa-undo"></i>
</template>
<b-container fluid>
<b-row class="my-1">
<b-col sm="3">
<label for="selectUser">{{ $t('ID_SELECT_USER') }}</label>
</b-col>
<b-col sm="9">
<b-form-select v-model="userSelected" :options="users"></b-form-select>
</b-col>
</b-row>
<b-row class="my-1">
<b-col sm="3">
<label for="reasonReassign">{{ $t('ID_REASON_REASSIGN') }}</label>
</b-col>
<b-col sm="9">
<b-form-textarea
id="reasonReassign"
v-model="reasonReassign"
rows="3"
max-rows="6"
></b-form-textarea>
</b-col>
</b-row>
<b-row class="my-1">
<b-col sm="3">
<label for="notifyUser">{{ $t('ID_NOTIFY_USERS_CASE') }}</label>
</b-col>
<b-col sm="9">
<b-form-checkbox v-model="notifyUser" id="notifyUser" name="notifyUser" switch>
</b-form-checkbox>
</b-col>
</b-row>
</b-container>
<div class="modal-footer">
<div class="float-right">
<b-button
variant="danger"
data-dismiss="modal"
@click="cancel"
>
{{ $t("ID_CANCEL") }}
</b-button>
<b-button
variant="success"
@click="reassignCase"
>
{{ $t("ID_PAUSE") }}
</b-button>
</div>
</div>
</b-modal>
</div>
</template>
<script>
import api from "./../../api/index";
import utils from "../../utils/utils";
export default {
name: "ModalPauseCase",
components: {},
props: {},
mounted() {},
data() {
return {
data: null,
locale: 'en-US',
users: [],
reasonReassign: null,
userSelected: null,
notifyUser: false
};
},
methods: {
classBtn(cls) {
return "btn v-btn-request " + cls;
},
show() {
this.getUsersReassign();
this.$refs["modal-reassign-case"].show();
},
cancel() {
this.$refs["modal-reassign-case"].hide();
},
getUsersReassign() {
let that = this;
api.cases.getUserReassign(this.data).then((response) => {
var users = response.data.data,
i;
if (response.statusText == "OK") {
for (i = 0; i < users.length; i += 1) {
that.users.push({
value: users[i].USR_UID,
text: utils.userNameDisplayFormat({
userName: users[i].USR_USERNAME || "",
firstName: users[i].USR_FIRSTNAME || "",
lastName: users[i].USR_LASTNAME || "",
format: window.config.FORMATS.format || null
})
});
}
}
});
},
reassignCase() {
let that = this;
this.data.userSelected = this.userSelected;
this.data.reasonReassign = this.reasonReassign;
this.notifyUser = this.notifyUser;
api.cases.reassingCase(this.data).then((response) => {
if (response.statusText == "OK") {
that.$refs["modal-reassign-case"].hide();
that.$parent.$refs["vueTable"].getData();
}
});
},
},
};
</script>
<style>
</style>

6
resources/assets/sass/menu.scss
View File

@@ -49,7 +49,7 @@
display: block;
font-size: 14px;
font-weight: 400;
padding: 8px;
padding: 8px 8px 8px 0px;
line-height: 30px;
text-decoration: none;
-webkit-user-select: none;
@@ -88,12 +88,12 @@
}
.v-sidebar-menu .vsm--link_mobile-item {
background-color: transparent
background-color: #3397E1;
}
.v-sidebar-menu .vsm--link_mobile-item.vsm--link_hover,
.v-sidebar-menu .vsm--link_mobile-item:hover {
background-color: transparent !important
background-color: #5aa4c4 !important;
}
.v-sidebar-menu .vsm--title {

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

@@ -24563,6 +24563,12 @@ msgstr "Please select a table to export."
msgid "Select a template file"
msgstr "Select a template file"
# TRANSLATION
# LABEL/ID_SELECT_USER
#: LABEL/ID_SELECT_USER
msgid "Select a User"
msgstr "Select a User"
# TRANSLATION
# LABEL/ID_SELECT_USER_OR_GROUP
#: LABEL/ID_SELECT_USER_OR_GROUP

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

@@ -61008,6 +61008,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE
( 'LABEL','ID_SELECT_STATUS','en','Select status...','2014-01-15') ,
( 'LABEL','ID_SELECT_TABLE','en','Please select a table to export.','2014-01-15') ,
( 'LABEL','ID_SELECT_TEMPLATE_FILE','en','Select a template file','2014-01-15') ,
( 'LABEL','ID_SELECT_USER','en','Select a User','2021-07-23') ,
( 'LABEL','ID_SELECT_USER_OR_GROUP','en','Please select the name of a user or a group in the Group or User field','2017-10-19') ,
( 'LABEL','ID_SELECT_VARIABLE','en','Select Variable','2017-10-27') ,
( 'LABEL','ID_SELECT_WORKSPACE','en','Select a workspace','2014-01-15') ,