From 5a8ef578c3e9d27f5984372ed07d522bbaf36e14 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 26 May 2025 14:16:43 +0300
Subject: [PATCH] SP-1493-data-formatting

---
 .../widgets/power_clamp_energy_data_widget.dart          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart b/lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart
index 8ae6cd7f..e8f802cd 100644
--- a/lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart
+++ b/lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart
@@ -69,13 +69,18 @@ class PowerClampEnergyDataWidget extends StatelessWidget {
                       PowerClampEnergyStatus(
                         iconPath: Assets.powerActiveIcon,
                         title: 'Active',
-                        value: _valueFromCode('EnergyConsumed', generalDataPoints),
+                        value: _valueFromCode('ActivePower', generalDataPoints),
                         unit: 'W',
                       ),
                       PowerClampEnergyStatus(
                         iconPath: Assets.voltMeterIcon,
                         title: 'Current',
-                        value: _valueFromCode('Current', generalDataPoints),
+                        value: _valueFromCode('Current', generalDataPoints)
+                            .replaceAllMapped(
+                              RegExp(r'(\d{1,3})(?=(\d{3})+(?!\d))'),
+                              (Match m) => '${m[1]}.',
+                            )
+                            .replaceAll('.0', ''),
                         unit: 'A',
                       ),
                       PowerClampEnergyStatus(