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

Merged in bugfix/PMCORE-2548 (pull request #7622)

Browse Source 
PMCORE-2548

Approved-by: Rodrigo Quelca
This commit is contained in:
Fabio Guachalla
2020-12-16 13:18:37 +00:00
committed by Rodrigo Quelca
parent 78b9fdf8ce 171cc32e16
commit 8bd4e68e35
8 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,7 +8,8 @@ export let cases = {
return Api.get({ return Api.get({
service: "MY_CASES", service: "MY_CASES",
params: { params: {
filter: data.filter filter: data.filter,
paged: data.paged
}, },
keys: {} keys: {}
}); });
@@ -17,6 +18,7 @@ export let cases = {
return Api.get({ return Api.get({
service: "TODO_LIST", service: "TODO_LIST",
params: { params: {
paged: data.paged
}, },
keys: {} keys: {}
}); });
@@ -25,6 +27,7 @@ export let cases = {
return Api.get({ return Api.get({
service: "DRAFT_LIST", service: "DRAFT_LIST",
params: { params: {
paged: data.paged
}, },
keys: {} keys: {}
}); });
@@ -33,6 +36,7 @@ export let cases = {
return Api.get({ return Api.get({
service: "PAUSED_LIST", service: "PAUSED_LIST",
params: { params: {
paged: data.paged
}, },
keys: {} keys: {}
}); });
@@ -41,6 +45,7 @@ export let cases = {
return Api.get({ return Api.get({
service: "UNASSIGNED_LIST", service: "UNASSIGNED_LIST",
params: { params: {
paged: data.paged
}, },
keys: {} keys: {}
}); });
@@ -164,7 +169,8 @@ export let cases = {
return Api.get({ return Api.get({
service: "SEARCH", service: "SEARCH",
params: dt, params: dt,
keys: {} keys: {},
paged: dt.paged
}) })
} }

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

@@ -151,7 +151,7 @@ export default {
programmatic: false, programmatic: false,
}, },
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(); return this.$parent.$parent.getCasesForVueTable(data);
}, },
customFilters: ["myfilter"], customFilters: ["myfilter"],
}, },
@@ -167,16 +167,23 @@ export default {
/** /**
* Get cases data by header * Get cases data by header
*/ */
getCasesForVueTable() { getCasesForVueTable(data) {
let that = this, let that = this,
dt; dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1);
paged = start + ',' + limit;
return new Promise((resolutionFunc, rejectionFunc) => { return new Promise((resolutionFunc, rejectionFunc) => {
let filters = {}; let filters = {};
_.forIn(this.filters, function(value, key) { _.forIn(this.filters, function(value, key) {
filters = {...filters, ...value}; filters = {...filters, ...value};
}); });
api.cases api.cases
.search(filters) .search({
filters,
paged:paged
})
.then((response) => { .then((response) => {
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);
resolutionFunc({ resolutionFunc({

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

@@ -90,7 +90,7 @@ export default {
programmatic: false, programmatic: false,
}, },
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(); return this.$parent.$parent.getCasesForVueTable(data);
}, },
}, },
pmDateFormat: "Y-m-d H:i:s", pmDateFormat: "Y-m-d H:i:s",
@@ -112,12 +112,18 @@ export default {
/** /**
* Get cases todo data * Get cases todo data
*/ */
getCasesForVueTable() { getCasesForVueTable(data) {
let that = this, let that = this,
dt; dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1);
paged = start + ',' + limit;
return new Promise((resolutionFunc, rejectionFunc) => { return new Promise((resolutionFunc, rejectionFunc) => {
api.cases api.cases
.draft() .draft({
paged: paged
})
.then((response) => { .then((response) => {
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);
resolutionFunc({ resolutionFunc({

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

@@ -107,7 +107,7 @@ export default {
programmatic: false, programmatic: false,
}, },
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(); return this.$parent.$parent.getCasesForVueTable(data);
}, },
}, },
translations: null, translations: null,
@@ -156,13 +156,18 @@ export default {
/** /**
* Get cases data by header * Get cases data by header
*/ */
getCasesForVueTable() { getCasesForVueTable(data) {
let that = this, let that = this,
dt; dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1);
paged = start + ',' + limit;
return new Promise((resolutionFunc, rejectionFunc) => { return new Promise((resolutionFunc, rejectionFunc) => {
api.cases api.cases
.myCases({ .myCases({
filter: that.filterHeader, filter: that.filterHeader,
paged: paged
}) })
.then((response) => { .then((response) => {
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);

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

@@ -119,7 +119,7 @@ export default {
programmatic: false, programmatic: false,
}, },
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(); return this.$parent.$parent.getCasesForVueTable(data);
}, },
}, },
pmDateFormat: "Y-m-d H:i:s", pmDateFormat: "Y-m-d H:i:s",
@@ -141,12 +141,18 @@ export default {
/** /**
* Get cases todo data * Get cases todo data
*/ */
getCasesForVueTable() { getCasesForVueTable(data) {
let that = this, let that = this,
dt; dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1);
paged = start + ',' + limit;
return new Promise((resolutionFunc, rejectionFunc) => { return new Promise((resolutionFunc, rejectionFunc) => {
api.cases api.cases
.paused() .paused({
paged: paged
})
.then((response) => { .then((response) => {
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);
resolutionFunc({ resolutionFunc({

14
resources/assets/js/home/Todo.vue
View File

@@ -112,7 +112,7 @@ export default {
programmatic: false, programmatic: false,
}, },
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(); return this.$parent.$parent.getCasesForVueTable(data);
}, },
}, },
pmDateFormat: "Y-m-d H:i:s", pmDateFormat: "Y-m-d H:i:s",
@@ -134,12 +134,18 @@ export default {
/** /**
* Get cases todo data * Get cases todo data
*/ */
getCasesForVueTable() { getCasesForVueTable(data) {
let that = this, let that = this,
dt; dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1);
paged = start + ',' + limit;
return new Promise((resolutionFunc, rejectionFunc) => { return new Promise((resolutionFunc, rejectionFunc) => {
api.cases api.cases
.todo() .todo({
paged: paged
})
.then((response) => { .then((response) => {
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);
resolutionFunc({ resolutionFunc({

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

@@ -116,7 +116,7 @@ export default {
programmatic: false, programmatic: false,
}, },
requestFunction(data) { requestFunction(data) {
return this.$parent.$parent.getCasesForVueTable(); return this.$parent.$parent.getCasesForVueTable(data);
}, },
}, },
pmDateFormat: "Y-m-d H:i:s", pmDateFormat: "Y-m-d H:i:s",
@@ -138,12 +138,18 @@ export default {
/** /**
* Get cases unassigned data * Get cases unassigned data
*/ */
getCasesForVueTable() { getCasesForVueTable(data) {
let that = this, let that = this,
dt; dt,
paged,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1);
paged = start + ',' + limit;
return new Promise((resolutionFunc, rejectionFunc) => { return new Promise((resolutionFunc, rejectionFunc) => {
api.cases api.cases
.unassigned() .unassigned({
paged: paged
})
.then((response) => { .then((response) => {
dt = that.formatDataResponse(response.data.data); dt = that.formatDataResponse(response.data.data);
resolutionFunc({ resolutionFunc({

2
workflow/engine/src/ProcessMaker/Services/Api/Home.php
View File

@@ -473,7 +473,7 @@ class Home extends Api
$result = []; $result = [];
$result['data'] = $list->getData(); $result['data'] = $list->getData();
// We will to enable always the pagination // We will to enable always the pagination
$result['total'] = $list->getLimit() + 1; $result['total'] = $list->getCounter();
return $result; return $result;
} catch (Exception $e) { } catch (Exception $e) {
throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage());