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

Merge branch 'release/3.7.0' of bitbucket.org:colosa/processmaker into bugfix/PMCORE-3342

Browse Source
This commit is contained in:
Henry Jordan
2021-10-06 18:51:08 +00:00
parent 71b8c4263c 9122c83d56
commit a57281e845
24 changed files with 182 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
resources/assets/js/api/Filters.js
View File

@@ -60,6 +60,16 @@ export let filters = {
keys: {},
});
},
/**
* Service to get the process list
*/
processListPaged(data) {
return Api.get({
service: "PROCESSES",
params: data,
keys: {},
});
},
/**
* Service to get the users list
*/

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

@@ -518,7 +518,8 @@ export default {
APP_UID: v.APP_UID,
DEL_INDEX: v.DEL_INDEX,
PRO_UID: v.PRO_UID,
TAS_UID: v.TAS_UID
TAS_UID: v.TAS_UID,
UNASSIGNED: v.UNASSIGNED
});
});
return data;
@@ -580,7 +581,8 @@ export default {
DEL_INDEX: data.row.DEL_INDEX,
PRO_UID: data.row.PRO_UID,
TAS_UID: data.row.TAS_UID,
ACTION: this.dataCase.ACTION || "todo"
ACTION: this.dataCase.ACTION || "todo",
UNASSIGNED: data.row.UNASSIGNED
});
this.$emit("onUpdatePage", "XCase");
}

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

@@ -662,7 +662,7 @@ export default {
autoShow: false,
},
],
refresh: false,
refresh: true,
});
this.$emit("cleanDefaultOption");
}

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

@@ -430,17 +430,17 @@ export default {
//force to search in the parallel tasks
if (params && params.openapplicationuid) {
this.onUpdateFilters({
params: [
{
fieldId: "caseNumber",
filterVar: "caseNumber",
label: "",
options:[],
value: params.openapplicationuid,
autoShow: false
}
],
refresh: false
params: [
{
fieldId: "caseNumber",
filterVar: "caseNumber",
label: "",
options:[],
value: params.openapplicationuid,
autoShow: false
}
],
refresh: true
});
this.$emit("cleanDefaultOption");
}

41
resources/assets/js/home/Home.vue
View File

@@ -4,6 +4,15 @@
:class="[{ collapsed: collapsed }, { onmobile: isOnMobile }]"
>
<div class="demo">
<b-alert
:show="dataAlert.dismissCountDown"
dismissible
:variant="dataAlert.variant"
@dismissed="dataAlert.dismissCountDown = 0"
@dismiss-count-down="countDownChanged"
>
{{ dataAlert.message }}
</b-alert>
<div class="container">
<router-view />
</div>
@@ -114,7 +123,13 @@ export default {
},
defaultOption: window.config.defaultOption || '',
pageData: {},
settings: {}
settings: {},
dataAlert: {
dismissSecs: 5,
dismissCountDown: 0,
message: "",
variant: "info"
},
};
},
mounted() {
@@ -280,6 +295,10 @@ export default {
} else {
this.page = "MyCases";
}
if (window.config._nodeId === "CASES_SENT" && this.defaultOption !== "") {
this.cleanDefaultOption();
this.showAlert(this.$i18n.t("ID_NO_PERMISSION_NO_PARTICIPATED_CASES"));
}
this.settings = this.config.setting[this.page];
this.lastPage = this.page;
},
@@ -602,7 +621,25 @@ export default {
return obj.props;
}
return obj;
}
},
/**
* Show the alert message
* @param {string} message - message to be displayen in the body
* @param {string} type - alert type
*/
showAlert(message, type) {
this.dataAlert.message = message;
this.dataAlert.variant = type || "info";
this.dataAlert.dismissCountDown = this.dataAlert.dismissSecs;
},
/**
* Updates the alert dismiss value to update
* dismissCountDown and decrease
* @param {mumber}
*/
countDownChanged(dismissCountDown) {
this.dataAlert.dismissCountDown = dismissCountDown;
},
}
};
</script>

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

@@ -475,7 +475,7 @@ export default {
autoShow: false,
},
],
refresh: false,
refresh: true,
});
this.$emit("cleanDefaultOption");
}

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

@@ -464,17 +464,17 @@ export default {
//force to search in the parallel tasks
if (params && params.openapplicationuid) {
this.onUpdateFilters({
params: [
{
fieldId: "caseNumber",
filterVar: "caseNumber",
label: "",
options:[],
value: params.openapplicationuid,
autoShow: false
}
],
refresh: false
params: [
{
fieldId: "caseNumber",
filterVar: "caseNumber",
label: "",
options:[],
value: params.openapplicationuid,
autoShow: false
}
],
refresh: true
});
this.$emit("cleanDefaultOption");
}

5
resources/assets/js/home/TaskMetrics/VueChartLvOne.vue
View File

@@ -233,7 +233,10 @@ export default {
getProcesses(query) {
let that = this;
Api.filters
.processList(query || "")
.processListPaged({
text: query || "",
paged: false,
})
.then((response) => {
that.formatDataProcesses(response.data);
})

26
resources/assets/js/home/TaskMetrics/VueChartLvThree.vue
View File

@@ -126,14 +126,14 @@ export default {
return {
currentSelection: null,
dateFrom:
this.data[3] && this.data[3].data.dateFromRisk
? this.data[3].data.dateFromRisk
: moment().format("YYYY-MM-DD"),
this.data[3] && this.data[3].data.dateFrom
? this.data[3].data.dateFrom
: moment().subtract(30, "d").format("YYYY-MM-DD"),
dateTo:
this.data[3] && this.data[3].data.dateToRisk
? this.data[3].data.dateToRisk
: moment().add(30, "d").format("YYYY-MM-DD"),
dateNow: moment().format("DD/MM/YYYY h:mm:ss a"),
this.data[3] && this.data[3].data.dateTo
? this.data[3].data.dateTo
: moment().format("YYYY-MM-DD"),
dateNow: moment().format("YYYY-MM-DD h:mm:ss a"),
size:
this.data[3] && this.data[3].data.size
? this.data[3].data.size
@@ -227,12 +227,12 @@ export default {
dt = {
process: this.data[2].id,
caseList: this.data[1].id.toLowerCase(),
dateFrom: moment(this.dateFrom).format("DD/MM/YYYY"),
dateTo: moment(this.dateTo).format("DD/MM/YYYY"),
dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"),
dateTo: moment(this.dateTo).format("YYYY-MM-DD"),
riskStatus: this.riskType,
};
this.size.id != "all" ? (dt["topCases"] = this.size.id) : null;
this.dateNow = moment().format("DD/MM/YYYY h:mm:ss a");
this.dateNow = moment().format("YYYY-MM-DD h:mm:ss a");
Api.process
.totalCasesByRisk(dt)
.then((response) => {
@@ -462,11 +462,9 @@ export default {
name: this.data[2]["name"],
level: 3,
data: {
dateFrom: this.data[3].data.dateFrom,
dateTo: this.data[3].data.dateTo,
dateFrom: this.dateFrom,
dateTo: this.dateTo,
period: this.data[3].data.period,
dateFromRisk: this.dateFrom,
dateToRisk: this.dateTo,
size: this.size,
riskType: this.riskType,
},

18
resources/assets/js/home/TaskMetrics/VueChartLvTwo.vue
View File

@@ -58,8 +58,8 @@
:options="options"
:series="series"
></apexchart>
<div class="row">
<div class="col-sm vp-align-right">
<div class="vp-text-align-center">
<div class="vp-align-right vp-inline-block">
<button
@click="onClickDrillDown()"
type="button"
@@ -69,7 +69,7 @@
><span class="vp-padding-l10">{{ $t("ID_DRILL") }}</span>
</button>
</div>
<div class="col-sm">
<div class="vp-inline-block">
<button @click="onClickData()" type="button" class="btn btn-primary">
<i class="fas fa-th"></i
><span class="vp-padding-l10">{{ $t("ID_DATA") }}</span>
@@ -100,10 +100,10 @@ export default {
return {
dateFrom: this.data[3]
? this.data[3].data.dateFrom
: moment().format("YYYY-MM-DD"),
: moment().subtract(30, "d").format("YYYY-MM-DD"),
dateTo: this.data[3]
? this.data[3].data.dateTo
: moment().add(30, "d").format("YYYY-MM-DD"),
: moment().format("YYYY-MM-DD"),
period: this.data[3] ? this.data[3].data.period : "day",
periodOptions: [
{ text: this.$t("ID_DAY"), value: "day" },
@@ -187,8 +187,8 @@ export default {
dt = {
processId: this.data[2].id,
caseList: this.data[1].id.toLowerCase(),
dateFrom: moment(this.dateFrom).format("DD/MM/YYYY"),
dateTo: moment(this.dateTo).format("DD/MM/YYYY"),
dateFrom: moment(this.dateFrom).format("YYYY-MM-DD"),
dateTo: moment(this.dateTo).format("YYYY-MM-DD"),
groupBy: this.period,
};
Api.process
@@ -338,5 +338,9 @@ export default {
.vp-padding-l20 {
padding-left: 20px;
}
.vp-text-align-center {
text-align: center;
}
</style>
<style src="vue-multiselect/dist/vue-multiselect.min.css"></style>

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

@@ -233,7 +233,6 @@
@postNotes="onPostNotes"
></ModalComments>
<ModalClaimCase ref="modal-claim-case"></ModalClaimCase>
<ModalPauseCase ref="modal-pause-case"></ModalPauseCase>
</div>
</template>
@@ -251,7 +250,6 @@ 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';
import ModalComments from "../modal/ModalComments.vue";
import { Event } from 'vue-tables-2';
import CurrentUserCell from "../../components/vuetable/CurrentUserCell.vue";
@@ -270,7 +268,6 @@ export default {
MultiviewHeader,
VueCardView,
VueListView,
ModalPauseCase,
CurrentUserCell,
ModalComments
},
@@ -680,14 +677,6 @@ 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 options in the ellipsis
* @param {object} data
@@ -705,13 +694,6 @@ export default {
that.openComments(data);
}
},
pause: {
name: "pause case",
icon: "far fa-pause-circle",
fn: function() {
that.showModalPause(data);
}
},
claim: {
name: "claim case",
icon: "fas fa-briefcase",

6
resources/assets/js/home/XCase.vue
View File

@@ -49,6 +49,12 @@ export default {
window.config.SYS_URI +
`cases/open?APP_UID=${this.dataCase.APP_UID}&DEL_INDEX=${this.dataCase.DEL_INDEX}&TAS_UID=${this.dataCase.TAS_UID}&action=${this.dataCase.ACTION}`;
}
if (this.dataCase.UNASSIGNED === true) {
this.path =
window.config.SYS_SERVER_AJAX +
window.config.SYS_URI +
`cases/open?APP_UID=${this.dataCase.APP_UID}&DEL_INDEX=${this.dataCase.DEL_INDEX}&action=unassigned`;
}
setTimeout(() => {
let that = this;