diff --git a/resources/assets/js/home/CustomCaseList/defaultMixins.js b/resources/assets/js/home/CustomCaseList/defaultMixins.js index 1e96cdeee..36aa9505c 100644 --- a/resources/assets/js/home/CustomCaseList/defaultMixins.js +++ b/resources/assets/js/home/CustomCaseList/defaultMixins.js @@ -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); diff --git a/resources/assets/js/home/Draft/defaultMixins.js b/resources/assets/js/home/Draft/defaultMixins.js index db7efd865..10a50f68f 100644 --- a/resources/assets/js/home/Draft/defaultMixins.js +++ b/resources/assets/js/home/Draft/defaultMixins.js @@ -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; } }); diff --git a/resources/assets/js/home/Inbox/defaultMixins.js b/resources/assets/js/home/Inbox/defaultMixins.js index 65a8ee5a2..8c19df95c 100644 --- a/resources/assets/js/home/Inbox/defaultMixins.js +++ b/resources/assets/js/home/Inbox/defaultMixins.js @@ -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; diff --git a/resources/assets/js/home/Paused/defaultMixins.js b/resources/assets/js/home/Paused/defaultMixins.js index 24c94a3b2..0b73b0063 100644 --- a/resources/assets/js/home/Paused/defaultMixins.js +++ b/resources/assets/js/home/Paused/defaultMixins.js @@ -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; } }); diff --git a/resources/assets/js/home/Unassigned/defaultMixins.js b/resources/assets/js/home/Unassigned/defaultMixins.js index cdfc5873d..7281b4b54 100644 --- a/resources/assets/js/home/Unassigned/defaultMixins.js +++ b/resources/assets/js/home/Unassigned/defaultMixins.js @@ -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