refactor: streamline value calculations in FlushMountedPresenceSensorControlView

lib/pages/common/buttons/search_reset_buttons.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 
 class SearchResetButtons extends StatelessWidget {
   const SearchResetButtons({
@@ -17,10 +17,8 @@ class SearchResetButtons extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
-      mainAxisSize: MainAxisSize.min,
       children: [
         Column(
-          mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             const SizedBox(height: 25),

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -108,7 +108,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 return DeviceManagementBody(
                     devices: deviceState.filteredDevices);
               } else {
-                return const DeviceManagementBody(devices: []);
+                return const Center(child: Text('Error fetching Devices'));
               }
             },
           );

lib/pages/device_managment/all_devices/widgets/device_managment_body.dart

@@ -72,7 +72,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Container(
                           padding: isLargeScreenSize(context)

lib/pages/device_managment/all_devices/widgets/device_search_filters.dart

@@ -14,29 +14,29 @@ class DeviceSearchFilters extends StatefulWidget {
 
 class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     with HelperResponsiveLayout {
-  late final TextEditingController _unitNameController;
-  late final TextEditingController _productNameController;
+  final _unitNameController = TextEditingController();
+  final _productNameController = TextEditingController();
 
-  @override
-  void initState() {
-    _unitNameController = TextEditingController();
-    _productNameController = TextEditingController();
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Wrap(
-      alignment: WrapAlignment.start,
-      runAlignment: WrapAlignment.start,
-      crossAxisAlignment: WrapCrossAlignment.center,
-      spacing: 20,
-      runSpacing: 10,
-      children: [
+  List<Widget> get _widgets => [
         _buildSearchField("Space Name", _unitNameController, 200),
         _buildSearchField("Device Name / Product Name", _productNameController, 300),
         _buildSearchResetButtons(),
-      ],
+      ];
+
+  @override
+  Widget build(BuildContext context) {
+    if (isExtraLargeScreenSize(context)) {
+      return Row(
+        children: _widgets
+            .map((e) => Padding(padding: const EdgeInsets.all(10), child: e))
+            .toList(),
+      );
+    }
+
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: _widgets,
     );
   }
 

lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart

@@ -24,11 +24,10 @@ class FlushMountedPresenceSensorChangeValueEvent
     extends FlushMountedPresenceSensorEvent {
   final int value;
   final String code;
-  final bool isBatchControl;
+
   const FlushMountedPresenceSensorChangeValueEvent({
     required this.value,
     required this.code,
-    this.isBatchControl = false,
   });
 
   @override

lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart

@@ -75,7 +75,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
+          value: (model.nearDetection / 100).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -92,7 +92,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
+          value: (model.farDetection / 100).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -109,7 +109,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: model.presenceDelay.toDouble(),
+          value: model.sensiReduce.toDouble(),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
@@ -117,7 +117,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
                 FlushMountedPresenceSensorBatchControlEvent(
                   deviceIds: devicesIds,
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
               ),
@@ -137,19 +137,21 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: (model.presenceDelay / 10).toDouble(),
           title: 'Target Confirm Time:',
           description: 's',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorBatchControlEvent(
-                  deviceIds: devicesIds,
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
-                  value: value,
-                ),
-              ),
+          minValue: 0.0,
+          maxValue: 0.5,
+          steps: 0.1,
+          valuesPercision: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
+                      code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                      value: (value * 10).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
           value: ((model.noneDelay / 10).toDouble()),

lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart

@@ -15,7 +15,7 @@ import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_la
 
 class FlushMountedPresenceSensorControlView extends StatelessWidget
     with HelperResponsiveLayout {
-  const FlushMountedPresenceSensorControlView({super.key, required this.device});
+  const FlushMountedPresenceSensorControlView({required this.device, super.key});
 
   final AllDevicesModel device;
 
@@ -113,7 +113,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
+          value: (model.nearDetection / 100).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -129,7 +129,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
+          value: (model.farDetection / 100).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -145,20 +145,20 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.presenceDelay.toDouble()),
+          value: model.sensiReduce.toDouble(),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
                 FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
               ),
         ),
         PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
+          value: model.occurDistReduce.toDouble(),
           title: 'Indent Level:',
           minValue: 0,
           maxValue: 3,
@@ -171,21 +171,23 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: (model.presenceDelay / 10).toDouble(),
+          valuesPercision: 1,
           title: 'Target Confirm Time:',
           description: 's',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
-                  value: value,
-                ),
-              ),
+          minValue: 0.0,
+          maxValue: 0.5,
+          steps: 0.1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                      value: (value * 10).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
-          value: ((model.noneDelay / 10).toDouble()),
+          value: (model.noneDelay / 10).toDouble(),
           description: 's',
           title: 'Disappe Delay:',
           minValue: 20,

lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart

@@ -217,31 +217,29 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     try {
       var status =
           await DevicesManagementApi().getPowerClampInfo(event.deviceId);
-      deviceStatus = PowerClampModel.fromJson(status as Map<String, Object?>? ??{});
-      final phaseADataPoints = deviceStatus.status.phaseA.dataPoints;
-      final phaseBDataPoints = deviceStatus.status.phaseB.dataPoints;
-      final phaseCDataPoints = deviceStatus.status.phaseC.dataPoints;
+      deviceStatus = PowerClampModel.fromJson(status);
+
       phaseData = [
         {
           'name': 'Phase A',
-          'voltage': '${(phaseADataPoints.elementAtOrNull(0)?.value as num? ?? 0) / 10} V',
-          'current': '${(phaseADataPoints.elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
-          'activePower': '${phaseADataPoints.elementAtOrNull(2)?.value??'N/A'} W',
-          'powerFactor': '${phaseADataPoints.elementAtOrNull(3)?.value??'N/A'}',
+          'voltage': '${deviceStatus.status.phaseA.dataPoints[0].value / 10} V',
+          'current': '${deviceStatus.status.phaseA.dataPoints[1].value / 10} A',
+          'activePower': '${deviceStatus.status.phaseA.dataPoints[2].value} W',
+          'powerFactor': '${deviceStatus.status.phaseA.dataPoints[3].value}',
         },
         {
           'name': 'Phase B',
-          'voltage': '${(phaseBDataPoints .elementAtOrNull(0)?.value  as num? ?? 0) / 10} V',
-          'current': '${(phaseBDataPoints .elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
-          'activePower': '${phaseBDataPoints.elementAtOrNull(2)?.value??'N/A'} W',
-          'powerFactor': '${phaseBDataPoints.elementAtOrNull(3)?.value??'N/A'}',
+          'voltage': '${deviceStatus.status.phaseB.dataPoints[0].value / 10} V',
+          'current': '${deviceStatus.status.phaseB.dataPoints[1].value / 10} A',
+          'activePower': '${deviceStatus.status.phaseB.dataPoints[2].value} W',
+          'powerFactor': '${deviceStatus.status.phaseB.dataPoints[3].value}',
         },
         {
           'name': 'Phase C',
-          'voltage': '${(phaseCDataPoints.elementAtOrNull(0)?.value as num? ?? 0) / 10} V',
-          'current': '${(phaseCDataPoints.elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
-          'activePower': '${phaseCDataPoints.elementAtOrNull(2)?.value ?? 'N/A'} W',
-          'powerFactor': '${phaseCDataPoints.elementAtOrNull(3)?.value ?? 'N/A'}',
+          'voltage': '${deviceStatus.status.phaseC.dataPoints[0].value / 10} V',
+          'current': '${deviceStatus.status.phaseC.dataPoints[1].value / 10} A',
+          'activePower': '${deviceStatus.status.phaseC.dataPoints[2].value} W',
+          'powerFactor': '${deviceStatus.status.phaseC.dataPoints[3].value}',
         },
       ];
       emit(GetDeviceStatus());
@@ -787,7 +785,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
   void selectDateRange() async {
     DateTime startDate = dateTime!;
     DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1)
-        .subtract(const Duration(days: 1));
+        .subtract(Duration(days: 1));
     String formattedEndDate = DateFormat('dd/MM/yyyy').format(endDate);
     endChartDate = ' - $formattedEndDate';
   }

lib/pages/device_managment/power_clamp/models/power_clamp_model.dart

@@ -12,9 +12,9 @@ class PowerClampModel {
 
   factory PowerClampModel.fromJson(Map<String, dynamic> json) {
     return PowerClampModel(
-      productUuid: json['productUuid'] as String? ?? '',
-      productType: json['productType'] as String? ?? '',
-      status: PowerStatus.fromJson(json['status'] as Map<String, dynamic>? ?? {}),
+      productUuid: json['productUuid'],
+      productType: json['productType'],
+      status: PowerStatus.fromJson(json['status']),
     );
   }
 
@@ -26,7 +26,7 @@ class PowerClampModel {
     return PowerClampModel(
       productUuid: productUuid ?? this.productUuid,
       productType: productType ?? this.productType,
-      status: statusPower ?? status,
+      status: statusPower ?? this.status,
     );
   }
 }
@@ -46,10 +46,12 @@ class PowerStatus {
 
   factory PowerStatus.fromJson(Map<String, dynamic> json) {
     return PowerStatus(
-        phaseA: Phase.fromJson(json['phaseA']as List<dynamic>? ?? []),
-        phaseB: Phase.fromJson(json['phaseB']as List<dynamic>? ?? []),
-        phaseC: Phase.fromJson(json['phaseC']as List<dynamic>? ?? []),
-        general: Phase.fromJson(json['general']as List<dynamic>? ?? []
+        phaseA: Phase.fromJson(json['phaseA']),
+        phaseB: Phase.fromJson(json['phaseB']),
+        phaseC: Phase.fromJson(json['phaseC']),
+        general: Phase.fromJson(json['general']
+            // List<DataPoint>.from(
+            //     json['general'].map((x) => DataPoint.fromJson(x))),
             ));
   }
 }
@@ -67,30 +69,30 @@ class Phase {
 }
 
 class DataPoint {
-  final String? code;
-  final String? customName;
-  final int? dpId;
-  final int? time;
-  final String? type;
-  final dynamic value;
+  dynamic code;
+  dynamic customName;
+  dynamic dpId;
+  dynamic time;
+  dynamic type;
+  dynamic value;
 
   DataPoint({
-    this.code,
-    this.customName,
-    this.dpId,
-    this.time,
-    this.type,
-    this.value,
+    required this.code,
+    required this.customName,
+    required this.dpId,
+    required this.time,
+    required this.type,
+    required this.value,
   });
 
   factory DataPoint.fromJson(Map<String, dynamic> json) {
     return DataPoint(
-      code: json['code'] as String?,
-      customName: json['customName'] as String?,
-      dpId: json['dpId'] as int?,
-      time: json['time'] as int?,
-      type: json['type'] as String?,
-      value: json['value'] as dynamic,
+      code: json['code'],
+      customName: json['customName'],
+      dpId: json['dpId'],
+      time: json['time'],
+      type: json['type'],
+      value: json['value'],
     );
   }
 }

lib/pages/device_managment/power_clamp/view/power_chart.dart

@@ -1,5 +1,5 @@
-import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
+import 'package:fl_chart/fl_chart.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class EnergyConsumptionPage extends StatefulWidget {
@@ -10,8 +10,7 @@ class EnergyConsumptionPage extends StatefulWidget {
   final Widget widget;
   final Function()? onTap;
 
-  const EnergyConsumptionPage({
-    super.key,
+  EnergyConsumptionPage({
     required this.chartData,
     required this.totalConsumption,
     required this.date,
@@ -92,12 +91,11 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
             ],
           ),
           Column(
-            mainAxisSize: MainAxisSize.min,
             children: [
               Padding(
                 padding: const EdgeInsets.only(top: 10),
                 child: SizedBox(
-                  height: MediaQuery.sizeOf(context).height * 0.09,
+                  height: MediaQuery.of(context).size.height * 0.11,
                   child: LineChart(
                     LineChartData(
                       lineTouchData: LineTouchData(
@@ -153,7 +151,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                                   child: RotatedBox(
                                     quarterTurns: -1,
                                     child: Text(_chartData[index].time,
-                                        style: const TextStyle(fontSize: 10)),
+                                        style: TextStyle(fontSize: 10)),
                                   ),
                                 );
                               }
@@ -192,8 +190,8 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                           spots: _chartData
                               .asMap()
                               .entries
-                              .map((entry) => FlSpot(
-                                  entry.key.toDouble(), entry.value.consumption))
+                              .map((entry) => FlSpot(entry.key.toDouble(),
+                                  entry.value.consumption))
                               .toList(),
                           isCurved: true,
                           color: ColorsManager.primaryColor.withOpacity(0.6),
@@ -220,7 +218,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                       borderData: FlBorderData(
                         show: false,
                         border: Border.all(
-                          color: const Color(0xff023DFE).withOpacity(0.7),
+                          color: Color(0xff023DFE).withOpacity(0.7),
                           width: 10,
                         ),
                       ),
@@ -255,9 +253,11 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                         child: InkWell(
                           onTap: widget.onTap,
                           child: Center(
-                            child: Padding(
-                              padding: const EdgeInsets.all(5),
-                              child: Text(widget.date),
+                            child: SizedBox(
+                              child: Padding(
+                                padding: const EdgeInsets.all(5),
+                                child: Text(widget.date),
+                              ),
                             ),
                           ),
                         ),

lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart

@@ -12,7 +12,8 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 //Smart Power Clamp
-class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayout {
+class SmartPowerDeviceControl extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const SmartPowerDeviceControl({super.key, required this.deviceId});
@@ -24,27 +25,27 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
         ..add(SmartPowerFetchDeviceEvent(deviceId)),
       child: BlocBuilder<SmartPowerBloc, SmartPowerState>(
         builder: (context, state) {
-          final blocProvider = BlocProvider.of<SmartPowerBloc>(context);
+          final _blocProvider = BlocProvider.of<SmartPowerBloc>(context);
 
           if (state is SmartPowerLoading) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is FakeState) {
             return _buildStatusControls(
-              currentPage: blocProvider.currentPage,
+              currentPage: _blocProvider.currentPage,
               context: context,
-              blocProvider: blocProvider,
+              blocProvider: _blocProvider,
             );
           } else if (state is GetDeviceStatus) {
             return _buildStatusControls(
-              currentPage: blocProvider.currentPage,
+              currentPage: _blocProvider.currentPage,
               context: context,
-              blocProvider: blocProvider,
+              blocProvider: _blocProvider,
             );
           } else if (state is FilterRecordsState) {
             return _buildStatusControls(
-              currentPage: blocProvider.currentPage,
+              currentPage: _blocProvider.currentPage,
               context: context,
-              blocProvider: blocProvider,
+              blocProvider: _blocProvider,
             );
           }
           return const Center(child: CircularProgressIndicator());
@@ -59,7 +60,7 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
     required SmartPowerBloc blocProvider,
     required int currentPage,
   }) {
-    PageController pageController = PageController(initialPage: currentPage);
+    PageController _pageController = PageController(initialPage: currentPage);
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       child: DeviceControlsContainer(
@@ -84,31 +85,25 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                   PowerClampInfoCard(
                     iconPath: Assets.powerActiveIcon,
                     title: 'Active',
-                    value: blocProvider.deviceStatus.status.general.dataPoints
-                            .elementAtOrNull(2)
-                            ?.value
-                            .toString() ??
-                        '',
+                    value: blocProvider
+                        .deviceStatus.status.general.dataPoints[2].value
+                        .toString(),
                     unit: '',
                   ),
                   PowerClampInfoCard(
                     iconPath: Assets.voltMeterIcon,
                     title: 'Current',
-                    value: blocProvider.deviceStatus.status.general.dataPoints
-                            .elementAtOrNull(1)
-                            ?.value
-                            .toString() ??
-                        '',
+                    value: blocProvider
+                        .deviceStatus.status.general.dataPoints[1].value
+                        .toString(),
                     unit: ' A',
                   ),
                   PowerClampInfoCard(
                     iconPath: Assets.frequencyIcon,
                     title: 'Frequency',
-                    value: blocProvider.deviceStatus.status.general.dataPoints
-                            .elementAtOrNull(4)
-                            ?.value
-                            .toString() ??
-                        '',
+                    value: blocProvider
+                        .deviceStatus.status.general.dataPoints[4].value
+                        .toString(),
                     unit: ' Hz',
                   ),
                 ],
@@ -147,7 +142,7 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                           icon: const Icon(Icons.arrow_left),
                           onPressed: () {
                             blocProvider.add(SmartPowerArrowPressedEvent(-1));
-                            pageController.previousPage(
+                            _pageController.previousPage(
                               duration: const Duration(milliseconds: 300),
                               curve: Curves.easeInOut,
                             );
@@ -167,7 +162,7 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                           icon: const Icon(Icons.arrow_right),
                           onPressed: () {
                             blocProvider.add(SmartPowerArrowPressedEvent(1));
-                            pageController.nextPage(
+                            _pageController.nextPage(
                               duration: const Duration(milliseconds: 300),
                               curve: Curves.easeInOut,
                             );
@@ -182,7 +177,7 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                   Expanded(
                     flex: 2,
                     child: PageView(
-                      controller: pageController,
+                      controller: _pageController,
                       onPageChanged: (int page) {
                         blocProvider.add(SmartPowerPageChangedEvent(page));
                       },
@@ -195,8 +190,8 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                             blocProvider.add(SelectDateEvent(context: context));
                             blocProvider.add(FilterRecordsByDateEvent(
                                 selectedDate: blocProvider.dateTime!,
-                                viewType:
-                                    blocProvider.views[blocProvider.currentIndex]));
+                                viewType: blocProvider
+                                    .views[blocProvider.currentIndex]));
                           },
                           widget: blocProvider.dateSwitcher(),
                           chartData: blocProvider.energyDataList.isNotEmpty

lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart

@@ -1,6 +1,4 @@
 // Flutter imports
-import 'dart:math';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -338,7 +336,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               }
               spaces.add(newSpace);
               _updateNodePosition(newSpace, newSpace.position);
-              realignTree();
             });
           },
         );
@@ -453,6 +450,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   void _saveSpaces() {
     if (widget.selectedCommunity == null) {
+      debugPrint("No community selected for saving spaces.");
       return;
     }
 
@@ -532,83 +530,35 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   Offset getBalancedChildPosition(SpaceModel parent) {
-    const double nodeWidth = 200;
-    const double verticalGap = 180;
+    int totalSiblings = parent.children.length + 1;
+    double totalWidth = (totalSiblings - 1) * 250; // Horizontal spacing
+    double startX = parent.position.dx - (totalWidth / 2);
 
-    if (parent.children.isEmpty) {
-      // First child → exactly center
-      return Offset(parent.position.dx, parent.position.dy + verticalGap);
-    } else {
-      // More children → arrange them spaced horizontally
-      double totalWidth = (parent.children.length) * (nodeWidth + 60);
-      double startX = parent.position.dx - (totalWidth / 2);
+    Offset position = Offset(startX + (parent.children.length * 250), parent.position.dy + 180);
 
-      double childX = startX + (parent.children.length * (nodeWidth + 60));
-      return Offset(childX, parent.position.dy + verticalGap);
+    // Check for overlaps & adjust
+    while (spaces.any((s) => (s.position - position).distance < 250)) {
+      position = Offset(position.dx + 250, position.dy);
     }
+
+    return position;
   }
 
   void realignTree() {
-    const double nodeWidth = 200;
-    const double nodeHeight = 100;
-    const double horizontalGap = 60;
-    const double verticalGap = 180;
-    const double rootGap = 400; // extra space between different roots
+    void updatePositions(SpaceModel node, double x, double y) {
+      node.position = Offset(x, y);
 
-    double canvasRightEdge = 1000;
-    double canvasBottomEdge = 1000;
+      int numChildren = node.children.length;
+      double childStartX = x - ((numChildren - 1) * 250) / 2;
 
-    double calculateSubtreeWidth(SpaceModel node) {
-      if (node.children.isEmpty) return nodeWidth;
-      double totalWidth = 0;
-      for (var child in node.children) {
-        totalWidth += calculateSubtreeWidth(child) + horizontalGap;
-      }
-      return totalWidth - horizontalGap;
-    }
-
-    void layoutSubtree(SpaceModel node, double startX, double y) {
-      double subtreeWidth = calculateSubtreeWidth(node);
-      double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
-      node.position = Offset(centerX, y);
-
-      canvasRightEdge = max(canvasRightEdge, centerX + nodeWidth);
-      canvasBottomEdge = max(canvasBottomEdge, y + nodeHeight);
-
-      if (node.children.length == 1) {
-        final child = node.children.first;
-        layoutSubtree(child, centerX, y + verticalGap);
-      } else {
-        double childX = startX;
-        for (var child in node.children) {
-          double childWidth = calculateSubtreeWidth(child);
-          layoutSubtree(child, childX, y + verticalGap);
-          childX += childWidth + horizontalGap;
-        }
+      for (int i = 0; i < numChildren; i++) {
+        updatePositions(node.children[i], childStartX + (i * 250), y + 180);
       }
     }
 
-    // ⚡ New: layout each root separately
-    final List<SpaceModel> roots = spaces
-        .where((s) =>
-            s.parent == null &&
-            s.status != SpaceStatus.deleted &&
-            s.status != SpaceStatus.parentDeleted)
-        .toList();
-
-    double currentX = 100; // start some margin from left
-    double currentY = 100; // top margin
-
-    for (var root in roots) {
-      layoutSubtree(root, currentX, currentY);
-      double rootWidth = calculateSubtreeWidth(root);
-      currentX += rootWidth + rootGap;
+    if (spaces.isNotEmpty) {
+      updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
     }
-
-    setState(() {
-      canvasWidth = canvasRightEdge + 400;
-      canvasHeight = canvasBottomEdge + 400;
-    });
   }
 
   void _onDuplicate(BuildContext parentContext) {
@@ -692,19 +642,63 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   void _duplicateSpace(SpaceModel space) {
-    final double horizontalGap = 250.0;
-    final double verticalGap = 180.0;
-    final double nodeWidth = 200;
-    final double nodeHeight = 100;
-    final double breathingSpace = 300.0; // extra gap after original tree
+    final Map<SpaceModel, SpaceModel> originalToDuplicate = {};
+    double horizontalGap = 250.0; // Increased spacing
+    double verticalGap = 180.0; // Adjusted for better visualization
 
-    /// Helper to recursively duplicate a node and its children
+    print("🟢 Duplicating: ${space.name}");
+
+    /// **Find a new position ensuring no overlap**
+    Offset getBalancedChildPosition(SpaceModel parent) {
+      int totalSiblings = parent.children.length + 1;
+      double totalWidth = (totalSiblings - 1) * horizontalGap;
+      double startX = parent.position.dx - (totalWidth / 2);
+      Offset position = Offset(
+          startX + (parent.children.length * horizontalGap), parent.position.dy + verticalGap);
+
+      // **Check for overlaps & adjust**
+      while (spaces.any((s) => (s.position - position).distance < horizontalGap)) {
+        position = Offset(position.dx + horizontalGap, position.dy);
+      }
+
+      print("🔹 New position for ${parent.name}: (${position.dx}, ${position.dy})");
+      return position;
+    }
+
+    /// **Realign the entire tree after duplication**
+    void realignTree() {
+      void updatePositions(SpaceModel node, double x, double y) {
+        node.position = Offset(x, y);
+        print("✅ Adjusted ${node.name} to (${x}, ${y})");
+
+        int numChildren = node.children.length;
+        double childStartX = x - ((numChildren - 1) * horizontalGap) / 2;
+
+        for (int i = 0; i < numChildren; i++) {
+          updatePositions(node.children[i], childStartX + (i * horizontalGap), y + verticalGap);
+        }
+      }
+
+      if (spaces.isNotEmpty) {
+        print("🔄 Realigning tree...");
+        updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+      }
+    }
+
+    /// **Recursive duplication logic**
     SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
+      Offset newPosition = duplicatedParent == null
+          ? Offset(original.position.dx + horizontalGap, original.position.dy)
+          : getBalancedChildPosition(duplicatedParent);
+
       final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
+      print(
+          "🟡 Duplicating ${original.name} → ${duplicatedName} at (${newPosition.dx}, ${newPosition.dy})");
+
       final duplicated = SpaceModel(
         name: duplicatedName,
         icon: original.icon,
-        position: Offset.zero,
+        position: newPosition,
         isPrivate: original.isPrivate,
         children: [],
         status: SpaceStatus.newSpace,
@@ -714,20 +708,28 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         tags: original.tags,
       );
 
-      spaces.add(duplicated);
+      setState(() {
+        spaces.add(duplicated);
+        _updateNodePosition(duplicated, duplicated.position);
 
-      if (duplicatedParent != null) {
-        final newConnection = Connection(
-          startSpace: duplicatedParent,
-          endSpace: duplicated,
-          direction: "down",
-        );
-        connections.add(newConnection);
-        duplicated.incomingConnection = newConnection;
-        duplicatedParent.addOutgoingConnection(newConnection);
-        duplicatedParent.children.add(duplicated);
-      }
+        if (duplicatedParent != null) {
+          final newConnection = Connection(
+            startSpace: duplicatedParent,
+            endSpace: duplicated,
+            direction: "down",
+          );
+          connections.add(newConnection);
+          duplicated.incomingConnection = newConnection;
+          duplicatedParent.addOutgoingConnection(newConnection);
+          duplicatedParent.children.add(duplicated);
+          print("🔗 Created connection: ${duplicatedParent.name} → ${duplicated.name}");
+        }
 
+        // **Recalculate the whole tree to avoid overlaps**
+        realignTree();
+      });
+
+      // Recursively duplicate children
       for (var child in original.children) {
         duplicateRecursive(child, duplicated);
       }
@@ -735,49 +737,21 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       return duplicated;
     }
 
-    /// Layout a subtree rooted at node
-    void layoutSubtree(SpaceModel node, double startX, double startY) {
-      double calculateSubtreeWidth(SpaceModel n) {
-        if (n.children.isEmpty) return nodeWidth;
-        double width = 0;
-        for (var child in n.children) {
-          width += calculateSubtreeWidth(child) + horizontalGap;
-        }
-        return width - horizontalGap;
-      }
+    /// **Handle root duplication**
+    if (space.parent == null) {
+      print("🟠 Duplicating root node: ${space.name}");
+      SpaceModel duplicatedRoot = duplicateRecursive(space, null);
 
-      void assignPositions(SpaceModel n, double x, double y) {
-        double subtreeWidth = calculateSubtreeWidth(n);
-        double centerX = x + subtreeWidth / 2 - nodeWidth / 2;
-        n.position = Offset(centerX, y);
+      setState(() {
+        spaces.add(duplicatedRoot);
+        realignTree();
+      });
 
-        if (n.children.length == 1) {
-          assignPositions(n.children.first, centerX, y + verticalGap);
-        } else {
-          double childX = x;
-          for (var child in n.children) {
-            double childWidth = calculateSubtreeWidth(child);
-            assignPositions(child, childX, y + verticalGap);
-            childX += childWidth + horizontalGap;
-          }
-        }
-      }
-
-      double totalSubtreeWidth = calculateSubtreeWidth(node);
-      assignPositions(node, startX, startY);
+      print("✅ Root duplication successful: ${duplicatedRoot.name}");
+    } else {
+      duplicateRecursive(space, space.parent);
     }
 
-    /// Actual duplication process
-    setState(() {
-      if (space.parent == null) {
-        // Duplicating a ROOT node
-        SpaceModel duplicatedRoot = duplicateRecursive(space, null);
-        realignTree();
-      } else {
-        // Duplicating a CHILD node inside its parent
-        SpaceModel duplicated = duplicateRecursive(space, space.parent);
-        realignTree();
-      }
-    });
+    print("🟢 Finished duplication process for: ${space.name}");
   }
 }

lib/services/batch_control_devices_service.dart

@@ -46,14 +46,14 @@ final class DebouncedBatchControlDevicesService
   final BatchControlDevicesService decoratee;
   final Duration debounceDuration;
 
-  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
-  var _isProcessing = false;
-
   DebouncedBatchControlDevicesService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 800),
+    this.debounceDuration = const Duration(milliseconds: 1500),
   });
 
+  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
+  var _isProcessing = false;
+
   @override
   Future<bool> batchControlDevices({
     required List<String> uuids,
@@ -68,16 +68,26 @@ final class DebouncedBatchControlDevicesService
 
     await Future.delayed(debounceDuration);
 
-    final lastRequest = _pendingRequests.last;
+    final groupedRequests =
+        <String, (List<String> uuids, String code, Object value)>{};
+    for (final request in _pendingRequests) {
+      final (_, requestCode, requestValue) = request;
+      groupedRequests[requestCode] = request;
+    }
     _pendingRequests.clear();
 
     try {
-      final (lastRequestUuids, lastRequestCode, lastRequestValue) = lastRequest;
-      return decoratee.batchControlDevices(
-        uuids: lastRequestUuids,
-        code: lastRequestCode,
-        value: lastRequestValue,
-      );
+      var allSuccessful = true;
+      for (final request in groupedRequests.values) {
+        final (lastRequestUuids, lastRequestCode, lastRequestValue) = request;
+        final success = await decoratee.batchControlDevices(
+          uuids: lastRequestUuids,
+          code: lastRequestCode,
+          value: lastRequestValue,
+        );
+        if (!success) allSuccessful = false;
+      }
+      return allSuccessful;
     } finally {
       _isProcessing = false;
     }

lib/services/control_device_service.dart

@@ -40,7 +40,7 @@ final class DebouncedControlDeviceService implements ControlDeviceService {
 
   DebouncedControlDeviceService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 800),
+    this.debounceDuration = const Duration(milliseconds: 1500),
   });
 
   final _pendingRequests = <(String deviceUuid, Status status)>[];
@@ -59,15 +59,24 @@ final class DebouncedControlDeviceService implements ControlDeviceService {
 
     await Future.delayed(debounceDuration);
 
-    final lastRequest = _pendingRequests.last;
+    final groupedRequests = <String, (String deviceUuid, Status status)>{};
+    for (final request in _pendingRequests) {
+      final (_, requestStatus) = request;
+      groupedRequests[requestStatus.code] = request;
+    }
     _pendingRequests.clear();
 
     try {
-      final (lastRequestDeviceUuid, lastRequestStatus) = lastRequest;
-      return decoratee.controlDevice(
-        deviceUuid: lastRequestDeviceUuid,
-        status: lastRequestStatus,
-      );
+      var allSuccessful = true;
+      for (final request in groupedRequests.values) {
+        final (lastRequestDeviceUuid, lastRequestStatus) = request;
+        final success = await decoratee.controlDevice(
+          deviceUuid: lastRequestDeviceUuid,
+          status: lastRequestStatus,
+        );
+        if (!success) allSuccessful = false;
+      }
+      return allSuccessful;
     } finally {
       _isProcessing = false;
     }