From ae41e50a4cbebf14533de0929d83ec395f11a0a1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 22 Jan 2025 17:44:55 +0530 Subject: [PATCH] fix: edit call log and layout --- frappe-ui | 2 +- .../src/components/Activities/CallArea.vue | 43 +- .../components/Modals/CallLogDetailModal.vue | 261 ++++++++++++ .../src/components/Modals/CallLogModal.vue | 402 ++++++++---------- frontend/src/pages/CallLogs.vue | 21 +- frontend/src/utils/callLog.js | 8 +- 6 files changed, 496 insertions(+), 241 deletions(-) create mode 100644 frontend/src/components/Modals/CallLogDetailModal.vue diff --git a/frappe-ui b/frappe-ui index 863eaae9..aea80633 160000 --- a/frappe-ui +++ b/frappe-ui @@ -1 +1 @@ -Subproject commit 863eaae9ada2edb287fc09fb21d05212bb5eebe9 +Subproject commit aea806331c179cc0cdb89b6a2f9de2130bd1061f diff --git a/frontend/src/components/Activities/CallArea.vue b/frontend/src/components/Activities/CallArea.vue index d2689580..ba54557e 100644 --- a/frontend/src/components/Activities/CallArea.vue +++ b/frontend/src/components/Activities/CallArea.vue @@ -1,14 +1,14 @@ - + @@ -89,7 +92,12 @@ - + + diff --git a/frontend/src/components/Modals/CallLogDetailModal.vue b/frontend/src/components/Modals/CallLogDetailModal.vue new file mode 100644 index 00000000..8f6758d4 --- /dev/null +++ b/frontend/src/components/Modals/CallLogDetailModal.vue @@ -0,0 +1,261 @@ + + + + + diff --git a/frontend/src/components/Modals/CallLogModal.vue b/frontend/src/components/Modals/CallLogModal.vue index fb8ec499..1932c285 100644 --- a/frontend/src/components/Modals/CallLogModal.vue +++ b/frontend/src/components/Modals/CallLogModal.vue @@ -1,245 +1,209 @@ diff --git a/frontend/src/utils/callLog.js b/frontend/src/utils/callLog.js index 4c989d6c..0a64eb32 100644 --- a/frontend/src/utils/callLog.js +++ b/frontend/src/utils/callLog.js @@ -14,13 +14,13 @@ export function getCallLogDetail(row, log, columns = []) { } } else if (row === 'caller') { return { - label: log._caller.label, - image: log._caller.image, + label: log._caller?.label, + image: log._caller?.image, } } else if (row === 'receiver') { return { - label: log._receiver.label, - image: log._receiver.image, + label: log._receiver?.label, + image: log._receiver?.image, } } else if (row === 'type') { return {