From 30acf641142b6d4548488b0d465963944f120d68 Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Thu, 14 Nov 2024 16:54:19 +0530 Subject: [PATCH 1/3] Improved: Added a function to set the ion-badge color based on log status and updated the 'Failed Records' icon properties (#680) --- src/views/DataManagerLogDetails.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/views/DataManagerLogDetails.vue b/src/views/DataManagerLogDetails.vue index 5d80031d..802062da 100644 --- a/src/views/DataManagerLogDetails.vue +++ b/src/views/DataManagerLogDetails.vue @@ -92,10 +92,10 @@

{{ translate('Finished') }}

- {{ translate(getStatusDesc(log.statusId)) }} + {{ translate(getStatusDesc(log.statusId)) }}
- +

{{ translate('Failed records') }}

@@ -257,6 +257,19 @@ export default defineComponent ({ } catch (error) { logger.error(error); } + }, + getLogStatusColor(statusId) { + if (statusId === 'SERVICE_FINISHED') { + return 'success'; + } else if (statusId === 'SERVICE_RUNNING') { + return 'dark'; + } else if (statusId === 'SERVICE_FAILED') { + return 'danger'; + } else if (statusId === 'SERVICE_PENDING') { + return 'medium'; + } else { + return 'medium'; + } } }, setup() { From ec1759cf40f229a191dced758c493556458137fd Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Tue, 26 Nov 2024 12:48:14 +0530 Subject: [PATCH 2/3] Improved: updated the failed record icon properties & removed unnecessary case in getLogStatusColor function(#680) --- src/views/DataManagerLogDetails.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/DataManagerLogDetails.vue b/src/views/DataManagerLogDetails.vue index 802062da..de7fc3b7 100644 --- a/src/views/DataManagerLogDetails.vue +++ b/src/views/DataManagerLogDetails.vue @@ -94,8 +94,8 @@ {{ translate(getStatusDesc(log.statusId)) }} -
- +
+

{{ translate('Failed records') }}

@@ -265,8 +265,6 @@ export default defineComponent ({ return 'dark'; } else if (statusId === 'SERVICE_FAILED') { return 'danger'; - } else if (statusId === 'SERVICE_PENDING') { - return 'medium'; } else { return 'medium'; } From 8f1a97ee22813965a5314200050ea50c07552aec Mon Sep 17 00:00:00 2001 From: R-Sourabh Date: Tue, 26 Nov 2024 12:58:55 +0530 Subject: [PATCH 3/3] Improved: updated the failed records icon properties & wrapped it in ion-button(#680) --- src/views/DataManagerLogDetails.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/DataManagerLogDetails.vue b/src/views/DataManagerLogDetails.vue index de7fc3b7..3be5ca21 100644 --- a/src/views/DataManagerLogDetails.vue +++ b/src/views/DataManagerLogDetails.vue @@ -95,7 +95,9 @@ {{ translate(getStatusDesc(log.statusId)) }}
- + + +

{{ translate('Failed records') }}