diff --git a/resources/assets/js/admin/settings/customCaseList/Tables.vue b/resources/assets/js/admin/settings/customCaseList/Tables.vue index 878139355..59d34a59b 100644 --- a/resources/assets/js/admin/settings/customCaseList/Tables.vue +++ b/resources/assets/js/admin/settings/customCaseList/Tables.vue @@ -250,8 +250,8 @@ export default { * @param {Array} data */ filterDataToExport(data) { - var dataExport = []; - dataExport.push({ + var dataExport; + dataExport = { type: data['type'], name: data['name'], description: data['description'], @@ -264,7 +264,7 @@ export default { iconColorScreen: data['iconColorScreen'], createDate: data['createDate'], updateDate: data['updateDate'] - }); + }; return dataExport; }, /** diff --git a/resources/assets/js/components/vuetable/GroupedCell.vue b/resources/assets/js/components/vuetable/GroupedCell.vue index 93b7c55d8..dfd0d85b2 100644 --- a/resources/assets/js/components/vuetable/GroupedCell.vue +++ b/resources/assets/js/components/vuetable/GroupedCell.vue @@ -54,7 +54,7 @@ export default { data() { return { //Color map for ["In Progress", "overdue", "inDraft", "paused", "unnasigned"] - colorMap: ["green", "red", "orange", "aqua", "silver"], + colorMap: ["green", "red", "orange", "blue", "silver"], id: "avatar-" + _.random(1000000), statusId: "status-" + _.random(1000000) }; diff --git a/resources/assets/js/components/vuetable/TaskCell.vue b/resources/assets/js/components/vuetable/TaskCell.vue index b8fd56ad3..748dde102 100644 --- a/resources/assets/js/components/vuetable/TaskCell.vue +++ b/resources/assets/js/components/vuetable/TaskCell.vue @@ -1,13 +1,21 @@