SP-1495-fix-deployment by wrapping ChartsLoadingWidget.CircularProgressIndicator with a padding instead of adding padding as a property of CircularProgressIndicator.

assets/icons/close_settings_icon.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 24C8.79469 24 5.78123 22.7518 3.51469 20.4853C1.24823 18.2188 0 15.2053 0 12C0 8.79469 1.24823 5.78123 3.51469 3.51469C5.78123 1.24823 8.79469 0 12 0C15.2053 0 18.2188 1.24823 20.4853 3.51469C22.7518 5.78123 24 8.79469 24 12C24 15.2053 22.7518 18.2188 20.4853 20.4853C18.2188 22.7518 15.2053 24 12 24ZM12 1.875C9.2955 1.875 6.75291 2.92819 4.84055 4.84055C2.92819 6.75291 1.875 9.2955 1.875 12C1.875 14.7045 2.92819 17.2471 4.84055 19.1595C6.75291 21.0718 9.2955 22.125 12 22.125C14.7045 22.125 17.2471 21.0718 19.1595 19.1595C21.0718 17.2471 22.125 14.7045 22.125 12C22.125 9.2955 21.0718 6.75291 19.1595 4.84055C17.2471 2.92819 14.7045 1.875 12 1.875ZM15.9775 17.3033L12 13.3258L8.02252 17.3033L6.6967 15.9775L10.6742 12L6.6967 8.02252L8.02252 6.6967L12 10.6742L15.9775 6.6967L17.3033 8.02252L13.3258 12L17.3033 15.9775L15.9775 17.3033Z" fill="#999999" fill-opacity="0.7"/>
-</svg>

assets/icons/edit_name_icon_settings.svg

@@ -1,3 +0,0 @@
-<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.4854 3.1332L9.8668 0.515228C9.64704 0.295536 9.34903 0.172119 9.03829 0.172119C8.72755 0.172119 8.42953 0.295536 8.20977 0.515228L0.983989 7.74042C0.874797 7.84895 0.788225 7.97806 0.729285 8.12027C0.670346 8.26249 0.640212 8.41499 0.640629 8.56894V11.1875C0.640629 11.4983 0.764094 11.7964 0.983864 12.0161C1.20363 12.2359 1.5017 12.3594 1.8125 12.3594H11.6563C11.8427 12.3594 12.0216 12.2853 12.1534 12.1534C12.2853 12.0216 12.3594 11.8427 12.3594 11.6562C12.3594 11.4698 12.2853 11.2909 12.1534 11.1591C12.0216 11.0272 11.8427 10.9531 11.6563 10.9531H6.32422L12.4854 4.79081C12.5942 4.68199 12.6806 4.55278 12.7395 4.41057C12.7984 4.26836 12.8288 4.11594 12.8288 3.96201C12.8288 3.80807 12.7984 3.65565 12.7395 3.51344C12.6806 3.37123 12.5942 3.24202 12.4854 3.1332ZM4.33204 10.9531H2.04688V8.66796L6.96875 3.74609L9.25391 6.03124L4.33204 10.9531ZM10.25 5.03515L7.96485 2.74999L9.03946 1.67538L11.3246 3.96054L10.25 5.03515Z" fill="#D5D5D5"/>
-</svg>

lib/pages/analytics/helpers/dashed_border_painter.dart

@@ -1,56 +0,0 @@
-import 'dart:ui';
-
-import 'package:flutter/material.dart';
-
-class DashedBorderPainter extends CustomPainter {
-  final double dashWidth;
-  final double dashSpace;
-  final Color color;
-
-  DashedBorderPainter({
-    this.dashWidth = 4.0,
-    this.dashSpace = 2.0,
-    this.color = Colors.black,
-  });
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final paint = Paint()
-      ..color = color
-      ..strokeWidth = 0.5
-      ..style = PaintingStyle.stroke;
-
-    final Path topPath = Path()
-      ..moveTo(0, 0)
-      ..lineTo(size.width, 0);
-
-    final Path bottomPath = Path()
-      ..moveTo(0, size.height)
-      ..lineTo(size.width, size.height);
-
-    final dashedTopPath = _createDashedPath(topPath, dashWidth, dashSpace);
-    final dashedBottomPath = _createDashedPath(bottomPath, dashWidth, dashSpace);
-
-    canvas.drawPath(dashedTopPath, paint);
-    canvas.drawPath(dashedBottomPath, paint);
-  }
-
-  Path _createDashedPath(Path source, double dashWidth, double dashSpace) {
-    final Path dashedPath = Path();
-    for (PathMetric pathMetric in source.computeMetrics()) {
-      double distance = 0.0;
-      while (distance < pathMetric.length) {
-        final double nextDistance = distance + dashWidth;
-        dashedPath.addPath(
-          pathMetric.extractPath(distance, nextDistance),
-          Offset.zero,
-        );
-        distance = nextDistance + dashSpace;
-      }
-    }
-    return dashedPath;
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
-}

lib/pages/analytics/models/occupacy.dart

@@ -1,18 +0,0 @@
-import 'package:equatable/equatable.dart';
-
-class Occupacy extends Equatable {
-  final String date;
-  final String occupancy;
-
-  const Occupacy({required this.date, required this.occupancy});
-
-  factory Occupacy.fromJson(Map<String, dynamic> json) {
-    return Occupacy(
-      date: json['date'] as String,
-      occupancy: json['occupancy'] as String,
-    );
-  }
-
-  @override
-  List<Object?> get props => [date, occupancy];
-}

lib/pages/analytics/models/occupancy_heat_map_model.dart

@@ -1,22 +0,0 @@
-import 'package:equatable/equatable.dart';
-
-class OccupancyHeatMapModel extends Equatable {
-  final DateTime date;
-
-  final int occupancy;
-
-  const OccupancyHeatMapModel({
-    required this.date,
-    required this.occupancy,
-  });
-
-  factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) {
-    return OccupancyHeatMapModel(
-      date: DateTime.parse(json['date'] as String),
-      occupancy: json['occupancy'] as int,
-    );
-  }
-
-  @override
-  List<Object?> get props => [date, occupancy];
-}

lib/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart

@@ -2,23 +2,16 @@ import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 
 part 'analytics_date_picker_event.dart';
-part 'analytics_date_picker_state.dart';
 
-class AnalyticsDatePickerBloc
+class AnalyticsDatePickerBloc extends Bloc<AnalyticsDatePickerEvent, DateTime> {
-    extends Bloc<AnalyticsDatePickerEvent, AnalyticsDatePickerState> {
+  AnalyticsDatePickerBloc() : super(DateTime.now()) {
-  AnalyticsDatePickerBloc() : super(AnalyticsDatePickerState()) {
     on<UpdateAnalyticsDatePickerEvent>(_onUpdateAnalyticsDatePickerEvent);
   }
 
   void _onUpdateAnalyticsDatePickerEvent(
     UpdateAnalyticsDatePickerEvent event,
-    Emitter<AnalyticsDatePickerState> emit,
+    Emitter<DateTime> emit,
   ) {
-    emit(
+    emit(event.date);
-      state.copyWith(
-        monthlyDate: event.montlyDate ?? state.monthlyDate,
-        yearlyDate: event.yearlyDate ?? state.yearlyDate,
-      ),
-    );
   }
 }

lib/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_event.dart

@@ -8,11 +8,10 @@ sealed class AnalyticsDatePickerEvent extends Equatable {
 }
 
 final class UpdateAnalyticsDatePickerEvent extends AnalyticsDatePickerEvent {
-  const UpdateAnalyticsDatePickerEvent({this.montlyDate, this.yearlyDate});
+  const UpdateAnalyticsDatePickerEvent(this.date);
 
-  final DateTime? montlyDate;
+  final DateTime date;
-  final DateTime? yearlyDate;
 
   @override
-  List<Object?> get props => [montlyDate, yearlyDate];
+  List<Object?> get props => [date];
 }

lib/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_state.dart

@@ -1,25 +0,0 @@
-part of 'analytics_date_picker_bloc.dart';
-
-final class AnalyticsDatePickerState extends Equatable {
-  AnalyticsDatePickerState({
-    DateTime? monthlyDate,
-    DateTime? yearlyDate,
-  })  : monthlyDate = monthlyDate ?? DateTime.now(),
-        yearlyDate = yearlyDate ?? DateTime.now();
-
-  final DateTime monthlyDate;
-  final DateTime yearlyDate;
-
-  AnalyticsDatePickerState copyWith({
-    DateTime? monthlyDate,
-    DateTime? yearlyDate,
-  }) {
-    return AnalyticsDatePickerState(
-      monthlyDate: monthlyDate ?? this.monthlyDate,
-      yearlyDate: yearlyDate ?? this.yearlyDate,
-    );
-  }
-
-  @override
-  List<Object?> get props => [monthlyDate, yearlyDate];
-}

lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart

@@ -1,22 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-
-abstract class AnalyticsDataLoadingStrategy {
-  void onCommunitySelected(
-    BuildContext context,
-    CommunityModel community,
-    List<SpaceModel> spaces,
-  );
-  void onSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel space,
-  );
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  );
-  void clearData(BuildContext context);
-}

lib/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart

@@ -1,14 +0,0 @@
-import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart';
-
-abstract final class AnalyticsDataLoadingStrategyFactory {
-  const AnalyticsDataLoadingStrategyFactory._();
-  static AnalyticsDataLoadingStrategy getStrategy(AnalyticsPageTab tab) {
-    return switch (tab) {
-      AnalyticsPageTab.energyManagement => EnergyManagementDataLoadingStrategy(),
-      AnalyticsPageTab.occupancy => OccupancyDataLoadingStrategy(),
-    };
-  }
-}

lib/pages/analytics/modules/analytics/strategies/energy_management_data_loading_strategy.dart

@@ -1,63 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-
-class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
-  @override
-  void onCommunitySelected(
-    BuildContext context,
-    CommunityModel community,
-    List<SpaceModel> spaces,
-  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnCommunitySelected(
-            community.uuid,
-            spaces,
-          ),
-        );
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
-  }
-
-  @override
-  void onSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel space,
-  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            space.uuid ?? '',
-            space.children,
-          ),
-        );
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
-  }
-
-  @override
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            child.uuid ?? '',
-            child.children,
-          ),
-        );
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
-  }
-
-  @override
-  void clearData(BuildContext context) {
-    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
-    FetchEnergyManagementDataHelper.clearAllData(context);
-  }
-}

lib/pages/analytics/modules/analytics/strategies/occupancy_data_loading_strategy.dart

@@ -1,62 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-
-class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
-  @override
-  void onCommunitySelected(
-    BuildContext context,
-    CommunityModel community,
-    List<SpaceModel> spaces,
-  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnCommunitySelected(
-            community.uuid,
-            spaces,
-          ),
-        );
-    FetchOccupancyDataHelper.loadOccupancyData(context);
-  }
-
-  @override
-  void onSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel space,
-  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            space.uuid ?? '',
-            space.children,
-          ),
-        );
-    FetchOccupancyDataHelper.loadOccupancyData(context);
-  }
-
-  @override
-  void onChildSpaceSelected(
-    BuildContext context,
-    CommunityModel community,
-    SpaceModel child,
-  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            child.uuid ?? '',
-            child.children,
-          ),
-        );
-    FetchOccupancyDataHelper.loadOccupancyData(context);
-  }
-
-  @override
-  void clearData(BuildContext context) {
-    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
-  }
-}

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart';
@@ -9,15 +8,11 @@ import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/ener
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/power_clamp_info/power_clamp_info_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/total_energy_consumption/total_energy_consumption_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_by_phases/fake_energy_consumption_by_phases_service.dart';
 import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_device/fake_energy_consumption_per_device_service.dart';
-import 'package:syncrow_web/pages/analytics/services/occupacy/fake_occupacy_service.dart';
-import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/fake_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
-import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
+import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/fake_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
@@ -35,7 +30,7 @@ class AnalyticsPage extends StatelessWidget {
         ),
         BlocProvider(
           create: (context) => TotalEnergyConsumptionBloc(
-            RemoteTotalEnergyConsumptionService(HTTPService()),
+            FakeTotalEnergyConsumptionService(),
           ),
         ),
         BlocProvider(
@@ -58,11 +53,6 @@ class AnalyticsPage extends StatelessWidget {
             FirebaseRealtimeDeviceService(),
           ),
         ),
-        BlocProvider(create: (context) => OccupancyBloc(FakeOccupacyService())),
-        BlocProvider(
-          create: (context) => OccupancyHeatMapBloc(FakeOccupancyHeatMapService()),
-        ),
-        BlocProvider(create: (context) => AnalyticsDatePickerBloc()),
       ],
       child: const AnalyticsPageForm(),
     );

lib/pages/analytics/modules/analytics/widgets/analytics_communities_sidebar.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/power_clamp_info/power_clamp_info_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/sidebar/analytics_space_tree_view.dart';
+import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 
 class AnalyticsCommunitiesSidebar extends StatelessWidget {
   const AnalyticsCommunitiesSidebar({super.key});
@@ -11,24 +11,42 @@ class AnalyticsCommunitiesSidebar extends StatelessWidget {
   Widget build(BuildContext context) {
     return Builder(
       builder: (context) {
-        final selectedTab = context.read<AnalyticsTabBloc>().state;
-        final strategy =
-            AnalyticsDataLoadingStrategyFactory.getStrategy(selectedTab);
-
-        // Clear data when tab changes
-        strategy.clearData(context);
-
         return Expanded(
-          child: AnalyticsSpaceTreeView(
+          child: SpaceTreeView(
-            onSelectCommunity: (community, spaces) {
+            title: const Text('Communities'),
-              strategy.onCommunitySelected(context, community, spaces);
+            shouldDisableDeselectingChildrenOfSelectedParent: true,
+            onSelect: () {
+              /// Necessary to wait for the state to update before fethcing the data.
+              Future.delayed(
+                const Duration(milliseconds: 100),
+                () {
+                  if (context.mounted) {
+                    FetchEnergyManagementDataHelper.fetchEnergyManagementData(
+                      context,
+                    );
+                    FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(
+                      context,
+                    );
+                    context.read<PowerClampInfoBloc>().add(
+                          const ClearPowerClampInfoEvent(),
+                        );
+                    final (selectedCommunities, selectedSpaces) =
+                        FetchEnergyManagementDataHelper
+                            .getSelectedCommunitiesAndSpaces(context);
+                    if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) {
+                      context.read<PowerClampInfoBloc>().add(
+                            const ClearPowerClampInfoEvent(),
+                          );
+                    } else {
+                      FetchEnergyManagementDataHelper.loadPowerClampInfo(
+                        context,
+                      );
+                    }
+                  }
                 },
-            onSelectSpace: (community, space) {
+              );
-              strategy.onSpaceSelected(context, community, space);
-            },
-            onSelectChildSpace: (community, child) {
-              strategy.onChildSpaceSelected(context, community, child);
             },
+            isSide: false,
           ),
         );
       },

lib/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart

@@ -1,24 +1,15 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:intl/intl.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/month_picker_widget.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/year_picker_widget.dart';
+import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-enum DatePickerType { month, year }
-
 class AnalyticsDateFilterButton extends StatefulWidget {
-  const AnalyticsDateFilterButton({
+  const AnalyticsDateFilterButton({super.key});
-    required this.selectedDate,
-    required this.onDateSelected,
-    this.datePickerType = DatePickerType.month,
-    super.key,
-  });
-
-  final DateTime selectedDate;
-  final void Function(DateTime)? onDateSelected;
-  final DatePickerType datePickerType;
 
   static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);
 
@@ -28,8 +19,25 @@ class AnalyticsDateFilterButton extends StatefulWidget {
 }
 
 class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
+  late final AnalyticsDatePickerBloc _analyticsDatePickerBloc;
+  @override
+  void initState() {
+    _analyticsDatePickerBloc = AnalyticsDatePickerBloc();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _analyticsDatePickerBloc.close();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
+    return BlocProvider.value(
+      value: _analyticsDatePickerBloc,
+      child: Builder(builder: (context) {
+        final selectedDate = context.watch<AnalyticsDatePickerBloc>().state;
         return TextButton.icon(
           style: TextButton.styleFrom(
             foregroundColor: AnalyticsDateFilterButton._color,
@@ -54,7 +62,7 @@ class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
                 ColorFilter.mode(AnalyticsDateFilterButton._color, BlendMode.srcIn),
           ),
           label: Text(
-        _formatDate(widget.selectedDate),
+            _formatDate(selectedDate),
             style: const TextStyle(
               fontWeight: FontWeight.w700,
             ),
@@ -62,35 +70,28 @@ class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
           onPressed: () {
             showDialog(
               context: context,
-          builder: (_) {
+              builder: (_) => MonthPickerWidget(
-            return switch (widget.datePickerType) {
+                selectedDate: selectedDate,
-              DatePickerType.month => MonthPickerWidget(
-                  selectedDate: widget.selectedDate,
                 onDateSelected: (value) {
-                    widget.onDateSelected?.call(value);
+                  _analyticsDatePickerBloc.add(
-                  },
+                    UpdateAnalyticsDatePickerEvent(value),
-                ),
+                  );
-              DatePickerType.year => YearPickerWidget(
+                  FetchEnergyManagementDataHelper.fetchEnergyManagementData(
-                  selectedDate: widget.selectedDate,
+                    context,
-                  onDateSelected: (value) {
+                    selectedDate: value,
-                    widget.onDateSelected?.call(value);
-                  },
-                ),
-            };
-          },
                   );
                 },
+              ),
+            );
+          },
+        );
+      }),
     );
   }
 
   String _formatDate(DateTime? date) {
-    final formatterBasedOnDatePickerType = switch (widget.datePickerType) {
+    final formatter = DateFormat('MMMM yyyy');
-      DatePickerType.month => DateFormat('MMMM yyyy'),
+    final formattedDate = formatter.format(date ?? DateTime.now());
-      DatePickerType.year => DateFormat('yyyy'),
-    };
-    final formattedDate = formatterBasedOnDatePickerType.format(
-      date ?? DateTime.now(),
-    );
     return formattedDate;
   }
 }

lib/pages/analytics/modules/analytics/widgets/analytics_page_tab_button.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/strategies/analytics_data_loading_strategy_factory.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class AnalyticsPageTabButton extends StatelessWidget {
@@ -18,12 +17,9 @@ class AnalyticsPageTabButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return TextButton(
-      onPressed: () {
+      onPressed: () => context.read<AnalyticsTabBloc>().add(
-        AnalyticsDataLoadingStrategyFactory.getStrategy(tab).clearData(context);
-        context.read<AnalyticsTabBloc>().add(
             UpdateAnalyticsTabEvent(tab),
-          );
+          ),
-      },
       child: Text(
         tab.title,
         textAlign: TextAlign.center,

lib/pages/analytics/modules/analytics/widgets/analytics_page_tabs_and_children.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_tab/analytics_tab_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_page_tab.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_page_tab_button.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class AnalyticsPageTabsAndChildren extends StatelessWidget {
@@ -40,7 +38,9 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
                           ...AnalyticsPageTab.values.map(
-                            (tab) => _buildAnimation(
+                            (tab) => AnimatedSwitcher(
+                              switchInCurve: Curves.easeIn,
+                              duration: const Duration(milliseconds: 200),
                               child: AnalyticsPageTabButton(
                                 key: ValueKey(selectedTab),
                                 tab: tab,
@@ -53,31 +53,12 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
                     ),
                   ),
                   const Spacer(),
-                  Visibility(
+                  const Expanded(
-                    key: ValueKey(selectedTab),
-                    visible: selectedTab == AnalyticsPageTab.energyManagement,
-                    child: Expanded(
                     flex: 2,
                     child: FittedBox(
                       fit: BoxFit.scaleDown,
                       alignment: AlignmentDirectional.centerEnd,
-                        child: AnalyticsDateFilterButton(
+                      child: AnalyticsDateFilterButton(),
-                          onDateSelected: (DateTime value) {
-                            context.read<AnalyticsDatePickerBloc>().add(
-                                  UpdateAnalyticsDatePickerEvent(montlyDate: value),
-                                );
-                            FetchEnergyManagementDataHelper
-                                .fetchEnergyManagementData(
-                              context,
-                              selectedDate: value,
-                            );
-                          },
-                          selectedDate: context
-                              .watch<AnalyticsDatePickerBloc>()
-                              .state
-                              .monthlyDate,
-                        ),
-                      ),
                     ),
                   ),
                 ],
@@ -86,18 +67,14 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
           ),
           Expanded(
             flex: 8,
-            child: _buildAnimation(child: selectedTab.child),
+            child: AnimatedSwitcher(
+              switchInCurve: Curves.easeIn,
+              duration: const Duration(milliseconds: 200),
+              child: selectedTab.child,
+            ),
           ),
         ],
       ),
     );
   }
-
-  Widget _buildAnimation({required Widget child}) {
-    return AnimatedSwitcher(
-      switchInCurve: Curves.easeIn,
-      duration: const Duration(milliseconds: 200),
-      child: child,
-    );
-  }
 }

lib/pages/analytics/modules/analytics/widgets/sidebar/analytics_space_tree_view.dart

@@ -1,188 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/common/widgets/search_bar.dart';
-import 'package:syncrow_web/common/widgets/sidebar_communities_list.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
-import 'package:syncrow_web/pages/space_tree/view/custom_expansion.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class AnalyticsSpaceTreeView extends StatefulWidget {
-  const AnalyticsSpaceTreeView({
-    super.key,
-    this.onSelectCommunity,
-    this.onSelectSpace,
-    this.onSelectChildSpace,
-  });
-
-  final void Function(
-    CommunityModel community,
-    List<SpaceModel> spaces,
-  )? onSelectCommunity;
-  final void Function(
-    CommunityModel community,
-    SpaceModel space,
-  )? onSelectSpace;
-  final void Function(
-    CommunityModel community,
-    SpaceModel child,
-  )? onSelectChildSpace;
-
-  @override
-  State<AnalyticsSpaceTreeView> createState() => _AnalyticsSpaceTreeViewState();
-}
-
-class _AnalyticsSpaceTreeViewState extends State<AnalyticsSpaceTreeView> {
-  late final ScrollController _scrollController;
-
-  @override
-  void initState() {
-    _scrollController = ScrollController();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      final communities = state.searchQuery.isNotEmpty
-          ? state.filteredCommunity
-          : state.communityList;
-      return Container(
-        height: MediaQuery.sizeOf(context).height,
-        decoration: const BoxDecoration(color: ColorsManager.whiteColors),
-        child: state is SpaceTreeLoadingState
-            ? const Center(child: CircularProgressIndicator())
-            : Column(
-                children: [
-                  Container(
-                    alignment: AlignmentDirectional.centerStart,
-                    padding: const EdgeInsets.all(24),
-                    child: DefaultTextStyle(
-                      style: context.textTheme.titleMedium!.copyWith(
-                        color: ColorsManager.blackColor,
-                        fontSize: 20,
-                      ),
-                      child: const Text('Communities'),
-                    ),
-                  ),
-                  CustomSearchBar(
-                    onSearchChanged: (query) => context.read<SpaceTreeBloc>().add(
-                          SearchQueryEvent(query),
-                        ),
-                  ),
-                  const SizedBox(height: 16),
-                  Expanded(
-                    child: state.isSearching
-                        ? const Center(child: CircularProgressIndicator())
-                        : SidebarCommunitiesList(
-                            onScrollToEnd: () {
-                              if (!state.paginationIsLoading) {
-                                context.read<SpaceTreeBloc>().add(
-                                      PaginationEvent(
-                                        state.paginationModel,
-                                        state.communityList,
-                                      ),
-                                    );
-                              }
-                            },
-                            scrollController: _scrollController,
-                            communities: communities,
-                            itemBuilder: (context, index) {
-                              return CustomExpansionTileSpaceTree(
-                                title: communities[index].name,
-                                isSelected: state.selectedCommunities
-                                    .contains(communities[index].uuid),
-                                isSoldCheck: state.selectedCommunities
-                                    .contains(communities[index].uuid),
-                                onExpansionChanged: () =>
-                                    context.read<SpaceTreeBloc>().add(
-                                          OnCommunityExpanded(
-                                            communities[index].uuid,
-                                          ),
-                                        ),
-                                isExpanded: state.expandedCommunities.contains(
-                                  communities[index].uuid,
-                                ),
-                                onItemSelected: () => widget.onSelectCommunity?.call(
-                                  communities[index],
-                                  communities[index].spaces,
-                                ),
-                                children: communities[index].spaces.map(
-                                  (space) {
-                                    return CustomExpansionTileSpaceTree(
-                                      title: space.name,
-                                      isExpanded:
-                                          state.expandedSpaces.contains(space.uuid),
-                                      onItemSelected: () =>
-                                          widget.onSelectSpace?.call(
-                                        communities[index],
-                                        space,
-                                      ),
-                                      onExpansionChanged: () =>
-                                          context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(
-                                                  communities[index].uuid,
-                                                  space.uuid ?? '',
-                                                ),
-                                              ),
-                                      isSelected: state.selectedSpaces
-                                              .contains(space.uuid) ||
-                                          state.soldCheck.contains(space.uuid),
-                                      isSoldCheck:
-                                          state.soldCheck.contains(space.uuid),
-                                      children: _buildNestedSpaces(
-                                        context,
-                                        state,
-                                        space,
-                                        communities[index],
-                                      ),
-                                    );
-                                  },
-                                ).toList(),
-                              );
-                            },
-                          ),
-                  ),
-                  if (state.paginationIsLoading) const CircularProgressIndicator(),
-                ],
-              ),
-      );
-    });
-  }
-
-  List<Widget> _buildNestedSpaces(
-    BuildContext context,
-    SpaceTreeState state,
-    SpaceModel space,
-    CommunityModel community,
-  ) {
-    return space.children.map((child) {
-      return CustomExpansionTileSpaceTree(
-        isSelected: state.selectedSpaces.contains(child.uuid) ||
-            state.soldCheck.contains(child.uuid),
-        isSoldCheck: state.soldCheck.contains(child.uuid),
-        title: child.name,
-        isExpanded: state.expandedSpaces.contains(child.uuid),
-        onItemSelected: () {
-          widget.onSelectChildSpace?.call(community, child);
-        },
-        onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(
-                OnSpaceExpanded(community.uuid, child.uuid ?? ''),
-              );
-        },
-        children: _buildNestedSpaces(context, state, child, community),
-      );
-    }).toList();
-  }
-}

lib/pages/analytics/modules/analytics/widgets/year_picker_widget.dart

@@ -1,147 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class YearPickerWidget extends StatefulWidget {
-  const YearPickerWidget({
-    super.key,
-    required this.selectedDate,
-    required this.onDateSelected,
-  });
-
-  final DateTime selectedDate;
-  final ValueChanged<DateTime>? onDateSelected;
-
-  @override
-  State<YearPickerWidget> createState() => _YearPickerWidgetState();
-}
-
-class _YearPickerWidgetState extends State<YearPickerWidget> {
-  late int _currentYear;
-
-  static final years = List.generate(
-    DateTime.now().year - 2020 + 1,
-    (index) => (2020 + index),
-  );
-
-  @override
-  void initState() {
-    super.initState();
-    _currentYear = widget.selectedDate.year;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Dialog(
-      backgroundColor: Theme.of(context).colorScheme.surface,
-      child: Container(
-        padding: const EdgeInsetsDirectional.all(20),
-        width: 320,
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            _buildMonthsGrid(),
-            const SizedBox(height: 20),
-            Row(
-              spacing: 12,
-              mainAxisAlignment: MainAxisAlignment.end,
-              children: [
-                FilledButton(
-                  onPressed: () => Navigator.pop(context),
-                  style: FilledButton.styleFrom(
-                    fixedSize: const Size(106, 40),
-                    backgroundColor: const Color(0xFFEDF2F7),
-                    padding: const EdgeInsetsDirectional.symmetric(
-                      vertical: 10,
-                      horizontal: 16,
-                    ),
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                  ),
-                  child: Text(
-                    'Cancel',
-                    style: context.textTheme.titleSmall?.copyWith(
-                      fontSize: 14,
-                      fontWeight: FontWeight.w600,
-                      color: ColorsManager.grey700,
-                    ),
-                  ),
-                ),
-                FilledButton(
-                  onPressed: () {
-                    Navigator.pop(context);
-                    final date = DateTime(_currentYear);
-                    widget.onDateSelected?.call(date);
-                  },
-                  style: FilledButton.styleFrom(
-                    fixedSize: const Size(106, 40),
-                    backgroundColor: ColorsManager.vividBlue.withValues(
-                      alpha: 0.7,
-                    ),
-                    padding: const EdgeInsetsDirectional.symmetric(
-                      vertical: 10,
-                      horizontal: 16,
-                    ),
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(20),
-                    ),
-                  ),
-                  child: Text(
-                    'Done',
-                    style: context.textTheme.titleSmall?.copyWith(
-                      fontSize: 14,
-                      fontWeight: FontWeight.w600,
-                      color: ColorsManager.whiteColors,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildMonthsGrid() {
-    return GridView.builder(
-      shrinkWrap: true,
-      itemCount: years.length,
-      physics: const NeverScrollableScrollPhysics(),
-      padding: const EdgeInsets.all(8),
-      gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
-        crossAxisCount: 3,
-        childAspectRatio: 2.5,
-        mainAxisSpacing: 8,
-        mainAxisExtent: 30,
-      ),
-      itemBuilder: (context, index) {
-        final isSelected = _currentYear == years[index];
-        return InkWell(
-          onTap: () => setState(() => _currentYear = years[index]),
-          child: Container(
-            alignment: Alignment.center,
-            decoration: BoxDecoration(
-              color: isSelected
-                  ? ColorsManager.vividBlue.withValues(alpha: 0.7)
-                  : const Color(0xFFEDF2F7),
-              borderRadius:
-                  isSelected ? BorderRadius.circular(15) : BorderRadius.zero,
-            ),
-            child: Text(
-              years[index].toString(),
-              style: context.textTheme.titleSmall?.copyWith(
-                fontSize: 12,
-                color: isSelected
-                    ? ColorsManager.whiteColors
-                    : ColorsManager.blackColor.withValues(alpha: 0.8),
-                fontWeight: FontWeight.w500,
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart

@@ -24,7 +24,7 @@ abstract final class EnergyManagementChartsHelper {
           getTitlesWidget: (value, meta) => Padding(
             padding: const EdgeInsetsDirectional.only(top: 20.0),
             child: Text(
-              (value + 1).toString(),
+              value.toString(),
               style: context.textTheme.bodySmall?.copyWith(
                 color: ColorsManager.greyColor,
                 fontSize: 12,
@@ -70,7 +70,7 @@ abstract final class EnergyManagementChartsHelper {
   static List<LineTooltipItem?> getTooltipItems(List<LineBarSpot> touchedSpots) {
     return touchedSpots.map((spot) {
       return LineTooltipItem(
-        getToolTipLabel(spot.x + 1, spot.y),
+        getToolTipLabel(spot.x, spot.y),
         const TextStyle(
           color: ColorsManager.textPrimaryColor,
           fontWeight: FontWeight.w600,

lib/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/energy_consumption_by_phases/energy_consumption_by_phases_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/energy_consumption_per_device/energy_consumption_per_device_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/power_clamp_info/power_clamp_info_bloc.dart';
@@ -25,35 +24,13 @@ abstract final class FetchEnergyManagementDataHelper {
       clearAllData(context);
       return;
     }
-    final datePickerState = context.read<AnalyticsDatePickerBloc>().state;
 
-    loadTotalEnergyConsumption(context, selectedDate: datePickerState.monthlyDate);
+    loadTotalEnergyConsumption(context);
-    loadEnergyConsumptionByPhases(
+    loadEnergyConsumptionByPhases(context);
-      context,
-      selectedDate: datePickerState.monthlyDate,
-    );
     loadEnergyConsumptionPerDevice(context);
     return;
   }
 
-  static void loadEnergyManagementData(BuildContext context) {
-    final (selectedCommunities, selectedSpaces) =
-        FetchEnergyManagementDataHelper.getSelectedCommunitiesAndSpaces(context);
-    if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) return;
-
-    FetchEnergyManagementDataHelper.fetchEnergyManagementData(context,
-        selectedDate: DateTime.now());
-    FetchEnergyManagementDataHelper.loadRealtimeDeviceChanges(context);
-    context.read<PowerClampInfoBloc>().add(const ClearPowerClampInfoEvent());
-    if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) {
-      context.read<PowerClampInfoBloc>().add(
-            const ClearPowerClampInfoEvent(),
-          );
-    } else {
-      FetchEnergyManagementDataHelper.loadPowerClampInfo(context);
-    }
-  }
-
   static (List<String> selectedCommunities, List<String> selectedSpaces)
       getSelectedCommunitiesAndSpaces(BuildContext context) {
     final spaceTreeState = context.read<SpaceTreeBloc>().state;
@@ -85,8 +62,7 @@ abstract final class FetchEnergyManagementDataHelper {
 
     final param = GetTotalEnergyConsumptionParam(
       spaceId: selectedCommunities.firstOrNull,
-      communityId: selectedCommunities.firstOrNull,
+      startDate: selectedDate,
-      monthDate: selectedDate,
     );
     context.read<TotalEnergyConsumptionBloc>().add(
           TotalEnergyConsumptionLoadEvent(param: param),

lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart

@@ -1,26 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_widget.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart';
 
-class AnalyticsEnergyManagementView extends StatefulWidget {
+class AnalyticsEnergyManagementView extends StatelessWidget {
   const AnalyticsEnergyManagementView({super.key});
 
-  @override
-  State<AnalyticsEnergyManagementView> createState() =>
-      _AnalyticsEnergyManagementViewState();
-}
-
-class _AnalyticsEnergyManagementViewState
-    extends State<AnalyticsEnergyManagementView> {
-  @override
-  void initState() {
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
-    super.initState();
-  }
-
   static const _padding = EdgeInsetsDirectional.all(32);
+
   @override
   Widget build(BuildContext context) {
     return LayoutBuilder(

lib/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_device_dropdown.dart

@@ -1,55 +1,36 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class PowerClampEnergyDataDeviceDropdown extends StatelessWidget {
   const PowerClampEnergyDataDeviceDropdown({super.key});
 
+  static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);
+
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return TextButton(
-      decoration: BoxDecoration(
+      style: TextButton.styleFrom(
+        foregroundColor: _color,
+        shape: RoundedRectangleBorder(
           borderRadius: BorderRadius.circular(16),
-        border: Border.all(
+          side: const BorderSide(
             color: ColorsManager.greyColor,
             width: 1,
           ),
         ),
-      child: DropdownButton<String>(
+        backgroundColor: ColorsManager.transparentColor,
-        value: 'Device 1',
+        padding: const EdgeInsets.symmetric(
-        isDense: true,
+          horizontal: 32,
-        borderRadius: BorderRadius.circular(16),
+          vertical: 16,
-        dropdownColor: ColorsManager.whiteColors,
-        underline: const SizedBox.shrink(),
-        icon: const RotatedBox(
-          quarterTurns: 1,
-          child: Icon(Icons.chevron_right, size: 16),
         ),
-        style: context.textTheme.labelSmall?.copyWith(
+      ),
-          color: ColorsManager.textPrimaryColor,
+      child: const Text(
+        'Device 1',
+        style: TextStyle(
           fontWeight: FontWeight.w700,
-          fontSize: 14,
-        ),
-        padding: const EdgeInsetsDirectional.symmetric(
-          horizontal: 20,
-          vertical: 2,
-        ),
-        items: [
-          for (var i = 1; i < 10; i++)
-            DropdownMenuItem(
-              value: 'Device $i',
-              child: Text(
-                'Device $i',
-                style: context.textTheme.labelSmall?.copyWith(
-                  color: ColorsManager.textPrimaryColor,
-                  fontWeight: FontWeight.w700,
-                  fontSize: 14,
         ),
       ),
-            ),
+      onPressed: () {},
-        ],
-        onChanged: (value) {},
-      ),
     );
   }
 }

lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart.dart

@@ -23,7 +23,10 @@ class TotalEnergyConsumptionChart extends StatelessWidget {
     return Expanded(
       child: LineChart(
         LineChartData(
-          titlesData: EnergyManagementChartsHelper.titlesData(context),
+          titlesData: EnergyManagementChartsHelper.titlesData(
+            context,
+            leftTitlesInterval: 5000,
+          ),
           gridData: EnergyManagementChartsHelper.gridData(),
           borderData: EnergyManagementChartsHelper.borderData(),
           lineTouchData: EnergyManagementChartsHelper.lineTouchData(),

lib/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart

@@ -1,37 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_param.dart';
-import 'package:syncrow_web/pages/analytics/services/occupacy/occupacy_service.dart';
-
-part 'occupancy_event.dart';
-part 'occupancy_state.dart';
-
-class OccupancyBloc extends Bloc<OccupancyEvent, OccupancyState> {
-  OccupancyBloc(this._occupacyService) : super(const OccupancyState()) {
-    on<LoadOccupancyEvent>(_onLoadOccupancyEvent);
-    on<ClearOccupancyEvent>(_onClearOccupancyEvent);
-  }
-
-  final OccupacyService _occupacyService;
-
-  Future<void> _onLoadOccupancyEvent(
-    LoadOccupancyEvent event,
-    Emitter<OccupancyState> emit,
-  ) async {
-    emit(state.copyWith(status: OccupancyStatus.loading));
-    try {
-      final chartData = await _occupacyService.load(event.param);
-      emit(state.copyWith(chartData: chartData, status: OccupancyStatus.loaded));
-    } catch (e) {
-      emit(state.copyWith(status: OccupancyStatus.failure, errorMessage: '$e'));
-    }
-  }
-
-  void _onClearOccupancyEvent(
-    ClearOccupancyEvent event,
-    Emitter<OccupancyState> emit,
-  ) {
-    emit(const OccupancyState());
-  }
-}

lib/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_event.dart

@@ -1,21 +0,0 @@
-part of 'occupancy_bloc.dart';
-
-sealed class OccupancyEvent extends Equatable {
-  const OccupancyEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-final class LoadOccupancyEvent extends OccupancyEvent {
-  const LoadOccupancyEvent(this.param);
-
-  final GetOccupancyParam param;
-
-  @override
-  List<Object> get props => [param];
-}
-
-final class ClearOccupancyEvent extends OccupancyEvent {
-  const ClearOccupancyEvent();
-}

lib/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_state.dart

@@ -1,30 +0,0 @@
-part of 'occupancy_bloc.dart';
-
-enum OccupancyStatus { initial, loading, loaded, failure }
-
-final class OccupancyState extends Equatable {
-  const OccupancyState({
-    this.chartData = const [],
-    this.status = OccupancyStatus.initial,
-    this.errorMessage,
-  });
-
-  final List<Occupacy> chartData;
-  final OccupancyStatus status;
-  final String? errorMessage;
-
-  OccupancyState copyWith({
-    List<Occupacy>? chartData,
-    OccupancyStatus? status,
-    String? errorMessage,
-  }) {
-    return OccupancyState(
-      chartData: chartData ?? this.chartData,
-      status: status ?? this.status,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-
-  @override
-  List<Object?> get props => [chartData, status, errorMessage];
-}

lib/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart

@@ -1,49 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/analytics/models/occupancy_heat_map_model.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_heat_map_param.dart';
-import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/occupancy_heat_map_service.dart';
-
-part 'occupancy_heat_map_event.dart';
-part 'occupancy_heat_map_state.dart';
-
-class OccupancyHeatMapBloc
-    extends Bloc<OccupancyHeatMapEvent, OccupancyHeatMapState> {
-  OccupancyHeatMapBloc(
-    this._occupancyHeatMapService,
-  ) : super(const OccupancyHeatMapState()) {
-    on<LoadOccupancyHeatMapEvent>(_onLoadOccupancyHeatMapEvent);
-    on<ClearOccupancyHeatMapEvent>(_onClearOccupancyHeatMapEvent);
-  }
-  final OccupancyHeatMapService _occupancyHeatMapService;
-
-  Future<void> _onLoadOccupancyHeatMapEvent(
-    LoadOccupancyHeatMapEvent event,
-    Emitter<OccupancyHeatMapState> emit,
-  ) async {
-    emit(state.copyWith(status: OccupancyHeatMapStatus.loading));
-    try {
-      final occupancyHeatMap = await _occupancyHeatMapService.load(event.param);
-      emit(
-        state.copyWith(
-          status: OccupancyHeatMapStatus.loaded,
-          heatMapData: occupancyHeatMap,
-        ),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: OccupancyHeatMapStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  void _onClearOccupancyHeatMapEvent(
-    ClearOccupancyHeatMapEvent event,
-    Emitter<OccupancyHeatMapState> emit,
-  ) {
-    emit(const OccupancyHeatMapState());
-  }
-}

lib/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_event.dart

@@ -1,21 +0,0 @@
-part of 'occupancy_heat_map_bloc.dart';
-
-sealed class OccupancyHeatMapEvent extends Equatable {
-  const OccupancyHeatMapEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-final class LoadOccupancyHeatMapEvent extends OccupancyHeatMapEvent {
-  const LoadOccupancyHeatMapEvent(this.param);
-
-  final GetOccupancyHeatMapParam param;
-
-  @override
-  List<Object> get props => [param];
-}
-
-final class ClearOccupancyHeatMapEvent extends OccupancyHeatMapEvent {
-  const ClearOccupancyHeatMapEvent();
-}

lib/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_state.dart

@@ -1,30 +0,0 @@
-part of 'occupancy_heat_map_bloc.dart';
-
-enum OccupancyHeatMapStatus { initial, loading, loaded, failure }
-
-final class OccupancyHeatMapState extends Equatable {
-  const OccupancyHeatMapState({
-    this.status = OccupancyHeatMapStatus.initial,
-    this.heatMapData = const [],
-    this.errorMessage,
-  });
-
-  final OccupancyHeatMapStatus status;
-  final String? errorMessage;
-  final List<OccupancyHeatMapModel> heatMapData;
-
-  OccupancyHeatMapState copyWith({
-    OccupancyHeatMapStatus? status,
-    List<OccupancyHeatMapModel>? heatMapData,
-    String? errorMessage,
-  }) {
-    return OccupancyHeatMapState(
-      status: status ?? this.status,
-      heatMapData: heatMapData ?? this.heatMapData,
-      errorMessage: errorMessage ?? this.errorMessage,
-    );
-  }
-
-  @override
-  List<Object?> get props => [status, errorMessage, heatMapData];
-}

lib/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart

@@ -1,57 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/fetch_energy_management_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_heat_map_param.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_param.dart';
-
-abstract final class FetchOccupancyDataHelper {
-  const FetchOccupancyDataHelper._();
-
-  static void loadOccupancyData(BuildContext context) {
-    final (selectedCommunities, selectedSpaces) =
-        FetchEnergyManagementDataHelper.getSelectedCommunitiesAndSpaces(context);
-    if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) {
-      context.read<OccupancyBloc>().add(
-            const ClearOccupancyEvent(),
-          );
-      context.read<OccupancyHeatMapBloc>().add(
-            const ClearOccupancyHeatMapEvent(),
-          );
-      return;
-    }
-
-    final datePickerState = context.read<AnalyticsDatePickerBloc>().state;
-
-    context.read<OccupancyBloc>().add(
-          LoadOccupancyEvent(
-            GetOccupancyParam(
-              monthDate:
-                  '${datePickerState.monthlyDate.year}-${datePickerState.monthlyDate.month}',
-              spaceUuid: selectedSpaces.firstOrNull,
-              communityUuid: selectedCommunities.first,
-            ),
-          ),
-        );
-
-    context.read<OccupancyHeatMapBloc>().add(
-          LoadOccupancyHeatMapEvent(
-            GetOccupancyHeatMapParam(
-              spaceId: selectedSpaces.isNotEmpty ? selectedSpaces.first : '',
-              communityId:
-                  selectedCommunities.isNotEmpty ? selectedCommunities.first : '',
-              year: datePickerState.yearlyDate,
-            ),
-          ),
-        );
-
-    context.read<RealtimeDeviceChangesBloc>()
-      ..add(const RealtimeDeviceChangesClosed())
-      ..add(
-        const RealtimeDeviceChangesStarted('14fe6e7e-47af-4a07-ae0a-7c4a26ef8135'),
-      );
-  }
-}

lib/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart

@@ -1,68 +1,12 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_chart_box.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_end_side_bar.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_box.dart';
 
-class AnalyticsOccupancyView extends StatefulWidget {
+class AnalyticsOccupancyView extends StatelessWidget {
   const AnalyticsOccupancyView({super.key});
 
-  static const _padding = EdgeInsetsDirectional.all(32);
-
-  @override
-  State<AnalyticsOccupancyView> createState() => _AnalyticsOccupancyViewState();
-}
-
-class _AnalyticsOccupancyViewState extends State<AnalyticsOccupancyView> {
-  @override
-  void initState() {
-    FetchOccupancyDataHelper.loadOccupancyData(context);
-    super.initState();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final height = MediaQuery.sizeOf(context).height;
+    return const Center(
-    return LayoutBuilder(
+      child: Text('AnalyticsOccupancyView is Working!'),
-      builder: (context, constraints) {
-        final isMediumOrLess = constraints.maxWidth <= 900;
-        if (isMediumOrLess) {
-          return SingleChildScrollView(
-            padding: AnalyticsOccupancyView._padding,
-            child: Column(
-              spacing: 32,
-              children: [
-                SizedBox(height: height * 0.45, child: const OccupancyEndSideBar()),
-                SizedBox(height: height * 0.5, child: const OccupancyChartBox()),
-                SizedBox(height: height * 0.5, child: const Placeholder()),
-              ],
-            ),
-          );
-        }
-
-        return SingleChildScrollView(
-          child: Container(
-            padding: AnalyticsOccupancyView._padding,
-            height: height * 0.9,
-            child: const Row(
-              spacing: 32,
-              children: [
-                Expanded(
-                  flex: 5,
-                  child: Column(
-                    spacing: 20,
-                    children: [
-                      Expanded(child: OccupancyChartBox()),
-                      Expanded(child: OccupancyHeatMapBox()),
-                    ],
-                  ),
-                ),
-                Expanded(flex: 2, child: OccupancyEndSideBar()),
-              ],
-            ),
-          ),
-        );
-      },
     );
   }
 }

lib/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart

@@ -1,145 +0,0 @@
-import 'package:fl_chart/fl_chart.dart';
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class OccupancyChart extends StatelessWidget {
-  const OccupancyChart({required this.chartData, super.key});
-
-  final List<Occupacy> chartData;
-
-  static const _chartWidth = 16.0;
-
-  @override
-  Widget build(BuildContext context) {
-    return BarChart(
-      BarChartData(
-        maxY: 1.0,
-        gridData: EnergyManagementChartsHelper.gridData().copyWith(
-          checkToShowHorizontalLine: (value) => true,
-          horizontalInterval: 0.25,
-        ),
-        borderData: EnergyManagementChartsHelper.borderData(),
-        barTouchData: _barTouchData(context),
-        titlesData: _titlesData(context),
-        barGroups: List.generate(chartData.length, (index) {
-          final actual = chartData[index];
-          return BarChartGroupData(
-            x: index,
-            barsSpace: 0,
-            groupVertically: true,
-            barRods: [
-              BarChartRodData(
-                toY: 1.0,
-                fromY: double.parse(actual.occupancy) + 0.025,
-                color: ColorsManager.graysColor,
-                width: _chartWidth,
-                borderRadius: BorderRadius.circular(10),
-              ),
-              BarChartRodData(
-                toY: double.parse(actual.occupancy),
-                color: ColorsManager.vividBlue.withValues(alpha: 0.8),
-                width: _chartWidth,
-                borderRadius: BorderRadius.circular(10),
-              ),
-            ],
-          );
-        }),
-      ),
-    );
-  }
-
-  BarTouchData _barTouchData(BuildContext context) {
-    return BarTouchData(
-      touchTooltipData: BarTouchTooltipData(
-        getTooltipColor: (touchTooltipItem) => ColorsManager.whiteColors,
-        tooltipBorder: const BorderSide(
-          color: ColorsManager.semiTransparentBlack,
-        ),
-        tooltipRoundedRadius: 16,
-        tooltipPadding: const EdgeInsets.all(8),
-        getTooltipItem: (group, groupIndex, rod, rodIndex) => getTooltipItem(
-          context: context,
-          group: group,
-          groupIndex: groupIndex,
-          rod: rod,
-          rodIndex: rodIndex,
-        ),
-      ),
-    );
-  }
-
-  BarTooltipItem? getTooltipItem({
-    required BuildContext context,
-    required BarChartGroupData group,
-    required int groupIndex,
-    required BarChartRodData rod,
-    required int rodIndex,
-  }) {
-    final data = chartData;
-
-    final occupancyValue = double.parse(data[group.x.toInt()].occupancy);
-    final percentage = '${(occupancyValue * 100).toStringAsFixed(0)}%';
-
-    return BarTooltipItem(
-      percentage,
-      context.textTheme.bodyMedium!.copyWith(
-        color: ColorsManager.blackColor,
-        fontSize: 14,
-      ),
-    );
-  }
-
-  FlTitlesData _titlesData(BuildContext context) {
-    final titlesData = EnergyManagementChartsHelper.titlesData(
-      context,
-      leftTitlesInterval: 250,
-    );
-
-    final leftTitles = titlesData.leftTitles.copyWith(
-      sideTitles: titlesData.leftTitles.sideTitles.copyWith(
-        reservedSize: 70,
-        interval: 0.25,
-        getTitlesWidget: (value, meta) => Padding(
-          padding: const EdgeInsetsDirectional.only(end: 12),
-          child: FittedBox(
-            alignment: AlignmentDirectional.centerStart,
-            fit: BoxFit.scaleDown,
-            child: Text(
-              '${(value * 100).toStringAsFixed(0)}%',
-              style: context.textTheme.bodySmall?.copyWith(
-                fontSize: 12,
-                color: ColorsManager.greyColor,
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-
-    final bottomTitles = AxisTitles(
-      sideTitles: SideTitles(
-        showTitles: true,
-        getTitlesWidget: (value, _) => FittedBox(
-          alignment: AlignmentDirectional.bottomCenter,
-          fit: BoxFit.scaleDown,
-          child: Text(
-            (value + 1).toString(),
-            style: context.textTheme.bodySmall?.copyWith(
-              color: ColorsManager.greyColor,
-              fontSize: 8,
-            ),
-          ),
-        ),
-        reservedSize: 36,
-      ),
-    );
-
-    return titlesData.copyWith(
-      leftTitles: leftTitles,
-      bottomTitles: bottomTitles,
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_chart_box.dart

@@ -1,67 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart';
-import 'package:syncrow_web/pages/analytics/widgets/analytics_error_widget.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class OccupancyChartBox extends StatelessWidget {
-  const OccupancyChartBox({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<OccupancyBloc, OccupancyState>(
-      builder: (context, state) {
-        return Container(
-          padding: const EdgeInsets.all(30),
-          decoration: containerWhiteDecoration,
-          child: Column(
-            spacing: 20,
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              AnalyticsErrorWidget(state.errorMessage),
-              Row(
-                children: [
-                  const Expanded(
-                    flex: 3,
-                    child: FittedBox(
-                      alignment: AlignmentDirectional.centerStart,
-                      fit: BoxFit.scaleDown,
-                      child: ChartTitle(title: Text('Occupancy')),
-                    ),
-                  ),
-                  const Spacer(),
-                  Expanded(
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      alignment: AlignmentDirectional.centerEnd,
-                      child: AnalyticsDateFilterButton(
-                        onDateSelected: (DateTime value) {
-                          context.read<AnalyticsDatePickerBloc>().add(
-                                UpdateAnalyticsDatePickerEvent(montlyDate: value),
-                              );
-                          FetchOccupancyDataHelper.loadOccupancyData(context);
-                        },
-                        selectedDate: context
-                            .watch<AnalyticsDatePickerBloc>()
-                            .state
-                            .monthlyDate,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-              const Divider(height: 0),
-              Expanded(child: OccupancyChart(chartData: state.chartData)),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_end_side_bar.dart

@@ -1,133 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/models/power_clamp_energy_status.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_energy_data_device_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/power_clamp_energy_status_widget.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/utils/style.dart';
-import 'package:uuid/uuid.dart';
-
-class OccupancyEndSideBar extends StatelessWidget {
-  const OccupancyEndSideBar({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<RealtimeDeviceChangesBloc, RealtimeDeviceChangesState>(
-      builder: (context, state) {
-        return Container(
-          decoration: subSectionContainerDecoration.copyWith(
-            borderRadius: BorderRadius.circular(30),
-          ),
-          padding: const EdgeInsetsDirectional.all(32),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              _buildHeader(context),
-              Text(
-                'Device ID:',
-                style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.textPrimaryColor,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 12,
-                ),
-              ),
-              const SizedBox(height: 6),
-              SelectableText(
-                (const Uuid().v4()),
-                style: context.textTheme.bodySmall?.copyWith(
-                  color: ColorsManager.blackColor,
-                  fontWeight: FontWeight.w400,
-                  fontSize: 12,
-                ),
-              ),
-              const SizedBox(height: 10),
-              const Divider(height: 1, color: ColorsManager.greyColor),
-              const SizedBox(height: 50),
-              SizedBox(
-                height: MediaQuery.sizeOf(context).height * 0.2,
-                child: PowerClampEnergyStatusWidget(
-                  status: [
-                    PowerClampEnergyStatus(
-                      iconPath: Assets.presenceState,
-                      title: 'Presence Status',
-                      value: _valueFromCode(
-                        'presence_state',
-                        state.deviceStatusList,
-                      ),
-                      unit: '',
-                    ),
-                    PowerClampEnergyStatus(
-                      iconPath: Assets.presenceTimeIcon,
-                      title: 'Presence Time',
-                      value:
-                          '${_valueFromCode('none_body_time', state.deviceStatusList)} Min',
-                      unit: '',
-                    ),
-                    PowerClampEnergyStatus(
-                      iconPath: Assets.currentDistanceIcon,
-                      title: 'Detection Distance',
-                      value:
-                          '${_valueFromCode('space_move_val', state.deviceStatusList)} M',
-                      unit: '',
-                    ),
-                  ],
-                ),
-              ),
-              const SizedBox(height: 20),
-            ],
-          ),
-        );
-      },
-    );
-  }
-
-  String _valueFromCode(
-    String code,
-    List<Status> status, {
-    String? defaultValue,
-  }) {
-    final value = status
-        .firstWhere(
-          (e) => e.code == code,
-          orElse: () => Status(code: '--', value: '--'),
-        )
-        .value
-        .toString();
-    return value == 'null' ? defaultValue ?? '--' : value;
-  }
-
-  Widget _buildHeader(BuildContext context) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Expanded(
-          flex: 2,
-          child: FittedBox(
-            fit: BoxFit.scaleDown,
-            alignment: AlignmentDirectional.centerStart,
-            child: SelectableText(
-              'Presnce Sensor',
-              style: context.textTheme.headlineSmall?.copyWith(
-                fontWeight: FontWeight.w700,
-                color: ColorsManager.vividBlue.withValues(alpha: 0.6),
-                fontSize: 18,
-              ),
-            ),
-          ),
-        ),
-        const Spacer(),
-        const Expanded(
-          child: FittedBox(
-            fit: BoxFit.scaleDown,
-            alignment: AlignmentDirectional.centerEnd,
-            child: PowerClampEnergyDataDeviceDropdown(),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart

@@ -1,84 +0,0 @@
-import 'dart:math' as math show max;
-
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_days.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_gradient.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_months.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_painter.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class OccupancyHeatMap extends StatelessWidget {
-  const OccupancyHeatMap({required this.heatMapData, super.key});
-  final Map<DateTime, int> heatMapData;
-
-  static const _cellSize = 16.0;
-  static const _totalWeeks = 53;
-
-  int get _maxValue => heatMapData.isNotEmpty
-      ? heatMapData.keys.map((key) => heatMapData[key]!).reduce(math.max)
-      : 0;
-
-  DateTime _getStartingDate() {
-    final jan1 = DateTime(DateTime.now().year, 1, 1);
-    final startOfWeek = jan1.subtract(Duration(days: jan1.weekday - 1));
-    return startOfWeek;
-  }
-
-  List<OccupancyPaintItem> _generatePaintItems(DateTime startDate) {
-    return List.generate(_totalWeeks * 7, (index) {
-      final date = startDate.add(Duration(days: index));
-      final value = heatMapData[date] ?? 0;
-      return OccupancyPaintItem(index: index, value: value);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final startDate = _getStartingDate();
-    final paintItems = _generatePaintItems(startDate);
-
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        OccupancyHeatMapMonths(startDate: startDate, cellSize: _cellSize),
-        Container(
-          decoration: const BoxDecoration(
-            border: Border(
-              bottom: BorderSide(color: ColorsManager.grayBorder),
-              top: BorderSide(color: ColorsManager.grayBorder),
-            ),
-          ),
-          width: double.infinity,
-          child: Row(
-            children: [
-              Expanded(
-                child: FittedBox(
-                  fit: BoxFit.fill,
-                  child: Row(
-                    children: [
-                      const OccupancyHeatMapDays(cellSize: _cellSize),
-                      CustomPaint(
-                        size: const Size(_totalWeeks * _cellSize, 7 * _cellSize),
-                        child: CustomPaint(
-                          isComplex: true,
-                          size: const Size(_totalWeeks * _cellSize, 7 * _cellSize),
-                          painter: OccupancyPainter(
-                            items: paintItems,
-                            maxValue: _maxValue,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-              ),
-            ],
-          ),
-        ),
-        const SizedBox(height: 20),
-        OccupancyHeatMapGradient(maxValue: _maxValue),
-      ],
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_box.dart

@@ -1,74 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/analytics_date_filter_button.dart';
-import 'package:syncrow_web/pages/analytics/modules/energy_management/widgets/chart_title.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart';
-import 'package:syncrow_web/pages/analytics/widgets/analytics_error_widget.dart';
-import 'package:syncrow_web/utils/style.dart';
-
-class OccupancyHeatMapBox extends StatelessWidget {
-  const OccupancyHeatMapBox({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return BlocBuilder<OccupancyHeatMapBloc, OccupancyHeatMapState>(
-      builder: (context, state) {
-        return Container(
-          padding: const EdgeInsets.all(30),
-          decoration: containerWhiteDecoration,
-          child: Column(
-            spacing: 20,
-            mainAxisSize: MainAxisSize.min,
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              AnalyticsErrorWidget(state.errorMessage),
-              Row(
-                children: [
-                  const Expanded(
-                    flex: 3,
-                    child: FittedBox(
-                      alignment: AlignmentDirectional.centerStart,
-                      fit: BoxFit.scaleDown,
-                      child: ChartTitle(title: Text('Occupancy Heat Map')),
-                    ),
-                  ),
-                  const Spacer(),
-                  Expanded(
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      alignment: AlignmentDirectional.centerEnd,
-                      child: AnalyticsDateFilterButton(
-                        onDateSelected: (DateTime value) {
-                          context.read<AnalyticsDatePickerBloc>().add(
-                                UpdateAnalyticsDatePickerEvent(yearlyDate: value),
-                              );
-                          FetchOccupancyDataHelper.loadOccupancyData(context);
-                        },
-                        datePickerType: DatePickerType.year,
-                        selectedDate: context
-                            .watch<AnalyticsDatePickerBloc>()
-                            .state
-                            .yearlyDate,
-                      ),
-                    ),
-                  ),
-                ],
-              ),
-              const Divider(height: 0),
-              Expanded(
-                child: OccupancyHeatMap(
-                  heatMapData: state.heatMapData.asMap().map(
-                        (_, value) => MapEntry(value.date, value.occupancy),
-                      ),
-                ),
-              ),
-            ],
-          ),
-        );
-      },
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_days.dart

@@ -1,51 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class OccupancyHeatMapDays extends StatelessWidget {
-  const OccupancyHeatMapDays({
-    required this.cellSize,
-    this.textColor = ColorsManager.blackColor,
-    super.key,
-  });
-
-  final double cellSize;
-  final Color textColor;
-
-  static const _weekDayLabels = [
-    'Monday',
-    'Tuesday',
-    'Wednesday',
-    'Thursday',
-    'Friday',
-    'Saturday',
-    'Sunday',
-  ];
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: List.generate(7, (i) {
-        final dayLabel = _weekDayLabels[i];
-        return Container(
-          height: cellSize,
-          alignment: AlignmentDirectional.centerStart,
-          margin: const EdgeInsetsDirectional.all(0.5).add(
-            const EdgeInsetsDirectional.only(end: 4),
-          ),
-          padding: const EdgeInsets.only(right: 6),
-          child: Text(
-            dayLabel,
-            textAlign: TextAlign.start,
-            style: context.textTheme.bodySmall?.copyWith(
-              color: textColor,
-              fontSize: 8,
-              fontWeight: FontWeight.w500,
-            ),
-          ),
-        );
-      }),
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_gradient.dart

@@ -1,47 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class OccupancyHeatMapGradient extends StatelessWidget {
-  const OccupancyHeatMapGradient({super.key, required this.maxValue});
-
-  final int maxValue;
-  List<Color> _heatMapColors() {
-    if (maxValue == 0) {
-      return [
-        ColorsManager.vividBlue.withValues(alpha: 0),
-        ColorsManager.vividBlue.withValues(alpha: 0),
-      ];
-    }
-    return List.generate(
-      maxValue + 1,
-      (index) => ColorsManager.vividBlue.withValues(alpha: index / maxValue),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Row(
-      children: [
-        const Spacer(),
-        Tooltip(
-          message: 'Min: 0 - Max: $maxValue',
-          child: Container(
-            width: 150,
-            height: 20,
-            decoration: BoxDecoration(
-              border: Border.all(
-                color: ColorsManager.grayBorder,
-                width: 1,
-              ),
-              gradient: LinearGradient(
-                begin: AlignmentDirectional.centerEnd,
-                end: AlignmentDirectional.centerStart,
-                colors: _heatMapColors(),
-              ),
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_months.dart

@@ -1,60 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:syncrow_web/pages/analytics/modules/occupancy/widgets/occupancy_heat_map_days.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class OccupancyHeatMapMonths extends StatelessWidget {
-  const OccupancyHeatMapMonths({
-    required this.startDate,
-    required this.cellSize,
-    super.key,
-  });
-
-  final DateTime startDate;
-  final double cellSize;
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 48,
-      width: double.infinity,
-      color: Colors.transparent,
-      child: Row(
-        mainAxisSize: MainAxisSize.min,
-        crossAxisAlignment: CrossAxisAlignment.end,
-        children: [
-          OccupancyHeatMapDays(
-            cellSize: cellSize / 3,
-            textColor: Colors.transparent,
-          ),
-          ...List.generate(12, (monthIndex) {
-            final monthStartDate = DateTime(startDate.year, monthIndex + 1, 1);
-            final monthName = DateFormat.MMM().format(monthStartDate);
-            return Expanded(
-              child: RotatedBox(
-                quarterTurns: 3,
-                child: Container(
-                  padding: EdgeInsetsDirectional.zero,
-                  margin: EdgeInsetsDirectional.zero,
-                  decoration: const BoxDecoration(
-                    border: Border(
-                      top: BorderSide(color: ColorsManager.borderColor),
-                    ),
-                  ),
-                  width: cellSize * 4,
-                  child: Padding(
-                    padding: const EdgeInsets.only(left: 4, top: 2),
-                    child: Text(
-                      monthName,
-                      style: const TextStyle(fontSize: 8),
-                    ),
-                  ),
-                ),
-              ),
-            );
-          }),
-        ],
-      ),
-    );
-  }
-}

lib/pages/analytics/modules/occupancy/widgets/occupancy_painter.dart

@@ -1,84 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-
-class OccupancyPaintItem {
-  final int index;
-  final int value;
-
-  const OccupancyPaintItem({required this.index, required this.value});
-}
-
-class OccupancyPainter extends CustomPainter {
-  OccupancyPainter({
-    required this.items,
-    required this.maxValue,
-  });
-
-  final List<OccupancyPaintItem> items;
-  final int maxValue;
-
-  static const double cellSize = 16.0;
-
-  @override
-  void paint(Canvas canvas, Size size) {
-    final Paint fillPaint = Paint();
-    final Paint borderPaint = Paint()
-      ..color = ColorsManager.grayBorder.withValues(alpha: 0.4)
-      ..style = PaintingStyle.stroke;
-
-    for (final item in items) {
-      final column = item.index ~/ 7;
-      final row = item.index % 7;
-
-      final x = column * cellSize;
-      final y = row * cellSize;
-
-      fillPaint.color = _getColor(item.value);
-      final rect = Rect.fromLTWH(x, y, cellSize, cellSize);
-      canvas.drawRect(rect, fillPaint);
-
-      _drawDashedLine(
-        canvas,
-        Offset(x, y),
-        Offset(x + cellSize, y),
-        borderPaint,
-      );
-      _drawDashedLine(
-        canvas,
-        Offset(x, y + cellSize),
-        Offset(x + cellSize, y + cellSize),
-        borderPaint,
-      );
-
-      canvas.drawLine(Offset(x, y), Offset(x, y + cellSize), borderPaint);
-      canvas.drawLine(
-          Offset(x + cellSize, y), Offset(x + cellSize, y + cellSize), borderPaint);
-    }
-  }
-
-  void _drawDashedLine(Canvas canvas, Offset start, Offset end, Paint paint) {
-    const double dashWidth = 2.0;
-    const double dashSpace = 4.0;
-    final double totalLength = (end - start).distance;
-    final Offset direction = (end - start) / (end - start).distance;
-
-    double currentLength = 0.0;
-    while (currentLength < totalLength) {
-      final Offset dashStart = start + direction * currentLength;
-      final double nextLength = currentLength + dashWidth;
-      final Offset dashEnd =
-          start + direction * (nextLength < totalLength ? nextLength : totalLength);
-      canvas.drawLine(dashStart, dashEnd, paint);
-      currentLength = nextLength + dashSpace;
-    }
-  }
-
-  Color _getColor(int value) {
-    if (maxValue == 0) return ColorsManager.vividBlue.withValues(alpha: 0);
-    final opacity = value.clamp(0, maxValue) / maxValue;
-    return ColorsManager.vividBlue.withValues(alpha: opacity);
-  }
-
-  @override
-  bool shouldRepaint(covariant CustomPainter oldDelegate) => false;
-}

lib/pages/analytics/params/get_occupancy_heat_map_param.dart

@@ -1,19 +0,0 @@
-class GetOccupancyHeatMapParam {
-  final DateTime year;
-  final String communityId;
-  final String spaceId;
-
-  const GetOccupancyHeatMapParam({
-    required this.year,
-    required this.communityId,
-    required this.spaceId,
-  });
-
-  Map<String, dynamic> toJson() {
-    return {
-      'year': year.toIso8601String(),
-      'communityId': communityId,
-      'spaceId': spaceId,
-    };
-  }
-}

lib/pages/analytics/params/get_occupancy_param.dart

@@ -1,19 +0,0 @@
-class GetOccupancyParam {
-  final String monthDate;
-  final String? spaceUuid;
-  final String communityUuid;
-
-  GetOccupancyParam({
-    required this.monthDate,
-    required this.spaceUuid,
-    required this.communityUuid,
-  });
-
-  Map<String, dynamic> toJson() {
-    return {
-      'monthDate': monthDate,
-      'spaceUuid': spaceUuid,
-      'communityUuid': communityUuid,
-    };
-  }
-}

lib/pages/analytics/params/get_total_energy_consumption_param.dart

@@ -1,21 +1,19 @@
 class GetTotalEnergyConsumptionParam {
-  final DateTime? monthDate;
+  final DateTime? startDate;
+  final DateTime? endDate;
   final String? spaceId;
-  final String? communityId;
 
   const GetTotalEnergyConsumptionParam({
-    this.monthDate,
+    this.startDate,
+    this.endDate,
     this.spaceId,
-    this.communityId,
   });
 
   Map<String, dynamic> toJson() {
     return {
-      'monthDate':
+      'startDate': startDate?.toIso8601String(),
-          '${monthDate?.year}-${monthDate?.month.toString().padLeft(2, '0')}',
+      'endDate': endDate?.toIso8601String(),
-      if (communityId == null || communityId!.isEmpty) 'spaceUuid': spaceId,
+      'spaceId': spaceId,
-      'communityUuid': communityId,
-      'groupByDevice': false,
     };
   }
 }

lib/pages/analytics/services/occupacy/fake_occupacy_service.dart

@@ -1,19 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_param.dart';
-import 'package:syncrow_web/pages/analytics/services/occupacy/occupacy_service.dart';
-
-class FakeOccupacyService implements OccupacyService {
-  @override
-  Future<List<Occupacy>> load(GetOccupancyParam param) async {
-    return await Future.delayed(
-      const Duration(seconds: 1),
-      () => List.generate(
-        30,
-        (index) => Occupacy(
-          date: DateTime.now().subtract(Duration(days: index)).toString(),
-          occupancy: ((index / 100)).toString(),
-        ),
-      ),
-    );
-  }
-}

lib/pages/analytics/services/occupacy/occupacy_service.dart

@@ -1,6 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_param.dart';
-
-abstract interface class OccupacyService {
-  Future<List<Occupacy>> load(GetOccupancyParam param);
-}

lib/pages/analytics/services/occupancy_heat_map/fake_occupancy_heat_map_service.dart

@@ -1,25 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/occupancy_heat_map_model.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_heat_map_param.dart';
-import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/occupancy_heat_map_service.dart';
-
-class FakeOccupancyHeatMapService implements OccupancyHeatMapService {
-  @override
-  Future<List<OccupancyHeatMapModel>> load(GetOccupancyHeatMapParam param) {
-    return Future.delayed(const Duration(milliseconds: 200), () {
-      final now = DateTime.now();
-      final startOfYear = DateTime(now.year, 1, 1);
-      final endOfYear = DateTime(now.year, 12, 31);
-      final daysInYear = endOfYear.difference(startOfYear).inDays + 1;
-
-      final List<OccupancyHeatMapModel> data = List.generate(
-        daysInYear,
-        (index) => OccupancyHeatMapModel(
-          date: startOfYear.add(Duration(days: index)),
-          occupancy: ((index + 1) * 10) % 100,
-        ),
-      );
-
-      return data;
-    });
-  }
-}

lib/pages/analytics/services/occupancy_heat_map/occupancy_heat_map_service.dart

@@ -1,6 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/occupancy_heat_map_model.dart';
-import 'package:syncrow_web/pages/analytics/params/get_occupancy_heat_map_param.dart';
-
-abstract interface class OccupancyHeatMapService {
-  Future<List<OccupancyHeatMapModel>> load(GetOccupancyHeatMapParam param);
-}

lib/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart

@@ -23,7 +23,7 @@ class FirebaseRealtimeDeviceService implements RealtimeDeviceService {
 
           return Status(
             code: status['code']?.toString() ?? '',
-            value: status['value']?.toString() ?? '',
+            value: num.tryParse(status['value']?.toString() ?? '0'),
           );
         }).toList();
       });

lib/pages/analytics/services/total_energy_consumption/fake_total_energy_consumption_service.dart

@@ -0,0 +1,19 @@
+import 'package:syncrow_web/pages/analytics/models/energy_data_model.dart';
+import 'package:syncrow_web/pages/analytics/params/get_total_energy_consumption_param.dart';
+import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/total_energy_consumption_service.dart';
+
+class FakeTotalEnergyConsumptionService implements TotalEnergyConsumptionService {
+  @override
+  Future<List<EnergyDataModel>> load(
+    GetTotalEnergyConsumptionParam param,
+  ) {
+    return Future.value(
+      List.generate(30, (index) {
+        return EnergyDataModel(
+          date: DateTime(2025, 1, index + 1),
+          value: 20000 + (index * 1000) % 5000,
+        );
+      }),
+    );
+  }
+}

lib/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart

@@ -14,37 +14,20 @@ class RemoteTotalEnergyConsumptionService implements TotalEnergyConsumptionServi
   ) async {
     try {
       final response = await _httpService.get(
-        path: '/power-clamp/historical',
+        path: 'endpoint',
         showServerMessage: true,
-        queryParameters: param.toJson(),
+        expectedResponseModel: (data) {
-        expectedResponseModel: _TotalEnergyConsumptionResponseMapper.map,
+          final json = data as Map<String, dynamic>? ?? {};
+          final mappedData = json['data'] as List<dynamic>? ?? [];
+          return mappedData.map((e) {
+            final jsonData = e as Map<String, dynamic>;
+            return EnergyDataModel.fromJson(jsonData);
+          }).toList();
+        },
       );
-
       return response;
     } catch (e) {
       throw Exception('Failed to load total energy consumption: $e');
     }
   }
 }
-
-abstract final class _TotalEnergyConsumptionResponseMapper {
-  const _TotalEnergyConsumptionResponseMapper._();
-
-  static List<EnergyDataModel> map(dynamic data) {
-    final json = data as Map<String, dynamic>? ?? {};
-    final dailyData = json['data'] as List<dynamic>? ?? [];
-
-    return dailyData.map((dayData) {
-      final date = dayData['date'] as String;
-      final energyValue = double.tryParse(
-            dayData['total_energy_consumed_kw'] as String? ?? '0',
-          ) ??
-          0.0;
-
-      return EnergyDataModel(
-        date: DateTime.parse(date),
-        value: energyValue,
-      );
-    }).toList();
-  }
-}

lib/pages/common/custom_table.dart

@@ -21,7 +21,6 @@ class DynamicTable extends StatefulWidget {
   final List<String>? initialSelectedIds;
   final int uuidIndex;
   final Function(dynamic selectedRows)? onSelectionChanged;
-  final Function(int rowIndex)? onSettingsPressed;
   const DynamicTable({
     super.key,
     required this.headers,
@@ -38,7 +37,6 @@ class DynamicTable extends StatefulWidget {
     this.initialSelectedIds,
     required this.uuidIndex,
     this.onSelectionChanged,
-    this.onSettingsPressed,
   });
 
   @override
@@ -65,8 +63,7 @@ class _DynamicTableState extends State<DynamicTable> {
     }
   }
 
-  bool _compareListOfLists(
+  bool _compareListOfLists(List<List<dynamic>> oldList, List<List<dynamic>> newList) {
-      List<List<dynamic>> oldList, List<List<dynamic>> newList) {
     // Check if the old and new lists are the same
     if (oldList.length != newList.length) return false;
 
@@ -135,8 +132,7 @@ class _DynamicTableState extends State<DynamicTable> {
                         children: [
                           if (widget.withCheckBox) _buildSelectAllCheckbox(),
                           ...List.generate(widget.headers.length, (index) {
-                            return _buildTableHeaderCell(
+                            return _buildTableHeaderCell(widget.headers[index], index);
-                                widget.headers[index], index);
                           })
                           //...widget.headers.map((header) => _buildTableHeaderCell(header)),
                         ],
@@ -157,14 +153,11 @@ class _DynamicTableState extends State<DynamicTable> {
                                         height: 15,
                                       ),
                                       Text(
-                                        widget.tableName == 'AccessManagement'
+                                        widget.tableName == 'AccessManagement' ? 'No Password ' : 'No Devices',
-                                            ? 'No Password '
-                                            : 'No Devices',
                                         style: Theme.of(context)
                                             .textTheme
                                             .bodySmall!
-                                            .copyWith(
+                                            .copyWith(color: ColorsManager.grayColor),
-                                                color: ColorsManager.grayColor),
                                       )
                                     ],
                                   ),
@@ -173,28 +166,16 @@ class _DynamicTableState extends State<DynamicTable> {
                             ],
                           )
                         : Column(
-                            children:
+                            children: List.generate(widget.data.length, (index) {
-                                List.generate(widget.data.length, (rowIndex) {
+                              final row = widget.data[index];
-                              final row = widget.data[rowIndex];
                               return Row(
                                 children: [
-                                  if (widget.withCheckBox)
+                                  if (widget.withCheckBox) _buildRowCheckbox(index, widget.size.height * 0.08),
-                                    _buildRowCheckbox(
+                                  ...row.map((cell) => _buildTableCell(cell.toString(), widget.size.height * 0.08)),
-                                        rowIndex, widget.size.height * 0.08),
-                                  ...row.asMap().entries.map((entry) {
-                                    int columnIndex = entry.key;
-                                    dynamic cell = entry.value;
-                                    return _buildTableCell(
-                                      cell.toString(),
-                                      widget.size.height * 0.08,
-                                      rowIndex: rowIndex,
-                                      columnIndex: columnIndex,
-                                    );
-                                  }).toList(),
                                 ],
                               );
                             }),
-                          )
+                          ),
                   ],
                 ),
               ),
@@ -215,9 +196,7 @@ class _DynamicTableState extends State<DynamicTable> {
       ),
       child: Checkbox(
         value: _selectAll,
-        onChanged: widget.withSelectAll && widget.data.isNotEmpty
+        onChanged: widget.withSelectAll && widget.data.isNotEmpty ? _toggleSelectAll : null,
-            ? _toggleSelectAll
-            : null,
       ),
     );
   }
@@ -259,9 +238,7 @@ class _DynamicTableState extends State<DynamicTable> {
         constraints: const BoxConstraints.expand(height: 40),
         alignment: Alignment.centerLeft,
         child: Padding(
-          padding: EdgeInsets.symmetric(
+          padding: EdgeInsets.symmetric(horizontal: index == widget.headers.length - 1 ? 12 : 8.0, vertical: 4),
-              horizontal: index == widget.headers.length - 1 ? 12 : 8.0,
-              vertical: 4),
           child: Text(
             title,
             style: context.textTheme.titleSmall!.copyWith(
@@ -276,23 +253,13 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableCell(
+  Widget _buildTableCell(String content, double size) {
-    String content,
-    double size, {
-    required int rowIndex,
-    required int columnIndex,
-  }) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
     if (isBatteryLevel) {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
-    bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
-
-    if (isSettingsColumn) {
-      return _buildSettingsIcon(rowIndex, size);
-    }
 
     Color? statusColor;
     switch (content) {
@@ -344,22 +311,4 @@ class _DynamicTableState extends State<DynamicTable> {
       ),
     );
   }
-
-  Widget _buildSettingsIcon(int rowIndex, double size) {
-    return Container(
-      height: size,
-      padding: const EdgeInsets.all(5.0),
-      decoration: const BoxDecoration(
-        border: Border(
-          bottom: BorderSide(color: ColorsManager.boxDivider, width: 1.0),
-        ),
-        color: Colors.white,
-      ),
-      alignment: Alignment.center,
-      child: IconButton(
-        icon: SvgPicture.asset(Assets.settings),
-        onPressed: () => widget.onSettingsPressed?.call(rowIndex),
-      ),
-    );
-  }
 }

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

@@ -95,7 +95,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
             return const RoutinesView();
           }
           if (state.createRoutineView) {
-            return const CreateNewRoutineView();
+            return CreateNewRoutineView();
           }
 
           return BlocBuilder<DeviceManagementBloc, DeviceManagementState>(

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

@@ -6,11 +6,9 @@ import 'package:syncrow_web/pages/common/filter/filter_widget.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/widgets/device_search_filters.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/device_settings_panel.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_batch_control_dialog.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_control_dialog.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/format_date_time.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/utils/style.dart';
@@ -60,8 +58,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
           'Low Battery ($lowBatteryCount)',
         ];
 
-        final buttonLabel =
+        final buttonLabel = (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
-            (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
 
         return Row(
           children: [
@@ -108,23 +105,18 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                             if (selectedDevices.length == 1) {
                                               showDialog(
                                                 context: context,
-                                                builder: (context) =>
+                                                builder: (context) => DeviceControlDialog(
-                                                    DeviceControlDialog(
                                                   device: selectedDevices.first,
                                                 ),
                                               );
-                                            } else if (selectedDevices.length >
+                                            } else if (selectedDevices.length > 1) {
-                                                1) {
+                                              final productTypes = selectedDevices
-                                              final productTypes =
+                                                  .map((device) => device.productType)
-                                                  selectedDevices
-                                                      .map((device) =>
-                                                          device.productType)
                                                   .toSet();
                                               if (productTypes.length == 1) {
                                                 showDialog(
                                                   context: context,
-                                                  builder: (context) =>
+                                                  builder: (context) => DeviceBatchControlDialog(
-                                                      DeviceBatchControlDialog(
                                                     devices: selectedDevices,
                                                   ),
                                                 );
@@ -138,9 +130,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                       textAlign: TextAlign.center,
                                       style: TextStyle(
                                         fontSize: 12,
-                                        color: isControlButtonEnabled
+                                        color: isControlButtonEnabled ? Colors.white : Colors.grey,
-                                            ? Colors.white
-                                            : Colors.grey,
                                       ),
                                     ),
                                   ),
@@ -176,40 +166,29 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                 'Installation Date and Time',
                                 'Status',
                                 'Last Offline Date and Time',
-                                'Settings'
                               ],
                               data: devicesToShow.map((device) {
                                 final combinedSpaceNames = device.spaces != null
-                                    ? device.spaces!
+                                    ? device.spaces!.map((space) => space.spaceName).join(' > ') +
-                                            .map((space) => space.spaceName)
-                                            .join(' > ') +
                                         (device.community != null
                                             ? ' > ${device.community!.name}'
                                             : '')
-                                    : (device.community != null
+                                    : (device.community != null ? device.community!.name : '');
-                                        ? device.community!.name
-                                        : '');
 
                                 return [
                                   device.name ?? '',
                                   device.productName ?? '',
                                   device.uuid ?? '',
-                                  (device.spaces != null &&
+                                  (device.spaces != null && device.spaces!.isNotEmpty)
-                                          device.spaces!.isNotEmpty)
                                       ? device.spaces![0].spaceName
                                       : '',
                                   combinedSpaceNames,
-                                  device.batteryLevel != null
+                                  device.batteryLevel != null ? '${device.batteryLevel}%' : '-',
-                                      ? '${device.batteryLevel}%'
+                                  formatDateTime(DateTime.fromMillisecondsSinceEpoch(
-                                      : '-',
-                                  formatDateTime(
-                                      DateTime.fromMillisecondsSinceEpoch(
                                       (device.createTime ?? 0) * 1000)),
                                   device.online == true ? 'Online' : 'Offline',
-                                  formatDateTime(
+                                  formatDateTime(DateTime.fromMillisecondsSinceEpoch(
-                                      DateTime.fromMillisecondsSinceEpoch(
                                       (device.updateTime ?? 0) * 1000)),
-                                  'Settings',
                                 ];
                               }).toList(),
                               onSelectionChanged: (selectedRows) {
@@ -223,10 +202,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                   .map((device) => device.uuid!)
                                   .toList(),
                               isEmpty: devicesToShow.isEmpty,
-                              onSettingsPressed: (rowIndex) {
-                                final device = devicesToShow[rowIndex];
-                                showDeviceSettingsSidebar(context, device);
-                              },
                             ),
                           ),
                         )
@@ -238,37 +213,4 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
       },
     );
   }
-
-  void showDeviceSettingsSidebar(BuildContext context, AllDevicesModel device) {
-    showGeneralDialog(
-      context: context,
-      barrierDismissible: true,
-      barrierLabel: "Device Settings",
-      transitionDuration: const Duration(milliseconds: 300),
-      pageBuilder: (context, anim1, anim2) {
-        return Align(
-          alignment: Alignment.centerRight,
-          child: Material(
-            child: Container(
-              width: MediaQuery.of(context).size.width * 0.3,
-              color: ColorsManager.whiteColors,
-              child: DeviceSettingsPanel(
-                device: device,
-                onClose: () => Navigator.of(context).pop(),
-              ),
-            ),
-          ),
-        );
-      },
-      transitionBuilder: (context, anim1, anim2, child) {
-        return SlideTransition(
-          position: Tween<Offset>(
-            begin: const Offset(1, 0),
-            end: Offset.zero,
-          ).animate(anim1),
-          child: child,
-        );
-      },
-    );
-  }
 }

lib/pages/device_managment/device_setting/bloc/device_info_model.dart

@@ -1,182 +0,0 @@
-class DeviceInfoModel {
-  final int activeTime;
-  final String category;
-  final String categoryName;
-  final int createTime;
-  final String gatewayId;
-  final String icon;
-  final String ip;
-  final String lat;
-  final String localKey;
-  final String lon;
-  final String model;
-  final String name;
-  final String nodeId;
-  final bool online;
-  final String ownerId;
-  final String productName;
-  final bool sub;
-  final String timeZone;
-  final int updateTime;
-  final String uuid;
-  final String productUuid;
-  final String productType;
-  final String permissionType;
-  final String macAddress;
-  final Subspace subspace;
-
-  DeviceInfoModel({
-    required this.activeTime,
-    required this.category,
-    required this.categoryName,
-    required this.createTime,
-    required this.gatewayId,
-    required this.icon,
-    required this.ip,
-    required this.lat,
-    required this.localKey,
-    required this.lon,
-    required this.model,
-    required this.name,
-    required this.nodeId,
-    required this.online,
-    required this.ownerId,
-    required this.productName,
-    required this.sub,
-    required this.timeZone,
-    required this.updateTime,
-    required this.uuid,
-    required this.productUuid,
-    required this.productType,
-    required this.permissionType,
-    required this.macAddress,
-    required this.subspace,
-  });
-
-  factory DeviceInfoModel.fromJson(Map<String, dynamic> json) {
-    return DeviceInfoModel(
-      activeTime: json['activeTime'],
-      category: json['category'],
-      categoryName: json['categoryName'],
-      createTime: json['createTime'],
-      gatewayId: json['gatewayId'],
-      icon: json['icon'],
-      ip: json['ip'] ?? "",
-      lat: json['lat'],
-      localKey: json['localKey'],
-      lon: json['lon'],
-      model: json['model'],
-      name: json['name'],
-      nodeId: json['nodeId'],
-      online: json['online'],
-      ownerId: json['ownerId'],
-      productName: json['productName'],
-      sub: json['sub'],
-      timeZone: json['timeZone'],
-      updateTime: json['updateTime'],
-      uuid: json['uuid'],
-      productUuid: json['productUuid'],
-      productType: json['productType'],
-      permissionType: json['permissionType'] ?? '',
-      macAddress: json['macAddress'],
-      subspace: Subspace.fromJson(json['subspace']),
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'activeTime': activeTime,
-      'category': category,
-      'categoryName': categoryName,
-      'createTime': createTime,
-      'gatewayId': gatewayId,
-      'icon': icon,
-      'ip': ip,
-      'lat': lat,
-      'localKey': localKey,
-      'lon': lon,
-      'model': model,
-      'name': name,
-      'nodeId': nodeId,
-      'online': online,
-      'ownerId': ownerId,
-      'productName': productName,
-      'sub': sub,
-      'timeZone': timeZone,
-      'updateTime': updateTime,
-      'uuid': uuid,
-      'productUuid': productUuid,
-      'productType': productType,
-      'permissionType': permissionType,
-      'macAddress': macAddress,
-      'subspace': subspace.toJson(),
-    };
-  }
-
-  static DeviceInfoModel empty() {
-    return DeviceInfoModel(
-      activeTime: 0,
-      category: '',
-      categoryName: '',
-      createTime: 0,
-      gatewayId: '',
-      icon: '',
-      ip: '',
-      lat: '',
-      localKey: '',
-      lon: '',
-      model: '',
-      name: '',
-      nodeId: '',
-      online: false,
-      ownerId: '',
-      productName: '',
-      sub: false,
-      timeZone: '',
-      updateTime: 0,
-      uuid: '',
-      productUuid: '',
-      productType: '',
-      permissionType: '',
-      macAddress: '',
-      subspace: Subspace(
-        uuid: '',
-        createdAt: '',
-        updatedAt: '',
-        subspaceName: '',
-      ),
-    );
-  }
-}
-
-class Subspace {
-  final String uuid;
-  final String createdAt;
-  final String updatedAt;
-  final String subspaceName;
-
-  Subspace({
-    required this.uuid,
-    required this.createdAt,
-    required this.updatedAt,
-    required this.subspaceName,
-  });
-
-  factory Subspace.fromJson(Map<String, dynamic> json) {
-    return Subspace(
-      uuid: json['uuid'],
-      createdAt: json['createdAt'],
-      updatedAt: json['updatedAt'],
-      subspaceName: json['subspaceName'],
-    );
-  }
-
-  Map<String, dynamic> toJson() {
-    return {
-      'uuid': uuid,
-      'createdAt': createdAt,
-      'updatedAt': updatedAt,
-      'subspaceName': subspaceName,
-    };
-  }
-}

lib/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart

@@ -1,149 +0,0 @@
-import 'package:bloc/bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/device_info_model.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_state.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/sub_space_model.dart';
-import 'package:syncrow_web/services/devices_mang_api.dart';
-import 'package:syncrow_web/utils/snack_bar.dart';
-part 'setting_bloc_event.dart';
-
-class SettingBlocBloc extends Bloc<SettingBlocEvent, DeviceSettingsState> {
-  final String deviceId;
-  SettingBlocBloc({
-    required this.deviceId,
-  }) : super(const SettingBlocInitial()) {
-    on<DeviceSettingInitialInfo>(fetchDeviceInfo);
-    on<SaveNameEvent>(saveName);
-    on<ChangeNameEvent>(_changeName);
-    on<DeleteDeviceEvent>(deleteDevice);
-    //on<FetchRoomsEvent>(_fetchRoomsAndDevices);
-  }
-  static String deviceName = '';
-  final TextEditingController nameController =
-      TextEditingController(text: deviceName);
-  List<SubSpaceModel> roomsList = [];
-  bool isEditingName = false;
-
-  bool _validateInputs() {
-    final nameError = fullNameValidator(nameController.text);
-    if (nameError != null) {
-      CustomSnackBar.displaySnackBar(nameError);
-      return true;
-    }
-    return false;
-  }
-
-  String? fullNameValidator(String? value) {
-    if (value == null) return 'name is required';
-    final withoutExtraSpaces = value.replaceAll(RegExp(r"\s+"), ' ').trim();
-    if (withoutExtraSpaces.length < 2 || withoutExtraSpaces.length > 30) {
-      return 'name must be between 2 and 30 characters long';
-    }
-    if (RegExp(r"/[^ a-zA-Z0-9-\']/").hasMatch(withoutExtraSpaces)) {
-      return 'Only alphanumeric characters, space, dash and single quote are allowed';
-    }
-    return null;
-  }
-
-  Future<void> saveName(
-      SaveNameEvent event, Emitter<DeviceSettingsState> emit) async {
-    if (_validateInputs()) return;
-    try {
-      emit(SettingLoadingState());
-      var response = await DevicesManagementApi.putDeviceName(
-          deviceId: deviceId, deviceName: nameController.text);
-      add(DeviceSettingInitialInfo());
-      CustomSnackBar.displaySnackBar('Save Successfully');
-      emit(UpdateSettingState(deviceName: nameController.text));
-    } catch (e) {
-      emit(ErrorState(message: e.toString()));
-    } finally {
-      // isSaving = false;
-    }
-  }
-
-  DeviceInfoModel deviceInfo = DeviceInfoModel(
-    activeTime: 0,
-    category: "",
-    categoryName: "",
-    createTime: 0,
-    gatewayId: "",
-    icon: "",
-    ip: "",
-    lat: "",
-    localKey: "",
-    lon: "",
-    model: "",
-    name: "",
-    nodeId: "",
-    online: false,
-    ownerId: "",
-    productName: "",
-    sub: false,
-    timeZone: "",
-    updateTime: 0,
-    uuid: "",
-    productUuid: "",
-    productType: "",
-    permissionType: "",
-    macAddress: "",
-    subspace: Subspace(
-      uuid: "",
-      createdAt: "",
-      updatedAt: "",
-      subspaceName: "",
-    ),
-  );
-
-  Future fetchDeviceInfo(
-      DeviceSettingInitialInfo event, Emitter<DeviceSettingsState> emit) async {
-    try {
-      emit(SettingLoadingState());
-      var response = await DevicesManagementApi.getDeviceInfo(deviceId);
-      deviceInfo = DeviceInfoModel.fromJson(response);
-      nameController.text = deviceInfo.name;
-
-      emit(UpdateSettingState(
-        deviceName: nameController.text,
-        deviceInfo: deviceInfo,
-      ));
-    } catch (e) {
-      emit(ErrorState(message: e.toString()));
-    }
-  }
-
-  bool editName = false;
-  final FocusNode focusNode = FocusNode();
-
-  void _changeName(ChangeNameEvent event, Emitter<DeviceSettingsState> emit) {
-    emit(SettingLoadingState());
-    editName = event.value!;
-    if (editName) {
-      Future.delayed(const Duration(milliseconds: 500), () {
-        focusNode.requestFocus();
-      });
-    } else {
-      add(const SaveNameEvent());
-      focusNode.unfocus();
-    }
-    emit(UpdateSettingState(deviceName: deviceName, deviceInfo: deviceInfo));
-  }
-
-  void deleteDevice(
-      DeleteDeviceEvent event, Emitter<DeviceSettingsState> emit) async {
-    try {
-      emit(SettingLoadingState());
-      var response =
-          await DevicesManagementApi.resetDevise(devicesUuid: deviceId);
-      CustomSnackBar.displaySnackBar('Reset Successfully');
-      emit(UpdateSettingState(
-        deviceName: nameController.text,
-        deviceInfo: deviceInfo,
-      ));
-    } catch (e) {
-      emit(ErrorState(message: e.toString()));
-      return;
-    }
-  }
-}

lib/pages/device_managment/device_setting/bloc/setting_bloc_event.dart

@@ -1,50 +0,0 @@
-part of 'setting_bloc_bloc.dart';
-
-abstract class SettingBlocEvent extends Equatable {
-  const SettingBlocEvent();
-  @override
-  List<Object?> get props => [];
-}
-
-class SaveDeviceName extends SettingBlocEvent {
-  final String deviceName;
-  final String deviceId;
-
-  const SaveDeviceName({required this.deviceName, required this.deviceId});
-
-  @override
-  List<Object?> get props => [deviceName, deviceId];
-}
-
-class StartEditingName extends SettingBlocEvent {}
-
-class CancelEditingName extends SettingBlocEvent {}
-
-class ChangeEditingNameValue extends SettingBlocEvent {
-  final String value;
-  const ChangeEditingNameValue(this.value);
-
-  @override
-  List<Object?> get props => [value];
-}
-
-class FetchRoomsEvent extends SettingBlocEvent {
-  final String deviceId;
-
-  const FetchRoomsEvent(this.deviceId);
-
-  @override
-  List<Object?> get props => [deviceId];
-}
-
-class SaveNameEvent extends SettingBlocEvent {
-  const SaveNameEvent();
-}
-
-class DeviceSettingInitialInfo extends SettingBlocEvent {}
-
-class ChangeNameEvent extends SettingBlocEvent {
-  final bool? value;
-  const ChangeNameEvent({this.value});
-}
-class DeleteDeviceEvent extends SettingBlocEvent {}

lib/pages/device_managment/device_setting/bloc/setting_bloc_state.dart

@@ -1,69 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/device_info_model.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/sub_space_model.dart';
-
-abstract class DeviceSettingsState extends Equatable {
-  const DeviceSettingsState();
-
-  @override
-  List<Object?> get props => [];
-}
-
-class SettingBlocInitial extends DeviceSettingsState {
-  final String deviceName;
-  final String deviceId;
-  final bool isEditingName;
-  final String editingNameValue;
-
-  const SettingBlocInitial({
-    this.deviceName = '',
-    this.deviceId = '',
-    this.isEditingName = false,
-    this.editingNameValue = '',
-  });
-
-  SettingBlocInitial copyWith({
-    String? deviceName,
-    String? deviceId,
-    bool? isEditingName,
-    String? editingNameValue,
-  }) =>
-      SettingBlocInitial(
-        deviceName: deviceName ?? this.deviceName,
-        deviceId: deviceId ?? this.deviceId,
-        isEditingName: isEditingName ?? this.isEditingName,
-        editingNameValue: editingNameValue ?? this.editingNameValue,
-      );
-
-  @override
-  List<Object?> get props =>
-      [deviceName, deviceId, isEditingName, editingNameValue];
-}
-
-class SettingLoadingState extends DeviceSettingsState {}
-
-class UpdateSettingState extends DeviceSettingsState {
-  final String deviceName;
-  final DeviceInfoModel? deviceInfo;
-  const UpdateSettingState({required this.deviceName, this.deviceInfo});
-
-  @override
-  List<Object?> get props => [deviceName, deviceInfo];
-}
-
-class ErrorState extends DeviceSettingsState {
-  final String message;
-
-  const ErrorState({required this.message});
-  @override
-  List<Object?> get props => [message];
-}
-
-class FetchRoomsState extends DeviceSettingsState {
-  final List<SubSpaceModel> roomsList;
-
-  const FetchRoomsState({required this.roomsList});
-
-  @override
-  List<Object?> get props => [roomsList];
-}

lib/pages/device_managment/device_setting/bloc/sub_space_model.dart

@@ -1,35 +0,0 @@
-import 'package:syncrow_web/pages/visitor_password/model/device_model.dart';
-
-class SubSpaceModel {
-  final String? id;
-  final String? name;
-  List<DeviceModel>? devices;
-
-  SubSpaceModel({
-    required this.id,
-    required this.name,
-    required this.devices,
-  });
-
-  Map<String, dynamic> toJson() {
-    return {
-      'id': id,
-      'name': name,
-      'devices': devices?.map((device) => device.toJson()).toList(),
-    };
-  }
-
-  factory SubSpaceModel.fromJson(Map<String, dynamic> json) {
-    List<DeviceModel> devices = [];
-    if (json['devices'] != null) {
-      for (var device in json['devices']) {
-        devices.add(DeviceModel.fromJson(device));
-      }
-    }
-    return SubSpaceModel(
-      id: json['uuid'],
-      name: json['subspaceName'],
-      devices: devices,
-    );
-  }
-}

lib/pages/device_managment/device_setting/device_settings_panel.dart

@@ -1,267 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/device_info_model.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_state.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/web_layout/default_container.dart';
-
-class DeviceSettingsPanel extends StatelessWidget {
-  final VoidCallback? onClose;
-  final AllDevicesModel device;
-
-  const DeviceSettingsPanel({this.onClose, super.key, required this.device});
-
-  @override
-  Widget build(BuildContext context) {
-    final sectionTitle = context.theme.textTheme.titleMedium!.copyWith(
-      fontWeight: FontWeight.bold,
-      color: ColorsManager.grayColor,
-    );
-    Widget infoRow(
-        {required String label, required String value, Widget? trailing}) {
-      return Padding(
-        padding: const EdgeInsets.symmetric(vertical: 6.0),
-        child: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Text(
-              label,
-              style: context.theme.textTheme.bodyMedium!.copyWith(
-                fontSize: 14,
-                color: ColorsManager.grayColor,
-              ),
-            ),
-            Expanded(
-              child: Text(
-                value,
-                textAlign: TextAlign.end,
-                style: context.theme.textTheme.bodyMedium!.copyWith(
-                  fontSize: 14,
-                  color: ColorsManager.blackColor,
-                ),
-                overflow: TextOverflow.ellipsis,
-              ),
-            ),
-            const SizedBox(width: 8),
-            trailing ?? const SizedBox.shrink(),
-          ],
-        ),
-      );
-    }
-
-    return BlocProvider(
-        create: (context) => SettingBlocBloc(
-              deviceId: device.uuid ?? '',
-            )..add(DeviceSettingInitialInfo()),
-        child: BlocBuilder<SettingBlocBloc, DeviceSettingsState>(
-            builder: (context, state) {
-          final iconPath =
-              DeviceTypeHelper.getDeviceIconByTypeCode(device.productType);
-          final _bloc = BlocProvider.of<SettingBlocBloc>(context);
-          DeviceInfoModel deviceInfo = DeviceInfoModel.empty();
-          if (state is UpdateSettingState) {
-            deviceInfo = state.deviceInfo!;
-          }
-          return Container(
-            width: MediaQuery.of(context).size.width * 0.3,
-            color: ColorsManager.grey25,
-            padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
-            child: ListView(
-              children: [
-                /// Header
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    IconButton(
-                      icon: SvgPicture.asset(Assets.closeSettingsIcon),
-                      onPressed: onClose ?? () => Navigator.of(context).pop(),
-                    ),
-                  ],
-                ),
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Text('Device Settings',
-                        style: context.theme.textTheme.titleLarge!.copyWith(
-                            fontWeight: FontWeight.bold,
-                            color: ColorsManager.primaryColor)),
-                  ],
-                ),
-                const SizedBox(height: 24),
-
-                /// Device Name + Icon
-                DefaultContainer(
-                  child: Row(
-                    children: [
-                      CircleAvatar(
-                        radius: 40,
-                        backgroundColor:
-                            const Color.fromARGB(177, 213, 213, 213),
-                        child: CircleAvatar(
-                          backgroundColor: ColorsManager.whiteColors,
-                          radius: 36,
-                          child: SvgPicture.asset(
-                            iconPath,
-                            fit: BoxFit.cover,
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 12),
-                      Expanded(
-                        child: TextFormField(
-                          maxLength: 30,
-                          style: const TextStyle(
-                            color: ColorsManager.blackColor,
-                          ),
-                          textAlign: TextAlign.center,
-                          focusNode: _bloc.focusNode,
-                          controller: _bloc.nameController,
-                          enabled: _bloc.editName,
-                          onFieldSubmitted: (value) {
-                            _bloc.add(const ChangeNameEvent(value: false));
-                          },
-                          decoration: const InputDecoration(
-                            border: InputBorder.none,
-                            fillColor: Colors.white10,
-                            counterText: '',
-                          ),
-                        ),
-                      ),
-                      const SizedBox(width: 8),
-                      _bloc.editName == true
-                          ? const SizedBox()
-                          : GestureDetector(
-                              onTap: () {
-                                _bloc.add(const ChangeNameEvent(value: true));
-                              },
-                              child: SvgPicture.asset(
-                                Assets.editNameIconSettings,
-                                color: ColorsManager.grayColor,
-                                height: 20,
-                                width: 20,
-                              ),
-                            ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 32),
-
-                /// Device Management
-                Text('Device Management', style: sectionTitle),
-                DefaultContainer(
-                  padding: EdgeInsets.zero,
-                  child: Column(
-                    children: [
-                      const SizedBox(
-                        height: 5,
-                      ),
-                      Padding(
-                        padding: const EdgeInsets.all(10.0),
-                        child: infoRow(
-                          label: 'Sub-Space:',
-                          value: device.subspace!.subspaceName,
-                          trailing: const Icon(
-                            Icons.arrow_forward_ios,
-                            size: 16,
-                            color: ColorsManager.greyColor,
-                          ),
-                        ),
-                      ),
-                      const Divider(color: ColorsManager.dividerColor),
-                      Padding(
-                        padding: const EdgeInsets.all(10.0),
-                        child: infoRow(
-                          label: 'Virtual Address:',
-                          value: deviceInfo.productUuid,
-                          trailing: InkWell(
-                            onTap: () {
-                              Clipboard.setData(
-                                ClipboardData(text: device.productUuid ?? ''),
-                              );
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                const SnackBar(
-                                  content: Text(
-                                      'Virtual Address copied to clipboard'),
-                                ),
-                              );
-                            },
-                            child: const Icon(
-                              Icons.copy,
-                              size: 16,
-                              color: ColorsManager.greyColor,
-                            ),
-                          ),
-                        ),
-                      ),
-                      const Divider(color: ColorsManager.dividerColor),
-                      Padding(
-                        padding: const EdgeInsets.all(10.0),
-                        child: infoRow(
-                            label: 'MAC Address:',
-                            value: deviceInfo.macAddress),
-                      ),
-                      const SizedBox(
-                        height: 5,
-                      ),
-                    ],
-                  ),
-                ),
-                const SizedBox(height: 32),
-
-                /// Remove Device Button
-                SizedBox(
-                  width: double.infinity,
-                  child: InkWell(
-                    onTap: () {
-                      _bloc.add(DeleteDeviceEvent());
-                    },
-                    child: const DefaultContainer(
-                      padding: EdgeInsets.all(25),
-                      child: Center(
-                        child: Text(
-                          'Remove Device',
-                          style: TextStyle(color: ColorsManager.red),
-                        ),
-                      ),
-                    ),
-                  ),
-                )
-              ],
-            ),
-          );
-        }));
-  }
-}
-
-class DeviceTypeHelper {
-  static const Map<String, String> _iconMap = {
-    'AC': Assets.ac,
-    'GW': Assets.gateway,
-    'CPS': Assets.sensors,
-    'DL': Assets.doorLock,
-    'WPS': Assets.sensors,
-    '3G': Assets.gangSwitch,
-    '2G': Assets.twoGang,
-    '1G': Assets.oneGang,
-    'CUR': Assets.curtain,
-    'WH': Assets.waterHeater,
-    'DS': Assets.doorSensor,
-    '1GT': Assets.oneTouchSwitch,
-    '2GT': Assets.twoTouchSwitch,
-    '3GT': Assets.threeTouchSwitch,
-    'GD': Assets.garageDoor,
-    'WL': Assets.waterLeakNormal,
-    'NCPS': Assets.sensors,
-  };
-
-  static String getDeviceIconByTypeCode(String? typeCode) {
-    if (typeCode == null) return Assets.logoHorizontal;
-    return _iconMap[typeCode] ?? Assets.logoHorizontal;
-  }
-}

lib/services/devices_mang_api.dart

@@ -91,8 +91,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> deviceBatchControl(
+  Future<bool> deviceBatchControl(List<String> uuids, String code, dynamic value) async {
-      List<String> uuids, String code, dynamic value) async {
     try {
       final body = {
         'devicesUuid': uuids,
@@ -117,8 +116,7 @@ class DevicesManagementApi {
     }
   }
 
-  static Future<List<DeviceModel>> getDevicesByGatewayId(
+  static Future<List<DeviceModel>> getDevicesByGatewayId(String gatewayId) async {
-      String gatewayId) async {
     final response = await HTTPService().get(
       path: ApiEndpoints.gatewayApi.replaceAll('{gatewayUuid}', gatewayId),
       showServerMessage: false,
@@ -152,9 +150,7 @@ class DevicesManagementApi {
     String code,
   ) async {
     final response = await HTTPService().get(
-      path: ApiEndpoints.getDeviceLogs
+      path: ApiEndpoints.getDeviceLogs.replaceAll('{uuid}', uuid).replaceAll('{code}', code),
-          .replaceAll('{uuid}', uuid)
-          .replaceAll('{code}', code),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return DeviceReport.fromJson(json['data']);
@@ -227,8 +223,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> addScheduleRecord(
+  Future<bool> addScheduleRecord(ScheduleEntry sendSchedule, String uuid) async {
-      ScheduleEntry sendSchedule, String uuid) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
@@ -245,8 +240,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<List<ScheduleModel>> getDeviceSchedules(
+  Future<List<ScheduleModel>> getDeviceSchedules(String uuid, String category) async {
-      String uuid, String category) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getScheduleByDeviceId
@@ -269,9 +263,7 @@ class DevicesManagementApi {
   }
 
   Future<bool> updateScheduleRecord(
-      {required bool enable,
+      {required bool enable, required String uuid, required String scheduleId}) async {
-      required String uuid,
-      required String scheduleId}) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateScheduleByDeviceId
@@ -292,8 +284,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> editScheduleRecord(
+  Future<bool> editScheduleRecord(String uuid, ScheduleEntry newSchedule) async {
-      String uuid, ScheduleEntry newSchedule) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
@@ -344,46 +335,4 @@ class DevicesManagementApi {
       return false;
     }
   }
-
-  static Future<Map<String, dynamic>> putDeviceName(
-      {required String deviceId, required String deviceName}) async {
-    try {
-      final response = await HTTPService().put(
-        path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
-        body: {"deviceName": deviceName},
-        expectedResponseModel: (json) {
-          return json['data'];
-        },
-      );
-      return response;
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  static Future getDeviceInfo(String deviceId) async {
-    final response = await HTTPService().get(
-        path: ApiEndpoints.deviceByUuid.replaceAll('{deviceUuid}', deviceId),
-        showServerMessage: false,
-        expectedResponseModel: (json) {
-          return json['data'] as Map<String, dynamic>;
-        });
-    return response;
-  }
-    static Future resetDevise({
-    String? devicesUuid,
-  }) async {
-    final response = await HTTPService().post(
-      path: ApiEndpoints.resetDevice.replaceAll('{deviceUuid}', devicesUuid!),
-      showServerMessage: false,
-      body: {
-        "devicesUuid": [devicesUuid]
-      },
-      expectedResponseModel: (json) {
-        return json;
-      },
-    );
-    return response;
-  }
-
 }

lib/services/space_mana_api.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/sub_space_model.dart';
 import 'package:syncrow_web/pages/space_tree/model/pagination_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
@@ -13,16 +12,14 @@ import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
-  Future<List<CommunityModel>> fetchCommunities(String projectId,
+  Future<List<CommunityModel>> fetchCommunities(String projectId, {int page = 1}) async {
-      {int page = 1}) async {
     try {
       List<CommunityModel> allCommunities = [];
       bool hasNext = true;
 
       while (hasNext) {
         await HTTPService().get(
-          path: ApiEndpoints.getCommunityList
+          path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
-              .replaceAll('{projectId}', projectId),
           queryParameters: {
             'page': page,
           },
@@ -58,14 +55,8 @@ class CommunitySpaceManagementApi {
     try {
       bool hasNext = false;
       await HTTPService().get(
-        path:
+        path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
-            ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
+        queryParameters: {'page': page, 'includeSpaces': true, 'size': 25, 'search': search},
-        queryParameters: {
-          'page': page,
-          'includeSpaces': true,
-          'size': 25,
-          'search': search
-        },
         expectedResponseModel: (json) {
           try {
             List<dynamic> jsonData = json['data'] ?? [];
@@ -77,10 +68,7 @@ class CommunitySpaceManagementApi {
 
             page = currentPage + 1;
             paginationModel = PaginationModel(
-                pageNum: page,
+                pageNum: page, hasNext: hasNext, size: 25, communities: communityList);
-                hasNext: hasNext,
-                size: 25,
-                communities: communityList);
             return paginationModel;
           } catch (_) {
             hasNext = false;
@@ -95,8 +83,7 @@ class CommunitySpaceManagementApi {
   Future<CommunityModel?> getCommunityById(String communityId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.getCommunityById
+        path: ApiEndpoints.getCommunityById.replaceAll('{communityId}', communityId),
-            .replaceAll('{communityId}', communityId),
         expectedResponseModel: (json) {
           return CommunityModel.fromJson(json['data']);
         },
@@ -108,8 +95,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<CommunityModel?> createCommunity(
+  Future<CommunityModel?> createCommunity(String name, String description, String projectId) async {
-      String name, String description, String projectId) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.createCommunity.replaceAll('{projectId}', projectId),
@@ -128,8 +114,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> updateCommunity(
+  Future<bool> updateCommunity(String communityId, String name, String projectId) async {
-      String communityId, String name, String projectId) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateCommunity
@@ -166,8 +151,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpacesResponse> fetchSpaces(
+  Future<SpacesResponse> fetchSpaces(String communityId, String projectId) async {
-      String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.listSpaces
@@ -193,8 +177,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpaceModel?> getSpace(
+  Future<SpaceModel?> getSpace(String communityId, String spaceId, String projectId) async {
-      String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpace
@@ -306,8 +289,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> deleteSpace(
+  Future<bool> deleteSpace(String communityId, String spaceId, String projectId) async {
-      String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteSpace
@@ -325,17 +307,15 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<List<SpaceModel>> getSpaceHierarchy(
+  Future<List<SpaceModel>> getSpaceHierarchy(String communityId, String projectId) async {
-      String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpaceHierarchy
             .replaceAll('{communityId}', communityId)
             .replaceAll('{projectId}', projectId),
         expectedResponseModel: (json) {
-          final spaceModels = (json['data'] as List)
+          final spaceModels =
-              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
+              (json['data'] as List).map((spaceJson) => SpaceModel.fromJson(spaceJson)).toList();
-              .toList();
 
           return spaceModels;
         },
@@ -347,17 +327,15 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<List<SpaceModel>> getSpaceOnlyWithDevices(
+  Future<List<SpaceModel>> getSpaceOnlyWithDevices({String? communityId, String? projectId}) async {
-      {String? communityId, String? projectId}) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.spaceOnlyWithDevices
             .replaceAll('{communityId}', communityId!)
             .replaceAll('{projectId}', projectId!),
         expectedResponseModel: (json) {
-          final spaceModels = (json['data'] as List)
+          final spaceModels =
-              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
+              (json['data'] as List).map((spaceJson) => SpaceModel.fromJson(spaceJson)).toList();
-              .toList();
           return spaceModels;
         },
       );
@@ -367,36 +345,4 @@ class CommunitySpaceManagementApi {
       return [];
     }
   }
-
-  static Future<List<SubSpaceModel>> getSubSpaceBySpaceId(
-      String communityId, String spaceId, String projectId) async {
-    try {
-      // Construct the API path
-      final path = ApiEndpoints.listSubspace
-          .replaceFirst('{communityUuid}', communityId)
-          .replaceFirst('{spaceUuid}', spaceId)
-          .replaceAll('{projectUuid}', projectId);
-
-      final response = await HTTPService().get(
-        path: path,
-        queryParameters: {"page": 1, "pageSize": 10},
-        showServerMessage: false,
-        expectedResponseModel: (json) {
-          List<SubSpaceModel> rooms = [];
-          if (json['data'] != null) {
-            for (var subspace in json['data']) {
-              rooms.add(SubSpaceModel.fromJson(subspace));
-            }
-          } else {
-            print("Warning: 'data' key is missing or null in response JSON.");
-          }
-          return rooms;
-        },
-      );
-
-      return response;
-    } catch (error, stackTrace) {
-      return []; // Return an empty list if there's an error
-    }
-  }
 }

lib/utils/color_manager.dart

@@ -73,6 +73,4 @@ abstract class ColorsManager {
   static const Color vividBlue = Color(0xFF023DFE);
   static const Color semiTransparentRed = Color(0x99FF0000);
   static const Color grey700 = Color(0xFF2D3748);
-    static const Color grey25 = Color(0xFFF9F9F9);
-
 }

lib/utils/constants/api_const.dart

@@ -60,12 +60,9 @@ abstract class ApiEndpoints {
       '/devices/{uuid}/report-logs?code={code}&startTime={startTime}&endTime={endTime}';
 
   static const String scheduleByDeviceId = '/schedule/{deviceUuid}';
-  static const String getScheduleByDeviceId =
+  static const String getScheduleByDeviceId = '/schedule/{deviceUuid}?category={category}';
-      '/schedule/{deviceUuid}?category={category}';
+  static const String deleteScheduleByDeviceId = '/schedule/{deviceUuid}/{scheduleUuid}';
-  static const String deleteScheduleByDeviceId =
+  static const String updateScheduleByDeviceId = '/schedule/enable/{deviceUuid}';
-      '/schedule/{deviceUuid}/{scheduleUuid}';
-  static const String updateScheduleByDeviceId =
-      '/schedule/enable/{deviceUuid}';
   static const String factoryReset = '/devices/batch';
 
   //product
@@ -127,10 +124,4 @@ abstract class ApiEndpoints {
       '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
   static const String spaceOnlyWithDevices =
       '/projects/{projectId}/communities/{communityId}/spaces?onlyWithDevices=true';
-
-  static const String listSubspace =
-      '/projects/{projectUuid}/communities/{communityUuid}/spaces/{spaceUuid}/subspaces';
-  static const String deviceByUuid = '/devices/{deviceUuid}';
-
-  static const String resetDevice = '/factory/reset/{deviceUuid}';
 }

lib/utils/constants/assets.dart

@@ -481,9 +481,4 @@ class Assets {
   static const String indentLevelIcon = 'assets/icons/indent_level_icon.svg';
   static const String triggerLevelIcon = 'assets/icons/trigger_level_icon.svg';
   static const String blankCalendar = 'assets/icons/blank_calendar.svg';
-  static const String closeSettingsIcon =
-      'assets/icons/close_settings_icon.svg';
-
-  static const String editNameIconSettings =
-      'assets/icons/edit_name_icon_settings.svg';
 }

lib/web_layout/default_container.dart

@@ -1,45 +0,0 @@
-import 'package:flutter/material.dart';
-
-class DefaultContainer extends StatelessWidget {
-  const DefaultContainer({
-    super.key,
-    required this.child,
-    this.height,
-    this.width,
-    this.color,
-    this.boxConstraints,
-    this.margin,
-    this.padding,
-    this.onTap,
-    this.borderRadius,
-  });
-
-  final double? height;
-  final double? width;
-  final Widget child;
-  final BoxConstraints? boxConstraints;
-  final EdgeInsets? margin;
-  final EdgeInsets? padding;
-  final Color? color;
-  final Function()? onTap;
-  final BorderRadius? borderRadius;
-  @override
-  Widget build(BuildContext context) {
-    return InkWell(
-      onTap: onTap,
-      borderRadius: BorderRadius.circular(20),
-      child: Container(
-        height: height,
-        width: width,
-        margin: margin ?? const EdgeInsets.only(right: 3, bottom: 3),
-        constraints: boxConstraints,
-        decoration: BoxDecoration(
-          color: color ?? Colors.white,
-          borderRadius: borderRadius ?? BorderRadius.circular(20),
-        ),
-        padding: padding ?? const EdgeInsets.all(10),
-        child: child,
-      ),
-    );
-  }
-}