Created and connected a remote implementation that fetches the heat map occupancy per space from the API.

Updated OccupancyHeatMapModel model with what the api returns, and only used the necessary fields that the api returns for this feature to work.
Matched the GetOccupancyHeatMapParam with what the API expects and removed the communityId since it is no longer necessary for the api, and renamed spaceId to spaceUuid for more clarity.
2026-10-26 23:47:57 +00:00 · 2025-05-14 10:51:37 +03:00 · 2025-05-14 10:51:19 +03:00 · 2025-05-14 10:49:32 +03:00 · 2025-05-14 10:48:28 +03:00 · 2025-05-14 10:47:54 +03:00
34 changed files with 890 additions and 220 deletions
@@ -0,0 +1,12 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_7305_15779)">
+<path d="M17.0872 11.5142C17.0872 13.2025 16.427 14.8021 15.2211 15.9954C14.0278 17.2014 12.4283 17.8615 10.7399 17.8615C9.05141 17.8615 7.45185 17.2014 6.25856 15.9954C5.05262 14.8021 4.39249 13.2025 4.39249 11.5142C4.39249 9.82574 5.05266 8.22618 6.25856 7.03289C7.45185 5.8269 9.05141 5.16681 10.7399 5.16681C11.8063 5.16681 12.8471 5.43337 13.7866 5.95388L11.2984 8.97523H21.0861L18.6486 0L16.2113 2.97053C14.5737 1.91691 12.6948 1.35835 10.7398 1.35835C8.02314 1.35835 5.47142 2.41197 3.55459 4.32888C1.63765 6.24578 0.583984 8.79747 0.583984 11.5142C0.583984 14.2309 1.63765 16.7825 3.55459 18.6994C5.47146 20.6163 8.0231 21.67 10.7398 21.67C13.4565 21.67 16.0082 20.6163 17.925 18.6994C19.8419 16.7825 20.8956 14.2309 20.8956 11.5142V10.8794H17.0872V11.5142Z" fill="#77DD00"/>
+<path d="M17.0876 10.8799H20.8961V11.5146C20.8961 14.2313 19.8424 16.7829 17.9254 18.6998C16.0086 20.6168 13.4569 21.6704 10.7402 21.6704V17.862C12.4287 17.862 14.0282 17.2019 15.2215 15.9959C16.4275 14.8026 17.0876 13.203 17.0876 11.5147V10.8799H17.0876Z" fill="#66BB00"/>
+<path d="M13.787 5.95388C12.8475 5.43333 11.8066 5.16681 10.7402 5.16681V1.35835C12.6952 1.35835 14.5741 1.91691 16.2117 2.97057L18.6491 0L21.0866 8.97523H11.2989L13.787 5.95388Z" fill="#66BB00"/>
+</g>
+<defs>
+<clipPath id="clip0_7305_15779">
+<rect width="21.67" height="21.67" fill="white"/>
+</clipPath>
+</defs>
+</svg>
@@ -1,22 +1,28 @@
 import 'package:equatable/equatable.dart';

 class OccupancyHeatMapModel extends Equatable {
-  final DateTime date;
+  final String uuid;

-  final int occupancy;
+  final DateTime eventDate;
+
+  final int countTotalPresenceDetected;

  const OccupancyHeatMapModel({
-    required this.date,
-    required this.occupancy,
+    required this.uuid,
+    required this.eventDate,
+    required this.countTotalPresenceDetected,
  });

  factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) {
    return OccupancyHeatMapModel(
-      date: DateTime.parse(json['date'] as String),
-      occupancy: json['occupancy'] as int,
+      uuid: json['uuid'] as String? ?? '',
+      eventDate: DateTime.parse(
+        json['event_date'] as String? ?? '${DateTime.now()}',
+      ),
+      countTotalPresenceDetected: json['count_total_presence_detected'] as int? ?? 0,
    );
  }

  @override
-  List<Object?> get props => [date, occupancy];
+  List<Object?> get props => [uuid, eventDate, countTotalPresenceDetected];
 }
@@ -20,7 +20,11 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
            spaces,
          ),
        );
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
+    FetchEnergyManagementDataHelper.loadEnergyManagementData(
+      context,
+      communityId: community.uuid,
+      spaceId: spaces.isNotEmpty ? spaces.first.uuid ?? '' : '',
+    );
  }

  @override
@@ -36,7 +40,12 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
            space.children,
          ),
        );
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
+
+    FetchEnergyManagementDataHelper.loadEnergyManagementData(
+      context,
+      communityId: community.uuid,
+      spaceId: space.uuid ?? '',
+    );
  }

  @override
@@ -45,14 +54,7 @@ class EnergyManagementDataLoadingStrategy implements AnalyticsDataLoadingStrateg
    CommunityModel community,
    SpaceModel child,
  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            child.uuid ?? '',
-            child.children,
-          ),
-        );
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
+    // Do nothing
  }

  @override
@@ -17,10 +17,14 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
    context.read<SpaceTreeBloc>().add(
          OnCommunitySelected(
            community.uuid,
-            spaces,
+            spaces.isNotEmpty ? [spaces.first] : [],
          ),
        );
-    FetchOccupancyDataHelper.loadOccupancyData(context);
+    FetchOccupancyDataHelper.loadOccupancyData(
+      context,
+      communityId: community.uuid,
+      spaceId: spaces.isNotEmpty ? spaces.first.uuid ?? '' : '',
+    );
  }

  @override
@@ -29,14 +33,25 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
    CommunityModel community,
    SpaceModel space,
  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            space.uuid ?? '',
-            space.children,
-          ),
-        );
-    FetchOccupancyDataHelper.loadOccupancyData(context);
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final selectedSpacesIds = spaceTreeBloc.state.selectedSpaces;
+    final isSpaceSelected = selectedSpacesIds.contains(space.uuid);
+
+    if (selectedSpacesIds.isEmpty) {
+      spaceTreeBloc.add(OnCommunitySelected(community.uuid, [space]));
+    } else if (isSpaceSelected) {
+      spaceTreeBloc.add(const SpaceTreeClearSelectionEvent());
+    } else {
+      spaceTreeBloc
+        ..add(const SpaceTreeClearSelectionEvent())
+        ..add(OnSpaceSelected(community, space.uuid ?? '', []));
+    }
+
+    FetchOccupancyDataHelper.loadOccupancyData(
+      context,
+      communityId: community.uuid,
+      spaceId: space.uuid ?? '',
+    );
  }

  @override
@@ -45,18 +60,12 @@ class OccupancyDataLoadingStrategy implements AnalyticsDataLoadingStrategy {
    CommunityModel community,
    SpaceModel child,
  ) {
-    context.read<SpaceTreeBloc>().add(
-          OnSpaceSelected(
-            community,
-            child.uuid ?? '',
-            child.children,
-          ),
-        );
-    FetchOccupancyDataHelper.loadOccupancyData(context);
+    // Do nothing
  }

  @override
  void clearData(BuildContext context) {
    context.read<SpaceTreeBloc>().add(const SpaceTreeClearSelectionEvent());
+    // FetchOccupancyDataHelper.clearAllData(context);
  }
 }
@@ -14,7 +14,7 @@ import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_he
 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/occupancy_heat_map/remote_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';
@@ -60,7 +60,9 @@ class AnalyticsPage extends StatelessWidget {
        ),
        BlocProvider(create: (context) => OccupancyBloc(FakeOccupacyService())),
        BlocProvider(
-          create: (context) => OccupancyHeatMapBloc(FakeOccupancyHeatMapService()),
+          create: (context) => OccupancyHeatMapBloc(
+            RemoteOccupancyHeatMapService(HTTPService()),
+          ),
        ),
        BlocProvider(create: (context) => AnalyticsDatePickerBloc()),
      ],
@@ -9,29 +9,21 @@ class AnalyticsCommunitiesSidebar extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Builder(
-      builder: (context) {
-        final selectedTab = context.read<AnalyticsTabBloc>().state;
-        final strategy =
-            AnalyticsDataLoadingStrategyFactory.getStrategy(selectedTab);
+    final selectedTab = context.watch<AnalyticsTabBloc>().state;
+    final strategy = AnalyticsDataLoadingStrategyFactory.getStrategy(selectedTab);

-        // Clear data when tab changes
-        strategy.clearData(context);
-
-        return Expanded(
-          child: AnalyticsSpaceTreeView(
-            onSelectCommunity: (community, spaces) {
-              strategy.onCommunitySelected(context, community, spaces);
-            },
-            onSelectSpace: (community, space) {
-              strategy.onSpaceSelected(context, community, space);
-            },
-            onSelectChildSpace: (community, child) {
-              strategy.onChildSpaceSelected(context, community, child);
-            },
-          ),
-        );
-      },
+    return Expanded(
+      child: AnalyticsSpaceTreeView(
+        onSelectCommunity: (community, spaces) {
+          strategy.onCommunitySelected(context, community, spaces);
+        },
+        onSelectSpace: (community, space) {
+          strategy.onSpaceSelected(context, community, space);
+        },
+        onSelectChildSpace: (community, child) {
+          strategy.onChildSpaceSelected(context, community, child);
+        },
+      ),
    );
  }
 }
@@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/analytics/modules/analytics/enums/analytics_pa
 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/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/style.dart';

 class AnalyticsPageTabsAndChildren extends StatelessWidget {
@@ -13,6 +14,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final spaceTreeState = context.read<SpaceTreeBloc>().state;
    return BlocBuilder<AnalyticsTabBloc, AnalyticsPageTab>(
      buildWhen: (previous, current) => previous != current,
      builder: (context, selectedTab) => Column(
@@ -53,32 +55,33 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
                    ),
                  ),
                  const Spacer(),
-                  _buildAnimation(
-                    child: Visibility(
-                      key: ValueKey(selectedTab),
-                      visible: selectedTab == AnalyticsPageTab.energyManagement,
-                      child: Expanded(
-                        flex: 2,
-                        child: FittedBox(
-                          fit: BoxFit.scaleDown,
-                          alignment: AlignmentDirectional.centerEnd,
-                          child: AnalyticsDateFilterButton(
-                            onDateSelected: (DateTime value) {
-                              context.read<AnalyticsDatePickerBloc>().add(
-                                    UpdateAnalyticsDatePickerEvent(
-                                        montlyDate: value),
-                                  );
-                              FetchEnergyManagementDataHelper
-                                  .fetchEnergyManagementData(
-                                context,
-                                selectedDate: value,
-                              );
-                            },
-                            selectedDate: context
-                                .watch<AnalyticsDatePickerBloc>()
-                                .state
-                                .monthlyDate,
-                          ),
+                  Visibility(
+                    key: ValueKey(selectedTab),
+                    visible: selectedTab == AnalyticsPageTab.energyManagement,
+                    child: Expanded(
+                      flex: 2,
+                      child: FittedBox(
+                        fit: BoxFit.scaleDown,
+                        alignment: AlignmentDirectional.centerEnd,
+                        child: AnalyticsDateFilterButton(
+                          onDateSelected: (DateTime value) {
+                            context.read<AnalyticsDatePickerBloc>().add(
+                                  UpdateAnalyticsDatePickerEvent(montlyDate: value),
+                                );
+                            FetchEnergyManagementDataHelper.loadEnergyManagementData(
+                              context,
+                              selectedDate: value,
+                              communityId:
+                                  spaceTreeState.selectedCommunities.firstOrNull ??
+                                      '',
+                              spaceId:
+                                  spaceTreeState.selectedSpaces.firstOrNull ?? '',
+                            );
+                          },
+                          selectedDate: context
+                              .watch<AnalyticsDatePickerBloc>()
+                              .state
+                              .monthlyDate,
                        ),
                      ),
                    ),
@@ -9,58 +9,38 @@ import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/tota
 import 'package:syncrow_web/pages/analytics/params/get_energy_consumption_by_phases_param.dart';
 import 'package:syncrow_web/pages/analytics/params/get_energy_consumption_per_device_param.dart';
 import 'package:syncrow_web/pages/analytics/params/get_total_energy_consumption_param.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';

 abstract final class FetchEnergyManagementDataHelper {
  const FetchEnergyManagementDataHelper._();

-  static void fetchEnergyManagementData(
+  static const String _powerClampId = 'cb71d6ad-6e29-4eaa-ae3e-1a0d1c5f60fa';
+
+  static void loadEnergyManagementData(
    BuildContext context, {
+    required String communityId,
+    required String spaceId,
    DateTime? selectedDate,
  }) {
-    final (selectedCommunities, selectedSpaces) =
-        getSelectedCommunitiesAndSpaces(context);
-
-    if (selectedCommunities.isEmpty && selectedSpaces.isEmpty) {
+    if (communityId.isEmpty && spaceId.isEmpty) {
      clearAllData(context);
      return;
    }
+
    final datePickerState = context.read<AnalyticsDatePickerBloc>().state;
+    final selectedDate0 = selectedDate ?? datePickerState.monthlyDate;

-    loadTotalEnergyConsumption(context, selectedDate: datePickerState.monthlyDate);
-    loadEnergyConsumptionByPhases(
+    loadTotalEnergyConsumption(
      context,
-      selectedDate: datePickerState.monthlyDate,
+      selectedDate: selectedDate0,
+      communityId: communityId,
+      spaceId: spaceId,
    );
+
+    loadEnergyConsumptionByPhases(context, selectedDate: selectedDate);
+
    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;
-    final selectedCommunities = spaceTreeState.selectedCommunities;
-    final selectedSpaces = spaceTreeState.selectedSpaces;
-
-    return (selectedCommunities, selectedSpaces);
+    loadRealtimeDeviceChanges(context);
+    loadPowerClampInfo(context);
  }

  static void loadEnergyConsumptionByPhases(
@@ -79,13 +59,12 @@ abstract final class FetchEnergyManagementDataHelper {
  static void loadTotalEnergyConsumption(
    BuildContext context, {
    DateTime? selectedDate,
+    required String communityId,
+    required String spaceId,
  }) {
-    final (selectedCommunities, selectedSpaces) =
-        getSelectedCommunitiesAndSpaces(context);
-
    final param = GetTotalEnergyConsumptionParam(
-      spaceId: selectedCommunities.firstOrNull,
-      communityId: selectedCommunities.firstOrNull,
+      spaceId: spaceId,
+      communityId: communityId,
      monthDate: selectedDate,
    );
    context.read<TotalEnergyConsumptionBloc>().add(
@@ -102,13 +81,13 @@ abstract final class FetchEnergyManagementDataHelper {

  static void loadPowerClampInfo(BuildContext context) {
    context.read<PowerClampInfoBloc>().add(
-          const LoadPowerClampInfoEvent('cb71d6ad-6e29-4eaa-ae3e-1a0d1c5f60fa'),
+          const LoadPowerClampInfoEvent(_powerClampId),
        );
  }

  static void loadRealtimeDeviceChanges(BuildContext context) {
    context.read<RealtimeDeviceChangesBloc>().add(
-          const RealtimeDeviceChangesStarted('cb71d6ad-6e29-4eaa-ae3e-1a0d1c5f60fa'),
+          const RealtimeDeviceChangesStarted(_powerClampId),
        );
  }

@@ -120,6 +99,7 @@ abstract final class FetchEnergyManagementDataHelper {
    context.read<PowerClampInfoBloc>().add(
          const ClearPowerClampInfoEvent(),
        );
+
    context.read<EnergyConsumptionPerDeviceBloc>().add(
          const ClearEnergyConsumptionPerDeviceEvent(),
        );
@@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_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/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';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';

 class AnalyticsEnergyManagementView extends StatefulWidget {
  const AnalyticsEnergyManagementView({super.key});
@@ -16,7 +18,14 @@ class _AnalyticsEnergyManagementViewState
    extends State<AnalyticsEnergyManagementView> {
  @override
  void initState() {
-    FetchEnergyManagementDataHelper.loadEnergyManagementData(context);
+    final spaceTreeBloc = context.read<SpaceTreeBloc>();
+    final communityId = spaceTreeBloc.state.selectedCommunities.firstOrNull;
+    final spaceId = spaceTreeBloc.state.selectedSpaces.firstOrNull;
+    FetchEnergyManagementDataHelper.loadEnergyManagementData(
+      context,
+      communityId: communityId ?? '',
+      spaceId: spaceId ?? '',
+    );
    super.initState();
  }

@@ -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_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';
@@ -11,17 +10,13 @@ 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;
+  static void loadOccupancyData(
+    BuildContext context, {
+    required String communityId,
+    required String spaceId,
+  }) {
+    if (communityId.isEmpty && spaceId.isEmpty) {
+      clearAllData(context);
    }

    final datePickerState = context.read<AnalyticsDatePickerBloc>().state;
@@ -31,8 +26,8 @@ abstract final class FetchOccupancyDataHelper {
            GetOccupancyParam(
              monthDate:
                  '${datePickerState.monthlyDate.year}-${datePickerState.monthlyDate.month}',
-              spaceUuid: selectedSpaces.firstOrNull,
-              communityUuid: selectedCommunities.first,
+              spaceUuid: spaceId,
+              communityUuid: communityId,
            ),
          ),
        );
@@ -40,9 +35,7 @@ abstract final class FetchOccupancyDataHelper {
    context.read<OccupancyHeatMapBloc>().add(
          LoadOccupancyHeatMapEvent(
            GetOccupancyHeatMapParam(
-              spaceId: selectedSpaces.isNotEmpty ? selectedSpaces.first : '',
-              communityId:
-                  selectedCommunities.isNotEmpty ? selectedCommunities.first : '',
+              spaceUuid: spaceId,
              year: datePickerState.yearlyDate,
            ),
          ),
@@ -54,4 +47,16 @@ abstract final class FetchOccupancyDataHelper {
        const RealtimeDeviceChangesStarted('14fe6e7e-47af-4a07-ae0a-7c4a26ef8135'),
      );
  }
+
+  static void clearAllData(BuildContext context) {
+    context.read<OccupancyBloc>().add(
+          const ClearOccupancyEvent(),
+        );
+    context.read<OccupancyHeatMapBloc>().add(
+          const ClearOccupancyHeatMapEvent(),
+        );
+    context.read<RealtimeDeviceChangesBloc>().add(
+          const RealtimeDeviceChangesClosed(),
+        );
+  }
 }
@@ -1,25 +1,13 @@
 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;
@@ -28,7 +16,7 @@ class _AnalyticsOccupancyViewState extends State<AnalyticsOccupancyView> {
        final isMediumOrLess = constraints.maxWidth <= 900;
        if (isMediumOrLess) {
          return SingleChildScrollView(
-            padding: AnalyticsOccupancyView._padding,
+            padding: _padding,
            child: Column(
              spacing: 32,
              children: [
@@ -42,7 +30,7 @@ class _AnalyticsOccupancyViewState extends State<AnalyticsOccupancyView> {

        return SingleChildScrollView(
          child: Container(
-            padding: AnalyticsOccupancyView._padding,
+            padding: _padding,
            height: height * 0.9,
            child: const Row(
              spacing: 32,
@@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/oc
 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/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/style.dart';

 class OccupancyChartBox extends StatelessWidget {
@@ -14,6 +15,7 @@ class OccupancyChartBox extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final spaceTreeState = context.watch<SpaceTreeBloc>().state;
    return BlocBuilder<OccupancyBloc, OccupancyState>(
      builder: (context, state) {
        return Container(
@@ -45,7 +47,11 @@ class OccupancyChartBox extends StatelessWidget {
                          context.read<AnalyticsDatePickerBloc>().add(
                                UpdateAnalyticsDatePickerEvent(montlyDate: value),
                              );
-                          FetchOccupancyDataHelper.loadOccupancyData(context);
+                          FetchOccupancyDataHelper.loadOccupancyData(
+                            context,
+                            communityId: spaceTreeState.selectedCommunities.firstOrNull ?? '',
+                            spaceId: spaceTreeState.selectedSpaces.firstOrNull ?? '',
+                          );
                        },
                        selectedDate: context
                            .watch<AnalyticsDatePickerBloc>()
@@ -15,7 +15,7 @@ class OccupancyHeatMap extends StatelessWidget {
  static const _totalWeeks = 53;

  int get _maxValue => heatMapData.isNotEmpty
-      ? heatMapData.keys.map((key) => heatMapData[key]!).reduce(math.max)
+      ? heatMapData.keys.map((key) => heatMapData[key] ?? 0).reduce(math.max)
      : 0;

  DateTime _getStartingDate() {
@@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_he
 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/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/utils/style.dart';

 class OccupancyHeatMapBox extends StatelessWidget {
@@ -14,6 +15,7 @@ class OccupancyHeatMapBox extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
+    final spaceTreeState = context.watch<SpaceTreeBloc>().state;
    return BlocBuilder<OccupancyHeatMapBloc, OccupancyHeatMapState>(
      builder: (context, state) {
        return Container(
@@ -45,7 +47,12 @@ class OccupancyHeatMapBox extends StatelessWidget {
                          context.read<AnalyticsDatePickerBloc>().add(
                                UpdateAnalyticsDatePickerEvent(yearlyDate: value),
                              );
-                          FetchOccupancyDataHelper.loadOccupancyData(context);
+                          FetchOccupancyDataHelper.loadOccupancyData(
+                            context,
+                            communityId:
+                                spaceTreeState.selectedCommunities.firstOrNull ?? '',
+                            spaceId: spaceTreeState.selectedSpaces.firstOrNull ?? '',
+                          );
                        },
                        datePickerType: DatePickerType.year,
                        selectedDate: context
@@ -61,7 +68,10 @@ class OccupancyHeatMapBox extends StatelessWidget {
              Expanded(
                child: OccupancyHeatMap(
                  heatMapData: state.heatMapData.asMap().map(
-                        (_, value) => MapEntry(value.date, value.occupancy),
+                        (_, value) => MapEntry(
+                          value.eventDate,
+                          value.countTotalPresenceDetected,
+                        ),
                      ),
                ),
              ),
@@ -1,19 +1,13 @@
 class GetOccupancyHeatMapParam {
  final DateTime year;
-  final String communityId;
-  final String spaceId;
+  final String spaceUuid;

  const GetOccupancyHeatMapParam({
    required this.year,
-    required this.communityId,
-    required this.spaceId,
+    required this.spaceUuid,
  });

  Map<String, dynamic> toJson() {
-    return {
-      'year': year.toIso8601String(),
-      'communityId': communityId,
-      'spaceId': spaceId,
-    };
+    return {'year': year.year};
  }
 }
@@ -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;
-    });
-  }
-}
@@ -0,0 +1,35 @@
+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';
+import 'package:syncrow_web/services/api/http_service.dart';
+
+final class RemoteOccupancyHeatMapService implements OccupancyHeatMapService {
+  const RemoteOccupancyHeatMapService(this._httpService);
+
+  final HTTPService _httpService;
+
+  @override
+  Future<List<OccupancyHeatMapModel>> load(GetOccupancyHeatMapParam param) async {
+    try {
+      final response = await _httpService.get(
+        path: '/occupancy/heat-map/space/${param.spaceUuid}',
+        showServerMessage: true,
+        queryParameters: param.toJson(),
+        expectedResponseModel: (response) {
+          final json = response as Map<String, dynamic>;
+          final dailyData = json['data'] as List<dynamic>? ?? <dynamic>[];
+
+          final result = dailyData.map(
+            (json) => OccupancyHeatMapModel.fromJson(json as Map<String, dynamic>),
+          );
+
+          return result.toList();
+        },
+      );
+
+      return response;
+    } catch (e) {
+      throw Exception('Failed to load total energy consumption:');
+    }
+  }
+}
@@ -12,7 +12,7 @@ class AnalyticsErrorWidget extends StatelessWidget {
    return Visibility(
      visible: errorMessage != null || (errorMessage?.isNotEmpty ?? false),
      child: Text(
-        '$errorMessage ?? "Something went wrong"',
+        errorMessage ?? 'Something went wrong',
        maxLines: 1,
        overflow: TextOverflow.ellipsis,
        style: context.textTheme.bodySmall?.copyWith(
@@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/
 import 'package:syncrow_web/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/two_gang_switch/two_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gateway.dart';
+import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -358,7 +359,10 @@ SOS
      case 'NCPS':
        return [
          FlushPresenceDelayFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF',),
+            deviceId: uuid ?? '',
+            deviceName: name ?? '',
+            type: 'IF',
+          ),

          FlushIlluminanceFunction(
              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
@@ -378,6 +382,17 @@ SOS
          FlushTriggerLevelFunction(
              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
        ];
+      case 'WH':
+        return [
+          WHRestartStatusFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          WHSwitchFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          TimerConfirmTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          BacklightFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+        ];

      default:
        return [];
@@ -536,7 +536,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
  //             'entityId': 'tab_to_run',
  //             'uniqueCustomId': const Uuid().v4(),
  //             'deviceId': 'tab_to_run',
-  //             'title': 'Tab to run',
+  //             'title': 'Tap to run',
  //             'productType': 'tab_to_run',
  //             'imagePath': Assets.tabToRun,
  //           }
@@ -771,7 +771,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
          'entityId': 'tab_to_run',
          'uniqueCustomId': const Uuid().v4(),
          'deviceId': 'tab_to_run',
-          'title': 'Tab to run',
+          'title': 'Tap to run',
          'productType': 'tab_to_run',
          'imagePath': Assets.tabToRun,
        }
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_swit
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/water_heater/water_heater_presence_sensor.dart';

 class DeviceDialogHelper {
  static Future<Map<String, dynamic>?> showDeviceDialog({
@@ -126,6 +127,15 @@ class DeviceDialogHelper {
          dialogType: dialogType,
          device: data['device'],
        );
+      case 'WH':
+        return WaterHeaterDialogRoutines.showWHFunctionsDialog(
+          context: context,
+          functions: functions,
+          uniqueCustomId: data['uniqueCustomId'],
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          dialogType: dialogType,
+          device: data['device'],
+        );

      default:
        return null;
@@ -162,7 +162,7 @@ class SaveRoutineHelper {
                width: 24,
                height: 24,
              ),
-              title: const Text('Tab to run'),
+              title: const Text('Tap to run'),
            ),
          if (state.isAutomation)
            ...state.ifItems.map((item) {
@@ -0,0 +1,134 @@
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_operational_value.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+abstract class WaterHeaterFunctions
+    extends DeviceFunction<WaterHeaterStatusModel> {
+  final String type;
+
+  WaterHeaterFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+    required this.type,
+  });
+
+  List<WaterHeaterOperationalValue> getOperationalValues();
+}
+
+class WHRestartStatusFunction extends WaterHeaterFunctions {
+  final int min;
+  WHRestartStatusFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        super(
+          code: 'relay_status',
+          operationName: 'Restart Status',
+          icon: Assets.refreshStatusIcon,
+        );
+
+  @override
+  List<WaterHeaterOperationalValue> getOperationalValues() {
+    return [
+      WaterHeaterOperationalValue(
+        icon: Assets.assetsAcPowerOFF,
+        description: 'Power OFF',
+        value: "off",
+      ),
+      WaterHeaterOperationalValue(
+        icon: Assets.assetsAcPower,
+        description: 'Power ON',
+        value: 'on',
+      ),
+      WaterHeaterOperationalValue(
+        icon: Assets.refreshStatusIcon,
+        description: "Restart  Memory",
+        value: 'memory',
+      ),
+    ];
+  }
+}
+
+class WHSwitchFunction extends WaterHeaterFunctions {
+  final int min;
+  WHSwitchFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        super(
+          code: 'switch_1',
+          operationName: 'Switch',
+          icon: Assets.assetsAcPower,
+        );
+
+  @override
+  List<WaterHeaterOperationalValue> getOperationalValues() {
+    return [
+      WaterHeaterOperationalValue(
+        icon: Assets.assetsAcPower,
+        description: 'ON',
+        value: true,
+      ),
+      WaterHeaterOperationalValue(
+        icon: Assets.assetsAcPowerOFF,
+        description: 'OFF',
+        value: false,
+      ),
+    ];
+  }
+}
+
+class TimerConfirmTimeFunction extends WaterHeaterFunctions {
+  TimerConfirmTimeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'countdown_1',
+          operationName: 'Timer',
+          icon: Assets.targetConfirmTimeIcon,
+        );
+
+  @override
+  List<WaterHeaterOperationalValue> getOperationalValues() {
+    final values = <WaterHeaterOperationalValue>[];
+
+    return values;
+  }
+}
+
+class BacklightFunction extends WaterHeaterFunctions {
+  final int min;
+  BacklightFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        super(
+          code: 'switch_backlight',
+          operationName: 'Backlight',
+          icon: Assets.indicator,
+        );
+
+  @override
+  List<WaterHeaterOperationalValue> getOperationalValues() {
+    return [
+      WaterHeaterOperationalValue(
+        icon: Assets.assetsAcPower,
+        description: 'ON',
+        value: true,
+      ),
+      WaterHeaterOperationalValue(
+        icon: Assets.assetsAcPowerOFF,
+        description: 'OFF',
+        value: false,
+      ),
+    ];
+  }
+}
@@ -0,0 +1,11 @@
+class WaterHeaterOperationalValue {
+  final String icon;
+  final String description;
+  final dynamic value;
+
+  WaterHeaterOperationalValue({
+    required this.icon,
+    required this.description,
+    required this.value,
+  });
+}
@@ -29,11 +29,11 @@ class ConditionsRoutinesDevicesView extends StatelessWidget {
                  children: [
                    DraggableCard(
                      imagePath: Assets.tabToRun,
-                      title: 'Tab to run',
+                      title: 'Tap to run',
                      deviceData: {
                        'deviceId': 'tab_to_run',
                        'type': 'trigger',
-                        'name': 'Tab to run',
+                        'name': 'Tap to run',
                      },
                    ),
                    DraggableCard(
@@ -43,7 +43,7 @@ class IfContainer extends StatelessWidget {
                        children: [
                          DraggableCard(
                            imagePath: Assets.tabToRun,
-                            title: 'Tab to run',
+                            title: 'Tap to run',
                            deviceData: {},
                          ),
                        ],
@@ -76,7 +76,8 @@ class IfContainer extends StatelessWidget {
                                        'WPS',
                                        'GW',
                                        'CPS',
-                                        'NCPS'
+                                        'NCPS',
+                                        'WH',
                                      ].contains(state.ifItems[index]
                                          ['productType'])) {
                                      
@@ -136,7 +137,7 @@ class IfContainer extends StatelessWidget {
                  context
                      .read<RoutineBloc>()
                      .add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS', 'NCPS']
+                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS', 'NCPS','WH']
                    .contains(mutableData['productType'])) {
                  context
                      .read<RoutineBloc>()
@@ -26,7 +26,7 @@ class FetchRoutineScenesAutomation extends StatelessWidget
              crossAxisAlignment: CrossAxisAlignment.start,
              mainAxisSize: MainAxisSize.min,
              children: [
-                _buildListTitle(context, "Scenes (Tab to Run)"),
+                _buildListTitle(context, "Scenes (Tap to Run)"),
                const SizedBox(height: 10),
                Visibility(
                  visible: state.scenes.isNotEmpty,
@@ -25,7 +25,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
    'WPS',
    'GW',
    'CPS',
-    'NCPS'
+    'NCPS',
+    'WH',
  };

  @override
@@ -1,11 +1,6 @@
 import 'package:flutter/material.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/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/flush/flush_operational_value.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart';

 class FlushOperationalValuesList extends StatelessWidget {
  final List<FlushOperationalValue> values;
@@ -0,0 +1,65 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_operational_value.dart';
+
+class WaterHeaterOperationalValuesList extends StatelessWidget {
+  final List<WaterHeaterOperationalValue> values;
+  final dynamic selectedValue;
+  final AllDevicesModel? device;
+  final String operationName;
+  final String selectCode;
+  final ValueChanged<WaterHeaterOperationalValue> onSelect;
+  const WaterHeaterOperationalValuesList({
+    required this.values,
+    required this.selectedValue,
+    required this.device,
+    required this.operationName,
+    required this.selectCode,
+    required this.onSelect,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      padding: const EdgeInsets.all(20),
+      itemCount: values.length,
+      itemBuilder: (context, index) => _buildValueItem(context, values[index]),
+    );
+  }
+
+  Widget _buildValueItem(
+      BuildContext context, WaterHeaterOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          SvgPicture.asset(
+            value.icon,
+            width: 24,
+            height: 24,
+          ),
+          Expanded(child: _buildValueDescription(value)),
+          _buildValueRadio(context, value),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildValueDescription(WaterHeaterOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(value.description),
+    );
+  }
+
+  Widget _buildValueRadio(context, WaterHeaterOperationalValue value) {
+    return Radio<dynamic>(
+        value: value.value,
+        groupValue: selectedValue,
+        onChanged: (_) => onSelect(value));
+  }
+
+}
@@ -0,0 +1,203 @@
+import 'package:flutter/material.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/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/water_heater/water_heater_value_selector_widget.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class WaterHeaterDialogRoutines extends StatefulWidget {
+  final List<DeviceFunction> functions;
+  final AllDevicesModel? device;
+  final List<DeviceFunctionData>? deviceSelectedFunctions;
+  final String? uniqueCustomId;
+  final String dialogType;
+
+  const WaterHeaterDialogRoutines({
+    super.key,
+    required this.functions,
+    this.device,
+    this.deviceSelectedFunctions,
+    this.uniqueCustomId,
+    required this.dialogType,
+  });
+
+  static Future<Map<String, dynamic>?> showWHFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String? uniqueCustomId,
+    required String dialogType,
+  }) async {
+    return showDialog<Map<String, dynamic>?>(
+      context: context,
+      builder: (context) => WaterHeaterDialogRoutines(
+        functions: functions,
+        device: device,
+        deviceSelectedFunctions: deviceSelectedFunctions,
+        uniqueCustomId: uniqueCustomId,
+        dialogType: dialogType,
+      ),
+    );
+  }
+
+  @override
+  State<WaterHeaterDialogRoutines> createState() =>
+      _WaterHeaterDialogRoutinesState();
+}
+
+class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
+  late final List<WaterHeaterFunctions> _waterHeaterFunctions;
+  @override
+  void initState() {
+    super.initState();
+    _waterHeaterFunctions =
+        widget.functions.whereType<WaterHeaterFunctions>().where((function) {
+      if (widget.dialogType == 'THEN') {
+        return function.type == 'THEN' || function.type == 'BOTH';
+      }
+      return function.type == 'IF' || function.type == 'BOTH';
+    }).toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => FunctionBloc()
+        ..add(InitializeFunctions(widget.deviceSelectedFunctions ?? [])),
+      child: _buildDialogContent(),
+    );
+  }
+
+  Widget _buildDialogContent() {
+    return AlertDialog(
+      contentPadding: EdgeInsets.zero,
+      content: BlocBuilder<FunctionBloc, FunctionBlocState>(
+        builder: (context, state) {
+          final selectedFunction = state.selectedFunction;
+          return Container(
+            width: selectedFunction != null ? 600 : 360,
+            height: 450,
+            decoration: BoxDecoration(
+              color: Colors.white,
+              borderRadius: BorderRadius.circular(20),
+            ),
+            padding: const EdgeInsets.only(top: 20),
+            child: Column(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                const DialogHeader('Water Heater Condition'),
+                Expanded(child: _buildMainContent(context, state)),
+                _buildDialogFooter(context, state),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        _buildFunctionList(context),
+        if (state.selectedFunction != null) _buildValueSelector(context, state),
+      ],
+    );
+  }
+
+  Widget _buildFunctionList(BuildContext context) {
+    return SizedBox(
+      width: 360,
+      child: ListView.separated(
+        shrinkWrap: false,
+        physics: const AlwaysScrollableScrollPhysics(),
+        itemCount: _waterHeaterFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = _waterHeaterFunctions[index];
+          return ListTile(
+            leading: SvgPicture.asset(
+              function.icon,
+              width: 24,
+              height: 24,
+              placeholderBuilder: (context) => const SizedBox(
+                width: 24,
+                height: 24,
+              ),
+            ),
+            title: Text(
+              function.operationName,
+              style: context.textTheme.bodyMedium,
+            ),
+            trailing: const Icon(
+              Icons.arrow_forward_ios,
+              size: 16,
+              color: ColorsManager.textGray,
+            ),
+            onTap: () => context.read<FunctionBloc>().add(
+                  SelectFunction(
+                    functionCode: function.code,
+                    operationName: function.operationName,
+                  ),
+                ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildValueSelector(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction ?? '';
+    final functionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction,
+        operationName: state.selectedOperationName ?? '',
+        value: null,
+      ),
+    );
+
+    return Expanded(
+      child: WaterHeaterValueSelectorWidget(
+        selectedFunction: selectedFunction,
+        functionData: functionData,
+        whFunctions: _waterHeaterFunctions,
+        device: widget.device,
+      ),
+    );
+  }
+
+  Widget _buildDialogFooter(BuildContext context, FunctionBlocState state) {
+    return DialogFooter(
+      onCancel: () => Navigator.pop(context),
+      onConfirm: state.addedFunctions.isNotEmpty
+          ? () {
+              context.read<RoutineBloc>().add(
+                    AddFunctionToRoutine(
+                      state.addedFunctions,
+                      widget.uniqueCustomId!,
+                    ),
+                  );
+              Navigator.pop(
+                context,
+                {'deviceId': widget.functions.first.deviceId},
+              );
+            }
+          : null,
+      isConfirmEnabled: state.selectedFunction != null,
+    );
+  }
+}
@@ -0,0 +1,196 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/helper/duration_format_helper.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
+import 'package:syncrow_web/pages/routines/models/water_heater/water_heater_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/water_heater/water_heater_operational_values_list.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class WaterHeaterValueSelectorWidget extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final List<WaterHeaterFunctions> whFunctions;
+  final AllDevicesModel? device;
+
+  const WaterHeaterValueSelectorWidget({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.whFunctions,
+    required this.device,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedFn = whFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+      orElse: () => WHSwitchFunction(
+        deviceId: '',
+        deviceName: '',
+        type: '',
+      ),
+    );
+    if (selectedFunction == 'countdown_1') {
+      return Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          _buildConditionToggle(
+            context,
+            functionData.condition,
+            selectedFunction,
+            device,
+            selectedFn.operationName,
+            functionData,
+          ),
+          _buildCountDownDisplay(
+            context,
+            functionData.value,
+            device,
+            selectedFn.operationName,
+            functionData,
+            selectedFunction,
+          ),
+          _buildCountDownSlider(
+            context,
+            functionData.value,
+            device,
+            selectedFn.operationName,
+            functionData,
+            selectedFunction,
+          ),
+          const SizedBox(height: 10),
+        ],
+      );
+    }
+
+    return WaterHeaterOperationalValuesList(
+      values: selectedFn.getOperationalValues(),
+      selectedValue: functionData.value,
+      device: device,
+      operationName: selectedFn.operationName,
+      selectCode: selectedFunction,
+      onSelect: (selectedValue) async {
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: functionData.operationName,
+                  value: selectedValue.value,
+                  condition: functionData.condition,
+                ),
+              ),
+            );
+      },
+    );
+  }
+
+  static Widget _buildCountDownDisplay(
+      BuildContext context,
+      dynamic initialValue,
+      AllDevicesModel? device,
+      String operationName,
+      DeviceFunctionData? selectedFunctionData,
+      String selectCode) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+      decoration: BoxDecoration(
+        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Text(
+        DurationFormatMixin.formatDuration(initialValue?.toInt() ?? 0),
+        style: context.textTheme.headlineMedium!.copyWith(
+          color: ColorsManager.primaryColorWithOpacity,
+        ),
+      ),
+    );
+  }
+
+  static Widget _buildCountDownSlider(
+    BuildContext context,
+    dynamic initialValue,
+    AllDevicesModel? device,
+    String operationName,
+    DeviceFunctionData? selectedFunctionData,
+    String selectCode,
+  ) {
+    const twelveHoursInSeconds = 43200.0;
+    final operationalValues = SwitchOperationalValue(
+      icon: '',
+      description: "sec",
+      value: 0.0,
+      minValue: 0,
+      maxValue: twelveHoursInSeconds,
+      stepValue: 1,
+    );
+    return Slider(
+      value: (initialValue ?? 0).toDouble(),
+      min: operationalValues.minValue?.toDouble() ?? 0.0,
+      max: operationalValues.maxValue?.toDouble() ?? 0.0,
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
+              (operationalValues.stepValue ?? 1))
+          .round(),
+      onChanged: (value) {
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectCode,
+                  operationName: operationName,
+                  value: value,
+                  condition: selectedFunctionData?.condition,
+                  valueDescription: selectedFunctionData?.valueDescription,
+                ),
+              ),
+            );
+      },
+    );
+  }
+
+  static Widget _buildConditionToggle(
+    BuildContext context,
+    String? currentCondition,
+    String selectCode,
+    AllDevicesModel? device,
+    String operationName,
+    DeviceFunctionData? selectedFunctionData,
+  ) {
+    final conditions = ["<", "==", ">"];
+
+    return ToggleButtons(
+      onPressed: (int index) {
+        context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectCode,
+                  operationName: operationName,
+                  condition: conditions[index],
+                  value: selectedFunctionData?.value ?? 0,
+                  valueDescription: selectedFunctionData?.valueDescription,
+                ),
+              ),
+            );
+      },
+      borderRadius: const BorderRadius.all(Radius.circular(8)),
+      selectedBorderColor: ColorsManager.primaryColorWithOpacity,
+      selectedColor: Colors.white,
+      fillColor: ColorsManager.primaryColorWithOpacity,
+      color: ColorsManager.primaryColorWithOpacity,
+      constraints: const BoxConstraints(
+        minHeight: 40.0,
+        minWidth: 40.0,
+      ),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      children: conditions.map((c) => Text(c)).toList(),
+    );
+  }
+}
@@ -116,7 +116,8 @@ class ThenContainer extends StatelessWidget {
                                          'WPS',
                                          'CPS',
                                          "GW",
-                                          "NCPS"
+                                          "NCPS",
+                                          'WH',
                                        ].contains(state.thenItems[index]
                                            ['productType'])) {
                                          context.read<RoutineBloc>().add(
@@ -232,8 +233,17 @@ class ThenContainer extends StatelessWidget {
                dialogType: "THEN");
            if (result != null) {
              context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS', "NCPS"]
-                .contains(mutableData['productType'])) {
+            } else if (![
+              'AC',
+              '1G',
+              '2G',
+              '3G',
+              'WPS',
+              'GW',
+              'CPS',
+              "NCPS",
+              "WH"
+            ].contains(mutableData['productType'])) {
              context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
            }
          },
@@ -481,4 +481,5 @@ 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 refreshStatusIcon = 'assets/icons/refresh_status_icon.svg';
 }
Author	SHA1	Message	Date
Faris Armoush	4d9e57c8b5	Created and connected a remote implementation that fetches the heat map occupancy per space from the API.	2025-05-14 10:51:37 +03:00
Faris Armoush	d1bb8da484	Updated `OccupancyHeatMapModel` model with what the api returns, and only used the necessary fields that the api returns for this feature to work.	2025-05-14 10:51:19 +03:00
Faris Armoush	300f9ae358	Matched the `GetOccupancyHeatMapParam` with what the API expects and removed the `communityId` since it is no longer necessary for the api, and renamed `spaceId` to `spaceUuid` for more clarity.	2025-05-14 10:49:32 +03:00
Faris Armoush	c1dab3400b	removed a force unwrap from `OccupancyHeatMap._maxValue` to avoid any bugs.	2025-05-14 10:48:28 +03:00
Faris Armoush	46815585cb	Fixed error in `AnalyticsErrorWidget` where it used to add the default error message to the `errorMessage`.	2025-05-14 10:47:54 +03:00
mohammadnemer1	7f9d044f7e	Merge pull request #184 from SyncrowIOT/SP-1530-FE-Add-card-for-the-water-heater-in-the-routine-web add water heater operational values to routines	2025-05-14 09:20:07 +03:00
mohammad	996a847a27	Refactor water heater value selector widget	2025-05-14 09:16:04 +03:00
Faris Armoush	5645fb7826	Merge pull request #182 from SyncrowIOT/SP-1519-FE-Handle-Loading-Skeletons-and-No-Data-Error-States Sp 1519 fe handle loading skeletons and no data error states	2025-05-13 16:55:54 +03:00
Faris Armoush	e8f7c29652	Applies correct business logic of the sidebar.	2025-05-13 16:46:34 +03:00
mohammad	36c5712c79	add water heater operational values to routines	2025-05-13 16:24:08 +03:00
Faris Armoush	c7fef11aec	Fixed typo `Tab to run` to `Tap to run`.	2025-05-12 12:06:37 +03:00
Faris Armoush	ef29d78d70	Clears data when needed.	2025-05-12 10:02:56 +03:00
Faris Armoush	cd9941f544	Doesn't load occupancy data on `initState` in `AnalyticsOccupancyView`.	2025-05-12 10:02:08 +03:00
Faris Armoush	71aa64ba9e	Merge pull request #181 from SyncrowIOT/bugfix/analytics_expansion_bugfix bugfix/analytics_expansion_bugfix.	2025-05-12 09:22:12 +03:00
Faris Armoush	2262d3b2ba	bugfix/analytics_expansion_bugfix.	2025-05-12 09:20:01 +03:00
Faris Armoush	b7ef9da35d	Sp 1513 fe implement device dropdown and live status card presence vacancy (#179 ) * Called the widget of presence sensor status widgets. * Enahnced `PowerClampEnergyDataDeviceDropdown` design and made it a dropdown. * connected the realtime feature to the occupancy side bar, but with a mock id. * revert default tab to energyManagement.	2025-05-11 16:59:15 +03:00