diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 578534b7..73e7f62c 100644 --- a/frontend/src/pages/Deals.vue +++ b/frontend/src/pages/Deals.vue @@ -350,7 +350,9 @@ function getGroupedByRows(listRows, groupByField, columns) { if (!option) { filteredRows = listRows.filter((row) => !row[groupByField.fieldname]) } else { - filteredRows = listRows.filter((row) => row[groupByField.fieldname] == option) + filteredRows = listRows.filter( + (row) => row[groupByField.fieldname] == option, + ) } let groupDetail = { @@ -382,14 +384,18 @@ function getKanbanRows(data, columns) { } function parseRows(rows, columns = []) { + let view_type = deals.value.data.view_type + let key = view_type === 'kanban' ? 'fieldname' : 'key' + let type = view_type === 'kanban' ? 'fieldtype' : 'type' + return rows.map((deal) => { let _rows = {} deals.value.data.rows.forEach((row) => { _rows[row] = deal[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[ + type + ] if ( fieldType && diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue index 98afce8f..9d65cbd5 100644 --- a/frontend/src/pages/Leads.vue +++ b/frontend/src/pages/Leads.vue @@ -370,7 +370,9 @@ function getGroupedByRows(listRows, groupByField, columns) { if (!option) { filteredRows = listRows.filter((row) => !row[groupByField.fieldname]) } else { - filteredRows = listRows.filter((row) => row[groupByField.fieldname] == option) + filteredRows = listRows.filter( + (row) => row[groupByField.fieldname] == option, + ) } let groupDetail = { @@ -402,14 +404,18 @@ function getKanbanRows(data, columns) { } function parseRows(rows, columns = []) { + let view_type = leads.value.data.view_type + let key = view_type === 'kanban' ? 'fieldname' : 'key' + let type = view_type === 'kanban' ? 'fieldtype' : 'type' + return rows.map((lead) => { let _rows = {} leads.value?.data.rows.forEach((row) => { _rows[row] = lead[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[ + type + ] if ( fieldType && diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue index 69662d9e..894f96d8 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -257,14 +257,18 @@ function getKanbanRows(data, columns) { } function parseRows(rows, columns = []) { + let view_type = tasks.value.data.view_type + let key = view_type === 'kanban' ? 'fieldname' : 'key' + let type = view_type === 'kanban' ? 'fieldtype' : 'type' + return rows.map((task) => { let _rows = {} tasks.value?.data.rows.forEach((row) => { _rows[row] = task[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[ + type + ] if ( fieldType &&