From 4d6604ab7a11b9a00fa346f6d401abaed91cac32 Mon Sep 17 00:00:00 2001 From: rajabxahmd Date: Mon, 17 Mar 2025 12:39:52 +0530 Subject: [PATCH 1/5] fix: improper currency formatting issue in kanban view --- frontend/src/pages/Deals.vue | 14 +++++++++++--- frontend/src/pages/Leads.vue | 14 +++++++++++--- frontend/src/pages/Tasks.vue | 14 +++++++++++--- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 578534b7..37b3dd70 100644 --- a/frontend/src/pages/Deals.vue +++ b/frontend/src/pages/Deals.vue @@ -387,9 +387,17 @@ function parseRows(rows, columns = []) { deals.value.data.rows.forEach((row) => { _rows[row] = deal[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType; + if (deals.value.data.view_type === 'kanban') { + fieldType = columns?.find( + (col) => (col.fieldname || col.value) == row, + )?.fieldtype + } + else { + 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..cbabb3e6 100644 --- a/frontend/src/pages/Leads.vue +++ b/frontend/src/pages/Leads.vue @@ -407,9 +407,17 @@ function parseRows(rows, columns = []) { leads.value?.data.rows.forEach((row) => { _rows[row] = lead[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType; + if (leads.value.data.view_type === 'kanban') { + fieldType = columns?.find( + (col) => (col.fieldname || col.value) == row, + )?.fieldtype + } + else { + 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..3a17614f 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -262,9 +262,17 @@ function parseRows(rows, columns = []) { tasks.value?.data.rows.forEach((row) => { _rows[row] = task[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType; + if (tasks.value.data.view_type === 'kanban') { + fieldType = columns?.find( + (col) => (col.fieldname || col.value) == row, + )?.fieldtype + } + else { + fieldType = columns?.find( + (col) => (col.key || col.value) == row, + )?.type + } if ( fieldType && From 26703070c9dc0ff625e5148a0956459691562a0f Mon Sep 17 00:00:00 2001 From: rajabxahmd Date: Wed, 19 Mar 2025 16:09:46 +0530 Subject: [PATCH 2/5] Update frontend/src/pages/Deals.vue Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frontend/src/pages/Deals.vue | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 37b3dd70..527a57e6 100644 --- a/frontend/src/pages/Deals.vue +++ b/frontend/src/pages/Deals.vue @@ -387,17 +387,11 @@ function parseRows(rows, columns = []) { deals.value.data.rows.forEach((row) => { _rows[row] = deal[row] - let fieldType; - if (deals.value.data.view_type === 'kanban') { - fieldType = columns?.find( - (col) => (col.fieldname || col.value) == row, - )?.fieldtype - } - else { - fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type - } + let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' + let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' + let fieldType = columns?.find( + (col) => (col[fieldname] || col.value) == row, + )?.[fieldtype] if ( fieldType && From 5bba8459182ce1e139ee32058a32f1a901f85e0d Mon Sep 17 00:00:00 2001 From: rajabxahmd Date: Wed, 19 Mar 2025 16:19:54 +0530 Subject: [PATCH 3/5] Update frontend/src/pages/Tasks.vue Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frontend/src/pages/Tasks.vue | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue index 3a17614f..93775863 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -262,17 +262,11 @@ function parseRows(rows, columns = []) { tasks.value?.data.rows.forEach((row) => { _rows[row] = task[row] - let fieldType; - if (tasks.value.data.view_type === 'kanban') { - fieldType = columns?.find( - (col) => (col.fieldname || col.value) == row, - )?.fieldtype - } - else { - fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type - } + let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' + let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' + let fieldType = columns?.find( + (col) => (col[fieldname] || col.value) == row, + )?.[fieldtype] if ( fieldType && From 8a6b6b65e1e8f95ac63ba5a9f956d523130172d9 Mon Sep 17 00:00:00 2001 From: rajabxahmd Date: Wed, 19 Mar 2025 16:20:05 +0530 Subject: [PATCH 4/5] Update frontend/src/pages/Leads.vue Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frontend/src/pages/Leads.vue | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue index cbabb3e6..03c5a314 100644 --- a/frontend/src/pages/Leads.vue +++ b/frontend/src/pages/Leads.vue @@ -407,17 +407,11 @@ function parseRows(rows, columns = []) { leads.value?.data.rows.forEach((row) => { _rows[row] = lead[row] - let fieldType; - if (leads.value.data.view_type === 'kanban') { - fieldType = columns?.find( - (col) => (col.fieldname || col.value) == row, - )?.fieldtype - } - else { - fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type - } + let fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' + let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' + let fieldType = columns?.find( + (col) => (col[fieldname] || col.value) == row, + )?.[fieldtype] if ( fieldType && From a32749533fc42406f52dc6af3a77b66d9042e898 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Fri, 21 Mar 2025 16:24:25 +0530 Subject: [PATCH 5/5] fix: code cleanup --- frontend/src/pages/Deals.vue | 16 ++++++++++------ frontend/src/pages/Leads.vue | 16 ++++++++++------ frontend/src/pages/Tasks.vue | 12 +++++++----- 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 527a57e6..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,16 +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 fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' - let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' - let fieldType = columns?.find( - (col) => (col[fieldname] || col.value) == row, - )?.[fieldtype] + 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 03c5a314..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,16 +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 fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' - let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' - let fieldType = columns?.find( - (col) => (col[fieldname] || col.value) == row, - )?.[fieldtype] + 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 93775863..894f96d8 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -257,16 +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 fieldname = deals.value.data.view_type === 'kanban' ? 'fieldname' : 'key' - let fieldtype = deals.value.data.view_type === 'kanban' ? 'fieldtype' : 'type' - let fieldType = columns?.find( - (col) => (col[fieldname] || col.value) == row, - )?.[fieldtype] + let fieldType = columns?.find((col) => (col[key] || col.value) == row)?.[ + type + ] if ( fieldType &&