fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in feature/PMCORE-3121 (pull request #8081)

Browse Source 
PMCORE-3121

Approved-by: Rodrigo Quelca
This commit is contained in:
Henry Jonathan Quispe Quispe
2021-08-30 20:33:55 +00:00
committed by Rodrigo Quelca
parent 0c94b4f42c 591dce48ec
commit d6aae5e289
5 changed files with 29 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,6 +81,7 @@ export default {
getCases(data) {
let that = this,
dt,
typeList = that.data.pageParent == "inbox"? "todo": that.data.pageParent,
start = 0,
limit = data.limit,
filters = {};
@@ -92,7 +93,7 @@ export default {
filters[item.filterVar] = item.value;
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases[that.data.pageParent](filters)
api.cases[typeList](filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);
resolutionFunc({
@@ -112,6 +113,7 @@ export default {
let that = this,
dt,
paged,
typeList = that.data.pageParent == "inbox"? "todo": that.data.pageParent,
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
filters = {};
@@ -126,7 +128,7 @@ export default {
}
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases[that.data.pageParent]
api.cases[typeList]
(filters)
.then((response) => {
dt = that.formatDataResponse(response.data.data);

19
resources/assets/js/home/Draft/defaultMixins.js
View File

@@ -77,19 +77,9 @@ export default {
getCases(data) {
let that = this,
dt,
start = 0,
limit = data.limit,
filters = {};
filters = {
paged: "0," + limit,
};
_.forIn(this.filters, function (item, key) {
if (item.value && item.value != "") {
if(filters && item.value) {
filters[item.filterVar] = item.value;
}
}
filters[item.filterVar] = item.value;
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases
@@ -116,13 +106,12 @@ export default {
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
filters = {};
paged = start + "," + limit;
filters = {
paged: paged,
limit: limit,
offset: start
};
_.forIn(this.filters, function (item, key) {
if (item.value && item.value != "") {
if (filters && item.value) {
filters[item.filterVar] = item.value;
}
});

29
resources/assets/js/home/Inbox/defaultMixins.js
View File

@@ -36,7 +36,7 @@ export default {
},
optionsVueView: {
limit: 10,
dblClick:(event, item, options)=>{
dblClick: (event, item, options) => {
this.openCase(item);
},
headings: {
@@ -79,13 +79,7 @@ export default {
getCases(data) {
let that = this,
dt,
start = 0,
limit = data.limit,
filters = {};
filters = {
paged: "0," + limit,
};
_.forIn(this.filters, function (item, key) {
filters[item.filterVar] = item.value;
});
@@ -114,15 +108,14 @@ export default {
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
filters = {};
paged = start + "," + limit;
filters = {
paged: paged,
limit: limit,
offset: start
};
_.forIn(this.filters, function (item, key) {
if(filters && item.value) {
filters[item.filterVar] = item.value;
}
if (filters && item.value) {
filters[item.filterVar] = item.value;
}
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases
@@ -145,10 +138,10 @@ export default {
* @returns
*/
formatColumnSettings(headings) {
let res=[];
_.forEach(headings, function(value, key) {
if(key != "actions"){
res.push({value,key});
let res = [];
_.forEach(headings, function (value, key) {
if (key != "actions") {
res.push({ value, key });
}
});
return res;
@@ -169,7 +162,7 @@ export default {
*/
onUpdateColumnSettings(columns) {
let cols = columns;
if(_.findIndex(cols, 'actions') == -1){
if (_.findIndex(cols, 'actions') == -1) {
cols.push("actions");
}
this.columns = cols;

17
resources/assets/js/home/Paused/defaultMixins.js
View File

@@ -78,17 +78,9 @@ export default {
getCases(data) {
let that = this,
dt,
start = 0,
limit = data.limit,
filters = {};
filters = {
paged: "0," + limit,
};
_.forIn(this.filters, function (item, key) {
if(filters && item.value) {
filters[item.filterVar] = item.value;
}
filters[item.filterVar] = item.value;
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases
@@ -115,13 +107,12 @@ export default {
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
filters = {};
paged = start + "," + limit;
filters = {
paged: paged,
limit: limit,
offset: start
};
_.forIn(this.filters, function (item, key) {
if (item.value && item.value != "") {
if (filters && item.value) {
filters[item.filterVar] = item.value;
}
});

19
resources/assets/js/home/Unassigned/defaultMixins.js
View File

@@ -78,17 +78,9 @@ export default {
getCases(data) {
let that = this,
dt,
start = 0,
limit = data.limit,
filters = {};
filters = {
paged: "0," + limit,
};
_.forIn(this.filters, function (item, key) {
if(filters && item.value) {
filters[item.filterVar] = item.value;
}
filters[item.filterVar] = item.value;
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases
@@ -115,13 +107,14 @@ export default {
limit = data.limit,
start = data.page === 1 ? 0 : limit * (data.page - 1),
filters = {};
paged = start + "," + limit;
filters = {
paged: paged,
limit: limit,
offset: start
};
_.forIn(this.filters, function (item, key) {
filters[item.filterVar] = item.value;
if (filters && item.value) {
filters[item.filterVar] = item.value;
}
});
return new Promise((resolutionFunc, rejectionFunc) => {
api.cases