From 16df75eb49322c7c7e634b9784f81886afd66cee Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Thu, 13 Mar 2025 13:14:31 +0400
Subject: [PATCH 001/238] fixed space update

---
 .../bloc/space_management_bloc.dart           | 24 ++++++++++++++++---
 .../bloc/space_management_event.dart          |  8 ++++---
 .../widgets/community_structure_widget.dart   |  1 +
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index 48208c87..b0f28459 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
@@ -457,7 +458,8 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
     emit(SpaceManagementLoading());
 
     try {
-      final updatedSpaces = await saveSpacesHierarchically(event.spaces, event.communityUuid);
+      final updatedSpaces =
+          await saveSpacesHierarchically(event.context, event.spaces, event.communityUuid);
 
       final allSpaces = await _fetchSpacesForCommunity(event.communityUuid);
 
@@ -508,9 +510,17 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   }
 
   Future<List<SpaceModel>> saveSpacesHierarchically(
-      List<SpaceModel> spaces, String communityUuid) async {
+      BuildContext context, List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
     final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+    var spaceBloc = context.read<SpaceTreeBloc>();
+    List<CommunityModel> communities = spaceBloc.state.communityList;
+    CommunityModel? selectedCommunity = communities.firstWhere(
+      (community) => community.uuid == communityUuid,
+    );
+    if (selectedCommunity != null) {
+      print("community name ${selectedCommunity}, spaces ${selectedCommunity.spaces.length}");
+    }
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -532,7 +542,13 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
         if (space.uuid != null && space.uuid!.isNotEmpty) {
           List<TagModelUpdate> tagUpdates = [];
 
-          final prevSpace = await _api.getSpace(communityUuid, space.uuid!, projectUuid);
+          List<SpaceModel> matchedSpaces =
+              selectedCommunity.spaces.where((space) => space.uuid == space.uuid).toList();
+
+          if (matchedSpaces.isEmpty) continue;
+
+          final prevSpace = matchedSpaces[0];
+
           final List<UpdateSubspaceTemplateModel> subspaceUpdates = [];
           final List<SubspaceModel>? prevSubspaces = prevSpace?.subspaces;
           final List<SubspaceModel>? newSubspaces = space.subspaces;
@@ -598,6 +614,8 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
             }
           }
 
+          print("tagUpdates ${tagUpdates}");
+
           final response = await _api.updateSpace(
               communityId: communityUuid,
               spaceId: space.uuid!,
diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart
index 6bd685ba..8a9db432 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_event.dart
@@ -58,14 +58,16 @@ class CreateSpaceEvent extends SpaceManagementEvent {
 class SaveSpacesEvent extends SpaceManagementEvent {
   final List<SpaceModel> spaces;
   final String communityUuid;
+  final BuildContext context;
 
-  const SaveSpacesEvent({
+  const SaveSpacesEvent(
+    this.context, {
     required this.spaces,
     required this.communityUuid,
   });
 
   @override
-  List<Object> get props => [spaces, communityUuid];
+  List<Object> get props => [spaces, communityUuid, context];
 }
 
 class UpdateSpacePositionEvent extends SpaceManagementEvent {
@@ -170,4 +172,4 @@ class UpdateSpaceModelCache extends SpaceManagementEvent {
 class DeleteSpaceModelFromCache extends SpaceManagementEvent {
   final String deletedUuid;
   DeleteSpaceModelFromCache(this.deletedUuid);
-}
\ No newline at end of file
+}
diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 12d76452..56352432 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -460,6 +460,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     String communityUuid = widget.selectedCommunity!.uuid;
 
     context.read<SpaceManagementBloc>().add(SaveSpacesEvent(
+          context,
           spaces: spacesToSave,
           communityUuid: communityUuid,
         ));

From 8ed6980264a921519473ba74d5be21286b9bf133 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Thu, 13 Mar 2025 13:51:52 +0400
Subject: [PATCH 002/238] resposnive text length of space model name

---
 .../widgets/space_model_card_widget.dart      | 79 ++++++++-----------
 lib/utils/string_utils.dart                   |  6 ++
 2 files changed, 38 insertions(+), 47 deletions(-)
 create mode 100644 lib/utils/string_utils.dart

diff --git a/lib/pages/spaces_management/space_model/widgets/space_model_card_widget.dart b/lib/pages/spaces_management/space_model/widgets/space_model_card_widget.dart
index d028acba..4d72a419 100644
--- a/lib/pages/spaces_management/space_model/widgets/space_model_card_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/space_model_card_widget.dart
@@ -18,8 +18,10 @@ import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dynamic_
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/dynamic_room_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+import 'package:syncrow_web/utils/string_utils.dart';
 
-class SpaceModelCardWidget extends StatelessWidget {
+class SpaceModelCardWidget extends StatelessWidget with HelperResponsiveLayout {
   final SpaceTemplateModel model;
   final BuildContext? pageContext;
   final bool topActionsDisabled;
@@ -76,14 +78,17 @@ class SpaceModelCardWidget extends StatelessWidget {
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
-                  Text(
-                    model.modelName,
-                    style: Theme.of(context).textTheme.headlineMedium?.copyWith(
-                          color: Colors.black,
-                          fontWeight: FontWeight.bold,
-                        ),
-                    maxLines: 1,
-                    overflow: TextOverflow.ellipsis,
+                  Expanded(
+                    child: Text(
+                      StringUtils.capitalizeFirstLetter(model.modelName),
+                      style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+                            color: ColorsManager.blackColor,
+                            fontWeight: FontWeight.bold,
+                            fontSize: isSmallScreenSize(context) ? 13 : 20,
+                          ),
+                      maxLines: 2,
+                      overflow: TextOverflow.ellipsis,
+                    ),
                   ),
                   if (!topActionsDisabled)
                     Row(
@@ -95,15 +100,12 @@ class SpaceModelCardWidget extends StatelessWidget {
                               builder: (BuildContext dialogContext) {
                                 return BlocProvider<LinkSpaceToModelBloc>(
                                   create: (_) => LinkSpaceToModelBloc(),
-                                  child: BlocListener<LinkSpaceToModelBloc,
-                                      LinkSpaceToModelState>(
+                                  child: BlocListener<LinkSpaceToModelBloc, LinkSpaceToModelState>(
                                     listenWhen: (previous, current) {
                                       return previous != current;
                                     },
                                     listener: (context, state) {
-                                      final _bloc =
-                                          BlocProvider.of<LinkSpaceToModelBloc>(
-                                              context);
+                                      final _bloc = BlocProvider.of<LinkSpaceToModelBloc>(context);
                                       if (state is SpaceModelLoading) {
                                         showDialog(
                                           context: context,
@@ -111,19 +113,14 @@ class SpaceModelCardWidget extends StatelessWidget {
                                           builder: (BuildContext context) {
                                             return Dialog(
                                               shape: RoundedRectangleBorder(
-                                                  borderRadius:
-                                                      BorderRadius.circular(
-                                                          20)),
+                                                  borderRadius: BorderRadius.circular(20)),
                                               elevation: 10,
                                               backgroundColor: Colors.white,
                                               child: Padding(
-                                                padding:
-                                                    const EdgeInsets.symmetric(
-                                                        vertical: 30,
-                                                        horizontal: 50),
+                                                padding: const EdgeInsets.symmetric(
+                                                    vertical: 30, horizontal: 50),
                                                 child: Column(
-                                                  mainAxisSize:
-                                                      MainAxisSize.min,
+                                                  mainAxisSize: MainAxisSize.min,
                                                   children: [
                                                     CustomLoadingIndicator(),
                                                   ],
@@ -132,19 +129,14 @@ class SpaceModelCardWidget extends StatelessWidget {
                                             );
                                           },
                                         );
-                                      } else if (state
-                                          is AlreadyHaveLinkedState) {
+                                      } else if (state is AlreadyHaveLinkedState) {
                                         Navigator.of(dialogContext).pop();
-                                        showOverwriteDialog(
-                                            context, _bloc, model);
-                                      } else if (state
-                                          is SpaceValidationSuccess) {
+                                        showOverwriteDialog(context, _bloc, model);
+                                      } else if (state is SpaceValidationSuccess) {
                                         _bloc.add(LinkSpaceModelEvent(
-                                            isOverWrite: false,
-                                            selectedSpaceMode: model.uuid));
+                                            isOverWrite: false, selectedSpaceMode: model.uuid));
 
-                                        Future.delayed(
-                                            const Duration(seconds: 1), () {
+                                        Future.delayed(const Duration(seconds: 1), () {
                                           Navigator.of(dialogContext).pop();
                                           Navigator.of(dialogContext).pop();
                                           Navigator.of(dialogContext).pop();
@@ -152,29 +144,23 @@ class SpaceModelCardWidget extends StatelessWidget {
 
                                         showDialog(
                                           context: context,
-                                          builder:
-                                              (BuildContext dialogContext) {
+                                          builder: (BuildContext dialogContext) {
                                             return const LinkingSuccessful();
                                           },
                                         ).then((v) {
-                                          Future.delayed(
-                                              const Duration(seconds: 2), () {
+                                          Future.delayed(const Duration(seconds: 2), () {
                                             Navigator.of(dialogContext).pop();
                                           });
                                         });
-                                      } else if (state
-                                          is SpaceModelLinkSuccess) {
+                                      } else if (state is SpaceModelLinkSuccess) {
                                         Navigator.of(dialogContext).pop();
                                         Navigator.of(dialogContext).pop();
                                         showDialog(
                                           context: context,
                                           barrierDismissible: false,
-                                          builder: (BuildContext
-                                              successDialogContext) {
-                                            Future.delayed(
-                                                const Duration(seconds: 2), () {
-                                              Navigator.of(successDialogContext)
-                                                  .pop();
+                                          builder: (BuildContext successDialogContext) {
+                                            Future.delayed(const Duration(seconds: 2), () {
+                                              Navigator.of(successDialogContext).pop();
                                             });
 
                                             return const LinkingSuccessful();
@@ -232,8 +218,7 @@ class SpaceModelCardWidget extends StatelessWidget {
                           ),
                         ),
                       ),
-                      if (productTagCount.isNotEmpty &&
-                          model.subspaceModels != null)
+                      if (productTagCount.isNotEmpty && model.subspaceModels != null)
                         Container(
                           width: 1.0,
                           color: ColorsManager.softGray,
diff --git a/lib/utils/string_utils.dart b/lib/utils/string_utils.dart
new file mode 100644
index 00000000..c8d8e2af
--- /dev/null
+++ b/lib/utils/string_utils.dart
@@ -0,0 +1,6 @@
+class StringUtils {
+  static String capitalizeFirstLetter(String text) {
+    if (text.isEmpty) return text;
+    return text[0].toUpperCase() + text.substring(1);
+  }
+}

From c39c6937552ab4b580556731e64338138467b66f Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Thu, 13 Mar 2025 14:37:39 +0400
Subject: [PATCH 003/238] remove unused import

---
 lib/services/routines_api.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index 9360820c..4ca69546 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -6,7 +6,6 @@ import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class SceneApi {
   static final HTTPService _httpService = HTTPService();

From 70d31f53513066d06b05d9d99d41fb0ac22810b4 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Thu, 13 Mar 2025 14:51:09 +0400
Subject: [PATCH 004/238] removed print

---
 .../all_spaces/bloc/space_management_bloc.dart               | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index b0f28459..d675c680 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -518,9 +518,6 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
     CommunityModel? selectedCommunity = communities.firstWhere(
       (community) => community.uuid == communityUuid,
     );
-    if (selectedCommunity != null) {
-      print("community name ${selectedCommunity}, spaces ${selectedCommunity.spaces.length}");
-    }
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -614,8 +611,6 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
             }
           }
 
-          print("tagUpdates ${tagUpdates}");
-
           final response = await _api.updateSpace(
               communityId: communityUuid,
               spaceId: space.uuid!,

From 2a0f6a4596d299bba7e492ea5767890463b954e1 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 11:50:18 +0400
Subject: [PATCH 005/238] updated endpoint of get automation by space

---
 .../bloc/routine_bloc/routine_bloc.dart       | 196 ++++++------------
 lib/services/routines_api.dart                |  39 ++--
 lib/utils/constants/api_const.dart            |   2 +-
 3 files changed, 85 insertions(+), 152 deletions(-)

diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index 1baafb14..801daa1c 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
@@ -16,9 +15,6 @@ import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/constants/strings_manager.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
-import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';
@@ -61,8 +57,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(
-        routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
       add(const LoadScenes());
@@ -88,8 +83,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index = updatedIfItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -98,21 +93,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(
-      AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index = currentItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -123,26 +115,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction =
-          List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(
-                currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode ==
-                currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -152,15 +140,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
-              .removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(currentFunctions)..addAll(selectedFunction);
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
+          ..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -169,8 +155,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
@@ -179,11 +164,9 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          scenes.addAll(
-              await SceneApi.getScenes(spaceId, communityId, projectUuid));
+          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
         }
       }
 
@@ -201,19 +184,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(
-      LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> automations = [];
+    final projectId = await ProjectManager.getProjectUUID() ?? '';
 
     try {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          automations.addAll(await SceneApi.getAutomation(spaceId));
+          automations.addAll(await SceneApi.getAutomation(spaceId, communityId, projectId));
         }
       }
       emit(state.copyWith(
@@ -230,16 +212,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(
-      SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -253,8 +233,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -267,8 +246,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -344,8 +322,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -366,8 +343,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -479,21 +455,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(
-      RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -504,8 +476,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(
-            ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -517,23 +488,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(
-      SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (
-    List<Map<String, dynamic>>,
-    List<Map<String, dynamic>>,
-    Map<String, List<DeviceFunctionData>>
-  ) _createCardData(
+  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
+      _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -566,8 +532,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath':
-                    matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -603,11 +568,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId':
-            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-        'title': action.actionExecutor == 'delay'
-            ? 'Delay'
-            : (matchingDevice.name ?? 'Device'),
+        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -650,8 +612,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(
-      GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -699,12 +660,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId':
-                action.type == 'automation' || action.actionExecutor == 'delay'
-                    ? const Uuid().v4()
-                    : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+                ? const Uuid().v4()
+                : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -739,8 +698,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -812,8 +770,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(
-      ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -837,20 +794,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(
-      DeleteScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(isLoading: true));
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       if (state.isTabToRun) {
         await SceneApi.deleteScene(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
-            sceneId: state.sceneId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
-            automationId: state.automationId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '');
       }
 
       add(const LoadScenes());
@@ -879,8 +833,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(
-      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
@@ -890,11 +843,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
       for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList =
-            spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
         for (var spaceId in spacesList) {
-          devices.addAll(await DevicesManagementApi()
-              .fetchDevices(communityId, spaceId, projectUuid));
+          devices
+              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
         }
       }
 
@@ -904,8 +856,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(
-      UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -919,8 +870,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -973,8 +923,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
-          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadScenes());
@@ -993,8 +942,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(
-      UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1105,8 +1053,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateAutomation(
-          createAutomationModel, state.automationId ?? '');
+      final result =
+          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
 
       if (result['success']) {
         add(ResetRoutineState());
@@ -1139,8 +1087,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails =
-          await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
@@ -1208,15 +1155,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId = action.actionExecutor == 'delay'
-            ? '${action.entityId}_delay'
-            : action.entityId;
+        final deviceId =
+            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1247,8 +1192,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        if (action.executorProperty != null && action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1290,14 +1234,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values
-          .where((card) => card['type'] == 'condition')
-          .toList();
+      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' ||
-              card['type'] == 'automation' ||
-              card['type'] == 'scene')
+              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index 4ca69546..ea01a5b7 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -11,8 +11,7 @@ class SceneApi {
   static final HTTPService _httpService = HTTPService();
 
 // //create scene
-  static Future<Map<String, dynamic>> createScene(
-      CreateSceneModel createSceneModel) async {
+  static Future<Map<String, dynamic>> createScene(CreateSceneModel createSceneModel) async {
     try {
       debugPrint('create scene model: ${createSceneModel.toMap()}');
       final response = await _httpService.post(
@@ -69,8 +68,7 @@ class SceneApi {
 
   //get scenes by community id and space id
 
-  static Future<List<ScenesModel>> getScenes(
-      String spaceId, String communityId, String projectId,
+  static Future<List<ScenesModel>> getScenes(String spaceId, String communityId, String projectId,
       {showInDevice = false}) async {
     try {
       final response = await _httpService.get(
@@ -98,11 +96,14 @@ class SceneApi {
 
   //getAutomation
 
-  static Future<List<ScenesModel>> getAutomation(String spaceId) async {
+  static Future<List<ScenesModel>> getAutomation(
+      String spaceId, String communityId, String projectId) async {
     try {
       final response = await _httpService.get(
-        path:
-            ApiEndpoints.getSpaceAutomation.replaceAll('{spaceUuid}', spaceId),
+        path: ApiEndpoints.getSpaceAutomation
+            .replaceAll('{spaceUuid}', spaceId)
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) {
           List<ScenesModel> scenes = [];
@@ -132,12 +133,10 @@ class SceneApi {
   // }
 
 //automation details
-  static Future<RoutineDetailsModel> getAutomationDetails(
-      String automationId) async {
+  static Future<RoutineDetailsModel> getAutomationDetails(String automationId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getAutomationDetails
-            .replaceAll('{automationId}', automationId),
+        path: ApiEndpoints.getAutomationDetails.replaceAll('{automationId}', automationId),
         showServerMessage: false,
         expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json),
       );
@@ -152,8 +151,7 @@ class SceneApi {
     try {
       final response = await _httpService.put(
         path: ApiEndpoints.updateScene.replaceAll('{sceneId}', sceneId),
-        body: createSceneModel
-            .toJson(sceneId.isNotEmpty == true ? sceneId : null),
+        body: createSceneModel.toJson(sceneId.isNotEmpty == true ? sceneId : null),
         expectedResponseModel: (json) {
           return json;
         },
@@ -165,14 +163,11 @@ class SceneApi {
   }
 
   //update automation
-  static updateAutomation(
-      CreateAutomationModel createAutomationModel, String automationId) async {
+  static updateAutomation(CreateAutomationModel createAutomationModel, String automationId) async {
     try {
       final response = await _httpService.put(
-        path: ApiEndpoints.updateAutomation
-            .replaceAll('{automationId}', automationId),
-        body: createAutomationModel
-            .toJson(automationId.isNotEmpty == true ? automationId : null),
+        path: ApiEndpoints.updateAutomation.replaceAll('{automationId}', automationId),
+        body: createAutomationModel.toJson(automationId.isNotEmpty == true ? automationId : null),
         expectedResponseModel: (json) {
           return json;
         },
@@ -189,8 +184,7 @@ class SceneApi {
       final response = await _httpService.get(
         path: ApiEndpoints.getScene.replaceAll('{sceneId}', sceneId),
         showServerMessage: false,
-        expectedResponseModel: (json) =>
-            RoutineDetailsModel.fromMap(json['data']),
+        expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json['data']),
       );
       return response;
     } catch (e) {
@@ -199,8 +193,7 @@ class SceneApi {
   }
 
   //delete Scene
-  static Future<bool> deleteScene(
-      {required String unitUuid, required String sceneId}) async {
+  static Future<bool> deleteScene({required String unitUuid, required String sceneId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteScene
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 5aa188d9..4307699e 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -69,7 +69,7 @@ abstract class ApiEndpoints {
   //product
   static const String listProducts = '/products';
   static const String getSpaceScenes = '/scene/tap-to-run/{spaceUuid}';
-  static const String getSpaceAutomation = '/automation/{spaceUuid}';
+  static const String getSpaceAutomation = '/projects/{projectId}communities/{communityId}/spaces/{spaceUuid}/automations';
   static const String getIconScene = '/scene/icon';
   static const String createScene = '/scene/tap-to-run';
   static const String createAutomation = '/automation';

From 7ae3e4a933b174c4e97ac329a227f18a1b543c58 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 11:54:47 +0400
Subject: [PATCH 006/238] updated endpoint for creating automations

---
 lib/pages/routines/bloc/routine_bloc/routine_bloc.dart | 4 +++-
 lib/services/routines_api.dart                         | 4 ++--
 lib/utils/constants/api_const.dart                     | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index 801daa1c..767f40b2 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -324,6 +324,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
   Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
           errorMessage: 'Automation name is required',
@@ -434,7 +436,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.createAutomation(createAutomationModel);
+      final result = await SceneApi.createAutomation(createAutomationModel, projectUuid);
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadAutomation());
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index ea01a5b7..fbc6c9ec 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -33,10 +33,10 @@ class SceneApi {
 //
 // create automation
   static Future<Map<String, dynamic>> createAutomation(
-      CreateAutomationModel createAutomationModel) async {
+      CreateAutomationModel createAutomationModel, String projectId) async {
     try {
       final response = await _httpService.post(
-        path: ApiEndpoints.createAutomation,
+        path: ApiEndpoints.createAutomation.replaceAll('{projectId}', projectId),
         body: createAutomationModel.toMap(),
         showServerMessage: false,
         expectedResponseModel: (json) {
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 4307699e..b30b02e3 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -69,10 +69,10 @@ abstract class ApiEndpoints {
   //product
   static const String listProducts = '/products';
   static const String getSpaceScenes = '/scene/tap-to-run/{spaceUuid}';
-  static const String getSpaceAutomation = '/projects/{projectId}communities/{communityId}/spaces/{spaceUuid}/automations';
+  static const String getSpaceAutomation = '/projects/{projectId}/communities/{communityId}/spaces/{spaceUuid}/automations';
   static const String getIconScene = '/scene/icon';
   static const String createScene = '/scene/tap-to-run';
-  static const String createAutomation = '/automation';
+  static const String createAutomation = '/projects/{projectId}/automations';
   static const String getUnitScenes =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
   static const String getAutomationDetails = '/automation/details/{automationId}';

From 2a065efc0e10ab2845620c83aee7933e1aecfb34 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 12:09:14 +0400
Subject: [PATCH 007/238] replaced endpoint for get automaiton by id

---
 lib/pages/routines/bloc/routine_bloc/routine_bloc.dart | 5 ++++-
 lib/services/routines_api.dart                         | 7 +++++--
 lib/utils/constants/api_const.dart                     | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index 767f40b2..6d5b9357 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -1079,6 +1079,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   Future<void> _onGetAutomationDetails(
       GetAutomationDetails event, Emitter<RoutineState> emit) async {
     try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
       emit(state.copyWith(
         isLoading: true,
         isUpdate: true,
@@ -1089,7 +1091,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         thenItems: [],
       ));
 
-      final automationDetails = await SceneApi.getAutomationDetails(event.automationId);
+      final automationDetails =
+          await SceneApi.getAutomationDetails(event.automationId, projectUuid);
 
       final Map<String, Map<String, dynamic>> deviceIfCards = {};
       final Map<String, Map<String, dynamic>> deviceThenCards = {};
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index fbc6c9ec..4c3b6893 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -133,10 +133,13 @@ class SceneApi {
   // }
 
 //automation details
-  static Future<RoutineDetailsModel> getAutomationDetails(String automationId) async {
+  static Future<RoutineDetailsModel> getAutomationDetails(
+      String automationId, String projectId) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getAutomationDetails.replaceAll('{automationId}', automationId),
+        path: ApiEndpoints.getAutomationDetails
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json),
       );
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index b30b02e3..9f44fb38 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -75,7 +75,7 @@ abstract class ApiEndpoints {
   static const String createAutomation = '/projects/{projectId}/automations';
   static const String getUnitScenes =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
-  static const String getAutomationDetails = '/automation/details/{automationId}';
+  static const String getAutomationDetails = '/projects/{projectId}/automations/{automationId}';
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';
 

From bc64efa557bc62e13a8636fdc48316ec396dd8ea Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 12:12:15 +0400
Subject: [PATCH 008/238] updated delete automation endpoint

---
 lib/pages/routines/bloc/routine_bloc/routine_bloc.dart | 4 +++-
 lib/services/routines_api.dart                         | 4 ++--
 lib/utils/constants/api_const.dart                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index 6d5b9357..b7e75847 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -798,6 +798,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
   FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
     try {
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
+
       emit(state.copyWith(isLoading: true));
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
@@ -806,7 +808,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '',projectId: projectId);
       }
 
       add(const LoadScenes());
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index 4c3b6893..c2593b4d 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -213,12 +213,12 @@ class SceneApi {
 
   // delete automation
   static Future<bool> deleteAutomation(
-      {required String unitUuid, required String automationId}) async {
+      {required String unitUuid, required String automationId, required String projectId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteAutomation
             .replaceAll('{automationId}', automationId)
-            .replaceAll('{unitUuid}', unitUuid),
+            .replaceAll('{projectId}', projectId),
         showServerMessage: false,
         expectedResponseModel: (json) => json['statusCode'] == 200,
       );
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 9f44fb38..5a42cb47 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -79,7 +79,7 @@ abstract class ApiEndpoints {
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String deleteAutomation = '/automation/{automationId}';
+  static const String deleteAutomation = '/projects/{projectId}/automations/{automationId}';
   static const String updateScene = '/scene/tap-to-run/{sceneId}';
 
   static const String updateAutomation = '/automation/{automationId}';

From e0486deecb4510c242172f85ec3861a5665dcda9 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 12:16:32 +0400
Subject: [PATCH 009/238] changed endpoint for automation update

---
 lib/pages/routines/bloc/routine_bloc/routine_bloc.dart | 10 +++++++---
 lib/services/routines_api.dart                         |  7 +++++--
 lib/utils/constants/api_const.dart                     |  5 +++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index b7e75847..361810c0 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -808,7 +808,9 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0], automationId: state.automationId ?? '',projectId: projectId);
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            automationId: state.automationId ?? '',
+            projectId: projectId);
       }
 
       add(const LoadScenes());
@@ -948,6 +950,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
   FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
+
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
           errorMessage: 'Automation name is required',
@@ -1057,8 +1061,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
-          await SceneApi.updateAutomation(createAutomationModel, state.automationId ?? '');
+      final result = await SceneApi.updateAutomation(
+          createAutomationModel, state.automationId ?? '', projectId);
 
       if (result['success']) {
         add(ResetRoutineState());
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index c2593b4d..56a29aa1 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -166,10 +166,13 @@ class SceneApi {
   }
 
   //update automation
-  static updateAutomation(CreateAutomationModel createAutomationModel, String automationId) async {
+  static updateAutomation(
+      CreateAutomationModel createAutomationModel, String automationId, String projectId) async {
     try {
       final response = await _httpService.put(
-        path: ApiEndpoints.updateAutomation.replaceAll('{automationId}', automationId),
+        path: ApiEndpoints.updateAutomation
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
         body: createAutomationModel.toJson(automationId.isNotEmpty == true ? automationId : null),
         expectedResponseModel: (json) {
           return json;
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 5a42cb47..71e0fc55 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -69,7 +69,8 @@ abstract class ApiEndpoints {
   //product
   static const String listProducts = '/products';
   static const String getSpaceScenes = '/scene/tap-to-run/{spaceUuid}';
-  static const String getSpaceAutomation = '/projects/{projectId}/communities/{communityId}/spaces/{spaceUuid}/automations';
+  static const String getSpaceAutomation =
+      '/projects/{projectId}/communities/{communityId}/spaces/{spaceUuid}/automations';
   static const String getIconScene = '/scene/icon';
   static const String createScene = '/scene/tap-to-run';
   static const String createAutomation = '/projects/{projectId}/automations';
@@ -82,7 +83,7 @@ abstract class ApiEndpoints {
   static const String deleteAutomation = '/projects/{projectId}/automations/{automationId}';
   static const String updateScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String updateAutomation = '/automation/{automationId}';
+  static const String updateAutomation = '/projects/{projectId}/automations/{automationId}';
 
   //space model
   static const String listSpaceModels = '/projects/{projectId}/space-models';

From a5a37f384152e918f099299d1e345369c2acde0a Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 14:10:03 +0400
Subject: [PATCH 010/238] append space id to list

---
 lib/pages/space_tree/view/space_tree_view.dart               | 5 +++--
 .../link_space_model/bloc/link_space_to_model_bloc.dart      | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/pages/space_tree/view/space_tree_view.dart b/lib/pages/space_tree/view/space_tree_view.dart
index 92bc858d..63926852 100644
--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@@ -37,8 +37,9 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
       List<CommunityModel> list = state.isSearching ? state.filteredCommunity : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
-        color: ColorsManager.whiteColors,
-        decoration: widget.isSide == true ? subSectionContainerDecoration : null,
+        decoration: widget.isSide == true
+            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
+            : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
diff --git a/lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart b/lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart
index c789c2a9..5b85e17e 100644
--- a/lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart
+++ b/lib/pages/spaces_management/link_space_model/bloc/link_space_to_model_bloc.dart
@@ -28,10 +28,11 @@ class LinkSpaceToModelBloc
     try {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var spaceBloc = context.read<SpaceTreeBloc>();
+      spacesListIds.clear(); 
       for (var communityId in spaceBloc.state.selectedCommunities) {
         List<String> spacesList =
             spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-        spacesListIds = spacesList;
+        spacesListIds.addAll(spacesList); 
       }
       hasSelectedSpaces =
           spaceBloc.state.selectedCommunities.any((communityId) {

From 3750fa8329dcef2e17fa516461ca2258cbdd62e7 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 14 Mar 2025 15:02:22 +0400
Subject: [PATCH 011/238] removed left and right button

---
 .../all_spaces/widgets/space_card_widget.dart        | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/space_card_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/space_card_widget.dart
index 0a78da52..f3a476b2 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/space_card_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/space_card_widget.dart
@@ -47,18 +47,6 @@ class SpaceCardWidget extends StatelessWidget {
           children: [
             buildSpaceContainer(index), // Build the space container
             if (isHovered) ...[
-              PlusButtonWidget(
-                index: index,
-                direction: 'left',
-                offset: const Offset(-21, 20),
-                onButtonTap: onButtonTap,
-              ),
-              PlusButtonWidget(
-                index: index,
-                direction: 'right',
-                offset: const Offset(140, 20),
-                onButtonTap: onButtonTap,
-              ),
               PlusButtonWidget(
                 index: index,
                 direction: 'down',

From 8c15fffd42d11e87b7c55cd0726d7a6fc32438e6 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Wed, 19 Mar 2025 12:25:37 +0400
Subject: [PATCH 012/238] duplicate

---
 .../widgets/community_structure_widget.dart   | 175 +++++++++++-------
 .../helper/space_helper.dart                  |  30 ++-
 2 files changed, 122 insertions(+), 83 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 56352432..70b86074 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -301,11 +301,18 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               SpaceTemplateModel? spaceModel, List<SubspaceModel>? subspaces, List<Tag>? tags) {
             setState(() {
               // Set the first space in the center or use passed position
-              Offset centerPosition = position ?? ConnectionHelper.getCenterPosition(screenSize);
+              Offset newPosition;
+              if (parentIndex != null) {
+                newPosition =
+                    getBalancedChildPosition(spaces[parentIndex]); // Ensure balanced position
+              } else {
+                newPosition = position ?? ConnectionHelper.getCenterPosition(screenSize);
+              }
+
               SpaceModel newSpace = SpaceModel(
                   name: name,
                   icon: icon,
-                  position: centerPosition,
+                  position: newPosition,
                   isPrivate: false,
                   children: [],
                   status: SpaceStatus.newSpace,
@@ -425,7 +432,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           Connection(
             startSpace: parent,
             endSpace: child,
-            direction: child.incomingConnection?.direction ?? "down",
+            direction: "down",
           ),
         );
 
@@ -522,6 +529,38 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         );
   }
 
+  Offset getBalancedChildPosition(SpaceModel parent) {
+    int totalSiblings = parent.children.length + 1;
+    double totalWidth = (totalSiblings - 1) * 250; // Horizontal spacing
+    double startX = parent.position.dx - (totalWidth / 2);
+
+    Offset position = Offset(startX + (parent.children.length * 250), parent.position.dy + 180);
+
+    // Check for overlaps & adjust
+    while (spaces.any((s) => (s.position - position).distance < 250)) {
+      position = Offset(position.dx + 250, position.dy);
+    }
+
+    return position;
+  }
+
+  void realignTree() {
+    void updatePositions(SpaceModel node, double x, double y) {
+      node.position = Offset(x, y);
+
+      int numChildren = node.children.length;
+      double childStartX = x - ((numChildren - 1) * 250) / 2;
+
+      for (int i = 0; i < numChildren; i++) {
+        updatePositions(node.children[i], childStartX + (i * 250), y + 180);
+      }
+    }
+
+    if (spaces.isNotEmpty) {
+      updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+    }
+  }
+
   void _onDuplicate(BuildContext parentContext) {
     final screenWidth = MediaQuery.of(context).size.width;
 
@@ -604,29 +643,57 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   void _duplicateSpace(SpaceModel space) {
     final Map<SpaceModel, SpaceModel> originalToDuplicate = {};
-    const double horizontalGap = 200.0;
-    const double verticalGap = 100.0;
+    double horizontalGap = 250.0; // Increased spacing
+    double verticalGap = 180.0; // Adjusted for better visualization
 
-    SpaceModel duplicateRecursive(
-        SpaceModel original, Offset parentPosition, SpaceModel? duplicatedParent) {
-      Offset newPosition = Offset(parentPosition.dx + horizontalGap, original.position.dy);
+    print("🟢 Duplicating: ${space.name}");
 
-      while (spaces.any((s) =>
-          (s.position - newPosition).distance < horizontalGap && s.status != SpaceStatus.deleted)) {
-        newPosition += Offset(horizontalGap, 0);
+    /// **Find a new position ensuring no overlap**
+    Offset getBalancedChildPosition(SpaceModel parent) {
+      int totalSiblings = parent.children.length + 1;
+      double totalWidth = (totalSiblings - 1) * horizontalGap;
+      double startX = parent.position.dx - (totalWidth / 2);
+      Offset position = Offset(
+          startX + (parent.children.length * horizontalGap), parent.position.dy + verticalGap);
+
+      // **Check for overlaps & adjust**
+      while (spaces.any((s) => (s.position - position).distance < horizontalGap)) {
+        position = Offset(position.dx + horizontalGap, position.dy);
       }
 
+      print("🔹 New position for ${parent.name}: (${position.dx}, ${position.dy})");
+      return position;
+    }
+
+    /// **Realign the entire tree after duplication**
+    void realignTree() {
+      void updatePositions(SpaceModel node, double x, double y) {
+        node.position = Offset(x, y);
+        print("✅ Adjusted ${node.name} to (${x}, ${y})");
+
+        int numChildren = node.children.length;
+        double childStartX = x - ((numChildren - 1) * horizontalGap) / 2;
+
+        for (int i = 0; i < numChildren; i++) {
+          updatePositions(node.children[i], childStartX + (i * horizontalGap), y + verticalGap);
+        }
+      }
+
+      if (spaces.isNotEmpty) {
+        print("🔄 Realigning tree...");
+        updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+      }
+    }
+
+    /// **Recursive duplication logic**
+    SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
+      Offset newPosition = duplicatedParent == null
+          ? Offset(original.position.dx + horizontalGap, original.position.dy)
+          : getBalancedChildPosition(duplicatedParent);
+
       final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-
-      final List<SubspaceModel>? duplicatedSubspaces;
-      final List<Tag>? duplicatedTags;
-      if (original.spaceModel != null) {
-        duplicatedTags = [];
-        duplicatedSubspaces = [];
-      } else {
-        duplicatedTags = original.tags;
-        duplicatedSubspaces = original.subspaces;
-      }
+      print(
+          "🟡 Duplicating ${original.name} → ${duplicatedName} at (${newPosition.dx}, ${newPosition.dy})");
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -637,12 +704,10 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         status: SpaceStatus.newSpace,
         parent: duplicatedParent,
         spaceModel: original.spaceModel,
-        subspaces: duplicatedSubspaces,
-        tags: duplicatedTags,
+        subspaces: original.subspaces,
+        tags: original.tags,
       );
 
-      originalToDuplicate[original] = duplicated;
-
       setState(() {
         spaces.add(duplicated);
         _updateNodePosition(duplicated, duplicated.position);
@@ -651,60 +716,42 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           final newConnection = Connection(
             startSpace: duplicatedParent,
             endSpace: duplicated,
-            direction: original.incomingConnection?.direction ?? 'down',
+            direction: "down",
           );
           connections.add(newConnection);
           duplicated.incomingConnection = newConnection;
           duplicatedParent.addOutgoingConnection(newConnection);
+          duplicatedParent.children.add(duplicated);
+          print("🔗 Created connection: ${duplicatedParent.name} → ${duplicated.name}");
         }
 
-        if (original.parent != null && duplicatedParent == null) {
-          final originalParent = original.parent!;
-          final duplicatedParent = originalToDuplicate[originalParent] ?? originalParent;
-
-          final parentConnection = Connection(
-            startSpace: duplicatedParent,
-            endSpace: duplicated,
-            direction: original.incomingConnection?.direction ?? "down",
-          );
-
-          connections.add(parentConnection);
-          duplicated.incomingConnection = parentConnection;
-          duplicatedParent.addOutgoingConnection(parentConnection);
-        }
+        // **Recalculate the whole tree to avoid overlaps**
+        realignTree();
       });
 
-      final childrenWithDownDirection = original.children
-          .where((child) =>
-              child.incomingConnection?.direction == "down" && child.status != SpaceStatus.deleted)
-          .toList();
-
-      Offset childStartPosition = childrenWithDownDirection.length == 1
-          ? duplicated.position
-          : newPosition + Offset(0, verticalGap);
-
-      for (final child in original.children) {
-        final isDownDirection = child.incomingConnection?.direction == "down" ?? false;
-
-        if (isDownDirection && childrenWithDownDirection.length == 1) {
-          childStartPosition = duplicated.position + Offset(0, verticalGap);
-        } else if (!isDownDirection) {
-          childStartPosition = duplicated.position + Offset(horizontalGap, 0);
-        }
-
-        final duplicatedChild = duplicateRecursive(child, childStartPosition, duplicated);
-        duplicated.children.add(duplicatedChild);
-        childStartPosition += Offset(0, verticalGap);
+      // Recursively duplicate children
+      for (var child in original.children) {
+        duplicateRecursive(child, duplicated);
       }
 
       return duplicated;
     }
 
+    /// **Handle root duplication**
     if (space.parent == null) {
-      duplicateRecursive(space, space.position, null);
+      print("🟠 Duplicating root node: ${space.name}");
+      SpaceModel duplicatedRoot = duplicateRecursive(space, null);
+
+      setState(() {
+        spaces.add(duplicatedRoot);
+        realignTree();
+      });
+
+      print("✅ Root duplication successful: ${duplicatedRoot.name}");
     } else {
-      final duplicatedParent = originalToDuplicate[space.parent!] ?? space.parent!;
-      duplicateRecursive(space, space.position, duplicatedParent);
+      duplicateRecursive(space, space.parent);
     }
+
+    print("🟢 Finished duplication process for: ${space.name}");
   }
 }
diff --git a/lib/pages/spaces_management/helper/space_helper.dart b/lib/pages/spaces_management/helper/space_helper.dart
index 126306cd..4049eb7e 100644
--- a/lib/pages/spaces_management/helper/space_helper.dart
+++ b/lib/pages/spaces_management/helper/space_helper.dart
@@ -2,8 +2,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_m
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 
 class SpaceHelper {
-  static SpaceModel? findSpaceByUuid(
-      String? uuid, List<CommunityModel> communities) {
+  static SpaceModel? findSpaceByUuid(String? uuid, List<CommunityModel> communities) {
     for (var community in communities) {
       for (var space in community.spaces) {
         if (space.uuid == uuid) return space;
@@ -12,8 +11,7 @@ class SpaceHelper {
     return null;
   }
 
-  static SpaceModel? findSpaceByInternalId(
-      String? internalId, List<SpaceModel> spaces) {
+  static SpaceModel? findSpaceByInternalId(String? internalId, List<SpaceModel> spaces) {
     if (internalId != null) {
       for (var space in spaces) {
         if (space.internalId == internalId) return space;
@@ -23,8 +21,7 @@ class SpaceHelper {
     return null;
   }
 
-  static String generateUniqueSpaceName(
-      String originalName, List<SpaceModel> spaces) {
+  static String generateUniqueSpaceName(String originalName, List<SpaceModel> spaces) {
     final baseName = originalName.replaceAll(RegExp(r'\(\d+\)$'), '').trim();
     int maxNumber = 0;
 
@@ -54,13 +51,10 @@ class SpaceHelper {
 
     return space == selectedSpace ||
         selectedSpace.parent?.internalId == space.internalId ||
-        selectedSpace.children
-                ?.any((child) => child.internalId == space.internalId) ==
-            true;
+        selectedSpace.children?.any((child) => child.internalId == space.internalId) == true;
   }
 
-  static bool isNameConflict(
-      String value, SpaceModel? parentSpace, SpaceModel? editSpace) {
+  static bool isNameConflict(String value, SpaceModel? parentSpace, SpaceModel? editSpace) {
     final siblings = parentSpace?.children
             .where((child) => child.internalId != editSpace?.internalId)
             .toList() ??
@@ -71,19 +65,17 @@ class SpaceHelper {
             .toList() ??
         [];
 
-    final editSiblingConflict =
-        editSiblings.any((child) => child.name == value);
+    final editSiblingConflict = editSiblings.any((child) => child.name == value);
 
     final siblingConflict = siblings.any((child) => child.name == value);
 
-    final parentConflict = parentSpace?.name == value &&
-        parentSpace?.internalId != editSpace?.internalId;
+    final parentConflict =
+        parentSpace?.name == value && parentSpace?.internalId != editSpace?.internalId;
 
-    final parentOfEditSpaceConflict = editSpace?.parent?.name == value &&
-        editSpace?.parent?.internalId != editSpace?.internalId;
+    final parentOfEditSpaceConflict =
+        editSpace?.parent?.name == value && editSpace?.parent?.internalId != editSpace?.internalId;
 
-    final childConflict =
-        editSpace?.children.any((child) => child.name == value) ?? false;
+    final childConflict = editSpace?.children.any((child) => child.name == value) ?? false;
 
     return siblingConflict ||
         parentConflict ||

From c0d53fdf5c36e2b0e28aaa9ad0e11a7e64701590 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Wed, 19 Mar 2025 12:24:55 +0300
Subject: [PATCH 013/238] Update Automation Status

---
 assets/icons/scenesPlayIcon.svg               |  17 ++
 assets/icons/spaseLocationIcon.svg            |   4 +
 .../automation_scene_trigger_bloc.dart        | 124 +++++++++++++
 .../automation_scene_trigger_event.dart       |  55 ++++++
 .../automation_scene_trigger_status.dart      |  51 +++++
 .../automation_status_update.dart             |  39 ++++
 lib/pages/routines/view/routines_view.dart    |  31 +++-
 .../fetch_routine_scenes_automation.dart      |  22 ++-
 .../main_routine_view/routine_view_card.dart  | 174 ++++++++++++------
 lib/services/routines_api.dart                |  56 ++++++
 lib/utils/constants/api_const.dart            |   5 +
 lib/utils/constants/assets.dart               |   5 +-
 12 files changed, 512 insertions(+), 71 deletions(-)
 create mode 100644 assets/icons/scenesPlayIcon.svg
 create mode 100644 assets/icons/spaseLocationIcon.svg
 create mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart
 create mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart
 create mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart
 create mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart

diff --git a/assets/icons/scenesPlayIcon.svg b/assets/icons/scenesPlayIcon.svg
new file mode 100644
index 00000000..6417b0e6
--- /dev/null
+++ b/assets/icons/scenesPlayIcon.svg
@@ -0,0 +1,17 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_6675_32326)">
+<path d="M18 3C9.71584 3 3 9.71572 3 18C3 26.2843 9.71584 33 18 33C26.2842 33 33 26.2843 33 18C33 9.71572 26.2842 3 18 3ZM23.1844 18.7951L15.6844 23.4826C15.5326 23.5774 15.3601 23.625 15.1875 23.625C15.0312 23.625 14.8746 23.5861 14.7329 23.5073C14.4349 23.3421 14.25 23.0285 14.25 22.6875V13.3125C14.25 12.9715 14.4349 12.6579 14.7329 12.4927C15.0309 12.3265 15.3953 12.3366 15.6844 12.5174L23.1844 17.2049C23.4584 17.3766 23.625 17.6769 23.625 18C23.625 18.3231 23.4584 18.6235 23.1844 18.7951Z" fill="#F4F4F4"/>
+</g>
+<defs>
+<filter id="filter0_d_6675_32326" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6675_32326"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6675_32326" result="shape"/>
+</filter>
+</defs>
+</svg>
diff --git a/assets/icons/spaseLocationIcon.svg b/assets/icons/spaseLocationIcon.svg
new file mode 100644
index 00000000..2c3f0ad9
--- /dev/null
+++ b/assets/icons/spaseLocationIcon.svg
@@ -0,0 +1,4 @@
+<svg width="15" height="14" viewBox="0 0 15 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.13597 13.8173C7.21711 13.9314 7.35373 14 7.5 14C7.64627 14 7.78289 13.9315 7.86403 13.8173C8.89942 12.3614 10.4245 10.5632 11.4872 8.73444C12.3369 7.27221 12.75 6.02509 12.75 4.92188C12.75 2.20795 10.3948 0 7.5 0C4.60515 0 2.25 2.20795 2.25 4.92188C2.25 6.02509 2.66309 7.27221 3.51283 8.73444C4.57476 10.5618 6.10271 12.3644 7.13597 13.8173ZM7.5 0.820312C9.91237 0.820312 11.875 2.66027 11.875 4.92188C11.875 5.88448 11.4968 7.00323 10.7188 8.342C9.80277 9.91834 8.49557 11.5174 7.5 12.8617C6.50457 11.5176 5.19729 9.91843 4.2812 8.342C3.5032 7.00323 3.125 5.88448 3.125 4.92188C3.125 2.66027 5.08763 0.820312 7.5 0.820312Z" fill="#999999"/>
+<path d="M7.5 7.38281C8.94742 7.38281 10.125 6.27884 10.125 4.92188C10.125 3.56491 8.94742 2.46094 7.5 2.46094C6.05257 2.46094 4.875 3.56491 4.875 4.92188C4.875 6.27884 6.05257 7.38281 7.5 7.38281ZM7.5 3.28125C8.46495 3.28125 9.25 4.01723 9.25 4.92188C9.25 5.82652 8.46495 6.5625 7.5 6.5625C6.53505 6.5625 5.75 5.82652 5.75 4.92188C5.75 4.01723 6.53505 3.28125 7.5 3.28125Z" fill="#999999"/>
+</svg>
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart
new file mode 100644
index 00000000..b76b06e0
--- /dev/null
+++ b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart
@@ -0,0 +1,124 @@
+import 'dart:async';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/auth/model/project_model.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart';
+import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+import 'package:syncrow_web/services/routines_api.dart';
+
+class AutomationSceneTriggerBloc extends Bloc<AutomationSceneTriggerEvent, AutomationSceneTriggerStatus> {
+  AutomationSceneTriggerBloc() : super(AutomationSceneInitial()) {
+    // on<LoadScenes>(_onLoadScenes);
+    // on<LoadAutomation>(_onLoadAutomation);
+    on<SceneTrigger>(_onSceneTrigger);
+    on<UpdateAutomationStatus>(_onUpdateAutomationStatus);
+  }
+
+  List<ScenesModel> scenes = [];
+  List<ScenesModel> automationList = [];
+
+  // Future<void> _onLoadScenes(LoadScenes event, Emitter<AutomationSceneTriggerStatus> emit) async {
+  //   emit(SceneLoading());
+
+  //   try {
+  //     Project? project = HomeCubit.getInstance().project;
+
+  //     if (event.unitId.isNotEmpty) {
+  //       scenes = await SceneApi.getScenesByUnitId(event.unitId,
+  //           event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
+  //           showInDevice: event.showInDevice);
+  //       emit(SceneLoaded(scenes, automationList));
+  //     } else {
+  //       emit(const SceneError(message: 'Unit ID is empty'));
+  //     }
+  //   } catch (e) {
+  //     emit(const SceneError(message: 'Something went wrong'));
+  //   }
+  // }
+
+  // Future<void> _onLoadAutomation(
+  //     LoadAutomation event, Emitter<AutomationSceneTriggerStatus> emit) async {
+  //   emit(SceneLoading());
+
+  //   try {
+  //     Project? project = HomeCubit.getInstance().project;
+
+  //     if (event.unitId.isNotEmpty) {
+  //       automationList = await SceneApi.getAutomationByUnitId(
+  //           event.unitId, event.communityId, project?.uuid ?? '');
+  //       emit(SceneLoaded(scenes, automationList));
+  //     } else {
+  //       emit(const SceneError(message: 'Unit ID is empty'));
+  //     }
+  //   } catch (e) {
+  //     emit(const SceneError(message: 'Something went wrong'));
+  //   }
+  // }
+
+  Future<void> _onSceneTrigger(
+      SceneTrigger event, Emitter<AutomationSceneTriggerStatus> emit) async {
+    final currentState = state;
+    if (currentState is AutomationSceneLoaded) {
+      emit(AutomationSceneLoaded(
+        currentState.scenes,
+        currentState.automationList,
+        loadingSceneId: event.sceneId,
+      ));
+
+      try {
+        final success = await SceneApi.triggerScene(event.sceneId);
+        if (success) {
+          emit(SceneTriggerSuccess(event.name));
+          emit(AutomationSceneLoaded(currentState.scenes, currentState.automationList));
+        } else {
+          emit(const AutomationSceneError(message: 'Something went wrong'));
+        }
+      } catch (e) {
+        emit(const AutomationSceneError(message: 'Something went wrong'));
+      }
+    }
+  }
+
+  Future<void> _onUpdateAutomationStatus(
+      UpdateAutomationStatus event, Emitter<AutomationSceneTriggerStatus> emit) async {
+    final currentState = state;
+    if (currentState is AutomationSceneLoaded) {
+      final newLoadingStates =
+          Map<String, bool>.from(currentState.loadingStates)
+            ..[event.automationId] = true;
+
+      emit(AutomationSceneLoaded(
+        currentState.scenes,
+        currentState.automationList,
+        loadingStates: newLoadingStates,
+      ));
+
+      try {
+        Project? project = HomeCubit.getInstance().project;
+
+        final success = await SceneApi.updateAutomationStatus(
+            event.automationId,
+            event.automationStatusUpdate,
+            project?.uuid ?? '');
+        if (success) {
+          automationList = await SceneApi.getAutomationByUnitId(
+              event.automationStatusUpdate.spaceUuid,
+              event.communityId,
+              project?.uuid ?? '');
+          newLoadingStates[event.automationId] = false;
+          emit(AutomationSceneLoaded(
+            currentState.scenes,
+            automationList,
+            loadingStates: newLoadingStates,
+          ));
+        } else {
+          emit(const AutomationSceneError(message: 'Something went wrong'));
+        }
+      } catch (e) {
+        emit(const AutomationSceneError(message: 'Something went wrong'));
+      }
+    }
+  }
+}
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart
new file mode 100644
index 00000000..b34eb5ed
--- /dev/null
+++ b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart
@@ -0,0 +1,55 @@
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
+import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+abstract class AutomationSceneTriggerEvent extends Equatable {
+  const AutomationSceneTriggerEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class AutomationSceneScenes extends AutomationSceneTriggerEvent {
+  final String unitId;
+  final bool showInDevice;
+  final SpaceModel unit;
+
+  const AutomationSceneScenes(this.unitId, this.unit, {this.showInDevice = false});
+
+  @override
+  List<Object> get props => [unitId, showInDevice];
+}
+
+class AutomationSceneAutomation extends AutomationSceneTriggerEvent {
+  final String unitId;
+    final String communityId;
+
+
+  const AutomationSceneAutomation(this.unitId, this.communityId);
+
+  @override
+  List<Object> get props => [unitId, communityId];
+}
+
+class SceneTrigger extends AutomationSceneTriggerEvent {
+  final String sceneId;
+  final String name;
+
+  const SceneTrigger(this.sceneId, this.name);
+
+  @override
+  List<Object> get props => [sceneId];
+}
+
+//updateAutomationStatus
+class UpdateAutomationStatus extends AutomationSceneTriggerEvent {
+  final String automationId;
+  final AutomationStatusUpdate automationStatusUpdate;
+  final String communityId;
+
+  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId, required this.communityId});
+
+  @override
+  List<Object> get props => [automationStatusUpdate];
+}
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart
new file mode 100644
index 00000000..6753372f
--- /dev/null
+++ b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart
@@ -0,0 +1,51 @@
+
+
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/routines/models/routine_model.dart';
+
+abstract class AutomationSceneTriggerStatus extends Equatable {
+  const AutomationSceneTriggerStatus();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class AutomationSceneInitial extends AutomationSceneTriggerStatus {}
+
+class AutomationSceneLoading extends AutomationSceneTriggerStatus {}
+
+class AutomationSceneLoaded extends AutomationSceneTriggerStatus {
+  final List<ScenesModel> scenes;
+  final List<ScenesModel> automationList;
+  final String? loadingSceneId;
+  final Map<String, bool> loadingStates;
+
+  const AutomationSceneLoaded(this.scenes, this.automationList,
+      {this.loadingSceneId, this.loadingStates = const {}});
+
+  @override
+  List<Object?> get props =>
+      [scenes, loadingSceneId, automationList, loadingStates];
+}
+
+class AutomationSceneError extends AutomationSceneTriggerStatus {
+  final String message;
+
+  const AutomationSceneError({required this.message});
+
+  @override
+  List<Object> get props => [message];
+}
+
+class SceneTriggerSuccess extends AutomationSceneTriggerStatus {
+  final String sceneName;
+
+  const SceneTriggerSuccess(this.sceneName);
+
+  @override
+  List<Object> get props => [sceneName];
+}
+
+class UpdateAutomationStatusLoading extends AutomationSceneTriggerStatus {
+  const UpdateAutomationStatusLoading();
+}
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart
new file mode 100644
index 00000000..c664c2c4
--- /dev/null
+++ b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart
@@ -0,0 +1,39 @@
+
+import 'dart:convert';
+
+class AutomationStatusUpdate {
+  final String spaceUuid;
+  final bool isEnable;
+
+  AutomationStatusUpdate({
+    required this.spaceUuid,
+    required this.isEnable,
+  });
+
+  factory AutomationStatusUpdate.fromRawJson(String str) =>
+      AutomationStatusUpdate.fromJson(json.decode(str));
+
+  String toRawJson() => json.encode(toJson());
+
+  factory AutomationStatusUpdate.fromJson(Map<String, dynamic> json) =>
+      AutomationStatusUpdate(
+        spaceUuid: json["spaceUuid"],
+        isEnable: json["isEnable"],
+      );
+
+  Map<String, dynamic> toJson() => {
+        "spaceUuid": spaceUuid,
+        "isEnable": isEnable,
+      };
+
+  factory AutomationStatusUpdate.fromMap(Map<String, dynamic> map) =>
+      AutomationStatusUpdate(
+        spaceUuid: map["spaceUuid"],
+        isEnable: map["isEnable"],
+      );
+
+  Map<String, dynamic> toMap() => {
+        "spaceUuid": spaceUuid,
+        "isEnable": isEnable,
+      };
+}
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index b0efb4a9..de627a43 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -60,22 +60,39 @@ class _RoutinesViewState extends State<RoutinesView> {
                         height: 10,
                       ),
                       RoutineViewCard(
+                        isFromScenes: false,
+                        cardType: '',
+                        spaceName: '',
                         onTap: () {
-                          if (context.read<SpaceTreeBloc>().state.selectedCommunities.length == 1 &&
-                              context.read<SpaceTreeBloc>().state.selectedSpaces.length == 1) {
+                          if (context
+                                      .read<SpaceTreeBloc>()
+                                      .state
+                                      .selectedCommunities
+                                      .length ==
+                                  1 &&
+                              context
+                                      .read<SpaceTreeBloc>()
+                                      .state
+                                      .selectedSpaces
+                                      .length ==
+                                  1) {
                             context.read<RoutineBloc>().add(
                                   (ResetRoutineState()),
                                 );
                             BlocProvider.of<RoutineBloc>(context).add(
-                              const CreateNewRoutineViewEvent(createRoutineView: true),
+                              const CreateNewRoutineViewEvent(
+                                  createRoutineView: true),
                             );
                           } else {
                             ScaffoldMessenger.of(context).showSnackBar(
                               SnackBar(
-                                content: Text(
-                                    context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
-                                        ? 'Please select a space'
-                                        : 'Please select only one space to proceed'),
+                                content: Text(context
+                                        .read<SpaceTreeBloc>()
+                                        .state
+                                        .selectedSpaces
+                                        .isEmpty
+                                    ? 'Please select a space'
+                                    : 'Please select only one space to proceed'),
                               ),
                             );
                             // CustomSnackBar.redSnackBar(
diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 718a78b9..08f4318e 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -12,7 +12,8 @@ class FetchRoutineScenesAutomation extends StatefulWidget {
   const FetchRoutineScenesAutomation({super.key});
 
   @override
-  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
+  State<FetchRoutineScenesAutomation> createState() =>
+      _FetchRoutineScenesState();
 }
 
 class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
@@ -64,9 +65,12 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                               right: isSmallScreenSize(context) ? 4.0 : 8.0,
                             ),
                             child: RoutineViewCard(
+                              cardType: 'scenes',
+                              spaceName: 'scenes',
                               onTap: () {
                                 BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(createRoutineView: true),
+                                  const CreateNewRoutineViewEvent(
+                                      createRoutineView: true),
                                 );
                                 context.read<RoutineBloc>().add(
                                       GetSceneDetails(
@@ -77,7 +81,8 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                     );
                               },
                               textString: state.scenes[index].name,
-                              icon: state.scenes[index].icon ?? Assets.logoHorizontal,
+                              icon: state.scenes[index].icon ??
+                                  Assets.logoHorizontal,
                               isFromScenes: true,
                               iconInBytes: state.scenes[index].iconInBytes,
                             ),
@@ -113,19 +118,24 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                               right: isSmallScreenSize(context) ? 4.0 : 8.0,
                             ),
                             child: RoutineViewCard(
+                              cardType: 'automations',
+                              spaceName: 'automations',
                               onTap: () {
                                 BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(createRoutineView: true),
+                                  const CreateNewRoutineViewEvent(
+                                      createRoutineView: true),
                                 );
                                 context.read<RoutineBloc>().add(
                                       GetAutomationDetails(
-                                          automationId: state.automations[index].id,
+                                          automationId:
+                                              state.automations[index].id,
                                           isAutomation: true,
                                           isUpdate: true),
                                     );
                               },
                               textString: state.automations[index].name,
-                              icon: state.automations[index].icon ?? Assets.automation,
+                              icon: state.automations[index].icon ??
+                                  Assets.automation,
                             ),
                           ),
                         ),
diff --git a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
index f8a2e358..fe94cf83 100644
--- a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
+++ b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -12,6 +13,8 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
     required this.onTap,
     required this.icon,
     required this.textString,
+    required this.spaceName,
+    required this.cardType,
     this.isFromScenes,
     this.iconInBytes,
   });
@@ -19,6 +22,9 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
   final Function() onTap;
   final dynamic icon;
   final String textString;
+  final String spaceName;
+  final String cardType;
+
   final bool? isFromScenes;
   final Uint8List? iconInBytes;
 
@@ -50,69 +56,125 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
         ),
         color: ColorsManager.whiteColors,
         child: InkWell(
-          onTap: onTap,
           borderRadius: BorderRadius.circular(10),
           child: Padding(
             padding: const EdgeInsets.all(8.0),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: [
-                Center(
-                  child: Container(
-                    decoration: BoxDecoration(
-                      color: ColorsManager.graysColor,
-                      borderRadius: BorderRadius.circular(120),
-                      border: Border.all(
-                        color: ColorsManager.greyColor,
-                        width: 2.0,
-                      ),
-                    ),
-                    height: iconSize,
-                    width: iconSize,
-                    child: (isFromScenes ?? false)
-                        ? (iconInBytes != null && iconInBytes?.isNotEmpty == true)
-                            ? Image.memory(
-                                iconInBytes!,
-                                height: iconSize,
-                                width: iconSize,
-                                fit: BoxFit.contain,
-                                errorBuilder: (context, error, stackTrace) => Image.asset(
-                                  Assets.logo,
-                                  height: iconSize,
-                                  width: iconSize,
-                                  fit: BoxFit.contain,
-                                ),
-                              )
-                            : Image.asset(
-                                Assets.logo,
-                                height: iconSize,
-                                width: iconSize,
-                                fit: BoxFit.contain,
-                              )
-                        : (icon is String && icon.endsWith('.svg'))
-                            ? SvgPicture.asset(
-                                icon,
-                                fit: BoxFit.contain,
-                              )
-                            : Icon(
-                                icon,
-                                color: ColorsManager.dialogBlueTitle,
-                                size: isSmallScreenSize(context) ? 30 : 40,
-                              ),
-                  ),
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.end,
+                  mainAxisAlignment: MainAxisAlignment.end,
+                  children: [
+                    (isFromScenes ?? false)
+                        ? InkWell(
+                            onTap: () {},
+                            child: SvgPicture.asset(
+                              Assets.scenesPlayIcon,
+                              fit: BoxFit.contain,
+                            ),
+                          )
+                        : CupertinoSwitch(
+                            activeColor: ColorsManager.primaryColor,
+                            value: false,
+                            onChanged: (value) {},
+                          )
+                  ],
                 ),
-                const SizedBox(height: 8),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 3),
-                  child: Text(
-                    textString,
-                    textAlign: TextAlign.center,
-                    overflow: TextOverflow.ellipsis,
-                    maxLines: 2,
-                    style: context.textTheme.bodySmall?.copyWith(
-                      color: ColorsManager.blackColor,
-                      fontSize: isSmallScreenSize(context) ? 10 : 12,
-                    ),
+                InkWell(
+                  onTap: onTap,
+                  child: Column(
+                    children: [
+                      Center(
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: ColorsManager.graysColor,
+                            borderRadius: BorderRadius.circular(120),
+                            border: Border.all(
+                              color: ColorsManager.greyColor,
+                              width: 2.0,
+                            ),
+                          ),
+                          height: iconSize,
+                          width: iconSize,
+                          child: (isFromScenes ?? false)
+                              ? (iconInBytes != null &&
+                                      iconInBytes?.isNotEmpty == true)
+                                  ? Image.memory(
+                                      iconInBytes!,
+                                      height: iconSize,
+                                      width: iconSize,
+                                      fit: BoxFit.contain,
+                                      errorBuilder:
+                                          (context, error, stackTrace) =>
+                                              Image.asset(
+                                        Assets.logo,
+                                        height: iconSize,
+                                        width: iconSize,
+                                        fit: BoxFit.contain,
+                                      ),
+                                    )
+                                  : Image.asset(
+                                      Assets.logo,
+                                      height: iconSize,
+                                      width: iconSize,
+                                      fit: BoxFit.contain,
+                                    )
+                              : (icon is String && icon.endsWith('.svg'))
+                                  ? SvgPicture.asset(
+                                      icon,
+                                      fit: BoxFit.contain,
+                                    )
+                                  : Icon(
+                                      icon,
+                                      color: ColorsManager.dialogBlueTitle,
+                                      size:
+                                          isSmallScreenSize(context) ? 30 : 40,
+                                    ),
+                        ),
+                      ),
+                      const SizedBox(height: 8),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 3),
+                        child: Column(
+                          children: [
+                            Text(
+                              textString,
+                              textAlign: TextAlign.center,
+                              overflow: TextOverflow.ellipsis,
+                              maxLines: 2,
+                              style: context.textTheme.bodySmall?.copyWith(
+                                color: ColorsManager.blackColor,
+                                fontSize: isSmallScreenSize(context) ? 10 : 12,
+                              ),
+                            ),
+                            if (spaceName != '')
+                              Row(
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                children: [
+                                  SvgPicture.asset(
+                                    Assets.spaceLocationIcon,
+                                    fit: BoxFit.contain,
+                                  ),
+                                  Text(
+                                    spaceName,
+                                    textAlign: TextAlign.center,
+                                    overflow: TextOverflow.ellipsis,
+                                    maxLines: 2,
+                                    style:
+                                        context.textTheme.bodySmall?.copyWith(
+                                      color: ColorsManager.blackColor,
+                                      fontSize:
+                                          isSmallScreenSize(context) ? 10 : 12,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                          ],
+                        ),
+                      ),
+                    ],
                   ),
                 ),
               ],
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index 56a29aa1..cbef2bc3 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
 import 'package:syncrow_web/pages/routines/models/icon_model.dart';
@@ -230,4 +231,59 @@ class SceneApi {
       rethrow;
     }
   }
+
+    static Future<bool> updateAutomationStatus(String automationId,
+      AutomationStatusUpdate createAutomationEnable, String projectId) async {
+    try {
+      final response = await _httpService.patch(
+        path: ApiEndpoints.updateAutomationStatus
+            .replaceAll('{automationId}', automationId)
+            .replaceAll('{projectId}', projectId),
+        body: createAutomationEnable.toMap(),
+        expectedResponseModel: (json) => json['success'],
+      );
+      return response;
+    } catch (e) {
+      rethrow;
+    }
+  }
+
+  static Future<bool> triggerScene(String sceneId) async {
+    try {
+      final response = await _httpService.post(
+        path: ApiEndpoints.triggerScene.replaceAll('{sceneId}', sceneId),
+        showServerMessage: false,
+        expectedResponseModel: (json) => json['success'],
+      );
+      return response;
+    } catch (e) {
+      rethrow;
+    }
+  }
+ static Future<List<ScenesModel>> getAutomationByUnitId(
+    String unitId,
+    String communityId,
+    String projectId,
+  ) async {
+    try {
+      final response = await _httpService.get(
+        path: ApiEndpoints.getUnitAutomation
+            .replaceAll('{unitUuid}', unitId)
+            .replaceAll('{communityId}', communityId)
+            .replaceAll('{projectId}', projectId),
+        showServerMessage: false,
+        expectedResponseModel: (json) {
+          List<ScenesModel> scenes = [];
+          for (var scene in json) {
+            scenes.add(ScenesModel.fromJson(scene));
+          }
+          return scenes;
+        },
+      );
+      return response;
+    } catch (e) {
+      rethrow;
+    }
+  }
+
 }
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 71e0fc55..00449836 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -111,4 +111,9 @@ abstract class ApiEndpoints {
   static const String terms = '/terms';
   static const String policy = '/policy';
   static const String userAgreements = '/user/agreements/web/{userUuid}';
+    static const String triggerScene = '/scene/tap-to-run/{sceneId}/trigger';
+  static const String updateAutomationStatus =
+      '/projects/{projectId}/automations/{automationId}';
+  static const String getUnitAutomation =
+      '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
 }
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index b7a0115f..5d462f28 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -406,6 +406,7 @@ class Assets {
   static const String deleteSpaceLinkIcon =
       'assets/icons/delete_space_link_icon.svg';
   static const String spaceLinkIcon = 'assets/icons/space_link_icon.svg';
-    static const String successIcon = 'assets/icons/success_icon.svg';
-
+  static const String successIcon = 'assets/icons/success_icon.svg';
+  static const String spaceLocationIcon = 'assets/icons/spaceLocationIcon.svg';
+  static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.svg';
 }

From 2d3345c1d961710ec13d8672149dc6b60f98d0bc Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Wed, 19 Mar 2025 21:48:44 +0400
Subject: [PATCH 014/238] fixed issue in subspace updatw

---
 .../bloc/space_management_bloc.dart           | 58 +++++--------------
 1 file changed, 15 insertions(+), 43 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index d675c680..56949a19 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -262,27 +262,6 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
         return;
       }
 
-      if (communities.isEmpty) {
-        communities = await _api.fetchCommunities(projectUuid);
-
-        List<CommunityModel> updatedCommunities = await Future.wait(
-          communities.map((community) async {
-            List<SpaceModel> spaces = await _fetchSpacesForCommunity(community.uuid);
-            return CommunityModel(
-              uuid: community.uuid,
-              createdAt: community.createdAt,
-              updatedAt: community.updatedAt,
-              name: community.name,
-              description: community.description,
-              spaces: spaces,
-              region: community.region,
-            );
-          }).toList(),
-        );
-
-        communities = updatedCommunities;
-      }
-
       emit(BlankState(
         spaceModels: prevSpaceModels,
         communities: communities,
@@ -540,7 +519,7 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
           List<TagModelUpdate> tagUpdates = [];
 
           List<SpaceModel> matchedSpaces =
-              selectedCommunity.spaces.where((space) => space.uuid == space.uuid).toList();
+              findMatchingSpaces(selectedCommunity.spaces, space.uuid!);
 
           if (matchedSpaces.isEmpty) continue;
 
@@ -696,27 +675,6 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
       var prevSpaceModels = await fetchSpaceModels();
 
-      if (communities.isEmpty) {
-        communities = await _api.fetchCommunities(projectUuid);
-
-        List<CommunityModel> updatedCommunities = await Future.wait(
-          communities.map((community) async {
-            List<SpaceModel> spaces = await _fetchSpacesForCommunity(community.uuid);
-            return CommunityModel(
-              uuid: community.uuid,
-              createdAt: community.createdAt,
-              updatedAt: community.updatedAt,
-              name: community.name,
-              description: community.description,
-              spaces: spaces,
-              region: community.region,
-            );
-          }).toList(),
-        );
-
-        communities = updatedCommunities;
-      }
-
       emit(SpaceModelLoaded(
           communities: communities,
           products: _cachedProducts ?? [],
@@ -799,4 +757,18 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
     return tagUpdates;
   }
+
+  List<SpaceModel> findMatchingSpaces(List<SpaceModel> spaces, String targetUuid) {
+    List<SpaceModel> matched = [];
+
+    for (var space in spaces) {
+      if (space.uuid == targetUuid) {
+        matched.add(space);
+      }
+      matched
+          .addAll(findMatchingSpaces(space.children, targetUuid)); // Recursively search in children
+    }
+
+    return matched;
+  }
 }

From 7e1c2ba71295e4b3ed995e8b28c9c8cca3b71810 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Fri, 21 Mar 2025 17:14:05 +0300
Subject: [PATCH 015/238] routines and automation Toggle

---
 assets/icons/scenesPlayIconCheck.svg          |  30 +++
 lib/main.dart                                 |   2 +-
 lib/main_dev.dart                             |   1 +
 .../automation_scene_trigger_bloc.dart        | 124 ------------
 .../automation_scene_trigger_event.dart       |  55 ------
 .../automation_scene_trigger_status.dart      |  51 -----
 .../bloc/routine_bloc/routine_bloc.dart       |  78 ++++++++
 .../bloc/routine_bloc/routine_event.dart      |  25 +++
 .../bloc/routine_bloc/routine_state.dart      |  44 +++++
 lib/pages/routines/models/routine_model.dart  |  12 ++
 lib/pages/routines/view/routines_view.dart    |   8 +-
 .../fetch_routine_scenes_automation.dart      | 184 +++++++++++-------
 .../main_routine_view/routine_view_card.dart  | 145 ++++++++++----
 lib/services/routines_api.dart                |  35 ++--
 lib/utils/constants/assets.dart               |   4 +-
 15 files changed, 441 insertions(+), 357 deletions(-)
 create mode 100644 assets/icons/scenesPlayIconCheck.svg
 delete mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart
 delete mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart
 delete mode 100644 lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart

diff --git a/assets/icons/scenesPlayIconCheck.svg b/assets/icons/scenesPlayIconCheck.svg
new file mode 100644
index 00000000..9e81869a
--- /dev/null
+++ b/assets/icons/scenesPlayIconCheck.svg
@@ -0,0 +1,30 @@
+<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_7280_5211)">
+<circle cx="18" cy="18" r="15" fill="#F4F4F4"/>
+</g>
+<g filter="url(#filter1_i_7280_5211)">
+<path d="M25.1663 13.187C24.8231 12.8439 24.2666 12.8439 23.9234 13.1871L16.1621 20.9484L12.0766 16.8628C11.7334 16.5196 11.1768 16.5196 10.8336 16.8628C10.4904 17.206 10.4904 17.7625 10.8336 18.1057L15.5406 22.8127C15.7122 22.9844 15.9372 23.0701 16.1621 23.0701C16.3869 23.0701 16.6119 22.9843 16.7835 22.8127L25.1663 14.43C25.5095 14.0868 25.5095 13.5303 25.1663 13.187Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_7280_5211" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_7280_5211"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_7280_5211" result="shape"/>
+</filter>
+<filter id="filter1_i_7280_5211" x="10.5762" y="12.9297" width="14.8475" height="10.1406" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset/>
+<feGaussianBlur stdDeviation="1.5"/>
+<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="shape" result="effect1_innerShadow_7280_5211"/>
+</filter>
+</defs>
+</svg>
diff --git a/lib/main.dart b/lib/main.dart
index f2f640e4..975578cf 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -33,7 +33,6 @@ Future<void> main() async {
 }
 
 class MyApp extends StatelessWidget {
-
   MyApp({super.key});
 
   final GoRouter _router = GoRouter(
@@ -55,6 +54,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
+    
           BlocProvider(
               create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
diff --git a/lib/main_dev.dart b/lib/main_dev.dart
index 9d00ebf7..76261c6a 100644
--- a/lib/main_dev.dart
+++ b/lib/main_dev.dart
@@ -55,6 +55,7 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
+       
           BlocProvider(
               create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart
deleted file mode 100644
index b76b06e0..00000000
--- a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_bloc.dart
+++ /dev/null
@@ -1,124 +0,0 @@
-import 'dart:async';
-
-import 'package:equatable/equatable.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/auth/model/project_model.dart';
-import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart';
-import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart';
-import 'package:syncrow_web/pages/routines/models/routine_model.dart';
-import 'package:syncrow_web/services/routines_api.dart';
-
-class AutomationSceneTriggerBloc extends Bloc<AutomationSceneTriggerEvent, AutomationSceneTriggerStatus> {
-  AutomationSceneTriggerBloc() : super(AutomationSceneInitial()) {
-    // on<LoadScenes>(_onLoadScenes);
-    // on<LoadAutomation>(_onLoadAutomation);
-    on<SceneTrigger>(_onSceneTrigger);
-    on<UpdateAutomationStatus>(_onUpdateAutomationStatus);
-  }
-
-  List<ScenesModel> scenes = [];
-  List<ScenesModel> automationList = [];
-
-  // Future<void> _onLoadScenes(LoadScenes event, Emitter<AutomationSceneTriggerStatus> emit) async {
-  //   emit(SceneLoading());
-
-  //   try {
-  //     Project? project = HomeCubit.getInstance().project;
-
-  //     if (event.unitId.isNotEmpty) {
-  //       scenes = await SceneApi.getScenesByUnitId(event.unitId,
-  //           event.unit.community.uuid, project?.uuid ?? TempConst.projectIdDev,
-  //           showInDevice: event.showInDevice);
-  //       emit(SceneLoaded(scenes, automationList));
-  //     } else {
-  //       emit(const SceneError(message: 'Unit ID is empty'));
-  //     }
-  //   } catch (e) {
-  //     emit(const SceneError(message: 'Something went wrong'));
-  //   }
-  // }
-
-  // Future<void> _onLoadAutomation(
-  //     LoadAutomation event, Emitter<AutomationSceneTriggerStatus> emit) async {
-  //   emit(SceneLoading());
-
-  //   try {
-  //     Project? project = HomeCubit.getInstance().project;
-
-  //     if (event.unitId.isNotEmpty) {
-  //       automationList = await SceneApi.getAutomationByUnitId(
-  //           event.unitId, event.communityId, project?.uuid ?? '');
-  //       emit(SceneLoaded(scenes, automationList));
-  //     } else {
-  //       emit(const SceneError(message: 'Unit ID is empty'));
-  //     }
-  //   } catch (e) {
-  //     emit(const SceneError(message: 'Something went wrong'));
-  //   }
-  // }
-
-  Future<void> _onSceneTrigger(
-      SceneTrigger event, Emitter<AutomationSceneTriggerStatus> emit) async {
-    final currentState = state;
-    if (currentState is AutomationSceneLoaded) {
-      emit(AutomationSceneLoaded(
-        currentState.scenes,
-        currentState.automationList,
-        loadingSceneId: event.sceneId,
-      ));
-
-      try {
-        final success = await SceneApi.triggerScene(event.sceneId);
-        if (success) {
-          emit(SceneTriggerSuccess(event.name));
-          emit(AutomationSceneLoaded(currentState.scenes, currentState.automationList));
-        } else {
-          emit(const AutomationSceneError(message: 'Something went wrong'));
-        }
-      } catch (e) {
-        emit(const AutomationSceneError(message: 'Something went wrong'));
-      }
-    }
-  }
-
-  Future<void> _onUpdateAutomationStatus(
-      UpdateAutomationStatus event, Emitter<AutomationSceneTriggerStatus> emit) async {
-    final currentState = state;
-    if (currentState is AutomationSceneLoaded) {
-      final newLoadingStates =
-          Map<String, bool>.from(currentState.loadingStates)
-            ..[event.automationId] = true;
-
-      emit(AutomationSceneLoaded(
-        currentState.scenes,
-        currentState.automationList,
-        loadingStates: newLoadingStates,
-      ));
-
-      try {
-        Project? project = HomeCubit.getInstance().project;
-
-        final success = await SceneApi.updateAutomationStatus(
-            event.automationId,
-            event.automationStatusUpdate,
-            project?.uuid ?? '');
-        if (success) {
-          automationList = await SceneApi.getAutomationByUnitId(
-              event.automationStatusUpdate.spaceUuid,
-              event.communityId,
-              project?.uuid ?? '');
-          newLoadingStates[event.automationId] = false;
-          emit(AutomationSceneLoaded(
-            currentState.scenes,
-            automationList,
-            loadingStates: newLoadingStates,
-          ));
-        } else {
-          emit(const AutomationSceneError(message: 'Something went wrong'));
-        }
-      } catch (e) {
-        emit(const AutomationSceneError(message: 'Something went wrong'));
-      }
-    }
-  }
-}
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart
deleted file mode 100644
index b34eb5ed..00000000
--- a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_event.dart
+++ /dev/null
@@ -1,55 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
-import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
-
-abstract class AutomationSceneTriggerEvent extends Equatable {
-  const AutomationSceneTriggerEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-class AutomationSceneScenes extends AutomationSceneTriggerEvent {
-  final String unitId;
-  final bool showInDevice;
-  final SpaceModel unit;
-
-  const AutomationSceneScenes(this.unitId, this.unit, {this.showInDevice = false});
-
-  @override
-  List<Object> get props => [unitId, showInDevice];
-}
-
-class AutomationSceneAutomation extends AutomationSceneTriggerEvent {
-  final String unitId;
-    final String communityId;
-
-
-  const AutomationSceneAutomation(this.unitId, this.communityId);
-
-  @override
-  List<Object> get props => [unitId, communityId];
-}
-
-class SceneTrigger extends AutomationSceneTriggerEvent {
-  final String sceneId;
-  final String name;
-
-  const SceneTrigger(this.sceneId, this.name);
-
-  @override
-  List<Object> get props => [sceneId];
-}
-
-//updateAutomationStatus
-class UpdateAutomationStatus extends AutomationSceneTriggerEvent {
-  final String automationId;
-  final AutomationStatusUpdate automationStatusUpdate;
-  final String communityId;
-
-  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId, required this.communityId});
-
-  @override
-  List<Object> get props => [automationStatusUpdate];
-}
diff --git a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart b/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart
deleted file mode 100644
index 6753372f..00000000
--- a/lib/pages/routines/bloc/automation_scene_trigger_bloc/automation_scene_trigger_status.dart
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-import 'package:equatable/equatable.dart';
-import 'package:syncrow_web/pages/routines/models/routine_model.dart';
-
-abstract class AutomationSceneTriggerStatus extends Equatable {
-  const AutomationSceneTriggerStatus();
-
-  @override
-  List<Object?> get props => [];
-}
-
-class AutomationSceneInitial extends AutomationSceneTriggerStatus {}
-
-class AutomationSceneLoading extends AutomationSceneTriggerStatus {}
-
-class AutomationSceneLoaded extends AutomationSceneTriggerStatus {
-  final List<ScenesModel> scenes;
-  final List<ScenesModel> automationList;
-  final String? loadingSceneId;
-  final Map<String, bool> loadingStates;
-
-  const AutomationSceneLoaded(this.scenes, this.automationList,
-      {this.loadingSceneId, this.loadingStates = const {}});
-
-  @override
-  List<Object?> get props =>
-      [scenes, loadingSceneId, automationList, loadingStates];
-}
-
-class AutomationSceneError extends AutomationSceneTriggerStatus {
-  final String message;
-
-  const AutomationSceneError({required this.message});
-
-  @override
-  List<Object> get props => [message];
-}
-
-class SceneTriggerSuccess extends AutomationSceneTriggerStatus {
-  final String sceneName;
-
-  const SceneTriggerSuccess(this.sceneName);
-
-  @override
-  List<Object> get props => [sceneName];
-}
-
-class UpdateAutomationStatusLoading extends AutomationSceneTriggerStatus {
-  const UpdateAutomationStatusLoading();
-}
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index 361810c0..d4f61bae 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.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/automation_scene_trigger_bloc/automation_status_update.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
 import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
@@ -51,6 +52,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     on<TriggerSwitchTabsEvent>(_triggerSwitchTabsEvent);
     on<CreateNewRoutineViewEvent>(_createNewRoutineViewEvent);
     on<ResetErrorMessage>(_resetErrorMessage);
+        on<SceneTrigger>(_onSceneTrigger);
+    on<UpdateAutomationStatus>(_onUpdateAutomationStatus);
   }
 
   FutureOr<void> _triggerSwitchTabsEvent(
@@ -1269,4 +1272,79 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
+
+  Future<void> _onSceneTrigger(
+      SceneTrigger event, Emitter<RoutineState> emit) async {
+    emit(state.copyWith(loadingSceneId: event.sceneId));
+
+    try {
+      final success = await SceneApi.triggerScene(event.sceneId!);
+
+      if (success) {
+        emit(state.copyWith(
+          loadingSceneId: null,
+          // Add success state if needed
+        ));
+        // Optional: Add delay to show success feedback
+        await Future.delayed(const Duration(milliseconds: 500));
+      } else {
+        emit(state.copyWith(
+          loadingSceneId: null,
+          errorMessage: 'Trigger failed',
+        ));
+      }
+    } catch (e) {
+      emit(state.copyWith(
+        loadingSceneId: null,
+        errorMessage: 'Trigger error: ${e.toString()}',
+      ));
+    }
+  }
+
+
+
+  Future<void> _onUpdateAutomationStatus(
+      UpdateAutomationStatus event, Emitter<RoutineState> emit) async {
+    // Create a new set safely
+    final currentLoadingIds = state.loadingAutomationIds;
+    final newLoadingIds = {...currentLoadingIds!}..add(event.automationId);
+
+    emit(state.copyWith(loadingAutomationIds: newLoadingIds));
+
+    try {
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
+      final success = await SceneApi.updateAutomationStatus(
+          event.automationId, event.automationStatusUpdate, projectId);
+
+      if (success) {
+        final updatedAutomations = await SceneApi.getAutomationByUnitId(
+            event.automationStatusUpdate.spaceUuid,
+            event.communityId,
+            projectId);
+
+        // Remove from loading set safely
+        final updatedLoadingIds = {...state.loadingAutomationIds!}
+          ..remove(event.automationId);
+
+        emit(state.copyWith(
+          automations: updatedAutomations,
+          loadingAutomationIds: updatedLoadingIds,
+        ));
+      } else {
+        final updatedLoadingIds = {...state.loadingAutomationIds!}
+          ..remove(event.automationId);
+        emit(state.copyWith(
+          loadingAutomationIds: updatedLoadingIds,
+          errorMessage: 'Update failed',
+        ));
+      }
+    } catch (e) {
+      final updatedLoadingIds = {...state.loadingAutomationIds!}
+        ..remove(event.automationId);
+      emit(state.copyWith(
+        loadingAutomationIds: updatedLoadingIds,
+        errorMessage: 'Update error: ${e.toString()}',
+      ));
+    }
+  }
 }
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_event.dart b/lib/pages/routines/bloc/routine_bloc/routine_event.dart
index c1b2a23f..b532235d 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_event.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_event.dart
@@ -210,3 +210,28 @@ class ResetRoutineState extends RoutineEvent {}
 class ClearFunctions extends RoutineEvent {}
 
 class ResetErrorMessage extends RoutineEvent {}
+
+
+
+
+class SceneTrigger extends RoutineEvent {
+  final String? sceneId;
+  final String? name;
+
+  const SceneTrigger({this.sceneId, this.name});
+
+  @override
+  List<Object> get props => [sceneId!,name!];
+}
+
+//updateAutomationStatus
+class UpdateAutomationStatus extends RoutineEvent {
+  final String automationId;
+  final AutomationStatusUpdate automationStatusUpdate;
+  final String communityId;
+
+  const UpdateAutomationStatus({required this.automationStatusUpdate, required this.automationId, required this.communityId});
+
+  @override
+  List<Object> get props => [automationStatusUpdate];
+}
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_state.dart b/lib/pages/routines/bloc/routine_bloc/routine_state.dart
index 4dc26a01..228d6af5 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_state.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_state.dart
@@ -1,6 +1,7 @@
 part of 'routine_bloc.dart';
 
 class RoutineState extends Equatable {
+  final String? loadingSceneId;
   final List<Map<String, dynamic>> ifItems;
   final List<Map<String, dynamic>> thenItems;
   final List<Map<String, String>> availableCards;
@@ -25,6 +26,7 @@ class RoutineState extends Equatable {
   // final String? automationActionExecutor;
   final bool routineTab;
   final bool createRoutineView;
+  final Set<String>? loadingAutomationIds; // Track loading automations
 
   const RoutineState(
       {this.ifItems = const [],
@@ -47,12 +49,16 @@ class RoutineState extends Equatable {
       this.sceneId,
       this.automationId,
       this.isUpdate,
+      this.loadingAutomationIds = const <String>{}, // Initialize with empty set
+      this.loadingSceneId,
       this.devices = const [],
       //  this.automationActionExecutor,
       this.routineTab = false,
       this.createRoutineView = false});
 
   RoutineState copyWith({
+    String? loadingSceneId,
+    Set<String>? loadingAutomationIds,
     List<Map<String, dynamic>>? ifItems,
     List<Map<String, dynamic>>? thenItems,
     List<ScenesModel>? scenes,
@@ -79,6 +85,8 @@ class RoutineState extends Equatable {
     bool? createRoutineView,
   }) {
     return RoutineState(
+        loadingSceneId: loadingSceneId,
+        loadingAutomationIds: loadingAutomationIds ?? this.loadingAutomationIds,
         ifItems: ifItems ?? this.ifItems,
         thenItems: thenItems ?? this.thenItems,
         scenes: scenes ?? this.scenes,
@@ -109,6 +117,7 @@ class RoutineState extends Equatable {
 
   @override
   List<Object?> get props => [
+        loadingAutomationIds,
         ifItems,
         thenItems,
         scenes,
@@ -134,3 +143,38 @@ class RoutineState extends Equatable {
         createRoutineView
       ];
 }
+
+class SceneInitial extends RoutineState {}
+
+class SceneLoading extends RoutineState {}
+
+class SceneLoaded extends RoutineState {
+  final List<ScenesModel>? scenesOrAutomation;
+  const SceneLoaded({this.scenesOrAutomation});
+  @override
+  List<Object?> get props => [
+        scenesOrAutomation,
+      ];
+}
+
+class SceneError extends RoutineState {
+  final String message;
+
+  const SceneError({required this.message});
+
+  @override
+  List<Object> get props => [message];
+}
+
+class SceneTriggerSuccess extends RoutineState {
+  final String sceneName;
+
+  const SceneTriggerSuccess(this.sceneName);
+
+  @override
+  List<Object> get props => [sceneName];
+}
+
+class UpdateAutomationStatusLoading extends RoutineState {
+  const UpdateAutomationStatusLoading();
+}
diff --git a/lib/pages/routines/models/routine_model.dart b/lib/pages/routines/models/routine_model.dart
index bb3e117b..2f7c2a24 100644
--- a/lib/pages/routines/models/routine_model.dart
+++ b/lib/pages/routines/models/routine_model.dart
@@ -9,6 +9,9 @@ class ScenesModel {
   final String status;
   final String type;
   final String? icon;
+  final String spaceName;
+  final String spaceId;
+  final String communityId;
 
   ScenesModel({
     required this.id,
@@ -16,6 +19,9 @@ class ScenesModel {
     required this.name,
     required this.status,
     required this.type,
+    required this.spaceName,
+    required this.spaceId,
+    required this.communityId,
     this.icon,
   });
 
@@ -41,6 +47,9 @@ class ScenesModel {
       name: json["name"] ?? '',
       status: json["status"] ?? '',
       type: json["type"] ?? '',
+      spaceName: json["spaceName"] ?? '',
+      spaceId: json["spaceId"] ?? '',
+      communityId: json["communityId"] ?? '',
       icon:
           isAutomation == true ? Assets.automation : (json["icon"] as String?),
     );
@@ -52,5 +61,8 @@ class ScenesModel {
         "name": name,
         "status": status,
         "type": type,
+        "spaceName": spaceName,
+        "spaceId": spaceId,
+        "communityId": communityId,
       };
 }
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index de627a43..3c140a4e 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -60,7 +60,13 @@ class _RoutinesViewState extends State<RoutinesView> {
                         height: 10,
                       ),
                       RoutineViewCard(
-                        isFromScenes: false,
+                        isLoading: false,
+                        onChanged: (v) {},
+                        status: '',
+                        spaceId: '',
+                        automationId: '',
+                        communityId: '',
+                        sceneId: '',
                         cardType: '',
                         spaceName: '',
                         onTap: () {
diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 08f4318e..809c462c 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.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';
@@ -46,48 +46,68 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                     ),
                     const SizedBox(height: 10),
                     if (state.scenes.isEmpty)
-                      Text(
-                        "No scenes found",
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: ColorsManager.grayColor,
+                      Expanded(
+                        child: Text(
+                          "No scenes found",
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: ColorsManager.grayColor,
+                          ),
                         ),
                       ),
                     if (state.scenes.isNotEmpty)
                       ConstrainedBox(
                         constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.7),
+                            maxHeight: isSmallScreenSize(context) ? 190 : 200,
+                            maxWidth: MediaQuery.sizeOf(context).width * 0.8),
                         child: ListView.builder(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.scenes.length,
-                          itemBuilder: (context, index) => Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: RoutineViewCard(
-                              cardType: 'scenes',
-                              spaceName: 'scenes',
-                              onTap: () {
-                                BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(
-                                      createRoutineView: true),
-                                );
-                                context.read<RoutineBloc>().add(
-                                      GetSceneDetails(
-                                        sceneId: state.scenes[index].id,
-                                        isTabToRun: true,
-                                        isUpdate: true,
-                                      ),
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.scenes.length,
+                            itemBuilder: (context, index) {
+                              final scene = state.scenes[index];
+                              final isLoading =
+                                  state.loadingSceneId == scene.id;
+
+                              return Padding(
+                                padding: EdgeInsets.only(
+                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                                ),
+                                child: RoutineViewCard(
+                                  isLoading: isLoading,
+                                  sceneOnTap: () {
+                                    context.read<RoutineBloc>().add(
+                                        SceneTrigger(
+                                            sceneId: scene.id,
+                                            name: scene.name));
+                                  },
+                                  status: state.scenes[index].status,
+                                  communityId:
+                                      state.scenes[index].communityId ?? '',
+                                  spaceId: state.scenes[index].spaceId,
+                                  sceneId: state.scenes[index].sceneTuyaId!,
+                                  automationId: state.scenes[index].id,
+                                  cardType: 'scenes',
+                                  spaceName: state.scenes[index].spaceName,
+                                  onTap: () {
+                                    BlocProvider.of<RoutineBloc>(context).add(
+                                      const CreateNewRoutineViewEvent(
+                                          createRoutineView: true),
                                     );
-                              },
-                              textString: state.scenes[index].name,
-                              icon: state.scenes[index].icon ??
-                                  Assets.logoHorizontal,
-                              isFromScenes: true,
-                              iconInBytes: state.scenes[index].iconInBytes,
-                            ),
-                          ),
-                        ),
+                                    context.read<RoutineBloc>().add(
+                                          GetSceneDetails(
+                                            sceneId: state.scenes[index].id,
+                                            isTabToRun: true,
+                                            isUpdate: true,
+                                          ),
+                                        );
+                                  },
+                                  textString: state.scenes[index].name,
+                                  icon: state.scenes[index].icon ??
+                                      Assets.logoHorizontal,
+                                  isFromScenes: true,
+                                  iconInBytes: state.scenes[index].iconInBytes,
+                                ),
+                              );
+                            }),
                       ),
                     const SizedBox(height: 15),
                     Text(
@@ -99,46 +119,74 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                     ),
                     const SizedBox(height: 10),
                     if (state.automations.isEmpty)
-                      Text(
-                        "No automations found",
-                        style: context.textTheme.bodyMedium?.copyWith(
-                          color: ColorsManager.grayColor,
+                      Expanded(
+                        child: Text(
+                          "No automations found",
+                          style: context.textTheme.bodyMedium?.copyWith(
+                            color: ColorsManager.grayColor,
+                          ),
                         ),
                       ),
                     if (state.automations.isNotEmpty)
                       ConstrainedBox(
                         constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 160 : 170,
+                            maxHeight: isSmallScreenSize(context) ? 190 : 200,
                             maxWidth: MediaQuery.sizeOf(context).width * 0.7),
                         child: ListView.builder(
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.automations.length,
-                          itemBuilder: (context, index) => Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: RoutineViewCard(
-                              cardType: 'automations',
-                              spaceName: 'automations',
-                              onTap: () {
-                                BlocProvider.of<RoutineBloc>(context).add(
-                                  const CreateNewRoutineViewEvent(
-                                      createRoutineView: true),
-                                );
-                                context.read<RoutineBloc>().add(
-                                      GetAutomationDetails(
-                                          automationId:
-                                              state.automations[index].id,
-                                          isAutomation: true,
-                                          isUpdate: true),
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.automations.length,
+                            itemBuilder: (context, index) {
+                              final isLoading = state.automations!
+                                  .contains(state.automations[index].id);
+
+                              return Padding(
+                                padding: EdgeInsets.only(
+                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                                ),
+                                child: RoutineViewCard(
+                                  isLoading: isLoading,
+                                  onChanged: (v) {
+                                    // BlocProvider.of<RoutineBloc>(context)
+                                    context.read<RoutineBloc>().add(
+                                          UpdateAutomationStatus(
+                                              automationId:
+                                                  state.automations[index].id,
+                                              automationStatusUpdate:
+                                                  AutomationStatusUpdate(
+                                                      spaceUuid: state
+                                                          .automations[index]
+                                                          .spaceId,
+                                                      isEnable: v),
+                                              communityId:
+                                                  'aff21a57-2f91-4e5c-b99b-0182c3ab65a9'),
+                                        );
+                                  },
+                                  status: state.automations[index].status,
+                                  communityId: '',
+                                  spaceId: state.automations[index].spaceId,
+                                  sceneId: '',
+                                  automationId: state.automations[index].id,
+                                  cardType: 'automations',
+                                  spaceName: state.scenes[index].spaceName,
+                                  onTap: () {
+                                    BlocProvider.of<RoutineBloc>(context).add(
+                                      const CreateNewRoutineViewEvent(
+                                          createRoutineView: true),
                                     );
-                              },
-                              textString: state.automations[index].name,
-                              icon: state.automations[index].icon ??
-                                  Assets.automation,
-                            ),
-                          ),
-                        ),
+                                    context.read<RoutineBloc>().add(
+                                          GetAutomationDetails(
+                                              automationId:
+                                                  state.automations[index].id,
+                                              isAutomation: true,
+                                              isUpdate: true),
+                                        );
+                                  },
+                                  textString: state.automations[index].name,
+                                  icon: state.automations[index].icon ??
+                                      Assets.automation,
+                                ),
+                              );
+                            }),
                       ),
                   ],
                 ),
diff --git a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
index fe94cf83..345a86c8 100644
--- a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
+++ b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -7,42 +8,78 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
+class RoutineViewCard extends StatefulWidget with HelperResponsiveLayout {
   const RoutineViewCard({
     super.key,
     required this.onTap,
+    this.sceneOnTap,
     required this.icon,
     required this.textString,
     required this.spaceName,
     required this.cardType,
     this.isFromScenes,
     this.iconInBytes,
+    required this.sceneId,
+    required this.communityId,
+    required this.spaceId,
+    required this.automationId,
+    required this.status,
+    this.onChanged,
+    required this.isLoading,
   });
 
   final Function() onTap;
+  final Function()? sceneOnTap;
+
   final dynamic icon;
   final String textString;
   final String spaceName;
   final String cardType;
+  final String sceneId;
+  final String spaceId;
+  final String status;
+  final bool isLoading;
+
+  final void Function(bool)? onChanged;
+  final String automationId;
+  final String communityId;
 
   final bool? isFromScenes;
   final Uint8List? iconInBytes;
 
+  @override
+  State<RoutineViewCard> createState() => _RoutineViewCardState();
+}
+
+class _RoutineViewCardState extends State<RoutineViewCard> {
+  bool _showTemporaryCheck = false;
+
+  void _handleSceneTap() {
+    if (!_showTemporaryCheck) {
+      setState(() => _showTemporaryCheck = true);
+      widget.sceneOnTap?.call();
+      Timer(const Duration(seconds: 3), () {
+        if (mounted) setState(() => _showTemporaryCheck = false);
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
-    final double cardWidth = isSmallScreenSize(context)
+    // Use widget.<mixinMethod> instead of just <mixinMethod>
+    final double cardWidth = widget.isSmallScreenSize(context)
         ? 120
-        : isMediumScreenSize(context)
+        : widget.isMediumScreenSize(context)
             ? 135
             : 150;
 
-    final double cardHeight = isSmallScreenSize(context) ? 160 : 170;
+    final double cardHeight = widget.isSmallScreenSize(context) ? 190 : 200;
 
-    final double iconSize = isSmallScreenSize(context)
-        ? 50
-        : isMediumScreenSize(context)
-            ? 60
-            : 70;
+    final double iconSize = widget.isSmallScreenSize(context)
+        ? 70
+        : widget.isMediumScreenSize(context)
+            ? 80
+            : 90;
 
     return ConstrainedBox(
       constraints: BoxConstraints(
@@ -62,27 +99,44 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
             child: Column(
               mainAxisAlignment: MainAxisAlignment.spaceEvenly,
               children: [
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.end,
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  children: [
-                    (isFromScenes ?? false)
-                        ? InkWell(
-                            onTap: () {},
-                            child: SvgPicture.asset(
-                              Assets.scenesPlayIcon,
-                              fit: BoxFit.contain,
-                            ),
-                          )
-                        : CupertinoSwitch(
-                            activeColor: ColorsManager.primaryColor,
-                            value: false,
-                            onChanged: (value) {},
-                          )
-                  ],
-                ),
+                widget.cardType != ''
+                    ? Row(
+                        mainAxisAlignment: MainAxisAlignment.end,
+                        children: [
+                          if (widget.isFromScenes ?? false)
+                            InkWell(
+                              onTap: _handleSceneTap,
+                              child: SvgPicture.asset(
+                                _showTemporaryCheck
+                                    ? Assets.scenesPlayIconCheck
+                                    : Assets.scenesPlayIcon,
+                                fit: BoxFit.contain,
+                              ),
+                            )
+                          else if (widget.isLoading)
+                            const SizedBox(
+                              width: 49,
+                              height: 20,
+                              child: Center(
+                                child: SizedBox(
+                                  width: 16,
+                                  height: 16,
+                                  child:
+                                      CircularProgressIndicator(strokeWidth: 2),
+                                ),
+                              ),
+                            )
+                          else
+                            CupertinoSwitch(
+                              activeColor: ColorsManager.primaryColor,
+                              value: widget.status == 'enable',
+                              onChanged: widget.onChanged,
+                            )
+                        ],
+                      )
+                    : const SizedBox(),
                 InkWell(
-                  onTap: onTap,
+                  onTap: widget.onTap,
                   child: Column(
                     children: [
                       Center(
@@ -97,11 +151,11 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
                           ),
                           height: iconSize,
                           width: iconSize,
-                          child: (isFromScenes ?? false)
-                              ? (iconInBytes != null &&
-                                      iconInBytes?.isNotEmpty == true)
+                          child: (widget.isFromScenes ?? false)
+                              ? (widget.iconInBytes != null &&
+                                      widget.iconInBytes?.isNotEmpty == true)
                                   ? Image.memory(
-                                      iconInBytes!,
+                                      widget.iconInBytes!,
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
@@ -120,16 +174,18 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
                                       width: iconSize,
                                       fit: BoxFit.contain,
                                     )
-                              : (icon is String && icon.endsWith('.svg'))
+                              : (widget.icon is String &&
+                                      widget.icon.endsWith('.svg'))
                                   ? SvgPicture.asset(
-                                      icon,
+                                      widget.icon,
                                       fit: BoxFit.contain,
                                     )
                                   : Icon(
-                                      icon,
+                                      widget.icon,
                                       color: ColorsManager.dialogBlueTitle,
-                                      size:
-                                          isSmallScreenSize(context) ? 30 : 40,
+                                      size: widget.isSmallScreenSize(context)
+                                          ? 30
+                                          : 40,
                                     ),
                         ),
                       ),
@@ -139,16 +195,17 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
                         child: Column(
                           children: [
                             Text(
-                              textString,
+                              widget.textString,
                               textAlign: TextAlign.center,
                               overflow: TextOverflow.ellipsis,
                               maxLines: 2,
                               style: context.textTheme.bodySmall?.copyWith(
                                 color: ColorsManager.blackColor,
-                                fontSize: isSmallScreenSize(context) ? 10 : 12,
+                                fontSize:
+                                    widget.isSmallScreenSize(context) ? 10 : 12,
                               ),
                             ),
-                            if (spaceName != '')
+                            if (widget.spaceName != '')
                               Row(
                                 crossAxisAlignment: CrossAxisAlignment.center,
                                 mainAxisAlignment: MainAxisAlignment.center,
@@ -158,7 +215,7 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
                                     fit: BoxFit.contain,
                                   ),
                                   Text(
-                                    spaceName,
+                                    widget.spaceName,
                                     textAlign: TextAlign.center,
                                     overflow: TextOverflow.ellipsis,
                                     maxLines: 2,
@@ -166,7 +223,9 @@ class RoutineViewCard extends StatelessWidget with HelperResponsiveLayout {
                                         context.textTheme.bodySmall?.copyWith(
                                       color: ColorsManager.blackColor,
                                       fontSize:
-                                          isSmallScreenSize(context) ? 10 : 12,
+                                          widget.isSmallScreenSize(context)
+                                              ? 10
+                                              : 12,
                                     ),
                                   ),
                                 ],
diff --git a/lib/services/routines_api.dart b/lib/services/routines_api.dart
index cbef2bc3..eaa09e27 100644
--- a/lib/services/routines_api.dart
+++ b/lib/services/routines_api.dart
@@ -12,7 +12,8 @@ class SceneApi {
   static final HTTPService _httpService = HTTPService();
 
 // //create scene
-  static Future<Map<String, dynamic>> createScene(CreateSceneModel createSceneModel) async {
+  static Future<Map<String, dynamic>> createScene(
+      CreateSceneModel createSceneModel) async {
     try {
       debugPrint('create scene model: ${createSceneModel.toMap()}');
       final response = await _httpService.post(
@@ -37,7 +38,8 @@ class SceneApi {
       CreateAutomationModel createAutomationModel, String projectId) async {
     try {
       final response = await _httpService.post(
-        path: ApiEndpoints.createAutomation.replaceAll('{projectId}', projectId),
+        path:
+            ApiEndpoints.createAutomation.replaceAll('{projectId}', projectId),
         body: createAutomationModel.toMap(),
         showServerMessage: false,
         expectedResponseModel: (json) {
@@ -69,7 +71,8 @@ class SceneApi {
 
   //get scenes by community id and space id
 
-  static Future<List<ScenesModel>> getScenes(String spaceId, String communityId, String projectId,
+  static Future<List<ScenesModel>> getScenes(
+      String spaceId, String communityId, String projectId,
       {showInDevice = false}) async {
     try {
       final response = await _httpService.get(
@@ -155,7 +158,8 @@ class SceneApi {
     try {
       final response = await _httpService.put(
         path: ApiEndpoints.updateScene.replaceAll('{sceneId}', sceneId),
-        body: createSceneModel.toJson(sceneId.isNotEmpty == true ? sceneId : null),
+        body: createSceneModel
+            .toJson(sceneId.isNotEmpty == true ? sceneId : null),
         expectedResponseModel: (json) {
           return json;
         },
@@ -167,14 +171,15 @@ class SceneApi {
   }
 
   //update automation
-  static updateAutomation(
-      CreateAutomationModel createAutomationModel, String automationId, String projectId) async {
+  static updateAutomation(CreateAutomationModel createAutomationModel,
+      String automationId, String projectId) async {
     try {
       final response = await _httpService.put(
         path: ApiEndpoints.updateAutomation
             .replaceAll('{automationId}', automationId)
             .replaceAll('{projectId}', projectId),
-        body: createAutomationModel.toJson(automationId.isNotEmpty == true ? automationId : null),
+        body: createAutomationModel
+            .toJson(automationId.isNotEmpty == true ? automationId : null),
         expectedResponseModel: (json) {
           return json;
         },
@@ -191,7 +196,8 @@ class SceneApi {
       final response = await _httpService.get(
         path: ApiEndpoints.getScene.replaceAll('{sceneId}', sceneId),
         showServerMessage: false,
-        expectedResponseModel: (json) => RoutineDetailsModel.fromMap(json['data']),
+        expectedResponseModel: (json) =>
+            RoutineDetailsModel.fromMap(json['data']),
       );
       return response;
     } catch (e) {
@@ -200,7 +206,8 @@ class SceneApi {
   }
 
   //delete Scene
-  static Future<bool> deleteScene({required String unitUuid, required String sceneId}) async {
+  static Future<bool> deleteScene(
+      {required String unitUuid, required String sceneId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteScene
@@ -217,7 +224,9 @@ class SceneApi {
 
   // delete automation
   static Future<bool> deleteAutomation(
-      {required String unitUuid, required String automationId, required String projectId}) async {
+      {required String unitUuid,
+      required String automationId,
+      required String projectId}) async {
     try {
       final response = await _httpService.delete(
         path: ApiEndpoints.deleteAutomation
@@ -232,7 +241,7 @@ class SceneApi {
     }
   }
 
-    static Future<bool> updateAutomationStatus(String automationId,
+  static Future<bool> updateAutomationStatus(String automationId,
       AutomationStatusUpdate createAutomationEnable, String projectId) async {
     try {
       final response = await _httpService.patch(
@@ -260,7 +269,8 @@ class SceneApi {
       rethrow;
     }
   }
- static Future<List<ScenesModel>> getAutomationByUnitId(
+
+  static Future<List<ScenesModel>> getAutomationByUnitId(
     String unitId,
     String communityId,
     String projectId,
@@ -285,5 +295,4 @@ class SceneApi {
       rethrow;
     }
   }
-
 }
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index 5d462f28..0e7b0bd2 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -407,6 +407,8 @@ class Assets {
       'assets/icons/delete_space_link_icon.svg';
   static const String spaceLinkIcon = 'assets/icons/space_link_icon.svg';
   static const String successIcon = 'assets/icons/success_icon.svg';
-  static const String spaceLocationIcon = 'assets/icons/spaceLocationIcon.svg';
+  static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
   static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.svg';
+  static const String scenesPlayIconCheck =
+      'assets/icons/scenesPlayIconCheck.svg';
 }

From 7e06dd76cf9a4ef31b43bc1ea721001b19572958 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 24 Mar 2025 13:57:53 +0300
Subject: [PATCH 016/238] create routine dialog flow

---
 lib/main.dart                                 |   5 +-
 lib/main_dev.dart                             |   5 +-
 .../device_managment_bloc.dart                |   3 +-
 .../view/device_managment_page.dart           |  15 +-
 .../create_routine_bloc.dart                  |  51 ++++
 .../create_routine_event.dart                 |  43 +++
 .../create_routine_state.dart                 |  46 +++
 .../bloc/routine_bloc/routine_bloc.dart       | 279 ++++++++++++------
 .../create_new_routines/commu_dropdown.dart   |  96 ++++++
 .../create_new_routines.dart                  | 148 ++++++++++
 .../create_new_routines/space_dropdown.dart   | 100 +++++++
 lib/pages/routines/view/routines_view.dart    | 154 ++++------
 .../fetch_routine_scenes_automation.dart      |  27 +-
 .../all_spaces/model/space_model.dart         |   4 +
 lib/services/devices_mang_api.dart            |  30 +-
 lib/services/space_mana_api.dart              |  20 ++
 lib/utils/constants/api_const.dart            |  76 +++--
 17 files changed, 863 insertions(+), 239 deletions(-)
 create mode 100644 lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart
 create mode 100644 lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart
 create mode 100644 lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart
 create mode 100644 lib/pages/routines/create_new_routines/commu_dropdown.dart
 create mode 100644 lib/pages/routines/create_new_routines/create_new_routines.dart
 create mode 100644 lib/pages/routines/create_new_routines/space_dropdown.dart

diff --git a/lib/main.dart b/lib/main.dart
index 975578cf..8eb6ce38 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.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';
@@ -54,7 +55,9 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-    
+          BlocProvider<CreateRoutineBloc>(
+            create: (context) => CreateRoutineBloc(),
+          ),
           BlocProvider(
               create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
diff --git a/lib/main_dev.dart b/lib/main_dev.dart
index 76261c6a..a42d5d07 100644
--- a/lib/main_dev.dart
+++ b/lib/main_dev.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/firebase_options_dev.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.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';
@@ -55,7 +56,9 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-       
+               BlocProvider<CreateRoutineBloc>(
+            create: (context) => CreateRoutineBloc(),
+          ),
           BlocProvider(
               create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
diff --git a/lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart b/lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart
index 7ed3a377..05e82f1f 100644
--- a/lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart
+++ b/lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart
@@ -43,8 +43,7 @@ class DeviceManagementBloc
            final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi()
-            .fetchDevices('', '', projectUuid );
+        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
       } else {
         for (var community in spaceBloc.state.selectedCommunities) {
           List<String> spacesList =
diff --git a/lib/pages/device_managment/all_devices/view/device_managment_page.dart b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
index 45af9751..0ed0e7c2 100644
--- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart
+++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
@@ -3,6 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.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/widgets/device_managment_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/view/routines_view.dart';
@@ -23,6 +25,9 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           create: (context) =>
               DeviceManagementBloc()..add(FetchDevices(context)),
         ),
+        BlocProvider<CreateRoutineBloc>(
+          create: (context) => CreateRoutineBloc(),
+        ),
       ],
       child: WebScaffold(
         appBarTitle: Text(
@@ -39,10 +44,15 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
+                  BlocProvider.of<CreateRoutineBloc>(context)
+                      .add(const ResetSelectedEvent());
+
                   context
                       .read<RoutineBloc>()
                       .add(const TriggerSwitchTabsEvent(isRoutineTab: false));
-                  context.read<DeviceManagementBloc>().add(FetchDevices(context));
+                  context
+                      .read<DeviceManagementBloc>()
+                      .add(FetchDevices(context));
                 },
                 child: Text(
                   'Devices',
@@ -60,6 +70,9 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                   backgroundColor: null,
                 ),
                 onPressed: () {
+                  BlocProvider.of<CreateRoutineBloc>(context)
+                      .add(const ResetSelectedEvent());
+
                   context
                       .read<RoutineBloc>()
                       .add(const TriggerSwitchTabsEvent(isRoutineTab: true));
diff --git a/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart b/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart
new file mode 100644
index 00000000..5a8e5590
--- /dev/null
+++ b/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart
@@ -0,0 +1,51 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+import 'package:syncrow_web/services/space_mana_api.dart';
+
+class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
+  CreateRoutineBloc() : super(const CreateRoutineInitial()) {
+    on<SpaceOnlyWithDevicesEvent>(_fetchSpaceOnlyWithDevices);
+    on<SaveCommunityIdAndSpaceIdEvent>(saveSpaceIdCommunityId);
+    on<ResetSelectedEvent>(resetSelected);
+  }
+
+  String selectedSpaceId = '';
+  String selectedCommunityId = '';
+
+  List<SpaceModel> spacesOnlyWithDevices = [];
+
+  Future<void> _fetchSpaceOnlyWithDevices(
+      SpaceOnlyWithDevicesEvent event, Emitter<CreateRoutineState> emit) async {
+    emit(const SpaceWithDeviceLoadingState());
+
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      spacesOnlyWithDevices = await CommunitySpaceManagementApi()
+          .getSpaceOnlyWithDevices(
+              communityId: event.communityID, projectId: projectUuid);
+
+      emit(SpaceWithDeviceLoadedState(spacesOnlyWithDevices));
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
+    }
+  }
+
+  saveSpaceIdCommunityId(
+      SaveCommunityIdAndSpaceIdEvent event, Emitter<CreateRoutineState> emit) {
+    emit(const SpaceWithDeviceLoadingState());
+    selectedSpaceId = event.spaceID!;
+    selectedCommunityId = event.communityID!;
+    emit(const SelectedState());
+  }
+
+  resetSelected(ResetSelectedEvent event, Emitter<CreateRoutineState> emit) {
+    emit(const SpaceWithDeviceLoadingState());
+    selectedSpaceId = '';
+    selectedCommunityId = '';
+    emit(const ResetSelectedState());
+  }
+}
diff --git a/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart b/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart
new file mode 100644
index 00000000..24e620c0
--- /dev/null
+++ b/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart
@@ -0,0 +1,43 @@
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+abstract class CreateRoutineEvent extends Equatable {
+  const CreateRoutineEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class AddToIfContainer extends CreateRoutineEvent {
+  final SpaceModel spaceModel;
+
+  const AddToIfContainer(this.spaceModel);
+
+  @override
+  List<Object?> get props => [spaceModel];
+}
+
+class SpaceOnlyWithDevicesEvent extends CreateRoutineEvent {
+  final String communityID;
+  const SpaceOnlyWithDevicesEvent(this.communityID);
+
+  @override
+  List<Object> get props => [communityID];
+}
+
+class SaveCommunityIdAndSpaceIdEvent extends CreateRoutineEvent {
+  final String? communityID;
+  final String? spaceID;
+
+  const SaveCommunityIdAndSpaceIdEvent({this.communityID, this.spaceID});
+
+  @override
+  List<Object> get props => [communityID!, spaceID!];
+}
+
+class ResetSelectedEvent extends CreateRoutineEvent {
+  const ResetSelectedEvent();
+
+  @override
+  List<Object> get props => [];
+}
diff --git a/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart b/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart
new file mode 100644
index 00000000..4911304b
--- /dev/null
+++ b/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart
@@ -0,0 +1,46 @@
+
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
+
+abstract class CreateRoutineState extends Equatable {
+  const CreateRoutineState();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class CreateRoutineInitial extends CreateRoutineState {
+  const CreateRoutineInitial();
+}
+
+class SpaceWithDeviceLoadingState extends CreateRoutineState {
+  const SpaceWithDeviceLoadingState();
+}
+
+class SpaceWithDeviceLoadedState extends CreateRoutineState {
+  final List<SpaceModel> spaces;
+
+  const SpaceWithDeviceLoadedState(this.spaces);
+
+  @override
+  List<Object?> get props => [spaces];
+}
+
+class SpaceTreeErrorState extends CreateRoutineState {
+  final String errorMessage;
+
+  const SpaceTreeErrorState(this.errorMessage);
+
+  @override
+  List<Object?> get props => [errorMessage];
+}
+
+class SelectedState extends CreateRoutineState {
+  const SelectedState();
+}
+
+
+class ResetSelectedState extends CreateRoutineState {
+  const ResetSelectedState();
+}
+
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index d4f61bae..ef9ca848 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -1,11 +1,14 @@
+
 import 'dart:async';
 
+import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.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/automation_scene_trigger_bloc/automation_status_update.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_automation_model.dart';
 import 'package:syncrow_web/pages/routines/models/create_scene_and_autoamtion/create_scene_model.dart';
 import 'package:syncrow_web/pages/routines/models/delay/delay_fucntions.dart';
@@ -13,9 +16,14 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
+import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/constants/strings_manager.dart';
+import 'package:syncrow_web/utils/constants/temp_const.dart';
+import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';
@@ -52,15 +60,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     on<TriggerSwitchTabsEvent>(_triggerSwitchTabsEvent);
     on<CreateNewRoutineViewEvent>(_createNewRoutineViewEvent);
     on<ResetErrorMessage>(_resetErrorMessage);
-        on<SceneTrigger>(_onSceneTrigger);
+    on<SceneTrigger>(_onSceneTrigger);
     on<UpdateAutomationStatus>(_onUpdateAutomationStatus);
   }
+  String selectedSpaceId = '';
+  String selectedCommunityId = '';
 
   FutureOr<void> _triggerSwitchTabsEvent(
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(
+        routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
       add(const LoadScenes());
@@ -86,8 +97,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
-        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index = updatedIfItems.indexWhere(
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -96,18 +107,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(
+          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(
+      AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index =
-        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index = currentItems.indexWhere(
+        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -118,22 +132,26 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(
+      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
+      List<DeviceFunctionData> selectedFunction =
+          List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
       if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
         List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
+            List<DeviceFunctionData>.from(
+                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
         List<String> functionCode = [];
         for (int i = 0; i < selectedFunction.length; i++) {
           for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
+            if (selectedFunction[i].functionCode ==
+                currentFunctions[j].functionCode) {
               currentFunctions[j] = selectedFunction[i];
               if (!functionCode.contains(currentFunctions[j].functionCode)) {
                 functionCode.add(currentFunctions[j].functionCode);
@@ -143,13 +161,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
 
         for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
+          selectedFunction
+              .removeWhere((code) => code.functionCode == functionCode[i]);
         }
 
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
-          ..addAll(selectedFunction);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            List.from(currentFunctions)..addAll(selectedFunction);
       } else {
-        currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
+        currentSelectedFunctions[event.uniqueCustomId] =
+            List.from(event.functions);
       }
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
@@ -158,19 +178,30 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(
+      LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<SpaceTreeBloc>();
-      for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-        for (var spaceId in spacesList) {
-          scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      if (createRoutineBloc.selectedSpaceId == '' &&
+          createRoutineBloc.selectedCommunityId == '') {
+        var spaceBloc = context.read<SpaceTreeBloc>();
+        for (var communityId in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          for (var spaceId in spacesList) {
+            scenes.addAll(
+                await SceneApi.getScenes(spaceId, communityId, projectUuid));
+          }
         }
+      } else {
+        scenes.addAll(await SceneApi.getScenes(
+            createRoutineBloc.selectedSpaceId,
+            createRoutineBloc.selectedCommunityId,
+            projectUuid));
       }
 
       emit(state.copyWith(
@@ -187,19 +218,31 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(
+      LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> automations = [];
     final projectId = await ProjectManager.getProjectUUID() ?? '';
 
+    BuildContext context = NavigationService.navigatorKey.currentContext!;
+    var createRoutineBloc = context.read<CreateRoutineBloc>();
     try {
-      BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<SpaceTreeBloc>();
-      for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-        for (var spaceId in spacesList) {
-          automations.addAll(await SceneApi.getAutomation(spaceId, communityId, projectId));
+      if (createRoutineBloc.selectedSpaceId == '' &&
+          createRoutineBloc.selectedCommunityId == '') {
+        var spaceBloc = context.read<SpaceTreeBloc>();
+        for (var communityId in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          for (var spaceId in spacesList) {
+            automations.addAll(
+                await SceneApi.getAutomation(spaceId, communityId, projectId));
+          }
         }
+      } else {
+        automations.addAll(await SceneApi.getAutomation(
+            createRoutineBloc.selectedSpaceId,
+            createRoutineBloc.selectedCommunityId,
+            projectId));
       }
       emit(state.copyWith(
         automations: automations,
@@ -215,14 +258,16 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(
+      SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(
+      AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -236,7 +281,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(
+      CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -249,7 +295,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -295,10 +342,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       }).toList();
 
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<SpaceTreeBloc>();
+      var spaceBloc = context.read<CreateRoutineBloc>();
 
       final createSceneModel = CreateSceneModel(
-        spaceUuid: spaceBloc.state.selectedSpaces[0],
+        spaceUuid: spaceBloc.selectedSpaceId,
         iconId: state.selectedIcon ?? '',
         showInDevice: true,
         sceneName: state.routineName ?? '',
@@ -325,10 +372,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(
+      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
           errorMessage: 'Automation name is required',
@@ -348,7 +395,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -424,10 +472,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<SpaceTreeBloc>();
+      var spaceBloc = context.read<CreateRoutineBloc>();
 
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceBloc.state.selectedSpaces[0],
+        spaceUuid: spaceBloc.selectedSpaceId,
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -439,7 +487,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.createAutomation(createAutomationModel, projectUuid);
+      final result =
+          await SceneApi.createAutomation(createAutomationModel, projectUuid);
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadAutomation());
@@ -460,17 +509,21 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(
+      RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(
+          thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions =
+          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -481,7 +534,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(
+            ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -493,18 +547,23 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(
+      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(
+      SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (List<Map<String, dynamic>>, List<Map<String, dynamic>>, Map<String, List<DeviceFunctionData>>)
-      _createCardData(
+  (
+    List<Map<String, dynamic>>,
+    List<Map<String, dynamic>>,
+    Map<String, List<DeviceFunctionData>>
+  ) _createCardData(
     List<RoutineAction> actions,
     List<RoutineCondition>? conditions,
     Map<String, List<DeviceFunctionData>> currentFunctions,
@@ -537,7 +596,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 'deviceId': condition.entityId,
                 'title': matchingDevice.name ?? condition.entityId,
                 'productType': condition.entityType,
-                'imagePath': matchingDevice.getDefaultIcon(condition.entityType),
+                'imagePath':
+                    matchingDevice.getDefaultIcon(condition.entityType),
               };
 
               final functions = matchingDevice.functions;
@@ -573,8 +633,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final cardData = {
         'entityId': action.entityId,
         'uniqueCustomId': const Uuid().v4(),
-        'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-        'title': action.actionExecutor == 'delay' ? 'Delay' : (matchingDevice.name ?? 'Device'),
+        'deviceId':
+            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+        'title': action.actionExecutor == 'delay'
+            ? 'Delay'
+            : (matchingDevice.name ?? 'Device'),
         'productType': action.productType,
         'imagePath': matchingDevice.getDefaultIcon(action.productType),
       };
@@ -617,7 +680,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return (thenItems, ifItems, currentFunctions);
   }
 
-  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(
+      GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -665,10 +729,12 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
-                ? const Uuid().v4()
-                : action.entityId,
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId':
+                action.type == 'automation' || action.actionExecutor == 'delay'
+                    ? const Uuid().v4()
+                    : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -703,7 +769,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        } else if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           if (!updatedFunctions.containsKey(uniqueCustomId)) {
             updatedFunctions[uniqueCustomId] = [];
           }
@@ -775,7 +842,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(
+      ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -799,21 +867,22 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         createRoutineView: false));
   }
 
-  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _deleteScene(
+      DeleteScene event, Emitter<RoutineState> emit) async {
     try {
-      final projectId = await ProjectManager.getProjectUUID() ?? '';
-
       emit(state.copyWith(isLoading: true));
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<SpaceTreeBloc>();
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
       if (state.isTabToRun) {
         await SceneApi.deleteScene(
-            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
+            unitUuid: createRoutineBloc.selectedSpaceId,
+            sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            unitUuid: spaceBloc.state.selectedSpaces[0],
-            automationId: state.automationId ?? '',
-            projectId: projectId);
+            projectId: projectId,
+            unitUuid: createRoutineBloc.selectedSpaceId,
+            automationId: state.automationId ?? '');
       }
 
       add(const LoadScenes());
@@ -842,21 +911,31 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(
+      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-
       List<AllDevicesModel> devices = [];
-
       BuildContext context = NavigationService.navigatorKey.currentContext!;
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
       var spaceBloc = context.read<SpaceTreeBloc>();
-      for (var communityId in spaceBloc.state.selectedCommunities) {
-        List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
-        for (var spaceId in spacesList) {
-          devices
-              .addAll(await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
+
+      if (createRoutineBloc.selectedSpaceId == '' &&
+          createRoutineBloc.selectedCommunityId == '') {
+        for (var communityId in spaceBloc.state.selectedCommunities) {
+          List<String> spacesList =
+              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          for (var spaceId in spacesList) {
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(communityId, spaceId, projectUuid));
+          }
         }
+      } else {
+        devices.addAll(await DevicesManagementApi().fetchDevices(
+            createRoutineBloc.selectedCommunityId,
+            createRoutineBloc.selectedSpaceId,
+            projectUuid));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));
@@ -865,7 +944,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(
+      UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -879,7 +959,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage: 'A delay condition cannot be the only or the last action',
+          errorMessage:
+              'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -932,7 +1013,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result =
+          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadScenes());
@@ -951,10 +1033,9 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(
+      UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
-      final projectId = await ProjectManager.getProjectUUID() ?? '';
-
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
           errorMessage: 'Automation name is required',
@@ -1049,10 +1130,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       }).toList();
 
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<SpaceTreeBloc>();
+      var spaceBloc = context.read<CreateRoutineBloc>();
 
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceBloc.state.selectedSpaces[0],
+        spaceUuid: spaceBloc.selectedSpaceId,
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -1063,7 +1144,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         conditions: conditions,
         actions: actions,
       );
-
+      final projectId = await ProjectManager.getProjectUUID() ?? '';
       final result = await SceneApi.updateAutomation(
           createAutomationModel, state.automationId ?? '', projectId);
 
@@ -1089,7 +1170,6 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       GetAutomationDetails event, Emitter<RoutineState> emit) async {
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-
       emit(state.copyWith(
         isLoading: true,
         isUpdate: true,
@@ -1169,13 +1249,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId =
-            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
+        final deviceId = action.actionExecutor == 'delay'
+            ? '${action.entityId}_delay'
+            : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId':
+                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1206,7 +1288,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null && action.actionExecutor != 'delay') {
+        if (action.executorProperty != null &&
+            action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1248,10 +1331,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
+      final ifItems = deviceIfCards.values
+          .where((card) => card['type'] == 'condition')
+          .toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
+              card['type'] == 'action' ||
+              card['type'] == 'automation' ||
+              card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(
@@ -1301,8 +1388,6 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-
-
   Future<void> _onUpdateAutomationStatus(
       UpdateAutomationStatus event, Emitter<RoutineState> emit) async {
     // Create a new set safely
diff --git a/lib/pages/routines/create_new_routines/commu_dropdown.dart b/lib/pages/routines/create_new_routines/commu_dropdown.dart
new file mode 100644
index 00000000..13e2a437
--- /dev/null
+++ b/lib/pages/routines/create_new_routines/commu_dropdown.dart
@@ -0,0 +1,96 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class CommunityDropdown extends StatelessWidget {
+  final String? selectedValue;
+  final Function(String?) onChanged;
+
+  const CommunityDropdown({
+    Key? key,
+    required this.selectedValue,
+    required this.onChanged,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Community",
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 13,
+                  color: ColorsManager.blackColor,
+                ),
+          ),
+          const SizedBox(height: 8),
+          BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
+            builder: (context, state) {
+              List<CommunityModel> communities = state.isSearching
+                  ? state.filteredCommunity
+                  : state.communityList;
+
+              return SizedBox(
+                child: DropdownButtonFormField<String>(
+                  dropdownColor: ColorsManager.whiteColors,
+                  value: selectedValue,
+                  items: communities.map((community) {
+                    return DropdownMenuItem<String>(
+                      value: community.uuid,
+                      child: Text('   ${community.name}'),
+                    );
+                  }).toList(),
+                  onChanged: onChanged,
+                  icon: const SizedBox.shrink(),
+                  borderRadius: const BorderRadius.all(Radius.circular(10)),
+                  hint: Padding(
+                    padding: EdgeInsets.only(left: 10),
+                    child: Text(
+                      "Please Select",
+                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                            color: ColorsManager.textGray,
+                          ),
+                    ),
+                  ),
+                  decoration: inputTextFormDeco().copyWith(
+                    contentPadding: EdgeInsets.zero,
+                    suffixIcon: Container(
+                      padding: EdgeInsets.zero,
+                      width: 70,
+                      height: 45,
+                      decoration: BoxDecoration(
+                        color: Colors.grey[100],
+                        borderRadius: const BorderRadius.only(
+                          bottomRight: Radius.circular(10),
+                          topRight: Radius.circular(10),
+                        ),
+                        border: Border.all(
+                          color: ColorsManager.textGray,
+                          width: 1.0,
+                        ),
+                      ),
+                      child: const Center(
+                        child: Icon(
+                          Icons.keyboard_arrow_down,
+                          color: ColorsManager.textGray,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              );
+            },
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/routines/create_new_routines/create_new_routines.dart b/lib/pages/routines/create_new_routines/create_new_routines.dart
new file mode 100644
index 00000000..5d1021f2
--- /dev/null
+++ b/lib/pages/routines/create_new_routines/create_new_routines.dart
@@ -0,0 +1,148 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_state.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/commu_dropdown.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/space_dropdown.dart';
+
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CreateNewRoutinesDialog extends StatefulWidget {
+  const CreateNewRoutinesDialog({Key? key}) : super(key: key);
+
+  @override
+  State<CreateNewRoutinesDialog> createState() =>
+      _CreateNewRoutinesDialogState();
+}
+
+class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
+  String? _selectedCommunity;
+  String? _selectedSpace;
+  void _fetchSpaces(String communityId) {
+    context
+        .read<CreateRoutineBloc>()
+        .add(SpaceOnlyWithDevicesEvent(communityId));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
+      builder: (context, state) {
+        final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+        final spaces = _bloc.spacesOnlyWithDevices;
+        final isLoading = state is SpaceWithDeviceLoadingState;
+
+        String spaceHint = 'Select a community first';
+
+        if (_selectedCommunity != null) {
+          if (isLoading) {
+            spaceHint = 'Loading spaces...';
+          } else if (spaces.isEmpty) {
+            spaceHint = 'No spaces available';
+          } else {
+            spaceHint = 'Select Space';
+          }
+        }
+
+        return AlertDialog(
+          backgroundColor: Colors.white,
+          insetPadding: EdgeInsets.zero,
+          contentPadding: EdgeInsets.zero,
+          shape:
+              RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+          title: Text(
+            'Create New Routines',
+            textAlign: TextAlign.center,
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  color: ColorsManager.primaryColor,
+                ),
+          ),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              const Divider(),
+              CommunityDropdown(
+                selectedValue: _selectedCommunity,
+                onChanged: (String? newValue) {
+                  setState(() {
+                    _selectedCommunity = newValue;
+                    _selectedSpace = null;
+                  });
+                  if (newValue != null) {
+                    _fetchSpaces(newValue);
+                  }
+                },
+              ),
+              const SizedBox(height: 16),
+              SpaceDropdown(
+                hintMessage: spaceHint,
+                spaces: spaces,
+                selectedValue: _selectedSpace,
+                onChanged: (String? newValue) {
+                  setState(() {
+                    _selectedSpace = newValue;
+                  });
+                },
+              ),
+              const Divider(),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceAround,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 20,
+                      right: 20,
+                    ),
+                    child: TextButton(
+                      onPressed: () {
+                      
+                        Navigator.of(context).pop();
+                      },
+                      child: Text(
+                        'Cancel',
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              fontWeight: FontWeight.w400,
+                              fontSize: 14,
+                              color: ColorsManager.blackColor,
+                            ),
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.only(
+                      left: 20,
+                      right: 20,
+                    ),
+                    child: TextButton(
+                      onPressed:
+                          _selectedCommunity != null && _selectedSpace != null
+                              ? () {
+                                  Navigator.of(context).pop({
+                                    'community': _selectedCommunity,
+                                    'space': _selectedSpace,
+                                  });
+                                }
+                              : null,
+                      child: Text(
+                        'Next',
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              fontWeight: FontWeight.w400,
+                              fontSize: 14,
+                              color: _selectedCommunity != null &&
+                                      _selectedSpace != null
+                                  ? ColorsManager.blueColor
+                                  : Colors.blue.shade100,
+                            ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
+}
diff --git a/lib/pages/routines/create_new_routines/space_dropdown.dart b/lib/pages/routines/create_new_routines/space_dropdown.dart
new file mode 100644
index 00000000..f207c736
--- /dev/null
+++ b/lib/pages/routines/create_new_routines/space_dropdown.dart
@@ -0,0 +1,100 @@
+import 'package:flutter/material.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/style.dart';
+
+class SpaceDropdown extends StatelessWidget {
+  final List<SpaceModel> spaces;
+  final String? selectedValue;
+  final Function(String?)? onChanged;
+  final String hintMessage;
+
+  const SpaceDropdown({
+    Key? key,
+    required this.spaces,
+    required this.selectedValue,
+    required this.onChanged,
+    required this.hintMessage,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            "Space",
+            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                  fontWeight: FontWeight.w400,
+                  fontSize: 13,
+                  color: ColorsManager.blackColor,
+                ),
+          ),
+          const SizedBox(height: 8),
+          DropdownButtonFormField<String>(
+            value: selectedValue,
+            items: spaces.map((space) {
+              return DropdownMenuItem<String>(
+                  value: space.uuid,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    children: [
+                      Text(
+                        '   ${space.name}',
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              fontSize: 12,
+                              color: ColorsManager.blackColor,
+                            ),
+                      ),
+                      Text(
+                        '   ${space.lastThreeParents}',
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              fontSize: 12,
+                            ),
+                      ),
+                    ],
+                  ));
+            }).toList(),
+            onChanged: onChanged,
+            icon: const SizedBox.shrink(),
+            borderRadius: const BorderRadius.all(Radius.circular(10)),
+            hint: Padding(
+              padding: const EdgeInsets.only(left: 10),
+              child: Text(
+                hintMessage,
+                style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                      color: ColorsManager.textGray,
+                    ),
+              ),
+            ),
+            decoration: inputTextFormDeco().copyWith(
+              contentPadding: EdgeInsets.zero,
+              suffixIcon: Container(
+                width: 70,
+                height: 45,
+                decoration: BoxDecoration(
+                  color: Colors.grey[200],
+                  borderRadius: const BorderRadius.only(
+                    bottomRight: Radius.circular(10),
+                    topRight: Radius.circular(10),
+                  ),
+                  border: Border.all(
+                    color: ColorsManager.textGray,
+                    width: 1.0,
+                  ),
+                ),
+                child: const Icon(
+                  Icons.keyboard_arrow_down,
+                  color: ColorsManager.textGray,
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index 3c140a4e..f21a2ad7 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/create_new_routines/create_new_routines.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart';
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -16,10 +18,23 @@ class RoutinesView extends StatefulWidget {
 }
 
 class _RoutinesViewState extends State<RoutinesView> {
-  @override
-  void initState() {
-    super.initState();
-    // context.read<RoutineBloc>().add(FetchDevicesInRoutine());
+  void _handleRoutineCreation(BuildContext context) async {
+    final result = await showDialog<Map<String, dynamic>>(
+      context: context,
+      builder: (context) => const CreateNewRoutinesDialog(),
+    );
+
+    if (result == null) return;
+    final communityId = result['community'];
+    final spaceId = result['space'];
+    final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+    final routineBloc = context.read<RoutineBloc>();
+    _bloc.add(SaveCommunityIdAndSpaceIdEvent(
+        communityID: communityId, spaceID: spaceId));
+    await Future.delayed(const Duration(milliseconds: 500));
+    routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
+    await Future.delayed(const Duration(milliseconds: 500));
+    BlocProvider.of<CreateRoutineBloc>(context).add(const ResetSelectedEvent());
   }
 
   @override
@@ -29,96 +44,57 @@ class _RoutinesViewState extends State<RoutinesView> {
         if (state.createRoutineView) {
           return const CreateNewRoutineView();
         }
+
         return Row(
           children: [
-            Expanded(child: SpaceTreeView(
-              onSelect: () {
-                context.read<RoutineBloc>()
+            Expanded(
+              child: SpaceTreeView(
+                onSelect: () => context.read<RoutineBloc>()
                   ..add(const LoadScenes())
-                  ..add(const LoadAutomation());
-              },
-            )),
+                  ..add(const LoadAutomation()),
+              ),
+            ),
             Expanded(
               flex: 4,
-              child: ListView(children: [
-                Container(
-                  padding: const EdgeInsets.all(16),
-                  height: MediaQuery.sizeOf(context).height,
-                  child: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      Text(
-                        "Create New Routines",
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.bold,
-                            ),
-                      ),
-                      const SizedBox(
-                        height: 10,
-                      ),
-                      RoutineViewCard(
-                        isLoading: false,
-                        onChanged: (v) {},
-                        status: '',
-                        spaceId: '',
-                        automationId: '',
-                        communityId: '',
-                        sceneId: '',
-                        cardType: '',
-                        spaceName: '',
-                        onTap: () {
-                          if (context
-                                      .read<SpaceTreeBloc>()
-                                      .state
-                                      .selectedCommunities
-                                      .length ==
-                                  1 &&
-                              context
-                                      .read<SpaceTreeBloc>()
-                                      .state
-                                      .selectedSpaces
-                                      .length ==
-                                  1) {
-                            context.read<RoutineBloc>().add(
-                                  (ResetRoutineState()),
-                                );
-                            BlocProvider.of<RoutineBloc>(context).add(
-                              const CreateNewRoutineViewEvent(
-                                  createRoutineView: true),
-                            );
-                          } else {
-                            ScaffoldMessenger.of(context).showSnackBar(
-                              SnackBar(
-                                content: Text(context
-                                        .read<SpaceTreeBloc>()
-                                        .state
-                                        .selectedSpaces
-                                        .isEmpty
-                                    ? 'Please select a space'
-                                    : 'Please select only one space to proceed'),
-                              ),
-                            );
-                            // CustomSnackBar.redSnackBar(
-                            //     context.read<SpaceTreeBloc>().state.selectedSpaces.isEmpty
-                            //         ? 'Please select a space'
-                            //         : 'Please select only one space to proceed');
-                          }
-                        },
-                        icon: Icons.add,
-                        textString: '',
-                      ),
-                      const SizedBox(
-                        height: 15,
-                      ),
-                      const Expanded(child: FetchRoutineScenesAutomation()),
-                    ],
+              child: ListView(
+                children: [
+                  Container(
+                    padding: const EdgeInsets.all(16),
+                    height: MediaQuery.sizeOf(context).height,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(
+                          "Create New Routines",
+                          style:
+                              Theme.of(context).textTheme.titleLarge?.copyWith(
+                                    color: ColorsManager.grayColor,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                        ),
+                        const SizedBox(height: 10),
+                        RoutineViewCard(
+                          isLoading: false,
+                          onChanged: (v) {},
+                          status: '',
+                          spaceId: '',
+                          automationId: '',
+                          communityId: '',
+                          sceneId: '',
+                          cardType: '',
+                          spaceName: '',
+                          onTap: () => _handleRoutineCreation(context),
+                          icon: Icons.add,
+                          textString: '',
+                        ),
+                        const SizedBox(height: 15),
+                        const Expanded(child: FetchRoutineScenesAutomation()),
+                      ],
+                    ),
                   ),
-                ),
-              ]),
-            ),
+                ],
+              ),
+            )
           ],
         );
       },
diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 809c462c..483500b1 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -109,7 +109,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                               );
                             }),
                       ),
-                    const SizedBox(height: 15),
+                    const SizedBox(height: 10),
                     Text(
                       "Automations",
                       style: Theme.of(context).textTheme.titleLarge?.copyWith(
@@ -117,7 +117,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                             fontWeight: FontWeight.bold,
                           ),
                     ),
-                    const SizedBox(height: 10),
+                    const SizedBox(height: 5),
                     if (state.automations.isEmpty)
                       Expanded(
                         child: Text(
@@ -130,7 +130,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                     if (state.automations.isNotEmpty)
                       ConstrainedBox(
                         constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 190 : 200,
+                            maxHeight: isSmallScreenSize(context) ? 185 : 192,
                             maxWidth: MediaQuery.sizeOf(context).width * 0.7),
                         child: ListView.builder(
                             scrollDirection: Axis.horizontal,
@@ -149,16 +149,17 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                     // BlocProvider.of<RoutineBloc>(context)
                                     context.read<RoutineBloc>().add(
                                           UpdateAutomationStatus(
-                                              automationId:
-                                                  state.automations[index].id,
-                                              automationStatusUpdate:
-                                                  AutomationStatusUpdate(
-                                                      spaceUuid: state
-                                                          .automations[index]
-                                                          .spaceId,
-                                                      isEnable: v),
-                                              communityId:
-                                                  'aff21a57-2f91-4e5c-b99b-0182c3ab65a9'),
+                                            automationId:
+                                                state.automations[index].id,
+                                            automationStatusUpdate:
+                                                AutomationStatusUpdate(
+                                                    spaceUuid: state
+                                                        .automations[index]
+                                                        .spaceId,
+                                                    isEnable: v),
+                                            communityId: state
+                                                .automations[index].communityId,
+                                          ),
                                         );
                                   },
                                   status: state.automations[index].status,
diff --git a/lib/pages/spaces_management/all_spaces/model/space_model.dart b/lib/pages/spaces_management/all_spaces/model/space_model.dart
index 71d365ca..6e744a29 100644
--- a/lib/pages/spaces_management/all_spaces/model/space_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/space_model.dart
@@ -14,6 +14,7 @@ class SpaceModel {
   String? icon;
   final String? spaceTuyaUuid;
   String name;
+  String? lastThreeParents;
   final bool isPrivate;
   final String? invitationCode;
   SpaceModel? parent;
@@ -33,6 +34,7 @@ class SpaceModel {
   SpaceModel({
     this.uuid,
     String? internalId,
+    this.lastThreeParents,
     this.spaceTuyaUuid,
     required this.icon,
     required this.name,
@@ -67,6 +69,7 @@ class SpaceModel {
       internalId: internalId,
       uuid: json['uuid'] ?? '',
       name: json['spaceName'],
+      lastThreeParents: json['lastThreeParents'],
       isPrivate: json['isPrivate'] ?? false,
       invitationCode: json['invitationCode'],
       subspaces: (json['subspaces'] as List<dynamic>?)
@@ -125,6 +128,7 @@ class SpaceModel {
       'uuid': uuid ?? '',
       'spaceTuyaUuid': spaceTuyaUuid,
       'name': name,
+      'lastThreeParents': lastThreeParents,
       'isPrivate': isPrivate,
       'invitationCode': invitationCode,
       'parent': parent?.uuid,
diff --git a/lib/services/devices_mang_api.dart b/lib/services/devices_mang_api.dart
index 25a0177f..604abaf4 100644
--- a/lib/services/devices_mang_api.dart
+++ b/lib/services/devices_mang_api.dart
@@ -23,8 +23,9 @@ class DevicesManagementApi {
             : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData =
-              communityId.isNotEmpty && spaceId.isNotEmpty ? json['data'] : json;
+          List<dynamic> jsonData = communityId.isNotEmpty && spaceId.isNotEmpty
+              ? json['data']
+              : json;
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
@@ -33,7 +34,7 @@ class DevicesManagementApi {
       );
       return response;
     } catch (e) {
-      debugPrint('Error fetching  $e');
+      debugPrint('fetchDevices Error fetching  $e');
       return [];
     }
   }
@@ -92,7 +93,8 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> deviceBatchControl(List<String> uuids, String code, dynamic value) async {
+  Future<bool> deviceBatchControl(
+      List<String> uuids, String code, dynamic value) async {
     try {
       final body = {
         'devicesUuid': uuids,
@@ -116,7 +118,8 @@ class DevicesManagementApi {
     }
   }
 
-  static Future<List<DeviceModel>> getDevicesByGatewayId(String gatewayId) async {
+  static Future<List<DeviceModel>> getDevicesByGatewayId(
+      String gatewayId) async {
     final response = await HTTPService().get(
       path: ApiEndpoints.gatewayApi.replaceAll('{gatewayUuid}', gatewayId),
       showServerMessage: false,
@@ -150,7 +153,9 @@ class DevicesManagementApi {
     String code,
   ) async {
     final response = await HTTPService().get(
-      path: ApiEndpoints.getDeviceLogs.replaceAll('{uuid}', uuid).replaceAll('{code}', code),
+      path: ApiEndpoints.getDeviceLogs
+          .replaceAll('{uuid}', uuid)
+          .replaceAll('{code}', code),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return DeviceReport.fromJson(json);
@@ -223,7 +228,8 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> addScheduleRecord(ScheduleEntry sendSchedule, String uuid) async {
+  Future<bool> addScheduleRecord(
+      ScheduleEntry sendSchedule, String uuid) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
@@ -240,7 +246,8 @@ class DevicesManagementApi {
     }
   }
 
-  Future<List<ScheduleModel>> getDeviceSchedules(String uuid, String category) async {
+  Future<List<ScheduleModel>> getDeviceSchedules(
+      String uuid, String category) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getScheduleByDeviceId
@@ -263,7 +270,9 @@ class DevicesManagementApi {
   }
 
   Future<bool> updateScheduleRecord(
-      {required bool enable, required String uuid, required String scheduleId}) async {
+      {required bool enable,
+      required String uuid,
+      required String scheduleId}) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateScheduleByDeviceId
@@ -284,7 +293,8 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> editScheduleRecord(String uuid, ScheduleEntry newSchedule) async {
+  Future<bool> editScheduleRecord(
+      String uuid, ScheduleEntry newSchedule) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
diff --git a/lib/services/space_mana_api.dart b/lib/services/space_mana_api.dart
index 4eced226..f18a8da8 100644
--- a/lib/services/space_mana_api.dart
+++ b/lib/services/space_mana_api.dart
@@ -302,4 +302,24 @@ class CommunitySpaceManagementApi {
       return [];
     }
   }
+    Future<List<SpaceModel>> getSpaceOnlyWithDevices(
+      {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)
+              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
+              .toList();
+          return spaceModels;
+        },
+      );
+      return response;
+    } catch (e) {
+      debugPrint('Error fetching space hierarchy: $e');
+      return [];
+    }
+  }
 }
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 00449836..be972392 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -9,15 +9,19 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String getRegion = '/region';
-  static const String visitorPassword = '/projects/{projectId}/visitor-password';
-  static const String getDevices = '/projects/{projectId}/visitor-password/devices';
+  static const String visitorPassword =
+      '/projects/{projectId}/visitor-password';
+  static const String getDevices =
+      '/projects/{projectId}/visitor-password/devices';
 
-  static const String sendOnlineOneTime = '/visitor-password/temporary-password/online/one-time';
+  static const String sendOnlineOneTime =
+      '/visitor-password/temporary-password/online/one-time';
   static const String sendOnlineMultipleTime =
       '/visitor-password/temporary-password/online/multiple-time';
 
 //offline Password
-  static const String sendOffLineOneTime = '/visitor-password/temporary-password/offline/one-time';
+  static const String sendOffLineOneTime =
+      '/visitor-password/temporary-password/offline/one-time';
   static const String sendOffLineMultipleTime =
       '/visitor-password/temporary-password/offline/multiple-time';
 
@@ -39,32 +43,45 @@ abstract class ApiEndpoints {
   static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
 
 // Space Module
-  static const String createSpace = '/projects/{projectId}/communities/{communityId}/spaces';
-  static const String listSpaces = '/projects/{projectId}/communities/{communityId}/spaces';
+  static const String createSpace =
+      '/projects/{projectId}/communities/{communityId}/spaces';
+  static const String listSpaces =
+      '/projects/{projectId}/communities/{communityId}/spaces';
   static const String deleteSpace =
       '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
   static const String updateSpace =
       '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
-  static const String getSpace = '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
-  static const String getSpaceHierarchy = '/projects/{projectId}/communities/{communityId}/spaces';
+  static const String getSpace =
+      '/projects/{projectId}/communities/{communityId}/spaces/{spaceId}';
+  static const String getSpaceHierarchy =
+      '/projects/{projectId}/communities/{communityId}/spaces';
 
 // Community Module
   static const String createCommunity = '/projects/{projectId}/communities';
   static const String getCommunityList = '/projects/{projectId}/communities';
-  static const String getCommunityById = '/projects/{projectId}/communities/{communityId}';
-  static const String updateCommunity = '/projects/{projectId}/communities/{communityId}';
-  static const String deleteCommunity = '/projects/{projectId}communities/{communityId}';
-  static const String getUserCommunities = '/projects/{projectId}/communities/user/{userUuid}';
-  static const String createUserCommunity = '/projects/{projectId}/communities/user';
+  static const String getCommunityById =
+      '/projects/{projectId}/communities/{communityId}';
+  static const String updateCommunity =
+      '/projects/{projectId}/communities/{communityId}';
+  static const String deleteCommunity =
+      '/projects/{projectId}communities/{communityId}';
+  static const String getUserCommunities =
+      '/projects/{projectId}/communities/user/{userUuid}';
+  static const String createUserCommunity =
+      '/projects/{projectId}/communities/user';
   static const String getDeviceLogsByDate =
       '/device/report-logs/{uuid}?code={code}&startTime={startTime}&endTime={endTime}';
 
   static const String scheduleByDeviceId = '/schedule/{deviceUuid}';
-  static const String getScheduleByDeviceId = '/schedule/{deviceUuid}?category={category}';
-  static const String deleteScheduleByDeviceId = '/schedule/{deviceUuid}/{scheduleUuid}';
-  static const String updateScheduleByDeviceId = '/schedule/enable/{deviceUuid}';
+  static const String getScheduleByDeviceId =
+      '/schedule/{deviceUuid}?category={category}';
+  static const String deleteScheduleByDeviceId =
+      '/schedule/{deviceUuid}/{scheduleUuid}';
+  static const String updateScheduleByDeviceId =
+      '/schedule/enable/{deviceUuid}';
   static const String factoryReset = '/device/factory/reset/{deviceUuid}';
-  static const String powerClamp = '/device/{powerClampUuid}/power-clamp/status';
+  static const String powerClamp =
+      '/device/{powerClampUuid}/power-clamp/status';
 
   //product
   static const String listProducts = '/products';
@@ -76,27 +93,33 @@ abstract class ApiEndpoints {
   static const String createAutomation = '/projects/{projectId}/automations';
   static const String getUnitScenes =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
-  static const String getAutomationDetails = '/projects/{projectId}/automations/{automationId}';
+  static const String getAutomationDetails =
+      '/projects/{projectId}/automations/{automationId}';
   static const String getScene = '/scene/tap-to-run/{sceneId}';
   static const String deleteScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String deleteAutomation = '/projects/{projectId}/automations/{automationId}';
+  static const String deleteAutomation =
+      '/projects/{projectId}/automations/{automationId}';
   static const String updateScene = '/scene/tap-to-run/{sceneId}';
 
-  static const String updateAutomation = '/projects/{projectId}/automations/{automationId}';
+  static const String updateAutomation =
+      '/projects/{projectId}/automations/{automationId}';
 
   //space model
   static const String listSpaceModels = '/projects/{projectId}/space-models';
   static const String createSpaceModel = '/projects/{projectId}/space-models';
-  static const String getSpaceModel = '/projects/{projectId}/space-models/{spaceModelUuid}';
-  static const String updateSpaceModel = '/projects/{projectId}/space-models/{spaceModelUuid}';
+  static const String getSpaceModel =
+      '/projects/{projectId}/space-models/{spaceModelUuid}';
+  static const String updateSpaceModel =
+      '/projects/{projectId}/space-models/{spaceModelUuid}';
   //tag
   static const String listTags = '/projects/{projectId}/tags';
 
   static const String linkSpaceModel =
       '/projects/{projectId}/space-models/{spaceModelUuid}/spaces/link';
 
-  static const String validateSpaceModel = '/projects/{projectId}/spaces/validate';
+  static const String validateSpaceModel =
+      '/projects/{projectId}/spaces/validate';
 
   static const String roleTypes = '/role/types';
   static const String permission = '/permission/{roleUuid}';
@@ -107,13 +130,16 @@ abstract class ApiEndpoints {
   static const String getUserById = '/projects/{projectId}/user/{userUuid}';
   static const String editUser = '/invite-user/{inviteUserUuid}';
   static const String deleteUser = '/invite-user/{inviteUserUuid}';
-  static const String changeUserStatus = '/invite-user/{invitedUserUuid}/disable';
+  static const String changeUserStatus =
+      '/invite-user/{invitedUserUuid}/disable';
   static const String terms = '/terms';
   static const String policy = '/policy';
   static const String userAgreements = '/user/agreements/web/{userUuid}';
-    static const String triggerScene = '/scene/tap-to-run/{sceneId}/trigger';
+  static const String triggerScene = '/scene/tap-to-run/{sceneId}/trigger';
   static const String updateAutomationStatus =
       '/projects/{projectId}/automations/{automationId}';
   static const String getUnitAutomation =
       '/projects/{projectId}/communities/{communityId}/spaces/{unitUuid}/automations';
+  static const String spaceOnlyWithDevices =
+      '/projects/{projectId}/communities/{communityId}/spaces?onlyWithDevices=true';
 }

From 6045158432799abb59fa18798f2bb25a7b4db44d Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 24 Mar 2025 15:32:02 +0300
Subject: [PATCH 017/238] Reset Selected space

---
 .../view/device_managment_page.dart           |  3 --
 .../bloc/routine_bloc/routine_bloc.dart       | 46 ++++++++++---------
 lib/pages/routines/view/routines_view.dart    |  6 +--
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/view/device_managment_page.dart b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
index 0ed0e7c2..f41b5a4a 100644
--- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart
+++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
@@ -25,9 +25,6 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
           create: (context) =>
               DeviceManagementBloc()..add(FetchDevices(context)),
         ),
-        BlocProvider<CreateRoutineBloc>(
-          create: (context) => CreateRoutineBloc(),
-        ),
       ],
       child: WebScaffold(
         appBarTitle: Text(
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index ef9ca848..2664d026 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:bloc/bloc.dart';
@@ -16,14 +15,9 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/routine_details_model.dart';
 import 'package:syncrow_web/pages/routines/models/routine_model.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 import 'package:syncrow_web/services/routines_api.dart';
-import 'package:syncrow_web/services/space_mana_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/constants/strings_manager.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
-import 'package:syncrow_web/utils/helpers/shared_preferences_helper.dart';
 import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/snack_bar.dart';
 import 'package:uuid/uuid.dart';
@@ -227,6 +221,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     BuildContext context = NavigationService.navigatorKey.currentContext!;
     var createRoutineBloc = context.read<CreateRoutineBloc>();
     try {
+  
       if (createRoutineBloc.selectedSpaceId == '' &&
           createRoutineBloc.selectedCommunityId == '') {
         var spaceBloc = context.read<SpaceTreeBloc>();
@@ -342,10 +337,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       }).toList();
 
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<CreateRoutineBloc>();
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
 
       final createSceneModel = CreateSceneModel(
-        spaceUuid: spaceBloc.selectedSpaceId,
+        spaceUuid: createRoutineBloc.selectedSpaceId,
         iconId: state.selectedIcon ?? '',
         showInDevice: true,
         sceneName: state.routineName ?? '',
@@ -472,10 +467,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         });
       }).toList();
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var spaceBloc = context.read<CreateRoutineBloc>();
+      var createRoutineBloc = context.read<CreateRoutineBloc>();
 
       final createAutomationModel = CreateAutomationModel(
-        spaceUuid: spaceBloc.selectedSpaceId,
+        spaceUuid: createRoutineBloc.selectedSpaceId,
         automationName: state.routineName ?? '',
         decisionExpr: state.selectedAutomationOperator,
         effectiveTime: EffectiveTime(
@@ -866,24 +861,33 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         isUpdate: false,
         createRoutineView: false));
   }
-
-  FutureOr<void> _deleteScene(
-      DeleteScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
     try {
-      emit(state.copyWith(isLoading: true));
       final projectId = await ProjectManager.getProjectUUID() ?? '';
+
+      emit(state.copyWith(isLoading: true));
       BuildContext context = NavigationService.navigatorKey.currentContext!;
-      var createRoutineBloc = context.read<CreateRoutineBloc>();
+      var spaceBloc = context.read<SpaceTreeBloc>();
       if (state.isTabToRun) {
         await SceneApi.deleteScene(
-            unitUuid: createRoutineBloc.selectedSpaceId,
-            sceneId: state.sceneId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0], sceneId: state.sceneId ?? '');
       } else {
         await SceneApi.deleteAutomation(
-            projectId: projectId,
-            unitUuid: createRoutineBloc.selectedSpaceId,
-            automationId: state.automationId ?? '');
+            unitUuid: spaceBloc.state.selectedSpaces[0],
+            automationId: state.automationId ?? '',
+            projectId: projectId);
       }
+      // var createRoutineBloc = context.read<CreateRoutineBloc>();
+      // if (state.isTabToRun) {
+      //   await SceneApi.deleteScene(
+      //       unitUuid: createRoutineBloc.selectedSpaceId,
+      //       sceneId: state.sceneId ?? '');
+      // } else {
+      //   await SceneApi.deleteAutomation(
+      //       projectId: projectId,
+      //       unitUuid: createRoutineBloc.selectedSpaceId,
+      //       automationId: state.automationId ?? '');
+      // }
 
       add(const LoadScenes());
       add(const LoadAutomation());
@@ -896,7 +900,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
-
+ 
   // FutureOr<void> _deleteAutomation(DeleteAutomation event, Emitter<RoutineState> emit) {
   //   try {
   //     emit(state.copyWith(isLoading: true));
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index f21a2ad7..962b3b89 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -31,10 +31,10 @@ class _RoutinesViewState extends State<RoutinesView> {
     final routineBloc = context.read<RoutineBloc>();
     _bloc.add(SaveCommunityIdAndSpaceIdEvent(
         communityID: communityId, spaceID: spaceId));
-    await Future.delayed(const Duration(milliseconds: 500));
+    await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
-    await Future.delayed(const Duration(milliseconds: 500));
-    BlocProvider.of<CreateRoutineBloc>(context).add(const ResetSelectedEvent());
+    await Future.delayed(const Duration(milliseconds:500));
+    _bloc.add(const ResetSelectedEvent());
   }
 
   @override

From 77a9aa2f19e878f791db64c7bd8621b084eb6eeb Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Wed, 26 Mar 2025 04:29:33 +0300
Subject: [PATCH 018/238] Added include spaces to the communites api

---
 .../space_tree/bloc/space_tree_bloc.dart      | 117 +++++++-----------
 lib/services/space_mana_api.dart              |  44 +++----
 2 files changed, 63 insertions(+), 98 deletions(-)

diff --git a/lib/pages/space_tree/bloc/space_tree_bloc.dart b/lib/pages/space_tree/bloc/space_tree_bloc.dart
index 31adaeb1..6315ee0f 100644
--- a/lib/pages/space_tree/bloc/space_tree_bloc.dart
+++ b/lib/pages/space_tree/bloc/space_tree_bloc.dart
@@ -28,11 +28,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
     try {
       final updatedCommunity = event.updatedCommunity;
-      final updatedCommunities =
-          List<CommunityModel>.from(state.communityList);
+      final updatedCommunities = List<CommunityModel>.from(state.communityList);
 
-      final index = updatedCommunities
-          .indexWhere((community) => community.uuid == updatedCommunity.uuid);
+      final index =
+          updatedCommunities.indexWhere((community) => community.uuid == updatedCommunity.uuid);
 
       if (index != -1) {
         updatedCommunities[index] = updatedCommunity;
@@ -51,47 +50,41 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid, includeSpaces: true);
 
-      List<CommunityModel> updatedCommunities = await Future.wait(
-        communities.map((community) async {
-          List<SpaceModel> spaces = await CommunitySpaceManagementApi()
-              .getSpaceHierarchy(community.uuid, projectUuid);
+      // List<CommunityModel> updatedCommunities = await Future.wait(
+      //   communities.map((community) async {
+      // List<SpaceModel> spaces =
+      //     await CommunitySpaceManagementApi().getSpaceHierarchy(community.uuid, projectUuid);
 
-          return CommunityModel(
-            uuid: community.uuid,
-            createdAt: community.createdAt,
-            updatedAt: community.updatedAt,
-            name: community.name,
-            description: community.description,
-            spaces: spaces,
-            region: community.region,
-          );
-        }).toList(),
-      );
+      //     return CommunityModel(
+      //       uuid: community.uuid,
+      //       createdAt: community.createdAt,
+      //       updatedAt: community.updatedAt,
+      //       name: community.name,
+      //       description: community.description,
+      //       spaces: spaces,
+      //       region: community.region,
+      //     );
+      //   }).toList(),
+      // );
 
-      emit(state.copyWith(
-          communitiesList: updatedCommunities,
-          expandedCommunity: [],
-          expandedSpaces: []));
+      emit(state.copyWith(communitiesList: communities, expandedCommunity: [], expandedSpaces: []));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
-  void _onCommunityAdded(
-      OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
+  void _onCommunityAdded(OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
     final updatedCommunities = List<CommunityModel>.from(state.communityList);
     updatedCommunities.add(event.newCommunity);
 
     emit(state.copyWith(communitiesList: updatedCommunities));
   }
 
-  _onCommunityExpanded(
-      OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
+  _onCommunityExpanded(OnCommunityExpanded event, Emitter<SpaceTreeState> emit) async {
     try {
-      List<String> updatedExpandedCommunityList =
-          List.from(state.expandedCommunities);
+      List<String> updatedExpandedCommunityList = List.from(state.expandedCommunities);
 
       if (updatedExpandedCommunityList.contains(event.communityId)) {
         updatedExpandedCommunityList.remove(event.communityId);
@@ -123,19 +116,14 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _onCommunitySelected(
-      OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
+  _onCommunitySelected(OnCommunitySelected event, Emitter<SpaceTreeState> emit) async {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
-          List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks =
-          List.from(state.soldCheck.toSet().toList());
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
-      List<String> selectedSpacesInCommunity =
-          communityAndSpaces[event.communityId] ?? [];
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityId] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
 
@@ -168,15 +156,11 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       List<String> updatedSelectedCommunities =
           List.from(state.selectedCommunities.toSet().toList());
-      List<String> updatedSelectedSpaces =
-          List.from(state.selectedSpaces.toSet().toList());
-      List<String> updatedSoldChecks =
-          List.from(state.soldCheck.toSet().toList());
-      Map<String, List<String>> communityAndSpaces =
-          Map.from(state.selectedCommunityAndSpaces);
+      List<String> updatedSelectedSpaces = List.from(state.selectedSpaces.toSet().toList());
+      List<String> updatedSoldChecks = List.from(state.soldCheck.toSet().toList());
+      Map<String, List<String>> communityAndSpaces = Map.from(state.selectedCommunityAndSpaces);
 
-      List<String> selectedSpacesInCommunity =
-          communityAndSpaces[event.communityModel.uuid] ?? [];
+      List<String> selectedSpacesInCommunity = communityAndSpaces[event.communityModel.uuid] ?? [];
 
       List<String> childrenIds = _getAllChildIds(event.children);
       bool isChildSelected = false;
@@ -199,11 +183,9 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
           selectedSpacesInCommunity.addAll(childrenIds);
         }
 
-        List<String> spaces =
-            _getThePathToChild(event.communityModel.uuid, event.spaceId);
+        List<String> spaces = _getThePathToChild(event.communityModel.uuid, event.spaceId);
         for (String space in spaces) {
-          if (!updatedSelectedSpaces.contains(space) &&
-              !updatedSoldChecks.contains(space)) {
+          if (!updatedSelectedSpaces.contains(space) && !updatedSoldChecks.contains(space)) {
             updatedSoldChecks.add(space);
           }
         }
@@ -226,9 +208,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         updatedSoldChecks.remove(event.spaceId);
 
         List<String> parents =
-            _getThePathToChild(event.communityModel.uuid, event.spaceId)
-                .toSet()
-                .toList();
+            _getThePathToChild(event.communityModel.uuid, event.spaceId).toSet().toList();
 
         if (updatedSelectedSpaces.isEmpty) {
           updatedSoldChecks.removeWhere(parents.contains);
@@ -236,8 +216,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         } else {
           // Check if any parent has selected children
           for (String space in parents) {
-            if (!_noChildrenSelected(
-                event.communityModel, space, updatedSelectedSpaces, parents)) {
+            if (!_noChildrenSelected(event.communityModel, space, updatedSelectedSpaces, parents)) {
               updatedSoldChecks.remove(space);
             }
           }
@@ -262,8 +241,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     }
   }
 
-  _noChildrenSelected(CommunityModel community, String spaceId,
-      List<String> selectedSpaces, List<String> parents) {
+  _noChildrenSelected(
+      CommunityModel community, String spaceId, List<String> selectedSpaces, List<String> parents) {
     if (selectedSpaces.contains(spaceId)) {
       return true;
     }
@@ -290,11 +269,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
       // Filter communities and expand only those that match the query
       filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity = community.name
-            .toLowerCase()
-            .contains(event.searchQuery.toLowerCase());
-        final containsQueryInSpaces = community.spaces.any(
-            (space) => _containsQuery(space, event.searchQuery.toLowerCase()));
+        final containsQueryInCommunity =
+            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+        final containsQueryInSpaces =
+            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
         return containsQueryInCommunity || containsQueryInSpaces;
       }).toList();
@@ -347,8 +325,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren = space.children.any((child) =>
-        _containsQuery(child, query)); // Recursive check for children
+    final matchesChildren =
+        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
 
     return matchesSpace || matchesChildren;
   }
@@ -371,8 +349,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return children;
   }
 
-  bool _anySpacesSelectedInCommunity(CommunityModel community,
-      List<String> selectedSpaces, List<String> partialCheckedList) {
+  bool _anySpacesSelectedInCommunity(
+      CommunityModel community, List<String> selectedSpaces, List<String> partialCheckedList) {
     bool result = false;
     List<String> ids = _getAllChildIds(community.spaces);
     for (var id in ids) {
@@ -401,8 +379,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     return ids;
   }
 
-  List<String> _getAllParentsIds(
-      SpaceModel child, String spaceId, List<String> listIds) {
+  List<String> _getAllParentsIds(SpaceModel child, String spaceId, List<String> listIds) {
     List<String> ids = listIds;
 
     ids.add(child.uuid ?? '');
diff --git a/lib/services/space_mana_api.dart b/lib/services/space_mana_api.dart
index f18a8da8..629f775c 100644
--- a/lib/services/space_mana_api.dart
+++ b/lib/services/space_mana_api.dart
@@ -3,27 +3,24 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_m
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_response_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
   Future<List<CommunityModel>> fetchCommunities(String projectId,
-      {int page = 1}) async {
+      {int page = 1, bool includeSpaces = false}) async {
     try {
       List<CommunityModel> allCommunities = [];
       bool hasNext = true;
 
       while (hasNext) {
         await HTTPService().get(
-          path: ApiEndpoints.getCommunityList
-              .replaceAll('{projectId}', projectId),
-          queryParameters: {'page': page},
+          path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
+          queryParameters: {'page': page, 'includeSpaces': includeSpaces},
           expectedResponseModel: (json) {
             try {
               List<dynamic> jsonData = json['data'] ?? [];
@@ -52,8 +49,7 @@ class CommunitySpaceManagementApi {
   Future<CommunityModel?> getCommunityById(String communityId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.getCommunityById
-            .replaceAll('{communityId}', communityId),
+        path: ApiEndpoints.getCommunityById.replaceAll('{communityId}', communityId),
         expectedResponseModel: (json) {
           return CommunityModel.fromJson(json['data']);
         },
@@ -65,8 +61,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<CommunityModel?> createCommunity(
-      String name, String description, String projectId) async {
+  Future<CommunityModel?> createCommunity(String name, String description, String projectId) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.createCommunity.replaceAll('{projectId}', projectId),
@@ -85,8 +80,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> updateCommunity(
-      String communityId, String name, String projectId) async {
+  Future<bool> updateCommunity(String communityId, String name, String projectId) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateCommunity
@@ -123,8 +117,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpacesResponse> fetchSpaces(
-      String communityId, String projectId) async {
+  Future<SpacesResponse> fetchSpaces(String communityId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.listSpaces
@@ -150,8 +143,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<SpaceModel?> getSpace(
-      String communityId, String spaceId, String projectId) async {
+  Future<SpaceModel?> getSpace(String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getSpace
@@ -262,8 +254,7 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<bool> deleteSpace(
-      String communityId, String spaceId, String projectId) async {
+  Future<bool> deleteSpace(String communityId, String spaceId, String projectId) async {
     try {
       final response = await HTTPService().delete(
         path: ApiEndpoints.deleteSpace
@@ -281,17 +272,15 @@ class CommunitySpaceManagementApi {
     }
   }
 
-  Future<List<SpaceModel>> getSpaceHierarchy(
-      String communityId, String projectId) async {
+  Future<List<SpaceModel>> getSpaceHierarchy(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)
-              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
-              .toList();
+          final spaceModels =
+              (json['data'] as List).map((spaceJson) => SpaceModel.fromJson(spaceJson)).toList();
 
           return spaceModels;
         },
@@ -302,17 +291,16 @@ class CommunitySpaceManagementApi {
       return [];
     }
   }
-    Future<List<SpaceModel>> getSpaceOnlyWithDevices(
-      {String? communityId, String? projectId}) async {
+
+  Future<List<SpaceModel>> getSpaceOnlyWithDevices({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)
-              .map((spaceJson) => SpaceModel.fromJson(spaceJson))
-              .toList();
+          final spaceModels =
+              (json['data'] as List).map((spaceJson) => SpaceModel.fromJson(spaceJson)).toList();
           return spaceModels;
         },
       );

From dad18b77de2a4238b0ac2e0b37969fd21a44fbf5 Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Wed, 26 Mar 2025 12:35:04 +0300
Subject: [PATCH 019/238] Removed `community` filter field from
 `DeviceSearchFilters`.

---
 .../widgets/device_search_filters.dart        | 60 ++++++++++---------
 1 file changed, 33 insertions(+), 27 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 650c0d21..0f565525 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -12,8 +12,8 @@ class DeviceSearchFilters extends StatefulWidget {
   State<DeviceSearchFilters> createState() => _DeviceSearchFiltersState();
 }
 
-class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperResponsiveLayout {
-  final TextEditingController communityController = TextEditingController();
+class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
+    with HelperResponsiveLayout {
   final TextEditingController unitNameController = TextEditingController();
   final TextEditingController productNameController = TextEditingController();
 
@@ -22,11 +22,17 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
     return isExtraLargeScreenSize(context)
         ? Row(
             children: [
-              _buildSearchField("Community", communityController, 200),
+              _buildSearchField(
+                "Space Name",
+                unitNameController,
+                200,
+              ),
               const SizedBox(width: 20),
-              _buildSearchField("Space Name", unitNameController, 200),
-              const SizedBox(width: 20),
-              _buildSearchField("Device Name / Product Name", productNameController, 300),
+              _buildSearchField(
+                "Device Name / Product Name",
+                productNameController,
+                300,
+              ),
               const SizedBox(width: 20),
               _buildSearchResetButtons(),
             ],
@@ -36,11 +42,10 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
             runSpacing: 10,
             children: [
               _buildSearchField(
-                "Community",
-                communityController,
+                "Space Name",
+                unitNameController,
                 200,
               ),
-              _buildSearchField("Space Name", unitNameController, 200),
               _buildSearchField(
                 "Device Name / Product Name",
                 productNameController,
@@ -51,22 +56,25 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
           );
   }
 
-  Widget _buildSearchField(String title, TextEditingController controller, double width) {
-    return Container(
-      child: StatefulTextField(
-        title: title,
-        width: width,
-        elevation: 2,
-        controller: controller,
-        onSubmitted: () {
-          context.read<DeviceManagementBloc>().add(SearchDevices(
-              productName: productNameController.text,
-              unitName: unitNameController.text,
-              community: communityController.text,
-              searchField: true));
-        },
-        onChanged: (p0) {},
-      ),
+  Widget _buildSearchField(
+    String title,
+    TextEditingController controller,
+    double width,
+  ) {
+    return StatefulTextField(
+      title: title,
+      width: width,
+      elevation: 2,
+      controller: controller,
+      onSubmitted: () {
+        final searchDevicesEvent = SearchDevices(
+          productName: productNameController.text,
+          unitName: unitNameController.text,
+          searchField: true,
+        );
+        context.read<DeviceManagementBloc>().add(searchDevicesEvent);
+      },
+      onChanged: (p0) {},
     );
   }
 
@@ -74,13 +82,11 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters> with HelperRe
     return SearchResetButtons(
       onSearch: () {
         context.read<DeviceManagementBloc>().add(SearchDevices(
-            community: communityController.text,
             unitName: unitNameController.text,
             productName: productNameController.text,
             searchField: true));
       },
       onReset: () {
-        communityController.clear();
         unitNameController.clear();
         productNameController.clear();
         context.read<DeviceManagementBloc>()

From b65f172f9dec7495cb5ec4c9c52a2941a2d3bcc7 Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Wed, 26 Mar 2025 12:36:26 +0300
Subject: [PATCH 020/238] Removed memory leak bug from `DeviceSearchFilters`
 widget.

---
 .../widgets/device_search_filters.dart         | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 0f565525..428f0b58 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -14,8 +14,22 @@ class DeviceSearchFilters extends StatefulWidget {
 
 class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     with HelperResponsiveLayout {
-  final TextEditingController unitNameController = TextEditingController();
-  final TextEditingController productNameController = TextEditingController();
+  late final TextEditingController unitNameController;
+  late final TextEditingController productNameController;
+
+  @override
+  void initState() {
+    unitNameController = TextEditingController();
+    productNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    unitNameController.dispose();
+    productNameController.dispose();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {

From d3128a9c9ca0bedab81dfc8e3980e753240078ac Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Wed, 26 Mar 2025 12:37:03 +0300
Subject: [PATCH 021/238] Refactor search button callback for improved
 readability

---
 .../all_devices/widgets/device_search_filters.dart  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 428f0b58..659a291a 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -94,12 +94,13 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
 
   Widget _buildSearchResetButtons() {
     return SearchResetButtons(
-      onSearch: () {
-        context.read<DeviceManagementBloc>().add(SearchDevices(
-            unitName: unitNameController.text,
-            productName: productNameController.text,
-            searchField: true));
-      },
+      onSearch: () => context.read<DeviceManagementBloc>().add(
+            SearchDevices(
+              unitName: unitNameController.text,
+              productName: productNameController.text,
+              searchField: true,
+            ),
+          ),
       onReset: () {
         unitNameController.clear();
         productNameController.clear();

From f670ae78aa87e7022f6b10a9910770c8faa24f25 Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Wed, 26 Mar 2025 12:39:51 +0300
Subject: [PATCH 022/238] Refactor device search filters layout for improved
 code organization and to remove any code duplication.

---
 .../widgets/device_search_filters.dart        | 61 ++++++++-----------
 1 file changed, 26 insertions(+), 35 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 659a291a..3910257f 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -31,43 +31,34 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     super.dispose();
   }
 
+  List<Widget> get _widgets => [
+        _buildSearchField(
+          "Space Name",
+          unitNameController,
+          200,
+        ),
+        _buildSearchField(
+          "Device Name / Product Name",
+          productNameController,
+          300,
+        ),
+        _buildSearchResetButtons(),
+      ];
+
   @override
   Widget build(BuildContext context) {
-    return isExtraLargeScreenSize(context)
-        ? Row(
-            children: [
-              _buildSearchField(
-                "Space Name",
-                unitNameController,
-                200,
-              ),
-              const SizedBox(width: 20),
-              _buildSearchField(
-                "Device Name / Product Name",
-                productNameController,
-                300,
-              ),
-              const SizedBox(width: 20),
-              _buildSearchResetButtons(),
-            ],
-          )
-        : Wrap(
-            spacing: 20,
-            runSpacing: 10,
-            children: [
-              _buildSearchField(
-                "Space Name",
-                unitNameController,
-                200,
-              ),
-              _buildSearchField(
-                "Device Name / Product Name",
-                productNameController,
-                300,
-              ),
-              _buildSearchResetButtons(),
-            ],
-          );
+    if (isExtraLargeScreenSize(context)) {
+      return Row(
+        spacing: 20,
+        children: _widgets,
+      );
+    }
+
+    return Wrap(
+      spacing: 20,
+      runSpacing: 10,
+      children: _widgets,
+    );
   }
 
   Widget _buildSearchField(

From 835dfe8785850f89f1ebb29958c08c2c010aa623 Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Wed, 26 Mar 2025 12:40:25 +0300
Subject: [PATCH 023/238] Rename controller variables in `DeviceSearchFilters`
 to be private to control access control.

---
 .../widgets/device_search_filters.dart        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 3910257f..27bcb0de 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -14,32 +14,32 @@ class DeviceSearchFilters extends StatefulWidget {
 
 class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     with HelperResponsiveLayout {
-  late final TextEditingController unitNameController;
-  late final TextEditingController productNameController;
+  late final TextEditingController _unitNameController;
+  late final TextEditingController _productNameController;
 
   @override
   void initState() {
-    unitNameController = TextEditingController();
-    productNameController = TextEditingController();
+    _unitNameController = TextEditingController();
+    _productNameController = TextEditingController();
     super.initState();
   }
 
   @override
   void dispose() {
-    unitNameController.dispose();
-    productNameController.dispose();
+    _unitNameController.dispose();
+    _productNameController.dispose();
     super.dispose();
   }
 
   List<Widget> get _widgets => [
         _buildSearchField(
           "Space Name",
-          unitNameController,
+          _unitNameController,
           200,
         ),
         _buildSearchField(
           "Device Name / Product Name",
-          productNameController,
+          _productNameController,
           300,
         ),
         _buildSearchResetButtons(),
@@ -73,8 +73,8 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       controller: controller,
       onSubmitted: () {
         final searchDevicesEvent = SearchDevices(
-          productName: productNameController.text,
-          unitName: unitNameController.text,
+          productName: _productNameController.text,
+          unitName: _unitNameController.text,
           searchField: true,
         );
         context.read<DeviceManagementBloc>().add(searchDevicesEvent);
@@ -87,14 +87,14 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     return SearchResetButtons(
       onSearch: () => context.read<DeviceManagementBloc>().add(
             SearchDevices(
-              unitName: unitNameController.text,
-              productName: productNameController.text,
+              unitName: _unitNameController.text,
+              productName: _productNameController.text,
               searchField: true,
             ),
           ),
       onReset: () {
-        unitNameController.clear();
-        productNameController.clear();
+        _unitNameController.clear();
+        _productNameController.clear();
         context.read<DeviceManagementBloc>()
           ..add(ResetFilters())
           ..add(FetchDevices(context));

From f307aaff9d767f1757e53b47fd90f83499447974 Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Thu, 27 Mar 2025 11:08:57 +0300
Subject: [PATCH 024/238] Removed the usage of spacing property because the
 GitHub action doesnt support the version that has it, so instead opted for
 using `Padding`.

---
 .../all_devices/widgets/device_search_filters.dart     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 27bcb0de..1928768b 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -49,8 +49,14 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
   Widget build(BuildContext context) {
     if (isExtraLargeScreenSize(context)) {
       return Row(
-        spacing: 20,
-        children: _widgets,
+        children: _widgets.map(
+          (e) {
+            return Padding(
+              padding: const EdgeInsets.symmetric(vertical: 10),
+              child: e,
+            );
+          },
+        ).toList(),
       );
     }
 

From 22935f7007bef58e7d682428cf4ec7677bb75059 Mon Sep 17 00:00:00 2001
From: fkarmoush <farmoush@uba.com.jo>
Date: Thu, 27 Mar 2025 14:52:26 +0300
Subject: [PATCH 025/238] SP-1271-rework

---
 .../widgets/device_search_filters.dart        | 41 ++++---------------
 1 file changed, 7 insertions(+), 34 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index 1928768b..fbbe65ab 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -14,34 +14,12 @@ class DeviceSearchFilters extends StatefulWidget {
 
 class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     with HelperResponsiveLayout {
-  late final TextEditingController _unitNameController;
-  late final TextEditingController _productNameController;
-
-  @override
-  void initState() {
-    _unitNameController = TextEditingController();
-    _productNameController = TextEditingController();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _unitNameController.dispose();
-    _productNameController.dispose();
-    super.dispose();
-  }
+  final _unitNameController = TextEditingController();
+  final _productNameController = TextEditingController();
 
   List<Widget> get _widgets => [
-        _buildSearchField(
-          "Space Name",
-          _unitNameController,
-          200,
-        ),
-        _buildSearchField(
-          "Device Name / Product Name",
-          _productNameController,
-          300,
-        ),
+        _buildSearchField("Space Name", _unitNameController, 200),
+        _buildSearchField("Device Name / Product Name", _productNameController, 300),
         _buildSearchResetButtons(),
       ];
 
@@ -49,14 +27,9 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
   Widget build(BuildContext context) {
     if (isExtraLargeScreenSize(context)) {
       return Row(
-        children: _widgets.map(
-          (e) {
-            return Padding(
-              padding: const EdgeInsets.symmetric(vertical: 10),
-              child: e,
-            );
-          },
-        ).toList(),
+        children: _widgets
+            .map((e) => Padding(padding: const EdgeInsets.all(10), child: e))
+            .toList(),
       );
     }
 

From 573e7b42edf4ff93fc8ea8e47bb2a7efa76c19bf Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Thu, 27 Mar 2025 15:04:33 +0300
Subject: [PATCH 026/238] Refactor routine creation UI for improved code
 organization

---
 .../create_new_routines/commu_dropdown.dart   | 134 +++++++++++----
 .../create_new_routines.dart                  |  50 +++---
 .../create_new_routines/space_dropdown.dart   | 155 ++++++++++++------
 lib/pages/routines/view/routines_view.dart    |   2 -
 4 files changed, 229 insertions(+), 112 deletions(-)

diff --git a/lib/pages/routines/create_new_routines/commu_dropdown.dart b/lib/pages/routines/create_new_routines/commu_dropdown.dart
index 13e2a437..ec031160 100644
--- a/lib/pages/routines/create_new_routines/commu_dropdown.dart
+++ b/lib/pages/routines/create_new_routines/commu_dropdown.dart
@@ -1,16 +1,16 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/style.dart';
 
 class CommunityDropdown extends StatelessWidget {
   final String? selectedValue;
   final Function(String?) onChanged;
+  final TextEditingController _searchController = TextEditingController();
 
-  const CommunityDropdown({
+  CommunityDropdown({
     Key? key,
     required this.selectedValue,
     required this.onChanged,
@@ -34,59 +34,125 @@ class CommunityDropdown extends StatelessWidget {
           const SizedBox(height: 8),
           BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
             builder: (context, state) {
-              List<CommunityModel> communities = state.isSearching
-                  ? state.filteredCommunity
-                  : state.communityList;
-
               return SizedBox(
-                child: DropdownButtonFormField<String>(
-                  dropdownColor: ColorsManager.whiteColors,
+                  child: Container(
+                decoration: BoxDecoration(
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                child: DropdownButton2<String>(
+                  underline: SizedBox(),
                   value: selectedValue,
-                  items: communities.map((community) {
+                  items: state.communityList.map((community) {
                     return DropdownMenuItem<String>(
                       value: community.uuid,
-                      child: Text('   ${community.name}'),
+                      child: Text(
+                        '  ${community.name}',
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 1,
+                      ),
                     );
                   }).toList(),
                   onChanged: onChanged,
-                  icon: const SizedBox.shrink(),
-                  borderRadius: const BorderRadius.all(Radius.circular(10)),
+                  style: TextStyle(color: Colors.black),
                   hint: Padding(
                     padding: EdgeInsets.only(left: 10),
                     child: Text(
-                      "Please Select",
+                      "  Please Select",
                       style: Theme.of(context).textTheme.bodySmall!.copyWith(
                             color: ColorsManager.textGray,
                           ),
                     ),
                   ),
-                  decoration: inputTextFormDeco().copyWith(
-                    contentPadding: EdgeInsets.zero,
-                    suffixIcon: Container(
-                      padding: EdgeInsets.zero,
-                      width: 70,
-                      height: 45,
-                      decoration: BoxDecoration(
-                        color: Colors.grey[100],
-                        borderRadius: const BorderRadius.only(
-                          bottomRight: Radius.circular(10),
-                          topRight: Radius.circular(10),
+                  customButton: Container(
+                    height: 45,
+                    decoration: BoxDecoration(
+                      border:
+                          Border.all(color: ColorsManager.textGray, width: 1.0),
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        Expanded(
+                          flex: 5,
+                          child: Text(
+                            selectedValue != null
+                                ? "  ${state.communityList.firstWhere((element) => element.uuid == selectedValue).name}"
+                                : '  Please Select',
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
                         ),
-                        border: Border.all(
-                          color: ColorsManager.textGray,
-                          width: 1.0,
+                        Expanded(
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: Colors.grey[100],
+                              borderRadius: const BorderRadius.only(
+                                topRight: Radius.circular(10),
+                                bottomRight: Radius.circular(10),
+                              ),
+                            ),
+                            height: 45,
+                            child: const Icon(
+                              Icons.keyboard_arrow_down,
+                              color: ColorsManager.textGray,
+                            ),
+                          ),
                         ),
-                      ),
-                      child: const Center(
-                        child: Icon(
-                          Icons.keyboard_arrow_down,
-                          color: ColorsManager.textGray,
+                      ],
+                    ),
+                  ),
+                  dropdownStyleData: DropdownStyleData(
+                    maxHeight: MediaQuery.of(context).size.height * 0.4,
+                    decoration: BoxDecoration(
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                  ),
+                  dropdownSearchData: DropdownSearchData(
+                    searchController: _searchController,
+                    searchInnerWidgetHeight: 50,
+                    searchInnerWidget: Container(
+                      height: 50,
+                      padding: const EdgeInsets.symmetric(
+                          horizontal: 8, vertical: 4),
+                      child: TextFormField(
+                        style: const TextStyle(color: Colors.black),
+                        controller: _searchController,
+                        decoration: InputDecoration(
+                          isDense: true,
+                          contentPadding: const EdgeInsets.symmetric(
+                            horizontal: 10,
+                            vertical: 12,
+                          ),
+                          hintText: 'Search for community...',
+                          border: OutlineInputBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
                         ),
                       ),
                     ),
+                    searchMatchFn: (item, searchValue) {
+                      final communityName =
+                          (item.child as Text).data?.toLowerCase() ?? '';
+                      return communityName
+                          .contains(searchValue.toLowerCase().trim());
+                    },
+                  ),
+                  onMenuStateChange: (isOpen) {
+                    if (!isOpen) {
+                      _searchController.clear();
+                    }
+                  },
+                  menuItemStyleData: const MenuItemStyleData(
+                    height: 40,
                   ),
                 ),
-              );
+              ));
             },
           ),
         ],
diff --git a/lib/pages/routines/create_new_routines/create_new_routines.dart b/lib/pages/routines/create_new_routines/create_new_routines.dart
index 5d1021f2..baf10748 100644
--- a/lib/pages/routines/create_new_routines/create_new_routines.dart
+++ b/lib/pages/routines/create_new_routines/create_new_routines.dart
@@ -62,28 +62,34 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
             mainAxisSize: MainAxisSize.min,
             children: [
               const Divider(),
-              CommunityDropdown(
-                selectedValue: _selectedCommunity,
-                onChanged: (String? newValue) {
-                  setState(() {
-                    _selectedCommunity = newValue;
-                    _selectedSpace = null;
-                  });
-                  if (newValue != null) {
-                    _fetchSpaces(newValue);
-                  }
-                },
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: CommunityDropdown(
+                  selectedValue: _selectedCommunity,
+                  onChanged: (String? newValue) {
+                    setState(() {
+                      _selectedCommunity = newValue;
+                      _selectedSpace = null;
+                    });
+                    if (newValue != null) {
+                      _fetchSpaces(newValue);
+                    }
+                  },
+                ),
               ),
-              const SizedBox(height: 16),
-              SpaceDropdown(
-                hintMessage: spaceHint,
-                spaces: spaces,
-                selectedValue: _selectedSpace,
-                onChanged: (String? newValue) {
-                  setState(() {
-                    _selectedSpace = newValue;
-                  });
-                },
+              const SizedBox(height: 5),
+              Padding(
+                padding: const EdgeInsets.only(left: 15, right: 15),
+                child: SpaceDropdown(
+                  hintMessage: spaceHint,
+                  spaces: spaces,
+                  selectedValue: _selectedSpace,
+                  onChanged: (String? newValue) {
+                    setState(() {
+                      _selectedSpace = newValue;
+                    });
+                  },
+                ),
               ),
               const Divider(),
               Row(
@@ -96,7 +102,6 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                     ),
                     child: TextButton(
                       onPressed: () {
-                      
                         Navigator.of(context).pop();
                       },
                       child: Text(
@@ -139,6 +144,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                   ),
                 ],
               ),
+              SizedBox(height: 10),
             ],
           ),
         );
diff --git a/lib/pages/routines/create_new_routines/space_dropdown.dart b/lib/pages/routines/create_new_routines/space_dropdown.dart
index f207c736..a26ff9f4 100644
--- a/lib/pages/routines/create_new_routines/space_dropdown.dart
+++ b/lib/pages/routines/create_new_routines/space_dropdown.dart
@@ -1,7 +1,8 @@
+import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.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/style.dart';
+
 
 class SpaceDropdown extends StatelessWidget {
   final List<SpaceModel> spaces;
@@ -33,62 +34,108 @@ class SpaceDropdown extends StatelessWidget {
                 ),
           ),
           const SizedBox(height: 8),
-          DropdownButtonFormField<String>(
-            value: selectedValue,
-            items: spaces.map((space) {
-              return DropdownMenuItem<String>(
-                  value: space.uuid,
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    children: [
-                      Text(
-                        '   ${space.name}',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 12,
-                              color: ColorsManager.blackColor,
-                            ),
-                      ),
-                      Text(
-                        '   ${space.lastThreeParents}',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontSize: 12,
-                            ),
-                      ),
-                    ],
-                  ));
-            }).toList(),
-            onChanged: onChanged,
-            icon: const SizedBox.shrink(),
-            borderRadius: const BorderRadius.all(Radius.circular(10)),
-            hint: Padding(
-              padding: const EdgeInsets.only(left: 10),
-              child: Text(
-                hintMessage,
-                style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                      color: ColorsManager.textGray,
-                    ),
+          SizedBox(
+            child: Container(
+              decoration: BoxDecoration(
+                borderRadius: BorderRadius.circular(10),
               ),
-            ),
-            decoration: inputTextFormDeco().copyWith(
-              contentPadding: EdgeInsets.zero,
-              suffixIcon: Container(
-                width: 70,
-                height: 45,
-                decoration: BoxDecoration(
-                  color: Colors.grey[200],
-                  borderRadius: const BorderRadius.only(
-                    bottomRight: Radius.circular(10),
-                    topRight: Radius.circular(10),
-                  ),
-                  border: Border.all(
-                    color: ColorsManager.textGray,
-                    width: 1.0,
+              child: DropdownButton2<String>(
+                underline: const SizedBox(),
+                value: selectedValue,
+                items: spaces.map((space) {
+                  return DropdownMenuItem<String>(
+                    value: space.uuid,
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      children: [
+                        Text(
+                          '   ${space.name}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                    color: ColorsManager.blackColor,
+                                  ),
+                        ),
+                        Text(
+                          '   ${space.lastThreeParents}',
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
+                                    fontSize: 12,
+                                  ),
+                        ),
+                      ],
+                    ),
+                  );
+                }).toList(),
+                onChanged: onChanged,
+                style: TextStyle(color: Colors.black),
+                hint: Padding(
+                  padding: const EdgeInsets.only(left: 10),
+                  child: Text(
+                    hintMessage,
+                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                          color: ColorsManager.textGray,
+                        ),
                   ),
                 ),
-                child: const Icon(
-                  Icons.keyboard_arrow_down,
-                  color: ColorsManager.textGray,
+                customButton: Container(
+                  height: 45,
+                  decoration: BoxDecoration(
+                    border:
+                        Border.all(color: ColorsManager.textGray, width: 1.0),
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Expanded(
+                        flex: 5,
+                        child: Padding(
+                          padding: const EdgeInsets.only(left: 10),
+                          child: Text(
+                            selectedValue != null
+                                ? spaces
+                                    .firstWhere((e) => e.uuid == selectedValue)
+                                    .name
+                                : hintMessage,
+                            style:
+                                Theme.of(context).textTheme.bodySmall!.copyWith(
+                                      color: selectedValue != null
+                                          ? Colors.black
+                                          : ColorsManager.textGray,
+                                    ),
+                            overflow: TextOverflow.ellipsis,
+                          ),
+                        ),
+                      ),
+                      Expanded(
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: Colors.grey[200],
+                            borderRadius: const BorderRadius.only(
+                              topRight: Radius.circular(10),
+                              bottomRight: Radius.circular(10),
+                            ),
+                          ),
+                          height: 45,
+                          child: const Icon(
+                            Icons.keyboard_arrow_down,
+                            color: ColorsManager.textGray,
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+                dropdownStyleData: DropdownStyleData(
+                  maxHeight: MediaQuery.of(context).size.height * 0.4,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                  ),
+                ),
+                menuItemStyleData: const MenuItemStyleData(
+                  height: 60,
                 ),
               ),
             ),
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index 962b3b89..83ab82b9 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -33,8 +33,6 @@ class _RoutinesViewState extends State<RoutinesView> {
         communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
-    await Future.delayed(const Duration(milliseconds:500));
-    _bloc.add(const ResetSelectedEvent());
   }
 
   @override

From a034202d760538bbc477c90fc1f7648b9a3699cc Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Thu, 3 Apr 2025 10:14:24 +0400
Subject: [PATCH 027/238] updated endpoints

---
 .../models/factory_reset_model.dart           |  3 ++
 .../bloc/visitor_password_bloc.dart           |  3 +-
 lib/services/access_mang_api.dart             | 44 +++++++++++++------
 lib/services/devices_mang_api.dart            | 19 ++++----
 lib/services/space_mana_api.dart              |  2 -
 lib/utils/constants/api_const.dart            | 30 +++++--------
 6 files changed, 56 insertions(+), 45 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/models/factory_reset_model.dart b/lib/pages/device_managment/all_devices/models/factory_reset_model.dart
index aec14d16..56c6c90b 100644
--- a/lib/pages/device_managment/all_devices/models/factory_reset_model.dart
+++ b/lib/pages/device_managment/all_devices/models/factory_reset_model.dart
@@ -2,14 +2,17 @@ import 'package:flutter/foundation.dart';
 
 class FactoryResetModel {
   final List<String> devicesUuid;
+  final String operationType;
 
   FactoryResetModel({
     required this.devicesUuid,
+    this.operationType = "RESET",
   });
 
   factory FactoryResetModel.fromJson(Map<String, dynamic> json) {
     return FactoryResetModel(
       devicesUuid: List<String>.from(json['devicesUuid']),
+      operationType: "RESET",
     );
   }
 
diff --git a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
index 45fb03fe..438b1abf 100644
--- a/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
+++ b/lib/pages/visitor_password/bloc/visitor_password_bloc.dart
@@ -194,9 +194,10 @@ class VisitorPasswordBloc
       emit(DeviceLoaded());
          final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      data = await AccessMangApi().fetchDevices(projectUuid);
+      data = await AccessMangApi().fetchDoorLockDeviceList(projectUuid);
       emit(TableLoaded(data));
     } catch (e) {
+      print("error: $e");
       emit(FailedState(e.toString()));
     }
   }
diff --git a/lib/services/access_mang_api.dart b/lib/services/access_mang_api.dart
index 6acbc395..a780a12b 100644
--- a/lib/services/access_mang_api.dart
+++ b/lib/services/access_mang_api.dart
@@ -6,13 +6,23 @@ import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class AccessMangApi {
+  AccessMangApi() {
+    _validateEndpoints();
+  }
+
+  void _validateEndpoints() {
+    if (!ApiEndpoints.getDevices.contains('{projectId}')) {
+      throw Exception("Endpoint 'getDevices' must contain '{projectId}' placeholder.");
+    }
+  }
+
   Future<List<PasswordModel>> fetchVisitorPassword(String projectId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.visitorPassword.replaceAll('{projectId}', projectId),
+        path: ApiEndpoints.visitorPassword,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json;
+          List<dynamic> jsonData = json['data'] ?? [];
           List<PasswordModel> passwordList = jsonData.map((jsonItem) {
             return PasswordModel.fromJson(jsonItem);
           }).toList();
@@ -25,17 +35,22 @@ class AccessMangApi {
     }
   }
 
-  Future fetchDevices(String projectId) async {
+  Future fetchDoorLockDeviceList(String projectId) async {
     try {
+      // The endpoint structure is already validated during initialization.
+
       final response = await HTTPService().get(
         path: ApiEndpoints.getDevices.replaceAll('{projectId}', projectId),
+        queryParameters: {
+          'deviceType': 'DOOR_LOCK',
+        },
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = json;
-          List<DeviceModel> passwordList = jsonData.map((jsonItem) {
+          List<dynamic> jsonData = json['data'] ?? [];
+          List<DeviceModel> deviceList = jsonData.map((jsonItem) {
             return DeviceModel.fromJson(jsonItem);
           }).toList();
-          return passwordList;
+          return deviceList;
         },
       );
       return response;
@@ -52,14 +67,15 @@ class AccessMangApi {
       String? invalidTime,
       List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOnlineOneTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode({
         "email": email,
         "passwordName": passwordName,
         "password": password,
         "devicesUuid": devicesUuid,
         "effectiveTime": effectiveTime,
-        "invalidTime": invalidTime
+        "invalidTime": invalidTime,
+        "operationType": "ONLINE_ONE_TIME",
       }),
       showServerMessage: true,
       expectedResponseModel: (json) {
@@ -84,13 +100,13 @@ class AccessMangApi {
       "password": password,
       "effectiveTime": effectiveTime,
       "invalidTime": invalidTime,
+      "operationType": "ONLINE_MULTIPLE_TIME",
     };
     if (scheduleList != null) {
-      body["scheduleList"] =
-          scheduleList.map((schedule) => schedule.toJson()).toList();
+      body["scheduleList"] = scheduleList.map((schedule) => schedule.toJson()).toList();
     }
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOnlineMultipleTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode(body),
       showServerMessage: true,
       expectedResponseModel: (json) {
@@ -105,8 +121,9 @@ class AccessMangApi {
   Future postOffLineOneTime(
       {String? email, String? passwordName, List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOffLineOneTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode({
+        "operationType": "OFFLINE_ONE_TIME",
         "email": email,
         "passwordName": passwordName,
         "devicesUuid": devicesUuid
@@ -126,13 +143,14 @@ class AccessMangApi {
       String? invalidTime,
       List<String>? devicesUuid}) async {
     final response = await HTTPService().post(
-      path: ApiEndpoints.sendOffLineMultipleTime,
+      path: ApiEndpoints.visitorPassword,
       body: jsonEncode({
         "email": email,
         "devicesUuid": devicesUuid,
         "passwordName": passwordName,
         "effectiveTime": effectiveTime,
         "invalidTime": invalidTime,
+        "operationType": "OFFLINE_MULTIPLE_TIME",
       }),
       showServerMessage: true,
       expectedResponseModel: (json) {
diff --git a/lib/services/devices_mang_api.dart b/lib/services/devices_mang_api.dart
index 25a0177f..0b16d826 100644
--- a/lib/services/devices_mang_api.dart
+++ b/lib/services/devices_mang_api.dart
@@ -24,7 +24,7 @@ class DevicesManagementApi {
         showServerMessage: true,
         expectedResponseModel: (json) {
           List<dynamic> jsonData =
-              communityId.isNotEmpty && spaceId.isNotEmpty ? json['data'] : json;
+              communityId.isNotEmpty && spaceId.isNotEmpty ? json['data'] : json['data'];
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
@@ -33,7 +33,7 @@ class DevicesManagementApi {
       );
       return response;
     } catch (e) {
-      debugPrint('Error fetching  $e');
+      debugPrint('Error fetching device $e');
       return [];
     }
   }
@@ -44,7 +44,7 @@ class DevicesManagementApi {
         path: ApiEndpoints.getDeviceStatus.replaceAll('{uuid}', uuid),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return DeviceStatus.fromJson(json);
+          return DeviceStatus.fromJson(json['data']);
         },
       );
       return response;
@@ -61,7 +61,7 @@ class DevicesManagementApi {
   Future getPowerClampInfo(String deviceId) async {
     try {
       final response = await HTTPService().get(
-        path: ApiEndpoints.powerClamp.replaceAll('{powerClampUuid}', deviceId),
+        path: ApiEndpoints.getDeviceStatus.replaceAll('{uuid}', deviceId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           return json;
@@ -98,6 +98,7 @@ class DevicesManagementApi {
         'devicesUuid': uuids,
         'code': code,
         'value': value,
+        'operationType': 'COMMAND',
       };
 
       final response = await HTTPService().post(
@@ -105,7 +106,7 @@ class DevicesManagementApi {
         body: body,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return (json['successResults'] as List).isNotEmpty;
+           return json['success'] ?? false;
         },
       );
 
@@ -125,7 +126,7 @@ class DevicesManagementApi {
         if (json == null || json.isEmpty || json == []) {
           return devices;
         }
-        for (var device in json['devices']) {
+        for (var device in json['data']['devices']) {
           devices.add(DeviceModel.fromJson(device));
         }
         return devices;
@@ -153,7 +154,7 @@ class DevicesManagementApi {
       path: ApiEndpoints.getDeviceLogs.replaceAll('{uuid}', uuid).replaceAll('{code}', code),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return DeviceReport.fromJson(json);
+        return DeviceReport.fromJson(json['data']);
       },
     );
     return response;
@@ -169,7 +170,7 @@ class DevicesManagementApi {
           .replaceAll('{endTime}', to ?? ''),
       showServerMessage: false,
       expectedResponseModel: (json) {
-        return DeviceReport.fromJson(json);
+        return DeviceReport.fromJson(json['data']);
       },
     );
     return response;
@@ -185,7 +186,7 @@ class DevicesManagementApi {
         queryParameters: queryParameters,
         showServerMessage: true,
         expectedResponseModel: (json) {
-          return DeviceStatus.fromJson(json['status']);
+          return DeviceStatus.fromJson(json['data']['status']);
         },
       );
       return response;
diff --git a/lib/services/space_mana_api.dart b/lib/services/space_mana_api.dart
index 4eced226..9b1b0df1 100644
--- a/lib/services/space_mana_api.dart
+++ b/lib/services/space_mana_api.dart
@@ -3,13 +3,11 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_m
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_response_model.dart';
-import 'package:syncrow_web/pages/spaces_management/space_model/models/create_space_template_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/space_template_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_body_model.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/tag_update_model.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 import 'package:syncrow_web/utils/constants/api_const.dart';
-import 'package:syncrow_web/utils/constants/temp_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
diff --git a/lib/utils/constants/api_const.dart b/lib/utils/constants/api_const.dart
index 71e0fc55..d0eefee7 100644
--- a/lib/utils/constants/api_const.dart
+++ b/lib/utils/constants/api_const.dart
@@ -9,17 +9,8 @@ abstract class ApiEndpoints {
   static const String sendOtp = '/authentication/user/send-otp';
   static const String verifyOtp = '/authentication/user/verify-otp';
   static const String getRegion = '/region';
-  static const String visitorPassword = '/projects/{projectId}/visitor-password';
-  static const String getDevices = '/projects/{projectId}/visitor-password/devices';
-
-  static const String sendOnlineOneTime = '/visitor-password/temporary-password/online/one-time';
-  static const String sendOnlineMultipleTime =
-      '/visitor-password/temporary-password/online/multiple-time';
-
-//offline Password
-  static const String sendOffLineOneTime = '/visitor-password/temporary-password/offline/one-time';
-  static const String sendOffLineMultipleTime =
-      '/visitor-password/temporary-password/offline/multiple-time';
+  static const String visitorPassword = '/visitor-passwords';
+  static const String getDevices = '/projects/{projectId}/devices';
 
   static const String getUser = '/user/{userUuid}';
 
@@ -28,15 +19,15 @@ abstract class ApiEndpoints {
   static const String getAllDevices = '/projects/{projectId}/devices';
   static const String getSpaceDevices =
       '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
-  static const String getDeviceStatus = '/device/{uuid}/functions/status';
-  static const String getBatchStatus = '/device/status/batch';
+  static const String getDeviceStatus = '/devices/{uuid}/functions/status';
+  static const String getBatchStatus = '/devices/batch';
 
-  static const String deviceControl = '/device/{uuid}/control';
-  static const String deviceBatchControl = '/device/control/batch';
-  static const String gatewayApi = '/device/gateway/{gatewayUuid}/devices';
+  static const String deviceControl = '/devices/{uuid}/command';
+  static const String deviceBatchControl = '/devices/batch';
+  static const String gatewayApi = '/devices/gateway/{gatewayUuid}/devices';
   static const String openDoorLock = '/door-lock/open/{doorLockUuid}';
 
-  static const String getDeviceLogs = '/device/report-logs/{uuid}?code={code}';
+  static const String getDeviceLogs = '/devices/{uuid}/report-logs?code={code}';
 
 // Space Module
   static const String createSpace = '/projects/{projectId}/communities/{communityId}/spaces';
@@ -57,14 +48,13 @@ abstract class ApiEndpoints {
   static const String getUserCommunities = '/projects/{projectId}/communities/user/{userUuid}';
   static const String createUserCommunity = '/projects/{projectId}/communities/user';
   static const String getDeviceLogsByDate =
-      '/device/report-logs/{uuid}?code={code}&startTime={startTime}&endTime={endTime}';
+      '/devices/{uuid}/report-logs?code={code}&startTime={startTime}&endTime={endTime}';
 
   static const String scheduleByDeviceId = '/schedule/{deviceUuid}';
   static const String getScheduleByDeviceId = '/schedule/{deviceUuid}?category={category}';
   static const String deleteScheduleByDeviceId = '/schedule/{deviceUuid}/{scheduleUuid}';
   static const String updateScheduleByDeviceId = '/schedule/enable/{deviceUuid}';
-  static const String factoryReset = '/device/factory/reset/{deviceUuid}';
-  static const String powerClamp = '/device/{powerClampUuid}/power-clamp/status';
+  static const String factoryReset = '/devices/batch';
 
   //product
   static const String listProducts = '/products';

From ab3f268f29ac8d5ecd3ca93be6dc4962addd7659 Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Sun, 6 Apr 2025 01:14:16 +0300
Subject: [PATCH 028/238] Added pagination and search logic in space tree

---
 .../create_new_routines/commu_dropdown.dart   |   5 +-
 .../space_tree/bloc/space_tree_bloc.dart      | 103 +++++++---
 .../space_tree/bloc/space_tree_event.dart     |  21 +-
 .../space_tree/bloc/space_tree_state.dart     |  19 +-
 .../space_tree/model/pagination_model.dart    |  20 ++
 .../space_tree/view/space_tree_view.dart      | 179 ++++++++++--------
 .../all_spaces/model/community_model.dart     |  10 +-
 lib/services/devices_mang_api.dart            |  27 +--
 lib/services/space_mana_api.dart              |  40 +++-
 9 files changed, 284 insertions(+), 140 deletions(-)
 create mode 100644 lib/pages/space_tree/model/pagination_model.dart

diff --git a/lib/pages/routines/create_new_routines/commu_dropdown.dart b/lib/pages/routines/create_new_routines/commu_dropdown.dart
index 13e2a437..658b69a0 100644
--- a/lib/pages/routines/create_new_routines/commu_dropdown.dart
+++ b/lib/pages/routines/create_new_routines/commu_dropdown.dart
@@ -34,9 +34,8 @@ class CommunityDropdown extends StatelessWidget {
           const SizedBox(height: 8),
           BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
             builder: (context, state) {
-              List<CommunityModel> communities = state.isSearching
-                  ? state.filteredCommunity
-                  : state.communityList;
+              List<CommunityModel> communities =
+                  state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
 
               return SizedBox(
                 child: DropdownButtonFormField<String>(
diff --git a/lib/pages/space_tree/bloc/space_tree_bloc.dart b/lib/pages/space_tree/bloc/space_tree_bloc.dart
index 6315ee0f..ab20b430 100644
--- a/lib/pages/space_tree/bloc/space_tree_bloc.dart
+++ b/lib/pages/space_tree/bloc/space_tree_bloc.dart
@@ -1,7 +1,10 @@
+import 'dart:async';
+
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.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/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/space_model.dart';
 import 'package:syncrow_web/services/space_mana_api.dart';
@@ -18,7 +21,10 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     on<ClearCachedData>(_clearCachedData);
     on<OnCommunityAdded>(_onCommunityAdded);
     on<OnCommunityUpdated>(_onCommunityUpdate);
+    on<PaginationEvent>(_fetchPaginationSpaces);
+    on<DebouncedSearchEvent>(_onDebouncedSearch);
   }
+  Timer _timer = Timer(const Duration(microseconds: 0), () {});
 
   void _onCommunityUpdate(
     OnCommunityUpdated event,
@@ -37,7 +43,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
         updatedCommunities[index] = updatedCommunity;
         emit(state.copyWith(communitiesList: updatedCommunities));
       } else {
-        emit(SpaceTreeErrorState('Community not found in the list.'));
+        emit(const SpaceTreeErrorState('Community not found in the list.'));
       }
     } catch (e) {
       emit(SpaceTreeErrorState('Error updating community: $e'));
@@ -49,8 +55,8 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
-      List<CommunityModel> communities =
-          await CommunitySpaceManagementApi().fetchCommunities(projectUuid, includeSpaces: true);
+      PaginationModel paginationModel = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: 1);
 
       // List<CommunityModel> updatedCommunities = await Future.wait(
       //   communities.map((community) async {
@@ -69,12 +75,38 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
       //   }).toList(),
       // );
 
-      emit(state.copyWith(communitiesList: communities, expandedCommunity: [], expandedSpaces: []));
+      emit(state.copyWith(
+          communitiesList: paginationModel.communities,
+          expandedCommunity: [],
+          expandedSpaces: [],
+          paginationModel: paginationModel));
     } catch (e) {
       emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
     }
   }
 
+  _fetchPaginationSpaces(PaginationEvent event, Emitter<SpaceTreeState> emit) async {
+    emit(state.copyWith(paginationIsLoading: true));
+    PaginationModel paginationModel = event.paginationModel;
+    List<CommunityModel> communities = List<CommunityModel>.from(event.communities);
+    try {
+      if (paginationModel.hasNext && state.searchQuery.isEmpty) {
+        final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+        paginationModel = await CommunitySpaceManagementApi().fetchCommunitiesAndSpaces(
+            projectId: projectUuid, page: paginationModel.pageNum, search: state.searchQuery);
+
+        communities.addAll(paginationModel.communities);
+      }
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
+    }
+    emit(state.copyWith(
+        communitiesList: communities,
+        paginationModel: paginationModel,
+        paginationIsLoading: false));
+  }
+
   void _onCommunityAdded(OnCommunityAdded event, Emitter<SpaceTreeState> emit) async {
     final updatedCommunities = List<CommunityModel>.from(state.communityList);
     updatedCommunities.add(event.newCommunity);
@@ -264,28 +296,52 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   _onSearch(SearchQueryEvent event, Emitter<SpaceTreeState> emit) async {
     try {
-      List<CommunityModel> communities = List.from(state.communityList);
-      List<CommunityModel> filteredCommunity = [];
+      const duration = Duration(seconds: 1);
+      if (_timer.isActive) {
+        _timer.cancel(); // clear timer
+      }
+      _timer = Timer(duration, () async => add(DebouncedSearchEvent(event.searchQuery)));
+
+      // List<CommunityModel> communities = List.from(state.communityList);
+      // List<CommunityModel> filteredCommunity = [];
 
       // Filter communities and expand only those that match the query
-      filteredCommunity = communities.where((community) {
-        final containsQueryInCommunity =
-            community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
-        final containsQueryInSpaces =
-            community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
+      // filteredCommunity = communities.where((community) {
+      //   final containsQueryInCommunity =
+      //       community.name.toLowerCase().contains(event.searchQuery.toLowerCase());
+      //   final containsQueryInSpaces =
+      //       community.spaces.any((space) => _containsQuery(space, event.searchQuery.toLowerCase()));
 
-        return containsQueryInCommunity || containsQueryInSpaces;
-      }).toList();
+      //   return containsQueryInCommunity || containsQueryInSpaces;
+      // }).toList();
 
-      emit(state.copyWith(
-          filteredCommunity: filteredCommunity,
-          isSearching: event.searchQuery.isNotEmpty,
-          searchQuery: event.searchQuery));
+      // emit(state.copyWith(
+      //     filteredCommunity: filteredCommunity,
+      //     isSearching: event.searchQuery.isNotEmpty,
+      //     searchQuery: event.searchQuery));
     } catch (e) {
       emit(const SpaceTreeErrorState('Something went wrong'));
     }
   }
 
+  _onDebouncedSearch(DebouncedSearchEvent event, Emitter<SpaceTreeState> emit) async {
+    emit(state.copyWith(
+      isSearching: true,
+    ));
+    PaginationModel paginationModel = const PaginationModel.emptyConstructor();
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+
+      paginationModel = await CommunitySpaceManagementApi()
+          .fetchCommunitiesAndSpaces(projectId: projectUuid, page: 1, search: event.searchQuery);
+    } catch (_) {}
+
+    emit(state.copyWith(
+        filteredCommunity: paginationModel.communities,
+        isSearching: false,
+        searchQuery: event.searchQuery));
+  }
+
   _clearAllData(ClearAllData event, Emitter<SpaceTreeState> emit) async {
     try {
       emit(state.copyWith(
@@ -323,13 +379,13 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
   }
 
   // Helper function to determine if any space or its children match the search query
-  bool _containsQuery(SpaceModel space, String query) {
-    final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren =
-        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
+  // bool _containsQuery(SpaceModel space, String query) {
+  //   final matchesSpace = space.name.toLowerCase().contains(query);
+  //   final matchesChildren =
+  //       space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
 
-    return matchesSpace || matchesChildren;
-  }
+  //   return matchesSpace || matchesChildren;
+  // }
 
   List<String> _getAllChildIds(List<SpaceModel> spaces) {
     List<String> ids = [];
@@ -403,6 +459,7 @@ class SpaceTreeBloc extends Bloc<SpaceTreeEvent, SpaceTreeState> {
 
   @override
   Future<void> close() async {
+    _timer.cancel();
     super.close();
   }
 }
diff --git a/lib/pages/space_tree/bloc/space_tree_event.dart b/lib/pages/space_tree/bloc/space_tree_event.dart
index fdf1240b..22254ce0 100644
--- a/lib/pages/space_tree/bloc/space_tree_event.dart
+++ b/lib/pages/space_tree/bloc/space_tree_event.dart
@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.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/space_model.dart';
 
@@ -11,6 +12,16 @@ class SpaceTreeEvent extends Equatable {
 
 class InitialEvent extends SpaceTreeEvent {}
 
+class PaginationEvent extends SpaceTreeEvent {
+  final PaginationModel paginationModel;
+  final List<CommunityModel> communities;
+
+  const PaginationEvent(this.paginationModel, this.communities);
+
+  @override
+  List<Object> get props => [paginationModel, communities];
+}
+
 class SearchForSpace extends SpaceTreeEvent {
   final String searchQuery;
 
@@ -69,6 +80,15 @@ class SearchQueryEvent extends SpaceTreeEvent {
   List<Object> get props => [searchQuery];
 }
 
+class DebouncedSearchEvent extends SpaceTreeEvent {
+  final String searchQuery;
+
+  const DebouncedSearchEvent(this.searchQuery);
+
+  @override
+  List<Object> get props => [searchQuery];
+}
+
 class OnCommunityAdded extends SpaceTreeEvent {
   final CommunityModel newCommunity;
   const OnCommunityAdded(this.newCommunity);
@@ -85,7 +105,6 @@ class OnCommunityUpdated extends SpaceTreeEvent {
   List<Object> get props => [updatedCommunity];
 }
 
-
 class ClearAllData extends SpaceTreeEvent {}
 
 class ClearCachedData extends SpaceTreeEvent {}
diff --git a/lib/pages/space_tree/bloc/space_tree_state.dart b/lib/pages/space_tree/bloc/space_tree_state.dart
index 915197dc..595380fd 100644
--- a/lib/pages/space_tree/bloc/space_tree_state.dart
+++ b/lib/pages/space_tree/bloc/space_tree_state.dart
@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.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';
 
 class SpaceTreeState extends Equatable {
@@ -12,6 +13,8 @@ class SpaceTreeState extends Equatable {
   final List<String> soldCheck;
   final bool isSearching;
   final String searchQuery;
+  final PaginationModel paginationModel;
+  final bool paginationIsLoading;
 
   const SpaceTreeState(
       {this.communityList = const [],
@@ -23,7 +26,9 @@ class SpaceTreeState extends Equatable {
       this.soldCheck = const [],
       this.isSearching = false,
       this.selectedCommunityAndSpaces = const {},
-      this.searchQuery = ''});
+      this.searchQuery = '',
+      this.paginationModel = const PaginationModel.emptyConstructor(),
+      this.paginationIsLoading = false});
 
   SpaceTreeState copyWith(
       {List<CommunityModel>? communitiesList,
@@ -35,7 +40,9 @@ class SpaceTreeState extends Equatable {
       List<String>? soldCheck,
       bool? isSearching,
       Map<String, List<String>>? selectedCommunityAndSpaces,
-      String? searchQuery}) {
+      String? searchQuery,
+      PaginationModel? paginationModel,
+      bool? paginationIsLoading}) {
     return SpaceTreeState(
         communityList: communitiesList ?? this.communityList,
         filteredCommunity: filteredCommunity ?? this.filteredCommunity,
@@ -46,7 +53,9 @@ class SpaceTreeState extends Equatable {
         soldCheck: soldCheck ?? this.soldCheck,
         isSearching: isSearching ?? this.isSearching,
         selectedCommunityAndSpaces: selectedCommunityAndSpaces ?? this.selectedCommunityAndSpaces,
-        searchQuery: searchQuery ?? this.searchQuery);
+        searchQuery: searchQuery ?? this.searchQuery,
+        paginationModel: paginationModel ?? this.paginationModel,
+        paginationIsLoading: paginationIsLoading ?? this.paginationIsLoading);
   }
 
   @override
@@ -60,7 +69,9 @@ class SpaceTreeState extends Equatable {
         soldCheck,
         isSearching,
         selectedCommunityAndSpaces,
-        searchQuery
+        searchQuery,
+        paginationModel,
+        paginationIsLoading
       ];
 }
 
diff --git a/lib/pages/space_tree/model/pagination_model.dart b/lib/pages/space_tree/model/pagination_model.dart
new file mode 100644
index 00000000..c40df1e0
--- /dev/null
+++ b/lib/pages/space_tree/model/pagination_model.dart
@@ -0,0 +1,20 @@
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+
+class PaginationModel {
+  final int pageNum;
+  final bool hasNext;
+  final int size;
+  final List<CommunityModel> communities;
+
+  const PaginationModel(
+      {required this.pageNum,
+      required this.hasNext,
+      required this.size,
+      required this.communities});
+
+  const PaginationModel.emptyConstructor()
+      : pageNum = 1,
+        hasNext = true,
+        size = 10,
+        communities = const [];
+}
diff --git a/lib/pages/space_tree/view/space_tree_view.dart b/lib/pages/space_tree/view/space_tree_view.dart
index 63926852..5b70da06 100644
--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@@ -34,7 +34,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      List<CommunityModel> list = state.isSearching ? state.filteredCommunity : state.communityList;
+      List<CommunityModel> list =
+          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
@@ -61,7 +62,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                         borderRadius: const BorderRadius.all(Radius.circular(20)),
                                         border: Border.all(color: ColorsManager.grayBorder)),
                                     child: TextFormField(
-                                      style: const TextStyle(color: Colors.black),
+                                      style: context.textTheme.bodyMedium
+                                          ?.copyWith(color: ColorsManager.blackColor),
                                       onChanged: (value) {
                                         context.read<SpaceTreeBloc>().add(SearchQueryEvent(value));
                                       },
@@ -94,88 +96,101 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                         ),
                   const SizedBox(height: 16),
                   Expanded(
-                    child: ListView(
-                      shrinkWrap: true,
-                      scrollDirection: Axis.horizontal,
-                      children: [
-                        Container(
-                          width: MediaQuery.sizeOf(context).width * 0.5,
-                          padding: const EdgeInsets.all(8.0),
-                          child: list.isEmpty
-                              ? Center(
-                                  child: Text(
-                                    'No results found',
-                                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                          color: ColorsManager.lightGrayColor,
-                                          fontWeight: FontWeight.w400,
+                    child: state.isSearching
+                        ? const Center(child: CircularProgressIndicator())
+                        : ListView(
+                            shrinkWrap: true,
+                            scrollDirection: Axis.horizontal,
+                            children: [
+                              Container(
+                                width: MediaQuery.sizeOf(context).width * 0.5,
+                                padding: const EdgeInsets.all(8.0),
+                                child: list.isEmpty
+                                    ? Center(
+                                        child: Text(
+                                          'No results found',
+                                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                                color: ColorsManager.lightGrayColor,
+                                                fontWeight: FontWeight.w400,
+                                              ),
                                         ),
-                                  ),
-                                )
-                              : Scrollbar(
-                                  scrollbarOrientation: ScrollbarOrientation.left,
-                                  thumbVisibility: true,
-                                  controller: _scrollController,
-                                  child: Padding(
-                                    padding: const EdgeInsets.only(left: 16),
-                                    child: ListView(
-                                      controller: _scrollController,
-                                      shrinkWrap: true,
-                                      children: list
-                                          .map(
-                                            (community) => CustomExpansionTileSpaceTree(
-                                              title: community.name,
-                                              isSelected: state.selectedCommunities
-                                                  .contains(community.uuid),
-                                              isSoldCheck: state.selectedCommunities
-                                                  .contains(community.uuid),
-                                              onExpansionChanged: () {
-                                                context
-                                                    .read<SpaceTreeBloc>()
-                                                    .add(OnCommunityExpanded(community.uuid));
-                                              },
-                                              isExpanded: state.expandedCommunities
-                                                  .contains(community.uuid),
-                                              onItemSelected: () {
-                                                context.read<SpaceTreeBloc>().add(
-                                                    OnCommunitySelected(
-                                                        community.uuid, community.spaces));
-                                                widget.onSelect();
-                                              },
-                                              children: community.spaces.map((space) {
-                                                return CustomExpansionTileSpaceTree(
-                                                  title: space.name,
-                                                  isExpanded:
-                                                      state.expandedSpaces.contains(space.uuid),
-                                                  onItemSelected: () {
-                                                    context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceSelected(community, space.uuid ?? '',
-                                                            space.children));
-                                                    widget.onSelect();
-                                                  },
-                                                  onExpansionChanged: () {
-                                                    context.read<SpaceTreeBloc>().add(
-                                                        OnSpaceExpanded(
-                                                            community.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, community),
-                                                );
-                                              }).toList(),
-                                            ),
-                                          )
-                                          .toList(),
-                                    ),
-                                  ),
-                                ),
-                        ),
-                      ],
-                    ),
+                                      )
+                                    : Scrollbar(
+                                        scrollbarOrientation: ScrollbarOrientation.left,
+                                        thumbVisibility: true,
+                                        controller: _scrollController,
+                                        child: NotificationListener(
+                                          onNotification: (notification) {
+                                            if (notification is ScrollEndNotification &&
+                                                notification.metrics.extentAfter == 0) {
+                                              // If the user has reached the end of the list Load more data
+                                              context.read<SpaceTreeBloc>().add(PaginationEvent(
+                                                  state.paginationModel, state.communityList));
+                                            }
+                                            return false;
+                                          },
+                                          child: Padding(
+                                            padding: const EdgeInsets.only(left: 16),
+                                            child: ListView.builder(
+                                                shrinkWrap: true,
+                                                itemCount: list.length,
+                                                controller: _scrollController,
+                                                itemBuilder: (context, index) {
+                                                  return CustomExpansionTileSpaceTree(
+                                                    title: list[index].name,
+                                                    isSelected: state.selectedCommunities
+                                                        .contains(list[index].uuid),
+                                                    isSoldCheck: state.selectedCommunities
+                                                        .contains(list[index].uuid),
+                                                    onExpansionChanged: () {
+                                                      context.read<SpaceTreeBloc>().add(
+                                                          OnCommunityExpanded(list[index].uuid));
+                                                    },
+                                                    isExpanded: state.expandedCommunities
+                                                        .contains(list[index].uuid),
+                                                    onItemSelected: () {
+                                                      context.read<SpaceTreeBloc>().add(
+                                                          OnCommunitySelected(list[index].uuid,
+                                                              list[index].spaces));
+                                                      widget.onSelect();
+                                                    },
+                                                    children: list[index].spaces.map((space) {
+                                                      return CustomExpansionTileSpaceTree(
+                                                        title: space.name,
+                                                        isExpanded: state.expandedSpaces
+                                                            .contains(space.uuid),
+                                                        onItemSelected: () {
+                                                          context.read<SpaceTreeBloc>().add(
+                                                              OnSpaceSelected(
+                                                                  list[index],
+                                                                  space.uuid ?? '',
+                                                                  space.children));
+                                                          widget.onSelect();
+                                                        },
+                                                        onExpansionChanged: () {
+                                                          context.read<SpaceTreeBloc>().add(
+                                                              OnSpaceExpanded(list[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, list[index]),
+                                                      );
+                                                    }).toList(),
+                                                  );
+                                                }),
+                                          ),
+                                        ),
+                                      ),
+                              ),
+                            ],
+                          ),
                   ),
-
+                  if (state.paginationIsLoading) const CircularProgressIndicator(),
                   // Expanded(
                   //   child: Padding(
                   //     padding: const EdgeInsets.all(8.0),
diff --git a/lib/pages/spaces_management/all_spaces/model/community_model.dart b/lib/pages/spaces_management/all_spaces/model/community_model.dart
index 14d9d729..d1e27095 100644
--- a/lib/pages/spaces_management/all_spaces/model/community_model.dart
+++ b/lib/pages/spaces_management/all_spaces/model/community_model.dart
@@ -22,11 +22,11 @@ class CommunityModel {
 
   factory CommunityModel.fromJson(Map<String, dynamic> json) {
     return CommunityModel(
-      uuid: json['uuid'],
-      createdAt: DateTime.parse(json['createdAt']),
-      updatedAt: DateTime.parse(json['updatedAt']),
-      name: json['name'],
-      description: json['description'],
+      uuid: json['uuid'] ?? '',
+      createdAt: DateTime.parse(json['createdAt'] ?? ''),
+      updatedAt: DateTime.parse(json['updatedAt'] ?? ''),
+      name: json['name'] ?? '',
+      description: json['description'] ?? '',
       region: json['region'] != null ? RegionModel.fromJson(json['region']) : null,
       spaces: json['spaces'] != null
           ? (json['spaces'] as List).map((space) => SpaceModel.fromJson(space)).toList()
diff --git a/lib/services/devices_mang_api.dart b/lib/services/devices_mang_api.dart
index 604abaf4..9fe4a2f6 100644
--- a/lib/services/devices_mang_api.dart
+++ b/lib/services/devices_mang_api.dart
@@ -23,9 +23,7 @@ class DevicesManagementApi {
             : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
-          List<dynamic> jsonData = communityId.isNotEmpty && spaceId.isNotEmpty
-              ? json['data']
-              : json;
+          List<dynamic> jsonData = json['data'];
           List<AllDevicesModel> devicesList = jsonData.map((jsonItem) {
             return AllDevicesModel.fromJson(jsonItem);
           }).toList();
@@ -93,8 +91,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> deviceBatchControl(
-      List<String> uuids, String code, dynamic value) async {
+  Future<bool> deviceBatchControl(List<String> uuids, String code, dynamic value) async {
     try {
       final body = {
         'devicesUuid': uuids,
@@ -118,8 +115,7 @@ class DevicesManagementApi {
     }
   }
 
-  static Future<List<DeviceModel>> getDevicesByGatewayId(
-      String gatewayId) async {
+  static Future<List<DeviceModel>> getDevicesByGatewayId(String gatewayId) async {
     final response = await HTTPService().get(
       path: ApiEndpoints.gatewayApi.replaceAll('{gatewayUuid}', gatewayId),
       showServerMessage: false,
@@ -153,9 +149,7 @@ class DevicesManagementApi {
     String code,
   ) async {
     final response = await HTTPService().get(
-      path: ApiEndpoints.getDeviceLogs
-          .replaceAll('{uuid}', uuid)
-          .replaceAll('{code}', code),
+      path: ApiEndpoints.getDeviceLogs.replaceAll('{uuid}', uuid).replaceAll('{code}', code),
       showServerMessage: false,
       expectedResponseModel: (json) {
         return DeviceReport.fromJson(json);
@@ -228,8 +222,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> addScheduleRecord(
-      ScheduleEntry sendSchedule, String uuid) async {
+  Future<bool> addScheduleRecord(ScheduleEntry sendSchedule, String uuid) async {
     try {
       final response = await HTTPService().post(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
@@ -246,8 +239,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<List<ScheduleModel>> getDeviceSchedules(
-      String uuid, String category) async {
+  Future<List<ScheduleModel>> getDeviceSchedules(String uuid, String category) async {
     try {
       final response = await HTTPService().get(
         path: ApiEndpoints.getScheduleByDeviceId
@@ -270,9 +262,7 @@ class DevicesManagementApi {
   }
 
   Future<bool> updateScheduleRecord(
-      {required bool enable,
-      required String uuid,
-      required String scheduleId}) async {
+      {required bool enable, required String uuid, required String scheduleId}) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.updateScheduleByDeviceId
@@ -293,8 +283,7 @@ class DevicesManagementApi {
     }
   }
 
-  Future<bool> editScheduleRecord(
-      String uuid, ScheduleEntry newSchedule) async {
+  Future<bool> editScheduleRecord(String uuid, ScheduleEntry newSchedule) async {
     try {
       final response = await HTTPService().put(
         path: ApiEndpoints.scheduleByDeviceId.replaceAll('{deviceUuid}', uuid),
diff --git a/lib/services/space_mana_api.dart b/lib/services/space_mana_api.dart
index 629f775c..604c8cae 100644
--- a/lib/services/space_mana_api.dart
+++ b/lib/services/space_mana_api.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.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';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
@@ -11,8 +12,7 @@ import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class CommunitySpaceManagementApi {
   // Community Management APIs
-  Future<List<CommunityModel>> fetchCommunities(String projectId,
-      {int page = 1, bool includeSpaces = false}) async {
+  Future<List<CommunityModel>> fetchCommunities(String projectId, {int page = 1}) async {
     try {
       List<CommunityModel> allCommunities = [];
       bool hasNext = true;
@@ -20,7 +20,9 @@ class CommunitySpaceManagementApi {
       while (hasNext) {
         await HTTPService().get(
           path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
-          queryParameters: {'page': page, 'includeSpaces': includeSpaces},
+          queryParameters: {
+            'page': page,
+          },
           expectedResponseModel: (json) {
             try {
               List<dynamic> jsonData = json['data'] ?? [];
@@ -46,6 +48,38 @@ class CommunitySpaceManagementApi {
     }
   }
 
+  Future<PaginationModel> fetchCommunitiesAndSpaces(
+      {required String projectId, int page = 1, String search = ''}) async {
+    PaginationModel paginationModel = const PaginationModel.emptyConstructor();
+
+    try {
+      bool hasNext = false;
+      await HTTPService().get(
+        path: ApiEndpoints.getCommunityList.replaceAll('{projectId}', projectId),
+        queryParameters: {'page': page, 'includeSpaces': true, 'size': 25, 'search': search},
+        expectedResponseModel: (json) {
+          try {
+            List<dynamic> jsonData = json['data'] ?? [];
+            hasNext = json['hasNext'] ?? false;
+            int currentPage = json['page'] ?? 1;
+            List<CommunityModel> communityList = jsonData.map((jsonItem) {
+              return CommunityModel.fromJson(jsonItem);
+            }).toList();
+
+            page = currentPage + 1;
+            paginationModel = PaginationModel(
+                pageNum: page, hasNext: hasNext, size: 25, communities: communityList);
+            return paginationModel;
+          } catch (_) {
+            hasNext = false;
+            return [];
+          }
+        },
+      );
+    } catch (_) {}
+    return paginationModel;
+  }
+
   Future<CommunityModel?> getCommunityById(String communityId) async {
     try {
       final response = await HTTPService().get(

From 4fc259491ec675d9072f8fc77638d34d43476e8c Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 6 Apr 2025 09:57:12 +0300
Subject: [PATCH 029/238] add WallPresenceSensor and add new icons for presence
 state and selected value

---
 assets/icons/Illuminance_icon.svg             |  18 +
 assets/icons/Indicator_icon.svg               |  12 +
 assets/icons/current_distance_icon.svg        |  17 +
 assets/icons/far_detection_icon.svg           |  16 +
 .../motion_detection_sensitivity_icon.svg     |  21 +
 ...otion_detection_sensitivity_value_icon.svg |   5 +
 .../motionless_detection_sensitivity_icon.svg |   6 +
 assets/icons/presence_state.svg               |  18 +
 assets/icons/presence_time_icon.svg           |  29 +
 .../all_devices/models/devices_model.dart     |  63 +-
 .../widgets/count_down_inching_view.dart      |  71 +++
 .../dialog_helper/device_dialog_helper.dart   |  75 ++-
 .../routines/models/wps/wps_functions.dart    | 290 +++++++++
 .../models/wps/wps_operational_value.dart     |  11 +
 lib/pages/routines/widgets/if_container.dart  |  80 ++-
 .../routines/widgets/routine_devices.dart     |   7 +-
 .../three_gang_switch_dialog.dart             |  47 +-
 .../wall_sensor/time_wheel.dart               | 150 +++++
 .../wall_sensor/wall_presence_sensor.dart     | 553 ++++++++++++++++++
 .../routines/widgets/then_container.dart      | 126 ++--
 lib/utils/constants/assets.dart               |  17 +
 21 files changed, 1517 insertions(+), 115 deletions(-)
 create mode 100644 assets/icons/Illuminance_icon.svg
 create mode 100644 assets/icons/Indicator_icon.svg
 create mode 100644 assets/icons/current_distance_icon.svg
 create mode 100644 assets/icons/far_detection_icon.svg
 create mode 100644 assets/icons/motion_detection_sensitivity_icon.svg
 create mode 100644 assets/icons/motion_detection_sensitivity_value_icon.svg
 create mode 100644 assets/icons/motionless_detection_sensitivity_icon.svg
 create mode 100644 assets/icons/presence_state.svg
 create mode 100644 assets/icons/presence_time_icon.svg
 create mode 100644 lib/pages/routines/models/wps/wps_functions.dart
 create mode 100644 lib/pages/routines/models/wps/wps_operational_value.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

diff --git a/assets/icons/Illuminance_icon.svg b/assets/icons/Illuminance_icon.svg
new file mode 100644
index 00000000..379c45f9
--- /dev/null
+++ b/assets/icons/Illuminance_icon.svg
@@ -0,0 +1,18 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8326 16.8575C7.55614 16.8575 4.89062 14.192 4.89062 10.9156C4.89062 7.63915 7.55614 4.97363 10.8326 4.97363C14.1091 4.97363 16.7746 7.63915 16.7746 10.9156C16.7746 14.192 14.1091 16.8575 10.8326 16.8575Z" fill="#FFE645"/>
+<path d="M10.8333 4.97363C10.8332 4.97363 10.833 4.97363 10.833 4.97363V16.8575H10.8333C14.1098 16.8575 16.7753 14.192 16.7753 10.9156C16.7753 7.63915 14.1098 4.97363 10.8333 4.97363Z" fill="#FFF1B9"/>
+<path d="M10.833 21.8334C10.4824 21.8334 10.1982 21.5493 10.1982 21.1986V18.8289C10.1982 18.4784 10.4824 18.1941 10.833 18.1941C11.1836 18.1941 11.4678 18.4784 11.4678 18.8289V21.1986C11.4678 21.5493 11.1836 21.8334 10.833 21.8334Z" fill="#FFE645"/>
+<path d="M21.0317 11.6348H18.7461C18.3955 11.6348 18.1113 11.3506 18.1113 11C18.1113 10.6496 18.3955 10.3652 18.7461 10.3652H21.0317C21.3824 10.3652 21.6665 10.6496 21.6665 11C21.6665 11.3506 21.3824 11.6348 21.0317 11.6348Z" fill="#FFCF2C"/>
+<path d="M2.92042 11.6348H0.634766C0.284157 11.6348 0 11.3506 0 11C0 10.6496 0.284157 10.3652 0.634766 10.3652H2.92042C3.27103 10.3652 3.55518 10.6496 3.55518 11C3.55518 11.3506 3.27103 11.6348 2.92042 11.6348Z" fill="#FFE645"/>
+<path d="M17.7243 7.65695C17.5049 7.65695 17.2915 7.54306 17.174 7.33941C16.9988 7.03591 17.1027 6.64761 17.4064 6.47239L19.3481 5.3513C19.6517 5.17591 20.04 5.28005 20.2152 5.58372C20.3905 5.88721 20.2865 6.27551 19.9828 6.45073L18.0412 7.57182C17.9412 7.62951 17.8321 7.65695 17.7243 7.65695Z" fill="#FFCF2C"/>
+<path d="M2.03686 16.7139C1.8175 16.7139 1.60409 16.6 1.48656 16.3963C1.31117 16.0928 1.41531 15.7045 1.71881 15.5293L3.69865 14.3862C4.00231 14.2108 4.39045 14.315 4.56567 14.6186C4.74106 14.9221 4.63708 15.3104 4.33342 15.4856L2.35358 16.6287C2.25373 16.6864 2.14447 16.7139 2.03686 16.7139Z" fill="#FFE645"/>
+<path d="M5.76902 20.4051C5.6614 20.4051 5.5523 20.3778 5.4523 20.32C5.14863 20.1448 5.04466 19.7565 5.21988 19.453L6.36279 17.4735C6.53801 17.17 6.92631 17.0658 7.22981 17.2412C7.53347 17.4164 7.63744 17.8047 7.46222 18.1082L6.31931 20.0877C6.20178 20.2914 5.98838 20.4051 5.76902 20.4051Z" fill="#FFE645"/>
+<path d="M3.94197 7.65681C3.83419 7.65681 3.72509 7.62937 3.62524 7.57168L1.64557 6.42877C1.34207 6.25355 1.23793 5.86525 1.41332 5.56158C1.58854 5.25809 1.97667 5.15395 2.28033 5.32933L4.26001 6.47224C4.56351 6.64746 4.66748 7.03576 4.49226 7.33926C4.37473 7.54291 4.16132 7.65681 3.94197 7.65681Z" fill="#FFE645"/>
+<path d="M19.6649 16.7342C19.5572 16.7342 19.4481 16.7067 19.348 16.6491L17.333 15.4857C17.0295 15.3103 16.9255 14.9221 17.1007 14.6185C17.276 14.315 17.6643 14.2108 17.9678 14.3862L19.9828 15.5496C20.2865 15.7248 20.3905 16.1131 20.2152 16.4166C20.0977 16.6203 19.8843 16.7342 19.6649 16.7342Z" fill="#FFCF2C"/>
+<path d="M15.8973 20.4051C15.6778 20.4051 15.4645 20.2913 15.347 20.0877L14.2043 18.1085C14.029 17.8048 14.133 17.4167 14.4367 17.2415C14.7402 17.0661 15.1285 17.1701 15.3037 17.4737L16.4464 19.4529C16.6217 19.7566 16.5177 20.1447 16.214 20.3199C16.114 20.3778 16.0049 20.4051 15.8973 20.4051Z" fill="#FFCF2C"/>
+<path d="M10.833 3.72144C10.4824 3.72144 10.1982 3.43728 10.1982 3.08667V0.801514C10.1982 0.450905 10.4824 0.166748 10.833 0.166748C11.1836 0.166748 11.4678 0.450905 11.4678 0.801514V3.08667C11.4678 3.43728 11.1836 3.72144 10.833 3.72144Z" fill="#FFE645"/>
+<path d="M14.7534 4.75952C14.6458 4.75952 14.5365 4.73208 14.4367 4.67422C14.133 4.499 14.029 4.11086 14.2043 3.8072L15.3472 1.82786C15.5224 1.5242 15.9105 1.42005 16.2142 1.59544C16.5178 1.77066 16.6218 2.15896 16.4466 2.46262L15.3037 4.44197C15.1862 4.64562 14.9728 4.75952 14.7534 4.75952Z" fill="#FFCF2C"/>
+<path d="M6.91292 4.75919C6.69356 4.75919 6.48015 4.64529 6.36262 4.44164L5.21988 2.46262C5.04466 2.15896 5.14863 1.77066 5.4523 1.59544C5.75579 1.42005 6.14409 1.5242 6.31931 1.82786L7.46206 3.80687C7.63728 4.11053 7.5333 4.49867 7.22964 4.67405C7.1298 4.73175 7.02053 4.75919 6.91292 4.75919Z" fill="#FFE645"/>
+<path d="M10.8333 18.1941C10.8332 18.1941 10.833 18.1941 10.833 18.1941V21.8334H10.8333C11.1839 21.8334 11.4681 21.5493 11.4681 21.1986V18.8289C11.4681 18.4784 11.1839 18.1941 10.8333 18.1941Z" fill="#FFCF2C"/>
+<path d="M10.8333 0.166748C10.8332 0.166748 10.833 0.166748 10.833 0.166748V3.72144H10.8333C11.1839 3.72144 11.4681 3.43728 11.4681 3.08667V0.801514C11.4681 0.450905 11.1839 0.166748 10.8333 0.166748Z" fill="#FFCF2C"/>
+</svg>
diff --git a/assets/icons/Indicator_icon.svg b/assets/icons/Indicator_icon.svg
new file mode 100644
index 00000000..a542e9fa
--- /dev/null
+++ b/assets/icons/Indicator_icon.svg
@@ -0,0 +1,12 @@
+<svg width="16" height="22" viewBox="0 0 16 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15.3977 14.7672V18.2386C15.3977 19.0611 14.7285 19.7299 13.906 19.7299H1.49132C0.668788 19.7299 0 19.0611 0 18.2386V14.7672C0 10.522 3.45363 7.06836 7.69885 7.06836H7.73063C11.9615 7.08575 15.3977 10.5326 15.3977 14.7672Z" fill="#FF5B5B"/>
+<path d="M15.3975 14.7672V18.2386C15.3975 19.0611 14.7283 19.7299 13.9058 19.7299H7.73047V7.06836C11.9613 7.08575 15.3975 10.5326 15.3975 14.7672Z" fill="#FF193D"/>
+<path d="M15.3977 15.5405V18.239C15.3977 19.0615 14.7285 19.7303 13.906 19.7303H1.49132C0.668788 19.7303 0 19.0615 0 18.239V15.5405H15.3977Z" fill="#7C8287"/>
+<path d="M15.3977 21.1981C15.3977 21.5492 15.1131 21.8334 14.7624 21.8334H0.635315C0.284205 21.8334 0 21.5492 0 21.1981C0 20.8474 0.284205 20.5627 0.635315 20.5627H14.7623C15.1131 20.5627 15.3977 20.8473 15.3977 21.1981Z" fill="#DCE6EB"/>
+<path d="M8.36829 0.802063V4.67286C8.36829 5.02355 8.08366 5.30817 7.73297 5.30817C7.38228 5.30817 7.09766 5.02355 7.09766 4.67286V0.802063C7.09761 0.451377 7.38224 0.166748 7.73297 0.166748C8.0837 0.166748 8.36829 0.451377 8.36829 0.802063Z" fill="#FFB64C"/>
+<path d="M2.87856 6.65271C2.67031 6.65271 2.4663 6.55047 2.34472 6.36262L0.357991 3.29471C0.167266 3.00023 0.251393 2.60684 0.545924 2.41612C0.840412 2.22535 1.23376 2.30952 1.42452 2.60405L3.41125 5.67195C3.60198 5.96644 3.51785 6.35983 3.22332 6.55055C3.11659 6.61966 2.99688 6.65271 2.87856 6.65271Z" fill="#FFB64C"/>
+<path d="M12.3087 6.6527C12.1903 6.6527 12.0706 6.61965 11.9639 6.55054C11.6694 6.35982 11.5852 5.96643 11.7759 5.67194L13.7627 2.60404C13.9534 2.30947 14.3467 2.22538 14.6413 2.41611C14.9358 2.60683 15.0199 3.00022 14.8292 3.29471L12.8425 6.36261C12.7209 6.55042 12.5169 6.6527 12.3087 6.6527Z" fill="#FF9F00"/>
+<path d="M15.3975 21.1981C15.3975 21.5492 15.1129 21.8334 14.7622 21.8334H7.73047V20.5627H14.7622C15.1129 20.5627 15.3975 20.8473 15.3975 21.1981Z" fill="#C8D2DC"/>
+<path d="M15.3975 15.5405V18.239C15.3975 19.0615 14.7283 19.7303 13.9058 19.7303H7.73047V15.5405H15.3975Z" fill="#596C76"/>
+<path d="M8.36774 0.802063V4.67286C8.36774 5.02355 8.08311 5.30817 7.73242 5.30817V0.166748C8.08311 0.166748 8.36774 0.451377 8.36774 0.802063Z" fill="#FF9F00"/>
+</svg>
diff --git a/assets/icons/current_distance_icon.svg b/assets/icons/current_distance_icon.svg
new file mode 100644
index 00000000..d4c87601
--- /dev/null
+++ b/assets/icons/current_distance_icon.svg
@@ -0,0 +1,17 @@
+<svg width="22" height="14" viewBox="0 0 22 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.6663 11.1257L7.02441 8.58667L10.833 13.6648H21.6663V11.1257Z" fill="#FFB54C"/>
+<path d="M0 11.1257V13.6648H10.8333V8.58667L0 11.1257Z" fill="#FFCC4A"/>
+<path d="M21.6663 11.1257V5.41284H20.0688L19.4341 6.04761L18.7993 5.41284H17.2018L16.5671 6.04761L15.9323 5.41284H14.3348L13.7 6.04761L13.0653 5.41284H11.4678L8.29395 8.26929L10.833 11.1257H21.6663Z" fill="#FFCC4A"/>
+<path d="M10.8333 5.41284H10.1986H8.60107L7.96631 6.04761L7.33154 5.41284H5.73405L5.09928 6.04761L4.46452 5.41284H2.86702L2.23226 6.04761L1.59749 5.41284H0V11.1257H10.8333V5.41284Z" fill="#FFE278"/>
+<path d="M21.0316 1.60449H10.833L10.1982 2.23926L10.833 2.87402H21.0316V1.60449Z" fill="#ABD5ED"/>
+<path d="M10.8333 1.60449H1.26953V0.334961H0V4.14355H1.26953V2.87402H10.8333V1.60449Z" fill="#BFEBFF"/>
+<path d="M20.3965 0.334961H21.666V4.14355H20.3965V0.334961Z" fill="#ABD5ED"/>
+<path d="M1.59766 5.41284H2.86719V8.58667H1.59766V5.41284Z" fill="#587AA1"/>
+<path d="M4.46484 5.41284H5.73438V7.31714H4.46484V5.41284Z" fill="#587AA1"/>
+<path d="M7.33203 5.41284H8.60156V8.58667H7.33203V5.41284Z" fill="#587AA1"/>
+<path d="M11.4678 7.31714H10.833L10.5156 6.99976V5.73022L10.833 5.41284H11.4678V7.31714Z" fill="#455F80"/>
+<path d="M10.1982 5.41284H10.833V7.31714H10.1982V5.41284Z" fill="#587AA1"/>
+<path d="M13.0654 5.41284H14.335V8.58667H13.0654V5.41284Z" fill="#455F80"/>
+<path d="M15.9326 5.41284H17.2021V7.31714H15.9326V5.41284Z" fill="#455F80"/>
+<path d="M18.7998 5.41284H20.0693V8.58667H18.7998V5.41284Z" fill="#455F80"/>
+</svg>
diff --git a/assets/icons/far_detection_icon.svg b/assets/icons/far_detection_icon.svg
new file mode 100644
index 00000000..b41b000a
--- /dev/null
+++ b/assets/icons/far_detection_icon.svg
@@ -0,0 +1,16 @@
+<svg width="22" height="16" viewBox="0 0 22 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.9326 7.99996C12.9326 8.4282 12.8042 8.82647 12.5838 9.15837C12.2083 9.72412 11.5654 9.84106 10.8355 9.84106C9.67727 9.84106 9.05078 9.15816 9.05078 7.99996C9.05078 7.26923 9.11211 6.62577 9.67883 6.25036C10.0104 6.03074 10.408 5.90283 10.8354 5.90283C11.9937 5.90287 12.9326 6.84175 12.9326 7.99996Z" fill="#E5646E"/>
+<path d="M11.4252 9.50734C10.267 9.50734 9.32807 8.56846 9.32807 7.41026C9.32807 6.98202 9.45843 6.5824 9.67877 6.25049C9.11302 6.62607 8.73828 7.27012 8.73828 8.00009C8.73828 9.15829 9.67716 10.0972 10.8354 10.0972C11.5653 10.0972 12.2082 9.72425 12.5837 9.15851C12.2519 9.3788 11.8534 9.50734 11.4252 9.50734Z" fill="#DB4655"/>
+<path d="M3.66787 0.133789C3.84673 0.133789 4.02559 0.202058 4.16209 0.338597C4.16848 0.344987 4.1747 0.351463 4.18079 0.358023L3.79505 1.32708C2.01269 3.10948 1.03102 5.47931 1.03102 7.99997C1.03102 10.5206 2.01269 12.8905 3.79505 14.6729L4.18101 15.6417C4.17483 15.6483 4.16852 15.6549 4.16209 15.6613C3.88935 15.9344 3.44668 15.9344 3.1736 15.6613C1.12705 13.6149 0 10.8941 0 7.99997C0 5.10588 1.12705 2.38502 3.17364 0.338597C3.31001 0.202058 3.489 0.133789 3.66787 0.133789Z" fill="#FFE6E7"/>
+<path d="M7.6231 4.08813C7.80196 4.08813 7.98099 4.1564 8.11732 4.29294C8.1312 4.30682 8.14437 4.32109 8.15681 4.33582L7.68282 5.28138C6.18391 6.78047 6.18391 9.21957 7.68282 10.7187L8.15774 11.6633C8.145 11.6783 8.13154 11.693 8.11732 11.7072C7.84458 11.9803 7.40157 11.9803 7.12884 11.7072C5.08466 9.66318 5.08466 6.33695 7.12884 4.29294C7.26521 4.15636 7.44424 4.08813 7.6231 4.08813Z" fill="#FF9A9F"/>
+<path d="M5.64357 2.11108C5.82243 2.11108 6.0013 2.17935 6.13779 2.31589C6.14575 2.32385 6.15345 2.33189 6.16094 2.34014L5.56438 3.30433C2.97545 5.89361 2.97545 10.1066 5.56438 12.6959L6.16145 13.6596C6.15383 13.668 6.14596 13.6762 6.13783 13.6843C5.86476 13.9574 5.42243 13.9574 5.14935 13.6843C2.01532 10.5501 2.01532 5.45005 5.14935 2.31581C5.28585 2.17935 5.46471 2.11108 5.64357 2.11108Z" fill="#FFCCCF"/>
+<path d="M6.29102 7.99972C6.29102 9.50473 7.0294 10.836 8.1565 11.6629C8.38886 11.3884 8.37511 10.9772 8.11608 10.7184C6.61717 9.21929 6.61717 6.78019 8.11608 5.28106C8.37511 5.0222 8.38793 4.61001 8.15557 4.33545C7.02852 5.1623 6.29102 6.49471 6.29102 7.99972Z" fill="#FF8086"/>
+<path d="M3.49609 7.99983C3.49609 10.2771 4.53592 12.313 6.16362 13.6593C6.413 13.385 6.405 12.9604 6.14001 12.6956C3.55107 10.1064 3.55107 5.89335 6.14001 3.30408C6.405 3.03925 6.41249 2.61411 6.16316 2.33984C4.53541 3.68609 3.49609 5.72253 3.49609 7.99983Z" fill="#FF9A9F"/>
+<path d="M0.699219 7.99986C0.699219 11.0495 2.05 13.7834 4.18124 15.6416C4.43535 15.3675 4.42896 14.9393 4.16232 14.6728C2.37992 12.8903 1.39825 10.5205 1.39825 7.99986C1.39825 5.47919 2.37992 3.10937 4.16232 1.32697C4.42896 1.06049 4.43514 0.632002 4.18103 0.35791C2.04979 2.21607 0.699219 4.95022 0.699219 7.99986Z" fill="#FFCCCF"/>
+<path d="M18.0014 15.8662C17.8226 15.8662 17.6437 15.7979 17.5072 15.6613C17.5008 15.655 17.4946 15.6485 17.4885 15.6419L17.8742 14.6729C19.6566 12.8905 20.6383 10.5206 20.6383 7.99997C20.6383 5.4793 19.6566 3.10948 17.8742 1.32708L17.4883 0.358277C17.4945 0.351632 17.5008 0.345072 17.5072 0.338596C17.7799 0.06552 18.2226 0.06552 18.4957 0.338596C20.5422 2.38502 21.6693 5.10588 21.6693 7.99997C21.6693 10.8941 20.5422 13.6149 18.4956 15.6613C18.3593 15.7979 18.1803 15.8662 18.0014 15.8662Z" fill="#FFE6E7"/>
+<path d="M14.0464 11.912C13.8675 11.912 13.6885 11.8438 13.5521 11.7072C13.5383 11.6933 13.5251 11.6791 13.5127 11.6644L13.9866 10.7187C15.4856 9.21966 15.4856 6.78055 13.9866 5.28143L13.5117 4.33687C13.5245 4.32181 13.5379 4.30716 13.5521 4.29294C13.8249 4.01987 14.2679 4.01987 14.5406 4.29294C16.5848 6.33695 16.5848 9.66318 14.5406 11.7072C14.4043 11.8438 14.2252 11.912 14.0464 11.912Z" fill="#FF9A9F"/>
+<path d="M16.0257 13.8892C15.8468 13.8892 15.668 13.8209 15.5315 13.6844C15.5235 13.6764 15.5158 13.6684 15.5083 13.6601L16.1049 12.6959C18.6938 10.1066 18.6938 5.89361 16.1049 3.30433L15.5078 2.34065C15.5154 2.33223 15.5233 2.32398 15.5314 2.31589C15.8045 2.04281 16.2468 2.04281 16.5199 2.31589C19.6539 5.45009 19.6539 10.5502 16.5199 13.6844C16.3834 13.8209 16.2046 13.8892 16.0257 13.8892Z" fill="#FFCCCF"/>
+<path d="M15.3797 8.00012C15.3797 6.49511 14.6413 5.16376 13.5142 4.33691C13.2819 4.61147 13.2956 5.02261 13.5546 5.28147C15.0536 6.78055 15.0536 9.21966 13.5546 10.7188C13.2956 10.9776 13.2828 11.3898 13.5152 11.6644C14.6422 10.8375 15.3797 9.50513 15.3797 8.00012Z" fill="#FF8086"/>
+<path d="M18.175 8.00005C18.175 5.72275 17.1351 3.68687 15.5074 2.34058C15.2581 2.61484 15.2661 3.03944 15.531 3.30426C18.12 5.89353 18.12 10.1065 15.531 12.6958C15.2661 12.9606 15.2586 13.3858 15.5079 13.66C17.1356 12.3138 18.175 10.2774 18.175 8.00005Z" fill="#FF9A9F"/>
+<path d="M20.9707 7.99989C20.9707 4.95025 19.6199 2.21636 17.4887 0.358154C17.2346 0.632246 17.241 1.06048 17.5076 1.32696C19.29 3.10936 20.2716 5.47918 20.2716 7.99985C20.2716 10.5205 19.29 12.8903 17.5076 14.6727C17.241 14.9392 17.2348 15.3677 17.4889 15.6418C19.6201 13.7837 20.9707 11.0495 20.9707 7.99989Z" fill="#FFCCCF"/>
+</svg>
diff --git a/assets/icons/motion_detection_sensitivity_icon.svg b/assets/icons/motion_detection_sensitivity_icon.svg
new file mode 100644
index 00000000..cd527f13
--- /dev/null
+++ b/assets/icons/motion_detection_sensitivity_icon.svg
@@ -0,0 +1,21 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.91415 8.48211C6.17473 8.04425 4.3403 8.07332 2.60916 8.56611C1.74635 8.81143 0.920517 9.16778 0.154693 9.62511C0.00421161 9.71499 -0.0449192 9.90978 0.0449212 10.0603C0.130234 10.2033 0.336744 10.2556 0.480159 10.1701C1.19846 9.74106 1.97317 9.40684 2.78283 9.17663C4.40699 8.71422 6.12775 8.68689 7.75919 9.09766C7.92922 9.14032 8.10166 9.03732 8.14445 8.86737C8.18723 8.69742 8.0841 8.52489 7.91415 8.48211Z" fill="#6BBEF6"/>
+<path d="M7.37225 10.4417C5.99155 10.1036 4.53693 10.1313 3.16562 10.5219C2.47009 10.7197 1.80528 11.0068 1.1896 11.3753C1.0392 11.4653 0.990237 11.6602 1.08025 11.8106C1.1397 11.91 1.24495 11.9651 1.3529 11.9651C1.40838 11.9651 1.46453 11.9505 1.51557 11.92C2.0836 11.58 2.69716 11.3151 3.33942 11.1324C4.60502 10.7719 5.94733 10.7463 7.22126 11.0583C7.39138 11.0999 7.56332 10.9958 7.60504 10.8255C7.64677 10.6553 7.54254 10.4835 7.37225 10.4417Z" fill="#6BBEF6"/>
+<path d="M6.83178 12.4028C5.81116 12.1632 4.73634 12.1888 3.72363 12.4772C3.19665 12.627 2.6929 12.8452 2.22626 13.1255C2.07599 13.2158 2.02737 13.4108 2.11763 13.561C2.20697 13.7097 2.4048 13.7587 2.55312 13.6696C2.97186 13.4181 3.42406 13.2223 3.89735 13.0877C4.80646 12.8289 5.77096 12.8057 6.68663 13.0208C6.85739 13.0605 7.02809 12.9549 7.06817 12.7844C7.10824 12.6138 7.00241 12.4429 6.83178 12.4028Z" fill="#6BBEF6"/>
+<path d="M14.4727 19.6416L13.6738 21.4527C13.5717 21.6842 13.3426 21.8336 13.0896 21.8336H8.12563C7.79678 21.8336 7.57643 21.4956 7.70914 21.1947L9.38433 17.397L13.3135 19.1303L14.4727 19.6416Z" fill="#FFDDCE"/>
+<path d="M14.475 19.6415L13.6761 21.4526C13.574 21.6841 13.3448 21.8335 13.0918 21.8335H12.123L13.3158 19.1301L14.475 19.6415Z" fill="#FFCBBE"/>
+<path d="M14.1855 13.4249L16.3003 14.3579L19.2365 7.70213C19.4938 7.119 19.229 6.43743 18.645 6.1798C18.061 5.92217 17.3791 6.18606 17.1218 6.7692L14.1855 13.4249Z" fill="#FFDDCE"/>
+<path d="M18.6453 6.17967C18.4607 6.09821 18.2662 6.06906 18.0786 6.08543C18.326 6.40921 18.3944 6.85397 18.2185 7.25273L15.8676 12.5814C15.6524 13.0693 15.8731 13.6392 16.3607 13.8543L16.4962 13.9141L19.2368 7.70201C19.4941 7.11887 19.2292 6.43726 18.6453 6.17967Z" fill="#FFCBBE"/>
+<path d="M12.0723 12.492L14.187 13.425L16.7716 7.56632C17.0291 6.98276 16.7647 6.30102 16.1812 6.04356L16.1797 6.04289C15.5961 5.78542 14.9144 6.04983 14.6569 6.63334L12.0723 12.492Z" fill="#FFDDCE"/>
+<path d="M16.1808 6.04379L16.1789 6.04295C15.9946 5.96165 15.8006 5.93254 15.6132 5.949C15.8606 6.27286 15.9288 6.71808 15.7526 7.11744L13.757 11.6407C13.5398 12.1331 13.7626 12.7082 14.2546 12.9252L14.3821 12.9814L16.7708 7.56693C17.0284 6.98312 16.7642 6.30121 16.1808 6.04379Z" fill="#FFCBBE"/>
+<path d="M8.56284 14.6994C7.94352 16.1032 8.58154 17.7448 9.98852 18.3655L13.7612 20.0298C14.9419 20.5507 16.3209 20.0175 16.8407 18.8391L21.1141 9.15261C21.2426 8.86126 21.2407 8.54557 21.1335 8.26982C21.0262 7.99412 20.8142 7.75968 20.5222 7.63091C19.9384 7.37337 19.2564 7.63705 18.9994 8.21972L16.4886 13.9111L12.2593 12.0453C12.2942 11.9675 14.112 7.84707 14.112 7.84707C14.2405 7.55571 14.2384 7.23939 14.1314 6.96428C14.0246 6.68875 13.8121 6.45414 13.5201 6.32537C12.9363 6.06782 12.2545 6.33104 11.9973 6.91418L8.56284 14.6994Z" fill="#FFDDCE"/>
+<path d="M13.1203 6.51804C13.2273 6.79311 13.2294 7.10947 13.1008 7.40083C13.1008 7.40083 12.0882 9.6961 11.5601 10.8928C11.3879 11.2831 11.5646 11.7387 11.9547 11.9108L12.2666 12.0484C12.3015 11.9705 14.1192 7.85012 14.1192 7.85012C14.2478 7.55876 14.2456 7.24244 14.1387 6.96733C14.0319 6.6918 13.8194 6.45719 13.5275 6.32842C13.3429 6.247 13.1485 6.21776 12.9608 6.23409C13.0274 6.32105 13.0811 6.41673 13.1203 6.51804Z" fill="#FFCBBE"/>
+<path d="M21.1416 8.27269C21.0344 7.99699 20.8223 7.76255 20.5303 7.63377C20.3457 7.55235 20.1513 7.52316 19.9636 7.53953C20.0301 7.62649 20.0837 7.72213 20.1231 7.8234C20.2304 8.0991 20.2322 8.41483 20.1037 8.70619L17.2515 15.1713C17.102 15.5102 16.7231 15.686 16.3689 15.5776C15.1754 15.2122 13.3924 15.1243 12.5647 17.0007C11.6818 19.0018 13.3307 19.8367 13.3307 19.8367L13.7693 20.0326C14.9499 20.5535 16.3289 20.0203 16.8488 18.842L21.1221 9.15548C21.2507 8.86412 21.2488 8.54839 21.1416 8.27269Z" fill="#FFCBBE"/>
+<path d="M14.0754 16.7326C14.8301 16.2038 15.3009 16.203 16.2573 16.2547C16.5879 16.2725 17.1315 16.1379 17.3359 15.8777L19.3641 12.8099C19.8043 12.2496 20.616 12.1527 21.1758 12.5935C21.7348 13.0337 21.8308 13.8434 21.3901 14.402L18.8737 18.2526C18.8737 18.2526 17.9272 19.6558 16.9484 20.0884C15.5668 20.6991 13.919 20.3242 13.0262 19.5722C13.0262 19.5722 12.8878 19.3576 13.0925 18.2919C13.2237 17.6089 14.0754 16.7326 14.0754 16.7326Z" fill="#FFDDCE"/>
+<path d="M21.1759 12.5933C20.874 12.3556 20.4991 12.2745 20.1486 12.3378C20.5354 12.7953 20.5607 13.4764 20.1751 13.9651L17.6587 17.8158C17.6587 17.8158 16.7122 19.2189 15.7334 19.6515C15.0065 19.9729 14.206 20.0211 13.4805 19.8853C14.4122 20.4147 15.7761 20.6063 16.9485 20.0881C17.9273 19.6555 18.8737 18.2523 18.8737 18.2523L21.3902 14.4017C21.8308 13.8432 21.7349 13.0335 21.1759 12.5933Z" fill="#FFCBBE"/>
+<path d="M14.2333 4.09028H7.43247C6.34901 4.09028 5.4707 3.21197 5.4707 2.12851C5.4707 1.04505 6.34901 0.166748 7.43247 0.166748H14.2333C15.3167 0.166748 16.195 1.04505 16.195 2.12851C16.195 3.21197 15.3167 4.09028 14.2333 4.09028Z" fill="#5C90B9"/>
+<path d="M14.2336 0.166748H12.9258C14.0092 0.166748 14.8875 1.04505 14.8875 2.12851C14.8875 3.21197 14.0092 4.09028 12.9258 4.09028H14.2336C15.3171 4.09028 16.1954 3.21197 16.1954 2.12851C16.1954 1.04505 15.3171 0.166748 14.2336 0.166748Z" fill="#4A80AA"/>
+<path d="M10.8338 4.09028C11.92 4.09028 12.8004 3.21197 12.8004 2.12851C12.8004 1.04506 11.92 0.166748 10.8338 0.166748C9.74768 0.166748 8.86719 1.04506 8.86719 2.12851C8.86719 3.21197 9.74768 4.09028 10.8338 4.09028Z" fill="#FFD064"/>
+<path d="M10.8329 4.09028C11.9163 4.09028 12.7946 3.21197 12.7946 2.12851C12.7946 1.04506 11.9163 0.166748 10.8329 0.166748C9.74941 0.166748 8.87109 1.04506 8.87109 2.12851C8.87109 3.21197 9.74941 4.09028 10.8329 4.09028Z" fill="#FFD064"/>
+<path d="M10.834 2.78329C11.1954 2.78329 11.4884 2.49033 11.4884 2.12895C11.4884 1.76757 11.1954 1.47461 10.834 1.47461C10.4726 1.47461 10.1797 1.76757 10.1797 2.12895C10.1797 2.49033 10.4726 2.78329 10.834 2.78329Z" fill="#5C90B9"/>
+</svg>
diff --git a/assets/icons/motion_detection_sensitivity_value_icon.svg b/assets/icons/motion_detection_sensitivity_value_icon.svg
new file mode 100644
index 00000000..21bebd7a
--- /dev/null
+++ b/assets/icons/motion_detection_sensitivity_value_icon.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.72751C16.7022 7.47106 16.444 7.24286 16.1963 7.34188L15.166 7.75403C16.1394 3.617 13.6255 1.13192 12.3309 0.160156L11.9303 0.68629C12.295 4.20985 10.8697 6.77552 10.8697 6.77552L9.6861 6.06286C7.63047 8.86439 7.26813 11.637 7.26813 11.637L6.22457 10.9497L5.84278 15.599L4.19531 17.1113C4.19531 17.1113 9.12215 19.2668 13.862 14.8542C14.0281 14.6996 13.9924 14.4272 13.7895 14.3258L12.2619 13.562C13.7729 12.6635 15.8697 10.3879 16.629 7.72751Z" fill="#1479FF"/>
+<path d="M6.94955 12.0658C7.20748 12.3235 7.64893 12.1695 7.69061 11.8073L7.74029 11.3759C7.74315 11.3515 8.03272 8.98838 9.75631 6.48396L10.3884 7.11599C10.5932 7.32076 10.9371 7.27255 11.0777 7.01939L11.2124 6.77685C11.2795 6.65646 12.7674 3.91306 12.3306 0.160279C12.2926 0.131763 12.2554 0.104185 12.2196 0.0782866C11.9917 -0.0867917 11.68 0.0943414 11.709 0.374303C12.0737 3.89786 10.6483 6.46353 10.6483 6.46353L9.94327 5.75849C9.80448 5.6197 9.57174 5.63474 9.45561 5.79298C7.40002 8.59451 7.099 11.3035 7.099 11.3035L6.50061 10.7051C6.32693 10.5315 6.03064 10.6084 5.96029 10.8437C5.23283 13.2767 5.71564 15.7659 5.71564 15.7659L5.71514 15.7664L6.34936 15.6438C6.34525 15.6222 5.97377 13.6265 6.44041 11.5575L6.94955 12.0658Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.00624C13.3141 5.83764 13.224 5.65428 13.0554 5.59659C12.8865 5.5394 12.7031 5.62905 12.6457 5.7976C11.8359 8.16772 10.4981 10.2792 8.9927 12.0909C8.98586 10.3632 9.52113 9.3046 9.5316 9.28437C9.61414 9.12683 9.55367 8.93194 9.39641 8.8489C9.23793 8.76601 9.04348 8.82636 8.96031 8.98394C8.92824 9.04499 8.19051 10.4827 8.37992 12.7999C4.65574 16.9746 0.236005 19.3733 0.170849 19.408C0.0136223 19.492 -0.0459481 19.6873 0.0381926 19.8446C0.0961615 19.9534 0.207724 20.0154 0.323037 20.0154C0.374404 20.0154 0.426084 20.0032 0.474599 19.9774C0.530303 19.9477 3.69996 18.2289 6.9675 15.1631C7.06207 15.1709 7.47437 15.2031 7.91512 15.2031C8.76023 15.2031 10.083 15.1232 11.1436 14.6989C11.3091 14.6326 11.3897 14.4449 11.3236 14.2793C11.2574 14.1139 11.068 14.034 10.9041 14.0996C9.80613 14.5389 8.34164 14.5695 7.6 14.552C9.86817 12.3043 12.09 9.41976 13.2564 6.00624Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/motionless_detection_sensitivity_icon.svg b/assets/icons/motionless_detection_sensitivity_icon.svg
new file mode 100644
index 00000000..a1dc2926
--- /dev/null
+++ b/assets/icons/motionless_detection_sensitivity_icon.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8334 21.8334C7.93969 21.8334 5.21921 20.7065 3.17302 18.6604C1.12688 16.6143 0 13.8938 0 11.0001C0 8.10644 1.12688 5.38596 3.17298 3.33977C5.21921 1.29363 7.93961 0.166748 10.8334 0.166748C13.727 0.166748 16.4475 1.29363 18.4936 3.33977C20.5398 5.38596 21.6667 8.1064 21.6667 11.0001C21.6667 13.8939 20.5397 16.6143 18.4936 18.6605C16.4475 20.7067 13.727 21.8334 10.8334 21.8334ZM10.8334 3.12052C6.48853 3.12052 2.95378 6.65528 2.95378 11.0001C2.95378 15.345 6.48853 18.8797 10.8334 18.8797C15.1782 18.8797 18.713 15.3449 18.713 11.0001C18.713 6.65532 15.1781 3.12052 10.8334 3.12052Z" fill="#7DD2F0"/>
+<g opacity="0.1">
+<path d="M5.14215 18.6604C3.09605 16.6143 1.96917 13.8938 1.96917 11.0001C1.96917 8.1064 3.09605 5.38592 5.14215 3.33981C6.95445 1.52752 9.29585 0.437158 11.8179 0.211393C11.4924 0.182194 11.1641 0.166748 10.8334 0.166748C7.93969 0.166748 5.21921 1.29363 3.17302 3.33977C1.12688 5.38588 0 8.1064 0 11C0 13.8937 1.12688 16.6142 3.17298 18.6603C5.21913 20.7065 7.93961 21.8334 10.8333 21.8334C11.164 21.8334 11.4924 21.818 11.8179 21.7888C9.29585 21.563 6.95449 20.4726 5.14215 18.6604Z" fill="black"/>
+</g>
+</svg>
diff --git a/assets/icons/presence_state.svg b/assets/icons/presence_state.svg
new file mode 100644
index 00000000..0c5ad042
--- /dev/null
+++ b/assets/icons/presence_state.svg
@@ -0,0 +1,18 @@
+<svg width="22" height="20" viewBox="0 0 22 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8333 1.71851L0.472669 15.9196C-0.702346 17.5301 0.447998 19.7934 2.44166 19.7934H19.225C21.2187 19.7934 22.369 17.5301 21.194 15.9196L10.8333 1.71851Z" fill="#F1FAFF"/>
+<path d="M21.1931 15.9183L10.8333 1.71851L9.06055 4.14839L17.6475 15.9183C18.8229 17.5294 17.6722 19.7933 15.6779 19.7933H19.2235C21.2178 19.7934 22.3685 17.5294 21.1931 15.9183Z" fill="#C7EEFB"/>
+<path d="M12.9102 6.05994H8.76926C7.63838 6.05994 6.72168 5.14319 6.72168 4.01236V2.12199C6.72168 2.00515 6.81643 1.9104 6.93327 1.9104H14.7463C14.8631 1.9104 14.9579 2.00515 14.9579 2.12199V4.01236C14.9579 5.14319 14.0411 6.05994 12.9102 6.05994Z" fill="#E0DDE2"/>
+<path d="M14.748 1.9104H13.5893V2.63688C13.5893 3.77034 12.6704 4.6892 11.537 4.6892H7.40546C7.19886 4.6892 6.99959 4.65835 6.81152 4.6016C7.06628 5.44539 7.84934 6.05998 8.77624 6.05998H12.9078C14.0412 6.05998 14.9601 5.14112 14.9601 4.00766V2.12246C14.9601 2.00536 14.8651 1.9104 14.748 1.9104Z" fill="#C8C1C9"/>
+<path d="M16.3024 2.66033H5.37858C5.26174 2.66033 5.16699 2.56558 5.16699 2.44874V0.41838C5.16699 0.301538 5.26174 0.206787 5.37858 0.206787H16.3024C16.4192 0.206787 16.514 0.301538 16.514 0.41838V2.44874C16.514 2.56562 16.4193 2.66033 16.3024 2.66033Z" fill="#E0DDE2"/>
+<path d="M16.3019 0.206787H15.0629V0.997127C15.0629 1.11426 14.9679 1.20923 14.8508 1.20923H5.16699V2.44827C5.16699 2.56541 5.26195 2.66037 5.37909 2.66037H16.3019C16.4191 2.66037 16.514 2.56541 16.514 2.44827V0.418887C16.514 0.30175 16.4191 0.206787 16.3019 0.206787Z" fill="#C8C1C9"/>
+<path d="M10.841 4.82612C11.141 4.82612 11.3842 4.58293 11.3842 4.28294C11.3842 3.98294 11.141 3.73975 10.841 3.73975C10.541 3.73975 10.2979 3.98294 10.2979 4.28294C10.2979 4.58293 10.541 4.82612 10.841 4.82612Z" fill="#FA2A3B"/>
+<path d="M10.7136 10.264C11.2545 10.264 11.6929 9.82553 11.6929 9.28469C11.6929 8.74385 11.2545 8.30542 10.7136 8.30542C10.1728 8.30542 9.73438 8.74385 9.73438 9.28469C9.73438 9.82553 10.1728 10.264 10.7136 10.264Z" fill="#62D8F9"/>
+<path d="M10.7138 8.30566C10.6442 8.30566 10.5762 8.31307 10.5107 8.32686C10.9541 8.42039 11.2869 8.81373 11.2869 9.28494C11.2869 9.75614 10.9541 10.1495 10.5107 10.243C10.5763 10.2568 10.6442 10.2642 10.7138 10.2642C11.2546 10.2642 11.6931 9.82576 11.6931 9.28494C11.6931 8.74412 11.2547 8.30566 10.7138 8.30566Z" fill="#00BEF7"/>
+<path d="M14.1217 13.3881L12.4086 13.1096L11.4778 11.3116C11.3944 11.1236 11.2634 10.8661 10.9741 10.78L9.88702 10.4538C9.76776 10.4247 9.65308 10.4141 9.4497 10.446L7.13145 10.9844C6.99264 11.0167 6.86865 11.0946 6.7794 11.2057L5.54163 12.7463C5.32157 13.0202 5.3652 13.4207 5.63913 13.6408C5.75661 13.7352 5.89736 13.7811 6.03718 13.7811C6.22338 13.7811 6.40789 13.6997 6.53357 13.5433L7.6336 12.1741L8.72165 11.9215L8.08273 14.0507C8.07045 14.0866 8.06652 14.1328 8.04896 14.234L7.68849 16.7928L6.00734 18.2515C5.74192 18.4818 5.71344 18.8836 5.94374 19.149C6.06959 19.294 6.24657 19.3683 6.4246 19.3683C6.57238 19.3683 6.72087 19.3171 6.84127 19.2126L8.70227 17.598C8.81826 17.4973 8.89393 17.3582 8.91534 17.2062L9.21009 15.114L9.24932 15.1257L10.8419 16.9844L11.7847 19.0313C11.892 19.2643 12.1223 19.4016 12.363 19.4016C12.452 19.4016 12.5425 19.3828 12.6287 19.343C12.9479 19.196 13.0874 18.8181 12.9405 18.499L11.9606 16.3716C11.936 16.3182 11.9042 16.2685 11.8659 16.2238L10.5325 14.6676L10.9911 13.1393L11.4257 13.9789C11.5183 14.1577 11.69 14.282 11.8886 14.3143L13.9174 14.6441C13.952 14.6497 13.9864 14.6524 14.0203 14.6524C14.3267 14.6524 14.5968 14.4304 14.6475 14.1182C14.7039 13.7713 14.4685 13.4445 14.1217 13.3881Z" fill="#62D8F9"/>
+<path d="M8.99707 10.5511C9.20045 10.5192 9.31454 10.5321 9.4338 10.5611L10.5209 10.8873C10.8102 10.9735 10.9411 11.231 11.0245 11.419L12.0585 13.4273C12.085 13.4787 12.1345 13.5144 12.1917 13.5232L14.645 13.9017C14.5979 13.6445 14.3947 13.4324 14.1218 13.3881L12.4088 13.1096L11.4779 11.3116C11.3945 11.1236 11.2635 10.8661 10.9742 10.78L9.88716 10.4538C9.7679 10.4247 9.65322 10.4141 9.44984 10.446L8.99707 10.5511Z" fill="#00BEF7"/>
+<path d="M11.9615 16.3715C11.9369 16.3181 11.905 16.2684 11.8667 16.2237L10.5333 14.6676L10.9919 13.1396L10.9337 13.0271C10.8579 12.8807 10.6424 12.9008 10.595 13.0587L10.1416 14.5696C10.1032 14.6976 10.1325 14.8363 10.2194 14.9377L11.4134 16.3311C11.4516 16.3758 11.4835 16.4256 11.5081 16.4789L12.4879 18.6063C12.6191 18.8912 12.5216 19.2223 12.2723 19.3948C12.3025 19.3992 12.3331 19.4015 12.3638 19.4015C12.4528 19.4015 12.5433 19.3827 12.6295 19.343C12.9487 19.196 13.0882 18.8181 12.9413 18.499L11.9615 16.3715Z" fill="#00BEF7"/>
+<path d="M3.47827 18.4406C3.31064 18.4406 3.17032 18.3095 3.16092 18.1401C3.08839 16.833 4.09282 15.7105 5.39991 15.6379C5.57574 15.6288 5.72551 15.7624 5.7352 15.9379C5.74493 16.1133 5.61065 16.2634 5.4352 16.2732C4.47834 16.3263 3.74305 17.148 3.79616 18.1048C3.8059 18.2802 3.67162 18.4304 3.49617 18.4401C3.4902 18.4404 3.48419 18.4406 3.47827 18.4406Z" fill="#00BEF7"/>
+<path d="M4.76838 18.4539C4.60076 18.4539 4.46044 18.3228 4.45104 18.1534C4.41524 17.5085 4.91082 16.9547 5.5557 16.9189C5.73081 16.9093 5.88121 17.0435 5.89094 17.219C5.90068 17.3944 5.76636 17.5445 5.59091 17.5542C5.29634 17.5706 5.06994 17.8236 5.08627 18.1182C5.09601 18.2936 4.96169 18.4437 4.78624 18.4535C4.78032 18.4537 4.77431 18.4539 4.76838 18.4539Z" fill="#00BEF7"/>
+<path d="M17.0106 13.6226C17.0076 13.6226 17.0046 13.6226 17.0016 13.6225C16.826 13.6176 16.6876 13.4712 16.6925 13.2956C16.7191 12.3377 15.9615 11.5366 15.0036 11.5099C14.828 11.505 14.6896 11.3587 14.6945 11.183C14.6994 11.0074 14.8466 10.8691 15.0213 10.8739C16.3299 10.9103 17.365 12.0047 17.3285 13.3134C17.3237 13.4859 17.1822 13.6226 17.0106 13.6226Z" fill="#00BEF7"/>
+<path d="M15.7216 13.6714C15.7186 13.6714 15.7156 13.6713 15.7126 13.6712C15.537 13.6663 15.3986 13.52 15.4035 13.3444C15.4075 13.2015 15.3555 13.0656 15.2574 12.9618C15.1591 12.8579 15.0263 12.7985 14.8835 12.7946C14.7079 12.7897 14.5695 12.6433 14.5743 12.4677C14.5793 12.2921 14.724 12.1534 14.9012 12.1586C15.214 12.1673 15.5046 12.2973 15.7196 12.5246C15.9346 12.752 16.0482 13.0494 16.0395 13.3621C16.0346 13.5347 15.8932 13.6714 15.7216 13.6714Z" fill="#00BEF7"/>
+</svg>
diff --git a/assets/icons/presence_time_icon.svg b/assets/icons/presence_time_icon.svg
new file mode 100644
index 00000000..d1c22e03
--- /dev/null
+++ b/assets/icons/presence_time_icon.svg
@@ -0,0 +1,29 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.18147 12.617H0.352631C0.157897 12.617 0 12.4719 0 12.2928C0 12.1137 0.157897 11.9685 0.352631 11.9685H5.18147C5.37624 11.9685 5.5341 12.1137 5.5341 12.2928C5.5341 12.4719 5.37624 12.617 5.18147 12.617Z" fill="#C5D3DD"/>
+<path d="M5.37006 14.6529H1.70029C1.50555 14.6529 1.34766 14.5077 1.34766 14.3287C1.34766 14.1496 1.50555 14.0044 1.70029 14.0044H5.3701C5.56483 14.0044 5.72273 14.1496 5.72273 14.3287C5.72269 14.5077 5.56483 14.6529 5.37006 14.6529Z" fill="#C5D3DD"/>
+<path d="M6.10302 16.3546H3.87607C3.68133 16.3546 3.52344 16.2094 3.52344 16.0303C3.52344 15.8512 3.68133 15.7061 3.87607 15.7061H6.10302C6.29775 15.7061 6.45565 15.8512 6.45565 16.0303C6.45565 16.2094 6.29779 16.3546 6.10302 16.3546Z" fill="#C5D3DD"/>
+<path d="M5.70018 10.5809H2.03037C1.83563 10.5809 1.67773 10.4357 1.67773 10.2566C1.67773 10.0776 1.83563 9.93237 2.03037 9.93237H5.70018C5.89495 9.93237 6.05281 10.0776 6.05281 10.2566C6.05281 10.4358 5.89491 10.5809 5.70018 10.5809Z" fill="#C5D3DD"/>
+<path d="M6.43505 8.87901H4.2081C4.01332 8.87901 3.85547 8.73382 3.85547 8.55474C3.85547 8.37565 4.01337 8.23047 4.2081 8.23047H6.43505C6.62978 8.23047 6.78768 8.37565 6.78768 8.55474C6.78768 8.73382 6.62978 8.87901 6.43505 8.87901Z" fill="#C5D3DD"/>
+<path d="M9.54009 6.56555L7.89129 4.64779C7.77455 4.51203 7.56983 4.4965 7.43398 4.61333L6.40778 5.4956C6.34258 5.55167 6.30233 5.63136 6.29584 5.71709C6.28936 5.80283 6.31725 5.88766 6.37332 5.9529L8.02212 7.87067C8.08624 7.94525 8.17695 7.98351 8.26813 7.98351C8.34297 7.98351 8.4182 7.95775 8.47938 7.90513L9.50559 7.02286C9.57078 6.96678 9.61104 6.8871 9.61752 6.80136C9.62405 6.71558 9.59616 6.63075 9.54009 6.56555Z" fill="#FEDF30"/>
+<path d="M8.57688 4.05987L7.88066 3.25006C7.76388 3.1143 7.5592 3.09882 7.42335 3.2156L5.02887 5.27423C4.96367 5.33031 4.92341 5.40999 4.91693 5.49573C4.91049 5.58147 4.93833 5.6663 4.99441 5.73154L5.69063 6.54135C5.75475 6.61593 5.84542 6.65419 5.93664 6.65419C6.01149 6.65419 6.08672 6.62842 6.1479 6.5758L8.54238 4.51718C8.60758 4.4611 8.64783 4.38142 8.65432 4.29568C8.6608 4.2099 8.63292 4.12507 8.57688 4.05987Z" fill="#D7AA02"/>
+<path d="M20.2699 5.71709C20.2634 5.63135 20.2231 5.55167 20.1579 5.49559L19.1317 4.61332C18.9959 4.49654 18.7912 4.51198 18.6744 4.64778L17.0256 6.56555C16.9696 6.63075 16.9417 6.71558 16.9482 6.80136C16.9547 6.8871 16.9949 6.96678 17.0601 7.02286L18.0863 7.90513C18.1476 7.95774 18.2227 7.98351 18.2976 7.98351C18.3888 7.98351 18.4795 7.94525 18.5436 7.87067L20.1924 5.9529C20.2485 5.88766 20.2763 5.80287 20.2699 5.71709Z" fill="#FEDF30"/>
+<path d="M21.5385 5.27382L19.144 3.21519C19.0788 3.15912 18.994 3.13093 18.9082 3.13771C18.8225 3.14416 18.7428 3.18445 18.6867 3.24965L17.9905 4.05946C17.8737 4.19526 17.8892 4.39998 18.025 4.51672L20.4195 6.57535C20.4785 6.62611 20.5536 6.65374 20.6309 6.65374C20.6391 6.65374 20.6472 6.65343 20.6553 6.65283C20.7411 6.64634 20.8207 6.60609 20.8768 6.54085L21.573 5.73104C21.6898 5.59532 21.6743 5.39056 21.5385 5.27382Z" fill="#D7AA02"/>
+<path d="M12.3359 2.71826H14.3258V5.56015H12.3359V2.71826Z" fill="#0055A3"/>
+<path d="M14.5486 0.899902H10.8925C10.5495 0.899902 10.2715 1.17795 10.2715 1.52094V2.27541C10.2715 2.6184 10.5495 2.89645 10.8925 2.89645H14.529L15.412 2.65843V1.153L14.5486 0.899902Z" fill="#0473CE"/>
+<path d="M15.7658 0.899902H14.4688C14.8117 0.899902 15.0898 1.17795 15.0898 1.52094V2.27541C15.0898 2.6184 14.8117 2.89645 14.4688 2.89645H15.7658C16.1088 2.89645 16.3869 2.6184 16.3869 2.27541V1.52094C16.3869 1.17795 16.1088 0.899902 15.7658 0.899902Z" fill="#0055A3"/>
+<path d="M11.1894 20.8213C6.73857 19.6401 4.08809 15.0744 5.26933 10.6236C6.22178 7.03487 9.37457 4.61661 12.8933 4.43364C13.7386 4.38971 21.1366 5.74662 21.1366 12.5075C21.1366 17.4616 16.6175 21.3883 12.6796 21.0765C12.1846 21.0373 11.6863 20.9532 11.1894 20.8213Z" fill="#26A6FE"/>
+<path d="M13.3282 4.42456C13.11 4.42456 12.8937 4.43303 12.6797 4.44951C16.9815 4.78048 20.369 8.37579 20.369 12.7625C20.369 17.1491 16.9814 20.7444 12.6797 21.0754C12.8937 21.0919 13.11 21.1003 13.3282 21.1003C17.9331 21.1003 21.6661 17.3674 21.6661 12.7625C21.6661 8.15754 17.9331 4.42456 13.3282 4.42456Z" fill="#0593FC"/>
+<path d="M13.3291 19.2553C16.9152 19.2553 19.8222 16.3483 19.8222 12.7622C19.8222 9.17613 16.9152 6.26904 13.3291 6.26904C9.74302 6.26904 6.83594 9.17613 6.83594 12.7622C6.83594 16.3483 9.74302 19.2553 13.3291 19.2553Z" fill="#FFF3EF"/>
+<path d="M14.167 6.32385C13.6602 6.25778 13.1594 6.25229 12.6719 6.30141C12.7378 6.30798 12.8038 6.31524 12.8699 6.32385C16.426 6.78721 18.933 10.0456 18.4696 13.6016C18.0723 16.6508 15.6199 18.9285 12.687 19.2238C16.1652 19.5707 19.3119 17.0915 19.7667 13.6016C20.2301 10.0456 17.723 6.78721 14.167 6.32385Z" fill="#F1F0F0"/>
+<path d="M13.3291 8.12532C13.1625 8.12532 13.0273 7.99021 13.0273 7.82353V6.98977C13.0273 6.8231 13.1625 6.68799 13.3291 6.68799C13.4958 6.68799 13.6309 6.8231 13.6309 6.98977V7.82353C13.6309 7.99021 13.4958 8.12532 13.3291 8.12532Z" fill="#B6C4CF"/>
+<path d="M16.8487 9.56667C16.7714 9.56667 16.6942 9.53722 16.6353 9.47829C16.5174 9.36043 16.5174 9.16937 16.6353 9.05151L17.2249 8.46195C17.3427 8.34404 17.5337 8.34409 17.6517 8.46195C17.7695 8.57981 17.7695 8.77087 17.6516 8.88873L17.062 9.47829C17.0031 9.53718 16.9259 9.56667 16.8487 9.56667Z" fill="#B6C4CF"/>
+<path d="M19.1512 13.0738H18.3174C18.1507 13.0738 18.0156 12.9387 18.0156 12.772C18.0156 12.6053 18.1507 12.4702 18.3174 12.4702H19.1512C19.3178 12.4702 19.453 12.6053 19.453 12.772C19.453 12.9387 19.3178 13.0738 19.1512 13.0738Z" fill="#B6C4CF"/>
+<path d="M17.4656 17.1814C17.3884 17.1814 17.3111 17.1519 17.2522 17.093L16.6626 16.5035C16.5448 16.3856 16.5448 16.1945 16.6626 16.0767C16.7805 15.9588 16.9715 15.9588 17.0894 16.0767L17.679 16.6662C17.7969 16.7841 17.7969 16.9752 17.679 17.093C17.6201 17.152 17.5428 17.1814 17.4656 17.1814Z" fill="#B6C4CF"/>
+<path d="M13.3682 18.8934C13.2015 18.8934 13.0664 18.7583 13.0664 18.5916V17.7578C13.0664 17.5912 13.2015 17.4561 13.3682 17.4561C13.5349 17.4561 13.67 17.5912 13.67 17.7578V18.5916C13.67 18.7583 13.5349 18.8934 13.3682 18.8934Z" fill="#B6C4CF"/>
+<path d="M9.26075 17.2073C9.18353 17.2073 9.10627 17.1779 9.04738 17.1189C8.92952 17.001 8.92952 16.81 9.04738 16.6921L9.63694 16.1026C9.7548 15.9847 9.94586 15.9847 10.0637 16.1026C10.1816 16.2204 10.1816 16.4115 10.0637 16.5293L9.47416 17.1189C9.41523 17.1778 9.33797 17.2073 9.26075 17.2073Z" fill="#B6C4CF"/>
+<path d="M8.38164 13.1114H7.54788C7.38121 13.1114 7.24609 12.9763 7.24609 12.8096C7.24609 12.6429 7.38121 12.5078 7.54788 12.5078H8.38164C8.54831 12.5078 8.68342 12.6429 8.68342 12.8096C8.68342 12.9763 8.54831 13.1114 8.38164 13.1114Z" fill="#B6C4CF"/>
+<path d="M9.82297 9.59328C9.74575 9.59328 9.66849 9.56383 9.6096 9.5049L9.02004 8.91534C8.90218 8.79748 8.90218 8.60642 9.02004 8.48856C9.1379 8.3707 9.32896 8.37065 9.44682 8.48856L10.0364 9.07812C10.1542 9.19598 10.1542 9.38704 10.0364 9.5049C9.97745 9.56383 9.90019 9.59328 9.82297 9.59328Z" fill="#B6C4CF"/>
+<path d="M13.3282 12.6168C13.149 12.6168 13.0039 12.4717 13.0039 12.2926V10.1121C13.0039 9.93303 13.149 9.78784 13.3282 9.78784C13.5073 9.78784 13.6524 9.93303 13.6524 10.1121V12.2926C13.6524 12.4717 13.5073 12.6168 13.3282 12.6168Z" fill="#678D98"/>
+<path d="M16.0561 15.7395C15.9731 15.7395 15.8901 15.7078 15.8268 15.6445L13.4661 13.2838C13.3394 13.1571 13.3394 12.9518 13.4661 12.8252C13.5928 12.6986 13.7981 12.6986 13.9247 12.8252L16.2854 15.1859C16.412 15.3126 16.412 15.5179 16.2854 15.6445C16.2221 15.7078 16.1391 15.7395 16.0561 15.7395Z" fill="#678D98"/>
+<path d="M13.3724 13.3816C13.0131 13.3816 12.7207 13.0893 12.7207 12.73C12.7207 12.3707 13.013 12.0784 13.3724 12.0784C13.7316 12.0784 14.024 12.3707 14.024 12.73C14.024 13.0893 13.7316 13.3816 13.3724 13.3816Z" fill="#3E5959"/>
+</svg>
diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index e71d5af8..0a3b346c 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 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/wps/wps_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/enum/device_types.dart';
 
@@ -148,7 +149,9 @@ class AllDevicesModel {
 
     productName = json['productName']?.toString();
     if (json['spaces'] != null && json['spaces'] is List) {
-      spaces = (json['spaces'] as List).map((space) => DeviceSpaceModel.fromJson(space)).toList();
+      spaces = (json['spaces'] as List)
+          .map((space) => DeviceSpaceModel.fromJson(space))
+          .toList();
     }
   }
 
@@ -196,7 +199,8 @@ SOS
     String tempIcon = '';
     if (type == DeviceType.LightBulb) {
       tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor ||
+        type == DeviceType.WallSensor) {
       tempIcon = Assets.sensors;
     } else if (type == DeviceType.AC) {
       tempIcon = Assets.ac;
@@ -226,6 +230,8 @@ SOS
       //  tempIcon = Assets.gang3touch;
     } else if (type == DeviceType.WaterLeak) {
       tempIcon = Assets.waterLeakNormal;
+    } else if (type == DeviceType.WaterLeak) {
+      tempIcon = Assets.waterLeakNormal;
     } else {
       tempIcon = Assets.logoHorizontal;
     }
@@ -252,27 +258,62 @@ SOS
       case '1G':
         return [
           OneGangSwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          OneGangCountdownFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          OneGangCountdownFunction(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '2G':
         return [
           TwoGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
           TwoGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '3G':
         return [
-          ThreeGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangSwitch3Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ThreeGangCountdown3Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangSwitch1Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangSwitch2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangSwitch3Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          ThreeGangCountdown3Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
+      case 'WPS':
+        return [
+          //IF Functions
+          PresenceStateFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          CurrentDistanceFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          IlluminanceValueFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          PresenceTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
 
+          //THEN Functions
+          FarDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          MotionSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          MotionLessSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          IndicatorFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          NoOneTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+
+          // FarDetectionSliderFunction(
+          //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')
+        ];
       default:
         return [];
     }
diff --git a/lib/pages/device_managment/water_heater/widgets/count_down_inching_view.dart b/lib/pages/device_managment/water_heater/widgets/count_down_inching_view.dart
index 53892c20..9c28d4d6 100644
--- a/lib/pages/device_managment/water_heater/widgets/count_down_inching_view.dart
+++ b/lib/pages/device_managment/water_heater/widgets/count_down_inching_view.dart
@@ -95,6 +95,77 @@ class CountdownInchingView extends StatelessWidget {
     );
   }
 
+  Row _hourMinutesSecondWheel(
+      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
+    final isCountDown =
+        state.scheduleMode?.name == ScheduleModes.countdown.name;
+    late bool isActive;
+    if (isCountDown &&
+        state.countdownRemaining != null &&
+        state.isCountdownActive == true) {
+      isActive = true;
+    } else if (!isCountDown &&
+        state.countdownRemaining != null &&
+        state.isInchingActive == true) {
+      isActive = true;
+    } else {
+      isActive = false;
+    }
+
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        _buildPickerColumn(
+            context,
+            'h',
+            isCountDown
+                ? (state.countdownHours ?? 0)
+                : (state.inchingHours ?? 0),
+            24, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: value,
+                minutes: isCountDown
+                    ? (state.countdownMinutes ?? 0)
+                    : (state.inchingMinutes ?? 0),
+              ));
+        }, isActive: isActive),
+        const SizedBox(width: 10),
+        _buildPickerColumn(
+            context,
+            'm',
+            isCountDown
+                ? (state.countdownMinutes ?? 0)
+                : (state.inchingMinutes ?? 0),
+            60, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: isCountDown
+                    ? (state.countdownHours ?? 0)
+                    : (state.inchingHours ?? 0),
+                minutes: value,
+              ));
+        }, isActive: isActive),
+        const SizedBox(width: 10),
+        _buildPickerColumn(
+            context,
+            'S',
+            isCountDown
+                ? (state.countdownMinutes ?? 0)
+                : (state.inchingMinutes ?? 0),
+            60, (value) {
+          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
+                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
+                hours: isCountDown
+                    ? (state.countdownHours ?? 0)
+                    : (state.inchingHours ?? 0),
+                minutes: value,
+              ));
+        }, isActive: isActive),
+      ],
+    );
+  }
+
   Widget _buildPickerColumn(
     BuildContext context,
     String label,
diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index 933b35d7..48eaedb9 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -6,21 +6,24 @@ 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/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
 
 class DeviceDialogHelper {
-  static Future<Map<String, dynamic>?> showDeviceDialog(
-    BuildContext context,
-    Map<String, dynamic> data, {
+  static Future<Map<String, dynamic>?> showDeviceDialog({
+    required BuildContext context,
+    required String dialogType,
+    required Map<String, dynamic> data,
     required bool removeComparetors,
   }) async {
     final functions = data['functions'] as List<DeviceFunction>;
 
     try {
       final result = await _getDialogForDeviceType(
-        context,
-        data['productType'],
-        data,
-        functions,
+        dialogType: dialogType,
+        context: context,
+        productType: data['productType'],
+        data: data,
+        functions: functions,
         removeComparetors: removeComparetors,
       );
 
@@ -34,32 +37,66 @@ class DeviceDialogHelper {
     return null;
   }
 
-  static Future<Map<String, dynamic>?> _getDialogForDeviceType(BuildContext context,
-      String productType, Map<String, dynamic> data, List<DeviceFunction> functions,
-      {required bool removeComparetors}) async {
+  static Future<Map<String, dynamic>?> _getDialogForDeviceType({
+    required String dialogType,
+    required BuildContext context,
+    required String productType,
+    required Map<String, dynamic> data,
+    required List<DeviceFunction> functions,
+    required bool removeComparetors,
+  }) async {
     final routineBloc = context.read<RoutineBloc>();
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
-    if (removeComparetors) {
+    if (removeComparetors && data['productType'] != 'WPS') {
       //remove the current temp function in the 'if container'
       functions.removeAt(3);
     }
 
     switch (productType) {
       case 'AC':
-        return ACHelper.showACFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
+        return ACHelper.showACFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
 
       case '1G':
-        return OneGangSwitchHelper.showSwitchFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
+        return OneGangSwitchHelper.showSwitchFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
       case '2G':
-        return TwoGangSwitchHelper.showSwitchFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
+        return TwoGangSwitchHelper.showSwitchFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
       case '3G':
-        return ThreeGangSwitchHelper.showSwitchFunctionsDialog(context, functions, data['device'],
-            deviceSelectedFunctions, data['uniqueCustomId'], removeComparetors);
+        return ThreeGangSwitchHelper.showSwitchFunctionsDialog(
+            context,
+            functions,
+            data['device'],
+            deviceSelectedFunctions,
+            data['uniqueCustomId'],
+            removeComparetors);
+      case 'WPS':
+        return WallPresenceSensor.showWPSFunctionsDialog(
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
       default:
         return null;
     }
diff --git a/lib/pages/routines/models/wps/wps_functions.dart b/lib/pages/routines/models/wps/wps_functions.dart
new file mode 100644
index 00000000..d090686a
--- /dev/null
+++ b/lib/pages/routines/models/wps/wps_functions.dart
@@ -0,0 +1,290 @@
+
+
+import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+abstract class WpsFunctions extends DeviceFunction<WallSensorModel> {
+  final String type; 
+
+  WpsFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+    required this.type,
+  });
+
+  List<WpsOperationalValue> getOperationalValues();
+}
+
+// For far_detection (75-600cm in 75cm steps)
+class FarDetectionFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  FarDetectionFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : min = 75,
+        max = 600,
+        step = 75,
+        unit = 'cm',
+        super(
+          type: type,
+          code: 'far_detection',
+          operationName: 'Far Detection',
+          icon: Assets.farDetectionIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    final values = <WpsOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(WpsOperationalValue(
+        icon: Assets.currentDistanceIcon,
+        description: '$value $unit',
+        value: value,
+      ));
+    }
+    return values;
+  }
+}
+
+// For presence_time (0-65535 minutes)
+class PresenceTimeFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  PresenceTimeFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : min = 0,
+        max = 65535,
+        step = 1,
+        unit = 'Min',
+        super(
+          type: type,
+          code: 'presence_time',
+          operationName: 'Presence Time',
+          icon: Assets.presenceTimeIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    return [
+      WpsOperationalValue(
+        icon: icon,
+        description: 'Custom $unit',
+        value: null,
+      )
+    ];
+  }
+}
+
+// For motion_sensitivity_value (1-5 levels)
+class MotionSensitivityFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  MotionSensitivityFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : min = 1,
+        max = 5,
+        step = 1,
+        super(
+          type: type,
+          code: 'motion_sensitivity_value',
+          operationName: 'Motion Detection Sensitivity',
+          icon: Assets.motionDetectionSensitivityIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => WpsOperationalValue(
+        icon: Assets.motionDetectionSensitivityValueIcon,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
+  }
+}
+
+class MotionLessSensitivityFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  MotionLessSensitivityFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : min = 1,
+        max = 5,
+        step = 1,
+        super(
+          type: type,
+          code: 'motionless_sensitivity',
+          operationName: 'Motionless Detection Sensitivity',
+          icon: Assets.motionlessDetectionSensitivityIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => WpsOperationalValue(
+        icon: Assets.currentDistanceIcon,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
+  }
+}
+
+class IndicatorFunction extends WpsFunctions {
+  IndicatorFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : super(
+          type: type,
+          code: 'indicator',
+          operationName: 'Indicator',
+          icon: Assets.IndicatorIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() => [
+        WpsOperationalValue(
+          icon: Assets.assetsAcPower,
+          description: "ON",
+          value: true,
+        ),
+        WpsOperationalValue(
+          icon: Assets.assetsAcPowerOFF,
+          description: "OFF",
+          value: false,
+        ),
+      ];
+}
+
+class NoOneTimeFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final String unit;
+
+  NoOneTimeFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : min = 10,
+        max = 10000,
+        unit = '秒',
+        super(
+          type: type,
+          code: 'no_one_time',
+          operationName: 'Nobody Time',
+          icon: Assets.nobodyTime,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    return [
+      WpsOperationalValue(
+        icon: icon,
+        description: 'Custom $unit',
+        value: null, 
+      )
+    ];
+  }
+}
+
+class PresenceStateFunction extends WpsFunctions {
+  PresenceStateFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : super(
+          type: type,
+          code: 'presence_state',
+          operationName: 'Presence State',
+          icon: Assets.presenceStateIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() => [
+        WpsOperationalValue(
+          icon: Assets.assetsAcPower,
+          description: "None",
+          value: true,
+        ),
+        WpsOperationalValue(
+          icon: Assets.presenceStateIcon,
+          description: "Presence",
+          value: false,
+        ),
+      ];
+}
+
+class CurrentDistanceFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  CurrentDistanceFunction(
+      {required super.deviceId, required super.deviceName, required type})
+      : min = 1,
+        max = 600,
+        step = 1,
+        super(
+          type: type,
+          code: 'current_distance',
+          operationName: 'Current Distance',
+          icon: Assets.currentDistanceIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    List<WpsOperationalValue> values = [];
+    for (int temp = min; temp <= max; temp += step) {
+      values.add(WpsOperationalValue(
+        icon: Assets.assetsTempreture,
+        description: "${temp}CM",
+        value: temp,
+      ));
+    }
+    return values;
+  }
+}
+
+class IlluminanceValueFunction extends WpsFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  IlluminanceValueFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        max = 10000,
+        step = 10,
+        super(
+          code: 'illuminance_value',
+          operationName: 'Illuminance Value',
+          icon: Assets.IlluminanceIcon,
+        );
+
+  @override
+  List<WpsOperationalValue> getOperationalValues() {
+    List<WpsOperationalValue> values = [];
+    for (int lux = min; lux <= max; lux += step) {
+      values.add(WpsOperationalValue(
+        icon: Assets.IlluminanceIcon,
+        description: "$lux Lux",
+        value: lux,
+      ));
+    }
+    return values;
+  }
+}
diff --git a/lib/pages/routines/models/wps/wps_operational_value.dart b/lib/pages/routines/models/wps/wps_operational_value.dart
new file mode 100644
index 00000000..28b05d1f
--- /dev/null
+++ b/lib/pages/routines/models/wps/wps_operational_value.dart
@@ -0,0 +1,11 @@
+class WpsOperationalValue {
+  final String icon;
+  final String description;
+  final dynamic value;
+
+  WpsOperationalValue({
+    required this.icon,
+    required this.description,
+    required this.value,
+  });
+}
diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index d1736240..d6078143 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -26,7 +26,9 @@ class IfContainer extends StatelessWidget {
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      const Text('IF', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                      const Text('IF',
+                          style: TextStyle(
+                              fontSize: 18, fontWeight: FontWeight.bold)),
                       if (state.isAutomation && state.ifItems.isNotEmpty)
                         AutomationOperatorSelector(
                             selectedOperator: state.selectedAutomationOperator),
@@ -53,34 +55,47 @@ class IfContainer extends StatelessWidget {
                           (index) => GestureDetector(
                                 onTap: () async {
                                   if (!state.isTabToRun) {
-                                    final result = await DeviceDialogHelper.showDeviceDialog(
-                                        context, state.ifItems[index],
-                                        removeComparetors: false);
+                                    final result = await DeviceDialogHelper
+                                        .showDeviceDialog(
+                                            context: context,
+                                            data: state.ifItems[index],
+                                            removeComparetors: false,
+                                            dialogType: "IF");
 
                                     if (result != null) {
-                                      context
-                                          .read<RoutineBloc>()
-                                          .add(AddToIfContainer(state.ifItems[index], false));
-                                    } else if (!['AC', '1G', '2G', '3G']
-                                        .contains(state.ifItems[index]['productType'])) {
-                                      context
-                                          .read<RoutineBloc>()
-                                          .add(AddToIfContainer(state.ifItems[index], false));
+                                      context.read<RoutineBloc>().add(
+                                          AddToIfContainer(
+                                              state.ifItems[index], false));
+                                    } else if (![
+                                      'AC',
+                                      '1G',
+                                      '2G',
+                                      '3G',
+                                      'WPS'
+                                    ].contains(
+                                        state.ifItems[index]['productType'])) {
+                                      context.read<RoutineBloc>().add(
+                                          AddToIfContainer(
+                                              state.ifItems[index], false));
                                     }
                                   }
                                 },
                                 child: DraggableCard(
-                                  imagePath: state.ifItems[index]['imagePath'] ?? '',
+                                  imagePath:
+                                      state.ifItems[index]['imagePath'] ?? '',
                                   title: state.ifItems[index]['title'] ?? '',
                                   deviceData: state.ifItems[index],
-                                  padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+                                  padding: const EdgeInsets.symmetric(
+                                      horizontal: 4, vertical: 8),
                                   isFromThen: false,
                                   isFromIf: true,
                                   onRemove: () {
-                                    context.read<RoutineBloc>().add(RemoveDragCard(
-                                        index: index,
-                                        isFromThen: false,
-                                        key: state.ifItems[index]['uniqueCustomId']));
+                                    context.read<RoutineBloc>().add(
+                                        RemoveDragCard(
+                                            index: index,
+                                            isFromThen: false,
+                                            key: state.ifItems[index]
+                                                ['uniqueCustomId']));
                                   },
                                 ),
                               )),
@@ -90,6 +105,7 @@ class IfContainer extends StatelessWidget {
             );
           },
           onAcceptWithDetails: (data) async {
+            print('data.data=${data.data}');
             final uniqueCustomId = const Uuid().v4();
 
             final mutableData = Map<String, dynamic>.from(data.data);
@@ -101,15 +117,25 @@ class IfContainer extends StatelessWidget {
 
             if (!state.isTabToRun) {
               if (mutableData['deviceId'] == 'tab_to_run') {
-                context.read<RoutineBloc>().add(AddToIfContainer(mutableData, true));
+                context
+                    .read<RoutineBloc>()
+                    .add(AddToIfContainer(mutableData, true));
               } else {
-                final result = await DeviceDialogHelper.showDeviceDialog(context, mutableData,
+                final result = await DeviceDialogHelper.showDeviceDialog(
+                    dialogType: 'IF',
+                    context: context,
+                    data: mutableData,
                     removeComparetors: false);
 
                 if (result != null) {
-                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G'].contains(mutableData['productType'])) {
-                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
+                  context
+                      .read<RoutineBloc>()
+                      .add(AddToIfContainer(mutableData, false));
+                } else if (!['AC', '1G', '2G', '3G', 'WPS']
+                    .contains(mutableData['productType'])) {
+                  context
+                      .read<RoutineBloc>()
+                      .add(AddToIfContainer(mutableData, false));
                 }
               }
             }
@@ -155,7 +181,9 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'or'));
+              context
+                  .read<RoutineBloc>()
+                  .add(const ChangeAutomationOperator(operator: 'or'));
             },
           ),
           Container(
@@ -181,7 +209,9 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'and'));
+              context
+                  .read<RoutineBloc>()
+                  .add(const ChangeAutomationOperator(operator: 'and'));
             },
           ),
         ],
diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index 21531ad3..2d3f7236 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -37,7 +37,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
                 device.productType == 'AC' ||
                 device.productType == '1G' ||
                 device.productType == '2G' ||
-                device.productType == '3G')
+                device.productType == '3G' ||
+                device.productType == 'WPS')
             .toList();
 
         return Wrap(
@@ -46,7 +47,9 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           children: deviceList.asMap().entries.map((entry) {
             final device = entry.value;
             if (state.searchText != null && state.searchText!.isNotEmpty) {
-              return device.name!.toLowerCase().contains(state.searchText!.toLowerCase())
+              return device.name!
+                      .toLowerCase()
+                      .contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
                       imagePath: device.getDefaultIcon(device.productType),
                       title: device.name ?? '',
diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index f565f07d..9a1511ea 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -22,21 +22,25 @@ class ThreeGangSwitchHelper {
     String uniqueCustomId,
     bool removeComparetors,
   ) async {
-    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> switchFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
+        print('functions: $functions');
+
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData = state.addedFunctions
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -83,9 +87,12 @@ class ThreeGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName: function.operationName,
+                                              operationName:
+                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -177,7 +184,8 @@ class ThreeGangSwitchHelper {
       );
     }
 
-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -214,11 +222,11 @@ class ThreeGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownDisplay(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownSlider(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -259,7 +267,8 @@ class ThreeGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -307,7 +316,8 @@ class ThreeGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -359,9 +369,13 @@ class ThreeGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -373,7 +387,8 @@ class ThreeGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart
new file mode 100644
index 00000000..a5b24a22
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart
@@ -0,0 +1,150 @@
+
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class TimeWheelPicker extends StatefulWidget {
+  final int initialHours;
+  final int initialMinutes;
+  final int initialSeconds;
+  final Function(int, int, int) onTimeChanged;
+
+  const TimeWheelPicker({
+    super.key,
+    required this.initialHours,
+    required this.initialMinutes,
+    required this.initialSeconds,
+    required this.onTimeChanged,
+  });
+
+  @override
+  State<TimeWheelPicker> createState() => _TimeWheelPickerState();
+}
+
+class _TimeWheelPickerState extends State<TimeWheelPicker> {
+  late FixedExtentScrollController _hoursController;
+  late FixedExtentScrollController _minutesController;
+  late FixedExtentScrollController _secondsController;
+
+  @override
+  void initState() {
+    super.initState();
+    _hoursController = FixedExtentScrollController(initialItem: widget.initialHours);
+    _minutesController = FixedExtentScrollController(initialItem: widget.initialMinutes);
+    _secondsController = FixedExtentScrollController(initialItem: widget.initialSeconds);
+  }
+
+  @override
+  void didUpdateWidget(TimeWheelPicker oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.initialHours != widget.initialHours) {
+      _hoursController.jumpToItem(widget.initialHours);
+    }
+    if (oldWidget.initialMinutes != widget.initialMinutes) {
+      _minutesController.jumpToItem(widget.initialMinutes);
+    }
+    if (oldWidget.initialSeconds != widget.initialSeconds) {
+      _secondsController.jumpToItem(widget.initialSeconds);
+    }
+  }
+
+  @override
+  void dispose() {
+    _hoursController.dispose();
+    _minutesController.dispose();
+    _secondsController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        _buildPickerColumn(
+          label: 'h',
+          controller: _hoursController,
+          itemCount: 24,
+          onChanged: (value) => _handleTimeChange(
+            value,
+            _minutesController.selectedItem,
+            _secondsController.selectedItem,
+          ),
+        ),
+        const SizedBox(width: 5),
+        _buildPickerColumn(
+          label: 'm',
+          controller: _minutesController,
+          itemCount: 60,
+          onChanged: (value) => _handleTimeChange(
+            _hoursController.selectedItem,
+            value,
+            _secondsController.selectedItem,
+          ),
+        ),
+        const SizedBox(width: 5),
+        _buildPickerColumn(
+          label: 's',
+          controller: _secondsController,
+          itemCount: 60,
+          onChanged: (value) => _handleTimeChange(
+            _hoursController.selectedItem,
+            _minutesController.selectedItem,
+            value,
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _handleTimeChange(int hours, int minutes, int seconds) {
+    widget.onTimeChanged(hours, minutes, seconds);
+  }
+
+  Widget _buildPickerColumn({
+    required String label,
+    required FixedExtentScrollController controller,
+    required int itemCount,
+    required Function(int) onChanged,
+  }) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          height: 40,
+          width: 40,
+          padding: const EdgeInsets.symmetric(horizontal: 5),
+          decoration: BoxDecoration(
+            color: ColorsManager.boxColor,
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: ListWheelScrollView.useDelegate(
+            controller: controller,
+            itemExtent: 40.0,
+            physics: const FixedExtentScrollPhysics(),
+            onSelectedItemChanged: onChanged,
+            childDelegate: ListWheelChildBuilderDelegate(
+              builder: (context, index) => Center(
+                child: Text(
+                  index.toString().padLeft(2),
+                  style: const TextStyle(
+                    fontSize: 18,
+                    color: ColorsManager.blue1,
+                  ),
+                ),
+              ),
+              childCount: itemCount,
+            ),
+          ),
+        ),
+        const SizedBox(width: 5),
+        Text(
+          label,
+          style: const TextStyle(
+            color: ColorsManager.blackColor,
+            fontSize: 18,
+          ),
+        ),
+      ],
+    );
+  }
+}
\ No newline at end of file
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
new file mode 100644
index 00000000..960b22de
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -0,0 +1,553 @@
+import 'package:flutter/material.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/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
+import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.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/wall_sensor/time_wheel.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+
+
+class WallPresenceSensor extends StatefulWidget {
+  final List<DeviceFunction> functions;
+  final AllDevicesModel? device;
+  final List<DeviceFunctionData>? deviceSelectedFunctions;
+  final String? uniqueCustomId;
+  final String? dialogType;
+  final bool removeComparetors;
+
+  const WallPresenceSensor({
+    super.key,
+    required this.functions,
+    this.device,
+    this.deviceSelectedFunctions,
+    this.uniqueCustomId,
+    this.dialogType,
+    this.removeComparetors = false,
+  });
+
+  static Future<Map<String, dynamic>?> showWPSFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String? uniqueCustomId,
+    String? dialogType,
+    bool removeComparetors = false,
+  }) async {
+    return showDialog<Map<String, dynamic>?>(
+      context: context,
+      builder: (context) => WallPresenceSensor(
+        functions: functions,
+        device: device,
+        deviceSelectedFunctions: deviceSelectedFunctions,
+        uniqueCustomId: uniqueCustomId,
+        removeComparetors: removeComparetors,
+        dialogType: dialogType,
+      ),
+    );
+  }
+
+  @override
+  State<WallPresenceSensor> createState() => _WallPresenceSensorState();
+}
+
+class _WallPresenceSensorState extends State<WallPresenceSensor> {
+  late final List<WpsFunctions> _wpsFunctions;
+
+  @override
+  void initState() {
+    super.initState();
+    _wpsFunctions =
+        widget.functions.whereType<WpsFunctions>().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('Presence Sensor 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: _wpsFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = _wpsFunctions[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: '',
+        value: null,
+      ),
+    );
+
+    return Expanded(
+      child: _ValueSelector(
+        selectedFunction: selectedFunction,
+        functionData: functionData,
+        acFunctions: _wpsFunctions,
+        device: widget.device,
+        dialogType: widget.dialogType!,
+        removeComparators: widget.removeComparetors,
+      ),
+    );
+  }
+
+  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,
+    );
+  }
+}
+
+class _ValueSelector extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final List<WpsFunctions> acFunctions;
+  final AllDevicesModel? device;
+  final String dialogType;
+  final bool removeComparators;
+
+  const _ValueSelector({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.acFunctions,
+    required this.device,
+    required this.dialogType,
+    required this.removeComparators,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final values = selectedFn.getOperationalValues();
+
+    if (_isSliderFunction(selectedFunction)) {
+      return _SliderValueSelector(
+        selectedFunction: selectedFunction,
+        functionData: functionData,
+        device: device,
+        dialogType: dialogType,
+      );
+    }
+
+    return _OperationalValuesList(
+      values: values,
+      selectedValue: functionData.value,
+      device: device,
+      operationName: selectedFn.operationName,
+      selectCode: selectedFunction,
+    );
+  }
+
+  bool _isSliderFunction(String function) => [
+        'current_distance',
+        'presence_time',
+        'illuminance_value'
+      ].contains(function);
+}
+
+class _SliderValueSelector extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final AllDevicesModel? device;
+  final String dialogType;
+
+  const _SliderValueSelector({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.device,
+    required this.dialogType,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final initialValue = functionData.value ?? 250;
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        const SizedBox(height: 20),
+        _ConditionToggle(
+          currentCondition: functionData.condition,
+          selectCode: selectedFunction,
+          device: device,
+          operationName: functionData.operationName,
+          selectedValue: functionData.value,
+        ),
+        _ValueDisplay(
+          value: initialValue,
+          functionCode: selectedFunction,
+        ),
+        const SizedBox(height: 20),
+        _FunctionSlider(
+          initialValue: initialValue,
+          functionCode: selectedFunction,
+          functionData: functionData,
+          device: device,
+        ),
+      ],
+    );
+  }
+}
+
+class _ConditionToggle extends StatelessWidget {
+  final String? currentCondition;
+  final String selectCode;
+  final AllDevicesModel? device;
+  final String operationName;
+  final dynamic selectedValue;
+
+  const _ConditionToggle({
+    this.currentCondition,
+    required this.selectCode,
+    this.device,
+    required this.operationName,
+    this.selectedValue,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    const conditions = ["<", "==", ">"];
+    return ToggleButtons(
+      onPressed: (index) => _updateCondition(context, conditions[index]),
+      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(),
+    );
+  }
+
+  void _updateCondition(BuildContext context, String condition) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: selectCode,
+              operationName: operationName,
+              condition: condition,
+              value: selectedValue,
+            ),
+          ),
+        );
+  }
+}
+
+class _ValueDisplay extends StatelessWidget {
+  final dynamic value;
+  final String functionCode;
+
+  const _ValueDisplay({
+    required this.value,
+    required this.functionCode,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+      decoration: BoxDecoration(
+        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Text(
+        _getDisplayText(),
+        style: context.textTheme.headlineMedium!.copyWith(
+          color: ColorsManager.primaryColorWithOpacity,
+        ),
+      ),
+    );
+  }
+
+  String _getDisplayText() {
+    final intValue = (value as num?)?.toInt() ?? 0;
+    switch (functionCode) {
+      case 'presence_time':
+        return '$intValue Min';
+      case 'current_distance':
+        return '$intValue CM';
+      case 'illuminance_value':
+        return '$intValue Lux';
+      default:
+        return '$intValue';
+    }
+  }
+}
+
+class _FunctionSlider extends StatelessWidget {
+  final dynamic initialValue;
+  final String functionCode;
+  final DeviceFunctionData functionData;
+  final AllDevicesModel? device;
+
+  const _FunctionSlider({
+    required this.initialValue,
+    required this.functionCode,
+    required this.functionData,
+    required this.device,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final (min, max) = _getSliderRange();
+    return Slider(
+      value: initialValue is int ? initialValue.toDouble() : min,
+      min: min,
+      max: max,
+      divisions: (max - min).toInt(),
+      onChanged: (value) => _updateValue(context, value.toInt()),
+    );
+  }
+
+  (double, double) _getSliderRange() {
+    switch (functionCode) {
+      case 'presence_time':
+        return (0, 65535);
+      case 'current_distance':
+        return (1, 600);
+      case 'illuminance_value':
+        return (0, 10000);
+      default:
+        return (200, 300);
+    }
+  }
+
+  void _updateValue(BuildContext context, int value) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: functionCode,
+              operationName: functionData.operationName,
+              value: value,
+              condition: functionData.condition,
+            ),
+          ),
+        );
+  }
+}
+
+class _OperationalValuesList extends StatelessWidget {
+  final List<WpsOperationalValue> values;
+  final dynamic selectedValue;
+  final AllDevicesModel? device;
+  final String operationName;
+  final String selectCode;
+
+  const _OperationalValuesList({
+    required this.values,
+    required this.selectedValue,
+    required this.device,
+    required this.operationName,
+    required this.selectCode,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return operationName == 'Nobody Time'
+        ? _buildTimeWheel(context)
+        : ListView.builder(
+            padding: const EdgeInsets.all(20),
+            itemCount: values.length,
+            itemBuilder: (context, index) =>
+                _buildValueItem(context, values[index]),
+          );
+  }
+
+  Widget _buildTimeWheel(BuildContext context) {
+    final currentTotalSeconds = selectedValue as int? ?? 0;
+    return TimeWheelPicker(
+      initialHours: currentTotalSeconds ~/ 3600,
+      initialMinutes: (currentTotalSeconds % 3600) ~/ 60,
+      initialSeconds: currentTotalSeconds % 60,
+      onTimeChanged: (h, m, s) => _updateTotalSeconds(context, h, m, s),
+    );
+  }
+
+  Widget _buildValueItem(BuildContext context, WpsOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          _buildValueIcon(context, value),
+          Expanded(child: _buildValueDescription(value)),
+          _buildValueRadio(context, value),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildValueIcon(context, WpsOperationalValue value) {
+    return Column(
+      children: [
+        if (_shouldShowTextDescription)
+          Text(value.description.replaceAll("cm", '')),
+        SvgPicture.asset(value.icon, width: 25, height: 25),
+      ],
+    );
+  }
+
+  bool get _shouldShowTextDescription =>
+      operationName == 'Far Detection' ||
+      operationName == 'Motionless Detection Sensitivity';
+
+  Widget _buildValueDescription(WpsOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(value.description),
+    );
+  }
+
+  Widget _buildValueRadio(context, WpsOperationalValue value) {
+    return Radio<dynamic>(
+      value: value.value,
+      groupValue: selectedValue,
+      onChanged: (_) => _selectValue(context, value.value),
+    );
+  }
+
+  void _selectValue(BuildContext context, dynamic value) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: selectCode,
+              operationName: operationName,
+              value: value,
+            ),
+          ),
+        );
+  }
+
+  void _updateTotalSeconds(BuildContext context, int h, int m, int s) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: selectCode,
+              operationName: operationName,
+              value: h * 3600 + m * 60 + s,
+            ),
+          ),
+        );
+  }
+}
diff --git a/lib/pages/routines/widgets/then_container.dart b/lib/pages/routines/widgets/then_container.dart
index 2fcc62b8..5b26056a 100644
--- a/lib/pages/routines/widgets/then_container.dart
+++ b/lib/pages/routines/widgets/then_container.dart
@@ -26,7 +26,9 @@ class ThenContainer extends StatelessWidget {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
-                    const Text('THEN', style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                    const Text('THEN',
+                        style: TextStyle(
+                            fontSize: 18, fontWeight: FontWeight.bold)),
                     const SizedBox(height: 16),
                     state.isLoading && state.isUpdate == true
                         ? const Center(
@@ -39,12 +41,17 @@ class ThenContainer extends StatelessWidget {
                                 state.thenItems.length,
                                 (index) => GestureDetector(
                                       onTap: () async {
-                                        if (state.thenItems[index]['deviceId'] == 'delay') {
-                                          final result = await DelayHelper.showDelayPickerDialog(
-                                              context, state.thenItems[index]);
+                                        if (state.thenItems[index]
+                                                ['deviceId'] ==
+                                            'delay') {
+                                          final result = await DelayHelper
+                                              .showDelayPickerDialog(context,
+                                                  state.thenItems[index]);
 
                                           if (result != null) {
-                                            context.read<RoutineBloc>().add(AddToThenContainer({
+                                            context
+                                                .read<RoutineBloc>()
+                                                .add(AddToThenContainer({
                                                   ...state.thenItems[index],
                                                   'imagePath': Assets.delay,
                                                   'title': 'Delay',
@@ -53,58 +60,86 @@ class ThenContainer extends StatelessWidget {
                                           return;
                                         }
 
-                                        if (state.thenItems[index]['type'] == 'automation') {
+                                        if (state.thenItems[index]['type'] ==
+                                            'automation') {
                                           final result = await showDialog<bool>(
                                             context: context,
-                                            builder: (BuildContext context) => AutomationDialog(
+                                            builder: (BuildContext context) =>
+                                                AutomationDialog(
                                               automationName:
-                                                  state.thenItems[index]['name'] ?? 'Automation',
+                                                  state.thenItems[index]
+                                                          ['name'] ??
+                                                      'Automation',
                                               automationId:
-                                                  state.thenItems[index]['deviceId'] ?? '',
-                                              uniqueCustomId: state.thenItems[index]
-                                                  ['uniqueCustomId'],
+                                                  state.thenItems[index]
+                                                          ['deviceId'] ??
+                                                      '',
+                                              uniqueCustomId:
+                                                  state.thenItems[index]
+                                                      ['uniqueCustomId'],
                                             ),
                                           );
 
                                           if (result != null) {
-                                            context.read<RoutineBloc>().add(AddToThenContainer({
+                                            context
+                                                .read<RoutineBloc>()
+                                                .add(AddToThenContainer({
                                                   ...state.thenItems[index],
-                                                  'imagePath': Assets.automation,
-                                                  'title': state.thenItems[index]['name'] ??
-                                                      state.thenItems[index]['title'],
+                                                  'imagePath':
+                                                      Assets.automation,
+                                                  'title':
+                                                      state.thenItems[index]
+                                                              ['name'] ??
+                                                          state.thenItems[index]
+                                                              ['title'],
                                                 }));
                                           }
                                           return;
                                         }
 
-                                        final result = await DeviceDialogHelper.showDeviceDialog(
-                                            context, state.thenItems[index],
-                                            removeComparetors: true);
+                                        final result = await DeviceDialogHelper
+                                            .showDeviceDialog(
+                                                context: context,
+                                                data: state.thenItems[index],
+                                                removeComparetors: true,
+                                                dialogType: "THEN");
 
                                         if (result != null) {
-                                          context
-                                              .read<RoutineBloc>()
-                                              .add(AddToThenContainer(state.thenItems[index]));
-                                        } else if (!['AC', '1G', '2G', '3G']
-                                            .contains(state.thenItems[index]['productType'])) {
-                                          context
-                                              .read<RoutineBloc>()
-                                              .add(AddToThenContainer(state.thenItems[index]));
+                                          context.read<RoutineBloc>().add(
+                                              AddToThenContainer(
+                                                  state.thenItems[index]));
+                                        } else if (![
+                                          'AC',
+                                          '1G',
+                                          '2G',
+                                          '3G',
+                                          'WPS'
+                                        ].contains(state.thenItems[index]
+                                            ['productType'])) {
+                                          context.read<RoutineBloc>().add(
+                                              AddToThenContainer(
+                                                  state.thenItems[index]));
                                         }
                                       },
                                       child: DraggableCard(
-                                        imagePath: state.thenItems[index]['imagePath'] ?? '',
-                                        title: state.thenItems[index]['title'] ?? '',
+                                        imagePath: state.thenItems[index]
+                                                ['imagePath'] ??
+                                            '',
+                                        title: state.thenItems[index]
+                                                ['title'] ??
+                                            '',
                                         deviceData: state.thenItems[index],
-                                        padding:
-                                            const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+                                        padding: const EdgeInsets.symmetric(
+                                            horizontal: 4, vertical: 8),
                                         isFromThen: true,
                                         isFromIf: false,
                                         onRemove: () {
-                                          context.read<RoutineBloc>().add(RemoveDragCard(
-                                              index: index,
-                                              isFromThen: true,
-                                              key: state.thenItems[index]['uniqueCustomId']));
+                                          context.read<RoutineBloc>().add(
+                                              RemoveDragCard(
+                                                  index: index,
+                                                  isFromThen: true,
+                                                  key: state.thenItems[index]
+                                                      ['uniqueCustomId']));
                                         },
                                       ),
                                     ))),
@@ -114,6 +149,8 @@ class ThenContainer extends StatelessWidget {
             );
           },
           onAcceptWithDetails: (data) async {
+            print('data.data THEN=${data.data}');
+
             final uniqueCustomId = const Uuid().v4();
             final mutableData = Map<String, dynamic>.from(data.data);
             mutableData['uniqueCustomId'] = uniqueCustomId;
@@ -129,8 +166,8 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['type'] == 'automation') {
-              int index =
-                  state.thenItems.indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
+              int index = state.thenItems.indexWhere(
+                  (item) => item['deviceId'] == mutableData['deviceId']);
               if (index != -1) {
                 return;
               }
@@ -155,8 +192,8 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['type'] == 'tap_to_run' && state.isAutomation) {
-              int index =
-                  state.thenItems.indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
+              int index = state.thenItems.indexWhere(
+                  (item) => item['deviceId'] == mutableData['deviceId']);
               if (index != -1) {
                 return;
               }
@@ -174,7 +211,8 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['deviceId'] == 'delay') {
-              final result = await DelayHelper.showDelayPickerDialog(context, mutableData);
+              final result =
+                  await DelayHelper.showDelayPickerDialog(context, mutableData);
 
               if (result != null) {
                 context.read<RoutineBloc>().add(AddToThenContainer({
@@ -186,11 +224,15 @@ class ThenContainer extends StatelessWidget {
               return;
             }
 
-            final result = await DeviceDialogHelper.showDeviceDialog(context, mutableData,
-                removeComparetors: true);
+            final result = await DeviceDialogHelper.showDeviceDialog(
+                context: context,
+                data: mutableData,
+                removeComparetors: true,
+                dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G'].contains(mutableData['productType'])) {
+            } else if (!['AC', '1G', '2G', '3G', 'WPS']
+                .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }
           },
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index 0e7b0bd2..01359f57 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -411,4 +411,21 @@ class Assets {
   static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.svg';
   static const String scenesPlayIconCheck =
       'assets/icons/scenesPlayIconCheck.svg';
+  static const String presenceStateIcon = 'assets/icons/presence_state.svg';
+  static const String currentDistanceIcon =
+      'assets/icons/current_distance_icon.svg';
+
+  static const String farDetectionIcon = 'assets/icons/far_detection_icon.svg';
+  static const String motionDetectionSensitivityIcon =
+      'assets/icons/motion_detection_sensitivity_icon.svg';
+
+  static const String motionlessDetectionSensitivityIcon =
+      'assets/icons/motionless_detection_sensitivity_icon.svg';
+
+  static const String IndicatorIcon = 'assets/icons/Indicator_icon.svg';
+    static const String motionDetectionSensitivityValueIcon = 'assets/icons/motion_detection_sensitivity_value_icon.svg';
+    static const String presenceTimeIcon = 'assets/icons/presence_time_icon.svg';
+    static const String IlluminanceIcon = 'assets/icons/Illuminance_icon.svg';
+
+  //Illuminance_icon
 }

From 49c743befb86f3ac896bc172e2b547a2c04d68cd Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 6 Apr 2025 10:04:36 +0300
Subject: [PATCH 030/238]  remove debug print statements

---
 .../widgets/routine_dialogs/three_gang_switch_dialog.dart       | 2 --
 lib/pages/routines/widgets/then_container.dart                  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index 9a1511ea..b4400b35 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -28,8 +28,6 @@ class ThreeGangSwitchHelper {
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
-        print('functions: $functions');
-
         return BlocProvider(
             create: (_) => FunctionBloc()
               ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
diff --git a/lib/pages/routines/widgets/then_container.dart b/lib/pages/routines/widgets/then_container.dart
index 5b26056a..a4d0461d 100644
--- a/lib/pages/routines/widgets/then_container.dart
+++ b/lib/pages/routines/widgets/then_container.dart
@@ -149,8 +149,6 @@ class ThenContainer extends StatelessWidget {
             );
           },
           onAcceptWithDetails: (data) async {
-            print('data.data THEN=${data.data}');
-
             final uniqueCustomId = const Uuid().v4();
             final mutableData = Map<String, dynamic>.from(data.data);
             mutableData['uniqueCustomId'] = uniqueCustomId;

From ad922577dae8120c15802553800009dd014ee7e2 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 6 Apr 2025 11:28:59 +0300
Subject: [PATCH 031/238] Refactor SVG icons and update asset paths and fix
 RoutinesView issues

---
 assets/icons/scenesPlayIcon.png               | Bin 0 -> 1703 bytes
 assets/icons/scenesPlayIcon.svg               |  17 ----------
 assets/icons/scenesPlayIconCheck.png          | Bin 0 -> 1802 bytes
 assets/icons/scenesPlayIconCheck.svg          |  30 ------------------
 lib/pages/routines/view/routines_view.dart    |   1 +
 .../fetch_routine_scenes_automation.dart      |   6 ++--
 .../main_routine_view/routine_view_card.dart  |   6 ++--
 lib/utils/constants/assets.dart               |   4 +--
 8 files changed, 9 insertions(+), 55 deletions(-)
 create mode 100644 assets/icons/scenesPlayIcon.png
 delete mode 100644 assets/icons/scenesPlayIcon.svg
 create mode 100644 assets/icons/scenesPlayIconCheck.png
 delete mode 100644 assets/icons/scenesPlayIconCheck.svg

diff --git a/assets/icons/scenesPlayIcon.png b/assets/icons/scenesPlayIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..923ad7d0bd74775326fde2d23b0fb6259c5901af
GIT binary patch
literal 1703
zcmV;Y23YxtP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH20TebK~#7Fy;w<1
z8&?>9<MG(R3nVOAP)M_2C<&k_B$e9akPwM1EhmZ!EvnQ@l^a5|#|BUjAhnlX5P>UV
zJs=h#!37RT2*i#6l|@MGt5|G<_v!Z!Gsqzr8`tEQo@YGs=6~P&_x~|=KH`*XadEMV
z2JTha+1Wg<yz)#GMb3LJ3nh6m=V;;Q&!4Mtuf2KmW>|D|v@tR=G93ReM?^$i0Y%{6
zfT5!~7-|Ke%*QWre!xg`N=iz&#>PhV*4CDAczCGY-`~Fk67XJQx7!JzN~6)xTo1=_
zE)1tirE(k`9N1!GV{HKHnwXey(|eJSaX|=;z{o05gQ?DFG)Ck8_UqTLzpkjL_;q}I
zymoDEZF+Zi*KDy^L>fCgJLbj3#i7yB(c1d@`a*zA2JqYT?X_#y^!Q$od7hgj8+q{H
zfriu&78Vwlk&*FDe}8}F-rnB60>Izc+}vF4>+7q^&(D8FJT8OM($WMkI}1oMoV*Jy
zb{3`8YU6u)dj5hW0tRv#u+GlT_uyqBp0rWf5&VN9F!Ay6T3JO&B>rH5oE&3gV>M9Y
zmjsG7EN}cHP~1r{t*x#6^z?Lu*=&xUnwt7ME-vm{7D8HCS!qj7PW~OXwE^caLnGt_
zqVoROz(`fy-QB9WxjDVV;kW|H6oncL5gg>Zfq{Yd022xO)V+A|g7>y3wS48cBVVN0
zVeIJW`0?JodpYca=<eOSxv<OSXV0Gf10gsOR&01INlB6rxi}0>4c%TUC@4sJ^ytw$
zcEJR-y-QC|zlGZ{n98w~BtRq`1TMkpbQ*GVbH9g+US}6fYPH%>T3Y%GZuL;3pgfo2
z0n&jAp<m<icno*$+{t90i4qeNbKbsvd&6qAY9SL|0z{^>w6w%SI+v=et6zmuI&cuy
z*4D;WS65GcPg2Ut%1U*)Tx7da2#{1ZJ3GrG?`VPeD;6SJSXhvNz>^rH?{nVc$B)z9
zZZ{=sl8{JV#vyC-h&uu@cLECmA)m4J^>wDx>Dc}I_Zec2&$-BPX)qfBNm`2BBq0$9
z$(DF{naS6OP^nMRp9F)X%LG9n&pi_i5#HYb7y;?!2oPLO2}&x`sjm;0mzUY_@Gyfn
zGJjyehb1K?G2|}hk7!M#6BY8VgoA!aN>pUUBH#F2jU+TUILKgt?CRC4EFmGmCm2#w
zAYc?S7z`=6EMb@>mBDsAK<U9^7GEEc3SfYeU7+qEM>u{*(o@uQUNE#K)^@}AMQBTu
zREFwKME-KwY_>Cvgm#~rn#!m;L^&dP5*aV_FM$bEP2L1&nxP64yxm1bMG_zpr74w{
zE-)YT$ACbkq@+mK?d@&0v9ZChp`gGJVPpRiAbjhlm?*^|)IV;h!hwpgD-b3G2DwPG
zCq!Avo`L~GG&3{P&-1(;v5JHulDjhmB{vqaH8nMjo@GZTK|Oi$grOw$>)O5u4Z~Va
zPEH5ZZG-I*pd$$(mw8a1*xTFN*HE0*o`)&fPOvmTKi>-5wLonS#H^zh$Ll@yF~&D<
z-k9p@>N+7tBfCH%>6Dd~{ajU5HE1%K%qZHV%JH~jgmJrQ9tx&qv^XEw1=G;bP(^up
z`BZp#_+e&drd#RNyd^~UYD7#uL>MzNGV&*k{Regd1Xa}`rv0JU>o;D$d}(cHXz(a?
z^(RF>N)Q3=Z$N&DL0uj4A|J7<{o%uhzriav5QEHk<YaRBN~Agg$di|s=R^j!z}U9%
zVIgXoIu;@VuX+N5z`8|iz{5WRL*%Pbqpnqr{6vz9Y-wrviR$cNi#Oy!%jD$bho?`U
zR-&TVj*5!1B4jvmUf?+i=v0yq8Ay6cD}4*ae+E3ElDg198$;^#5p1id4JRJdN>dYh
zR)6oWm8JJor)aRVFa%8<YNzm;nwku%F2O$$nc9R{WKbjlRj(k?4)yl-b~QIQk9Bo*
zts#h7;Z0UVbO-*sy&J<|iFPE=DF~ed!8=HGUtpME4@tNt)1Wq)p3#X1uGeX<eCnY&
zt!+MycorDZjy#2hg>LNB0ZG^a>Hy*40E=4SF=iU5%lBhqV$9ScWBwuXogKN#fqNI?
x+y9ozr>MkZo}BlPPcoDvKF-@l0zP(;=|9Vj#95-|^6&rv002ovPDHLkV1oZxBV_;p

literal 0
HcmV?d00001

diff --git a/assets/icons/scenesPlayIcon.svg b/assets/icons/scenesPlayIcon.svg
deleted file mode 100644
index 6417b0e6..00000000
--- a/assets/icons/scenesPlayIcon.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_6675_32326)">
-<path d="M18 3C9.71584 3 3 9.71572 3 18C3 26.2843 9.71584 33 18 33C26.2842 33 33 26.2843 33 18C33 9.71572 26.2842 3 18 3ZM23.1844 18.7951L15.6844 23.4826C15.5326 23.5774 15.3601 23.625 15.1875 23.625C15.0312 23.625 14.8746 23.5861 14.7329 23.5073C14.4349 23.3421 14.25 23.0285 14.25 22.6875V13.3125C14.25 12.9715 14.4349 12.6579 14.7329 12.4927C15.0309 12.3265 15.3953 12.3366 15.6844 12.5174L23.1844 17.2049C23.4584 17.3766 23.625 17.6769 23.625 18C23.625 18.3231 23.4584 18.6235 23.1844 18.7951Z" fill="#F4F4F4"/>
-</g>
-<defs>
-<filter id="filter0_d_6675_32326" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.5"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_6675_32326"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_6675_32326" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/assets/icons/scenesPlayIconCheck.png b/assets/icons/scenesPlayIconCheck.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f7101f790c2a114da9f38f184a23e63afb31b17
GIT binary patch
literal 1802
zcmV+l2le=gP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH2A@epK~#7FwOCn9
z6n7Y(+1c53FHkOzh<LD2l@t}Vp&Eji;L&1DloVPe=}YTV4bnD^rh@5%B<+KJF$g8;
zgGEpigR~?N6O54%2oR0}DMv^Exh==;!k#nzeZwqWk#=Xd@FoAu?9R+LzyEjszG0Za
zg!LW^3JO%TaIVVC%;a$7y#I-!$ok&PtflxUXX(YMsi|t5YqxLTu8W9>FolJMh2Zzb
z(9qCLkWic(vGjBgmf8zY*5g-LKVYPLZr!@YK6>;>Jv}|mFD@=>=jZ1)KzLl&I2;ZF
zsM2UObg#g&tQ*UvQmLE^3k&vb+qT&O)ZNw9<)P~$A!CCu8iA2rqJ~nv$z+Pa`Oed)
zPbU`@6@A{>+4*36e7tvdcGhCGT18qjGc%Uq;o;Wy_Vx!A6%}~^nE>EB>DkSjHyiLg
zFY63gq!`)1f4_#@pwsE1)6>)6Z)$2Po|~JS_X6;@rlzLG8XFr+u3o)*igav*Bqb&B
zK5?eVGOWA{Ep`^J)oNp3zI^!uETI_4YQSo1Yi~lAnRL=d<wWogionFi#%g63?IrUE
z3uNW$=;$be8{Z*Nv|)MUZ-8P~f~l&i;(B{~LoF6dL{Cr8kI~W5A24euqobq0B_t$#
zjo6w*a#-LIN&?Y)eL29$RnMP4R}Bmd7@SV$CRiqat-+8WK|XA5ZoUaHVTe!ti4!L{
z-*{5XN0wd6MXDX9nwpwV_Uze{#jKO;-n}~;arx@_@#8<i2riTrJN}leBw2`39D$~W
zZ#U%T=I%Xo=+G5rods^Yl9raX1E)HK%CeOtKx7>hF5cyG8MCvqFCs;^FzYO8wc2?5
z_U+GbYJeMg@BdOgKs!*O^lJn`Fz(v5D?^Dw6veJ*&z}8kv)Lw@ASFINKI`n+vs<A<
z3!88fAPSw4kr58o*>L~<{ZmS<^Z4=OUr<X*uV26Z#n8}DH4}u8l`dSk@UGkKrr4EA
zfaJ3N{(cU9M+?M9l`4ZpZRl51rKP3K2M-?1t*@^yu-olpOn`Fu@ZmI%$3xAUEF?;(
z(6u>KQ68N;PN^c?@8URa0ng6q_4<kP=g*ho{1jrblnFr4<B||IJessrxe1U6gcM60
zvdpYh5#o)KL4ZO>Vq&5VEZ{FZKbDe`Qix3b2*1ab=s|(p3NSp{%Mu`@oVO^c$fryI
zf?yP35uvWG&I3JmfV1EQuS-fw{)mi>%xr6G``w=odMDb63Vm0?K?I790TUF&4`VbM
zDN~l8g&Rfr$inJW-$W(4&>2`P2?teb5wRnn`3Z=2YoJzYX=$M{Mx2R9pV9+N=#3jU
z-pk3!`35nS=<j)YCoJSK7z`q4iYU1ZyA^@Z9Y~f?3}KPqH88gU<SZPVDelFK7vEmH
zcI{UsU`Wu!`-ow}5T5+}e34v6W+i&*o|u?ufg2PBHtH4+Kqy-}4gqYqbLUPf>QX)h
zDHDKzXZ=ZlU|A2<M5zve|9FtPPB6l{02CP!CsC*)@t`TimoHx~3KR@UUteDn%7+7W
zjf^5vx-%$B9+=Gj<jIqE@~IL<=gytGSY2KH<<qB6E2E;KQkWowN<&swRt?Yd_I>;I
z5uhatp_d8ZCl0(|9OUeQ5@j(lF-Mb=le3}Bzyv9SgM(FwT`R2Z1lw2|aeS`R9Ai3j
z=8U<#yu21>G%@QaWSzpo!W`7B7PHxG0cn$%<1%AJaJ%U~5T;icaqcneEUm4rMR)Js
z?Fk79S<J}D@OWo6UklN>no<}hj6{|F9>M-Gvkn4Rl_MFxL+zP7dGe&~;lqc5msh_<
z@<Bm(q`wjUB@(=P%}G8{l>-M3e1$ZhL=CdwFBc=zR}$3<K*FU<mt5#cRs`EL9?S#j
zFK5<BpsRwwpfXR>JCNaTfFb#}9!68E8e=h8Dh#RpDe>%JsV$1AwY$6f-mzoHiopn8
zhlhvTjvP7S!uJAUC7@MB?uleQ?<l<klp-COP)t*((!r2seH7ag8pBBkjnXuP{?~l(
zuglYQsb67dIuuPks&hzLSy?)<OX!cMR)bn(^jZS09tGcSZD?qytE{Z-05us$(X}C)
zY;kdMPNFKlgJG~jJL2gp2z>`ac9830u*`^uy*MV&qA{8Nqc0vfZlQbSuO6D!#^%+8
zW0VQ)NXW~}^I)e=Si%8N3n&i@c&QZ`W1$6JJ`ZAMp%EGPFJks`pjQ#maihNdZ>zkG
s>L0$v`Y!oPhW8U6>l-7AKfB2CHz0EJyP5|2asU7T07*qoM6N<$g8AoEVgLXD

literal 0
HcmV?d00001

diff --git a/assets/icons/scenesPlayIconCheck.svg b/assets/icons/scenesPlayIconCheck.svg
deleted file mode 100644
index 9e81869a..00000000
--- a/assets/icons/scenesPlayIconCheck.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<svg width="36" height="36" viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_7280_5211)">
-<circle cx="18" cy="18" r="15" fill="#F4F4F4"/>
-</g>
-<g filter="url(#filter1_i_7280_5211)">
-<path d="M25.1663 13.187C24.8231 12.8439 24.2666 12.8439 23.9234 13.1871L16.1621 20.9484L12.0766 16.8628C11.7334 16.5196 11.1768 16.5196 10.8336 16.8628C10.4904 17.206 10.4904 17.7625 10.8336 18.1057L15.5406 22.8127C15.7122 22.9844 15.9372 23.0701 16.1621 23.0701C16.3869 23.0701 16.6119 22.9843 16.7835 22.8127L25.1663 14.43C25.5095 14.0868 25.5095 13.5303 25.1663 13.187Z" fill="white"/>
-</g>
-<defs>
-<filter id="filter0_d_7280_5211" x="0" y="0" width="36" height="36" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.5"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_7280_5211"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_7280_5211" result="shape"/>
-</filter>
-<filter id="filter1_i_7280_5211" x="10.5762" y="12.9297" width="14.8475" height="10.1406" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feBlend mode="normal" in="SourceGraphic" in2="BackgroundImageFix" result="shape"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset/>
-<feGaussianBlur stdDeviation="1.5"/>
-<feComposite in2="hardAlpha" operator="arithmetic" k2="-1" k3="1"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0"/>
-<feBlend mode="normal" in2="shape" result="effect1_innerShadow_7280_5211"/>
-</filter>
-</defs>
-</svg>
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index 83ab82b9..c398243c 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -90,6 +90,7 @@ class _RoutinesViewState extends State<RoutinesView> {
                       ],
                     ),
                   ),
+                  const SizedBox(height: 50),
                 ],
               ),
             )
diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 483500b1..99c131ee 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -117,7 +117,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                             fontWeight: FontWeight.bold,
                           ),
                     ),
-                    const SizedBox(height: 5),
+                    const SizedBox(height: 3),
                     if (state.automations.isEmpty)
                       Expanded(
                         child: Text(
@@ -130,8 +130,8 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                     if (state.automations.isNotEmpty)
                       ConstrainedBox(
                         constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 185 : 192,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.7),
+                          maxHeight: isSmallScreenSize(context) ? 190 : 195,
+                        ),
                         child: ListView.builder(
                             scrollDirection: Axis.horizontal,
                             itemCount: state.automations.length,
diff --git a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
index 345a86c8..5f471973 100644
--- a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
+++ b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
@@ -106,10 +106,10 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                           if (widget.isFromScenes ?? false)
                             InkWell(
                               onTap: _handleSceneTap,
-                              child: SvgPicture.asset(
+                              child: Image.asset(
                                 _showTemporaryCheck
-                                    ? Assets.scenesPlayIconCheck
-                                    : Assets.scenesPlayIcon,
+                                    ? Assets.scenesPlayIcon
+                                    : Assets.scenesPlayIconCheck,
                                 fit: BoxFit.contain,
                               ),
                             )
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index 0e7b0bd2..dc4036ad 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -408,7 +408,7 @@ class Assets {
   static const String spaceLinkIcon = 'assets/icons/space_link_icon.svg';
   static const String successIcon = 'assets/icons/success_icon.svg';
   static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
-  static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.svg';
+  static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png';
   static const String scenesPlayIconCheck =
-      'assets/icons/scenesPlayIconCheck.svg';
+      'assets/icons/scenesPlayIconCheck.png';
 }

From 8dc4081a892bf6732df82d8f69afa2800f647dcb Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 6 Apr 2025 16:38:34 +0300
Subject: [PATCH 032/238] save presence state and edit selected value

---
 .../all_devices/models/devices_model.dart        | 16 ++++++++--------
 lib/pages/routines/models/wps/wps_functions.dart | 10 ++++------
 .../wall_sensor/wall_presence_sensor.dart        |  6 +++---
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index 0a3b346c..2663d931 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -291,25 +291,25 @@ SOS
         return [
           //IF Functions
           PresenceStateFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           CurrentDistanceFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           IlluminanceValueFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           PresenceTimeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
 
           //THEN Functions
           FarDetectionFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
           MotionSensitivityFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
           MotionLessSensitivityFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
           IndicatorFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           NoOneTimeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
 
           // FarDetectionSliderFunction(
           //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')
diff --git a/lib/pages/routines/models/wps/wps_functions.dart b/lib/pages/routines/models/wps/wps_functions.dart
index d090686a..4f48300e 100644
--- a/lib/pages/routines/models/wps/wps_functions.dart
+++ b/lib/pages/routines/models/wps/wps_functions.dart
@@ -1,5 +1,3 @@
-
-
 import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.dart';
@@ -195,7 +193,7 @@ class NoOneTimeFunction extends WpsFunctions {
       WpsOperationalValue(
         icon: icon,
         description: 'Custom $unit',
-        value: null, 
+        value: null,
       )
     ];
   }
@@ -216,12 +214,12 @@ class PresenceStateFunction extends WpsFunctions {
         WpsOperationalValue(
           icon: Assets.assetsAcPower,
           description: "None",
-          value: true,
+          value: 'none',
         ),
         WpsOperationalValue(
           icon: Assets.presenceStateIcon,
           description: "Presence",
-          value: false,
+          value: 'presence',
         ),
       ];
 }
@@ -238,7 +236,7 @@ class CurrentDistanceFunction extends WpsFunctions {
         step = 1,
         super(
           type: type,
-          code: 'current_distance',
+          code: 'dis_current',
           operationName: 'Current Distance',
           icon: Assets.currentDistanceIcon,
         );
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index 960b22de..ee91b321 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -252,7 +252,7 @@ class _ValueSelector extends StatelessWidget {
   }
 
   bool _isSliderFunction(String function) => [
-        'current_distance',
+        'dis_current',
         'presence_time',
         'illuminance_value'
       ].contains(function);
@@ -382,7 +382,7 @@ class _ValueDisplay extends StatelessWidget {
     switch (functionCode) {
       case 'presence_time':
         return '$intValue Min';
-      case 'current_distance':
+      case 'dis_current':
         return '$intValue CM';
       case 'illuminance_value':
         return '$intValue Lux';
@@ -421,7 +421,7 @@ class _FunctionSlider extends StatelessWidget {
     switch (functionCode) {
       case 'presence_time':
         return (0, 65535);
-      case 'current_distance':
+      case 'dis_current':
         return (1, 600);
       case 'illuminance_value':
         return (0, 10000);

From ca44f3bf55234adb0f0ed0b0acdf01961286972b Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 7 Apr 2025 12:53:12 +0300
Subject: [PATCH 033/238] fix routine popup

---
 .../create_routine_bloc.dart                  |  20 +-
 .../create_routine_event.dart                 |   8 +
 .../create_routine_state.dart                 |   7 +
 .../create_new_routines/commu_dropdown.dart   | 224 +++++++--------
 .../create_new_routines.dart                  | 265 ++++++++++--------
 lib/pages/routines/widgets/if_container.dart  |   2 -
 6 files changed, 290 insertions(+), 236 deletions(-)

diff --git a/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart b/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart
index 5a8e5590..b472d034 100644
--- a/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart
+++ b/lib/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart
@@ -2,6 +2,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_state.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/services/space_mana_api.dart';
 
@@ -10,11 +11,12 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
     on<SpaceOnlyWithDevicesEvent>(_fetchSpaceOnlyWithDevices);
     on<SaveCommunityIdAndSpaceIdEvent>(saveSpaceIdCommunityId);
     on<ResetSelectedEvent>(resetSelected);
+    on<FetchCommunityEvent>(_fetchCommunity);
   }
 
   String selectedSpaceId = '';
   String selectedCommunityId = '';
-
+  List<CommunityModel> communities = [];
   List<SpaceModel> spacesOnlyWithDevices = [];
 
   Future<void> _fetchSpaceOnlyWithDevices(
@@ -30,7 +32,7 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
 
       emit(SpaceWithDeviceLoadedState(spacesOnlyWithDevices));
     } catch (e) {
-      emit(SpaceTreeErrorState('Error loading communities and spaces: $e'));
+      emit(SpaceTreeErrorState('Error loading spaces: $e'));
     }
   }
 
@@ -48,4 +50,18 @@ class CreateRoutineBloc extends Bloc<CreateRoutineEvent, CreateRoutineState> {
     selectedCommunityId = '';
     emit(const ResetSelectedState());
   }
+
+  Future<void> _fetchCommunity(
+      FetchCommunityEvent event, Emitter<CreateRoutineState> emit) async {
+    emit(const CommunitiesLoadingState());
+
+    try {
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      communities =
+          await CommunitySpaceManagementApi().fetchCommunities(projectUuid);
+      emit(const CommunityLoadedState());
+    } catch (e) {
+      emit(SpaceTreeErrorState('Error loading communities $e'));
+    }
+  }
 }
diff --git a/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart b/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart
index 24e620c0..ba901497 100644
--- a/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart
+++ b/lib/pages/routines/bloc/create_routine_bloc/create_routine_event.dart
@@ -41,3 +41,11 @@ class ResetSelectedEvent extends CreateRoutineEvent {
   @override
   List<Object> get props => [];
 }
+
+
+class FetchCommunityEvent extends CreateRoutineEvent {
+  const FetchCommunityEvent();
+
+  @override
+  List<Object> get props => [];
+}
\ No newline at end of file
diff --git a/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart b/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart
index 4911304b..5ebc20f7 100644
--- a/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart
+++ b/lib/pages/routines/bloc/create_routine_bloc/create_routine_state.dart
@@ -44,3 +44,10 @@ class ResetSelectedState extends CreateRoutineState {
   const ResetSelectedState();
 }
 
+class CommunityLoadedState extends CreateRoutineState {
+  const CommunityLoadedState();
+}
+
+class CommunitiesLoadingState extends CreateRoutineState {
+  const CommunitiesLoadingState();
+}
\ No newline at end of file
diff --git a/lib/pages/routines/create_new_routines/commu_dropdown.dart b/lib/pages/routines/create_new_routines/commu_dropdown.dart
index 32ee7219..5b96e977 100644
--- a/lib/pages/routines/create_new_routines/commu_dropdown.dart
+++ b/lib/pages/routines/create_new_routines/commu_dropdown.dart
@@ -1,12 +1,11 @@
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_state.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CommunityDropdown extends StatelessWidget {
   final String? selectedValue;
+  final List<CommunityModel> communities;
   final Function(String?) onChanged;
   final TextEditingController _searchController = TextEditingController();
 
@@ -14,6 +13,7 @@ class CommunityDropdown extends StatelessWidget {
     Key? key,
     required this.selectedValue,
     required this.onChanged,
+    required this.communities,
   }) : super(key: key);
 
   @override
@@ -32,123 +32,123 @@ class CommunityDropdown extends StatelessWidget {
                 ),
           ),
           const SizedBox(height: 8),
-          BlocBuilder<SpaceTreeBloc, SpaceTreeState>(
-            builder: (context, state) {
-              return SizedBox(
-                  child: Container(
+          SizedBox(
+              child: Container(
+            decoration: BoxDecoration(
+              borderRadius: BorderRadius.circular(10),
+            ),
+            child: DropdownButton2<String>(
+              underline: const SizedBox(),
+              value: selectedValue,
+              items: communities.map((community) {
+                return DropdownMenuItem<String>(
+                  value: community.uuid,
+                  child: Text(
+                    '  ${community.name}',
+                    overflow: TextOverflow.ellipsis,
+                    maxLines: 1,
+                  ),
+                );
+              }).toList(),
+              onChanged: onChanged,
+              style: const TextStyle(color: Colors.black),
+              hint: Padding(
+                padding: const EdgeInsets.only(left: 10),
+                child: Text(
+                  "  Please Select",
+                  style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                        color: ColorsManager.textGray,
+                      ),
+                ),
+              ),
+              customButton: Container(
+                height: 45,
+                decoration: BoxDecoration(
+                  border: Border.all(color: ColorsManager.textGray, width: 1.0),
+                  borderRadius: BorderRadius.circular(10),
+                ),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    Expanded(
+                      flex: 5,
+                      child: Text(
+                        selectedValue != null
+                            ? "  ${communities.firstWhere((element) => element.uuid == selectedValue).name}"
+                            : '  Please Select',
+                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                              color: selectedValue != null
+                                  ? Colors.black
+                                  : ColorsManager.textGray,
+                            ),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    Expanded(
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: Colors.grey[100],
+                          borderRadius: const BorderRadius.only(
+                            topRight: Radius.circular(10),
+                            bottomRight: Radius.circular(10),
+                          ),
+                        ),
+                        height: 45,
+                        child: const Icon(
+                          Icons.keyboard_arrow_down,
+                          color: ColorsManager.textGray,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              dropdownStyleData: DropdownStyleData(
+                maxHeight: MediaQuery.of(context).size.height * 0.4,
                 decoration: BoxDecoration(
                   borderRadius: BorderRadius.circular(10),
                 ),
-                child: DropdownButton2<String>(
-                  underline: SizedBox(),
-                  value: selectedValue,
-                  items: state.communityList.map((community) {
-                    return DropdownMenuItem<String>(
-                      value: community.uuid,
-                      child: Text(
-                        '  ${community.name}',
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 1,
+              ),
+              dropdownSearchData: DropdownSearchData(
+                searchController: _searchController,
+                searchInnerWidgetHeight: 50,
+                searchInnerWidget: Container(
+                  height: 50,
+                  padding:
+                      const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
+                  child: TextFormField(
+                    style: const TextStyle(color: Colors.black),
+                    controller: _searchController,
+                    decoration: InputDecoration(
+                      isDense: true,
+                      contentPadding: const EdgeInsets.symmetric(
+                        horizontal: 10,
+                        vertical: 12,
                       ),
-                    );
-                  }).toList(),
-                  onChanged: onChanged,
-                  style: TextStyle(color: Colors.black),
-                  hint: Padding(
-                    padding: EdgeInsets.only(left: 10),
-                    child: Text(
-                      "  Please Select",
-                      style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                            color: ColorsManager.textGray,
-                          ),
-                    ),
-                  ),
-                  customButton: Container(
-                    height: 45,
-                    decoration: BoxDecoration(
-                      border: Border.all(color: ColorsManager.textGray, width: 1.0),
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                    child: Row(
-                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: [
-                        Expanded(
-                          flex: 5,
-                          child: Text(
-                            selectedValue != null
-                                ? "  ${state.communityList.firstWhere((element) => element.uuid == selectedValue).name}"
-                                : '  Please Select',
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  color:
-                                      selectedValue != null ? Colors.black : ColorsManager.textGray,
-                                ),
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                        Expanded(
-                          child: Container(
-                            decoration: BoxDecoration(
-                              color: Colors.grey[100],
-                              borderRadius: const BorderRadius.only(
-                                topRight: Radius.circular(10),
-                                bottomRight: Radius.circular(10),
-                              ),
-                            ),
-                            height: 45,
-                            child: const Icon(
-                              Icons.keyboard_arrow_down,
-                              color: ColorsManager.textGray,
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                  ),
-                  dropdownStyleData: DropdownStyleData(
-                    maxHeight: MediaQuery.of(context).size.height * 0.4,
-                    decoration: BoxDecoration(
-                      borderRadius: BorderRadius.circular(10),
-                    ),
-                  ),
-                  dropdownSearchData: DropdownSearchData(
-                    searchController: _searchController,
-                    searchInnerWidgetHeight: 50,
-                    searchInnerWidget: Container(
-                      height: 50,
-                      padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
-                      child: TextFormField(
-                        style: const TextStyle(color: Colors.black),
-                        controller: _searchController,
-                        decoration: InputDecoration(
-                          isDense: true,
-                          contentPadding: const EdgeInsets.symmetric(
-                            horizontal: 10,
-                            vertical: 12,
-                          ),
-                          hintText: 'Search for community...',
-                          border: OutlineInputBorder(
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                        ),
+                      hintText: 'Search for community...',
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(8),
                       ),
                     ),
-                    searchMatchFn: (item, searchValue) {
-                      final communityName = (item.child as Text).data?.toLowerCase() ?? '';
-                      return communityName.contains(searchValue.toLowerCase().trim());
-                    },
-                  ),
-                  onMenuStateChange: (isOpen) {
-                    if (!isOpen) {
-                      _searchController.clear();
-                    }
-                  },
-                  menuItemStyleData: const MenuItemStyleData(
-                    height: 40,
                   ),
                 ),
-              ));
-            },
-          ),
+                searchMatchFn: (item, searchValue) {
+                  final communityName =
+                      (item.child as Text).data?.toLowerCase() ?? '';
+                  return communityName
+                      .contains(searchValue.toLowerCase().trim());
+                },
+              ),
+              onMenuStateChange: (isOpen) {
+                if (!isOpen) {
+                  _searchController.clear();
+                }
+              },
+              menuItemStyleData: const MenuItemStyleData(
+                height: 40,
+              ),
+            ),
+          ))
         ],
       ),
     );
diff --git a/lib/pages/routines/create_new_routines/create_new_routines.dart b/lib/pages/routines/create_new_routines/create_new_routines.dart
index baf10748..4900af9b 100644
--- a/lib/pages/routines/create_new_routines/create_new_routines.dart
+++ b/lib/pages/routines/create_new_routines/create_new_routines.dart
@@ -5,11 +5,10 @@ import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routi
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/commu_dropdown.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/space_dropdown.dart';
-
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CreateNewRoutinesDialog extends StatefulWidget {
-  const CreateNewRoutinesDialog({Key? key}) : super(key: key);
+  const CreateNewRoutinesDialog({super.key});
 
   @override
   State<CreateNewRoutinesDialog> createState() =>
@@ -19,136 +18,162 @@ class CreateNewRoutinesDialog extends StatefulWidget {
 class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
   String? _selectedCommunity;
   String? _selectedSpace;
-  void _fetchSpaces(String communityId) {
-    context
-        .read<CreateRoutineBloc>()
-        .add(SpaceOnlyWithDevicesEvent(communityId));
-  }
 
   @override
   Widget build(BuildContext context) {
-    return BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
-      builder: (context, state) {
-        final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
-        final spaces = _bloc.spacesOnlyWithDevices;
-        final isLoading = state is SpaceWithDeviceLoadingState;
+    return BlocProvider(
+        create: (BuildContext context) =>
+            CreateRoutineBloc()..add(const FetchCommunityEvent()),
+        child: BlocBuilder<CreateRoutineBloc, CreateRoutineState>(
+          builder: (context, state) {
+            final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+            final spaces = _bloc.spacesOnlyWithDevices;
+            final isLoadingCommunities = state is CommunitiesLoadingState;
+            final isLoadingSpaces = state is SpaceWithDeviceLoadingState;
+            String spaceHint = 'Select a community first';
+            if (_selectedCommunity != null) {
+              if (isLoadingSpaces) {
+                spaceHint = 'Loading spaces...';
+              } else if (spaces.isEmpty) {
+                spaceHint = 'No spaces available';
+              } else {
+                spaceHint = 'Select Space';
+              }
+            }
 
-        String spaceHint = 'Select a community first';
-
-        if (_selectedCommunity != null) {
-          if (isLoading) {
-            spaceHint = 'Loading spaces...';
-          } else if (spaces.isEmpty) {
-            spaceHint = 'No spaces available';
-          } else {
-            spaceHint = 'Select Space';
-          }
-        }
-
-        return AlertDialog(
-          backgroundColor: Colors.white,
-          insetPadding: EdgeInsets.zero,
-          contentPadding: EdgeInsets.zero,
-          shape:
-              RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
-          title: Text(
-            'Create New Routines',
-            textAlign: TextAlign.center,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  color: ColorsManager.primaryColor,
-                ),
-          ),
-          content: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              const Divider(),
-              Padding(
-                padding: const EdgeInsets.only(left: 15, right: 15),
-                child: CommunityDropdown(
-                  selectedValue: _selectedCommunity,
-                  onChanged: (String? newValue) {
-                    setState(() {
-                      _selectedCommunity = newValue;
-                      _selectedSpace = null;
-                    });
-                    if (newValue != null) {
-                      _fetchSpaces(newValue);
-                    }
-                  },
-                ),
+            return AlertDialog(
+              backgroundColor: Colors.white,
+              insetPadding: EdgeInsets.zero,
+              contentPadding: EdgeInsets.zero,
+              shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(12)),
+              title: Text(
+                'Create New Routines',
+                textAlign: TextAlign.center,
+                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                      color: ColorsManager.primaryColor,
+                    ),
               ),
-              const SizedBox(height: 5),
-              Padding(
-                padding: const EdgeInsets.only(left: 15, right: 15),
-                child: SpaceDropdown(
-                  hintMessage: spaceHint,
-                  spaces: spaces,
-                  selectedValue: _selectedSpace,
-                  onChanged: (String? newValue) {
-                    setState(() {
-                      _selectedSpace = newValue;
-                    });
-                  },
-                ),
-              ),
-              const Divider(),
-              Row(
-                mainAxisAlignment: MainAxisAlignment.spaceAround,
+              content: Stack(
                 children: [
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 20,
-                      right: 20,
-                    ),
-                    child: TextButton(
-                      onPressed: () {
-                        Navigator.of(context).pop();
-                      },
-                      child: Text(
-                        'Cancel',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 14,
-                              color: ColorsManager.blackColor,
-                            ),
+                  Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      const Divider(),
+                      Padding(
+                        padding: const EdgeInsets.only(left: 15, right: 15),
+                        child: CommunityDropdown(
+                          communities: _bloc.communities,
+                          selectedValue: _selectedCommunity,
+                          onChanged: (String? newValue) {
+                            setState(() {
+                              _selectedCommunity = newValue;
+                              _selectedSpace = null;
+                            });
+                            if (newValue != null) {
+                              _bloc.add(SpaceOnlyWithDevicesEvent(newValue));
+                            }
+                          },
+                        ),
                       ),
-                    ),
-                  ),
-                  Padding(
-                    padding: const EdgeInsets.only(
-                      left: 20,
-                      right: 20,
-                    ),
-                    child: TextButton(
-                      onPressed:
-                          _selectedCommunity != null && _selectedSpace != null
-                              ? () {
-                                  Navigator.of(context).pop({
-                                    'community': _selectedCommunity,
-                                    'space': _selectedSpace,
-                                  });
-                                }
-                              : null,
-                      child: Text(
-                        'Next',
-                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                              fontWeight: FontWeight.w400,
-                              fontSize: 14,
-                              color: _selectedCommunity != null &&
+                      const SizedBox(height: 5),
+                      Padding(
+                        padding: const EdgeInsets.only(left: 15, right: 15),
+                        child: SpaceDropdown(
+                          hintMessage: spaceHint,
+                          spaces: spaces,
+                          selectedValue: _selectedSpace,
+                          onChanged: (String? newValue) {
+                            setState(() {
+                              _selectedSpace = newValue;
+                            });
+                          },
+                        ),
+                      ),
+                      const Divider(),
+                      Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceAround,
+                        children: [
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 20,
+                              right: 20,
+                            ),
+                            child: TextButton(
+                              onPressed: () {
+                                Navigator.of(context).pop();
+                              },
+                              child: Text(
+                                'Cancel',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 14,
+                                      color: ColorsManager.blackColor,
+                                    ),
+                              ),
+                            ),
+                          ),
+                          Padding(
+                            padding: const EdgeInsets.only(
+                              left: 20,
+                              right: 20,
+                            ),
+                            child: TextButton(
+                              onPressed: _selectedCommunity != null &&
                                       _selectedSpace != null
-                                  ? ColorsManager.blueColor
-                                  : Colors.blue.shade100,
+                                  ? () {
+                                      Navigator.of(context).pop({
+                                        'community': _selectedCommunity,
+                                        'space': _selectedSpace,
+                                      });
+                                    }
+                                  : null,
+                              child: Text(
+                                'Next',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodyMedium!
+                                    .copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 14,
+                                      color: _selectedCommunity != null &&
+                                              _selectedSpace != null
+                                          ? ColorsManager.blueColor
+                                          : Colors.blue.shade100,
+                                    ),
+                              ),
                             ),
+                          ),
+                        ],
+                      ),
+                      const SizedBox(height: 10),
+                    ],
+                  ),
+                  if (isLoadingCommunities)
+                    const SizedBox(
+                      height: 200,
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        crossAxisAlignment: CrossAxisAlignment.center,
+                        children: [
+                          Center(
+                            child: Center(
+                              child: CircularProgressIndicator(
+                                color: ColorsManager.primaryColor,
+                              ),
+                            ),
+                          ),
+                        ],
                       ),
                     ),
-                  ),
                 ],
               ),
-              SizedBox(height: 10),
-            ],
-          ),
-        );
-      },
-    );
+            );
+          },
+        ));
   }
 }
diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index d6078143..eebf3fb7 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -105,9 +105,7 @@ class IfContainer extends StatelessWidget {
             );
           },
           onAcceptWithDetails: (data) async {
-            print('data.data=${data.data}');
             final uniqueCustomId = const Uuid().v4();
-
             final mutableData = Map<String, dynamic>.from(data.data);
             mutableData['uniqueCustomId'] = uniqueCustomId;
 

From d264409d29ad786a0062d466ec255b138dbc057d Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 7 Apr 2025 14:27:36 +0300
Subject: [PATCH 034/238] - Refactor the WpsFunctions class in
 wps_functions.dart to use 'cm' instead of 'temp' for the description of
 operational values. - Update the WallPresenceSensor class in
 wall_presence_sensor.dart to use the selected operation name

---
 lib/pages/routines/models/wps/wps_functions.dart       |  7 ++++---
 .../wall_sensor/wall_presence_sensor.dart              | 10 +++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/pages/routines/models/wps/wps_functions.dart b/lib/pages/routines/models/wps/wps_functions.dart
index 4f48300e..8907927c 100644
--- a/lib/pages/routines/models/wps/wps_functions.dart
+++ b/lib/pages/routines/models/wps/wps_functions.dart
@@ -244,11 +244,12 @@ class CurrentDistanceFunction extends WpsFunctions {
   @override
   List<WpsOperationalValue> getOperationalValues() {
     List<WpsOperationalValue> values = [];
-    for (int temp = min; temp <= max; temp += step) {
+    for (int cm = min; cm <= max; cm += step) {
       values.add(WpsOperationalValue(
         icon: Assets.assetsTempreture,
-        description: "${temp}CM",
-        value: temp,
+        description: "${cm}CM",
+
+        value: cm,
       ));
     }
     return values;
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index ee91b321..e065080f 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -13,7 +13,6 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
-
 class WallPresenceSensor extends StatefulWidget {
   final List<DeviceFunction> functions;
   final AllDevicesModel? device;
@@ -171,7 +170,7 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       orElse: () => DeviceFunctionData(
         entityId: '',
         functionCode: selectedFunction,
-        operationName: '',
+        operationName: state.selectedOperationName!,
         value: null,
       ),
     );
@@ -251,11 +250,8 @@ class _ValueSelector extends StatelessWidget {
     );
   }
 
-  bool _isSliderFunction(String function) => [
-        'dis_current',
-        'presence_time',
-        'illuminance_value'
-      ].contains(function);
+  bool _isSliderFunction(String function) =>
+      ['dis_current', 'presence_time', 'illuminance_value'].contains(function);
 }
 
 class _SliderValueSelector extends StatelessWidget {

From 6bd9fb7e4e28f6a0ff697cec20d5751bd4094f10 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 7 Apr 2025 16:22:21 +0300
Subject: [PATCH 035/238] Refactor routine_view_card.dart to adjust the size o

---
 .../fetch_routine_scenes_automation.dart      | 312 ++++++++++--------
 .../main_routine_view/routine_view_card.dart  |   2 +
 2 files changed, 168 insertions(+), 146 deletions(-)

diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 99c131ee..0a22208c 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -31,165 +31,185 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
             ? const Center(
                 child: CircularProgressIndicator(),
               )
-            : Padding(
-                padding: const EdgeInsets.symmetric(vertical: 16.0),
-                child: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    Text(
-                      "Scenes (Tab to Run)",
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            color: ColorsManager.grayColor,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 10),
-                    if (state.scenes.isEmpty)
-                      Expanded(
-                        child: Text(
+            : SingleChildScrollView(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 16.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        "Scenes (Tab to Run)",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                      ),
+                      const SizedBox(height: 10),
+                      if (state.scenes.isEmpty)
+                        Text(
                           "No scenes found",
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.grayColor,
                           ),
                         ),
-                      ),
-                    if (state.scenes.isNotEmpty)
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                            maxHeight: isSmallScreenSize(context) ? 190 : 200,
-                            maxWidth: MediaQuery.sizeOf(context).width * 0.8),
-                        child: ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: state.scenes.length,
-                            itemBuilder: (context, index) {
-                              final scene = state.scenes[index];
-                              final isLoading =
-                                  state.loadingSceneId == scene.id;
+                      if (state.scenes.isNotEmpty)
+                        SizedBox(
+                          height: 200, 
+                          child: ListView.builder(
+                              shrinkWrap: true,
+                              scrollDirection: Axis.horizontal,
+                              itemCount: state.scenes.length,
+                              itemBuilder: (context, index) {
+                                final scene = state.scenes[index];
+                                final isLoading =
+                                    state.loadingSceneId == scene.id;
 
-                              return Padding(
-                                padding: EdgeInsets.only(
-                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                ),
-                                child: RoutineViewCard(
-                                  isLoading: isLoading,
-                                  sceneOnTap: () {
-                                    context.read<RoutineBloc>().add(
-                                        SceneTrigger(
-                                            sceneId: scene.id,
-                                            name: scene.name));
-                                  },
-                                  status: state.scenes[index].status,
-                                  communityId:
-                                      state.scenes[index].communityId ?? '',
-                                  spaceId: state.scenes[index].spaceId,
-                                  sceneId: state.scenes[index].sceneTuyaId!,
-                                  automationId: state.scenes[index].id,
-                                  cardType: 'scenes',
-                                  spaceName: state.scenes[index].spaceName,
-                                  onTap: () {
-                                    BlocProvider.of<RoutineBloc>(context).add(
-                                      const CreateNewRoutineViewEvent(
-                                          createRoutineView: true),
-                                    );
-                                    context.read<RoutineBloc>().add(
-                                          GetSceneDetails(
-                                            sceneId: state.scenes[index].id,
-                                            isTabToRun: true,
-                                            isUpdate: true,
-                                          ),
-                                        );
-                                  },
-                                  textString: state.scenes[index].name,
-                                  icon: state.scenes[index].icon ??
-                                      Assets.logoHorizontal,
-                                  isFromScenes: true,
-                                  iconInBytes: state.scenes[index].iconInBytes,
-                                ),
-                              );
-                            }),
+                                return Padding(
+                                  padding: EdgeInsets.only(
+                                    right:
+                                        isSmallScreenSize(context) ? 4.0 : 8.0,
+                                  ),
+                                  child: Column(
+                                    children: [
+                                      RoutineViewCard(
+                                        isLoading: isLoading,
+                                        sceneOnTap: () {
+                                          context.read<RoutineBloc>().add(
+                                              SceneTrigger(
+                                                  sceneId: scene.id,
+                                                  name: scene.name));
+                                        },
+                                        status: state.scenes[index].status,
+                                        communityId:
+                                            state.scenes[index].communityId ??
+                                                '',
+                                        spaceId: state.scenes[index].spaceId,
+                                        sceneId:
+                                            state.scenes[index].sceneTuyaId!,
+                                        automationId: state.scenes[index].id,
+                                        cardType: 'scenes',
+                                        spaceName:
+                                            state.scenes[index].spaceName,
+                                        onTap: () {
+                                          BlocProvider.of<RoutineBloc>(context)
+                                              .add(
+                                            const CreateNewRoutineViewEvent(
+                                                createRoutineView: true),
+                                          );
+                                          context.read<RoutineBloc>().add(
+                                                GetSceneDetails(
+                                                  sceneId:
+                                                      state.scenes[index].id,
+                                                  isTabToRun: true,
+                                                  isUpdate: true,
+                                                ),
+                                              );
+                                        },
+                                        textString: state.scenes[index].name,
+                                        icon: state.scenes[index].icon ??
+                                            Assets.logoHorizontal,
+                                        isFromScenes: true,
+                                        iconInBytes:
+                                            state.scenes[index].iconInBytes,
+                                      ),
+                                    ],
+                                  ),
+                                );
+                              }),
+                        ),
+                      const SizedBox(height: 10),
+                      Text(
+                        "Automations",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
                       ),
-                    const SizedBox(height: 10),
-                    Text(
-                      "Automations",
-                      style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            color: ColorsManager.grayColor,
-                            fontWeight: FontWeight.bold,
-                          ),
-                    ),
-                    const SizedBox(height: 3),
-                    if (state.automations.isEmpty)
-                      Expanded(
-                        child: Text(
+                      const SizedBox(height: 3),
+                      if (state.automations.isEmpty)
+                        Text(
                           "No automations found",
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.grayColor,
                           ),
                         ),
-                      ),
-                    if (state.automations.isNotEmpty)
-                      ConstrainedBox(
-                        constraints: BoxConstraints(
-                          maxHeight: isSmallScreenSize(context) ? 190 : 195,
-                        ),
-                        child: ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: state.automations.length,
-                            itemBuilder: (context, index) {
-                              final isLoading = state.automations!
-                                  .contains(state.automations[index].id);
+                      if (state.automations.isNotEmpty)
+                        SizedBox(
+                          height: 200, 
 
-                              return Padding(
-                                padding: EdgeInsets.only(
-                                  right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                ),
-                                child: RoutineViewCard(
-                                  isLoading: isLoading,
-                                  onChanged: (v) {
-                                    // BlocProvider.of<RoutineBloc>(context)
-                                    context.read<RoutineBloc>().add(
-                                          UpdateAutomationStatus(
-                                            automationId:
-                                                state.automations[index].id,
-                                            automationStatusUpdate:
-                                                AutomationStatusUpdate(
-                                                    spaceUuid: state
-                                                        .automations[index]
-                                                        .spaceId,
-                                                    isEnable: v),
-                                            communityId: state
-                                                .automations[index].communityId,
-                                          ),
-                                        );
-                                  },
-                                  status: state.automations[index].status,
-                                  communityId: '',
-                                  spaceId: state.automations[index].spaceId,
-                                  sceneId: '',
-                                  automationId: state.automations[index].id,
-                                  cardType: 'automations',
-                                  spaceName: state.scenes[index].spaceName,
-                                  onTap: () {
-                                    BlocProvider.of<RoutineBloc>(context).add(
-                                      const CreateNewRoutineViewEvent(
-                                          createRoutineView: true),
-                                    );
-                                    context.read<RoutineBloc>().add(
-                                          GetAutomationDetails(
-                                              automationId:
-                                                  state.automations[index].id,
-                                              isAutomation: true,
-                                              isUpdate: true),
-                                        );
-                                  },
-                                  textString: state.automations[index].name,
-                                  icon: state.automations[index].icon ??
-                                      Assets.automation,
-                                ),
-                              );
-                            }),
-                      ),
-                  ],
+                          child: ListView.builder(
+                              shrinkWrap: true,
+                              scrollDirection: Axis.horizontal,
+                              itemCount: state.automations.length,
+                              itemBuilder: (context, index) {
+                                final isLoading = state.automations!
+                                    .contains(state.automations[index].id);
+
+                                return Column(
+                                  children: [
+                                    Padding(
+                                      padding: EdgeInsets.only(
+                                        right: isSmallScreenSize(context)
+                                            ? 4.0
+                                            : 8.0,
+                                      ),
+                                      child: RoutineViewCard(
+                                        isLoading: isLoading,
+                                        onChanged: (v) {
+                                          context.read<RoutineBloc>().add(
+                                                UpdateAutomationStatus(
+                                                  automationId: state
+                                                      .automations[index].id,
+                                                  automationStatusUpdate:
+                                                      AutomationStatusUpdate(
+                                                          spaceUuid: state
+                                                              .automations[
+                                                                  index]
+                                                              .spaceId,
+                                                          isEnable: v),
+                                                  communityId: state
+                                                      .automations[index]
+                                                      .communityId,
+                                                ),
+                                              );
+                                        },
+                                        status: state.automations[index].status,
+                                        communityId: '',
+                                        spaceId:
+                                            state.automations[index].spaceId,
+                                        sceneId: '',
+                                        automationId:
+                                            state.automations[index].id,
+                                        cardType: 'automations',
+                                        spaceName:
+                                            state.scenes[index].spaceName,
+                                        onTap: () {
+                                          BlocProvider.of<RoutineBloc>(context)
+                                              .add(
+                                            const CreateNewRoutineViewEvent(
+                                                createRoutineView: true),
+                                          );
+                                          context.read<RoutineBloc>().add(
+                                                GetAutomationDetails(
+                                                    automationId: state
+                                                        .automations[index].id,
+                                                    isAutomation: true,
+                                                    isUpdate: true),
+                                              );
+                                        },
+                                        textString:
+                                            state.automations[index].name,
+                                        icon: state.automations[index].icon ??
+                                            Assets.automation,
+                                      ),
+                                    ),
+                                  ],
+                                );
+                              }),
+                        ),
+                    ],
+                  ),
                 ),
               );
       },
diff --git a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
index 5f471973..841ffa6e 100644
--- a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
+++ b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
@@ -177,6 +177,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                               : (widget.icon is String &&
                                       widget.icon.endsWith('.svg'))
                                   ? SvgPicture.asset(
+                                      height: iconSize,
+                                      width: iconSize,
                                       widget.icon,
                                       fit: BoxFit.contain,
                                     )

From a56f4e488e8da0039e0359c9d853de5b7fccdb0e Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 7 Apr 2025 16:42:44 +0300
Subject: [PATCH 036/238] Refactor routine_view_card.dart to adjust the size of
 the CircularProgressIndicator Fix routine popup Update
 wall_presence_sensor.dart to handle null selectedOperationName

---
 .../routines/create_new_routines/create_new_routines.dart   | 6 ++----
 .../routine_dialogs/wall_sensor/wall_presence_sensor.dart   | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/pages/routines/create_new_routines/create_new_routines.dart b/lib/pages/routines/create_new_routines/create_new_routines.dart
index 4900af9b..0542f888 100644
--- a/lib/pages/routines/create_new_routines/create_new_routines.dart
+++ b/lib/pages/routines/create_new_routines/create_new_routines.dart
@@ -161,10 +161,8 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                         crossAxisAlignment: CrossAxisAlignment.center,
                         children: [
                           Center(
-                            child: Center(
-                              child: CircularProgressIndicator(
-                                color: ColorsManager.primaryColor,
-                              ),
+                            child: CircularProgressIndicator(
+                              color: ColorsManager.primaryColor,
                             ),
                           ),
                         ],
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index e065080f..b7733511 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -170,7 +170,7 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       orElse: () => DeviceFunctionData(
         entityId: '',
         functionCode: selectedFunction,
-        operationName: state.selectedOperationName!,
+        operationName: state.selectedOperationName ?? '',
         value: null,
       ),
     );

From 7accf1d4c85770cb152eaaca114c4566330c900c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 13:07:53 +0300
Subject: [PATCH 037/238] SP-1366- Add Gateway Device Card to Devices Section.

---
 lib/pages/routines/widgets/routine_devices.dart | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index 2d3f7236..ba5756e0 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -1,6 +1,5 @@
 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/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
 
@@ -32,14 +31,10 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           }
         });
 
-        List<AllDevicesModel> deviceList = state.devices
-            .where((device) =>
-                device.productType == 'AC' ||
-                device.productType == '1G' ||
-                device.productType == '2G' ||
-                device.productType == '3G' ||
-                device.productType == 'WPS')
-            .toList();
+        final deviceList = state.devices.where((device) {
+          const allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
+          return allowedProductTypes.contains(device.productType);
+        }).toList();
 
         return Wrap(
           spacing: 10,
@@ -63,7 +58,7 @@ class _RoutineDevicesState extends State<RoutineDevices> {
                         'uniqueCustomId': '',
                       },
                     )
-                  : Container();
+                  : const SizedBox.shrink();
             } else {
               return DraggableCard(
                 imagePath: device.getDefaultIcon(device.productType),

From 46f318734ad7f137ff5a5e67efb5839184f510f3 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 15:06:11 +0300
Subject: [PATCH 038/238] Add SVG icons for active bell and gear

---
 assets/icons/active_bell.svg    | 21 +++++++++++++++++++++
 assets/icons/gear.svg           |  3 +++
 lib/utils/constants/assets.dart |  3 +++
 3 files changed, 27 insertions(+)
 create mode 100644 assets/icons/active_bell.svg
 create mode 100644 assets/icons/gear.svg

diff --git a/assets/icons/active_bell.svg b/assets/icons/active_bell.svg
new file mode 100644
index 00000000..3887ead5
--- /dev/null
+++ b/assets/icons/active_bell.svg
@@ -0,0 +1,21 @@
+<svg width="23" height="23" viewBox="0 0 23 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_7572_5102)">
+<path d="M11.255 22.5148H11.2389C9.82071 22.5148 8.66699 21.361 8.66699 19.9429V19.3419C8.66699 18.9913 8.95123 18.707 9.30183 18.707H13.1921C13.5427 18.707 13.8269 18.9913 13.8269 19.3419V19.9429C13.8269 21.3611 12.6731 22.5148 11.255 22.5148Z" fill="#FFA81C"/>
+<path d="M13.1912 18.707H11.2461V22.5148H11.2542C12.6723 22.5148 13.826 21.361 13.826 19.9429V19.3419C13.826 18.9912 13.5418 18.707 13.1912 18.707Z" fill="#FF9300"/>
+<path d="M12.5157 4.81334H9.97762C9.62701 4.81334 9.34277 4.5291 9.34277 4.1785V2.74955C9.34277 1.69974 10.1968 0.845703 11.2466 0.845703C12.2964 0.845703 13.1505 1.69978 13.1505 2.74955V4.1785C13.1505 4.5291 12.8663 4.81334 12.5157 4.81334Z" fill="#FFA81C"/>
+<path d="M12.5151 4.81334C12.8657 4.81334 13.1499 4.5291 13.1499 4.1785V2.74955C13.1499 1.69974 12.2959 0.845703 11.2461 0.845703V4.81334H12.5151Z" fill="#FF9300"/>
+<path d="M17.9733 19.9777H4.51899C3.96952 19.9777 3.52246 19.5306 3.52246 18.9811V18.0735C3.52246 17.0793 3.88851 16.1245 4.55319 15.3852C5.00799 14.8792 5.25846 14.226 5.25846 13.5457V9.43293C5.25846 6.13133 7.94448 3.44531 11.2461 3.44531C14.5477 3.44531 17.2337 6.13133 17.2337 9.43293V13.5457C17.2337 14.226 17.4842 14.8792 17.939 15.3851C18.6037 16.1245 18.9697 17.0792 18.9697 18.0734V18.9811C18.9698 19.5306 18.5228 19.9777 17.9733 19.9777Z" fill="#FFCF2C"/>
+<path d="M17.9732 19.9776C18.5227 19.9776 18.9698 19.5306 18.9698 18.9811V18.0734C18.9698 17.0792 18.6037 16.1245 17.939 15.3851C17.4842 14.8792 17.2337 14.226 17.2337 13.5457V9.43293C17.2337 6.13133 14.5477 3.44531 11.2461 3.44531V19.9776H17.9732Z" fill="#FFC12E"/>
+<path d="M3.52246 18.0734V18.9811C3.52246 19.5306 3.96952 19.9776 4.51899 19.9776H17.9732C18.5227 19.9776 18.9698 19.5306 18.9698 18.9811V18.0734C18.9698 17.638 18.8995 17.2102 18.7648 16.8047H3.72747C3.59272 17.2102 3.52246 17.638 3.52246 18.0734Z" fill="#FFF566"/>
+<path d="M11.2461 16.8047V19.9776H17.9732C18.5227 19.9776 18.9698 19.5306 18.9698 18.9811V18.0734C18.9698 17.638 18.8995 17.2102 18.7647 16.8047H11.2461V16.8047Z" fill="#FFE645"/>
+<path d="M1.04282 7.85721C0.998428 7.85721 0.953397 7.85255 0.908238 7.84278C0.565508 7.7688 0.347673 7.43097 0.421653 7.08824C0.930035 4.73345 2.22744 2.57028 4.07483 0.997187C4.3418 0.769872 4.74247 0.802079 4.96975 1.06897C5.19706 1.33594 5.16494 1.73657 4.89797 1.96388C3.2616 3.35728 2.11262 5.2723 1.66273 7.35619C1.59852 7.65376 1.33536 7.85721 1.04282 7.85721Z" fill="#FF8B6E"/>
+<path d="M21.4417 7.85717C21.1491 7.85717 20.886 7.65377 20.8218 7.35619C20.3719 5.2723 19.2229 3.35728 17.5866 1.96393C17.3196 1.73661 17.2875 1.33594 17.5148 1.06901C17.7421 0.80204 18.1427 0.769875 18.4097 0.997233C20.2571 2.57024 21.5545 4.73345 22.0628 7.08825C22.1368 7.43098 21.919 7.7688 21.5763 7.84278C21.5311 7.85247 21.4861 7.85717 21.4417 7.85717Z" fill="#FF674F"/>
+<path d="M3.48329 8.6005C3.4444 8.6005 3.40495 8.5969 3.36534 8.58945C3.02075 8.5247 2.79394 8.19284 2.85869 7.84829C3.20714 5.99413 4.18429 4.28141 5.61006 3.02565C5.87314 2.79385 6.27431 2.81937 6.50603 3.08245C6.73779 3.34557 6.71231 3.74671 6.44923 3.97842C5.23495 5.04796 4.40293 6.50556 4.1065 8.08276C4.04919 8.38778 3.78268 8.6005 3.48329 8.6005Z" fill="#FF8B6E"/>
+<path d="M19.0004 8.60042C18.701 8.60042 18.4345 8.38771 18.3772 8.08273C18.0808 6.50557 17.2489 5.04793 16.0346 3.97843C15.7715 3.74667 15.7461 3.34554 15.9778 3.08241C16.2095 2.81934 16.6107 2.7939 16.8738 3.02562C18.2995 4.28138 19.2766 5.99405 19.625 7.84817C19.6898 8.19277 19.4629 8.52458 19.1183 8.58933C19.0788 8.59682 19.0393 8.60042 19.0004 8.60042Z" fill="#FF674F"/>
+</g>
+<defs>
+<clipPath id="clip0_7572_5102">
+<rect width="21.67" height="21.67" fill="white" transform="translate(0.407227 0.845703)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/assets/icons/gear.svg b/assets/icons/gear.svg
new file mode 100644
index 00000000..02dbab04
--- /dev/null
+++ b/assets/icons/gear.svg
@@ -0,0 +1,3 @@
+<svg width="22" height="23" viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.412 9.9034L18.9398 9.28324C18.788 8.81496 18.5981 8.35938 18.3703 7.92902C18.7373 7.30886 19.522 6.00531 19.522 6.00531C19.6613 5.75219 19.6233 5.43578 19.4208 5.23324L17.6362 3.43609C17.4338 3.23364 17.1047 3.19563 16.8642 3.3475L14.9404 4.49922C14.4975 4.27141 14.0419 4.08152 13.5862 3.92969L12.9661 1.45754C12.9028 1.17902 12.6496 0.976562 12.3586 0.976562H9.82734C9.53629 0.976562 9.28312 1.17902 9.21989 1.4575C9.21989 1.4575 8.78953 3.18293 8.59973 3.92965C8.10614 4.09418 7.62516 4.29663 7.16957 4.5498L5.16984 3.34746C4.91672 3.19558 4.60031 3.23359 4.39781 3.43605L2.61328 5.23324C2.39817 5.43578 2.36016 5.75219 2.51199 6.00531L3.75234 8.06828C3.5498 8.46063 3.38527 8.86563 3.24609 9.28324L0.773948 9.9034C0.495427 9.96672 0.292969 10.2198 0.292969 10.5109V13.0422C0.292969 13.3332 0.495427 13.5864 0.773906 13.6496L3.24609 14.2698C3.39797 14.7381 3.60051 15.2064 3.82832 15.6494L2.72723 17.4845C2.57535 17.7376 2.61328 18.054 2.82844 18.2692L4.61301 20.0537C4.81547 20.2563 5.13188 20.2942 5.38504 20.1423C5.38504 20.1423 6.62531 19.4082 7.2329 19.0412C7.67578 19.2817 8.13136 19.4715 8.59973 19.6234L9.21989 22.0956C9.28317 22.374 9.53629 22.5765 9.82734 22.5765H12.3586C12.6496 22.5765 12.9028 22.374 12.9661 22.0956L13.5862 19.6234C14.0671 19.4715 14.5354 19.269 14.9911 19.0286C15.6112 19.3955 16.8642 20.1423 16.8642 20.1423C17.1046 20.2942 17.4337 20.2563 17.6362 20.0537L19.4208 18.2692C19.6232 18.054 19.6613 17.7376 19.522 17.4845L18.383 15.5987C18.6108 15.1684 18.788 14.7254 18.9398 14.2698L21.412 13.6496C21.6905 13.5864 21.8929 13.3332 21.8929 13.0422V10.5109C21.893 10.2198 21.6905 9.96672 21.412 9.9034ZM11.093 16.2063C8.65031 16.2063 6.66328 14.2192 6.66328 11.7766C6.66328 9.33391 8.65031 7.34688 11.093 7.34688C13.5356 7.34688 15.5227 9.33391 15.5227 11.7766C15.5227 14.2192 13.5356 16.2063 11.093 16.2063Z" fill="#A1A7B3"/>
+</svg>
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index e81512ff..d9788ee8 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -426,5 +426,8 @@ class Assets {
     static const String motionDetectionSensitivityValueIcon = 'assets/icons/motion_detection_sensitivity_value_icon.svg';
     static const String presenceTimeIcon = 'assets/icons/presence_time_icon.svg';
     static const String IlluminanceIcon = 'assets/icons/Illuminance_icon.svg';
+    static const String gear = 'assets/icons/gear.svg';
+    static const String activeBell='assets/icons/active_bell.svg';
+
 
 }

From 9d4395e204b3a1b43d0f46676ae85c44ef78fb39 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 15:08:01 +0300
Subject: [PATCH 039/238] Added gateway product type to `IfContainer`.

---
 lib/pages/routines/widgets/if_container.dart | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index eebf3fb7..b65e99c7 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -72,6 +72,7 @@ class IfContainer extends StatelessWidget {
                                       '2G',
                                       '3G',
                                       'WPS'
+                                      'GW',
                                     ].contains(
                                         state.ifItems[index]['productType'])) {
                                       context.read<RoutineBloc>().add(
@@ -129,7 +130,7 @@ class IfContainer extends StatelessWidget {
                   context
                       .read<RoutineBloc>()
                       .add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS']
+                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW']
                     .contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()

From 8a244dcd239ac31763b8265b54812227341ff79f Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 15:08:15 +0300
Subject: [PATCH 040/238] Created `GatewayModel`.

---
 .../gateway/model/gateway_model.dart          | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 lib/pages/device_managment/gateway/model/gateway_model.dart

diff --git a/lib/pages/device_managment/gateway/model/gateway_model.dart b/lib/pages/device_managment/gateway/model/gateway_model.dart
new file mode 100644
index 00000000..8e8d00f9
--- /dev/null
+++ b/lib/pages/device_managment/gateway/model/gateway_model.dart
@@ -0,0 +1,40 @@
+class GatewayModel {
+  final String uuid;
+  final bool switchAlarmSound;
+  final String masterState;
+  final bool factoryReset;
+  final String alarmActive;
+
+  GatewayModel({
+    required this.uuid,
+    required this.switchAlarmSound,
+    required this.masterState,
+    required this.factoryReset,
+    required this.alarmActive,
+  });
+
+  factory GatewayModel.fromJson(Map<String, dynamic> json) {
+    final status = json['status'] as List<dynamic>;
+
+    final switchAlarmSound = status.firstWhere(
+      (item) => item['code'] == 'switch_alarm_sound',
+    )['value'] as bool;
+    final masterState = status.firstWhere(
+      (item) => item['code'] == 'master_state',
+    )['value'] as String;
+    final factoryReset = status.firstWhere(
+      (item) => item['code'] == 'factory_reset',
+    )['value'] as bool;
+    final alarmActive = status.firstWhere(
+      (item) => item['code'] == 'alarm_active',
+    )['value'] as String;
+
+    return GatewayModel(
+      uuid: json['uuid'] as String,
+      switchAlarmSound: switchAlarmSound,
+      masterState: masterState,
+      factoryReset: factoryReset,
+      alarmActive: alarmActive,
+    );
+  }
+}

From b0846b2fefc8ed6546e3b45864446fcaa4d3aca1 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 15:08:33 +0300
Subject: [PATCH 041/238] Add Gateway operational value classes and
 implementations

---
 lib/pages/routines/models/gateway.dart | 108 +++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 lib/pages/routines/models/gateway.dart

diff --git a/lib/pages/routines/models/gateway.dart b/lib/pages/routines/models/gateway.dart
new file mode 100644
index 00000000..be257a8b
--- /dev/null
+++ b/lib/pages/routines/models/gateway.dart
@@ -0,0 +1,108 @@
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class GatewayOperationalValue {
+  final String icon;
+  final String description;
+  final dynamic value;
+
+  GatewayOperationalValue({
+    required this.icon,
+    required this.description,
+    required this.value,
+  });
+}
+
+abstract class GatewayFunctions extends DeviceFunction<GatewayOperationalValue> {
+  final String type;
+
+  GatewayFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+    required this.type,
+  });
+
+  List<GatewayOperationalValue> getOperationalValues();
+}
+
+final class GatewaySwitchAlarmSound extends GatewayFunctions {
+  GatewaySwitchAlarmSound({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+    super.code = '',
+    super.operationName = 'Switch Alarm Sound',
+    super.icon = Assets.activeBell,
+  });
+
+  @override
+  List<GatewayOperationalValue> getOperationalValues() => [
+        GatewayOperationalValue(
+          icon: Assets.assetsAcPower,
+          description: "ON",
+          value: true,
+        ),
+        GatewayOperationalValue(
+          icon: Assets.assetsAcPowerOFF,
+          description: "OFF",
+          value: false,
+        ),
+      ];
+}
+
+final class GatewayMasterState extends GatewayFunctions {
+  GatewayMasterState({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+    super.code = '',
+    super.operationName = 'Master State',
+    super.icon = Assets.gear,
+  });
+
+  @override
+  List<GatewayOperationalValue> getOperationalValues() {
+    return [
+      GatewayOperationalValue(
+        icon: Assets.assetsAcPower,
+        description: "Normal",
+        value: true,
+      ),
+      GatewayOperationalValue(
+        icon: Assets.assetsAcPowerOFF,
+        description: "Alarm",
+        value: false,
+      ),
+    ];
+  }
+}
+
+final class GatewayFactoryReset extends GatewayFunctions {
+  GatewayFactoryReset({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+    super.code = '',
+    super.operationName = 'Factory Reset',
+    super.icon = Assets.factoryReset,
+  });
+
+  @override
+  List<GatewayOperationalValue> getOperationalValues() {
+    return [
+      GatewayOperationalValue(
+        icon: Assets.assetsAcPower,
+        description: "ON",
+        value: true,
+      ),
+      GatewayOperationalValue(
+        icon: Assets.assetsAcPowerOFF,
+        description: "OFF",
+        value: false,
+      ),
+    ];
+  }
+}

From b6752683fdc29c531921748be319b6d1d03b1574 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 15:08:53 +0300
Subject: [PATCH 042/238] Add Gateway dialog and functions integration

---
 .../all_devices/models/devices_model.dart     |  19 +++
 .../dialog_helper/device_dialog_helper.dart   |  25 ++-
 .../gateway/gateway_dialog.dart               |  29 ++++
 .../gateway/gateway_if_dialog.dart            | 144 ++++++++++++++++++
 4 files changed, 210 insertions(+), 7 deletions(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart

diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index 2663d931..d6999a98 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 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/wps/wps_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/enum/device_types.dart';
@@ -314,6 +315,24 @@ SOS
           // FarDetectionSliderFunction(
           //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')
         ];
+      case 'GW':
+        return [
+          GatewaySwitchAlarmSound(
+            deviceId: uuid ?? '',
+            deviceName: name ?? '',
+            type: 'IF',
+          ),
+          GatewayMasterState(
+            deviceId: uuid ?? '',
+            deviceName: name ?? '',
+            type: 'IF',
+          ),
+          GatewayFactoryReset(
+            deviceId: uuid ?? '',
+            deviceName: name ?? '',
+            type: 'IF',
+          ),
+        ];
       default:
         return [];
     }
diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index 48eaedb9..a94b6740 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -1,11 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_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/widgets/routine_dialogs/ac_dialog.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 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/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
 
 class DeviceDialogHelper {
@@ -57,12 +58,13 @@ class DeviceDialogHelper {
     switch (productType) {
       case 'AC':
         return ACHelper.showACFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+          context,
+          functions,
+          data['device'],
+          deviceSelectedFunctions,
+          data['uniqueCustomId'],
+          removeComparetors,
+        );
 
       case '1G':
         return OneGangSwitchHelper.showSwitchFunctionsDialog(
@@ -97,6 +99,15 @@ class DeviceDialogHelper {
             deviceSelectedFunctions: deviceSelectedFunctions,
             uniqueCustomId: data['uniqueCustomId'],
             removeComparetors: removeComparetors);
+      case 'GW':
+        return GatewayHelper.showGatewayFunctionsDialog(
+          dialogType: dialogType,
+          context: context,
+          functions: functions,
+          uniqueCustomId: data['uniqueCustomId'],
+          deviceSelectedFunctions: deviceSelectedFunctions,
+        );
+
       default:
         return null;
     }
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
new file mode 100644
index 00000000..fe7379fc
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.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/widgets/routine_dialogs/gateway/gateway_if_dialog.dart';
+
+final class GatewayHelper {
+  static Future<Map<String, dynamic>?> showGatewayFunctionsDialog({
+    required String dialogType,
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required String? uniqueCustomId,
+    required List<DeviceFunctionData> deviceSelectedFunctions,
+  }) async {
+    return showDialog(
+      context: context,
+      builder: (context) => BlocProvider<FunctionBloc>(
+        create: (context) => FunctionBloc()
+          ..add(
+            InitializeFunctions(deviceSelectedFunctions),
+          ),
+        child: GatewayIfDialog(
+            uniqueCustomId: uniqueCustomId,
+            functions: functions,
+            deviceSelectedFunctions: deviceSelectedFunctions),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
new file mode 100644
index 00000000..ecaf5ba9
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
@@ -0,0 +1,144 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.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/gateway.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/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class GatewayIfDialog extends StatefulWidget {
+  const GatewayIfDialog({
+    required this.uniqueCustomId,
+    required this.functions,
+    required this.deviceSelectedFunctions,
+    super.key,
+  });
+
+  final String? uniqueCustomId;
+  final List<DeviceFunction> functions;
+  final List<DeviceFunctionData> deviceSelectedFunctions;
+
+  @override
+  State<GatewayIfDialog> createState() => _GatewayIfDialogState();
+}
+
+class _GatewayIfDialogState extends State<GatewayIfDialog> {
+  late final List<GatewayFunctions> _gatewayFunctions;
+
+  @override
+  void initState() {
+    super.initState();
+    _gatewayFunctions = widget.functions
+        .whereType<GatewayFunctions>()
+        .where((function) => function.type == 'IF' || function.type == 'BOTH')
+        .toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    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('Gateway Conditions'),
+                Expanded(child: _buildMainContent(context, state)),
+                _buildDialogFooter(context, state),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  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 ?? '-1',
+                    ),
+                  );
+              Navigator.pop(
+                context,
+                {'deviceId': widget.functions.firstOrNull?.deviceId},
+              );
+            }
+          : null,
+      isConfirmEnabled: state.selectedFunction != null,
+    );
+  }
+
+  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: _gatewayFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = _gatewayFunctions[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,
+                  ),
+                ),
+          );
+        },
+      ),
+    );
+  }
+}

From 006bd4c8aebea218f71a47b762b342c276e9edb7 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 16:20:22 +0300
Subject: [PATCH 043/238] =?UTF-8?q?SP-1364/=20Gateway=20Conditions=20Popup?=
 =?UTF-8?q?=20(for=20=E2=80=9CIf=E2=80=9D=20section)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../all_devices/models/devices_model.dart     |   6 +-
 lib/pages/routines/models/gateway.dart        |  10 +-
 .../gateway/gateway_if_dialog.dart            | 111 +++++++++++++++++-
 3 files changed, 113 insertions(+), 14 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index d6999a98..a71de8ce 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -320,17 +320,17 @@ SOS
           GatewaySwitchAlarmSound(
             deviceId: uuid ?? '',
             deviceName: name ?? '',
-            type: 'IF',
+            type: 'BOTH',
           ),
           GatewayMasterState(
             deviceId: uuid ?? '',
             deviceName: name ?? '',
-            type: 'IF',
+            type: 'BOTH',
           ),
           GatewayFactoryReset(
             deviceId: uuid ?? '',
             deviceName: name ?? '',
-            type: 'IF',
+            type: 'BOTH',
           ),
         ];
       default:
diff --git a/lib/pages/routines/models/gateway.dart b/lib/pages/routines/models/gateway.dart
index be257a8b..daeebd53 100644
--- a/lib/pages/routines/models/gateway.dart
+++ b/lib/pages/routines/models/gateway.dart
@@ -33,7 +33,7 @@ final class GatewaySwitchAlarmSound extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = '',
+    super.code = 'switch_alarm_sound',
     super.operationName = 'Switch Alarm Sound',
     super.icon = Assets.activeBell,
   });
@@ -58,7 +58,7 @@ final class GatewayMasterState extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = '',
+    super.code = 'master_state',
     super.operationName = 'Master State',
     super.icon = Assets.gear,
   });
@@ -69,12 +69,12 @@ final class GatewayMasterState extends GatewayFunctions {
       GatewayOperationalValue(
         icon: Assets.assetsAcPower,
         description: "Normal",
-        value: true,
+        value: 'Normal',
       ),
       GatewayOperationalValue(
         icon: Assets.assetsAcPowerOFF,
         description: "Alarm",
-        value: false,
+        value: 'Alarm',
       ),
     ];
   }
@@ -85,7 +85,7 @@ final class GatewayFactoryReset extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = '',
+    super.code = 'factory_reset',
     super.operationName = 'Factory Reset',
     super.icon = Assets.factoryReset,
   });
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
index ecaf5ba9..457110b7 100644
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/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';
@@ -32,10 +33,7 @@ class _GatewayIfDialogState extends State<GatewayIfDialog> {
   @override
   void initState() {
     super.initState();
-    _gatewayFunctions = widget.functions
-        .whereType<GatewayFunctions>()
-        .where((function) => function.type == 'IF' || function.type == 'BOTH')
-        .toList();
+    _gatewayFunctions = widget.functions.whereType<GatewayFunctions>().toList();
   }
 
   @override
@@ -89,11 +87,32 @@ class _GatewayIfDialogState extends State<GatewayIfDialog> {
   }
 
   Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedOperationName = state.selectedOperationName;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
+
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
         _buildFunctionList(context),
-        // if (state.selectedFunction != null) _buildValueSelector(context, state),
+        if (state.selectedFunction != null)
+          Expanded(
+            child: _buildValueSelector(
+              context: context,
+              selectedFunction: selectedFunction ?? '',
+              selectedFunctionData: selectedFunctionData,
+              acFunctions: _gatewayFunctions,
+              operationName: selectedOperationName ?? '',
+            ),
+          ),
       ],
     );
   }
@@ -103,7 +122,6 @@ class _GatewayIfDialogState extends State<GatewayIfDialog> {
       width: 360,
       child: ListView.separated(
         shrinkWrap: false,
-        physics: const AlwaysScrollableScrollPhysics(),
         itemCount: _gatewayFunctions.length,
         separatorBuilder: (context, index) => const Padding(
           padding: EdgeInsets.symmetric(horizontal: 40.0),
@@ -141,4 +159,85 @@ class _GatewayIfDialogState extends State<GatewayIfDialog> {
       ),
     );
   }
+
+  static Widget _buildValueSelector({
+    required BuildContext context,
+    required String selectedFunction,
+    required DeviceFunctionData? selectedFunctionData,
+    required List<GatewayFunctions> acFunctions,
+    AllDevicesModel? device,
+    required String operationName,
+  }) {
+    final selectedGatewayFunctions = acFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+    );
+    final values = selectedGatewayFunctions.getOperationalValues();
+
+    return _buildOperationalValuesList(
+      context: context,
+      values: values,
+      selectedValue: selectedFunctionData?.value,
+      device: device,
+      operationName: operationName,
+      selectCode: selectedFunction,
+      selectedFunctionData: selectedFunctionData,
+    );
+  }
+
+  static Widget _buildOperationalValuesList({
+    required BuildContext context,
+    required List<GatewayOperationalValue> values,
+    required dynamic selectedValue,
+    AllDevicesModel? device,
+    required String operationName,
+    required String selectCode,
+    DeviceFunctionData? selectedFunctionData,
+  }) {
+    return ListView.builder(
+      itemCount: values.length,
+      itemBuilder: (context, index) {
+        final value = values[index];
+        final isSelected = selectedValue == value.value;
+        return ListTile(
+          leading: SvgPicture.asset(
+            value.icon,
+            width: 24,
+            height: 24,
+            placeholderBuilder: (context) => Container(
+              width: 24,
+              height: 24,
+              color: Colors.transparent,
+            ),
+          ),
+          title: Text(
+            value.description,
+            style: context.textTheme.bodyMedium,
+          ),
+          trailing: Icon(
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            size: 24,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
+          ),
+          onTap: () {
+            if (!isSelected) {
+              context.read<FunctionBloc>().add(
+                    AddFunction(
+                      functionData: DeviceFunctionData(
+                        entityId: device?.uuid ?? '',
+                        functionCode: selectCode,
+                        operationName: operationName,
+                        value: value.value,
+                        condition: selectedFunctionData?.condition,
+                        valueDescription: selectedFunctionData?.valueDescription,
+                      ),
+                    ),
+                  );
+            }
+          },
+        );
+      },
+    );
+  }
 }

From 970f7ed16f18356b5b95ededf039f0bd69d03103 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 16:41:34 +0300
Subject: [PATCH 044/238] SP-1365

---
 .../helper/dialog_helper/device_dialog_helper.dart       | 9 ++++-----
 .../widgets/routine_dialogs/gateway/gateway_dialog.dart  | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index a94b6740..1fac903e 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -50,10 +50,10 @@ class DeviceDialogHelper {
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
-    if (removeComparetors && data['productType'] != 'WPS') {
-      //remove the current temp function in the 'if container'
-      functions.removeAt(3);
-    }
+    // if (removeComparetors && data['productType'] != 'WPS') {
+    //   //remove the current temp function in the 'if container'
+    //   functions.removeAt(3);
+    // }
 
     switch (productType) {
       case 'AC':
@@ -101,7 +101,6 @@ class DeviceDialogHelper {
             removeComparetors: removeComparetors);
       case 'GW':
         return GatewayHelper.showGatewayFunctionsDialog(
-          dialogType: dialogType,
           context: context,
           functions: functions,
           uniqueCustomId: data['uniqueCustomId'],
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
index fe7379fc..b9638cd9 100644
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
@@ -6,7 +6,6 @@ import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gatew
 
 final class GatewayHelper {
   static Future<Map<String, dynamic>?> showGatewayFunctionsDialog({
-    required String dialogType,
     required BuildContext context,
     required List<DeviceFunction> functions,
     required String? uniqueCustomId,

From 3a0c8edf8601e0a79c0ff90d7827d8e6bb9938fc Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 8 Apr 2025 16:42:31 +0300
Subject: [PATCH 045/238] =?UTF-8?q?SP-1365/=20Gateway=20Functions=20Popup?=
 =?UTF-8?q?=20(for=20=E2=80=9CThen=E2=80=9D=20section).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/routines/widgets/then_container.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/pages/routines/widgets/then_container.dart b/lib/pages/routines/widgets/then_container.dart
index a4d0461d..e0828721 100644
--- a/lib/pages/routines/widgets/then_container.dart
+++ b/lib/pages/routines/widgets/then_container.dart
@@ -113,7 +113,8 @@ class ThenContainer extends StatelessWidget {
                                           '1G',
                                           '2G',
                                           '3G',
-                                          'WPS'
+                                          'WPS',
+                                          "GW",
                                         ].contains(state.thenItems[index]
                                             ['productType'])) {
                                           context.read<RoutineBloc>().add(
@@ -229,7 +230,7 @@ class ThenContainer extends StatelessWidget {
                 dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G', 'WPS']
+            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW']
                 .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }

From a242377ea645b19eb9d9233f5568d9ee0f8268e9 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 09:46:45 +0300
Subject: [PATCH 046/238] Fully refactored `CreateRoutine/Gateway` feature.

---
 .../dialog_helper/device_dialog_helper.dart   |   3 +-
 .../routine_dialog_function_list_tile.dart    |  42 +++
 .../routine_dialog_selection_list_tile.dart   |  47 ++++
 .../gateway/gateway_dialog.dart               | 143 +++++++++--
 .../gateway_dialog_value_selector.dart        |  58 +++++
 .../gateway/gateway_functions_list.dart       |  43 ++++
 .../gateway/gateway_helper.dart               |  34 +++
 .../gateway/gateway_if_dialog.dart            | 243 ------------------
 8 files changed, 350 insertions(+), 263 deletions(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialog_selection_list_tile.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart
 delete mode 100644 lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart

diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index 1fac903e..f029677e 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_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/widgets/routine_dialogs/ac_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 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';
@@ -105,6 +105,7 @@ class DeviceDialogHelper {
           functions: functions,
           uniqueCustomId: data['uniqueCustomId'],
           deviceSelectedFunctions: deviceSelectedFunctions,
+          device: data['device'],
         );
 
       default:
diff --git a/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart b/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
new file mode 100644
index 00000000..3e98a06e
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialog_function_list_tile.dart
@@ -0,0 +1,42 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class RoutineDialogFunctionListTile extends StatelessWidget {
+  const RoutineDialogFunctionListTile({
+    super.key,
+    required this.iconPath,
+    required this.operationName,
+    required this.onTap,
+  });
+
+  final String iconPath;
+  final String operationName;
+  final void Function() onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: SvgPicture.asset(
+        iconPath,
+        width: 24,
+        height: 24,
+        placeholderBuilder: (context) => const SizedBox(
+          width: 24,
+          height: 24,
+        ),
+      ),
+      title: Text(
+        operationName,
+        style: context.textTheme.bodyMedium,
+      ),
+      trailing: const Icon(
+        Icons.arrow_forward_ios,
+        size: 16,
+        color: ColorsManager.textGray,
+      ),
+      onTap: onTap,
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialog_selection_list_tile.dart b/lib/pages/routines/widgets/routine_dialog_selection_list_tile.dart
new file mode 100644
index 00000000..b661e591
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialog_selection_list_tile.dart
@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class RoutineDialogSelectionListTile extends StatelessWidget {
+  const RoutineDialogSelectionListTile({
+    required this.iconPath,
+    required this.description,
+    required this.isSelected,
+    required this.onTap,
+    super.key,
+  });
+
+  final bool isSelected;
+  final String iconPath;
+  final String description;
+  final void Function() onTap;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListTile(
+      leading: SvgPicture.asset(
+        iconPath,
+        width: 24,
+        height: 24,
+        placeholderBuilder: (context) => Container(
+          width: 24,
+          height: 24,
+          color: Colors.transparent,
+        ),
+      ),
+      title: Text(
+        description,
+        style: context.textTheme.bodyMedium,
+      ),
+      trailing: Icon(
+        isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+        size: 24,
+        color: isSelected
+            ? ColorsManager.primaryColorWithOpacity
+            : ColorsManager.textGray,
+      ),
+      onTap: onTap,
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
index b9638cd9..fc7189f2 100644
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
@@ -1,28 +1,133 @@
 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/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart';
+import 'package:syncrow_web/pages/routines/models/gateway.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/gateway/gateway_dialog_value_selector.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart';
 
-final class GatewayHelper {
-  static Future<Map<String, dynamic>?> showGatewayFunctionsDialog({
-    required BuildContext context,
-    required List<DeviceFunction> functions,
-    required String? uniqueCustomId,
-    required List<DeviceFunctionData> deviceSelectedFunctions,
-  }) async {
-    return showDialog(
-      context: context,
-      builder: (context) => BlocProvider<FunctionBloc>(
-        create: (context) => FunctionBloc()
-          ..add(
-            InitializeFunctions(deviceSelectedFunctions),
-          ),
-        child: GatewayIfDialog(
-            uniqueCustomId: uniqueCustomId,
-            functions: functions,
-            deviceSelectedFunctions: deviceSelectedFunctions),
+class GatewayDialog extends StatefulWidget {
+  const GatewayDialog({
+    required this.uniqueCustomId,
+    required this.functions,
+    required this.deviceSelectedFunctions,
+    required this.device,
+    super.key,
+  });
+
+  final String? uniqueCustomId;
+  final List<DeviceFunction> functions;
+  final List<DeviceFunctionData> deviceSelectedFunctions;
+  final AllDevicesModel? device;
+
+  @override
+  State<GatewayDialog> createState() => _GatewayDialogState();
+}
+
+class _GatewayDialogState extends State<GatewayDialog> {
+  late final List<GatewayFunctions> _gatewayFunctions;
+
+  @override
+  void initState() {
+    super.initState();
+    _gatewayFunctions = widget.functions.whereType<GatewayFunctions>().toList();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    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('Gateway Conditions'),
+                Expanded(child: _buildMainContent(context, state)),
+                _buildDialogFooter(context, state),
+              ],
+            ),
+          );
+        },
       ),
     );
   }
+
+  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedOperationName = state.selectedOperationName;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
+    final selectedGatewayFunctions = _gatewayFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+      orElse: () => GatewaySwitchAlarmSound(
+        code: selectedFunction ?? '',
+        deviceId: '',
+        deviceName: '',
+        operationName: '',
+        icon: '',
+        type: '',
+      ),
+    );
+    final operations = selectedGatewayFunctions.getOperationalValues();
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        GatewayFunctionsList(gatewayFunctions: _gatewayFunctions),
+        if (state.selectedFunction != null)
+          Expanded(
+            child: GatewayDialogValueSelector(
+              operations: operations,
+              selectedFunction: selectedFunction ?? '',
+              selectedFunctionData: selectedFunctionData,
+              gatewayFunctions: _gatewayFunctions,
+              operationName: selectedOperationName ?? '',
+              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 ?? '-1',
+                    ),
+                  );
+              Navigator.pop(
+                context,
+                {'deviceId': widget.functions.firstOrNull?.deviceId},
+              );
+            }
+          : null,
+      isConfirmEnabled: state.selectedFunction != null,
+    );
+  }
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart
new file mode 100644
index 00000000..392c3012
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog_value_selector.dart
@@ -0,0 +1,58 @@
+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/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/gateway.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialog_selection_list_tile.dart';
+
+class GatewayDialogValueSelector extends StatelessWidget {
+  const GatewayDialogValueSelector({
+    required this.operations,
+    required this.selectedFunction,
+    required this.selectedFunctionData,
+    required this.gatewayFunctions,
+    required this.device,
+    required this.operationName,
+    super.key,
+  });
+
+  final List<GatewayOperationalValue> operations;
+  final String selectedFunction;
+  final DeviceFunctionData? selectedFunctionData;
+  final List<GatewayFunctions> gatewayFunctions;
+  final AllDevicesModel? device;
+  final String operationName;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      itemCount: operations.length,
+      itemBuilder: (context, index) {
+        final operation = operations[index];
+        final isSelected = selectedFunctionData?.value == operation.value;
+        return RoutineDialogSelectionListTile(
+          iconPath: operation.icon,
+          description: operation.description,
+          isSelected: isSelected,
+          onTap: () {
+            if (!isSelected) {
+              context.read<FunctionBloc>().add(
+                    AddFunction(
+                      functionData: DeviceFunctionData(
+                        entityId: device?.uuid ?? '',
+                        functionCode: selectedFunction,
+                        operationName: operationName,
+                        value: operation.value,
+                        condition: selectedFunctionData?.condition,
+                        valueDescription: selectedFunctionData?.valueDescription,
+                      ),
+                    ),
+                  );
+            }
+          },
+        );
+      },
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart
new file mode 100644
index 00000000..6d253dcb
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_functions_list.dart
@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/gateway.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialog_function_list_tile.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class GatewayFunctionsList extends StatelessWidget {
+  const GatewayFunctionsList({
+    required this.gatewayFunctions,
+    super.key,
+  });
+
+  final List<GatewayFunctions> gatewayFunctions;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 360,
+      child: ListView.separated(
+        shrinkWrap: false,
+        itemCount: gatewayFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = gatewayFunctions[index];
+          return RoutineDialogFunctionListTile(
+            iconPath: function.icon,
+            operationName: function.operationName,
+            onTap: () => context.read<FunctionBloc>().add(
+                  SelectFunction(
+                    functionCode: function.code,
+                    operationName: function.operationName,
+                  ),
+                ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart
new file mode 100644
index 00000000..9a9351ca
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart
@@ -0,0 +1,34 @@
+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/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart';
+
+abstract final class GatewayHelper {
+  const GatewayHelper._();
+
+  static Future<Map<String, dynamic>?> showGatewayFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required String? uniqueCustomId,
+    required List<DeviceFunctionData> deviceSelectedFunctions,
+    required AllDevicesModel? device,
+  }) async {
+    return showDialog(
+      context: context,
+      builder: (context) => BlocProvider<FunctionBloc>(
+        create: (context) => FunctionBloc()
+          ..add(
+            InitializeFunctions(deviceSelectedFunctions),
+          ),
+        child: GatewayDialog(
+          uniqueCustomId: uniqueCustomId,
+          functions: functions,
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          device: device,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
deleted file mode 100644
index 457110b7..00000000
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_if_dialog.dart
+++ /dev/null
@@ -1,243 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.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/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/gateway.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/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class GatewayIfDialog extends StatefulWidget {
-  const GatewayIfDialog({
-    required this.uniqueCustomId,
-    required this.functions,
-    required this.deviceSelectedFunctions,
-    super.key,
-  });
-
-  final String? uniqueCustomId;
-  final List<DeviceFunction> functions;
-  final List<DeviceFunctionData> deviceSelectedFunctions;
-
-  @override
-  State<GatewayIfDialog> createState() => _GatewayIfDialogState();
-}
-
-class _GatewayIfDialogState extends State<GatewayIfDialog> {
-  late final List<GatewayFunctions> _gatewayFunctions;
-
-  @override
-  void initState() {
-    super.initState();
-    _gatewayFunctions = widget.functions.whereType<GatewayFunctions>().toList();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    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('Gateway Conditions'),
-                Expanded(child: _buildMainContent(context, state)),
-                _buildDialogFooter(context, state),
-              ],
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  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 ?? '-1',
-                    ),
-                  );
-              Navigator.pop(
-                context,
-                {'deviceId': widget.functions.firstOrNull?.deviceId},
-              );
-            }
-          : null,
-      isConfirmEnabled: state.selectedFunction != null,
-    );
-  }
-
-  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
-    final selectedFunction = state.selectedFunction;
-    final selectedOperationName = state.selectedOperationName;
-    final selectedFunctionData = state.addedFunctions.firstWhere(
-      (f) => f.functionCode == selectedFunction,
-      orElse: () => DeviceFunctionData(
-        entityId: '',
-        functionCode: selectedFunction ?? '',
-        operationName: '',
-        value: null,
-      ),
-    );
-
-    return Row(
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: [
-        _buildFunctionList(context),
-        if (state.selectedFunction != null)
-          Expanded(
-            child: _buildValueSelector(
-              context: context,
-              selectedFunction: selectedFunction ?? '',
-              selectedFunctionData: selectedFunctionData,
-              acFunctions: _gatewayFunctions,
-              operationName: selectedOperationName ?? '',
-            ),
-          ),
-      ],
-    );
-  }
-
-  Widget _buildFunctionList(BuildContext context) {
-    return SizedBox(
-      width: 360,
-      child: ListView.separated(
-        shrinkWrap: false,
-        itemCount: _gatewayFunctions.length,
-        separatorBuilder: (context, index) => const Padding(
-          padding: EdgeInsets.symmetric(horizontal: 40.0),
-          child: Divider(color: ColorsManager.dividerColor),
-        ),
-        itemBuilder: (context, index) {
-          final function = _gatewayFunctions[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,
-                  ),
-                ),
-          );
-        },
-      ),
-    );
-  }
-
-  static Widget _buildValueSelector({
-    required BuildContext context,
-    required String selectedFunction,
-    required DeviceFunctionData? selectedFunctionData,
-    required List<GatewayFunctions> acFunctions,
-    AllDevicesModel? device,
-    required String operationName,
-  }) {
-    final selectedGatewayFunctions = acFunctions.firstWhere(
-      (f) => f.code == selectedFunction,
-    );
-    final values = selectedGatewayFunctions.getOperationalValues();
-
-    return _buildOperationalValuesList(
-      context: context,
-      values: values,
-      selectedValue: selectedFunctionData?.value,
-      device: device,
-      operationName: operationName,
-      selectCode: selectedFunction,
-      selectedFunctionData: selectedFunctionData,
-    );
-  }
-
-  static Widget _buildOperationalValuesList({
-    required BuildContext context,
-    required List<GatewayOperationalValue> values,
-    required dynamic selectedValue,
-    AllDevicesModel? device,
-    required String operationName,
-    required String selectCode,
-    DeviceFunctionData? selectedFunctionData,
-  }) {
-    return ListView.builder(
-      itemCount: values.length,
-      itemBuilder: (context, index) {
-        final value = values[index];
-        final isSelected = selectedValue == value.value;
-        return ListTile(
-          leading: SvgPicture.asset(
-            value.icon,
-            width: 24,
-            height: 24,
-            placeholderBuilder: (context) => Container(
-              width: 24,
-              height: 24,
-              color: Colors.transparent,
-            ),
-          ),
-          title: Text(
-            value.description,
-            style: context.textTheme.bodyMedium,
-          ),
-          trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
-            size: 24,
-            color: isSelected
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
-          ),
-          onTap: () {
-            if (!isSelected) {
-              context.read<FunctionBloc>().add(
-                    AddFunction(
-                      functionData: DeviceFunctionData(
-                        entityId: device?.uuid ?? '',
-                        functionCode: selectCode,
-                        operationName: operationName,
-                        value: value.value,
-                        condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
-                      ),
-                    ),
-                  );
-            }
-          },
-        );
-      },
-    );
-  }
-}

From 9b69ec31e9200df34cc3ce4aadad23219507894a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 09:57:18 +0300
Subject: [PATCH 047/238] Refactor RoutineDevices to use a class-level constant
 for allowed product types.

---
 lib/pages/routines/widgets/routine_devices.dart | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index ba5756e0..f6ff0db9 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -17,6 +17,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
     context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
+  static const _allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
+
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
@@ -31,10 +33,9 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           }
         });
 
-        final deviceList = state.devices.where((device) {
-          const allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW'};
-          return allowedProductTypes.contains(device.productType);
-        }).toList();
+        final deviceList = state.devices
+            .where((device) => _allowedProductTypes.contains(device.productType))
+            .toList();
 
         return Wrap(
           spacing: 10,

From 774f21a55b1801d88f84efda14150bad2b2985fe Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 09:59:15 +0300
Subject: [PATCH 048/238] Refactor RoutineDevices to consolidate device data
 preparation in a single map to remove code duplication.

---
 .../routines/widgets/routine_devices.dart     | 39 ++++++++-----------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index f6ff0db9..84fd44c0 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -42,37 +42,32 @@ class _RoutineDevicesState extends State<RoutineDevices> {
           runSpacing: 10,
           children: deviceList.asMap().entries.map((entry) {
             final device = entry.value;
+
+            final deviceData = {
+              'device': device,
+              'imagePath': device.getDefaultIcon(device.productType),
+              'title': device.name ?? '',
+              'deviceId': device.uuid,
+              'productType': device.productType,
+              'functions': device.functions,
+              'uniqueCustomId': '',
+            };
+
             if (state.searchText != null && state.searchText!.isNotEmpty) {
               return device.name!
                       .toLowerCase()
                       .contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
-                      imagePath: device.getDefaultIcon(device.productType),
-                      title: device.name ?? '',
-                      deviceData: {
-                        'device': device,
-                        'imagePath': device.getDefaultIcon(device.productType),
-                        'title': device.name ?? '',
-                        'deviceId': device.uuid,
-                        'productType': device.productType,
-                        'functions': device.functions,
-                        'uniqueCustomId': '',
-                      },
+                      imagePath: deviceData['imagePath'] as String,
+                      title: deviceData['title'] as String,
+                      deviceData: deviceData,
                     )
                   : const SizedBox.shrink();
             } else {
               return DraggableCard(
-                imagePath: device.getDefaultIcon(device.productType),
-                title: device.name ?? '',
-                deviceData: {
-                  'device': device,
-                  'imagePath': device.getDefaultIcon(device.productType),
-                  'title': device.name ?? '',
-                  'deviceId': device.uuid,
-                  'productType': device.productType,
-                  'functions': device.functions,
-                  'uniqueCustomId': '',
-                },
+                imagePath: deviceData['imagePath'] as String,
+                title: deviceData['title'] as String,
+                deviceData: deviceData,
               );
             }
           }).toList(),

From d08ab8caac0a5cee5331e14c75bfa1c73431669e Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Wed, 9 Apr 2025 10:09:56 +0300
Subject: [PATCH 049/238] add dialogType to devices and add parameter in
 showSwitchFunctionsDialog

---
 .../all_devices/models/devices_model.dart     | 32 +++++----
 .../dialog_helper/device_dialog_helper.dart   | 57 ++++++++--------
 lib/pages/routines/models/ac/ac_function.dart | 27 ++++++--
 .../three_gang_switch/three_gang_switch.dart  | 12 ++--
 .../widgets/routine_dialogs/ac_dialog.dart    | 56 ++++++++++------
 .../one_gang_switch_dialog.dart               | 62 +++++++++++-------
 .../three_gang_switch_dialog.dart             | 17 ++---
 .../two_gang_switch_dialog.dart               | 65 ++++++++++++-------
 8 files changed, 198 insertions(+), 130 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index 2663d931..deac5b2a 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -247,12 +247,18 @@ SOS
     switch (productType) {
       case 'AC':
         return [
-          SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ModeFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          LevelFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          SwitchFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ModeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          TempSetFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          CurrentTempFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          LevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ChildLockFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
 
       case '1G':
@@ -275,17 +281,17 @@ SOS
       case '3G':
         return [
           ThreeGangSwitch1Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           ThreeGangSwitch2Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           ThreeGangSwitch3Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           ThreeGangCountdown1Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           ThreeGangCountdown2Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
           ThreeGangCountdown3Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
       case 'WPS':
         return [
@@ -311,8 +317,6 @@ SOS
           NoOneTimeFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
 
-          // FarDetectionSliderFunction(
-          //     deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN')
         ];
       default:
         return [];
diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index 48eaedb9..96919364 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -49,45 +49,46 @@ class DeviceDialogHelper {
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
-    if (removeComparetors && data['productType'] != 'WPS') {
-      //remove the current temp function in the 'if container'
-      functions.removeAt(3);
-    }
 
     switch (productType) {
       case 'AC':
         return ACHelper.showACFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+          context: context,
+          functions: functions,
+          device: data['device'],
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          uniqueCustomId: data['uniqueCustomId'],
+          removeComparetors: removeComparetors,
+          dialogType: dialogType,
+        );
 
       case '1G':
         return OneGangSwitchHelper.showSwitchFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
       case '2G':
         return TwoGangSwitchHelper.showSwitchFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
       case '3G':
         return ThreeGangSwitchHelper.showSwitchFunctionsDialog(
-            context,
-            functions,
-            data['device'],
-            deviceSelectedFunctions,
-            data['uniqueCustomId'],
-            removeComparetors);
+            dialogType: dialogType,
+            context: context,
+            functions: functions,
+            device: data['device'],
+            deviceSelectedFunctions: deviceSelectedFunctions,
+            uniqueCustomId: data['uniqueCustomId'],
+            removeComparetors: removeComparetors);
       case 'WPS':
         return WallPresenceSensor.showWPSFunctionsDialog(
             dialogType: dialogType,
diff --git a/lib/pages/routines/models/ac/ac_function.dart b/lib/pages/routines/models/ac/ac_function.dart
index 0af1ff69..0b534e88 100644
--- a/lib/pages/routines/models/ac/ac_function.dart
+++ b/lib/pages/routines/models/ac/ac_function.dart
@@ -5,23 +5,28 @@ import 'package:syncrow_web/utils/constants/app_enum.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 abstract class ACFunction extends DeviceFunction<AcStatusModel> {
+  final String type;
+
   ACFunction({
     required super.deviceId,
     required super.deviceName,
     required super.code,
     required super.operationName,
     required super.icon,
+    required this.type,
   });
 
   List<ACOperationalValue> getOperationalValues();
 }
 
 class SwitchFunction extends ACFunction {
-  SwitchFunction({required super.deviceId, required super.deviceName})
+  SwitchFunction(
+      {required super.deviceId, required super.deviceName, required type})
       : super(
           code: 'switch',
           operationName: 'Power',
           icon: Assets.assetsAcPower,
+          type: type,
         );
 
   @override
@@ -40,11 +45,13 @@ class SwitchFunction extends ACFunction {
 }
 
 class ModeFunction extends ACFunction {
-  ModeFunction({required super.deviceId, required super.deviceName})
+  ModeFunction(
+      {required super.deviceId, required super.deviceName, required type})
       : super(
           code: 'mode',
           operationName: 'Mode',
           icon: Assets.assetsFreezing,
+          type: type,
         );
 
   @override
@@ -72,7 +79,8 @@ class TempSetFunction extends ACFunction {
   final int max;
   final int step;
 
-  TempSetFunction({required super.deviceId, required super.deviceName})
+  TempSetFunction(
+      {required super.deviceId, required super.deviceName, required type})
       : min = 160,
         max = 300,
         step = 1,
@@ -80,6 +88,7 @@ class TempSetFunction extends ACFunction {
           code: 'temp_set',
           operationName: 'Set Temperature',
           icon: Assets.assetsTempreture,
+          type: type,
         );
 
   @override
@@ -97,8 +106,10 @@ class TempSetFunction extends ACFunction {
 }
 
 class LevelFunction extends ACFunction {
-  LevelFunction({required super.deviceId, required super.deviceName})
+  LevelFunction(
+      {required super.deviceId, required super.deviceName, required type})
       : super(
+          type: type,
           code: 'level',
           operationName: 'Fan Speed',
           icon: Assets.assetsFanSpeed,
@@ -130,8 +141,10 @@ class LevelFunction extends ACFunction {
 }
 
 class ChildLockFunction extends ACFunction {
-  ChildLockFunction({required super.deviceId, required super.deviceName})
+  ChildLockFunction(
+      {required super.deviceId, required super.deviceName, required type})
       : super(
+          type: type,
           code: 'child_lock',
           operationName: 'Child Lock',
           icon: Assets.assetsChildLock,
@@ -157,11 +170,13 @@ class CurrentTempFunction extends ACFunction {
   final int max;
   final int step;
 
-  CurrentTempFunction({required super.deviceId, required super.deviceName})
+  CurrentTempFunction(
+      {required super.deviceId, required super.deviceName, required type})
       : min = -100,
         max = 990,
         step = 1,
         super(
+          type: type,
           code: 'temp_current',
           operationName: 'Current Temperature',
           icon: Assets.currentTemp,
diff --git a/lib/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart b/lib/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart
index ca0ed497..9bdd30b4 100644
--- a/lib/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart
+++ b/lib/pages/routines/models/gang_switches/three_gang_switch/three_gang_switch.dart
@@ -3,7 +3,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operation
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class ThreeGangSwitch1Function extends BaseSwitchFunction {
-  ThreeGangSwitch1Function({required super.deviceId, required super.deviceName})
+  ThreeGangSwitch1Function({required super.deviceId, required super.deviceName ,required type})
       : super(
           code: 'switch_1',
           operationName: 'Light 1 Switch',
@@ -26,7 +26,7 @@ class ThreeGangSwitch1Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown1Function extends BaseSwitchFunction {
-  ThreeGangCountdown1Function({required super.deviceId, required super.deviceName})
+  ThreeGangCountdown1Function({required super.deviceId, required super.deviceName ,required type})
       : super(
           code: 'countdown_1',
           operationName: 'Light 1 Countdown',
@@ -47,7 +47,7 @@ class ThreeGangCountdown1Function extends BaseSwitchFunction {
 }
 
 class ThreeGangSwitch2Function extends BaseSwitchFunction {
-  ThreeGangSwitch2Function({required super.deviceId, required super.deviceName})
+  ThreeGangSwitch2Function({required super.deviceId, required super.deviceName, required type})
       : super(
           code: 'switch_2',
           operationName: 'Light 2 Switch',
@@ -70,7 +70,7 @@ class ThreeGangSwitch2Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown2Function extends BaseSwitchFunction {
-  ThreeGangCountdown2Function({required super.deviceId, required super.deviceName})
+  ThreeGangCountdown2Function({required super.deviceId, required super.deviceName ,required type})
       : super(
           code: 'countdown_2',
           operationName: 'Light 2 Countdown',
@@ -91,7 +91,7 @@ class ThreeGangCountdown2Function extends BaseSwitchFunction {
 }
 
 class ThreeGangSwitch3Function extends BaseSwitchFunction {
-  ThreeGangSwitch3Function({required super.deviceId, required super.deviceName})
+  ThreeGangSwitch3Function({required super.deviceId, required super.deviceName ,required type})
       : super(
           code: 'switch_3',
           operationName: 'Light 3 Switch',
@@ -114,7 +114,7 @@ class ThreeGangSwitch3Function extends BaseSwitchFunction {
 }
 
 class ThreeGangCountdown3Function extends BaseSwitchFunction {
-  ThreeGangCountdown3Function({required super.deviceId, required super.deviceName})
+  ThreeGangCountdown3Function({required super.deviceId, required super.deviceName ,required type})
       : super(
           code: 'countdown_3',
           operationName: 'Light 3 Countdown',
diff --git a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
index 90c56ede..bbaa645a 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
@@ -13,29 +13,38 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
 class ACHelper {
-  static Future<Map<String, dynamic>?> showACFunctionsDialog(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool? removeComparetors,
-  ) async {
-    List<ACFunction> acFunctions = functions.whereType<ACFunction>().toList();
+  static Future<Map<String, dynamic>?> showACFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required AllDevicesModel? device,
+    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    required String uniqueCustomId,
+    required bool? removeComparetors,
+    required String dialogType,
+  }) async {
+    List<ACFunction> acFunctions =
+        functions.whereType<ACFunction>().where((function) {
+      if (dialogType == 'THEN') {
+        return function.type == 'THEN' || function.type == 'BOTH';
+      }
+      return function.type == 'IF' || function.type == 'BOTH';
+    }).toList();
+    // List<ACFunction> acFunctions = functions.whereType<ACFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-          create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+          create: (_) => FunctionBloc()
+            ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
           child: AlertDialog(
             contentPadding: EdgeInsets.zero,
             content: BlocBuilder<FunctionBloc, FunctionBlocState>(
               builder: (context, state) {
                 final selectedFunction = state.selectedFunction;
                 final selectedOperationName = state.selectedOperationName;
-                final selectedFunctionData =
-                    state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                final selectedFunctionData = state.addedFunctions
+                    .firstWhere((f) => f.functionCode == selectedFunction,
                         orElse: () => DeviceFunctionData(
                               entityId: '',
                               functionCode: selectedFunction ?? '',
@@ -65,8 +74,10 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected: (functionCode, operationName) =>
-                                    context.read<FunctionBloc>().add(SelectFunction(
+                                onFunctionSelected:
+                                    (functionCode, operationName) => context
+                                        .read<FunctionBloc>()
+                                        .add(SelectFunction(
                                           functionCode: functionCode,
                                           operationName: operationName,
                                         )),
@@ -194,7 +205,8 @@ class ACHelper {
       );
     }
 
-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -290,7 +302,8 @@ class ACHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -384,9 +397,13 @@ class ACHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -398,7 +415,8 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index adccb33d..4fe87da3 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -14,29 +14,32 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class OneGangSwitchHelper {
-  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool removeComparetors,
-  ) async {
-    List<BaseSwitchFunction> acFunctions = functions.whereType<BaseSwitchFunction>().toList();
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog({
+    required String dialogType,
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required AllDevicesModel? device,
+    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    required String uniqueCustomId,
+    required bool removeComparetors,
+  }) async {
+    List<BaseSwitchFunction> acFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData = state.addedFunctions
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -83,9 +86,12 @@ class OneGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName: function.operationName,
+                                              operationName:
+                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -175,7 +181,8 @@ class OneGangSwitchHelper {
       );
     }
 
-    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -212,11 +219,11 @@ class OneGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownDisplay(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownSlider(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -257,7 +264,8 @@ class OneGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -305,7 +313,8 @@ class OneGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -357,9 +366,13 @@ class OneGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -371,7 +384,8 @@ class OneGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index b4400b35..f1cbd6aa 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -14,14 +14,15 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ThreeGangSwitchHelper {
-  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool removeComparetors,
-  ) async {
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required AllDevicesModel? device,
+    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    required String uniqueCustomId,
+    required String dialogType,
+    required bool removeComparetors,
+  }) async {
     List<BaseSwitchFunction> switchFunctions =
         functions.whereType<BaseSwitchFunction>().toList();
 
diff --git a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
index c894f65c..d4c47445 100644
--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
@@ -14,29 +14,32 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TwoGangSwitchHelper {
-  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog(
-    BuildContext context,
-    List<DeviceFunction> functions,
-    AllDevicesModel? device,
-    List<DeviceFunctionData>? deviceSelectedFunctions,
-    String uniqueCustomId,
-    bool removeComparetors,
-  ) async {
-    List<BaseSwitchFunction> switchFunctions = functions.whereType<BaseSwitchFunction>().toList();
+  static Future<Map<String, dynamic>?> showSwitchFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required AllDevicesModel? device,
+    required List<DeviceFunctionData>? deviceSelectedFunctions,
+    required String uniqueCustomId,
+    required bool removeComparetors,
+    required String dialogType,
+  }) async {
+    List<BaseSwitchFunction> switchFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData = state.addedFunctions
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -83,9 +86,12 @@ class TwoGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName: function.operationName,
+                                              operationName:
+                                                  function.operationName,
                                             ));
                                       },
                                     );
@@ -161,7 +167,8 @@ class TwoGangSwitchHelper {
     required String operationName,
     required bool removeComparetors,
   }) {
-    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
+    if (selectedFunction == 'countdown_1' ||
+        selectedFunction == 'countdown_2') {
       final initialValue = selectedFunctionData?.value ?? 200;
       return _buildTemperatureSelector(
         context: context,
@@ -175,7 +182,8 @@ class TwoGangSwitchHelper {
       );
     }
 
-    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn =
+        switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -212,11 +220,11 @@ class TwoGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownDisplay(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownSlider(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -257,7 +265,8 @@ class TwoGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected:
+          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -305,7 +314,8 @@ class TwoGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) -
+                  (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -357,9 +367,13 @@ class TwoGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -371,7 +385,8 @@ class TwoGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );

From 92aa574944021ce019a0293bece855c0da5da5cb Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 10:21:49 +0300
Subject: [PATCH 050/238] update `GatewayMasterState.getOperationalValues` to
 match what the api expects.

---
 lib/pages/routines/models/gateway.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/routines/models/gateway.dart b/lib/pages/routines/models/gateway.dart
index daeebd53..dcb29148 100644
--- a/lib/pages/routines/models/gateway.dart
+++ b/lib/pages/routines/models/gateway.dart
@@ -69,12 +69,12 @@ final class GatewayMasterState extends GatewayFunctions {
       GatewayOperationalValue(
         icon: Assets.assetsAcPower,
         description: "Normal",
-        value: 'Normal',
+        value: 'normal',
       ),
       GatewayOperationalValue(
         icon: Assets.assetsAcPowerOFF,
         description: "Alarm",
-        value: 'Alarm',
+        value: 'alarm',
       ),
     ];
   }

From fda96025e9a88cf32f285aabede9bbb449010b6f Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 10:41:38 +0300
Subject: [PATCH 051/238] uncommented code.

---
 .../helper/dialog_helper/device_dialog_helper.dart        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index f029677e..d1146df9 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -50,10 +50,10 @@ class DeviceDialogHelper {
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
-    // if (removeComparetors && data['productType'] != 'WPS') {
-    //   //remove the current temp function in the 'if container'
-    //   functions.removeAt(3);
-    // }
+    if (removeComparetors && data['productType'] != 'WPS') {
+      //remove the current temp function in the 'if container'
+      functions.removeAt(3);
+    }
 
     switch (productType) {
       case 'AC':

From 9c97e2879aa8facf645ba931bd33014ada56af5c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 10:57:10 +0300
Subject: [PATCH 052/238] Refactor constructor syntax for Gateway functions to
 use initializer list

---
 lib/pages/routines/models/gateway.dart        | 27 ++++++++++---------
 .../gateway/gateway_dialog.dart               |  3 ---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/pages/routines/models/gateway.dart b/lib/pages/routines/models/gateway.dart
index dcb29148..b1a70d2e 100644
--- a/lib/pages/routines/models/gateway.dart
+++ b/lib/pages/routines/models/gateway.dart
@@ -33,10 +33,11 @@ final class GatewaySwitchAlarmSound extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = 'switch_alarm_sound',
-    super.operationName = 'Switch Alarm Sound',
-    super.icon = Assets.activeBell,
-  });
+  }) : super(
+          code: 'switch_alarm_sound',
+          operationName: 'Switch Alarm Sound',
+          icon: Assets.activeBell,
+        );
 
   @override
   List<GatewayOperationalValue> getOperationalValues() => [
@@ -58,10 +59,11 @@ final class GatewayMasterState extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = 'master_state',
-    super.operationName = 'Master State',
-    super.icon = Assets.gear,
-  });
+  }) : super(
+          code: 'master_state',
+          operationName: 'Master State',
+          icon: Assets.gear,
+        );
 
   @override
   List<GatewayOperationalValue> getOperationalValues() {
@@ -85,10 +87,11 @@ final class GatewayFactoryReset extends GatewayFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-    super.code = 'factory_reset',
-    super.operationName = 'Factory Reset',
-    super.icon = Assets.factoryReset,
-  });
+  }) : super(
+          code: 'factory_reset',
+          operationName: 'Factory Reset',
+          icon: Assets.factoryReset,
+        );
 
   @override
   List<GatewayOperationalValue> getOperationalValues() {
diff --git a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
index fc7189f2..364854ce 100644
--- a/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart
@@ -81,11 +81,8 @@ class _GatewayDialogState extends State<GatewayDialog> {
     final selectedGatewayFunctions = _gatewayFunctions.firstWhere(
       (f) => f.code == selectedFunction,
       orElse: () => GatewaySwitchAlarmSound(
-        code: selectedFunction ?? '',
         deviceId: '',
         deviceName: '',
-        operationName: '',
-        icon: '',
         type: '',
       ),
     );

From fd6b737556bb134bf0795319cd2458e6150da3c3 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Wed, 9 Apr 2025 12:17:26 +0300
Subject: [PATCH 053/238] Refactor one_gang_switch_dialog.dart to use
 one_gang_switch instead of ac in function names and variables

---
 .../one_gang_switch_dialog.dart               | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index 4fe87da3..d0fcde28 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -5,8 +5,10 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 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/helper/duration_format_helper.dart';
+import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
+import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
@@ -23,7 +25,7 @@ class OneGangSwitchHelper {
     required String uniqueCustomId,
     required bool removeComparetors,
   }) async {
-    List<BaseSwitchFunction> acFunctions =
+    List<BaseSwitchFunction> oneGangFunctions =
         functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
@@ -64,12 +66,12 @@ class OneGangSwitchHelper {
                               // Left side: Function list
                               Expanded(
                                 child: ListView.separated(
-                                  itemCount: acFunctions.length,
+                                  itemCount: oneGangFunctions.length,
                                   separatorBuilder: (_, __) => const Divider(
                                     color: ColorsManager.dividerColor,
                                   ),
                                   itemBuilder: (context, index) {
-                                    final function = acFunctions[index];
+                                    final function = oneGangFunctions[index];
                                     return ListTile(
                                       leading: SvgPicture.asset(
                                         function.icon,
@@ -105,7 +107,7 @@ class OneGangSwitchHelper {
                                     context: context,
                                     selectedFunction: selectedFunction,
                                     selectedFunctionData: selectedFunctionData,
-                                    acFunctions: acFunctions,
+                                    acFunctions: oneGangFunctions,
                                     device: device,
                                     operationName: selectedOperationName ?? '',
                                     removeComparetors: removeComparetors,
@@ -180,9 +182,14 @@ class OneGangSwitchHelper {
         removeComparetors: removeComparetors,
       );
     }
+    final selectedFn = acFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+      orElse: () => OneGangSwitchFunction(
+        deviceId: '',
+        deviceName: '',
+      ),
+    );
 
-    final selectedFn =
-        acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(

From c90b9a1912cd812db16648794878322285e79554 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 12:24:59 +0300
Subject: [PATCH 054/238] bugfix/ range index errorof automations in routines.

---
 .../main_routine_view/fetch_routine_scenes_automation.dart      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 0a22208c..92a837b6 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -183,7 +183,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                             state.automations[index].id,
                                         cardType: 'automations',
                                         spaceName:
-                                            state.scenes[index].spaceName,
+                                            state.automations[index].spaceName,
                                         onTap: () {
                                           BlocProvider.of<RoutineBloc>(context)
                                               .add(

From 694a5a7dda87dd619eee4358055d28acf5c3ae04 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 12:32:44 +0300
Subject: [PATCH 055/238] Refactor GatewayModel.fromJson to use a loop for
 status parsing instead of firstWhere.

---
 .../gateway/model/gateway_model.dart          | 43 +++++++++++--------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/lib/pages/device_managment/gateway/model/gateway_model.dart b/lib/pages/device_managment/gateway/model/gateway_model.dart
index 8e8d00f9..b9600fd7 100644
--- a/lib/pages/device_managment/gateway/model/gateway_model.dart
+++ b/lib/pages/device_managment/gateway/model/gateway_model.dart
@@ -14,27 +14,36 @@ class GatewayModel {
   });
 
   factory GatewayModel.fromJson(Map<String, dynamic> json) {
-    final status = json['status'] as List<dynamic>;
+    final status = json['status'] as List<dynamic>? ?? <dynamic>[];
 
-    final switchAlarmSound = status.firstWhere(
-      (item) => item['code'] == 'switch_alarm_sound',
-    )['value'] as bool;
-    final masterState = status.firstWhere(
-      (item) => item['code'] == 'master_state',
-    )['value'] as String;
-    final factoryReset = status.firstWhere(
-      (item) => item['code'] == 'factory_reset',
-    )['value'] as bool;
-    final alarmActive = status.firstWhere(
-      (item) => item['code'] == 'alarm_active',
-    )['value'] as String;
+    bool? switchAlarmSound;
+    String? masterState;
+    bool? factoryReset;
+    String? alarmActive;
+
+    for (final item in status) {
+      switch (item['code']) {
+        case 'switch_alarm_sound':
+          switchAlarmSound = item['value'] as bool;
+          break;
+        case 'master_state':
+          masterState = item['value'] as String;
+          break;
+        case 'factory_reset':
+          factoryReset = item['value'] as bool;
+          break;
+        case 'alarm_active':
+          alarmActive = item['value'] as String;
+          break;
+      }
+    }
 
     return GatewayModel(
       uuid: json['uuid'] as String,
-      switchAlarmSound: switchAlarmSound,
-      masterState: masterState,
-      factoryReset: factoryReset,
-      alarmActive: alarmActive,
+      switchAlarmSound: switchAlarmSound ?? false,
+      masterState: masterState ?? '',
+      factoryReset: factoryReset ?? false,
+      alarmActive: alarmActive ?? '',
     );
   }
 }

From 387ef99728382cf082f5f4a96859b15f420f9c98 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 12:33:20 +0300
Subject: [PATCH 056/238] fix: handle nullable uuid in GatewayModel.fromJson

---
 lib/pages/device_managment/gateway/model/gateway_model.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/device_managment/gateway/model/gateway_model.dart b/lib/pages/device_managment/gateway/model/gateway_model.dart
index b9600fd7..a522aa00 100644
--- a/lib/pages/device_managment/gateway/model/gateway_model.dart
+++ b/lib/pages/device_managment/gateway/model/gateway_model.dart
@@ -39,7 +39,7 @@ class GatewayModel {
     }
 
     return GatewayModel(
-      uuid: json['uuid'] as String,
+      uuid: json['uuid'] as String? ?? '',
       switchAlarmSound: switchAlarmSound ?? false,
       masterState: masterState ?? '',
       factoryReset: factoryReset ?? false,

From 6c691d4b3ceb71c468ee2802a298c5f1c47c07eb Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 12:46:43 +0300
Subject: [PATCH 057/238] displays ceiling sensor in routine

---
 .../helper/dialog_helper/device_dialog_helper.dart       | 2 +-
 lib/pages/routines/widgets/if_container.dart             | 5 +++--
 lib/pages/routines/widgets/routine_devices.dart          | 3 ++-
 lib/pages/routines/widgets/then_container.dart           | 9 +++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index 96919364..caf92489 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_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/widgets/routine_dialogs/ac_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 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/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart';
 
 class DeviceDialogHelper {
diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index eebf3fb7..5ca549fb 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -71,7 +71,8 @@ class IfContainer extends StatelessWidget {
                                       '1G',
                                       '2G',
                                       '3G',
-                                      'WPS'
+                                      'WPS',
+                                      'CPS',
                                     ].contains(
                                         state.ifItems[index]['productType'])) {
                                       context.read<RoutineBloc>().add(
@@ -129,7 +130,7 @@ class IfContainer extends StatelessWidget {
                   context
                       .read<RoutineBloc>()
                       .add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS']
+                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'CPS']
                     .contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()
diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index 2d3f7236..5f642bac 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -38,7 +38,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
                 device.productType == '1G' ||
                 device.productType == '2G' ||
                 device.productType == '3G' ||
-                device.productType == 'WPS')
+                device.productType == 'WPS' ||
+                device.productType == 'CPS')
             .toList();
 
         return Wrap(
diff --git a/lib/pages/routines/widgets/then_container.dart b/lib/pages/routines/widgets/then_container.dart
index a4d0461d..d1856879 100644
--- a/lib/pages/routines/widgets/then_container.dart
+++ b/lib/pages/routines/widgets/then_container.dart
@@ -3,10 +3,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/automation_dialog.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/delay_dialog.dart';
 import 'package:syncrow_web/pages/routines/helper/dialog_helper/device_dialog_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/dragable_card.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/automation_dialog.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/delay_dialog.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:uuid/uuid.dart';
 
@@ -113,7 +113,8 @@ class ThenContainer extends StatelessWidget {
                                           '1G',
                                           '2G',
                                           '3G',
-                                          'WPS'
+                                          'WPS',
+                                          'CPS',
                                         ].contains(state.thenItems[index]
                                             ['productType'])) {
                                           context.read<RoutineBloc>().add(
@@ -229,7 +230,7 @@ class ThenContainer extends StatelessWidget {
                 dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G', 'WPS']
+            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'CPS']
                 .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }

From 4ea91b93330f06dc92b4b4bcccaadc5f3691a918 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 13:16:36 +0300
Subject: [PATCH 058/238] SP-1276/ Show Configuration Pop-up on Drop.

---
 .../dialog_helper/device_dialog_helper.dart   | 12 ++-
 .../ceiling_sensor/ceiling_sensor_dialog.dart | 77 +++++++++++++++++++
 .../ceiling_sensor/ceiling_sensor_helper.dart | 36 +++++++++
 3 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart

diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index caf92489..df440004 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_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/widgets/routine_dialogs/ac_dialog.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 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';
@@ -49,7 +50,6 @@ class DeviceDialogHelper {
     final deviceSelectedFunctions =
         routineBloc.state.selectedFunctions[data['uniqueCustomId']] ?? [];
 
-
     switch (productType) {
       case 'AC':
         return ACHelper.showACFunctionsDialog(
@@ -98,6 +98,16 @@ class DeviceDialogHelper {
             deviceSelectedFunctions: deviceSelectedFunctions,
             uniqueCustomId: data['uniqueCustomId'],
             removeComparetors: removeComparetors);
+      case 'CPS':
+        return CeilingSensorHelper.showCeilingSensorDialog(
+          context: context,
+          functions: functions,
+          device: data['device'],
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          uniqueCustomId: data['uniqueCustomId'],
+          dialogType: dialogType,
+        );
+
       default:
         return null;
     }
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
new file mode 100644
index 00000000..8820d305
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -0,0 +1,77 @@
+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/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+
+class CeilingSensorDialog extends StatelessWidget {
+  const CeilingSensorDialog({
+    required this.uniqueCustomId,
+    required this.functions,
+    required this.deviceSelectedFunctions,
+    required this.device,
+    required this.dialogType,
+    super.key,
+  });
+  final String? uniqueCustomId;
+  final List<DeviceFunction> functions;
+  final List<DeviceFunctionData> deviceSelectedFunctions;
+  final AllDevicesModel? device;
+  final String dialogType;
+
+  @override
+  Widget build(BuildContext context) {
+    return AlertDialog(
+      contentPadding: EdgeInsets.zero,
+      content: BlocBuilder<FunctionBloc, FunctionBlocState>(
+        builder: (context, state) {
+          final selectedFunction = state.selectedFunction;
+          final selectedOperationName = state.selectedOperationName;
+          final selectedFunctionData = state.addedFunctions
+              .firstWhere((f) => f.functionCode == selectedFunction,
+                  orElse: () => DeviceFunctionData(
+                        entityId: '',
+                        functionCode: selectedFunction ?? '',
+                        operationName: '',
+                        value: null,
+                      ));
+
+          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('Presence Sensor Condition'),
+                DialogFooter(
+                  onCancel: () => Navigator.pop(context),
+                  onConfirm: state.addedFunctions.isNotEmpty
+                      ? () {
+                          context.read<RoutineBloc>().add(
+                                AddFunctionToRoutine(
+                                    state.addedFunctions, '{uniqueCustomId}'),
+                              );
+
+                          Navigator.pop(context, {
+                            // 'deviceId': functions.first.deviceId,
+                          });
+                        }
+                      : null,
+                  isConfirmEnabled: selectedFunction != null,
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
new file mode 100644
index 00000000..310ca5c4
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
@@ -0,0 +1,36 @@
+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/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart';
+
+abstract final class CeilingSensorHelper {
+  const CeilingSensorHelper._();
+
+  static Future<Map<String, dynamic>?> showCeilingSensorDialog({
+    required BuildContext context,
+    required String? uniqueCustomId,
+    required List<DeviceFunction> functions,
+    required List<DeviceFunctionData> deviceSelectedFunctions,
+    required AllDevicesModel? device,
+    required String dialogType,
+  }) {
+    return showDialog(
+      context: context,
+      builder: (context) => BlocProvider(
+        create: (context) => FunctionBloc()
+          ..add(
+            InitializeFunctions(deviceSelectedFunctions),
+          ),
+        child: CeilingSensorDialog(
+          uniqueCustomId: uniqueCustomId,
+          functions: functions,
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          device: device,
+          dialogType: dialogType,
+        ),
+      ),
+    );
+  }
+}

From c0662bb19ecd31b35a786ae3316f95421c461c6e Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 15:23:56 +0300
Subject: [PATCH 059/238] Added assets.

---
 assets/icons/boundary.svg                     | 28 +++++++++++++
 assets/icons/close_to_motion.svg              | 10 +++++
 assets/icons/cps_custom_mode.svg              | 15 +++++++
 assets/icons/cps_mode1.svg                    |  6 +++
 assets/icons/cps_mode2.svg                    |  7 ++++
 assets/icons/cps_mode3.svg                    |  6 +++
 assets/icons/cps_mode4.svg                    |  6 +++
 assets/icons/far_away_motion.svg              | 11 +++++
 assets/icons/motion_meter.svg                 | 10 +++++
 assets/icons/moving_speed.svg                 |  9 ++++
 assets/icons/presence_judgement_threshold.svg | 15 +++++++
 assets/icons/radar_fault.svg                  | 14 +++++++
 assets/icons/self_testing_failure.svg         | 23 +++++++++++
 assets/icons/self_testing_success.svg         | 23 +++++++++++
 assets/icons/self_testing_timeout.svg         | 41 +++++++++++++++++++
 assets/icons/space_type.svg                   | 10 +++++
 assets/icons/spatial_motion_value.svg         | 18 ++++++++
 assets/icons/spatial_static_value.svg         |  6 +++
 assets/icons/sports_para.svg                  |  6 +++
 lib/utils/constants/assets.dart               | 22 +++++++++-
 20 files changed, 284 insertions(+), 2 deletions(-)
 create mode 100644 assets/icons/boundary.svg
 create mode 100644 assets/icons/close_to_motion.svg
 create mode 100644 assets/icons/cps_custom_mode.svg
 create mode 100644 assets/icons/cps_mode1.svg
 create mode 100644 assets/icons/cps_mode2.svg
 create mode 100644 assets/icons/cps_mode3.svg
 create mode 100644 assets/icons/cps_mode4.svg
 create mode 100644 assets/icons/far_away_motion.svg
 create mode 100644 assets/icons/motion_meter.svg
 create mode 100644 assets/icons/moving_speed.svg
 create mode 100644 assets/icons/presence_judgement_threshold.svg
 create mode 100644 assets/icons/radar_fault.svg
 create mode 100644 assets/icons/self_testing_failure.svg
 create mode 100644 assets/icons/self_testing_success.svg
 create mode 100644 assets/icons/self_testing_timeout.svg
 create mode 100644 assets/icons/space_type.svg
 create mode 100644 assets/icons/spatial_motion_value.svg
 create mode 100644 assets/icons/spatial_static_value.svg
 create mode 100644 assets/icons/sports_para.svg

diff --git a/assets/icons/boundary.svg b/assets/icons/boundary.svg
new file mode 100644
index 00000000..73b4ab24
--- /dev/null
+++ b/assets/icons/boundary.svg
@@ -0,0 +1,28 @@
+<svg width="22" height="18" viewBox="0 0 22 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.45051 0.620117H2.66797C2.76403 0.620117 2.84185 0.697982 2.84185 0.794001V16.5102H3.62439V0.794043C3.62439 0.697982 3.54657 0.620117 3.45051 0.620117Z" fill="#9C9C9C"/>
+<path d="M19.39 0.620117H18.6074C18.7035 0.620117 18.7813 0.697982 18.7813 0.794001V16.5102H19.5638V0.794043C19.5638 0.697982 19.486 0.620117 19.39 0.620117Z" fill="#9C9C9C"/>
+<path d="M2.84259 0.794001C2.84259 0.697982 2.76477 0.620117 2.66871 0.620117H2.2774C2.18134 0.620117 2.10352 0.697982 2.10352 0.794001V16.5102H2.84259V0.794001Z" fill="#ACACAC"/>
+<path d="M18.7811 0.794001C18.7811 0.697982 18.7032 0.620117 18.6072 0.620117H18.2159C18.1198 0.620117 18.042 0.697982 18.042 0.794001V16.5102H18.7811V0.794001Z" fill="#ACACAC"/>
+<path d="M7.55203 6.30395L11.8047 2.05127H8.21845L3.96582 6.30395H7.55203Z" fill="#FDB441"/>
+<path d="M11.4857 6.30395L15.7383 2.05127H11.8035L7.55078 6.30395H11.4857Z" fill="#5A5A5A"/>
+<path d="M15.0726 6.30395L19.3253 2.05127H15.739L11.4863 6.30395H15.0726Z" fill="#FDB441"/>
+<path d="M4.28295 2.05127H0.378083C0.186003 2.05127 0.0302734 2.207 0.0302734 2.39908V5.95618C0.0302734 6.0522 0.0692057 6.13916 0.132132 6.20209L4.28295 2.05127Z" fill="#FDB441"/>
+<path d="M4.28261 2.05127L0.131836 6.20209C0.194762 6.26501 0.281725 6.30395 0.377786 6.30395H3.96485L8.21748 2.05127H4.28261Z" fill="#5A5A5A"/>
+<path d="M20.6996 4.61246V2.09067L20.2053 2.05461C20.1904 2.05262 20.1752 2.05127 20.1597 2.05127H19.3259L15.0732 6.30395H19.0081C19.3229 5.98914 20.3693 4.94271 20.6996 4.61246Z" fill="#5A5A5A"/>
+<path d="M19.0078 6.30374H20.1596C20.1942 6.30374 20.2276 6.2985 20.2592 6.28906L20.6993 6.22419V4.6123C20.3688 4.94276 19.3225 5.98907 19.0078 6.30374Z" fill="#FDB441"/>
+<path d="M21.6207 2.29561C21.6105 2.26294 21.5957 2.23235 21.5769 2.20459C21.5144 2.11208 21.4086 2.05127 21.2886 2.05127C21.2344 2.05127 20.8258 2.05127 20.1582 2.05127C20.3503 2.05127 20.506 2.20696 20.506 2.39908V3.67415V4.8045L21.6364 3.67415V2.39908C21.6364 2.36298 21.6309 2.32828 21.6207 2.29561Z" fill="#444444"/>
+<path d="M20.5059 5.9563C20.5059 6.14834 20.3502 6.30407 20.1582 6.30411H21.2885C21.3365 6.30411 21.3823 6.29437 21.4239 6.27677C21.5331 6.23056 21.6134 6.13001 21.6319 6.00911C21.6345 5.99185 21.6363 5.97428 21.6363 5.9563V3.67432L20.506 4.80466V5.9563H20.5059Z" fill="#F6AB31"/>
+<path d="M7.55203 11.782L11.8047 7.5293H8.21845L3.96582 11.782H7.55203Z" fill="#FDB441"/>
+<path d="M11.4857 11.782L15.7383 7.5293H11.8035L7.55078 11.782H11.4857Z" fill="#5A5A5A"/>
+<path d="M15.0726 11.782L19.3253 7.5293H15.739L11.4863 11.782H15.0726Z" fill="#FDB441"/>
+<path d="M4.28295 7.5293H0.378083C0.186003 7.5293 0.0302734 7.68503 0.0302734 7.87711V11.4342C0.0302734 11.5302 0.0692057 11.6172 0.132132 11.6801L4.28295 7.5293Z" fill="#FDB441"/>
+<path d="M4.28261 7.52934L0.131836 11.6801C0.194762 11.743 0.281725 11.782 0.377786 11.782H3.96485L8.21752 7.5293H4.28261V7.52934Z" fill="#5A5A5A"/>
+<path d="M20.6996 10.0905V7.56869L20.2053 7.53264C20.1904 7.53065 20.1752 7.5293 20.1597 7.5293H19.3259L15.0732 11.782H19.0081C19.3229 11.4672 20.3693 10.4207 20.6996 10.0905Z" fill="#5A5A5A"/>
+<path d="M19.0078 11.7818H20.1596C20.1942 11.7818 20.2276 11.7766 20.2592 11.7671L20.6993 11.7022V10.0903C20.3688 10.4208 19.3225 11.4671 19.0078 11.7818Z" fill="#FDB441"/>
+<path d="M21.6207 7.77364C21.6105 7.74097 21.5957 7.71037 21.5769 7.68261C21.5144 7.59011 21.4086 7.5293 21.2886 7.5293C21.2344 7.5293 20.8258 7.5293 20.1582 7.5293C20.3503 7.5293 20.506 7.68498 20.506 7.87711V9.15218V10.2825L21.6364 9.15218V7.87711C21.6364 7.84105 21.6309 7.80631 21.6207 7.77364Z" fill="#444444"/>
+<path d="M20.5059 11.4343C20.5059 11.6264 20.3502 11.7821 20.1582 11.7821H21.2885C21.3365 11.7821 21.3823 11.7724 21.4239 11.7548C21.5331 11.7086 21.6134 11.608 21.6319 11.4871C21.6345 11.4699 21.6363 11.4523 21.6363 11.4343V9.15234L20.506 10.2827V11.4343H20.5059Z" fill="#F6AB31"/>
+<path d="M5.46624 15.6406H4.42285C4.5669 15.6406 4.6837 15.7574 4.6837 15.9015V17.1188C4.6837 17.2628 4.5669 17.3796 4.42285 17.3796H5.46624C5.61029 17.3796 5.72708 17.2628 5.72708 17.1188V15.9015C5.72708 15.7574 5.61029 15.6406 5.46624 15.6406Z" fill="#ACACAC"/>
+<path d="M21.4057 17.3796C21.5497 17.3796 21.6665 17.2628 21.6665 17.1188V15.9015C21.6665 15.7574 21.5497 15.6406 21.4057 15.6406H20.3623C20.5064 15.6406 20.6232 15.7574 20.6232 15.9015V17.1188C20.6232 17.2628 20.5064 17.3796 20.3623 17.3796H21.4057Z" fill="#ACACAC"/>
+<path d="M0.260846 15.6406C0.116797 15.6406 0 15.7574 0 15.9015V17.1188C0 17.2628 0.116797 17.3796 0.260846 17.3796H4.4236C4.56765 17.3796 4.6844 17.2628 4.6844 17.1188V15.9015C4.6844 15.7574 4.5676 15.6406 4.42355 15.6406H0.260846Z" fill="#BFBFBF"/>
+<path d="M16.2003 15.6406C16.0563 15.6406 15.9395 15.7574 15.9395 15.9015V17.1188C15.9395 17.2628 16.0563 17.3796 16.2003 17.3796H20.363C20.5071 17.3796 20.6239 17.2628 20.6239 17.1188V15.9015C20.6239 15.7574 20.5071 15.6406 20.363 15.6406H16.2003Z" fill="#BFBFBF"/>
+</svg>
diff --git a/assets/icons/close_to_motion.svg b/assets/icons/close_to_motion.svg
new file mode 100644
index 00000000..8ba6c8c6
--- /dev/null
+++ b/assets/icons/close_to_motion.svg
@@ -0,0 +1,10 @@
+<svg width="20" height="14" viewBox="0 0 20 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M3.97266 12.0879H17.8775" stroke="#373737" stroke-linecap="round"/>
+<path d="M3.97266 11.5879C3.69651 11.5879 3.47266 11.8117 3.47266 12.0879C3.47266 12.364 3.69651 12.5879 3.97266 12.5879V11.5879ZM11.9183 12.5879H12.4183V11.5879H11.9183V12.5879ZM3.97266 12.5879H11.9183V11.5879H3.97266V12.5879Z" fill="#75777F"/>
+<path d="M3.99488 8.50684C1.71745 8.50684 0 9.54938 0 10.9319C0 12.3144 1.71745 13.3569 3.99488 13.3569C6.27232 13.3569 7.98976 12.3144 7.98976 10.9319C7.98976 9.54938 6.27236 8.50684 3.99488 8.50684Z" fill="#FFCC03"/>
+<path d="M3.99488 8.50684C1.71745 8.50684 0 9.54938 0 10.9319C0 12.3144 1.71745 13.3569 3.99488 13.3569V8.50684Z" fill="#FFE981"/>
+<path d="M6.90323 2.27066C6.24679 1.30901 5.15979 0.734863 3.99547 0.734863C2.83114 0.734863 1.74414 1.30897 1.0877 2.27066C0.431304 3.23231 0.292645 4.45382 0.716885 5.53815L2.58009 10.3005C2.80969 10.8874 3.36522 11.2667 3.99547 11.2667C4.62572 11.2667 5.18124 10.8874 5.41084 10.3005L7.27405 5.53811C7.69829 4.45382 7.55963 3.23231 6.90323 2.27066Z" fill="#CC1F2C"/>
+<path d="M3.99449 0.734863C2.83013 0.734863 1.74316 1.30897 1.08673 2.27066C0.430327 3.23231 0.291669 4.45382 0.715909 5.53815L2.57911 10.3005C2.80871 10.8874 3.36424 11.2667 3.99449 11.2667V0.734863Z" fill="#F05449"/>
+<path d="M19.5562 5.2553C19.0806 4.55855 18.293 4.14258 17.4494 4.14258C16.6058 4.14258 15.8182 4.55855 15.3426 5.2553C14.8671 5.95205 14.7666 6.83704 15.074 7.62267L16.4239 11.0731C16.5903 11.4983 16.9928 11.7731 17.4494 11.7731C17.906 11.7731 18.3086 11.4983 18.4749 11.0731L19.8248 7.62263C20.1322 6.83708 20.0317 5.95205 19.5562 5.2553Z" fill="#CC1F2C"/>
+<path d="M17.4494 4.14258C16.6058 4.14258 15.8182 4.55855 15.3426 5.2553C14.8671 5.95205 14.7666 6.83704 15.074 7.62267L16.4239 11.0731C16.5903 11.4983 16.9928 11.7731 17.4494 11.7731V4.14258Z" fill="#F05449"/>
+</svg>
diff --git a/assets/icons/cps_custom_mode.svg b/assets/icons/cps_custom_mode.svg
new file mode 100644
index 00000000..4176c939
--- /dev/null
+++ b/assets/icons/cps_custom_mode.svg
@@ -0,0 +1,15 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.37727 0.166504L0 4.54378L17.2893 21.8331L21.6666 17.4557L4.37727 0.166504ZM3.1988 4.37544C2.91985 4.09649 2.91985 3.64426 3.1988 3.3653C3.47775 3.08635 3.92999 3.08635 4.20894 3.3653C4.48789 3.64426 4.48789 4.09649 4.20894 4.37544C3.92999 4.6544 3.47775 4.6544 3.1988 4.37544ZM17.4576 18.6343C17.1787 18.3553 17.1787 17.9031 17.4576 17.6241C17.7366 17.3452 18.1888 17.3452 18.4678 17.6241C18.7467 17.9031 18.7467 18.3553 18.4678 18.6343C18.1889 18.9132 17.7366 18.9132 17.4576 18.6343Z" fill="#98D9D5"/>
+<path d="M8.72863 7.2116C8.58915 7.35108 8.58915 7.57717 8.72863 7.71669C8.86811 7.85622 9.0942 7.85617 9.23372 7.71669L10.5806 6.36984L10.0755 5.86475L8.72863 7.2116Z" fill="#6DA8D6"/>
+<path d="M5.80871 4.29119C5.66923 4.43067 5.66923 4.65676 5.80871 4.79628C5.94818 4.93581 6.17428 4.93576 6.3138 4.79628L7.66066 3.44943L7.15556 2.94434L5.80871 4.29119Z" fill="#6DA8D6"/>
+<path d="M7.26867 5.75164C7.12919 5.89111 7.12919 6.11721 7.26867 6.25673C7.40815 6.39621 7.63424 6.39621 7.77376 6.25673L9.12062 4.90988L8.61552 4.40479L7.26867 5.75164Z" fill="#6DA8D6"/>
+<path d="M14.1163 12.5993C13.9768 12.7388 13.9768 12.9649 14.1163 13.1044C14.2558 13.2439 14.4819 13.2439 14.6214 13.1044L15.9683 11.7575L15.4632 11.2524L14.1163 12.5993Z" fill="#6DA8D6"/>
+<path d="M18.3841 14.1729L17.0372 15.5197C16.8977 15.6592 16.8977 15.8853 17.0372 16.0248C17.1767 16.1643 17.4028 16.1643 17.5423 16.0248L18.8892 14.6779L18.3841 14.1729Z" fill="#6DA8D6"/>
+<path d="M15.5773 14.0597C15.4378 14.1992 15.4378 14.4253 15.5773 14.5648C15.7167 14.7043 15.9428 14.7043 16.0824 14.5648L17.4292 13.218L16.9241 12.7129L15.5773 14.0597Z" fill="#6DA8D6"/>
+<path d="M21.25 1.93008L19.9031 0.583181C19.3475 0.0276114 18.4384 0.0276114 17.8828 0.583181L16.1992 2.2668L17.5461 4.28708L19.5664 5.63393L21.25 3.95031C21.8056 3.39479 21.8056 2.48565 21.25 1.93008Z" fill="#F2484B"/>
+<path d="M14.9445 3.52148L2.35938 16.1066L3.36728 18.4659L17.3015 5.2051L14.9445 3.52148Z" fill="#6DA8D6"/>
+<path d="M16.9637 4.86816L3.36621 18.4656L5.72549 19.4736L18.3106 6.88849L16.9637 4.86816Z" fill="#185F8D"/>
+<path d="M0 21.8333L2.38509 20.8512L2.02028 19.8131L0.982092 19.4482L0 21.8333Z" fill="#274B6D"/>
+<path d="M5.72586 19.4736C5.64581 19.1756 5.48467 18.8876 5.24353 18.6465C4.81015 18.2131 4.22577 18.0372 3.70329 18.129C3.7951 17.6065 3.6192 17.0222 3.18582 16.5888C2.94468 16.3476 2.65668 16.1865 2.35868 16.1064L2.35639 16.1087L0.981445 19.4478L2.38444 20.8508L5.72353 19.4759L5.72586 19.4736Z" fill="#FFCC75"/>
+<path d="M16.1991 2.26718L14.9443 3.52197L18.3115 6.88911L19.5663 5.63431L16.1991 2.26718Z" fill="#F2EBD9"/>
+</svg>
diff --git a/assets/icons/cps_mode1.svg b/assets/icons/cps_mode1.svg
new file mode 100644
index 00000000..407105df
--- /dev/null
+++ b/assets/icons/cps_mode1.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 20.0156C15.5228 20.0156 20 15.5385 20 10.0156C20 4.49278 15.5228 0.015625 10 0.015625C4.47715 0.015625 0 4.49278 0 10.0156C0 15.5385 4.47715 20.0156 10 20.0156Z" fill="#FFB54A"/>
+<path d="M13.3263 19.4481C16.3853 18.3692 18.762 15.8448 19.636 12.6949L11.4992 4.55811C11.4992 4.55811 8.03387 7.46049 8.17614 8.25693L9.7659 9.82752L9.23356 15.3554L13.3263 19.4481Z" fill="#F9880D"/>
+<path d="M11.4996 4.55811V15.3554H9.23398V7.34521L8.17656 8.25693L6.69727 6.54092L8.86055 4.67568L8.99688 4.55811H11.4996Z" fill="#F8FFFB"/>
+<path d="M10 4.55811H11.4996V15.3554H10V4.55811Z" fill="#D8D8D8"/>
+</svg>
diff --git a/assets/icons/cps_mode2.svg b/assets/icons/cps_mode2.svg
new file mode 100644
index 00000000..9464a7ea
--- /dev/null
+++ b/assets/icons/cps_mode2.svg
@@ -0,0 +1,7 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 20.0464C15.5228 20.0464 20 15.5692 20 10.0464C20 4.52354 15.5228 0.0463867 10 0.0463867C4.47715 0.0463867 0 4.52354 0 10.0464C0 15.5692 4.47715 20.0464 10 20.0464Z" fill="#424242"/>
+<path d="M11.0775 19.9883C15.3757 19.5277 18.8585 16.3439 19.7673 12.1961L13.3194 5.74813C13.3194 5.74813 8.04414 5.60235 6.13867 8.73633L8.9466 11.5514L6.44617 15.3861L11.0775 19.9883Z" fill="#232323"/>
+<path d="M14.159 15.3864H6.44613V12.7829L11.3996 9.03281C12.0277 8.55727 11.8763 7.89418 11.815 7.70227C11.7559 7.51742 11.5043 6.91242 10.7484 6.89035C10.7315 6.88988 10.7019 6.88961 10.69 6.88953H9.81414C8.52395 6.88953 8.42371 8.30332 8.42371 8.73664H6.13867C6.13867 6.30367 7.65008 4.60449 9.81414 4.60449L10.7029 4.60453C10.7029 4.60453 10.7776 4.6052 10.8148 4.60625C12.2924 4.64941 13.5392 5.59156 13.9916 7.00645C14.4497 8.43957 13.9737 9.95004 12.7789 10.8546L9.81121 13.1014H14.1591V15.3864H14.159Z" fill="#F8FFFB"/>
+<path d="M12.7792 10.8544L10.1514 12.844V9.97785L11.3999 9.0327C12.0279 8.55719 11.8766 7.8941 11.8155 7.70227C11.7564 7.51711 11.5046 6.91234 10.7486 6.89031C10.7317 6.88992 10.7021 6.88953 10.6903 6.88953H10.1514V4.60449H10.7033C10.7033 4.60449 10.7778 4.60527 10.8152 4.60605C12.2926 4.64938 13.5395 5.59137 13.9918 7.00652C14.45 8.43937 13.9741 9.94988 12.7792 10.8544Z" fill="#D8D8D8"/>
+<path d="M10.1514 13.1011H14.1593V15.3861H10.1514V13.1011Z" fill="#D8D8D8"/>
+</svg>
diff --git a/assets/icons/cps_mode3.svg b/assets/icons/cps_mode3.svg
new file mode 100644
index 00000000..998329fd
--- /dev/null
+++ b/assets/icons/cps_mode3.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 20.0771C15.5228 20.0771 20 15.6 20 10.0771C20 4.5543 15.5228 0.0771484 10 0.0771484C4.47715 0.0771484 0 4.5543 0 10.0771C0 15.6 4.47715 20.0771 10 20.0771Z" fill="#07E5CA"/>
+<path d="M10.0839 13.4524L8.77727 12.2934L7.35418 14.2613L12.779 19.6856C16.1417 18.7146 18.7756 16.0263 19.6699 12.6317L12.7734 5.73535L6.46289 7.4725L9.23348 10.2371L9.09187 10.8674L11.2682 12.9721C11.2682 12.972 10.5204 13.5331 10.0839 13.4524Z" fill="#00B59B"/>
+<path d="M12.7735 5.73498C12.1468 5.03658 11.1001 4.61963 9.97359 4.61963C9.74531 4.61963 9.51633 4.64061 9.29305 4.68197L9.22426 4.69467C8.53879 4.82131 7.91781 5.13639 7.42836 5.60576C6.94879 6.066 6.6284 6.64404 6.5018 7.27736L6.46289 7.47209L8.77723 7.64721L8.8243 7.52557C8.95844 7.17908 9.2818 6.91943 9.66816 6.84799L9.73695 6.83529C10.1734 6.75467 10.6217 6.90189 10.907 7.21986C11.2853 7.64131 11.2475 8.31838 10.8245 8.69842C10.6195 8.88256 9.61078 9.09518 9.27523 9.08119L9.09191 9.07334V10.867L9.27523 10.8592C9.61301 10.845 10.6196 11.0578 10.8245 11.2419C11.2475 11.622 11.2853 12.299 10.907 12.7205C10.6217 13.0385 10.1734 13.1857 9.73691 13.1051L9.6682 13.0924C9.2818 13.0209 8.95844 12.7613 8.8243 12.4148L8.77723 12.2931L6.46289 12.4683L6.5018 12.663C6.62836 13.2963 6.94875 13.8744 7.4284 14.3346C7.91777 14.804 8.53879 15.119 9.22426 15.2457L9.29297 15.2584C9.51633 15.2997 9.74531 15.3207 9.97359 15.3207C11.1001 15.3207 12.1468 14.9038 12.7734 14.2054C13.8294 13.0288 13.7796 11.1994 12.6833 9.97018C13.7796 8.74092 13.8294 6.91158 12.7735 5.73498Z" fill="#F8FFFB"/>
+<path d="M12.6836 9.97012C13.7801 11.1994 13.8297 13.0287 12.7738 14.2057C12.152 14.8982 11.1168 15.3143 10 15.3205V13.1264C10.3469 13.1197 10.6797 12.9748 10.9074 12.7205C11.2855 12.299 11.248 11.6221 10.825 11.242C10.7117 11.1404 10.3543 11.0299 10 10.9537V8.98652C10.3543 8.91035 10.7117 8.8002 10.825 8.69863C11.248 8.31855 11.2855 7.6416 10.9074 7.22012C10.6797 6.96582 10.3469 6.8209 10 6.81426V4.62012C11.1168 4.62637 12.152 5.04199 12.7738 5.73496C13.8297 6.91152 13.7801 8.74082 12.6836 9.97012Z" fill="#D8D8D8"/>
+</svg>
diff --git a/assets/icons/cps_mode4.svg b/assets/icons/cps_mode4.svg
new file mode 100644
index 00000000..3136a806
--- /dev/null
+++ b/assets/icons/cps_mode4.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10 20.1079C15.5228 20.1079 20 15.6308 20 10.1079C20 4.58506 15.5228 0.10791 10 0.10791C4.47715 0.10791 0 4.58506 0 10.1079C0 15.6308 4.47715 20.1079 10 20.1079Z" fill="#424242"/>
+<path d="M19.8765 11.6809L12.9637 4.76807L5.99414 12.7653L12.907 19.6782C16.525 18.5806 19.2749 15.4882 19.8765 11.6809Z" fill="#232323"/>
+<path d="M12.9637 10.4997V4.76807H10.0215L5.99414 10.5458V12.7653H10.698V15.4478H12.9637V12.7653H14.4117V10.4997H12.9637ZM10.698 10.4997H8.78789L10.698 7.75986V10.4997Z" fill="#F8FFFB"/>
+<path d="M12.9637 10.4997V4.76807H10.0215L10 4.79893V8.76104L10.698 7.75986V10.4997H10V12.7653H10.698V15.4478H12.9637V12.7653H14.4117V10.4997H12.9637Z" fill="#D8D8D8"/>
+</svg>
diff --git a/assets/icons/far_away_motion.svg b/assets/icons/far_away_motion.svg
new file mode 100644
index 00000000..9458eb0d
--- /dev/null
+++ b/assets/icons/far_away_motion.svg
@@ -0,0 +1,11 @@
+<svg width="20" height="16" viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M17.7889 10.2691H11.3018C10.7286 10.2691 10.2622 9.80276 10.2622 9.22952V9.14261C10.2622 8.56937 10.7286 8.10301 11.3018 8.10301H17.4112C17.7348 8.10301 17.9971 7.84067 17.9971 7.51708C17.9971 7.19349 17.7348 6.93115 17.4112 6.93115H11.3018C10.0824 6.93115 9.09034 7.92321 9.09034 9.14261V9.22952C9.09034 10.4489 10.0824 11.441 11.3018 11.441H17.7889C18.3621 11.441 18.8285 11.9073 18.8285 12.4806C18.8285 13.0538 18.3621 13.5202 17.7889 13.5202H2.48241C2.15882 13.5202 1.89648 13.7825 1.89648 14.1061C1.89648 14.4297 2.15882 14.692 2.48241 14.692H17.7889C19.0083 14.692 20.0004 13.7 20.0004 12.4806C20.0004 11.2612 19.0083 10.2691 17.7889 10.2691Z" fill="#373737"/>
+<path d="M11.3013 11.441H13.7698V10.2691H11.3013C10.7281 10.2691 10.2617 9.80276 10.2617 9.22952V9.14261C10.2617 8.56937 10.7281 8.10301 11.3013 8.10301H13.7698V6.93115H11.3013C10.0819 6.93115 9.08984 7.92321 9.08984 9.14261V9.22952C9.08984 10.4489 10.0819 11.441 11.3013 11.441Z" fill="#75777F"/>
+<path d="M13.7693 13.52H2.48144C2.15785 13.52 1.89551 13.7824 1.89551 14.1059C1.89551 14.4295 2.15785 14.6919 2.48144 14.6919H13.7693V13.52Z" fill="#75777F"/>
+<path d="M4.02221 10.8325C1.7292 10.8325 0 11.8822 0 13.2742C0 14.6661 1.7292 15.7158 4.02221 15.7158C6.31523 15.7158 8.04443 14.6661 8.04443 13.2742C8.04443 11.8822 6.31527 10.8325 4.02221 10.8325Z" fill="#FFCC03"/>
+<path d="M4.02221 10.8325C1.7292 10.8325 0 11.8822 0 13.2742C0 14.6661 1.7292 15.7158 4.02221 15.7158V10.8325Z" fill="#FFE981"/>
+<path d="M6.95014 4.55363C6.28921 3.5854 5.19477 3.00732 4.02248 3.00732C2.8502 3.00732 1.75576 3.58536 1.09483 4.55363C0.433937 5.52186 0.29433 6.75173 0.721473 7.84347L2.59742 12.6384C2.82859 13.2293 3.38792 13.6112 4.02248 13.6112C4.65705 13.6112 5.21638 13.2293 5.44754 12.6384L7.3235 7.84343C7.75064 6.75173 7.61103 5.52186 6.95014 4.55363Z" fill="#CC1F2C"/>
+<path d="M4.02151 3.00732C2.84918 3.00732 1.75478 3.58536 1.09385 4.55363C0.432961 5.52186 0.293353 6.75173 0.720496 7.84347L2.59645 12.6384C2.82762 13.2293 3.38695 13.6112 4.02151 13.6112V3.00732Z" fill="#F05449"/>
+<path d="M19.5529 1.55833C19.074 0.856811 18.2811 0.437988 17.4317 0.437988C16.5823 0.437988 15.7894 0.856811 15.3105 1.55833C14.8317 2.25984 14.7305 3.15088 15.04 3.94189L16.3992 7.41594C16.5667 7.84406 16.972 8.12074 17.4317 8.12074C17.8915 8.12074 18.2967 7.84406 18.4642 7.41594L19.8234 3.94185C20.1328 3.15092 20.0317 2.25984 19.5529 1.55833Z" fill="#CC1F2C"/>
+<path d="M17.4317 0.437988C16.5823 0.437988 15.7894 0.856811 15.3105 1.55833C14.8317 2.25984 14.7305 3.15088 15.04 3.94189L16.3992 7.41594C16.5667 7.84406 16.972 8.12074 17.4317 8.12074V0.437988Z" fill="#F05449"/>
+</svg>
diff --git a/assets/icons/motion_meter.svg b/assets/icons/motion_meter.svg
new file mode 100644
index 00000000..85469973
--- /dev/null
+++ b/assets/icons/motion_meter.svg
@@ -0,0 +1,10 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8333 21.8332C16.8164 21.8332 21.6667 16.9829 21.6667 10.9998C21.6667 5.01675 16.8164 0.166504 10.8333 0.166504C4.85025 0.166504 0 5.01675 0 10.9998C0 16.9829 4.85025 21.8332 10.8333 21.8332Z" fill="#59ABFF"/>
+<path d="M21.6663 10.9998C21.6663 5.0267 16.8061 0.166504 10.833 0.166504V21.8332C16.8061 21.8332 21.6663 16.973 21.6663 10.9998Z" fill="#4D87FF"/>
+<path d="M10.8337 19.6663C15.6201 19.6663 19.5003 15.7861 19.5003 10.9997C19.5003 6.21321 15.6201 2.33301 10.8337 2.33301C6.04719 2.33301 2.16699 6.21321 2.16699 10.9997C2.16699 15.7861 6.04719 19.6663 10.8337 19.6663Z" fill="#F3F5F9"/>
+<path d="M19.4997 10.9997C19.4997 6.22095 15.6117 2.33301 10.833 2.33301V19.6663C15.6117 19.6663 19.4997 15.7784 19.4997 10.9997Z" fill="#E1E6F0"/>
+<path d="M14.4007 7.93541C13.6771 7.21182 12.1435 6.66618 10.8333 6.66618C10.235 6.66618 9.75 6.18113 9.75 5.58285C9.75 4.98456 10.235 4.49951 10.8333 4.49951C12.7149 4.49951 14.8118 5.2824 15.9327 6.40329C16.3558 6.82637 14.6121 8.14688 14.4007 7.93541Z" fill="#FF5959"/>
+<path d="M14.4004 7.9359C14.6119 8.14744 16.3555 6.82693 15.9324 6.40385C14.8114 5.28289 12.7145 4.5 10.833 4.5V6.66667C12.1432 6.66667 13.6768 7.21231 14.4004 7.9359Z" fill="#E63A57"/>
+<path d="M10.8338 12.0833C10.534 12.0833 10.2358 11.9596 10.0216 11.7174C9.62541 11.2691 9.66758 10.5845 10.1159 10.1882L14.4493 6.35808C14.8974 5.9618 15.5821 6.00405 15.9784 6.45233C16.3746 6.90061 16.3325 7.58528 15.8841 7.98149L11.5508 11.8117C11.3447 11.9938 11.0887 12.0833 10.8338 12.0833Z" fill="#4D4D80"/>
+<path d="M14.4489 6.35808L10.833 9.55413V12.0833H10.8334C11.0884 12.0833 11.3444 11.9938 11.5505 11.8117L15.8838 7.98149C16.3322 7.58528 16.3743 6.90061 15.9781 6.45233C15.5817 6.00405 14.897 5.9618 14.4489 6.35808Z" fill="#443D66"/>
+</svg>
diff --git a/assets/icons/moving_speed.svg b/assets/icons/moving_speed.svg
new file mode 100644
index 00000000..6db52050
--- /dev/null
+++ b/assets/icons/moving_speed.svg
@@ -0,0 +1,9 @@
+<svg width="22" height="18" viewBox="0 0 22 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21.6665 12.1843H13.9647V11.5495C13.9647 8.39954 11.4019 5.8367 8.25187 5.8367C5.10188 5.8367 2.53904 8.39954 2.53904 11.5495V12.1843H0V11.5495C0 8.65592 1.12686 5.93539 3.17297 3.88928C5.21908 1.84317 7.93962 0.716309 10.8332 0.716309C13.7268 0.716309 16.4474 1.84317 18.4935 3.88928C20.5396 5.93539 21.6665 8.65592 21.6665 11.5495V12.1843Z" fill="#FFCE2E"/>
+<path d="M18.4934 3.88928C16.4473 1.84317 13.7267 0.716309 10.8331 0.716309C7.93952 0.716309 5.21898 1.84317 3.17288 3.88928C3.02245 4.03954 2.87781 4.1941 2.7373 4.35146L5.1441 6.75826C6.03921 6.17574 7.10657 5.8367 8.25178 5.8367C10.8733 5.8367 13.0879 7.61188 13.7572 10.0233L21.6559 11.0867C21.5424 8.36681 20.4301 5.82596 18.4934 3.88928Z" fill="#FF9900"/>
+<path d="M13.9645 11.5495V12.1843H21.6662V11.5495C21.6662 8.65592 20.5394 5.93539 18.4933 3.88928C16.4472 1.84317 13.7266 0.716309 10.833 0.716309V6.4541C12.6895 7.39847 13.9645 9.32788 13.9645 11.5495Z" fill="#FF4F18"/>
+<path d="M18.967 3.89014L9.22326 12.7801C8.8667 13.1054 8.85381 13.6625 9.19515 14.0036L11.5747 16.3832C11.9164 16.725 12.4746 16.7116 12.7996 16.3537L21.6674 6.58985V3.89014H18.967Z" fill="#B7E4F8"/>
+<path d="M11.5735 16.3832C11.9153 16.725 12.4736 16.7116 12.7985 16.3537L21.6663 6.58985V3.89014L10.3828 15.1925L11.5735 16.3832Z" fill="#6FC8F1"/>
+<path d="M10.8328 17.2838C10.1546 17.2838 9.51683 17.0197 9.03729 16.5401C8.04746 15.5501 8.04746 13.9393 9.03729 12.9493C9.51683 12.4697 10.1546 12.2056 10.8328 12.2056C11.5109 12.2056 12.1486 12.4697 12.6281 12.9493C13.6181 13.9393 13.6181 15.55 12.6281 16.5401C12.1486 17.0197 11.5109 17.2838 10.8328 17.2838Z" fill="#388CB3"/>
+<path d="M12.628 12.9492L9.03711 16.5401C9.51665 17.0196 10.1544 17.2838 10.8326 17.2838C11.5107 17.2838 12.1484 17.0196 12.628 16.5401C13.6178 15.5501 13.6178 13.9392 12.628 12.9492Z" fill="#265D77"/>
+</svg>
diff --git a/assets/icons/presence_judgement_threshold.svg b/assets/icons/presence_judgement_threshold.svg
new file mode 100644
index 00000000..d5537da7
--- /dev/null
+++ b/assets/icons/presence_judgement_threshold.svg
@@ -0,0 +1,15 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0 6.47823V7.39644C0 7.51684 0.0975848 7.61442 0.217979 7.61442H8.12501V6.26025H0.217979C0.0975848 6.26025 0 6.35784 0 6.47823Z" fill="#80D261"/>
+<path d="M14.2606 0.16662C10.1904 0.144022 6.83113 3.43254 6.77133 7.50241C6.75191 8.82462 7.07708 10.0693 7.66284 11.1524C7.89233 11.5767 7.81671 12.101 7.47563 12.4422L6.82859 13.0892L7.44761 14.3853L8.74368 15.0042L9.39072 14.3572C9.73184 14.0161 10.2562 13.9405 10.6805 14.17C11.7636 14.7558 13.0083 15.0809 14.3305 15.0615C18.4003 15.0017 21.6889 11.6424 21.6663 7.57219C21.6436 3.49229 18.3405 0.18926 14.2606 0.16662Z" fill="#D4F2F6"/>
+<path d="M8.80176 7.61426C8.80176 10.6058 11.2269 13.0309 14.2184 13.0309C16.9807 13.0309 19.26 10.9633 19.5932 8.29135L17.6039 7.61426L16.2497 5.58301H14.8955L13.5413 9.64551H12.1872L10.833 6.93718L8.80176 7.61426Z" fill="#6BD9E7"/>
+<path d="M17.6041 7.61443L16.2499 5.58318H14.8957L13.5416 9.64568H12.1874L11.5103 6.93734L8.97266 6.26026C9.57399 3.92402 11.6947 2.19775 14.2187 2.19775C16.9809 2.19775 19.2602 4.26536 19.5934 6.93734L17.6041 7.61443Z" fill="#6BD9E7"/>
+<path d="M18.0722 7.77344C17.5411 10.2015 15.3802 12.0283 12.7805 12.0283C11.9447 12.0283 11.1532 11.8389 10.4463 11.5009C11.4217 12.4479 12.7523 13.031 14.2192 13.031C16.9814 13.031 19.2607 10.9634 19.5939 8.29136L18.0722 7.77344Z" fill="#02C7DD"/>
+<path d="M18.1965 6.61169C18.1965 6.89107 18.1753 7.16563 18.1344 7.4338L19.5932 6.93728C19.3609 5.07382 18.1819 3.50429 16.5527 2.7251C17.5678 3.7114 18.1965 5.09096 18.1965 6.61169Z" fill="#02C7DD"/>
+<path d="M8.31407 16.2938L8.74402 15.004L6.82893 13.0889L5.53908 13.5188C5.44276 13.5509 5.35525 13.605 5.28348 13.6768L0.319224 18.641C-0.106408 19.0666 -0.106408 19.7567 0.319224 20.1823L1.65054 21.5136C2.07617 21.9392 2.76625 21.9392 3.19184 21.5136L8.15609 16.5494C8.22791 16.4776 8.28199 16.3901 8.31407 16.2938Z" fill="#017297"/>
+<path d="M10.833 7.83257V9.23307C10.833 9.83496 11.321 10.3229 11.9229 10.3229H13.8057C14.4076 10.3229 14.8955 9.83496 14.8955 9.23303V6.47836C14.8955 6.35796 14.9931 6.26038 15.1135 6.26038H16.0317C16.1521 6.26038 16.2497 6.35796 16.2497 6.47836V7.20178C16.2497 7.80371 16.7377 8.29167 17.3396 8.29167H19.5932C19.6209 8.06984 19.6351 7.84391 19.6351 7.61459C19.6351 7.38527 19.6209 7.15933 19.5932 6.9375H17.8219C17.7015 6.9375 17.6039 6.83992 17.6039 6.71952V5.9961C17.6039 5.39422 17.1159 4.90625 16.514 4.90625H14.6312C14.0293 4.90625 13.5413 5.39422 13.5413 5.99614V8.75082C13.5413 8.87121 13.4438 8.9688 13.3234 8.9688H12.4052C12.2848 8.9688 12.1872 8.87121 12.1872 8.75082V7.35031C12.1872 6.74839 11.6992 6.26042 11.0973 6.26042H8.97238C8.861 6.69324 8.80176 7.14698 8.80176 7.61459H10.615C10.7354 7.61459 10.833 7.71217 10.833 7.83257Z" fill="#80D261"/>
+<path d="M19.5931 6.9375H18.1867C18.1588 7.40723 18.071 7.86117 17.9307 8.29167H19.5931C19.6208 8.06984 19.6351 7.8439 19.6351 7.61458C19.635 7.38526 19.6208 7.15933 19.5931 6.9375Z" fill="#68CA44"/>
+<path d="M16.1203 11.3269L12.9528 16.8131C12.7011 17.2491 13.0158 17.794 13.5191 17.794H19.854C20.3574 17.794 20.672 17.2491 20.4203 16.8131L17.2529 11.3269C17.0012 10.891 16.372 10.891 16.1203 11.3269Z" fill="#FFC344"/>
+<path d="M7.30793 15.8097C7.22427 15.8097 7.14056 15.7777 7.07675 15.7139L6.11922 14.7564C5.99151 14.6287 5.99151 14.4217 6.11922 14.294C6.2469 14.1663 6.45392 14.1663 6.58163 14.294L7.53915 15.2515C7.66687 15.3792 7.66687 15.5862 7.53915 15.7139C7.4753 15.7778 7.39159 15.8097 7.30793 15.8097Z" fill="#025F80"/>
+<path d="M16.6873 15.4124C16.5067 15.4124 16.3604 15.266 16.3604 15.0854V13.7312C16.3604 13.5507 16.5067 13.4043 16.6873 13.4043C16.8679 13.4043 17.0142 13.5507 17.0142 13.7312V15.0854C17.0142 15.2659 16.8679 15.4124 16.6873 15.4124Z" fill="#017297"/>
+<path d="M16.6863 16.7725C16.8669 16.7725 17.0133 16.6262 17.0133 16.4456C17.0133 16.265 16.8669 16.1187 16.6863 16.1187C16.5058 16.1187 16.3594 16.265 16.3594 16.4456C16.3594 16.6262 16.5058 16.7725 16.6863 16.7725Z" fill="#017297"/>
+</svg>
diff --git a/assets/icons/radar_fault.svg b/assets/icons/radar_fault.svg
new file mode 100644
index 00000000..b2295d1a
--- /dev/null
+++ b/assets/icons/radar_fault.svg
@@ -0,0 +1,14 @@
+<svg width="21" height="21" viewBox="0 0 21 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M9.9996 0.169434C15.5133 0.169434 19.9996 4.6557 19.9996 10.1694C19.9996 15.6832 15.5133 20.1694 9.9996 20.1694C4.48548 20.1694 0 15.6832 0 10.1694C0 4.6557 4.48548 0.169434 9.9996 0.169434Z" fill="#DCF5F8"/>
+<path d="M10.0002 17.1381C13.8491 17.1381 16.9692 14.018 16.9692 10.1692C16.9692 6.32031 13.8491 3.2002 10.0002 3.2002C6.15136 3.2002 3.03125 6.32031 3.03125 10.1692C3.03125 14.018 6.15136 17.1381 10.0002 17.1381Z" fill="#A6E7F0"/>
+<path d="M9.99894 12.9202C11.5182 12.9202 12.7498 11.6886 12.7498 10.1694C12.7498 8.65008 11.5182 7.41846 9.99894 7.41846C8.47967 7.41846 7.24805 8.65008 7.24805 10.1694C7.24805 11.6886 8.47967 12.9202 9.99894 12.9202Z" fill="#2ED1E2"/>
+<path d="M9.99855 11.7261C10.8585 11.7261 11.5557 11.0289 11.5557 10.169C11.5557 9.30897 10.8585 8.61182 9.99855 8.61182C9.13856 8.61182 8.44141 9.30897 8.44141 10.169C8.44141 11.0289 9.13856 11.7261 9.99855 11.7261Z" fill="#02C7DD"/>
+<path d="M6.36004 0.85498L7.84432 3.53186C5.72693 4.22108 4.05125 5.89676 3.36203 8.01415L0.685547 6.53027C1.70107 3.93894 3.76871 1.8709 6.36004 0.85498Z" fill="#A6E7F0"/>
+<path d="M2.57406 9.29723C2.57406 5.89778 4.09359 2.85365 6.49005 0.805664C2.70227 2.23014 0 5.88999 0 10.1694C0 15.6831 4.48548 20.1694 9.9996 20.1694C10.3326 20.1694 10.6618 20.1527 10.9865 20.1207C6.15137 18.8944 2.57406 14.5137 2.57406 9.29723Z" fill="#A6E7F0"/>
+<path d="M7.84362 3.53174L9.99881 7.41833C8.4819 7.41833 7.24792 8.65231 7.24792 10.1692L3.36133 8.01403C4.05054 5.89664 5.72623 4.22095 7.84362 3.53174Z" fill="#6BD9E7"/>
+<path d="M6.38611 0.898474L6.36199 0.85498C3.77067 1.8709 1.70302 3.93894 0.6875 6.53027L2.6982 7.64503C3.09542 4.96823 4.44269 2.60194 6.38611 0.898474Z" fill="#6BD9E7"/>
+<path d="M8.5957 3.6387C8.5965 3.63851 8.5973 3.63837 8.59809 3.63818C8.5973 3.63837 8.5965 3.63856 8.5957 3.6387Z" fill="#A6E7F0"/>
+<path d="M14.2321 5.60636C14.7735 5.60636 15.2123 5.16752 15.2123 4.62618C15.2123 4.08484 14.7735 3.646 14.2321 3.646C13.6908 3.646 13.252 4.08484 13.252 4.62618C13.252 5.16752 13.6908 5.60636 14.2321 5.60636Z" fill="#EE6161"/>
+<path d="M7.79097 17.7514C8.22781 17.7514 8.58193 17.3972 8.58193 16.9604C8.58193 16.5236 8.22781 16.1694 7.79097 16.1694C7.35413 16.1694 7 16.5236 7 16.9604C7 17.3972 7.35413 17.7514 7.79097 17.7514Z" fill="#97DA7B"/>
+<path d="M15.5 11.0194C12.9318 11.0194 10.85 13.1013 10.85 15.6694C10.85 18.2376 12.9318 20.3194 15.5 20.3194C18.0682 20.3194 20.15 18.2376 20.15 15.6694C20.15 13.1013 18.0682 11.0194 15.5 11.0194ZM11.9594 15.6694C11.9594 14.5299 12.4977 13.5163 13.3344 12.8685L16.6926 19.0039C16.3201 19.1372 15.9187 19.2099 15.5 19.2099C13.5446 19.21 11.9594 17.6248 11.9594 15.6694ZM19.0404 15.6694C19.0404 16.8089 18.5021 17.8226 17.6655 18.4704L14.3073 12.335C14.6798 12.2017 15.0813 12.1289 15.5 12.1289C17.4554 12.1289 19.0404 13.714 19.0404 15.6694Z" fill="#FF5A73" stroke="#FF5A73" stroke-width="0.3"/>
+</svg>
diff --git a/assets/icons/self_testing_failure.svg b/assets/icons/self_testing_failure.svg
new file mode 100644
index 00000000..c86c9ec2
--- /dev/null
+++ b/assets/icons/self_testing_failure.svg
@@ -0,0 +1,23 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9922 20.0771H1.75781C0.788555 20.0771 0 19.2886 0 18.3193V4.17871C0 3.20945 0.788555 2.4209 1.75781 2.4209H11.9922C12.9614 2.4209 13.75 3.20945 13.75 4.17871V18.3193C13.75 19.2886 12.9614 20.0771 11.9922 20.0771Z" fill="#FF5E82"/>
+<path d="M11.9922 2.4209H6.875V20.0771H11.9922C12.9614 20.0771 13.75 19.2886 13.75 18.3193V4.17871C13.75 3.20945 12.9614 2.4209 11.9922 2.4209Z" fill="#B7457D"/>
+<path d="M1.75781 3.59277C1.43473 3.59277 1.17188 3.85563 1.17188 4.17871V18.3193C1.17188 18.6424 1.43473 18.9053 1.75781 18.9053H11.9922C12.3153 18.9053 12.5781 18.6424 12.5781 18.3193V4.17871C12.5781 3.85563 12.3153 3.59277 11.9922 3.59277H1.75781Z" fill="#F2FAFF"/>
+<path d="M11.9922 3.59277H6.875V18.9053H11.9922C12.3153 18.9053 12.5781 18.6424 12.5781 18.3193V4.17871C12.5781 3.85563 12.3153 3.59277 11.9922 3.59277Z" fill="#C8EAFA"/>
+<path d="M5.00834 7.97561L5.76592 7.21803C5.99475 6.9892 5.99475 6.61822 5.76592 6.38939C5.53713 6.16057 5.16611 6.16057 4.93728 6.38939L4.17971 7.14697L3.42213 6.38939C3.19334 6.16057 2.82232 6.16057 2.5935 6.38939C2.36467 6.61822 2.36467 6.9892 2.5935 7.21803L3.35107 7.97561L2.5935 8.73318C2.36467 8.96201 2.36467 9.33299 2.5935 9.56182C2.70791 9.67623 2.85787 9.73342 3.00783 9.73342C3.15779 9.73342 3.30775 9.67623 3.42213 9.56178L4.17971 8.80424L4.93728 9.56182C5.05166 9.67623 5.20162 9.73342 5.35158 9.73342C5.50154 9.73342 5.6515 9.67623 5.76588 9.56178C5.99471 9.33295 5.99471 8.96197 5.76588 8.73314L5.00834 7.97561Z" fill="#5E54AC"/>
+<path d="M5.00834 11.9756L5.76592 11.218C5.99475 10.9892 5.99475 10.6182 5.76592 10.3894C5.53713 10.1606 5.16611 10.1606 4.93728 10.3894L4.17971 11.147L3.42213 10.3894C3.19334 10.1606 2.82232 10.1606 2.5935 10.3894C2.36467 10.6182 2.36467 10.9892 2.5935 11.218L3.35107 11.9756L2.5935 12.7332C2.36467 12.962 2.36467 13.333 2.5935 13.5618C2.70791 13.6762 2.85787 13.7334 3.00783 13.7334C3.15779 13.7334 3.30775 13.6762 3.42213 13.5618L4.17971 12.8042L4.93728 13.5618C5.05166 13.6762 5.20162 13.7334 5.35158 13.7334C5.50154 13.7334 5.6515 13.6762 5.76588 13.5618C5.99471 13.3329 5.99471 12.962 5.76588 12.7331L5.00834 11.9756Z" fill="#5E54AC"/>
+<path d="M5.00834 15.9756L5.76592 15.218C5.99475 14.9892 5.99475 14.6182 5.76592 14.3894C5.53713 14.1606 5.16611 14.1606 4.93728 14.3894L4.17971 15.147L3.42213 14.3894C3.19334 14.1606 2.82232 14.1606 2.5935 14.3894C2.36467 14.6182 2.36467 14.9892 2.5935 15.218L3.35107 15.9756L2.5935 16.7332C2.36467 16.962 2.36467 17.333 2.5935 17.5618C2.70791 17.6762 2.85787 17.7334 3.00783 17.7334C3.15779 17.7334 3.30775 17.6762 3.42213 17.5618L4.17971 16.8042L4.93728 17.5618C5.05166 17.6762 5.20162 17.7334 5.35158 17.7334C5.50154 17.7334 5.6515 17.6762 5.76588 17.5618C5.99471 17.3329 5.99471 16.962 5.76588 16.7331L5.00834 15.9756Z" fill="#5E54AC"/>
+<path d="M19.4141 20.0771H15.5078C15.1842 20.0771 14.9219 19.8148 14.9219 19.4912V15.585C14.9219 15.2614 15.1842 14.999 15.5078 14.999H19.4141C19.7377 14.999 20 15.2614 20 15.585V19.4912C20 19.8148 19.7377 20.0771 19.4141 20.0771Z" fill="#F2FAFF"/>
+<path d="M19.4141 14.999H17.4609V20.0771H19.4141C19.7377 20.0771 20 19.8148 20 19.4912V15.585C20 15.2614 19.7377 14.999 19.4141 14.999Z" fill="#C8EAFA"/>
+<path d="M18.2422 12.6553H16.6797C15.7104 12.6553 14.9219 13.4438 14.9219 14.4131V15.585H20V14.4131C20 13.4438 19.2114 12.6553 18.2422 12.6553Z" fill="#A4E9FF"/>
+<path d="M20 14.4131C20 13.4438 19.2114 12.6553 18.2422 12.6553H17.4609V15.585H20V14.4131Z" fill="#91BBFF"/>
+<path d="M10 4.76465H3.75C3.42641 4.76465 3.16406 4.5023 3.16406 4.17871V3.39746C3.16406 2.46688 3.8909 1.70289 4.80672 1.6434C5.06109 0.740625 5.89199 0.0771484 6.875 0.0771484C7.85801 0.0771484 8.68891 0.740625 8.94328 1.6434C9.8591 1.70289 10.5859 2.46688 10.5859 3.39746V4.17871C10.5859 4.5023 10.3236 4.76465 10 4.76465Z" fill="#FFE67A"/>
+<path d="M8.94328 1.6434C8.68891 0.740625 7.85801 0.0771484 6.875 0.0771484V4.76465H10C10.3236 4.76465 10.5859 4.5023 10.5859 4.17871V3.39746C10.5859 2.46688 9.8591 1.70289 8.94328 1.6434Z" fill="#FFC336"/>
+<path d="M7.72045 15.5587C7.52627 15.3645 7.49299 15.0614 7.64045 14.8297L9.57393 11.7914C9.69295 11.6043 9.90991 11.4972 10.1383 11.5241C10.2743 11.5401 10.399 11.6081 10.4959 11.7049L11.5741 12.7831C11.671 12.88 11.7389 13.0047 11.7549 13.1408C11.7818 13.3691 11.6748 13.5861 11.4876 13.7051L8.44928 15.6386C8.21764 15.7861 7.91463 15.7528 7.72045 15.5587Z" fill="#FFD6AA"/>
+<path d="M11.5724 12.7832L11.0333 12.2441L7.71875 15.5587C7.91293 15.7529 8.21598 15.7862 8.44766 15.6387L11.486 13.7052C11.6731 13.5862 11.7802 13.3693 11.7533 13.1409C11.7373 13.0048 11.6693 12.8801 11.5724 12.7832Z" fill="#FAC68F"/>
+<path d="M18.4926 5.89121L17.3878 4.78637C17.1589 4.55754 16.7879 4.55754 16.5591 4.78637L15.3162 6.02934C15.0873 6.25816 15.0873 6.62914 15.3162 6.85797L16.421 7.96281C16.6498 8.19164 17.0208 8.19164 17.2496 7.96281L18.4926 6.71984C18.7214 6.49105 18.7214 6.12004 18.4926 5.89121Z" fill="#F2FAFF"/>
+<path d="M17.9407 5.33887L15.8691 7.41047L16.4216 7.96289C16.6504 8.19172 17.0214 8.19172 17.2502 7.96289L18.4932 6.71992C18.722 6.49109 18.722 6.12012 18.4932 5.89129L17.9407 5.33887Z" fill="#C8EAFA"/>
+<path d="M19.5969 3.68168C19.063 3.14777 18.1973 3.14777 17.6634 3.68168L16.5586 4.78652L18.4921 6.72L19.5969 5.61516C20.1308 5.08125 20.1308 4.21559 19.5969 3.68168Z" fill="#FF5E82"/>
+<path d="M19.5989 3.68164L17.5273 5.75324L18.4941 6.72L19.5989 5.61516C20.1329 5.08121 20.1329 4.21555 19.5989 3.68164Z" fill="#B7457D"/>
+<path d="M9.65234 11.6919L15.3139 6.03037L17.2471 7.96357L11.5855 13.6251L9.65234 11.6919Z" fill="#BC8173"/>
+<path d="M10.6191 12.6587L16.2807 6.99717L17.2473 7.96377L11.5857 13.6253L10.6191 12.6587Z" fill="#9D5E4A"/>
+</svg>
diff --git a/assets/icons/self_testing_success.svg b/assets/icons/self_testing_success.svg
new file mode 100644
index 00000000..1f8976b0
--- /dev/null
+++ b/assets/icons/self_testing_success.svg
@@ -0,0 +1,23 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9922 20.0464H1.75781C0.788555 20.0464 0 19.2578 0 18.2886V4.14795C0 3.17869 0.788555 2.39014 1.75781 2.39014H11.9922C12.9614 2.39014 13.75 3.17869 13.75 4.14795V18.2886C13.75 19.2578 12.9614 20.0464 11.9922 20.0464Z" fill="#FF5E82"/>
+<path d="M11.9922 2.39014H6.875V20.0464H11.9922C12.9614 20.0464 13.75 19.2578 13.75 18.2886V4.14795C13.75 3.17869 12.9614 2.39014 11.9922 2.39014Z" fill="#B7457D"/>
+<path d="M1.75781 3.56201C1.43473 3.56201 1.17188 3.82486 1.17188 4.14795V18.2886C1.17188 18.6117 1.43473 18.8745 1.75781 18.8745H11.9922C12.3153 18.8745 12.5781 18.6117 12.5781 18.2886V4.14795C12.5781 3.82486 12.3153 3.56201 11.9922 3.56201H1.75781Z" fill="#F2FAFF"/>
+<path d="M11.9922 3.56201H6.875V18.8745H11.9922C12.3153 18.8745 12.5781 18.6117 12.5781 18.2886V4.14795C12.5781 3.82486 12.3153 3.56201 11.9922 3.56201Z" fill="#C8EAFA"/>
+<path d="M4.01889 9.36547C3.86893 9.36547 3.71896 9.30828 3.60459 9.19383L2.49975 8.08898C2.27092 7.86016 2.27092 7.48918 2.49975 7.26035C2.72854 7.03152 3.09955 7.03152 3.32838 7.26035L4.01893 7.9509L5.81436 6.15551C6.04318 5.92668 6.4142 5.92668 6.64299 6.15551C6.87182 6.38434 6.87182 6.75531 6.64299 6.98414L4.43326 9.19383C4.31881 9.30828 4.16881 9.36547 4.01889 9.36547Z" fill="#5E54AC"/>
+<path d="M4.01889 13.2107C3.86893 13.2107 3.71896 13.1535 3.60459 13.039L2.49975 11.9342C2.27092 11.7054 2.27092 11.3344 2.49975 11.1056C2.72854 10.8767 3.09955 10.8767 3.32838 11.1056L4.01893 11.7961L5.81436 10.0007C6.04318 9.77189 6.4142 9.77189 6.64299 10.0007C6.87182 10.2296 6.87182 10.6005 6.64299 10.8294L4.43326 13.039C4.31881 13.1535 4.16881 13.2107 4.01889 13.2107Z" fill="#5E54AC"/>
+<path d="M4.01889 17.2107C3.86893 17.2107 3.71896 17.1535 3.60459 17.039L2.49975 15.9342C2.27092 15.7054 2.27092 15.3344 2.49975 15.1056C2.72854 14.8767 3.09955 14.8767 3.32838 15.1056L4.01893 15.7961L5.81436 14.0007C6.04318 13.7719 6.4142 13.7719 6.64299 14.0007C6.87182 14.2296 6.87182 14.6005 6.64299 14.8294L4.43326 17.039C4.31881 17.1535 4.16881 17.2107 4.01889 17.2107Z" fill="#5E54AC"/>
+<path d="M19.4141 20.0464H15.5078C15.1842 20.0464 14.9219 19.784 14.9219 19.4604V15.5542C14.9219 15.2306 15.1842 14.9683 15.5078 14.9683H19.4141C19.7377 14.9683 20 15.2306 20 15.5542V19.4604C20 19.784 19.7377 20.0464 19.4141 20.0464Z" fill="#F2FAFF"/>
+<path d="M19.4141 14.9683H17.4609V20.0464H19.4141C19.7377 20.0464 20 19.784 20 19.4604V15.5542C20 15.2306 19.7377 14.9683 19.4141 14.9683Z" fill="#C8EAFA"/>
+<path d="M18.2422 12.6245H16.6797C15.7104 12.6245 14.9219 13.4131 14.9219 14.3823V15.5542H20V14.3823C20 13.4131 19.2114 12.6245 18.2422 12.6245Z" fill="#A4E9FF"/>
+<path d="M20 14.3823C20 13.4131 19.2114 12.6245 18.2422 12.6245H17.4609V15.5542H20V14.3823Z" fill="#91BBFF"/>
+<path d="M10 4.73389H3.75C3.42641 4.73389 3.16406 4.47154 3.16406 4.14795V3.3667C3.16406 2.43611 3.8909 1.67213 4.80672 1.61264C5.06109 0.709863 5.89199 0.0463867 6.875 0.0463867C7.85801 0.0463867 8.68891 0.709863 8.94328 1.61264C9.8591 1.67213 10.5859 2.43611 10.5859 3.3667V4.14795C10.5859 4.47154 10.3236 4.73389 10 4.73389Z" fill="#FFE67A"/>
+<path d="M8.94328 1.61264C8.68891 0.709863 7.85801 0.0463867 6.875 0.0463867V4.73389H10C10.3236 4.73389 10.5859 4.47154 10.5859 4.14795V3.3667C10.5859 2.43611 9.8591 1.67213 8.94328 1.61264Z" fill="#FFC336"/>
+<path d="M7.72045 15.5279C7.52627 15.3337 7.49299 15.0307 7.64045 14.799L9.57393 11.7606C9.69295 11.5736 9.90991 11.4665 10.1383 11.4934C10.2743 11.5094 10.399 11.5773 10.4959 11.6742L11.5741 12.7524C11.671 12.8493 11.7389 12.9739 11.7549 13.11C11.7818 13.3384 11.6748 13.5553 11.4876 13.6743L8.44928 15.6078C8.21764 15.7554 7.91463 15.7221 7.72045 15.5279Z" fill="#FFD6AA"/>
+<path d="M11.5724 12.7525L11.0333 12.2134L7.71875 15.5279C7.91293 15.7221 8.21598 15.7554 8.44766 15.6079L11.486 13.6745C11.6731 13.5554 11.7802 13.3385 11.7533 13.1101C11.7373 12.974 11.6693 12.8494 11.5724 12.7525Z" fill="#FAC68F"/>
+<path d="M18.4926 5.86045L17.3878 4.75561C17.1589 4.52678 16.7879 4.52678 16.5591 4.75561L15.3162 5.99857C15.0873 6.2274 15.0873 6.59838 15.3162 6.82721L16.421 7.93205C16.6498 8.16088 17.0208 8.16088 17.2496 7.93205L18.4926 6.68908C18.7214 6.46029 18.7214 6.08928 18.4926 5.86045Z" fill="#F2FAFF"/>
+<path d="M17.9407 5.30811L15.8691 7.37971L16.4216 7.93213C16.6504 8.16096 17.0214 8.16096 17.2502 7.93213L18.4932 6.68916C18.722 6.46033 18.722 6.08936 18.4932 5.86053L17.9407 5.30811Z" fill="#C8EAFA"/>
+<path d="M19.5969 3.65092C19.063 3.11701 18.1973 3.11701 17.6634 3.65092L16.5586 4.75576L18.4921 6.68924L19.5969 5.58439C20.1308 5.05049 20.1308 4.18482 19.5969 3.65092Z" fill="#FF5E82"/>
+<path d="M19.5989 3.65088L17.5273 5.72248L18.4941 6.68924L19.5989 5.58439C20.1329 5.05045 20.1329 4.18479 19.5989 3.65088Z" fill="#B7457D"/>
+<path d="M9.65234 11.6611L15.3139 5.99961L17.2471 7.93281L11.5855 13.5943L9.65234 11.6611Z" fill="#BC8173"/>
+<path d="M10.6191 12.6279L16.2807 6.96641L17.2473 7.93301L11.5857 13.5945L10.6191 12.6279Z" fill="#9D5E4A"/>
+</svg>
diff --git a/assets/icons/self_testing_timeout.svg b/assets/icons/self_testing_timeout.svg
new file mode 100644
index 00000000..55c1e632
--- /dev/null
+++ b/assets/icons/self_testing_timeout.svg
@@ -0,0 +1,41 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.9922 20.1079H1.75781C0.788555 20.1079 0 19.3194 0 18.3501V4.20947C0 3.24021 0.788555 2.45166 1.75781 2.45166H11.9922C12.9614 2.45166 13.75 3.24021 13.75 4.20947V18.3501C13.75 19.3194 12.9614 20.1079 11.9922 20.1079Z" fill="#FF5E82"/>
+<path d="M11.9922 2.45166H6.875V20.1079H11.9922C12.9614 20.1079 13.75 19.3194 13.75 18.3501V4.20947C13.75 3.24021 12.9614 2.45166 11.9922 2.45166Z" fill="#B7457D"/>
+<path d="M1.75781 3.62354C1.43473 3.62354 1.17188 3.88639 1.17188 4.20947V18.3501C1.17188 18.6732 1.43473 18.936 1.75781 18.936H11.9922C12.3153 18.936 12.5781 18.6732 12.5781 18.3501V4.20947C12.5781 3.88639 12.3153 3.62354 11.9922 3.62354H1.75781Z" fill="#F2FAFF"/>
+<path d="M11.9922 3.62354H6.875V18.936H11.9922C12.3153 18.936 12.5781 18.6732 12.5781 18.3501V4.20947C12.5781 3.88639 12.3153 3.62354 11.9922 3.62354Z" fill="#C8EAFA"/>
+<path d="M12.4999 20.1083C14.9852 20.1083 16.9999 18.0936 16.9999 15.6083C16.9999 13.1231 14.9852 11.1084 12.4999 11.1084C10.0147 11.1084 8 13.1231 8 15.6083C8 18.0936 10.0147 20.1083 12.4999 20.1083Z" fill="#F07281"/>
+<path d="M12.69 20.1039C12.6271 20.1065 12.5636 20.1078 12.5 20.1078C10.0148 20.1078 8 18.0931 8 15.6079C8 13.1227 10.0148 11.1079 12.5 11.1079C12.5636 11.1079 12.6271 11.1092 12.69 11.1119C10.293 11.2115 8.38013 13.1863 8.38013 15.6079C8.38013 18.0294 10.293 20.0043 12.69 20.1039Z" fill="#EB5569"/>
+<path d="M12.4994 19.5174C14.6586 19.5174 16.409 17.767 16.409 15.6078C16.409 13.4486 14.6586 11.6982 12.4994 11.6982C10.3402 11.6982 8.58984 13.4486 8.58984 15.6078C8.58984 17.767 10.3402 19.5174 12.4994 19.5174Z" fill="#EAF6FF"/>
+<path d="M12.7846 19.5072C12.6905 19.514 12.5952 19.5175 12.4994 19.5175C10.3402 19.5175 8.58984 17.7671 8.58984 15.6078C8.58984 13.4486 10.3402 11.6982 12.4995 11.6982C12.5953 11.6982 12.6905 11.7017 12.7846 11.7085C10.7584 11.8545 9.16007 13.5444 9.16007 15.6078C9.16007 17.6713 10.7584 19.3612 12.7846 19.5072Z" fill="#D8ECFE"/>
+<path d="M12.2539 13.3321L12.4284 13.2198C12.471 13.1924 12.5257 13.1924 12.5682 13.2198L12.7428 13.3321C12.7744 13.3525 12.7935 13.3876 12.7935 13.4252V15.6605H12.2031V13.4252C12.2031 13.3876 12.2222 13.3525 12.2539 13.3321Z" fill="#5680A6"/>
+<path d="M12.6884 13.2972L12.5833 13.3648V15.6605H12.2031V13.4353C12.2031 13.3914 12.2254 13.3504 12.2624 13.3267L12.4284 13.2198C12.471 13.1924 12.5256 13.1924 12.5682 13.2198L12.6884 13.2972Z" fill="#497090"/>
+<path d="M14.3445 15.6776L14.2376 15.8436C14.2138 15.8806 14.1729 15.9029 14.129 15.9029H12.5V15.3125H14.129C14.1729 15.3125 14.2138 15.3348 14.2376 15.3717L14.3445 15.5378C14.3719 15.5803 14.3719 15.635 14.3445 15.6776Z" fill="#5680A6"/>
+<path d="M13.2936 15.6077C13.2936 15.712 13.2734 15.8116 13.2365 15.9029H12.5V15.3125H13.2365C13.2734 15.4037 13.2936 15.5033 13.2936 15.6077Z" fill="#497090"/>
+<path d="M12.4993 16.0211C12.7277 16.0211 12.9127 15.8361 12.9127 15.6077C12.9127 15.3794 12.7277 15.1943 12.4993 15.1943C12.271 15.1943 12.0859 15.3794 12.0859 15.6077C12.0859 15.8361 12.271 16.0211 12.4993 16.0211Z" fill="#F07281"/>
+<path d="M12.6894 15.9748C12.6326 16.0044 12.568 16.0211 12.4993 16.0211C12.2711 16.0211 12.0859 15.836 12.0859 15.6077C12.0859 15.3795 12.2711 15.1943 12.4993 15.1943C12.568 15.1943 12.6326 15.2111 12.6894 15.2407C12.5567 15.3093 12.4661 15.4481 12.4661 15.6078C12.4661 15.7674 12.5567 15.9061 12.6894 15.9748Z" fill="#EB5569"/>
+<path d="M12.5019 12.7788C12.4232 12.7788 12.3594 12.715 12.3594 12.6363V12.268C12.3594 12.1893 12.4232 12.1255 12.5019 12.1255C12.5807 12.1255 12.6445 12.1893 12.6445 12.268V12.6363C12.6445 12.715 12.5807 12.7788 12.5019 12.7788Z" fill="#88B4F5"/>
+<path d="M12.5019 19.0894C12.4232 19.0894 12.3594 19.0255 12.3594 18.9468V18.5786C12.3594 18.4999 12.4232 18.436 12.5019 18.436C12.5807 18.436 12.6445 18.4999 12.6445 18.5786V18.9468C12.6445 19.0255 12.5807 19.0894 12.5019 19.0894Z" fill="#88B4F5"/>
+<path d="M9.52445 15.7504H9.15622C9.07749 15.7504 9.01367 15.6866 9.01367 15.6079C9.01367 15.5292 9.07749 15.4653 9.15622 15.4653H9.52445C9.60318 15.4653 9.667 15.5292 9.667 15.6079C9.667 15.6866 9.60318 15.7504 9.52445 15.7504Z" fill="#88B4F5"/>
+<path d="M15.835 15.7504H15.4668C15.388 15.7504 15.3242 15.6866 15.3242 15.6079C15.3242 15.5292 15.388 15.4653 15.4668 15.4653H15.835C15.9137 15.4653 15.9775 15.5292 15.9775 15.6079C15.9775 15.6866 15.9137 15.7504 15.835 15.7504Z" fill="#88B4F5"/>
+<path d="M9.60755 17.4199C9.55829 17.4199 9.51037 17.3944 9.48397 17.3486C9.4446 17.2805 9.46796 17.1933 9.53615 17.1539L9.85505 16.9698C9.92318 16.9305 10.0104 16.9538 10.0498 17.022C10.0891 17.0901 10.0658 17.1773 9.99759 17.2167L9.6787 17.4008C9.65626 17.4138 9.63174 17.4199 9.60755 17.4199Z" fill="#88B4F5"/>
+<path d="M15.0724 14.2647C15.0231 14.2647 14.9752 14.2391 14.9488 14.1934C14.9094 14.1252 14.9328 14.038 15.001 13.9986L15.3199 13.8145C15.388 13.7752 15.4752 13.7985 15.5146 13.8667C15.554 13.9349 15.5306 14.0221 15.4624 14.0614L15.1435 14.2456C15.1211 14.2585 15.0966 14.2647 15.0724 14.2647Z" fill="#88B4F5"/>
+<path d="M9.92619 14.2647C9.902 14.2647 9.8775 14.2585 9.85505 14.2456L9.53615 14.0614C9.46796 14.0221 9.4446 13.9349 9.48397 13.8667C9.52333 13.7985 9.6105 13.7752 9.6787 13.8145L9.99759 13.9987C10.0658 14.038 10.0891 14.1252 10.0498 14.1934C10.0234 14.2391 9.97545 14.2647 9.92619 14.2647Z" fill="#88B4F5"/>
+<path d="M10.8319 18.6422C10.8077 18.6422 10.7832 18.636 10.7608 18.623C10.6926 18.5836 10.6692 18.4965 10.7086 18.4283L10.8927 18.1094C10.9321 18.0412 11.0192 18.0178 11.0874 18.0572C11.1556 18.0966 11.179 18.1838 11.1396 18.2519L10.9555 18.5708C10.9291 18.6166 10.8812 18.6422 10.8319 18.6422Z" fill="#88B4F5"/>
+<path d="M13.9862 13.1773C13.962 13.1773 13.9375 13.1711 13.9151 13.1582C13.8469 13.1188 13.8235 13.0316 13.8629 12.9634L14.047 12.6445C14.0863 12.5764 14.1735 12.553 14.2417 12.5924C14.3099 12.6317 14.3333 12.7189 14.2939 12.7871L14.1098 13.106C14.0834 13.1517 14.0355 13.1773 13.9862 13.1773Z" fill="#88B4F5"/>
+<path d="M11.0163 13.1778C10.967 13.1778 10.9191 13.1522 10.8927 13.1065L10.7086 12.7876C10.6692 12.7194 10.6926 12.6322 10.7608 12.5929C10.8289 12.5535 10.9161 12.5768 10.9555 12.645L11.1396 12.9639C11.179 13.0321 11.1556 13.1193 11.0874 13.1587C11.065 13.1716 11.0405 13.1778 11.0163 13.1778Z" fill="#88B4F5"/>
+<path d="M15.3252 15.6128C15.3252 15.534 15.389 15.4702 15.4677 15.4702L15.836 15.4702C15.9147 15.4702 15.9785 15.534 15.9785 15.6128C15.9785 15.6915 15.9147 15.7553 15.836 15.7553L15.4677 15.7553C15.389 15.7553 15.3252 15.6915 15.3252 15.6128Z" fill="#88B4F5"/>
+<path d="M9.01464 15.6128C9.01464 15.534 9.07846 15.4702 9.15719 15.4702L9.52542 15.4702C9.60415 15.4702 9.66797 15.534 9.66797 15.6128C9.66797 15.6915 9.60415 15.7553 9.52542 15.7553L9.15719 15.7553C9.07848 15.7553 9.01464 15.6915 9.01464 15.6128Z" fill="#88B4F5"/>
+<path d="M12.3536 12.6363L12.3536 12.268C12.3536 12.1893 12.4174 12.1255 12.4961 12.1255C12.5749 12.1255 12.6387 12.1893 12.6387 12.268L12.6387 12.6363C12.6387 12.715 12.5749 12.7788 12.4961 12.7788C12.4174 12.7788 12.3536 12.715 12.3536 12.6363Z" fill="#88B4F5"/>
+<path d="M12.3536 18.9468L12.3536 18.5786C12.3536 18.4998 12.4174 18.436 12.4961 18.436C12.5749 18.436 12.6387 18.4999 12.6387 18.5786L12.6387 18.9468C12.6387 19.0256 12.5749 19.0894 12.4961 19.0894C12.4174 19.0894 12.3536 19.0255 12.3536 18.9468Z" fill="#88B4F5"/>
+<path d="M10.6831 12.7184C10.6831 12.6691 10.7087 12.6212 10.7544 12.5948C10.8226 12.5554 10.9098 12.5788 10.9491 12.647L11.1332 12.9659C11.1726 13.034 11.1492 13.1212 11.0811 13.1606C11.0129 13.2 10.9257 13.1766 10.8863 13.1084L10.7022 12.7895C10.6892 12.7671 10.6831 12.7426 10.6831 12.7184Z" fill="#88B4F5"/>
+<path d="M13.8393 18.1832C13.8393 18.134 13.8649 18.0861 13.9106 18.0597C13.9788 18.0203 14.066 18.0437 14.1054 18.1118L14.2895 18.4307C14.3288 18.4989 14.3055 18.5861 14.2373 18.6255C14.1691 18.6648 14.0819 18.6414 14.0426 18.5733L13.8585 18.2544C13.8455 18.2319 13.8393 18.2074 13.8393 18.1832Z" fill="#88B4F5"/>
+<path d="M13.8393 13.037C13.8393 13.0128 13.8455 12.9883 13.8584 12.9659L14.0426 12.647C14.0819 12.5788 14.1691 12.5554 14.2373 12.5948C14.3055 12.6342 14.3288 12.7213 14.2895 12.7895L14.1053 13.1084C14.066 13.1766 13.9788 13.2 13.9106 13.1606C13.8649 13.1342 13.8393 13.0863 13.8393 13.037Z" fill="#88B4F5"/>
+<path d="M9.46038 13.9437C9.46038 13.9195 9.46655 13.895 9.47952 13.8726C9.51889 13.8044 9.60607 13.781 9.67424 13.8204L9.99314 14.0045C10.0613 14.0439 10.0847 14.1311 10.0453 14.1992C10.0059 14.2674 9.91877 14.2908 9.85059 14.2514L9.53169 14.0673C9.48596 14.0409 9.46038 13.993 9.46038 13.9437Z" fill="#88B4F5"/>
+<path d="M14.9252 17.099C14.9252 17.0748 14.9314 17.0503 14.9444 17.0278C14.9837 16.9597 15.0709 16.9363 15.1391 16.9757L15.458 17.1598C15.5262 17.1991 15.5495 17.2863 15.5102 17.3545C15.4708 17.4227 15.3836 17.4461 15.3154 17.4067L14.9965 17.2226C14.9508 17.1962 14.9252 17.1483 14.9252 17.099Z" fill="#88B4F5"/>
+<path d="M14.9252 14.1281C14.9252 14.0788 14.9508 14.0309 14.9965 14.0045L15.3154 13.8204C15.3836 13.781 15.4708 13.8044 15.5102 13.8726C15.5495 13.9407 15.5262 14.0279 15.458 14.0673L15.1391 14.2514C15.0709 14.2908 14.9837 14.2674 14.9444 14.1992C14.9314 14.1768 14.9252 14.1523 14.9252 14.1281Z" fill="#88B4F5"/>
+<path d="M4.01889 9.27221C3.86893 9.27221 3.71896 9.21502 3.60459 9.10057L2.49975 7.99572C2.27092 7.76689 2.27092 7.39592 2.49975 7.16709C2.72854 6.93826 3.09955 6.93826 3.32838 7.16709L4.01893 7.85764L5.81436 6.06225C6.04318 5.83342 6.4142 5.83342 6.64299 6.06225C6.87182 6.29107 6.87182 6.66205 6.64299 6.89088L4.43326 9.10057C4.31881 9.21498 4.16881 9.27221 4.01889 9.27221Z" fill="#5E54AC"/>
+<path d="M5.00834 12.0069L5.76592 11.2493C5.99475 11.0204 5.99475 10.6495 5.76592 10.4206C5.53713 10.1918 5.16611 10.1918 4.93728 10.4206L4.17971 11.1782L3.42213 10.4206C3.19334 10.1918 2.82232 10.1918 2.5935 10.4206C2.36467 10.6495 2.36467 11.0204 2.5935 11.2493L3.35107 12.0069L2.5935 12.7644C2.36467 12.9933 2.36467 13.3642 2.5935 13.5931C2.70791 13.7075 2.85787 13.7647 3.00783 13.7647C3.15779 13.7647 3.30775 13.7075 3.42213 13.593L4.17971 12.8355L4.93728 13.5931C5.05166 13.7075 5.20162 13.7647 5.35158 13.7647C5.50154 13.7647 5.6515 13.7075 5.76588 13.593C5.99471 13.3642 5.99471 12.9932 5.76588 12.7644L5.00834 12.0069Z" fill="#5E54AC"/>
+<path d="M5.00834 16.0069L5.76592 15.2493C5.99475 15.0204 5.99475 14.6495 5.76592 14.4206C5.53713 14.1918 5.16611 14.1918 4.93728 14.4206L4.17971 15.1782L3.42213 14.4206C3.19334 14.1918 2.82232 14.1918 2.5935 14.4206C2.36467 14.6495 2.36467 15.0204 2.5935 15.2493L3.35107 16.0069L2.5935 16.7644C2.36467 16.9933 2.36467 17.3642 2.5935 17.5931C2.70791 17.7075 2.85787 17.7647 3.00783 17.7647C3.15779 17.7647 3.30775 17.7075 3.42213 17.593L4.17971 16.8355L4.93728 17.5931C5.05166 17.7075 5.20162 17.7647 5.35158 17.7647C5.50154 17.7647 5.6515 17.7075 5.76588 17.593C5.99471 17.3642 5.99471 16.9932 5.76588 16.7644L5.00834 16.0069Z" fill="#5E54AC"/>
+<path d="M10 4.79541H3.75C3.42641 4.79541 3.16406 4.53307 3.16406 4.20947V3.42822C3.16406 2.49764 3.8909 1.73365 4.80672 1.67416C5.06109 0.771387 5.89199 0.10791 6.875 0.10791C7.85801 0.10791 8.68891 0.771387 8.94328 1.67416C9.8591 1.73365 10.5859 2.49764 10.5859 3.42822V4.20947C10.5859 4.53307 10.3236 4.79541 10 4.79541Z" fill="#FFE67A"/>
+<path d="M8.94328 1.67416C8.68891 0.771387 7.85801 0.10791 6.875 0.10791V4.79541H10C10.3236 4.79541 10.5859 4.53307 10.5859 4.20947V3.42822C10.5859 2.49764 9.8591 1.73365 8.94328 1.67416Z" fill="#FFC336"/>
+</svg>
diff --git a/assets/icons/space_type.svg b/assets/icons/space_type.svg
new file mode 100644
index 00000000..af5f6845
--- /dev/null
+++ b/assets/icons/space_type.svg
@@ -0,0 +1,10 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1.61417 2.15625H0.863281V15.9173H1.61417V2.15625Z" fill="#FCD577"/>
+<path d="M19.6761 20.2188H5.91504V20.9696H19.6761V20.2188Z" fill="#FF6F52"/>
+<path d="M2.47774 2.53177L1.23889 0.541992L0 2.53177H2.47774Z" fill="#FCD577"/>
+<path d="M0 15.5425L1.23889 17.5322L2.47774 15.5425H0Z" fill="#FCD577"/>
+<path d="M19.3018 21.8332L21.2915 20.5944L19.3018 19.3555V21.8332Z" fill="#FF6F52"/>
+<path d="M6.29154 21.8332L4.30176 20.5944L6.29154 19.3555V21.8332Z" fill="#FF6F52"/>
+<path d="M21.2917 1.72397V0.541992H4.30176V17.5319H21.2917V2.97543" fill="#CFDCE5"/>
+<path d="M3.92578 0.166504V17.9073H21.6665V0.166504H3.92578ZM20.9157 10.1588V17.1564H10.1888V14.9644H9.438V17.1564H4.67662V0.917389H9.438V9.40788V10.1588V13.0121H10.1889V10.1588H17.247V9.40788H10.1889V0.917389H20.9157V9.40788H19.0493V10.1588H20.9157Z" fill="#415E72"/>
+</svg>
diff --git a/assets/icons/spatial_motion_value.svg b/assets/icons/spatial_motion_value.svg
new file mode 100644
index 00000000..018da674
--- /dev/null
+++ b/assets/icons/spatial_motion_value.svg
@@ -0,0 +1,18 @@
+<svg width="22" height="20" viewBox="0 0 22 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8333 1.71851L0.472669 15.9196C-0.702346 17.5301 0.447998 19.7934 2.44166 19.7934H19.225C21.2187 19.7934 22.369 17.5301 21.194 15.9196L10.8333 1.71851Z" fill="#F1FAFF"/>
+<path d="M21.1931 15.9183L10.8333 1.71851L9.06055 4.14839L17.6475 15.9183C18.8229 17.5294 17.6722 19.7933 15.6779 19.7933H19.2235C21.2178 19.7934 22.3685 17.5294 21.1931 15.9183Z" fill="#C7EEFB"/>
+<path d="M12.9102 6.05994H8.76926C7.63838 6.05994 6.72168 5.14319 6.72168 4.01236V2.12199C6.72168 2.00515 6.81643 1.9104 6.93327 1.9104H14.7463C14.8631 1.9104 14.9579 2.00515 14.9579 2.12199V4.01236C14.9579 5.14319 14.0411 6.05994 12.9102 6.05994Z" fill="#E0DDE2"/>
+<path d="M14.748 1.9104H13.5893V2.63688C13.5893 3.77034 12.6704 4.6892 11.537 4.6892H7.40546C7.19886 4.6892 6.99959 4.65835 6.81152 4.6016C7.06628 5.44539 7.84934 6.05998 8.77624 6.05998H12.9078C14.0412 6.05998 14.9601 5.14112 14.9601 4.00766V2.12246C14.9601 2.00536 14.8651 1.9104 14.748 1.9104Z" fill="#C8C1C9"/>
+<path d="M16.3024 2.66033H5.37858C5.26174 2.66033 5.16699 2.56558 5.16699 2.44874V0.41838C5.16699 0.301538 5.26174 0.206787 5.37858 0.206787H16.3024C16.4192 0.206787 16.514 0.301538 16.514 0.41838V2.44874C16.514 2.56562 16.4193 2.66033 16.3024 2.66033Z" fill="#E0DDE2"/>
+<path d="M16.3019 0.206787H15.0629V0.997127C15.0629 1.11426 14.9679 1.20923 14.8508 1.20923H5.16699V2.44827C5.16699 2.56541 5.26195 2.66037 5.37909 2.66037H16.3019C16.4191 2.66037 16.514 2.56541 16.514 2.44827V0.418887C16.514 0.30175 16.4191 0.206787 16.3019 0.206787Z" fill="#C8C1C9"/>
+<path d="M10.841 4.82612C11.141 4.82612 11.3842 4.58293 11.3842 4.28294C11.3842 3.98294 11.141 3.73975 10.841 3.73975C10.541 3.73975 10.2979 3.98294 10.2979 4.28294C10.2979 4.58293 10.541 4.82612 10.841 4.82612Z" fill="#FA2A3B"/>
+<path d="M10.7136 10.2642C11.2545 10.2642 11.6929 9.82577 11.6929 9.28494C11.6929 8.7441 11.2545 8.30566 10.7136 8.30566C10.1728 8.30566 9.73438 8.7441 9.73438 9.28494C9.73438 9.82577 10.1728 10.2642 10.7136 10.2642Z" fill="#62D8F9"/>
+<path d="M10.7138 8.30542C10.6442 8.30542 10.5762 8.31283 10.5107 8.32662C10.9541 8.42014 11.2869 8.81349 11.2869 9.28469C11.2869 9.7559 10.9541 10.1492 10.5107 10.2428C10.5763 10.2566 10.6442 10.264 10.7138 10.264C11.2546 10.264 11.6931 9.82551 11.6931 9.28469C11.6931 8.74387 11.2547 8.30542 10.7138 8.30542Z" fill="#00BEF7"/>
+<path d="M14.1217 13.3878L12.4086 13.1093L11.4778 11.3114C11.3944 11.1233 11.2634 10.8659 10.9741 10.7797L9.88702 10.4535C9.76776 10.4245 9.65308 10.4138 9.4497 10.4457L7.13145 10.9842C6.99264 11.0164 6.86865 11.0944 6.7794 11.2054L5.54163 12.746C5.32157 13.02 5.3652 13.4204 5.63913 13.6405C5.75661 13.7349 5.89736 13.7808 6.03718 13.7808C6.22338 13.7808 6.40789 13.6995 6.53357 13.543L7.6336 12.1739L8.72165 11.9212L8.08273 14.0505C8.07045 14.0863 8.06652 14.1326 8.04896 14.2338L7.68849 16.7926L6.00734 18.2512C5.74192 18.4815 5.71344 18.8834 5.94374 19.1488C6.06959 19.2938 6.24657 19.368 6.4246 19.368C6.57238 19.368 6.72087 19.3168 6.84127 19.2124L8.70227 17.5977C8.81826 17.4971 8.89393 17.358 8.91534 17.2059L9.21009 15.1137L9.24932 15.1255L10.8419 16.9842L11.7847 19.0311C11.892 19.264 12.1223 19.4013 12.363 19.4013C12.452 19.4013 12.5425 19.3825 12.6287 19.3428C12.9479 19.1958 13.0874 18.8179 12.9405 18.4987L11.9606 16.3713C11.936 16.3179 11.9042 16.2682 11.8659 16.2236L10.5325 14.6674L10.9911 13.1391L11.4257 13.9786C11.5183 14.1574 11.69 14.2818 11.8886 14.3141L13.9174 14.6439C13.952 14.6495 13.9864 14.6522 14.0203 14.6522C14.3267 14.6522 14.5968 14.4302 14.6475 14.118C14.7039 13.771 14.4685 13.4442 14.1217 13.3878Z" fill="#62D8F9"/>
+<path d="M8.99707 10.5509C9.20045 10.519 9.31454 10.5319 9.4338 10.5609L10.5209 10.8871C10.8102 10.9732 10.9411 11.2307 11.0245 11.4187L12.0585 13.427C12.085 13.4785 12.1345 13.5142 12.1917 13.523L14.645 13.9015C14.5979 13.6442 14.3947 13.4322 14.1218 13.3878L12.4088 13.1093L11.4779 11.3114C11.3945 11.1233 11.2635 10.8659 10.9742 10.7797L9.88716 10.4535C9.7679 10.4245 9.65322 10.4138 9.44984 10.4457L8.99707 10.5509Z" fill="#00BEF7"/>
+<path d="M11.9615 16.371C11.9369 16.3176 11.905 16.2679 11.8667 16.2233L10.5333 14.6671L10.9919 13.1391L10.9337 13.0266C10.8579 12.8802 10.6424 12.9003 10.595 13.0583L10.1416 14.5691C10.1032 14.6971 10.1325 14.8358 10.2194 14.9372L11.4134 16.3307C11.4516 16.3753 11.4835 16.4251 11.5081 16.4784L12.4879 18.6058C12.6191 18.8907 12.5216 19.2219 12.2723 19.3943C12.3025 19.3987 12.3331 19.401 12.3638 19.401C12.4528 19.401 12.5433 19.3822 12.6295 19.3425C12.9487 19.1955 13.0882 18.8176 12.9413 18.4985L11.9615 16.371Z" fill="#00BEF7"/>
+<path d="M3.47827 18.4408C3.31064 18.4408 3.17032 18.3097 3.16092 18.1403C3.08839 16.8332 4.09282 15.7107 5.39991 15.6381C5.57574 15.6291 5.72551 15.7627 5.7352 15.9381C5.74493 16.1135 5.61065 16.2637 5.4352 16.2734C4.47834 16.3266 3.74305 17.1483 3.79616 18.105C3.8059 18.2805 3.67162 18.4306 3.49617 18.4403C3.4902 18.4406 3.48419 18.4408 3.47827 18.4408Z" fill="#00BEF7"/>
+<path d="M4.76838 18.4541C4.60076 18.4541 4.46044 18.3231 4.45104 18.1536C4.41524 17.5088 4.91082 16.9549 5.5557 16.9192C5.73081 16.9095 5.88121 17.0438 5.89094 17.2192C5.90068 17.3947 5.76636 17.5447 5.59091 17.5545C5.29634 17.5708 5.06994 17.8238 5.08627 18.1185C5.09601 18.2939 4.96169 18.444 4.78624 18.4537C4.78032 18.454 4.77431 18.4541 4.76838 18.4541Z" fill="#00BEF7"/>
+<path d="M17.0106 13.6224C17.0076 13.6224 17.0046 13.6223 17.0016 13.6222C16.826 13.6173 16.6876 13.471 16.6925 13.2954C16.7191 12.3374 15.9615 11.5363 15.0036 11.5097C14.828 11.5048 14.6896 11.3584 14.6945 11.1828C14.6994 11.0072 14.8466 10.8688 15.0213 10.8737C16.3299 10.9101 17.365 12.0044 17.3285 13.3131C17.3237 13.4857 17.1822 13.6224 17.0106 13.6224Z" fill="#00BEF7"/>
+<path d="M15.7216 13.6711C15.7186 13.6711 15.7156 13.6711 15.7126 13.671C15.537 13.6661 15.3986 13.5197 15.4035 13.3441C15.4075 13.2013 15.3555 13.0654 15.2574 12.9615C15.1591 12.8577 15.0263 12.7983 14.8835 12.7943C14.7079 12.7894 14.5695 12.6431 14.5743 12.4675C14.5793 12.2919 14.724 12.1531 14.9012 12.1583C15.214 12.1671 15.5046 12.2971 15.7196 12.5244C15.9346 12.7517 16.0482 13.0491 16.0395 13.3619C16.0346 13.5344 15.8932 13.6711 15.7216 13.6711Z" fill="#00BEF7"/>
+</svg>
diff --git a/assets/icons/spatial_static_value.svg b/assets/icons/spatial_static_value.svg
new file mode 100644
index 00000000..95ca6112
--- /dev/null
+++ b/assets/icons/spatial_static_value.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.7715 21.8328C16.7205 21.8328 21.5431 16.9829 21.5431 11.0003C21.5431 5.01761 16.7205 0.167725 10.7715 0.167725C4.82259 0.167725 0 5.01761 0 11.0003C0 16.9829 4.82259 21.8328 10.7715 21.8328Z" fill="#B3CEEC"/>
+<path d="M9.41996 16.2738H7.27293C7.10438 16.2738 6.96777 16.1371 6.96777 15.9686V6.03098C6.96777 5.86243 7.10442 5.72583 7.27293 5.72583H9.41996C9.58851 5.72583 9.72511 5.86247 9.72511 6.03098V15.9686C9.72511 16.1372 9.58851 16.2738 9.41996 16.2738Z" fill="#5F99D7"/>
+<path d="M14.3946 16.2738H12.2475C12.079 16.2738 11.9424 16.1371 11.9424 15.9686V6.03098C11.9424 5.86243 12.079 5.72583 12.2475 5.72583H14.3946C14.5631 5.72583 14.6997 5.86247 14.6997 6.03098V15.9686C14.6997 16.1372 14.5631 16.2738 14.3946 16.2738Z" fill="#5F99D7"/>
+<path d="M10.8332 0.166748C10.584 0.166748 10.3369 0.175931 10.0918 0.19252C15.7289 0.573633 20.1837 5.26629 20.1837 11.0001C20.1837 16.7339 15.7289 21.4265 10.0918 21.8076C10.3369 21.8242 10.584 21.8334 10.8332 21.8334C16.8163 21.8334 21.6666 16.9832 21.6666 11.0001C21.6666 5.01699 16.8163 0.166748 10.8332 0.166748Z" fill="#98BCE5"/>
+</svg>
diff --git a/assets/icons/sports_para.svg b/assets/icons/sports_para.svg
new file mode 100644
index 00000000..6f9d5ece
--- /dev/null
+++ b/assets/icons/sports_para.svg
@@ -0,0 +1,6 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8334 21.8332C7.93969 21.8332 5.21921 20.7063 3.17302 18.6601C1.12688 16.614 0 13.8935 0 10.9999C0 8.10619 1.12688 5.38572 3.17298 3.33953C5.21921 1.29338 7.93961 0.166504 10.8334 0.166504C13.727 0.166504 16.4475 1.29338 18.4936 3.33953C20.5398 5.38572 21.6667 8.10615 21.6667 10.9999C21.6667 13.8936 20.5397 16.614 18.4936 18.6602C16.4475 20.7064 13.727 21.8332 10.8334 21.8332ZM10.8334 3.12028C6.48853 3.12028 2.95378 6.65504 2.95378 10.9999C2.95378 15.3447 6.48853 18.8794 10.8334 18.8794C15.1782 18.8794 18.713 15.3447 18.713 10.9999C18.713 6.65508 15.1781 3.12028 10.8334 3.12028Z" fill="#023DFE" fill-opacity="0.6"/>
+<g opacity="0.1">
+<path d="M5.14215 18.6601C3.09605 16.614 1.96917 13.8935 1.96917 10.9998C1.96917 8.10615 3.09605 5.38567 5.14215 3.33957C6.95445 1.52727 9.29585 0.436914 11.8179 0.211149C11.4924 0.18195 11.1641 0.166504 10.8334 0.166504C7.93969 0.166504 5.21921 1.29338 3.17302 3.33953C1.12688 5.38563 0 8.10615 0 10.9998C0 13.8934 1.12688 16.614 3.17298 18.6601C5.21913 20.7062 7.93961 21.8332 10.8333 21.8332C11.164 21.8332 11.4924 21.8177 11.8179 21.7886C9.29585 21.5628 6.95449 20.4724 5.14215 18.6601Z" fill="black"/>
+</g>
+</svg>
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index d9788ee8..7bcd1484 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -428,6 +428,24 @@ class Assets {
     static const String IlluminanceIcon = 'assets/icons/Illuminance_icon.svg';
     static const String gear = 'assets/icons/gear.svg';
     static const String activeBell='assets/icons/active_bell.svg';
-
-
+    static const String cpsCustomMode = 'assets/icons/cps_custom_mode.svg';
+    static const String cpsMode1 = 'assets/icons/cps_mode1.svg';
+    static const String cpsMode2 = 'assets/icons/cps_mode2.svg';
+    static const String cpsMode3 = 'assets/icons/cps_mode3.svg';
+    static const String cpsMode4 = 'assets/icons/cps_mode4.svg';
+    static const String closeToMotion = 'assets/icons/close_to_motion.svg';
+    static const String farAwayMotion = 'assets/icons/far_away_motion.svg';
+    static const String communicationFault = 'assets/icons/communication_fault.svg';
+    static const String radarFault = 'assets/icons/radar_fault.svg';
+    static const String selfTestingSuccess = 'assets/icons/self_testing_success.svg';
+    static const String selfTestingFailure = 'assets/icons/self_testing_failure.svg';
+    static const String selfTestingTimeout = 'assets/icons/self_testing_timeout.svg';
+    static const String movingSpeed = 'assets/icons/moving_speed.svg';
+    static const String boundary = 'assets/icons/boundary.svg';
+    static const String motionMeter = 'assets/icons/motion_meter.svg';
+    static const String spatialStaticValue = 'assets/icons/spatial_static_value.svg';
+    static const String spatialMotionValue = 'assets/icons/spatial_motion_value.svg';
+    static const String presenceJudgementThrshold = 'assets/icons/presence_judgement_threshold.svg';
+    static const String spaceType = 'assets/icons/space_type.svg';
+    static const String sportsPara = 'assets/icons/sports_para.svg';
 }

From cd9ed5861a8ebacd71fbea6bb75b8d3ca3d6361c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 15:40:44 +0300
Subject: [PATCH 060/238] Implemented some operations for the cps feature.

---
 .../ceiling_presence_sensor_functions.dart    | 635 ++++++++++++++++++
 1 file changed, 635 insertions(+)
 create mode 100644 lib/pages/routines/models/ceiling_presence_sensor_functions.dart

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
new file mode 100644
index 00000000..5bd15e66
--- /dev/null
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -0,0 +1,635 @@
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class CpsOperationalValue {
+  final String icon;
+  final String description;
+  final dynamic value;
+
+  CpsOperationalValue({
+    required this.icon,
+    required this.description,
+    required this.value,
+  });
+}
+
+abstract class CpsFunctions extends DeviceFunction<CpsOperationalValue> {
+  CpsFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+    required this.type,
+  });
+
+  final String type;
+
+  List<CpsOperationalValue> getOperationalValues();
+}
+
+final class CpsRadarSwitchFunction extends CpsFunctions {
+  CpsRadarSwitchFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'radar_switch',
+          operationName: 'Radar Switch',
+          icon: Assets.acPower,
+        );
+
+  @override
+  List<CpsOperationalValue> getOperationalValues() => [
+        CpsOperationalValue(
+          icon: Assets.assetsAcPower,
+          description: "ON",
+          value: true,
+        ),
+        CpsOperationalValue(
+          icon: Assets.assetsAcPowerOFF,
+          description: "OFF",
+          value: false,
+        ),
+      ];
+}
+
+final class CpsSpatialParameterSwitchFunction extends CpsFunctions {
+  CpsSpatialParameterSwitchFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'space_para_switch',
+          operationName: 'Spatial Parameter Switch',
+          icon: Assets.acPower,
+        );
+
+  @override
+  List<CpsOperationalValue> getOperationalValues() => [
+        CpsOperationalValue(
+          icon: Assets.assetsAcPower,
+          description: "ON",
+          value: true,
+        ),
+        CpsOperationalValue(
+          icon: Assets.assetsAcPowerOFF,
+          description: "OFF",
+          value: false,
+        ),
+      ];
+}
+
+final class CpsSensitivityFunction extends CpsFunctions {
+  CpsSensitivityFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 1,
+        max = 10,
+        step = 1,
+        scale = 0,
+        super(
+          code: 'far_detection',
+          operationName: 'Far Detection',
+          icon: Assets.sensitivity,
+        );
+
+  final int min;
+  final int max;
+  final int step;
+  final int scale;
+
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    final values = <CpsOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(
+        CpsOperationalValue(
+          icon: Assets.sensitivity,
+          description: '$value',
+          value: value,
+        ),
+      );
+    }
+    return values;
+  }
+}
+
+final class CpsMovingSpeedFunction extends CpsFunctions {
+  CpsMovingSpeedFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.speedoMeter,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [];
+  }
+}
+
+final class CpsSpatialStaticValueFunction extends CpsFunctions {
+  CpsSpatialStaticValueFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.spatialStaticValue,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsSpatialMotionValueFunction extends CpsFunctions {
+  CpsSpatialMotionValueFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.spatialMotionValue,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
+  CpsMaxDistanceOfDetectionFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.currentDistanceIcon,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
+  CpsMaxDistanceOfStaticDetectionFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.currentDistanceIcon,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsDetectionRangeFunction extends CpsFunctions {
+  CpsDetectionRangeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.farDetection,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
+  CpsDistanceOfMovingObjectsFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.currentDistanceIcon,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
+  CpsPresenceJudgementThrsholdFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.presenceJudgementThrshold,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
+  CpsMotionAmplitudeTriggerThresholdFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.presenceJudgementThrshold,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsPerpetualBoundaryFunction extends CpsFunctions {
+  CpsPerpetualBoundaryFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.boundary,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+
+
+final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
+  CpsMotionTriggerBoundaryFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.motionMeter,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+final class CpsMotionTriggerTimeFunction extends CpsFunctions {
+  CpsMotionTriggerTimeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.motionMeter,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+final class CpsMotionToStaticTimeFunction extends CpsFunctions {
+  CpsMotionToStaticTimeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.motionMeter,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
+  CpsEnteringNoBodyStateTimeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.motionMeter,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
+
+
+
+final class CpsSelfTestResultFunctions extends CpsFunctions {
+  CpsSelfTestResultFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'self_test_result',
+          operationName: 'Self-Test Result',
+          icon: Assets.selfTestResult,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [
+      CpsOperationalValue(
+        description: 'Self Testing',
+        icon: Assets.selfTestResult,
+        value: 'self_testing',
+      ),
+      CpsOperationalValue(
+        description: 'Self Testing Success',
+        icon: Assets.selfTestingSuccess,
+        value: 'self_testing_success',
+      ),
+      CpsOperationalValue(
+        description: 'Self Testing Failure',
+        icon: Assets.selfTestingFailure,
+        value: 'self_testing_failure',
+      ),
+      CpsOperationalValue(
+        description: 'Self Testing Timeout',
+        icon: Assets.selfTestingTimeout,
+        value: 'self_testing_timeout',
+      ),
+      CpsOperationalValue(
+        description: 'Communication Fault',
+        icon: Assets.communicationFault,
+        value: 'communication_fault',
+      ),
+    ];
+  }
+}
+
+final class CpsNobodyTimeFunction extends CpsFunctions {
+  CpsNobodyTimeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'nobody_time',
+          operationName: 'Entering Nobody Time',
+          icon: Assets.assetsNobodyTime,
+        );
+
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: 'None',
+        value: 'none',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '10sec',
+        value: '10s',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '30sec',
+        value: '30s',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '1min',
+        value: '1min',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '2min',
+        value: '2min',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '5min',
+        value: '5min',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '10min',
+        value: '10min',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '30min',
+        value: '30min',
+      ),
+      CpsOperationalValue(
+        icon: Assets.assetsNobodyTime,
+        description: '1hour',
+        value: '1hr',
+      ),
+    ];
+  }
+}
+
+final class CpsMovementFunctions extends CpsFunctions {
+  CpsMovementFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'movement',
+          operationName: 'Movement',
+          icon: Assets.motion,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [
+      CpsOperationalValue(
+        description: 'None',
+        icon: Assets.nobodyTime,
+        value: 'none',
+      ),
+      CpsOperationalValue(
+        description: 'Close To',
+        icon: Assets.closeToMotion,
+        value: 'parlour',
+      ),
+      CpsOperationalValue(
+        description: 'Far Away',
+        icon: Assets.farAwayMotion,
+        value: 'far_away',
+      ),
+    ];
+  }
+}
+
+
+final class CpsCustomModeFunction extends CpsFunctions {
+  CpsCustomModeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'custom_mode',
+          operationName: 'Custom Mode',
+          icon: Assets.cpsCustomMode,
+        );
+
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [
+      CpsOperationalValue(
+        icon: Assets.cpsMode1,
+        description: 'Mode 1',
+        value: 'mode1',
+      ),
+      CpsOperationalValue(
+        icon: Assets.cpsMode2,
+        description: 'Mode 2',
+        value: 'mode2',
+      ),
+      CpsOperationalValue(
+        icon: Assets.cpsMode3,
+        description: 'Mode 3',
+        value: 'mode3',
+      ),
+      CpsOperationalValue(
+        icon: Assets.cpsMode4,
+        description: 'Mode 4',
+        value: 'mode4',
+      ),
+    ];
+  }
+}
+
+final class CpsSpaceTypeFunctions extends CpsFunctions {
+  CpsSpaceTypeFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'space_type',
+          operationName: 'Space Type',
+          icon: Assets.spaceType,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [
+      CpsOperationalValue(
+        description: 'Office',
+        icon: Assets.office,
+        value: 'office',
+      ),
+      CpsOperationalValue(
+        description: 'Parlour',
+        icon: Assets.parlour,
+        value: 'parlour',
+      ),
+      CpsOperationalValue(
+        description: 'Bathroom',
+        icon: Assets.bathroom,
+        value: 'bathroom',
+      ),
+      CpsOperationalValue(
+        description: 'Bedroom',
+        icon: Assets.bedroom,
+        value: 'bedroom',
+      ),
+      CpsOperationalValue(
+        description: 'DIY',
+        icon: Assets.dyi,
+        value: 'dyi',
+      ),
+    ];
+  }
+}
+
+class CpsPresenceStatusFunctions extends CpsFunctions {
+  CpsPresenceStatusFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: 'presence_state',
+          operationName: 'Presence Status',
+          icon: Assets.presenceSensor,
+        );
+
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    return [
+      CpsOperationalValue(
+        icon: Assets.nobodyTime,
+        description: 'None',
+        value: 'none',
+      ),
+      CpsOperationalValue(
+        icon: Assets.presenceState,
+        description: 'Presence',
+        value: 'presence',
+      ),
+      CpsOperationalValue(
+        icon: Assets.motion,
+        description: 'Motion',
+        value: 'motion',
+      ),
+    ];
+  }
+}
+
+final class CpsSportsParaFunction extends CpsFunctions {
+  CpsSportsParaFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  }) : super(
+          code: '',
+          operationName: '',
+          icon: Assets.sportsPara,
+        );
+  @override
+  List<CpsOperationalValue> getOperationalValues() {
+    // TODO: implement getOperationalValues
+    throw UnimplementedError();
+  }
+}
\ No newline at end of file

From c1d9846899212b768011b828b2ec73427f48d7ae Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 15:41:21 +0300
Subject: [PATCH 061/238] Enhance CeilingSensorHelper: Add deviceName and
 deviceId parameters to sensor functions

---
 .../ceiling_sensor/ceiling_sensor_helper.dart | 129 ++++++++++++++++++
 1 file changed, 129 insertions(+)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
index 310ca5c4..67083504 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
@@ -2,6 +2,7 @@ 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/models/ceiling_presence_sensor_functions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart';
 
@@ -33,4 +34,132 @@ abstract final class CeilingSensorHelper {
       ),
     );
   }
+
+  static List<DeviceFunction<CpsOperationalValue>> getCeilingSensorFunctions({
+    required String uuid,
+    required String name,
+  }) {
+    return [
+      CpsRadarSwitchFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsSpatialParameterSwitchFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsSensitivityFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMovingSpeedFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsSpatialStaticValueFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsSpatialMotionValueFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsMaxDistanceOfDetectionFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMaxDistanceOfStaticDetectionFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsDetectionRangeFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsDistanceOfMovingObjectsFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsPresenceJudgementThrsholdFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMotionAmplitudeTriggerThresholdFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsPerpetualBoundaryFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMotionTriggerBoundaryFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMotionTriggerTimeFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMotionToStaticTimeFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsEnteringNoBodyStateTimeFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsSelfTestResultFunctions(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsNobodyTimeFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsMovementFunctions(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsCustomModeFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsSpaceTypeFunctions(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'BOTH',
+      ),
+      CpsPresenceStatusFunctions(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+      CpsSportsParaFunction(
+        deviceName: name,
+        deviceId: uuid,
+        type: 'IF',
+      ),
+    ];
+  }
 }

From 120ed85d105c8b1a2c86d16fd7b5fac1d0964f84 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 15:41:28 +0300
Subject: [PATCH 062/238] Add CPS case to device function switch for ceiling
 sensor integration

---
 .../device_managment/all_devices/models/devices_model.dart  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index 2ea085c5..9069f8a3 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/three_gang_switc
 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/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';
 import 'package:syncrow_web/utils/enum/device_types.dart';
 
@@ -337,6 +338,11 @@ SOS
             type: 'BOTH',
           ),
         ];
+      case 'CPS':
+        return CeilingSensorHelper.getCeilingSensorFunctions(
+          uuid: uuid ?? '',
+          name: name ?? '',
+        );
       default:
         return [];
     }

From 3f565788d5c6fa5051c61d54902040de5496d8a4 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 15:42:22 +0300
Subject: [PATCH 063/238] Refactor CeilingSensorDialog to be a StatefulWidget.

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 8820d305..62594d38 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -7,7 +7,7 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
 
-class CeilingSensorDialog extends StatelessWidget {
+class CeilingSensorDialog extends StatefulWidget {
   const CeilingSensorDialog({
     required this.uniqueCustomId,
     required this.functions,
@@ -22,6 +22,11 @@ class CeilingSensorDialog extends StatelessWidget {
   final AllDevicesModel? device;
   final String dialogType;
 
+  @override
+  State<CeilingSensorDialog> createState() => _CeilingSensorDialogState();
+}
+
+class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(

From 6d612398ed96f09d02e5ca79aea864163122f0bd Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 16:41:03 +0300
Subject: [PATCH 064/238] Update operation names in CpsFunctions and add toggle
 codes to CeilingSensorHelper

---
 assets/icons/communication_fault.svg          |  22 +++
 .../ceiling_presence_sensor_functions.dart    |  55 +++----
 .../ceiling_sensor/ceiling_sensor_dialog.dart | 151 +++++++++++++++++-
 .../ceiling_sensor/ceiling_sensor_helper.dart |  11 ++
 4 files changed, 205 insertions(+), 34 deletions(-)
 create mode 100644 assets/icons/communication_fault.svg

diff --git a/assets/icons/communication_fault.svg b/assets/icons/communication_fault.svg
new file mode 100644
index 00000000..e2ab1b40
--- /dev/null
+++ b/assets/icons/communication_fault.svg
@@ -0,0 +1,22 @@
+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M6.72272 14.6122L6.18327 14.354L2.97852 19.0925H6.55507L6.89972 18.8677V14.7744L6.72272 14.6122Z" fill="#407093"/>
+<path d="M6.23049 14.3775L5.01761 13.7969H4.78901L1.35938 18.8679L1.56355 19.0926H3.04156L6.23049 14.3775Z" fill="#365E7D"/>
+<path d="M7.54213 18.8677H2.81285C2.59801 18.8677 2.42383 19.0418 2.42383 19.2567V19.7497C2.42383 19.9645 2.59797 20.1386 2.81277 20.1386H7.54213C7.75698 20.1386 7.93116 19.9645 7.93116 19.7497V19.2567C7.93116 19.0418 7.75698 18.8677 7.54213 18.8677Z" fill="#4A80AA"/>
+<path d="M2.50507 19.7497V19.2567C2.50507 19.0419 2.67925 18.8677 2.89409 18.8677H0.389022C0.174179 18.8677 0 19.0418 0 19.2567V19.7497C0 19.9645 0.174179 20.1386 0.389022 20.1386H2.89405C2.67921 20.1386 2.50507 19.9645 2.50507 19.7497Z" fill="#407093"/>
+<path d="M6.06769 11.5625C5.92211 11.8628 5.83984 12.1995 5.83984 12.5557C5.83984 13.5291 6.44937 14.3595 7.30726 14.688C7.67558 14.5726 8.00285 14.3644 8.26136 14.0903V13.593L6.06769 11.5625Z" fill="#4A80AA"/>
+<path d="M5.88003 12.5635C5.88003 12.2155 5.9605 11.8866 6.10296 11.5934L5.40175 10.9443H5.11722C4.68695 11.3502 4.41797 11.9253 4.41797 12.5635C4.41797 13.7929 5.41461 14.7896 6.64406 14.7896C6.90015 14.7896 7.14573 14.7456 7.37464 14.666C6.50464 14.3633 5.88003 13.5366 5.88003 12.5635Z" fill="#407093"/>
+<path d="M18.8025 0.40287C18.4502 0.0506057 17.8791 0.0506057 17.5268 0.40287L16.666 1.26369V1.37279L17.7404 2.49283L17.9416 2.53931L18.8024 1.67849C19.1547 1.32627 19.1547 0.755135 18.8025 0.40287Z" fill="#FFD086"/>
+<path d="M19.0404 0.82865C19.0028 0.672713 18.9242 0.524628 18.8025 0.40287C18.4502 0.0506057 17.8791 0.0506057 17.5268 0.40287L16.666 1.26369V1.37279L17.2357 1.96662C17.5753 1.61322 17.9125 1.26447 18.0859 1.09107C18.3749 0.802049 18.7971 0.799822 19.0404 0.82865Z" fill="#FFC365"/>
+<path d="M15.8571 2.69561C15.8473 2.69561 15.8373 2.6951 15.8272 2.69413L5.87968 1.71499C5.71378 1.69866 5.59257 1.55097 5.6089 1.38507C5.62522 1.21917 5.773 1.09804 5.93882 1.11425L15.8864 2.09335C16.0522 2.10967 16.1735 2.25737 16.1571 2.42327C16.1418 2.57917 16.0105 2.69561 15.8571 2.69561Z" fill="#365E7D"/>
+<path d="M8.75675 4.55789C8.62288 4.55789 8.50058 4.46812 8.46503 4.33258C8.42273 4.17133 8.51917 4.00633 8.68038 3.96402L15.7804 2.10172C15.9416 2.0595 16.1066 2.15586 16.1489 2.31711C16.1912 2.47832 16.0948 2.64332 15.9336 2.68563L8.83355 4.54793C8.80784 4.55465 8.78206 4.55789 8.75675 4.55789Z" fill="#407093"/>
+<path d="M17.7843 13.6061C17.6308 13.6061 17.4995 13.4895 17.4843 13.3336L16.5112 3.37993C16.495 3.21407 16.6163 3.06641 16.7822 3.05016C16.9481 3.0347 17.0957 3.15532 17.112 3.32122L18.085 13.2749C18.1012 13.4407 17.9799 13.5884 17.814 13.6046C17.804 13.6056 17.7941 13.6061 17.7843 13.6061Z" fill="#365E7D"/>
+<path d="M14.9212 10.781C14.8956 10.781 14.8696 10.7777 14.8437 10.7709C14.6825 10.7281 14.5866 10.5629 14.6293 10.4018L16.519 3.27433C16.5617 3.11315 16.7269 3.01733 16.8881 3.05991C17.0492 3.10265 17.1452 3.26788 17.1025 3.42901L15.2127 10.5565C15.1769 10.6917 15.0548 10.781 14.9212 10.781Z" fill="#407093"/>
+<path d="M15.8027 2.12842L16.6657 1.26541L17.9412 2.54085L17.0782 3.40386L15.8027 2.12842Z" fill="#FFC365"/>
+<path d="M16.4582 2.78031C16.6656 2.56312 16.9895 2.22437 17.3028 1.89867L16.6678 1.26367L15.8047 2.12679L16.4582 2.78031Z" fill="#FFA90F"/>
+<path d="M17.2722 3.89628C17.195 3.89628 17.1177 3.86679 17.0588 3.80788L15.399 2.14805C15.2811 2.03016 15.2811 1.8391 15.399 1.72117C15.5168 1.60336 15.7079 1.60336 15.8258 1.72117L17.4857 3.38101C17.6036 3.4989 17.6036 3.68995 17.4857 3.80788C17.4267 3.86683 17.3495 3.89628 17.2722 3.89628Z" fill="#4A80AA"/>
+<path d="M17.4668 14.1492L7.36085 3.95557C6.02101 6.98032 5.78835 10.2274 6.7914 13.0274C9.56154 15.5262 13.6996 15.9099 17.5091 14.3392L17.4668 14.1492Z" fill="#B5DCFF"/>
+<path d="M7.4139 4.01031L5.09848 1.6748L4.86645 1.6977C3.23512 5.65405 3.71145 9.96509 6.47621 12.7299C6.64367 12.8973 6.81695 13.0562 6.99535 13.207C5.82988 10.4102 6.01929 7.08393 7.4139 4.01031Z" fill="#8BCAFF"/>
+<path d="M18.3911 13.4249L8.14156 3.17529C8.0407 3.19084 7.94359 3.2367 7.86594 3.31435L7.42012 3.76021C7.32437 3.85596 7.27676 3.98099 7.27539 4.1065L17.4925 14.3235C17.6444 14.4755 17.8907 14.4755 18.0426 14.3235L18.3912 13.975C18.5431 13.8231 18.5431 13.5768 18.3911 13.4249Z" fill="#DBEDFF"/>
+<path d="M7.4351 3.76805L7.87162 3.33153C7.95201 3.25114 8.05354 3.20512 8.1583 3.19266L5.78221 0.816572C5.6303 0.664658 5.38401 0.664658 5.23206 0.816572L4.88347 1.16516C4.73155 1.31708 4.73155 1.56337 4.88347 1.71528L7.29295 4.12477C7.28979 3.99602 7.33686 3.86629 7.4351 3.76805Z" fill="#B5DCFF"/>
+<path d="M14.5 10.9887C11.9318 10.9887 9.85 13.0705 9.85 15.6387C9.85 18.2068 11.9318 20.2887 14.5 20.2887C17.0682 20.2887 19.15 18.2068 19.15 15.6387C19.15 13.0705 17.0682 10.9887 14.5 10.9887ZM10.9594 15.6387C10.9594 14.4992 11.4977 13.4855 12.3344 12.8377L15.6926 18.9731C15.3201 19.1064 14.9187 19.1792 14.5 19.1792C12.5446 19.1793 10.9594 17.5941 10.9594 15.6387ZM18.0404 15.6387C18.0404 16.7782 17.5021 17.7919 16.6655 18.4397L13.3073 12.3042C13.6798 12.1709 14.0813 12.0981 14.5 12.0981C16.4554 12.0981 18.0404 13.6833 18.0404 15.6387Z" fill="#FF5A73" stroke="#FF5A73" stroke-width="0.3"/>
+</svg>
diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 5bd15e66..4aa2e650 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -90,8 +90,8 @@ final class CpsSensitivityFunction extends CpsFunctions {
         step = 1,
         scale = 0,
         super(
-          code: 'far_detection',
-          operationName: 'Far Detection',
+          code: 'sensitivity',
+          operationName: 'Sensitivity',
           icon: Assets.sensitivity,
         );
 
@@ -123,7 +123,7 @@ final class CpsMovingSpeedFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Moving Speed',
           icon: Assets.speedoMeter,
         );
   @override
@@ -139,7 +139,7 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Spacial Static Value',
           icon: Assets.spatialStaticValue,
         );
   @override
@@ -149,7 +149,6 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsSpatialMotionValueFunction extends CpsFunctions {
   CpsSpatialMotionValueFunction({
     required super.deviceId,
@@ -157,7 +156,7 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Spatial Motion Value',
           icon: Assets.spatialMotionValue,
         );
   @override
@@ -167,7 +166,6 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
   CpsMaxDistanceOfDetectionFunction({
     required super.deviceId,
@@ -175,7 +173,7 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Maximum Distance Of Detection',
           icon: Assets.currentDistanceIcon,
         );
   @override
@@ -185,7 +183,6 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
   CpsMaxDistanceOfStaticDetectionFunction({
     required super.deviceId,
@@ -193,7 +190,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
   @override
@@ -203,7 +200,6 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsDetectionRangeFunction extends CpsFunctions {
   CpsDetectionRangeFunction({
     required super.deviceId,
@@ -211,7 +207,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
   @override
@@ -221,7 +217,6 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
   CpsDistanceOfMovingObjectsFunction({
     required super.deviceId,
@@ -229,7 +224,7 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Distance Of Moving Objects',
           icon: Assets.currentDistanceIcon,
         );
   @override
@@ -239,7 +234,6 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
   CpsPresenceJudgementThrsholdFunction({
     required super.deviceId,
@@ -247,7 +241,7 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
   @override
@@ -264,7 +258,7 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
   @override
@@ -274,7 +268,6 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsPerpetualBoundaryFunction extends CpsFunctions {
   CpsPerpetualBoundaryFunction({
     required super.deviceId,
@@ -282,7 +275,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
   @override
@@ -292,9 +285,6 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
   }
 }
 
-
-
-
 final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
   CpsMotionTriggerBoundaryFunction({
     required super.deviceId,
@@ -302,7 +292,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
   @override
@@ -312,7 +302,6 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
   }
 }
 
-
 final class CpsMotionTriggerTimeFunction extends CpsFunctions {
   CpsMotionTriggerTimeFunction({
     required super.deviceId,
@@ -320,7 +309,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
   @override
@@ -337,7 +326,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
   @override
@@ -354,7 +343,7 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Entering Nobody State Time',
           icon: Assets.motionMeter,
         );
   @override
@@ -364,8 +353,6 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
   }
 }
 
-
-
 final class CpsSelfTestResultFunctions extends CpsFunctions {
   CpsSelfTestResultFunctions({
     required super.deviceId,
@@ -404,6 +391,11 @@ final class CpsSelfTestResultFunctions extends CpsFunctions {
         icon: Assets.communicationFault,
         value: 'communication_fault',
       ),
+      CpsOperationalValue(
+        description: 'Radar Fault',
+        icon: Assets.radarFault,
+        value: 'radar_fault',
+      ),
     ];
   }
 }
@@ -503,7 +495,6 @@ final class CpsMovementFunctions extends CpsFunctions {
   }
 }
 
-
 final class CpsCustomModeFunction extends CpsFunctions {
   CpsCustomModeFunction({
     required super.deviceId,
@@ -624,7 +615,7 @@ final class CpsSportsParaFunction extends CpsFunctions {
     required super.type,
   }) : super(
           code: '',
-          operationName: '',
+          operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );
   @override
@@ -632,4 +623,4 @@ final class CpsSportsParaFunction extends CpsFunctions {
     // TODO: implement getOperationalValues
     throw UnimplementedError();
   }
-}
\ No newline at end of file
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 62594d38..0f19f204 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -3,9 +3,13 @@ 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/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functions.dart';
 import 'package:syncrow_web/pages/routines/models/device_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_dialog_function_list_tile.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialog_selection_list_tile.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 
 class CeilingSensorDialog extends StatefulWidget {
   const CeilingSensorDialog({
@@ -27,6 +31,20 @@ class CeilingSensorDialog extends StatefulWidget {
 }
 
 class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
+  late final List<CpsFunctions> _cpsFunctions;
+
+  @override
+  void initState() {
+    super.initState();
+
+    _cpsFunctions = widget.functions.whereType<CpsFunctions>().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 AlertDialog(
@@ -56,17 +74,20 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
               mainAxisSize: MainAxisSize.min,
               children: [
                 const DialogHeader('Presence Sensor Condition'),
+                Expanded(child: _buildMainContent(context, state)),
                 DialogFooter(
                   onCancel: () => Navigator.pop(context),
                   onConfirm: state.addedFunctions.isNotEmpty
                       ? () {
                           context.read<RoutineBloc>().add(
                                 AddFunctionToRoutine(
-                                    state.addedFunctions, '{uniqueCustomId}'),
+                                  state.addedFunctions,
+                                  '${widget.uniqueCustomId}',
+                                ),
                               );
 
                           Navigator.pop(context, {
-                            // 'deviceId': functions.first.deviceId,
+                            'deviceId': widget.functions.first.deviceId,
                           });
                         }
                       : null,
@@ -79,4 +100,130 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       ),
     );
   }
+
+  Widget _buildMainContent(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedOperationName = state.selectedOperationName;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
+    final selectedCpsFunctions = _cpsFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+      orElse: () => CpsMovementFunctions(
+        deviceId: '',
+        deviceName: '',
+        type: '',
+      ),
+    );
+    final operations = selectedCpsFunctions.getOperationalValues();
+
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        CpsFunctionsList(cpsFunctions: _cpsFunctions),
+        if (state.selectedFunction != null)
+          Expanded(
+            child: CpsDialogValueSelector(
+              operations: operations,
+              selectedFunction: selectedFunction ?? '',
+              selectedFunctionData: selectedFunctionData,
+              cpsFunctions: _cpsFunctions,
+              operationName: selectedOperationName ?? '',
+              device: widget.device,
+            ),
+          ),
+      ],
+    );
+  }
+}
+
+class CpsFunctionsList extends StatelessWidget {
+  const CpsFunctionsList({required this.cpsFunctions, super.key});
+
+  final List<CpsFunctions> cpsFunctions;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 360,
+      child: ListView.separated(
+        shrinkWrap: false,
+        itemCount: cpsFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = cpsFunctions[index];
+          return RoutineDialogFunctionListTile(
+            iconPath: function.icon,
+            operationName: function.operationName,
+            onTap: () => context.read<FunctionBloc>().add(
+                  SelectFunction(
+                    functionCode: function.code,
+                    operationName: function.operationName,
+                  ),
+                ),
+          );
+        },
+      ),
+    );
+  }
+}
+
+class CpsDialogValueSelector extends StatelessWidget {
+  const CpsDialogValueSelector({
+    required this.operations,
+    required this.selectedFunction,
+    required this.selectedFunctionData,
+    required this.cpsFunctions,
+    required this.device,
+    required this.operationName,
+    super.key,
+  });
+
+  final List<CpsOperationalValue> operations;
+  final String selectedFunction;
+  final DeviceFunctionData? selectedFunctionData;
+  final List<CpsFunctions> cpsFunctions;
+  final AllDevicesModel? device;
+  final String operationName;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      itemCount: operations.length,
+      itemBuilder: (context, index) {
+        final operation = operations[index];
+        final isSelected = selectedFunctionData?.value == operation.value;
+        return RoutineDialogSelectionListTile(
+          iconPath: operation.icon,
+          description: operation.description,
+          isSelected: isSelected,
+          onTap: () {
+            if (!isSelected) {
+              context.read<FunctionBloc>().add(
+                    AddFunction(
+                      functionData: DeviceFunctionData(
+                        entityId: device?.uuid ?? '',
+                        functionCode: selectedFunction,
+                        operationName: operationName,
+                        value: operation.value,
+                        condition: selectedFunctionData?.condition,
+                        valueDescription: selectedFunctionData?.valueDescription,
+                      ),
+                    ),
+                  );
+            }
+          },
+        );
+      },
+    );
+  }
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
index 67083504..291c2f81 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
@@ -162,4 +162,15 @@ abstract final class CeilingSensorHelper {
       ),
     ];
   }
+
+  static const toggleCodes = <String>{
+    'radar_switch',
+    'space_para_switch',
+    'self_test_result',
+    'nobody_time',
+    'movement',
+    'custom_mode',
+    'space_type',
+    'presence_state',
+  };
 }

From 627ff4e9294d2a1daf82d56a4bde421c03031368 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 9 Apr 2025 17:00:21 +0300
Subject: [PATCH 065/238] Update operation codes and values for various CPS
 functions.

---
 .../ceiling_presence_sensor_functions.dart    | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 4aa2e650..5408ccd0 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -122,7 +122,7 @@ final class CpsMovingSpeedFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'moving_speed',
           operationName: 'Moving Speed',
           icon: Assets.speedoMeter,
         );
@@ -138,7 +138,7 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'spatial_static_value',
           operationName: 'Spacial Static Value',
           icon: Assets.spatialStaticValue,
         );
@@ -155,7 +155,7 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'spatial_motion_value',
           operationName: 'Spatial Motion Value',
           icon: Assets.spatialMotionValue,
         );
@@ -172,7 +172,7 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'maximum_distance_of_detection',
           operationName: 'Maximum Distance Of Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -189,7 +189,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'maximum_distance_of_static_detection',
           operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -206,7 +206,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'detection_range',
           operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
@@ -223,7 +223,7 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'distance_of_moving_objects',
           operationName: 'Distance Of Moving Objects',
           icon: Assets.currentDistanceIcon,
         );
@@ -240,7 +240,7 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'presence_judgement_threshold',
           operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -257,7 +257,7 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'motion_amplitude_trigger_threshold',
           operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -274,7 +274,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'perpetual_boundary',
           operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
@@ -291,7 +291,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'motion_trigger_boundary',
           operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
@@ -308,7 +308,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'motion_trigger_time',
           operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
@@ -325,7 +325,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'motion_to_static_time',
           operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
@@ -342,7 +342,7 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'entering_nobody_state_time',
           operationName: 'Entering Nobody State Time',
           icon: Assets.motionMeter,
         );
@@ -369,22 +369,22 @@ final class CpsSelfTestResultFunctions extends CpsFunctions {
       CpsOperationalValue(
         description: 'Self Testing',
         icon: Assets.selfTestResult,
-        value: 'self_testing',
+        value: 'check',
       ),
       CpsOperationalValue(
         description: 'Self Testing Success',
         icon: Assets.selfTestingSuccess,
-        value: 'self_testing_success',
+        value: 'check_success',
       ),
       CpsOperationalValue(
         description: 'Self Testing Failure',
         icon: Assets.selfTestingFailure,
-        value: 'self_testing_failure',
+        value: 'check_failure',
       ),
       CpsOperationalValue(
         description: 'Self Testing Timeout',
         icon: Assets.selfTestingTimeout,
-        value: 'self_testing_timeout',
+        value: 'check_timeout',
       ),
       CpsOperationalValue(
         description: 'Communication Fault',
@@ -614,7 +614,7 @@ final class CpsSportsParaFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: '',
+          code: 'sports_para',
           operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );

From 729080ec4e7c2416d5de0c8fca708912163a4bdd Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 10:11:12 +0300
Subject: [PATCH 066/238] Refactor CPS function codes to use helper methods for
 consistency and clarity

---
 .../ceiling_presence_sensor_functions.dart    | 49 ++++++++++---------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 5408ccd0..0a03a803 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -1,6 +1,11 @@
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
+extension _Helper on String { 
+  String get correct => this;
+  String get wrong => this;
+}
+
 class CpsOperationalValue {
   final String icon;
   final String description;
@@ -34,7 +39,7 @@ final class CpsRadarSwitchFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'radar_switch',
+          code: 'radar_switch'.correct,
           operationName: 'Radar Switch',
           icon: Assets.acPower,
         );
@@ -60,7 +65,7 @@ final class CpsSpatialParameterSwitchFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'space_para_switch',
+          code: 'space_para_switch'.correct,
           operationName: 'Spatial Parameter Switch',
           icon: Assets.acPower,
         );
@@ -90,7 +95,7 @@ final class CpsSensitivityFunction extends CpsFunctions {
         step = 1,
         scale = 0,
         super(
-          code: 'sensitivity',
+          code: 'sensitivity'.correct,
           operationName: 'Sensitivity',
           icon: Assets.sensitivity,
         );
@@ -138,7 +143,7 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'spatial_static_value',
+          code: 'space_static_val'.correct,
           operationName: 'Spacial Static Value',
           icon: Assets.spatialStaticValue,
         );
@@ -155,7 +160,7 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'spatial_motion_value',
+          code: 'space_move_val'.correct,
           operationName: 'Spatial Motion Value',
           icon: Assets.spatialMotionValue,
         );
@@ -172,7 +177,7 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'maximum_distance_of_detection',
+          code: 'moving_max_dis'.correct, 
           operationName: 'Maximum Distance Of Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -189,7 +194,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'maximum_distance_of_static_detection',
+          code: 'static_max_dis'.correct,
           operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -206,7 +211,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'detection_range',
+          code: 'moving_range'.correct,
           operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
@@ -223,7 +228,7 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'distance_of_moving_objects',
+          code: 'presence_range'.correct,
           operationName: 'Distance Of Moving Objects',
           icon: Assets.currentDistanceIcon,
         );
@@ -240,7 +245,7 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'presence_judgement_threshold',
+          code: 'presence_judgement_threshold'.wrong,
           operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -257,7 +262,7 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'motion_amplitude_trigger_threshold',
+          code: 'motion_amplitude_trigger_threshold'.wrong,
           operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -274,7 +279,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'perpetual_boundary',
+          code: 'perceptual_boundary'.correct,
           operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
@@ -291,7 +296,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'motion_trigger_boundary',
+          code: 'moving_boundary'.correct,
           operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
@@ -308,7 +313,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'motion_trigger_time',
+          code: 'moving_rigger_time'.correct,
           operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
@@ -325,7 +330,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'motion_to_static_time',
+          code: 'moving_static_time'.correct,
           operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
@@ -342,7 +347,7 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'entering_nobody_state_time',
+          code: 'none_body_time',
           operationName: 'Entering Nobody State Time',
           icon: Assets.motionMeter,
         );
@@ -359,7 +364,7 @@ final class CpsSelfTestResultFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'self_test_result',
+          code: 'checking_result'.correct,
           operationName: 'Self-Test Result',
           icon: Assets.selfTestResult,
         );
@@ -406,7 +411,7 @@ final class CpsNobodyTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'nobody_time',
+          code: 'nobody_time'.correct,
           operationName: 'Entering Nobody Time',
           icon: Assets.assetsNobodyTime,
         );
@@ -469,7 +474,7 @@ final class CpsMovementFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'movement',
+          code: 'body_movement'.correct,
           operationName: 'Movement',
           icon: Assets.motion,
         );
@@ -539,7 +544,7 @@ final class CpsSpaceTypeFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'space_type',
+          code: 'scene'.correct,
           operationName: 'Space Type',
           icon: Assets.spaceType,
         );
@@ -581,7 +586,7 @@ class CpsPresenceStatusFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'presence_state',
+          code: 'presence_state'.correct,
           operationName: 'Presence Status',
           icon: Assets.presenceSensor,
         );
@@ -614,7 +619,7 @@ final class CpsSportsParaFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'sports_para',
+          code: 'sports_para'.correct,
           operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );

From 7c68b90aef070aeb01fb43d2d15704dc312d700e Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 10:59:43 +0300
Subject: [PATCH 067/238] Refactor CPS functions to implement operational value
 generation with min, max, and step parameters.

---
 .../ceiling_presence_sensor_functions.dart    | 347 +++++++++++++++---
 1 file changed, 298 insertions(+), 49 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 0a03a803..f10b0ece 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -1,7 +1,7 @@
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-extension _Helper on String { 
+extension _Helper on String {
   String get correct => this;
   String get wrong => this;
 }
@@ -93,7 +93,6 @@ final class CpsSensitivityFunction extends CpsFunctions {
   })  : min = 1,
         max = 10,
         step = 1,
-        scale = 0,
         super(
           code: 'sensitivity'.correct,
           operationName: 'Sensitivity',
@@ -103,7 +102,6 @@ final class CpsSensitivityFunction extends CpsFunctions {
   final int min;
   final int max;
   final int step;
-  final int scale;
 
   @override
   List<CpsOperationalValue> getOperationalValues() {
@@ -126,14 +124,29 @@ final class CpsMovingSpeedFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0,
+        max = 32,
+        step = 1,
+        super(
           code: 'moving_speed',
           operationName: 'Moving Speed',
           icon: Assets.speedoMeter,
         );
+
+  final int min;
+  final int max;
+  final int step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    return [];
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => CpsOperationalValue(
+        icon: Assets.speedoMeter,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
   }
 }
 
@@ -142,15 +155,29 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0,
+        max = 255,
+        step = 1,
+        super(
           code: 'space_static_val'.correct,
           operationName: 'Spacial Static Value',
           icon: Assets.spatialStaticValue,
         );
+
+  final int min;
+  final int max;
+  final int step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => CpsOperationalValue(
+        icon: Assets.spatialStaticValue,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
   }
 }
 
@@ -159,15 +186,29 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0,
+        max = 255,
+        step = 1,
+        super(
           code: 'space_move_val'.correct,
           operationName: 'Spatial Motion Value',
           icon: Assets.spatialMotionValue,
         );
+
+  final int min;
+  final int max;
+  final int step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => CpsOperationalValue(
+        icon: Assets.spatialMotionValue,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
   }
 }
 
@@ -176,15 +217,33 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
-          code: 'moving_max_dis'.correct, 
+  })  : min = 0.0,
+        max = 10.0,
+        step = 0.5,
+        super(
+          code: 'moving_max_dis'.correct,
           operationName: 'Maximum Distance Of Detection',
           icon: Assets.currentDistanceIcon,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.currentDistanceIcon,
+          description: '${value.toStringAsFixed(1)}M',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -193,15 +252,33 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 10.0,
+        step = 0.5,
+        super(
           code: 'static_max_dis'.correct,
           operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.currentDistanceIcon,
+          description: '${value.toStringAsFixed(1)}M',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -210,15 +287,33 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 25.5,
+        step = 0.1,
+        super(
           code: 'moving_range'.correct,
           operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.farDetection,
+          description: '${value.toStringAsFixed(1)}M',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -227,15 +322,33 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 25.5,
+        step = 0.1,
+        super(
           code: 'presence_range'.correct,
           operationName: 'Distance Of Moving Objects',
           icon: Assets.currentDistanceIcon,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.currentDistanceIcon,
+          description: '${value.toStringAsFixed(1)}M',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -244,15 +357,29 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0,
+        max = 255,
+        step = 5,
+        super(
           code: 'presence_judgement_threshold'.wrong,
           operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
+
+  final int min;
+  final int max;
+  final int step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => CpsOperationalValue(
+        icon: Assets.presenceJudgementThrshold,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
   }
 }
 
@@ -261,15 +388,29 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0,
+        max = 255,
+        step = 5,
+        super(
           code: 'motion_amplitude_trigger_threshold'.wrong,
           operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
+
+  final int min;
+  final int max;
+  final int step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    return List.generate(
+      (max - min) ~/ step + 1,
+      (index) => CpsOperationalValue(
+        icon: Assets.presenceJudgementThrshold,
+        description: '${min + (index * step)}',
+        value: min + (index * step),
+      ),
+    );
   }
 }
 
@@ -278,15 +419,33 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.00,
+        max = 5.00,
+        step = 0.50,
+        super(
           code: 'perceptual_boundary'.correct,
           operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.boundary,
+          description: '${value.toStringAsFixed(1)}M',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -295,15 +454,33 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 5.0,
+        step = 0.5,
+        super(
           code: 'moving_boundary'.correct,
           operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.motionMeter,
+          description: '${value.toStringAsFixed(1)}M',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -312,15 +489,33 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 2.0,
+        step = 0.1,
+        super(
           code: 'moving_rigger_time'.correct,
           operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.motionMeter,
+          description: '${value.toStringAsFixed(3)}sec',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -329,15 +524,33 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 50.0,
+        step = 1.0,
+        super(
           code: 'moving_static_time'.correct,
           operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.motionMeter,
+          description: '${value.toStringAsFixed(0)}s',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -346,15 +559,33 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 0.0,
+        max = 300.0,
+        step = 5.0,
+        super(
           code: 'none_body_time',
           operationName: 'Entering Nobody State Time',
           icon: Assets.motionMeter,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.motionMeter,
+          description: '${value.toStringAsFixed(0)}sec',
+          value: value,
+        );
+      },
+    );
   }
 }
 
@@ -489,7 +720,7 @@ final class CpsMovementFunctions extends CpsFunctions {
       CpsOperationalValue(
         description: 'Close To',
         icon: Assets.closeToMotion,
-        value: 'parlour',
+        value: 'close_to',
       ),
       CpsOperationalValue(
         description: 'Far Away',
@@ -618,14 +849,32 @@ final class CpsSportsParaFunction extends CpsFunctions {
     required super.deviceId,
     required super.deviceName,
     required super.type,
-  }) : super(
+  })  : min = 1,
+        max = 100,
+        step = 1,
+        super(
           code: 'sports_para'.correct,
           operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );
+
+  final double min;
+  final double max;
+  final double step;
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
-    // TODO: implement getOperationalValues
-    throw UnimplementedError();
+    final count = ((max - min) / step).round() + 1;
+    return List.generate(
+      count,
+      (index) {
+        final value = (min + (index * step));
+        return CpsOperationalValue(
+          icon: Assets.motionMeter,
+          description: value.toStringAsFixed(0),
+          value: value,
+        );
+      },
+    );
   }
 }

From 75b2f964285d15be548d648929b58e5450490b86 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 11:27:02 +0300
Subject: [PATCH 068/238] added spaces in operational value descriptions to
 match figma design.

---
 .../ceiling_presence_sensor_functions.dart       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index f10b0ece..670dd4d4 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -239,7 +239,7 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.currentDistanceIcon,
-          description: '${value.toStringAsFixed(1)}M',
+          description: '${value.toStringAsFixed(1)} M',
           value: value,
         );
       },
@@ -274,7 +274,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.currentDistanceIcon,
-          description: '${value.toStringAsFixed(1)}M',
+          description: '${value.toStringAsFixed(1)} M',
           value: value,
         );
       },
@@ -309,7 +309,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.farDetection,
-          description: '${value.toStringAsFixed(1)}M',
+          description: '${value.toStringAsFixed(1)} M',
           value: value,
         );
       },
@@ -344,7 +344,7 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.currentDistanceIcon,
-          description: '${value.toStringAsFixed(1)}M',
+          description: '${value.toStringAsFixed(1)} M',
           value: value,
         );
       },
@@ -476,7 +476,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.motionMeter,
-          description: '${value.toStringAsFixed(1)}M',
+          description: '${value.toStringAsFixed(1)} M',
           value: value,
         );
       },
@@ -511,7 +511,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.motionMeter,
-          description: '${value.toStringAsFixed(3)}sec',
+          description: '${value.toStringAsFixed(3)} sec',
           value: value,
         );
       },
@@ -546,7 +546,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.motionMeter,
-          description: '${value.toStringAsFixed(0)}s',
+          description: '${value.toStringAsFixed(0)} sec',
           value: value,
         );
       },
@@ -581,7 +581,7 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
         final value = (min + (index * step));
         return CpsOperationalValue(
           icon: Assets.motionMeter,
-          description: '${value.toStringAsFixed(0)}sec',
+          description: '${value.toStringAsFixed(0)} sec',
           value: value,
         );
       },

From 796409600eae71e84a390c1dc1b1eff576002444 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 14:03:08 +0300
Subject: [PATCH 069/238] Update operation codes for
 CpsPresenceJudgementThresholdFunction and
 CpsMotionAmplitudeTriggerThresholdFunction.

---
 .../routines/models/ceiling_presence_sensor_functions.dart    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 670dd4d4..afa5ba5e 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -361,7 +361,7 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
         max = 255,
         step = 5,
         super(
-          code: 'presence_judgement_threshold'.wrong,
+          code: 'presence_reference',
           operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -392,7 +392,7 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
         max = 255,
         step = 5,
         super(
-          code: 'motion_amplitude_trigger_threshold'.wrong,
+          code: 'moving_reference',
           operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );

From 9ca6fb8640d353a17c48730bcfa0fe5d0252b89c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 14:03:44 +0300
Subject: [PATCH 070/238] Remove unnecessary extension methods for operational
 value codes in CPS functions

---
 .../ceiling_presence_sensor_functions.dart    | 43 ++++++++-----------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index afa5ba5e..6e181407 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -1,11 +1,6 @@
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-extension _Helper on String {
-  String get correct => this;
-  String get wrong => this;
-}
-
 class CpsOperationalValue {
   final String icon;
   final String description;
@@ -39,7 +34,7 @@ final class CpsRadarSwitchFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'radar_switch'.correct,
+          code: 'radar_switch',
           operationName: 'Radar Switch',
           icon: Assets.acPower,
         );
@@ -65,7 +60,7 @@ final class CpsSpatialParameterSwitchFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'space_para_switch'.correct,
+          code: 'space_para_switch',
           operationName: 'Spatial Parameter Switch',
           icon: Assets.acPower,
         );
@@ -94,7 +89,7 @@ final class CpsSensitivityFunction extends CpsFunctions {
         max = 10,
         step = 1,
         super(
-          code: 'sensitivity'.correct,
+          code: 'sensitivity',
           operationName: 'Sensitivity',
           icon: Assets.sensitivity,
         );
@@ -159,7 +154,7 @@ final class CpsSpatialStaticValueFunction extends CpsFunctions {
         max = 255,
         step = 1,
         super(
-          code: 'space_static_val'.correct,
+          code: 'space_static_val',
           operationName: 'Spacial Static Value',
           icon: Assets.spatialStaticValue,
         );
@@ -190,7 +185,7 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
         max = 255,
         step = 1,
         super(
-          code: 'space_move_val'.correct,
+          code: 'space_move_val',
           operationName: 'Spatial Motion Value',
           icon: Assets.spatialMotionValue,
         );
@@ -221,7 +216,7 @@ final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
         max = 10.0,
         step = 0.5,
         super(
-          code: 'moving_max_dis'.correct,
+          code: 'moving_max_dis',
           operationName: 'Maximum Distance Of Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -256,7 +251,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
         max = 10.0,
         step = 0.5,
         super(
-          code: 'static_max_dis'.correct,
+          code: 'static_max_dis',
           operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -291,7 +286,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
         max = 25.5,
         step = 0.1,
         super(
-          code: 'moving_range'.correct,
+          code: 'moving_range',
           operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
@@ -326,7 +321,7 @@ final class CpsDistanceOfMovingObjectsFunction extends CpsFunctions {
         max = 25.5,
         step = 0.1,
         super(
-          code: 'presence_range'.correct,
+          code: 'presence_range',
           operationName: 'Distance Of Moving Objects',
           icon: Assets.currentDistanceIcon,
         );
@@ -423,7 +418,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
         max = 5.00,
         step = 0.50,
         super(
-          code: 'perceptual_boundary'.correct,
+          code: 'perceptual_boundary',
           operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
@@ -458,7 +453,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
         max = 5.0,
         step = 0.5,
         super(
-          code: 'moving_boundary'.correct,
+          code: 'moving_boundary',
           operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
@@ -493,7 +488,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
         max = 2.0,
         step = 0.1,
         super(
-          code: 'moving_rigger_time'.correct,
+          code: 'moving_rigger_time',
           operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
@@ -528,7 +523,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
         max = 50.0,
         step = 1.0,
         super(
-          code: 'moving_static_time'.correct,
+          code: 'moving_static_time',
           operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
@@ -595,7 +590,7 @@ final class CpsSelfTestResultFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'checking_result'.correct,
+          code: 'checking_result',
           operationName: 'Self-Test Result',
           icon: Assets.selfTestResult,
         );
@@ -642,7 +637,7 @@ final class CpsNobodyTimeFunction extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'nobody_time'.correct,
+          code: 'nobody_time',
           operationName: 'Entering Nobody Time',
           icon: Assets.assetsNobodyTime,
         );
@@ -705,7 +700,7 @@ final class CpsMovementFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'body_movement'.correct,
+          code: 'body_movement',
           operationName: 'Movement',
           icon: Assets.motion,
         );
@@ -775,7 +770,7 @@ final class CpsSpaceTypeFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'scene'.correct,
+          code: 'scene',
           operationName: 'Space Type',
           icon: Assets.spaceType,
         );
@@ -817,7 +812,7 @@ class CpsPresenceStatusFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'presence_state'.correct,
+          code: 'presence_state',
           operationName: 'Presence Status',
           icon: Assets.presenceSensor,
         );
@@ -853,7 +848,7 @@ final class CpsSportsParaFunction extends CpsFunctions {
         max = 100,
         step = 1,
         super(
-          code: 'sports_para'.correct,
+          code: 'sports_para',
           operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );

From 9d3b58deebe3d4a8c6f12e9a0ec831d7f21a8fc8 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 14:32:09 +0300
Subject: [PATCH 071/238] Refactor wall presence sensor components and add new
 widgets for improved functionality and clarity to ensure reusability in the
 future for other devices.

---
 .../routines/widgets/condition_toggle.dart    |  33 ++
 .../routines/widgets/function_slider.dart     |  26 ++
 .../wall_sensor/wall_presence_sensor.dart     | 353 +-----------------
 .../wps_operational_values_list.dart          | 114 ++++++
 .../wps_value_selector_widget.dart            |  95 +++++
 .../widgets/slider_value_selector.dart        |  67 ++++
 lib/pages/routines/widgets/value_display.dart |  31 ++
 7 files changed, 372 insertions(+), 347 deletions(-)
 create mode 100644 lib/pages/routines/widgets/condition_toggle.dart
 create mode 100644 lib/pages/routines/widgets/function_slider.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_operational_values_list.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
 create mode 100644 lib/pages/routines/widgets/slider_value_selector.dart
 create mode 100644 lib/pages/routines/widgets/value_display.dart

diff --git a/lib/pages/routines/widgets/condition_toggle.dart b/lib/pages/routines/widgets/condition_toggle.dart
new file mode 100644
index 00000000..99ea2f04
--- /dev/null
+++ b/lib/pages/routines/widgets/condition_toggle.dart
@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class ConditionToggle extends StatelessWidget {
+  final String? currentCondition;
+  final void Function(String condition) onChanged;
+
+  const ConditionToggle({
+    required this.onChanged,
+    this.currentCondition,
+    super.key,
+  });
+
+  static const _conditions = ["<", "==", ">"];
+
+  @override
+  Widget build(BuildContext context) {
+    return ToggleButtons(
+      onPressed: (index) => onChanged(_conditions[index]),
+      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(),
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/function_slider.dart b/lib/pages/routines/widgets/function_slider.dart
new file mode 100644
index 00000000..b7fb0d53
--- /dev/null
+++ b/lib/pages/routines/widgets/function_slider.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+
+class FunctionSlider extends StatelessWidget {
+  final dynamic initialValue;
+
+  final (double min, double max) range;
+  final void Function(double value) onChanged;
+
+  const FunctionSlider({
+    required this.onChanged,
+    required this.initialValue,
+    required this.range,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Slider(
+      value: initialValue is int ? initialValue.toDouble() : range.$1,
+      min: range.$1,
+      max: range.$2,
+      divisions: (range.$2 - range.$1).toInt(),
+      onChanged: onChanged,
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index b7733511..91abb34e 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -1,17 +1,16 @@
 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/wps/wps_functions.dart';
-import 'package:syncrow_web/pages/routines/models/wps/wps_operational_value.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/wall_sensor/time_wheel.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
 class WallPresenceSensor extends StatefulWidget {
   final List<DeviceFunction> functions;
@@ -63,8 +62,7 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
   @override
   void initState() {
     super.initState();
-    _wpsFunctions =
-        widget.functions.whereType<WpsFunctions>().where((function) {
+    _wpsFunctions = widget.functions.whereType<WpsFunctions>().where((function) {
       if (widget.dialogType == 'THEN') {
         return function.type == 'THEN' || function.type == 'BOTH';
       }
@@ -176,10 +174,10 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
     );
 
     return Expanded(
-      child: _ValueSelector(
+      child: WpsValueSelectorWidget(
         selectedFunction: selectedFunction,
         functionData: functionData,
-        acFunctions: _wpsFunctions,
+        wpsFunctions: _wpsFunctions,
         device: widget.device,
         dialogType: widget.dialogType!,
         removeComparators: widget.removeComparetors,
@@ -208,342 +206,3 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
     );
   }
 }
-
-class _ValueSelector extends StatelessWidget {
-  final String selectedFunction;
-  final DeviceFunctionData functionData;
-  final List<WpsFunctions> acFunctions;
-  final AllDevicesModel? device;
-  final String dialogType;
-  final bool removeComparators;
-
-  const _ValueSelector({
-    required this.selectedFunction,
-    required this.functionData,
-    required this.acFunctions,
-    required this.device,
-    required this.dialogType,
-    required this.removeComparators,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final selectedFn =
-        acFunctions.firstWhere((f) => f.code == selectedFunction);
-    final values = selectedFn.getOperationalValues();
-
-    if (_isSliderFunction(selectedFunction)) {
-      return _SliderValueSelector(
-        selectedFunction: selectedFunction,
-        functionData: functionData,
-        device: device,
-        dialogType: dialogType,
-      );
-    }
-
-    return _OperationalValuesList(
-      values: values,
-      selectedValue: functionData.value,
-      device: device,
-      operationName: selectedFn.operationName,
-      selectCode: selectedFunction,
-    );
-  }
-
-  bool _isSliderFunction(String function) =>
-      ['dis_current', 'presence_time', 'illuminance_value'].contains(function);
-}
-
-class _SliderValueSelector extends StatelessWidget {
-  final String selectedFunction;
-  final DeviceFunctionData functionData;
-  final AllDevicesModel? device;
-  final String dialogType;
-
-  const _SliderValueSelector({
-    required this.selectedFunction,
-    required this.functionData,
-    required this.device,
-    required this.dialogType,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final initialValue = functionData.value ?? 250;
-    return Column(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        const SizedBox(height: 20),
-        _ConditionToggle(
-          currentCondition: functionData.condition,
-          selectCode: selectedFunction,
-          device: device,
-          operationName: functionData.operationName,
-          selectedValue: functionData.value,
-        ),
-        _ValueDisplay(
-          value: initialValue,
-          functionCode: selectedFunction,
-        ),
-        const SizedBox(height: 20),
-        _FunctionSlider(
-          initialValue: initialValue,
-          functionCode: selectedFunction,
-          functionData: functionData,
-          device: device,
-        ),
-      ],
-    );
-  }
-}
-
-class _ConditionToggle extends StatelessWidget {
-  final String? currentCondition;
-  final String selectCode;
-  final AllDevicesModel? device;
-  final String operationName;
-  final dynamic selectedValue;
-
-  const _ConditionToggle({
-    this.currentCondition,
-    required this.selectCode,
-    this.device,
-    required this.operationName,
-    this.selectedValue,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    const conditions = ["<", "==", ">"];
-    return ToggleButtons(
-      onPressed: (index) => _updateCondition(context, conditions[index]),
-      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(),
-    );
-  }
-
-  void _updateCondition(BuildContext context, String condition) {
-    context.read<FunctionBloc>().add(
-          AddFunction(
-            functionData: DeviceFunctionData(
-              entityId: device?.uuid ?? '',
-              functionCode: selectCode,
-              operationName: operationName,
-              condition: condition,
-              value: selectedValue,
-            ),
-          ),
-        );
-  }
-}
-
-class _ValueDisplay extends StatelessWidget {
-  final dynamic value;
-  final String functionCode;
-
-  const _ValueDisplay({
-    required this.value,
-    required this.functionCode,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
-      decoration: BoxDecoration(
-        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Text(
-        _getDisplayText(),
-        style: context.textTheme.headlineMedium!.copyWith(
-          color: ColorsManager.primaryColorWithOpacity,
-        ),
-      ),
-    );
-  }
-
-  String _getDisplayText() {
-    final intValue = (value as num?)?.toInt() ?? 0;
-    switch (functionCode) {
-      case 'presence_time':
-        return '$intValue Min';
-      case 'dis_current':
-        return '$intValue CM';
-      case 'illuminance_value':
-        return '$intValue Lux';
-      default:
-        return '$intValue';
-    }
-  }
-}
-
-class _FunctionSlider extends StatelessWidget {
-  final dynamic initialValue;
-  final String functionCode;
-  final DeviceFunctionData functionData;
-  final AllDevicesModel? device;
-
-  const _FunctionSlider({
-    required this.initialValue,
-    required this.functionCode,
-    required this.functionData,
-    required this.device,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final (min, max) = _getSliderRange();
-    return Slider(
-      value: initialValue is int ? initialValue.toDouble() : min,
-      min: min,
-      max: max,
-      divisions: (max - min).toInt(),
-      onChanged: (value) => _updateValue(context, value.toInt()),
-    );
-  }
-
-  (double, double) _getSliderRange() {
-    switch (functionCode) {
-      case 'presence_time':
-        return (0, 65535);
-      case 'dis_current':
-        return (1, 600);
-      case 'illuminance_value':
-        return (0, 10000);
-      default:
-        return (200, 300);
-    }
-  }
-
-  void _updateValue(BuildContext context, int value) {
-    context.read<FunctionBloc>().add(
-          AddFunction(
-            functionData: DeviceFunctionData(
-              entityId: device?.uuid ?? '',
-              functionCode: functionCode,
-              operationName: functionData.operationName,
-              value: value,
-              condition: functionData.condition,
-            ),
-          ),
-        );
-  }
-}
-
-class _OperationalValuesList extends StatelessWidget {
-  final List<WpsOperationalValue> values;
-  final dynamic selectedValue;
-  final AllDevicesModel? device;
-  final String operationName;
-  final String selectCode;
-
-  const _OperationalValuesList({
-    required this.values,
-    required this.selectedValue,
-    required this.device,
-    required this.operationName,
-    required this.selectCode,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return operationName == 'Nobody Time'
-        ? _buildTimeWheel(context)
-        : ListView.builder(
-            padding: const EdgeInsets.all(20),
-            itemCount: values.length,
-            itemBuilder: (context, index) =>
-                _buildValueItem(context, values[index]),
-          );
-  }
-
-  Widget _buildTimeWheel(BuildContext context) {
-    final currentTotalSeconds = selectedValue as int? ?? 0;
-    return TimeWheelPicker(
-      initialHours: currentTotalSeconds ~/ 3600,
-      initialMinutes: (currentTotalSeconds % 3600) ~/ 60,
-      initialSeconds: currentTotalSeconds % 60,
-      onTimeChanged: (h, m, s) => _updateTotalSeconds(context, h, m, s),
-    );
-  }
-
-  Widget _buildValueItem(BuildContext context, WpsOperationalValue value) {
-    return Padding(
-      padding: const EdgeInsets.all(8.0),
-      child: Row(
-        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-        children: [
-          _buildValueIcon(context, value),
-          Expanded(child: _buildValueDescription(value)),
-          _buildValueRadio(context, value),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildValueIcon(context, WpsOperationalValue value) {
-    return Column(
-      children: [
-        if (_shouldShowTextDescription)
-          Text(value.description.replaceAll("cm", '')),
-        SvgPicture.asset(value.icon, width: 25, height: 25),
-      ],
-    );
-  }
-
-  bool get _shouldShowTextDescription =>
-      operationName == 'Far Detection' ||
-      operationName == 'Motionless Detection Sensitivity';
-
-  Widget _buildValueDescription(WpsOperationalValue value) {
-    return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 8.0),
-      child: Text(value.description),
-    );
-  }
-
-  Widget _buildValueRadio(context, WpsOperationalValue value) {
-    return Radio<dynamic>(
-      value: value.value,
-      groupValue: selectedValue,
-      onChanged: (_) => _selectValue(context, value.value),
-    );
-  }
-
-  void _selectValue(BuildContext context, dynamic value) {
-    context.read<FunctionBloc>().add(
-          AddFunction(
-            functionData: DeviceFunctionData(
-              entityId: device?.uuid ?? '',
-              functionCode: selectCode,
-              operationName: operationName,
-              value: value,
-            ),
-          ),
-        );
-  }
-
-  void _updateTotalSeconds(BuildContext context, int h, int m, int s) {
-    context.read<FunctionBloc>().add(
-          AddFunction(
-            functionData: DeviceFunctionData(
-              entityId: device?.uuid ?? '',
-              functionCode: selectCode,
-              operationName: operationName,
-              value: h * 3600 + m * 60 + s,
-            ),
-          ),
-        );
-  }
-}
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_operational_values_list.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_operational_values_list.dart
new file mode 100644
index 00000000..6c149cd3
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_operational_values_list.dart
@@ -0,0 +1,114 @@
+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/wps/wps_operational_value.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart';
+
+class WpsOperationalValuesList extends StatelessWidget {
+  final List<WpsOperationalValue> values;
+  final dynamic selectedValue;
+  final AllDevicesModel? device;
+  final String operationName;
+  final String selectCode;
+
+  const WpsOperationalValuesList({
+    required this.values,
+    required this.selectedValue,
+    required this.device,
+    required this.operationName,
+    required this.selectCode,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return operationName == 'Nobody Time'
+        ? _buildTimeWheel(context)
+        : ListView.builder(
+            padding: const EdgeInsets.all(20),
+            itemCount: values.length,
+            itemBuilder: (context, index) => _buildValueItem(context, values[index]),
+          );
+  }
+
+  Widget _buildTimeWheel(BuildContext context) {
+    final currentTotalSeconds = selectedValue as int? ?? 0;
+    return TimeWheelPicker(
+      initialHours: currentTotalSeconds ~/ 3600,
+      initialMinutes: (currentTotalSeconds % 3600) ~/ 60,
+      initialSeconds: currentTotalSeconds % 60,
+      onTimeChanged: (h, m, s) => _updateTotalSeconds(context, h, m, s),
+    );
+  }
+
+  Widget _buildValueItem(BuildContext context, WpsOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          _buildValueIcon(context, value),
+          Expanded(child: _buildValueDescription(value)),
+          _buildValueRadio(context, value),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildValueIcon(context, WpsOperationalValue value) {
+    return Column(
+      children: [
+        if (_shouldShowTextDescription) Text(value.description.replaceAll("cm", '')),
+        SvgPicture.asset(value.icon, width: 25, height: 25),
+      ],
+    );
+  }
+
+  bool get _shouldShowTextDescription =>
+      operationName == 'Far Detection' ||
+      operationName == 'Motionless Detection Sensitivity';
+
+  Widget _buildValueDescription(WpsOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(value.description),
+    );
+  }
+
+  Widget _buildValueRadio(context, WpsOperationalValue value) {
+    return Radio<dynamic>(
+      value: value.value,
+      groupValue: selectedValue,
+      onChanged: (_) => _selectValue(context, value.value),
+    );
+  }
+
+  void _selectValue(BuildContext context, dynamic value) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: selectCode,
+              operationName: operationName,
+              value: value,
+            ),
+          ),
+        );
+  }
+
+  void _updateTotalSeconds(BuildContext context, int h, int m, int s) {
+    context.read<FunctionBloc>().add(
+          AddFunction(
+            functionData: DeviceFunctionData(
+              entityId: device?.uuid ?? '',
+              functionCode: selectCode,
+              operationName: operationName,
+              value: h * 3600 + m * 60 + s,
+            ),
+          ),
+        );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
new file mode 100644
index 00000000..5f38b240
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
@@ -0,0 +1,95 @@
+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/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/wps/wps_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wps_operational_values_list.dart';
+import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
+
+class WpsValueSelectorWidget extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final List<WpsFunctions> wpsFunctions;
+  final AllDevicesModel? device;
+  final String dialogType;
+  final bool removeComparators;
+
+  const WpsValueSelectorWidget({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.wpsFunctions,
+    required this.device,
+    required this.dialogType,
+    required this.removeComparators,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedFn = wpsFunctions.firstWhere((f) => f.code == selectedFunction);
+    final values = selectedFn.getOperationalValues();
+
+    if (_isSliderFunction(selectedFunction)) {
+      return SliderValueSelector(
+        selectedFunction: selectedFunction,
+        functionData: functionData,
+        device: device,
+        dialogType: dialogType,
+        sliderRange: sliderRange,
+        displayedValue: getDisplayText,
+        initialValue: functionData.value ?? 250,
+        onConditionChanged: (condition) => context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: functionData.operationName,
+                  condition: condition,
+                  value: functionData.value,
+                ),
+              ),
+            ),
+        onSliderChanged: (value) => context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: functionData.operationName,
+                  value: value.toInt(),
+                  condition: functionData.condition,
+                ),
+              ),
+            ),
+      );
+    }
+
+    return WpsOperationalValuesList(
+      values: values,
+      selectedValue: functionData.value,
+      device: device,
+      operationName: selectedFn.operationName,
+      selectCode: selectedFunction,
+    );
+  }
+
+  bool _isSliderFunction(String function) =>
+      ['dis_current', 'presence_time', 'illuminance_value'].contains(function);
+
+  (double, double) get sliderRange => switch (functionData.functionCode) {
+        'presence_time' => (0, 65535),
+        'dis_current' => (0, 600),
+        'illuminance_value' => (0, 10000),
+        _ => (200, 300),
+      };
+
+  String get getDisplayText {
+    final intValue = int.tryParse('${functionData.value ?? ''}');
+    return switch (functionData.functionCode) {
+      'presence_time' => '${intValue ?? '0'} Min',
+      'dis_current' => '${intValue ?? '250'} CM',
+      'illuminance_value' => '${intValue ?? '0'} Lux',
+      _ => '$intValue',
+    };
+  }
+}
diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
new file mode 100644
index 00000000..6b408008
--- /dev/null
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -0,0 +1,67 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/condition_toggle.dart';
+import 'package:syncrow_web/pages/routines/widgets/function_slider.dart';
+import 'package:syncrow_web/pages/routines/widgets/value_display.dart';
+
+class SliderValueSelector extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final AllDevicesModel? device;
+  final String dialogType;
+  final (double, double) sliderRange;
+  final String displayedValue;
+  final Object? initialValue;
+  final void Function(String condition) onConditionChanged;
+  final void Function(double value) onSliderChanged;
+
+  const SliderValueSelector({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.device,
+    required this.dialogType,
+    required this.sliderRange,
+    required this.displayedValue,
+    required this.initialValue,
+    required this.onConditionChanged,
+    required this.onSliderChanged,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        const SizedBox(height: 20),
+        ConditionToggle(
+          currentCondition: functionData.condition,
+          onChanged: onConditionChanged,
+        ),
+        ValueDisplay(
+          value: initialValue,
+          label: displayedValue,
+        ),
+        const SizedBox(height: 20),
+        FunctionSlider(
+          initialValue: initialValue,
+          range: sliderRange, onChanged: onSliderChanged,
+          //           void _updateValue(BuildContext context, int value) {
+          //   context.read<FunctionBloc>().add(
+          //         AddFunction(
+          //           functionData: DeviceFunctionData(
+          //             entityId: device?.uuid ?? '',
+          //             functionCode: functionCode,
+          //             operationName: functionData.operationName,
+          //             value: value,
+          //             condition: functionData.condition,
+          //           ),
+          //         ),
+          //       );
+          // }
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/value_display.dart b/lib/pages/routines/widgets/value_display.dart
new file mode 100644
index 00000000..e9b76325
--- /dev/null
+++ b/lib/pages/routines/widgets/value_display.dart
@@ -0,0 +1,31 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class ValueDisplay extends StatelessWidget {
+  final dynamic value;
+  final String label;
+
+  const ValueDisplay({
+    required this.value,
+    required this.label,
+    super.key,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
+      decoration: BoxDecoration(
+        color: ColorsManager.primaryColorWithOpacity.withOpacity(0.1),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Text(
+        label,
+        style: context.textTheme.headlineMedium!.copyWith(
+          color: ColorsManager.primaryColorWithOpacity,
+        ),
+      ),
+    );
+  }
+}

From 551779c33ae1abbe22db0094ca0dffa9b2c7a476 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 14:41:58 +0300
Subject: [PATCH 072/238] moved widgets to their own files.

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart | 91 +------------------
 .../cps_dialog_value_selector.dart            | 58 ++++++++++++
 .../ceiling_sensor/cps_functions_list.dart    | 40 ++++++++
 3 files changed, 101 insertions(+), 88 deletions(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 0f19f204..50756c69 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -7,9 +7,8 @@ import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functi
 import 'package:syncrow_web/pages/routines/models/device_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_dialog_function_list_tile.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialog_selection_list_tile.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart';
 
 class CeilingSensorDialog extends StatefulWidget {
   const CeilingSensorDialog({
@@ -20,6 +19,7 @@ class CeilingSensorDialog extends StatefulWidget {
     required this.dialogType,
     super.key,
   });
+
   final String? uniqueCustomId;
   final List<DeviceFunction> functions;
   final List<DeviceFunctionData> deviceSelectedFunctions;
@@ -142,88 +142,3 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
     );
   }
 }
-
-class CpsFunctionsList extends StatelessWidget {
-  const CpsFunctionsList({required this.cpsFunctions, super.key});
-
-  final List<CpsFunctions> cpsFunctions;
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      width: 360,
-      child: ListView.separated(
-        shrinkWrap: false,
-        itemCount: cpsFunctions.length,
-        separatorBuilder: (context, index) => const Padding(
-          padding: EdgeInsets.symmetric(horizontal: 40.0),
-          child: Divider(color: ColorsManager.dividerColor),
-        ),
-        itemBuilder: (context, index) {
-          final function = cpsFunctions[index];
-          return RoutineDialogFunctionListTile(
-            iconPath: function.icon,
-            operationName: function.operationName,
-            onTap: () => context.read<FunctionBloc>().add(
-                  SelectFunction(
-                    functionCode: function.code,
-                    operationName: function.operationName,
-                  ),
-                ),
-          );
-        },
-      ),
-    );
-  }
-}
-
-class CpsDialogValueSelector extends StatelessWidget {
-  const CpsDialogValueSelector({
-    required this.operations,
-    required this.selectedFunction,
-    required this.selectedFunctionData,
-    required this.cpsFunctions,
-    required this.device,
-    required this.operationName,
-    super.key,
-  });
-
-  final List<CpsOperationalValue> operations;
-  final String selectedFunction;
-  final DeviceFunctionData? selectedFunctionData;
-  final List<CpsFunctions> cpsFunctions;
-  final AllDevicesModel? device;
-  final String operationName;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView.builder(
-      itemCount: operations.length,
-      itemBuilder: (context, index) {
-        final operation = operations[index];
-        final isSelected = selectedFunctionData?.value == operation.value;
-        return RoutineDialogSelectionListTile(
-          iconPath: operation.icon,
-          description: operation.description,
-          isSelected: isSelected,
-          onTap: () {
-            if (!isSelected) {
-              context.read<FunctionBloc>().add(
-                    AddFunction(
-                      functionData: DeviceFunctionData(
-                        entityId: device?.uuid ?? '',
-                        functionCode: selectedFunction,
-                        operationName: operationName,
-                        value: operation.value,
-                        condition: selectedFunctionData?.condition,
-                        valueDescription: selectedFunctionData?.valueDescription,
-                      ),
-                    ),
-                  );
-            }
-          },
-        );
-      },
-    );
-  }
-}
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart
new file mode 100644
index 00000000..504017a2
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart
@@ -0,0 +1,58 @@
+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/models/ceiling_presence_sensor_functions.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialog_selection_list_tile.dart';
+
+class CpsDialogValueSelector extends StatelessWidget {
+  const CpsDialogValueSelector({
+    required this.operations,
+    required this.selectedFunction,
+    required this.selectedFunctionData,
+    required this.cpsFunctions,
+    required this.device,
+    required this.operationName,
+    super.key,
+  });
+
+  final List<CpsOperationalValue> operations;
+  final String selectedFunction;
+  final DeviceFunctionData? selectedFunctionData;
+  final List<CpsFunctions> cpsFunctions;
+  final AllDevicesModel? device;
+  final String operationName;
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.builder(
+      itemCount: operations.length,
+      itemBuilder: (context, index) {
+        final operation = operations[index];
+        final isSelected = selectedFunctionData?.value == operation.value;
+        return RoutineDialogSelectionListTile(
+          iconPath: operation.icon,
+          description: operation.description,
+          isSelected: isSelected,
+          onTap: () {
+            if (!isSelected) {
+              context.read<FunctionBloc>().add(
+                    AddFunction(
+                      functionData: DeviceFunctionData(
+                        entityId: device?.uuid ?? '',
+                        functionCode: selectedFunction,
+                        operationName: operationName,
+                        value: operation.value,
+                        condition: selectedFunctionData?.condition,
+                        valueDescription: selectedFunctionData?.valueDescription,
+                      ),
+                    ),
+                  );
+            }
+          },
+        );
+      },
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
new file mode 100644
index 00000000..2a35428a
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialog_function_list_tile.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CpsFunctionsList extends StatelessWidget {
+  const CpsFunctionsList({required this.cpsFunctions, super.key});
+
+  final List<CpsFunctions> cpsFunctions;
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 360,
+      child: ListView.separated(
+        shrinkWrap: false,
+        itemCount: cpsFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = cpsFunctions[index];
+          return RoutineDialogFunctionListTile(
+            iconPath: function.icon,
+            operationName: function.operationName,
+            onTap: () => context.read<FunctionBloc>().add(
+                  SelectFunction(
+                    functionCode: function.code,
+                    operationName: function.operationName,
+                  ),
+                ),
+          );
+        },
+      ),
+    );
+  }
+}

From cf103d5a7c1e67912688afab5f2f81906a600deb Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 15:15:20 +0300
Subject: [PATCH 073/238] Add CpsDialogSliderSelector for enhanced slider
 functionality and integrate with CeilingSensorDialog

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart |  31 ++++--
 .../cps_dialog_slider_selector.dart           | 105 ++++++++++++++++++
 .../widgets/slider_value_selector.dart        |  16 +--
 3 files changed, 129 insertions(+), 23 deletions(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 50756c69..7b51d064 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -7,6 +7,8 @@ import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functi
 import 'package:syncrow_web/pages/routines/models/device_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/ceiling_sensor/ceiling_sensor_helper.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart';
 
@@ -122,21 +124,32 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       ),
     );
     final operations = selectedCpsFunctions.getOperationalValues();
-
+    final isToggleFunction =
+        CeilingSensorHelper.toggleCodes.contains(selectedFunction);
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
         CpsFunctionsList(cpsFunctions: _cpsFunctions),
         if (state.selectedFunction != null)
           Expanded(
-            child: CpsDialogValueSelector(
-              operations: operations,
-              selectedFunction: selectedFunction ?? '',
-              selectedFunctionData: selectedFunctionData,
-              cpsFunctions: _cpsFunctions,
-              operationName: selectedOperationName ?? '',
-              device: widget.device,
-            ),
+            child: isToggleFunction
+                ? CpsDialogValueSelector(
+                    operations: operations,
+                    selectedFunction: selectedFunction ?? '',
+                    selectedFunctionData: selectedFunctionData,
+                    cpsFunctions: _cpsFunctions,
+                    operationName: selectedOperationName ?? '',
+                    device: widget.device,
+                  )
+                : CpsDialogSliderSelector(
+                    operations: operations,
+                    selectedFunction: selectedFunction ?? '',
+                    selectedFunctionData: selectedFunctionData,
+                    cpsFunctions: _cpsFunctions,
+                    operationName: selectedOperationName ?? '',
+                    device: widget.device,
+                    dialogType: widget.dialogType,
+                  ),
           ),
       ],
     );
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
new file mode 100644
index 00000000..d826afb5
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -0,0 +1,105 @@
+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/models/ceiling_presence_sensor_functions.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
+
+class CpsDialogSliderSelector extends StatelessWidget {
+  const CpsDialogSliderSelector({
+    required this.operations,
+    required this.selectedFunction,
+    required this.selectedFunctionData,
+    required this.cpsFunctions,
+    required this.device,
+    required this.operationName,
+    required this.dialogType,
+    super.key,
+  });
+
+  final List<CpsOperationalValue> operations;
+  final String selectedFunction;
+  final DeviceFunctionData selectedFunctionData;
+  final List<CpsFunctions> cpsFunctions;
+  final AllDevicesModel? device;
+  final String operationName;
+  final String dialogType;
+
+  @override
+  Widget build(BuildContext context) {
+    return SliderValueSelector(
+      selectedFunction: selectedFunction,
+      functionData: selectedFunctionData,
+      device: device,
+      dialogType: dialogType,
+      sliderRange: _sliderRange,
+      displayedValue: _displayText,
+      initialValue: selectedFunctionData.value ?? 0,
+      onConditionChanged: (condition) => context.read<FunctionBloc>().add(
+            AddFunction(
+              functionData: DeviceFunctionData(
+                entityId: device?.uuid ?? '',
+                functionCode: selectedFunction,
+                operationName: selectedFunctionData.operationName,
+                condition: condition,
+                value: selectedFunctionData.value,
+              ),
+            ),
+          ),
+      onSliderChanged: (value) => context.read<FunctionBloc>().add(
+            AddFunction(
+              functionData: DeviceFunctionData(
+                entityId: device?.uuid ?? '',
+                functionCode: selectedFunction,
+                operationName: selectedFunctionData.operationName,
+                value: value.toInt(),
+                condition: selectedFunctionData.condition,
+              ),
+            ),
+          ),
+    );
+  }
+
+  double get sliderStepper { 
+    return 1;
+  }
+
+  (double, double) get _sliderRange => switch (selectedFunctionData.functionCode) {
+        'moving_speed' => (0, 32),
+        'space_static_val' => (0, 255),
+        'space_move_val' => (0, 255),
+        'moving_max_dis' => (0, 10),
+        'static_max_dis' => (0, 10),
+        'moving_range' => (0, 25.5),
+        'presence_range' => (0, 25.5),
+        'presence_judgement_threshold' => (0, 255),
+        'motion_amplitude_trigger_threshold' => (0, 255),
+        'perceptual_boundary' => (0, 5),
+        'moving_boundary' => (0, 5),
+        'moving_rigger_time' => (0, 2),
+        'moving_static_time' => (0, 50),
+        'none_body_time' => (0, 300),
+        _ => (0, 300),
+      };
+
+  String get _displayText {
+    final value = selectedFunctionData.value;
+    final parsedValue = double.tryParse('$value') ?? value;
+
+    return switch (selectedFunctionData.functionCode) {
+      'moving_max_dis' ||
+      'static_max_dis' ||
+      'moving_range' ||
+      'presence_range' ||
+      'perceptual_boundary' ||
+      'moving_boundary' =>
+        '${parsedValue?.toStringAsFixed(1) ?? '0'} M',
+      'moving_rigger_time' => '${parsedValue?.toStringAsFixed(3) ?? '0'} s',
+      'moving_static_time' ||
+      'none_body_time' =>
+        '${parsedValue?.toStringAsFixed(0) ?? '0'} s',
+      _ => '${parsedValue ?? 0}',
+    };
+  }
+}
diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
index 6b408008..82c59533 100644
--- a/lib/pages/routines/widgets/slider_value_selector.dart
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -46,20 +46,8 @@ class SliderValueSelector extends StatelessWidget {
         const SizedBox(height: 20),
         FunctionSlider(
           initialValue: initialValue,
-          range: sliderRange, onChanged: onSliderChanged,
-          //           void _updateValue(BuildContext context, int value) {
-          //   context.read<FunctionBloc>().add(
-          //         AddFunction(
-          //           functionData: DeviceFunctionData(
-          //             entityId: device?.uuid ?? '',
-          //             functionCode: functionCode,
-          //             operationName: functionData.operationName,
-          //             value: value,
-          //             condition: functionData.condition,
-          //           ),
-          //         ),
-          //       );
-          // }
+          range: sliderRange,
+          onChanged: onSliderChanged,
         ),
       ],
     );

From fadb23d631a6c9ce3bb5febbcb941e12f171db24 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 15:26:36 +0300
Subject: [PATCH 074/238] Refactor SliderValueSelector layout by removing
 unnecessary SizedBox and adjusting spacing for improved UI consistency.

---
 lib/pages/routines/widgets/slider_value_selector.dart | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
index 82c59533..dd26caf1 100644
--- a/lib/pages/routines/widgets/slider_value_selector.dart
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -32,9 +32,9 @@ class SliderValueSelector extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(
+      spacing: 16,
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
-        const SizedBox(height: 20),
         ConditionToggle(
           currentCondition: functionData.condition,
           onChanged: onConditionChanged,
@@ -43,7 +43,6 @@ class SliderValueSelector extends StatelessWidget {
           value: initialValue,
           label: displayedValue,
         ),
-        const SizedBox(height: 20),
         FunctionSlider(
           initialValue: initialValue,
           range: sliderRange,

From 74046c5aede8d97ed0497daf2f69ce143087fd2b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 16:22:02 +0300
Subject: [PATCH 075/238] Refactor SliderValueSelector and ValueDisplay to
 include unit handling and improve UI consistency across sensor dialogs.

---
 .../cps_dialog_slider_selector.dart           |  30 ++--
 .../wps_value_selector_widget.dart            |  18 ++-
 .../widgets/slider_value_selector.dart        | 132 +++++++++++++++---
 lib/pages/routines/widgets/value_display.dart |   4 +-
 4 files changed, 145 insertions(+), 39 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index d826afb5..3c792eca 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -29,13 +29,12 @@ class CpsDialogSliderSelector extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return SliderValueSelector(
-      selectedFunction: selectedFunction,
-      functionData: selectedFunctionData,
-      device: device,
+      currentCondition: selectedFunctionData.condition,
       dialogType: dialogType,
       sliderRange: _sliderRange,
       displayedValue: _displayText,
       initialValue: selectedFunctionData.value ?? 0,
+      unit: _unit,
       onConditionChanged: (condition) => context.read<FunctionBloc>().add(
             AddFunction(
               functionData: DeviceFunctionData(
@@ -58,13 +57,10 @@ class CpsDialogSliderSelector extends StatelessWidget {
               ),
             ),
           ),
+    
     );
   }
 
-  double get sliderStepper { 
-    return 1;
-  }
-
   (double, double) get _sliderRange => switch (selectedFunctionData.functionCode) {
         'moving_speed' => (0, 32),
         'space_static_val' => (0, 255),
@@ -94,12 +90,26 @@ class CpsDialogSliderSelector extends StatelessWidget {
       'presence_range' ||
       'perceptual_boundary' ||
       'moving_boundary' =>
-        '${parsedValue?.toStringAsFixed(1) ?? '0'} M',
-      'moving_rigger_time' => '${parsedValue?.toStringAsFixed(3) ?? '0'} s',
+        '${parsedValue?.toStringAsFixed(1) ?? '0'}',
+      'moving_rigger_time' => '${parsedValue?.toStringAsFixed(3) ?? '0'}',
       'moving_static_time' ||
       'none_body_time' =>
-        '${parsedValue?.toStringAsFixed(0) ?? '0'} s',
+        '${parsedValue?.toStringAsFixed(0) ?? '0'}',
       _ => '${parsedValue ?? 0}',
     };
   }
+
+  String get _unit {
+    return switch (selectedFunctionData.functionCode) {
+      'moving_max_dis' ||
+      'static_max_dis' ||
+      'moving_range' ||
+      'presence_range' ||
+      'perceptual_boundary' ||
+      'moving_boundary' =>
+        'M',
+      'moving_rigger_time' || 'moving_static_time' || 'none_body_time' => 'sec',
+      _ => '',
+    };
+  }
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
index 5f38b240..ccd82e23 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
@@ -32,9 +32,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
 
     if (_isSliderFunction(selectedFunction)) {
       return SliderValueSelector(
-        selectedFunction: selectedFunction,
-        functionData: functionData,
-        device: device,
+        currentCondition: functionData.condition,
         dialogType: dialogType,
         sliderRange: sliderRange,
         displayedValue: getDisplayText,
@@ -61,6 +59,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
                 ),
               ),
             ),
+        unit: _unit,
       );
     }
 
@@ -86,10 +85,17 @@ class WpsValueSelectorWidget extends StatelessWidget {
   String get getDisplayText {
     final intValue = int.tryParse('${functionData.value ?? ''}');
     return switch (functionData.functionCode) {
-      'presence_time' => '${intValue ?? '0'} Min',
-      'dis_current' => '${intValue ?? '250'} CM',
-      'illuminance_value' => '${intValue ?? '0'} Lux',
+      'presence_time' => '${intValue ?? '0'}',
+      'dis_current' => '${intValue ?? '250'}',
+      'illuminance_value' => '${intValue ?? '0'}',
       _ => '$intValue',
     };
   }
+
+  String get _unit => switch (functionData.functionCode) {
+        'presence_time' => 'Min',
+        'dis_current' => 'CM',
+        'illuminance_value' => 'Lux',
+        _ => '',
+      };
 }
diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
index dd26caf1..dfcfeac4 100644
--- a/lib/pages/routines/widgets/slider_value_selector.dart
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -1,54 +1,142 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:flutter/services.dart';
 import 'package:syncrow_web/pages/routines/widgets/condition_toggle.dart';
 import 'package:syncrow_web/pages/routines/widgets/function_slider.dart';
 import 'package:syncrow_web/pages/routines/widgets/value_display.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class SliderValueSelector extends StatelessWidget {
-  final String selectedFunction;
-  final DeviceFunctionData functionData;
-  final AllDevicesModel? device;
+  final String? currentCondition;
   final String dialogType;
   final (double, double) sliderRange;
   final String displayedValue;
   final Object? initialValue;
   final void Function(String condition) onConditionChanged;
   final void Function(double value) onSliderChanged;
+  final String unit;
 
   const SliderValueSelector({
-    required this.selectedFunction,
-    required this.functionData,
-    required this.device,
     required this.dialogType,
     required this.sliderRange,
     required this.displayedValue,
     required this.initialValue,
     required this.onConditionChanged,
     required this.onSliderChanged,
+    required this.currentCondition,
+    required this.unit,
     super.key,
   });
 
   @override
   Widget build(BuildContext context) {
-    return Column(
-      spacing: 16,
+    if (dialogType == 'IF') {
+      return Column(
+        spacing: 16,
+        mainAxisAlignment: MainAxisAlignment.center,
+        children: [
+          ConditionToggle(
+            currentCondition: currentCondition,
+            onChanged: onConditionChanged,
+          ),
+          ValueDisplay(
+            value: initialValue,
+            label: displayedValue,
+            unit: unit,
+          ),
+          FunctionSlider(
+            initialValue: initialValue,
+            range: sliderRange,
+            onChanged: onSliderChanged,
+          ),
+        ],
+      );
+    }
+
+    return Row(
       mainAxisAlignment: MainAxisAlignment.center,
+      crossAxisAlignment: CrossAxisAlignment.center,
+      mainAxisSize: MainAxisSize.min,
       children: [
-        ConditionToggle(
-          currentCondition: functionData.condition,
-          onChanged: onConditionChanged,
-        ),
-        ValueDisplay(
-          value: initialValue,
-          label: displayedValue,
-        ),
-        FunctionSlider(
-          initialValue: initialValue,
-          range: sliderRange,
-          onChanged: onSliderChanged,
+        const Spacer(),
+        Expanded(
+          flex: 2,
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              TextFormField(
+                onChanged: (value) => onSliderChanged(double.tryParse(value) ?? 0),
+                expands: false,
+                onTapOutside: (_) => FocusScope.of(context).unfocus(),
+                initialValue: displayedValue,
+                style: context.textTheme.headlineMedium!.copyWith(
+                  color: ColorsManager.primaryColorWithOpacity,
+                ),
+                inputFormatters: [
+                  RangeInputFormatter(min: sliderRange.$1, max: sliderRange.$2),
+                ],
+                decoration: InputDecoration(
+                  border: OutlineInputBorder(
+                    borderSide: BorderSide.none,
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                  filled: true,
+                  fillColor: ColorsManager.textFieldGreyColor.withOpacity(0.5),
+                  suffixText: unit,
+                  hintStyle: context.textTheme.headlineMedium!.copyWith(
+                    color: ColorsManager.primaryColorWithOpacity,
+                  ),
+                ),
+              ),
+              const SizedBox(height: 8),
+              Row(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    'Min: ${sliderRange.$1}',
+                    style: context.textTheme.bodySmall!.copyWith(
+                      color: ColorsManager.lightGrayColor,
+                    ),
+                  ),
+                  const Spacer(),
+                  Text(
+                    'Max: ${sliderRange.$2}',
+                    style: context.textTheme.bodySmall!.copyWith(
+                      color: ColorsManager.lightGrayColor,
+                    ),
+                  ),
+                ],
+              ),
+            ],
+          ),
         ),
+        const Spacer(),
       ],
     );
   }
 }
+
+class RangeInputFormatter extends TextInputFormatter {
+  const RangeInputFormatter({required this.min, required this.max});
+
+  final double min;
+  final double max;
+
+  @override
+  TextEditingValue formatEditUpdate(
+    TextEditingValue oldValue,
+    TextEditingValue newValue,
+  ) {
+    final text = newValue.text;
+    if (text.isEmpty) {
+      return newValue;
+    }
+
+    final value = double.tryParse(text);
+    if (value == null || value < min || value > max) {
+      return oldValue;
+    }
+
+    return newValue;
+  }
+}
diff --git a/lib/pages/routines/widgets/value_display.dart b/lib/pages/routines/widgets/value_display.dart
index e9b76325..a47fb5b4 100644
--- a/lib/pages/routines/widgets/value_display.dart
+++ b/lib/pages/routines/widgets/value_display.dart
@@ -5,11 +5,13 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 class ValueDisplay extends StatelessWidget {
   final dynamic value;
   final String label;
+  final String unit;
 
   const ValueDisplay({
     required this.value,
     required this.label,
     super.key,
+    required this.unit,
   });
 
   @override
@@ -21,7 +23,7 @@ class ValueDisplay extends StatelessWidget {
         borderRadius: BorderRadius.circular(10),
       ),
       child: Text(
-        label,
+        '$label$unit',
         style: context.textTheme.headlineMedium!.copyWith(
           color: ColorsManager.primaryColorWithOpacity,
         ),

From a5d26d04eb5d26f8949dea3b53a19f81f11303a0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 16:35:19 +0300
Subject: [PATCH 076/238] Remove unused variables from CeilingSensorDialog to
 streamline state management

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart            | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 7b51d064..9190bf37 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -54,15 +54,6 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       content: BlocBuilder<FunctionBloc, FunctionBlocState>(
         builder: (context, state) {
           final selectedFunction = state.selectedFunction;
-          final selectedOperationName = state.selectedOperationName;
-          final selectedFunctionData = state.addedFunctions
-              .firstWhere((f) => f.functionCode == selectedFunction,
-                  orElse: () => DeviceFunctionData(
-                        entityId: '',
-                        functionCode: selectedFunction ?? '',
-                        operationName: '',
-                        value: null,
-                      ));
 
           return Container(
             width: selectedFunction != null ? 600 : 360,

From 49439816d5c8ddca8f8e8f57cb1b19f62e59ce22 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 10 Apr 2025 16:43:33 +0300
Subject: [PATCH 077/238] Update SliderValueSelector to improve text styling
 for unit and range labels

---
 lib/pages/routines/widgets/slider_value_selector.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
index dfcfeac4..db5c4675 100644
--- a/lib/pages/routines/widgets/slider_value_selector.dart
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -83,7 +83,7 @@ class SliderValueSelector extends StatelessWidget {
                   filled: true,
                   fillColor: ColorsManager.textFieldGreyColor.withOpacity(0.5),
                   suffixText: unit,
-                  hintStyle: context.textTheme.headlineMedium!.copyWith(
+                  suffixStyle: context.textTheme.headlineMedium!.copyWith(
                     color: ColorsManager.primaryColorWithOpacity,
                   ),
                 ),
@@ -94,14 +94,14 @@ class SliderValueSelector extends StatelessWidget {
                 children: [
                   Text(
                     'Min: ${sliderRange.$1}',
-                    style: context.textTheme.bodySmall!.copyWith(
+                    style: context.textTheme.labelSmall!.copyWith(
                       color: ColorsManager.lightGrayColor,
                     ),
                   ),
                   const Spacer(),
                   Text(
                     'Max: ${sliderRange.$2}',
-                    style: context.textTheme.bodySmall!.copyWith(
+                    style: context.textTheme.labelSmall!.copyWith(
                       color: ColorsManager.lightGrayColor,
                     ),
                   ),

From ebbecb9738854f8251b78f184dd860cd9fd108b0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 09:18:09 +0300
Subject: [PATCH 078/238] Update toggleCodes in CeilingSensorHelper to replace
 'self_test_result' and 'movement' with 'checking_result' and 'body_movement'
 for improved clarity.

---
 .../ceiling_sensor/ceiling_sensor_helper.dart               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
index 291c2f81..940daf23 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart
@@ -166,11 +166,11 @@ abstract final class CeilingSensorHelper {
   static const toggleCodes = <String>{
     'radar_switch',
     'space_para_switch',
-    'self_test_result',
+    'checking_result',
     'nobody_time',
-    'movement',
+    'body_movement',
     'custom_mode',
-    'space_type',
+    'scene',
     'presence_state',
   };
 }

From 828db5d5e4105e5ddccf0e0633dcfce447de3813 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 09:57:45 +0300
Subject: [PATCH 079/238] Refactor CpsDialogSliderSelector to improve value
 parsing and formatting in _displayText method

---
 .../ceiling_sensor/cps_dialog_slider_selector.dart    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 3c792eca..53f66b67 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -57,7 +57,6 @@ class CpsDialogSliderSelector extends StatelessWidget {
               ),
             ),
           ),
-    
     );
   }
 
@@ -81,7 +80,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
 
   String get _displayText {
     final value = selectedFunctionData.value;
-    final parsedValue = double.tryParse('$value') ?? value;
+    final parsedValue = double.tryParse('$value');
 
     return switch (selectedFunctionData.functionCode) {
       'moving_max_dis' ||
@@ -90,12 +89,12 @@ class CpsDialogSliderSelector extends StatelessWidget {
       'presence_range' ||
       'perceptual_boundary' ||
       'moving_boundary' =>
-        '${parsedValue?.toStringAsFixed(1) ?? '0'}',
-      'moving_rigger_time' => '${parsedValue?.toStringAsFixed(3) ?? '0'}',
+        parsedValue?.toStringAsFixed(1) ?? '0',
+      'moving_rigger_time' => parsedValue?.toStringAsFixed(2) ?? '0',
       'moving_static_time' ||
       'none_body_time' =>
-        '${parsedValue?.toStringAsFixed(0) ?? '0'}',
-      _ => '${parsedValue ?? 0}',
+        parsedValue?.toStringAsFixed(0) ?? '0',
+      _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
     };
   }
 

From 60a1a9ad6f2c1853f0d92a5c335a1298bfe84862 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 10:09:39 +0300
Subject: [PATCH 080/238] Add dividendOfRange parameter to FunctionSlider and
 related components for improved range handling

---
 .../routines/widgets/function_slider.dart     | 21 ++++++++++++-----
 .../cps_dialog_slider_selector.dart           | 23 ++++++++++++++++++-
 .../wps_value_selector_widget.dart            |  1 +
 .../widgets/slider_value_selector.dart        |  3 +++
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/lib/pages/routines/widgets/function_slider.dart b/lib/pages/routines/widgets/function_slider.dart
index b7fb0d53..50167a7b 100644
--- a/lib/pages/routines/widgets/function_slider.dart
+++ b/lib/pages/routines/widgets/function_slider.dart
@@ -2,25 +2,34 @@ import 'package:flutter/material.dart';
 
 class FunctionSlider extends StatelessWidget {
   final dynamic initialValue;
-
   final (double min, double max) range;
   final void Function(double value) onChanged;
+  final double dividendOfRange;
 
   const FunctionSlider({
     required this.onChanged,
     required this.initialValue,
     required this.range,
+    required this.dividendOfRange,
     super.key,
   });
 
   @override
   Widget build(BuildContext context) {
+    final (min, max) = range;
+    final bool isValidRange = max > min;
+    final double value = initialValue is int
+        ? (initialValue as int).toDouble()
+        : (initialValue as double);
+
+    final int? divisions = isValidRange ? ((max - min) / dividendOfRange).round() : null;
+
     return Slider(
-      value: initialValue is int ? initialValue.toDouble() : range.$1,
-      min: range.$1,
-      max: range.$2,
-      divisions: (range.$2 - range.$1).toInt(),
-      onChanged: onChanged,
+      value: value.clamp(min, max),
+      min: min,
+      max: max,
+      divisions: divisions,
+      onChanged: isValidRange ? onChanged : null,
     );
   }
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 53f66b67..2e399888 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -52,11 +52,12 @@ class CpsDialogSliderSelector extends StatelessWidget {
                 entityId: device?.uuid ?? '',
                 functionCode: selectedFunction,
                 operationName: selectedFunctionData.operationName,
-                value: value.toInt(),
+                value: value,
                 condition: selectedFunctionData.condition,
               ),
             ),
           ),
+      dividendOfRange: _dividendOfRange,
     );
   }
 
@@ -111,4 +112,24 @@ class CpsDialogSliderSelector extends StatelessWidget {
       _ => '',
     };
   }
+
+  double get _dividendOfRange => switch (selectedFunctionData.functionCode) {
+        'sensitivity' => 1,
+        'moving_speed' => 1,
+        'space_static_val' => 1,
+        'space_move_val' => 1,
+        'presence_reference' => 5,
+        'moving_reference' => 5,
+        'moving_max_dis' => 0.5,
+        'static_max_dis' => 0.5,
+        'moving_range' => 0.1,
+        'presence_range' => 0.1,
+        'perceptual_boundary' => 0.5,
+        'moving_boundary' => 0.5,
+        'moving_rigger_time' => 0.1,
+        'moving_static_time' => 1.0,
+        'none_body_time' => 5.0,
+        'sports_para' => 1.0,
+        _ => 1,
+      };
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
index ccd82e23..fcdc991a 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
@@ -60,6 +60,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
               ),
             ),
         unit: _unit,
+        dividendOfRange: 1,
       );
     }
 
diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
index db5c4675..bc35e674 100644
--- a/lib/pages/routines/widgets/slider_value_selector.dart
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -15,6 +15,7 @@ class SliderValueSelector extends StatelessWidget {
   final void Function(String condition) onConditionChanged;
   final void Function(double value) onSliderChanged;
   final String unit;
+  final double dividendOfRange;
 
   const SliderValueSelector({
     required this.dialogType,
@@ -25,6 +26,7 @@ class SliderValueSelector extends StatelessWidget {
     required this.onSliderChanged,
     required this.currentCondition,
     required this.unit,
+    required this.dividendOfRange,
     super.key,
   });
 
@@ -48,6 +50,7 @@ class SliderValueSelector extends StatelessWidget {
             initialValue: initialValue,
             range: sliderRange,
             onChanged: onSliderChanged,
+            dividendOfRange: dividendOfRange,
           ),
         ],
       );

From c62e8b3f1541fa38c2de8ba7456acf011391b08a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 10:14:35 +0300
Subject: [PATCH 081/238] Update _displayText method to format values with two
 decimal places for improved precision

---
 .../ceiling_sensor/cps_dialog_slider_selector.dart              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 2e399888..d7f4b688 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -94,7 +94,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
       'moving_rigger_time' => parsedValue?.toStringAsFixed(2) ?? '0',
       'moving_static_time' ||
       'none_body_time' =>
-        parsedValue?.toStringAsFixed(0) ?? '0',
+        parsedValue?.toStringAsFixed(2) ?? '0',
       _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
     };
   }

From dcbca6481414c02c5c3c8481ede2a2db3f9f2276 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 10:16:20 +0300
Subject: [PATCH 082/238] Fix spacing in ValueDisplay text output for improved
 readability

---
 lib/pages/routines/widgets/value_display.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/value_display.dart b/lib/pages/routines/widgets/value_display.dart
index a47fb5b4..6a8bd949 100644
--- a/lib/pages/routines/widgets/value_display.dart
+++ b/lib/pages/routines/widgets/value_display.dart
@@ -23,7 +23,7 @@ class ValueDisplay extends StatelessWidget {
         borderRadius: BorderRadius.circular(10),
       ),
       child: Text(
-        '$label$unit',
+        '$label $unit ',
         style: context.textTheme.headlineMedium!.copyWith(
           color: ColorsManager.primaryColorWithOpacity,
         ),

From fa8f29ff71dedd706e667a8415e1c0d9cb598ed4 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 10:41:23 +0300
Subject: [PATCH 083/238] Add sensitivity feature.

---
 assets/icons/sensitivity_feature_1.svg | 5 +++++
 assets/icons/sensitivity_feature_2.svg | 5 +++++
 assets/icons/sensitivity_feature_3.svg | 5 +++++
 assets/icons/sensitivity_feature_4.svg | 5 +++++
 assets/icons/sensitivity_feature_5.svg | 5 +++++
 assets/icons/sensitivity_feature_6.svg | 5 +++++
 assets/icons/sensitivity_feature_7.svg | 5 +++++
 assets/icons/sensitivity_feature_8.svg | 5 +++++
 assets/icons/sensitivity_feature_9.svg | 5 +++++
 lib/utils/constants/assets.dart        | 9 +++++++++
 10 files changed, 54 insertions(+)
 create mode 100644 assets/icons/sensitivity_feature_1.svg
 create mode 100644 assets/icons/sensitivity_feature_2.svg
 create mode 100644 assets/icons/sensitivity_feature_3.svg
 create mode 100644 assets/icons/sensitivity_feature_4.svg
 create mode 100644 assets/icons/sensitivity_feature_5.svg
 create mode 100644 assets/icons/sensitivity_feature_6.svg
 create mode 100644 assets/icons/sensitivity_feature_7.svg
 create mode 100644 assets/icons/sensitivity_feature_8.svg
 create mode 100644 assets/icons/sensitivity_feature_9.svg

diff --git a/assets/icons/sensitivity_feature_1.svg b/assets/icons/sensitivity_feature_1.svg
new file mode 100644
index 00000000..21bebd7a
--- /dev/null
+++ b/assets/icons/sensitivity_feature_1.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.72751C16.7022 7.47106 16.444 7.24286 16.1963 7.34188L15.166 7.75403C16.1394 3.617 13.6255 1.13192 12.3309 0.160156L11.9303 0.68629C12.295 4.20985 10.8697 6.77552 10.8697 6.77552L9.6861 6.06286C7.63047 8.86439 7.26813 11.637 7.26813 11.637L6.22457 10.9497L5.84278 15.599L4.19531 17.1113C4.19531 17.1113 9.12215 19.2668 13.862 14.8542C14.0281 14.6996 13.9924 14.4272 13.7895 14.3258L12.2619 13.562C13.7729 12.6635 15.8697 10.3879 16.629 7.72751Z" fill="#1479FF"/>
+<path d="M6.94955 12.0658C7.20748 12.3235 7.64893 12.1695 7.69061 11.8073L7.74029 11.3759C7.74315 11.3515 8.03272 8.98838 9.75631 6.48396L10.3884 7.11599C10.5932 7.32076 10.9371 7.27255 11.0777 7.01939L11.2124 6.77685C11.2795 6.65646 12.7674 3.91306 12.3306 0.160279C12.2926 0.131763 12.2554 0.104185 12.2196 0.0782866C11.9917 -0.0867917 11.68 0.0943414 11.709 0.374303C12.0737 3.89786 10.6483 6.46353 10.6483 6.46353L9.94327 5.75849C9.80448 5.6197 9.57174 5.63474 9.45561 5.79298C7.40002 8.59451 7.099 11.3035 7.099 11.3035L6.50061 10.7051C6.32693 10.5315 6.03064 10.6084 5.96029 10.8437C5.23283 13.2767 5.71564 15.7659 5.71564 15.7659L5.71514 15.7664L6.34936 15.6438C6.34525 15.6222 5.97377 13.6265 6.44041 11.5575L6.94955 12.0658Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.00624C13.3141 5.83764 13.224 5.65428 13.0554 5.59659C12.8865 5.5394 12.7031 5.62905 12.6457 5.7976C11.8359 8.16772 10.4981 10.2792 8.9927 12.0909C8.98586 10.3632 9.52113 9.3046 9.5316 9.28437C9.61414 9.12683 9.55367 8.93194 9.39641 8.8489C9.23793 8.76601 9.04348 8.82636 8.96031 8.98394C8.92824 9.04499 8.19051 10.4827 8.37992 12.7999C4.65574 16.9746 0.236005 19.3733 0.170849 19.408C0.0136223 19.492 -0.0459481 19.6873 0.0381926 19.8446C0.0961615 19.9534 0.207724 20.0154 0.323037 20.0154C0.374404 20.0154 0.426084 20.0032 0.474599 19.9774C0.530303 19.9477 3.69996 18.2289 6.9675 15.1631C7.06207 15.1709 7.47437 15.2031 7.91512 15.2031C8.76023 15.2031 10.083 15.1232 11.1436 14.6989C11.3091 14.6326 11.3897 14.4449 11.3236 14.2793C11.2574 14.1139 11.068 14.034 10.9041 14.0996C9.80613 14.5389 8.34164 14.5695 7.6 14.552C9.86817 12.3043 12.09 9.41976 13.2564 6.00624Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_2.svg b/assets/icons/sensitivity_feature_2.svg
new file mode 100644
index 00000000..7370ab6f
--- /dev/null
+++ b/assets/icons/sensitivity_feature_2.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.75827C16.7022 7.50183 16.444 7.27362 16.1963 7.37265L15.166 7.78479C16.1394 3.64776 13.6255 1.16268 12.3309 0.190918L11.9303 0.717051C12.295 4.24061 10.8697 6.80628 10.8697 6.80628L9.6861 6.09362C7.63047 8.89515 7.26813 11.6677 7.26813 11.6677L6.22457 10.9805L5.84278 15.6298L4.19531 17.1421C4.19531 17.1421 9.12215 19.2976 13.862 14.8849C14.0281 14.7303 13.9924 14.458 13.7895 14.3565L12.2619 13.5927C13.7729 12.6943 15.8697 10.4187 16.629 7.75827Z" fill="#3C90FF"/>
+<path d="M6.94955 12.0966C7.20748 12.3542 7.64893 12.2002 7.69061 11.838L7.74029 11.4067C7.74315 11.3823 8.03272 9.01914 9.75631 6.51472L10.3884 7.14675C10.5932 7.35152 10.9371 7.30332 11.0777 7.05015L11.2124 6.80761C11.2795 6.68722 12.7674 3.94382 12.3306 0.191041C12.2926 0.162525 12.2554 0.134947 12.2196 0.109048C11.9917 -0.05603 11.68 0.125103 11.709 0.405064C12.0737 3.92862 10.6483 6.49429 10.6483 6.49429L9.94327 5.78925C9.80448 5.65046 9.57174 5.6655 9.45561 5.82374C7.40002 8.62527 7.099 11.3343 7.099 11.3343L6.50061 10.7359C6.32693 10.5622 6.03064 10.6391 5.96029 10.8745C5.23283 13.3075 5.71564 15.7967 5.71564 15.7967L5.71514 15.7971L6.34936 15.6745C6.34525 15.6529 5.97377 13.6573 6.44041 11.5883L6.94955 12.0966Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.037C13.3141 5.86841 13.224 5.68505 13.0554 5.62735C12.8865 5.57016 12.7031 5.65981 12.6457 5.82837C11.8359 8.19849 10.4981 10.3099 8.9927 12.1216C8.98586 10.394 9.52113 9.33536 9.5316 9.31513C9.61414 9.15759 9.55367 8.96271 9.39641 8.87966C9.23793 8.79677 9.04348 8.85712 8.96031 9.0147C8.92824 9.07575 8.19051 10.5135 8.37992 12.8306C4.65574 17.0054 0.236005 19.404 0.170849 19.4388C0.0136223 19.5228 -0.0459481 19.7181 0.0381926 19.8753C0.0961615 19.9842 0.207724 20.0461 0.323037 20.0461C0.374404 20.0461 0.426084 20.034 0.474599 20.0081C0.530303 19.9785 3.69996 18.2597 6.9675 15.1939C7.06207 15.2017 7.47437 15.2338 7.91512 15.2338C8.76023 15.2338 10.083 15.154 11.1436 14.7297C11.3091 14.6633 11.3897 14.4757 11.3236 14.3101C11.2574 14.1447 11.068 14.0648 10.9041 14.1303C9.80613 14.5696 8.34164 14.6003 7.6 14.5828C9.86817 12.335 12.09 9.45052 13.2564 6.037Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_3.svg b/assets/icons/sensitivity_feature_3.svg
new file mode 100644
index 00000000..23b92c43
--- /dev/null
+++ b/assets/icons/sensitivity_feature_3.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.78903C16.7022 7.53259 16.444 7.30438 16.1963 7.40341L15.166 7.81556C16.1394 3.67852 13.6255 1.19344 12.3309 0.22168L11.9303 0.747813C12.295 4.27137 10.8697 6.83704 10.8697 6.83704L9.6861 6.12438C7.63047 8.92591 7.26813 11.6985 7.26813 11.6985L6.22457 11.0113L5.84278 15.6606L4.19531 17.1728C4.19531 17.1728 9.12215 19.3283 13.862 14.9157C14.0281 14.7611 13.9924 14.4887 13.7895 14.3873L12.2619 13.6235C13.7729 12.725 15.8697 10.4494 16.629 7.78903Z" fill="#59A0FF"/>
+<path d="M6.94955 12.1274C7.20748 12.385 7.64893 12.231 7.69061 11.8688L7.74029 11.4374C7.74315 11.413 8.03272 9.0499 9.75631 6.54548L10.3884 7.17751C10.5932 7.38228 10.9371 7.33408 11.0777 7.08091L11.2124 6.83837C11.2795 6.71798 12.7674 3.97458 12.3306 0.221802C12.2926 0.193287 12.2554 0.165709 12.2196 0.13981C11.9917 -0.0252682 11.68 0.155865 11.709 0.435826C12.0737 3.95939 10.6483 6.52505 10.6483 6.52505L9.94327 5.82001C9.80448 5.68122 9.57174 5.69626 9.45561 5.8545C7.40002 8.65603 7.099 11.3651 7.099 11.3651L6.50061 10.7667C6.32693 10.593 6.03064 10.6699 5.96029 10.9052C5.23283 13.3383 5.71564 15.8274 5.71564 15.8274L5.71514 15.8279L6.34936 15.7053C6.34525 15.6837 5.97377 13.688 6.44041 11.619L6.94955 12.1274Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.06776C13.3141 5.89917 13.224 5.71581 13.0554 5.65811C12.8865 5.60092 12.7031 5.69057 12.6457 5.85913C11.8359 8.22925 10.4981 10.3407 8.9927 12.1524C8.98586 10.4247 9.52113 9.36612 9.5316 9.34589C9.61414 9.18835 9.55367 8.99347 9.39641 8.91042C9.23793 8.82753 9.04348 8.88788 8.96031 9.04546C8.92824 9.10651 8.19051 10.5442 8.37992 12.8614C4.65574 17.0362 0.236005 19.4348 0.170849 19.4695C0.0136223 19.5535 -0.0459481 19.7489 0.0381926 19.9061C0.0961615 20.015 0.207724 20.0769 0.323037 20.0769C0.374404 20.0769 0.426084 20.0647 0.474599 20.0389C0.530303 20.0093 3.69996 18.2904 6.9675 15.2246C7.06207 15.2324 7.47437 15.2646 7.91512 15.2646C8.76023 15.2646 10.083 15.1847 11.1436 14.7604C11.3091 14.6941 11.3897 14.5064 11.3236 14.3409C11.2574 14.1754 11.068 14.0955 10.9041 14.1611C9.80613 14.6004 8.34164 14.6311 7.6 14.6136C9.86817 12.3658 12.09 9.48128 13.2564 6.06776Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_4.svg b/assets/icons/sensitivity_feature_4.svg
new file mode 100644
index 00000000..7a92045f
--- /dev/null
+++ b/assets/icons/sensitivity_feature_4.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.81979C16.7022 7.56335 16.444 7.33515 16.1963 7.43417L15.166 7.84632C16.1394 3.70928 13.6255 1.2242 12.3309 0.252441L11.9303 0.778575C12.295 4.30213 10.8697 6.8678 10.8697 6.8678L9.6861 6.15514C7.63047 8.95667 7.26813 11.7293 7.26813 11.7293L6.22457 11.042L5.84278 15.6913L4.19531 17.2036C4.19531 17.2036 9.12215 19.3591 13.862 14.9464C14.0281 14.7919 13.9924 14.5195 13.7895 14.418L12.2619 13.6543C13.7729 12.7558 15.8697 10.4802 16.629 7.81979Z" fill="#6AAAFF"/>
+<path d="M6.94955 12.1581C7.20748 12.4157 7.64893 12.2618 7.69061 11.8996L7.74029 11.4682C7.74315 11.4438 8.03272 9.08066 9.75631 6.57624L10.3884 7.20828C10.5932 7.41304 10.9371 7.36484 11.0777 7.11167L11.2124 6.86913C11.2795 6.74874 12.7674 4.00534 12.3306 0.252564C12.2926 0.224048 12.2554 0.19647 12.2196 0.170572C11.9917 0.00549348 11.68 0.186627 11.709 0.466588C12.0737 3.99015 10.6483 6.55581 10.6483 6.55581L9.94327 5.85077C9.80448 5.71199 9.57174 5.72702 9.45561 5.88527C7.40002 8.68679 7.099 11.3958 7.099 11.3958L6.50061 10.7974C6.32693 10.6237 6.03064 10.7007 5.96029 10.936C5.23283 13.369 5.71564 15.8582 5.71564 15.8582L5.71514 15.8586L6.34936 15.7361C6.34525 15.7145 5.97377 13.7188 6.44041 11.6498L6.94955 12.1581Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.09852C13.3141 5.92993 13.224 5.74657 13.0554 5.68887C12.8865 5.63169 12.7031 5.72134 12.6457 5.88989C11.8359 8.26001 10.4981 10.3715 8.9927 12.1831C8.98586 10.4555 9.52113 9.39689 9.5316 9.37665C9.61414 9.21911 9.55367 9.02423 9.39641 8.94118C9.23793 8.85829 9.04348 8.91864 8.96031 9.07622C8.92824 9.13728 8.19051 10.575 8.37992 12.8922C4.65574 17.0669 0.236005 19.4656 0.170849 19.5003C0.0136223 19.5843 -0.0459481 19.7796 0.0381926 19.9369C0.0961615 20.0457 0.207724 20.1076 0.323037 20.1076C0.374404 20.1076 0.426084 20.0955 0.474599 20.0697C0.530303 20.04 3.69996 18.3212 6.9675 15.2554C7.06207 15.2632 7.47437 15.2954 7.91512 15.2954C8.76023 15.2954 10.083 15.2155 11.1436 14.7912C11.3091 14.7249 11.3897 14.5372 11.3236 14.3716C11.2574 14.2062 11.068 14.1263 10.9041 14.1919C9.80613 14.6312 8.34164 14.6618 7.6 14.6443C9.86817 12.3965 12.09 9.51204 13.2564 6.09852Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_5.svg b/assets/icons/sensitivity_feature_5.svg
new file mode 100644
index 00000000..5f056602
--- /dev/null
+++ b/assets/icons/sensitivity_feature_5.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.85056C16.7022 7.59411 16.444 7.36591 16.1963 7.46493L15.166 7.87708C16.1394 3.74004 13.6255 1.25496 12.3309 0.283203L11.9303 0.809337C12.295 4.3329 10.8697 6.89856 10.8697 6.89856L9.6861 6.18591C7.63047 8.98743 7.26813 11.76 7.26813 11.76L6.22457 11.0728L5.84278 15.7221L4.19531 17.2344C4.19531 17.2344 9.12215 19.3899 13.862 14.9772C14.0281 14.8226 13.9924 14.5503 13.7895 14.4488L12.2619 13.685C13.7729 12.7865 15.8697 10.511 16.629 7.85056Z" fill="#8EBEFE"/>
+<path d="M6.94955 12.1889C7.20748 12.4465 7.64893 12.2925 7.69061 11.9303L7.74029 11.499C7.74315 11.4746 8.03272 9.11142 9.75631 6.60701L10.3884 7.23904C10.5932 7.4438 10.9371 7.3956 11.0777 7.14244L11.2124 6.8999C11.2795 6.77951 12.7674 4.0361 12.3306 0.283326C12.2926 0.25481 12.2554 0.227232 12.2196 0.201334C11.9917 0.0362552 11.68 0.217388 11.709 0.49735C12.0737 4.02091 10.6483 6.58658 10.6483 6.58658L9.94327 5.88154C9.80448 5.74275 9.57174 5.75779 9.45561 5.91603C7.40002 8.71756 7.099 11.4266 7.099 11.4266L6.50061 10.8282C6.32693 10.6545 6.03064 10.7314 5.96029 10.9667C5.23283 13.3998 5.71564 15.889 5.71564 15.889L5.71514 15.8894L6.34936 15.7668C6.34525 15.7452 5.97377 13.7496 6.44041 11.6806L6.94955 12.1889Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.12928C13.3141 5.96069 13.224 5.77733 13.0554 5.71964C12.8865 5.66245 12.7031 5.7521 12.6457 5.92065C11.8359 8.29077 10.4981 10.4022 8.9927 12.2139C8.98586 10.4862 9.52113 9.42765 9.5316 9.40741C9.61414 9.24987 9.55367 9.05499 9.39641 8.97194C9.23793 8.88905 9.04348 8.9494 8.96031 9.10698C8.92824 9.16804 8.19051 10.6057 8.37992 12.9229C4.65574 17.0977 0.236005 19.4963 0.170849 19.5311C0.0136223 19.615 -0.0459481 19.8104 0.0381926 19.9676C0.0961615 20.0765 0.207724 20.1384 0.323037 20.1384C0.374404 20.1384 0.426084 20.1263 0.474599 20.1004C0.530303 20.0708 3.69996 18.352 6.9675 15.2862C7.06207 15.2939 7.47437 15.3261 7.91512 15.3261C8.76023 15.3261 10.083 15.2462 11.1436 14.822C11.3091 14.7556 11.3897 14.568 11.3236 14.4024C11.2574 14.2369 11.068 14.1571 10.9041 14.2226C9.80613 14.6619 8.34164 14.6926 7.6 14.6751C9.86817 12.4273 12.09 9.5428 13.2564 6.12928Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_6.svg b/assets/icons/sensitivity_feature_6.svg
new file mode 100644
index 00000000..288b172e
--- /dev/null
+++ b/assets/icons/sensitivity_feature_6.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.88132C16.7022 7.62487 16.444 7.39667 16.1963 7.49569L15.166 7.90784C16.1394 3.77081 13.6255 1.28572 12.3309 0.313965L11.9303 0.840098C12.295 4.36366 10.8697 6.92932 10.8697 6.92932L9.6861 6.21667C7.63047 9.01819 7.26813 11.7908 7.26813 11.7908L6.22457 11.1035L5.84278 15.7529L4.19531 17.2651C4.19531 17.2651 9.12215 19.4206 13.862 15.008C14.0281 14.8534 13.9924 14.581 13.7895 14.4796L12.2619 13.7158C13.7729 12.8173 15.8697 10.5417 16.629 7.88132Z" fill="#A0C9FF"/>
+<path d="M6.94955 12.2196C7.20748 12.4773 7.64893 12.3233 7.69061 11.9611L7.74029 11.5297C7.74315 11.5053 8.03272 9.14218 9.75631 6.63777L10.3884 7.2698C10.5932 7.47457 10.9371 7.42636 11.0777 7.1732L11.2124 6.93066C11.2795 6.81027 12.7674 4.06687 12.3306 0.314088C12.2926 0.285572 12.2554 0.257994 12.2196 0.232095C11.9917 0.0670169 11.68 0.24815 11.709 0.528111C12.0737 4.05167 10.6483 6.61734 10.6483 6.61734L9.94327 5.9123C9.80448 5.77351 9.57174 5.78855 9.45561 5.94679C7.40002 8.74832 7.099 11.4573 7.099 11.4573L6.50061 10.8589C6.32693 10.6853 6.03064 10.7622 5.96029 10.9975C5.23283 13.4305 5.71564 15.9197 5.71564 15.9197L5.71514 15.9202L6.34936 15.7976C6.34525 15.776 5.97377 13.7803 6.44041 11.7113L6.94955 12.2196Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.16005C13.3141 5.99145 13.224 5.80809 13.0554 5.7504C12.8865 5.69321 12.7031 5.78286 12.6457 5.95141C11.8359 8.32153 10.4981 10.433 8.9927 12.2447C8.98586 10.517 9.52113 9.45841 9.5316 9.43818C9.61414 9.28064 9.55367 9.08575 9.39641 9.00271C9.23793 8.91982 9.04348 8.98017 8.96031 9.13774C8.92824 9.1988 8.19051 10.6365 8.37992 12.9537C4.65574 17.1285 0.236005 19.5271 0.170849 19.5618C0.0136223 19.6458 -0.0459481 19.8412 0.0381926 19.9984C0.0961615 20.1073 0.207724 20.1692 0.323037 20.1692C0.374404 20.1692 0.426084 20.157 0.474599 20.1312C0.530303 20.1015 3.69996 18.3827 6.9675 15.3169C7.06207 15.3247 7.47437 15.3569 7.91512 15.3569C8.76023 15.3569 10.083 15.277 11.1436 14.8527C11.3091 14.7864 11.3897 14.5987 11.3236 14.4331C11.2574 14.2677 11.068 14.1878 10.9041 14.2534C9.80613 14.6927 8.34164 14.7233 7.6 14.7058C9.86817 12.4581 12.09 9.57357 13.2564 6.16005Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_7.svg b/assets/icons/sensitivity_feature_7.svg
new file mode 100644
index 00000000..5779dfd2
--- /dev/null
+++ b/assets/icons/sensitivity_feature_7.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.91208C16.7022 7.65563 16.444 7.42743 16.1963 7.52645L15.166 7.9386C16.1394 3.80157 13.6255 1.31649 12.3309 0.344727L11.9303 0.87086C12.295 4.39442 10.8697 6.96009 10.8697 6.96009L9.6861 6.24743C7.63047 9.04896 7.26813 11.8215 7.26813 11.8215L6.22457 11.1343L5.84278 15.7836L4.19531 17.2959C4.19531 17.2959 9.12215 19.4514 13.862 15.0387C14.0281 14.8842 13.9924 14.6118 13.7895 14.5103L12.2619 13.7465C13.7729 12.8481 15.8697 10.5725 16.629 7.91208Z" fill="#CDE2FF"/>
+<path d="M6.94955 12.2504C7.20748 12.508 7.64893 12.354 7.69061 11.9919L7.74029 11.5605C7.74315 11.5361 8.03272 9.17295 9.75631 6.66853L10.3884 7.30056C10.5932 7.50533 10.9371 7.45712 11.0777 7.20396L11.2124 6.96142C11.2795 6.84103 12.7674 4.09763 12.3306 0.344849C12.2926 0.316334 12.2554 0.288755 12.2196 0.262857C11.9917 0.0977786 11.68 0.278912 11.709 0.558873C12.0737 4.08243 10.6483 6.6481 10.6483 6.6481L9.94327 5.94306C9.80448 5.80427 9.57174 5.81931 9.45561 5.97755C7.40002 8.77908 7.099 11.4881 7.099 11.4881L6.50061 10.8897C6.32693 10.716 6.03064 10.7929 5.96029 11.0283C5.23283 13.4613 5.71564 15.9505 5.71564 15.9505L5.71514 15.9509L6.34936 15.8283C6.34525 15.8067 5.97377 13.8111 6.44041 11.7421L6.94955 12.2504Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.19081C13.3141 6.02221 13.224 5.83885 13.0554 5.78116C12.8865 5.72397 12.7031 5.81362 12.6457 5.98218C11.8359 8.35229 10.4981 10.4637 8.9927 12.2754C8.98586 10.5478 9.52113 9.48917 9.5316 9.46894C9.61414 9.3114 9.55367 9.11651 9.39641 9.03347C9.23793 8.95058 9.04348 9.01093 8.96031 9.16851C8.92824 9.22956 8.19051 10.6673 8.37992 12.9844C4.65574 17.1592 0.236005 19.5579 0.170849 19.5926C0.0136223 19.6766 -0.0459481 19.8719 0.0381926 20.0291C0.0961615 20.138 0.207724 20.1999 0.323037 20.1999C0.374404 20.1999 0.426084 20.1878 0.474599 20.162C0.530303 20.1323 3.69996 18.4135 6.9675 15.3477C7.06207 15.3555 7.47437 15.3877 7.91512 15.3877C8.76023 15.3877 10.083 15.3078 11.1436 14.8835C11.3091 14.8171 11.3897 14.6295 11.3236 14.4639C11.2574 14.2985 11.068 14.2186 10.9041 14.2841C9.80613 14.7234 8.34164 14.7541 7.6 14.7366C9.86817 12.4888 12.09 9.60433 13.2564 6.19081Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_8.svg b/assets/icons/sensitivity_feature_8.svg
new file mode 100644
index 00000000..4816b1ba
--- /dev/null
+++ b/assets/icons/sensitivity_feature_8.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.94333C16.7022 7.68688 16.444 7.45868 16.1963 7.5577L15.166 7.96985C16.1394 3.83282 13.6255 1.34774 12.3309 0.375977L11.9303 0.90211C12.295 4.42567 10.8697 6.99134 10.8697 6.99134L9.6861 6.27868C7.63047 9.08021 7.26813 11.8528 7.26813 11.8528L6.22457 11.1656L5.84278 15.8149L4.19531 17.3271C4.19531 17.3271 9.12215 19.4826 13.862 15.07C14.0281 14.9154 13.9924 14.643 13.7895 14.5416L12.2619 13.7778C13.7729 12.8793 15.8697 10.6037 16.629 7.94333Z" fill="#DCEBFF"/>
+<path d="M6.94955 12.2814C7.20748 12.539 7.64893 12.385 7.69061 12.0229L7.74029 11.5915C7.74315 11.5671 8.03272 9.20395 9.75631 6.69953L10.3884 7.33157C10.5932 7.53633 10.9371 7.48813 11.0777 7.23496L11.2124 6.99243C11.2795 6.87204 12.7674 4.12863 12.3306 0.375855C12.2926 0.347339 12.2554 0.319761 12.2196 0.293863C11.9917 0.128785 11.68 0.309918 11.709 0.589879C12.0737 4.11344 10.6483 6.67911 10.6483 6.67911L9.94327 5.97407C9.80448 5.83528 9.57174 5.85032 9.45561 6.00856C7.40002 8.81008 7.099 11.5191 7.099 11.5191L6.50061 10.9207C6.32693 10.747 6.03064 10.824 5.96029 11.0593C5.23283 13.4923 5.71564 15.9815 5.71564 15.9815L5.71514 15.9819L6.34936 15.8594C6.34525 15.8377 5.97377 13.8421 6.44041 11.7731L6.94955 12.2814Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.22181C13.3141 6.05322 13.224 5.86986 13.0554 5.81217C12.8865 5.75498 12.7031 5.84463 12.6457 6.01318C11.8359 8.3833 10.4981 10.4947 8.9927 12.3064C8.98586 10.5788 9.52113 9.52018 9.5316 9.49994C9.61414 9.3424 9.55367 9.14752 9.39641 9.06447C9.23793 8.98158 9.04348 9.04193 8.96031 9.19951C8.92824 9.26057 8.19051 10.6983 8.37992 13.0155C4.65574 17.1902 0.236005 19.5889 0.170849 19.6236C0.0136223 19.7076 -0.0459481 19.9029 0.0381926 20.0602C0.0961615 20.169 0.207724 20.2309 0.323037 20.2309C0.374404 20.2309 0.426084 20.2188 0.474599 20.193C0.530303 20.1633 3.69996 18.4445 6.9675 15.3787C7.06207 15.3865 7.47437 15.4187 7.91512 15.4187C8.76023 15.4187 10.083 15.3388 11.1436 14.9145C11.3091 14.8482 11.3897 14.6605 11.3236 14.4949C11.2574 14.3295 11.068 14.2496 10.9041 14.3151C9.80613 14.7544 8.34164 14.7851 7.6 14.7676C9.86817 12.5198 12.09 9.63533 13.2564 6.22181Z" fill="#B8DDFF"/>
+</svg>
diff --git a/assets/icons/sensitivity_feature_9.svg b/assets/icons/sensitivity_feature_9.svg
new file mode 100644
index 00000000..978145b4
--- /dev/null
+++ b/assets/icons/sensitivity_feature_9.svg
@@ -0,0 +1,5 @@
+<svg width="17" height="21" viewBox="0 0 17 21" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M16.629 7.97409C16.7022 7.71765 16.444 7.48944 16.1963 7.58847L15.166 8.00061C16.1394 3.86358 13.6255 1.3785 12.3309 0.406738L11.9303 0.932872C12.295 4.45643 10.8697 7.0221 10.8697 7.0221L9.6861 6.30944C7.63047 9.11097 7.26813 11.8835 7.26813 11.8835L6.22457 11.1963L5.84278 15.8456L4.19531 17.3579C4.19531 17.3579 9.12215 19.5134 13.862 15.1007C14.0281 14.9462 13.9924 14.6738 13.7895 14.5723L12.2619 13.8086C13.7729 12.9101 15.8697 10.6345 16.629 7.97409Z" fill="#EAF3FF"/>
+<path d="M6.94955 12.3122C7.20748 12.5698 7.64893 12.4158 7.69061 12.0536L7.74029 11.6223C7.74315 11.5978 8.03272 9.23471 9.75631 6.7303L10.3884 7.36233C10.5932 7.56709 10.9371 7.51889 11.0777 7.26573L11.2124 7.02319C11.2795 6.9028 12.7674 4.15939 12.3306 0.406617C12.2926 0.378101 12.2554 0.350523 12.2196 0.324625C11.9917 0.159546 11.68 0.340679 11.709 0.620641C12.0737 4.1442 10.6483 6.70987 10.6483 6.70987L9.94327 6.00483C9.80448 5.86604 9.57174 5.88108 9.45561 6.03932C7.40002 8.84085 7.099 11.5499 7.099 11.5499L6.50061 10.9515C6.32693 10.7778 6.03064 10.8547 5.96029 11.09C5.23283 13.5231 5.71564 16.0123 5.71564 16.0123L5.71514 16.0127L6.34936 15.8901C6.34525 15.8685 5.97377 13.8728 6.44041 11.8039L6.94955 12.3122Z" fill="#D5EAFF"/>
+<path d="M13.2564 6.25258C13.3141 6.08398 13.224 5.90062 13.0554 5.84293C12.8865 5.78574 12.7031 5.87539 12.6457 6.04394C11.8359 8.41406 10.4981 10.5255 8.9927 12.3372C8.98586 10.6095 9.52113 9.55094 9.5316 9.5307C9.61414 9.37317 9.55367 9.17828 9.39641 9.09524C9.23793 9.01234 9.04348 9.0727 8.96031 9.23027C8.92824 9.29133 8.19051 10.729 8.37992 13.0462C4.65574 17.221 0.236005 19.6196 0.170849 19.6543C0.0136223 19.7383 -0.0459481 19.9337 0.0381926 20.0909C0.0961615 20.1998 0.207724 20.2617 0.323037 20.2617C0.374404 20.2617 0.426084 20.2495 0.474599 20.2237C0.530303 20.1941 3.69996 18.4752 6.9675 15.4095C7.06207 15.4172 7.47437 15.4494 7.91512 15.4494C8.76023 15.4494 10.083 15.3695 11.1436 14.9452C11.3091 14.8789 11.3897 14.6913 11.3236 14.5257C11.2574 14.3602 11.068 14.2804 10.9041 14.3459C9.80613 14.7852 8.34164 14.8159 7.6 14.7984C9.86817 12.5506 12.09 9.6661 13.2564 6.25258Z" fill="#B8DDFF"/>
+</svg>
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index 7bcd1484..6973492e 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -448,4 +448,13 @@ class Assets {
     static const String presenceJudgementThrshold = 'assets/icons/presence_judgement_threshold.svg';
     static const String spaceType = 'assets/icons/space_type.svg';
     static const String sportsPara = 'assets/icons/sports_para.svg';
+    static const String sensitivityFeature1 = 'assets/icons/sensitivity_feature_1.svg';
+    static const String sensitivityFeature2 = 'assets/icons/sensitivity_feature_2.svg';
+    static const String sensitivityFeature3 = 'assets/icons/sensitivity_feature_3.svg';
+    static const String sensitivityFeature4 = 'assets/icons/sensitivity_feature_4.svg';
+    static const String sensitivityFeature5 = 'assets/icons/sensitivity_feature_5.svg';
+    static const String sensitivityFeature6 = 'assets/icons/sensitivity_feature_6.svg';
+    static const String sensitivityFeature7 = 'assets/icons/sensitivity_feature_7.svg';
+    static const String sensitivityFeature8 = 'assets/icons/sensitivity_feature_8.svg';
+    static const String sensitivityFeature9 = 'assets/icons/sensitivity_feature_9.svg';
 }

From c54fd780b7d9e5bf27ae50641e6e532e5e7bef90 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 10:41:40 +0300
Subject: [PATCH 084/238] Update sensitivity function to adjust max value and
 add image assets; modify dialog logic for sensitivity handling

---
 .../ceiling_presence_sensor_functions.dart       | 16 +++++++++++++++-
 .../ceiling_sensor/ceiling_sensor_dialog.dart    |  7 +++++--
 .../cps_dialog_slider_selector.dart              |  1 +
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 6e181407..8f3eeb5e 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -98,13 +98,27 @@ final class CpsSensitivityFunction extends CpsFunctions {
   final int max;
   final int step;
 
+  static const _images = <String>[
+    Assets.sensitivityFeature1,
+    Assets.sensitivityFeature1,
+    Assets.sensitivityFeature2,
+    Assets.sensitivityFeature3,
+    Assets.sensitivityFeature4,
+    Assets.sensitivityFeature5,
+    Assets.sensitivityFeature6,
+    Assets.sensitivityFeature7,
+    Assets.sensitivityFeature8,
+    Assets.sensitivityFeature9,
+    Assets.sensitivityFeature9,
+  ];
+
   @override
   List<CpsOperationalValue> getOperationalValues() {
     final values = <CpsOperationalValue>[];
     for (var value = min; value <= max; value += step) {
       values.add(
         CpsOperationalValue(
-          icon: Assets.sensitivity,
+          icon: _images[value],
           description: '$value',
           value: value,
         ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 9190bf37..dc71a595 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -115,8 +115,11 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       ),
     );
     final operations = selectedCpsFunctions.getOperationalValues();
-    final isToggleFunction =
-        CeilingSensorHelper.toggleCodes.contains(selectedFunction);
+    final isSensitivityFunction = selectedFunction == 'sensitivity';
+    final isToggleFunction = isSensitivityFunction
+        ? widget.dialogType == 'THEN'
+        : CeilingSensorHelper.toggleCodes.contains(selectedFunction);
+
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index d7f4b688..59f48fbd 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -63,6 +63,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
 
   (double, double) get _sliderRange => switch (selectedFunctionData.functionCode) {
         'moving_speed' => (0, 32),
+        'sensitivity' => (0, 10),
         'space_static_val' => (0, 255),
         'space_move_val' => (0, 255),
         'moving_max_dis' => (0, 10),

From 36e88d033be2a5270c556f2125e1dded88edc213 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 10:56:19 +0300
Subject: [PATCH 085/238] Refactor SliderValueSelector layout for improved
 readability and maintainability

---
 .../widgets/slider_value_selector.dart        | 94 +++----------------
 1 file changed, 15 insertions(+), 79 deletions(-)

diff --git a/lib/pages/routines/widgets/slider_value_selector.dart b/lib/pages/routines/widgets/slider_value_selector.dart
index bc35e674..526e6fa0 100644
--- a/lib/pages/routines/widgets/slider_value_selector.dart
+++ b/lib/pages/routines/widgets/slider_value_selector.dart
@@ -3,8 +3,6 @@ import 'package:flutter/services.dart';
 import 'package:syncrow_web/pages/routines/widgets/condition_toggle.dart';
 import 'package:syncrow_web/pages/routines/widgets/function_slider.dart';
 import 'package:syncrow_web/pages/routines/widgets/value_display.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class SliderValueSelector extends StatelessWidget {
   final String? currentCondition;
@@ -32,88 +30,26 @@ class SliderValueSelector extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if (dialogType == 'IF') {
-      return Column(
-        spacing: 16,
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
+    return Column(
+      spacing: 16,
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        if (dialogType == 'IF')
           ConditionToggle(
             currentCondition: currentCondition,
             onChanged: onConditionChanged,
           ),
-          ValueDisplay(
-            value: initialValue,
-            label: displayedValue,
-            unit: unit,
-          ),
-          FunctionSlider(
-            initialValue: initialValue,
-            range: sliderRange,
-            onChanged: onSliderChanged,
-            dividendOfRange: dividendOfRange,
-          ),
-        ],
-      );
-    }
-
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      crossAxisAlignment: CrossAxisAlignment.center,
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        const Spacer(),
-        Expanded(
-          flex: 2,
-          child: Column(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              TextFormField(
-                onChanged: (value) => onSliderChanged(double.tryParse(value) ?? 0),
-                expands: false,
-                onTapOutside: (_) => FocusScope.of(context).unfocus(),
-                initialValue: displayedValue,
-                style: context.textTheme.headlineMedium!.copyWith(
-                  color: ColorsManager.primaryColorWithOpacity,
-                ),
-                inputFormatters: [
-                  RangeInputFormatter(min: sliderRange.$1, max: sliderRange.$2),
-                ],
-                decoration: InputDecoration(
-                  border: OutlineInputBorder(
-                    borderSide: BorderSide.none,
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  filled: true,
-                  fillColor: ColorsManager.textFieldGreyColor.withOpacity(0.5),
-                  suffixText: unit,
-                  suffixStyle: context.textTheme.headlineMedium!.copyWith(
-                    color: ColorsManager.primaryColorWithOpacity,
-                  ),
-                ),
-              ),
-              const SizedBox(height: 8),
-              Row(
-                mainAxisSize: MainAxisSize.min,
-                children: [
-                  Text(
-                    'Min: ${sliderRange.$1}',
-                    style: context.textTheme.labelSmall!.copyWith(
-                      color: ColorsManager.lightGrayColor,
-                    ),
-                  ),
-                  const Spacer(),
-                  Text(
-                    'Max: ${sliderRange.$2}',
-                    style: context.textTheme.labelSmall!.copyWith(
-                      color: ColorsManager.lightGrayColor,
-                    ),
-                  ),
-                ],
-              ),
-            ],
-          ),
+        ValueDisplay(
+          value: initialValue,
+          label: displayedValue,
+          unit: unit,
+        ),
+        FunctionSlider(
+          initialValue: initialValue,
+          range: sliderRange,
+          onChanged: onSliderChanged,
+          dividendOfRange: dividendOfRange,
         ),
-        const Spacer(),
       ],
     );
   }

From 11feaf7c877227eeeda24010384c82b805499581 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 11:10:51 +0300
Subject: [PATCH 086/238] passed correct operation name to `onSliderChanged`
 and onConditionChanged`. in `CpsDialogSliderSelector`.

---
 .../ceiling_sensor/cps_dialog_slider_selector.dart            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 59f48fbd..49c3ac2e 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -40,7 +40,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
               functionData: DeviceFunctionData(
                 entityId: device?.uuid ?? '',
                 functionCode: selectedFunction,
-                operationName: selectedFunctionData.operationName,
+                operationName: operationName,
                 condition: condition,
                 value: selectedFunctionData.value,
               ),
@@ -51,7 +51,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
               functionData: DeviceFunctionData(
                 entityId: device?.uuid ?? '',
                 functionCode: selectedFunction,
-                operationName: selectedFunctionData.operationName,
+                operationName: operationName,
                 value: value,
                 condition: selectedFunctionData.condition,
               ),

From 97eb1c152b5846abf4a4a4a29899a6e676f683ea Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 13 Apr 2025 12:18:56 +0300
Subject: [PATCH 087/238] Implement a countdown timer for the AC and fix bugs
 in the 'Forgot Password'

---
 .../auth/view/forget_password_web_page.dart   |  19 +-
 .../device_managment/ac/bloc/ac_bloc.dart     | 193 ++++++++++++++++--
 .../device_managment/ac/bloc/ac_event.dart    |  30 +++
 .../device_managment/ac/bloc/ac_state.dart    |  38 +++-
 .../device_managment/ac/model/ac_model.dart   |   9 +
 .../ac/view/ac_device_control.dart            | 132 ++++++++----
 6 files changed, 344 insertions(+), 77 deletions(-)

diff --git a/lib/pages/auth/view/forget_password_web_page.dart b/lib/pages/auth/view/forget_password_web_page.dart
index f389f44f..7686ea8f 100644
--- a/lib/pages/auth/view/forget_password_web_page.dart
+++ b/lib/pages/auth/view/forget_password_web_page.dart
@@ -201,20 +201,17 @@ class ForgetPasswordWebPage extends StatelessWidget {
                                                           !state.isButtonEnabled &&
                                                           state.remainingTime != 1
                                                       ? null
-                                                      : () {
+                                                      : 
+                                                       () {
                                                           if (forgetBloc
-                                                                  .forgetEmailKey.currentState!
-                                                                  .validate() ||
-                                                              forgetBloc
-                                                                  .forgetRegionKey.currentState!
-                                                                  .validate()) {
-                                                            if (forgetBloc
-                                                                .forgetRegionKey.currentState!
-                                                                .validate()) {
-                                                              forgetBloc.add(StartTimerEvent());
-                                                            }
+                                                              .forgetEmailKey
+                                                              .currentState!
+                                                              .validate()) {
+                                                            forgetBloc.add(
+                                                                StartTimerEvent());
                                                           }
                                                         },
+                                                
                                                   child: Text(
                                                     'Get Code ${state is TimerState && !state.isButtonEnabled && state.remainingTime != 1 ? "(${forgetBloc.formattedTime(state.remainingTime)}) " : ""}',
                                                     style: TextStyle(
diff --git a/lib/pages/device_managment/ac/bloc/ac_bloc.dart b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
index 7c35034e..076e9050 100644
--- a/lib/pages/device_managment/ac/bloc/ac_bloc.dart
+++ b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
@@ -13,6 +13,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   late AcStatusModel deviceStatus;
   final String deviceId;
   Timer? _timer;
+  Timer? _countdownTimer;
 
   AcBloc({required this.deviceId}) : super(AcsInitialState()) {
     on<AcFetchDeviceStatusEvent>(_onFetchAcStatus);
@@ -21,7 +22,16 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     on<AcBatchControlEvent>(_onAcBatchControl);
     on<AcFactoryResetEvent>(_onFactoryReset);
     on<AcStatusUpdated>(_onAcStatusUpdated);
+    on<OnClose>(_onClose);
+    on<IncreaseTimeEvent>(_handleIncreaseTime);
+    on<DecreaseTimeEvent>(_handleDecreaseTime);
+    on<UpdateTimerEvent>(_handleUpdateTimer);
+    on<ToggleScheduleEvent>(_handleToggleTimer);
+    on<ApiCountdownValueEvent>(_handleApiCountdownValue);
   }
+  bool timerActive = false;
+  int scheduledHours = 0;
+  int scheduledMinutes = 0;
 
   FutureOr<void> _onFetchAcStatus(
       AcFetchDeviceStatusEvent event, Emitter<AcsState> emit) async {
@@ -30,8 +40,23 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
       deviceStatus = AcStatusModel.fromJson(event.deviceId, status.status);
+      if (deviceStatus.countdown1 != 0) {
+        // Convert API value to minutes
+        final totalMinutes = deviceStatus.countdown1 * 6;
+        scheduledHours = totalMinutes ~/ 60;
+        scheduledMinutes = totalMinutes % 60;
+        timerActive = true;
+        _startCountdownTimer(emit);
+      }
+
+      emit(ACStatusLoaded(
+        status: deviceStatus,
+        scheduledHours: scheduledHours,
+        scheduledMinutes: scheduledMinutes,
+        isTimerActive: timerActive,
+      ));
+
       _listenToChanges(event.deviceId);
-      emit(ACStatusLoaded(deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
     }
@@ -70,31 +95,16 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
 
   void _onAcStatusUpdated(AcStatusUpdated event, Emitter<AcsState> emit) {
     deviceStatus = event.deviceStatus;
-    emit(ACStatusLoaded(deviceStatus));
+    emit(ACStatusLoaded(status: deviceStatus));
   }
 
-  // Future<void> testFirebaseConnection() async {
-  //   // Reference to a test node in your database
-  //   final testRef = FirebaseDatabase.instance.ref("test");
-
-  //   // Write a test value
-  //   await testRef.set("Hello, Firebase!");
-
-  //   // Listen for changes on the test node
-  //   testRef.onValue.listen((DatabaseEvent event) {
-  //     final data = event.snapshot.value;
-  //     print("Data from Firebase: $data");
-  //     // If you see "Hello, Firebase!" printed in your console, it means the connection works.
-  //   });
-  // }
-
   FutureOr<void> _onAcControl(
       AcControlEvent event, Emitter<AcsState> emit) async {
     final oldValue = _getValueByCode(event.code);
 
     _updateLocalValue(event.code, event.value, emit);
 
-    emit(ACStatusLoaded(deviceStatus));
+    emit(ACStatusLoaded(status: deviceStatus));
 
     await _runDebounce(
       isBatch: false,
@@ -151,7 +161,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   void _revertValueAndEmit(
       String deviceId, String code, dynamic oldValue, Emitter<AcsState> emit) {
     _updateLocalValue(code, oldValue, emit);
-    emit(ACStatusLoaded(deviceStatus));
+    emit(ACStatusLoaded(status: deviceStatus));
   }
 
   void _updateLocalValue(String code, dynamic value, Emitter<AcsState> emit) {
@@ -184,11 +194,16 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         if (value is bool) {
           deviceStatus = deviceStatus.copyWith(childLock: value);
         }
+
+      case 'countdown_time':
+        if (value is int) {
+          deviceStatus = deviceStatus.copyWith(countdown1: value);
+        }
         break;
       default:
         break;
     }
-    emit(ACStatusLoaded(deviceStatus));
+    emit(ACStatusLoaded(status: deviceStatus));
   }
 
   dynamic _getValueByCode(String code) {
@@ -203,6 +218,8 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         return deviceStatus.fanSpeedsString;
       case 'child_lock':
         return deviceStatus.childLock;
+      case 'countdown_time':
+        return deviceStatus.countdown1;
       default:
         return null;
     }
@@ -216,7 +233,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
           await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus =
           AcStatusModel.fromJson(event.devicesIds.first, status.status);
-      emit(ACStatusLoaded(deviceStatus));
+      emit(ACStatusLoaded(status: deviceStatus));
     } catch (e) {
       emit(AcsFailedState(error: e.toString()));
     }
@@ -228,7 +245,7 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
 
     _updateLocalValue(event.code, event.value, emit);
 
-    emit(ACStatusLoaded(deviceStatus));
+    emit(ACStatusLoaded(status: deviceStatus));
 
     await _runDebounce(
       isBatch: true,
@@ -257,4 +274,136 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       emit(AcsFailedState(error: e.toString()));
     }
   }
+
+  void _onClose(OnClose event, Emitter<AcsState> emit) {
+    _countdownTimer?.cancel();
+    _timer?.cancel();
+  }
+
+  void _handleIncreaseTime(IncreaseTimeEvent event, Emitter<AcsState> emit) {
+    if (state is! ACStatusLoaded) return;
+    final currentState = state as ACStatusLoaded;
+    int newHours = scheduledHours;
+    int newMinutes = scheduledMinutes + 30;
+    newHours += newMinutes ~/ 60;
+    newMinutes = newMinutes % 60;
+    if (newHours > 23) {
+      newHours = 23;
+      newMinutes = 59;
+    }
+    scheduledHours = newHours;
+    scheduledMinutes = newMinutes;
+
+    emit(currentState.copyWith(
+      scheduledHours: scheduledHours,
+      scheduledMinutes: scheduledMinutes,
+    ));
+  }
+
+  void _handleDecreaseTime(DecreaseTimeEvent event, Emitter<AcsState> emit) {
+    if (state is! ACStatusLoaded) return;
+    final currentState = state as ACStatusLoaded;
+    int totalMinutes = (scheduledHours * 60) + scheduledMinutes;
+    totalMinutes = (totalMinutes - 30).clamp(0, 1440);
+    scheduledHours = totalMinutes ~/ 60;
+    scheduledMinutes = totalMinutes % 60;
+
+    emit(currentState.copyWith(
+      scheduledHours: scheduledHours,
+      scheduledMinutes: scheduledMinutes,
+    ));
+  }
+
+  Future<void> _handleToggleTimer(
+      ToggleScheduleEvent event, Emitter<AcsState> emit) async {
+    if (state is! ACStatusLoaded) return;
+    final currentState = state as ACStatusLoaded;
+
+    timerActive = !timerActive;
+
+    if (timerActive) {
+      final totalMinutes = scheduledHours * 60 + scheduledMinutes;
+      if (totalMinutes <= 0) {
+        timerActive = false;
+        emit(currentState.copyWith(isTimerActive: timerActive));
+        return;
+      }
+
+      try {
+        final scaledValue = totalMinutes ~/ 6;
+        await DevicesManagementApi().deviceControl(
+          deviceId,
+          Status(code: 'countdown_time', value: scaledValue),
+        );
+        _startCountdownTimer(emit);
+        emit(currentState.copyWith(isTimerActive: timerActive));
+      } catch (e) {
+        timerActive = false;
+        emit(AcsFailedState(error: e.toString()));
+      }
+    } else {
+      await DevicesManagementApi().deviceControl(
+        deviceId,
+        Status(code: 'countdown_time', value: 0),
+      );
+      _countdownTimer?.cancel();
+      scheduledHours = 0;
+      scheduledMinutes = 0;
+      emit(currentState.copyWith(
+        isTimerActive: timerActive,
+        scheduledHours: 0,
+        scheduledMinutes: 0,
+      ));
+    }
+  }
+
+  void _startCountdownTimer(Emitter<AcsState> emit) {
+    _countdownTimer?.cancel();
+    int totalSeconds = (scheduledHours * 3600) + (scheduledMinutes * 60);
+
+    _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (totalSeconds > 0) {
+        totalSeconds--;
+        scheduledHours = totalSeconds ~/ 3600;
+        scheduledMinutes = (totalSeconds % 3600) ~/ 60;
+        add(UpdateTimerEvent());
+      } else {
+        _countdownTimer?.cancel();
+        timerActive = false;
+        scheduledHours = 0;
+        scheduledMinutes = 0;
+        add(TimerCompletedEvent());
+      }
+    });
+  }
+
+  void _handleUpdateTimer(UpdateTimerEvent event, Emitter<AcsState> emit) {
+    if (state is ACStatusLoaded) {
+      final currentState = state as ACStatusLoaded;
+      emit(currentState.copyWith(
+        scheduledHours: scheduledHours,
+        scheduledMinutes: scheduledMinutes,
+        isTimerActive: timerActive,
+      ));
+    }
+  }
+
+  void _handleApiCountdownValue(
+      ApiCountdownValueEvent event, Emitter<AcsState> emit) {
+    if (state is ACStatusLoaded) {
+      final totalMinutes = event.apiValue * 6;
+      final scheduledHours = totalMinutes ~/ 60;
+      scheduledMinutes = totalMinutes % 60;
+      _startCountdownTimer(
+        emit,
+      );
+      add(UpdateTimerEvent());
+    }
+  }
+
+  @override
+  Future<void> close() {
+    add(OnClose());
+    return super.close();
+  }
 }
diff --git a/lib/pages/device_managment/ac/bloc/ac_event.dart b/lib/pages/device_managment/ac/bloc/ac_event.dart
index 5492e198..9764f3ed 100644
--- a/lib/pages/device_managment/ac/bloc/ac_event.dart
+++ b/lib/pages/device_managment/ac/bloc/ac_event.dart
@@ -8,6 +8,7 @@ sealed class AcsEvent extends Equatable {
   @override
   List<Object> get props => [];
 }
+
 class AcUpdated extends AcsEvent {}
 
 class AcFetchDeviceStatusEvent extends AcsEvent {
@@ -18,10 +19,12 @@ class AcFetchDeviceStatusEvent extends AcsEvent {
   @override
   List<Object> get props => [deviceId];
 }
+
 class AcStatusUpdated extends AcsEvent {
   final AcStatusModel deviceStatus;
   AcStatusUpdated(this.deviceStatus);
 }
+
 class AcFetchBatchStatusEvent extends AcsEvent {
   final List<String> devicesIds;
 
@@ -73,3 +76,30 @@ class AcFactoryResetEvent extends AcsEvent {
   @override
   List<Object> get props => [deviceId, factoryResetModel];
 }
+
+
+
+class OnClose extends AcsEvent {}
+
+class IncreaseTimeEvent extends AcsEvent {
+  @override
+  List<Object> get props => [];
+}
+
+class DecreaseTimeEvent extends AcsEvent {
+  @override
+  List<Object> get props => [];
+}
+
+class ToggleScheduleEvent extends AcsEvent {}
+
+class TimerCompletedEvent extends AcsEvent {}
+
+class UpdateTimerEvent extends AcsEvent {
+}
+
+class ApiCountdownValueEvent extends AcsEvent {
+  final int apiValue;
+
+  const ApiCountdownValueEvent(this.apiValue);
+}
diff --git a/lib/pages/device_managment/ac/bloc/ac_state.dart b/lib/pages/device_managment/ac/bloc/ac_state.dart
index dfd12e6d..3e1e2c68 100644
--- a/lib/pages/device_managment/ac/bloc/ac_state.dart
+++ b/lib/pages/device_managment/ac/bloc/ac_state.dart
@@ -2,8 +2,9 @@ import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/ac/model/ac_model.dart';
 
 abstract class AcsState extends Equatable {
-  const AcsState();
+  final bool isTimerActive;
 
+  const AcsState({this.isTimerActive = false});
   @override
   List<Object> get props => [];
 }
@@ -15,8 +16,30 @@ class AcsLoadingState extends AcsState {}
 class ACStatusLoaded extends AcsState {
   final AcStatusModel status;
   final DateTime timestamp;
+  final int scheduledHours;
+  final int scheduledMinutes;
+  final bool isTimerActive;
 
-  ACStatusLoaded(this.status) : timestamp = DateTime.now();
+  ACStatusLoaded({
+    required this.status,
+    this.scheduledHours = 0,
+    this.scheduledMinutes = 0,
+    this.isTimerActive = false,
+  }) : timestamp = DateTime.now();
+  ACStatusLoaded copyWith({
+    AcStatusModel? status,
+    int? scheduledHours,
+    int? scheduledMinutes,
+    bool? isTimerActive,
+    int? remainingTime,
+  }) {
+    return ACStatusLoaded(
+      status: status ?? this.status,
+      scheduledHours: scheduledHours ?? this.scheduledHours,
+      scheduledMinutes: scheduledMinutes ?? this.scheduledMinutes,
+      isTimerActive: isTimerActive ?? this.isTimerActive,
+    );
+  }
 
   @override
   List<Object> get props => [status, timestamp];
@@ -40,3 +63,14 @@ class AcsFailedState extends AcsState {
   @override
   List<Object> get props => [error];
 }
+
+class TimerRunInProgress extends AcsState {
+  final int remainingTime;
+
+  const TimerRunInProgress(this.remainingTime);
+
+  @override
+  List<Object> get props => [remainingTime];
+}
+
+
diff --git a/lib/pages/device_managment/ac/model/ac_model.dart b/lib/pages/device_managment/ac/model/ac_model.dart
index 1eb2145f..c67006b2 100644
--- a/lib/pages/device_managment/ac/model/ac_model.dart
+++ b/lib/pages/device_managment/ac/model/ac_model.dart
@@ -11,6 +11,7 @@ class AcStatusModel {
   final bool childLock;
   final TempModes acMode;
   final FanSpeeds acFanSpeed;
+  late final int countdown1;
 
   AcStatusModel({
     required this.uuid,
@@ -18,6 +19,7 @@ class AcStatusModel {
     required this.modeString,
     required this.tempSet,
     required this.currentTemp,
+    required this.countdown1,
     required this.fanSpeedsString,
     required this.childLock,
   })  : acMode = getACMode(modeString),
@@ -30,6 +32,7 @@ class AcStatusModel {
     late int currentTemp;
     late String fanSpeeds;
     late bool childLock;
+    late int _countdown1 = 0;
 
     for (var status in jsonList) {
       switch (status.code) {
@@ -51,6 +54,9 @@ class AcStatusModel {
         case 'child_lock':
           childLock = status.value ?? false;
           break;
+        case 'countdown_time':
+          _countdown1 = status.value ?? 0;
+          break;
       }
     }
 
@@ -62,6 +68,7 @@ class AcStatusModel {
       currentTemp: currentTemp,
       fanSpeedsString: fanSpeeds,
       childLock: childLock,
+      countdown1: _countdown1,
     );
   }
 
@@ -73,6 +80,7 @@ class AcStatusModel {
     int? currentTemp,
     String? fanSpeedsString,
     bool? childLock,
+    int? countdown1,
   }) {
     return AcStatusModel(
       uuid: uuid ?? this.uuid,
@@ -82,6 +90,7 @@ class AcStatusModel {
       currentTemp: currentTemp ?? this.currentTemp,
       fanSpeedsString: fanSpeedsString ?? this.fanSpeedsString,
       childLock: childLock ?? this.childLock,
+      countdown1: countdown1 ?? this.countdown1,
     );
   }
 
diff --git a/lib/pages/device_managment/ac/view/ac_device_control.dart b/lib/pages/device_managment/ac/view/ac_device_control.dart
index 071344d7..e5c9bbbd 100644
--- a/lib/pages/device_managment/ac/view/ac_device_control.dart
+++ b/lib/pages/device_managment/ac/view/ac_device_control.dart
@@ -10,11 +10,10 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.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/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
-  const AcDeviceControlsView({super.key, required this.device});
+  AcDeviceControlsView({super.key, required this.device});
 
   final AllDevicesModel device;
 
@@ -23,11 +22,15 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
+
     return BlocProvider(
       create: (context) => AcBloc(deviceId: device.uuid!)
         ..add(AcFetchDeviceStatusEvent(device.uuid!)),
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
+          final acBloc = BlocProvider.of<AcBloc>(context);
+
+          print(state);
           if (state is ACStatusLoaded) {
             return GridView(
               padding: const EdgeInsets.symmetric(horizontal: 50),
@@ -78,56 +81,101 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
                 ),
                 ToggleWidget(
                   label: '',
-                  labelWidget: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  labelWidget: Column(
+                    crossAxisAlignment: CrossAxisAlignment.center,
+                    mainAxisAlignment: MainAxisAlignment.center,
                     children: [
-                      IconButton(
-                        padding: const EdgeInsets.all(0),
-                        onPressed: () {},
-                        icon: const Icon(
-                          Icons.remove,
-                          size: 28,
-                          color: ColorsManager.greyColor,
+                      Container(
+                        width: MediaQuery.of(context).size.width,
+                        decoration: const ShapeDecoration(
+                          color: ColorsManager.primaryColor,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.all(Radius.circular(30)),
+                          ),
                         ),
                       ),
-                      Text(
-                        '06',
-                        style: context.textTheme.titleLarge!.copyWith(
-                          color: ColorsManager.dialogBlueTitle,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      Text(
-                        'h',
-                        style: context.textTheme.bodySmall!
-                            .copyWith(color: ColorsManager.blackColor),
-                      ),
-                      Text(
-                        '30',
-                        style: context.textTheme.titleLarge!.copyWith(
-                          color: ColorsManager.dialogBlueTitle,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
-                      Text('m',
-                          style: context.textTheme.bodySmall!
-                              .copyWith(color: ColorsManager.blackColor)),
-                      IconButton(
-                        padding: const EdgeInsets.all(0),
-                        onPressed: () {},
-                        icon: const Icon(
-                          Icons.add,
-                          size: 28,
-                          color: ColorsManager.greyColor,
+                      Center(
+                        child: SizedBox(
+                          child: Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                            children: [
+                              IconButton(
+                                onPressed: () {
+                                  if (acBloc.timerActive == false) {
+                                    context
+                                        .read<AcBloc>()
+                                        .add(DecreaseTimeEvent());
+                                  }
+                                },
+                                icon: const Icon(Icons.remove,
+                                    color: ColorsManager.greyColor),
+                              ),
+                              Text(
+                                acBloc.scheduledHours
+                                    .toString()
+                                    .padLeft(2, '0'),
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleLarge!
+                                    .copyWith(
+                                      color: ColorsManager.dialogBlueTitle,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                              ),
+                              Text(
+                                'h',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodySmall!
+                                    .copyWith(
+                                      color: ColorsManager.blackColor,
+                                    ),
+                              ),
+                              Text(
+                                acBloc.scheduledMinutes
+                                    .toString()
+                                    .padLeft(2, '0'),
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .titleLarge!
+                                    .copyWith(
+                                      color: ColorsManager.dialogBlueTitle,
+                                      fontWeight: FontWeight.bold,
+                                    ),
+                              ),
+                              Text(
+                                'm',
+                                style: Theme.of(context)
+                                    .textTheme
+                                    .bodySmall!
+                                    .copyWith(
+                                      color: ColorsManager.blackColor,
+                                    ),
+                              ),
+                              IconButton(
+                                onPressed: () {
+                                  if (acBloc.timerActive == false) {
+                                    context
+                                        .read<AcBloc>()
+                                        .add(IncreaseTimeEvent());
+                                  }
+                                },
+                                icon: const Icon(Icons.add,
+                                    color: ColorsManager.greyColor),
+                              ),
+                            ],
+                          ),
                         ),
                       ),
                     ],
                   ),
-                  value: false,
+                  value: acBloc.timerActive,
                   code: 'ac_schedule',
                   deviceId: device.uuid!,
                   icon: Assets.acSchedule,
-                  onChange: (value) {},
+                  onChange: (value) {
+                    context.read<AcBloc>().add(ToggleScheduleEvent());
+                  },
                 ),
                 ToggleWidget(
                   deviceId: device.uuid!,

From cb6d50d3671e7a1b122add70f8d6e1b4dcf0fbbc Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 13 Apr 2025 12:21:35 +0300
Subject: [PATCH 088/238] remove unnecessary print statement

---
 lib/pages/device_managment/ac/view/ac_device_control.dart | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/pages/device_managment/ac/view/ac_device_control.dart b/lib/pages/device_managment/ac/view/ac_device_control.dart
index e5c9bbbd..4e8f896c 100644
--- a/lib/pages/device_managment/ac/view/ac_device_control.dart
+++ b/lib/pages/device_managment/ac/view/ac_device_control.dart
@@ -29,8 +29,6 @@ class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
       child: BlocBuilder<AcBloc, AcsState>(
         builder: (context, state) {
           final acBloc = BlocProvider.of<AcBloc>(context);
-
-          print(state);
           if (state is ACStatusLoaded) {
             return GridView(
               padding: const EdgeInsets.symmetric(horizontal: 50),

From bc32fe7941ebbab221c0b429d14b11a9c06b38d2 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:25:03 +0300
Subject: [PATCH 089/238] removed unused method and its use.

---
 .../all_spaces/widgets/sidebar_widget.dart    | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 17566da7..e4a5d14d 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -36,7 +36,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   void initState() {
     super.initState();
-    _selectedId = widget.selectedSpaceUuid; // Initialize with the passed selected space UUID
+    _selectedId =
+        widget.selectedSpaceUuid; // Initialize with the passed selected space UUID
   }
 
   @override
@@ -61,8 +62,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     return widget.communities.where((community) {
       final containsQueryInCommunity =
           community.name.toLowerCase().contains(_searchQuery.toLowerCase());
-      final containsQueryInSpaces =
-          community.spaces.any((space) => _containsQuery(space, _searchQuery.toLowerCase()));
+      final containsQueryInSpaces = community.spaces
+          .any((space) => _containsQuery(space, _searchQuery.toLowerCase()));
 
       return containsQueryInCommunity || containsQueryInSpaces;
     }).toList();
@@ -71,8 +72,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren =
-        space.children.any((child) => _containsQuery(child, query)); // Recursive check for children
+    final matchesChildren = space.children.any(
+        (child) => _containsQuery(child, query)); // Recursive check for children
 
     // If the space or any of its children match the query, expand this space
     if (matchesSpace || matchesChildren) {
@@ -106,7 +107,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       width: 300,
       decoration: subSectionContainerDecoration,
       child: Column(
-        mainAxisSize: MainAxisSize.min, // Ensures the Column only takes necessary height
+        mainAxisSize:
+            MainAxisSize.min, // Ensures the Column only takes necessary height
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           // Communities title with the add button
@@ -153,9 +155,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           // Community list
           Expanded(
             child: ListView(
-              children: filteredCommunities.map((community) {
-                return _buildCommunityTile(context, community);
-              }).toList(),
+              children: filteredCommunities
+                  .map((community) => _buildCommunityTile(context, community))
+                  .toList(),
             ),
           ),
         ],
@@ -192,9 +194,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               SelectCommunityEvent(selectedCommunity: community),
             );
       },
-      onExpansionChanged: (String title, bool expanded) {
-        _handleExpansionChange(community.uuid, expanded);
-      },
+      onExpansionChanged: (title, expanded) {},
       children: hasChildren
           ? community.spaces
               .where((space) => (space.status != SpaceStatus.deleted ||
@@ -205,7 +205,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  Widget _buildSpaceTile(SpaceModel space, CommunityModel community, {int depth = 1}) {
+  Widget _buildSpaceTile(SpaceModel space, CommunityModel community,
+      {int depth = 1}) {
     bool isExpandedSpace = _isSpaceOrChildSelected(space);
     return Padding(
         padding: EdgeInsets.only(left: depth * 16.0),
@@ -214,9 +215,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           key: ValueKey(space.uuid),
           isSelected: _selectedId == space.uuid,
           initiallyExpanded: isExpandedSpace,
-          onExpansionChanged: (bool expanded) {
-            _handleExpansionChange(space.uuid ?? '', expanded);
-          },
+          onExpansionChanged: (expanded) {},
           onItemSelected: () {
             setState(() {
               _selectedId = space.uuid;
@@ -224,14 +223,15 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             });
 
             context.read<SpaceManagementBloc>().add(
-                  SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
+                  SelectSpaceEvent(
+                      selectedCommunity: community, selectedSpace: space),
                 );
           },
           children: space.children.isNotEmpty
-              ? space.children.map((childSpace) => _buildSpaceTile(childSpace, community)).toList()
+              ? space.children
+                  .map((childSpace) => _buildSpaceTile(childSpace, community))
+                  .toList()
               : [], // Recursively render child spaces if available
         ));
   }
-
-  void _handleExpansionChange(String uuid, bool expanded) {}
 }

From 978934399e96766eb9b4064cdffca696be9b6670 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:25:28 +0300
Subject: [PATCH 090/238] fixed invalid use of a private type in a public API
 in `SidebarWidget`.

---
 .../spaces_management/all_spaces/widgets/sidebar_widget.dart    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index e4a5d14d..81cec22f 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -25,7 +25,7 @@ class SidebarWidget extends StatefulWidget {
   });
 
   @override
-  _SidebarWidgetState createState() => _SidebarWidgetState();
+  State<SidebarWidget> createState() => _SidebarWidgetState();
 }
 
 class _SidebarWidgetState extends State<SidebarWidget> {

From 35a99ccda7c7ddc3d0654f562235ff993a02b492 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:27:04 +0300
Subject: [PATCH 091/238] removed unnecessary comments from `SidebarWidget`.

---
 .../all_spaces/widgets/sidebar_widget.dart    | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 81cec22f..2e486cc6 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -29,15 +29,14 @@ class SidebarWidget extends StatefulWidget {
 }
 
 class _SidebarWidgetState extends State<SidebarWidget> {
-  String _searchQuery = ''; // Track search query
+  String _searchQuery = '';
   String? _selectedSpaceUuid;
   String? _selectedId;
 
   @override
   void initState() {
     super.initState();
-    _selectedId =
-        widget.selectedSpaceUuid; // Initialize with the passed selected space UUID
+    _selectedId = widget.selectedSpaceUuid;
   }
 
   @override
@@ -50,15 +49,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     }
   }
 
-  // Function to filter communities based on the search query
   List<CommunityModel> _filterCommunities() {
     if (_searchQuery.isEmpty) {
-      // Reset the selected community and space UUIDs if there's no query
       _selectedSpaceUuid = null;
       return widget.communities;
     }
 
-    // Filter communities and expand only those that match the query
     return widget.communities.where((community) {
       final containsQueryInCommunity =
           community.name.toLowerCase().contains(_searchQuery.toLowerCase());
@@ -69,13 +65,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     }).toList();
   }
 
-  // Helper function to determine if any space or its children match the search query
   bool _containsQuery(SpaceModel space, String query) {
     final matchesSpace = space.name.toLowerCase().contains(query);
     final matchesChildren = space.children.any(
-        (child) => _containsQuery(child, query)); // Recursive check for children
+      (child) => _containsQuery(child, query),
+    );
 
-    // If the space or any of its children match the query, expand this space
     if (matchesSpace || matchesChildren) {
       _selectedSpaceUuid = space.uuid;
     }
@@ -84,12 +79,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   bool _isSpaceOrChildSelected(SpaceModel space) {
-    // Return true if the current space or any of its child spaces is selected
     if (_selectedSpaceUuid == space.uuid) {
       return true;
     }
 
-    // Recursively check if any child spaces match the query
     for (var child in space.children) {
       if (_isSpaceOrChildSelected(child)) {
         return true;
@@ -107,11 +100,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       width: 300,
       decoration: subSectionContainerDecoration,
       child: Column(
-        mainAxisSize:
-            MainAxisSize.min, // Ensures the Column only takes necessary height
+        mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          // Communities title with the add button
           Container(
             decoration: subSectionContainerDecoration,
             padding: const EdgeInsets.all(16.0),
@@ -143,7 +134,6 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               ],
             ),
           ),
-          // Search bar
           CustomSearchBar(
             onSearchChanged: (query) {
               setState(() {
@@ -152,7 +142,6 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             },
           ),
           const SizedBox(height: 16),
-          // Community list
           Expanded(
             child: ListView(
               children: filteredCommunities
@@ -185,7 +174,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       onItemSelected: () {
         setState(() {
           _selectedId = community.uuid;
-          _selectedSpaceUuid = null; // Update the selected community
+          _selectedSpaceUuid = null;
         });
 
         context.read<CenterBodyBloc>().add(CommunitySelectedEvent());
@@ -231,7 +220,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               ? space.children
                   .map((childSpace) => _buildSpaceTile(childSpace, community))
                   .toList()
-              : [], // Recursively render child spaces if available
+              : [],
         ));
   }
 }

From bfd3d4542e2a6829bc2871d65b6a00a49e35397a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:28:50 +0300
Subject: [PATCH 092/238] refactor: simplify onSearchChanged callback to use
 expressions.

---
 .../all_spaces/widgets/sidebar_widget.dart                  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 2e486cc6..7c362dd7 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -135,11 +135,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             ),
           ),
           CustomSearchBar(
-            onSearchChanged: (query) {
-              setState(() {
-                _searchQuery = query;
-              });
-            },
+            onSearchChanged: (query) => setState(() => _searchQuery = query),
           ),
           const SizedBox(height: 16),
           Expanded(

From cd9821679effb740aaa61b4716689c53272a007d Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:29:38 +0300
Subject: [PATCH 093/238] added trailing commas.

---
 .../all_spaces/widgets/sidebar_widget.dart    | 56 ++++++++++---------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 7c362dd7..482bb447 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -109,10 +109,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             child: Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                Text('Communities',
-                    style: Theme.of(context).textTheme.titleMedium?.copyWith(
-                          color: ColorsManager.blackColor,
-                        )),
+                Text(
+                  'Communities',
+                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                        color: ColorsManager.blackColor,
+                      ),
+                ),
                 GestureDetector(
                   onTap: () => _navigateToBlank(context),
                   child: Container(
@@ -194,29 +196,29 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       {int depth = 1}) {
     bool isExpandedSpace = _isSpaceOrChildSelected(space);
     return Padding(
-        padding: EdgeInsets.only(left: depth * 16.0),
-        child: SpaceTile(
-          title: space.name,
-          key: ValueKey(space.uuid),
-          isSelected: _selectedId == space.uuid,
-          initiallyExpanded: isExpandedSpace,
-          onExpansionChanged: (expanded) {},
-          onItemSelected: () {
-            setState(() {
-              _selectedId = space.uuid;
-              _selectedSpaceUuid = space.uuid;
-            });
+      padding: EdgeInsets.only(left: depth * 16.0),
+      child: SpaceTile(
+        title: space.name,
+        key: ValueKey(space.uuid),
+        isSelected: _selectedId == space.uuid,
+        initiallyExpanded: isExpandedSpace,
+        onExpansionChanged: (expanded) {},
+        onItemSelected: () {
+          setState(() {
+            _selectedId = space.uuid;
+            _selectedSpaceUuid = space.uuid;
+          });
 
-            context.read<SpaceManagementBloc>().add(
-                  SelectSpaceEvent(
-                      selectedCommunity: community, selectedSpace: space),
-                );
-          },
-          children: space.children.isNotEmpty
-              ? space.children
-                  .map((childSpace) => _buildSpaceTile(childSpace, community))
-                  .toList()
-              : [],
-        ));
+          context.read<SpaceManagementBloc>().add(
+                SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
+              );
+        },
+        children: space.children.isNotEmpty
+            ? space.children
+                .map((childSpace) => _buildSpaceTile(childSpace, community))
+                .toList()
+            : [],
+      ),
+    );
   }
 }

From c2f5a8df10ba6d9f4b44da229b018c697fb286e4 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:31:17 +0300
Subject: [PATCH 094/238] refactor: streamline context usage and improve
 readability in SidebarWidget

---
 .../all_spaces/widgets/sidebar_widget.dart            | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 482bb447..d241a9c1 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -12,6 +12,7 @@ import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/cent
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.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';
 
 class SidebarWidget extends StatefulWidget {
@@ -111,7 +112,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               children: [
                 Text(
                   'Communities',
-                  style: Theme.of(context).textTheme.titleMedium?.copyWith(
+                  style: context.textTheme.titleMedium?.copyWith(
                         color: ColorsManager.blackColor,
                       ),
                 ),
@@ -153,9 +154,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   void _navigateToBlank(BuildContext context) {
-    setState(() {
-      _selectedId = '';
-    });
+    setState(() => _selectedId = '');
     context.read<SpaceManagementBloc>().add(
           NewCommunityEvent(communities: widget.communities),
         );
@@ -194,14 +193,14 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   Widget _buildSpaceTile(SpaceModel space, CommunityModel community,
       {int depth = 1}) {
-    bool isExpandedSpace = _isSpaceOrChildSelected(space);
+    bool spaceIsExpanded = _isSpaceOrChildSelected(space);
     return Padding(
       padding: EdgeInsets.only(left: depth * 16.0),
       child: SpaceTile(
         title: space.name,
         key: ValueKey(space.uuid),
         isSelected: _selectedId == space.uuid,
-        initiallyExpanded: isExpandedSpace,
+        initiallyExpanded: spaceIsExpanded,
         onExpansionChanged: (expanded) {},
         onItemSelected: () {
           setState(() {

From 55695ca5db761e532469b0251a171f43a324516f Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:33:50 +0300
Subject: [PATCH 095/238] refactor: improve readability and structure in
 SidebarWidget's space tile handling

---
 .../all_spaces/widgets/sidebar_widget.dart    | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index d241a9c1..1e6b2bf5 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -113,8 +113,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
                 Text(
                   'Communities',
                   style: context.textTheme.titleMedium?.copyWith(
-                        color: ColorsManager.blackColor,
-                      ),
+                    color: ColorsManager.blackColor,
+                  ),
                 ),
                 GestureDetector(
                   onTap: () => _navigateToBlank(context),
@@ -183,23 +183,30 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       onExpansionChanged: (title, expanded) {},
       children: hasChildren
           ? community.spaces
-              .where((space) => (space.status != SpaceStatus.deleted ||
-                  space.status != SpaceStatus.parentDeleted))
-              .map((space) => _buildSpaceTile(space, community))
+              .where((space) {
+                final isDeleted = space.status != SpaceStatus.deleted;
+                final isParentDeleted = space.status != SpaceStatus.parentDeleted;
+                return (isDeleted || isParentDeleted);
+              })
+              .map((space) => _buildSpaceTile(space: space, community: community))
               .toList()
           : null,
     );
   }
 
-  Widget _buildSpaceTile(SpaceModel space, CommunityModel community,
-      {int depth = 1}) {
+  Widget _buildSpaceTile({
+    required SpaceModel space,
+    required CommunityModel community,
+    int depth = 1,
+  }) {
     bool spaceIsExpanded = _isSpaceOrChildSelected(space);
+    final isSelected = _selectedId == space.uuid;
     return Padding(
       padding: EdgeInsets.only(left: depth * 16.0),
       child: SpaceTile(
         title: space.name,
         key: ValueKey(space.uuid),
-        isSelected: _selectedId == space.uuid,
+        isSelected: isSelected,
         initiallyExpanded: spaceIsExpanded,
         onExpansionChanged: (expanded) {},
         onItemSelected: () {
@@ -212,11 +219,14 @@ class _SidebarWidgetState extends State<SidebarWidget> {
                 SelectSpaceEvent(selectedCommunity: community, selectedSpace: space),
               );
         },
-        children: space.children.isNotEmpty
-            ? space.children
-                .map((childSpace) => _buildSpaceTile(childSpace, community))
-                .toList()
-            : [],
+        children: space.children
+            .map(
+              (childSpace) => _buildSpaceTile(
+                space: childSpace,
+                community: community,
+              ),
+            )
+            .toList(),
       ),
     );
   }

From 62ee9a72d6143e47f6946421ecf60f22e347a330 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:47:00 +0300
Subject: [PATCH 096/238] moved `SidebarHeader` and `SidebarAddCommunityButton`
 to their own files.

---
 .../widgets/sidebar_add_community_button.dart | 32 ++++++++
 .../all_spaces/widgets/sidebar_header.dart    | 29 +++++++
 .../all_spaces/widgets/sidebar_widget.dart    | 78 +++++--------------
 3 files changed, 79 insertions(+), 60 deletions(-)
 create mode 100644 lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
 create mode 100644 lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
new file mode 100644
index 00000000..2f434350
--- /dev/null
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
@@ -0,0 +1,32 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+class SidebarAddCommunityButton extends StatelessWidget {
+  const SidebarAddCommunityButton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => _navigateToBlank(context),
+      child: Container(
+        width: 30,
+        height: 30,
+        decoration: const BoxDecoration(
+          color: ColorsManager.whiteColors,
+          shape: BoxShape.circle,
+        ),
+        child: Center(
+          child: SvgPicture.asset(
+            Assets.roundedAddIcon,
+            width: 24,
+            height: 24,
+          ),
+        ),
+      ),
+    );
+  }
+
+  void _navigateToBlank(BuildContext context) {}
+}
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
new file mode 100644
index 00000000..1e386d4f
--- /dev/null
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class SidebarHeader extends StatelessWidget {
+  const SidebarHeader({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      decoration: subSectionContainerDecoration,
+      padding: const EdgeInsets.all(16.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Text(
+            'Communities',
+            style: context.textTheme.titleMedium?.copyWith(
+              color: ColorsManager.blackColor,
+            ),
+          ),
+          const SidebarAddCommunityButton(),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 1e6b2bf5..a98dead8 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -1,18 +1,15 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_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';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_tile.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_header.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.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';
 
 class SidebarWidget extends StatefulWidget {
@@ -20,9 +17,9 @@ class SidebarWidget extends StatefulWidget {
   final String? selectedSpaceUuid;
 
   const SidebarWidget({
-    super.key,
     required this.communities,
     this.selectedSpaceUuid,
+    super.key,
   });
 
   @override
@@ -36,21 +33,19 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   void initState() {
-    super.initState();
     _selectedId = widget.selectedSpaceUuid;
+    super.initState();
   }
 
   @override
   void didUpdateWidget(covariant SidebarWidget oldWidget) {
-    super.didUpdateWidget(oldWidget);
     if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
-      setState(() {
-        _selectedId = widget.selectedSpaceUuid;
-      });
+      setState(() => _selectedId = widget.selectedSpaceUuid);
     }
+    super.didUpdateWidget(oldWidget);
   }
 
-  List<CommunityModel> _filterCommunities() {
+  List<CommunityModel> _filteredCommunities() {
     if (_searchQuery.isEmpty) {
       _selectedSpaceUuid = null;
       return widget.communities;
@@ -59,17 +54,20 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     return widget.communities.where((community) {
       final containsQueryInCommunity =
           community.name.toLowerCase().contains(_searchQuery.toLowerCase());
-      final containsQueryInSpaces = community.spaces
-          .any((space) => _containsQuery(space, _searchQuery.toLowerCase()));
+      final containsQueryInSpaces = community.spaces.any((space) =>
+          _containsQuery(space: space, query: _searchQuery.toLowerCase()));
 
       return containsQueryInCommunity || containsQueryInSpaces;
     }).toList();
   }
 
-  bool _containsQuery(SpaceModel space, String query) {
+  bool _containsQuery({
+    required SpaceModel space,
+    required String query,
+  }) {
     final matchesSpace = space.name.toLowerCase().contains(query);
     final matchesChildren = space.children.any(
-      (child) => _containsQuery(child, query),
+      (child) => _containsQuery(space: child, query: query),
     );
 
     if (matchesSpace || matchesChildren) {
@@ -95,7 +93,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final filteredCommunities = _filterCommunities();
+    final filteredCommunities = _filteredCommunities();
 
     return Container(
       width: 300,
@@ -104,39 +102,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Container(
-            decoration: subSectionContainerDecoration,
-            padding: const EdgeInsets.all(16.0),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-              children: [
-                Text(
-                  'Communities',
-                  style: context.textTheme.titleMedium?.copyWith(
-                    color: ColorsManager.blackColor,
-                  ),
-                ),
-                GestureDetector(
-                  onTap: () => _navigateToBlank(context),
-                  child: Container(
-                    width: 30,
-                    height: 30,
-                    decoration: const BoxDecoration(
-                      color: ColorsManager.whiteColors,
-                      shape: BoxShape.circle,
-                    ),
-                    child: Center(
-                      child: SvgPicture.asset(
-                        Assets.roundedAddIcon,
-                        width: 24,
-                        height: 24,
-                      ),
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
+          const SidebarHeader(),
           CustomSearchBar(
             onSearchChanged: (query) => setState(() => _searchQuery = query),
           ),
@@ -153,15 +119,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  void _navigateToBlank(BuildContext context) {
-    setState(() => _selectedId = '');
-    context.read<SpaceManagementBloc>().add(
-          NewCommunityEvent(communities: widget.communities),
-        );
-  }
-
   Widget _buildCommunityTile(BuildContext context, CommunityModel community) {
-    bool hasChildren = community.spaces.isNotEmpty;
+    final hasChildren = community.spaces.isNotEmpty;
 
     return CommunityTile(
       title: community.name,
@@ -197,12 +156,11 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   Widget _buildSpaceTile({
     required SpaceModel space,
     required CommunityModel community,
-    int depth = 1,
   }) {
-    bool spaceIsExpanded = _isSpaceOrChildSelected(space);
+    final spaceIsExpanded = _isSpaceOrChildSelected(space);
     final isSelected = _selectedId == space.uuid;
     return Padding(
-      padding: EdgeInsets.only(left: depth * 16.0),
+      padding: const EdgeInsetsDirectional.only(start: 16.0),
       child: SpaceTile(
         title: space.name,
         key: ValueKey(space.uuid),

From c7c88987631551721db1dde86065c7bce5cfeb77 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 12:52:38 +0300
Subject: [PATCH 097/238] removed redundant code.

---
 .../all_spaces/widgets/sidebar_widget.dart    | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index a98dead8..b7eacc0b 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -120,8 +120,6 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   Widget _buildCommunityTile(BuildContext context, CommunityModel community) {
-    final hasChildren = community.spaces.isNotEmpty;
-
     return CommunityTile(
       title: community.name,
       key: ValueKey(community.uuid),
@@ -140,16 +138,14 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             );
       },
       onExpansionChanged: (title, expanded) {},
-      children: hasChildren
-          ? community.spaces
-              .where((space) {
-                final isDeleted = space.status != SpaceStatus.deleted;
-                final isParentDeleted = space.status != SpaceStatus.parentDeleted;
-                return (isDeleted || isParentDeleted);
-              })
-              .map((space) => _buildSpaceTile(space: space, community: community))
-              .toList()
-          : null,
+      children: community.spaces
+          .where((space) {
+            final isDeleted = space.status != SpaceStatus.deleted;
+            final isParentDeleted = space.status != SpaceStatus.parentDeleted;
+            return (isDeleted || isParentDeleted);
+          })
+          .map((space) => _buildSpaceTile(space: space, community: community))
+          .toList(),
     );
   }
 

From 6493f02bccc7c3de144b5375c4807c04389aa79a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 13:08:23 +0300
Subject: [PATCH 098/238] simplify if statements readabaility.

---
 .../all_spaces/widgets/sidebar_widget.dart               | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index b7eacc0b..92e72326 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -78,14 +78,11 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   bool _isSpaceOrChildSelected(SpaceModel space) {
-    if (_selectedSpaceUuid == space.uuid) {
-      return true;
-    }
+    if (_selectedSpaceUuid == space.uuid) return true;
+    
 
     for (var child in space.children) {
-      if (_isSpaceOrChildSelected(child)) {
-        return true;
-      }
+      if (_isSpaceOrChildSelected(child)) return true;
     }
 
     return false;

From 79f5ef7871df02a53f511ac9df114eba14ec82c3 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 13:12:48 +0300
Subject: [PATCH 099/238] simplify space selection logic.

---
 .../all_spaces/widgets/sidebar_widget.dart            | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 92e72326..b103184e 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -78,14 +78,9 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   bool _isSpaceOrChildSelected(SpaceModel space) {
-    if (_selectedSpaceUuid == space.uuid) return true;
-    
-
-    for (var child in space.children) {
-      if (_isSpaceOrChildSelected(child)) return true;
-    }
-
-    return false;
+    final isSpaceSelected = _selectedSpaceUuid == space.uuid;
+    final anySubSpaceIsSelected = space.children.any(_isSpaceOrChildSelected);
+    return isSpaceSelected || anySubSpaceIsSelected;
   }
 
   @override

From acad0e8c9c79431f6a5158bc7df90a8f4468ac52 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 13 Apr 2025 14:50:07 +0300
Subject: [PATCH 100/238] 
 SP-1189-FE-Add-Button-Not-clickable-Opening-Pop-up-in-Community-Screen

---
 .../widgets/sidebar_add_community_button.dart | 51 +++++++++++++------
 .../all_spaces/widgets/sidebar_header.dart    |  8 +--
 .../all_spaces/widgets/sidebar_widget.dart    |  5 +-
 3 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
index 2f434350..5c769d48 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
@@ -1,32 +1,51 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class SidebarAddCommunityButton extends StatelessWidget {
-  const SidebarAddCommunityButton({super.key});
+  const SidebarAddCommunityButton({
+    required this.existingCommunityNames,
+    super.key,
+  });
+
+  final List<String> existingCommunityNames;
 
   @override
   Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: () => _navigateToBlank(context),
-      child: Container(
-        width: 30,
-        height: 30,
-        decoration: const BoxDecoration(
-          color: ColorsManager.whiteColors,
-          shape: BoxShape.circle,
-        ),
-        child: Center(
-          child: SvgPicture.asset(
-            Assets.roundedAddIcon,
-            width: 24,
-            height: 24,
+    return SizedBox.square(
+      dimension: 30,
+      child: IconButton(
+        style: IconButton.styleFrom(
+          iconSize: 20,
+          backgroundColor: ColorsManager.circleImageBackground,
+          shape: const CircleBorder(
+            side: BorderSide(
+              color: ColorsManager.lightGrayBorderColor,
+              width: 3,
+            ),
           ),
         ),
+        onPressed: () => _showCreateCommunityDialog(context),
+        icon: SvgPicture.asset(Assets.addIcon),
       ),
     );
   }
 
-  void _navigateToBlank(BuildContext context) {}
+  void _showCreateCommunityDialog(BuildContext context) => showDialog<void>(
+        context: context,
+        builder: (context) => CreateCommunityDialog(
+          isEditMode: false,
+          existingCommunityNames: existingCommunityNames,
+          onCreateCommunity: (name, description) {
+            context.read<SpaceManagementBloc>().add(
+                  CreateCommunityEvent(name, description, context),
+                );
+          },
+        ),
+      );
 }
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
index 1e386d4f..135be109 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
@@ -5,13 +5,15 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class SidebarHeader extends StatelessWidget {
-  const SidebarHeader({super.key});
+  const SidebarHeader({required this.existingCommunityNames, super.key});
+
+  final List<String> existingCommunityNames;
 
   @override
   Widget build(BuildContext context) {
     return Container(
       decoration: subSectionContainerDecoration,
-      padding: const EdgeInsets.all(16.0),
+      padding: const EdgeInsets.all(16),
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
@@ -21,7 +23,7 @@ class SidebarHeader extends StatelessWidget {
               color: ColorsManager.blackColor,
             ),
           ),
-          const SidebarAddCommunityButton(),
+          SidebarAddCommunityButton(existingCommunityNames: existingCommunityNames),
         ],
       ),
     );
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index b103184e..35bb8ad2 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -94,7 +94,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          const SidebarHeader(),
+          SidebarHeader(
+            existingCommunityNames:
+                widget.communities.map((community) => community.name).toList(),
+          ),
           CustomSearchBar(
             onSearchChanged: (query) => setState(() => _searchQuery = query),
           ),

From 9bf37243a6dd4f79f9d5cf3c7a2db0d1420f6fa4 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 13 Apr 2025 14:55:55 +0300
Subject: [PATCH 101/238] remove unused code and make a limitation for the
 nobody time picker

---
 .../device_managment/ac/model/ac_model.dart   |  2 +-
 .../ac/view/ac_device_control.dart            |  2 +-
 .../wall_sensor/time_wheel.dart               | 65 ++++++++++++-------
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/lib/pages/device_managment/ac/model/ac_model.dart b/lib/pages/device_managment/ac/model/ac_model.dart
index c67006b2..6afc778d 100644
--- a/lib/pages/device_managment/ac/model/ac_model.dart
+++ b/lib/pages/device_managment/ac/model/ac_model.dart
@@ -11,7 +11,7 @@ class AcStatusModel {
   final bool childLock;
   final TempModes acMode;
   final FanSpeeds acFanSpeed;
-  late final int countdown1;
+  final int countdown1;
 
   AcStatusModel({
     required this.uuid,
diff --git a/lib/pages/device_managment/ac/view/ac_device_control.dart b/lib/pages/device_managment/ac/view/ac_device_control.dart
index 4e8f896c..8c33c853 100644
--- a/lib/pages/device_managment/ac/view/ac_device_control.dart
+++ b/lib/pages/device_managment/ac/view/ac_device_control.dart
@@ -13,7 +13,7 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class AcDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
-  AcDeviceControlsView({super.key, required this.device});
+ const  AcDeviceControlsView({super.key, required this.device});
 
   final AllDevicesModel device;
 
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart
index a5b24a22..56f74054 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/time_wheel.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
@@ -28,9 +27,12 @@ class _TimeWheelPickerState extends State<TimeWheelPicker> {
   @override
   void initState() {
     super.initState();
-    _hoursController = FixedExtentScrollController(initialItem: widget.initialHours);
-    _minutesController = FixedExtentScrollController(initialItem: widget.initialMinutes);
-    _secondsController = FixedExtentScrollController(initialItem: widget.initialSeconds);
+    _hoursController =
+        FixedExtentScrollController(initialItem: widget.initialHours);
+    _minutesController =
+        FixedExtentScrollController(initialItem: widget.initialMinutes);
+    _secondsController =
+        FixedExtentScrollController(initialItem: widget.initialSeconds);
   }
 
   @override
@@ -47,6 +49,8 @@ class _TimeWheelPickerState extends State<TimeWheelPicker> {
     }
   }
 
+
+
   @override
   void dispose() {
     _hoursController.dispose();
@@ -61,26 +65,28 @@ class _TimeWheelPickerState extends State<TimeWheelPicker> {
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         _buildPickerColumn(
-          label: 'h',
-          controller: _hoursController,
-          itemCount: 24,
-          onChanged: (value) => _handleTimeChange(
-            value,
-            _minutesController.selectedItem,
-            _secondsController.selectedItem,
-          ),
-        ),
+            label: 'h',
+            controller: _hoursController,
+            itemCount: 3,
+            onChanged: (value) {
+              _handleTimeChange(
+                value,
+                _minutesController.selectedItem,
+                _secondsController.selectedItem,
+              );
+            }),
         const SizedBox(width: 5),
         _buildPickerColumn(
-          label: 'm',
-          controller: _minutesController,
-          itemCount: 60,
-          onChanged: (value) => _handleTimeChange(
-            _hoursController.selectedItem,
-            value,
-            _secondsController.selectedItem,
-          ),
-        ),
+            label: 'm',
+            controller: _minutesController,
+            itemCount: 60,
+            onChanged: (value) {
+              _handleTimeChange(
+                _hoursController.selectedItem,
+                value,
+                _secondsController.selectedItem,
+              );
+            }),
         const SizedBox(width: 5),
         _buildPickerColumn(
           label: 's',
@@ -97,6 +103,19 @@ class _TimeWheelPickerState extends State<TimeWheelPicker> {
   }
 
   void _handleTimeChange(int hours, int minutes, int seconds) {
+    int total = hours * 3600 + minutes * 60 + seconds;
+    if (total > 10000) {
+      hours = 2;
+      minutes = 46;
+      seconds = 40;
+      total = 10000;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _hoursController.jumpToItem(hours);
+        _minutesController.jumpToItem(minutes);
+        _secondsController.jumpToItem(seconds);
+      });
+    }
+
     widget.onTimeChanged(hours, minutes, seconds);
   }
 
@@ -147,4 +166,4 @@ class _TimeWheelPickerState extends State<TimeWheelPicker> {
       ],
     );
   }
-}
\ No newline at end of file
+}

From 4fae2d6be0c0ba395194a0db67493f8a4ba82617 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Sun, 13 Apr 2025 16:19:16 +0300
Subject: [PATCH 102/238] Refactor SosDeviceControlsView

---
 .../sos/view/sos_device_control_view.dart             | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/pages/device_managment/sos/view/sos_device_control_view.dart b/lib/pages/device_managment/sos/view/sos_device_control_view.dart
index dff67c55..dde4512b 100644
--- a/lib/pages/device_managment/sos/view/sos_device_control_view.dart
+++ b/lib/pages/device_managment/sos/view/sos_device_control_view.dart
@@ -13,7 +13,8 @@ import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_la
 
 import '../models/sos_status_model.dart';
 
-class SosDeviceControlsView extends StatelessWidget with HelperResponsiveLayout {
+class SosDeviceControlsView extends StatelessWidget
+    with HelperResponsiveLayout {
   const SosDeviceControlsView({
     super.key,
     required this.device,
@@ -24,7 +25,8 @@ class SosDeviceControlsView extends StatelessWidget with HelperResponsiveLayout
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) => SosDeviceBloc()..add(GetDeviceStatus(device.uuid!)),
+        create: (context) =>
+            SosDeviceBloc()..add(GetDeviceStatus(device.uuid!)),
         child: BlocBuilder<SosDeviceBloc, SosDeviceState>(
           builder: (context, state) {
             if (state is SosDeviceLoadingState) {
@@ -63,7 +65,8 @@ class SosDeviceControlsView extends StatelessWidget with HelperResponsiveLayout
         ));
   }
 
-  Widget _buildStatusControls(BuildContext context, SosStatusModel deviceStatus) {
+  Widget _buildStatusControls(
+      BuildContext context, SosStatusModel deviceStatus) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -85,7 +88,7 @@ class SosDeviceControlsView extends StatelessWidget with HelperResponsiveLayout
         IconNameStatusContainer(
           isFullIcon: false,
           name: deviceStatus.sosStatus == 'sos' ? 'SOS' : 'Normal',
-          icon: deviceStatus.sosStatus == 'sos' ? Assets.sos : Assets.sosNormal,
+          icon: deviceStatus.sosStatus == 'sos' ? Assets.sosNormal : Assets.sos,
           onTap: () {},
           status: false,
           textColor: ColorsManager.blackColor,

From 140f4ff5e20e4e4b760d1ee355c8437db691bc8e Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 14 Apr 2025 09:57:25 +0300
Subject: [PATCH 103/238] Refactor AC device controls and toggle widget

---
 .../device_managment/ac/bloc/ac_bloc.dart     | 21 ++++++++++++-------
 .../shared/toggle_widget.dart                 |  3 ---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/pages/device_managment/ac/bloc/ac_bloc.dart b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
index 076e9050..3da6e848 100644
--- a/lib/pages/device_managment/ac/bloc/ac_bloc.dart
+++ b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
@@ -331,10 +331,13 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
 
       try {
         final scaledValue = totalMinutes ~/ 6;
-        await DevicesManagementApi().deviceControl(
-          deviceId,
-          Status(code: 'countdown_time', value: scaledValue),
-        );
+        Future.delayed(const Duration(seconds: 1), () async {
+          await DevicesManagementApi().deviceControl(
+            deviceId,
+            Status(code: 'countdown_time', value: scaledValue),
+          );
+        });
+
         _startCountdownTimer(emit);
         emit(currentState.copyWith(isTimerActive: timerActive));
       } catch (e) {
@@ -342,10 +345,12 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         emit(AcsFailedState(error: e.toString()));
       }
     } else {
-      await DevicesManagementApi().deviceControl(
-        deviceId,
-        Status(code: 'countdown_time', value: 0),
-      );
+      Future.delayed(const Duration(seconds: 1), () async {
+        await DevicesManagementApi().deviceControl(
+          deviceId,
+          Status(code: 'countdown_time', value: 0),
+        );
+      });
       _countdownTimer?.cancel();
       scheduledHours = 0;
       scheduledMinutes = 0;
diff --git a/lib/pages/device_managment/shared/toggle_widget.dart b/lib/pages/device_managment/shared/toggle_widget.dart
index ad0ba8ad..4888572f 100644
--- a/lib/pages/device_managment/shared/toggle_widget.dart
+++ b/lib/pages/device_managment/shared/toggle_widget.dart
@@ -62,9 +62,6 @@ class ToggleWidget extends StatelessWidget {
                       )),
                 if (showToggle)
                   Container(
-                    height: 20,
-                    width: 35,
-                    padding: const EdgeInsets.only(right: 16, top: 10),
                     child: CupertinoSwitch(
                       value: value,
                       activeColor: ColorsManager.dialogBlueTitle,

From 9a2687d4c58e3659ca6f06d9d0821734ed5c467b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 11:13:27 +0300
Subject: [PATCH 104/238] added some comments for clarity about how we should
 send the data to BE.

---
 .../ceiling_presence_sensor_functions.dart    | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index 8f3eeb5e..bdec76d3 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -1,6 +1,7 @@
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
+// TODO: functions in conditions / status in actions
 class CpsOperationalValue {
   final String icon;
   final String description;
@@ -222,6 +223,7 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
 }
 
 final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
+  // confirm with BE
   CpsMaxDistanceOfDetectionFunction({
     required super.deviceId,
     required super.deviceName,
@@ -265,7 +267,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
         max = 10.0,
         step = 0.5,
         super(
-          code: 'static_max_dis',
+          code: 'static_max_dis', // 0 / 500
           operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -300,7 +302,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
         max = 25.5,
         step = 0.1,
         super(
-          code: 'moving_range',
+          code: 'moving_range', // just then
           operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
@@ -370,7 +372,7 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
         max = 255,
         step = 5,
         super(
-          code: 'presence_reference',
+          code: 'presence_reference', // max 255 // change widget
           operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -401,7 +403,7 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
         max = 255,
         step = 5,
         super(
-          code: 'moving_reference',
+          code: 'moving_reference', // max 255 // change widget
           operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -432,7 +434,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
         max = 5.00,
         step = 0.50,
         super(
-          code: 'perceptual_boundary',
+          code: 'perceptual_boundary', // 0 / 500
           operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
@@ -451,7 +453,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
         return CpsOperationalValue(
           icon: Assets.boundary,
           description: '${value.toStringAsFixed(1)}M',
-          value: value,
+          value: value + 1200,
         );
       },
     );
@@ -467,7 +469,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
         max = 5.0,
         step = 0.5,
         super(
-          code: 'moving_boundary',
+          code: 'moving_boundary', // 0 / 500 / step 50
           operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
@@ -502,7 +504,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
         max = 2.0,
         step = 0.1,
         super(
-          code: 'moving_rigger_time',
+          code: 'moving_rigger_time', // 0 / 2000 steps 10
           operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
@@ -537,7 +539,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
         max = 50.0,
         step = 1.0,
         super(
-          code: 'moving_static_time',
+          code: 'moving_static_time', // 0 / 6000 steps 100
           operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
@@ -572,7 +574,7 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
         max = 300.0,
         step = 5.0,
         super(
-          code: 'none_body_time',
+          code: 'none_body_time', // 0 / 300000 / steps 500 
           operationName: 'Entering Nobody State Time',
           icon: Assets.motionMeter,
         );
@@ -604,7 +606,7 @@ final class CpsSelfTestResultFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'checking_result',
+          code: 'checking_result', // just in action
           operationName: 'Self-Test Result',
           icon: Assets.selfTestResult,
         );
@@ -826,7 +828,7 @@ class CpsPresenceStatusFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'presence_state',
+          code: 'presence_state', // just in action
           operationName: 'Presence Status',
           icon: Assets.presenceSensor,
         );
@@ -862,7 +864,7 @@ final class CpsSportsParaFunction extends CpsFunctions {
         max = 100,
         step = 1,
         super(
-          code: 'sports_para',
+          code: 'sports_para', // just in action
           operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );

From 1023170788c73c2f747eb9193fc6482a22e86f00 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 11:25:36 +0300
Subject: [PATCH 105/238] Sort communities in create new routine dropdown.

---
 .../routines/create_new_routines/create_new_routines.dart   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/pages/routines/create_new_routines/create_new_routines.dart b/lib/pages/routines/create_new_routines/create_new_routines.dart
index 0542f888..8f28208f 100644
--- a/lib/pages/routines/create_new_routines/create_new_routines.dart
+++ b/lib/pages/routines/create_new_routines/create_new_routines.dart
@@ -63,7 +63,11 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                       Padding(
                         padding: const EdgeInsets.only(left: 15, right: 15),
                         child: CommunityDropdown(
-                          communities: _bloc.communities,
+                          communities: _bloc.communities..sort(
+                              (a, b) => a.name.toLowerCase().compareTo(
+                                    b.name.toLowerCase(),
+                                  ),
+                            ),
                           selectedValue: _selectedCommunity,
                           onChanged: (String? newValue) {
                             setState(() {

From 9e3a78f6b734cf9f2919593f17d81c990832c617 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 12:10:42 +0300
Subject: [PATCH 106/238] Update dialog header to reflect sensor condition type
 dynamically

---
 .../routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index dc71a595..21aa7c51 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -66,7 +66,9 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                const DialogHeader('Presence Sensor Condition'),
+                DialogHeader(
+                  'Presence Sensor ${widget.dialogType == "IF" ? 'Conditions' : 'Functions'}',
+                ),
                 Expanded(child: _buildMainContent(context, state)),
                 DialogFooter(
                   onCancel: () => Navigator.pop(context),

From 06383018b9e275edbce98cdc69e8c8c0e309e151 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 14:32:22 +0300
Subject: [PATCH 107/238] refactored helpers into a helper class to release
 some complexity out of the widget.

---
 .../cps_dialog_slider_selector.dart           | 121 ++++++++++++------
 1 file changed, 79 insertions(+), 42 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 49c3ac2e..42b5a29e 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -31,10 +31,13 @@ class CpsDialogSliderSelector extends StatelessWidget {
     return SliderValueSelector(
       currentCondition: selectedFunctionData.condition,
       dialogType: dialogType,
-      sliderRange: _sliderRange,
-      displayedValue: _displayText,
+      sliderRange: CpsSliderHelpers.sliderRange(selectedFunctionData.functionCode),
+      displayedValue: CpsSliderHelpers.displayText(
+        value: selectedFunctionData.value,
+        functionCode: selectedFunctionData.functionCode,
+      ),
       initialValue: selectedFunctionData.value ?? 0,
-      unit: _unit,
+      unit: CpsSliderHelpers.unit(selectedFunctionData.functionCode),
       onConditionChanged: (condition) => context.read<FunctionBloc>().add(
             AddFunction(
               functionData: DeviceFunctionData(
@@ -57,11 +60,50 @@ class CpsDialogSliderSelector extends StatelessWidget {
               ),
             ),
           ),
-      dividendOfRange: _dividendOfRange,
+      dividendOfRange: CpsSliderHelpers.dividendOfRange(
+        selectedFunctionData.functionCode,
+      ),
     );
   }
 
-  (double, double) get _sliderRange => switch (selectedFunctionData.functionCode) {
+  double reverseMappedValue(double value) {
+    final (inputMin, inputMax) =
+        CpsSliderHelpers.sliderRange(selectedFunctionData.functionCode);
+    final (outputMin, outputMax, outputStep) = CpsSliderHelpers.mappedRange(
+      selectedFunctionData.functionCode,
+    );
+
+    final clampedValue = value.clamp(outputMin, outputMax);
+
+    final stepsFromMin = ((clampedValue - outputMin) / outputStep).round();
+
+    final mappedValue = inputMin +
+        (stepsFromMin *
+            CpsSliderHelpers.dividendOfRange(selectedFunctionData.functionCode));
+
+    return mappedValue.clamp(inputMin, inputMax);
+  }
+}
+
+abstract final class CpsSliderHelpers {
+  static (double min, double max, double step) mappedRange(String functionCode) {
+    final (defaultMin, defaultMax) = sliderRange(functionCode);
+    final defaultDivdidend = dividendOfRange(functionCode);
+    return switch (functionCode) {
+      'static_max_dis' => (0, 500, 50),
+      'presence_reference' => (0, 255, 50),
+      'moving_reference' => (0, 255, 5),
+      'perceptual_boundary' => (0, 500, 50),
+      'moving_boundary' => (0, 500, 50),
+      'moving_rigger_time' => (0, 2000, 100),
+      'moving_static_time' => (0, 6000, 100),
+      'none_body_time' => (0, 300000, 500),
+      _ => (defaultMin, defaultMax, defaultDivdidend),
+    };
+  }
+
+  static (double min, double max) sliderRange(String functionCode) =>
+      switch (functionCode) {
         'moving_speed' => (0, 32),
         'sensitivity' => (0, 10),
         'space_static_val' => (0, 255),
@@ -80,11 +122,40 @@ class CpsDialogSliderSelector extends StatelessWidget {
         _ => (0, 300),
       };
 
-  String get _displayText {
-    final value = selectedFunctionData.value;
+  static double dividendOfRange(String functionCode) => switch (functionCode) {
+        'presence_reference' => 5,
+        'moving_reference' => 5,
+        'moving_max_dis' => 0.5,
+        'static_max_dis' => 0.5,
+        'moving_range' => 0.1,
+        'presence_range' => 0.1,
+        'perceptual_boundary' => 0.5,
+        'moving_boundary' => 0.5,
+        'moving_rigger_time' => 0.1,
+        'moving_static_time' => 1.0,
+        'none_body_time' => 5.0,
+        _ => 1,
+      };
+
+  static String unit(String functionCode) => switch (functionCode) {
+        'moving_max_dis' ||
+        'static_max_dis' ||
+        'moving_range' ||
+        'presence_range' ||
+        'perceptual_boundary' ||
+        'moving_boundary' =>
+          'M',
+        'moving_rigger_time' || 'moving_static_time' || 'none_body_time' => 'sec',
+        _ => '',
+      };
+
+  static String displayText({
+    required dynamic value,
+    required String functionCode,
+  }) {
     final parsedValue = double.tryParse('$value');
 
-    return switch (selectedFunctionData.functionCode) {
+    return switch (functionCode) {
       'moving_max_dis' ||
       'static_max_dis' ||
       'moving_range' ||
@@ -99,38 +170,4 @@ class CpsDialogSliderSelector extends StatelessWidget {
       _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
     };
   }
-
-  String get _unit {
-    return switch (selectedFunctionData.functionCode) {
-      'moving_max_dis' ||
-      'static_max_dis' ||
-      'moving_range' ||
-      'presence_range' ||
-      'perceptual_boundary' ||
-      'moving_boundary' =>
-        'M',
-      'moving_rigger_time' || 'moving_static_time' || 'none_body_time' => 'sec',
-      _ => '',
-    };
-  }
-
-  double get _dividendOfRange => switch (selectedFunctionData.functionCode) {
-        'sensitivity' => 1,
-        'moving_speed' => 1,
-        'space_static_val' => 1,
-        'space_move_val' => 1,
-        'presence_reference' => 5,
-        'moving_reference' => 5,
-        'moving_max_dis' => 0.5,
-        'static_max_dis' => 0.5,
-        'moving_range' => 0.1,
-        'presence_range' => 0.1,
-        'perceptual_boundary' => 0.5,
-        'moving_boundary' => 0.5,
-        'moving_rigger_time' => 0.1,
-        'moving_static_time' => 1.0,
-        'none_body_time' => 5.0,
-        'sports_para' => 1.0,
-        _ => 1,
-      };
 }

From f19cc616be9cff1155f867c99a022b8e74e7372e Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 14:32:49 +0300
Subject: [PATCH 108/238] moved `CpsSliderHelpers` to its own file.

---
 .../cps_dialog_slider_selector.dart           | 88 +------------------
 .../ceiling_sensor/cps_slider_helpers.dart    | 86 ++++++++++++++++++
 2 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 42b5a29e..2bdd1135 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/ceiling_presence_sensor_functions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart';
 import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
 
 class CpsDialogSliderSelector extends StatelessWidget {
@@ -84,90 +85,3 @@ class CpsDialogSliderSelector extends StatelessWidget {
     return mappedValue.clamp(inputMin, inputMax);
   }
 }
-
-abstract final class CpsSliderHelpers {
-  static (double min, double max, double step) mappedRange(String functionCode) {
-    final (defaultMin, defaultMax) = sliderRange(functionCode);
-    final defaultDivdidend = dividendOfRange(functionCode);
-    return switch (functionCode) {
-      'static_max_dis' => (0, 500, 50),
-      'presence_reference' => (0, 255, 50),
-      'moving_reference' => (0, 255, 5),
-      'perceptual_boundary' => (0, 500, 50),
-      'moving_boundary' => (0, 500, 50),
-      'moving_rigger_time' => (0, 2000, 100),
-      'moving_static_time' => (0, 6000, 100),
-      'none_body_time' => (0, 300000, 500),
-      _ => (defaultMin, defaultMax, defaultDivdidend),
-    };
-  }
-
-  static (double min, double max) sliderRange(String functionCode) =>
-      switch (functionCode) {
-        'moving_speed' => (0, 32),
-        'sensitivity' => (0, 10),
-        'space_static_val' => (0, 255),
-        'space_move_val' => (0, 255),
-        'moving_max_dis' => (0, 10),
-        'static_max_dis' => (0, 10),
-        'moving_range' => (0, 25.5),
-        'presence_range' => (0, 25.5),
-        'presence_judgement_threshold' => (0, 255),
-        'motion_amplitude_trigger_threshold' => (0, 255),
-        'perceptual_boundary' => (0, 5),
-        'moving_boundary' => (0, 5),
-        'moving_rigger_time' => (0, 2),
-        'moving_static_time' => (0, 50),
-        'none_body_time' => (0, 300),
-        _ => (0, 300),
-      };
-
-  static double dividendOfRange(String functionCode) => switch (functionCode) {
-        'presence_reference' => 5,
-        'moving_reference' => 5,
-        'moving_max_dis' => 0.5,
-        'static_max_dis' => 0.5,
-        'moving_range' => 0.1,
-        'presence_range' => 0.1,
-        'perceptual_boundary' => 0.5,
-        'moving_boundary' => 0.5,
-        'moving_rigger_time' => 0.1,
-        'moving_static_time' => 1.0,
-        'none_body_time' => 5.0,
-        _ => 1,
-      };
-
-  static String unit(String functionCode) => switch (functionCode) {
-        'moving_max_dis' ||
-        'static_max_dis' ||
-        'moving_range' ||
-        'presence_range' ||
-        'perceptual_boundary' ||
-        'moving_boundary' =>
-          'M',
-        'moving_rigger_time' || 'moving_static_time' || 'none_body_time' => 'sec',
-        _ => '',
-      };
-
-  static String displayText({
-    required dynamic value,
-    required String functionCode,
-  }) {
-    final parsedValue = double.tryParse('$value');
-
-    return switch (functionCode) {
-      'moving_max_dis' ||
-      'static_max_dis' ||
-      'moving_range' ||
-      'presence_range' ||
-      'perceptual_boundary' ||
-      'moving_boundary' =>
-        parsedValue?.toStringAsFixed(1) ?? '0',
-      'moving_rigger_time' => parsedValue?.toStringAsFixed(2) ?? '0',
-      'moving_static_time' ||
-      'none_body_time' =>
-        parsedValue?.toStringAsFixed(2) ?? '0',
-      _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
-    };
-  }
-}
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
new file mode 100644
index 00000000..80192056
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
@@ -0,0 +1,86 @@
+abstract final class CpsSliderHelpers {
+  static (double min, double max, double step) mappedRange(String functionCode) {
+    final (defaultMin, defaultMax) = sliderRange(functionCode);
+    final defaultDivdidend = dividendOfRange(functionCode);
+    return switch (functionCode) {
+      'static_max_dis' => (0, 500, 50),
+      'presence_reference' => (0, 255, 50),
+      'moving_reference' => (0, 255, 5),
+      'perceptual_boundary' => (0, 500, 50),
+      'moving_boundary' => (0, 500, 50),
+      'moving_rigger_time' => (0, 2000, 100),
+      'moving_static_time' => (0, 6000, 100),
+      'none_body_time' => (0, 300000, 500),
+      _ => (defaultMin, defaultMax, defaultDivdidend),
+    };
+  }
+
+  static (double min, double max) sliderRange(String functionCode) =>
+      switch (functionCode) {
+        'moving_speed' => (0, 32),
+        'sensitivity' => (0, 10),
+        'space_static_val' => (0, 255),
+        'space_move_val' => (0, 255),
+        'moving_max_dis' => (0, 10),
+        'static_max_dis' => (0, 10),
+        'moving_range' => (0, 25.5),
+        'presence_range' => (0, 25.5),
+        'presence_judgement_threshold' => (0, 255),
+        'motion_amplitude_trigger_threshold' => (0, 255),
+        'perceptual_boundary' => (0, 5),
+        'moving_boundary' => (0, 5),
+        'moving_rigger_time' => (0, 2),
+        'moving_static_time' => (0, 50),
+        'none_body_time' => (0, 300),
+        _ => (0, 300),
+      };
+
+  static double dividendOfRange(String functionCode) => switch (functionCode) {
+        'presence_reference' => 5,
+        'moving_reference' => 5,
+        'moving_max_dis' => 0.5,
+        'static_max_dis' => 0.5,
+        'moving_range' => 0.1,
+        'presence_range' => 0.1,
+        'perceptual_boundary' => 0.5,
+        'moving_boundary' => 0.5,
+        'moving_rigger_time' => 0.1,
+        'moving_static_time' => 1.0,
+        'none_body_time' => 5.0,
+        _ => 1,
+      };
+
+  static String unit(String functionCode) => switch (functionCode) {
+        'moving_max_dis' ||
+        'static_max_dis' ||
+        'moving_range' ||
+        'presence_range' ||
+        'perceptual_boundary' ||
+        'moving_boundary' =>
+          'M',
+        'moving_rigger_time' || 'moving_static_time' || 'none_body_time' => 'sec',
+        _ => '',
+      };
+
+  static String displayText({
+    required dynamic value,
+    required String functionCode,
+  }) {
+    final parsedValue = double.tryParse('$value');
+
+    return switch (functionCode) {
+      'moving_max_dis' ||
+      'static_max_dis' ||
+      'moving_range' ||
+      'presence_range' ||
+      'perceptual_boundary' ||
+      'moving_boundary' =>
+        parsedValue?.toStringAsFixed(1) ?? '0',
+      'moving_rigger_time' => parsedValue?.toStringAsFixed(2) ?? '0',
+      'moving_static_time' ||
+      'none_body_time' =>
+        parsedValue?.toStringAsFixed(2) ?? '0',
+      _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
+    };
+  }
+}

From 1493e35f6ad5175f2ac9827770a38ec1768437c4 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 14:35:24 +0300
Subject: [PATCH 109/238] removed unused method.

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 21aa7c51..1403b2ca 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -150,4 +150,15 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       ],
     );
   }
+List<DeviceFunctionData> updateValuesForAddedFunctions(List<DeviceFunctionData> addedFunctions) {
+    return addedFunctions.map((function) {
+      if (function.functionCode == 'sensitivity') {
+        return function.copyWith(
+          value: function.value,
+          condition: function.condition,
+        );
+      }
+      return function;
+    }).toList();
+  }
 }

From db84a9aa5ef3cf0b7d2ba0e8d44d35b37c0071a0 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 14 Apr 2025 16:03:34 +0300
Subject: [PATCH 110/238] fix a logic

---
 .../device_managment/ac/bloc/ac_bloc.dart     | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/lib/pages/device_managment/ac/bloc/ac_bloc.dart b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
index 3da6e848..501d29d8 100644
--- a/lib/pages/device_managment/ac/bloc/ac_bloc.dart
+++ b/lib/pages/device_managment/ac/bloc/ac_bloc.dart
@@ -331,13 +331,14 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
 
       try {
         final scaledValue = totalMinutes ~/ 6;
-        Future.delayed(const Duration(seconds: 1), () async {
-          await DevicesManagementApi().deviceControl(
-            deviceId,
-            Status(code: 'countdown_time', value: scaledValue),
-          );
-        });
-
+        await _runDebounce(
+          isBatch: false,
+          deviceId: deviceId,
+          code: 'countdown_time',
+          value: scaledValue,
+          oldValue: scaledValue,
+          emit: emit,
+        );
         _startCountdownTimer(emit);
         emit(currentState.copyWith(isTimerActive: timerActive));
       } catch (e) {
@@ -345,12 +346,14 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         emit(AcsFailedState(error: e.toString()));
       }
     } else {
-      Future.delayed(const Duration(seconds: 1), () async {
-        await DevicesManagementApi().deviceControl(
-          deviceId,
-          Status(code: 'countdown_time', value: 0),
-        );
-      });
+      await _runDebounce(
+        isBatch: false,
+        deviceId: deviceId,
+        code: 'countdown_time',
+        value: 0,
+        oldValue: 0,
+        emit: emit,
+      );
       _countdownTimer?.cancel();
       scheduledHours = 0;
       scheduledMinutes = 0;

From ebcd89d2a5a85a64057913ada4bb8084872ddd84 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 14 Apr 2025 16:24:50 +0300
Subject: [PATCH 111/238] Refactor ceiling sensor functions and update slider
 helper mappings for improved value handling

---
 .../ceiling_presence_sensor_functions.dart    | 26 +++++----
 .../ceiling_sensor/ceiling_sensor_dialog.dart | 53 +++++++++++++++++--
 .../cps_dialog_slider_selector.dart           | 18 -------
 .../ceiling_sensor/cps_slider_helpers.dart    | 10 ++--
 4 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
index bdec76d3..6dbe5cf6 100644
--- a/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
+++ b/lib/pages/routines/models/ceiling_presence_sensor_functions.dart
@@ -1,7 +1,6 @@
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-// TODO: functions in conditions / status in actions
 class CpsOperationalValue {
   final String icon;
   final String description;
@@ -223,7 +222,6 @@ final class CpsSpatialMotionValueFunction extends CpsFunctions {
 }
 
 final class CpsMaxDistanceOfDetectionFunction extends CpsFunctions {
-  // confirm with BE
   CpsMaxDistanceOfDetectionFunction({
     required super.deviceId,
     required super.deviceName,
@@ -267,7 +265,7 @@ final class CpsMaxDistanceOfStaticDetectionFunction extends CpsFunctions {
         max = 10.0,
         step = 0.5,
         super(
-          code: 'static_max_dis', // 0 / 500
+          code: 'static_max_dis',
           operationName: 'Maximum Distance Of Static Detection',
           icon: Assets.currentDistanceIcon,
         );
@@ -302,7 +300,7 @@ final class CpsDetectionRangeFunction extends CpsFunctions {
         max = 25.5,
         step = 0.1,
         super(
-          code: 'moving_range', // just then
+          code: 'moving_range',
           operationName: 'Detection Range',
           icon: Assets.farDetection,
         );
@@ -372,7 +370,7 @@ final class CpsPresenceJudgementThrsholdFunction extends CpsFunctions {
         max = 255,
         step = 5,
         super(
-          code: 'presence_reference', // max 255 // change widget
+          code: 'presence_reference',
           operationName: 'Presence Judgement Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -403,7 +401,7 @@ final class CpsMotionAmplitudeTriggerThresholdFunction extends CpsFunctions {
         max = 255,
         step = 5,
         super(
-          code: 'moving_reference', // max 255 // change widget
+          code: 'moving_reference',
           operationName: 'Motion Amplitude Trigger Threshold',
           icon: Assets.presenceJudgementThrshold,
         );
@@ -434,7 +432,7 @@ final class CpsPerpetualBoundaryFunction extends CpsFunctions {
         max = 5.00,
         step = 0.50,
         super(
-          code: 'perceptual_boundary', // 0 / 500
+          code: 'perceptual_boundary',
           operationName: 'Perpetual Boundary',
           icon: Assets.boundary,
         );
@@ -469,7 +467,7 @@ final class CpsMotionTriggerBoundaryFunction extends CpsFunctions {
         max = 5.0,
         step = 0.5,
         super(
-          code: 'moving_boundary', // 0 / 500 / step 50
+          code: 'moving_boundary',
           operationName: 'Motion Trigger Boundary',
           icon: Assets.motionMeter,
         );
@@ -504,7 +502,7 @@ final class CpsMotionTriggerTimeFunction extends CpsFunctions {
         max = 2.0,
         step = 0.1,
         super(
-          code: 'moving_rigger_time', // 0 / 2000 steps 10
+          code: 'moving_rigger_time',
           operationName: 'Motion Trigger Time',
           icon: Assets.motionMeter,
         );
@@ -539,7 +537,7 @@ final class CpsMotionToStaticTimeFunction extends CpsFunctions {
         max = 50.0,
         step = 1.0,
         super(
-          code: 'moving_static_time', // 0 / 6000 steps 100
+          code: 'moving_static_time',
           operationName: 'Motion To Static Time',
           icon: Assets.motionMeter,
         );
@@ -574,7 +572,7 @@ final class CpsEnteringNoBodyStateTimeFunction extends CpsFunctions {
         max = 300.0,
         step = 5.0,
         super(
-          code: 'none_body_time', // 0 / 300000 / steps 500 
+          code: 'none_body_time',
           operationName: 'Entering Nobody State Time',
           icon: Assets.motionMeter,
         );
@@ -606,7 +604,7 @@ final class CpsSelfTestResultFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'checking_result', // just in action
+          code: 'checking_result',
           operationName: 'Self-Test Result',
           icon: Assets.selfTestResult,
         );
@@ -828,7 +826,7 @@ class CpsPresenceStatusFunctions extends CpsFunctions {
     required super.deviceName,
     required super.type,
   }) : super(
-          code: 'presence_state', // just in action
+          code: 'presence_state',
           operationName: 'Presence Status',
           icon: Assets.presenceSensor,
         );
@@ -864,7 +862,7 @@ final class CpsSportsParaFunction extends CpsFunctions {
         max = 100,
         step = 1,
         super(
-          code: 'sports_para', // just in action
+          code: 'sports_para',
           operationName: 'Sports Para',
           icon: Assets.sportsPara,
         );
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 1403b2ca..52665dfa 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -11,6 +11,7 @@ import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_senso
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_value_selector.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart';
 
 class CeilingSensorDialog extends StatefulWidget {
   const CeilingSensorDialog({
@@ -76,7 +77,8 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
                       ? () {
                           context.read<RoutineBloc>().add(
                                 AddFunctionToRoutine(
-                                  state.addedFunctions,
+                                  _updateValuesForAddedFunctions(
+                                      state.addedFunctions),
                                   '${widget.uniqueCustomId}',
                                 ),
                               );
@@ -150,15 +152,58 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       ],
     );
   }
-List<DeviceFunctionData> updateValuesForAddedFunctions(List<DeviceFunctionData> addedFunctions) {
+
+  List<DeviceFunctionData> _updateValuesForAddedFunctions(
+    List<DeviceFunctionData> addedFunctions,
+  ) {
+    const mappableSteppedFunctions = <String>{
+      'static_max_dis',
+      'presence_reference',
+      'moving_reference',
+      'perceptual_boundary',
+      'moving_boundary',
+      'moving_rigger_time',
+      'moving_static_time',
+      'none_body_time',
+      'moving_max_dis',
+    };
     return addedFunctions.map((function) {
-      if (function.functionCode == 'sensitivity') {
-        return function.copyWith(
+      if (mappableSteppedFunctions.contains(function.functionCode)) {
+        final mappedValue = mapSteppedValue(
           value: function.value,
+          inputStep: CpsSliderHelpers.dividendOfRange(function.functionCode),
+          inputRange: CpsSliderHelpers.sliderRange(function.functionCode),
+          outputRange: CpsSliderHelpers.mappedRange(function.functionCode),
+        );
+        return DeviceFunctionData(
+          value: mappedValue,
+          entityId: function.entityId,
+          functionCode: function.functionCode,
+          operationName: function.operationName,
           condition: function.condition,
+          actionExecutor: function.actionExecutor,
+          valueDescription: function.valueDescription,
         );
       }
       return function;
     }).toList();
   }
+
+  int mapSteppedValue({
+    required (double min, double max) inputRange,
+    required double inputStep,
+    required (double min, double max, double dividend) outputRange,
+    required double value,
+  }) {
+    final (inputMin, inputMax) = inputRange;
+    final (outputMin, outputMax, outputStep) = outputRange;
+
+    final clampedValue = value.clamp(inputMin, inputMax);
+
+    final stepsFromMin = ((clampedValue - inputMin) / inputStep).round();
+
+    final mappedValue = outputMin + (stepsFromMin * outputStep);
+
+    return mappedValue.clamp(outputMin, outputMax).round();
+  }
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 2bdd1135..1c549d9f 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -66,22 +66,4 @@ class CpsDialogSliderSelector extends StatelessWidget {
       ),
     );
   }
-
-  double reverseMappedValue(double value) {
-    final (inputMin, inputMax) =
-        CpsSliderHelpers.sliderRange(selectedFunctionData.functionCode);
-    final (outputMin, outputMax, outputStep) = CpsSliderHelpers.mappedRange(
-      selectedFunctionData.functionCode,
-    );
-
-    final clampedValue = value.clamp(outputMin, outputMax);
-
-    final stepsFromMin = ((clampedValue - outputMin) / outputStep).round();
-
-    final mappedValue = inputMin +
-        (stepsFromMin *
-            CpsSliderHelpers.dividendOfRange(selectedFunctionData.functionCode));
-
-    return mappedValue.clamp(inputMin, inputMax);
-  }
 }
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
index 80192056..03b7b5af 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
@@ -4,13 +4,14 @@ abstract final class CpsSliderHelpers {
     final defaultDivdidend = dividendOfRange(functionCode);
     return switch (functionCode) {
       'static_max_dis' => (0, 500, 50),
-      'presence_reference' => (0, 255, 50),
+      'presence_reference' => (0, 255, 5),
       'moving_reference' => (0, 255, 5),
       'perceptual_boundary' => (0, 500, 50),
       'moving_boundary' => (0, 500, 50),
       'moving_rigger_time' => (0, 2000, 100),
-      'moving_static_time' => (0, 6000, 100),
-      'none_body_time' => (0, 300000, 500),
+      'moving_static_time' => (0, 60000, 1000),
+      'none_body_time' => (0, 300000, 5000),
+      'moving_max_dis' => (0, 500, 50),
       _ => (defaultMin, defaultMax, defaultDivdidend),
     };
   }
@@ -83,4 +84,7 @@ abstract final class CpsSliderHelpers {
       _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
     };
   }
+  // TODO: Sports Para causes 400 in IF and THEN / sports_para
+  // TODO: Detection range causes 400 in IF / moving_range
+  // TODO: Distance of moving objects causes 400 in IF / presence_range
 }

From 4849bb41ba1c4112d09b65493c2ff83b82841658 Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Tue, 15 Apr 2025 02:13:00 +0300
Subject: [PATCH 112/238] Added function to single card, included tag and
 location to cards

---
 assets/icons/device_tag_ic.svg                |   4 +
 .../all_devices/models/device_sub_space.dart  |  18 +
 .../all_devices/models/device_tag_model.dart  |  20 +
 .../all_devices/models/devices_model.dart     | 154 +++---
 .../functions_bloc/functions_bloc_bloc.dart   |   1 +
 .../bloc/routine_bloc/routine_bloc.dart       | 468 ++++++++----------
 lib/pages/routines/widgets/dragable_card.dart |  85 +++-
 .../routines/widgets/routine_devices.dart     |   6 +-
 .../one_gang_switch_dialog.dart               |  43 +-
 lib/utils/constants/assets.dart               | 176 +++----
 10 files changed, 469 insertions(+), 506 deletions(-)
 create mode 100644 assets/icons/device_tag_ic.svg
 create mode 100644 lib/pages/device_managment/all_devices/models/device_sub_space.dart
 create mode 100644 lib/pages/device_managment/all_devices/models/device_tag_model.dart

diff --git a/assets/icons/device_tag_ic.svg b/assets/icons/device_tag_ic.svg
new file mode 100644
index 00000000..830b6129
--- /dev/null
+++ b/assets/icons/device_tag_ic.svg
@@ -0,0 +1,4 @@
+<svg width="8" height="9" viewBox="0 0 8 9" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.13918 0.5H4.10294C4.0408 0.5 3.98117 0.524721 3.93722 0.568668L0.251783 4.25398C-0.0839278 4.58982 -0.0839278 5.13617 0.251783 5.47188L3.02848 8.24852C3.1906 8.41064 3.40686 8.49994 3.63734 8.5H3.6374C3.86794 8.5 4.0842 8.41064 4.24638 8.24846L7.9317 4.56308C7.97565 4.51914 8.00037 4.4595 8.00037 4.39736L8.00043 1.36113C8.00037 0.886312 7.61399 0.5 7.13918 0.5ZM7.53159 4.30031L3.91488 7.91702C3.84127 7.9907 3.74269 8.03122 3.6374 8.03122C3.53205 8.03122 3.43353 7.9907 3.35992 7.91708L0.583222 5.14045C0.43026 4.98748 0.43026 4.73845 0.583222 4.58542L4.19999 0.968775H7.13918C7.35556 0.968775 7.53165 1.14481 7.53165 1.36119L7.53159 4.30031Z" fill="#999999"/>
+<path d="M5.93455 1.8291C5.73782 1.8291 5.55288 1.90577 5.41377 2.04487C5.27466 2.18392 5.19806 2.36886 5.19806 2.56559C5.19806 2.76232 5.27466 2.94726 5.41377 3.08637C5.55288 3.22548 5.73782 3.30208 5.93455 3.30208C6.13121 3.30208 6.31616 3.22548 6.45527 3.08637C6.59437 2.94726 6.67098 2.76232 6.67098 2.56559C6.67098 2.36886 6.59437 2.18392 6.45533 2.04487C6.31622 1.90577 6.13128 1.8291 5.93455 1.8291ZM6.12383 2.75487C6.07329 2.80547 6.00602 2.83331 5.93455 2.83331C5.86301 2.83331 5.79581 2.80547 5.74527 2.75487C5.69467 2.70433 5.66683 2.63707 5.66683 2.56559C5.66683 2.49412 5.69467 2.42685 5.74527 2.37631C5.79581 2.32571 5.86307 2.29788 5.93455 2.29788C6.00602 2.29788 6.07323 2.32571 6.12383 2.37631C6.17443 2.42685 6.20226 2.49412 6.20226 2.56559C6.20226 2.63707 6.17437 2.70433 6.12383 2.75487Z" fill="#999999"/>
+</svg>
diff --git a/lib/pages/device_managment/all_devices/models/device_sub_space.dart b/lib/pages/device_managment/all_devices/models/device_sub_space.dart
new file mode 100644
index 00000000..96195f76
--- /dev/null
+++ b/lib/pages/device_managment/all_devices/models/device_sub_space.dart
@@ -0,0 +1,18 @@
+class DeviceSubSpace {
+  String? id;
+  String? createdAt;
+  String? updatedAt;
+  String? subspaceName;
+  bool? disabled;
+
+  DeviceSubSpace({this.id, this.createdAt, this.updatedAt, this.subspaceName, this.disabled});
+
+  DeviceSubSpace.fromJson(Map<String, dynamic> json) {
+    id = json['uuid']?.toString() ?? '';
+    createdAt = json['createdAt']?.toString() ?? '';
+    updatedAt = json['updatedAt']?.toString() ?? '';
+    subspaceName = json['subspaceName']?.toString() ?? '';
+    subspaceName = json['subspaceName']?.toString() ?? '';
+    disabled = json['disabled'] ?? false;
+  }
+}
diff --git a/lib/pages/device_managment/all_devices/models/device_tag_model.dart b/lib/pages/device_managment/all_devices/models/device_tag_model.dart
new file mode 100644
index 00000000..12580d3f
--- /dev/null
+++ b/lib/pages/device_managment/all_devices/models/device_tag_model.dart
@@ -0,0 +1,20 @@
+class DeviceTagModel {
+  String? id;
+  String? createdAt;
+  String? updatedAt;
+  String? name;
+
+  DeviceTagModel({
+    this.id,
+    this.createdAt,
+    this.updatedAt,
+    this.name,
+  });
+
+  DeviceTagModel.fromJson(Map<String, dynamic> json) {
+    id = json['uuid']?.toString() ?? '';
+    createdAt = json['createdAt']?.toString() ?? '';
+    updatedAt = json['updatedAt']?.toString() ?? '';
+    name = json['name']?.toString() ?? '';
+  }
+}
diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index 2ea085c5..c7c35eca 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -1,6 +1,8 @@
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_community.model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_space_model.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_sub_space.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_subspace.model.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_tag_model.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
@@ -78,38 +80,41 @@ class AllDevicesModel {
   int? batteryLevel;
   String? productName;
   List<DeviceSpaceModel>? spaces;
+  List<DeviceTagModel>? deviceTags;
+  DeviceSubSpace? deviceSubSpace;
 
-  AllDevicesModel({
-    this.room,
-    this.subspace,
-    this.unit,
-    this.community,
-    this.productUuid,
-    this.productType,
-    this.permissionType,
-    this.activeTime,
-    this.category,
-    this.categoryName,
-    this.createTime,
-    this.gatewayId,
-    this.icon,
-    this.ip,
-    this.lat,
-    this.localKey,
-    this.lon,
-    this.model,
-    this.name,
-    this.nodeId,
-    this.online,
-    this.ownerId,
-    this.sub,
-    this.timeZone,
-    this.updateTime,
-    this.uuid,
-    this.batteryLevel,
-    this.productName,
-    this.spaces,
-  });
+  AllDevicesModel(
+      {this.room,
+      this.subspace,
+      this.unit,
+      this.community,
+      this.productUuid,
+      this.productType,
+      this.permissionType,
+      this.activeTime,
+      this.category,
+      this.categoryName,
+      this.createTime,
+      this.gatewayId,
+      this.icon,
+      this.ip,
+      this.lat,
+      this.localKey,
+      this.lon,
+      this.model,
+      this.name,
+      this.nodeId,
+      this.online,
+      this.ownerId,
+      this.sub,
+      this.timeZone,
+      this.updateTime,
+      this.uuid,
+      this.batteryLevel,
+      this.productName,
+      this.spaces,
+      this.deviceTags,
+      this.deviceSubSpace});
 
   AllDevicesModel.fromJson(Map<String, dynamic> json) {
     room = (json['room'] != null && (json['room'] is Map))
@@ -147,12 +152,15 @@ class AllDevicesModel {
     updateTime = int.tryParse(json['updateTime']?.toString() ?? '');
     uuid = json['uuid']?.toString();
     batteryLevel = int.tryParse(json['battery']?.toString() ?? '');
-
     productName = json['productName']?.toString();
+    deviceTags = json['deviceTag'] != null && json['deviceTag'] is List
+        ? (json['deviceTag'] as List).map((tag) => DeviceTagModel.fromJson(tag)).toList()
+        : [];
+    deviceSubSpace = json['subspace'] != null
+        ? DeviceSubSpace.fromJson(json['subspace'])
+        : DeviceSubSpace(subspaceName: '');
     if (json['spaces'] != null && json['spaces'] is List) {
-      spaces = (json['spaces'] as List)
-          .map((space) => DeviceSpaceModel.fromJson(space))
-          .toList();
+      spaces = (json['spaces'] as List).map((space) => DeviceSpaceModel.fromJson(space)).toList();
     }
   }
 
@@ -200,8 +208,7 @@ SOS
     String tempIcon = '';
     if (type == DeviceType.LightBulb) {
       tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor ||
-        type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
       tempIcon = Assets.sensors;
     } else if (type == DeviceType.AC) {
       tempIcon = Assets.ac;
@@ -248,76 +255,51 @@ SOS
     switch (productType) {
       case 'AC':
         return [
-          SwitchFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ModeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          TempSetFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          CurrentTempFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          LevelFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ChildLockFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ModeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          LevelFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
 
       case '1G':
         return [
           OneGangSwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          OneGangCountdownFunction(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+          OneGangCountdownFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '2G':
         return [
           TwoGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
           TwoGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown1Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown2Function(
-              deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '3G':
         return [
-          ThreeGangSwitch1Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangSwitch2Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangSwitch3Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown1Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown2Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown3Function(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch3Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown3Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
       case 'WPS':
         return [
           //IF Functions
-          PresenceStateFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          CurrentDistanceFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          IlluminanceValueFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          PresenceTimeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PresenceStateFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentDistanceFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          IlluminanceValueFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PresenceTimeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
 
           //THEN Functions
-          FarDetectionFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          MotionSensitivityFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          MotionLessSensitivityFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          IndicatorFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          NoOneTimeFunction(
-              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-
+          FarDetectionFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          MotionSensitivityFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          MotionLessSensitivityFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          IndicatorFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          NoOneTimeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
         ];
       case 'GW':
         return [
diff --git a/lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart b/lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart
index a196ff27..bb4a7a1e 100644
--- a/lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart
+++ b/lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart
@@ -30,6 +30,7 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
         condition: event.functionData.condition ?? existingData.condition,
       );
     } else {
+      functions.clear();
       functions.add(event.functionData);
     }
 
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index 2664d026..b698c19e 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -64,8 +64,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     TriggerSwitchTabsEvent event,
     Emitter<RoutineState> emit,
   ) {
-    emit(state.copyWith(
-        routineTab: event.isRoutineTab, createRoutineView: false));
+    emit(state.copyWith(routineTab: event.isRoutineTab, createRoutineView: false));
     add(ResetRoutineState());
     if (event.isRoutineTab) {
       add(const LoadScenes());
@@ -91,8 +90,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     final updatedIfItems = List<Map<String, dynamic>>.from(state.ifItems);
 
     // Find the index of the item in teh current itemsList
-    int index = updatedIfItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        updatedIfItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       updatedIfItems[index] = event.item;
@@ -101,21 +100,18 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
 
     if (event.isTabToRun) {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: true, isAutomation: false));
     } else {
-      emit(state.copyWith(
-          ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
+      emit(state.copyWith(ifItems: updatedIfItems, isTabToRun: false, isAutomation: true));
     }
   }
 
-  void _onAddToThenContainer(
-      AddToThenContainer event, Emitter<RoutineState> emit) {
+  void _onAddToThenContainer(AddToThenContainer event, Emitter<RoutineState> emit) {
     final currentItems = List<Map<String, dynamic>>.from(state.thenItems);
 
     // Find the index of the item in teh current itemsList
-    int index = currentItems.indexWhere(
-        (map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
+    int index =
+        currentItems.indexWhere((map) => map['uniqueCustomId'] == event.item['uniqueCustomId']);
     // Replace the map if the index is valid
     if (index != -1) {
       currentItems[index] = event.item;
@@ -126,45 +122,42 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(thenItems: currentItems));
   }
 
-  void _onAddFunctionsToRoutine(
-      AddFunctionToRoutine event, Emitter<RoutineState> emit) {
+  void _onAddFunctionsToRoutine(AddFunctionToRoutine event, Emitter<RoutineState> emit) {
     try {
       if (event.functions.isEmpty) return;
 
-      List<DeviceFunctionData> selectedFunction =
-          List<DeviceFunctionData>.from(event.functions);
+      // List<DeviceFunctionData> selectedFunction = List<DeviceFunctionData>.from(event.functions);
 
       Map<String, List<DeviceFunctionData>> currentSelectedFunctions =
           Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
-      if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
-        List<DeviceFunctionData> currentFunctions =
-            List<DeviceFunctionData>.from(
-                currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
-        List<String> functionCode = [];
-        for (int i = 0; i < selectedFunction.length; i++) {
-          for (int j = 0; j < currentFunctions.length; j++) {
-            if (selectedFunction[i].functionCode ==
-                currentFunctions[j].functionCode) {
-              currentFunctions[j] = selectedFunction[i];
-              if (!functionCode.contains(currentFunctions[j].functionCode)) {
-                functionCode.add(currentFunctions[j].functionCode);
-              }
-            }
-          }
-        }
+      // if (currentSelectedFunctions.containsKey(event.uniqueCustomId)) {
+      //   List<DeviceFunctionData> currentFunctions =
+      //       List<DeviceFunctionData>.from(currentSelectedFunctions[event.uniqueCustomId] ?? []);
 
-        for (int i = 0; i < functionCode.length; i++) {
-          selectedFunction
-              .removeWhere((code) => code.functionCode == functionCode[i]);
-        }
+      //   List<String> functionCode = [];
+      //   for (int i = 0; i < selectedFunction.length; i++) {
+      //     for (int j = 0; j < currentFunctions.length; j++) {
+      //       if (selectedFunction[i].functionCode == currentFunctions[j].functionCode) {
+      //         currentFunctions[j] = selectedFunction[i];
+      //         if (!functionCode.contains(currentFunctions[j].functionCode)) {
+      //           functionCode.add(currentFunctions[j].functionCode);
+      //         }
+      //       }
+      //     }
+      //   }
 
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(currentFunctions)..addAll(selectedFunction);
-      } else {
-        currentSelectedFunctions[event.uniqueCustomId] =
-            List.from(event.functions);
-      }
+      //   for (int i = 0; i < functionCode.length; i++) {
+      //     selectedFunction.removeWhere((code) => code.functionCode == functionCode[i]);
+      //   }
+
+      //   currentSelectedFunctions[event.uniqueCustomId] = List.from(currentFunctions)
+      //     ..addAll(selectedFunction);
+      // } else {
+      //   currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
+      // }
+
+      currentSelectedFunctions[event.uniqueCustomId] = List.from(event.functions);
 
       emit(state.copyWith(selectedFunctions: currentSelectedFunctions));
     } catch (e) {
@@ -172,30 +165,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadScenes(
-      LoadScenes event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadScenes(LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
     try {
       BuildContext context = NavigationService.navigatorKey.currentContext!;
       var createRoutineBloc = context.read<CreateRoutineBloc>();
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      if (createRoutineBloc.selectedSpaceId == '' &&
-          createRoutineBloc.selectedCommunityId == '') {
+      if (createRoutineBloc.selectedSpaceId == '' && createRoutineBloc.selectedCommunityId == '') {
         var spaceBloc = context.read<SpaceTreeBloc>();
         for (var communityId in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList =
-              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
           for (var spaceId in spacesList) {
-            scenes.addAll(
-                await SceneApi.getScenes(spaceId, communityId, projectUuid));
+            scenes.addAll(await SceneApi.getScenes(spaceId, communityId, projectUuid));
           }
         }
       } else {
         scenes.addAll(await SceneApi.getScenes(
-            createRoutineBloc.selectedSpaceId,
-            createRoutineBloc.selectedCommunityId,
-            projectUuid));
+            createRoutineBloc.selectedSpaceId, createRoutineBloc.selectedCommunityId, projectUuid));
       }
 
       emit(state.copyWith(
@@ -212,8 +199,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onLoadAutomation(
-      LoadAutomation event, Emitter<RoutineState> emit) async {
+  Future<void> _onLoadAutomation(LoadAutomation event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> automations = [];
     final projectId = await ProjectManager.getProjectUUID() ?? '';
@@ -221,23 +207,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     BuildContext context = NavigationService.navigatorKey.currentContext!;
     var createRoutineBloc = context.read<CreateRoutineBloc>();
     try {
-  
-      if (createRoutineBloc.selectedSpaceId == '' &&
-          createRoutineBloc.selectedCommunityId == '') {
+      if (createRoutineBloc.selectedSpaceId == '' && createRoutineBloc.selectedCommunityId == '') {
         var spaceBloc = context.read<SpaceTreeBloc>();
         for (var communityId in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList =
-              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
           for (var spaceId in spacesList) {
-            automations.addAll(
-                await SceneApi.getAutomation(spaceId, communityId, projectId));
+            automations.addAll(await SceneApi.getAutomation(spaceId, communityId, projectId));
           }
         }
       } else {
         automations.addAll(await SceneApi.getAutomation(
-            createRoutineBloc.selectedSpaceId,
-            createRoutineBloc.selectedCommunityId,
-            projectId));
+            createRoutineBloc.selectedSpaceId, createRoutineBloc.selectedCommunityId, projectId));
       }
       emit(state.copyWith(
         automations: automations,
@@ -253,16 +233,14 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onSearchRoutines(
-      SearchRoutines event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onSearchRoutines(SearchRoutines event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     await Future.delayed(const Duration(seconds: 1));
     emit(state.copyWith(isLoading: false, errorMessage: null));
     emit(state.copyWith(searchText: event.query));
   }
 
-  FutureOr<void> _onAddSelectedIcon(
-      AddSelectedIcon event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onAddSelectedIcon(AddSelectedIcon event, Emitter<RoutineState> emit) {
     emit(state.copyWith(selectedIcon: event.icon));
   }
 
@@ -276,8 +254,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     return actions.last['deviceId'] == 'delay';
   }
 
-  Future<void> _onCreateScene(
-      CreateSceneEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateScene(CreateSceneEvent event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -290,8 +267,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -367,8 +343,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onCreateAutomation(
-      CreateAutomationEvent event, Emitter<RoutineState> emit) async {
+  Future<void> _onCreateAutomation(CreateAutomationEvent event, Emitter<RoutineState> emit) async {
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       if (state.routineName == null || state.routineName!.isEmpty) {
@@ -390,8 +365,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         CustomSnackBar.redSnackBar('Cannot have delay as the last action');
@@ -482,8 +456,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
-          await SceneApi.createAutomation(createAutomationModel, projectUuid);
+      final result = await SceneApi.createAutomation(createAutomationModel, projectUuid);
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadAutomation());
@@ -504,21 +477,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onRemoveDragCard(
-      RemoveDragCard event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onRemoveDragCard(RemoveDragCard event, Emitter<RoutineState> emit) {
     if (event.isFromThen) {
       final thenItems = List<Map<String, dynamic>>.from(state.thenItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       thenItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
-      emit(state.copyWith(
-          thenItems: thenItems, selectedFunctions: selectedFunctions));
+      emit(state.copyWith(thenItems: thenItems, selectedFunctions: selectedFunctions));
     } else {
       final ifItems = List<Map<String, dynamic>>.from(state.ifItems);
-      final selectedFunctions =
-          Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
+      final selectedFunctions = Map<String, List<DeviceFunctionData>>.from(state.selectedFunctions);
 
       ifItems.removeAt(event.index);
       selectedFunctions.remove(event.key);
@@ -529,8 +498,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             isAutomation: false,
             isTabToRun: false));
       } else {
-        emit(state.copyWith(
-            ifItems: ifItems, selectedFunctions: selectedFunctions));
+        emit(state.copyWith(ifItems: ifItems, selectedFunctions: selectedFunctions));
       }
     }
   }
@@ -542,141 +510,138 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     ));
   }
 
-  FutureOr<void> _onEffectiveTimeEvent(
-      EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onEffectiveTimeEvent(EffectiveTimePeriodEvent event, Emitter<RoutineState> emit) {
     emit(state.copyWith(effectiveTime: event.effectiveTime));
   }
 
-  FutureOr<void> _onSetRoutineName(
-      SetRoutineName event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onSetRoutineName(SetRoutineName event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
       routineName: event.name,
     ));
   }
 
-  (
-    List<Map<String, dynamic>>,
-    List<Map<String, dynamic>>,
-    Map<String, List<DeviceFunctionData>>
-  ) _createCardData(
-    List<RoutineAction> actions,
-    List<RoutineCondition>? conditions,
-    Map<String, List<DeviceFunctionData>> currentFunctions,
-    bool isTabToRun,
-  ) {
-    final ifItems = isTabToRun
-        ? [
-            {
-              'entityId': 'tab_to_run',
-              'uniqueCustomId': const Uuid().v4(),
-              'deviceId': 'tab_to_run',
-              'title': 'Tab to run',
-              'productType': 'tab_to_run',
-              'imagePath': Assets.tabToRun,
-            }
-          ]
-        : conditions?.map((condition) {
-              final matchingDevice = state.devices.firstWhere(
-                (device) => device.uuid == condition.entityId,
-                orElse: () => AllDevicesModel(
-                  uuid: condition.entityId,
-                  name: condition.entityId,
-                  productType: condition.entityType,
-                ),
-              );
+  // (
+  //   List<Map<String, dynamic>>,
+  //   List<Map<String, dynamic>>,
+  //   Map<String, List<DeviceFunctionData>>
+  // ) _createCardData(
+  //   List<RoutineAction> actions,
+  //   List<RoutineCondition>? conditions,
+  //   Map<String, List<DeviceFunctionData>> currentFunctions,
+  //   bool isTabToRun,
+  // ) {
+  //   final ifItems = isTabToRun
+  //       ? [
+  //           {
+  //             'entityId': 'tab_to_run',
+  //             'uniqueCustomId': const Uuid().v4(),
+  //             'deviceId': 'tab_to_run',
+  //             'title': 'Tab to run',
+  //             'productType': 'tab_to_run',
+  //             'imagePath': Assets.tabToRun,
+  //           }
+  //         ]
+  //       : conditions?.map((condition) {
+  //             final matchingDevice = state.devices.firstWhere(
+  //               (device) => device.uuid == condition.entityId,
+  //               orElse: () => AllDevicesModel(
+  //                 uuid: condition.entityId,
+  //                 name: condition.entityId,
+  //                 productType: condition.entityType,
+  //               ),
+  //             );
 
-              final cardData = {
-                'entityId': condition.entityId,
-                'uniqueCustomId': const Uuid().v4(),
-                'deviceId': condition.entityId,
-                'title': matchingDevice.name ?? condition.entityId,
-                'productType': condition.entityType,
-                'imagePath':
-                    matchingDevice.getDefaultIcon(condition.entityType),
-              };
+  //             final cardData = {
+  //               'entityId': condition.entityId,
+  //               'uniqueCustomId': const Uuid().v4(),
+  //               'deviceId': condition.entityId,
+  //               'title': matchingDevice.name ?? condition.entityId,
+  //               'productType': condition.entityType,
+  //               'imagePath':
+  //                   matchingDevice.getDefaultIcon(condition.entityType),
+  //             };
 
-              final functions = matchingDevice.functions;
+  //             final functions = matchingDevice.functions;
 
-              for (var function in functions) {
-                if (function.code == condition.expr.statusCode) {
-                  currentFunctions[cardData['uniqueCustomId'] ?? ''] = [
-                    DeviceFunctionData(
-                      entityId: condition.entityId,
-                      functionCode: condition.expr.statusCode,
-                      value: condition.expr.statusValue,
-                      operationName: function.operationName,
-                    ),
-                  ];
-                  break;
-                }
-              }
+  //             for (var function in functions) {
+  //               if (function.code == condition.expr.statusCode) {
+  //                 currentFunctions[cardData['uniqueCustomId'] ?? ''] = [
+  //                   DeviceFunctionData(
+  //                     entityId: condition.entityId,
+  //                     functionCode: condition.expr.statusCode,
+  //                     value: condition.expr.statusValue,
+  //                     operationName: function.operationName,
+  //                   ),
+  //                 ];
+  //                 break;
+  //               }
+  //             }
 
-              return cardData;
-            }).toList() ??
-            [];
+  //             return cardData;
+  //           }).toList() ??
+  //           [];
 
-    final thenItems = actions.map((action) {
-      final matchingDevice = state.devices.firstWhere(
-        (device) => device.uuid == action.entityId,
-        orElse: () => AllDevicesModel(
-          uuid: action.entityId,
-          name: action.entityId,
-          productType: action.productType,
-        ),
-      );
+  //   final thenItems = actions.map((action) {
+  //     final matchingDevice = state.devices.firstWhere(
+  //       (device) => device.uuid == action.entityId,
+  //       orElse: () => AllDevicesModel(
+  //         uuid: action.entityId,
+  //         name: action.entityId,
+  //         productType: action.productType,
+  //       ),
+  //     );
 
-      final cardData = {
-        'entityId': action.entityId,
-        'uniqueCustomId': const Uuid().v4(),
-        'deviceId':
-            action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-        'title': action.actionExecutor == 'delay'
-            ? 'Delay'
-            : (matchingDevice.name ?? 'Device'),
-        'productType': action.productType,
-        'imagePath': matchingDevice.getDefaultIcon(action.productType),
-      };
+  //     final cardData = {
+  //       'entityId': action.entityId,
+  //       'uniqueCustomId': const Uuid().v4(),
+  //       'deviceId':
+  //           action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+  //       'title': action.actionExecutor == 'delay'
+  //           ? 'Delay'
+  //           : (matchingDevice.name ?? 'Device'),
+  //       'productType': action.productType,
+  //       'imagePath': matchingDevice.getDefaultIcon(action.productType),
+  //     };
 
-      final functions = matchingDevice.functions;
+  //     final functions = matchingDevice.functions;
 
-      if (action.executorProperty != null && action.actionExecutor != 'delay') {
-        final functionCode = action.executorProperty!.functionCode;
-        for (var function in functions) {
-          if (function.code == functionCode) {
-            currentFunctions[cardData['uniqueCustomId'] ?? ''] = [
-              DeviceFunctionData(
-                entityId: action.entityId,
-                functionCode: functionCode ?? '',
-                value: action.executorProperty!.functionValue,
-                operationName: function.operationName,
-              ),
-            ];
-            break;
-          }
-        }
-      } else if (action.actionExecutor == 'delay') {
-        final delayFunction = DelayFunction(
-          deviceId: action.entityId,
-          deviceName: 'Delay',
-        );
-        currentFunctions[cardData['uniqueCustomId'] ?? ''] = [
-          DeviceFunctionData(
-            entityId: action.entityId,
-            functionCode: 'delay',
-            value: action.executorProperty?.delaySeconds ?? 0,
-            operationName: delayFunction.operationName,
-          ),
-        ];
-      }
+  //     if (action.executorProperty != null && action.actionExecutor != 'delay') {
+  //       final functionCode = action.executorProperty!.functionCode;
+  //       for (var function in functions) {
+  //         if (function.code == functionCode) {
+  //           currentFunctions[cardData['uniqueCustomId'] ?? ''] = [
+  //             DeviceFunctionData(
+  //               entityId: action.entityId,
+  //               functionCode: functionCode ?? '',
+  //               value: action.executorProperty!.functionValue,
+  //               operationName: function.operationName,
+  //             ),
+  //           ];
+  //           break;
+  //         }
+  //       }
+  //     } else if (action.actionExecutor == 'delay') {
+  //       final delayFunction = DelayFunction(
+  //         deviceId: action.entityId,
+  //         deviceName: 'Delay',
+  //       );
+  //       currentFunctions[cardData['uniqueCustomId'] ?? ''] = [
+  //         DeviceFunctionData(
+  //           entityId: action.entityId,
+  //           functionCode: 'delay',
+  //           value: action.executorProperty?.delaySeconds ?? 0,
+  //           operationName: delayFunction.operationName,
+  //         ),
+  //       ];
+  //     }
 
-      return cardData;
-    }).toList();
+  //     return cardData;
+  //   }).toList();
 
-    return (thenItems, ifItems, currentFunctions);
-  }
+  //   return (thenItems, ifItems, currentFunctions);
+  // }
 
-  Future<void> _onGetSceneDetails(
-      GetSceneDetails event, Emitter<RoutineState> emit) async {
+  Future<void> _onGetSceneDetails(GetSceneDetails event, Emitter<RoutineState> emit) async {
     try {
       emit(state.copyWith(
         isLoading: true,
@@ -724,12 +689,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         if (!deviceCards.containsKey(deviceId)) {
           deviceCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId':
-                action.type == 'automation' || action.actionExecutor == 'delay'
-                    ? const Uuid().v4()
-                    : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+                ? const Uuid().v4()
+                : action.entityId,
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
                 : action.type == 'automation'
@@ -764,16 +727,15 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ),
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
-        } else if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
-          if (!updatedFunctions.containsKey(uniqueCustomId)) {
-            updatedFunctions[uniqueCustomId] = [];
-          }
+        } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
+          // if (!updatedFunctions.containsKey(uniqueCustomId)) {
+          //   updatedFunctions[uniqueCustomId] = [];
+          // }
           final functions = matchingDevice?.functions;
           final functionCode = action.executorProperty?.functionCode;
           for (DeviceFunction function in functions ?? []) {
             if (function.code == functionCode) {
-              updatedFunctions[uniqueCustomId]!.add(
+              updatedFunctions[const Uuid().v4()]!.add(
                 DeviceFunctionData(
                   entityId: action.entityId,
                   functionCode: functionCode ?? '',
@@ -837,8 +799,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onResetRoutineState(
-      ResetRoutineState event, Emitter<RoutineState> emit) {
+  FutureOr<void> _onResetRoutineState(ResetRoutineState event, Emitter<RoutineState> emit) {
     emit(state.copyWith(
         ifItems: [],
         thenItems: [],
@@ -861,6 +822,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         isUpdate: false,
         createRoutineView: false));
   }
+
   FutureOr<void> _deleteScene(DeleteScene event, Emitter<RoutineState> emit) async {
     try {
       final projectId = await ProjectManager.getProjectUUID() ?? '';
@@ -900,7 +862,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
- 
+
   // FutureOr<void> _deleteAutomation(DeleteAutomation event, Emitter<RoutineState> emit) {
   //   try {
   //     emit(state.copyWith(isLoading: true));
@@ -915,8 +877,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   //   }
   // }
 
-  FutureOr<void> _fetchDevices(
-      FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _fetchDevices(FetchDevicesInRoutine event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true));
     try {
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
@@ -925,21 +886,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       var createRoutineBloc = context.read<CreateRoutineBloc>();
       var spaceBloc = context.read<SpaceTreeBloc>();
 
-      if (createRoutineBloc.selectedSpaceId == '' &&
-          createRoutineBloc.selectedCommunityId == '') {
+      if (createRoutineBloc.selectedSpaceId == '' && createRoutineBloc.selectedCommunityId == '') {
         for (var communityId in spaceBloc.state.selectedCommunities) {
-          List<String> spacesList =
-              spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
+          List<String> spacesList = spaceBloc.state.selectedCommunityAndSpaces[communityId] ?? [];
           for (var spaceId in spacesList) {
-            devices.addAll(await DevicesManagementApi()
-                .fetchDevices(communityId, spaceId, projectUuid));
+            devices.addAll(
+                await DevicesManagementApi().fetchDevices(communityId, spaceId, projectUuid));
           }
         }
       } else {
         devices.addAll(await DevicesManagementApi().fetchDevices(
-            createRoutineBloc.selectedCommunityId,
-            createRoutineBloc.selectedSpaceId,
-            projectUuid));
+            createRoutineBloc.selectedCommunityId, createRoutineBloc.selectedSpaceId, projectUuid));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));
@@ -948,8 +905,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateScene(
-      UpdateScene event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateScene(UpdateScene event, Emitter<RoutineState> emit) async {
     try {
       // Check if first action is delay
       // if (_isFirstActionDelay(state.thenItems)) {
@@ -963,8 +919,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (_isLastActionDelay(state.thenItems)) {
         emit(state.copyWith(
-          errorMessage:
-              'A delay condition cannot be the only or the last action',
+          errorMessage: 'A delay condition cannot be the only or the last action',
           isLoading: false,
         ));
         return;
@@ -1017,8 +972,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         actions: actions,
       );
 
-      final result =
-          await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
+      final result = await SceneApi.updateScene(createSceneModel, state.sceneId ?? '');
       if (result['success']) {
         add(ResetRoutineState());
         add(const LoadScenes());
@@ -1037,8 +991,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  FutureOr<void> _onUpdateAutomation(
-      UpdateAutomation event, Emitter<RoutineState> emit) async {
+  FutureOr<void> _onUpdateAutomation(UpdateAutomation event, Emitter<RoutineState> emit) async {
     try {
       if (state.routineName == null || state.routineName!.isEmpty) {
         emit(state.copyWith(
@@ -1253,15 +1206,13 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId = action.actionExecutor == 'delay'
-            ? '${action.entityId}_delay'
-            : action.entityId;
+        final deviceId =
+            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
 
         if (!deviceThenCards.containsKey(deviceId)) {
           deviceThenCards[deviceId] = {
             'entityId': action.entityId,
-            'deviceId':
-                action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
             'uniqueCustomId': const Uuid().v4(),
             'title': action.actionExecutor == 'delay'
                 ? 'Delay'
@@ -1281,7 +1232,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
                 : action.type == 'automation'
                     ? 'automation'
                     : 'action',
-            'icon': action.icon ?? ''
+            'icon': action.icon ?? '',
           };
         }
 
@@ -1292,8 +1243,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           updatedFunctions[uniqueCustomId] = [];
         }
 
-        if (action.executorProperty != null &&
-            action.actionExecutor != 'delay') {
+        if (action.executorProperty != null && action.actionExecutor != 'delay') {
           final functions = matchingDevice.functions;
           final functionCode = action.executorProperty!.functionCode;
           for (var function in functions) {
@@ -1335,14 +1285,10 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
         }
       }
 
-      final ifItems = deviceIfCards.values
-          .where((card) => card['type'] == 'condition')
-          .toList();
+      final ifItems = deviceIfCards.values.where((card) => card['type'] == 'condition').toList();
       final thenItems = deviceThenCards.values
           .where((card) =>
-              card['type'] == 'action' ||
-              card['type'] == 'automation' ||
-              card['type'] == 'scene')
+              card['type'] == 'action' || card['type'] == 'automation' || card['type'] == 'scene')
           .toList();
 
       emit(state.copyWith(
@@ -1364,8 +1310,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-  Future<void> _onSceneTrigger(
-      SceneTrigger event, Emitter<RoutineState> emit) async {
+  Future<void> _onSceneTrigger(SceneTrigger event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(loadingSceneId: event.sceneId));
 
     try {
@@ -1407,29 +1352,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (success) {
         final updatedAutomations = await SceneApi.getAutomationByUnitId(
-            event.automationStatusUpdate.spaceUuid,
-            event.communityId,
-            projectId);
+            event.automationStatusUpdate.spaceUuid, event.communityId, projectId);
 
         // Remove from loading set safely
-        final updatedLoadingIds = {...state.loadingAutomationIds!}
-          ..remove(event.automationId);
+        final updatedLoadingIds = {...state.loadingAutomationIds!}..remove(event.automationId);
 
         emit(state.copyWith(
           automations: updatedAutomations,
           loadingAutomationIds: updatedLoadingIds,
         ));
       } else {
-        final updatedLoadingIds = {...state.loadingAutomationIds!}
-          ..remove(event.automationId);
+        final updatedLoadingIds = {...state.loadingAutomationIds!}..remove(event.automationId);
         emit(state.copyWith(
           loadingAutomationIds: updatedLoadingIds,
           errorMessage: 'Update failed',
         ));
       }
     } catch (e) {
-      final updatedLoadingIds = {...state.loadingAutomationIds!}
-        ..remove(event.automationId);
+      final updatedLoadingIds = {...state.loadingAutomationIds!}..remove(event.automationId);
       emit(state.copyWith(
         loadingAutomationIds: updatedLoadingIds,
         errorMessage: 'Update error: ${e.toString()}',
diff --git a/lib/pages/routines/widgets/dragable_card.dart b/lib/pages/routines/widgets/dragable_card.dart
index 77786429..039732b0 100644
--- a/lib/pages/routines/widgets/dragable_card.dart
+++ b/lib/pages/routines/widgets/dragable_card.dart
@@ -6,6 +6,7 @@ import 'package:flutter_svg/flutter_svg.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/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class DraggableCard extends StatelessWidget {
@@ -70,7 +71,7 @@ class DraggableCard extends StatelessWidget {
           child: Container(
             padding: padding ?? const EdgeInsets.all(16),
             width: 110,
-            height: deviceFunctions.isEmpty ? 123 : null,
+            height: deviceFunctions.isEmpty ? 160 : 170,
             child: Column(
               mainAxisSize: MainAxisSize.min,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -78,6 +79,7 @@ class DraggableCard extends StatelessWidget {
               children: [
                 Column(
                   mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.center,
                   children: [
                     Container(
                       height: 50,
@@ -101,19 +103,82 @@ class DraggableCard extends StatelessWidget {
                     const SizedBox(height: 8),
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 3),
-                      child: Text(
-                        deviceData['title'] ?? deviceData['name'] ?? title,
-                        textAlign: TextAlign.center,
-                        overflow: TextOverflow.ellipsis,
-                        maxLines: 2,
-                        style: context.textTheme.bodySmall?.copyWith(
-                          color: ColorsManager.blackColor,
-                          fontSize: 12,
+                      child: Flexible(
+                        child: Text(
+                          deviceData['title'] ?? deviceData['name'] ?? title,
+                          textAlign: TextAlign.center,
+                          overflow: TextOverflow.ellipsis,
+                          maxLines: 2,
+                          style: context.textTheme.bodySmall?.copyWith(
+                            color: ColorsManager.blackColor,
+                            fontSize: 12,
+                          ),
                         ),
                       ),
                     ),
+                    const SizedBox(
+                      height: 4,
+                    ),
+                    Visibility(
+                      visible: deviceData['tag'] != null,
+                      child: Row(
+                        spacing: 2,
+                        children: [
+                          SizedBox(
+                              width: 8, height: 8, child: SvgPicture.asset(Assets.deviceTagIcon)),
+                          Flexible(
+                            child: Text(
+                              deviceData['tag'] ?? '',
+                              textAlign: TextAlign.center,
+                              overflow: TextOverflow.ellipsis,
+                              maxLines: 2,
+                              style: context.textTheme.bodySmall?.copyWith(
+                                color: ColorsManager.lightGreyColor,
+                                fontSize: 9,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Visibility(
+                      visible: deviceData['subSpace'] != null || deviceData['subSpace'] != '',
+                      child: const SizedBox(
+                        height: 4,
+                      ),
+                    ),
+                    Visibility(
+                      visible: deviceData['subSpace'] != null || deviceData['subSpace'] != '',
+                      child: Row(
+                        spacing: 2,
+                        children: [
+                          SizedBox(
+                              width: 8,
+                              height: 8,
+                              child: SvgPicture.asset(Assets.spaceLocationIcon)),
+                          Flexible(
+                            child: Text(
+                              deviceData['subSpace'] ?? '',
+                              textAlign: TextAlign.center,
+                              overflow: TextOverflow.ellipsis,
+                              maxLines: 2,
+                              style: context.textTheme.bodySmall?.copyWith(
+                                color: ColorsManager.lightGreyColor,
+                                fontSize: 9,
+                                fontWeight: FontWeight.w400,
+                              ),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ),
                   ],
                 ),
+                if (deviceFunctions.isNotEmpty)
+                  const SizedBox(
+                    height: 4,
+                  ),
                 if (deviceFunctions.isNotEmpty)
                   ...deviceFunctions.map((function) => Row(
                         mainAxisSize: MainAxisSize.min,
@@ -123,7 +188,7 @@ class DraggableCard extends StatelessWidget {
                               '${function.operationName}: ${_formatFunctionValue(function)}',
                               style: context.textTheme.bodySmall?.copyWith(
                                 fontSize: 9,
-                                color: ColorsManager.textGray,
+                                color: ColorsManager.lightGreyColor,
                                 height: 1.2,
                               ),
                               maxLines: 2,
diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index 84fd44c0..f22c8ae3 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -51,12 +51,12 @@ class _RoutineDevicesState extends State<RoutineDevices> {
               'productType': device.productType,
               'functions': device.functions,
               'uniqueCustomId': '',
+              'tag': device.deviceTags!.isNotEmpty ? device.deviceTags![0].name : '',
+              'subSpace': device.deviceSubSpace?.subspaceName ?? '',
             };
 
             if (state.searchText != null && state.searchText!.isNotEmpty) {
-              return device.name!
-                      .toLowerCase()
-                      .contains(state.searchText!.toLowerCase())
+              return device.name!.toLowerCase().contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
                       imagePath: deviceData['imagePath'] as String,
                       title: deviceData['title'] as String,
diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index d0fcde28..5bc374a3 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -5,7 +5,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_mo
 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/helper/duration_format_helper.dart';
-import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_function.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
@@ -25,23 +24,21 @@ class OneGangSwitchHelper {
     required String uniqueCustomId,
     required bool removeComparetors,
   }) async {
-    List<BaseSwitchFunction> oneGangFunctions =
-        functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> oneGangFunctions = functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()
-              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData = state.addedFunctions
-                      .firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData =
+                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -88,12 +85,9 @@ class OneGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
+                                        context.read<FunctionBloc>().add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName:
-                                                  function.operationName,
+                                              operationName: function.operationName,
                                             ));
                                       },
                                     );
@@ -226,11 +220,11 @@ class OneGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+        _buildCountDownDisplay(
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(context, initialValue, device, operationName,
-            selectedFunctionData, selectCode),
+        _buildCountDownSlider(
+            context, initialValue, device, operationName, selectedFunctionData, selectCode),
       ],
     );
   }
@@ -271,8 +265,7 @@ class OneGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -320,8 +313,7 @@ class OneGangSwitchHelper {
       value: (initialValue ?? 0).toDouble(),
       min: operationalValues.minValue?.toDouble() ?? 0.0,
       max: operationalValues.maxValue?.toDouble() ?? 0.0,
-      divisions: (((operationalValues.maxValue ?? 0) -
-                  (operationalValues.minValue ?? 0)) /
+      divisions: (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
               (operationalValues.stepValue ?? 1))
           .round(),
       onChanged: (value) {
@@ -373,13 +365,9 @@ class OneGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected
-                ? ColorsManager.primaryColorWithOpacity
-                : ColorsManager.textGray,
+            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
@@ -391,8 +379,7 @@ class OneGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index d9788ee8..12d699b4 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -13,12 +13,10 @@ class Assets {
   static const String rightLine = "assets/images/right_line.png";
   static const String google = "assets/images/google.svg";
   static const String facebook = "assets/images/facebook.svg";
-  static const String invisiblePassword =
-      "assets/images/Password_invisible.svg";
+  static const String invisiblePassword = "assets/images/Password_invisible.svg";
   static const String visiblePassword = "assets/images/password_visible.svg";
   static const String accessIcon = "assets/images/access_icon.svg";
-  static const String spaseManagementIcon =
-      "assets/images/spase_management_icon.svg";
+  static const String spaseManagementIcon = "assets/images/spase_management_icon.svg";
   static const String devicesIcon = "assets/images/devices_icon.svg";
   static const String moveinIcon = "assets/images/movein_icon.svg";
   static const String constructionIcon = "assets/images/construction_icon.svg";
@@ -31,15 +29,13 @@ class Assets {
   static const String emptyTable = "assets/images/empty_table.svg";
 
   // General assets
-  static const String motionlessDetection =
-      "assets/icons/motionless_detection.svg";
+  static const String motionlessDetection = "assets/icons/motionless_detection.svg";
   static const String acHeating = "assets/icons/ac_heating.svg";
   static const String acPowerOff = "assets/icons/ac_power_off.svg";
   static const String acFanMiddle = "assets/icons/ac_fan_middle.svg";
   static const String switchAlarmSound = "assets/icons/switch_alarm_sound.svg";
   static const String resetOff = "assets/icons/reset_off.svg";
-  static const String sensitivityOperationIcon =
-      "assets/icons/sesitivity_operation_icon.svg";
+  static const String sensitivityOperationIcon = "assets/icons/sesitivity_operation_icon.svg";
   static const String motionDetection = "assets/icons/motion_detection.svg";
   static const String freezing = "assets/icons/freezing.svg";
   static const String indicator = "assets/icons/indicator.svg";
@@ -60,8 +56,7 @@ class Assets {
   static const String celsiusDegrees = "assets/icons/celsius_degrees.svg";
   static const String masterState = "assets/icons/master_state.svg";
   static const String acPower = "assets/icons/ac_power.svg";
-  static const String farDetectionFunction =
-      "assets/icons/far_detection_function.svg";
+  static const String farDetectionFunction = "assets/icons/far_detection_function.svg";
   static const String nobodyTime = "assets/icons/nobody_time.svg";
 
   // Automation functions
@@ -69,47 +64,33 @@ class Assets {
       "assets/icons/automation_functions/temp_password_unlock.svg";
   static const String doorlockNormalOpen =
       "assets/icons/automation_functions/doorlock_normal_open.svg";
-  static const String doorbell =
-      "assets/icons/automation_functions/doorbell.svg";
+  static const String doorbell = "assets/icons/automation_functions/doorbell.svg";
   static const String remoteUnlockViaApp =
       "assets/icons/automation_functions/remote_unlock_via_app.svg";
-  static const String doubleLock =
-      "assets/icons/automation_functions/double_lock.svg";
-  static const String selfTestResult =
-      "assets/icons/automation_functions/self_test_result.svg";
-  static const String lockAlarm =
-      "assets/icons/automation_functions/lock_alarm.svg";
-  static const String presenceState =
-      "assets/icons/automation_functions/presence_state.svg";
-  static const String currentTemp =
-      "assets/icons/automation_functions/current_temp.svg";
-  static const String presence =
-      "assets/icons/automation_functions/presence.svg";
+  static const String doubleLock = "assets/icons/automation_functions/double_lock.svg";
+  static const String selfTestResult = "assets/icons/automation_functions/self_test_result.svg";
+  static const String lockAlarm = "assets/icons/automation_functions/lock_alarm.svg";
+  static const String presenceState = "assets/icons/automation_functions/presence_state.svg";
+  static const String currentTemp = "assets/icons/automation_functions/current_temp.svg";
+  static const String presence = "assets/icons/automation_functions/presence.svg";
   static const String residualElectricity =
       "assets/icons/automation_functions/residual_electricity.svg";
-  static const String hijackAlarm =
-      "assets/icons/automation_functions/hijack_alarm.svg";
-  static const String passwordUnlock =
-      "assets/icons/automation_functions/password_unlock.svg";
+  static const String hijackAlarm = "assets/icons/automation_functions/hijack_alarm.svg";
+  static const String passwordUnlock = "assets/icons/automation_functions/password_unlock.svg";
   static const String remoteUnlockRequest =
       "assets/icons/automation_functions/remote_unlock_req.svg";
-  static const String cardUnlock =
-      "assets/icons/automation_functions/card_unlock.svg";
+  static const String cardUnlock = "assets/icons/automation_functions/card_unlock.svg";
   static const String motion = "assets/icons/automation_functions/motion.svg";
   static const String fingerprintUnlock =
       "assets/icons/automation_functions/fingerprint_unlock.svg";
 
   // Presence Sensor Assets
   static const String sensorMotionIcon = "assets/icons/sensor_motion_ic.svg";
-  static const String sensorPresenceIcon =
-      "assets/icons/sensor_presence_ic.svg";
+  static const String sensorPresenceIcon = "assets/icons/sensor_presence_ic.svg";
   static const String sensorVacantIcon = "assets/icons/sensor_vacant_ic.svg";
-  static const String illuminanceRecordIcon =
-      "assets/icons/illuminance_record_ic.svg";
-  static const String presenceRecordIcon =
-      "assets/icons/presence_record_ic.svg";
-  static const String helpDescriptionIcon =
-      "assets/icons/help_description_ic.svg";
+  static const String illuminanceRecordIcon = "assets/icons/illuminance_record_ic.svg";
+  static const String presenceRecordIcon = "assets/icons/presence_record_ic.svg";
+  static const String helpDescriptionIcon = "assets/icons/help_description_ic.svg";
 
   static const String lightPulp = "assets/icons/light_pulb.svg";
   static const String acDevice = "assets/icons/ac_device.svg";
@@ -159,12 +140,10 @@ class Assets {
   static const String unit = 'assets/icons/unit_icon.svg';
   static const String villa = 'assets/icons/villa_icon.svg';
   static const String iconEdit = 'assets/icons/icon_edit_icon.svg';
-  static const String textFieldSearch =
-      'assets/icons/textfield_search_icon.svg';
+  static const String textFieldSearch = 'assets/icons/textfield_search_icon.svg';
   static const String roundedAddIcon = 'assets/icons/rounded_add_icon.svg';
   static const String addIcon = 'assets/icons/add_icon.svg';
-  static const String smartThermostatIcon =
-      'assets/icons/smart_thermostat_icon.svg';
+  static const String smartThermostatIcon = 'assets/icons/smart_thermostat_icon.svg';
   static const String smartLightIcon = 'assets/icons/smart_light_icon.svg';
   static const String presenceSensor = 'assets/icons/presence_sensor.svg';
   static const String Gang3SwitchIcon = 'assets/icons/3_Gang_switch_icon.svg';
@@ -212,8 +191,7 @@ class Assets {
   //assets/icons/water_leak_normal.svg
   static const String waterLeakNormal = 'assets/icons/water_leak_normal.svg';
   //assets/icons/water_leak_detected.svg
-  static const String waterLeakDetected =
-      'assets/icons/water_leak_detected.svg';
+  static const String waterLeakDetected = 'assets/icons/water_leak_detected.svg';
 
   //assets/icons/automation_records.svg
   static const String automationRecords = 'assets/icons/automation_records.svg';
@@ -280,64 +258,40 @@ class Assets {
   static const String delay = 'assets/icons/routine/delay.svg';
 
   // Assets for functions_icons
-  static const String assetsSensitivityFunction =
-      "assets/icons/functions_icons/sensitivity.svg";
+  static const String assetsSensitivityFunction = "assets/icons/functions_icons/sensitivity.svg";
   static const String assetsSensitivityOperationIcon =
       "assets/icons/functions_icons/sesitivity_operation_icon.svg";
-  static const String assetsAcPower =
-      "assets/icons/functions_icons/ac_power.svg";
-  static const String assetsAcPowerOFF =
-      "assets/icons/functions_icons/ac_power_off.svg";
-  static const String assetsChildLock =
-      "assets/icons/functions_icons/child_lock.svg";
-  static const String assetsFreezing =
-      "assets/icons/functions_icons/freezing.svg";
-  static const String assetsFanSpeed =
-      "assets/icons/functions_icons/fan_speed.svg";
-  static const String assetsAcCooling =
-      "assets/icons/functions_icons/ac_cooling.svg";
-  static const String assetsAcHeating =
-      "assets/icons/functions_icons/ac_heating.svg";
-  static const String assetsCelsiusDegrees =
-      "assets/icons/functions_icons/celsius_degrees.svg";
-  static const String assetsTempreture =
-      "assets/icons/functions_icons/tempreture.svg";
-  static const String assetsAcFanLow =
-      "assets/icons/functions_icons/ac_fan_low.svg";
-  static const String assetsAcFanMiddle =
-      "assets/icons/functions_icons/ac_fan_middle.svg";
-  static const String assetsAcFanHigh =
-      "assets/icons/functions_icons/ac_fan_high.svg";
-  static const String assetsAcFanAuto =
-      "assets/icons/functions_icons/ac_fan_auto.svg";
-  static const String assetsSceneChildLock =
-      "assets/icons/functions_icons/scene_child_lock.svg";
+  static const String assetsAcPower = "assets/icons/functions_icons/ac_power.svg";
+  static const String assetsAcPowerOFF = "assets/icons/functions_icons/ac_power_off.svg";
+  static const String assetsChildLock = "assets/icons/functions_icons/child_lock.svg";
+  static const String assetsFreezing = "assets/icons/functions_icons/freezing.svg";
+  static const String assetsFanSpeed = "assets/icons/functions_icons/fan_speed.svg";
+  static const String assetsAcCooling = "assets/icons/functions_icons/ac_cooling.svg";
+  static const String assetsAcHeating = "assets/icons/functions_icons/ac_heating.svg";
+  static const String assetsCelsiusDegrees = "assets/icons/functions_icons/celsius_degrees.svg";
+  static const String assetsTempreture = "assets/icons/functions_icons/tempreture.svg";
+  static const String assetsAcFanLow = "assets/icons/functions_icons/ac_fan_low.svg";
+  static const String assetsAcFanMiddle = "assets/icons/functions_icons/ac_fan_middle.svg";
+  static const String assetsAcFanHigh = "assets/icons/functions_icons/ac_fan_high.svg";
+  static const String assetsAcFanAuto = "assets/icons/functions_icons/ac_fan_auto.svg";
+  static const String assetsSceneChildLock = "assets/icons/functions_icons/scene_child_lock.svg";
   static const String assetsSceneChildUnlock =
       "assets/icons/functions_icons/scene_child_unlock.svg";
-  static const String assetsSceneRefresh =
-      "assets/icons/functions_icons/scene_refresh.svg";
-  static const String assetsLightCountdown =
-      "assets/icons/functions_icons/light_countdown.svg";
-  static const String assetsFarDetection =
-      "assets/icons/functions_icons/far_detection.svg";
+  static const String assetsSceneRefresh = "assets/icons/functions_icons/scene_refresh.svg";
+  static const String assetsLightCountdown = "assets/icons/functions_icons/light_countdown.svg";
+  static const String assetsFarDetection = "assets/icons/functions_icons/far_detection.svg";
   static const String assetsFarDetectionFunction =
       "assets/icons/functions_icons/far_detection_function.svg";
-  static const String assetsIndicator =
-      "assets/icons/functions_icons/indicator.svg";
-  static const String assetsMotionDetection =
-      "assets/icons/functions_icons/motion_detection.svg";
+  static const String assetsIndicator = "assets/icons/functions_icons/indicator.svg";
+  static const String assetsMotionDetection = "assets/icons/functions_icons/motion_detection.svg";
   static const String assetsMotionlessDetection =
       "assets/icons/functions_icons/motionless_detection.svg";
-  static const String assetsNobodyTime =
-      "assets/icons/functions_icons/nobody_time.svg";
-  static const String assetsFactoryReset =
-      "assets/icons/functions_icons/factory_reset.svg";
-  static const String assetsMasterState =
-      "assets/icons/functions_icons/master_state.svg";
+  static const String assetsNobodyTime = "assets/icons/functions_icons/nobody_time.svg";
+  static const String assetsFactoryReset = "assets/icons/functions_icons/factory_reset.svg";
+  static const String assetsMasterState = "assets/icons/functions_icons/master_state.svg";
   static const String assetsSwitchAlarmSound =
       "assets/icons/functions_icons/switch_alarm_sound.svg";
-  static const String assetsResetOff =
-      "assets/icons/functions_icons/reset_off.svg";
+  static const String assetsResetOff = "assets/icons/functions_icons/reset_off.svg";
 
 // Assets for automation_functions
   static const String assetsCardUnlock =
@@ -368,8 +322,7 @@ class Assets {
       "assets/icons/functions_icons/automation_functions/self_test_result.svg";
   static const String assetsPresence =
       "assets/icons/functions_icons/automation_functions/presence.svg";
-  static const String assetsMotion =
-      "assets/icons/functions_icons/automation_functions/motion.svg";
+  static const String assetsMotion = "assets/icons/functions_icons/automation_functions/motion.svg";
   static const String assetsCurrentTemp =
       "assets/icons/functions_icons/automation_functions/current_temp.svg";
   static const String assetsPresenceState =
@@ -381,16 +334,12 @@ class Assets {
   static const String activeUser = 'assets/icons/active_user.svg';
   static const String deActiveUser = 'assets/icons/deactive_user.svg';
   static const String invitedIcon = 'assets/icons/invited_icon.svg';
-  static const String rectangleCheckBox =
-      'assets/icons/rectangle_check_box.png';
+  static const String rectangleCheckBox = 'assets/icons/rectangle_check_box.png';
   static const String CheckBoxChecked = 'assets/icons/box_checked.png';
   static const String emptyBox = 'assets/icons/empty_box.png';
-  static const String completeProcessIcon =
-      'assets/icons/compleate_process_icon.svg';
-  static const String currentProcessIcon =
-      'assets/icons/current_process_icon.svg';
-  static const String uncomplete_ProcessIcon =
-      'assets/icons/uncompleate_process_icon.svg';
+  static const String completeProcessIcon = 'assets/icons/compleate_process_icon.svg';
+  static const String currentProcessIcon = 'assets/icons/current_process_icon.svg';
+  static const String uncomplete_ProcessIcon = 'assets/icons/uncompleate_process_icon.svg';
   static const String wrongProcessIcon = 'assets/icons/wrong_process_icon.svg';
   static const String arrowForward = 'assets/icons/arrow_forward.svg';
   static const String arrowDown = 'assets/icons/arrow_down.svg';
@@ -403,17 +352,14 @@ class Assets {
   static const String duplicate = 'assets/icons/duplicate.svg';
   static const String spaceDelete = 'assets/icons/space_delete.svg';
 
-  static const String deleteSpaceLinkIcon =
-      'assets/icons/delete_space_link_icon.svg';
+  static const String deleteSpaceLinkIcon = 'assets/icons/delete_space_link_icon.svg';
   static const String spaceLinkIcon = 'assets/icons/space_link_icon.svg';
   static const String successIcon = 'assets/icons/success_icon.svg';
   static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
   static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png';
-  static const String scenesPlayIconCheck =
-      'assets/icons/scenesPlayIconCheck.png';
+  static const String scenesPlayIconCheck = 'assets/icons/scenesPlayIconCheck.png';
   static const String presenceStateIcon = 'assets/icons/presence_state.svg';
-  static const String currentDistanceIcon =
-      'assets/icons/current_distance_icon.svg';
+  static const String currentDistanceIcon = 'assets/icons/current_distance_icon.svg';
 
   static const String farDetectionIcon = 'assets/icons/far_detection_icon.svg';
   static const String motionDetectionSensitivityIcon =
@@ -423,11 +369,11 @@ class Assets {
       'assets/icons/motionless_detection_sensitivity_icon.svg';
 
   static const String IndicatorIcon = 'assets/icons/Indicator_icon.svg';
-    static const String motionDetectionSensitivityValueIcon = 'assets/icons/motion_detection_sensitivity_value_icon.svg';
-    static const String presenceTimeIcon = 'assets/icons/presence_time_icon.svg';
-    static const String IlluminanceIcon = 'assets/icons/Illuminance_icon.svg';
-    static const String gear = 'assets/icons/gear.svg';
-    static const String activeBell='assets/icons/active_bell.svg';
-
-
+  static const String motionDetectionSensitivityValueIcon =
+      'assets/icons/motion_detection_sensitivity_value_icon.svg';
+  static const String presenceTimeIcon = 'assets/icons/presence_time_icon.svg';
+  static const String IlluminanceIcon = 'assets/icons/Illuminance_icon.svg';
+  static const String gear = 'assets/icons/gear.svg';
+  static const String activeBell = 'assets/icons/active_bell.svg';
+  static const String deviceTagIcon = 'assets/icons/device_tag_ic.svg';
 }

From ee12980b473ad67c7b700f19900e3f60e1cf94c6 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 10:03:21 +0300
Subject: [PATCH 113/238] Fix value parsing in CpsDialogSliderSelector to
 ensure two decimal precision

---
 .../ceiling_sensor/cps_dialog_slider_selector.dart              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index 1c549d9f..a2d11f79 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -56,7 +56,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
                 entityId: device?.uuid ?? '',
                 functionCode: selectedFunction,
                 operationName: operationName,
-                value: value,
+                value: double.parse(value.toStringAsFixed(2)),
                 condition: selectedFunctionData.condition,
               ),
             ),

From ceb1e1d23a203924ff5e11331cbf66e08a87b2fd Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 10:03:37 +0300
Subject: [PATCH 114/238] Remove TODO comments.

---
 .../routine_dialogs/ceiling_sensor/cps_slider_helpers.dart     | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
index 03b7b5af..7c7571f6 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
@@ -84,7 +84,4 @@ abstract final class CpsSliderHelpers {
       _ => '${parsedValue?.toStringAsFixed(0) ?? 0}',
     };
   }
-  // TODO: Sports Para causes 400 in IF and THEN / sports_para
-  // TODO: Detection range causes 400 in IF / moving_range
-  // TODO: Distance of moving objects causes 400 in IF / presence_range
 }

From e2ec986bb9ae8de3a618c5cbe725c6b1a3d26edb Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 10:03:47 +0300
Subject: [PATCH 115/238] Refactor mappable stepped functions to a static
 constant for improved readability and maintainability

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart | 32 +++++++++++--------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 52665dfa..e54f348e 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -153,23 +153,27 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
     );
   }
 
+  static const _mappableSteppedFunctions = <String>{
+    'static_max_dis',
+    'presence_reference',
+    'moving_reference',
+    'perceptual_boundary',
+    'moving_boundary',
+    'moving_rigger_time',
+    'moving_static_time',
+    'none_body_time',
+    'moving_max_dis',
+  };
+
   List<DeviceFunctionData> _updateValuesForAddedFunctions(
     List<DeviceFunctionData> addedFunctions,
   ) {
-    const mappableSteppedFunctions = <String>{
-      'static_max_dis',
-      'presence_reference',
-      'moving_reference',
-      'perceptual_boundary',
-      'moving_boundary',
-      'moving_rigger_time',
-      'moving_static_time',
-      'none_body_time',
-      'moving_max_dis',
-    };
     return addedFunctions.map((function) {
-      if (mappableSteppedFunctions.contains(function.functionCode)) {
-        final mappedValue = mapSteppedValue(
+      final shouldMapValue = _mappableSteppedFunctions.contains(
+        function.functionCode,
+      );
+      if (shouldMapValue) {
+        final mappedValue = _mapSteppedValue(
           value: function.value,
           inputStep: CpsSliderHelpers.dividendOfRange(function.functionCode),
           inputRange: CpsSliderHelpers.sliderRange(function.functionCode),
@@ -189,7 +193,7 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
     }).toList();
   }
 
-  int mapSteppedValue({
+  int _mapSteppedValue({
     required (double min, double max) inputRange,
     required double inputStep,
     required (double min, double max, double dividend) outputRange,

From 6bea4c2f4adbea34e666b440185280104994b038 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 10:34:05 +0300
Subject: [PATCH 116/238] Add mappings for moving_range and presence_range in
 slider helpers

---
 .../routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart   | 2 ++
 .../routine_dialogs/ceiling_sensor/cps_slider_helpers.dart      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index e54f348e..7ce6a9b1 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -163,6 +163,8 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
     'moving_static_time',
     'none_body_time',
     'moving_max_dis',
+    'moving_range',
+    'presence_range',
   };
 
   List<DeviceFunctionData> _updateValuesForAddedFunctions(
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
index 7c7571f6..fcb363c9 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
@@ -12,6 +12,8 @@ abstract final class CpsSliderHelpers {
       'moving_static_time' => (0, 60000, 1000),
       'none_body_time' => (0, 300000, 5000),
       'moving_max_dis' => (0, 500, 50),
+      'moving_range' => (0, 255, 5),
+      'presence_range' => (0, 255, 5),
       _ => (defaultMin, defaultMax, defaultDivdidend),
     };
   }

From dba89027e365e65fbfc85c82d2922d66db6734f8 Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Tue, 15 Apr 2025 11:09:48 +0300
Subject: [PATCH 117/238] Updated the if statement for the tag and the location

---
 lib/pages/routines/widgets/dragable_card.dart | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/routines/widgets/dragable_card.dart b/lib/pages/routines/widgets/dragable_card.dart
index 039732b0..7395d2d6 100644
--- a/lib/pages/routines/widgets/dragable_card.dart
+++ b/lib/pages/routines/widgets/dragable_card.dart
@@ -120,7 +120,7 @@ class DraggableCard extends StatelessWidget {
                       height: 4,
                     ),
                     Visibility(
-                      visible: deviceData['tag'] != null,
+                      visible: deviceData['tag'] != null && deviceData['tag'] != '',
                       child: Row(
                         spacing: 2,
                         children: [
@@ -143,13 +143,13 @@ class DraggableCard extends StatelessWidget {
                       ),
                     ),
                     Visibility(
-                      visible: deviceData['subSpace'] != null || deviceData['subSpace'] != '',
+                      visible: deviceData['subSpace'] != null && deviceData['subSpace'] != '',
                       child: const SizedBox(
                         height: 4,
                       ),
                     ),
                     Visibility(
-                      visible: deviceData['subSpace'] != null || deviceData['subSpace'] != '',
+                      visible: deviceData['subSpace'] != null && deviceData['subSpace'] != '',
                       child: Row(
                         spacing: 2,
                         children: [

From 254e03e3c770da9f7661b88a20751f8e851023d8 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 11:19:58 +0300
Subject: [PATCH 118/238] Add mapping for 'sports_para' in slider range
 function

---
 .../routine_dialogs/ceiling_sensor/cps_slider_helpers.dart       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
index fcb363c9..fd637c28 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_slider_helpers.dart
@@ -35,6 +35,7 @@ abstract final class CpsSliderHelpers {
         'moving_rigger_time' => (0, 2),
         'moving_static_time' => (0, 50),
         'none_body_time' => (0, 300),
+        'sports_para' => (0, 100),
         _ => (0, 300),
       };
 

From be0533645eee2ec131a32dba7b496c9bbee06b7b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 11:20:15 +0300
Subject: [PATCH 119/238] Refactor dialog header text assignment in
 `CeilingSensorDialog` for clarity and readability.

---
 .../ceiling_sensor/ceiling_sensor_dialog.dart      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 7ce6a9b1..c18706f0 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -35,6 +35,7 @@ class CeilingSensorDialog extends StatefulWidget {
 
 class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
   late final List<CpsFunctions> _cpsFunctions;
+  late final String _dialogHeaderText;
 
   @override
   void initState() {
@@ -46,6 +47,9 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
       }
       return function.type == 'IF' || function.type == 'BOTH';
     }).toList();
+
+    final isIfDialog = widget.dialogType == 'IF';
+    _dialogHeaderText = isIfDialog ? 'Conditions' : 'Functions';
   }
 
   @override
@@ -67,18 +71,18 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
             child: Column(
               mainAxisSize: MainAxisSize.min,
               children: [
-                DialogHeader(
-                  'Presence Sensor ${widget.dialogType == "IF" ? 'Conditions' : 'Functions'}',
-                ),
+                DialogHeader('Presence Sensor $_dialogHeaderText'),
                 Expanded(child: _buildMainContent(context, state)),
                 DialogFooter(
                   onCancel: () => Navigator.pop(context),
                   onConfirm: state.addedFunctions.isNotEmpty
                       ? () {
+                          final functions = _updateValuesForAddedFunctions(
+                            state.addedFunctions,
+                          );
                           context.read<RoutineBloc>().add(
                                 AddFunctionToRoutine(
-                                  _updateValuesForAddedFunctions(
-                                      state.addedFunctions),
+                                  functions,
                                   '${widget.uniqueCustomId}',
                                 ),
                               );

From 616adccfdda7fd8611a4a5e1c2eb36d896439644 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 12:58:20 +0300
Subject: [PATCH 120/238] Applied the correct scenario of tapping add community
 icon button.

---
 .../widgets/sidebar_add_community_button.dart | 23 ++-----------
 .../all_spaces/widgets/sidebar_header.dart    | 11 +++++--
 .../all_spaces/widgets/sidebar_widget.dart    | 32 ++++++++++++++++---
 3 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
index 5c769d48..ae1eb2bf 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_add_community_button.dart
@@ -1,19 +1,15 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
-import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class SidebarAddCommunityButton extends StatelessWidget {
   const SidebarAddCommunityButton({
-    required this.existingCommunityNames,
+    required this.onTap,
     super.key,
   });
 
-  final List<String> existingCommunityNames;
+  final void Function() onTap;
 
   @override
   Widget build(BuildContext context) {
@@ -30,22 +26,9 @@ class SidebarAddCommunityButton extends StatelessWidget {
             ),
           ),
         ),
-        onPressed: () => _showCreateCommunityDialog(context),
+        onPressed: onTap,
         icon: SvgPicture.asset(Assets.addIcon),
       ),
     );
   }
-
-  void _showCreateCommunityDialog(BuildContext context) => showDialog<void>(
-        context: context,
-        builder: (context) => CreateCommunityDialog(
-          isEditMode: false,
-          existingCommunityNames: existingCommunityNames,
-          onCreateCommunity: (name, description) {
-            context.read<SpaceManagementBloc>().add(
-                  CreateCommunityEvent(name, description, context),
-                );
-          },
-        ),
-      );
 }
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
index 135be109..1706d51a 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_header.dart
@@ -5,9 +5,12 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class SidebarHeader extends StatelessWidget {
-  const SidebarHeader({required this.existingCommunityNames, super.key});
+  const SidebarHeader({
+    required this.onAddCommunity,
+    super.key,
+  });
 
-  final List<String> existingCommunityNames;
+  final void Function() onAddCommunity;
 
   @override
   Widget build(BuildContext context) {
@@ -23,7 +26,9 @@ class SidebarHeader extends StatelessWidget {
               color: ColorsManager.blackColor,
             ),
           ),
-          SidebarAddCommunityButton(existingCommunityNames: existingCommunityNames),
+          SidebarAddCommunityButton(
+            onTap: onAddCommunity,
+          ),
         ],
       ),
     );
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 35bb8ad2..b30a8c96 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/community_tile.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/sidebar_header.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_tile_widget.dart';
+import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
 import 'package:syncrow_web/utils/style.dart';
@@ -94,10 +95,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         mainAxisSize: MainAxisSize.min,
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          SidebarHeader(
-            existingCommunityNames:
-                widget.communities.map((community) => community.name).toList(),
-          ),
+          SidebarHeader(onAddCommunity: _onAddCommunity),
           CustomSearchBar(
             onSearchChanged: (query) => setState(() => _searchQuery = query),
           ),
@@ -179,4 +177,30 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       ),
     );
   }
+
+  void _onAddCommunity() => _selectedId?.isNotEmpty ?? true
+      ? _clearSelection()
+      : _showCreateCommunityDialog();
+
+  void _clearSelection() {
+    setState(() => _selectedId = '');
+    context.read<SpaceManagementBloc>().add(
+          NewCommunityEvent(communities: widget.communities),
+        );
+  }
+
+  void _showCreateCommunityDialog() {
+    showDialog<void>(
+      context: context,
+      builder: (context) => CreateCommunityDialog(
+        isEditMode: false,
+        existingCommunityNames: widget.communities.map((e) => e.name).toList(),
+        onCreateCommunity: (name, description) {
+          context.read<SpaceManagementBloc>().add(
+                CreateCommunityEvent(name, description, context),
+              );
+        },
+      ),
+    );
+  }
 }

From 7dcaa20da12ace15f71e1a9693a4bd9dc031f490 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 13:06:30 +0300
Subject: [PATCH 121/238] Enhanced the code and look of `DialogFooter` buttons.

---
 lib/pages/routines/widgets/dialog_footer.dart | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/lib/pages/routines/widgets/dialog_footer.dart b/lib/pages/routines/widgets/dialog_footer.dart
index 15db9732..e5a548f7 100644
--- a/lib/pages/routines/widgets/dialog_footer.dart
+++ b/lib/pages/routines/widgets/dialog_footer.dart
@@ -8,12 +8,12 @@ class DialogFooter extends StatelessWidget {
   final int? dialogWidth;
 
   const DialogFooter({
-    Key? key,
+    super.key,
     required this.onCancel,
     required this.onConfirm,
     required this.isConfirmEnabled,
     this.dialogWidth,
-  }) : super(key: key);
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -28,21 +28,19 @@ class DialogFooter extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: [
-          Expanded(
-            child: _buildFooterButton(
-              context,
-              'Cancel',
-              onCancel,
-            ),
+          _buildFooterButton(
+            context: context,
+            text: 'Cancel',
+            onTap: onCancel,
           ),
           if (isConfirmEnabled) ...[
             Container(width: 1, height: 50, color: ColorsManager.greyColor),
-            Expanded(
-              child: _buildFooterButton(
-                context,
-                'Confirm',
-                onConfirm,
-              ),
+            _buildFooterButton(
+              context: context,
+              text: 'Confirm',
+              onTap: onConfirm,
+              textColor:
+                  isConfirmEnabled ? ColorsManager.primaryColorWithOpacity : Colors.red,
             ),
           ],
         ],
@@ -50,24 +48,24 @@ class DialogFooter extends StatelessWidget {
     );
   }
 
-  Widget _buildFooterButton(
-    BuildContext context,
-    String text,
-    VoidCallback? onTap,
-  ) {
-    return GestureDetector(
-      onTap: onTap,
-      child: SizedBox(
-        height: 50,
-        child: Center(
-          child: Text(
-            text,
-            style: Theme.of(context).textTheme.bodyMedium!.copyWith(
-                  color: text == 'Confirm'
-                      ? ColorsManager.primaryColorWithOpacity
-                      : ColorsManager.textGray,
-                ),
-          ),
+  Widget _buildFooterButton({
+    required BuildContext context,
+    required String text,
+    required VoidCallback? onTap,
+    Color? textColor,
+  }) {
+    return Expanded(
+      child: TextButton(
+        style: TextButton.styleFrom(
+          foregroundColor: ColorsManager.primaryColorWithOpacity,
+          disabledForegroundColor: ColorsManager.primaryColor,
+        ),
+        onPressed: onTap,
+        child: Text(
+          text,
+          style: Theme.of(context).textTheme.bodyMedium?.copyWith(
+                color: textColor ?? ColorsManager.textGray,
+              ),
         ),
       ),
     );

From 1bfab8cc768557c5da701f7d997b837beaf0bc68 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 14:38:06 +0300
Subject: [PATCH 122/238] SP-1189-Fix tapping ok and nothing happening bug by
 taking the action out of the widget.

---
 .../widgets/loaded_space_widget.dart          |   7 +
 .../all_spaces/widgets/sidebar_widget.dart    |   8 +-
 .../views/create_subspace_model_dialog.dart   | 231 ++++--------------
 .../create_subspace_model_chips_box.dart      |  64 +++++
 .../create_subspace_model_footer_buttons.dart |  53 ++++
 .../widgets/subspace_chip.dart                |  58 +++++
 .../widgets/subspaces_textfield.dart          |  68 ++++++
 7 files changed, 297 insertions(+), 192 deletions(-)
 create mode 100644 lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart
 create mode 100644 lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_footer_buttons.dart
 create mode 100644 lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart
 create mode 100644 lib/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart

diff --git a/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
index 66b2d6da..5ef9c79b 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
@@ -2,6 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/view/space_tree_view.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_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/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/space_model.dart';
@@ -107,6 +109,11 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                     selectedSpaceUuid: widget.selectedSpace?.uuid ??
                         widget.selectedCommunity?.uuid ??
                         '',
+                    onCreateCommunity: (name, description) {
+                      context.read<SpaceManagementBloc>().add(
+                            CreateCommunityEvent(name, description, context),
+                          );
+                    },
                   ),
                   CommunityStructureArea(
                     selectedCommunity: widget.selectedCommunity,
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index b30a8c96..3eb1c001 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -16,9 +16,11 @@ import 'package:syncrow_web/utils/style.dart';
 class SidebarWidget extends StatefulWidget {
   final List<CommunityModel> communities;
   final String? selectedSpaceUuid;
+  final void Function(String name, String description) onCreateCommunity;
 
   const SidebarWidget({
     required this.communities,
+    required this.onCreateCommunity,
     this.selectedSpaceUuid,
     super.key,
   });
@@ -195,11 +197,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       builder: (context) => CreateCommunityDialog(
         isEditMode: false,
         existingCommunityNames: widget.communities.map((e) => e.name).toList(),
-        onCreateCommunity: (name, description) {
-          context.read<SpaceManagementBloc>().add(
-                CreateCommunityEvent(name, description, context),
-              );
-        },
+        onCreateCommunity: widget.onCreateCommunity,
       ),
     );
   }
diff --git a/lib/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart
index 7a39891b..66acdf3d 100644
--- a/lib/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace_model/views/create_subspace_model_dialog.dart
@@ -1,12 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_state.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_footer_buttons.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CreateSubSpaceModelDialog extends StatelessWidget {
   final bool isEdit;
@@ -14,211 +15,67 @@ class CreateSubSpaceModelDialog extends StatelessWidget {
   final List<SubspaceTemplateModel>? existingSubSpaces;
   final void Function(List<SubspaceTemplateModel> newSubspaces)? onUpdate;
 
-  const CreateSubSpaceModelDialog(
-      {Key? key,
-      required this.isEdit,
-      required this.dialogTitle,
-      this.existingSubSpaces,
-      this.onUpdate})
-      : super(key: key);
+  const CreateSubSpaceModelDialog({
+    required this.isEdit,
+    required this.dialogTitle,
+    this.existingSubSpaces,
+    this.onUpdate,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
     final screenWidth = MediaQuery.of(context).size.width;
-    final textController = TextEditingController();
 
     return Dialog(
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(20),
       ),
       child: BlocProvider(
-        create: (_) {
+        create: (context) {
           final bloc = SubSpaceModelBloc();
           if (existingSubSpaces != null) {
-            for (var subSpace in existingSubSpaces!) {
+            for (final subSpace in existingSubSpaces ?? []) {
               bloc.add(AddSubSpaceModel(subSpace));
             }
           }
           return bloc;
         },
         child: BlocBuilder<SubSpaceModelBloc, SubSpaceModelState>(
-          builder: (context, state) {
-            return Container(
-                color: ColorsManager.whiteColors,
-                child: SizedBox(
-                  width: screenWidth * 0.3,
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Text(
-                          dialogTitle,
-                          style: Theme.of(context)
-                              .textTheme
-                              .headlineLarge
-                              ?.copyWith(color: ColorsManager.blackColor),
-                        ),
-                        const SizedBox(height: 16),
-                        Container(
-                          width: screenWidth * 0.35,
-                          padding: const EdgeInsets.symmetric(
-                              vertical: 10.0, horizontal: 16.0),
-                          decoration: BoxDecoration(
-                            color: ColorsManager.boxColor,
-                            borderRadius: BorderRadius.circular(10),
-                          ),
-                          child: Wrap(
-                            spacing: 8.0,
-                            runSpacing: 8.0,
-                            children: [
-                              ...state.subSpaces.asMap().entries.map(
-                                (entry) {
-                                  final index = entry.key;
-                                  final subSpace = entry.value;
-
-                                  final lowerName =
-                                      subSpace.subspaceName.toLowerCase();
-
-                                  final duplicateIndices = state.subSpaces
-                                      .asMap()
-                                      .entries
-                                      .where((e) =>
-                                          e.value.subspaceName.toLowerCase() ==
-                                          lowerName)
-                                      .map((e) => e.key)
-                                      .toList();
-                                  final isDuplicate =
-                                      duplicateIndices.length > 1 &&
-                                          duplicateIndices.indexOf(index) != 0;
-
-                                  return Chip(
-                                    label: Text(subSpace.subspaceName,
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .bodySmall
-                                            ?.copyWith(
-                                              color: ColorsManager.spaceColor,
-                                            )),
-                                    backgroundColor: ColorsManager.whiteColors,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(10),
-                                      side: BorderSide(
-                                        color: isDuplicate
-                                            ? ColorsManager.red
-                                            : ColorsManager.transparentColor,
-                                        width: 0,
-                                      ),
-                                    ),
-                                    deleteIcon: Container(
-                                      width: 24,
-                                      height: 24,
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        border: Border.all(
-                                          color: ColorsManager.lightGrayColor,
-                                          width: 1.5,
-                                        ),
-                                      ),
-                                      child: const Icon(
-                                        Icons.close,
-                                        size: 16,
-                                        color: ColorsManager.lightGrayColor,
-                                      ),
-                                    ),
-                                    onDeleted: () => context
-                                        .read<SubSpaceModelBloc>()
-                                        .add(RemoveSubSpaceModel(subSpace)),
-                                  );
-                                },
-                              ),
-                              SizedBox(
-                                width: 200,
-                                child: TextField(
-                                    controller: textController,
-                                    decoration: InputDecoration(
-                                        border: InputBorder.none,
-                                        hintText: state.subSpaces.isEmpty
-                                            ? 'Please enter the name'
-                                            : null,
-                                        hintStyle: Theme.of(context)
-                                            .textTheme
-                                            .bodySmall!
-                                            .copyWith(
-                                                color: ColorsManager
-                                                    .lightGrayColor)),
-                                    onSubmitted: (value) {
-                                      if (value.trim().isNotEmpty) {
-                                        context.read<SubSpaceModelBloc>().add(
-                                            AddSubSpaceModel(
-                                                SubspaceTemplateModel(
-                                                    subspaceName: value.trim(),
-                                                    disabled: false)));
-                                        textController.clear();
-                                      }
-                                    },
-                                    style: Theme.of(context)
-                                        .textTheme
-                                        .bodyMedium
-                                        ?.copyWith(
-                                            color: ColorsManager.blackColor)),
-                              ),
-                            ],
-                          ),
-                        ),
-                        if (state.errorMessage.isNotEmpty)
-                          Padding(
-                            padding: const EdgeInsets.only(bottom: 16.0),
-                            child: Text(state.errorMessage,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodySmall
-                                    ?.copyWith(
-                                      color: ColorsManager.red,
-                                    )),
-                          ),
-                        const SizedBox(height: 16),
-                        Row(
-                          children: [
-                            Expanded(
-                              child: CancelButton(
-                                label: 'Cancel',
-                                onPressed: () async {
-                                  Navigator.of(context).pop();
-                                },
-                              ),
-                            ),
-                            const SizedBox(width: 10),
-                            Expanded(
-                              child: DefaultButton(
-                                onPressed: (state.errorMessage.isNotEmpty)
-                                    ? null
-                                    : () async {
-                                        final subSpaces = context
-                                            .read<SubSpaceModelBloc>()
-                                            .state
-                                            .subSpaces;
-                                        Navigator.of(context).pop();
-                                        if (onUpdate != null) {
-                                          onUpdate!(subSpaces);
-                                        }
-                                      },
-                                backgroundColor: ColorsManager.secondaryColor,
-                                borderRadius: 10,
-                                foregroundColor: state.errorMessage.isNotEmpty
-                                    ? ColorsManager.whiteColorsWithOpacity
-                                    : ColorsManager.whiteColors,
-                                child: const Text('OK'),
-                              ),
-                            ),
-                          ],
-                        ),
-                      ],
+          builder: (context, state) => Container(
+            color: ColorsManager.whiteColors,
+            width: screenWidth * 0.3,
+            padding: const EdgeInsets.all(16),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  dialogTitle,
+                  style: context.textTheme.headlineLarge?.copyWith(
+                    color: ColorsManager.blackColor,
+                  ),
+                ),
+                const SizedBox(height: 16),
+                CreateSubspaceModelChipsBox(subSpaces: state.subSpaces),
+                if (state.errorMessage.isNotEmpty)
+                  Padding(
+                    padding: const EdgeInsets.only(bottom: 16),
+                    child: Text(
+                      state.errorMessage,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.red,
+                      ),
                     ),
                   ),
-                ));
-          },
+                const SizedBox(height: 16),
+                CreateSubspaceModelFooterButtons(
+                  onUpdate: onUpdate,
+                  errorMessage: state.errorMessage,
+                ),
+              ],
+            ),
+          ),
         ),
       ),
     );
diff --git a/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart b/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart
new file mode 100644
index 00000000..a18fc8d8
--- /dev/null
+++ b/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart
@@ -0,0 +1,64 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CreateSubspaceModelChipsBox extends StatelessWidget {
+  const CreateSubspaceModelChipsBox({
+    required this.subSpaces,
+    super.key,
+  });
+
+  final List<SubspaceTemplateModel> subSpaces;
+
+  @override
+  Widget build(BuildContext context) {
+    final screenWidth = MediaQuery.of(context).size.width;
+
+    return Container(
+      width: screenWidth * 0.35,
+      padding: const EdgeInsets.symmetric(
+        vertical: 10,
+        horizontal: 16,
+      ),
+      decoration: BoxDecoration(
+        color: ColorsManager.boxColor,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Wrap(
+        spacing: 8,
+        runSpacing: 8,
+        alignment: WrapAlignment.start,
+        crossAxisAlignment: WrapCrossAlignment.center,
+        children: [
+          ...subSpaces.asMap().entries.map(
+            (entry) {
+              final index = entry.key;
+              final subSpace = entry.value;
+
+              final lowerName = subSpace.subspaceName.toLowerCase();
+
+              final duplicateIndices = subSpaces
+                  .asMap()
+                  .entries
+                  .where((e) => e.value.subspaceName.toLowerCase() == lowerName)
+                  .map((e) => e.key)
+                  .toList();
+              final isDuplicate = duplicateIndices.length > 1 &&
+                  duplicateIndices.indexOf(index) != 0;
+
+              return SubspaceChip(
+                subSpace: subSpace,
+                isDuplicate: isDuplicate,
+              );
+            },
+          ),
+          SubspacesTextfield(
+            hintText: subSpaces.isEmpty ? 'Please enter the name' : null,
+          ),
+        ],
+      ),
+    );
+  }
+}
diff --git a/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_footer_buttons.dart b/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_footer_buttons.dart
new file mode 100644
index 00000000..a8dcf89c
--- /dev/null
+++ b/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_footer_buttons.dart
@@ -0,0 +1,53 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
+import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CreateSubspaceModelFooterButtons extends StatelessWidget {
+  const CreateSubspaceModelFooterButtons({
+    required this.onUpdate,
+    required this.errorMessage,
+    super.key,
+  });
+
+  final void Function(List<SubspaceTemplateModel> newSubspaces)? onUpdate;
+  final String errorMessage;
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      children: [
+        Expanded(
+          child: CancelButton(
+            label: 'Cancel',
+            onPressed: () => Navigator.of(context).pop(),
+          ),
+        ),
+        const SizedBox(width: 10),
+        Expanded(
+          child: DefaultButton(
+            onPressed: errorMessage.isEmpty
+                ? () {
+                    Navigator.of(context).pop();
+                    if (onUpdate != null) {
+                      final subSpaces =
+                          context.read<SubSpaceModelBloc>().state.subSpaces;
+                      onUpdate!(subSpaces);
+                    }
+                  }
+                : null,
+            backgroundColor: ColorsManager.secondaryColor,
+            borderRadius: 10,
+            foregroundColor: errorMessage.isNotEmpty
+                ? ColorsManager.whiteColorsWithOpacity
+                : ColorsManager.whiteColors,
+            child: const Text('OK'),
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart b/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart
new file mode 100644
index 00000000..b54e0712
--- /dev/null
+++ b/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart
@@ -0,0 +1,58 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class SubspaceChip extends StatelessWidget {
+  const SubspaceChip({
+    required this.subSpace,
+    required this.isDuplicate,
+    super.key,
+  });
+
+  final SubspaceTemplateModel subSpace;
+  final bool isDuplicate;
+
+  @override
+  Widget build(BuildContext context) {
+    return Chip(
+      label: Text(
+        subSpace.subspaceName,
+        style: context.textTheme.bodySmall?.copyWith(
+          color: isDuplicate ? ColorsManager.red : ColorsManager.spaceColor,
+        ),
+      ),
+      backgroundColor: ColorsManager.whiteColors,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(10),
+        side: BorderSide(
+          color: isDuplicate ? ColorsManager.red : ColorsManager.transparentColor,
+          width: 0,
+        ),
+      ),
+      deleteIcon: Container(
+        padding: const EdgeInsetsDirectional.all(1),
+        decoration: BoxDecoration(
+          shape: BoxShape.circle,
+          border: Border.all(
+            color: ColorsManager.lightGrayColor,
+            width: 1.5,
+          ),
+        ),
+        child: const FittedBox(
+          fit: BoxFit.scaleDown,
+          child: Icon(
+            Icons.close,
+            color: ColorsManager.lightGrayColor,
+          ),
+        ),
+      ),
+      onDeleted: () => context.read<SubSpaceModelBloc>().add(
+            RemoveSubSpaceModel(subSpace),
+          ),
+    );
+  }
+}
diff --git a/lib/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart b/lib/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart
new file mode 100644
index 00000000..d654b960
--- /dev/null
+++ b/lib/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart
@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class SubspacesTextfield extends StatefulWidget {
+  const SubspacesTextfield({
+    required this.hintText,
+    super.key,
+  });
+
+  final String? hintText;
+
+  @override
+  State<SubspacesTextfield> createState() => _SubspacesTextfieldState();
+}
+
+class _SubspacesTextfieldState extends State<SubspacesTextfield> {
+  late final TextEditingController _controller;
+  @override
+  void initState() {
+    _controller = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SizedBox(
+      width: 100,
+      child: TextField(
+        controller: _controller,
+        decoration: InputDecoration(
+          border: InputBorder.none,
+          hintText: widget.hintText,
+          hintStyle: context.textTheme.bodySmall?.copyWith(
+            color: ColorsManager.lightGrayColor,
+          ),
+        ),
+        onSubmitted: (value) {
+          final trimmedValue = value.trim();
+          if (trimmedValue.isNotEmpty) {
+            context.read<SubSpaceModelBloc>().add(
+                  AddSubSpaceModel(
+                    SubspaceTemplateModel(
+                      subspaceName: trimmedValue,
+                      disabled: false,
+                    ),
+                  ),
+                );
+            _controller.clear();
+          }
+        },
+        style: context.textTheme.bodyMedium?.copyWith(
+          color: ColorsManager.blackColor,
+        ),
+      ),
+    );
+  }
+}

From 748c67fd8b475530dc75b8abf5df102e022980d2 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 14:52:20 +0300
Subject: [PATCH 123/238] SP-1333

---
 .../widgets/tag_chips_display_widget.dart       | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index fc6a8c88..fc085237 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -88,12 +88,7 @@ class TagChipDisplay extends StatelessWidget {
                           ),
                         ),
                       ),
-                  EditChip(onTap: () async {
-                    // Use the Navigator's context for showDialog
-                    Navigator.of(context).pop();
-
-                    await showDialog<bool>(
-                        barrierDismissible: false,
+                  EditChip(onTap: () => showDialog<bool>(
                         context: context,
                         builder: (context) => AssignTagModelsDialog(
                               products: products,
@@ -110,18 +105,14 @@ class TagChipDisplay extends StatelessWidget {
                                   spaceModel?.tags ?? [], subspaces),
                               spaceName: spaceModel?.modelName ?? '',
                               projectTags: projectTags,
-                            ));
-                  })
+                            )))
                 ],
               ),
             ),
           )
         : TextButton(
-            onPressed: () async {
-              Navigator.of(context).pop();
-
-              await showDialog<bool>(
-                barrierDismissible: false,
+            onPressed: () {
+              showDialog<void>(
                 context: context,
                 builder: (context) => AddDeviceTypeModelWidget(
                   products: products,

From 117f6190dd62175b45de191c9d1af24f557dfe30 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:02:58 +0300
Subject: [PATCH 124/238] removed unnecessary `BuildContext` from
 `TagChipDisplay` constructor, sorted its properies, and converted to using
 `super.key`.

---
 .../dialog/create_space_model_dialog.dart     |  1 -
 .../widgets/tag_chips_display_widget.dart     | 26 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
index 98251382..3afb0c6f 100644
--- a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
+++ b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
@@ -145,7 +145,6 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     ),
                     const SizedBox(height: 10),
                     TagChipDisplay(
-                      context,
                       screenWidth: screenWidth,
                       spaceModel: updatedSpaceModel,
                       products: products,
diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index fc085237..3c1a22ec 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -23,19 +23,19 @@ class TagChipDisplay extends StatelessWidget {
   final List<SpaceTemplateModel>? allSpaceModels;
   final List<Tag> projectTags;
 
-  const TagChipDisplay(BuildContext context,
-      {Key? key,
-      required this.screenWidth,
-      required this.spaceModel,
-      required this.products,
-      required this.subspaces,
-      required this.allTags,
-      required this.spaceNameController,
-      this.pageContext,
-      this.otherSpaceModels,
-      this.allSpaceModels,
-      required this.projectTags})
-      : super(key: key);
+  const TagChipDisplay({
+     required this.screenWidth,
+     required this.spaceModel,
+     required this.products,
+     required this.subspaces,
+     required this.allTags,
+     required this.spaceNameController,
+     required this.projectTags,
+     this.pageContext,
+     this.otherSpaceModels,
+     this.allSpaceModels,
+     super.key,
+    });
 
   @override
   Widget build(BuildContext context) {

From 7d0e50fb1d2b0795631fd3c1112c1c32bb645e52 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:03:27 +0300
Subject: [PATCH 125/238] removed unnecessary comments.

---
 .../space_model/widgets/tag_chips_display_widget.dart        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 3c1a22ec..57dd6318 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -51,14 +51,13 @@ class TagChipDisplay extends StatelessWidget {
                 borderRadius: BorderRadius.circular(15),
                 border: Border.all(
                   color: ColorsManager.textFieldGreyColor,
-                  width: 3.0, // Border width
+                  width: 3.0,
                 ),
               ),
               child: Wrap(
                 spacing: 8.0,
                 runSpacing: 8.0,
                 children: [
-                  // Combine tags from spaceModel and subspaces
                   ...TagHelper.groupTags([
                     ...?spaceModel?.tags,
                     ...?spaceModel?.subspaceModels?.expand((subspace) => subspace.tags ?? [])
@@ -73,7 +72,7 @@ class TagChipDisplay extends StatelessWidget {
                             ),
                           ),
                           label: Text(
-                            'x${entry.value}', // Show count
+                            'x${entry.value}',
                             style: Theme.of(context)
                                 .textTheme
                                 .bodySmall!

From 7945cefe5374a0a4152fe939708f3353992d2eb3 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:05:06 +0300
Subject: [PATCH 126/238] added trailing commas wherever necessary.

---
 .../widgets/tag_chips_display_widget.dart     | 78 ++++++++++---------
 1 file changed, 42 insertions(+), 36 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 57dd6318..98996d5f 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -24,23 +24,24 @@ class TagChipDisplay extends StatelessWidget {
   final List<Tag> projectTags;
 
   const TagChipDisplay({
-     required this.screenWidth,
-     required this.spaceModel,
-     required this.products,
-     required this.subspaces,
-     required this.allTags,
-     required this.spaceNameController,
-     required this.projectTags,
-     this.pageContext,
-     this.otherSpaceModels,
-     this.allSpaceModels,
-     super.key,
-    });
+    required this.screenWidth,
+    required this.spaceModel,
+    required this.products,
+    required this.subspaces,
+    required this.allTags,
+    required this.spaceNameController,
+    required this.projectTags,
+    this.pageContext,
+    this.otherSpaceModels,
+    this.allSpaceModels,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
     return (spaceModel?.tags?.isNotEmpty == true ||
-            spaceModel?.subspaceModels?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
+            spaceModel?.subspaceModels
+                    ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
                 true)
         ? SizedBox(
             width: screenWidth * 0.25,
@@ -60,7 +61,7 @@ class TagChipDisplay extends StatelessWidget {
                 children: [
                   ...TagHelper.groupTags([
                     ...?spaceModel?.tags,
-                    ...?spaceModel?.subspaceModels?.expand((subspace) => subspace.tags ?? [])
+                    ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
                   ]).entries.map(
                         (entry) => Chip(
                           avatar: SizedBox(
@@ -73,10 +74,9 @@ class TagChipDisplay extends StatelessWidget {
                           ),
                           label: Text(
                             'x${entry.value}',
-                            style: Theme.of(context)
-                                .textTheme
-                                .bodySmall!
-                                .copyWith(color: ColorsManager.spaceColor),
+                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                                  color: ColorsManager.spaceColor,
+                                ),
                           ),
                           backgroundColor: ColorsManager.whiteColors,
                           shape: RoundedRectangleBorder(
@@ -87,24 +87,30 @@ class TagChipDisplay extends StatelessWidget {
                           ),
                         ),
                       ),
-                  EditChip(onTap: () => showDialog<bool>(
-                        context: context,
-                        builder: (context) => AssignTagModelsDialog(
-                              products: products,
-                              allSpaceModels: allSpaceModels,
-                              subspaces: subspaces,
-                              pageContext: pageContext,
-                              allTags: allTags,
-                              spaceModel: spaceModel,
-                              otherSpaceModels: otherSpaceModels,
-                              initialTags: TagHelper.generateInitialTags(
-                                  subspaces: subspaces, spaceTagModels: spaceModel?.tags ?? []),
-                              title: 'Edit Device',
-                              addedProducts: TagHelper.createInitialSelectedProducts(
-                                  spaceModel?.tags ?? [], subspaces),
-                              spaceName: spaceModel?.modelName ?? '',
-                              projectTags: projectTags,
-                            )))
+                  EditChip(
+                    onTap: () => showDialog<bool>(
+                      context: context,
+                      builder: (context) => AssignTagModelsDialog(
+                        products: products,
+                        allSpaceModels: allSpaceModels,
+                        subspaces: subspaces,
+                        pageContext: pageContext,
+                        allTags: allTags,
+                        spaceModel: spaceModel,
+                        otherSpaceModels: otherSpaceModels,
+                        initialTags: TagHelper.generateInitialTags(
+                            subspaces: subspaces,
+                            spaceTagModels: spaceModel?.tags ?? []),
+                        title: 'Edit Device',
+                        addedProducts: TagHelper.createInitialSelectedProducts(
+                          spaceModel?.tags ?? [],
+                          subspaces,
+                        ),
+                        spaceName: spaceModel?.modelName ?? '',
+                        projectTags: projectTags,
+                      ),
+                    ),
+                  ),
                 ],
               ),
             ),

From c0a963ded5529c5280d8b47737f0ad31b208de40 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:05:31 +0300
Subject: [PATCH 127/238] refactor: use context extension for text theme.

---
 .../space_model/widgets/tag_chips_display_widget.dart      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 98996d5f..19bdf64f 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TagChipDisplay extends StatelessWidget {
   final double screenWidth;
@@ -74,9 +75,9 @@ class TagChipDisplay extends StatelessWidget {
                           ),
                           label: Text(
                             'x${entry.value}',
-                            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                  color: ColorsManager.spaceColor,
-                                ),
+                            style: context.textTheme.bodySmall!.copyWith(
+                              color: ColorsManager.spaceColor,
+                            ),
                           ),
                           backgroundColor: ColorsManager.whiteColors,
                           shape: RoundedRectangleBorder(

From a66784473fd16f27ecab567f0691d6a3a9052be0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:06:01 +0300
Subject: [PATCH 128/238] Replaced conditional with an if statement in
 `TagChipDisplay`.

---
 .../widgets/tag_chips_display_widget.dart     | 186 +++++++++---------
 1 file changed, 94 insertions(+), 92 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 19bdf64f..b3f3d978 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -40,106 +40,108 @@ class TagChipDisplay extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return (spaceModel?.tags?.isNotEmpty == true ||
-            spaceModel?.subspaceModels
-                    ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
-                true)
-        ? SizedBox(
-            width: screenWidth * 0.25,
-            child: Container(
-              padding: const EdgeInsets.all(8.0),
-              decoration: BoxDecoration(
-                color: ColorsManager.textFieldGreyColor,
-                borderRadius: BorderRadius.circular(15),
-                border: Border.all(
-                  color: ColorsManager.textFieldGreyColor,
-                  width: 3.0,
-                ),
-              ),
-              child: Wrap(
-                spacing: 8.0,
-                runSpacing: 8.0,
-                children: [
-                  ...TagHelper.groupTags([
-                    ...?spaceModel?.tags,
-                    ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
-                  ]).entries.map(
-                        (entry) => Chip(
-                          avatar: SizedBox(
-                            width: 24,
-                            height: 24,
-                            child: SvgPicture.asset(
-                              entry.key.icon ?? 'assets/icons/gateway.svg',
-                              fit: BoxFit.contain,
-                            ),
-                          ),
-                          label: Text(
-                            'x${entry.value}',
-                            style: context.textTheme.bodySmall!.copyWith(
-                              color: ColorsManager.spaceColor,
-                            ),
-                          ),
-                          backgroundColor: ColorsManager.whiteColors,
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(16),
-                            side: const BorderSide(
-                              color: ColorsManager.spaceColor,
-                            ),
-                          ),
+    if ((spaceModel?.tags?.isNotEmpty == true ||
+        spaceModel?.subspaceModels
+                ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
+            true)) {
+      return SizedBox(
+        width: screenWidth * 0.25,
+        child: Container(
+          padding: const EdgeInsets.all(8.0),
+          decoration: BoxDecoration(
+            color: ColorsManager.textFieldGreyColor,
+            borderRadius: BorderRadius.circular(15),
+            border: Border.all(
+              color: ColorsManager.textFieldGreyColor,
+              width: 3.0,
+            ),
+          ),
+          child: Wrap(
+            spacing: 8.0,
+            runSpacing: 8.0,
+            children: [
+              ...TagHelper.groupTags([
+                ...?spaceModel?.tags,
+                ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
+              ]).entries.map(
+                    (entry) => Chip(
+                      avatar: SizedBox(
+                        width: 24,
+                        height: 24,
+                        child: SvgPicture.asset(
+                          entry.key.icon ?? 'assets/icons/gateway.svg',
+                          fit: BoxFit.contain,
                         ),
                       ),
-                  EditChip(
-                    onTap: () => showDialog<bool>(
-                      context: context,
-                      builder: (context) => AssignTagModelsDialog(
-                        products: products,
-                        allSpaceModels: allSpaceModels,
-                        subspaces: subspaces,
-                        pageContext: pageContext,
-                        allTags: allTags,
-                        spaceModel: spaceModel,
-                        otherSpaceModels: otherSpaceModels,
-                        initialTags: TagHelper.generateInitialTags(
-                            subspaces: subspaces,
-                            spaceTagModels: spaceModel?.tags ?? []),
-                        title: 'Edit Device',
-                        addedProducts: TagHelper.createInitialSelectedProducts(
-                          spaceModel?.tags ?? [],
-                          subspaces,
+                      label: Text(
+                        'x${entry.value}',
+                        style: context.textTheme.bodySmall!.copyWith(
+                          color: ColorsManager.spaceColor,
+                        ),
+                      ),
+                      backgroundColor: ColorsManager.whiteColors,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(16),
+                        side: const BorderSide(
+                          color: ColorsManager.spaceColor,
                         ),
-                        spaceName: spaceModel?.modelName ?? '',
-                        projectTags: projectTags,
                       ),
                     ),
                   ),
-                ],
-              ),
-            ),
-          )
-        : TextButton(
-            onPressed: () {
-              showDialog<void>(
-                context: context,
-                builder: (context) => AddDeviceTypeModelWidget(
-                  products: products,
-                  subspaces: subspaces,
-                  allTags: allTags,
-                  spaceName: spaceNameController.text,
-                  pageContext: pageContext,
-                  isCreate: true,
-                  spaceModel: spaceModel,
-                  otherSpaceModels: otherSpaceModels,
-                  projectTags: projectTags,
+              EditChip(
+                onTap: () => showDialog<bool>(
+                  context: context,
+                  builder: (context) => AssignTagModelsDialog(
+                    products: products,
+                    allSpaceModels: allSpaceModels,
+                    subspaces: subspaces,
+                    pageContext: pageContext,
+                    allTags: allTags,
+                    spaceModel: spaceModel,
+                    otherSpaceModels: otherSpaceModels,
+                    initialTags: TagHelper.generateInitialTags(
+                        subspaces: subspaces,
+                        spaceTagModels: spaceModel?.tags ?? []),
+                    title: 'Edit Device',
+                    addedProducts: TagHelper.createInitialSelectedProducts(
+                      spaceModel?.tags ?? [],
+                      subspaces,
+                    ),
+                    spaceName: spaceModel?.modelName ?? '',
+                    projectTags: projectTags,
+                  ),
                 ),
-              );
-            },
-            style: TextButton.styleFrom(
-              padding: EdgeInsets.zero,
-            ),
-            child: const ButtonContentWidget(
-              icon: Icons.add,
-              label: 'Add Devices',
+              ),
+            ],
+          ),
+        ),
+      );
+    } else {
+      return TextButton(
+        onPressed: () {
+          showDialog<void>(
+            context: context,
+            builder: (context) => AddDeviceTypeModelWidget(
+              products: products,
+              subspaces: subspaces,
+              allTags: allTags,
+              spaceName: spaceNameController.text,
+              pageContext: pageContext,
+              isCreate: true,
+              spaceModel: spaceModel,
+              otherSpaceModels: otherSpaceModels,
+              projectTags: projectTags,
             ),
           );
+        },
+        style: TextButton.styleFrom(
+          padding: EdgeInsets.zero,
+        ),
+        child: const ButtonContentWidget(
+          icon: Icons.add,
+          label: 'Add Devices',
+        ),
+      );
+    }
   }
 }

From be168aed9314585f8e4e327c91f09c1262b4a4c6 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:08:30 +0300
Subject: [PATCH 129/238] refactor: simplify tag checking logic to enhance
 readability.

---
 .../space_model/widgets/tag_chips_display_widget.dart    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index b3f3d978..1eaa3425 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -40,10 +40,11 @@ class TagChipDisplay extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    if ((spaceModel?.tags?.isNotEmpty == true ||
-        spaceModel?.subspaceModels
-                ?.any((subspace) => subspace.tags?.isNotEmpty == true) ==
-            true)) {
+    final hasTags = spaceModel?.tags?.isNotEmpty ?? false;
+    final hasSubspaceTags =
+        spaceModel?.subspaceModels?.any((e) => e.tags?.isNotEmpty ?? false) ?? false;
+
+    if (hasTags || hasSubspaceTags) {
       return SizedBox(
         width: screenWidth * 0.25,
         child: Container(

From f57348e5cda17a30d7fb79d431d6ba533238e9da Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:13:47 +0300
Subject: [PATCH 130/238] converted to using expressions wherever possible in
 `TagChipDisplay`.

---
 .../widgets/tag_chips_display_widget.dart     | 86 +++++++++----------
 1 file changed, 43 insertions(+), 43 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 1eaa3425..1472a05b 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -38,6 +38,11 @@ class TagChipDisplay extends StatelessWidget {
     super.key,
   });
 
+  Map<ProductModel, int> get _groupedTags => TagHelper.groupTags([
+        ...?spaceModel?.tags,
+        ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
+      ]);
+
   @override
   Widget build(BuildContext context) {
     final hasTags = spaceModel?.tags?.isNotEmpty ?? false;
@@ -61,36 +66,33 @@ class TagChipDisplay extends StatelessWidget {
             spacing: 8.0,
             runSpacing: 8.0,
             children: [
-              ...TagHelper.groupTags([
-                ...?spaceModel?.tags,
-                ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
-              ]).entries.map(
-                    (entry) => Chip(
-                      avatar: SizedBox(
-                        width: 24,
-                        height: 24,
-                        child: SvgPicture.asset(
-                          entry.key.icon ?? 'assets/icons/gateway.svg',
-                          fit: BoxFit.contain,
-                        ),
-                      ),
-                      label: Text(
-                        'x${entry.value}',
-                        style: context.textTheme.bodySmall!.copyWith(
-                          color: ColorsManager.spaceColor,
-                        ),
-                      ),
-                      backgroundColor: ColorsManager.whiteColors,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16),
-                        side: const BorderSide(
-                          color: ColorsManager.spaceColor,
-                        ),
-                      ),
+              ..._groupedTags.entries.map((entry) {
+                return Chip(
+                  avatar: SizedBox(
+                    width: 24,
+                    height: 24,
+                    child: SvgPicture.asset(
+                      entry.key.icon ?? 'assets/icons/gateway.svg',
+                      fit: BoxFit.contain,
                     ),
                   ),
+                  label: Text(
+                    'x${entry.value}',
+                    style: context.textTheme.bodySmall!.copyWith(
+                      color: ColorsManager.spaceColor,
+                    ),
+                  ),
+                  backgroundColor: ColorsManager.whiteColors,
+                  shape: RoundedRectangleBorder(
+                    borderRadius: BorderRadius.circular(16),
+                    side: const BorderSide(
+                      color: ColorsManager.spaceColor,
+                    ),
+                  ),
+                );
+              }),
               EditChip(
-                onTap: () => showDialog<bool>(
+                onTap: () => showDialog<void>(
                   context: context,
                   builder: (context) => AssignTagModelsDialog(
                     products: products,
@@ -119,22 +121,20 @@ class TagChipDisplay extends StatelessWidget {
       );
     } else {
       return TextButton(
-        onPressed: () {
-          showDialog<void>(
-            context: context,
-            builder: (context) => AddDeviceTypeModelWidget(
-              products: products,
-              subspaces: subspaces,
-              allTags: allTags,
-              spaceName: spaceNameController.text,
-              pageContext: pageContext,
-              isCreate: true,
-              spaceModel: spaceModel,
-              otherSpaceModels: otherSpaceModels,
-              projectTags: projectTags,
-            ),
-          );
-        },
+        onPressed: () => showDialog<void>(
+          context: context,
+          builder: (context) => AddDeviceTypeModelWidget(
+            products: products,
+            subspaces: subspaces,
+            allTags: allTags,
+            spaceName: spaceNameController.text,
+            pageContext: pageContext,
+            isCreate: true,
+            spaceModel: spaceModel,
+            otherSpaceModels: otherSpaceModels,
+            projectTags: projectTags,
+          ),
+        ),
         style: TextButton.styleFrom(
           padding: EdgeInsets.zero,
         ),

From 08e5e17910a6b3e56c207300ba9952b701a42159 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:23:36 +0300
Subject: [PATCH 131/238] Extracted `Add Devices` button into a private method.

---
 .../widgets/tag_chips_display_widget.dart     | 58 ++++++++++---------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 1472a05b..1f75a047 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -53,18 +53,18 @@ class TagChipDisplay extends StatelessWidget {
       return SizedBox(
         width: screenWidth * 0.25,
         child: Container(
-          padding: const EdgeInsets.all(8.0),
+          padding: const EdgeInsets.all(8),
           decoration: BoxDecoration(
             color: ColorsManager.textFieldGreyColor,
             borderRadius: BorderRadius.circular(15),
             border: Border.all(
               color: ColorsManager.textFieldGreyColor,
-              width: 3.0,
+              width: 3,
             ),
           ),
           child: Wrap(
-            spacing: 8.0,
-            runSpacing: 8.0,
+            spacing: 8,
+            runSpacing: 8,
             children: [
               ..._groupedTags.entries.map((entry) {
                 return Chip(
@@ -120,29 +120,33 @@ class TagChipDisplay extends StatelessWidget {
         ),
       );
     } else {
-      return TextButton(
-        onPressed: () => showDialog<void>(
-          context: context,
-          builder: (context) => AddDeviceTypeModelWidget(
-            products: products,
-            subspaces: subspaces,
-            allTags: allTags,
-            spaceName: spaceNameController.text,
-            pageContext: pageContext,
-            isCreate: true,
-            spaceModel: spaceModel,
-            otherSpaceModels: otherSpaceModels,
-            projectTags: projectTags,
-          ),
-        ),
-        style: TextButton.styleFrom(
-          padding: EdgeInsets.zero,
-        ),
-        child: const ButtonContentWidget(
-          icon: Icons.add,
-          label: 'Add Devices',
-        ),
-      );
+      return _buildAddDevicesButton(context);
     }
   }
+
+  Widget _buildAddDevicesButton(BuildContext context) {
+    return TextButton(
+      onPressed: () => showDialog<void>(
+        context: context,
+        builder: (context) => AddDeviceTypeModelWidget(
+          products: products,
+          subspaces: subspaces,
+          allTags: allTags,
+          spaceName: spaceNameController.text,
+          pageContext: pageContext,
+          isCreate: true,
+          spaceModel: spaceModel,
+          otherSpaceModels: otherSpaceModels,
+          projectTags: projectTags,
+        ),
+      ),
+      style: TextButton.styleFrom(
+        padding: EdgeInsets.zero,
+      ),
+      child: const ButtonContentWidget(
+        icon: Icons.add,
+        label: 'Add Devices',
+      ),
+    );
+  }
 }

From 90e0d2f52be8c575be2b228111a85035130058df Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:24:36 +0300
Subject: [PATCH 132/238] Extracted Chip into a private method.

---
 .../widgets/tag_chips_display_widget.dart     | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 1f75a047..200cd659 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -66,31 +66,7 @@ class TagChipDisplay extends StatelessWidget {
             spacing: 8,
             runSpacing: 8,
             children: [
-              ..._groupedTags.entries.map((entry) {
-                return Chip(
-                  avatar: SizedBox(
-                    width: 24,
-                    height: 24,
-                    child: SvgPicture.asset(
-                      entry.key.icon ?? 'assets/icons/gateway.svg',
-                      fit: BoxFit.contain,
-                    ),
-                  ),
-                  label: Text(
-                    'x${entry.value}',
-                    style: context.textTheme.bodySmall!.copyWith(
-                      color: ColorsManager.spaceColor,
-                    ),
-                  ),
-                  backgroundColor: ColorsManager.whiteColors,
-                  shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(16),
-                    side: const BorderSide(
-                      color: ColorsManager.spaceColor,
-                    ),
-                  ),
-                );
-              }),
+              ..._groupedTags.entries.map((entry) => _buildChip(context, entry)),
               EditChip(
                 onTap: () => showDialog<void>(
                   context: context,
@@ -124,6 +100,35 @@ class TagChipDisplay extends StatelessWidget {
     }
   }
 
+  Chip _buildChip(
+    BuildContext context,
+    MapEntry<ProductModel, int> entry,
+  ) {
+    return Chip(
+      avatar: SizedBox(
+        width: 24,
+        height: 24,
+        child: SvgPicture.asset(
+          entry.key.icon ?? 'assets/icons/gateway.svg',
+          fit: BoxFit.contain,
+        ),
+      ),
+      label: Text(
+        '${entry.value}',
+        style: context.textTheme.bodySmall!.copyWith(
+          color: ColorsManager.spaceColor,
+        ),
+      ),
+      backgroundColor: ColorsManager.whiteColors,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(16),
+        side: const BorderSide(
+          color: ColorsManager.spaceColor,
+        ),
+      ),
+    );
+  }
+
   Widget _buildAddDevicesButton(BuildContext context) {
     return TextButton(
       onPressed: () => showDialog<void>(

From a4432656ab05cf39351240d1134cb033e65fbc5b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:25:19 +0300
Subject: [PATCH 133/238] refactor: extract EditChip into a private method for
 improved readability

---
 .../widgets/tag_chips_display_widget.dart     | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 200cd659..8cf52c4f 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -67,30 +67,7 @@ class TagChipDisplay extends StatelessWidget {
             runSpacing: 8,
             children: [
               ..._groupedTags.entries.map((entry) => _buildChip(context, entry)),
-              EditChip(
-                onTap: () => showDialog<void>(
-                  context: context,
-                  builder: (context) => AssignTagModelsDialog(
-                    products: products,
-                    allSpaceModels: allSpaceModels,
-                    subspaces: subspaces,
-                    pageContext: pageContext,
-                    allTags: allTags,
-                    spaceModel: spaceModel,
-                    otherSpaceModels: otherSpaceModels,
-                    initialTags: TagHelper.generateInitialTags(
-                        subspaces: subspaces,
-                        spaceTagModels: spaceModel?.tags ?? []),
-                    title: 'Edit Device',
-                    addedProducts: TagHelper.createInitialSelectedProducts(
-                      spaceModel?.tags ?? [],
-                      subspaces,
-                    ),
-                    spaceName: spaceModel?.modelName ?? '',
-                    projectTags: projectTags,
-                  ),
-                ),
-              ),
+              _buildEditChip(context),
             ],
           ),
         ),
@@ -100,7 +77,35 @@ class TagChipDisplay extends StatelessWidget {
     }
   }
 
-  Chip _buildChip(
+  Widget _buildEditChip(BuildContext context) {
+    return EditChip(
+      onTap: () => showDialog<void>(
+        context: context,
+        builder: (context) => AssignTagModelsDialog(
+          products: products,
+          allSpaceModels: allSpaceModels,
+          subspaces: subspaces,
+          pageContext: pageContext,
+          allTags: allTags,
+          spaceModel: spaceModel,
+          otherSpaceModels: otherSpaceModels,
+          initialTags: TagHelper.generateInitialTags(
+            subspaces: subspaces,
+            spaceTagModels: spaceModel?.tags ?? [],
+          ),
+          title: 'Edit Device',
+          addedProducts: TagHelper.createInitialSelectedProducts(
+            spaceModel?.tags ?? [],
+            subspaces,
+          ),
+          spaceName: spaceModel?.modelName ?? '',
+          projectTags: projectTags,
+        ),
+      ),
+    );
+  }
+
+  Widget _buildChip(
     BuildContext context,
     MapEntry<ProductModel, int> entry,
   ) {

From d3902d622e2680016440dbadedfae320844925cd Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:27:45 +0300
Subject: [PATCH 134/238] Moved constructor to be the first element in
 `TagChipDisplay`.

---
 .../widgets/tag_chips_display_widget.dart     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 8cf52c4f..63eab144 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -13,17 +13,6 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TagChipDisplay extends StatelessWidget {
-  final double screenWidth;
-  final SpaceTemplateModel? spaceModel;
-  final List<ProductModel>? products;
-  final List<SubspaceTemplateModel>? subspaces;
-  final List<String>? allTags;
-  final TextEditingController spaceNameController;
-  final BuildContext? pageContext;
-  final List<String>? otherSpaceModels;
-  final List<SpaceTemplateModel>? allSpaceModels;
-  final List<Tag> projectTags;
-
   const TagChipDisplay({
     required this.screenWidth,
     required this.spaceModel,
@@ -38,6 +27,17 @@ class TagChipDisplay extends StatelessWidget {
     super.key,
   });
 
+  final double screenWidth;
+  final SpaceTemplateModel? spaceModel;
+  final List<ProductModel>? products;
+  final List<SubspaceTemplateModel>? subspaces;
+  final List<String>? allTags;
+  final TextEditingController spaceNameController;
+  final BuildContext? pageContext;
+  final List<String>? otherSpaceModels;
+  final List<SpaceTemplateModel>? allSpaceModels;
+  final List<Tag> projectTags;
+
   Map<ProductModel, int> get _groupedTags => TagHelper.groupTags([
         ...?spaceModel?.tags,
         ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])

From 920827d763702884c9b0b49a3111188b95340c97 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:28:12 +0300
Subject: [PATCH 135/238] Removed unnecessary SizedBox from `TagChipDisplay`.

---
 .../widgets/tag_chips_display_widget.dart     | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 63eab144..a369636a 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -50,27 +50,25 @@ class TagChipDisplay extends StatelessWidget {
         spaceModel?.subspaceModels?.any((e) => e.tags?.isNotEmpty ?? false) ?? false;
 
     if (hasTags || hasSubspaceTags) {
-      return SizedBox(
+      return Container(
         width: screenWidth * 0.25,
-        child: Container(
-          padding: const EdgeInsets.all(8),
-          decoration: BoxDecoration(
+        padding: const EdgeInsets.all(8),
+        decoration: BoxDecoration(
+          color: ColorsManager.textFieldGreyColor,
+          borderRadius: BorderRadius.circular(15),
+          border: Border.all(
             color: ColorsManager.textFieldGreyColor,
-            borderRadius: BorderRadius.circular(15),
-            border: Border.all(
-              color: ColorsManager.textFieldGreyColor,
-              width: 3,
-            ),
-          ),
-          child: Wrap(
-            spacing: 8,
-            runSpacing: 8,
-            children: [
-              ..._groupedTags.entries.map((entry) => _buildChip(context, entry)),
-              _buildEditChip(context),
-            ],
+            width: 3,
           ),
         ),
+        child: Wrap(
+          spacing: 8,
+          runSpacing: 8,
+          children: [
+            ..._groupedTags.entries.map((entry) => _buildChip(context, entry)),
+            _buildEditChip(context),
+          ],
+        ),
       );
     } else {
       return _buildAddDevicesButton(context);

From fa5bb350c335bb2a38098440e149ef6e7195df08 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:29:25 +0300
Subject: [PATCH 136/238] refactor: replace spaceNameController with spaceName
 in `TagChipDisplay`.

---
 .../widgets/dialog/create_space_model_dialog.dart           | 2 +-
 .../space_model/widgets/tag_chips_display_widget.dart       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
index 3afb0c6f..09374855 100644
--- a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
+++ b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
@@ -150,7 +150,7 @@ class CreateSpaceModelDialog extends StatelessWidget {
                       products: products,
                       subspaces: subspaces,
                       allTags: allTags,
-                      spaceNameController: spaceNameController,
+                      spaceName: spaceNameController.text,
                       pageContext: pageContext,
                       otherSpaceModels: otherSpaceModels,
                       allSpaceModels: allSpaceModels,
diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index a369636a..f952d289 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -19,7 +19,7 @@ class TagChipDisplay extends StatelessWidget {
     required this.products,
     required this.subspaces,
     required this.allTags,
-    required this.spaceNameController,
+    required this.spaceName,
     required this.projectTags,
     this.pageContext,
     this.otherSpaceModels,
@@ -32,7 +32,7 @@ class TagChipDisplay extends StatelessWidget {
   final List<ProductModel>? products;
   final List<SubspaceTemplateModel>? subspaces;
   final List<String>? allTags;
-  final TextEditingController spaceNameController;
+  final String spaceName;
   final BuildContext? pageContext;
   final List<String>? otherSpaceModels;
   final List<SpaceTemplateModel>? allSpaceModels;
@@ -140,7 +140,7 @@ class TagChipDisplay extends StatelessWidget {
           products: products,
           subspaces: subspaces,
           allTags: allTags,
-          spaceName: spaceNameController.text,
+          spaceName: spaceName,
           pageContext: pageContext,
           isCreate: true,
           spaceModel: spaceModel,

From db8e5a4aa6b7b340036fd6ca82233a05f86eb522 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:32:31 +0300
Subject: [PATCH 137/238] Refactor `TagChipDisplay._groupedTags`  to enhance
 readabaility.

---
 .../widgets/tag_chips_display_widget.dart            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index f952d289..7a591695 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -38,10 +38,14 @@ class TagChipDisplay extends StatelessWidget {
   final List<SpaceTemplateModel>? allSpaceModels;
   final List<Tag> projectTags;
 
-  Map<ProductModel, int> get _groupedTags => TagHelper.groupTags([
-        ...?spaceModel?.tags,
-        ...?spaceModel?.subspaceModels?.expand((e) => e.tags ?? [])
-      ]);
+  Map<ProductModel, int> get _groupedTags {
+    final spaceTags = spaceModel?.tags ?? <Tag>[];
+
+    final subspaces = spaceModel?.subspaceModels ?? [];
+    final subspaceTags = subspaces.expand((e) => e.tags ?? <Tag>[]).toList();
+
+    return TagHelper.groupTags([...spaceTags, ...subspaceTags]);
+  }
 
   @override
   Widget build(BuildContext context) {

From d1a21be9832dfe566c03d6e0307d82ddb702c149 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:35:24 +0300
Subject: [PATCH 138/238] removed `else` from `TagChipDisplay.build`

---
 .../space_model/widgets/tag_chips_display_widget.dart         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index 7a591695..ceab79dc 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -74,9 +74,9 @@ class TagChipDisplay extends StatelessWidget {
           ],
         ),
       );
-    } else {
-      return _buildAddDevicesButton(context);
     }
+
+    return _buildAddDevicesButton(context);
   }
 
   Widget _buildEditChip(BuildContext context) {

From 7699453e6d41ae72db413065c02ab43f11b5e000 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:43:50 +0300
Subject: [PATCH 139/238] moved styling of `_buildChip` up, and removed
 unnecessary `SizedBox`.

---
 .../widgets/tag_chips_display_widget.dart     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index ceab79dc..ec2a99b1 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/pages/spaces_management/space_model/widgets/button_content_widget.dart';
 import 'package:syncrow_web/pages/spaces_management/tag_model/views/add_device_type_model_widget.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';
 
 class TagChipDisplay extends StatelessWidget {
@@ -112,20 +113,6 @@ class TagChipDisplay extends StatelessWidget {
     MapEntry<ProductModel, int> entry,
   ) {
     return Chip(
-      avatar: SizedBox(
-        width: 24,
-        height: 24,
-        child: SvgPicture.asset(
-          entry.key.icon ?? 'assets/icons/gateway.svg',
-          fit: BoxFit.contain,
-        ),
-      ),
-      label: Text(
-        '${entry.value}',
-        style: context.textTheme.bodySmall!.copyWith(
-          color: ColorsManager.spaceColor,
-        ),
-      ),
       backgroundColor: ColorsManager.whiteColors,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(16),
@@ -133,6 +120,18 @@ class TagChipDisplay extends StatelessWidget {
           color: ColorsManager.spaceColor,
         ),
       ),
+      avatar: SvgPicture.asset(
+        entry.key.icon ?? Assets.gateway,
+        fit: BoxFit.contain,
+        height: 24,
+        width: 24,
+      ),
+      label: Text(
+        '${entry.value}',
+        style: context.textTheme.bodySmall!.copyWith(
+          color: ColorsManager.spaceColor,
+        ),
+      ),
     );
   }
 

From 9044645f952c8ae744840c8c5d5cdd343fb2c744 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 15:45:47 +0300
Subject: [PATCH 140/238] remove screenWidth parameter from `TagChipDisplay`
 and use `context.screenWidth` instead.

---
 .../space_model/widgets/dialog/create_space_model_dialog.dart | 1 -
 .../space_model/widgets/tag_chips_display_widget.dart         | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
index 09374855..70dde231 100644
--- a/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
+++ b/lib/pages/spaces_management/space_model/widgets/dialog/create_space_model_dialog.dart
@@ -145,7 +145,6 @@ class CreateSpaceModelDialog extends StatelessWidget {
                     ),
                     const SizedBox(height: 10),
                     TagChipDisplay(
-                      screenWidth: screenWidth,
                       spaceModel: updatedSpaceModel,
                       products: products,
                       subspaces: subspaces,
diff --git a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
index ec2a99b1..86f99e02 100644
--- a/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
+++ b/lib/pages/spaces_management/space_model/widgets/tag_chips_display_widget.dart
@@ -15,7 +15,6 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class TagChipDisplay extends StatelessWidget {
   const TagChipDisplay({
-    required this.screenWidth,
     required this.spaceModel,
     required this.products,
     required this.subspaces,
@@ -28,7 +27,6 @@ class TagChipDisplay extends StatelessWidget {
     super.key,
   });
 
-  final double screenWidth;
   final SpaceTemplateModel? spaceModel;
   final List<ProductModel>? products;
   final List<SubspaceTemplateModel>? subspaces;
@@ -56,7 +54,7 @@ class TagChipDisplay extends StatelessWidget {
 
     if (hasTags || hasSubspaceTags) {
       return Container(
-        width: screenWidth * 0.25,
+        width: context.screenWidth * 0.25,
         padding: const EdgeInsets.all(8),
         decoration: BoxDecoration(
           color: ColorsManager.textFieldGreyColor,

From 86b87716945e41be605461fc80076d5cf84dd85c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 16:12:01 +0300
Subject: [PATCH 141/238] bump-v of web deployment action.

---
 .../workflows/azure-static-web-apps-polite-smoke-017c65c10.yml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
index e28d1bb2..28cf00a2 100644
--- a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
+++ b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.2' # Specify the Flutter version you want to use
+          flutter-version: '3.27.3' # Specify the Flutter version you want to use
 
       - name: Install dependencies
         run: flutter pub get

From 4989a0e95cdf1358110d9f8ef85845d4cd5192dc Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 16:24:46 +0300
Subject: [PATCH 142/238] removed the use of `Flexible` that was causing an
 exception.

---
 lib/pages/routines/widgets/dragable_card.dart | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/pages/routines/widgets/dragable_card.dart b/lib/pages/routines/widgets/dragable_card.dart
index 7395d2d6..46f5ecfd 100644
--- a/lib/pages/routines/widgets/dragable_card.dart
+++ b/lib/pages/routines/widgets/dragable_card.dart
@@ -103,16 +103,14 @@ class DraggableCard extends StatelessWidget {
                     const SizedBox(height: 8),
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 3),
-                      child: Flexible(
-                        child: Text(
-                          deviceData['title'] ?? deviceData['name'] ?? title,
-                          textAlign: TextAlign.center,
-                          overflow: TextOverflow.ellipsis,
-                          maxLines: 2,
-                          style: context.textTheme.bodySmall?.copyWith(
-                            color: ColorsManager.blackColor,
-                            fontSize: 12,
-                          ),
+                      child: Text(
+                        deviceData['title'] ?? deviceData['name'] ?? title,
+                        textAlign: TextAlign.center,
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 2,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: ColorsManager.blackColor,
+                          fontSize: 12,
                         ),
                       ),
                     ),

From 9eefd522b7ee33da7dede28d74251c1036f72faf Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Tue, 15 Apr 2025 16:25:00 +0300
Subject: [PATCH 143/238] bump flutter version on production github action.

---
 .../workflows/azure-static-web-apps-mango-bush-01e607f10.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
index 95e9346d..f0379c95 100644
--- a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
+++ b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Set up Flutter
         uses: subosito/flutter-action@v2
         with:
-          flutter-version: '3.22.2' # Specify the Flutter version you want to use
+          flutter-version: '3.27.3' # Specify the Flutter version you want to use
 
       - name: Install dependencies
         run: flutter pub get

From d4a7dd5854d123aea08724c857c5bac164b0d78c Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Wed, 16 Apr 2025 03:46:10 +0300
Subject: [PATCH 144/238] Fixed design issues, added tag and location to the
 save dialog

---
 .../all_devices/models/devices_model.dart     |   2 -
 .../bloc/routine_bloc/routine_bloc.dart       | 164 ++++++++--------
 .../routines/helper/save_routine_helper.dart  | 176 ++++++++++++------
 lib/pages/routines/view/routines_view.dart    |  15 +-
 lib/pages/routines/widgets/dragable_card.dart |  26 ++-
 lib/pages/routines/widgets/if_container.dart  | 173 ++++++++---------
 .../main_routine_view/routine_view_card.dart  |  29 +--
 7 files changed, 311 insertions(+), 274 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index c7c35eca..0ac3f776 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -238,8 +238,6 @@ SOS
       //  tempIcon = Assets.gang3touch;
     } else if (type == DeviceType.WaterLeak) {
       tempIcon = Assets.waterLeakNormal;
-    } else if (type == DeviceType.WaterLeak) {
-      tempIcon = Assets.waterLeakNormal;
     } else {
       tempIcon = Assets.logoHorizontal;
     }
diff --git a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
index b698c19e..d60f8d64 100644
--- a/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
+++ b/lib/pages/routines/bloc/routine_bloc/routine_bloc.dart
@@ -684,40 +684,45 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             ? '${action.entityId}_automation'
             : action.actionExecutor == 'delay'
                 ? '${action.entityId}_delay'
-                : action.entityId;
+                : const Uuid().v4();
 
-        if (!deviceCards.containsKey(deviceId)) {
-          deviceCards[deviceId] = {
-            'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
-                ? const Uuid().v4()
-                : action.entityId,
-            'title': action.actionExecutor == 'delay'
-                ? 'Delay'
-                : action.type == 'automation'
-                    ? action.name ?? 'Automation'
-                    : (matchingDevice?.name ?? 'Device'),
-            'productType': action.productType,
-            'functions': matchingDevice?.functions,
-            'imagePath': action.type == 'automation'
-                ? Assets.automation
-                : action.actionExecutor == 'delay'
-                    ? Assets.delay
-                    : matchingDevice?.getDefaultIcon(action.productType),
-            'device': matchingDevice,
-            'name': action.name,
-            'type': action.type,
-          };
-        }
+        // if (!deviceCards.containsKey(deviceId)) {
+        deviceCards[deviceId] = {
+          'entityId': action.entityId,
+          'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+          'uniqueCustomId': action.type == 'automation' || action.actionExecutor == 'delay'
+              ? action.entityId
+              : const Uuid().v4(),
+          'title': action.actionExecutor == 'delay'
+              ? 'Delay'
+              : action.type == 'automation'
+                  ? action.name ?? 'Automation'
+                  : (matchingDevice?.name ?? 'Device'),
+          'productType': action.productType,
+          'functions': matchingDevice?.functions,
+          'imagePath': action.type == 'automation'
+              ? Assets.automation
+              : action.actionExecutor == 'delay'
+                  ? Assets.delay
+                  : matchingDevice?.getDefaultIcon(action.productType),
+          'device': matchingDevice,
+          'name': action.name,
+          'type': action.type,
+          'tag': matchingDevice?.deviceTags?.isNotEmpty ?? false
+              ? matchingDevice?.deviceTags![0].name ?? ''
+              : '',
+          'subSpace': matchingDevice?.deviceSubSpace?.subspaceName ?? '',
+        };
+        // }
 
         final cardData = deviceCards[deviceId]!;
         final uniqueCustomId = cardData['uniqueCustomId'].toString();
 
+        if (!updatedFunctions.containsKey(uniqueCustomId)) {
+          updatedFunctions[uniqueCustomId] = [];
+        }
+
         if (action.type == 'automation') {
-          if (!updatedFunctions.containsKey(uniqueCustomId)) {
-            updatedFunctions[uniqueCustomId] = [];
-          }
           updatedFunctions[uniqueCustomId]!.add(
             DeviceFunctionData(
               entityId: action.entityId,
@@ -728,14 +733,11 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           );
           // emit(state.copyWith(automationActionExecutor: action.actionExecutor));
         } else if (action.executorProperty != null && action.actionExecutor != 'delay') {
-          // if (!updatedFunctions.containsKey(uniqueCustomId)) {
-          //   updatedFunctions[uniqueCustomId] = [];
-          // }
-          final functions = matchingDevice?.functions;
+          final functions = matchingDevice?.functions ?? [];
           final functionCode = action.executorProperty?.functionCode;
-          for (DeviceFunction function in functions ?? []) {
+          for (DeviceFunction function in functions) {
             if (function.code == functionCode) {
-              updatedFunctions[const Uuid().v4()]!.add(
+              updatedFunctions[uniqueCustomId]!.add(
                 DeviceFunctionData(
                   entityId: action.entityId,
                   functionCode: functionCode ?? '',
@@ -747,9 +749,6 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
             }
           }
         } else if (action.actionExecutor == 'delay') {
-          if (!updatedFunctions.containsKey(uniqueCustomId)) {
-            updatedFunctions[uniqueCustomId] = [];
-          }
           final delayFunction = DelayFunction(
             deviceId: action.entityId,
             deviceName: 'Delay',
@@ -1156,21 +1155,25 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId = condition.entityId;
+        final deviceId = const Uuid().v4();
 
-        if (!deviceIfCards.containsKey(deviceId)) {
-          deviceIfCards[deviceId] = {
-            'entityId': condition.entityId,
-            'deviceId': condition.entityId,
-            'uniqueCustomId': const Uuid().v4(),
-            'title': matchingDevice.name ?? 'Device',
-            'productType': condition.productType,
-            'functions': matchingDevice.functions,
-            'imagePath': matchingDevice.getDefaultIcon(condition.productType),
-            'device': matchingDevice,
-            'type': 'condition',
-          };
-        }
+        // if (!deviceIfCards.containsKey(deviceId)) {
+        deviceIfCards[deviceId] = {
+          'entityId': condition.entityId,
+          'deviceId': condition.entityId,
+          'uniqueCustomId': const Uuid().v4(),
+          'title': matchingDevice.name ?? 'Device',
+          'productType': condition.productType,
+          'functions': matchingDevice.functions,
+          'imagePath': matchingDevice.getDefaultIcon(condition.productType),
+          'device': matchingDevice,
+          'type': 'condition',
+          'tag': matchingDevice.deviceTags?.isNotEmpty ?? false
+              ? matchingDevice.deviceTags![0].name
+              : '',
+          'subSpace': matchingDevice.deviceSubSpace?.subspaceName ?? '',
+        };
+        // }
 
         final cardData = deviceIfCards[deviceId]!;
         final uniqueCustomId = cardData['uniqueCustomId'].toString();
@@ -1206,35 +1209,38 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           ),
         );
 
-        final deviceId =
-            action.actionExecutor == 'delay' ? '${action.entityId}_delay' : action.entityId;
+        final deviceId = const Uuid().v4();
 
-        if (!deviceThenCards.containsKey(deviceId)) {
-          deviceThenCards[deviceId] = {
-            'entityId': action.entityId,
-            'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
-            'uniqueCustomId': const Uuid().v4(),
-            'title': action.actionExecutor == 'delay'
-                ? 'Delay'
-                : (action.type == 'scene' || action.type == 'automation')
-                    ? action.name
-                    : (matchingDevice.name ?? 'Device'),
-            'productType': action.productType,
-            'functions': matchingDevice.functions,
-            'imagePath': action.actionExecutor == 'delay'
-                ? Assets.delay
-                : action.type == 'automation'
-                    ? Assets.automation
-                    : matchingDevice.getDefaultIcon(action.productType),
-            'device': matchingDevice,
-            'type': action.type == 'scene'
-                ? 'scene'
-                : action.type == 'automation'
-                    ? 'automation'
-                    : 'action',
-            'icon': action.icon ?? '',
-          };
-        }
+        // if (!deviceThenCards.containsKey(deviceId)) {
+        deviceThenCards[deviceId] = {
+          'entityId': action.entityId,
+          'deviceId': action.actionExecutor == 'delay' ? 'delay' : action.entityId,
+          'uniqueCustomId': const Uuid().v4(),
+          'title': action.actionExecutor == 'delay'
+              ? 'Delay'
+              : (action.type == 'scene' || action.type == 'automation')
+                  ? action.name
+                  : (matchingDevice.name ?? 'Device'),
+          'productType': action.productType,
+          'functions': matchingDevice.functions,
+          'imagePath': action.actionExecutor == 'delay'
+              ? Assets.delay
+              : action.type == 'automation'
+                  ? Assets.automation
+                  : matchingDevice.getDefaultIcon(action.productType),
+          'device': matchingDevice,
+          'type': action.type == 'scene'
+              ? 'scene'
+              : action.type == 'automation'
+                  ? 'automation'
+                  : 'action',
+          'icon': action.icon ?? '',
+          'tag': matchingDevice.deviceTags?.isNotEmpty ?? false
+              ? matchingDevice.deviceTags![0].name
+              : '',
+          'subSpace': matchingDevice.deviceSubSpace?.subspaceName ?? '',
+        };
+        // }
 
         final cardData = deviceThenCards[deviceId]!;
         final uniqueCustomId = cardData['uniqueCustomId'].toString();
diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index e2ca5ede..457f74dc 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.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/widgets/dialog_header.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -20,7 +21,7 @@ class SaveRoutineHelper {
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: Container(
-                width: 600,
+                width: MediaQuery.sizeOf(context).width * 0.5,
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(20),
@@ -30,14 +31,15 @@ class SaveRoutineHelper {
                   children: [
                     DialogHeader('Create a scene: ${state.routineName ?? ""}'),
                     Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
                           // Left side - IF
                           Expanded(
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
+                            child: ListView(
+                              // crossAxisAlignment: CrossAxisAlignment.start,
+                              shrinkWrap: true,
                               children: [
                                 const Text(
                                   'IF:',
@@ -59,26 +61,7 @@ class SaveRoutineHelper {
                                   ...state.ifItems.map((item) {
                                     final functions =
                                         state.selectedFunctions[item['uniqueCustomId']] ?? [];
-                                    return ListTile(
-                                      leading: SvgPicture.asset(
-                                        item['imagePath'],
-                                        width: 22,
-                                        height: 22,
-                                      ),
-                                      title:
-                                          Text(item['title'], style: const TextStyle(fontSize: 14)),
-                                      subtitle: Wrap(
-                                        children: functions
-                                            .map((f) => Text(
-                                                  '${f.operationName}: ${f.value}, ',
-                                                  style: const TextStyle(
-                                                      color: ColorsManager.grayColor, fontSize: 8),
-                                                  overflow: TextOverflow.ellipsis,
-                                                  maxLines: 3,
-                                                ))
-                                            .toList(),
-                                      ),
-                                    );
+                                    return functionRow(item, context, functions);
                                   }),
                               ],
                             ),
@@ -87,8 +70,9 @@ class SaveRoutineHelper {
                           // Right side - THEN items
 
                           Expanded(
-                            child: Column(
-                              crossAxisAlignment: CrossAxisAlignment.start,
+                            child: ListView(
+                              // crossAxisAlignment: CrossAxisAlignment.start,
+                              shrinkWrap: true,
                               children: [
                                 const Text(
                                   'THEN:',
@@ -100,37 +84,7 @@ class SaveRoutineHelper {
                                 ...state.thenItems.map((item) {
                                   final functions =
                                       state.selectedFunctions[item['uniqueCustomId']] ?? [];
-                                  return ListTile(
-                                    leading: item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                                        ? Image.memory(
-                                            base64Decode(item['icon']),
-                                            width: 22,
-                                            height: 22,
-                                          )
-                                        : SvgPicture.asset(
-                                            item['imagePath'],
-                                            width: 22,
-                                            height: 22,
-                                          ),
-                                    title: Text(
-                                      item['title'],
-                                      style: context.textTheme.bodySmall?.copyWith(
-                                        fontSize: 14,
-                                        color: ColorsManager.grayColor,
-                                      ),
-                                    ),
-                                    subtitle: Wrap(
-                                      children: functions
-                                          .map((f) => Text(
-                                                '${f.operationName}: ${f.value}, ',
-                                                style: context.textTheme.bodySmall?.copyWith(
-                                                    color: ColorsManager.grayColor, fontSize: 8),
-                                                overflow: TextOverflow.ellipsis,
-                                                maxLines: 3,
-                                              ))
-                                          .toList(),
-                                    ),
-                                  );
+                                  return functionRow(item, context, functions);
                                 }),
                               ],
                             ),
@@ -177,4 +131,112 @@ class SaveRoutineHelper {
       },
     );
   }
+
+  static Widget functionRow(
+      dynamic item, BuildContext context, List<DeviceFunctionData> functions) {
+    return Padding(
+      padding: const EdgeInsets.only(top: 6),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Expanded(
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              spacing: 8,
+              children: [
+                item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                    ? Image.memory(
+                        base64Decode(item['icon']),
+                        width: 22,
+                        height: 22,
+                      )
+                    : SvgPicture.asset(
+                        item['imagePath'],
+                        width: 22,
+                        height: 22,
+                      ),
+                Flexible(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    spacing: 2,
+                    children: [
+                      Text(
+                        item['title'],
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          fontSize: 14,
+                          color: ColorsManager.textPrimaryColor,
+                        ),
+                      ),
+                      Wrap(
+                        children: functions
+                            .map((f) => Text(
+                                  '${f.operationName}: ${f.value}',
+                                  style: context.textTheme.bodySmall
+                                      ?.copyWith(color: ColorsManager.grayColor, fontSize: 8),
+                                  overflow: TextOverflow.ellipsis,
+                                  maxLines: 3,
+                                ))
+                            .toList(),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          ),
+          Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            spacing: 2,
+            children: [
+              Visibility(
+                visible: item['tag'] != null && item['tag'] != '',
+                child: Row(
+                  spacing: 2,
+                  children: [
+                    SizedBox(width: 8, height: 8, child: SvgPicture.asset(Assets.deviceTagIcon)),
+                    Text(
+                      item['tag'] ?? '',
+                      textAlign: TextAlign.center,
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: 1,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.lightGreyColor,
+                        fontSize: 9,
+                        fontWeight: FontWeight.w400,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+              Visibility(
+                visible: item['subSpace'] != null && item['subSpace'] != '',
+                child: Row(
+                  spacing: 2,
+                  children: [
+                    SizedBox(
+                        width: 8, height: 8, child: SvgPicture.asset(Assets.spaceLocationIcon)),
+                    Text(
+                      item['subSpace'] ?? '',
+                      textAlign: TextAlign.center,
+                      overflow: TextOverflow.ellipsis,
+                      maxLines: 1,
+                      style: context.textTheme.bodySmall?.copyWith(
+                        color: ColorsManager.lightGreyColor,
+                        fontSize: 9,
+                        fontWeight: FontWeight.w400,
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
 }
diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index c398243c..2d6ee648 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -29,8 +29,7 @@ class _RoutinesViewState extends State<RoutinesView> {
     final spaceId = result['space'];
     final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
     final routineBloc = context.read<RoutineBloc>();
-    _bloc.add(SaveCommunityIdAndSpaceIdEvent(
-        communityID: communityId, spaceID: spaceId));
+    _bloc.add(SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
   }
@@ -49,7 +48,8 @@ class _RoutinesViewState extends State<RoutinesView> {
               child: SpaceTreeView(
                 onSelect: () => context.read<RoutineBloc>()
                   ..add(const LoadScenes())
-                  ..add(const LoadAutomation()),
+                  ..add(const LoadAutomation())
+                  ..add(FetchDevicesInRoutine()),
               ),
             ),
             Expanded(
@@ -64,11 +64,10 @@ class _RoutinesViewState extends State<RoutinesView> {
                       children: [
                         Text(
                           "Create New Routines",
-                          style:
-                              Theme.of(context).textTheme.titleLarge?.copyWith(
-                                    color: ColorsManager.grayColor,
-                                    fontWeight: FontWeight.bold,
-                                  ),
+                          style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                                color: ColorsManager.grayColor,
+                                fontWeight: FontWeight.bold,
+                              ),
                         ),
                         const SizedBox(height: 10),
                         RoutineViewCard(
diff --git a/lib/pages/routines/widgets/dragable_card.dart b/lib/pages/routines/widgets/dragable_card.dart
index 7395d2d6..7ac29375 100644
--- a/lib/pages/routines/widgets/dragable_card.dart
+++ b/lib/pages/routines/widgets/dragable_card.dart
@@ -69,9 +69,9 @@ class DraggableCard extends StatelessWidget {
         Card(
           color: ColorsManager.whiteColors,
           child: Container(
-            padding: padding ?? const EdgeInsets.all(16),
+            padding: const EdgeInsets.all(16),
             width: 110,
-            height: deviceFunctions.isEmpty ? 160 : 170,
+            height: deviceFunctions.isEmpty ? 160 : 180,
             child: Column(
               mainAxisSize: MainAxisSize.min,
               mainAxisAlignment: MainAxisAlignment.center,
@@ -103,16 +103,14 @@ class DraggableCard extends StatelessWidget {
                     const SizedBox(height: 8),
                     Padding(
                       padding: const EdgeInsets.symmetric(horizontal: 3),
-                      child: Flexible(
-                        child: Text(
-                          deviceData['title'] ?? deviceData['name'] ?? title,
-                          textAlign: TextAlign.center,
-                          overflow: TextOverflow.ellipsis,
-                          maxLines: 2,
-                          style: context.textTheme.bodySmall?.copyWith(
-                            color: ColorsManager.blackColor,
-                            fontSize: 12,
-                          ),
+                      child: Text(
+                        deviceData['title'] ?? deviceData['name'] ?? title,
+                        textAlign: TextAlign.center,
+                        overflow: TextOverflow.ellipsis,
+                        maxLines: 2,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: ColorsManager.blackColor,
+                          fontSize: 12,
                         ),
                       ),
                     ),
@@ -131,7 +129,7 @@ class DraggableCard extends StatelessWidget {
                               deviceData['tag'] ?? '',
                               textAlign: TextAlign.center,
                               overflow: TextOverflow.ellipsis,
-                              maxLines: 2,
+                              maxLines: 1,
                               style: context.textTheme.bodySmall?.copyWith(
                                 color: ColorsManager.lightGreyColor,
                                 fontSize: 9,
@@ -162,7 +160,7 @@ class DraggableCard extends StatelessWidget {
                               deviceData['subSpace'] ?? '',
                               textAlign: TextAlign.center,
                               overflow: TextOverflow.ellipsis,
-                              maxLines: 2,
+                              maxLines: 1,
                               style: context.textTheme.bodySmall?.copyWith(
                                 color: ColorsManager.lightGreyColor,
                                 fontSize: 9,
diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index b65e99c7..007e4dc5 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -17,91 +17,86 @@ class IfContainer extends StatelessWidget {
       builder: (context, state) {
         return DragTarget<Map<String, dynamic>>(
           builder: (context, candidateData, rejectedData) {
-            return Container(
-              width: double.infinity,
-              padding: const EdgeInsets.all(16),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      const Text('IF',
-                          style: TextStyle(
-                              fontSize: 18, fontWeight: FontWeight.bold)),
-                      if (state.isAutomation && state.ifItems.isNotEmpty)
-                        AutomationOperatorSelector(
-                            selectedOperator: state.selectedAutomationOperator),
-                    ],
-                  ),
-                  const SizedBox(height: 16),
-                  if (state.isTabToRun)
-                    const Row(
-                      mainAxisAlignment: MainAxisAlignment.center,
+            return SingleChildScrollView(
+              child: Container(
+                width: double.infinity,
+                padding: const EdgeInsets.all(16),
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
-                        DraggableCard(
-                          imagePath: Assets.tabToRun,
-                          title: 'Tab to run',
-                          deviceData: {},
-                        ),
+                        const Text('IF',
+                            style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                        if (state.isAutomation && state.ifItems.isNotEmpty)
+                          AutomationOperatorSelector(
+                              selectedOperator: state.selectedAutomationOperator),
                       ],
                     ),
-                  if (!state.isTabToRun)
-                    Wrap(
-                      spacing: 8,
-                      runSpacing: 8,
-                      children: List.generate(
-                          state.ifItems.length,
-                          (index) => GestureDetector(
-                                onTap: () async {
-                                  if (!state.isTabToRun) {
-                                    final result = await DeviceDialogHelper
-                                        .showDeviceDialog(
-                                            context: context,
-                                            data: state.ifItems[index],
-                                            removeComparetors: false,
-                                            dialogType: "IF");
+                    const SizedBox(height: 16),
+                    if (state.isTabToRun)
+                      const Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          DraggableCard(
+                            imagePath: Assets.tabToRun,
+                            title: 'Tab to run',
+                            deviceData: {},
+                          ),
+                        ],
+                      ),
+                    if (!state.isTabToRun)
+                      Wrap(
+                        spacing: 8,
+                        runSpacing: 8,
+                        children: List.generate(
+                            state.ifItems.length,
+                            (index) => GestureDetector(
+                                  onTap: () async {
+                                    if (!state.isTabToRun) {
+                                      final result = await DeviceDialogHelper.showDeviceDialog(
+                                          context: context,
+                                          data: state.ifItems[index],
+                                          removeComparetors: false,
+                                          dialogType: "IF");
 
-                                    if (result != null) {
-                                      context.read<RoutineBloc>().add(
-                                          AddToIfContainer(
-                                              state.ifItems[index], false));
-                                    } else if (![
-                                      'AC',
-                                      '1G',
-                                      '2G',
-                                      '3G',
-                                      'WPS'
-                                      'GW',
-                                    ].contains(
-                                        state.ifItems[index]['productType'])) {
-                                      context.read<RoutineBloc>().add(
-                                          AddToIfContainer(
-                                              state.ifItems[index], false));
+                                      if (result != null) {
+                                        context
+                                            .read<RoutineBloc>()
+                                            .add(AddToIfContainer(state.ifItems[index], false));
+                                      } else if (![
+                                        'AC',
+                                        '1G',
+                                        '2G',
+                                        '3G',
+                                        'WPS'
+                                            'GW',
+                                      ].contains(state.ifItems[index]['productType'])) {
+                                        context
+                                            .read<RoutineBloc>()
+                                            .add(AddToIfContainer(state.ifItems[index], false));
+                                      }
                                     }
-                                  }
-                                },
-                                child: DraggableCard(
-                                  imagePath:
-                                      state.ifItems[index]['imagePath'] ?? '',
-                                  title: state.ifItems[index]['title'] ?? '',
-                                  deviceData: state.ifItems[index],
-                                  padding: const EdgeInsets.symmetric(
-                                      horizontal: 4, vertical: 8),
-                                  isFromThen: false,
-                                  isFromIf: true,
-                                  onRemove: () {
-                                    context.read<RoutineBloc>().add(
-                                        RemoveDragCard(
-                                            index: index,
-                                            isFromThen: false,
-                                            key: state.ifItems[index]
-                                                ['uniqueCustomId']));
                                   },
-                                ),
-                              )),
-                    ),
-                ],
+                                  child: DraggableCard(
+                                    imagePath: state.ifItems[index]['imagePath'] ?? '',
+                                    title: state.ifItems[index]['title'] ?? '',
+                                    deviceData: state.ifItems[index],
+                                    padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+                                    isFromThen: false,
+                                    isFromIf: true,
+                                    onRemove: () {
+                                      context.read<RoutineBloc>().add(RemoveDragCard(
+                                          index: index,
+                                          isFromThen: false,
+                                          key: state.ifItems[index]['uniqueCustomId']));
+                                    },
+                                  ),
+                                )),
+                      ),
+                  ],
+                ),
               ),
             );
           },
@@ -116,9 +111,7 @@ class IfContainer extends StatelessWidget {
 
             if (!state.isTabToRun) {
               if (mutableData['deviceId'] == 'tab_to_run') {
-                context
-                    .read<RoutineBloc>()
-                    .add(AddToIfContainer(mutableData, true));
+                context.read<RoutineBloc>().add(AddToIfContainer(mutableData, true));
               } else {
                 final result = await DeviceDialogHelper.showDeviceDialog(
                     dialogType: 'IF',
@@ -127,14 +120,10 @@ class IfContainer extends StatelessWidget {
                     removeComparetors: false);
 
                 if (result != null) {
-                  context
-                      .read<RoutineBloc>()
-                      .add(AddToIfContainer(mutableData, false));
+                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
                 } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW']
                     .contains(mutableData['productType'])) {
-                  context
-                      .read<RoutineBloc>()
-                      .add(AddToIfContainer(mutableData, false));
+                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
                 }
               }
             }
@@ -180,9 +169,7 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context
-                  .read<RoutineBloc>()
-                  .add(const ChangeAutomationOperator(operator: 'or'));
+              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'or'));
             },
           ),
           Container(
@@ -208,9 +195,7 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context
-                  .read<RoutineBloc>()
-                  .add(const ChangeAutomationOperator(operator: 'and'));
+              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'and'));
             },
           ),
         ],
diff --git a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
index 841ffa6e..7be5a959 100644
--- a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
+++ b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
@@ -121,8 +121,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                 child: SizedBox(
                                   width: 16,
                                   height: 16,
-                                  child:
-                                      CircularProgressIndicator(strokeWidth: 2),
+                                  child: CircularProgressIndicator(strokeWidth: 2),
                                 ),
                               ),
                             )
@@ -159,9 +158,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
-                                      errorBuilder:
-                                          (context, error, stackTrace) =>
-                                              Image.asset(
+                                      errorBuilder: (context, error, stackTrace) => Image.asset(
                                         Assets.logo,
                                         height: iconSize,
                                         width: iconSize,
@@ -174,8 +171,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       width: iconSize,
                                       fit: BoxFit.contain,
                                     )
-                              : (widget.icon is String &&
-                                      widget.icon.endsWith('.svg'))
+                              : (widget.icon is String && widget.icon.endsWith('.svg'))
                                   ? SvgPicture.asset(
                                       height: iconSize,
                                       width: iconSize,
@@ -185,9 +181,7 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   : Icon(
                                       widget.icon,
                                       color: ColorsManager.dialogBlueTitle,
-                                      size: widget.isSmallScreenSize(context)
-                                          ? 30
-                                          : 40,
+                                      size: widget.isSmallScreenSize(context) ? 30 : 40,
                                     ),
                         ),
                       ),
@@ -200,11 +194,10 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                               widget.textString,
                               textAlign: TextAlign.center,
                               overflow: TextOverflow.ellipsis,
-                              maxLines: 2,
+                              maxLines: 1,
                               style: context.textTheme.bodySmall?.copyWith(
                                 color: ColorsManager.blackColor,
-                                fontSize:
-                                    widget.isSmallScreenSize(context) ? 10 : 12,
+                                fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
                               ),
                             ),
                             if (widget.spaceName != '')
@@ -220,14 +213,10 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                     widget.spaceName,
                                     textAlign: TextAlign.center,
                                     overflow: TextOverflow.ellipsis,
-                                    maxLines: 2,
-                                    style:
-                                        context.textTheme.bodySmall?.copyWith(
+                                    maxLines: 1,
+                                    style: context.textTheme.bodySmall?.copyWith(
                                       color: ColorsManager.blackColor,
-                                      fontSize:
-                                          widget.isSmallScreenSize(context)
-                                              ? 10
-                                              : 12,
+                                      fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
                                     ),
                                   ),
                                 ],

From 91c4c772b5bf8f1af8f80dcd2cee38889a24a45d Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 13:08:38 +0300
Subject: [PATCH 145/238] SP-1330.

---
 .../all_spaces/widgets/sidebar_widget.dart    | 66 ++++++++++++++++---
 1 file changed, 56 insertions(+), 10 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 3eb1c001..34cb9a70 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -11,6 +11,8 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_til
 import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class SidebarWidget extends StatefulWidget {
@@ -30,6 +32,8 @@ class SidebarWidget extends StatefulWidget {
 }
 
 class _SidebarWidgetState extends State<SidebarWidget> {
+  late final ScrollController _scrollController;
+
   String _searchQuery = '';
   String? _selectedSpaceUuid;
   String? _selectedId;
@@ -37,9 +41,16 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   void initState() {
     _selectedId = widget.selectedSpaceUuid;
+    _scrollController = ScrollController();
     super.initState();
   }
 
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
   @override
   void didUpdateWidget(covariant SidebarWidget oldWidget) {
     if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
@@ -86,12 +97,14 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     return isSpaceSelected || anySubSpaceIsSelected;
   }
 
+  static const _width = 300.0;
+
   @override
   Widget build(BuildContext context) {
     final filteredCommunities = _filteredCommunities();
 
     return Container(
-      width: 300,
+      width: _width,
       decoration: subSectionContainerDecoration,
       child: Column(
         mainAxisSize: MainAxisSize.min,
@@ -103,10 +116,42 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           ),
           const SizedBox(height: 16),
           Expanded(
-            child: ListView(
-              children: filteredCommunities
-                  .map((community) => _buildCommunityTile(context, community))
-                  .toList(),
+            child: Visibility(
+              visible: filteredCommunities.isNotEmpty,
+              replacement: Center(
+                child: Text(
+                  'No results found',
+                  textAlign: TextAlign.center,
+                  style: context.textTheme.bodySmall?.copyWith(
+                    color: ColorsManager.lightGreyColor,
+                    fontWeight: FontWeight.w400,
+                  ),
+                ),
+              ),
+              child: ListView(
+                shrinkWrap: true,
+                scrollDirection: Axis.horizontal,
+                children: [
+                  SizedBox(
+                    width: context.screenWidth * 0.5,
+                    child: Scrollbar(
+                      scrollbarOrientation: ScrollbarOrientation.left,
+                      thumbVisibility: true,
+                      controller: _scrollController,
+                      child: ListView.builder(
+                        padding: const EdgeInsetsDirectional.only(start: 16),
+                        shrinkWrap: true,
+                        itemCount: filteredCommunities.length,
+                        controller: _scrollController,
+                        itemBuilder: (context, index) => _buildCommunityTile(
+                          context,
+                          filteredCommunities[index],
+                        ),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
             ),
           ),
         ],
@@ -134,11 +179,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
       },
       onExpansionChanged: (title, expanded) {},
       children: community.spaces
-          .where((space) {
-            final isDeleted = space.status != SpaceStatus.deleted;
-            final isParentDeleted = space.status != SpaceStatus.parentDeleted;
-            return (isDeleted || isParentDeleted);
-          })
+          .where(
+            (space) => {
+              SpaceStatus.deleted,
+              SpaceStatus.parentDeleted,
+            }.contains(space.status),
+          )
           .map((space) => _buildSpaceTile(space: space, community: community))
           .toList(),
     );

From dce44e20ec6a87d173b1f84cfa4b80d75a393a6c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 13:11:56 +0300
Subject: [PATCH 146/238] Extracted `EmptyResultsWidget` into its own widget
 and file for reusability.

---
 .../widgets/empty_search_result_widget.dart   | 26 +++++++++++++++++++
 .../all_spaces/widgets/sidebar_widget.dart    | 13 ++--------
 2 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 lib/common/widgets/empty_search_result_widget.dart

diff --git a/lib/common/widgets/empty_search_result_widget.dart b/lib/common/widgets/empty_search_result_widget.dart
new file mode 100644
index 00000000..493974d4
--- /dev/null
+++ b/lib/common/widgets/empty_search_result_widget.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class EmptySearchResultWidget extends StatelessWidget {
+  const EmptySearchResultWidget({
+    this.message = 'No results found',
+    super.key,
+  });
+
+  final String message;
+
+  @override
+  Widget build(BuildContext context) {
+    return Center(
+      child: Text(
+        message,
+        textAlign: TextAlign.center,
+        style: context.textTheme.bodySmall?.copyWith(
+          color: ColorsManager.lightGreyColor,
+          fontWeight: FontWeight.w400,
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 34cb9a70..6d03c0d0 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/common/widgets/empty_search_result_widget.dart';
 import 'package:syncrow_web/common/widgets/search_bar.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
@@ -11,7 +12,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_til
 import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
 
@@ -118,16 +118,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
           Expanded(
             child: Visibility(
               visible: filteredCommunities.isNotEmpty,
-              replacement: Center(
-                child: Text(
-                  'No results found',
-                  textAlign: TextAlign.center,
-                  style: context.textTheme.bodySmall?.copyWith(
-                    color: ColorsManager.lightGreyColor,
-                    fontWeight: FontWeight.w400,
-                  ),
-                ),
-              ),
+              replacement: const EmptySearchResultWidget(),
               child: ListView(
                 shrinkWrap: true,
                 scrollDirection: Axis.horizontal,

From fc1d394509b0866d3046e1105727738222dd504b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 13:17:09 +0300
Subject: [PATCH 147/238] Extracted `SidebarCommunitiesList` into a reusable
 widget.

---
 .../widgets/sidebar_communities_list.dart     | 55 +++++++++++++++++++
 .../all_spaces/widgets/sidebar_widget.dart    | 31 +++--------
 2 files changed, 62 insertions(+), 24 deletions(-)
 create mode 100644 lib/common/widgets/sidebar_communities_list.dart

diff --git a/lib/common/widgets/sidebar_communities_list.dart b/lib/common/widgets/sidebar_communities_list.dart
new file mode 100644
index 00000000..f5f34f24
--- /dev/null
+++ b/lib/common/widgets/sidebar_communities_list.dart
@@ -0,0 +1,55 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class SidebarCommunitiesList extends StatefulWidget {
+  const SidebarCommunitiesList({
+    required this.communities,
+    required this.itemBuilder,
+    super.key,
+  });
+
+  final List<CommunityModel> communities;
+  final Widget Function(BuildContext context, int index) itemBuilder;
+
+  @override
+  State<SidebarCommunitiesList> createState() => _SidebarCommunitiesListState();
+}
+
+class _SidebarCommunitiesListState extends State<SidebarCommunitiesList> {
+  late final ScrollController _scrollController;
+
+  @override
+  void initState() {
+    _scrollController = ScrollController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _scrollController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SingleChildScrollView(
+      scrollDirection: Axis.horizontal,
+      child: SizedBox(
+        width: context.screenWidth * 0.5,
+        child: Scrollbar(
+          scrollbarOrientation: ScrollbarOrientation.left,
+          thumbVisibility: true,
+          controller: _scrollController,
+          child: ListView.builder(
+            padding: const EdgeInsetsDirectional.only(start: 16),
+            shrinkWrap: true,
+            itemCount: widget.communities.length,
+            controller: _scrollController,
+            itemBuilder: widget.itemBuilder,
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 6d03c0d0..9be0c746 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/widgets/empty_search_result_widget.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/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -12,7 +13,6 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/widgets/space_til
 import 'package:syncrow_web/pages/spaces_management/create_community/view/create_community_dialog.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
 
 class SidebarWidget extends StatefulWidget {
@@ -119,29 +119,12 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             child: Visibility(
               visible: filteredCommunities.isNotEmpty,
               replacement: const EmptySearchResultWidget(),
-              child: ListView(
-                shrinkWrap: true,
-                scrollDirection: Axis.horizontal,
-                children: [
-                  SizedBox(
-                    width: context.screenWidth * 0.5,
-                    child: Scrollbar(
-                      scrollbarOrientation: ScrollbarOrientation.left,
-                      thumbVisibility: true,
-                      controller: _scrollController,
-                      child: ListView.builder(
-                        padding: const EdgeInsetsDirectional.only(start: 16),
-                        shrinkWrap: true,
-                        itemCount: filteredCommunities.length,
-                        controller: _scrollController,
-                        itemBuilder: (context, index) => _buildCommunityTile(
-                          context,
-                          filteredCommunities[index],
-                        ),
-                      ),
-                    ),
-                  ),
-                ],
+              child: SidebarCommunitiesList(
+                communities: filteredCommunities,
+                itemBuilder: (context, index) => _buildCommunityTile(
+                  context,
+                  filteredCommunities[index],
+                ),
               ),
             ),
           ),

From afdd44e098b28ec148d6daf5a8b15fa91a653149 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 13:18:52 +0300
Subject: [PATCH 148/238] removed comments from `SpaceTreeView`.

---
 .../space_tree/view/space_tree_view.dart      | 62 -------------------
 1 file changed, 62 deletions(-)

diff --git a/lib/pages/space_tree/view/space_tree_view.dart b/lib/pages/space_tree/view/space_tree_view.dart
index 5b70da06..5b6d5593 100644
--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@@ -191,68 +191,6 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                           ),
                   ),
                   if (state.paginationIsLoading) const CircularProgressIndicator(),
-                  // Expanded(
-                  //   child: Padding(
-                  //     padding: const EdgeInsets.all(8.0),
-                  //     child: list.isEmpty
-                  //         ? Center(
-                  //             child: Text(
-                  //               'No results found',
-                  //               style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                  //                     color: ColorsManager.lightGrayColor, // Gray when not selected
-                  //                     fontWeight: FontWeight.w400,
-                  //                   ),
-                  //             ),
-                  //           )
-                  //         : ListView(
-                  //             shrinkWrap: true,
-                  //             children: list
-                  //                 .map(
-                  //                   (community) => CustomExpansionTileSpaceTree(
-                  //                     title: community.name,
-                  //                     isSelected:
-                  //                         state.selectedCommunities.contains(community.uuid),
-                  //                     isSoldCheck:
-                  //                         state.selectedCommunities.contains(community.uuid),
-                  //                     onExpansionChanged: () {
-                  //                       context
-                  //                           .read<SpaceTreeBloc>()
-                  //                           .add(OnCommunityExpanded(community.uuid));
-                  //                     },
-                  //                     isExpanded:
-                  //                         state.expandedCommunities.contains(community.uuid),
-                  //                     onItemSelected: () {
-                  //                       context.read<SpaceTreeBloc>().add(
-                  //                           OnCommunitySelected(community.uuid, community.spaces));
-
-                  //                       onSelect();
-                  //                     },
-                  //                     children: community.spaces.map((space) {
-                  //                       return CustomExpansionTileSpaceTree(
-                  //                         title: space.name,
-                  //                         isExpanded: state.expandedSpaces.contains(space.uuid),
-                  //                         onItemSelected: () {
-                  //                           context.read<SpaceTreeBloc>().add(OnSpaceSelected(
-                  //                               community.uuid, space.uuid ?? '', space.children));
-                  //                           onSelect();
-                  //                         },
-                  //                         onExpansionChanged: () {
-                  //                           context.read<SpaceTreeBloc>().add(
-                  //                               OnSpaceExpanded(community.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, community.uuid),
-                  //                       );
-                  //                     }).toList(),
-                  //                   ),
-                  //                 )
-                  //                 .toList(),
-                  //           ),
-                  //   ),
-                  // ),
                 ],
               ),
       );

From 8b441aaf46a7697c10c4512722cb04aa1dc2898a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:09:36 +0300
Subject: [PATCH 149/238] Refactor SidebarCommunitiesList to be a
 StatelessWidget and update its usage across SpaceTreeView and SidebarWidget
 for improved performance and maintainability.

---
 .../widgets/sidebar_communities_list.dart     |  48 ++-
 .../space_tree/view/space_tree_view.dart      | 283 +++++++++---------
 .../all_spaces/widgets/sidebar_widget.dart    |   2 +
 3 files changed, 167 insertions(+), 166 deletions(-)

diff --git a/lib/common/widgets/sidebar_communities_list.dart b/lib/common/widgets/sidebar_communities_list.dart
index f5f34f24..acc8471d 100644
--- a/lib/common/widgets/sidebar_communities_list.dart
+++ b/lib/common/widgets/sidebar_communities_list.dart
@@ -2,34 +2,19 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class SidebarCommunitiesList extends StatefulWidget {
+class SidebarCommunitiesList extends StatelessWidget {
   const SidebarCommunitiesList({
     required this.communities,
     required this.itemBuilder,
+    required this.scrollController,
+    required this.onScrollToEnd,
     super.key,
   });
 
   final List<CommunityModel> communities;
   final Widget Function(BuildContext context, int index) itemBuilder;
-
-  @override
-  State<SidebarCommunitiesList> createState() => _SidebarCommunitiesListState();
-}
-
-class _SidebarCommunitiesListState extends State<SidebarCommunitiesList> {
-  late final ScrollController _scrollController;
-
-  @override
-  void initState() {
-    _scrollController = ScrollController();
-    super.initState();
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    super.dispose();
-  }
+  final ScrollController scrollController;
+  final void Function() onScrollToEnd;
 
   @override
   Widget build(BuildContext context) {
@@ -40,13 +25,22 @@ class _SidebarCommunitiesListState extends State<SidebarCommunitiesList> {
         child: Scrollbar(
           scrollbarOrientation: ScrollbarOrientation.left,
           thumbVisibility: true,
-          controller: _scrollController,
-          child: ListView.builder(
-            padding: const EdgeInsetsDirectional.only(start: 16),
-            shrinkWrap: true,
-            itemCount: widget.communities.length,
-            controller: _scrollController,
-            itemBuilder: widget.itemBuilder,
+          controller: scrollController,
+          child: NotificationListener(
+            onNotification: (notification) {
+              if (notification is ScrollEndNotification &&
+                  notification.metrics.extentAfter == 0) {
+                onScrollToEnd.call();
+              }
+              return false;
+            },
+            child: ListView.builder(
+              padding: const EdgeInsetsDirectional.only(start: 16),
+              shrinkWrap: true,
+              itemCount: communities.length,
+              controller: scrollController,
+              itemBuilder: itemBuilder,
+            ),
           ),
         ),
       ),
diff --git a/lib/pages/space_tree/view/space_tree_view.dart b/lib/pages/space_tree/view/space_tree_view.dart
index 5b6d5593..cae4af1c 100644
--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.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';
@@ -34,160 +35,158 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      List<CommunityModel> list =
-          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
+      final communities = state.searchQuery.isNotEmpty
+          ? state.filteredCommunity
+          : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
-            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
+            ? subSectionContainerDecoration.copyWith(
+                color: ColorsManager.whiteColors)
             : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
             : Column(
                 children: [
-                  widget.isSide == true
-                      ? Container(
-                          decoration: const BoxDecoration(
-                            color: ColorsManager.circleRolesBackground,
-                            borderRadius: BorderRadius.only(
-                                topRight: Radius.circular(20), topLeft: Radius.circular(20)),
-                          ),
-                          child: Padding(
-                            padding: const EdgeInsets.all(8.0),
-                            child: Row(
-                              children: [
-                                Expanded(
-                                  child: Container(
-                                    decoration: BoxDecoration(
-                                        borderRadius: const BorderRadius.all(Radius.circular(20)),
-                                        border: Border.all(color: ColorsManager.grayBorder)),
-                                    child: TextFormField(
-                                      style: context.textTheme.bodyMedium
-                                          ?.copyWith(color: ColorsManager.blackColor),
-                                      onChanged: (value) {
-                                        context.read<SpaceTreeBloc>().add(SearchQueryEvent(value));
-                                      },
-                                      decoration: textBoxDecoration(radios: 20)!.copyWith(
-                                        fillColor: Colors.white,
-                                        suffixIcon: Padding(
-                                          padding: const EdgeInsets.only(right: 16),
-                                          child: SvgPicture.asset(
-                                            Assets.textFieldSearch,
-                                            width: 24,
-                                            height: 24,
+                  if (widget.isSide == true)
+                    Container(
+                      decoration: const BoxDecoration(
+                        color: ColorsManager.circleRolesBackground,
+                        borderRadius: BorderRadius.only(
+                          topRight: Radius.circular(20),
+                          topLeft: Radius.circular(20),
+                        ),
+                      ),
+                      child: Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: Row(
+                          children: [
+                            Expanded(
+                              child: Container(
+                                decoration: BoxDecoration(
+                                  borderRadius: const BorderRadius.all(
+                                    Radius.circular(20),
+                                  ),
+                                  border: Border.all(
+                                    color: ColorsManager.grayBorder,
+                                  ),
+                                ),
+                                child: TextFormField(
+                                  style: context.textTheme.bodyMedium?.copyWith(
+                                    color: ColorsManager.blackColor,
+                                  ),
+                                  onChanged: (value) =>
+                                      context.read<SpaceTreeBloc>().add(
+                                            SearchQueryEvent(value),
                                           ),
-                                        ),
-                                        hintStyle: context.textTheme.bodyMedium?.copyWith(
-                                            fontWeight: FontWeight.w400,
-                                            fontSize: 12,
-                                            color: ColorsManager.textGray),
+                                  decoration:
+                                      textBoxDecoration(radios: 20)?.copyWith(
+                                    fillColor: Colors.white,
+                                    suffixIcon: Padding(
+                                      padding: const EdgeInsets.only(right: 16),
+                                      child: SvgPicture.asset(
+                                        Assets.textFieldSearch,
+                                        width: 24,
+                                        height: 24,
                                       ),
                                     ),
+                                    hintStyle:
+                                        context.textTheme.bodyMedium?.copyWith(
+                                      fontWeight: FontWeight.w400,
+                                      fontSize: 12,
+                                      color: ColorsManager.textGray,
+                                    ),
                                   ),
                                 ),
-                              ],
+                              ),
                             ),
-                          ),
-                        )
-                      : CustomSearchBar(
-                          onSearchChanged: (query) {
-                            context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-                          },
+                          ],
                         ),
+                      ),
+                    )
+                  else
+                    CustomSearchBar(
+                      onSearchChanged: (query) => context.read<SpaceTreeBloc>().add(
+                            SearchQueryEvent(query),
+                          ),
+                    ),
                   const SizedBox(height: 16),
                   Expanded(
                     child: state.isSearching
                         ? const Center(child: CircularProgressIndicator())
-                        : ListView(
-                            shrinkWrap: true,
-                            scrollDirection: Axis.horizontal,
-                            children: [
-                              Container(
-                                width: MediaQuery.sizeOf(context).width * 0.5,
-                                padding: const EdgeInsets.all(8.0),
-                                child: list.isEmpty
-                                    ? Center(
-                                        child: Text(
-                                          'No results found',
-                                          style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                                                color: ColorsManager.lightGrayColor,
-                                                fontWeight: FontWeight.w400,
-                                              ),
-                                        ),
-                                      )
-                                    : Scrollbar(
-                                        scrollbarOrientation: ScrollbarOrientation.left,
-                                        thumbVisibility: true,
-                                        controller: _scrollController,
-                                        child: NotificationListener(
-                                          onNotification: (notification) {
-                                            if (notification is ScrollEndNotification &&
-                                                notification.metrics.extentAfter == 0) {
-                                              // If the user has reached the end of the list Load more data
-                                              context.read<SpaceTreeBloc>().add(PaginationEvent(
-                                                  state.paginationModel, state.communityList));
-                                            }
-                                            return false;
-                                          },
-                                          child: Padding(
-                                            padding: const EdgeInsets.only(left: 16),
-                                            child: ListView.builder(
-                                                shrinkWrap: true,
-                                                itemCount: list.length,
-                                                controller: _scrollController,
-                                                itemBuilder: (context, index) {
-                                                  return CustomExpansionTileSpaceTree(
-                                                    title: list[index].name,
-                                                    isSelected: state.selectedCommunities
-                                                        .contains(list[index].uuid),
-                                                    isSoldCheck: state.selectedCommunities
-                                                        .contains(list[index].uuid),
-                                                    onExpansionChanged: () {
-                                                      context.read<SpaceTreeBloc>().add(
-                                                          OnCommunityExpanded(list[index].uuid));
-                                                    },
-                                                    isExpanded: state.expandedCommunities
-                                                        .contains(list[index].uuid),
-                                                    onItemSelected: () {
-                                                      context.read<SpaceTreeBloc>().add(
-                                                          OnCommunitySelected(list[index].uuid,
-                                                              list[index].spaces));
-                                                      widget.onSelect();
-                                                    },
-                                                    children: list[index].spaces.map((space) {
-                                                      return CustomExpansionTileSpaceTree(
-                                                        title: space.name,
-                                                        isExpanded: state.expandedSpaces
-                                                            .contains(space.uuid),
-                                                        onItemSelected: () {
-                                                          context.read<SpaceTreeBloc>().add(
-                                                              OnSpaceSelected(
-                                                                  list[index],
-                                                                  space.uuid ?? '',
-                                                                  space.children));
-                                                          widget.onSelect();
-                                                        },
-                                                        onExpansionChanged: () {
-                                                          context.read<SpaceTreeBloc>().add(
-                                                              OnSpaceExpanded(list[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, list[index]),
-                                                      );
-                                                    }).toList(),
-                                                  );
-                                                }),
+                        : SidebarCommunitiesList(
+                            onScrollToEnd: () => 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: () {
+                                  context.read<SpaceTreeBloc>().add(
+                                        OnCommunitySelected(
+                                          communities[index].uuid,
+                                          communities[index].spaces,
+                                        ),
+                                      );
+                                  widget.onSelect();
+                                },
+                                children: communities[index].spaces.map(
+                                  (space) {
+                                    return CustomExpansionTileSpaceTree(
+                                      title: space.name,
+                                      isExpanded:
+                                          state.expandedSpaces.contains(space.uuid),
+                                      onItemSelected: () {
+                                        context.read<SpaceTreeBloc>().add(
+                                              OnSpaceSelected(
+                                                communities[index],
+                                                space.uuid ?? '',
+                                                space.children,
+                                              ),
+                                            );
+                                        widget.onSelect();
+                                      },
+                                      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(),
@@ -198,22 +197,28 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   }
 
   List<Widget> _buildNestedSpaces(
-      BuildContext context, SpaceTreeState state, SpaceModel space, CommunityModel community) {
+    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),
+        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: () {
-          context
-              .read<SpaceTreeBloc>()
-              .add(OnSpaceSelected(community, child.uuid ?? '', child.children));
+          context.read<SpaceTreeBloc>().add(
+                OnSpaceSelected(community, child.uuid ?? '', child.children),
+              );
           widget.onSelect();
         },
         onExpansionChanged: () {
-          context.read<SpaceTreeBloc>().add(OnSpaceExpanded(community.uuid, child.uuid ?? ''));
+          context.read<SpaceTreeBloc>().add(
+                OnSpaceExpanded(community.uuid, child.uuid ?? ''),
+              );
         },
         children: _buildNestedSpaces(context, state, child, community),
       );
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 9be0c746..198ebc51 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -120,6 +120,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               visible: filteredCommunities.isNotEmpty,
               replacement: const EmptySearchResultWidget(),
               child: SidebarCommunitiesList(
+                scrollController: _scrollController,
+                onScrollToEnd: () {},
                 communities: filteredCommunities,
                 itemBuilder: (context, index) => _buildCommunityTile(
                   context,

From 4c38c5064989b4cf63301e6f067166c845cfadf0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:29:39 +0300
Subject: [PATCH 150/238] Refactor notification handling in
 SidebarCommunitiesList for improved readability and maintainability.

---
 .../widgets/sidebar_communities_list.dart     | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/lib/common/widgets/sidebar_communities_list.dart b/lib/common/widgets/sidebar_communities_list.dart
index acc8471d..191aab25 100644
--- a/lib/common/widgets/sidebar_communities_list.dart
+++ b/lib/common/widgets/sidebar_communities_list.dart
@@ -16,6 +16,16 @@ class SidebarCommunitiesList extends StatelessWidget {
   final ScrollController scrollController;
   final void Function() onScrollToEnd;
 
+  bool _onNotification(ScrollEndNotification notification) {
+    final hasReachedEnd = notification.metrics.extentAfter == 0;
+    if (hasReachedEnd) {
+      onScrollToEnd.call();
+      return true;
+    }
+
+    return false;
+  }
+
   @override
   Widget build(BuildContext context) {
     return SingleChildScrollView(
@@ -26,17 +36,11 @@ class SidebarCommunitiesList extends StatelessWidget {
           scrollbarOrientation: ScrollbarOrientation.left,
           thumbVisibility: true,
           controller: scrollController,
-          child: NotificationListener(
-            onNotification: (notification) {
-              if (notification is ScrollEndNotification &&
-                  notification.metrics.extentAfter == 0) {
-                onScrollToEnd.call();
-              }
-              return false;
-            },
+          child: NotificationListener<ScrollEndNotification>(
+            onNotification: _onNotification,
             child: ListView.builder(
-              padding: const EdgeInsetsDirectional.only(start: 16),
               shrinkWrap: true,
+              padding: const EdgeInsetsDirectional.only(start: 16),
               itemCount: communities.length,
               controller: scrollController,
               itemBuilder: itemBuilder,

From b4f03ab6c3bdb1795c0d1d24cea662a2c80bd927 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:36:37 +0300
Subject: [PATCH 151/238] Initialize ScrollController in initState for better
 state management in SpaceTreeView.

---
 lib/pages/space_tree/view/space_tree_view.dart | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/pages/space_tree/view/space_tree_view.dart b/lib/pages/space_tree/view/space_tree_view.dart
index cae4af1c..3d5d00bf 100644
--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@@ -24,7 +24,13 @@ class SpaceTreeView extends StatefulWidget {
 }
 
 class _SpaceTreeViewState extends State<SpaceTreeView> {
-  final ScrollController _scrollController = ScrollController();
+  late final ScrollController _scrollController;
+
+  @override
+  void initState() {
+    _scrollController = ScrollController();
+    super.initState();
+  }
 
   @override
   void dispose() {

From f1667d445895ec9f3ae062e1653552e336f3e359 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:44:11 +0300
Subject: [PATCH 152/238] Refactor type annotations for onExpansionChanged and
 onItemSelected in CustomExpansionTileSpaceTree for improved clarity.

---
 lib/pages/space_tree/view/custom_expansion.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index 515a8448..c06816b4 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -8,8 +8,8 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
   final bool isSelected;
   final bool isSoldCheck;
   final bool isExpanded;
-  final Function? onExpansionChanged;
-  final Function? onItemSelected;
+  final void Function()? onExpansionChanged;
+  final void Function()? onItemSelected;
 
   const CustomExpansionTileSpaceTree(
       {super.key,

From f709b92e1266901aa521bd83763d7576a5981cb6 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:44:31 +0300
Subject: [PATCH 153/238] Refactor constructor formatting and improve
 readability in CustomExpansionTileSpaceTree.

---
 .../space_tree/view/custom_expansion.dart     | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index c06816b4..c9755180 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -11,16 +11,17 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
   final void Function()? onExpansionChanged;
   final void Function()? onItemSelected;
 
-  const CustomExpansionTileSpaceTree(
-      {super.key,
-      this.spaceId,
-      required this.title,
-      this.children,
-      this.isExpanded = false,
-      this.onExpansionChanged,
-      this.onItemSelected,
-      required this.isSelected,
-      this.isSoldCheck = false});
+  const CustomExpansionTileSpaceTree({
+    required this.isSelected,
+    required this.title,
+    this.spaceId,
+    this.children,
+    this.onExpansionChanged,
+    this.onItemSelected,
+    this.isExpanded = false,
+    this.isSoldCheck = false,
+    super.key,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -56,7 +57,9 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
                   }
                 },
                 child: Icon(
-                  isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
+                  isExpanded
+                      ? Icons.keyboard_arrow_down
+                      : Icons.keyboard_arrow_right,
                   color: ColorsManager.lightGrayColor,
                   size: 16.0,
                 ),
@@ -72,7 +75,8 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
                   _capitalizeFirstLetter(title),
                   style: Theme.of(context).textTheme.bodySmall!.copyWith(
                         color: isSelected
-                            ? ColorsManager.blackColor // Change color to black when selected
+                            ? ColorsManager
+                                .blackColor // Change color to black when selected
                             : ColorsManager.lightGrayColor, // Gray when not selected
                         fontWeight: FontWeight.w400,
                       ),

From 3de7606a00a6252477b73a505b5117408e1c1495 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:46:37 +0300
Subject: [PATCH 154/238] Refactor expansion icon handling in
 CustomExpansionTileSpaceTree for improved readability and maintainability.

---
 .../space_tree/view/custom_expansion.dart     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index c9755180..2d969489 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -49,21 +49,7 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
               }),
               checkColor: ColorsManager.whiteColors,
             ),
-            if (children != null && children!.isNotEmpty)
-              InkWell(
-                onTap: () {
-                  if (onExpansionChanged != null) {
-                    onExpansionChanged!();
-                  }
-                },
-                child: Icon(
-                  isExpanded
-                      ? Icons.keyboard_arrow_down
-                      : Icons.keyboard_arrow_right,
-                  color: ColorsManager.lightGrayColor,
-                  size: 16.0,
-                ),
-              ),
+            _buildExpansionIcon(),
             Expanded(
               child: GestureDetector(
                 onTap: () {
@@ -96,6 +82,20 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
     );
   }
 
+  Widget _buildExpansionIcon() {
+    return Visibility(
+      visible: children != null && children!.isNotEmpty,
+      child: InkWell(
+        onTap: onExpansionChanged,
+        child: Icon(
+          isExpanded ? Icons.keyboard_arrow_down : Icons.keyboard_arrow_right,
+          color: ColorsManager.lightGrayColor,
+          size: 16.0,
+        ),
+      ),
+    );
+  }
+
   String _capitalizeFirstLetter(String text) {
     if (text.isEmpty) return text;
     return text[0].toUpperCase() + text.substring(1);

From 0cc867a4ea1e863cb25127af81ac2b63305091de Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:47:19 +0300
Subject: [PATCH 155/238] Refactor text color assignment in
 CustomExpansionTileSpaceTree for improved readability.

---
 lib/pages/space_tree/view/custom_expansion.dart | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index 2d969489..dc55cbe7 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -61,9 +61,8 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
                   _capitalizeFirstLetter(title),
                   style: Theme.of(context).textTheme.bodySmall!.copyWith(
                         color: isSelected
-                            ? ColorsManager
-                                .blackColor // Change color to black when selected
-                            : ColorsManager.lightGrayColor, // Gray when not selected
+                            ? ColorsManager.blackColor
+                            : ColorsManager.lightGrayColor,
                         fontWeight: FontWeight.w400,
                       ),
                 ),

From 52e1ff94dedc9b8095815cfe3a4aee1678db097a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:47:42 +0300
Subject: [PATCH 156/238] Refactor onItemSelected handling in
 CustomExpansionTileSpaceTree for improved readability.

---
 lib/pages/space_tree/view/custom_expansion.dart | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index dc55cbe7..4aee79e9 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -52,11 +52,7 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
             _buildExpansionIcon(),
             Expanded(
               child: GestureDetector(
-                onTap: () {
-                  if (onItemSelected != null) {
-                    onItemSelected!();
-                  }
-                },
+                onTap: onItemSelected,
                 child: Text(
                   _capitalizeFirstLetter(title),
                   style: Theme.of(context).textTheme.bodySmall!.copyWith(

From 3216d6b879ce6428ab721a0dc081127efc29b6e0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:47:52 +0300
Subject: [PATCH 157/238] Refactor fillColor assignment in
 CustomExpansionTileSpaceTree for improved readability.

---
 lib/pages/space_tree/view/custom_expansion.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index 4aee79e9..43087e05 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -43,9 +43,9 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
               fillColor: WidgetStateProperty.resolveWith((states) {
                 if (states.contains(WidgetState.selected)) {
                   return ColorsManager.blue1;
-                } else {
-                  return ColorsManager.checkBoxFillColor;
                 }
+
+                return ColorsManager.checkBoxFillColor;
               }),
               checkColor: ColorsManager.whiteColors,
             ),

From 01d5cb48cc08973cf9d0437edb788844e6a5f9cc Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 16 Apr 2025 14:49:20 +0300
Subject: [PATCH 158/238] Refactor onChanged callback in Checkbox for improved
 readability in CustomExpansionTileSpaceTree.

---
 lib/pages/space_tree/view/custom_expansion.dart | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index 43087e05..e4e7f423 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -31,15 +31,11 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
           children: [
             Checkbox(
               value: isSoldCheck ? null : isSelected,
-              onChanged: (bool? value) {
-                if (onItemSelected != null) {
-                  onItemSelected!();
-                }
-              },
+              onChanged: (value) => onItemSelected ?? () {},
               tristate: true,
-              side: WidgetStateBorderSide.resolveWith((states) {
-                return const BorderSide(color: ColorsManager.grayBorder);
-              }),
+              side: WidgetStateBorderSide.resolveWith(
+                (states) => const BorderSide(color: ColorsManager.grayBorder),
+              ),
               fillColor: WidgetStateProperty.resolveWith((states) {
                 if (states.contains(WidgetState.selected)) {
                   return ColorsManager.blue1;

From 72ae3b172718a6613bd65e6183006a78a2731247 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Wed, 16 Apr 2025 15:06:50 +0300
Subject: [PATCH 159/238] Refactor FactoryResetModel and
 MainDoorSensorBatchView

- Refactor FactoryResetModel to include 'operationType' in toJson and toMap methods.
- Refactor MainDoorSensorBatchView to use BlocProvider and Builder for better state management.
---
 .../models/factory_reset_model.dart           |  3 ++
 .../view/main_door_sensor_batch_view.dart     | 53 +++++++++----------
 lib/services/devices_mang_api.dart            |  3 +-
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/models/factory_reset_model.dart b/lib/pages/device_managment/all_devices/models/factory_reset_model.dart
index 56c6c90b..1b5685a1 100644
--- a/lib/pages/device_managment/all_devices/models/factory_reset_model.dart
+++ b/lib/pages/device_managment/all_devices/models/factory_reset_model.dart
@@ -19,6 +19,7 @@ class FactoryResetModel {
   Map<String, dynamic> toJson() {
     return {
       'devicesUuid': devicesUuid,
+      'operationType': operationType,
     };
   }
 
@@ -33,6 +34,7 @@ class FactoryResetModel {
   Map<String, dynamic> toMap() {
     return {
       'devicesUuid': devicesUuid,
+      'operationType': operationType,
     };
   }
 
@@ -56,3 +58,4 @@ class FactoryResetModel {
   @override
   int get hashCode => devicesUuid.hashCode;
 }
+
diff --git a/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart b/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart
index 7337c9fd..bbebabaa 100644
--- a/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart
+++ b/lib/pages/device_managment/main_door_sensor/view/main_door_sensor_batch_view.dart
@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_re
 import 'package:syncrow_web/pages/device_managment/main_door_sensor/bloc/main_door_sensor_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/main_door_sensor/bloc/main_door_sensor_event.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
-// import 'package:syncrow_web/pages/device_managment/shared/batch_control/firmware_update.dart';
 
 class MainDoorSensorBatchView extends StatelessWidget {
   const MainDoorSensorBatchView({super.key, required this.devicesIds});
@@ -13,35 +12,31 @@ class MainDoorSensorBatchView extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.center,
-      children: [
-        // SizedBox(
-        //   width: 170,
-        //   height: 140,
-        //   child: FirmwareUpdateWidget(
-        //     deviceId: devicesIds.first,
-        //     version: 12,
-        //   ),
-        // ),
-        // const SizedBox(
-        //   width: 12,
-        // ),
-        SizedBox(
-          width: 170,
-          height: 140,
-          child: FactoryResetWidget(
-            callFactoryReset: () {
-              BlocProvider.of<MainDoorSensorBloc>(context).add(
-                MainDoorSensorFactoryReset(
-                  deviceId: devicesIds.first,
-                  factoryReset: FactoryResetModel(devicesUuid: devicesIds),
+    return BlocProvider(
+      create: (context) => MainDoorSensorBloc(),
+      child: Builder(
+        builder: (innerContext) {
+          return Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SizedBox(
+                width: 170,
+                height: 140,
+                child: FactoryResetWidget(
+                  callFactoryReset: () {
+                    BlocProvider.of<MainDoorSensorBloc>(innerContext).add(
+                      MainDoorSensorFactoryReset(
+                        deviceId: devicesIds.first,
+                        factoryReset: FactoryResetModel(devicesUuid: devicesIds),
+                      ),
+                    );
+                  },
                 ),
-              );
-            },
-          ),
-        ),
-      ],
+              ),
+            ],
+          );
+        },
+      ),
     );
   }
 }
diff --git a/lib/services/devices_mang_api.dart b/lib/services/devices_mang_api.dart
index 85e91759..b4de6326 100644
--- a/lib/services/devices_mang_api.dart
+++ b/lib/services/devices_mang_api.dart
@@ -321,13 +321,14 @@ class DevicesManagementApi {
   Future<bool> factoryReset(FactoryResetModel factoryReset, String uuid) async {
     try {
       final response = await HTTPService().post(
-        path: ApiEndpoints.factoryReset.replaceAll('{deviceUuid}', uuid),
+        path: ApiEndpoints.factoryReset,
         body: factoryReset.toMap(),
         showServerMessage: true,
         expectedResponseModel: (json) {
           return json['success'] ?? false;
         },
       );
+
       return response;
     } catch (e) {
       debugPrint('Error fetching  $e');

From 726c173a7659e3b12f58c4507c94106916f170d1 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 09:33:10 +0300
Subject: [PATCH 160/238] 
 SP-1433-FE-Text-Alignment-Issue-in-UI-Component-in-adding-subspace-in-a-space

---
 .../views/create_subspace_model_dialog.dart   | 78 ++++++-------------
 .../create_subspace_model_chips_box.dart      |  6 ++
 .../widgets/subspace_chip.dart                |  9 +--
 3 files changed, 33 insertions(+), 60 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index 0a2a01e5..fd7b890a 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -8,6 +8,8 @@ import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_state.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
+import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CreateSubSpaceDialog extends StatelessWidget {
@@ -20,15 +22,14 @@ class CreateSubSpaceDialog extends StatelessWidget {
   final Function(List<SubspaceModel>?)? onSave;
 
   const CreateSubSpaceDialog(
-      {Key? key,
+      {super.key,
       required this.isEdit,
       required this.dialogTitle,
       this.existingSubSpaces,
       required this.spaceName,
       required this.spaceTags,
       required this.products,
-      required this.onSave})
-      : super(key: key);
+      required this.onSave});
 
   @override
   Widget build(BuildContext context) {
@@ -78,8 +79,10 @@ class CreateSubSpaceDialog extends StatelessWidget {
                             borderRadius: BorderRadius.circular(10),
                           ),
                           child: Wrap(
-                            spacing: 8.0,
-                            runSpacing: 8.0,
+                            spacing: 8,
+                            runSpacing: 8,
+                            alignment: WrapAlignment.start,
+                            crossAxisAlignment: WrapCrossAlignment.center,
                             children: [
                               ...state.subSpaces.asMap().entries.map(
                                 (entry) {
@@ -97,44 +100,14 @@ class CreateSubSpaceDialog extends StatelessWidget {
                                           lowerName)
                                       .map((e) => e.key)
                                       .toList();
-                                  final isDuplicate =
-                                      duplicateIndices.length > 1 &&
-                                          duplicateIndices.indexOf(index) != 0;
-
-                                  return Chip(
-                                    label: Text(subSpace.subspaceName,
-                                        style: Theme.of(context)
-                                            .textTheme
-                                            .bodyMedium
-                                            ?.copyWith(
-                                                color:
-                                                    ColorsManager.spaceColor)),
-                                    backgroundColor: ColorsManager.whiteColors,
-                                    shape: RoundedRectangleBorder(
-                                      borderRadius: BorderRadius.circular(10),
-                                      side: BorderSide(
-                                        color: isDuplicate
-                                            ? ColorsManager.red
-                                            : ColorsManager.transparentColor,
-                                        width: 0,
-                                      ),
-                                    ),
-                                    deleteIcon: Container(
-                                      width: 24,
-                                      height: 24,
-                                      decoration: BoxDecoration(
-                                        shape: BoxShape.circle,
-                                        border: Border.all(
-                                          color: ColorsManager.lightGrayColor,
-                                          width: 1.5,
-                                        ),
-                                      ),
-                                      child: const Icon(
-                                        Icons.close,
-                                        size: 16,
-                                        color: ColorsManager.lightGrayColor,
-                                      ),
+                                  final isDuplicate = duplicateIndices.length > 1 &&
+                                      duplicateIndices.indexOf(index) != 0;
+                                  return SubspaceChip(
+                                    subSpace: SubspaceTemplateModel(
+                                      subspaceName: entry.value.subspaceName,
+                                      disabled: entry.value.disabled,
                                     ),
+                                    isDuplicate: isDuplicate,
                                     onDeleted: () => context
                                         .read<SubSpaceBloc>()
                                         .add(RemoveSubSpace(subSpace)),
@@ -154,19 +127,18 @@ class CreateSubSpaceDialog extends StatelessWidget {
                                             .textTheme
                                             .bodySmall
                                             ?.copyWith(
-                                                color: ColorsManager
-                                                    .lightGrayColor)),
+                                                color:
+                                                    ColorsManager.lightGrayColor)),
                                     onSubmitted: (value) {
                                       if (value.trim().isNotEmpty) {
-                                        context.read<SubSpaceBloc>().add(
-                                            AddSubSpace(SubspaceModel(
+                                        context.read<SubSpaceBloc>().add(AddSubSpace(
+                                            SubspaceModel(
                                                 subspaceName: value.trim(),
                                                 disabled: false)));
                                         textController.clear();
                                       }
                                     },
-                                    style:
-                                        Theme.of(context).textTheme.bodyMedium),
+                                    style: Theme.of(context).textTheme.bodyMedium),
                               ),
                             ],
                           ),
@@ -175,12 +147,10 @@ class CreateSubSpaceDialog extends StatelessWidget {
                           Padding(
                             padding: const EdgeInsets.only(top: 8.0),
                             child: Text(state.errorMessage,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodySmall
-                                    ?.copyWith(
-                                      color: ColorsManager.warningRed,
-                                    )),
+                                style:
+                                    Theme.of(context).textTheme.bodySmall?.copyWith(
+                                          color: ColorsManager.warningRed,
+                                        )),
                           ),
                         const SizedBox(height: 16),
                         Row(
diff --git a/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart b/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart
index a18fc8d8..c6b302c0 100644
--- a/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart
+++ b/lib/pages/spaces_management/create_subspace_model/widgets/create_subspace_model_chips_box.dart
@@ -1,4 +1,7 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
+import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspaces_textfield.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
@@ -51,6 +54,9 @@ class CreateSubspaceModelChipsBox extends StatelessWidget {
               return SubspaceChip(
                 subSpace: subSpace,
                 isDuplicate: isDuplicate,
+                onDeleted: () => context.read<SubSpaceModelBloc>().add(
+                      RemoveSubSpaceModel(subSpace),
+                    ),
               );
             },
           ),
diff --git a/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart b/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart
index b54e0712..098b4804 100644
--- a/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart
+++ b/lib/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart
@@ -1,7 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_bloc.dart';
-import 'package:syncrow_web/pages/spaces_management/create_subspace_model/bloc/subspace_model_event.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -11,10 +8,12 @@ class SubspaceChip extends StatelessWidget {
     required this.subSpace,
     required this.isDuplicate,
     super.key,
+    required this.onDeleted,
   });
 
   final SubspaceTemplateModel subSpace;
   final bool isDuplicate;
+  final void Function() onDeleted;
 
   @override
   Widget build(BuildContext context) {
@@ -50,9 +49,7 @@ class SubspaceChip extends StatelessWidget {
           ),
         ),
       ),
-      onDeleted: () => context.read<SubSpaceModelBloc>().add(
-            RemoveSubSpaceModel(subSpace),
-          ),
+      onDeleted: onDeleted,
     );
   }
 }

From 62bf4f29445760002b708c64ef1785c4fffe23d5 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 09:34:03 +0300
Subject: [PATCH 161/238] Refactor CreateSubSpaceDialog to use context
 extension for screen width calculations

---
 .../views/create_subspace_model_dialog.dart               | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index fd7b890a..11c747bc 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -11,6 +11,7 @@ import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspac
 import 'package:syncrow_web/pages/spaces_management/create_subspace_model/widgets/subspace_chip.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_template_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CreateSubSpaceDialog extends StatelessWidget {
   final bool isEdit;
@@ -19,7 +20,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
   final String? spaceName;
   final List<Tag>? spaceTags;
   final List<ProductModel>? products;
-  final Function(List<SubspaceModel>?)? onSave;
+  final void Function(List<SubspaceModel>?)? onSave;
 
   const CreateSubSpaceDialog(
       {super.key,
@@ -33,7 +34,6 @@ class CreateSubSpaceDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final screenWidth = MediaQuery.of(context).size.width;
     final textController = TextEditingController();
 
     return Dialog(
@@ -55,7 +55,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
             return Container(
                 color: ColorsManager.whiteColors,
                 child: SizedBox(
-                  width: screenWidth * 0.35,
+                  width: context.screenWidth * 0.35,
                   child: Padding(
                     padding: const EdgeInsets.all(16.0),
                     child: Column(
@@ -71,7 +71,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
                         ),
                         const SizedBox(height: 16),
                         Container(
-                          width: screenWidth * 0.35,
+                          width: context.screenWidth * 0.35,
                           padding: const EdgeInsets.symmetric(
                               vertical: 10.0, horizontal: 16.0),
                           decoration: BoxDecoration(

From 18c886753dfac908b0696945f0300220953646ed Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 09:35:33 +0300
Subject: [PATCH 162/238] added trailing commas  wherever neccessary in
 `CreateSubSpaceDialog`.

---
 .../views/create_subspace_model_dialog.dart   | 292 +++++++++---------
 1 file changed, 151 insertions(+), 141 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index 11c747bc..336cc354 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -22,15 +22,16 @@ class CreateSubSpaceDialog extends StatelessWidget {
   final List<ProductModel>? products;
   final void Function(List<SubspaceModel>?)? onSave;
 
-  const CreateSubSpaceDialog(
-      {super.key,
-      required this.isEdit,
-      required this.dialogTitle,
-      this.existingSubSpaces,
-      required this.spaceName,
-      required this.spaceTags,
-      required this.products,
-      required this.onSave});
+  const CreateSubSpaceDialog({
+    super.key,
+    required this.isEdit,
+    required this.dialogTitle,
+    this.existingSubSpaces,
+    required this.spaceName,
+    required this.spaceTags,
+    required this.products,
+    required this.onSave,
+  });
 
   @override
   Widget build(BuildContext context) {
@@ -44,7 +45,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
         create: (_) {
           final bloc = SubSpaceBloc();
           if (existingSubSpaces != null) {
-            for (var subSpace in existingSubSpaces!) {
+            for (final subSpace in existingSubSpaces ?? []) {
               bloc.add(AddSubSpace(subSpace));
             }
           }
@@ -53,143 +54,152 @@ class CreateSubSpaceDialog extends StatelessWidget {
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(
-                color: ColorsManager.whiteColors,
-                child: SizedBox(
-                  width: context.screenWidth * 0.35,
-                  child: Padding(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisSize: MainAxisSize.min,
-                      children: [
-                        Text(
-                          dialogTitle,
-                          style: Theme.of(context)
-                              .textTheme
-                              .headlineLarge
-                              ?.copyWith(color: ColorsManager.blackColor),
-                        ),
-                        const SizedBox(height: 16),
-                        Container(
-                          width: context.screenWidth * 0.35,
-                          padding: const EdgeInsets.symmetric(
-                              vertical: 10.0, horizontal: 16.0),
-                          decoration: BoxDecoration(
-                            color: ColorsManager.boxColor,
-                            borderRadius: BorderRadius.circular(10),
-                          ),
-                          child: Wrap(
-                            spacing: 8,
-                            runSpacing: 8,
-                            alignment: WrapAlignment.start,
-                            crossAxisAlignment: WrapCrossAlignment.center,
-                            children: [
-                              ...state.subSpaces.asMap().entries.map(
-                                (entry) {
-                                  final index = entry.key;
-                                  final subSpace = entry.value;
-
-                                  final lowerName =
-                                      subSpace.subspaceName.toLowerCase();
-
-                                  final duplicateIndices = state.subSpaces
-                                      .asMap()
-                                      .entries
-                                      .where((e) =>
-                                          e.value.subspaceName.toLowerCase() ==
-                                          lowerName)
-                                      .map((e) => e.key)
-                                      .toList();
-                                  final isDuplicate = duplicateIndices.length > 1 &&
-                                      duplicateIndices.indexOf(index) != 0;
-                                  return SubspaceChip(
-                                    subSpace: SubspaceTemplateModel(
-                                      subspaceName: entry.value.subspaceName,
-                                      disabled: entry.value.disabled,
-                                    ),
-                                    isDuplicate: isDuplicate,
-                                    onDeleted: () => context
-                                        .read<SubSpaceBloc>()
-                                        .add(RemoveSubSpace(subSpace)),
-                                  );
-                                },
-                              ),
-                              SizedBox(
-                                width: 200,
-                                child: TextField(
-                                    controller: textController,
-                                    decoration: InputDecoration(
-                                        border: InputBorder.none,
-                                        hintText: state.subSpaces.isEmpty
-                                            ? 'Please enter the name'
-                                            : null,
-                                        hintStyle: Theme.of(context)
-                                            .textTheme
-                                            .bodySmall
-                                            ?.copyWith(
-                                                color:
-                                                    ColorsManager.lightGrayColor)),
-                                    onSubmitted: (value) {
-                                      if (value.trim().isNotEmpty) {
-                                        context.read<SubSpaceBloc>().add(AddSubSpace(
-                                            SubspaceModel(
-                                                subspaceName: value.trim(),
-                                                disabled: false)));
-                                        textController.clear();
-                                      }
-                                    },
-                                    style: Theme.of(context).textTheme.bodyMedium),
-                              ),
-                            ],
-                          ),
-                        ),
-                        if (state.errorMessage.isNotEmpty)
-                          Padding(
-                            padding: const EdgeInsets.only(top: 8.0),
-                            child: Text(state.errorMessage,
-                                style:
-                                    Theme.of(context).textTheme.bodySmall?.copyWith(
-                                          color: ColorsManager.warningRed,
-                                        )),
-                          ),
-                        const SizedBox(height: 16),
-                        Row(
-                          children: [
-                            Expanded(
-                              child: CancelButton(
-                                label: 'Cancel',
-                                onPressed: () async {
-                                  Navigator.of(context).pop();
-                                },
-                              ),
+              color: ColorsManager.whiteColors,
+              child: SizedBox(
+                width: context.screenWidth * 0.35,
+                child: Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      Text(
+                        dialogTitle,
+                        style: Theme.of(context).textTheme.headlineLarge?.copyWith(
+                              color: ColorsManager.blackColor,
                             ),
-                            const SizedBox(width: 10),
-                            Expanded(
-                              child: DefaultButton(
-                                onPressed: (state.errorMessage.isNotEmpty)
-                                    ? null
-                                    : () async {
-                                        final subSpaces = context
-                                            .read<SubSpaceBloc>()
-                                            .state
-                                            .subSpaces;
-                                        onSave!(subSpaces);
-                                        Navigator.of(context).pop();
-                                      },
-                                backgroundColor: ColorsManager.secondaryColor,
-                                borderRadius: 10,
-                                foregroundColor: state.errorMessage.isNotEmpty
-                                    ? ColorsManager.whiteColorsWithOpacity
-                                    : ColorsManager.whiteColors,
-                                child: const Text('OK'),
+                      ),
+                      const SizedBox(height: 16),
+                      Container(
+                        width: context.screenWidth * 0.35,
+                        padding: const EdgeInsets.symmetric(
+                          vertical: 10.0,
+                          horizontal: 16.0,
+                        ),
+                        decoration: BoxDecoration(
+                          color: ColorsManager.boxColor,
+                          borderRadius: BorderRadius.circular(10),
+                        ),
+                        child: Wrap(
+                          spacing: 8,
+                          runSpacing: 8,
+                          alignment: WrapAlignment.start,
+                          crossAxisAlignment: WrapCrossAlignment.center,
+                          children: [
+                            ...state.subSpaces.asMap().entries.map(
+                              (entry) {
+                                final index = entry.key;
+                                final subSpace = entry.value;
+
+                                final lowerName =
+                                    subSpace.subspaceName.toLowerCase();
+
+                                final duplicateIndices = state.subSpaces
+                                    .asMap()
+                                    .entries
+                                    .where((e) =>
+                                        e.value.subspaceName.toLowerCase() ==
+                                        lowerName)
+                                    .map((e) => e.key)
+                                    .toList();
+                                final isDuplicate = duplicateIndices.length > 1 &&
+                                    duplicateIndices.indexOf(index) != 0;
+                                return SubspaceChip(
+                                  subSpace: SubspaceTemplateModel(
+                                    subspaceName: entry.value.subspaceName,
+                                    disabled: entry.value.disabled,
+                                  ),
+                                  isDuplicate: isDuplicate,
+                                  onDeleted: () => context.read<SubSpaceBloc>().add(
+                                        RemoveSubSpace(subSpace),
+                                      ),
+                                );
+                              },
+                            ),
+                            SizedBox(
+                              width: 200,
+                              child: TextField(
+                                controller: textController,
+                                decoration: InputDecoration(
+                                  border: InputBorder.none,
+                                  hintText: state.subSpaces.isEmpty
+                                      ? 'Please enter the name'
+                                      : null,
+                                  hintStyle: Theme.of(context)
+                                      .textTheme
+                                      .bodySmall
+                                      ?.copyWith(
+                                        color: ColorsManager.lightGrayColor,
+                                      ),
+                                ),
+                                onSubmitted: (value) {
+                                  if (value.trim().isNotEmpty) {
+                                    context.read<SubSpaceBloc>().add(
+                                          AddSubSpace(
+                                            SubspaceModel(
+                                              subspaceName: value.trim(),
+                                              disabled: false,
+                                            ),
+                                          ),
+                                        );
+                                    textController.clear();
+                                  }
+                                },
+                                style: Theme.of(context).textTheme.bodyMedium,
                               ),
                             ),
                           ],
                         ),
-                      ],
-                    ),
+                      ),
+                      if (state.errorMessage.isNotEmpty)
+                        Padding(
+                          padding: const EdgeInsets.only(top: 8.0),
+                          child: Text(
+                            state.errorMessage,
+                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                                  color: ColorsManager.warningRed,
+                                ),
+                          ),
+                        ),
+                      const SizedBox(height: 16),
+                      Row(
+                        children: [
+                          Expanded(
+                            child: CancelButton(
+                              label: 'Cancel',
+                              onPressed: () async {
+                                Navigator.of(context).pop();
+                              },
+                            ),
+                          ),
+                          const SizedBox(width: 10),
+                          Expanded(
+                            child: DefaultButton(
+                              onPressed: (state.errorMessage.isNotEmpty)
+                                  ? null
+                                  : () async {
+                                      final subSpaces = context
+                                          .read<SubSpaceBloc>()
+                                          .state
+                                          .subSpaces;
+                                      onSave!(subSpaces);
+                                      Navigator.of(context).pop();
+                                    },
+                              backgroundColor: ColorsManager.secondaryColor,
+                              borderRadius: 10,
+                              foregroundColor: state.errorMessage.isNotEmpty
+                                  ? ColorsManager.whiteColorsWithOpacity
+                                  : ColorsManager.whiteColors,
+                              child: const Text('OK'),
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
                   ),
-                ));
+                ),
+              ),
+            );
           },
         ),
       ),

From ae95d06482ab2d117c4c4a0817f7491714c62521 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 09:35:47 +0300
Subject: [PATCH 163/238] Fix constructor parameter order in
 CreateSubSpaceDialog

---
 .../create_subspace/views/create_subspace_model_dialog.dart   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index 336cc354..3f7cc598 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -23,14 +23,14 @@ class CreateSubSpaceDialog extends StatelessWidget {
   final void Function(List<SubspaceModel>?)? onSave;
 
   const CreateSubSpaceDialog({
-    super.key,
     required this.isEdit,
     required this.dialogTitle,
-    this.existingSubSpaces,
     required this.spaceName,
     required this.spaceTags,
     required this.products,
     required this.onSave,
+    this.existingSubSpaces,
+    super.key,
   });
 
   @override

From a6fc99443b07635eaa76f26ba165abe4346648b6 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 09:38:54 +0300
Subject: [PATCH 164/238] Refactor CreateSubSpaceDialog layout for improved
 readability and maintainability

---
 .../views/create_subspace_model_dialog.dart   | 253 +++++++++---------
 1 file changed, 121 insertions(+), 132 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index 3f7cc598..ef20fa56 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -54,150 +54,139 @@ class CreateSubSpaceDialog extends StatelessWidget {
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(
+              width: context.screenWidth * 0.35,
               color: ColorsManager.whiteColors,
-              child: SizedBox(
-                width: context.screenWidth * 0.35,
-                child: Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Text(
-                        dialogTitle,
-                        style: Theme.of(context).textTheme.headlineLarge?.copyWith(
-                              color: ColorsManager.blackColor,
-                            ),
-                      ),
-                      const SizedBox(height: 16),
-                      Container(
-                        width: context.screenWidth * 0.35,
-                        padding: const EdgeInsets.symmetric(
-                          vertical: 10.0,
-                          horizontal: 16.0,
-                        ),
-                        decoration: BoxDecoration(
-                          color: ColorsManager.boxColor,
-                          borderRadius: BorderRadius.circular(10),
-                        ),
-                        child: Wrap(
-                          spacing: 8,
-                          runSpacing: 8,
-                          alignment: WrapAlignment.start,
-                          crossAxisAlignment: WrapCrossAlignment.center,
-                          children: [
-                            ...state.subSpaces.asMap().entries.map(
-                              (entry) {
-                                final index = entry.key;
-                                final subSpace = entry.value;
+              padding: const EdgeInsets.all(16),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Text(
+                    dialogTitle,
+                    style: context.textTheme.headlineLarge?.copyWith(
+                      color: ColorsManager.blackColor,
+                    ),
+                  ),
+                  const SizedBox(height: 16),
+                  Container(
+                    width: context.screenWidth * 0.35,
+                    padding: const EdgeInsets.symmetric(
+                      vertical: 10,
+                      horizontal: 16,
+                    ),
+                    decoration: BoxDecoration(
+                      color: ColorsManager.boxColor,
+                      borderRadius: BorderRadius.circular(10),
+                    ),
+                    child: Wrap(
+                      spacing: 8,
+                      runSpacing: 8,
+                      alignment: WrapAlignment.start,
+                      crossAxisAlignment: WrapCrossAlignment.center,
+                      children: [
+                        ...state.subSpaces.asMap().entries.map(
+                          (entry) {
+                            final index = entry.key;
+                            final subSpace = entry.value;
 
-                                final lowerName =
-                                    subSpace.subspaceName.toLowerCase();
+                            final lowerName = subSpace.subspaceName.toLowerCase();
 
-                                final duplicateIndices = state.subSpaces
-                                    .asMap()
-                                    .entries
-                                    .where((e) =>
-                                        e.value.subspaceName.toLowerCase() ==
-                                        lowerName)
-                                    .map((e) => e.key)
-                                    .toList();
-                                final isDuplicate = duplicateIndices.length > 1 &&
-                                    duplicateIndices.indexOf(index) != 0;
-                                return SubspaceChip(
-                                  subSpace: SubspaceTemplateModel(
-                                    subspaceName: entry.value.subspaceName,
-                                    disabled: entry.value.disabled,
+                            final duplicateIndices = state.subSpaces
+                                .asMap()
+                                .entries
+                                .where((e) =>
+                                    e.value.subspaceName.toLowerCase() == lowerName)
+                                .map((e) => e.key)
+                                .toList();
+                            final isDuplicate = duplicateIndices.length > 1 &&
+                                duplicateIndices.indexOf(index) != 0;
+                            return SubspaceChip(
+                              subSpace: SubspaceTemplateModel(
+                                subspaceName: entry.value.subspaceName,
+                                disabled: entry.value.disabled,
+                              ),
+                              isDuplicate: isDuplicate,
+                              onDeleted: () => context.read<SubSpaceBloc>().add(
+                                    RemoveSubSpace(subSpace),
                                   ),
-                                  isDuplicate: isDuplicate,
-                                  onDeleted: () => context.read<SubSpaceBloc>().add(
-                                        RemoveSubSpace(subSpace),
-                                      ),
-                                );
-                              },
-                            ),
-                            SizedBox(
-                              width: 200,
-                              child: TextField(
-                                controller: textController,
-                                decoration: InputDecoration(
-                                  border: InputBorder.none,
-                                  hintText: state.subSpaces.isEmpty
-                                      ? 'Please enter the name'
-                                      : null,
-                                  hintStyle: Theme.of(context)
-                                      .textTheme
-                                      .bodySmall
-                                      ?.copyWith(
-                                        color: ColorsManager.lightGrayColor,
-                                      ),
-                                ),
-                                onSubmitted: (value) {
-                                  if (value.trim().isNotEmpty) {
-                                    context.read<SubSpaceBloc>().add(
-                                          AddSubSpace(
-                                            SubspaceModel(
-                                              subspaceName: value.trim(),
-                                              disabled: false,
-                                            ),
-                                          ),
-                                        );
-                                    textController.clear();
-                                  }
-                                },
-                                style: Theme.of(context).textTheme.bodyMedium,
+                            );
+                          },
+                        ),
+                        SizedBox(
+                          width: 200,
+                          child: TextField(
+                            controller: textController,
+                            decoration: InputDecoration(
+                              border: InputBorder.none,
+                              hintText: state.subSpaces.isEmpty
+                                  ? 'Please enter the name'
+                                  : null,
+                              hintStyle: context.textTheme.bodySmall?.copyWith(
+                                color: ColorsManager.lightGrayColor,
                               ),
                             ),
-                          ],
+                            onSubmitted: (value) {
+                              if (value.trim().isNotEmpty) {
+                                context.read<SubSpaceBloc>().add(
+                                      AddSubSpace(
+                                        SubspaceModel(
+                                          subspaceName: value.trim(),
+                                          disabled: false,
+                                        ),
+                                      ),
+                                    );
+                                textController.clear();
+                              }
+                            },
+                            style: context.textTheme.bodyMedium,
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  if (state.errorMessage.isNotEmpty)
+                    Padding(
+                      padding: const EdgeInsets.only(top: 8.0),
+                      child: Text(
+                        state.errorMessage,
+                        style: context.textTheme.bodySmall?.copyWith(
+                          color: ColorsManager.warningRed,
                         ),
                       ),
-                      if (state.errorMessage.isNotEmpty)
-                        Padding(
-                          padding: const EdgeInsets.only(top: 8.0),
-                          child: Text(
-                            state.errorMessage,
-                            style: Theme.of(context).textTheme.bodySmall?.copyWith(
-                                  color: ColorsManager.warningRed,
-                                ),
-                          ),
+                    ),
+                  const SizedBox(height: 16),
+                  Row(
+                    children: [
+                      Expanded(
+                        child: CancelButton(
+                          label: 'Cancel',
+                          onPressed: () async {
+                            Navigator.of(context).pop();
+                          },
+                        ),
+                      ),
+                      const SizedBox(width: 10),
+                      Expanded(
+                        child: DefaultButton(
+                          onPressed: state.errorMessage.isEmpty
+                              ? () {
+                                  final subSpacesBloc = context.read<SubSpaceBloc>();
+                                  final subSpaces = subSpacesBloc.state.subSpaces;
+                                  onSave?.call(subSpaces);
+                                  Navigator.of(context).pop();
+                                }
+                              : null,
+                          backgroundColor: ColorsManager.secondaryColor,
+                          borderRadius: 10,
+                          foregroundColor: state.errorMessage.isNotEmpty
+                              ? ColorsManager.whiteColorsWithOpacity
+                              : ColorsManager.whiteColors,
+                          child: const Text('OK'),
                         ),
-                      const SizedBox(height: 16),
-                      Row(
-                        children: [
-                          Expanded(
-                            child: CancelButton(
-                              label: 'Cancel',
-                              onPressed: () async {
-                                Navigator.of(context).pop();
-                              },
-                            ),
-                          ),
-                          const SizedBox(width: 10),
-                          Expanded(
-                            child: DefaultButton(
-                              onPressed: (state.errorMessage.isNotEmpty)
-                                  ? null
-                                  : () async {
-                                      final subSpaces = context
-                                          .read<SubSpaceBloc>()
-                                          .state
-                                          .subSpaces;
-                                      onSave!(subSpaces);
-                                      Navigator.of(context).pop();
-                                    },
-                              backgroundColor: ColorsManager.secondaryColor,
-                              borderRadius: 10,
-                              foregroundColor: state.errorMessage.isNotEmpty
-                                  ? ColorsManager.whiteColorsWithOpacity
-                                  : ColorsManager.whiteColors,
-                              child: const Text('OK'),
-                            ),
-                          ),
-                        ],
                       ),
                     ],
                   ),
-                ),
+                ],
               ),
             );
           },

From 2a77483f46dcc1a2e2d7a57ca2c0a3af23e6488a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 09:45:14 +0300
Subject: [PATCH 165/238] Refactor `CreateSubSpaceDialog` to improve widget
 structure and readability

---
 .../views/create_subspace_model_dialog.dart   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index ef20fa56..e8ef9993 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -37,20 +37,20 @@ class CreateSubSpaceDialog extends StatelessWidget {
   Widget build(BuildContext context) {
     final textController = TextEditingController();
 
-    return Dialog(
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(20),
-      ),
-      child: BlocProvider(
-        create: (_) {
-          final bloc = SubSpaceBloc();
-          if (existingSubSpaces != null) {
-            for (final subSpace in existingSubSpaces ?? []) {
-              bloc.add(AddSubSpace(subSpace));
-            }
+    return BlocProvider(
+      create: (_) {
+        final bloc = SubSpaceBloc();
+        if (existingSubSpaces != null) {
+          for (final subSpace in existingSubSpaces ?? []) {
+            bloc.add(AddSubSpace(subSpace));
           }
-          return bloc;
-        },
+        }
+        return bloc;
+      },
+      child: Dialog(
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
         child: BlocBuilder<SubSpaceBloc, SubSpaceState>(
           builder: (context, state) {
             return Container(

From 024fbcdb837fd4db97a29038d7ce20e617235f2c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 11:25:39 +0300
Subject: [PATCH 166/238] Refactor `CreateSubSpaceDialog` to convert to
 StatefulWidget and manage text controller lifecycle

---
 .../views/create_subspace_model_dialog.dart   | 40 ++++++++++++++-----
 1 file changed, 29 insertions(+), 11 deletions(-)

diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index e8ef9993..09951bd8 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -13,7 +13,7 @@ import 'package:syncrow_web/pages/spaces_management/space_model/models/subspace_
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
-class CreateSubSpaceDialog extends StatelessWidget {
+class CreateSubSpaceDialog extends StatefulWidget {
   final bool isEdit;
   final String dialogTitle;
   final List<SubspaceModel>? existingSubSpaces;
@@ -34,14 +34,31 @@ class CreateSubSpaceDialog extends StatelessWidget {
   });
 
   @override
-  Widget build(BuildContext context) {
-    final textController = TextEditingController();
+  State<CreateSubSpaceDialog> createState() => _CreateSubSpaceDialogState();
+}
 
+class _CreateSubSpaceDialogState extends State<CreateSubSpaceDialog> {
+  late final TextEditingController _subspaceNameController;
+
+  @override
+  void initState() {
+    _subspaceNameController = TextEditingController();
+    super.initState();
+  }
+
+  @override
+  void dispose() {
+    _subspaceNameController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
     return BlocProvider(
       create: (_) {
         final bloc = SubSpaceBloc();
-        if (existingSubSpaces != null) {
-          for (final subSpace in existingSubSpaces ?? []) {
+        if (widget.existingSubSpaces != null) {
+          for (final subSpace in widget.existingSubSpaces ?? []) {
             bloc.add(AddSubSpace(subSpace));
           }
         }
@@ -62,7 +79,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                    dialogTitle,
+                    widget.dialogTitle,
                     style: context.textTheme.headlineLarge?.copyWith(
                       color: ColorsManager.blackColor,
                     ),
@@ -115,7 +132,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
                         SizedBox(
                           width: 200,
                           child: TextField(
-                            controller: textController,
+                            controller: _subspaceNameController,
                             decoration: InputDecoration(
                               border: InputBorder.none,
                               hintText: state.subSpaces.isEmpty
@@ -126,16 +143,17 @@ class CreateSubSpaceDialog extends StatelessWidget {
                               ),
                             ),
                             onSubmitted: (value) {
-                              if (value.trim().isNotEmpty) {
+                              final trimmedValue = value.trim();
+                              if (trimmedValue.isNotEmpty) {
                                 context.read<SubSpaceBloc>().add(
                                       AddSubSpace(
                                         SubspaceModel(
-                                          subspaceName: value.trim(),
+                                          subspaceName: trimmedValue,
                                           disabled: false,
                                         ),
                                       ),
                                     );
-                                textController.clear();
+                                _subspaceNameController.clear();
                               }
                             },
                             style: context.textTheme.bodyMedium,
@@ -172,7 +190,7 @@ class CreateSubSpaceDialog extends StatelessWidget {
                               ? () {
                                   final subSpacesBloc = context.read<SubSpaceBloc>();
                                   final subSpaces = subSpacesBloc.state.subSpaces;
-                                  onSave?.call(subSpaces);
+                                  widget.onSave?.call(subSpaces);
                                   Navigator.of(context).pop();
                                 }
                               : null,

From ce253b2034e41fb43e1a105100708208ac4c54eb Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 11:27:37 +0300
Subject: [PATCH 167/238] Remove unused parameters from `CreateSubSpaceDialog`
 constructor

---
 .../all_spaces/widgets/dialogs/create_space_dialog.dart      | 2 --
 .../create_subspace/views/create_subspace_model_dialog.dart  | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart b/lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart
index 56e1212e..a7f6e2ea 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/dialogs/create_space_dialog.dart
@@ -592,8 +592,6 @@ class CreateSpaceDialogState extends State<CreateSpaceDialog> {
         return CreateSubSpaceDialog(
             spaceName: name,
             dialogTitle: isEdit ? 'Edit Sub-space' : 'Create Sub-space',
-            spaceTags: spaceTags,
-            isEdit: isEdit,
             products: products,
             existingSubSpaces: existingSubSpaces,
             onSave: (slectedSubspaces) {
diff --git a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
index 09951bd8..948028ed 100644
--- a/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
+++ b/lib/pages/spaces_management/create_subspace/views/create_subspace_model_dialog.dart
@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/common/buttons/cancel_button.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/subspace_model.dart';
-import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_event.dart';
 import 'package:syncrow_web/pages/spaces_management/create_subspace/bloc/subspace_state.dart';
@@ -14,19 +13,15 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CreateSubSpaceDialog extends StatefulWidget {
-  final bool isEdit;
   final String dialogTitle;
   final List<SubspaceModel>? existingSubSpaces;
   final String? spaceName;
-  final List<Tag>? spaceTags;
   final List<ProductModel>? products;
   final void Function(List<SubspaceModel>?)? onSave;
 
   const CreateSubSpaceDialog({
-    required this.isEdit,
     required this.dialogTitle,
     required this.spaceName,
-    required this.spaceTags,
     required this.products,
     required this.onSave,
     this.existingSubSpaces,

From 8136804694616a84d9065f14d96cebe158f5d715 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 12:18:09 +0300
Subject: [PATCH 168/238] bugfix.

---
 lib/pages/space_tree/view/custom_expansion.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index e4e7f423..dab0a49f 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -31,7 +31,7 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
           children: [
             Checkbox(
               value: isSoldCheck ? null : isSelected,
-              onChanged: (value) => onItemSelected ?? () {},
+              onChanged: (value) => onItemSelected?.call(),
               tristate: true,
               side: WidgetStateBorderSide.resolveWith(
                 (states) => const BorderSide(color: ColorsManager.grayBorder),

From 977875f1f2e82b1ba44365fc37d08150cf79f802 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 13:08:16 +0300
Subject: [PATCH 169/238] SP-1435

---
 lib/pages/routines/view/routines_view.dart    |  78 ++++----
 .../fetch_routine_scenes_automation.dart      | 168 ++++++++----------
 .../main_routine_view/routine_view_card.dart  | 104 ++++++-----
 3 files changed, 170 insertions(+), 180 deletions(-)

diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index 2d6ee648..9d4639ed 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/create_new_routines/create_new_routines.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/routines/widgets/main_routine_view/fetch_routi
 import 'package:syncrow_web/pages/routines/widgets/main_routine_view/routine_view_card.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/extension/build_context_x.dart';
 
 class RoutinesView extends StatefulWidget {
   const RoutinesView({super.key});
@@ -27,9 +28,10 @@ class _RoutinesViewState extends State<RoutinesView> {
     if (result == null) return;
     final communityId = result['community'];
     final spaceId = result['space'];
-    final _bloc = BlocProvider.of<CreateRoutineBloc>(context);
+    final bloc = BlocProvider.of<CreateRoutineBloc>(context);
     final routineBloc = context.read<RoutineBloc>();
-    _bloc.add(SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
+    bloc.add(
+        SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
   }
@@ -54,43 +56,41 @@ class _RoutinesViewState extends State<RoutinesView> {
             ),
             Expanded(
               flex: 4,
-              child: ListView(
-                children: [
-                  Container(
-                    padding: const EdgeInsets.all(16),
-                    height: MediaQuery.sizeOf(context).height,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        Text(
-                          "Create New Routines",
-                          style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                                color: ColorsManager.grayColor,
-                                fontWeight: FontWeight.bold,
-                              ),
-                        ),
-                        const SizedBox(height: 10),
-                        RoutineViewCard(
-                          isLoading: false,
-                          onChanged: (v) {},
-                          status: '',
-                          spaceId: '',
-                          automationId: '',
-                          communityId: '',
-                          sceneId: '',
-                          cardType: '',
-                          spaceName: '',
-                          onTap: () => _handleRoutineCreation(context),
-                          icon: Icons.add,
-                          textString: '',
-                        ),
-                        const SizedBox(height: 15),
-                        const Expanded(child: FetchRoutineScenesAutomation()),
-                      ],
-                    ),
+              child: SizedBox(
+                height: context.screenHeight,
+                width: context.screenWidth,
+                child: SingleChildScrollView(
+                  padding: const EdgeInsetsDirectional.all(16),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    mainAxisAlignment: MainAxisAlignment.start,
+                    spacing: 16,
+                    children: [
+                      Text(
+                        "Create New Routines",
+                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.bold,
+                            ),
+                      ),
+                      RoutineViewCard(
+                        isLoading: false,
+                        onChanged: (v) {},
+                        status: '',
+                        spaceId: '',
+                        automationId: '',
+                        communityId: '',
+                        sceneId: '',
+                        cardType: '',
+                        spaceName: '',
+                        onTap: () => _handleRoutineCreation(context),
+                        icon: Icons.add,
+                        textString: '',
+                      ),
+                      const FetchRoutineScenesAutomation(),
+                    ],
                   ),
-                  const SizedBox(height: 50),
-                ],
+                ),
               ),
             )
           ],
diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 92a837b6..0e25dcea 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -12,8 +12,7 @@ class FetchRoutineScenesAutomation extends StatefulWidget {
   const FetchRoutineScenesAutomation({super.key});
 
   @override
-  State<FetchRoutineScenesAutomation> createState() =>
-      _FetchRoutineScenesState();
+  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
 }
 
 class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
@@ -55,20 +54,17 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                         ),
                       if (state.scenes.isNotEmpty)
                         SizedBox(
-                          height: 200, 
+                          height: 200,
                           child: ListView.builder(
-                              shrinkWrap: true,
                               scrollDirection: Axis.horizontal,
                               itemCount: state.scenes.length,
                               itemBuilder: (context, index) {
                                 final scene = state.scenes[index];
-                                final isLoading =
-                                    state.loadingSceneId == scene.id;
+                                final isLoading = state.loadingSceneId == scene.id;
 
                                 return Padding(
                                   padding: EdgeInsets.only(
-                                    right:
-                                        isSmallScreenSize(context) ? 4.0 : 8.0,
+                                    right: isSmallScreenSize(context) ? 4.0 : 8.0,
                                   ),
                                   child: Column(
                                     children: [
@@ -76,31 +72,28 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                         isLoading: isLoading,
                                         sceneOnTap: () {
                                           context.read<RoutineBloc>().add(
-                                              SceneTrigger(
+                                                SceneTrigger(
                                                   sceneId: scene.id,
-                                                  name: scene.name));
+                                                  name: scene.name,
+                                                ),
+                                              );
                                         },
                                         status: state.scenes[index].status,
-                                        communityId:
-                                            state.scenes[index].communityId ??
-                                                '',
+                                        communityId: state.scenes[index].communityId,
                                         spaceId: state.scenes[index].spaceId,
-                                        sceneId:
-                                            state.scenes[index].sceneTuyaId!,
+                                        sceneId: state.scenes[index].sceneTuyaId!,
                                         automationId: state.scenes[index].id,
                                         cardType: 'scenes',
-                                        spaceName:
-                                            state.scenes[index].spaceName,
+                                        spaceName: state.scenes[index].spaceName,
                                         onTap: () {
-                                          BlocProvider.of<RoutineBloc>(context)
-                                              .add(
+                                          BlocProvider.of<RoutineBloc>(context).add(
                                             const CreateNewRoutineViewEvent(
-                                                createRoutineView: true),
+                                              createRoutineView: true,
+                                            ),
                                           );
                                           context.read<RoutineBloc>().add(
                                                 GetSceneDetails(
-                                                  sceneId:
-                                                      state.scenes[index].id,
+                                                  sceneId: state.scenes[index].id,
                                                   isTabToRun: true,
                                                   isUpdate: true,
                                                 ),
@@ -110,8 +103,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                         icon: state.scenes[index].icon ??
                                             Assets.logoHorizontal,
                                         isFromScenes: true,
-                                        iconInBytes:
-                                            state.scenes[index].iconInBytes,
+                                        iconInBytes: state.scenes[index].iconInBytes,
                                       ),
                                     ],
                                   ),
@@ -136,77 +128,69 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                         ),
                       if (state.automations.isNotEmpty)
                         SizedBox(
-                          height: 200, 
-
+                          height: 200,
                           child: ListView.builder(
-                              shrinkWrap: true,
-                              scrollDirection: Axis.horizontal,
-                              itemCount: state.automations.length,
-                              itemBuilder: (context, index) {
-                                final isLoading = state.automations!
-                                    .contains(state.automations[index].id);
+                            scrollDirection: Axis.horizontal,
+                            itemCount: state.automations.length,
+                            itemBuilder: (context, index) {
+                              final isLoading = state.automations
+                                  .contains(state.automations[index].id);
 
-                                return Column(
-                                  children: [
-                                    Padding(
-                                      padding: EdgeInsets.only(
-                                        right: isSmallScreenSize(context)
-                                            ? 4.0
-                                            : 8.0,
-                                      ),
-                                      child: RoutineViewCard(
-                                        isLoading: isLoading,
-                                        onChanged: (v) {
-                                          context.read<RoutineBloc>().add(
-                                                UpdateAutomationStatus(
-                                                  automationId: state
-                                                      .automations[index].id,
-                                                  automationStatusUpdate:
-                                                      AutomationStatusUpdate(
-                                                          spaceUuid: state
-                                                              .automations[
-                                                                  index]
-                                                              .spaceId,
-                                                          isEnable: v),
-                                                  communityId: state
-                                                      .automations[index]
-                                                      .communityId,
-                                                ),
-                                              );
-                                        },
-                                        status: state.automations[index].status,
-                                        communityId: '',
-                                        spaceId:
-                                            state.automations[index].spaceId,
-                                        sceneId: '',
-                                        automationId:
-                                            state.automations[index].id,
-                                        cardType: 'automations',
-                                        spaceName:
-                                            state.automations[index].spaceName,
-                                        onTap: () {
-                                          BlocProvider.of<RoutineBloc>(context)
-                                              .add(
-                                            const CreateNewRoutineViewEvent(
-                                                createRoutineView: true),
-                                          );
-                                          context.read<RoutineBloc>().add(
-                                                GetAutomationDetails(
-                                                    automationId: state
-                                                        .automations[index].id,
-                                                    isAutomation: true,
-                                                    isUpdate: true),
-                                              );
-                                        },
-                                        textString:
-                                            state.automations[index].name,
-                                        icon: state.automations[index].icon ??
-                                            Assets.automation,
-                                      ),
+                              return Column(
+                                children: [
+                                  Padding(
+                                    padding: EdgeInsets.only(
+                                      right: isSmallScreenSize(context) ? 4.0 : 8.0,
                                     ),
-                                  ],
-                                );
-                              }),
+                                    child: RoutineViewCard(
+                                      isLoading: isLoading,
+                                      onChanged: (v) {
+                                        context.read<RoutineBloc>().add(
+                                              UpdateAutomationStatus(
+                                                automationId:
+                                                    state.automations[index].id,
+                                                automationStatusUpdate:
+                                                    AutomationStatusUpdate(
+                                                  spaceUuid: state
+                                                      .automations[index].spaceId,
+                                                  isEnable: v,
+                                                ),
+                                                communityId: state
+                                                    .automations[index].communityId,
+                                              ),
+                                            );
+                                      },
+                                      status: state.automations[index].status,
+                                      communityId: '',
+                                      spaceId: state.automations[index].spaceId,
+                                      sceneId: '',
+                                      automationId: state.automations[index].id,
+                                      cardType: 'automations',
+                                      spaceName: state.automations[index].spaceName,
+                                      onTap: () {
+                                        BlocProvider.of<RoutineBloc>(context).add(
+                                          const CreateNewRoutineViewEvent(
+                                            createRoutineView: true,
+                                          ),
+                                        );
+                                        context.read<RoutineBloc>().add(
+                                              GetAutomationDetails(
+                                                automationId:
+                                                    state.automations[index].id,
+                                                isAutomation: true,
+                                                isUpdate: true,
+                                              ),
+                                            );
+                                      },
+                                      textString: state.automations[index].name,
+                                      icon: state.automations[index].icon ??
+                                          Assets.automation,
+                                    ),
+                                  ),
+                                ],
+                              );
+                            },
+                          ),
                         ),
                     ],
                   ),
diff --git a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
index 7be5a959..4fc4bd0f 100644
--- a/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
+++ b/lib/pages/routines/widgets/main_routine_view/routine_view_card.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -66,7 +67,6 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
 
   @override
   Widget build(BuildContext context) {
-    // Use widget.<mixinMethod> instead of just <mixinMethod>
     final double cardWidth = widget.isSmallScreenSize(context)
         ? 120
         : widget.isMediumScreenSize(context)
@@ -127,22 +127,23 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                             )
                           else
                             CupertinoSwitch(
-                              activeColor: ColorsManager.primaryColor,
+                              activeTrackColor: ColorsManager.primaryColor,
                               value: widget.status == 'enable',
                               onChanged: widget.onChanged,
                             )
                         ],
                       )
                     : const SizedBox(),
-                InkWell(
-                  onTap: widget.onTap,
-                  child: Column(
-                    children: [
-                      Center(
+                Column(
+                  children: [
+                    Center(
+                      child: InkWell(
+                        customBorder: const CircleBorder(),
+                        onTap: widget.onTap,
                         child: Container(
                           decoration: BoxDecoration(
                             color: ColorsManager.graysColor,
-                            borderRadius: BorderRadius.circular(120),
+                            shape: BoxShape.circle,
                             border: Border.all(
                               color: ColorsManager.greyColor,
                               width: 2.0,
@@ -158,7 +159,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
-                                      errorBuilder: (context, error, stackTrace) => Image.asset(
+                                      errorBuilder: (context, error, stackTrace) =>
+                                          Image.asset(
                                         Assets.logo,
                                         height: iconSize,
                                         width: iconSize,
@@ -171,7 +173,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       width: iconSize,
                                       fit: BoxFit.contain,
                                     )
-                              : (widget.icon is String && widget.icon.endsWith('.svg'))
+                              : (widget.icon is String &&
+                                      widget.icon.endsWith('.svg'))
                                   ? SvgPicture.asset(
                                       height: iconSize,
                                       width: iconSize,
@@ -181,51 +184,54 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   : Icon(
                                       widget.icon,
                                       color: ColorsManager.dialogBlueTitle,
-                                      size: widget.isSmallScreenSize(context) ? 30 : 40,
+                                      size: widget.isSmallScreenSize(context)
+                                          ? 30
+                                          : 40,
                                     ),
                         ),
                       ),
-                      const SizedBox(height: 8),
-                      Padding(
-                        padding: const EdgeInsets.symmetric(horizontal: 3),
-                        child: Column(
-                          children: [
-                            Text(
-                              widget.textString,
-                              textAlign: TextAlign.center,
-                              overflow: TextOverflow.ellipsis,
-                              maxLines: 1,
-                              style: context.textTheme.bodySmall?.copyWith(
-                                color: ColorsManager.blackColor,
-                                fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
-                              ),
+                    ),
+                    const SizedBox(height: 8),
+                    Padding(
+                      padding: const EdgeInsets.symmetric(horizontal: 3),
+                      child: Column(
+                        children: [
+                          Text(
+                            widget.textString,
+                            textAlign: TextAlign.center,
+                            overflow: TextOverflow.ellipsis,
+                            maxLines: 1,
+                            style: context.textTheme.bodySmall?.copyWith(
+                              color: ColorsManager.blackColor,
+                              fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
                             ),
-                            if (widget.spaceName != '')
-                              Row(
-                                crossAxisAlignment: CrossAxisAlignment.center,
-                                mainAxisAlignment: MainAxisAlignment.center,
-                                children: [
-                                  SvgPicture.asset(
-                                    Assets.spaceLocationIcon,
-                                    fit: BoxFit.contain,
+                          ),
+                          if (widget.spaceName != '')
+                            Row(
+                              crossAxisAlignment: CrossAxisAlignment.center,
+                              mainAxisAlignment: MainAxisAlignment.center,
+                              children: [
+                                SvgPicture.asset(
+                                  Assets.spaceLocationIcon,
+                                  fit: BoxFit.contain,
+                                ),
+                                Text(
+                                  widget.spaceName,
+                                  textAlign: TextAlign.center,
+                                  overflow: TextOverflow.ellipsis,
+                                  maxLines: 1,
+                                  style: context.textTheme.bodySmall?.copyWith(
+                                    color: ColorsManager.blackColor,
+                                    fontSize:
+                                        widget.isSmallScreenSize(context) ? 10 : 12,
                                   ),
-                                  Text(
-                                    widget.spaceName,
-                                    textAlign: TextAlign.center,
-                                    overflow: TextOverflow.ellipsis,
-                                    maxLines: 1,
-                                    style: context.textTheme.bodySmall?.copyWith(
-                                      color: ColorsManager.blackColor,
-                                      fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
-                                    ),
-                                  ),
-                                ],
-                              ),
-                          ],
-                        ),
+                                ),
+                              ],
+                            ),
+                        ],
                       ),
-                    ],
-                  ),
+                    ),
+                  ],
                 ),
               ],
             ),

From f912b41fd8c93e8c072fe444b9f702adcf3e7bc1 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 13:12:09 +0300
Subject: [PATCH 170/238] Refactor visibility handling for scenes and
 automations in FetchRoutineScenesAutomation

---
 .../fetch_routine_scenes_automation.dart      | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 0e25dcea..c46ba377 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -17,10 +17,6 @@ class FetchRoutineScenesAutomation extends StatefulWidget {
 
 class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
     with HelperResponsiveLayout {
-  @override
-  void initState() {
-    super.initState();
-  }
 
   @override
   Widget build(BuildContext context) {
@@ -45,15 +41,15 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                             ),
                       ),
                       const SizedBox(height: 10),
-                      if (state.scenes.isEmpty)
-                        Text(
+                      Visibility(
+                        visible: state.scenes.isNotEmpty,
+                        replacement: Text(
                           "No scenes found",
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.grayColor,
                           ),
                         ),
-                      if (state.scenes.isNotEmpty)
-                        SizedBox(
+                        child: SizedBox(
                           height: 200,
                           child: ListView.builder(
                               scrollDirection: Axis.horizontal,
@@ -110,6 +106,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                                 );
                               }),
                         ),
+                      ),
                       const SizedBox(height: 10),
                       Text(
                         "Automations",
@@ -119,15 +116,15 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                             ),
                       ),
                       const SizedBox(height: 3),
-                      if (state.automations.isEmpty)
-                        Text(
+                      Visibility(
+                        visible: state.automations.isNotEmpty,
+                        replacement: Text(
                           "No automations found",
                           style: context.textTheme.bodyMedium?.copyWith(
                             color: ColorsManager.grayColor,
                           ),
                         ),
-                      if (state.automations.isNotEmpty)
-                        SizedBox(
+                        child: SizedBox(
                           height: 200,
                           child: ListView.builder(
                             scrollDirection: Axis.horizontal,
@@ -192,6 +189,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
                             },
                           ),
                         ),
+                      )
                     ],
                   ),
                 ),

From 70f1f39fce8f84428e2fb60753fd4de90f47a6b1 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 13:13:48 +0300
Subject: [PATCH 171/238] Improve loading state handling and in
 `FetchRoutineScenesAutomation`.

---
 .../fetch_routine_scenes_automation.dart      | 336 +++++++++---------
 1 file changed, 163 insertions(+), 173 deletions(-)

diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index c46ba377..3e5d4e7f 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -8,192 +8,182 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class FetchRoutineScenesAutomation extends StatefulWidget {
-  const FetchRoutineScenesAutomation({super.key});
-
-  @override
-  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
-}
-
-class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation>
+class FetchRoutineScenesAutomation extends StatelessWidget
     with HelperResponsiveLayout {
+  const FetchRoutineScenesAutomation({super.key});
 
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        return state.isLoading
-            ? const Center(
-                child: CircularProgressIndicator(),
-              )
-            : SingleChildScrollView(
-                child: Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 16.0),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
-                      Text(
-                        "Scenes (Tab to Run)",
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.bold,
-                            ),
-                      ),
-                      const SizedBox(height: 10),
-                      Visibility(
-                        visible: state.scenes.isNotEmpty,
-                        replacement: Text(
-                          "No scenes found",
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            color: ColorsManager.grayColor,
-                          ),
-                        ),
-                        child: SizedBox(
-                          height: 200,
-                          child: ListView.builder(
-                              scrollDirection: Axis.horizontal,
-                              itemCount: state.scenes.length,
-                              itemBuilder: (context, index) {
-                                final scene = state.scenes[index];
-                                final isLoading = state.loadingSceneId == scene.id;
+        if (state.isLoading) const Center(child: CircularProgressIndicator());
 
-                                return Padding(
-                                  padding: EdgeInsets.only(
-                                    right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                  ),
-                                  child: Column(
-                                    children: [
-                                      RoutineViewCard(
-                                        isLoading: isLoading,
-                                        sceneOnTap: () {
-                                          context.read<RoutineBloc>().add(
-                                                SceneTrigger(
-                                                  sceneId: scene.id,
-                                                  name: scene.name,
-                                                ),
-                                              );
-                                        },
-                                        status: state.scenes[index].status,
-                                        communityId: state.scenes[index].communityId,
-                                        spaceId: state.scenes[index].spaceId,
-                                        sceneId: state.scenes[index].sceneTuyaId!,
-                                        automationId: state.scenes[index].id,
-                                        cardType: 'scenes',
-                                        spaceName: state.scenes[index].spaceName,
-                                        onTap: () {
-                                          BlocProvider.of<RoutineBloc>(context).add(
-                                            const CreateNewRoutineViewEvent(
-                                              createRoutineView: true,
-                                            ),
-                                          );
-                                          context.read<RoutineBloc>().add(
-                                                GetSceneDetails(
-                                                  sceneId: state.scenes[index].id,
-                                                  isTabToRun: true,
-                                                  isUpdate: true,
-                                                ),
-                                              );
-                                        },
-                                        textString: state.scenes[index].name,
-                                        icon: state.scenes[index].icon ??
-                                            Assets.logoHorizontal,
-                                        isFromScenes: true,
-                                        iconInBytes: state.scenes[index].iconInBytes,
-                                      ),
-                                    ],
-                                  ),
-                                );
-                              }),
-                        ),
+        return SingleChildScrollView(
+          child: Padding(
+            padding: const EdgeInsets.symmetric(vertical: 16.0),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Text(
+                  "Scenes (Tab to Run)",
+                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        color: ColorsManager.grayColor,
+                        fontWeight: FontWeight.bold,
                       ),
-                      const SizedBox(height: 10),
-                      Text(
-                        "Automations",
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.bold,
-                            ),
-                      ),
-                      const SizedBox(height: 3),
-                      Visibility(
-                        visible: state.automations.isNotEmpty,
-                        replacement: Text(
-                          "No automations found",
-                          style: context.textTheme.bodyMedium?.copyWith(
-                            color: ColorsManager.grayColor,
-                          ),
-                        ),
-                        child: SizedBox(
-                          height: 200,
-                          child: ListView.builder(
-                            scrollDirection: Axis.horizontal,
-                            itemCount: state.automations.length,
-                            itemBuilder: (context, index) {
-                              final isLoading = state.automations
-                                  .contains(state.automations[index].id);
+                ),
+                const SizedBox(height: 10),
+                Visibility(
+                  visible: state.scenes.isNotEmpty,
+                  replacement: Text(
+                    "No scenes found",
+                    style: context.textTheme.bodyMedium?.copyWith(
+                      color: ColorsManager.grayColor,
+                    ),
+                  ),
+                  child: SizedBox(
+                    height: 200,
+                    child: ListView.builder(
+                        scrollDirection: Axis.horizontal,
+                        itemCount: state.scenes.length,
+                        itemBuilder: (context, index) {
+                          final scene = state.scenes[index];
+                          final isLoading = state.loadingSceneId == scene.id;
 
-                              return Column(
-                                children: [
-                                  Padding(
-                                    padding: EdgeInsets.only(
-                                      right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                                    ),
-                                    child: RoutineViewCard(
-                                      isLoading: isLoading,
-                                      onChanged: (v) {
-                                        context.read<RoutineBloc>().add(
-                                              UpdateAutomationStatus(
-                                                automationId:
-                                                    state.automations[index].id,
-                                                automationStatusUpdate:
-                                                    AutomationStatusUpdate(
-                                                  spaceUuid: state
-                                                      .automations[index].spaceId,
-                                                  isEnable: v,
-                                                ),
-                                                communityId: state
-                                                    .automations[index].communityId,
-                                              ),
-                                            );
-                                      },
-                                      status: state.automations[index].status,
-                                      communityId: '',
-                                      spaceId: state.automations[index].spaceId,
-                                      sceneId: '',
-                                      automationId: state.automations[index].id,
-                                      cardType: 'automations',
-                                      spaceName: state.automations[index].spaceName,
-                                      onTap: () {
-                                        BlocProvider.of<RoutineBloc>(context).add(
-                                          const CreateNewRoutineViewEvent(
-                                            createRoutineView: true,
+                          return Padding(
+                            padding: EdgeInsets.only(
+                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                            ),
+                            child: Column(
+                              children: [
+                                RoutineViewCard(
+                                  isLoading: isLoading,
+                                  sceneOnTap: () {
+                                    context.read<RoutineBloc>().add(
+                                          SceneTrigger(
+                                            sceneId: scene.id,
+                                            name: scene.name,
                                           ),
                                         );
-                                        context.read<RoutineBloc>().add(
-                                              GetAutomationDetails(
-                                                automationId:
-                                                    state.automations[index].id,
-                                                isAutomation: true,
-                                                isUpdate: true,
-                                              ),
-                                            );
-                                      },
-                                      textString: state.automations[index].name,
-                                      icon: state.automations[index].icon ??
-                                          Assets.automation,
-                                    ),
-                                  ),
-                                ],
-                              );
-                            },
-                          ),
-                        ),
-                      )
-                    ],
+                                  },
+                                  status: state.scenes[index].status,
+                                  communityId: state.scenes[index].communityId,
+                                  spaceId: state.scenes[index].spaceId,
+                                  sceneId: state.scenes[index].sceneTuyaId!,
+                                  automationId: state.scenes[index].id,
+                                  cardType: 'scenes',
+                                  spaceName: state.scenes[index].spaceName,
+                                  onTap: () {
+                                    BlocProvider.of<RoutineBloc>(context).add(
+                                      const CreateNewRoutineViewEvent(
+                                        createRoutineView: true,
+                                      ),
+                                    );
+                                    context.read<RoutineBloc>().add(
+                                          GetSceneDetails(
+                                            sceneId: state.scenes[index].id,
+                                            isTabToRun: true,
+                                            isUpdate: true,
+                                          ),
+                                        );
+                                  },
+                                  textString: state.scenes[index].name,
+                                  icon: state.scenes[index].icon ??
+                                      Assets.logoHorizontal,
+                                  isFromScenes: true,
+                                  iconInBytes: state.scenes[index].iconInBytes,
+                                ),
+                              ],
+                            ),
+                          );
+                        }),
                   ),
                 ),
-              );
+                const SizedBox(height: 10),
+                Text(
+                  "Automations",
+                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                        color: ColorsManager.grayColor,
+                        fontWeight: FontWeight.bold,
+                      ),
+                ),
+                const SizedBox(height: 3),
+                Visibility(
+                  visible: state.automations.isNotEmpty,
+                  replacement: Text(
+                    "No automations found",
+                    style: context.textTheme.bodyMedium?.copyWith(
+                      color: ColorsManager.grayColor,
+                    ),
+                  ),
+                  child: SizedBox(
+                    height: 200,
+                    child: ListView.builder(
+                      scrollDirection: Axis.horizontal,
+                      itemCount: state.automations.length,
+                      itemBuilder: (context, index) {
+                        final isLoading =
+                            state.automations.contains(state.automations[index].id);
+
+                        return Column(
+                          children: [
+                            Padding(
+                              padding: EdgeInsets.only(
+                                right: isSmallScreenSize(context) ? 4.0 : 8.0,
+                              ),
+                              child: RoutineViewCard(
+                                isLoading: isLoading,
+                                onChanged: (v) {
+                                  context.read<RoutineBloc>().add(
+                                        UpdateAutomationStatus(
+                                          automationId: state.automations[index].id,
+                                          automationStatusUpdate:
+                                              AutomationStatusUpdate(
+                                            spaceUuid:
+                                                state.automations[index].spaceId,
+                                            isEnable: v,
+                                          ),
+                                          communityId:
+                                              state.automations[index].communityId,
+                                        ),
+                                      );
+                                },
+                                status: state.automations[index].status,
+                                communityId: '',
+                                spaceId: state.automations[index].spaceId,
+                                sceneId: '',
+                                automationId: state.automations[index].id,
+                                cardType: 'automations',
+                                spaceName: state.automations[index].spaceName,
+                                onTap: () {
+                                  BlocProvider.of<RoutineBloc>(context).add(
+                                    const CreateNewRoutineViewEvent(
+                                      createRoutineView: true,
+                                    ),
+                                  );
+                                  context.read<RoutineBloc>().add(
+                                        GetAutomationDetails(
+                                          automationId: state.automations[index].id,
+                                          isAutomation: true,
+                                          isUpdate: true,
+                                        ),
+                                      );
+                                },
+                                textString: state.automations[index].name,
+                                icon: state.automations[index].icon ??
+                                    Assets.automation,
+                              ),
+                            ),
+                          ],
+                        );
+                      },
+                    ),
+                  ),
+                )
+              ],
+            ),
+          ),
+        );
       },
     );
   }

From 9431eb79c1ab7b7f062d58921b431a0738310386 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 13:18:44 +0300
Subject: [PATCH 172/238] Fix loading state handling and refactor
 scene/automation rendering in `FetchRoutineScenesAutomation`

---
 .../fetch_routine_scenes_automation.dart      | 281 +++++++++---------
 1 file changed, 140 insertions(+), 141 deletions(-)

diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index 3e5d4e7f..f935fef8 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -16,7 +16,7 @@ class FetchRoutineScenesAutomation extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        if (state.isLoading) const Center(child: CircularProgressIndicator());
+        if (state.isLoading) return const Center(child: CircularProgressIndicator());
 
         return SingleChildScrollView(
           child: Padding(
@@ -25,159 +25,25 @@ class FetchRoutineScenesAutomation extends StatelessWidget
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisSize: MainAxisSize.min,
               children: [
-                Text(
-                  "Scenes (Tab to Run)",
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        color: ColorsManager.grayColor,
-                        fontWeight: FontWeight.bold,
-                      ),
-                ),
+                _buildListTitle(context, "Scenes (Tab to Run)"),
                 const SizedBox(height: 10),
                 Visibility(
                   visible: state.scenes.isNotEmpty,
-                  replacement: Text(
-                    "No scenes found",
-                    style: context.textTheme.bodyMedium?.copyWith(
-                      color: ColorsManager.grayColor,
-                    ),
-                  ),
+                  replacement: _buildEmptyState(context, "No scenes found"),
                   child: SizedBox(
                     height: 200,
-                    child: ListView.builder(
-                        scrollDirection: Axis.horizontal,
-                        itemCount: state.scenes.length,
-                        itemBuilder: (context, index) {
-                          final scene = state.scenes[index];
-                          final isLoading = state.loadingSceneId == scene.id;
-
-                          return Padding(
-                            padding: EdgeInsets.only(
-                              right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                            ),
-                            child: Column(
-                              children: [
-                                RoutineViewCard(
-                                  isLoading: isLoading,
-                                  sceneOnTap: () {
-                                    context.read<RoutineBloc>().add(
-                                          SceneTrigger(
-                                            sceneId: scene.id,
-                                            name: scene.name,
-                                          ),
-                                        );
-                                  },
-                                  status: state.scenes[index].status,
-                                  communityId: state.scenes[index].communityId,
-                                  spaceId: state.scenes[index].spaceId,
-                                  sceneId: state.scenes[index].sceneTuyaId!,
-                                  automationId: state.scenes[index].id,
-                                  cardType: 'scenes',
-                                  spaceName: state.scenes[index].spaceName,
-                                  onTap: () {
-                                    BlocProvider.of<RoutineBloc>(context).add(
-                                      const CreateNewRoutineViewEvent(
-                                        createRoutineView: true,
-                                      ),
-                                    );
-                                    context.read<RoutineBloc>().add(
-                                          GetSceneDetails(
-                                            sceneId: state.scenes[index].id,
-                                            isTabToRun: true,
-                                            isUpdate: true,
-                                          ),
-                                        );
-                                  },
-                                  textString: state.scenes[index].name,
-                                  icon: state.scenes[index].icon ??
-                                      Assets.logoHorizontal,
-                                  isFromScenes: true,
-                                  iconInBytes: state.scenes[index].iconInBytes,
-                                ),
-                              ],
-                            ),
-                          );
-                        }),
+                    child: _buildScenes(state),
                   ),
                 ),
                 const SizedBox(height: 10),
-                Text(
-                  "Automations",
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                        color: ColorsManager.grayColor,
-                        fontWeight: FontWeight.bold,
-                      ),
-                ),
+                _buildListTitle(context, "Automations"),
                 const SizedBox(height: 3),
                 Visibility(
                   visible: state.automations.isNotEmpty,
-                  replacement: Text(
-                    "No automations found",
-                    style: context.textTheme.bodyMedium?.copyWith(
-                      color: ColorsManager.grayColor,
-                    ),
-                  ),
+                  replacement: _buildEmptyState(context, "No automations found"),
                   child: SizedBox(
                     height: 200,
-                    child: ListView.builder(
-                      scrollDirection: Axis.horizontal,
-                      itemCount: state.automations.length,
-                      itemBuilder: (context, index) {
-                        final isLoading =
-                            state.automations.contains(state.automations[index].id);
-
-                        return Column(
-                          children: [
-                            Padding(
-                              padding: EdgeInsets.only(
-                                right: isSmallScreenSize(context) ? 4.0 : 8.0,
-                              ),
-                              child: RoutineViewCard(
-                                isLoading: isLoading,
-                                onChanged: (v) {
-                                  context.read<RoutineBloc>().add(
-                                        UpdateAutomationStatus(
-                                          automationId: state.automations[index].id,
-                                          automationStatusUpdate:
-                                              AutomationStatusUpdate(
-                                            spaceUuid:
-                                                state.automations[index].spaceId,
-                                            isEnable: v,
-                                          ),
-                                          communityId:
-                                              state.automations[index].communityId,
-                                        ),
-                                      );
-                                },
-                                status: state.automations[index].status,
-                                communityId: '',
-                                spaceId: state.automations[index].spaceId,
-                                sceneId: '',
-                                automationId: state.automations[index].id,
-                                cardType: 'automations',
-                                spaceName: state.automations[index].spaceName,
-                                onTap: () {
-                                  BlocProvider.of<RoutineBloc>(context).add(
-                                    const CreateNewRoutineViewEvent(
-                                      createRoutineView: true,
-                                    ),
-                                  );
-                                  context.read<RoutineBloc>().add(
-                                        GetAutomationDetails(
-                                          automationId: state.automations[index].id,
-                                          isAutomation: true,
-                                          isUpdate: true,
-                                        ),
-                                      );
-                                },
-                                textString: state.automations[index].name,
-                                icon: state.automations[index].icon ??
-                                    Assets.automation,
-                              ),
-                            ),
-                          ],
-                        );
-                      },
-                    ),
+                    child: _buildAutomations(state),
                   ),
                 )
               ],
@@ -187,4 +53,137 @@ class FetchRoutineScenesAutomation extends StatelessWidget
       },
     );
   }
+
+  Widget _buildAutomations(RoutineState state) {
+    return ListView.builder(
+      scrollDirection: Axis.horizontal,
+      itemCount: state.automations.length,
+      itemBuilder: (context, index) {
+        final isLoading = state.automations.contains(state.automations[index].id);
+
+        return Column(
+          children: [
+            Padding(
+              padding: EdgeInsets.only(
+                right: isSmallScreenSize(context) ? 4.0 : 8.0,
+              ),
+              child: RoutineViewCard(
+                isLoading: isLoading,
+                onChanged: (v) {
+                  context.read<RoutineBloc>().add(
+                        UpdateAutomationStatus(
+                          automationId: state.automations[index].id,
+                          automationStatusUpdate: AutomationStatusUpdate(
+                            spaceUuid: state.automations[index].spaceId,
+                            isEnable: v,
+                          ),
+                          communityId: state.automations[index].communityId,
+                        ),
+                      );
+                },
+                status: state.automations[index].status,
+                communityId: '',
+                spaceId: state.automations[index].spaceId,
+                sceneId: '',
+                automationId: state.automations[index].id,
+                cardType: 'automations',
+                spaceName: state.automations[index].spaceName,
+                onTap: () {
+                  BlocProvider.of<RoutineBloc>(context).add(
+                    const CreateNewRoutineViewEvent(
+                      createRoutineView: true,
+                    ),
+                  );
+                  context.read<RoutineBloc>().add(
+                        GetAutomationDetails(
+                          automationId: state.automations[index].id,
+                          isAutomation: true,
+                          isUpdate: true,
+                        ),
+                      );
+                },
+                textString: state.automations[index].name,
+                icon: state.automations[index].icon ?? Assets.automation,
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildScenes(RoutineState state) {
+    return ListView.builder(
+        scrollDirection: Axis.horizontal,
+        itemCount: state.scenes.length,
+        itemBuilder: (context, index) {
+          final scene = state.scenes[index];
+          final isLoading = state.loadingSceneId == scene.id;
+
+          return Padding(
+            padding: EdgeInsets.only(
+              right: isSmallScreenSize(context) ? 4.0 : 8.0,
+            ),
+            child: Column(
+              children: [
+                RoutineViewCard(
+                  isLoading: isLoading,
+                  sceneOnTap: () {
+                    context.read<RoutineBloc>().add(
+                          SceneTrigger(
+                            sceneId: scene.id,
+                            name: scene.name,
+                          ),
+                        );
+                  },
+                  status: state.scenes[index].status,
+                  communityId: state.scenes[index].communityId,
+                  spaceId: state.scenes[index].spaceId,
+                  sceneId: state.scenes[index].sceneTuyaId!,
+                  automationId: state.scenes[index].id,
+                  cardType: 'scenes',
+                  spaceName: state.scenes[index].spaceName,
+                  onTap: () {
+                    BlocProvider.of<RoutineBloc>(context).add(
+                      const CreateNewRoutineViewEvent(
+                        createRoutineView: true,
+                      ),
+                    );
+                    context.read<RoutineBloc>().add(
+                          GetSceneDetails(
+                            sceneId: state.scenes[index].id,
+                            isTabToRun: true,
+                            isUpdate: true,
+                          ),
+                        );
+                  },
+                  textString: state.scenes[index].name,
+                  icon: state.scenes[index].icon ?? Assets.logoHorizontal,
+                  isFromScenes: true,
+                  iconInBytes: state.scenes[index].iconInBytes,
+                ),
+              ],
+            ),
+          );
+        });
+  }
+
+  Widget _buildListTitle(BuildContext context, String title) {
+    return Text(
+      title,
+      style: Theme.of(context).textTheme.titleLarge?.copyWith(
+            color: ColorsManager.grayColor,
+            fontWeight: FontWeight.bold,
+          ),
+    );
+  }
+
+  Widget _buildEmptyState(BuildContext context, String title) {
+    return Text(
+      title,
+      style: context.textTheme.bodyMedium?.copyWith(
+        color: ColorsManager.grayColor,
+      ),
+    );
+  }
 }

From 1407c173b0c82442dc146716fb71201916ccd07c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 13:28:00 +0300
Subject: [PATCH 173/238] tapping bugfix.

---
 lib/pages/space_tree/view/custom_expansion.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/space_tree/view/custom_expansion.dart b/lib/pages/space_tree/view/custom_expansion.dart
index e4e7f423..dab0a49f 100644
--- a/lib/pages/space_tree/view/custom_expansion.dart
+++ b/lib/pages/space_tree/view/custom_expansion.dart
@@ -31,7 +31,7 @@ class CustomExpansionTileSpaceTree extends StatelessWidget {
           children: [
             Checkbox(
               value: isSoldCheck ? null : isSelected,
-              onChanged: (value) => onItemSelected ?? () {},
+              onChanged: (value) => onItemSelected?.call(),
               tristate: true,
               side: WidgetStateBorderSide.resolveWith(
                 (states) => const BorderSide(color: ColorsManager.grayBorder),

From 34fa426163a3224774c4011331938b35ef18f9a3 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 14:17:43 +0300
Subject: [PATCH 174/238] submitting password field in login logs the user in.

---
 lib/pages/auth/view/login_web_page.dart | 28 +++++++++++++++++--------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/lib/pages/auth/view/login_web_page.dart b/lib/pages/auth/view/login_web_page.dart
index 72cad7cc..a6de87cf 100644
--- a/lib/pages/auth/view/login_web_page.dart
+++ b/lib/pages/auth/view/login_web_page.dart
@@ -55,12 +55,12 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
     final isSmallScreen = isSmallScreenSize(context);
     final isMediumScreen = isMediumScreenSize(context);
     Size size = MediaQuery.of(context).size;
-    late ScrollController _scrollController;
-    _scrollController = ScrollController();
+    late ScrollController scrollController;
+    scrollController = ScrollController();
 
-    void _scrollToCenter() {
-      final double middlePosition = _scrollController.position.maxScrollExtent / 2;
-      _scrollController.animateTo(
+    void scrollToCenter() {
+      final double middlePosition = scrollController.position.maxScrollExtent / 2;
+      scrollController.animateTo(
         middlePosition,
         duration: const Duration(seconds: 1),
         curve: Curves.easeInOut,
@@ -68,7 +68,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
     }
 
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      _scrollToCenter();
+      scrollToCenter();
     });
 
     return Stack(
@@ -76,7 +76,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
         FirstLayer(
           second: Center(
             child: ListView(
-              controller: _scrollController,
+              controller: scrollController,
               shrinkWrap: true,
               children: [
                 Container(
@@ -199,7 +199,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
           width: size.width * 0.9,
           child: DropdownButtonHideUnderline(
             child: DropdownButton2<String>(
-              style: TextStyle(color: Colors.black),
+              style: const TextStyle(color: Colors.black),
               isExpanded: true,
               hint: Text(
                 'Select your region/country',
@@ -336,6 +336,16 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
             obscureText: loginBloc.obscureText,
             keyboardType: TextInputType.visiblePassword,
             controller: loginBloc.loginPasswordController,
+            onFieldSubmitted: (value) {
+              if (loginBloc.loginFormKey.currentState!.validate()) {
+                loginBloc.add(LoginButtonPressed(    
+                  username: loginBloc.loginEmailController.text,
+                  password: value,
+                ));
+              } else {
+                loginBloc.add(ChangeValidateEvent());
+              }
+            },
             decoration: textBoxDecoration()!.copyWith(
               hintText: 'At least 8 characters',
               hintStyle: Theme.of(context)
@@ -393,7 +403,7 @@ class _LoginWebPageState extends State<LoginWebPage> with HelperResponsiveLayout
         Transform.scale(
           scale: 1.2,
           child: Checkbox(
-            fillColor: MaterialStateProperty.all<Color>(Colors.white),
+            fillColor: WidgetStateProperty.all<Color>(Colors.white),
             activeColor: Colors.white,
             value: loginBloc.isChecked,
             checkColor: Colors.black,

From a0dd12855766eb273c89e9e1c1b01baf3fa7c0b8 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 14:30:30 +0300
Subject: [PATCH 175/238] matched design of Function and action in
 `SaveRoutineHelper.showSaveRoutineDialog`

---
 .../routines/helper/save_routine_helper.dart  | 103 +++++++++++-------
 1 file changed, 64 insertions(+), 39 deletions(-)

diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index 457f74dc..57081230 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -5,8 +5,8 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.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/widgets/dialog_header.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/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -31,7 +31,8 @@ class SaveRoutineHelper {
                   children: [
                     DialogHeader('Create a scene: ${state.routineName ?? ""}'),
                     Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                      padding:
+                          const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -59,8 +60,9 @@ class SaveRoutineHelper {
                                   ),
                                 if (state.isAutomation)
                                   ...state.ifItems.map((item) {
-                                    final functions =
-                                        state.selectedFunctions[item['uniqueCustomId']] ?? [];
+                                    final functions = state.selectedFunctions[
+                                            item['uniqueCustomId']] ??
+                                        [];
                                     return functionRow(item, context, functions);
                                   }),
                               ],
@@ -68,10 +70,8 @@ class SaveRoutineHelper {
                           ),
                           const SizedBox(width: 16),
                           // Right side - THEN items
-
                           Expanded(
                             child: ListView(
-                              // crossAxisAlignment: CrossAxisAlignment.start,
                               shrinkWrap: true,
                               children: [
                                 const Text(
@@ -82,8 +82,9 @@ class SaveRoutineHelper {
                                 ),
                                 const SizedBox(height: 8),
                                 ...state.thenItems.map((item) {
-                                  final functions =
-                                      state.selectedFunctions[item['uniqueCustomId']] ?? [];
+                                  final functions = state.selectedFunctions[
+                                          item['uniqueCustomId']] ??
+                                      [];
                                   return functionRow(item, context, functions);
                                 }),
                               ],
@@ -92,33 +93,30 @@ class SaveRoutineHelper {
                         ],
                       ),
                     ),
-                    // if (state.errorMessage != null || state.errorMessage!.isNotEmpty)
-                    //   Padding(
-                    //     padding: const EdgeInsets.all(8.0),
-                    //     child: Text(
-                    //       state.errorMessage!,
-                    //       style: const TextStyle(color: Colors.red),
-                    //     ),
-                    //   ),
                     DialogFooter(
                       onCancel: () => Navigator.pop(context),
                       onConfirm: () async {
                         if (state.isAutomation) {
                           if (state.isUpdate ?? false) {
-                            context.read<RoutineBloc>().add(const UpdateAutomation());
+                            context
+                                .read<RoutineBloc>()
+                                .add(const UpdateAutomation());
                           } else {
-                            context.read<RoutineBloc>().add(const CreateAutomationEvent());
+                            context
+                                .read<RoutineBloc>()
+                                .add(const CreateAutomationEvent());
                           }
                         } else {
                           if (state.isUpdate ?? false) {
                             context.read<RoutineBloc>().add(const UpdateScene());
                           } else {
-                            context.read<RoutineBloc>().add(const CreateSceneEvent());
+                            context
+                                .read<RoutineBloc>()
+                                .add(const CreateSceneEvent());
                           }
                         }
-                        // if (state.errorMessage == null || state.errorMessage!.isEmpty) {
+
                         Navigator.pop(context);
-                        // }
                       },
                       isConfirmEnabled: true,
                     ),
@@ -133,7 +131,10 @@ class SaveRoutineHelper {
   }
 
   static Widget functionRow(
-      dynamic item, BuildContext context, List<DeviceFunctionData> functions) {
+    dynamic item,
+    BuildContext context,
+    List<DeviceFunctionData> functions,
+  ) {
     return Padding(
       padding: const EdgeInsets.only(top: 6),
       child: Row(
@@ -142,19 +143,36 @@ class SaveRoutineHelper {
           Expanded(
             child: Row(
               mainAxisAlignment: MainAxisAlignment.start,
-              spacing: 8,
+              spacing: 17,
               children: [
-                item['type'] == 'tap_to_run' || item['type'] == 'scene'
-                    ? Image.memory(
-                        base64Decode(item['icon']),
-                        width: 22,
-                        height: 22,
-                      )
-                    : SvgPicture.asset(
-                        item['imagePath'],
-                        width: 22,
-                        height: 22,
-                      ),
+                Container(
+                  width: 22,
+                  height: 22,
+                  padding: const EdgeInsetsDirectional.all(4),
+                  decoration: BoxDecoration(
+                    shape: BoxShape.circle,
+                    color: ColorsManager.textFieldGreyColor,
+                    border: Border.all(
+                      color: ColorsManager.neutralGray,
+                      width: 1.5,
+                    ),
+                  ),
+                  child: Center(
+                    child: item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                        ? Image.memory(
+                            base64Decode(item['icon']),
+                            width: 12,
+                            height: 22,
+                            fit: BoxFit.scaleDown,
+                          )
+                        : SvgPicture.asset(
+                            item['imagePath'],
+                            width: 12,
+                            height: 12,
+                            fit: BoxFit.scaleDown,
+                          ),
+                  ),
+                ),
                 Flexible(
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.start,
@@ -166,16 +184,18 @@ class SaveRoutineHelper {
                         maxLines: 1,
                         overflow: TextOverflow.ellipsis,
                         style: context.textTheme.bodySmall?.copyWith(
-                          fontSize: 14,
+                          fontSize: 15,
                           color: ColorsManager.textPrimaryColor,
                         ),
                       ),
                       Wrap(
+                        runSpacing: 16,
+                        spacing: 4,
                         children: functions
                             .map((f) => Text(
                                   '${f.operationName}: ${f.value}',
-                                  style: context.textTheme.bodySmall
-                                      ?.copyWith(color: ColorsManager.grayColor, fontSize: 8),
+                                  style: context.textTheme.bodySmall?.copyWith(
+                                      color: ColorsManager.grayColor, fontSize: 8),
                                   overflow: TextOverflow.ellipsis,
                                   maxLines: 3,
                                 ))
@@ -197,7 +217,10 @@ class SaveRoutineHelper {
                 child: Row(
                   spacing: 2,
                   children: [
-                    SizedBox(width: 8, height: 8, child: SvgPicture.asset(Assets.deviceTagIcon)),
+                    SizedBox(
+                        width: 8,
+                        height: 8,
+                        child: SvgPicture.asset(Assets.deviceTagIcon)),
                     Text(
                       item['tag'] ?? '',
                       textAlign: TextAlign.center,
@@ -218,7 +241,9 @@ class SaveRoutineHelper {
                   spacing: 2,
                   children: [
                     SizedBox(
-                        width: 8, height: 8, child: SvgPicture.asset(Assets.spaceLocationIcon)),
+                        width: 8,
+                        height: 8,
+                        child: SvgPicture.asset(Assets.spaceLocationIcon)),
                     Text(
                       item['subSpace'] ?? '',
                       textAlign: TextAlign.center,

From c46cfb48a83f92e8347431a9cf876a37ab3b4fba Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 14:38:04 +0300
Subject: [PATCH 176/238] refactor: extract IF and THEN sections into separate
 methods for better readability

---
 .../routines/helper/save_routine_helper.dart  | 161 +++++++++---------
 1 file changed, 81 insertions(+), 80 deletions(-)

diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index 57081230..0750ba07 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -36,90 +36,13 @@ class SaveRoutineHelper {
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
-                          // Left side - IF
-                          Expanded(
-                            child: ListView(
-                              // crossAxisAlignment: CrossAxisAlignment.start,
-                              shrinkWrap: true,
-                              children: [
-                                const Text(
-                                  'IF:',
-                                  style: TextStyle(
-                                    fontSize: 16,
-                                  ),
-                                ),
-                                const SizedBox(height: 8),
-                                if (state.isTabToRun)
-                                  ListTile(
-                                    leading: SvgPicture.asset(
-                                      Assets.tabToRun,
-                                      width: 24,
-                                      height: 24,
-                                    ),
-                                    title: const Text('Tab to run'),
-                                  ),
-                                if (state.isAutomation)
-                                  ...state.ifItems.map((item) {
-                                    final functions = state.selectedFunctions[
-                                            item['uniqueCustomId']] ??
-                                        [];
-                                    return functionRow(item, context, functions);
-                                  }),
-                              ],
-                            ),
-                          ),
+                          _buildIfConditions(state, context),
                           const SizedBox(width: 16),
-                          // Right side - THEN items
-                          Expanded(
-                            child: ListView(
-                              shrinkWrap: true,
-                              children: [
-                                const Text(
-                                  'THEN:',
-                                  style: TextStyle(
-                                    fontSize: 16,
-                                  ),
-                                ),
-                                const SizedBox(height: 8),
-                                ...state.thenItems.map((item) {
-                                  final functions = state.selectedFunctions[
-                                          item['uniqueCustomId']] ??
-                                      [];
-                                  return functionRow(item, context, functions);
-                                }),
-                              ],
-                            ),
-                          ),
+                          _buildThenActions(state, context),
                         ],
                       ),
                     ),
-                    DialogFooter(
-                      onCancel: () => Navigator.pop(context),
-                      onConfirm: () async {
-                        if (state.isAutomation) {
-                          if (state.isUpdate ?? false) {
-                            context
-                                .read<RoutineBloc>()
-                                .add(const UpdateAutomation());
-                          } else {
-                            context
-                                .read<RoutineBloc>()
-                                .add(const CreateAutomationEvent());
-                          }
-                        } else {
-                          if (state.isUpdate ?? false) {
-                            context.read<RoutineBloc>().add(const UpdateScene());
-                          } else {
-                            context
-                                .read<RoutineBloc>()
-                                .add(const CreateSceneEvent());
-                          }
-                        }
-
-                        Navigator.pop(context);
-                      },
-                      isConfirmEnabled: true,
-                    ),
+                    _buildDialogFooter(context, state),
                   ],
                 ),
               ),
@@ -130,6 +53,84 @@ class SaveRoutineHelper {
     );
   }
 
+  static DialogFooter _buildDialogFooter(BuildContext context, RoutineState state) {
+    return DialogFooter(
+      onCancel: () => Navigator.pop(context),
+      onConfirm: () async {
+        if (state.isAutomation) {
+          if (state.isUpdate ?? false) {
+            context.read<RoutineBloc>().add(const UpdateAutomation());
+          } else {
+            context.read<RoutineBloc>().add(const CreateAutomationEvent());
+          }
+        } else {
+          if (state.isUpdate ?? false) {
+            context.read<RoutineBloc>().add(const UpdateScene());
+          } else {
+            context.read<RoutineBloc>().add(const CreateSceneEvent());
+          }
+        }
+
+        Navigator.pop(context);
+      },
+      isConfirmEnabled: true,
+    );
+  }
+
+  static Expanded _buildThenActions(RoutineState state, BuildContext context) {
+    return Expanded(
+      child: ListView(
+        shrinkWrap: true,
+        children: [
+          const Text(
+            'THEN:',
+            style: TextStyle(
+              fontSize: 16,
+            ),
+          ),
+          const SizedBox(height: 8),
+          ...state.thenItems.map((item) {
+            final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
+            return functionRow(item, context, functions);
+          }),
+        ],
+      ),
+    );
+  }
+
+  static Expanded _buildIfConditions(RoutineState state, BuildContext context) {
+    return Expanded(
+      child: ListView(
+        // crossAxisAlignment: CrossAxisAlignment.start,
+        shrinkWrap: true,
+        children: [
+          const Text(
+            'IF:',
+            style: TextStyle(
+              fontSize: 16,
+            ),
+          ),
+          const SizedBox(height: 8),
+          if (state.isTabToRun)
+            ListTile(
+              leading: SvgPicture.asset(
+                Assets.tabToRun,
+                width: 24,
+                height: 24,
+              ),
+              title: const Text('Tab to run'),
+            ),
+          if (state.isAutomation)
+            ...state.ifItems.map((item) {
+              final functions =
+                  state.selectedFunctions[item['uniqueCustomId']] ?? [];
+              return functionRow(item, context, functions);
+            }),
+        ],
+      ),
+    );
+  }
+
   static Widget functionRow(
     dynamic item,
     BuildContext context,

From 2e4f904d3a84388a9554f768e4d21b5298192ab9 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 14:39:33 +0300
Subject: [PATCH 177/238] style: improve code formatting and readability in
 SaveRoutineHelper

---
 .../routines/helper/save_routine_helper.dart  | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index 0750ba07..e9d870d9 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -31,8 +31,10 @@ class SaveRoutineHelper {
                   children: [
                     DialogHeader('Create a scene: ${state.routineName ?? ""}'),
                     Padding(
-                      padding:
-                          const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 16,
+                        vertical: 8,
+                      ),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -56,7 +58,7 @@ class SaveRoutineHelper {
   static DialogFooter _buildDialogFooter(BuildContext context, RoutineState state) {
     return DialogFooter(
       onCancel: () => Navigator.pop(context),
-      onConfirm: () async {
+      onConfirm: () {
         if (state.isAutomation) {
           if (state.isUpdate ?? false) {
             context.read<RoutineBloc>().add(const UpdateAutomation());
@@ -101,7 +103,6 @@ class SaveRoutineHelper {
   static Expanded _buildIfConditions(RoutineState state, BuildContext context) {
     return Expanded(
       child: ListView(
-        // crossAxisAlignment: CrossAxisAlignment.start,
         shrinkWrap: true,
         children: [
           const Text(
@@ -193,13 +194,17 @@ class SaveRoutineHelper {
                         runSpacing: 16,
                         spacing: 4,
                         children: functions
-                            .map((f) => Text(
-                                  '${f.operationName}: ${f.value}',
-                                  style: context.textTheme.bodySmall?.copyWith(
-                                      color: ColorsManager.grayColor, fontSize: 8),
-                                  overflow: TextOverflow.ellipsis,
-                                  maxLines: 3,
-                                ))
+                            .map(
+                              (function) => Text(
+                                '${function.operationName}: ${function.value}',
+                                style: context.textTheme.bodySmall?.copyWith(
+                                  color: ColorsManager.grayColor,
+                                  fontSize: 8,
+                                ),
+                                overflow: TextOverflow.ellipsis,
+                                maxLines: 3,
+                              ),
+                            )
                             .toList(),
                       ),
                     ],
@@ -219,9 +224,12 @@ class SaveRoutineHelper {
                   spacing: 2,
                   children: [
                     SizedBox(
-                        width: 8,
-                        height: 8,
-                        child: SvgPicture.asset(Assets.deviceTagIcon)),
+                      width: 8,
+                      height: 8,
+                      child: SvgPicture.asset(
+                        Assets.deviceTagIcon,
+                      ),
+                    ),
                     Text(
                       item['tag'] ?? '',
                       textAlign: TextAlign.center,
@@ -242,9 +250,12 @@ class SaveRoutineHelper {
                   spacing: 2,
                   children: [
                     SizedBox(
-                        width: 8,
-                        height: 8,
-                        child: SvgPicture.asset(Assets.spaceLocationIcon)),
+                      width: 8,
+                      height: 8,
+                      child: SvgPicture.asset(
+                        Assets.spaceLocationIcon,
+                      ),
+                    ),
                     Text(
                       item['subSpace'] ?? '',
                       textAlign: TextAlign.center,

From 84264391d9a9bd4d20354926d981cb78a525ce89 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 16:14:26 +0300
Subject: [PATCH 178/238] progress towards matching the design of `save routine
 dialog`.

---
 .../routines/helper/save_routine_helper.dart  | 133 +++++++++++-------
 lib/pages/routines/widgets/dialog_footer.dart |  32 +++--
 lib/pages/routines/widgets/dialog_header.dart |   1 +
 3 files changed, 105 insertions(+), 61 deletions(-)

diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index e9d870d9..c568c6c1 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -6,7 +6,6 @@ import 'package:flutter_svg/flutter_svg.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/widgets/dialog_footer.dart';
-import 'package:syncrow_web/pages/routines/widgets/dialog_header.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';
@@ -18,6 +17,10 @@ class SaveRoutineHelper {
       builder: (BuildContext context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
+            final selectedConditionLabel = state.selectedAutomationOperator == 'and'
+                ? 'All Conditions are met'
+                : 'Any Condition is met';
+
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: Container(
@@ -29,22 +32,35 @@ class SaveRoutineHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    DialogHeader('Create a scene: ${state.routineName ?? ""}'),
+                    const SizedBox(height: 18),
+                    Text(
+                      'Create a scene: ${state.routineName ?? ""}',
+                      textAlign: TextAlign.center,
+                      style: Theme.of(context).textTheme.headlineMedium!.copyWith(
+                            color: ColorsManager.primaryColorWithOpacity,
+                            fontWeight: FontWeight.bold,
+                          ),
+                    ),
+                    const SizedBox(height: 18),
+                    _buildDivider(),
+                    _buildListsLabelRow(selectedConditionLabel),
                     Padding(
-                      padding: const EdgeInsets.symmetric(
+                      padding: const EdgeInsetsDirectional.symmetric(
                         horizontal: 16,
-                        vertical: 8,
                       ),
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.start,
+                        mainAxisSize: MainAxisSize.min,
                         children: [
                           _buildIfConditions(state, context),
-                          const SizedBox(width: 16),
                           _buildThenActions(state, context),
                         ],
                       ),
                     ),
+                    _buildDivider(),
+                    const SizedBox(height: 8),
                     _buildDialogFooter(context, state),
+                    const SizedBox(height: 8),
                   ],
                 ),
               ),
@@ -55,63 +71,82 @@ class SaveRoutineHelper {
     );
   }
 
-  static DialogFooter _buildDialogFooter(BuildContext context, RoutineState state) {
-    return DialogFooter(
-      onCancel: () => Navigator.pop(context),
-      onConfirm: () {
-        if (state.isAutomation) {
-          if (state.isUpdate ?? false) {
-            context.read<RoutineBloc>().add(const UpdateAutomation());
-          } else {
-            context.read<RoutineBloc>().add(const CreateAutomationEvent());
-          }
-        } else {
-          if (state.isUpdate ?? false) {
-            context.read<RoutineBloc>().add(const UpdateScene());
-          } else {
-            context.read<RoutineBloc>().add(const CreateSceneEvent());
-          }
-        }
-
-        Navigator.pop(context);
-      },
-      isConfirmEnabled: true,
+  static Container _buildDivider() {
+    return Container(
+      height: 1,
+      width: double.infinity,
+      color: ColorsManager.greyColor,
     );
   }
 
-  static Expanded _buildThenActions(RoutineState state, BuildContext context) {
-    return Expanded(
-      child: ListView(
-        shrinkWrap: true,
+  static Widget _buildListsLabelRow(String selectedConditionLabel) {
+    const textStyle = TextStyle(
+      fontSize: 16,
+    );
+    return Container(
+      color: ColorsManager.backgroundColor.withValues(alpha: 0.5),
+      padding: const EdgeInsetsDirectional.all(20),
+      child: Row(
+        spacing: 16,
         children: [
-          const Text(
-            'THEN:',
-            style: TextStyle(
-              fontSize: 16,
-            ),
-          ),
-          const SizedBox(height: 8),
-          ...state.thenItems.map((item) {
-            final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
-            return functionRow(item, context, functions);
-          }),
+          Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)),
+          const Expanded(child: Text('THEN:', style: textStyle)),
         ],
       ),
     );
   }
 
-  static Expanded _buildIfConditions(RoutineState state, BuildContext context) {
+  static Widget _buildDialogFooter(BuildContext context, RoutineState state) {
+    return Row(
+      spacing: 16,
+      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+      children: [
+        DialogFooterButton(
+          text: 'Cancel',
+          onTap: () => Navigator.pop(context),
+        ),
+        DialogFooterButton(
+          text: 'Confirm',
+          onTap: () {
+            if (state.isAutomation) {
+              if (state.isUpdate ?? false) {
+                context.read<RoutineBloc>().add(const UpdateAutomation());
+              } else {
+                context.read<RoutineBloc>().add(const CreateAutomationEvent());
+              }
+            } else {
+              if (state.isUpdate ?? false) {
+                context.read<RoutineBloc>().add(const UpdateScene());
+              } else {
+                context.read<RoutineBloc>().add(const CreateSceneEvent());
+              }
+            }
+
+            Navigator.pop(context);
+          },
+          textColor: ColorsManager.primaryColorWithOpacity,
+        ),
+      ],
+    );
+  }
+
+  static Widget _buildThenActions(RoutineState state, BuildContext context) {
+    return Expanded(
+      child: ListView(
+        shrinkWrap: true,
+        children: state.thenItems.map((item) {
+          final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
+          return functionRow(item, context, functions);
+        }).toList(),
+      ),
+    );
+  }
+
+  static Widget _buildIfConditions(RoutineState state, BuildContext context) {
     return Expanded(
       child: ListView(
         shrinkWrap: true,
         children: [
-          const Text(
-            'IF:',
-            style: TextStyle(
-              fontSize: 16,
-            ),
-          ),
-          const SizedBox(height: 8),
           if (state.isTabToRun)
             ListTile(
               leading: SvgPicture.asset(
diff --git a/lib/pages/routines/widgets/dialog_footer.dart b/lib/pages/routines/widgets/dialog_footer.dart
index e5a548f7..38178ee6 100644
--- a/lib/pages/routines/widgets/dialog_footer.dart
+++ b/lib/pages/routines/widgets/dialog_footer.dart
@@ -28,32 +28,40 @@ class DialogFooter extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         children: [
-          _buildFooterButton(
-            context: context,
+          DialogFooterButton(
             text: 'Cancel',
             onTap: onCancel,
           ),
           if (isConfirmEnabled) ...[
             Container(width: 1, height: 50, color: ColorsManager.greyColor),
-            _buildFooterButton(
-              context: context,
+            DialogFooterButton(
               text: 'Confirm',
               onTap: onConfirm,
-              textColor:
-                  isConfirmEnabled ? ColorsManager.primaryColorWithOpacity : Colors.red,
+              textColor: isConfirmEnabled
+                  ? ColorsManager.primaryColorWithOpacity
+                  : Colors.red,
             ),
           ],
         ],
       ),
     );
   }
+}
 
-  Widget _buildFooterButton({
-    required BuildContext context,
-    required String text,
-    required VoidCallback? onTap,
-    Color? textColor,
-  }) {
+class DialogFooterButton extends StatelessWidget {
+  const DialogFooterButton({
+    required this.text,
+    required this.onTap,
+    this.textColor,
+    super.key,
+  });
+
+  final String text;
+  final VoidCallback? onTap;
+  final Color? textColor;
+
+  @override
+  Widget build(BuildContext context) {
     return Expanded(
       child: TextButton(
         style: TextButton.styleFrom(
diff --git a/lib/pages/routines/widgets/dialog_header.dart b/lib/pages/routines/widgets/dialog_header.dart
index 4fe1f0b1..f1f5686a 100644
--- a/lib/pages/routines/widgets/dialog_header.dart
+++ b/lib/pages/routines/widgets/dialog_header.dart
@@ -16,6 +16,7 @@ class DialogHeader extends StatelessWidget {
         ),
         Text(
           title,
+          textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.bodyMedium!.copyWith(
                 color: ColorsManager.primaryColorWithOpacity,
                 fontWeight: FontWeight.bold,

From e45f57ca03d1649385e13fbf4ab7f46ef7e6f3c6 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 17 Apr 2025 16:55:44 +0300
Subject: [PATCH 179/238] SP-1441

---
 lib/pages/routines/widgets/dragable_card.dart                   | 2 +-
 lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart       | 2 +-
 .../ceiling_sensor/cps_dialog_slider_selector.dart              | 2 +-
 .../widgets/routine_dialogs/one_gang_switch_dialog.dart         | 2 +-
 .../widgets/routine_dialogs/two_gang_switch_dialog.dart         | 2 +-
 .../routine_dialogs/wall_sensor/wps_value_selector_widget.dart  | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/pages/routines/widgets/dragable_card.dart b/lib/pages/routines/widgets/dragable_card.dart
index 7ac29375..9853df7c 100644
--- a/lib/pages/routines/widgets/dragable_card.dart
+++ b/lib/pages/routines/widgets/dragable_card.dart
@@ -225,7 +225,7 @@ class DraggableCard extends StatelessWidget {
     if (function.functionCode == 'temp_set' || function.functionCode == 'temp_current') {
       return '${(function.value / 10).toStringAsFixed(0)}°C';
     } else if (function.functionCode.contains('countdown')) {
-      final seconds = function.value.toInt();
+      final seconds = function.value?.toInt() ?? 0;
       if (seconds >= 3600) {
         final hours = (seconds / 3600).floor();
         final remainingMinutes = ((seconds % 3600) / 60).floor();
diff --git a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
index bbaa645a..0bba956a 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
@@ -287,7 +287,7 @@ class ACHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0.0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
index a2d11f79..cd8e4c46 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_dialog_slider_selector.dart
@@ -46,7 +46,7 @@ class CpsDialogSliderSelector extends StatelessWidget {
                 functionCode: selectedFunction,
                 operationName: operationName,
                 condition: condition,
-                value: selectedFunctionData.value,
+                value: selectedFunctionData.value ?? 0,
               ),
             ),
           ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index 5bc374a3..4290be37 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -250,7 +250,7 @@ class OneGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0.0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
index d4c47445..d5e7007c 100644
--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
@@ -250,7 +250,7 @@ class TwoGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0.0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
index fcdc991a..b07d38a2 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
@@ -44,7 +44,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
                   condition: condition,
-                  value: functionData.value,
+                  value: functionData.value ?? 0.0,
                 ),
               ),
             ),

From 065bd33511bccb7e856af928450938546339ca5b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 21 Apr 2025 10:03:02 +0300
Subject: [PATCH 180/238] SP-1330.

---
 .../all_spaces/widgets/sidebar_widget.dart    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 198ebc51..6dc8ae9c 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -136,6 +136,17 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   }
 
   Widget _buildCommunityTile(BuildContext context, CommunityModel community) {
+    final spaces = community.spaces
+        .where(
+          (space) =>
+              {
+                SpaceStatus.deleted,
+                SpaceStatus.parentDeleted,
+              }.contains(space.status) ==
+              false,
+        )
+        .map((space) => _buildSpaceTile(space: space, community: community))
+        .toList();
     return CommunityTile(
       title: community.name,
       key: ValueKey(community.uuid),
@@ -154,15 +165,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
             );
       },
       onExpansionChanged: (title, expanded) {},
-      children: community.spaces
-          .where(
-            (space) => {
-              SpaceStatus.deleted,
-              SpaceStatus.parentDeleted,
-            }.contains(space.status),
-          )
-          .map((space) => _buildSpaceTile(space: space, community: community))
-          .toList(),
+      children: spaces,
     );
   }
 

From 62fb8b30975dc4af0e2a62ae6f07c6dc87d4f6fe Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 21 Apr 2025 10:28:44 +0300
Subject: [PATCH 181/238] SP-1441

---
 .../widgets/routine_dialogs/ac_dialog.dart    | 33 +++++++++----------
 .../one_gang_switch_dialog.dart               |  4 +--
 .../three_gang_switch_dialog.dart             |  4 +--
 .../two_gang_switch_dialog.dart               |  4 +--
 .../wps_value_selector_widget.dart            |  6 ++--
 5 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
index 0bba956a..68cf857d 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
@@ -1,6 +1,8 @@
 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/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
@@ -9,8 +11,6 @@ import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
 import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
 
 class ACHelper {
   static Future<Map<String, dynamic>?> showACFunctionsDialog({
@@ -74,10 +74,8 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected:
-                                    (functionCode, operationName) => context
-                                        .read<FunctionBloc>()
-                                        .add(SelectFunction(
+                                onFunctionSelected: (functionCode, operationName) =>
+                                    context.read<FunctionBloc>().add(SelectFunction(
                                           functionCode: functionCode,
                                           operationName: operationName,
                                         )),
@@ -191,8 +189,9 @@ class ACHelper {
     required String operationName,
     bool? removeComparators,
   }) {
+    final initialVal = selectedFunction == 'temp_set' ? 200 : -100;
     if (selectedFunction == 'temp_set' || selectedFunction == 'temp_current') {
-      final initialValue = selectedFunctionData?.value ?? 250;
+      final initialValue = selectedFunctionData?.value ?? initialVal;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -205,8 +204,7 @@ class ACHelper {
       );
     }
 
-    final selectedFn =
-        acFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn = acFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -287,7 +285,9 @@ class ACHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0.0,
+                  value: selectedFunctionData?.value ?? selectCode == 'temp_set'
+                      ? 200
+                      : -100,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
@@ -302,8 +302,7 @@ class ACHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -317,6 +316,7 @@ class ACHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
+    final initialVal = selectCode == 'temp_set' ? 200 : -100;
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 10),
       decoration: BoxDecoration(
@@ -324,7 +324,7 @@ class ACHelper {
         borderRadius: BorderRadius.circular(10),
       ),
       child: Text(
-        '${(initialValue ?? 200) / 10}°C',
+        '${(initialValue ?? initialVal) / 10}°C',
         style: context.textTheme.headlineMedium!.copyWith(
           color: ColorsManager.primaryColorWithOpacity,
         ),
@@ -397,9 +397,7 @@ class ACHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -415,8 +413,7 @@ class ACHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index 4290be37..e56da833 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -164,7 +164,7 @@ class OneGangSwitchHelper {
     required bool removeComparetors,
   }) {
     if (selectedFunction == 'countdown_1') {
-      final initialValue = selectedFunctionData?.value ?? 200;
+      final initialValue = selectedFunctionData?.value ?? 0;
       return _buildCountDownSelector(
         context: context,
         initialValue: initialValue,
@@ -250,7 +250,7 @@ class OneGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0.0,
+                  value: selectedFunctionData?.value ?? 0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index f1cbd6aa..ab62a52c 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -170,7 +170,7 @@ class ThreeGangSwitchHelper {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2' ||
         selectedFunction == 'countdown_3') {
-      final initialValue = selectedFunctionData?.value ?? 200;
+      final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -251,7 +251,7 @@ class ThreeGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value,
+                  value: selectedFunctionData?.value ?? 0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
index d5e7007c..d6715599 100644
--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
@@ -169,7 +169,7 @@ class TwoGangSwitchHelper {
   }) {
     if (selectedFunction == 'countdown_1' ||
         selectedFunction == 'countdown_2') {
-      final initialValue = selectedFunctionData?.value ?? 200;
+      final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
         context: context,
         initialValue: initialValue,
@@ -250,7 +250,7 @@ class TwoGangSwitchHelper {
                   functionCode: selectCode,
                   operationName: operationName,
                   condition: conditions[index],
-                  value: selectedFunctionData?.value ?? 0.0,
+                  value: selectedFunctionData?.value ?? 0,
                   valueDescription: selectedFunctionData?.valueDescription,
                 ),
               ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
index b07d38a2..30232846 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart
@@ -36,7 +36,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
         dialogType: dialogType,
         sliderRange: sliderRange,
         displayedValue: getDisplayText,
-        initialValue: functionData.value ?? 250,
+        initialValue: functionData.value ?? 0.0,
         onConditionChanged: (condition) => context.read<FunctionBloc>().add(
               AddFunction(
                 functionData: DeviceFunctionData(
@@ -44,7 +44,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
                   condition: condition,
-                  value: functionData.value ?? 0.0,
+                  value: functionData.value ?? 0,
                 ),
               ),
             ),
@@ -87,7 +87,7 @@ class WpsValueSelectorWidget extends StatelessWidget {
     final intValue = int.tryParse('${functionData.value ?? ''}');
     return switch (functionData.functionCode) {
       'presence_time' => '${intValue ?? '0'}',
-      'dis_current' => '${intValue ?? '250'}',
+      'dis_current' => '${intValue ?? '0'}',
       'illuminance_value' => '${intValue ?? '0'}',
       _ => '$intValue',
     };

From cf20bdcd4289fa28d439ba566ff39cbe5c27a507 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 21 Apr 2025 10:57:46 +0300
Subject: [PATCH 182/238] SP-1440

---
 .../routines/helper/save_routine_helper.dart  | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index c568c6c1..bc4764e3 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -14,7 +14,7 @@ class SaveRoutineHelper {
   static Future<void> showSaveRoutineDialog(BuildContext context) async {
     return showDialog<void>(
       context: context,
-      builder: (BuildContext context) {
+      builder: (context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
             final selectedConditionLabel = state.selectedAutomationOperator == 'and'
@@ -24,7 +24,8 @@ class SaveRoutineHelper {
             return AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: Container(
-                width: MediaQuery.sizeOf(context).width * 0.5,
+                width: context.screenWidth * 0.5,
+                height: 500,
                 decoration: BoxDecoration(
                   color: Colors.white,
                   borderRadius: BorderRadius.circular(20),
@@ -44,17 +45,24 @@ class SaveRoutineHelper {
                     const SizedBox(height: 18),
                     _buildDivider(),
                     _buildListsLabelRow(selectedConditionLabel),
-                    Padding(
-                      padding: const EdgeInsetsDirectional.symmetric(
-                        horizontal: 16,
-                      ),
-                      child: Row(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          _buildIfConditions(state, context),
-                          _buildThenActions(state, context),
-                        ],
+                    Expanded(
+                      child: Padding(
+                        padding: const EdgeInsetsDirectional.symmetric(
+                          horizontal: 16,
+                        ),
+                        child: Row(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          mainAxisSize: MainAxisSize.min,
+                          spacing: 24,
+                          children: [
+                            _buildIfConditions(state, context),
+                            Container(
+                              width: 1,
+                              color: ColorsManager.greyColor,
+                            ),
+                            _buildThenActions(state, context),
+                          ],
+                        ),
                       ),
                     ),
                     _buildDivider(),
@@ -133,7 +141,7 @@ class SaveRoutineHelper {
   static Widget _buildThenActions(RoutineState state, BuildContext context) {
     return Expanded(
       child: ListView(
-        shrinkWrap: true,
+        // shrinkWrap: true,
         children: state.thenItems.map((item) {
           final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
           return functionRow(item, context, functions);
@@ -145,7 +153,7 @@ class SaveRoutineHelper {
   static Widget _buildIfConditions(RoutineState state, BuildContext context) {
     return Expanded(
       child: ListView(
-        shrinkWrap: true,
+        // shrinkWrap: true,
         children: [
           if (state.isTabToRun)
             ListTile(

From 67a164e6d244f06917eecfe1926ec9226b7e9988 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 21 Apr 2025 10:59:09 +0300
Subject: [PATCH 183/238] modified divider color to match figma design.

---
 lib/pages/routines/helper/save_routine_helper.dart | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/routines/helper/save_routine_helper.dart b/lib/pages/routines/helper/save_routine_helper.dart
index bc4764e3..23920ba6 100644
--- a/lib/pages/routines/helper/save_routine_helper.dart
+++ b/lib/pages/routines/helper/save_routine_helper.dart
@@ -58,7 +58,7 @@ class SaveRoutineHelper {
                             _buildIfConditions(state, context),
                             Container(
                               width: 1,
-                              color: ColorsManager.greyColor,
+                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
                             ),
                             _buildThenActions(state, context),
                           ],

From d8afb562ebe436ff6d6605e4ab9356ba74e26553 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 21 Apr 2025 12:07:21 +0300
Subject: [PATCH 184/238] SP-1447, set the limit of gangs countdown to be 12
 hours instead of 24 hours.

---
 .../widgets/routine_dialogs/one_gang_switch_dialog.dart        | 3 ++-
 .../widgets/routine_dialogs/three_gang_switch_dialog.dart      | 3 ++-
 .../widgets/routine_dialogs/two_gang_switch_dialog.dart        | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index e56da833..51a99f3b 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -301,12 +301,13 @@ class OneGangSwitchHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
+    const twelveHoursInSeconds = 43200.0;
     final operationalValues = SwitchOperationalValue(
       icon: '',
       description: "sec",
       value: 0.0,
       minValue: 0,
-      maxValue: 86400,
+      maxValue: twelveHoursInSeconds,
       stepValue: 1,
     );
     return Slider(
diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index ab62a52c..a83fc4a0 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -303,12 +303,13 @@ class ThreeGangSwitchHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
+    const twelveHoursInSeconds = 43200.0;
     final operationalValues = SwitchOperationalValue(
       icon: '',
       description: "sec",
       value: 0.0,
       minValue: 0,
-      maxValue: 86400,
+      maxValue: twelveHoursInSeconds,
       stepValue: 1,
     );
     return Slider(
diff --git a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
index d6715599..2bb6b6e5 100644
--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
@@ -302,12 +302,13 @@ class TwoGangSwitchHelper {
     DeviceFunctionData? selectedFunctionData,
     String selectCode,
   ) {
+    const twelveHoursInSeconds = 43200.0;
     final operationalValues = SwitchOperationalValue(
       icon: '',
       description: "sec",
       value: 0.0,
       minValue: 0,
-      maxValue: 86400,
+      maxValue: twelveHoursInSeconds,
       stepValue: 1,
     );
     return Slider(

From b4ef22ef0a56b6dd68cc94d750903c0b367f9609 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Mon, 21 Apr 2025 14:23:40 +0300
Subject: [PATCH 185/238] SP-702/ clears user data on logging out.

---
 lib/pages/auth/bloc/auth_bloc.dart | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/pages/auth/bloc/auth_bloc.dart b/lib/pages/auth/bloc/auth_bloc.dart
index 9e0ac2f9..35663557 100644
--- a/lib/pages/auth/bloc/auth_bloc.dart
+++ b/lib/pages/auth/bloc/auth_bloc.dart
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/auth/model/region_model.dart';
 import 'package:syncrow_web/pages/auth/model/token.dart';
 import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.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/services/auth_api.dart';
@@ -432,9 +433,13 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
   }
 
   static Future<void> logout(BuildContext context) async {
-    final storage = FlutterSecureStorage();
-    ProjectManager.clearProjectUUID();
+    const storage = FlutterSecureStorage();
     context.read<SpaceTreeBloc>().add(ClearAllData());
-    storage.deleteAll();
+    user = null;
+    context.read<HomeBloc>().user = null;
+    await Future.wait<void>([
+      ProjectManager.clearProjectUUID(),
+      storage.deleteAll(),
+    ]);
   }
 }

From b90179107913acf7cf83cb2c8dfaf5d2016089c3 Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Tue, 22 Apr 2025 02:33:50 +0300
Subject: [PATCH 186/238] Update Flutter run and build commands, and added
 main_staging file

---
 ...e-static-web-apps-mango-bush-01e607f10.yml |  2 +-
 ...static-web-apps-polite-smoke-017c65c10.yml |  2 +-
 .vscode/launch.json                           | 39 +++++----
 README.md                                     |  9 +-
 lib/main_staging.dart                         | 86 +++++++++++++++++++
 .../space_tree/view/space_tree_view.dart      | 82 ++++++++----------
 6 files changed, 157 insertions(+), 63 deletions(-)
 create mode 100644 lib/main_staging.dart

diff --git a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
index f0379c95..cd1168fc 100644
--- a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
+++ b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
@@ -31,7 +31,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Flutter Web App
-        run: flutter build web --release --dart-define=FLAVOR=production
+        run: flutter build web --web-renderer canvaskit --flavor production -t lib/main.dart
 
       - name: Build And Deploy
         id: builddeploy
diff --git a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
index 28cf00a2..1edcb974 100644
--- a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
+++ b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
@@ -31,7 +31,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Flutter Web App
-        run: flutter build web --release --dart-define=FLAVOR=development
+        run: flutter build web --web-renderer canvaskit --flavor development -t lib/main_dev.dart
 
       - name: Build And Deploy
         id: builddeploy
diff --git a/.vscode/launch.json b/.vscode/launch.json
index b6f83bdc..ab5f8f0e 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,11 +10,14 @@
             "type": "dart",
        
             "args": [
-       
-              "--dart-define",
-       
-              "FLAVOR=development"
-       
+              "-d",
+              "chrome",
+              "--web-port",
+              "3000",
+              "--flavor",
+              "development",
+              "-t",
+              "lib/main_dev.dart",
             ],
        
             "flutterMode": "debug"
@@ -28,11 +31,14 @@
             "type": "dart",
        
             "args": [
-       
-              "--dart-define",
-       
-              "FLAVOR=staging"
-       
+                "-d",
+                "chrome",
+                "--web-port",
+                "3000",
+                "--flavor",
+                "staging",
+                "-t",
+                "lib/main_staging.dart",
             ],
        
             "flutterMode": "debug"
@@ -46,11 +52,14 @@
             "type": "dart",
        
             "args": [
-       
-              "--dart-define",
-       
-              "FLAVOR=production"
-       
+              "-d",
+              "chrome",
+              "--web-port",
+              "3000",
+              "--flavor",
+              "production",
+              "-t",
+              "lib/main_staging.dart",
             ],
        
             "flutterMode": "debug"
diff --git a/README.md b/README.md
index 745fe6f0..6a3cc51b 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,12 @@ samples, guidance on mobile development, and a full API reference.
 
 ## USEFUL COMMANDS
 
-Run on chrome: flutter run -d chrome --dart-define=FLAVOR='ENV_NAME'
+- Building for the Web
+  - CanvasKit
+    - `flutter build web --web-renderer canvaskit --flavor development -t lib/main_dev.dart --output=build/web_dev` - build for DEVELOPMENT.
+    - `flutter build web --web-renderer canvaskit --flavor staging -t lib/main_staging.dart --output=build/web_stg` - build for STAGING.
+    - `flutter build web --web-renderer canvaskit --flavor production -t lib/main.dart --output=build/web` - build for PRODUCTION.
+
+- run command: `flutter run -d chrome --flavor development --target=lib/main_dev.dart`
 
-Build: flutter build web --release --dart-define=FLAVOR='ENV_NAME'
 
diff --git a/lib/main_staging.dart b/lib/main_staging.dart
new file mode 100644
index 00000000..b0505c85
--- /dev/null
+++ b/lib/main_staging.dart
@@ -0,0 +1,86 @@
+import 'package:firebase_core/firebase_core.dart';
+import 'package:flutter/gestures.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:go_router/go_router.dart';
+import 'package:syncrow_web/firebase_options_dev.dart';
+import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_event.dart';
+import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.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/visitor_password/bloc/visitor_password_bloc.dart';
+import 'package:syncrow_web/services/locator.dart';
+import 'package:syncrow_web/utils/app_routes.dart';
+import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/theme/theme.dart';
+
+Future<void> main() async {
+  try {
+    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'staging');
+    await dotenv.load(fileName: '.env.$environment');
+    WidgetsFlutterBinding.ensureInitialized();
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptionsDev.currentPlatform,
+    );
+    initialSetup();
+  } catch (_) {}
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  MyApp({
+    super.key,
+  });
+
+  final GoRouter _router = GoRouter(
+    initialLocation: RoutesConst.auth,
+    routes: AppRoutes.getRoutes(),
+    redirect: (context, state) async {
+      String checkToken = await AuthBloc.getTokenAndValidate();
+      final loggedIn = checkToken == 'Success';
+      final goingToLogin = state.uri.toString() == RoutesConst.auth;
+
+      if (!loggedIn && !goingToLogin) return RoutesConst.auth;
+      if (loggedIn && goingToLogin) return RoutesConst.home;
+
+      return null;
+    },
+  );
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+        providers: [
+          BlocProvider<CreateRoutineBloc>(
+            create: (context) => CreateRoutineBloc(),
+          ),
+          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider<VisitorPasswordBloc>(
+            create: (context) => VisitorPasswordBloc(),
+          ),
+          BlocProvider<RoutineBloc>(
+            create: (context) => RoutineBloc(),
+          ),
+          BlocProvider<SpaceTreeBloc>(
+            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+          ),
+        ],
+        child: MaterialApp.router(
+          debugShowCheckedModeBanner: false,
+          scrollBehavior: const MaterialScrollBehavior().copyWith(
+            dragDevices: {
+              PointerDeviceKind.mouse,
+              PointerDeviceKind.touch,
+              PointerDeviceKind.stylus,
+              PointerDeviceKind.unknown,
+            },
+          ),
+          theme: myTheme,
+          routerConfig: _router,
+        ));
+  }
+}
diff --git a/lib/pages/space_tree/view/space_tree_view.dart b/lib/pages/space_tree/view/space_tree_view.dart
index 3d5d00bf..bfe3a2bd 100644
--- a/lib/pages/space_tree/view/space_tree_view.dart
+++ b/lib/pages/space_tree/view/space_tree_view.dart
@@ -41,14 +41,12 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<SpaceTreeBloc, SpaceTreeState>(builder: (context, state) {
-      final communities = state.searchQuery.isNotEmpty
-          ? state.filteredCommunity
-          : state.communityList;
+      final communities =
+          state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList;
       return Container(
         height: MediaQuery.sizeOf(context).height,
         decoration: widget.isSide == true
-            ? subSectionContainerDecoration.copyWith(
-                color: ColorsManager.whiteColors)
+            ? subSectionContainerDecoration.copyWith(color: ColorsManager.whiteColors)
             : const BoxDecoration(color: ColorsManager.whiteColors),
         child: state is SpaceTreeLoadingState
             ? const Center(child: CircularProgressIndicator())
@@ -81,12 +79,10 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                   style: context.textTheme.bodyMedium?.copyWith(
                                     color: ColorsManager.blackColor,
                                   ),
-                                  onChanged: (value) =>
-                                      context.read<SpaceTreeBloc>().add(
-                                            SearchQueryEvent(value),
-                                          ),
-                                  decoration:
-                                      textBoxDecoration(radios: 20)?.copyWith(
+                                  onChanged: (value) => context.read<SpaceTreeBloc>().add(
+                                        SearchQueryEvent(value),
+                                      ),
+                                  decoration: textBoxDecoration(radios: 20)?.copyWith(
                                     fillColor: Colors.white,
                                     suffixIcon: Padding(
                                       padding: const EdgeInsets.only(right: 16),
@@ -96,8 +92,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                         height: 24,
                                       ),
                                     ),
-                                    hintStyle:
-                                        context.textTheme.bodyMedium?.copyWith(
+                                    hintStyle: context.textTheme.bodyMedium?.copyWith(
                                       fontWeight: FontWeight.w400,
                                       fontSize: 12,
                                       color: ColorsManager.textGray,
@@ -121,27 +116,30 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                     child: state.isSearching
                         ? const Center(child: CircularProgressIndicator())
                         : SidebarCommunitiesList(
-                            onScrollToEnd: () => context.read<SpaceTreeBloc>().add(
-                                  PaginationEvent(
-                                    state.paginationModel,
-                                    state.communityList,
-                                  ),
-                                ),
+                            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,
-                                          ),
-                                        ),
+                                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,
                                 ),
@@ -158,8 +156,7 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                   (space) {
                                     return CustomExpansionTileSpaceTree(
                                       title: space.name,
-                                      isExpanded:
-                                          state.expandedSpaces.contains(space.uuid),
+                                      isExpanded: state.expandedSpaces.contains(space.uuid),
                                       onItemSelected: () {
                                         context.read<SpaceTreeBloc>().add(
                                               OnSpaceSelected(
@@ -170,18 +167,15 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
                                             );
                                         widget.onSelect();
                                       },
-                                      onExpansionChanged: () =>
-                                          context.read<SpaceTreeBloc>().add(
-                                                OnSpaceExpanded(
-                                                  communities[index].uuid,
-                                                  space.uuid ?? '',
-                                                ),
-                                              ),
-                                      isSelected: state.selectedSpaces
-                                              .contains(space.uuid) ||
-                                          state.soldCheck.contains(space.uuid),
-                                      isSoldCheck:
+                                      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,
@@ -210,8 +204,8 @@ class _SpaceTreeViewState extends State<SpaceTreeView> {
   ) {
     return space.children.map((child) {
       return CustomExpansionTileSpaceTree(
-        isSelected: state.selectedSpaces.contains(child.uuid) ||
-            state.soldCheck.contains(child.uuid),
+        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),

From d7a37c65190837f95bdde1547cf0324b49649792 Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Tue, 22 Apr 2025 03:01:43 +0300
Subject: [PATCH 187/238] Removed flavor from Flutter run and build commands

---
 .../azure-static-web-apps-mango-bush-01e607f10.yml        | 2 +-
 .../azure-static-web-apps-polite-smoke-017c65c10.yml      | 2 +-
 .vscode/launch.json                                       | 8 +-------
 README.md                                                 | 8 ++++----
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
index cd1168fc..db94e74f 100644
--- a/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
+++ b/.github/workflows/azure-static-web-apps-mango-bush-01e607f10.yml
@@ -31,7 +31,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Flutter Web App
-        run: flutter build web --web-renderer canvaskit --flavor production -t lib/main.dart
+        run: flutter build web --web-renderer canvaskit -t lib/main.dart
 
       - name: Build And Deploy
         id: builddeploy
diff --git a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
index 1edcb974..738bd279 100644
--- a/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
+++ b/.github/workflows/azure-static-web-apps-polite-smoke-017c65c10.yml
@@ -31,7 +31,7 @@ jobs:
         run: flutter pub get
 
       - name: Build Flutter Web App
-        run: flutter build web --web-renderer canvaskit --flavor development -t lib/main_dev.dart
+        run: flutter build web --web-renderer canvaskit -t lib/main_dev.dart
 
       - name: Build And Deploy
         id: builddeploy
diff --git a/.vscode/launch.json b/.vscode/launch.json
index ab5f8f0e..f81a9deb 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -14,8 +14,6 @@
               "chrome",
               "--web-port",
               "3000",
-              "--flavor",
-              "development",
               "-t",
               "lib/main_dev.dart",
             ],
@@ -35,8 +33,6 @@
                 "chrome",
                 "--web-port",
                 "3000",
-                "--flavor",
-                "staging",
                 "-t",
                 "lib/main_staging.dart",
             ],
@@ -56,10 +52,8 @@
               "chrome",
               "--web-port",
               "3000",
-              "--flavor",
-              "production",
               "-t",
-              "lib/main_staging.dart",
+              "lib/main.dart",
             ],
        
             "flutterMode": "debug"
diff --git a/README.md b/README.md
index 6a3cc51b..91409775 100644
--- a/README.md
+++ b/README.md
@@ -18,10 +18,10 @@ samples, guidance on mobile development, and a full API reference.
 
 - Building for the Web
   - CanvasKit
-    - `flutter build web --web-renderer canvaskit --flavor development -t lib/main_dev.dart --output=build/web_dev` - build for DEVELOPMENT.
-    - `flutter build web --web-renderer canvaskit --flavor staging -t lib/main_staging.dart --output=build/web_stg` - build for STAGING.
-    - `flutter build web --web-renderer canvaskit --flavor production -t lib/main.dart --output=build/web` - build for PRODUCTION.
+    - `flutter build web --web-renderer canvaskit -t lib/main_dev.dart --output=build/web_dev` - build for DEVELOPMENT.
+    - `flutter build web --web-renderer canvaskit -t lib/main_staging.dart --output=build/web_stg` - build for STAGING.
+    - `flutter build web --web-renderer canvaskit -t lib/main.dart --output=build/web` - build for PRODUCTION.
 
-- run command: `flutter run -d chrome --flavor development --target=lib/main_dev.dart`
+- run command: `flutter run -d chrome --target=lib/main_dev.dart`
 
 

From 177a4711fe52ca557f9abd593352d886e7426f44 Mon Sep 17 00:00:00 2001
From: Abdullah Alassaf <abdullah@realkeyper.com>
Date: Tue, 22 Apr 2025 03:39:27 +0300
Subject: [PATCH 188/238] Synced main_dev and main_staging with main.dart

---
 lib/main_dev.dart     | 15 +++++++--------
 lib/main_staging.dart | 11 ++++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/main_dev.dart b/lib/main_dev.dart
index a42d5d07..578b2c30 100644
--- a/lib/main_dev.dart
+++ b/lib/main_dev.dart
@@ -16,12 +16,12 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment =
-        String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
@@ -33,9 +33,7 @@ Future<void> main() async {
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({
-    super.key,
-  });
+  MyApp({super.key});
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -56,11 +54,10 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
         providers: [
-               BlocProvider<CreateRoutineBloc>(
+          BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(
-              create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -81,6 +78,8 @@ class MyApp extends StatelessWidget {
               PointerDeviceKind.unknown,
             },
           ),
+          key: NavigationService.navigatorKey,
+          // scaffoldMessengerKey: NavigationService.snackbarKey,
           theme: myTheme,
           routerConfig: _router,
         ));
diff --git a/lib/main_staging.dart b/lib/main_staging.dart
index b0505c85..e7f95c57 100644
--- a/lib/main_staging.dart
+++ b/lib/main_staging.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:go_router/go_router.dart';
-import 'package:syncrow_web/firebase_options_dev.dart';
+import 'package:syncrow_web/firebase_options_prod.dart';
 import 'package:syncrow_web/pages/auth/bloc/auth_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/home/bloc/home_event.dart';
@@ -16,6 +16,7 @@ import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.da
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
+import 'package:syncrow_web/utils/navigation_service.dart';
 import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
@@ -24,7 +25,7 @@ Future<void> main() async {
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
-      options: DefaultFirebaseOptionsDev.currentPlatform,
+      options: DefaultFirebaseOptionsStaging.currentPlatform,
     );
     initialSetup();
   } catch (_) {}
@@ -32,9 +33,7 @@ Future<void> main() async {
 }
 
 class MyApp extends StatelessWidget {
-  MyApp({
-    super.key,
-  });
+  MyApp({super.key});
 
   final GoRouter _router = GoRouter(
     initialLocation: RoutesConst.auth,
@@ -79,6 +78,8 @@ class MyApp extends StatelessWidget {
               PointerDeviceKind.unknown,
             },
           ),
+          key: NavigationService.navigatorKey,
+          // scaffoldMessengerKey: NavigationService.snackbarKey,
           theme: myTheme,
           routerConfig: _router,
         ));

From 05b31805107c29ce27ede2af21b5921718d09f64 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:22:41 +0300
Subject: [PATCH 189/238] Created `ControlDeviceService` interface and its
 remote and debounced implementation.

---
 lib/services/control_device_service.dart | 80 ++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 lib/services/control_device_service.dart

diff --git a/lib/services/control_device_service.dart b/lib/services/control_device_service.dart
new file mode 100644
index 00000000..b115990d
--- /dev/null
+++ b/lib/services/control_device_service.dart
@@ -0,0 +1,80 @@
+import 'dart:developer';
+
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+import 'package:syncrow_web/utils/constants/api_const.dart';
+
+abstract interface class ControlDeviceService {
+  Future<bool> controlDevice({
+    required String deviceUuid,
+    required Status status,
+  });
+}
+
+final class RemoteControlDeviceService implements ControlDeviceService {
+  @override
+  Future<bool> controlDevice({
+    required String deviceUuid,
+    required Status status,
+  }) async {
+    try {
+      final response = await HTTPService().post(
+        path: ApiEndpoints.deviceControl.replaceAll('{uuid}', deviceUuid),
+        body: status.toMap(),
+        showServerMessage: true,
+        expectedResponseModel: (json) {
+          return (json['success'] as bool?) ?? false;
+        },
+      );
+      return response;
+    } catch (e) {
+      log('Error fetching  $e', name: 'ControlDeviceService');
+      return false;
+    }
+  }
+}
+
+final class DebouncedControlDeviceService implements ControlDeviceService {
+  final ControlDeviceService decoratee;
+  final Duration _debounceDuration;
+  final List<(String deviceUuid, Status status)> _pendingRequests = [];
+  bool _isProcessing = false;
+
+  DebouncedControlDeviceService({
+    required this.decoratee,
+    Duration debounceDuration = const Duration(milliseconds: 1500),
+  }) : _debounceDuration = debounceDuration;
+
+  @override
+  Future<bool> controlDevice({
+    required String deviceUuid,
+    required Status status,
+  }) async {
+    _pendingRequests.add((deviceUuid, status));
+
+    if (_isProcessing) {
+      log(
+        'Request added to queue',
+        name: 'DebouncedControlDeviceService',
+      );
+      return false;
+    }
+
+    _isProcessing = true;
+
+    await Future.delayed(_debounceDuration);
+
+    final lastRequest = _pendingRequests.last;
+    _pendingRequests.clear();
+
+    try {
+      final ( lastRequestDeviceUuid, lastRequestStatus) = lastRequest;
+      return decoratee.controlDevice(
+        deviceUuid: lastRequestDeviceUuid,
+        status: lastRequestStatus,
+      );
+    } finally {
+      _isProcessing = false;
+    }
+  }
+}

From 8c637e40ff7c3325ee18547d736842f7a932fabe Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:23:00 +0300
Subject: [PATCH 190/238] Created `FlushMountedPresenceSensorModel` model.

---
 .../flush_mounted_presence_sensor_model.dart  | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
new file mode 100644
index 00000000..975af0e8
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
@@ -0,0 +1,99 @@
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
+
+class FlushMountedPresenceSensorModel {
+  FlushMountedPresenceSensorModel({
+    required this.presenceState,
+    required this.farDetection,
+    required this.illuminance,
+    required this.sensitivity,
+    required this.occurDistReduce,
+    required this.noneDelay,
+    required this.presenceDelay,
+    required this.nearDetection,
+    required this.sensiReduce,
+    required this.checkingResult,
+  });
+
+  static const String codePresenceState = 'presence_state';
+  static const String codeSensitivity = 'sensitivity';
+  static const String codeNearDetection = 'near_detection';
+  static const String codeFarDetection = 'far_detection';
+  static const String codeCheckingResult = 'checking_result';
+  static const String codePresenceDelay = 'presence_delay';
+  static const String codeNoneDelay = 'none_delay';
+  static const String codeOccurDistReduce = 'occur_dist_reduce';
+  static const String codeIlluminance = 'illum_value';
+  static const String codeSensiReduce = 'sensi_reduce';
+
+  String presenceState;
+  int sensitivity;
+  int nearDetection;
+  int farDetection;
+  String checkingResult;
+  int presenceDelay;
+  int noneDelay;
+  int occurDistReduce;
+  int illuminance;
+  int sensiReduce;
+
+  factory FlushMountedPresenceSensorModel.fromJson(List<Status> jsonList) {
+    String presenceState = 'none';
+    int sensitivity = 0;
+    int nearDetection = 0;
+    int farDetection = 0;
+    String checkingResult = 'none';
+    int presenceDelay = 0;
+    int noneDelay = 0;
+    int occurDistReduce = 0;
+    int illuminance = 0;
+    int sensiReduce = 0;
+
+    for (var status in jsonList) {
+      switch (status.code) {
+        case codePresenceState:
+          presenceState = status.value ?? 'presence';
+          break;
+        case codeSensitivity:
+          sensitivity = status.value ?? 0;
+          break;
+        case codeNearDetection:
+          nearDetection = status.value ?? 0;
+          break;
+        case codeFarDetection:
+          farDetection = status.value ?? 0;
+          break;
+        case codeCheckingResult:
+          checkingResult = status.value ?? 'check_success';
+          break;
+        case codePresenceDelay:
+          presenceDelay = status.value ?? 0;
+          break;
+        case codeNoneDelay:
+          noneDelay = status.value ?? 0;
+          break;
+        case codeOccurDistReduce:
+          occurDistReduce = status.value ?? 0;
+          break;
+        case codeIlluminance:
+          illuminance = status.value ?? 0;
+          break;
+        case codeSensiReduce:
+          sensiReduce = status.value ?? 0;
+          break;
+      }
+    }
+
+    return FlushMountedPresenceSensorModel(
+      presenceState: presenceState,
+      sensitivity: sensitivity,
+      nearDetection: nearDetection,
+      farDetection: farDetection,
+      checkingResult: checkingResult,
+      presenceDelay: presenceDelay,
+      noneDelay: noneDelay,
+      occurDistReduce: occurDistReduce,
+      illuminance: illuminance,
+      sensiReduce: sensiReduce,
+    );
+  }
+}

From 367d6717e72780173f8be30a321e35867b0d69b7 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:23:28 +0300
Subject: [PATCH 191/238] Refactor `PresenceUpdateData` widget to support
 decimal values.

---
 .../shared/sensors_widgets/presence_update_data.dart        | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart b/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart
index 16596a1f..4b4d5562 100644
--- a/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart
+++ b/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart
@@ -13,6 +13,7 @@ class PresenceUpdateData extends StatefulWidget {
     required this.maxValue,
     required this.steps,
     this.description,
+    this.valuesPercision = 0,
   });
 
   final String title;
@@ -22,6 +23,7 @@ class PresenceUpdateData extends StatefulWidget {
   final double steps;
   final Function action;
   final String? description;
+  final int valuesPercision;
 
   @override
   State<PresenceUpdateData> createState() => _CurrentTempState();
@@ -45,7 +47,7 @@ class _CurrentTempState extends State<PresenceUpdateData> {
   }
 
   void _onValueChanged(double newValue) {
-    widget.action(newValue.toInt());
+    widget.action(newValue);
   }
 
   @override
@@ -66,7 +68,7 @@ class _CurrentTempState extends State<PresenceUpdateData> {
                 color: ColorsManager.blackColor, fontWeight: FontWeight.w400, fontSize: 10),
           ),
           IncrementDecrementWidget(
-              value: widget.value.toString(),
+              value: widget.value.toStringAsFixed(widget.valuesPercision),
               description: widget.description ?? '',
               descriptionColor: ColorsManager.blackColor,
               onIncrement: () {

From 1975a1b6f466349af147330c0ccaee6029f79cb8 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:24:14 +0300
Subject: [PATCH 192/238] created `FlushMountedPresenceSensorBloc`, events, and
 states for device management.

---
 .../flush_mounted_presence_sensor_bloc.dart   | 266 ++++++++++++++++++
 .../flush_mounted_presence_sensor_event.dart  |  84 ++++++
 .../flush_mounted_presence_sensor_state.dart  |  76 +++++
 3 files changed, 426 insertions(+)
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_state.dart

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
new file mode 100644
index 00000000..06be2666
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -0,0 +1,266 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:firebase_database/firebase_database.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+import 'package:syncrow_web/services/devices_mang_api.dart';
+
+part 'flush_mounted_presence_sensor_event.dart';
+part 'flush_mounted_presence_sensor_state.dart';
+
+class FlushMountedPresenceSensorBloc
+    extends Bloc<FlushMountedPresenceSensorEvent, FlushMountedPresenceSensorState> {
+  final String deviceId;
+  late FlushMountedPresenceSensorModel deviceStatus;
+
+  final ControlDeviceService controlDeviceService;
+
+  FlushMountedPresenceSensorBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+  }) : super(FlushMountedPresenceSensorInitialState()) {
+    on<FlushMountedPresenceSensorFetchStatusEvent>(
+      _onFlushMountedPresenceSensorFetchStatusEvent,
+    );
+    on<FlushMountedPresenceSensorFetchBatchStatusEvent>(
+        _onFlushMountedPresenceSensorFetchBatchStatusEvent);
+    on<FlushMountedPresenceSensorChangeValueEvent>(
+      _onFlushMountedPresenceSensorChangeValueEvent,
+    );
+    on<FlushMountedPresenceSensorBatchControlEvent>(
+      _onFlushMountedPresenceSensorBatchControlEvent,
+    );
+    on<FlushMountedPresenceSensorGetDeviceReportsEvent>(
+        _onFlushMountedPresenceSensorGetDeviceReportsEvent);
+    on<FlushMountedPresenceSensorShowDescriptionEvent>(
+      _onFlushMountedPresenceSensorShowDescriptionEvent,
+    );
+    on<FlushMountedPresenceSensorBackToGridViewEvent>(
+      _onFlushMountedPresenceSensorBackToGridViewEvent,
+    );
+    on<FlushMountedPresenceSensorFactoryResetEvent>(
+      _onFlushMountedPresenceSensorFactoryResetEvent,
+    );
+  }
+
+  void _onFlushMountedPresenceSensorFetchStatusEvent(
+    FlushMountedPresenceSensorFetchStatusEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) async {
+    emit(FlushMountedPresenceSensorLoadingInitialState());
+    try {
+      final response = await DevicesManagementApi().getDeviceStatus(deviceId);
+      deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
+      emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+      _listenToChanges(emit, deviceId);
+    } catch (e) {
+      emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
+      return;
+    }
+  }
+
+  Future<void> _onFlushMountedPresenceSensorFetchBatchStatusEvent(
+    FlushMountedPresenceSensorFetchBatchStatusEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) async {
+    emit(FlushMountedPresenceSensorLoadingInitialState());
+    try {
+      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
+      emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+    } catch (e) {
+      emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
+    }
+  }
+
+  void _listenToChanges(
+    Emitter<FlushMountedPresenceSensorState> emit,
+    String deviceId,
+  ) {
+    try {
+      final ref = FirebaseDatabase.instance.ref(
+        'device-status/$deviceId',
+      );
+
+      ref.onValue.listen((DatabaseEvent event) {
+        Map<dynamic, dynamic> usersMap =
+            event.snapshot.value as Map<dynamic, dynamic>;
+        List<Status> statusList = [];
+
+        usersMap['status'].forEach((element) {
+          statusList.add(Status(code: element['code'], value: element['value']));
+        });
+
+        deviceStatus = FlushMountedPresenceSensorModel.fromJson(statusList);
+        emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+      });
+    } catch (_) {}
+  }
+
+  void _onFlushMountedPresenceSensorChangeValueEvent(
+    FlushMountedPresenceSensorChangeValueEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) async {
+    emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+    switch (event.code) {
+      case FlushMountedPresenceSensorModel.codeFarDetection:
+        deviceStatus.farDetection = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeSensitivity:
+        log('updated sensitivity: ${deviceStatus.sensitivity}-${event.value}');
+        deviceStatus.sensitivity = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeNoneDelay:
+        log('updated none delay: ${deviceStatus.noneDelay}-${event.value}');
+        deviceStatus.noneDelay = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codePresenceDelay:
+        deviceStatus.presenceDelay = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeNearDetection:
+        deviceStatus.nearDetection = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
+        deviceStatus.occurDistReduce = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeSensiReduce:
+        deviceStatus.sensiReduce = event.value;
+        break;
+      default:
+        break;
+    }
+    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+    await _runDeBouncer(
+      deviceId: deviceId,
+      code: event.code,
+      value: event.value,
+      isBatch: false,
+      emit: emit,
+    );
+  }
+
+  Future<void> _onFlushMountedPresenceSensorBatchControlEvent(
+    FlushMountedPresenceSensorBatchControlEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) async {
+    emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+    switch (event.code) {
+      case FlushMountedPresenceSensorModel.codeFarDetection:
+        deviceStatus.farDetection = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeSensitivity:
+        deviceStatus.sensitivity = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeNoneDelay:
+        deviceStatus.noneDelay = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codePresenceDelay:
+        deviceStatus.presenceDelay = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeNearDetection:
+        deviceStatus.nearDetection = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
+        deviceStatus.occurDistReduce = event.value;
+        break;
+      case FlushMountedPresenceSensorModel.codeSensiReduce:
+        deviceStatus.sensiReduce = event.value;
+        break;
+      default:
+        break;
+    }
+    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+    await _runDeBouncer(
+      deviceId: event.deviceIds,
+      code: event.code,
+      value: event.value,
+      emit: emit,
+      isBatch: true,
+    );
+  }
+
+  Future<void> _runDeBouncer({
+    required dynamic deviceId,
+    required String code,
+    required dynamic value,
+    required Emitter<FlushMountedPresenceSensorState> emit,
+    required bool isBatch,
+  }) async {
+    try {
+      if (isBatch) {
+        await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+      } else {
+        await controlDeviceService.controlDevice(
+          deviceUuid: deviceId,
+          status: Status(code: code, value: value),
+        );
+      }
+    } catch (_) {
+      await Future.delayed(const Duration(milliseconds: 500));
+      add(FlushMountedPresenceSensorFetchStatusEvent());
+    }
+  }
+
+  Future<void> _onFlushMountedPresenceSensorGetDeviceReportsEvent(
+    FlushMountedPresenceSensorGetDeviceReportsEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) async {
+    emit(FlushMountedPresenceSensorDeviceReportsLoadingState());
+
+    try {
+      await DevicesManagementApi.getDeviceReports(deviceId, event.code)
+          .then((value) {
+        emit(FlushMountedPresenceSensorDeviceReportsState(
+            deviceReport: value, code: event.code));
+      });
+    } catch (e) {
+      emit(FlushMountedPresenceSensorDeviceReportsFailedState(error: e.toString()));
+      return;
+    }
+  }
+
+  void _onFlushMountedPresenceSensorShowDescriptionEvent(
+    FlushMountedPresenceSensorShowDescriptionEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) {
+    emit(FlushMountedPresenceSensorShowDescriptionState(
+        description: event.description));
+  }
+
+  void _onFlushMountedPresenceSensorBackToGridViewEvent(
+    FlushMountedPresenceSensorBackToGridViewEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) {
+    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+  }
+
+  Future<void> _onFlushMountedPresenceSensorFactoryResetEvent(
+    FlushMountedPresenceSensorFactoryResetEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) async {
+    emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+    try {
+      final response = await DevicesManagementApi().factoryReset(
+        event.factoryReset,
+        event.deviceId,
+      );
+      if (!response) {
+        emit(
+          const FlushMountedPresenceSensorFailedState(
+            error: 'Something went wrong with factory reset, please try again',
+          ),
+        );
+      } else {
+        emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+      }
+    } catch (e) {
+      emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
+    }
+  }
+}
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
new file mode 100644
index 00000000..f1636300
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
@@ -0,0 +1,84 @@
+part of 'flush_mounted_presence_sensor_bloc.dart';
+
+sealed class FlushMountedPresenceSensorEvent extends Equatable {
+  const FlushMountedPresenceSensorEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class FlushMountedPresenceSensorFetchStatusEvent
+    extends FlushMountedPresenceSensorEvent {}
+
+class FlushMountedPresenceSensorChangeValueEvent
+    extends FlushMountedPresenceSensorEvent {
+  final int value;
+  final String code;
+  final bool isBatchControl;
+  const FlushMountedPresenceSensorChangeValueEvent({
+    required this.value,
+    required this.code,
+    this.isBatchControl = false,
+  });
+
+  @override
+  List<Object> get props => [value, code];
+}
+
+class FlushMountedPresenceSensorFetchBatchStatusEvent
+    extends FlushMountedPresenceSensorEvent {
+  final List<String> devicesIds;
+  const FlushMountedPresenceSensorFetchBatchStatusEvent(this.devicesIds);
+
+  @override
+  List<Object> get props => [devicesIds];
+}
+
+class FlushMountedPresenceSensorGetDeviceReportsEvent
+    extends FlushMountedPresenceSensorEvent {
+  final String deviceUuid;
+  final String code;
+  const FlushMountedPresenceSensorGetDeviceReportsEvent({
+    required this.deviceUuid,
+    required this.code,
+  });
+
+  @override
+  List<Object> get props => [deviceUuid, code];
+}
+
+class FlushMountedPresenceSensorShowDescriptionEvent
+    extends FlushMountedPresenceSensorEvent {
+  final String description;
+  const FlushMountedPresenceSensorShowDescriptionEvent({required this.description});
+}
+
+class FlushMountedPresenceSensorBackToGridViewEvent
+    extends FlushMountedPresenceSensorEvent {}
+
+class FlushMountedPresenceSensorBatchControlEvent
+    extends FlushMountedPresenceSensorEvent {
+  final List<String> deviceIds;
+  final String code;
+  final dynamic value;
+
+  const FlushMountedPresenceSensorBatchControlEvent({
+    required this.deviceIds,
+    required this.code,
+    required this.value,
+  });
+
+  @override
+  List<Object> get props => [deviceIds, code, value];
+}
+
+class FlushMountedPresenceSensorFactoryResetEvent
+    extends FlushMountedPresenceSensorEvent {
+  final String deviceId;
+  final FactoryResetModel factoryReset;
+
+  const FlushMountedPresenceSensorFactoryResetEvent({
+    required this.deviceId,
+    required this.factoryReset,
+  });
+}
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_state.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_state.dart
new file mode 100644
index 00000000..0fef07f2
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_state.dart
@@ -0,0 +1,76 @@
+part of 'flush_mounted_presence_sensor_bloc.dart';
+
+sealed class FlushMountedPresenceSensorState extends Equatable {
+  const FlushMountedPresenceSensorState();
+
+  @override
+  List<Object> get props => [];
+}
+
+class FlushMountedPresenceSensorInitialState
+    extends FlushMountedPresenceSensorState {}
+
+class FlushMountedPresenceSensorLoadingInitialState
+    extends FlushMountedPresenceSensorState {}
+
+class FlushMountedPresenceSensorUpdateState extends FlushMountedPresenceSensorState {
+  final FlushMountedPresenceSensorModel model;
+  const FlushMountedPresenceSensorUpdateState({required this.model});
+
+  @override
+  List<Object> get props => [model];
+}
+
+class FlushMountedPresenceSensorLoadingNewSate
+    extends FlushMountedPresenceSensorState {
+  final FlushMountedPresenceSensorModel model;
+  const FlushMountedPresenceSensorLoadingNewSate({required this.model});
+
+  @override
+  List<Object> get props => [model];
+}
+
+class FlushMountedPresenceSensorFailedState extends FlushMountedPresenceSensorState {
+  final String error;
+
+  const FlushMountedPresenceSensorFailedState({required this.error});
+
+  @override
+  List<Object> get props => [error];
+}
+
+class FlushMountedPresenceSensorDeviceReportsLoadingState
+    extends FlushMountedPresenceSensorState {}
+
+class FlushMountedPresenceSensorDeviceReportsState
+    extends FlushMountedPresenceSensorState {
+  const FlushMountedPresenceSensorDeviceReportsState({
+    required this.deviceReport,
+    required this.code,
+  });
+
+  final DeviceReport deviceReport;
+  final String code;
+
+  @override
+  List<Object> get props => [deviceReport, code];
+}
+
+class FlushMountedPresenceSensorDeviceReportsFailedState
+    extends FlushMountedPresenceSensorState {
+  const FlushMountedPresenceSensorDeviceReportsFailedState({required this.error});
+
+  final String error;
+
+  @override
+  List<Object> get props => [error];
+}
+
+class FlushMountedPresenceSensorShowDescriptionState
+    extends FlushMountedPresenceSensorState {
+  const FlushMountedPresenceSensorShowDescriptionState({required this.description});
+
+  final String description;
+  @override
+  List<Object> get props => [description];
+}

From fb8ccdf0a67043f4203fd3519f50de5693f999d2 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:24:38 +0300
Subject: [PATCH 193/238] Add FlushMountedPresenceSensorControlView for
 managing presence sensor settings

---
 .../helper/route_controls_based_code.dart     |   4 +
 ..._mounted_presence_sensor_control_view.dart | 225 ++++++++++++++++++
 2 files changed, 229 insertions(+)
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart

diff --git a/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart b/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart
index e38ac582..81405451 100644
--- a/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart
+++ b/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart
@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_batch_st
 import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_status_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_control_view.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/gateway/view/gateway_batch_control.dart';
@@ -104,6 +105,9 @@ mixin RouteControlsBasedCode {
         );
       case 'SOS':
         return SosDeviceControlsView(device: device);
+
+      case 'NCPS': 
+        return FlushMountedPresenceSensorControlView(device: device);
       default:
         return const SizedBox();
     }
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
new file mode 100644
index 00000000..5a355067
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -0,0 +1,225 @@
+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/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
+import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
+import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart';
+import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_status.dart';
+import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
+import 'package:syncrow_web/pages/device_managment/shared/table/description_view.dart';
+import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+
+class FlushMountedPresenceSensorControlView extends StatelessWidget
+    with HelperResponsiveLayout {
+  const FlushMountedPresenceSensorControlView({super.key, required this.device});
+
+  final AllDevicesModel device;
+
+  @override
+  Widget build(BuildContext context) {
+    final isExtraLarge = isExtraLargeScreenSize(context);
+    final isLarge = isLargeScreenSize(context);
+    final isMedium = isMediumScreenSize(context);
+    return BlocProvider(
+      create: (context) => FlushMountedPresenceSensorBloc(
+        deviceId: device.uuid!,
+        controlDeviceService: DebouncedControlDeviceService(
+          decoratee: RemoteControlDeviceService(),
+        ),
+      )..add(FlushMountedPresenceSensorFetchStatusEvent()),
+      child: BlocBuilder<FlushMountedPresenceSensorBloc,
+          FlushMountedPresenceSensorState>(
+        builder: (context, state) {
+          if (state is FlushMountedPresenceSensorLoadingInitialState ||
+              state is FlushMountedPresenceSensorDeviceReportsLoadingState) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (state is FlushMountedPresenceSensorUpdateState) {
+            return _buildGridView(
+                context, state.model, isExtraLarge, isLarge, isMedium);
+          } else if (state is FlushMountedPresenceSensorDeviceReportsState) {
+            return ReportsTable(
+              report: state.deviceReport,
+              thirdColumnTitle:
+                  state.code == 'illuminance_value' ? "Value" : 'Status',
+              thirdColumnDescription:
+                  state.code == 'illuminance_value' ? "Lux" : null,
+              onRowTap: (index) {},
+              onClose: () {
+                context
+                    .read<FlushMountedPresenceSensorBloc>()
+                    .add(FlushMountedPresenceSensorBackToGridViewEvent());
+              },
+            );
+          } else if (state is FlushMountedPresenceSensorShowDescriptionState) {
+            return DescriptionView(
+              description: state.description,
+              onClose: () {
+                context
+                    .read<FlushMountedPresenceSensorBloc>()
+                    .add(FlushMountedPresenceSensorBackToGridViewEvent());
+              },
+            );
+          } else if (state is FlushMountedPresenceSensorDeviceReportsFailedState) {
+            final model =
+                context.read<FlushMountedPresenceSensorBloc>().deviceStatus;
+            return _buildGridView(
+              context,
+              model,
+              isExtraLarge,
+              isLarge,
+              isMedium,
+            );
+          }
+          return const Center(
+            child: Text('Error fetching status', textAlign: TextAlign.center),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget _buildGridView(
+    BuildContext context,
+    FlushMountedPresenceSensorModel model,
+    bool isExtraLarge,
+    bool isLarge,
+    bool isMedium,
+  ) {
+    return GridView(
+      padding: const EdgeInsets.symmetric(horizontal: 50),
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: isLarge || isExtraLarge
+            ? 3
+            : isMedium
+                ? 2
+                : 1,
+        mainAxisExtent: 140,
+        crossAxisSpacing: 12,
+        mainAxisSpacing: 12,
+      ),
+      children: [
+        PresenceState(
+          value: model.presenceState,
+        ),
+        PresenceDisplayValue(
+          value: model.illuminance.toString(),
+          postfix: 'Lux',
+          description: 'Illuminance Value',
+        ),
+        PresenceUpdateData(
+          value: model.sensitivity.toDouble(),
+          title: 'Sensitivity:',
+          minValue: 0,
+          maxValue: 9,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeSensitivity,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.nearDetection).toDouble(),
+          title: 'Nearest Detect Dist:',
+          description: 'm',
+          minValue: 0.0,
+          maxValue: 950,
+          steps: 10,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeNearDetection,
+                  value: (value).toInt(),
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.farDetection).toDouble(),
+          title: 'Max Detect Dist:',
+          description: 'm',
+          minValue: 0.0,
+          maxValue: 950,
+          steps: 10,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeFarDetection,
+                  value: (value).toInt(),
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.presenceDelay.toDouble()),
+          title: 'Trigger Level:',
+          minValue: 0,
+          maxValue: 3,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.occurDistReduce.toDouble()),
+          title: 'Indent Level:',
+          minValue: 0,
+          maxValue: 3,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.sensiReduce.toDouble()),
+          title: 'Target Confirm Time:',
+          description: 's',
+          minValue: 0,
+          maxValue: 3,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: ((model.noneDelay).toDouble()),
+          description: 's',
+          title: 'Disappe Delay:',
+          minValue: 0,
+          maxValue: 3000,
+          steps: 10,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeNoneDelay,
+                  value: value,
+                ),
+              ),
+        ),
+        GestureDetector(
+          onTap: () => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorGetDeviceReportsEvent(
+                  code: 'presence_state',
+                  deviceUuid: device.uuid!,
+                ),
+              ),
+          child: const PresenceStaticWidget(
+            icon: Assets.presenceRecordIcon,
+            description: 'Presence Record',
+          ),
+        ),
+      ],
+    );
+  }
+}

From 8c960bd5f11872ac7bd42c3ffa0c9e8594a31859 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:26:17 +0300
Subject: [PATCH 194/238] created `BatchControlDevicesService` interface.

---
 lib/services/batch_control_devices_service.dart | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 lib/services/batch_control_devices_service.dart

diff --git a/lib/services/batch_control_devices_service.dart b/lib/services/batch_control_devices_service.dart
new file mode 100644
index 00000000..3049ec7e
--- /dev/null
+++ b/lib/services/batch_control_devices_service.dart
@@ -0,0 +1,7 @@
+abstract interface class BatchControlDevicesService {
+  Future<bool> batchControlDevices({
+    required List<String> uuids,
+    required String code,
+    required Object value,
+  });
+}

From 24130be66589ad110e100e52caa4b7ddb3c50ba0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:26:55 +0300
Subject: [PATCH 195/238] organized instances in bloc.

---
 .../bloc/flush_mounted_presence_sensor_bloc.dart               | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index 06be2666..d7720937 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -17,10 +17,9 @@ part 'flush_mounted_presence_sensor_state.dart';
 class FlushMountedPresenceSensorBloc
     extends Bloc<FlushMountedPresenceSensorEvent, FlushMountedPresenceSensorState> {
   final String deviceId;
-  late FlushMountedPresenceSensorModel deviceStatus;
-
   final ControlDeviceService controlDeviceService;
 
+  late FlushMountedPresenceSensorModel deviceStatus;
   FlushMountedPresenceSensorBloc({
     required this.deviceId,
     required this.controlDeviceService,

From b11d4186fb9efc55e5b2a587515c9d50b17075c3 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:31:26 +0300
Subject: [PATCH 196/238] Add BatchControlDevicesService integration to
 FlushMountedPresenceSensorBloc and ControlView

---
 .../flush_mounted_presence_sensor_bloc.dart   |  9 +-
 ..._mounted_presence_sensor_control_view.dart |  4 +
 .../batch_control_devices_service.dart        | 83 +++++++++++++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index d7720937..98cfa977 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_rep
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
 import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/services/devices_mang_api.dart';
 
@@ -18,11 +19,13 @@ class FlushMountedPresenceSensorBloc
     extends Bloc<FlushMountedPresenceSensorEvent, FlushMountedPresenceSensorState> {
   final String deviceId;
   final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
 
   late FlushMountedPresenceSensorModel deviceStatus;
   FlushMountedPresenceSensorBloc({
     required this.deviceId,
     required this.controlDeviceService,
+    required this.batchControlDevicesService,
   }) : super(FlushMountedPresenceSensorInitialState()) {
     on<FlushMountedPresenceSensorFetchStatusEvent>(
       _onFlushMountedPresenceSensorFetchStatusEvent,
@@ -193,7 +196,11 @@ class FlushMountedPresenceSensorBloc
   }) async {
     try {
       if (isBatch) {
-        await DevicesManagementApi().deviceBatchControl(deviceId, code, value);
+        await batchControlDevicesService.batchControlDevices(
+          uuids: deviceId,
+          code: code,
+          value: value,
+        );
       } else {
         await controlDeviceService.controlDevice(
           deviceUuid: deviceId,
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index 5a355067..c02b4141 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presen
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/description_view.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
 import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
@@ -30,6 +31,9 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
         controlDeviceService: DebouncedControlDeviceService(
           decoratee: RemoteControlDeviceService(),
         ),
+        batchControlDevicesService: DebouncedBatchControlDevicesService(
+          decoratee: RemoteBatchControlDevicesService(),
+        ),
       )..add(FlushMountedPresenceSensorFetchStatusEvent()),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
diff --git a/lib/services/batch_control_devices_service.dart b/lib/services/batch_control_devices_service.dart
index 3049ec7e..c8d0bfc2 100644
--- a/lib/services/batch_control_devices_service.dart
+++ b/lib/services/batch_control_devices_service.dart
@@ -1,3 +1,8 @@
+import 'dart:developer';
+
+import 'package:syncrow_web/services/api/http_service.dart';
+import 'package:syncrow_web/utils/constants/api_const.dart';
+
 abstract interface class BatchControlDevicesService {
   Future<bool> batchControlDevices({
     required List<String> uuids,
@@ -5,3 +10,81 @@ abstract interface class BatchControlDevicesService {
     required Object value,
   });
 }
+
+class RemoteBatchControlDevicesService implements BatchControlDevicesService {
+  @override
+  Future<bool> batchControlDevices({
+    required List<String> uuids,
+    required String code,
+    required Object value,
+  }) async {
+    try {
+      final body = {
+        'devicesUuid': uuids,
+        'code': code,
+        'value': value,
+        'operationType': 'COMMAND',
+      };
+
+      final response = await HTTPService().post(
+        path: ApiEndpoints.deviceBatchControl,
+        body: body,
+        showServerMessage: true,
+        expectedResponseModel: (json) => (json['success'] as bool?) ?? false,
+      );
+
+      return response;
+    } catch (e) {
+      log('Error fetching $e', name: 'BatchControlDevicesService');
+      return false;
+    }
+  }
+}
+
+final class DebouncedBatchControlDevicesService
+    implements BatchControlDevicesService {
+  final BatchControlDevicesService decoratee;
+  final Duration _debounceDuration;
+  final List<(List<String> uuids, String code, Object value)> _pendingRequests = [];
+  bool _isProcessing = false;
+
+  DebouncedBatchControlDevicesService({
+    required this.decoratee,
+    Duration debounceDuration = const Duration(milliseconds: 1500),
+  }) : _debounceDuration = debounceDuration;
+
+  @override
+  Future<bool> batchControlDevices({
+    required List<String> uuids,
+    required String code,
+    required Object value,
+  }) async {
+    _pendingRequests.add((uuids, code, value));
+
+    if (_isProcessing) {
+      log(
+        'Request added to queue',
+        name: 'DebouncedBatchControlDevicesService',
+      );
+      return false;
+    }
+
+    _isProcessing = true;
+
+    await Future.delayed(_debounceDuration);
+
+    final lastRequest = _pendingRequests.last;
+    _pendingRequests.clear();
+
+    try {
+      final (lastRequestUuids, lastRequestCode, lastRequestValue) = lastRequest;
+      return decoratee.batchControlDevices(
+        uuids: lastRequestUuids,
+        code: lastRequestCode,
+        value: lastRequestValue,
+      );
+    } finally {
+      _isProcessing = false;
+    }
+  }
+}

From 42d6b64e588a96210a131dd050ea6cc63739234c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:32:49 +0300
Subject: [PATCH 197/238] Refactor FlushMountedPresenceSensorBloc to replace
 _runDeBouncer with _controlDevice for handling device control logic

---
 .../bloc/flush_mounted_presence_sensor_bloc.dart            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index 98cfa977..f15c14d6 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -138,7 +138,7 @@ class FlushMountedPresenceSensorBloc
         break;
     }
     emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-    await _runDeBouncer(
+    await _controlDevice(
       deviceId: deviceId,
       code: event.code,
       value: event.value,
@@ -178,7 +178,7 @@ class FlushMountedPresenceSensorBloc
         break;
     }
     emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-    await _runDeBouncer(
+    await _controlDevice(
       deviceId: event.deviceIds,
       code: event.code,
       value: event.value,
@@ -187,7 +187,7 @@ class FlushMountedPresenceSensorBloc
     );
   }
 
-  Future<void> _runDeBouncer({
+  Future<void> _controlDevice({
     required dynamic deviceId,
     required String code,
     required dynamic value,

From 91f93d439528eab3479a53580a81ce3f35d52c2a Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:44:11 +0300
Subject: [PATCH 198/238] Refactor FlushMountedPresenceSensorBloc to streamline
 device control logic and remove redundant code

---
 .../flush_mounted_presence_sensor_bloc.dart   | 141 +++++++-----------
 1 file changed, 51 insertions(+), 90 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index f15c14d6..a3c15aa0 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:developer';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
@@ -110,41 +109,16 @@ class FlushMountedPresenceSensorBloc
     Emitter<FlushMountedPresenceSensorState> emit,
   ) async {
     emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-    switch (event.code) {
-      case FlushMountedPresenceSensorModel.codeFarDetection:
-        deviceStatus.farDetection = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeSensitivity:
-        log('updated sensitivity: ${deviceStatus.sensitivity}-${event.value}');
-        deviceStatus.sensitivity = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeNoneDelay:
-        log('updated none delay: ${deviceStatus.noneDelay}-${event.value}');
-        deviceStatus.noneDelay = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codePresenceDelay:
-        deviceStatus.presenceDelay = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeNearDetection:
-        deviceStatus.nearDetection = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
-        deviceStatus.occurDistReduce = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeSensiReduce:
-        deviceStatus.sensiReduce = event.value;
-        break;
-      default:
-        break;
-    }
+    _updateDeviceFunctionFromCode(event.code, event.value);
     emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-    await _controlDevice(
-      deviceId: deviceId,
-      code: event.code,
-      value: event.value,
-      isBatch: false,
-      emit: emit,
-    );
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (_) {
+      await _reloadDeviceStatus();
+    }
   }
 
   Future<void> _onFlushMountedPresenceSensorBatchControlEvent(
@@ -152,67 +126,54 @@ class FlushMountedPresenceSensorBloc
     Emitter<FlushMountedPresenceSensorState> emit,
   ) async {
     emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-    switch (event.code) {
-      case FlushMountedPresenceSensorModel.codeFarDetection:
-        deviceStatus.farDetection = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeSensitivity:
-        deviceStatus.sensitivity = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeNoneDelay:
-        deviceStatus.noneDelay = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codePresenceDelay:
-        deviceStatus.presenceDelay = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeNearDetection:
-        deviceStatus.nearDetection = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
-        deviceStatus.occurDistReduce = event.value;
-        break;
-      case FlushMountedPresenceSensorModel.codeSensiReduce:
-        deviceStatus.sensiReduce = event.value;
-        break;
-      default:
-        break;
-    }
+    _updateDeviceFunctionFromCode(event.code, event.value);
     emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-    await _controlDevice(
-      deviceId: event.deviceIds,
-      code: event.code,
-      value: event.value,
-      emit: emit,
-      isBatch: true,
-    );
+
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (_) {
+      await _reloadDeviceStatus();
+    }
   }
 
-  Future<void> _controlDevice({
-    required dynamic deviceId,
-    required String code,
-    required dynamic value,
-    required Emitter<FlushMountedPresenceSensorState> emit,
-    required bool isBatch,
-  }) async {
-    try {
-      if (isBatch) {
-        await batchControlDevicesService.batchControlDevices(
-          uuids: deviceId,
-          code: code,
-          value: value,
-        );
-      } else {
-        await controlDeviceService.controlDevice(
-          deviceUuid: deviceId,
-          status: Status(code: code, value: value),
-        );
-      }
-    } catch (_) {
-      await Future.delayed(const Duration(milliseconds: 500));
-      add(FlushMountedPresenceSensorFetchStatusEvent());
+  void _updateDeviceFunctionFromCode(String code, int value) {
+    switch (code) {
+      case FlushMountedPresenceSensorModel.codeFarDetection:
+        deviceStatus.farDetection = value;
+        break;
+      case FlushMountedPresenceSensorModel.codeSensitivity:
+        deviceStatus.sensitivity = value;
+        break;
+      case FlushMountedPresenceSensorModel.codeNoneDelay:
+        deviceStatus.noneDelay = value;
+        break;
+      case FlushMountedPresenceSensorModel.codePresenceDelay:
+        deviceStatus.presenceDelay = value;
+        break;
+      case FlushMountedPresenceSensorModel.codeNearDetection:
+        deviceStatus.nearDetection = value;
+        break;
+      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
+        deviceStatus.occurDistReduce = value;
+        break;
+      case FlushMountedPresenceSensorModel.codeSensiReduce:
+        deviceStatus.sensiReduce = value;
+        break;
+      default:
+        return;
     }
   }
 
+  Future<void> _reloadDeviceStatus() async {
+    await Future.delayed(const Duration(milliseconds: 500), () {
+      add(FlushMountedPresenceSensorFetchStatusEvent());
+    });
+  }
+
   Future<void> _onFlushMountedPresenceSensorGetDeviceReportsEvent(
     FlushMountedPresenceSensorGetDeviceReportsEvent event,
     Emitter<FlushMountedPresenceSensorState> emit,

From 7adce3b94ca4e3f963756f430a512c3fc57b2094 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:44:44 +0300
Subject: [PATCH 199/238] Refactor
 _onFlushMountedPresenceSensorFetchBatchStatusEvent to use final for response
 variable

---
 .../bloc/flush_mounted_presence_sensor_bloc.dart                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index a3c15aa0..9b62cb4e 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -72,7 +72,7 @@ class FlushMountedPresenceSensorBloc
   ) async {
     emit(FlushMountedPresenceSensorLoadingInitialState());
     try {
-      var response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
+      final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
       emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
     } catch (e) {

From d1bb7b129ffce822e507d3cad65de9ddefa5f6a1 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Wed, 23 Apr 2025 10:46:56 +0300
Subject: [PATCH 200/238] Refactor widget lifecycle methods for temperature
 control and presence sensor

---
 .../ac/view/control_list/current_temp.dart    | 10 +++-
 .../view/ceiling_sensor_controls.dart         | 34 ++++++++------
 .../sensors_widgets/presense_nobody_time.dart | 10 ++++
 .../wall_sensor/bloc/wall_bloc.dart           | 46 +++++++++++--------
 .../wall_sensor/bloc/wall_event.dart          |  6 +++
 5 files changed, 72 insertions(+), 34 deletions(-)

diff --git a/lib/pages/device_managment/ac/view/control_list/current_temp.dart b/lib/pages/device_managment/ac/view/control_list/current_temp.dart
index 7618846c..fdd51164 100644
--- a/lib/pages/device_managment/ac/view/control_list/current_temp.dart
+++ b/lib/pages/device_managment/ac/view/control_list/current_temp.dart
@@ -60,7 +60,15 @@ class _CurrentTempState extends State<CurrentTemp> {
           );
     });
   }
-
+  @override
+  void didUpdateWidget(CurrentTemp oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.tempSet != widget.tempSet) {
+      setState(() {
+        _adjustedValue = _initialAdjustedValue(widget.tempSet);
+      });
+    }
+  }
   @override
   void dispose() {
     _debounce?.cancel();
diff --git a/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart b/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart
index 845c326b..36b676e9 100644
--- a/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart
+++ b/lib/pages/device_managment/ceiling_sensor/view/ceiling_sensor_controls.dart
@@ -16,7 +16,8 @@ import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dar
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLayout {
+class CeilingSensorControlsView extends StatelessWidget
+    with HelperResponsiveLayout {
   const CeilingSensorControlsView({super.key, required this.device});
 
   final AllDevicesModel device;
@@ -31,29 +32,35 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ..add(CeilingInitialEvent(device.uuid ?? '')),
       child: BlocBuilder<CeilingSensorBloc, CeilingSensorState>(
         builder: (context, state) {
-          if (state is CeilingLoadingInitialState || state is CeilingReportsLoadingState) {
+          if (state is CeilingLoadingInitialState ||
+              state is CeilingReportsLoadingState) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is CeilingUpdateState) {
-            return _buildGridView(
-                context, state.ceilingSensorModel, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(context, state.ceilingSensorModel,
+                isExtraLarge, isLarge, isMedium);
           } else if (state is CeilingReportsState) {
             return ReportsTable(
               report: state.deviceReport,
               onRowTap: (index) {},
               onClose: () {
-                context.read<CeilingSensorBloc>().add(BackToCeilingGridViewEvent());
+                context
+                    .read<CeilingSensorBloc>()
+                    .add(BackToCeilingGridViewEvent());
               },
             );
           } else if (state is ShowCeilingDescriptionState) {
             return DescriptionView(
               description: state.description,
               onClose: () {
-                context.read<CeilingSensorBloc>().add(BackToCeilingGridViewEvent());
+                context
+                    .read<CeilingSensorBloc>()
+                    .add(BackToCeilingGridViewEvent());
               },
             );
           } else if (state is CeilingReportsFailedState) {
             final model = context.read<CeilingSensorBloc>().deviceStatus;
-            return _buildGridView(context, model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(
+                context, model, isExtraLarge, isLarge, isMedium);
           }
           return const Center(child: Text('Error fetching status'));
         },
@@ -61,8 +68,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
     );
   }
 
-  Widget _buildGridView(BuildContext context, CeilingSensorModel model, bool isExtraLarge,
-      bool isLarge, bool isMedium) {
+  Widget _buildGridView(BuildContext context, CeilingSensorModel model,
+      bool isExtraLarge, bool isLarge, bool isMedium) {
     return GridView(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       shrinkWrap: true,
@@ -143,8 +150,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ),
         GestureDetector(
           onTap: () {
-            context.read<CeilingSensorBloc>().add(
-                GetCeilingDeviceReportsEvent(code: 'presence_state', deviceUuid: device.uuid!));
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
+                code: 'presence_state', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.illuminanceRecordIcon,
@@ -153,9 +160,8 @@ class CeilingSensorControlsView extends StatelessWidget with HelperResponsiveLay
         ),
         GestureDetector(
           onTap: () {
-            context
-                .read<CeilingSensorBloc>()
-                .add(GetCeilingDeviceReportsEvent(code: '', deviceUuid: device.uuid!));
+            context.read<CeilingSensorBloc>().add(GetCeilingDeviceReportsEvent(
+                code: '', deviceUuid: device.uuid!));
           },
           child: const PresenceStaticWidget(
             icon: Assets.helpDescriptionIcon,
diff --git a/lib/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart b/lib/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart
index 4e64ee1e..9cc23505 100644
--- a/lib/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart
+++ b/lib/pages/device_managment/shared/sensors_widgets/presense_nobody_time.dart
@@ -84,6 +84,16 @@ class _PresenceUpdateDataState extends State<PresenceNoBodyTime> {
     }
   }
 
+  @override
+  void didUpdateWidget(PresenceNoBodyTime oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.value != widget.value) {
+      setState(() {
+        _currentValue = widget.value;
+      });
+    }
+  }
+
   @override
   Widget build(BuildContext context) {
     return DeviceControlsContainer(
diff --git a/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart b/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
index ea2813d7..3c144142 100644
--- a/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/wall_bloc.dart
@@ -21,6 +21,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     on<ShowDescriptionEvent>(_showDescription);
     on<BackToGridViewEvent>(_backToGridView);
     on<WallSensorFactoryResetEvent>(_onFactoryReset);
+    on<WallSensorRealtimeUpdateEvent>(_onRealtimeUpdate);
   }
 
   void _fetchWallSensorStatus(
@@ -30,7 +31,7 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       var response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = WallSensorModel.fromJson(response.status);
       emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
-      _listenToChanges(emit, deviceId);
+      _listenToChanges(deviceId);
     } catch (e) {
       emit(WallSensorFailedState(error: e.toString()));
       return;
@@ -52,28 +53,27 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
     }
   }
 
-  _listenToChanges(Emitter<WallSensorState> emit, deviceId) {
-    try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+  void _listenToChanges(String deviceId) {
+    DatabaseReference ref =
+        FirebaseDatabase.instance.ref('device-status/$deviceId');
+    ref.onValue.listen((DatabaseEvent event) {
+      final data = event.snapshot.value as Map<dynamic, dynamic>?;
+      if (data == null) return;
 
-      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
-        List<Status> statusList = [];
+      final statusList = (data['status'] as List?)
+          ?.map((e) => Status(code: e['code'], value: e['value']))
+          .toList();
 
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus = WallSensorModel.fromJson(statusList);
-        emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
-      });
-    } catch (_) {}
+      if (statusList != null) {
+        final updatedDeviceStatus = WallSensorModel.fromJson(statusList);
+        if (!isClosed) {
+          add(WallSensorRealtimeUpdateEvent(updatedDeviceStatus));
+        }
+      }
+    });
   }
 
+
   void _changeValue(
       WallSensorChangeValueEvent event, Emitter<WallSensorState> emit) async {
     emit(WallSensorLoadingNewSate(wallSensorModel: deviceStatus));
@@ -195,4 +195,12 @@ class WallSensorBloc extends Bloc<WallSensorEvent, WallSensorState> {
       emit(WallSensorFailedState(error: e.toString()));
     }
   }
+
+  void _onRealtimeUpdate(
+    WallSensorRealtimeUpdateEvent event,
+    Emitter<WallSensorState> emit,
+  ) {
+    deviceStatus = event.deviceStatus;
+    emit(WallSensorUpdateState(wallSensorModel: deviceStatus));
+  }
 }
diff --git a/lib/pages/device_managment/wall_sensor/bloc/wall_event.dart b/lib/pages/device_managment/wall_sensor/bloc/wall_event.dart
index 17d85d43..fd71d7d4 100644
--- a/lib/pages/device_managment/wall_sensor/bloc/wall_event.dart
+++ b/lib/pages/device_managment/wall_sensor/bloc/wall_event.dart
@@ -1,5 +1,6 @@
 import 'package:equatable/equatable.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/wall_sensor/model/wall_sensor_model.dart';
 
 abstract class WallSensorEvent extends Equatable {
   const WallSensorEvent();
@@ -70,3 +71,8 @@ class WallSensorFactoryResetEvent extends WallSensorEvent {
     required this.factoryReset,
   });
 }
+
+class WallSensorRealtimeUpdateEvent extends WallSensorEvent {
+  final WallSensorModel deviceStatus;
+  const WallSensorRealtimeUpdateEvent(this.deviceStatus);
+}

From 46860619a07f58e4a0e0e57cb35696c9e3ab03a3 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:48:24 +0300
Subject: [PATCH 201/238] Add bloc dependency to pubspec.yaml

---
 pubspec.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pubspec.yaml b/pubspec.yaml
index fd7ed797..ec8660b6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -60,6 +60,7 @@ dependencies:
   firebase_core: ^3.11.0
   firebase_crashlytics: ^4.3.2
   firebase_database: ^11.3.2
+  bloc: ^8.1.4
 
 
 dev_dependencies:

From 2bb7a6950a6e1cc7d74e6db66e408efad1f85c40 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 10:52:08 +0300
Subject: [PATCH 202/238] Refactor debounce duration handling in
 BatchControlDevicesService and ControlDeviceService

---
 .../batch_control_devices_service.dart        | 23 ++++++++-----------
 lib/services/control_device_service.dart      | 23 ++++++++-----------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/lib/services/batch_control_devices_service.dart b/lib/services/batch_control_devices_service.dart
index c8d0bfc2..76dbe480 100644
--- a/lib/services/batch_control_devices_service.dart
+++ b/lib/services/batch_control_devices_service.dart
@@ -11,7 +11,7 @@ abstract interface class BatchControlDevicesService {
   });
 }
 
-class RemoteBatchControlDevicesService implements BatchControlDevicesService {
+final class RemoteBatchControlDevicesService implements BatchControlDevicesService {
   @override
   Future<bool> batchControlDevices({
     required List<String> uuids,
@@ -44,14 +44,15 @@ class RemoteBatchControlDevicesService implements BatchControlDevicesService {
 final class DebouncedBatchControlDevicesService
     implements BatchControlDevicesService {
   final BatchControlDevicesService decoratee;
-  final Duration _debounceDuration;
-  final List<(List<String> uuids, String code, Object value)> _pendingRequests = [];
-  bool _isProcessing = false;
+  final Duration debounceDuration;
+
+  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
+  var _isProcessing = false;
 
   DebouncedBatchControlDevicesService({
     required this.decoratee,
-    Duration debounceDuration = const Duration(milliseconds: 1500),
-  }) : _debounceDuration = debounceDuration;
+    this.debounceDuration = const Duration(milliseconds: 1500),
+  });
 
   @override
   Future<bool> batchControlDevices({
@@ -61,17 +62,11 @@ final class DebouncedBatchControlDevicesService
   }) async {
     _pendingRequests.add((uuids, code, value));
 
-    if (_isProcessing) {
-      log(
-        'Request added to queue',
-        name: 'DebouncedBatchControlDevicesService',
-      );
-      return false;
-    }
+    if (_isProcessing) return false;
 
     _isProcessing = true;
 
-    await Future.delayed(_debounceDuration);
+    await Future.delayed(debounceDuration);
 
     final lastRequest = _pendingRequests.last;
     _pendingRequests.clear();
diff --git a/lib/services/control_device_service.dart b/lib/services/control_device_service.dart
index b115990d..ab04a398 100644
--- a/lib/services/control_device_service.dart
+++ b/lib/services/control_device_service.dart
@@ -36,14 +36,15 @@ final class RemoteControlDeviceService implements ControlDeviceService {
 
 final class DebouncedControlDeviceService implements ControlDeviceService {
   final ControlDeviceService decoratee;
-  final Duration _debounceDuration;
-  final List<(String deviceUuid, Status status)> _pendingRequests = [];
-  bool _isProcessing = false;
+  final Duration debounceDuration;
 
   DebouncedControlDeviceService({
     required this.decoratee,
-    Duration debounceDuration = const Duration(milliseconds: 1500),
-  }) : _debounceDuration = debounceDuration;
+    this.debounceDuration = const Duration(milliseconds: 1500),
+  });
+
+  final _pendingRequests = <(String deviceUuid, Status status)>[];
+  var _isProcessing = false;
 
   @override
   Future<bool> controlDevice({
@@ -52,23 +53,17 @@ final class DebouncedControlDeviceService implements ControlDeviceService {
   }) async {
     _pendingRequests.add((deviceUuid, status));
 
-    if (_isProcessing) {
-      log(
-        'Request added to queue',
-        name: 'DebouncedControlDeviceService',
-      );
-      return false;
-    }
+    if (_isProcessing) return false;
 
     _isProcessing = true;
 
-    await Future.delayed(_debounceDuration);
+    await Future.delayed(debounceDuration);
 
     final lastRequest = _pendingRequests.last;
     _pendingRequests.clear();
 
     try {
-      final ( lastRequestDeviceUuid, lastRequestStatus) = lastRequest;
+      final (lastRequestDeviceUuid, lastRequestStatus) = lastRequest;
       return decoratee.controlDevice(
         deviceUuid: lastRequestDeviceUuid,
         status: lastRequestStatus,

From 4a5176cf2238b1e2a04a769c7d43e14b22476458 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 12:11:13 +0300
Subject: [PATCH 203/238] Refactor presence update data handling for improved
 precision and scaling

---
 ...ed_presence_sensor_batch_control_view.dart | 187 ++++++++++++++++++
 ..._mounted_presence_sensor_control_view.dart |  52 ++---
 .../sensors_widgets/presence_update_data.dart |   8 +-
 3 files changed, 221 insertions(+), 26 deletions(-)
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
new file mode 100644
index 00000000..0ef4cdbc
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
@@ -0,0 +1,187 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
+import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
+import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
+
+class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
+  const FlushMountedPresenceSensorBatchControlView({
+    required this.devicesIds,
+    super.key,
+  });
+
+  final List<String> devicesIds;
+
+  @override
+  Widget build(BuildContext context) {
+    final isExtraLarge = isExtraLargeScreenSize(context);
+    final isLarge = isLargeScreenSize(context);
+    final isMedium = isMediumScreenSize(context);
+    return BlocProvider(
+      create: (context) => FlushMountedPresenceSensorBloc(
+        deviceId: devicesIds.first,
+        controlDeviceService: DebouncedControlDeviceService(
+          decoratee: RemoteControlDeviceService(),
+        ),
+        batchControlDevicesService: DebouncedBatchControlDevicesService(
+          decoratee: RemoteBatchControlDevicesService(),
+        ),
+      )..add(FlushMountedPresenceSensorFetchStatusEvent()),
+      child: BlocBuilder<FlushMountedPresenceSensorBloc,
+          FlushMountedPresenceSensorState>(
+        builder: (context, state) {
+          if (state is FlushMountedPresenceSensorLoadingInitialState ||
+              state is FlushMountedPresenceSensorDeviceReportsLoadingState) {
+            return const Center(child: CircularProgressIndicator());
+          } else if (state is FlushMountedPresenceSensorUpdateState) {
+            return _buildGridView(
+                context, state.model, isExtraLarge, isLarge, isMedium);
+          }
+          return const Center(child: Text('Error fetching status'));
+        },
+      ),
+    );
+  }
+
+  Widget _buildGridView(
+    BuildContext context,
+    FlushMountedPresenceSensorModel model,
+    bool isExtraLarge,
+    bool isLarge,
+    bool isMedium,
+  ) {
+    return GridView(
+      padding: const EdgeInsets.symmetric(horizontal: 50),
+      shrinkWrap: true,
+      physics: const NeverScrollableScrollPhysics(),
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: isLarge || isExtraLarge
+            ? 3
+            : isMedium
+                ? 2
+                : 1,
+        mainAxisExtent: 140,
+        crossAxisSpacing: 12,
+        mainAxisSpacing: 12,
+      ),
+      children: [
+        PresenceUpdateData(
+          value: model.sensitivity.toDouble(),
+          title: 'Sensitivity:',
+          minValue: 0,
+          maxValue: 9,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeSensitivity,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.nearDetection / 100).toDouble(),
+          title: 'Nearest Detect Dist:',
+          description: 'm',
+          minValue: 0.0,
+          maxValue: 9.5,
+          steps: 0.1,
+          valuesPercision: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codeNearDetection,
+                      value: (value * 100).toInt(),
+                    ),
+                  ),
+        ),
+        PresenceUpdateData(
+          value: (model.farDetection / 100).toDouble(),
+          title: 'Max Detect Dist:',
+          description: 'm',
+          minValue: 0.0,
+          maxValue: 9.5,
+          steps: 0.1,
+          valuesPercision: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codeFarDetection,
+                      value: (value * 100).toInt(),
+                    ),
+                  ),
+        ),
+        PresenceUpdateData(
+          value: model.presenceDelay.toDouble(),
+          title: 'Trigger Level:',
+          minValue: 0,
+          maxValue: 3,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.occurDistReduce.toDouble()),
+          title: 'Indent Level:',
+          minValue: 0,
+          maxValue: 3,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: (model.sensiReduce.toDouble()),
+          title: 'Target Confirm Time:',
+          description: 's',
+          minValue: 0,
+          maxValue: 3,
+          steps: 1,
+          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+                FlushMountedPresenceSensorChangeValueEvent(
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
+                  value: value,
+                ),
+              ),
+        ),
+        PresenceUpdateData(
+          value: ((model.noneDelay / 10).toDouble()),
+          description: 's',
+          title: 'Disappe Delay:',
+          minValue: 20,
+          maxValue: 300,
+          steps: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codeNoneDelay,
+                      value: (value * 10).round(),
+                    ),
+                  ),
+        ),
+        FactoryResetWidget(
+          callFactoryReset: () {
+            context.read<FlushMountedPresenceSensorBloc>().add(
+                  FlushMountedPresenceSensorFactoryResetEvent(
+                    deviceId: devicesIds.first,
+                    factoryReset: FactoryResetModel(devicesUuid: devicesIds),
+                  ),
+                );
+          },
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index c02b4141..dab887b2 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -130,32 +130,36 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection).toDouble(),
+          value: (model.nearDetection / 100).toDouble(),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
-          maxValue: 950,
-          steps: 10,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeNearDetection,
-                  value: (value).toInt(),
-                ),
-              ),
+          maxValue: 9.5,
+          steps: 0.1,
+          valuesPercision: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codeNearDetection,
+                      value: (value * 100).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection).toDouble(),
+          value: (model.farDetection / 100).toDouble(),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
-          maxValue: 950,
-          steps: 10,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeFarDetection,
-                  value: (value).toInt(),
-                ),
-              ),
+          maxValue: 9.5,
+          steps: 0.1,
+          valuesPercision: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codeFarDetection,
+                      value: (value * 100).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
           value: (model.presenceDelay.toDouble()),
@@ -198,16 +202,16 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: ((model.noneDelay).toDouble()),
+          value: ((model.noneDelay / 10).toDouble()),
           description: 's',
           title: 'Disappe Delay:',
-          minValue: 0,
-          maxValue: 3000,
-          steps: 10,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
+          minValue: 20,
+          maxValue: 300,
+          steps: 1,
+          action: (double value) => context.read<FlushMountedPresenceSensorBloc>().add(
                 FlushMountedPresenceSensorChangeValueEvent(
                   code: FlushMountedPresenceSensorModel.codeNoneDelay,
-                  value: value,
+                  value: (value * 10).round(),
                 ),
               ),
         ),
diff --git a/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart b/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart
index 4b4d5562..e535612d 100644
--- a/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart
+++ b/lib/pages/device_managment/shared/sensors_widgets/presence_update_data.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/increament_decreament.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class PresenceUpdateData extends StatefulWidget {
   const PresenceUpdateData({
@@ -64,8 +65,11 @@ class _CurrentTempState extends State<PresenceUpdateData> {
         children: [
           Text(
             widget.title,
-            style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                color: ColorsManager.blackColor, fontWeight: FontWeight.w400, fontSize: 10),
+            style: context.textTheme.bodySmall?.copyWith(
+              color: ColorsManager.blackColor,
+              fontWeight: FontWeight.w400,
+              fontSize: 10,
+            ),
           ),
           IncrementDecrementWidget(
               value: widget.value.toStringAsFixed(widget.valuesPercision),

From 86164e746a77e81ffe27cdc8b430cffda28c68f1 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 12:15:50 +0300
Subject: [PATCH 204/238] Refactor FlushMountedPresenceSensorBloc creation to
 use factory method and streamline dependency injection

---
 ..._mounted_presence_sensor_bloc_factory.dart | 21 ++++++++
 ...ed_presence_sensor_batch_control_view.dart | 25 +++-------
 ..._mounted_presence_sensor_control_view.dart | 48 +++++++------------
 3 files changed, 44 insertions(+), 50 deletions(-)
 create mode 100644 lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
new file mode 100644
index 00000000..537189af
--- /dev/null
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
@@ -0,0 +1,21 @@
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
+import 'package:syncrow_web/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+
+abstract final class FlushMountedPresenceSensorBlocFactory {
+  const FlushMountedPresenceSensorBlocFactory._();
+
+  static FlushMountedPresenceSensorBloc create({
+    required String deviceId,
+  }) {
+    return FlushMountedPresenceSensorBloc(
+      deviceId: '',
+      controlDeviceService: DebouncedControlDeviceService(
+        decoratee: RemoteControlDeviceService(),
+      ),
+      batchControlDevicesService: DebouncedBatchControlDevicesService(
+        decoratee: RemoteBatchControlDevicesService(),
+      ),
+    )..add(FlushMountedPresenceSensorFetchStatusEvent());
+  }
+}
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
index 0ef4cdbc..7f1e726c 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
@@ -2,11 +2,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
@@ -20,19 +19,10 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
 
   @override
   Widget build(BuildContext context) {
-    final isExtraLarge = isExtraLargeScreenSize(context);
-    final isLarge = isLargeScreenSize(context);
-    final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => FlushMountedPresenceSensorBloc(
+      create: (context) => FlushMountedPresenceSensorBlocFactory.create(
         deviceId: devicesIds.first,
-        controlDeviceService: DebouncedControlDeviceService(
-          decoratee: RemoteControlDeviceService(),
-        ),
-        batchControlDevicesService: DebouncedBatchControlDevicesService(
-          decoratee: RemoteBatchControlDevicesService(),
-        ),
-      )..add(FlushMountedPresenceSensorFetchStatusEvent()),
+      ),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
         builder: (context, state) {
@@ -40,8 +30,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
               state is FlushMountedPresenceSensorDeviceReportsLoadingState) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is FlushMountedPresenceSensorUpdateState) {
-            return _buildGridView(
-                context, state.model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(context, state.model);
           }
           return const Center(child: Text('Error fetching status'));
         },
@@ -52,10 +41,10 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
   Widget _buildGridView(
     BuildContext context,
     FlushMountedPresenceSensorModel model,
-    bool isExtraLarge,
-    bool isLarge,
-    bool isMedium,
   ) {
+    final isExtraLarge = isExtraLargeScreenSize(context);
+    final isLarge = isLargeScreenSize(context);
+    final isMedium = isMediumScreenSize(context);
     return GridView(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       shrinkWrap: true,
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index dab887b2..bdefa507 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -2,6 +2,7 @@ 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/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_static_widget.dart';
@@ -9,8 +10,6 @@ import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presen
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_update_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/description_view.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
-import 'package:syncrow_web/services/batch_control_devices_service.dart';
-import 'package:syncrow_web/services/control_device_service.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
@@ -22,19 +21,10 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
 
   @override
   Widget build(BuildContext context) {
-    final isExtraLarge = isExtraLargeScreenSize(context);
-    final isLarge = isLargeScreenSize(context);
-    final isMedium = isMediumScreenSize(context);
     return BlocProvider(
-      create: (context) => FlushMountedPresenceSensorBloc(
-        deviceId: device.uuid!,
-        controlDeviceService: DebouncedControlDeviceService(
-          decoratee: RemoteControlDeviceService(),
-        ),
-        batchControlDevicesService: DebouncedBatchControlDevicesService(
-          decoratee: RemoteBatchControlDevicesService(),
-        ),
-      )..add(FlushMountedPresenceSensorFetchStatusEvent()),
+      create: (context) => FlushMountedPresenceSensorBlocFactory.create(
+        deviceId: device.uuid ?? '-1',
+      ),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
         builder: (context, state) {
@@ -42,8 +32,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               state is FlushMountedPresenceSensorDeviceReportsLoadingState) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is FlushMountedPresenceSensorUpdateState) {
-            return _buildGridView(
-                context, state.model, isExtraLarge, isLarge, isMedium);
+            return _buildGridView(context, state.model);
           } else if (state is FlushMountedPresenceSensorDeviceReportsState) {
             return ReportsTable(
               report: state.deviceReport,
@@ -70,13 +59,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
           } else if (state is FlushMountedPresenceSensorDeviceReportsFailedState) {
             final model =
                 context.read<FlushMountedPresenceSensorBloc>().deviceStatus;
-            return _buildGridView(
-              context,
-              model,
-              isExtraLarge,
-              isLarge,
-              isMedium,
-            );
+            return _buildGridView(context, model);
           }
           return const Center(
             child: Text('Error fetching status', textAlign: TextAlign.center),
@@ -89,10 +72,10 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
   Widget _buildGridView(
     BuildContext context,
     FlushMountedPresenceSensorModel model,
-    bool isExtraLarge,
-    bool isLarge,
-    bool isMedium,
   ) {
+    final isExtraLarge = isExtraLargeScreenSize(context);
+    final isLarge = isLargeScreenSize(context);
+    final isMedium = isMediumScreenSize(context);
     return GridView(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       shrinkWrap: true,
@@ -208,12 +191,13 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
           minValue: 20,
           maxValue: 300,
           steps: 1,
-          action: (double value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeNoneDelay,
-                  value: (value * 10).round(),
-                ),
-              ),
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codeNoneDelay,
+                      value: (value * 10).round(),
+                    ),
+                  ),
         ),
         GestureDetector(
           onTap: () => context.read<FlushMountedPresenceSensorBloc>().add(

From e1a24651307b67943c2ac4df6e051953acdcb735 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 13:11:25 +0300
Subject: [PATCH 205/238] Fix deviceId assignment in
 FlushMountedPresenceSensorBlocFactory and update _listenToChanges method for
 async handling

---
 .../flush_mounted_presence_sensor_bloc.dart   | 30 +++++++++++--------
 ..._mounted_presence_sensor_bloc_factory.dart |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index 9b62cb4e..0bc15cd2 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:developer';
 
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
@@ -80,28 +81,31 @@ class FlushMountedPresenceSensorBloc
     }
   }
 
-  void _listenToChanges(
+  Future<void> _listenToChanges(
     Emitter<FlushMountedPresenceSensorState> emit,
     String deviceId,
-  ) {
-    try {
-      final ref = FirebaseDatabase.instance.ref(
-        'device-status/$deviceId',
-      );
+  ) async {
+    final ref = FirebaseDatabase.instance.ref(
+      'device-status/$deviceId',
+    );
 
-      ref.onValue.listen((DatabaseEvent event) {
+    await ref.onValue.listen(
+      (DatabaseEvent event) async {
         Map<dynamic, dynamic> usersMap =
             event.snapshot.value as Map<dynamic, dynamic>;
         List<Status> statusList = [];
-
-        usersMap['status'].forEach((element) {
+    
+        (usersMap['status'] as List<dynamic>?)?.forEach((element) {
           statusList.add(Status(code: element['code'], value: element['value']));
         });
-
+    
         deviceStatus = FlushMountedPresenceSensorModel.fromJson(statusList);
-        emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
-      });
-    } catch (_) {}
+        if (!emit.isDone) {
+          emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+        }
+      },
+      onError: (error) => log(error.toString(), name: 'FirebaseDatabaseError'),
+    ).asFuture();
   }
 
   void _onFlushMountedPresenceSensorChangeValueEvent(
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
index 537189af..f1342eec 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
@@ -9,7 +9,7 @@ abstract final class FlushMountedPresenceSensorBlocFactory {
     required String deviceId,
   }) {
     return FlushMountedPresenceSensorBloc(
-      deviceId: '',
+      deviceId: deviceId,
       controlDeviceService: DebouncedControlDeviceService(
         decoratee: RemoteControlDeviceService(),
       ),

From 2c684a94953d9076f7ad0c1d82a6f8051b215351 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Wed, 23 Apr 2025 16:58:50 +0300
Subject: [PATCH 206/238] SP-1441 rework.

---
 .../widgets/routine_dialogs/ac_dialog.dart    | 29 +++++++++--
 .../ceiling_sensor/ceiling_sensor_dialog.dart |  6 ++-
 .../ceiling_sensor/cps_functions_list.dart    | 40 ++++++++++++---
 .../one_gang_switch_dialog.dart               | 50 ++++++++++++++-----
 .../three_gang_switch_dialog.dart             | 43 ++++++++++------
 .../two_gang_switch_dialog.dart               | 45 ++++++++++-------
 .../wall_sensor/wall_presence_sensor.dart     | 43 +++++++++++++---
 7 files changed, 192 insertions(+), 64 deletions(-)

diff --git a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
index 68cf857d..11bedf24 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
@@ -74,11 +74,33 @@ class ACHelper {
                               child: _buildFunctionsList(
                                 context: context,
                                 acFunctions: acFunctions,
-                                onFunctionSelected: (functionCode, operationName) =>
-                                    context.read<FunctionBloc>().add(SelectFunction(
+                                device: device,
+                                onFunctionSelected: (functionCode, operationName) {
+                                  context.read<FunctionBloc>().add(
+                                        SelectFunction(
                                           functionCode: functionCode,
                                           operationName: operationName,
-                                        )),
+                                        ),
+                                      );
+                                  if (functionCode == 'temp_set' ||
+                                      functionCode == 'temp_current') {
+                                    context.read<FunctionBloc>().add(
+                                          AddFunction(
+                                            functionData: DeviceFunctionData(
+                                              entityId: device?.uuid ?? '',
+                                              functionCode: functionCode,
+                                              operationName: operationName,
+                                              value: functionCode == 'temp_set'
+                                                  ? 200
+                                                  : -100,
+                                              condition: '==',
+                                              valueDescription: selectedFunctionData
+                                                  .valueDescription,
+                                            ),
+                                          ),
+                                        );
+                                  }
+                                },
                               ),
                             ),
                             // Value selector
@@ -137,6 +159,7 @@ class ACHelper {
     required BuildContext context,
     required List<ACFunction> acFunctions,
     required Function(String, String) onFunctionSelected,
+    required AllDevicesModel? device,
   }) {
     return ListView.separated(
       shrinkWrap: false,
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index c18706f0..4e174265 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -131,7 +131,11 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        CpsFunctionsList(cpsFunctions: _cpsFunctions),
+        CpsFunctionsList(
+          cpsFunctions: _cpsFunctions,
+          device: widget.device,
+          selectedFunctionData: selectedFunctionData,
+        ),
         if (state.selectedFunction != null)
           Expanded(
             child: isToggleFunction
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
index 2a35428a..707246c4 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
@@ -1,14 +1,24 @@
 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/models/ceiling_presence_sensor_functions.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialog_function_list_tile.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CpsFunctionsList extends StatelessWidget {
-  const CpsFunctionsList({required this.cpsFunctions, super.key});
+  const CpsFunctionsList({
+    required this.cpsFunctions,
+  required  this.device,
+  required this.selectedFunctionData,
+    super.key,
+  });
 
   final List<CpsFunctions> cpsFunctions;
+  final AllDevicesModel? device;
+  final DeviceFunctionData? selectedFunctionData;
 
   @override
   Widget build(BuildContext context) {
@@ -26,12 +36,28 @@ class CpsFunctionsList extends StatelessWidget {
           return RoutineDialogFunctionListTile(
             iconPath: function.icon,
             operationName: function.operationName,
-            onTap: () => context.read<FunctionBloc>().add(
-                  SelectFunction(
-                    functionCode: function.code,
-                    operationName: function.operationName,
-                  ),
-                ),
+            onTap: () {
+              context.read<FunctionBloc>().add(
+                    SelectFunction(
+                      functionCode: function.code,
+                      operationName: function.operationName,
+                    ),
+                  );
+              if (!CeilingSensorHelper.toggleCodes.contains(function.code)) {
+                context.read<FunctionBloc>().add(
+                      AddFunction(
+                        functionData: DeviceFunctionData(
+                          entityId: device?.uuid ?? '',
+                          functionCode: function.code,
+                          operationName: function.operationName,
+                          value: 0,
+                          condition: '==',
+                          valueDescription: selectedFunctionData?.valueDescription,
+                        ),
+                      ),
+                    );
+              }
+            },
           );
         },
       ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index 51a99f3b..a2d6d8db 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -24,21 +24,23 @@ class OneGangSwitchHelper {
     required String uniqueCustomId,
     required bool removeComparetors,
   }) async {
-    List<BaseSwitchFunction> oneGangFunctions = functions.whereType<BaseSwitchFunction>().toList();
+    List<BaseSwitchFunction> oneGangFunctions =
+        functions.whereType<BaseSwitchFunction>().toList();
 
     return showDialog<Map<String, dynamic>?>(
       context: context,
       builder: (BuildContext context) {
         return BlocProvider(
-            create: (_) => FunctionBloc()..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
+            create: (_) => FunctionBloc()
+              ..add(InitializeFunctions(deviceSelectedFunctions ?? [])),
             child: AlertDialog(
               contentPadding: EdgeInsets.zero,
               content: BlocBuilder<FunctionBloc, FunctionBlocState>(
                 builder: (context, state) {
                   final selectedFunction = state.selectedFunction;
                   final selectedOperationName = state.selectedOperationName;
-                  final selectedFunctionData =
-                      state.addedFunctions.firstWhere((f) => f.functionCode == selectedFunction,
+                  final selectedFunctionData = state.addedFunctions
+                      .firstWhere((f) => f.functionCode == selectedFunction,
                           orElse: () => DeviceFunctionData(
                                 entityId: '',
                                 functionCode: selectedFunction ?? '',
@@ -85,10 +87,29 @@ class OneGangSwitchHelper {
                                         color: ColorsManager.textGray,
                                       ),
                                       onTap: () {
-                                        context.read<FunctionBloc>().add(SelectFunction(
+                                        context
+                                            .read<FunctionBloc>()
+                                            .add(SelectFunction(
                                               functionCode: function.code,
                                               operationName: function.operationName,
                                             ));
+                                        if (function.code == 'countdown_1') {
+                                          context.read<FunctionBloc>().add(
+                                                AddFunction(
+                                                  functionData: DeviceFunctionData(
+                                                    entityId: device?.uuid ?? '',
+                                                    functionCode: function.code,
+                                                    operationName:
+                                                        function.operationName,
+                                                    value: 0,
+                                                    condition: '==',
+                                                    valueDescription:
+                                                        selectedFunctionData
+                                                            .valueDescription,
+                                                  ),
+                                                ),
+                                              );
+                                        }
                                       },
                                     );
                                   },
@@ -220,11 +241,11 @@ class OneGangSwitchHelper {
             selectedFunctionData,
           ),
         const SizedBox(height: 20),
-        _buildCountDownDisplay(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownDisplay(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
         const SizedBox(height: 20),
-        _buildCountDownSlider(
-            context, initialValue, device, operationName, selectedFunctionData, selectCode),
+        _buildCountDownSlider(context, initialValue, device, operationName,
+            selectedFunctionData, selectCode),
       ],
     );
   }
@@ -314,9 +335,10 @@ class OneGangSwitchHelper {
       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(),
+      divisions:
+          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+                  (operationalValues.stepValue ?? 1))
+              .round(),
       onChanged: (value) {
         context.read<FunctionBloc>().add(
               AddFunction(
@@ -368,7 +390,9 @@ class OneGangSwitchHelper {
           trailing: Icon(
             isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
             size: 24,
-            color: isSelected ? ColorsManager.primaryColorWithOpacity : ColorsManager.textGray,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
           ),
           onTap: () {
             if (!isSelected) {
diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index a83fc4a0..fdc2cb98 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -90,9 +90,27 @@ class ThreeGangSwitchHelper {
                                             .read<FunctionBloc>()
                                             .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName:
-                                                  function.operationName,
+                                              operationName: function.operationName,
                                             ));
+                                        if (function.code == 'countdown_1' ||
+                                            function.code == 'countdown_2' ||
+                                            function.code == 'countdown_3') {
+                                          context.read<FunctionBloc>().add(
+                                                AddFunction(
+                                                  functionData: DeviceFunctionData(
+                                                    entityId: device?.uuid ?? '',
+                                                    functionCode: function.code,
+                                                    operationName:
+                                                        function.operationName,
+                                                    value: 0,
+                                                    condition: '==',
+                                                    valueDescription:
+                                                        selectedFunctionData
+                                                            .valueDescription,
+                                                  ),
+                                                ),
+                                              );
+                                        }
                                       },
                                     );
                                   },
@@ -183,8 +201,7 @@ class ThreeGangSwitchHelper {
       );
     }
 
-    final selectedFn =
-        switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -266,8 +283,7 @@ class ThreeGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -316,10 +332,10 @@ class ThreeGangSwitchHelper {
       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(),
+      divisions:
+          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+                  (operationalValues.stepValue ?? 1))
+              .round(),
       onChanged: (value) {
         context.read<FunctionBloc>().add(
               AddFunction(
@@ -369,9 +385,7 @@ class ThreeGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -387,8 +401,7 @@ class ThreeGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
index 2bb6b6e5..14e9f4a7 100644
--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
@@ -90,9 +90,26 @@ class TwoGangSwitchHelper {
                                             .read<FunctionBloc>()
                                             .add(SelectFunction(
                                               functionCode: function.code,
-                                              operationName:
-                                                  function.operationName,
+                                              operationName: function.operationName,
                                             ));
+                                        if (function.code == 'countdown_1' ||
+                                            function.code == 'countdown_2') {
+                                          context.read<FunctionBloc>().add(
+                                                AddFunction(
+                                                  functionData: DeviceFunctionData(
+                                                    entityId: device?.uuid ?? '',
+                                                    functionCode: function.code,
+                                                    operationName:
+                                                        function.operationName,
+                                                    value: 0,
+                                                    condition: '==',
+                                                    valueDescription:
+                                                        selectedFunctionData
+                                                            .valueDescription,
+                                                  ),
+                                                ),
+                                              );
+                                        }
                                       },
                                     );
                                   },
@@ -167,8 +184,7 @@ class TwoGangSwitchHelper {
     required String operationName,
     required bool removeComparetors,
   }) {
-    if (selectedFunction == 'countdown_1' ||
-        selectedFunction == 'countdown_2') {
+    if (selectedFunction == 'countdown_1' || selectedFunction == 'countdown_2') {
       final initialValue = selectedFunctionData?.value ?? 0;
       return _buildTemperatureSelector(
         context: context,
@@ -182,8 +198,7 @@ class TwoGangSwitchHelper {
       );
     }
 
-    final selectedFn =
-        switchFunctions.firstWhere((f) => f.code == selectedFunction);
+    final selectedFn = switchFunctions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
 
     return _buildOperationalValuesList(
@@ -265,8 +280,7 @@ class TwoGangSwitchHelper {
         minHeight: 40.0,
         minWidth: 40.0,
       ),
-      isSelected:
-          conditions.map((c) => c == (currentCondition ?? "==")).toList(),
+      isSelected: conditions.map((c) => c == (currentCondition ?? "==")).toList(),
       children: conditions.map((c) => Text(c)).toList(),
     );
   }
@@ -315,10 +329,10 @@ class TwoGangSwitchHelper {
       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(),
+      divisions:
+          (((operationalValues.maxValue ?? 0) - (operationalValues.minValue ?? 0)) /
+                  (operationalValues.stepValue ?? 1))
+              .round(),
       onChanged: (value) {
         context.read<FunctionBloc>().add(
               AddFunction(
@@ -368,9 +382,7 @@ class TwoGangSwitchHelper {
             style: context.textTheme.bodyMedium,
           ),
           trailing: Icon(
-            isSelected
-                ? Icons.radio_button_checked
-                : Icons.radio_button_unchecked,
+            isSelected ? Icons.radio_button_checked : Icons.radio_button_unchecked,
             size: 24,
             color: isSelected
                 ? ColorsManager.primaryColorWithOpacity
@@ -386,8 +398,7 @@ class TwoGangSwitchHelper {
                         operationName: operationName,
                         value: value.value,
                         condition: selectedFunctionData?.condition,
-                        valueDescription:
-                            selectedFunctionData?.valueDescription,
+                        valueDescription: selectedFunctionData?.valueDescription,
                       ),
                     ),
                   );
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index 91abb34e..44f1efcc 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -111,13 +111,23 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
-        _buildFunctionList(context),
+        _buildFunctionList(context, state),
         if (state.selectedFunction != null) _buildValueSelector(context, state),
       ],
     );
   }
 
-  Widget _buildFunctionList(BuildContext context) {
+  Widget _buildFunctionList(BuildContext context, FunctionBlocState state) {
+    final selectedFunction = state.selectedFunction;
+    final selectedFunctionData = state.addedFunctions.firstWhere(
+      (f) => f.functionCode == selectedFunction,
+      orElse: () => DeviceFunctionData(
+        entityId: '',
+        functionCode: selectedFunction ?? '',
+        operationName: '',
+        value: null,
+      ),
+    );
     return SizedBox(
       width: 360,
       child: ListView.separated(
@@ -149,12 +159,29 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
               size: 16,
               color: ColorsManager.textGray,
             ),
-            onTap: () => context.read<FunctionBloc>().add(
-                  SelectFunction(
-                    functionCode: function.code,
-                    operationName: function.operationName,
-                  ),
-                ),
+            onTap: () {
+              context.read<FunctionBloc>().add(
+                    SelectFunction(
+                      functionCode: function.code,
+                      operationName: function.operationName,
+                    ),
+                  );
+              if (['dis_current', 'presence_time', 'illuminance_value']
+                  .contains(function.code)) {
+                context.read<FunctionBloc>().add(
+                      AddFunction(
+                        functionData: DeviceFunctionData(
+                          entityId: widget.device?.uuid ?? '',
+                          functionCode: function.code,
+                          operationName: function.operationName,
+                          value: 0,
+                          condition: '==',
+                          valueDescription: selectedFunctionData.valueDescription,
+                        ),
+                      ),
+                    );
+              }
+            },
           );
         },
       ),

From c03b8f290c4ac7799e0e84519c133e8bd6b23f75 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 24 Apr 2025 10:25:41 +0300
Subject: [PATCH 207/238] refactor function tap handlers to use
 `RoutineTapFunctionHelper` for improved code reuse and readability, and to
 remove code duplication.

---
 .../widgets/routine_dialogs/ac_dialog.dart    | 42 +++++++--------
 .../ceiling_sensor/ceiling_sensor_dialog.dart |  1 +
 .../ceiling_sensor/cps_functions_list.dart    | 53 +++++++++----------
 .../helpers/routine_tap_function_helper.dart  | 46 ++++++++++++++++
 .../one_gang_switch_dialog.dart               | 39 +++++---------
 .../three_gang_switch_dialog.dart             | 43 ++++++---------
 .../two_gang_switch_dialog.dart               | 41 ++++++--------
 .../wall_sensor/wall_presence_sensor.dart     | 36 +++++--------
 8 files changed, 149 insertions(+), 152 deletions(-)
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart

diff --git a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
index 11bedf24..1de9b0d4 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ac_dialog.dart
@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/routines/models/ac/ac_operational_value.dart';
 import 'package:syncrow_web/pages/routines/models/device_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/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -76,30 +77,23 @@ class ACHelper {
                                 acFunctions: acFunctions,
                                 device: device,
                                 onFunctionSelected: (functionCode, operationName) {
-                                  context.read<FunctionBloc>().add(
-                                        SelectFunction(
-                                          functionCode: functionCode,
-                                          operationName: operationName,
-                                        ),
-                                      );
-                                  if (functionCode == 'temp_set' ||
-                                      functionCode == 'temp_current') {
-                                    context.read<FunctionBloc>().add(
-                                          AddFunction(
-                                            functionData: DeviceFunctionData(
-                                              entityId: device?.uuid ?? '',
-                                              functionCode: functionCode,
-                                              operationName: operationName,
-                                              value: functionCode == 'temp_set'
-                                                  ? 200
-                                                  : -100,
-                                              condition: '==',
-                                              valueDescription: selectedFunctionData
-                                                  .valueDescription,
-                                            ),
-                                          ),
-                                        );
-                                  }
+                                  RoutineTapFunctionHelper.onTapFunction(
+                                    context,
+                                    functionCode: functionCode,
+                                    functionOperationName: operationName,
+                                    functionValueDescription:
+                                        selectedFunctionData.valueDescription,
+                                    deviceUuid: device?.uuid,
+                                    codesToAddIntoFunctionsWithDefaultValue: [
+                                      'temp_set',
+                                      'temp_current',
+                                    ],
+                                    defaultValue: functionCode == 'temp_set'
+                                        ? 200
+                                        : functionCode == 'temp_current'
+                                            ? -100
+                                            : 0,
+                                  );
                                 },
                               ),
                             ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
index 4e174265..f3d07a66 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart
@@ -135,6 +135,7 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
           cpsFunctions: _cpsFunctions,
           device: widget.device,
           selectedFunctionData: selectedFunctionData,
+          dialogType: widget.dialogType,
         ),
         if (state.selectedFunction != null)
           Expanded(
diff --git a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
index 707246c4..efc57653 100644
--- a/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/cps_functions_list.dart
@@ -1,24 +1,24 @@
 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/models/ceiling_presence_sensor_functions.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialog_function_list_tile.dart';
-import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class CpsFunctionsList extends StatelessWidget {
   const CpsFunctionsList({
     required this.cpsFunctions,
-  required  this.device,
-  required this.selectedFunctionData,
+    required this.device,
+    required this.selectedFunctionData,
+    required this.dialogType,
     super.key,
   });
 
   final List<CpsFunctions> cpsFunctions;
   final AllDevicesModel? device;
   final DeviceFunctionData? selectedFunctionData;
+  final String dialogType;
 
   @override
   Widget build(BuildContext context) {
@@ -36,28 +36,27 @@ class CpsFunctionsList extends StatelessWidget {
           return RoutineDialogFunctionListTile(
             iconPath: function.icon,
             operationName: function.operationName,
-            onTap: () {
-              context.read<FunctionBloc>().add(
-                    SelectFunction(
-                      functionCode: function.code,
-                      operationName: function.operationName,
-                    ),
-                  );
-              if (!CeilingSensorHelper.toggleCodes.contains(function.code)) {
-                context.read<FunctionBloc>().add(
-                      AddFunction(
-                        functionData: DeviceFunctionData(
-                          entityId: device?.uuid ?? '',
-                          functionCode: function.code,
-                          operationName: function.operationName,
-                          value: 0,
-                          condition: '==',
-                          valueDescription: selectedFunctionData?.valueDescription,
-                        ),
-                      ),
-                    );
-              }
-            },
+            onTap: () => RoutineTapFunctionHelper.onTapFunction(
+              context,
+              functionCode: function.code,
+              functionOperationName: function.operationName,
+              functionValueDescription: selectedFunctionData?.valueDescription,
+              deviceUuid: device?.uuid,
+              codesToAddIntoFunctionsWithDefaultValue: [
+                'static_max_dis',
+                'presence_reference',
+                'moving_reference',
+                'perceptual_boundary',
+                'moving_boundary',
+                'moving_rigger_time',
+                'moving_static_time',
+                'none_body_time',
+                'moving_max_dis',
+                'moving_range',
+                'presence_range',
+                if (dialogType == "IF") 'sensitivity',
+              ],
+            ),
           );
         },
       ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart b/lib/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart
new file mode 100644
index 00000000..2b09f579
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart
@@ -0,0 +1,46 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+
+abstract final class RoutineTapFunctionHelper {
+  const RoutineTapFunctionHelper._();
+
+  static void onTapFunction(
+    BuildContext context, {
+    required String functionCode,
+    required String functionOperationName,
+    required String? functionValueDescription,
+    required String? deviceUuid,
+    required List<String> codesToAddIntoFunctionsWithDefaultValue,
+    int defaultValue = 0,
+  }) {
+    final functionsBloc = context.read<FunctionBloc>();
+    functionsBloc.add(
+      SelectFunction(
+        functionCode: functionCode,
+        operationName: functionOperationName,
+      ),
+    );
+    final addedFunctions = functionsBloc.state.addedFunctions;
+    final isFunctionAlreadyAdded = addedFunctions.any(
+      (e) => e.functionCode == functionCode,
+    );
+    final shouldAddFunction =
+        codesToAddIntoFunctionsWithDefaultValue.contains(functionCode);
+    if (!isFunctionAlreadyAdded && shouldAddFunction) {
+      context.read<FunctionBloc>().add(
+            AddFunction(
+              functionData: DeviceFunctionData(
+                entityId: deviceUuid ?? '',
+                functionCode: functionCode,
+                operationName: functionOperationName,
+                value: defaultValue,
+                condition: '==',
+                valueDescription: functionValueDescription,
+              ),
+            ),
+          );
+    }
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
index a2d6d8db..3c786045 100644
--- a/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart
@@ -11,6 +11,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.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/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -86,31 +87,19 @@ class OneGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () {
-                                        context
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
-                                              functionCode: function.code,
-                                              operationName: function.operationName,
-                                            ));
-                                        if (function.code == 'countdown_1') {
-                                          context.read<FunctionBloc>().add(
-                                                AddFunction(
-                                                  functionData: DeviceFunctionData(
-                                                    entityId: device?.uuid ?? '',
-                                                    functionCode: function.code,
-                                                    operationName:
-                                                        function.operationName,
-                                                    value: 0,
-                                                    condition: '==',
-                                                    valueDescription:
-                                                        selectedFunctionData
-                                                            .valueDescription,
-                                                  ),
-                                                ),
-                                              );
-                                        }
-                                      },
+                                      onTap: () =>
+                                          RoutineTapFunctionHelper.onTapFunction(
+                                        context,
+                                        functionCode: function.code,
+                                        functionOperationName:
+                                            function.operationName,
+                                        functionValueDescription:
+                                            selectedFunctionData.valueDescription,
+                                        deviceUuid: device?.uuid,
+                                        codesToAddIntoFunctionsWithDefaultValue: [
+                                          'countdown_1',
+                                        ],
+                                      ),
                                     );
                                   },
                                 ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
index fdc2cb98..44a367ef 100644
--- a/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_func
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.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/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -85,33 +86,21 @@ class ThreeGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () {
-                                        context
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
-                                              functionCode: function.code,
-                                              operationName: function.operationName,
-                                            ));
-                                        if (function.code == 'countdown_1' ||
-                                            function.code == 'countdown_2' ||
-                                            function.code == 'countdown_3') {
-                                          context.read<FunctionBloc>().add(
-                                                AddFunction(
-                                                  functionData: DeviceFunctionData(
-                                                    entityId: device?.uuid ?? '',
-                                                    functionCode: function.code,
-                                                    operationName:
-                                                        function.operationName,
-                                                    value: 0,
-                                                    condition: '==',
-                                                    valueDescription:
-                                                        selectedFunctionData
-                                                            .valueDescription,
-                                                  ),
-                                                ),
-                                              );
-                                        }
-                                      },
+                                      onTap: () =>
+                                          RoutineTapFunctionHelper.onTapFunction(
+                                        context,
+                                        functionCode: function.code,
+                                        functionOperationName:
+                                            function.operationName,
+                                        functionValueDescription:
+                                            selectedFunctionData.valueDescription,
+                                        deviceUuid: device?.uuid,
+                                        codesToAddIntoFunctionsWithDefaultValue: [
+                                          'countdown_1',
+                                          'countdown_2',
+                                          'countdown_3',
+                                        ],
+                                      ),
                                     );
                                   },
                                 ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
index 14e9f4a7..f551d21b 100644
--- a/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/two_gang_switch_dialog.dart
@@ -10,6 +10,7 @@ import 'package:syncrow_web/pages/routines/models/gang_switches/base_switch_func
 import 'package:syncrow_web/pages/routines/models/gang_switches/switch_operational_value.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/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -85,32 +86,20 @@ class TwoGangSwitchHelper {
                                         size: 16,
                                         color: ColorsManager.textGray,
                                       ),
-                                      onTap: () {
-                                        context
-                                            .read<FunctionBloc>()
-                                            .add(SelectFunction(
-                                              functionCode: function.code,
-                                              operationName: function.operationName,
-                                            ));
-                                        if (function.code == 'countdown_1' ||
-                                            function.code == 'countdown_2') {
-                                          context.read<FunctionBloc>().add(
-                                                AddFunction(
-                                                  functionData: DeviceFunctionData(
-                                                    entityId: device?.uuid ?? '',
-                                                    functionCode: function.code,
-                                                    operationName:
-                                                        function.operationName,
-                                                    value: 0,
-                                                    condition: '==',
-                                                    valueDescription:
-                                                        selectedFunctionData
-                                                            .valueDescription,
-                                                  ),
-                                                ),
-                                              );
-                                        }
-                                      },
+                                      onTap: () =>
+                                          RoutineTapFunctionHelper.onTapFunction(
+                                        context,
+                                        functionCode: function.code,
+                                        functionOperationName:
+                                            function.operationName,
+                                        functionValueDescription:
+                                            selectedFunctionData.valueDescription,
+                                        deviceUuid: device?.uuid,
+                                        codesToAddIntoFunctionsWithDefaultValue: [
+                                          'countdown_1',
+                                          'countdown_2',
+                                        ],
+                                      ),
                                     );
                                   },
                                 ),
diff --git a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
index 44f1efcc..4d04102d 100644
--- a/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
+++ b/lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart
@@ -8,6 +8,7 @@ import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/wps/wps_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/helpers/routine_tap_function_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/wall_sensor/wps_value_selector_widget.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -159,29 +160,18 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
               size: 16,
               color: ColorsManager.textGray,
             ),
-            onTap: () {
-              context.read<FunctionBloc>().add(
-                    SelectFunction(
-                      functionCode: function.code,
-                      operationName: function.operationName,
-                    ),
-                  );
-              if (['dis_current', 'presence_time', 'illuminance_value']
-                  .contains(function.code)) {
-                context.read<FunctionBloc>().add(
-                      AddFunction(
-                        functionData: DeviceFunctionData(
-                          entityId: widget.device?.uuid ?? '',
-                          functionCode: function.code,
-                          operationName: function.operationName,
-                          value: 0,
-                          condition: '==',
-                          valueDescription: selectedFunctionData.valueDescription,
-                        ),
-                      ),
-                    );
-              }
-            },
+            onTap: () => RoutineTapFunctionHelper.onTapFunction(
+              context,
+              functionCode: function.code,
+              functionOperationName: function.operationName,
+              functionValueDescription: selectedFunctionData.valueDescription,
+              deviceUuid: widget.device?.uuid,
+              codesToAddIntoFunctionsWithDefaultValue: [
+                'dis_current',
+                'presence_time',
+                'illuminance_value',
+              ],
+            ),
           );
         },
       ),

From 75b0b245433219b278473917640cb9e7babdc7d0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 24 Apr 2025 14:13:13 +0300
Subject: [PATCH 208/238] Add Flush Mounted Presence Sensor support and update
 event handling

---
 .../helper/route_controls_based_code.dart     |  5 ++
 .../flush_mounted_presence_sensor_bloc.dart   | 56 ++++++++++++-------
 .../flush_mounted_presence_sensor_event.dart  | 10 ++++
 ...ed_presence_sensor_batch_control_view.dart | 23 +++++---
 4 files changed, 65 insertions(+), 29 deletions(-)

diff --git a/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart b/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart
index 81405451..5586a310 100644
--- a/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart
+++ b/lib/pages/device_managment/all_devices/helper/route_controls_based_code.dart
@@ -9,6 +9,7 @@ import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_batch_st
 import 'package:syncrow_web/pages/device_managment/curtain/view/curtain_status_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/door_lock/view/door_lock_control_view.dart';
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_batch_control_view.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/view/garage_door_control_view.dart';
@@ -198,6 +199,10 @@ mixin RouteControlsBasedCode {
         return SOSBatchControlView(
           deviceIds: devices.where((e) => (e.productType == 'SOS')).map((e) => e.uuid!).toList(),
         );
+      case 'NCPS':
+        return FlushMountedPresenceSensorBatchControlView(
+          devicesIds: devices.where((e) => (e.productType == 'NCPS')).map((e) => e.uuid!).toList(),
+        );
       default:
         return const SizedBox();
     }
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index 0bc15cd2..d692ed2b 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -49,6 +49,9 @@ class FlushMountedPresenceSensorBloc
     on<FlushMountedPresenceSensorFactoryResetEvent>(
       _onFlushMountedPresenceSensorFactoryResetEvent,
     );
+    on<FlushMountedPresenceSensorStatusUpdatedEvent>(
+      _onFlushMountedPresenceSensorStatusUpdatedEvent,
+    );
   }
 
   void _onFlushMountedPresenceSensorFetchStatusEvent(
@@ -60,7 +63,7 @@ class FlushMountedPresenceSensorBloc
       final response = await DevicesManagementApi().getDeviceStatus(deviceId);
       deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
       emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-      _listenToChanges(emit, deviceId);
+      _listenToChanges(deviceId);
     } catch (e) {
       emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
       return;
@@ -76,36 +79,39 @@ class FlushMountedPresenceSensorBloc
       final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
       emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+      _listenToChanges(event.devicesIds.first);
     } catch (e) {
       emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
     }
   }
 
-  Future<void> _listenToChanges(
-    Emitter<FlushMountedPresenceSensorState> emit,
-    String deviceId,
-  ) async {
-    final ref = FirebaseDatabase.instance.ref(
-      'device-status/$deviceId',
-    );
+  void _listenToChanges(String deviceId) {
+    try {
+      final ref = FirebaseDatabase.instance.ref(
+        'device-status/$deviceId',
+      );
+
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
 
-    await ref.onValue.listen(
-      (DatabaseEvent event) async {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
         List<Status> statusList = [];
-    
-        (usersMap['status'] as List<dynamic>?)?.forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+        eventsMap['status'].forEach((element) {
+          statusList.add(
+            Status(code: element['code'], value: element['value']),
+          );
         });
-    
+
         deviceStatus = FlushMountedPresenceSensorModel.fromJson(statusList);
-        if (!emit.isDone) {
-          emit(FlushMountedPresenceSensorLoadingNewSate(model: deviceStatus));
+        if (!isClosed) {
+          add(FlushMountedPresenceSensorStatusUpdatedEvent(deviceStatus));
         }
-      },
-      onError: (error) => log(error.toString(), name: 'FirebaseDatabaseError'),
-    ).asFuture();
+      });
+    } catch (_) {
+      log(
+        'Error listening to changes',
+        name: 'FlushMountedPresenceSensorBloc._listenToChanges',
+      );
+    }
   }
 
   void _onFlushMountedPresenceSensorChangeValueEvent(
@@ -234,4 +240,12 @@ class FlushMountedPresenceSensorBloc
       emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
     }
   }
+
+  void _onFlushMountedPresenceSensorStatusUpdatedEvent(
+    FlushMountedPresenceSensorStatusUpdatedEvent event,
+    Emitter<FlushMountedPresenceSensorState> emit,
+  ) {
+    deviceStatus = event.model;
+    emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
+  }
 }
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
index f1636300..f70e7f3a 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
@@ -10,6 +10,16 @@ sealed class FlushMountedPresenceSensorEvent extends Equatable {
 class FlushMountedPresenceSensorFetchStatusEvent
     extends FlushMountedPresenceSensorEvent {}
 
+class FlushMountedPresenceSensorStatusUpdatedEvent
+    extends FlushMountedPresenceSensorEvent {
+  const FlushMountedPresenceSensorStatusUpdatedEvent(this.model);
+
+  final FlushMountedPresenceSensorModel model;
+
+  @override
+  List<Object> get props => [model];
+}
+
 class FlushMountedPresenceSensorChangeValueEvent
     extends FlushMountedPresenceSensorEvent {
   final int value;
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
index 7f1e726c..25cbba09 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
@@ -67,7 +67,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 9,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeSensitivity,
                   value: value,
                 ),
@@ -83,7 +84,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           valuesPercision: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeNearDetection,
                       value: (value * 100).toInt(),
                     ),
@@ -99,7 +101,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           valuesPercision: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeFarDetection,
                       value: (value * 100).toInt(),
                     ),
@@ -112,20 +115,22 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codePresenceDelay,
                   value: value,
                 ),
               ),
         ),
         PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
+          value: model.occurDistReduce.toDouble(),
           title: 'Indent Level:',
           minValue: 0,
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
                   value: value,
                 ),
@@ -139,7 +144,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
+                FlushMountedPresenceSensorBatchControlEvent(
+                  deviceIds: devicesIds,
                   code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
@@ -154,7 +160,8 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           steps: 1,
           action: (double value) =>
               context.read<FlushMountedPresenceSensorBloc>().add(
-                    FlushMountedPresenceSensorChangeValueEvent(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
                       code: FlushMountedPresenceSensorModel.codeNoneDelay,
                       value: (value * 10).round(),
                     ),

From ba20998067fc0a6aad9ba38c04ff01f63a6e0de4 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 24 Apr 2025 14:21:38 +0300
Subject: [PATCH 209/238] disabled realtime on batch control.

---
 .../bloc/flush_mounted_presence_sensor_bloc.dart                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
index d692ed2b..aea800dd 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_bloc.dart
@@ -79,7 +79,6 @@ class FlushMountedPresenceSensorBloc
       final response = await DevicesManagementApi().getBatchStatus(event.devicesIds);
       deviceStatus = FlushMountedPresenceSensorModel.fromJson(response.status);
       emit(FlushMountedPresenceSensorUpdateState(model: deviceStatus));
-      _listenToChanges(event.devicesIds.first);
     } catch (e) {
       emit(FlushMountedPresenceSensorFailedState(error: e.toString()));
     }

From c8e540e9383d3c39bd64ce1a084ae1b0e6180623 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 24 Apr 2025 14:29:18 +0300
Subject: [PATCH 210/238] Remove unnecessary event dispatch in
 FlushMountedPresenceSensorBlocFactory creation

---
 .../factories/flush_mounted_presence_sensor_bloc_factory.dart   | 2 +-
 .../views/flush_mounted_presence_sensor_batch_control_view.dart | 2 +-
 .../views/flush_mounted_presence_sensor_control_view.dart       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
index f1342eec..49fb517f 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/factories/flush_mounted_presence_sensor_bloc_factory.dart
@@ -16,6 +16,6 @@ abstract final class FlushMountedPresenceSensorBlocFactory {
       batchControlDevicesService: DebouncedBatchControlDevicesService(
         decoratee: RemoteBatchControlDevicesService(),
       ),
-    )..add(FlushMountedPresenceSensorFetchStatusEvent());
+    );
   }
 }
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
index 25cbba09..78db6e2e 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
@@ -22,7 +22,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
     return BlocProvider(
       create: (context) => FlushMountedPresenceSensorBlocFactory.create(
         deviceId: devicesIds.first,
-      ),
+      )..add(FlushMountedPresenceSensorFetchBatchStatusEvent(devicesIds)),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
         builder: (context, state) {
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index bdefa507..f0815c60 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -24,7 +24,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
     return BlocProvider(
       create: (context) => FlushMountedPresenceSensorBlocFactory.create(
         deviceId: device.uuid ?? '-1',
-      ),
+      )..add(FlushMountedPresenceSensorFetchStatusEvent()),
       child: BlocBuilder<FlushMountedPresenceSensorBloc,
           FlushMountedPresenceSensorState>(
         builder: (context, state) {

From 778257644d003c900515e7248ee823199dca433f Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Thu, 24 Apr 2025 15:13:10 +0300
Subject: [PATCH 211/238] reduced debounce duration.

---
 lib/services/batch_control_devices_service.dart | 2 +-
 lib/services/control_device_service.dart        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/services/batch_control_devices_service.dart b/lib/services/batch_control_devices_service.dart
index 76dbe480..de5af9ee 100644
--- a/lib/services/batch_control_devices_service.dart
+++ b/lib/services/batch_control_devices_service.dart
@@ -51,7 +51,7 @@ final class DebouncedBatchControlDevicesService
 
   DebouncedBatchControlDevicesService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 1500),
+    this.debounceDuration = const Duration(milliseconds: 800),
   });
 
   @override
diff --git a/lib/services/control_device_service.dart b/lib/services/control_device_service.dart
index ab04a398..9913b52e 100644
--- a/lib/services/control_device_service.dart
+++ b/lib/services/control_device_service.dart
@@ -40,7 +40,7 @@ final class DebouncedControlDeviceService implements ControlDeviceService {
 
   DebouncedControlDeviceService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 1500),
+    this.debounceDuration = const Duration(milliseconds: 800),
   });
 
   final _pendingRequests = <(String deviceUuid, Status status)>[];

From 09fb604acc86d378a0f0dc91470233954904145b Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Fri, 25 Apr 2025 10:49:25 +0400
Subject: [PATCH 212/238] added filtering

---
 .../all_spaces/widgets/sidebar_widget.dart    | 93 ++++++++++---------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 6dc8ae9c..374f0a0a 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/widgets/empty_search_result_widget.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/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/community_model.dart';
@@ -15,6 +16,8 @@ import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/cent
 import 'package:syncrow_web/pages/spaces_management/structure_selector/bloc/center_body_event.dart';
 import 'package:syncrow_web/utils/style.dart';
 
+import '../../../space_tree/bloc/space_tree_event.dart';
+
 class SidebarWidget extends StatefulWidget {
   final List<CommunityModel> communities;
   final String? selectedSpaceUuid;
@@ -40,13 +43,31 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   void initState() {
-    _selectedId = widget.selectedSpaceUuid;
     _scrollController = ScrollController();
+    _scrollController.addListener(_onScroll);
+    _selectedId = widget.selectedSpaceUuid;
     super.initState();
   }
 
+  void _onScroll() {
+    if (_scrollController.position.pixels >= _scrollController.position.maxScrollExtent - 100) {
+      // Trigger pagination event
+      final bloc = context.read<SpaceTreeBloc>();
+      if (!bloc.state.paginationIsLoading && bloc.state.paginationModel?.hasNext == true) {
+        bloc.add(
+          PaginationEvent(
+            bloc.state.paginationModel!,
+            bloc.state.communityList,
+          ),
+        );
+      }
+    }
+  }
+
   @override
   void dispose() {
+    _scrollController.removeListener(_onScroll);
+
     _scrollController.dispose();
     super.dispose();
   }
@@ -59,38 +80,6 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     super.didUpdateWidget(oldWidget);
   }
 
-  List<CommunityModel> _filteredCommunities() {
-    if (_searchQuery.isEmpty) {
-      _selectedSpaceUuid = null;
-      return widget.communities;
-    }
-
-    return widget.communities.where((community) {
-      final containsQueryInCommunity =
-          community.name.toLowerCase().contains(_searchQuery.toLowerCase());
-      final containsQueryInSpaces = community.spaces.any((space) =>
-          _containsQuery(space: space, query: _searchQuery.toLowerCase()));
-
-      return containsQueryInCommunity || containsQueryInSpaces;
-    }).toList();
-  }
-
-  bool _containsQuery({
-    required SpaceModel space,
-    required String query,
-  }) {
-    final matchesSpace = space.name.toLowerCase().contains(query);
-    final matchesChildren = space.children.any(
-      (child) => _containsQuery(space: child, query: query),
-    );
-
-    if (matchesSpace || matchesChildren) {
-      _selectedSpaceUuid = space.uuid;
-    }
-
-    return matchesSpace || matchesChildren;
-  }
-
   bool _isSpaceOrChildSelected(SpaceModel space) {
     final isSpaceSelected = _selectedSpaceUuid == space.uuid;
     final anySubSpaceIsSelected = space.children.any(_isSpaceOrChildSelected);
@@ -101,7 +90,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   Widget build(BuildContext context) {
-    final filteredCommunities = _filteredCommunities();
+    final spaceTreeState = context.watch<SpaceTreeBloc>().state;
+    final filteredCommunities = spaceTreeState.isSearching
+        ? spaceTreeState.filteredCommunity
+        : spaceTreeState.communityList;
 
     return Container(
       width: _width,
@@ -112,7 +104,13 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         children: [
           SidebarHeader(onAddCommunity: _onAddCommunity),
           CustomSearchBar(
-            onSearchChanged: (query) => setState(() => _searchQuery = query),
+            onSearchChanged: (query) {
+              setState(() {
+                _searchQuery = query;
+              });
+
+              context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
+            },
           ),
           const SizedBox(height: 16),
           Expanded(
@@ -120,14 +118,18 @@ class _SidebarWidgetState extends State<SidebarWidget> {
               visible: filteredCommunities.isNotEmpty,
               replacement: const EmptySearchResultWidget(),
               child: SidebarCommunitiesList(
-                scrollController: _scrollController,
-                onScrollToEnd: () {},
-                communities: filteredCommunities,
-                itemBuilder: (context, index) => _buildCommunityTile(
-                  context,
-                  filteredCommunities[index],
-                ),
-              ),
+                  scrollController: _scrollController,
+                  onScrollToEnd: () {},
+                  communities: filteredCommunities,
+                  itemBuilder: (context, index) {
+                    if (index == filteredCommunities.length) {
+                      return const Padding(
+                        padding: EdgeInsets.all(8.0),
+                        child: Center(child: CircularProgressIndicator()),
+                      );
+                    }
+                    return _buildCommunityTile(context, filteredCommunities[index]);
+                  }),
             ),
           ),
         ],
@@ -205,9 +207,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     );
   }
 
-  void _onAddCommunity() => _selectedId?.isNotEmpty ?? true
-      ? _clearSelection()
-      : _showCreateCommunityDialog();
+  void _onAddCommunity() =>
+      _selectedId?.isNotEmpty ?? true ? _clearSelection() : _showCreateCommunityDialog();
 
   void _clearSelection() {
     setState(() => _selectedId = '');

From ff07e7509de5c0e95ee54bb112f259b43b889c7d Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Sat, 26 Apr 2025 16:04:41 +0400
Subject: [PATCH 213/238] fixed the issue in aligning child space

---
 .../widgets/community_structure_widget.dart   | 183 +++++++++++++-----
 1 file changed, 136 insertions(+), 47 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 70b86074..5fb648e3 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -336,6 +336,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
               }
               spaces.add(newSpace);
               _updateNodePosition(newSpace, newSpace.position);
+              realignTree();
             });
           },
         );
@@ -450,7 +451,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   void _saveSpaces() {
     if (widget.selectedCommunity == null) {
-      debugPrint("No community selected for saving spaces.");
       return;
     }
 
@@ -530,34 +530,82 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   Offset getBalancedChildPosition(SpaceModel parent) {
-    int totalSiblings = parent.children.length + 1;
-    double totalWidth = (totalSiblings - 1) * 250; // Horizontal spacing
-    double startX = parent.position.dx - (totalWidth / 2);
+    const double nodeWidth = 200;
+    const double verticalGap = 180;
 
-    Offset position = Offset(startX + (parent.children.length * 250), parent.position.dy + 180);
+    if (parent.children.isEmpty) {
+      // First child → exactly center
+      return Offset(parent.position.dx, parent.position.dy + verticalGap);
+    } else {
+      // More children → arrange them spaced horizontally
+      double totalWidth = (parent.children.length) * (nodeWidth + 60);
+      double startX = parent.position.dx - (totalWidth / 2);
 
-    // Check for overlaps & adjust
-    while (spaces.any((s) => (s.position - position).distance < 250)) {
-      position = Offset(position.dx + 250, position.dy);
+      double childX = startX + (parent.children.length * (nodeWidth + 60));
+      return Offset(childX, parent.position.dy + verticalGap);
     }
-
-    return position;
   }
 
   void realignTree() {
-    void updatePositions(SpaceModel node, double x, double y) {
-      node.position = Offset(x, y);
+    const double nodeWidth = 200;
+    const double nodeHeight = 100;
+    const double horizontalGap = 60;
+    const double verticalGap = 180;
 
-      int numChildren = node.children.length;
-      double childStartX = x - ((numChildren - 1) * 250) / 2;
+    double canvasRightEdge = 1000;
+    double canvasBottomEdge = 1000;
 
-      for (int i = 0; i < numChildren; i++) {
-        updatePositions(node.children[i], childStartX + (i * 250), y + 180);
+    double _calculateSubtreeWidth(SpaceModel node) {
+      if (node.children.isEmpty) return nodeWidth;
+      double totalWidth = 0;
+      for (var child in node.children) {
+        totalWidth += _calculateSubtreeWidth(child) + horizontalGap;
+      }
+      return totalWidth - horizontalGap;
+    }
+
+    void _layoutTree(SpaceModel node, double startX, double y) {
+      double subtreeWidth = _calculateSubtreeWidth(node);
+      double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
+      node.position = Offset(centerX, y);
+
+      canvasRightEdge =
+          centerX + nodeWidth > canvasRightEdge ? centerX + nodeWidth : canvasRightEdge;
+      canvasBottomEdge = y + nodeHeight > canvasBottomEdge ? y + nodeHeight : canvasBottomEdge;
+
+      if (node.children.length == 1) {
+        final child = node.children.first;
+        double parentCenterX = node.position.dx + nodeWidth / 2;
+        double childX = parentCenterX - nodeWidth / 2;
+        double childY = y + verticalGap;
+
+        child.position = Offset(childX, childY);
+        _layoutTree(child, childX, childY);
+      } else {
+        double childX = startX;
+        for (var child in node.children) {
+          double childWidth = _calculateSubtreeWidth(child);
+          _layoutTree(child, childX, y + verticalGap);
+          childX += childWidth + horizontalGap;
+        }
       }
     }
 
-    if (spaces.isNotEmpty) {
-      updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+    final SpaceModel? root = spaces.firstWhere(
+      (s) => s.parent == null,
+      orElse: () => spaces.first,
+    );
+
+    if (root != null) {
+      double totalTreeWidth = _calculateSubtreeWidth(root);
+      double startingX = (canvasWidth / 2) - (totalTreeWidth / 2);
+
+      _layoutTree(root, startingX, 100);
+
+      setState(() {
+        canvasWidth = canvasRightEdge + 200;
+        canvasHeight = canvasBottomEdge + 200;
+      });
     }
   }
 
@@ -650,38 +698,87 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
     /// **Find a new position ensuring no overlap**
     Offset getBalancedChildPosition(SpaceModel parent) {
-      int totalSiblings = parent.children.length + 1;
-      double totalWidth = (totalSiblings - 1) * horizontalGap;
-      double startX = parent.position.dx - (totalWidth / 2);
-      Offset position = Offset(
-          startX + (parent.children.length * horizontalGap), parent.position.dy + verticalGap);
+      const double nodeWidth = 200;
+      const double horizontalGap = 60;
+      const double verticalGap = 180;
 
-      // **Check for overlaps & adjust**
-      while (spaces.any((s) => (s.position - position).distance < horizontalGap)) {
-        position = Offset(position.dx + horizontalGap, position.dy);
-      }
+      int numSiblings = parent.children.length;
+      double totalWidth = numSiblings * (nodeWidth + horizontalGap);
 
-      print("🔹 New position for ${parent.name}: (${position.dx}, ${position.dy})");
-      return position;
+      // Calculate position directly beneath the parent, spaced horizontally
+      double x = parent.position.dx - (totalWidth / 2) + numSiblings * (nodeWidth + horizontalGap);
+      double y = parent.position.dy + verticalGap;
+
+      return Offset(x, y);
     }
 
     /// **Realign the entire tree after duplication**
     void realignTree() {
-      void updatePositions(SpaceModel node, double x, double y) {
-        node.position = Offset(x, y);
-        print("✅ Adjusted ${node.name} to (${x}, ${y})");
+      const double nodeWidth = 200;
+      const double nodeHeight = 100;
+      const double horizontalGap = 60;
+      const double verticalGap = 180;
 
-        int numChildren = node.children.length;
-        double childStartX = x - ((numChildren - 1) * horizontalGap) / 2;
+      double canvasRightEdge = 1000;
+      double canvasBottomEdge = 1000;
 
-        for (int i = 0; i < numChildren; i++) {
-          updatePositions(node.children[i], childStartX + (i * horizontalGap), y + verticalGap);
+      // Step 1: Calculate the width of any subtree
+      double _calculateSubtreeWidth(SpaceModel node) {
+        if (node.children.isEmpty) return nodeWidth;
+        double totalWidth = 0;
+        for (var child in node.children) {
+          totalWidth += _calculateSubtreeWidth(child) + horizontalGap;
+        }
+        return totalWidth - horizontalGap;
+      }
+
+      void _layoutTree(SpaceModel node, double startX, double y) {
+        double subtreeWidth = _calculateSubtreeWidth(node);
+        double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
+        node.position = Offset(centerX, y);
+
+        canvasRightEdge =
+            centerX + nodeWidth > canvasRightEdge ? centerX + nodeWidth : canvasRightEdge;
+        canvasBottomEdge = y + nodeHeight > canvasBottomEdge ? y + nodeHeight : canvasBottomEdge;
+
+        if (node.children.length == 1) {
+          final child = node.children.first;
+
+          double parentCenterX = node.position.dx + nodeWidth / 2;
+          double childX = parentCenterX - nodeWidth / 2;
+          double childY = y + verticalGap;
+
+          child.position = Offset(childX, childY);
+
+          _layoutTree(child, childX, childY);
+        } else {
+          double childX = startX;
+          for (var child in node.children) {
+            double childWidth = _calculateSubtreeWidth(child);
+            _layoutTree(child, childX, y + verticalGap);
+            childX += childWidth + horizontalGap;
+          }
         }
       }
 
-      if (spaces.isNotEmpty) {
-        print("🔄 Realigning tree...");
-        updatePositions(spaces.first, spaces.first.position.dx, spaces.first.position.dy);
+      // Step 3: Start centered
+      final SpaceModel? root = spaces.firstWhere(
+        (s) => s.parent == null,
+        orElse: () => spaces.first,
+      );
+
+      if (root != null) {
+        // Calculate total width of full tree
+        double totalTreeWidth = _calculateSubtreeWidth(root);
+
+        double startingX = (canvasWidth / 2) - (totalTreeWidth / 2);
+
+        _layoutTree(root, startingX, 100);
+
+        setState(() {
+          canvasWidth = canvasRightEdge + 200; // give breathing space
+          canvasHeight = canvasBottomEdge + 200;
+        });
       }
     }
 
@@ -692,8 +789,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           : getBalancedChildPosition(duplicatedParent);
 
       final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-      print(
-          "🟡 Duplicating ${original.name} → ${duplicatedName} at (${newPosition.dx}, ${newPosition.dy})");
 
       final duplicated = SpaceModel(
         name: duplicatedName,
@@ -722,7 +817,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           duplicated.incomingConnection = newConnection;
           duplicatedParent.addOutgoingConnection(newConnection);
           duplicatedParent.children.add(duplicated);
-          print("🔗 Created connection: ${duplicatedParent.name} → ${duplicated.name}");
         }
 
         // **Recalculate the whole tree to avoid overlaps**
@@ -739,19 +833,14 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
     /// **Handle root duplication**
     if (space.parent == null) {
-      print("🟠 Duplicating root node: ${space.name}");
       SpaceModel duplicatedRoot = duplicateRecursive(space, null);
 
       setState(() {
         spaces.add(duplicatedRoot);
         realignTree();
       });
-
-      print("✅ Root duplication successful: ${duplicatedRoot.name}");
     } else {
       duplicateRecursive(space, space.parent);
     }
-
-    print("🟢 Finished duplication process for: ${space.name}");
   }
 }

From 976d6e385a23830cb14dfc752f3ebcbf1f9b87ee Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Sun, 27 Apr 2025 11:12:03 +0400
Subject: [PATCH 214/238] duplicated space

---
 .../widgets/community_structure_widget.dart   | 245 +++++++-----------
 1 file changed, 91 insertions(+), 154 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 5fb648e3..6d742e69 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -1,4 +1,6 @@
 // Flutter imports
+import 'dart:math';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 
@@ -551,62 +553,62 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     const double nodeHeight = 100;
     const double horizontalGap = 60;
     const double verticalGap = 180;
+    const double rootGap = 400; // extra space between different roots
 
     double canvasRightEdge = 1000;
     double canvasBottomEdge = 1000;
 
-    double _calculateSubtreeWidth(SpaceModel node) {
+    double calculateSubtreeWidth(SpaceModel node) {
       if (node.children.isEmpty) return nodeWidth;
       double totalWidth = 0;
       for (var child in node.children) {
-        totalWidth += _calculateSubtreeWidth(child) + horizontalGap;
+        totalWidth += calculateSubtreeWidth(child) + horizontalGap;
       }
       return totalWidth - horizontalGap;
     }
 
-    void _layoutTree(SpaceModel node, double startX, double y) {
-      double subtreeWidth = _calculateSubtreeWidth(node);
+    void layoutSubtree(SpaceModel node, double startX, double y) {
+      double subtreeWidth = calculateSubtreeWidth(node);
       double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
       node.position = Offset(centerX, y);
 
-      canvasRightEdge =
-          centerX + nodeWidth > canvasRightEdge ? centerX + nodeWidth : canvasRightEdge;
-      canvasBottomEdge = y + nodeHeight > canvasBottomEdge ? y + nodeHeight : canvasBottomEdge;
+      canvasRightEdge = max(canvasRightEdge, centerX + nodeWidth);
+      canvasBottomEdge = max(canvasBottomEdge, y + nodeHeight);
 
       if (node.children.length == 1) {
         final child = node.children.first;
-        double parentCenterX = node.position.dx + nodeWidth / 2;
-        double childX = parentCenterX - nodeWidth / 2;
-        double childY = y + verticalGap;
-
-        child.position = Offset(childX, childY);
-        _layoutTree(child, childX, childY);
+        layoutSubtree(child, centerX, y + verticalGap);
       } else {
         double childX = startX;
         for (var child in node.children) {
-          double childWidth = _calculateSubtreeWidth(child);
-          _layoutTree(child, childX, y + verticalGap);
+          double childWidth = calculateSubtreeWidth(child);
+          layoutSubtree(child, childX, y + verticalGap);
           childX += childWidth + horizontalGap;
         }
       }
     }
 
-    final SpaceModel? root = spaces.firstWhere(
-      (s) => s.parent == null,
-      orElse: () => spaces.first,
-    );
+    // ⚡ New: layout each root separately
+    final List<SpaceModel> roots = spaces
+        .where((s) =>
+            s.parent == null &&
+            s.status != SpaceStatus.deleted &&
+            s.status != SpaceStatus.parentDeleted)
+        .toList();
 
-    if (root != null) {
-      double totalTreeWidth = _calculateSubtreeWidth(root);
-      double startingX = (canvasWidth / 2) - (totalTreeWidth / 2);
+    double currentX = 100; // start some margin from left
+    double currentY = 100; // top margin
 
-      _layoutTree(root, startingX, 100);
-
-      setState(() {
-        canvasWidth = canvasRightEdge + 200;
-        canvasHeight = canvasBottomEdge + 200;
-      });
+    for (var root in roots) {
+      layoutSubtree(root, currentX, currentY);
+      double rootWidth = calculateSubtreeWidth(root);
+      currentX += rootWidth + rootGap;
     }
+
+    setState(() {
+      canvasWidth = canvasRightEdge + 400;
+      canvasHeight = canvasBottomEdge + 400;
+    });
   }
 
   void _onDuplicate(BuildContext parentContext) {
@@ -690,110 +692,19 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   void _duplicateSpace(SpaceModel space) {
-    final Map<SpaceModel, SpaceModel> originalToDuplicate = {};
-    double horizontalGap = 250.0; // Increased spacing
-    double verticalGap = 180.0; // Adjusted for better visualization
+    final double horizontalGap = 250.0;
+    final double verticalGap = 180.0;
+    final double nodeWidth = 200;
+    final double nodeHeight = 100;
+    final double breathingSpace = 300.0; // extra gap after original tree
 
-    print("🟢 Duplicating: ${space.name}");
-
-    /// **Find a new position ensuring no overlap**
-    Offset getBalancedChildPosition(SpaceModel parent) {
-      const double nodeWidth = 200;
-      const double horizontalGap = 60;
-      const double verticalGap = 180;
-
-      int numSiblings = parent.children.length;
-      double totalWidth = numSiblings * (nodeWidth + horizontalGap);
-
-      // Calculate position directly beneath the parent, spaced horizontally
-      double x = parent.position.dx - (totalWidth / 2) + numSiblings * (nodeWidth + horizontalGap);
-      double y = parent.position.dy + verticalGap;
-
-      return Offset(x, y);
-    }
-
-    /// **Realign the entire tree after duplication**
-    void realignTree() {
-      const double nodeWidth = 200;
-      const double nodeHeight = 100;
-      const double horizontalGap = 60;
-      const double verticalGap = 180;
-
-      double canvasRightEdge = 1000;
-      double canvasBottomEdge = 1000;
-
-      // Step 1: Calculate the width of any subtree
-      double _calculateSubtreeWidth(SpaceModel node) {
-        if (node.children.isEmpty) return nodeWidth;
-        double totalWidth = 0;
-        for (var child in node.children) {
-          totalWidth += _calculateSubtreeWidth(child) + horizontalGap;
-        }
-        return totalWidth - horizontalGap;
-      }
-
-      void _layoutTree(SpaceModel node, double startX, double y) {
-        double subtreeWidth = _calculateSubtreeWidth(node);
-        double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
-        node.position = Offset(centerX, y);
-
-        canvasRightEdge =
-            centerX + nodeWidth > canvasRightEdge ? centerX + nodeWidth : canvasRightEdge;
-        canvasBottomEdge = y + nodeHeight > canvasBottomEdge ? y + nodeHeight : canvasBottomEdge;
-
-        if (node.children.length == 1) {
-          final child = node.children.first;
-
-          double parentCenterX = node.position.dx + nodeWidth / 2;
-          double childX = parentCenterX - nodeWidth / 2;
-          double childY = y + verticalGap;
-
-          child.position = Offset(childX, childY);
-
-          _layoutTree(child, childX, childY);
-        } else {
-          double childX = startX;
-          for (var child in node.children) {
-            double childWidth = _calculateSubtreeWidth(child);
-            _layoutTree(child, childX, y + verticalGap);
-            childX += childWidth + horizontalGap;
-          }
-        }
-      }
-
-      // Step 3: Start centered
-      final SpaceModel? root = spaces.firstWhere(
-        (s) => s.parent == null,
-        orElse: () => spaces.first,
-      );
-
-      if (root != null) {
-        // Calculate total width of full tree
-        double totalTreeWidth = _calculateSubtreeWidth(root);
-
-        double startingX = (canvasWidth / 2) - (totalTreeWidth / 2);
-
-        _layoutTree(root, startingX, 100);
-
-        setState(() {
-          canvasWidth = canvasRightEdge + 200; // give breathing space
-          canvasHeight = canvasBottomEdge + 200;
-        });
-      }
-    }
-
-    /// **Recursive duplication logic**
+    /// Helper to recursively duplicate a node and its children
     SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
-      Offset newPosition = duplicatedParent == null
-          ? Offset(original.position.dx + horizontalGap, original.position.dy)
-          : getBalancedChildPosition(duplicatedParent);
-
       final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-
       final duplicated = SpaceModel(
         name: duplicatedName,
         icon: original.icon,
-        position: newPosition,
+        position: Offset.zero,
         isPrivate: original.isPrivate,
         children: [],
         status: SpaceStatus.newSpace,
@@ -803,27 +714,20 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         tags: original.tags,
       );
 
-      setState(() {
-        spaces.add(duplicated);
-        _updateNodePosition(duplicated, duplicated.position);
+      spaces.add(duplicated);
 
-        if (duplicatedParent != null) {
-          final newConnection = Connection(
-            startSpace: duplicatedParent,
-            endSpace: duplicated,
-            direction: "down",
-          );
-          connections.add(newConnection);
-          duplicated.incomingConnection = newConnection;
-          duplicatedParent.addOutgoingConnection(newConnection);
-          duplicatedParent.children.add(duplicated);
-        }
+      if (duplicatedParent != null) {
+        final newConnection = Connection(
+          startSpace: duplicatedParent,
+          endSpace: duplicated,
+          direction: "down",
+        );
+        connections.add(newConnection);
+        duplicated.incomingConnection = newConnection;
+        duplicatedParent.addOutgoingConnection(newConnection);
+        duplicatedParent.children.add(duplicated);
+      }
 
-        // **Recalculate the whole tree to avoid overlaps**
-        realignTree();
-      });
-
-      // Recursively duplicate children
       for (var child in original.children) {
         duplicateRecursive(child, duplicated);
       }
@@ -831,16 +735,49 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       return duplicated;
     }
 
-    /// **Handle root duplication**
-    if (space.parent == null) {
-      SpaceModel duplicatedRoot = duplicateRecursive(space, null);
+    /// Layout a subtree rooted at node
+    void layoutSubtree(SpaceModel node, double startX, double startY) {
+      double calculateSubtreeWidth(SpaceModel n) {
+        if (n.children.isEmpty) return nodeWidth;
+        double width = 0;
+        for (var child in n.children) {
+          width += calculateSubtreeWidth(child) + horizontalGap;
+        }
+        return width - horizontalGap;
+      }
 
-      setState(() {
-        spaces.add(duplicatedRoot);
-        realignTree();
-      });
-    } else {
-      duplicateRecursive(space, space.parent);
+      void assignPositions(SpaceModel n, double x, double y) {
+        double subtreeWidth = calculateSubtreeWidth(n);
+        double centerX = x + subtreeWidth / 2 - nodeWidth / 2;
+        n.position = Offset(centerX, y);
+
+        if (n.children.length == 1) {
+          assignPositions(n.children.first, centerX, y + verticalGap);
+        } else {
+          double childX = x;
+          for (var child in n.children) {
+            double childWidth = calculateSubtreeWidth(child);
+            assignPositions(child, childX, y + verticalGap);
+            childX += childWidth + horizontalGap;
+          }
+        }
+      }
+
+      double totalSubtreeWidth = calculateSubtreeWidth(node);
+      assignPositions(node, startX, startY);
     }
+
+    /// Actual duplication process
+    setState(() {
+      if (space.parent == null) {
+        // Duplicating a ROOT node
+        SpaceModel duplicatedRoot = duplicateRecursive(space, null);
+        realignTree();
+      } else {
+        // Duplicating a CHILD node inside its parent
+        SpaceModel duplicated = duplicateRecursive(space, space.parent);
+        realignTree();
+      }
+    });
   }
 }

From 756457927c51337a3f57561b17e016878b3f0784 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 10:13:53 +0300
Subject: [PATCH 215/238] removed unnecessary `isBatch` flag from
 `FlushMountedPresenceSensorChangeValueEvent`.

---
 .../bloc/flush_mounted_presence_sensor_event.dart              | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
index f70e7f3a..08a01615 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/bloc/flush_mounted_presence_sensor_event.dart
@@ -24,11 +24,10 @@ class FlushMountedPresenceSensorChangeValueEvent
     extends FlushMountedPresenceSensorEvent {
   final int value;
   final String code;
-  final bool isBatchControl;
+
   const FlushMountedPresenceSensorChangeValueEvent({
     required this.value,
     required this.code,
-    this.isBatchControl = false,
   });
 
   @override

From 6fc35a7b9a36ed1d992c6256762ba72227e2d245 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 10:14:19 +0300
Subject: [PATCH 216/238] enhanced device debouncing to accomodate for multiple
 calls from the different devices functions calls.

---
 lib/services/control_device_service.dart | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

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

From b26928b3d5590d99b166ece44400a1af0eeecf22 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 10:14:35 +0300
Subject: [PATCH 217/238] fixed ui bugs.

---
 ..._mounted_presence_sensor_control_view.dart | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index f0815c60..300854ab 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -113,7 +113,8 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
+          value:
+              ((model.nearDetection / 100).toDouble()).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -129,7 +130,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
+          value: ((model.farDetection / 100).toDouble()).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -145,14 +146,14 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.presenceDelay.toDouble()),
+          value: (model.sensiReduce.toDouble()),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
           steps: 1,
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
                 FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
               ),
@@ -171,18 +172,20 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: (model.presenceDelay / 10).toDouble(),
+          valuesPercision: 1,
           title: 'Target Confirm Time:',
           description: 's',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorChangeValueEvent(
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
-                  value: value,
-                ),
-              ),
+          minValue: 0.0,
+          maxValue: 0.5,
+          steps: 0.1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorChangeValueEvent(
+                      code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                      value: (value * 10).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
           value: ((model.noneDelay / 10).toDouble()),

From 233fb2ee2c806705dc5168fa7c2c930888305bd9 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 10:55:03 +0300
Subject: [PATCH 218/238] refactor: improve formatting of clamp method for near
 and far detection values

---
 .../views/flush_mounted_presence_sensor_control_view.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index 300854ab..0360b642 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -113,8 +113,10 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value:
-              ((model.nearDetection / 100).toDouble()).clamp(0.0, double.infinity),
+          value: (model.nearDetection / 100).clamp(
+            0.0,
+            double.infinity,
+          ),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -130,7 +132,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: ((model.farDetection / 100).toDouble()).clamp(0.0, double.infinity),
+          value: (model.farDetection / 100).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,

From 6e0b1775f05ca5ef567a9d066273f4e0362775f0 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 10:55:18 +0300
Subject: [PATCH 219/238] fix: reorder constructor parameters for consistency
 in FlushMountedPresenceSensorControlView

---
 .../views/flush_mounted_presence_sensor_control_view.dart       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index 0360b642..c521bd3b 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -15,7 +15,7 @@ import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_la
 
 class FlushMountedPresenceSensorControlView extends StatelessWidget
     with HelperResponsiveLayout {
-  const FlushMountedPresenceSensorControlView({super.key, required this.device});
+  const FlushMountedPresenceSensorControlView({required this.device, super.key});
 
   final AllDevicesModel device;
 

From 43802a9fad77795408b9d57ef234e848249cb3c1 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 10:57:44 +0300
Subject: [PATCH 220/238] refactor: update detection value calculations and
 adjust parameters for presence delay

---
 ...ed_presence_sensor_batch_control_view.dart | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
index 78db6e2e..4f27183d 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
@@ -75,7 +75,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).toDouble(),
+          value: (model.nearDetection / 100).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -92,7 +92,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.farDetection / 100).toDouble(),
+          value: (model.farDetection / 100).clamp(0.0, double.infinity),
           title: 'Max Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -117,7 +117,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
           action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
                 FlushMountedPresenceSensorBatchControlEvent(
                   deviceIds: devicesIds,
-                  code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
                   value: value,
                 ),
               ),
@@ -137,19 +137,21 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: (model.presenceDelay / 10).toDouble(),
           title: 'Target Confirm Time:',
           description: 's',
-          minValue: 0,
-          maxValue: 3,
-          steps: 1,
-          action: (int value) => context.read<FlushMountedPresenceSensorBloc>().add(
-                FlushMountedPresenceSensorBatchControlEvent(
-                  deviceIds: devicesIds,
-                  code: FlushMountedPresenceSensorModel.codeSensiReduce,
-                  value: value,
-                ),
-              ),
+          minValue: 0.0,
+          maxValue: 0.5,
+          steps: 0.1,
+          valuesPercision: 1,
+          action: (double value) =>
+              context.read<FlushMountedPresenceSensorBloc>().add(
+                    FlushMountedPresenceSensorBatchControlEvent(
+                      deviceIds: devicesIds,
+                      code: FlushMountedPresenceSensorModel.codePresenceDelay,
+                      value: (value * 10).toInt(),
+                    ),
+                  ),
         ),
         PresenceUpdateData(
           value: ((model.noneDelay / 10).toDouble()),

From 3193fd26fefdc2f3505dba90c3b323c0b2fee774 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 11:04:54 +0300
Subject: [PATCH 221/238] refactor: update presence delay value and enhance
 request handling in DebouncedBatchControlDevicesService

---
 ...ed_presence_sensor_batch_control_view.dart |  2 +-
 .../batch_control_devices_service.dart        | 32 ++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
index 4f27183d..2860e5cc 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_batch_control_view.dart
@@ -109,7 +109,7 @@ class FlushMountedPresenceSensorBatchControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: model.presenceDelay.toDouble(),
+          value: model.sensiReduce.toDouble(),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
diff --git a/lib/services/batch_control_devices_service.dart b/lib/services/batch_control_devices_service.dart
index de5af9ee..f78cdef4 100644
--- a/lib/services/batch_control_devices_service.dart
+++ b/lib/services/batch_control_devices_service.dart
@@ -46,14 +46,14 @@ final class DebouncedBatchControlDevicesService
   final BatchControlDevicesService decoratee;
   final Duration debounceDuration;
 
-  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
-  var _isProcessing = false;
-
   DebouncedBatchControlDevicesService({
     required this.decoratee,
-    this.debounceDuration = const Duration(milliseconds: 800),
+    this.debounceDuration = const Duration(milliseconds: 1500),
   });
 
+  final _pendingRequests = <(List<String> uuids, String code, Object value)>[];
+  var _isProcessing = false;
+
   @override
   Future<bool> batchControlDevices({
     required List<String> uuids,
@@ -68,16 +68,26 @@ final class DebouncedBatchControlDevicesService
 
     await Future.delayed(debounceDuration);
 
-    final lastRequest = _pendingRequests.last;
+    final groupedRequests =
+        <String, (List<String> uuids, String code, Object value)>{};
+    for (final request in _pendingRequests) {
+      final (_, requestCode, requestValue) = request;
+      groupedRequests[requestCode] = request;
+    }
     _pendingRequests.clear();
 
     try {
-      final (lastRequestUuids, lastRequestCode, lastRequestValue) = lastRequest;
-      return decoratee.batchControlDevices(
-        uuids: lastRequestUuids,
-        code: lastRequestCode,
-        value: lastRequestValue,
-      );
+      var allSuccessful = true;
+      for (final request in groupedRequests.values) {
+        final (lastRequestUuids, lastRequestCode, lastRequestValue) = request;
+        final success = await decoratee.batchControlDevices(
+          uuids: lastRequestUuids,
+          code: lastRequestCode,
+          value: lastRequestValue,
+        );
+        if (!success) allSuccessful = false;
+      }
+      return allSuccessful;
     } finally {
       _isProcessing = false;
     }

From 34d4d892d913f59789e9eee1e1364ccbd527d342 Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 11:11:38 +0300
Subject: [PATCH 222/238] refactor: streamline value calculations in
 FlushMountedPresenceSensorControlView

---
 .../flush_mounted_presence_sensor_control_view.dart   | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
index c521bd3b..08ad809d 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/views/flush_mounted_presence_sensor_control_view.dart
@@ -113,10 +113,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.nearDetection / 100).clamp(
-            0.0,
-            double.infinity,
-          ),
+          value: (model.nearDetection / 100).clamp(0.0, double.infinity),
           title: 'Nearest Detect Dist:',
           description: 'm',
           minValue: 0.0,
@@ -148,7 +145,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: (model.sensiReduce.toDouble()),
+          value: model.sensiReduce.toDouble(),
           title: 'Trigger Level:',
           minValue: 0,
           maxValue: 3,
@@ -161,7 +158,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
               ),
         ),
         PresenceUpdateData(
-          value: (model.occurDistReduce.toDouble()),
+          value: model.occurDistReduce.toDouble(),
           title: 'Indent Level:',
           minValue: 0,
           maxValue: 3,
@@ -190,7 +187,7 @@ class FlushMountedPresenceSensorControlView extends StatelessWidget
                   ),
         ),
         PresenceUpdateData(
-          value: ((model.noneDelay / 10).toDouble()),
+          value: (model.noneDelay / 10).toDouble(),
           description: 's',
           title: 'Disappe Delay:',
           minValue: 20,

From 0f56273d99271361c4143fc1dc3364ba9396031b Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 12:10:38 +0300
Subject: [PATCH 223/238] SP-1408

---
 .../all_devices/view/device_managment_page.dart                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/device_managment/all_devices/view/device_managment_page.dart b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
index f41b5a4a..fd3a2574 100644
--- a/lib/pages/device_managment/all_devices/view/device_managment_page.dart
+++ b/lib/pages/device_managment/all_devices/view/device_managment_page.dart
@@ -108,7 +108,7 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
                 return DeviceManagementBody(
                     devices: deviceState.filteredDevices);
               } else {
-                return const Center(child: Text('Error fetching Devices'));
+                return const DeviceManagementBody(devices: []);
               }
             },
           );

From 51c52c66cba5f672834f6cd2f627b5870177746c Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 15:18:19 +0300
Subject: [PATCH 224/238] 
 SP-1478-FE-On-devices-management-page-when-we-open-power-clamp-device-loading-indicator-remains-loading-and-no-data-is-displayed

---
 .../power_clamp/bloc/smart_power_bloc.dart    | 32 +++++------
 .../power_clamp/models/power_clamp_model.dart | 54 +++++++++----------
 .../power_clamp/view/power_chart.dart         | 24 ++++-----
 .../view/smart_power_device_control.dart      | 53 +++++++++---------
 4 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart b/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart
index 52cccff4..24c5138f 100644
--- a/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart
+++ b/lib/pages/device_managment/power_clamp/bloc/smart_power_bloc.dart
@@ -217,29 +217,31 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
     try {
       var status =
           await DevicesManagementApi().getPowerClampInfo(event.deviceId);
-      deviceStatus = PowerClampModel.fromJson(status);
-
+      deviceStatus = PowerClampModel.fromJson(status as Map<String, Object?>? ??{});
+      final phaseADataPoints = deviceStatus.status.phaseA.dataPoints;
+      final phaseBDataPoints = deviceStatus.status.phaseB.dataPoints;
+      final phaseCDataPoints = deviceStatus.status.phaseC.dataPoints;
       phaseData = [
         {
           'name': 'Phase A',
-          'voltage': '${deviceStatus.status.phaseA.dataPoints[0].value / 10} V',
-          'current': '${deviceStatus.status.phaseA.dataPoints[1].value / 10} A',
-          'activePower': '${deviceStatus.status.phaseA.dataPoints[2].value} W',
-          'powerFactor': '${deviceStatus.status.phaseA.dataPoints[3].value}',
+          'voltage': '${(phaseADataPoints.elementAtOrNull(0)?.value as num? ?? 0) / 10} V',
+          'current': '${(phaseADataPoints.elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
+          'activePower': '${phaseADataPoints.elementAtOrNull(2)?.value??'N/A'} W',
+          'powerFactor': '${phaseADataPoints.elementAtOrNull(3)?.value??'N/A'}',
         },
         {
           'name': 'Phase B',
-          'voltage': '${deviceStatus.status.phaseB.dataPoints[0].value / 10} V',
-          'current': '${deviceStatus.status.phaseB.dataPoints[1].value / 10} A',
-          'activePower': '${deviceStatus.status.phaseB.dataPoints[2].value} W',
-          'powerFactor': '${deviceStatus.status.phaseB.dataPoints[3].value}',
+          'voltage': '${(phaseBDataPoints .elementAtOrNull(0)?.value  as num? ?? 0) / 10} V',
+          'current': '${(phaseBDataPoints .elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
+          'activePower': '${phaseBDataPoints.elementAtOrNull(2)?.value??'N/A'} W',
+          'powerFactor': '${phaseBDataPoints.elementAtOrNull(3)?.value??'N/A'}',
         },
         {
           'name': 'Phase C',
-          'voltage': '${deviceStatus.status.phaseC.dataPoints[0].value / 10} V',
-          'current': '${deviceStatus.status.phaseC.dataPoints[1].value / 10} A',
-          'activePower': '${deviceStatus.status.phaseC.dataPoints[2].value} W',
-          'powerFactor': '${deviceStatus.status.phaseC.dataPoints[3].value}',
+          'voltage': '${(phaseCDataPoints.elementAtOrNull(0)?.value as num? ?? 0) / 10} V',
+          'current': '${(phaseCDataPoints.elementAtOrNull(1)?.value as num? ?? 0) / 10} A',
+          'activePower': '${phaseCDataPoints.elementAtOrNull(2)?.value ?? 'N/A'} W',
+          'powerFactor': '${phaseCDataPoints.elementAtOrNull(3)?.value ?? 'N/A'}',
         },
       ];
       emit(GetDeviceStatus());
@@ -785,7 +787,7 @@ class SmartPowerBloc extends Bloc<SmartPowerEvent, SmartPowerState> {
   void selectDateRange() async {
     DateTime startDate = dateTime!;
     DateTime endDate = DateTime(startDate.year, startDate.month + 1, 1)
-        .subtract(Duration(days: 1));
+        .subtract(const Duration(days: 1));
     String formattedEndDate = DateFormat('dd/MM/yyyy').format(endDate);
     endChartDate = ' - $formattedEndDate';
   }
diff --git a/lib/pages/device_managment/power_clamp/models/power_clamp_model.dart b/lib/pages/device_managment/power_clamp/models/power_clamp_model.dart
index 914a255b..4318d5ee 100644
--- a/lib/pages/device_managment/power_clamp/models/power_clamp_model.dart
+++ b/lib/pages/device_managment/power_clamp/models/power_clamp_model.dart
@@ -12,9 +12,9 @@ class PowerClampModel {
 
   factory PowerClampModel.fromJson(Map<String, dynamic> json) {
     return PowerClampModel(
-      productUuid: json['productUuid'],
-      productType: json['productType'],
-      status: PowerStatus.fromJson(json['status']),
+      productUuid: json['productUuid'] as String? ?? '',
+      productType: json['productType'] as String? ?? '',
+      status: PowerStatus.fromJson(json['status'] as Map<String, dynamic>? ?? {}),
     );
   }
 
@@ -26,7 +26,7 @@ class PowerClampModel {
     return PowerClampModel(
       productUuid: productUuid ?? this.productUuid,
       productType: productType ?? this.productType,
-      status: statusPower ?? this.status,
+      status: statusPower ?? status,
     );
   }
 }
@@ -46,12 +46,10 @@ class PowerStatus {
 
   factory PowerStatus.fromJson(Map<String, dynamic> json) {
     return PowerStatus(
-        phaseA: Phase.fromJson(json['phaseA']),
-        phaseB: Phase.fromJson(json['phaseB']),
-        phaseC: Phase.fromJson(json['phaseC']),
-        general: Phase.fromJson(json['general']
-            // List<DataPoint>.from(
-            //     json['general'].map((x) => DataPoint.fromJson(x))),
+        phaseA: Phase.fromJson(json['phaseA']as List<dynamic>? ?? []),
+        phaseB: Phase.fromJson(json['phaseB']as List<dynamic>? ?? []),
+        phaseC: Phase.fromJson(json['phaseC']as List<dynamic>? ?? []),
+        general: Phase.fromJson(json['general']as List<dynamic>? ?? []
             ));
   }
 }
@@ -69,30 +67,30 @@ class Phase {
 }
 
 class DataPoint {
-  dynamic code;
-  dynamic customName;
-  dynamic dpId;
-  dynamic time;
-  dynamic type;
-  dynamic value;
+  final String? code;
+  final String? customName;
+  final int? dpId;
+  final int? time;
+  final String? type;
+  final dynamic value;
 
   DataPoint({
-    required this.code,
-    required this.customName,
-    required this.dpId,
-    required this.time,
-    required this.type,
-    required this.value,
+    this.code,
+    this.customName,
+    this.dpId,
+    this.time,
+    this.type,
+    this.value,
   });
 
   factory DataPoint.fromJson(Map<String, dynamic> json) {
     return DataPoint(
-      code: json['code'],
-      customName: json['customName'],
-      dpId: json['dpId'],
-      time: json['time'],
-      type: json['type'],
-      value: json['value'],
+      code: json['code'] as String?,
+      customName: json['customName'] as String?,
+      dpId: json['dpId'] as int?,
+      time: json['time'] as int?,
+      type: json['type'] as String?,
+      value: json['value'] as dynamic,
     );
   }
 }
diff --git a/lib/pages/device_managment/power_clamp/view/power_chart.dart b/lib/pages/device_managment/power_clamp/view/power_chart.dart
index 19050b8a..7d6371f4 100644
--- a/lib/pages/device_managment/power_clamp/view/power_chart.dart
+++ b/lib/pages/device_managment/power_clamp/view/power_chart.dart
@@ -1,5 +1,5 @@
-import 'package:flutter/material.dart';
 import 'package:fl_chart/fl_chart.dart';
+import 'package:flutter/material.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class EnergyConsumptionPage extends StatefulWidget {
@@ -10,7 +10,8 @@ class EnergyConsumptionPage extends StatefulWidget {
   final Widget widget;
   final Function()? onTap;
 
-  EnergyConsumptionPage({
+  const EnergyConsumptionPage({
+    super.key,
     required this.chartData,
     required this.totalConsumption,
     required this.date,
@@ -91,11 +92,12 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
             ],
           ),
           Column(
+            mainAxisSize: MainAxisSize.min,
             children: [
               Padding(
                 padding: const EdgeInsets.only(top: 10),
                 child: SizedBox(
-                  height: MediaQuery.of(context).size.height * 0.11,
+                  height: MediaQuery.sizeOf(context).height * 0.09,
                   child: LineChart(
                     LineChartData(
                       lineTouchData: LineTouchData(
@@ -151,7 +153,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                                   child: RotatedBox(
                                     quarterTurns: -1,
                                     child: Text(_chartData[index].time,
-                                        style: TextStyle(fontSize: 10)),
+                                        style: const TextStyle(fontSize: 10)),
                                   ),
                                 );
                               }
@@ -190,8 +192,8 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                           spots: _chartData
                               .asMap()
                               .entries
-                              .map((entry) => FlSpot(entry.key.toDouble(),
-                                  entry.value.consumption))
+                              .map((entry) => FlSpot(
+                                  entry.key.toDouble(), entry.value.consumption))
                               .toList(),
                           isCurved: true,
                           color: ColorsManager.primaryColor.withOpacity(0.6),
@@ -218,7 +220,7 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                       borderData: FlBorderData(
                         show: false,
                         border: Border.all(
-                          color: Color(0xff023DFE).withOpacity(0.7),
+                          color: const Color(0xff023DFE).withOpacity(0.7),
                           width: 10,
                         ),
                       ),
@@ -253,11 +255,9 @@ class _EnergyConsumptionPageState extends State<EnergyConsumptionPage> {
                         child: InkWell(
                           onTap: widget.onTap,
                           child: Center(
-                            child: SizedBox(
-                              child: Padding(
-                                padding: const EdgeInsets.all(5),
-                                child: Text(widget.date),
-                              ),
+                            child: Padding(
+                              padding: const EdgeInsets.all(5),
+                              child: Text(widget.date),
                             ),
                           ),
                         ),
diff --git a/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart b/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart
index 03d649fa..67313802 100644
--- a/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart
+++ b/lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart
@@ -12,8 +12,7 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 //Smart Power Clamp
-class SmartPowerDeviceControl extends StatelessWidget
-    with HelperResponsiveLayout {
+class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayout {
   final String deviceId;
 
   const SmartPowerDeviceControl({super.key, required this.deviceId});
@@ -25,27 +24,27 @@ class SmartPowerDeviceControl extends StatelessWidget
         ..add(SmartPowerFetchDeviceEvent(deviceId)),
       child: BlocBuilder<SmartPowerBloc, SmartPowerState>(
         builder: (context, state) {
-          final _blocProvider = BlocProvider.of<SmartPowerBloc>(context);
+          final blocProvider = BlocProvider.of<SmartPowerBloc>(context);
 
           if (state is SmartPowerLoading) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is FakeState) {
             return _buildStatusControls(
-              currentPage: _blocProvider.currentPage,
+              currentPage: blocProvider.currentPage,
               context: context,
-              blocProvider: _blocProvider,
+              blocProvider: blocProvider,
             );
           } else if (state is GetDeviceStatus) {
             return _buildStatusControls(
-              currentPage: _blocProvider.currentPage,
+              currentPage: blocProvider.currentPage,
               context: context,
-              blocProvider: _blocProvider,
+              blocProvider: blocProvider,
             );
           } else if (state is FilterRecordsState) {
             return _buildStatusControls(
-              currentPage: _blocProvider.currentPage,
+              currentPage: blocProvider.currentPage,
               context: context,
-              blocProvider: _blocProvider,
+              blocProvider: blocProvider,
             );
           }
           return const Center(child: CircularProgressIndicator());
@@ -60,7 +59,7 @@ class SmartPowerDeviceControl extends StatelessWidget
     required SmartPowerBloc blocProvider,
     required int currentPage,
   }) {
-    PageController _pageController = PageController(initialPage: currentPage);
+    PageController pageController = PageController(initialPage: currentPage);
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 50),
       child: DeviceControlsContainer(
@@ -85,25 +84,31 @@ class SmartPowerDeviceControl extends StatelessWidget
                   PowerClampInfoCard(
                     iconPath: Assets.powerActiveIcon,
                     title: 'Active',
-                    value: blocProvider
-                        .deviceStatus.status.general.dataPoints[2].value
-                        .toString(),
+                    value: blocProvider.deviceStatus.status.general.dataPoints
+                            .elementAtOrNull(2)
+                            ?.value
+                            .toString() ??
+                        '',
                     unit: '',
                   ),
                   PowerClampInfoCard(
                     iconPath: Assets.voltMeterIcon,
                     title: 'Current',
-                    value: blocProvider
-                        .deviceStatus.status.general.dataPoints[1].value
-                        .toString(),
+                    value: blocProvider.deviceStatus.status.general.dataPoints
+                            .elementAtOrNull(1)
+                            ?.value
+                            .toString() ??
+                        '',
                     unit: ' A',
                   ),
                   PowerClampInfoCard(
                     iconPath: Assets.frequencyIcon,
                     title: 'Frequency',
-                    value: blocProvider
-                        .deviceStatus.status.general.dataPoints[4].value
-                        .toString(),
+                    value: blocProvider.deviceStatus.status.general.dataPoints
+                            .elementAtOrNull(4)
+                            ?.value
+                            .toString() ??
+                        '',
                     unit: ' Hz',
                   ),
                 ],
@@ -142,7 +147,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                           icon: const Icon(Icons.arrow_left),
                           onPressed: () {
                             blocProvider.add(SmartPowerArrowPressedEvent(-1));
-                            _pageController.previousPage(
+                            pageController.previousPage(
                               duration: const Duration(milliseconds: 300),
                               curve: Curves.easeInOut,
                             );
@@ -162,7 +167,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                           icon: const Icon(Icons.arrow_right),
                           onPressed: () {
                             blocProvider.add(SmartPowerArrowPressedEvent(1));
-                            _pageController.nextPage(
+                            pageController.nextPage(
                               duration: const Duration(milliseconds: 300),
                               curve: Curves.easeInOut,
                             );
@@ -177,7 +182,7 @@ class SmartPowerDeviceControl extends StatelessWidget
                   Expanded(
                     flex: 2,
                     child: PageView(
-                      controller: _pageController,
+                      controller: pageController,
                       onPageChanged: (int page) {
                         blocProvider.add(SmartPowerPageChangedEvent(page));
                       },
@@ -190,8 +195,8 @@ class SmartPowerDeviceControl extends StatelessWidget
                             blocProvider.add(SelectDateEvent(context: context));
                             blocProvider.add(FilterRecordsByDateEvent(
                                 selectedDate: blocProvider.dateTime!,
-                                viewType: blocProvider
-                                    .views[blocProvider.currentIndex]));
+                                viewType:
+                                    blocProvider.views[blocProvider.currentIndex]));
                           },
                           widget: blocProvider.dateSwitcher(),
                           chartData: blocProvider.energyDataList.isNotEmpty

From ac2996629e5a0955bda6658d99f581be73b1ddbb Mon Sep 17 00:00:00 2001
From: Faris Armoush <farmoush@uba.com.jo>
Date: Sun, 27 Apr 2025 15:42:50 +0300
Subject: [PATCH 225/238] resolved an exception that was thrown when resizing
 the `DeviceSearchFilters`.

---
 .../common/buttons/search_reset_buttons.dart  |  4 ++-
 .../widgets/device_managment_body.dart        |  1 +
 .../widgets/device_search_filters.dart        | 32 +++++++++----------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/lib/pages/common/buttons/search_reset_buttons.dart b/lib/pages/common/buttons/search_reset_buttons.dart
index 7b63a485..6fdbfd2a 100644
--- a/lib/pages/common/buttons/search_reset_buttons.dart
+++ b/lib/pages/common/buttons/search_reset_buttons.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 
 class SearchResetButtons extends StatelessWidget {
   const SearchResetButtons({
@@ -17,8 +17,10 @@ class SearchResetButtons extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Row(
+      mainAxisSize: MainAxisSize.min,
       children: [
         Column(
+          mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.center,
           children: [
             const SizedBox(height: 25),
diff --git a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
index 907e5390..a3c975c1 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_managment_body.dart
@@ -72,6 +72,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               child: state is DeviceManagementLoading
                   ? const Center(child: CircularProgressIndicator())
                   : Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Container(
                           padding: isLargeScreenSize(context)
diff --git a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
index fbbe65ab..18d72fc9 100644
--- a/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
+++ b/lib/pages/device_managment/all_devices/widgets/device_search_filters.dart
@@ -14,29 +14,29 @@ class DeviceSearchFilters extends StatefulWidget {
 
 class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
     with HelperResponsiveLayout {
-  final _unitNameController = TextEditingController();
-  final _productNameController = TextEditingController();
+  late final TextEditingController _unitNameController;
+  late final TextEditingController _productNameController;
 
-  List<Widget> get _widgets => [
-        _buildSearchField("Space Name", _unitNameController, 200),
-        _buildSearchField("Device Name / Product Name", _productNameController, 300),
-        _buildSearchResetButtons(),
-      ];
+  @override
+  void initState() {
+    _unitNameController = TextEditingController();
+    _productNameController = TextEditingController();
+    super.initState();
+  }
 
   @override
   Widget build(BuildContext context) {
-    if (isExtraLargeScreenSize(context)) {
-      return Row(
-        children: _widgets
-            .map((e) => Padding(padding: const EdgeInsets.all(10), child: e))
-            .toList(),
-      );
-    }
-
     return Wrap(
+      alignment: WrapAlignment.start,
+      runAlignment: WrapAlignment.start,
+      crossAxisAlignment: WrapCrossAlignment.center,
       spacing: 20,
       runSpacing: 10,
-      children: _widgets,
+      children: [
+        _buildSearchField("Space Name", _unitNameController, 200),
+        _buildSearchField("Device Name / Product Name", _productNameController, 300),
+        _buildSearchResetButtons(),
+      ],
     );
   }
 

From 52608b1f355227fc3e23170c20555e2ea6b53c46 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Sun, 27 Apr 2025 22:42:57 +0400
Subject: [PATCH 226/238] fixed search query

---
 .../all_spaces/widgets/sidebar_widget.dart    | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 374f0a0a..612bf781 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/common/widgets/empty_search_result_widget.dart';
@@ -36,6 +38,7 @@ class SidebarWidget extends StatefulWidget {
 
 class _SidebarWidgetState extends State<SidebarWidget> {
   late final ScrollController _scrollController;
+  Timer? _debounce;
 
   String _searchQuery = '';
   String? _selectedSpaceUuid;
@@ -43,10 +46,10 @@ class _SidebarWidgetState extends State<SidebarWidget> {
 
   @override
   void initState() {
+    super.initState();
     _scrollController = ScrollController();
     _scrollController.addListener(_onScroll);
     _selectedId = widget.selectedSpaceUuid;
-    super.initState();
   }
 
   void _onScroll() {
@@ -67,11 +70,22 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   void dispose() {
     _scrollController.removeListener(_onScroll);
-
     _scrollController.dispose();
+    _debounce?.cancel();
     super.dispose();
   }
 
+  void _onSearchChanged(String query) {
+    if (_debounce?.isActive ?? false) _debounce?.cancel();
+
+    _debounce = Timer(const Duration(milliseconds: 500), () {
+      setState(() {
+        _searchQuery = query;
+      });
+      context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
+    });
+  }
+
   @override
   void didUpdateWidget(covariant SidebarWidget oldWidget) {
     if (widget.selectedSpaceUuid != oldWidget.selectedSpaceUuid) {
@@ -91,7 +105,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
   @override
   Widget build(BuildContext context) {
     final spaceTreeState = context.watch<SpaceTreeBloc>().state;
-    final filteredCommunities = spaceTreeState.isSearching
+    final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
         ? spaceTreeState.filteredCommunity
         : spaceTreeState.communityList;
 
@@ -104,13 +118,7 @@ class _SidebarWidgetState extends State<SidebarWidget> {
         children: [
           SidebarHeader(onAddCommunity: _onAddCommunity),
           CustomSearchBar(
-            onSearchChanged: (query) {
-              setState(() {
-                _searchQuery = query;
-              });
-
-              context.read<SpaceTreeBloc>().add(SearchQueryEvent(query));
-            },
+            onSearchChanged: _onSearchChanged,
           ),
           const SizedBox(height: 16),
           Expanded(
@@ -123,10 +131,15 @@ class _SidebarWidgetState extends State<SidebarWidget> {
                   communities: filteredCommunities,
                   itemBuilder: (context, index) {
                     if (index == filteredCommunities.length) {
-                      return const Padding(
-                        padding: EdgeInsets.all(8.0),
-                        child: Center(child: CircularProgressIndicator()),
-                      );
+                      final spaceTreeState = context.read<SpaceTreeBloc>().state;
+                      if (spaceTreeState.paginationIsLoading) {
+                        return const Padding(
+                          padding: EdgeInsets.all(8.0),
+                          child: Center(child: CircularProgressIndicator()),
+                        );
+                      } else {
+                        return const SizedBox.shrink();
+                      }
                     }
                     return _buildCommunityTile(context, filteredCommunities[index]);
                   }),

From 6ef0b2f9d1477dca367c08c4135808081db1a2ca Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 00:36:58 +0400
Subject: [PATCH 227/238] fixed the save issue

---
 .../bloc/space_management_bloc.dart           | 70 ++++++++++++++-----
 .../widgets/community_structure_widget.dart   |  1 -
 lib/services/space_mana_api.dart              |  1 +
 3 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index 56949a19..bcb89857 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -4,6 +4,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.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/spaces_management/all_spaces/model/community_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/create_subspace_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/product_model.dart';
@@ -246,7 +247,9 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
       final previousState = state;
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
       var spaceBloc = event.context.read<SpaceTreeBloc>();
-      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+      var spaceTreeState = event.context.read<SpaceTreeBloc>().state;
+
+      List<CommunityModel> communities = await _waitForCommunityList(spaceBloc, spaceTreeState);
       await fetchSpaceModels();
       await fetchTags();
 
@@ -277,11 +280,13 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
     LoadCommunityAndSpacesEvent event,
     Emitter<SpaceManagementState> emit,
   ) async {
+    var spaceTreeState = event.context.read<SpaceTreeBloc>().state;
     var spaceBloc = event.context.read<SpaceTreeBloc>();
+
     _onloadProducts();
     await fetchTags();
     // Wait until `communityList` is loaded
-    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc);
+    List<CommunityModel> communities = await _waitForCommunityList(spaceBloc, spaceTreeState);
 
     // Fetch space models after communities are available
     final prevSpaceModels = await fetchSpaceModels();
@@ -292,23 +297,38 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
         allTags: _cachedTags ?? []));
   }
 
-  Future<List<CommunityModel>> _waitForCommunityList(SpaceTreeBloc spaceBloc) async {
+  Future<List<CommunityModel>> _waitForCommunityList(
+      SpaceTreeBloc spaceBloc, SpaceTreeState spaceTreeState) async {
     // Check if communityList is already populated
-    if (spaceBloc.state.communityList.isNotEmpty) {
-      return spaceBloc.state.communityList;
+    final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
+        ? spaceTreeState.filteredCommunity
+        : spaceTreeState.communityList;
+    if (filteredCommunities.isNotEmpty) {
+      return filteredCommunities;
     }
 
     final completer = Completer<List<CommunityModel>>();
     final subscription = spaceBloc.stream.listen((state) {
-      if (state.communityList.isNotEmpty) {
-        completer.complete(state.communityList);
+      if (!completer.isCompleted && state.communityList.isNotEmpty) {
+        completer
+            .complete(state.searchQuery.isNotEmpty ? state.filteredCommunity : state.communityList);
       }
     });
+    try {
+      final communities = await completer.future.timeout(
+        const Duration(seconds: 10),
+        onTimeout: () {
+          if (!completer.isCompleted) {
+            completer.complete([]);
+          }
+          return [];
+        },
+      );
 
-    // Return the list once available, then cancel the listener
-    final communities = await completer.future;
-    await subscription.cancel();
-    return communities;
+      return communities;
+    } finally {
+      await subscription.cancel();
+    }
   }
 
   void _onCommunityDelete(
@@ -491,12 +511,21 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   Future<List<SpaceModel>> saveSpacesHierarchically(
       BuildContext context, List<SpaceModel> spaces, String communityUuid) async {
     final orderedSpaces = flattenHierarchy(spaces);
+
     final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-    var spaceBloc = context.read<SpaceTreeBloc>();
-    List<CommunityModel> communities = spaceBloc.state.communityList;
-    CommunityModel? selectedCommunity = communities.firstWhere(
-      (community) => community.uuid == communityUuid,
-    );
+    CommunityModel? selectedCommunity;
+    try {
+      final spaceTreeState = context.read<SpaceTreeBloc>().state;
+      final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
+          ? spaceTreeState.filteredCommunity
+          : spaceTreeState.communityList;
+
+      selectedCommunity = filteredCommunities.firstWhere(
+        (community) => community.uuid == communityUuid,
+      );
+    } catch (e) {
+      return [];
+    }
 
     final parentsToDelete = orderedSpaces.where((space) =>
         space.status == SpaceStatus.deleted &&
@@ -669,9 +698,12 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
     try {
       await fetchTags();
-      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-      var spaceBloc = event.context.read<SpaceTreeBloc>();
-      List<CommunityModel> communities = spaceBloc.state.communityList;
+      final spaceTreeState = event.context.read<SpaceTreeBloc>().state;
+      final filteredCommunities = spaceTreeState.searchQuery.isNotEmpty
+          ? spaceTreeState.filteredCommunity
+          : spaceTreeState.communityList;
+
+      List<CommunityModel> communities = filteredCommunities;
 
       var prevSpaceModels = await fetchSpaceModels();
 
diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 6d742e69..c1ef4fbc 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -467,7 +467,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     }
 
     String communityUuid = widget.selectedCommunity!.uuid;
-
     context.read<SpaceManagementBloc>().add(SaveSpacesEvent(
           context,
           spaces: spacesToSave,
diff --git a/lib/services/space_mana_api.dart b/lib/services/space_mana_api.dart
index 604c8cae..19e219b6 100644
--- a/lib/services/space_mana_api.dart
+++ b/lib/services/space_mana_api.dart
@@ -281,6 +281,7 @@ class CommunitySpaceManagementApi {
           return json['success'] ?? false;
         },
       );
+
       return response;
     } catch (e) {
       debugPrint('Error updating space: $e');

From fe3db663b67a718d48603e4580214dbcae946de6 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 10:03:27 +0400
Subject: [PATCH 228/238] realign initially

---
 .../all_spaces/widgets/community_structure_widget.dart         | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index c1ef4fbc..6b349374 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -72,6 +72,8 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     _nameController = TextEditingController(
       text: widget.selectedCommunity?.name ?? '',
     );
+    realignTree();
+
     _transformationController = TransformationController();
     if (widget.selectedSpace != null) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
@@ -96,6 +98,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         spaces = widget.spaces.isNotEmpty ? flattenSpaces(widget.spaces) : [];
         connections = widget.spaces.isNotEmpty ? createConnections(widget.spaces) : [];
         _adjustCanvasSizeForSpaces();
+        realignTree();
       });
     }
 

From 349fe6c55524e64cc485bc64cbef4e07e2953d7f Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 11:58:41 +0400
Subject: [PATCH 229/238] realignment

---
 .../widgets/community_structure_widget.dart   | 62 +++++++++++++++++--
 1 file changed, 57 insertions(+), 5 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 6b349374..12156b22 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -698,7 +698,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     final double verticalGap = 180.0;
     final double nodeWidth = 200;
     final double nodeHeight = 100;
-    final double breathingSpace = 300.0; // extra gap after original tree
+    final double breathingSpace = 300.0;
 
     /// Helper to recursively duplicate a node and its children
     SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
@@ -706,7 +706,7 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       final duplicated = SpaceModel(
         name: duplicatedName,
         icon: original.icon,
-        position: Offset.zero,
+        position: original.position,
         isPrivate: original.isPrivate,
         children: [],
         status: SpaceStatus.newSpace,
@@ -725,11 +725,13 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
           direction: "down",
         );
         connections.add(newConnection);
+
         duplicated.incomingConnection = newConnection;
         duplicatedParent.addOutgoingConnection(newConnection);
         duplicatedParent.children.add(duplicated);
       }
 
+      // Duplicate its children recursively
       for (var child in original.children) {
         duplicateRecursive(child, duplicated);
       }
@@ -773,13 +775,63 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
     setState(() {
       if (space.parent == null) {
         // Duplicating a ROOT node
-        SpaceModel duplicatedRoot = duplicateRecursive(space, null);
+        duplicateRecursive(space, null);
+        connections = createConnections(spaces);
         realignTree();
       } else {
-        // Duplicating a CHILD node inside its parent
-        SpaceModel duplicated = duplicateRecursive(space, space.parent);
+        final parent = space.parent!;
+
+        final duplicated = duplicateRecursive(space, parent);
+        final newConnection = Connection(
+          startSpace: parent,
+          endSpace: duplicated,
+          direction: "down",
+        );
+        connections.add(newConnection);
+        duplicated.incomingConnection = newConnection;
+        parent.addOutgoingConnection(newConnection);
+        parent.children.add(duplicated);
+        connections = createConnections(spaces);
         realignTree();
+        //_realignSubtree(space.parent!);
       }
     });
   }
+
+  void _realignSubtree(SpaceModel parent) {
+    const double nodeWidth = 200;
+    const double horizontalGap = 60;
+    const double verticalGap = 180;
+
+    double calculateSubtreeWidth(SpaceModel node) {
+      if (node.children.isEmpty) return nodeWidth;
+      double width = 0;
+      for (var child in node.children) {
+        width += calculateSubtreeWidth(child) + horizontalGap;
+      }
+      return width - horizontalGap;
+    }
+
+    void assignPositions(SpaceModel node, double startX, double startY) {
+      double subtreeWidth = calculateSubtreeWidth(node);
+      double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
+      node.position = Offset(centerX, startY);
+
+      if (node.children.length == 1) {
+        assignPositions(node.children.first, centerX, startY + verticalGap);
+      } else {
+        double childX = startX;
+        for (var child in node.children) {
+          double childWidth = calculateSubtreeWidth(child);
+          assignPositions(child, childX, startY + verticalGap);
+          childX += childWidth + horizontalGap;
+        }
+      }
+    }
+
+    // Start laying out from parent
+    assignPositions(parent, parent.position.dx - 150, parent.position.dy);
+
+    _adjustCanvasSizeForSpaces();
+  }
 }

From 7cbe20ae88e90fea9d8d5ac862d3472464384427 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 12:56:29 +0400
Subject: [PATCH 230/238] remove unused code

---
 .../widgets/community_structure_widget.dart   | 69 -------------------
 1 file changed, 69 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 12156b22..4b337961 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -739,38 +739,6 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       return duplicated;
     }
 
-    /// Layout a subtree rooted at node
-    void layoutSubtree(SpaceModel node, double startX, double startY) {
-      double calculateSubtreeWidth(SpaceModel n) {
-        if (n.children.isEmpty) return nodeWidth;
-        double width = 0;
-        for (var child in n.children) {
-          width += calculateSubtreeWidth(child) + horizontalGap;
-        }
-        return width - horizontalGap;
-      }
-
-      void assignPositions(SpaceModel n, double x, double y) {
-        double subtreeWidth = calculateSubtreeWidth(n);
-        double centerX = x + subtreeWidth / 2 - nodeWidth / 2;
-        n.position = Offset(centerX, y);
-
-        if (n.children.length == 1) {
-          assignPositions(n.children.first, centerX, y + verticalGap);
-        } else {
-          double childX = x;
-          for (var child in n.children) {
-            double childWidth = calculateSubtreeWidth(child);
-            assignPositions(child, childX, y + verticalGap);
-            childX += childWidth + horizontalGap;
-          }
-        }
-      }
-
-      double totalSubtreeWidth = calculateSubtreeWidth(node);
-      assignPositions(node, startX, startY);
-    }
-
     /// Actual duplication process
     setState(() {
       if (space.parent == null) {
@@ -797,41 +765,4 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
       }
     });
   }
-
-  void _realignSubtree(SpaceModel parent) {
-    const double nodeWidth = 200;
-    const double horizontalGap = 60;
-    const double verticalGap = 180;
-
-    double calculateSubtreeWidth(SpaceModel node) {
-      if (node.children.isEmpty) return nodeWidth;
-      double width = 0;
-      for (var child in node.children) {
-        width += calculateSubtreeWidth(child) + horizontalGap;
-      }
-      return width - horizontalGap;
-    }
-
-    void assignPositions(SpaceModel node, double startX, double startY) {
-      double subtreeWidth = calculateSubtreeWidth(node);
-      double centerX = startX + subtreeWidth / 2 - nodeWidth / 2;
-      node.position = Offset(centerX, startY);
-
-      if (node.children.length == 1) {
-        assignPositions(node.children.first, centerX, startY + verticalGap);
-      } else {
-        double childX = startX;
-        for (var child in node.children) {
-          double childWidth = calculateSubtreeWidth(child);
-          assignPositions(child, childX, startY + verticalGap);
-          childX += childWidth + horizontalGap;
-        }
-      }
-    }
-
-    // Start laying out from parent
-    assignPositions(parent, parent.position.dx - 150, parent.position.dy);
-
-    _adjustCanvasSizeForSpaces();
-  }
 }

From 25614c3dd013de8eb98a658b8e81ef14605e6bcc Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 12:59:16 +0400
Subject: [PATCH 231/238] fix the flatten

---
 .../all_spaces/widgets/community_structure_widget.dart | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 4b337961..36a6aefe 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -407,21 +407,31 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
 
   List<SpaceModel> flattenSpaces(List<SpaceModel> spaces) {
     List<SpaceModel> result = [];
+    Map<String, SpaceModel> idToSpace = {};
 
     void flatten(SpaceModel space) {
       if (space.status == SpaceStatus.deleted || space.status == SpaceStatus.parentDeleted) {
         return;
       }
       result.add(space);
+      idToSpace[space.internalId] = space; 
+
       for (var child in space.children) {
         flatten(child);
       }
     }
 
+
     for (var space in spaces) {
       flatten(space);
     }
 
+    for (var space in result) {
+      if (space.parent != null) {
+        space.parent = idToSpace[space.parent!.internalId]; 
+      }
+    }
+
     return result;
   }
 

From ab23be9828341bf9dffe188a16af350d6ca72415 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 14:36:27 +0400
Subject: [PATCH 232/238] fixed the issue in selecting space model and tag

---
 .../all_spaces/bloc/space_management_bloc.dart           | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index bcb89857..eb7e5925 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -634,11 +634,11 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
               projectId: projectUuid);
         } else {
           // Call create if the space does not have a UUID
-          final List<CreateTagBodyModel> tagBodyModels = space.tags != null
+          List<CreateTagBodyModel> tagBodyModels = space.tags != null
               ? space.tags!.map((tag) => tag.toCreateTagBodyModel()).toList()
               : [];
 
-          final createSubspaceBodyModels = space.subspaces?.map((subspace) {
+          var createSubspaceBodyModels = space.subspaces?.map((subspace) {
                 final tagBodyModels =
                     subspace.tags?.map((tag) => tag.toCreateTagBodyModel()).toList() ?? [];
                 return CreateSubspaceModel()
@@ -647,6 +647,11 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
               }).toList() ??
               [];
 
+          if (space.spaceModel?.uuid != null) {
+            tagBodyModels = [];
+            createSubspaceBodyModels = [];
+          }
+
           final response = await _api.createSpace(
               communityId: communityUuid,
               name: space.name,

From 8dc833b2c381b0e512eb0c745d5044e64b675992 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 15:21:28 +0400
Subject: [PATCH 233/238] fixed blank page rendering

---
 .../all_spaces/bloc/space_management_bloc.dart           | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
index eb7e5925..5df5c36d 100644
--- a/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
+++ b/lib/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart
@@ -466,6 +466,7 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
 
       if (previousState is SpaceManagementLoaded) {
         await _updateLoadedState(
+          event.context,
           previousState,
           allSpaces,
           event.communityUuid,
@@ -482,6 +483,7 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   }
 
   Future<void> _updateLoadedState(
+    BuildContext context,
     SpaceManagementLoaded previousState,
     List<SpaceModel> allSpaces,
     String communityUuid,
@@ -489,7 +491,10 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
   ) async {
     var prevSpaceModels = await fetchSpaceModels();
     await fetchTags();
-    final communities = List<CommunityModel>.from(previousState.communities);
+    final spaceTreeState = context.read<SpaceTreeBloc>().state;
+    final communities = spaceTreeState.searchQuery.isNotEmpty
+        ? spaceTreeState.filteredCommunity
+        : spaceTreeState.communityList;
 
     for (var community in communities) {
       if (community.uuid == communityUuid) {
@@ -504,6 +509,8 @@ class SpaceManagementBloc extends Bloc<SpaceManagementEvent, SpaceManagementStat
             spaceModels: prevSpaceModels,
             allTags: _cachedTags ?? []));
         return;
+      } else {
+        print("Community not found");
       }
     }
   }

From ce225818fb7dc48131fc0cebab28d16fa5c7859d Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Mon, 28 Apr 2025 16:25:43 +0400
Subject: [PATCH 234/238] fixed community search caching

---
 .../all_spaces/widgets/loaded_space_widget.dart            | 7 +++----
 .../all_spaces/widgets/sidebar_widget.dart                 | 2 ++
 .../space_model/view/space_model_page.dart                 | 4 ++++
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
index 5ef9c79b..40876dd8 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/loaded_space_widget.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/view/space_tree_view.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_bloc.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/bloc/space_management_event.dart';
@@ -45,7 +46,6 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
   @override
   void initState() {
     super.initState();
-
     _spaceModels = List.from(widget.spaceModels ?? []);
   }
 
@@ -106,9 +106,8 @@ class _LoadedSpaceViewState extends State<LoadedSpaceView> {
                 children: [
                   SidebarWidget(
                     communities: widget.communities,
-                    selectedSpaceUuid: widget.selectedSpace?.uuid ??
-                        widget.selectedCommunity?.uuid ??
-                        '',
+                    selectedSpaceUuid:
+                        widget.selectedSpace?.uuid ?? widget.selectedCommunity?.uuid ?? '',
                     onCreateCommunity: (name, description) {
                       context.read<SpaceManagementBloc>().add(
                             CreateCommunityEvent(name, description, context),
diff --git a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
index 612bf781..8c184c13 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/sidebar_widget.dart
@@ -50,6 +50,8 @@ class _SidebarWidgetState extends State<SidebarWidget> {
     _scrollController = ScrollController();
     _scrollController.addListener(_onScroll);
     _selectedId = widget.selectedSpaceUuid;
+    _searchQuery = '';
+    context.read<SpaceTreeBloc>().add(ClearCachedData());
   }
 
   void _onScroll() {
diff --git a/lib/pages/spaces_management/space_model/view/space_model_page.dart b/lib/pages/spaces_management/space_model/view/space_model_page.dart
index e1aa7a92..eef196be 100644
--- a/lib/pages/spaces_management/space_model/view/space_model_page.dart
+++ b/lib/pages/spaces_management/space_model/view/space_model_page.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.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/product_model.dart';
 import 'package:syncrow_web/pages/spaces_management/all_spaces/model/tag.dart';
 import 'package:syncrow_web/pages/spaces_management/space_model/bloc/space_model_bloc.dart';
@@ -27,6 +29,8 @@ class SpaceModelPage extends StatelessWidget {
           return const Center(child: CircularProgressIndicator());
         } else if (state is SpaceModelLoaded) {
           final spaceModels = state.spaceModels;
+          context.read<SpaceTreeBloc>().add(ClearCachedData());
+
           final allTagValues = _getAllTagValues(spaceModels);
           final allSpaceModelNames = _getAllSpaceModelName(spaceModels);
 

From 63bc7a56debfbeda08330ebb8067e9293f73d926 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Mon, 28 Apr 2025 16:49:22 +0300
Subject: [PATCH 235/238] - Refactor the code in _RoutinesViewState to improve
 readability and maintainability. - Update the indentation and add padding to
 the child widgets in the Column. - Add a bottom padding to the empty state
 text in _buildEmptyState.

---
 lib/pages/routines/view/routines_view.dart    | 64 ++++++++++---------
 .../fetch_routine_scenes_automation.dart      | 20 ++++--
 2 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/lib/pages/routines/view/routines_view.dart b/lib/pages/routines/view/routines_view.dart
index 9d4639ed..f46ef15f 100644
--- a/lib/pages/routines/view/routines_view.dart
+++ b/lib/pages/routines/view/routines_view.dart
@@ -30,8 +30,8 @@ class _RoutinesViewState extends State<RoutinesView> {
     final spaceId = result['space'];
     final bloc = BlocProvider.of<CreateRoutineBloc>(context);
     final routineBloc = context.read<RoutineBloc>();
-    bloc.add(
-        SaveCommunityIdAndSpaceIdEvent(communityID: communityId, spaceID: spaceId));
+    bloc.add(SaveCommunityIdAndSpaceIdEvent(
+        communityID: communityId, spaceID: spaceId));
     await Future.delayed(const Duration(seconds: 1));
     routineBloc.add(const CreateNewRoutineViewEvent(createRoutineView: true));
   }
@@ -61,34 +61,38 @@ class _RoutinesViewState extends State<RoutinesView> {
                 width: context.screenWidth,
                 child: SingleChildScrollView(
                   padding: const EdgeInsetsDirectional.all(16),
-                  child: Column(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    mainAxisAlignment: MainAxisAlignment.start,
-                    spacing: 16,
-                    children: [
-                      Text(
-                        "Create New Routines",
-                        style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                              color: ColorsManager.grayColor,
-                              fontWeight: FontWeight.bold,
-                            ),
-                      ),
-                      RoutineViewCard(
-                        isLoading: false,
-                        onChanged: (v) {},
-                        status: '',
-                        spaceId: '',
-                        automationId: '',
-                        communityId: '',
-                        sceneId: '',
-                        cardType: '',
-                        spaceName: '',
-                        onTap: () => _handleRoutineCreation(context),
-                        icon: Icons.add,
-                        textString: '',
-                      ),
-                      const FetchRoutineScenesAutomation(),
-                    ],
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 20),
+                    child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.start,
+                      spacing: 16,
+                      children: [
+                        Text(
+                          "Create New Routines",
+                          style:
+                              Theme.of(context).textTheme.titleLarge?.copyWith(
+                                    color: ColorsManager.grayColor,
+                                    fontWeight: FontWeight.bold,
+                                  ),
+                        ),
+                        RoutineViewCard(
+                          isLoading: false,
+                          onChanged: (v) {},
+                          status: '',
+                          spaceId: '',
+                          automationId: '',
+                          communityId: '',
+                          sceneId: '',
+                          cardType: '',
+                          spaceName: '',
+                          onTap: () => _handleRoutineCreation(context),
+                          icon: Icons.add,
+                          textString: '',
+                        ),
+                        const FetchRoutineScenesAutomation(),
+                      ],
+                    ),
                   ),
                 ),
               ),
diff --git a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
index f935fef8..a67caef9 100644
--- a/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
+++ b/lib/pages/routines/widgets/main_routine_view/fetch_routine_scenes_automation.dart
@@ -16,7 +16,8 @@ class FetchRoutineScenesAutomation extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        if (state.isLoading) return const Center(child: CircularProgressIndicator());
+        if (state.isLoading)
+          return const Center(child: CircularProgressIndicator());
 
         return SingleChildScrollView(
           child: Padding(
@@ -40,7 +41,8 @@ class FetchRoutineScenesAutomation extends StatelessWidget
                 const SizedBox(height: 3),
                 Visibility(
                   visible: state.automations.isNotEmpty,
-                  replacement: _buildEmptyState(context, "No automations found"),
+                  replacement:
+                      _buildEmptyState(context, "No automations found"),
                   child: SizedBox(
                     height: 200,
                     child: _buildAutomations(state),
@@ -59,7 +61,8 @@ class FetchRoutineScenesAutomation extends StatelessWidget
       scrollDirection: Axis.horizontal,
       itemCount: state.automations.length,
       itemBuilder: (context, index) {
-        final isLoading = state.automations.contains(state.automations[index].id);
+        final isLoading =
+            state.automations.contains(state.automations[index].id);
 
         return Column(
           children: [
@@ -179,10 +182,13 @@ class FetchRoutineScenesAutomation extends StatelessWidget
   }
 
   Widget _buildEmptyState(BuildContext context, String title) {
-    return Text(
-      title,
-      style: context.textTheme.bodyMedium?.copyWith(
-        color: ColorsManager.grayColor,
+    return Padding(
+      padding: const EdgeInsets.only(bottom: 100),
+      child: Text(
+        title,
+        style: context.textTheme.bodyMedium?.copyWith(
+          color: ColorsManager.grayColor,
+        ),
       ),
     );
   }

From acefe6b4338efb28ae87cdd28a4b269379cd5274 Mon Sep 17 00:00:00 2001
From: hannathkadher <h.kadher@syncrow.ae>
Date: Tue, 29 Apr 2025 10:13:11 +0400
Subject: [PATCH 236/238] fixed repeated duplication

---
 .../widgets/community_structure_widget.dart   | 118 +++++++++---------
 1 file changed, 57 insertions(+), 61 deletions(-)

diff --git a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
index 36a6aefe..a93679d0 100644
--- a/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
+++ b/lib/pages/spaces_management/all_spaces/widgets/community_structure_widget.dart
@@ -414,21 +414,20 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         return;
       }
       result.add(space);
-      idToSpace[space.internalId] = space; 
+      idToSpace[space.internalId] = space;
 
       for (var child in space.children) {
         flatten(child);
       }
     }
 
-
     for (var space in spaces) {
       flatten(space);
     }
 
     for (var space in result) {
       if (space.parent != null) {
-        space.parent = idToSpace[space.parent!.internalId]; 
+        space.parent = idToSpace[space.parent!.internalId];
       }
     }
 
@@ -704,62 +703,26 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
   }
 
   void _duplicateSpace(SpaceModel space) {
-    final double horizontalGap = 250.0;
-    final double verticalGap = 180.0;
-    final double nodeWidth = 200;
-    final double nodeHeight = 100;
-    final double breathingSpace = 300.0;
-
-    /// Helper to recursively duplicate a node and its children
-    SpaceModel duplicateRecursive(SpaceModel original, SpaceModel? duplicatedParent) {
-      final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
-      final duplicated = SpaceModel(
-        name: duplicatedName,
-        icon: original.icon,
-        position: original.position,
-        isPrivate: original.isPrivate,
-        children: [],
-        status: SpaceStatus.newSpace,
-        parent: duplicatedParent,
-        spaceModel: original.spaceModel,
-        subspaces: original.subspaces,
-        tags: original.tags,
-      );
-
-      spaces.add(duplicated);
-
-      if (duplicatedParent != null) {
-        final newConnection = Connection(
-          startSpace: duplicatedParent,
-          endSpace: duplicated,
-          direction: "down",
-        );
-        connections.add(newConnection);
-
-        duplicated.incomingConnection = newConnection;
-        duplicatedParent.addOutgoingConnection(newConnection);
-        duplicatedParent.children.add(duplicated);
-      }
-
-      // Duplicate its children recursively
-      for (var child in original.children) {
-        duplicateRecursive(child, duplicated);
-      }
-
-      return duplicated;
-    }
-
-    /// Actual duplication process
     setState(() {
-      if (space.parent == null) {
-        // Duplicating a ROOT node
-        duplicateRecursive(space, null);
-        connections = createConnections(spaces);
-        realignTree();
-      } else {
-        final parent = space.parent!;
+      SpaceModel? parent = space.parent;
+
+      SpaceModel duplicated = _deepCloneSpaceTree(space, parent: parent);
+
+      duplicated.position = Offset(space.position.dx + 300, space.position.dy + 100);
+      List<SpaceModel> duplicatedSubtree = [];
+      void collectSubtree(SpaceModel node) {
+        duplicatedSubtree.add(node);
+        for (var child in node.children) {
+          collectSubtree(child);
+        }
+      }
+
+      collectSubtree(duplicated);
+      spaces.addAll(duplicatedSubtree);
+
+      if (parent != null) {
+        parent.children.add(duplicated);
 
-        final duplicated = duplicateRecursive(space, parent);
         final newConnection = Connection(
           startSpace: parent,
           endSpace: duplicated,
@@ -768,11 +731,44 @@ class _CommunityStructureAreaState extends State<CommunityStructureArea> {
         connections.add(newConnection);
         duplicated.incomingConnection = newConnection;
         parent.addOutgoingConnection(newConnection);
-        parent.children.add(duplicated);
-        connections = createConnections(spaces);
-        realignTree();
-        //_realignSubtree(space.parent!);
       }
+
+      realignTree();
+      connections = createConnections(spaces);
     });
   }
+
+  SpaceModel _deepCloneSpaceTree(SpaceModel original, {SpaceModel? parent}) {
+    final duplicatedName = SpaceHelper.generateUniqueSpaceName(original.name, spaces);
+
+    final newSpace = SpaceModel(
+      name: duplicatedName,
+      icon: original.icon,
+      position: original.position,
+      isPrivate: original.isPrivate,
+      children: [],
+      status: SpaceStatus.newSpace,
+      spaceModel: original.spaceModel,
+      subspaces: original.subspaces,
+      tags: original.tags,
+      parent: parent,
+    );
+
+    for (var child in original.children) {
+      final duplicatedChild = _deepCloneSpaceTree(child, parent: newSpace);
+      newSpace.children.add(duplicatedChild);
+
+      final newConnection = Connection(
+        startSpace: newSpace,
+        endSpace: duplicatedChild,
+        direction: "down",
+      );
+      connections.add(newConnection);
+
+      duplicatedChild.incomingConnection = newConnection;
+      newSpace.addOutgoingConnection(newConnection);
+    }
+
+    return newSpace;
+  }
 }

From ccce7bb6714e9d5d6d304f96de1effa1388a56ac Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Tue, 29 Apr 2025 10:06:17 +0300
Subject: [PATCH 237/238] fix real time garage door and add flush sensor to
 routines

---
 assets/icons/disappe_delay_icon.svg           |  17 +
 assets/icons/indent_level_icon.svg            |  13 +
 assets/icons/target_confirm_time_icon.svg     |  21 +
 assets/icons/trigger_level_icon.svg           |  23 +
 .../all_devices/models/devices_model.dart     | 111 +++--
 .../flush_mounted_presence_sensor_model.dart  |   4 +
 .../garage_door/bloc/garage_door_bloc.dart    |  19 +-
 .../view/garage_door_control_view.dart        |  43 +-
 .../dialog_helper/device_dialog_helper.dart   |  10 +
 .../models/flush/flush_functions.dart         | 407 ++++++++++++++++++
 .../models/flush/flush_operational_value.dart |  11 +
 lib/pages/routines/widgets/if_container.dart  |  72 ++--
 .../routines/widgets/routine_devices.dart     |  22 +-
 .../flush_operational_values_list.dart        |  70 +++
 .../flush_presence_sensor.dart                | 208 +++++++++
 .../flush_value_selector_widget.dart          | 178 ++++++++
 .../flush_presence_sensor/time_wheel.dart     | 169 ++++++++
 .../routines/widgets/then_container.dart      |  58 +--
 lib/utils/constants/assets.dart               | 113 +++--
 lib/utils/enum/device_types.dart              |   4 +-
 pubspec.lock                                  |   2 +-
 21 files changed, 1435 insertions(+), 140 deletions(-)
 create mode 100644 assets/icons/disappe_delay_icon.svg
 create mode 100644 assets/icons/indent_level_icon.svg
 create mode 100644 assets/icons/target_confirm_time_icon.svg
 create mode 100644 assets/icons/trigger_level_icon.svg
 create mode 100644 lib/pages/routines/models/flush/flush_functions.dart
 create mode 100644 lib/pages/routines/models/flush/flush_operational_value.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_operational_values_list.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_value_selector_widget.dart
 create mode 100644 lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/time_wheel.dart

diff --git a/assets/icons/disappe_delay_icon.svg b/assets/icons/disappe_delay_icon.svg
new file mode 100644
index 00000000..c65fc5a7
--- /dev/null
+++ b/assets/icons/disappe_delay_icon.svg
@@ -0,0 +1,17 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8194_10048)">
+<path d="M11.4732 16.7316C8.31096 16.7316 5.73828 14.1589 5.73828 10.9967C5.73828 7.8344 8.31096 5.26172 11.4732 5.26172C14.6355 5.26172 17.2081 7.8344 17.2081 10.9967C17.2081 14.1589 14.6355 16.7316 11.4732 16.7316Z" fill="#EBF6FF"/>
+<path d="M17.2076 10.9967C17.2076 7.8344 14.6349 5.26172 11.4727 5.26172V16.7316C14.6349 16.7316 17.2076 14.1589 17.2076 10.9967Z" fill="#D7E7F8"/>
+<path d="M11.4721 17.3699C7.95827 17.3699 5.09961 14.5112 5.09961 10.9974C5.09961 7.48362 7.95827 4.625 11.472 4.625C14.9858 4.625 17.8445 7.48366 17.8445 10.9974C17.8445 14.5112 14.9858 17.3699 11.4721 17.3699ZM11.4721 5.89473C8.6584 5.89473 6.36934 8.18379 6.36934 10.9974C6.36934 13.811 8.6584 16.1001 11.472 16.1001C14.2857 16.1001 16.5748 13.8111 16.5748 10.9974C16.5748 8.18375 14.2857 5.89473 11.4721 5.89473Z" fill="#9FE066"/>
+<path d="M11.4728 11.6318H8.28525C7.93464 11.6318 7.65039 11.3475 7.65039 10.9969C7.65039 10.6463 7.93464 10.3621 8.28525 10.3621H10.8379V8.95127C10.8379 8.60066 11.1222 8.31641 11.4728 8.31641C11.8234 8.31641 12.1076 8.60066 12.1076 8.95127V10.9969C12.1077 11.3475 11.8234 11.6318 11.4728 11.6318Z" fill="#394949"/>
+<path d="M12.1075 10.9969V8.95127C12.1075 8.60066 11.8233 8.31641 11.4727 8.31641V11.6318C11.8233 11.6318 12.1075 11.3475 12.1075 10.9969Z" fill="#151F1F"/>
+<path d="M16.5753 10.9974C16.5753 13.8111 14.2863 16.1001 11.4727 16.1001V17.3698C14.9865 17.3698 17.8451 14.5112 17.8451 10.9974C17.8451 7.48366 14.9864 4.625 11.4727 4.625V5.89473C14.2863 5.89473 16.5753 8.18379 16.5753 10.9974Z" fill="#4ACA7B"/>
+<path d="M18.6832 3.78752C16.7572 1.86147 14.1963 0.800781 11.4725 0.800781C8.74869 0.800781 6.18782 1.86147 4.26177 3.78752C2.67775 5.37158 1.67966 7.38516 1.37492 9.56545L1.08378 9.2743C0.835882 9.02641 0.433887 9.02641 0.185951 9.2743C-0.0619838 9.52219 -0.0619838 9.92419 0.185951 10.1721L1.46097 11.4471C1.58494 11.5711 1.74742 11.6331 1.90986 11.6331C2.0723 11.6331 2.23482 11.5711 2.35875 11.4471L3.63377 10.1721C3.8817 9.92423 3.8817 9.52224 3.63377 9.2743C3.38587 9.02641 2.98388 9.02641 2.73594 9.2743L2.70678 9.30346C3.50083 5.18845 7.12907 2.07051 11.4725 2.07051C16.3953 2.07051 20.4003 6.07548 20.4003 10.9983C20.4003 15.921 16.3953 19.926 11.4725 19.926C7.46868 19.926 3.9294 17.234 2.86558 13.3794C2.77234 13.0413 2.42266 12.8429 2.08474 12.9363C1.74674 13.0295 1.54837 13.3792 1.64165 13.7171C2.22378 15.8264 3.50315 17.7286 5.24408 19.0732C7.04184 20.4618 9.19555 21.1957 11.4725 21.1957C14.1963 21.1957 16.7571 20.135 18.6832 18.209C20.6093 16.2829 21.67 13.7221 21.67 10.9983C21.67 8.27439 20.6093 5.71361 18.6832 3.78752Z" fill="#FF4D5B"/>
+<path d="M20.4004 10.9983C20.4004 15.9211 16.3955 19.926 11.4727 19.926V21.1958C14.1965 21.1958 16.7573 20.135 18.6834 18.209C20.6095 16.2829 21.6702 13.7221 21.6702 10.9983C21.6702 8.27439 20.6094 5.71361 18.6834 3.78752C16.7573 1.86147 14.1965 0.800781 11.4727 0.800781V2.07051C16.3955 2.07051 20.4004 6.07548 20.4004 10.9983Z" fill="#DE0062"/>
+</g>
+<defs>
+<clipPath id="clip0_8194_10048">
+<rect width="21.67" height="21.67" fill="white" transform="translate(0 0.164062)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/assets/icons/indent_level_icon.svg b/assets/icons/indent_level_icon.svg
new file mode 100644
index 00000000..837cdac2
--- /dev/null
+++ b/assets/icons/indent_level_icon.svg
@@ -0,0 +1,13 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8194_10065)">
+<path d="M17.6069 21.8341H4.06313C1.81893 21.8341 0 20.0151 0 17.7709V4.22719C0 1.98299 1.81893 0.164062 4.06313 0.164062H17.6069C19.8511 0.164062 21.67 1.98299 21.67 4.22719V17.7709C21.67 20.0151 19.8511 21.8341 17.6069 21.8341Z" fill="#E3F8FA"/>
+<path d="M15.1312 7.18375L10.955 5.60387C10.8771 5.57475 10.7925 5.57475 10.7153 5.60387L6.53904 7.18375C6.40767 7.23386 6.32031 7.35982 6.32031 7.50067V9.30605C6.32031 9.41711 6.37516 9.5214 6.46591 9.58438C6.55868 9.64736 6.67516 9.6609 6.77877 9.6223L10.8351 8.08779L14.8915 9.62298C14.9301 9.6372 14.9707 9.64465 15.0113 9.64465C15.0791 9.64465 15.1461 9.62433 15.2043 9.58438C15.2958 9.5214 15.3499 9.41711 15.3499 9.30605V7.5C15.3499 7.35914 15.2626 7.23318 15.1312 7.18375Z" fill="#8CE1EB"/>
+<path d="M15.1312 13.9572L10.955 12.3773C10.8771 12.3482 10.7925 12.3482 10.7153 12.3773L6.53904 13.9572C6.40767 14.0073 6.32031 14.1333 6.32031 14.2741V16.0795C6.32031 16.1906 6.37516 16.2948 6.46591 16.3578C6.55868 16.4215 6.67516 16.435 6.77877 16.3957L10.8351 14.8612L14.8915 16.3964C14.9301 16.4106 14.9707 16.4181 15.0113 16.4181C15.0791 16.4181 15.1461 16.3978 15.2043 16.3578C15.2958 16.2948 15.3499 16.1906 15.3499 16.0795V14.2734C15.3499 14.1326 15.2626 14.0066 15.1312 13.9572Z" fill="#26C6DA"/>
+<path d="M15.1312 10.5705L10.955 8.99059C10.8771 8.96147 10.7925 8.96147 10.7153 8.99059L6.53904 10.5705C6.40767 10.6206 6.32031 10.7465 6.32031 10.8874V12.6928C6.32031 12.8038 6.37516 12.9081 6.46591 12.9711C6.55868 13.0348 6.67516 13.0483 6.77877 13.009L10.8351 11.4745L14.8915 13.0097C14.9301 13.0239 14.9707 13.0314 15.0113 13.0314C15.0791 13.0314 15.1461 13.0111 15.2043 12.9711C15.2958 12.9081 15.3499 12.8038 15.3499 12.6928V10.8867C15.3499 10.7459 15.2626 10.6199 15.1312 10.5705Z" fill="#26C6DA"/>
+</g>
+<defs>
+<clipPath id="clip0_8194_10065">
+<rect width="21.67" height="21.67" fill="white" transform="translate(0 0.164062)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/assets/icons/target_confirm_time_icon.svg b/assets/icons/target_confirm_time_icon.svg
new file mode 100644
index 00000000..61141654
--- /dev/null
+++ b/assets/icons/target_confirm_time_icon.svg
@@ -0,0 +1,21 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.7802 9.0399L20.0667 9.18046C19.7057 9.25157 19.4663 9.5894 19.5103 9.95466C19.6254 10.9106 19.5871 11.9137 19.3549 12.9433C18.5334 16.5849 15.4143 19.3394 11.6982 19.6957C6.22309 20.2206 1.65927 15.6884 2.13085 10.223C2.48684 6.09727 5.78343 2.73681 9.90242 2.3098C12.864 2.00274 15.5631 3.17762 17.3531 5.18175L18.396 4.25096C16.4588 2.08197 13.6036 0.750365 10.4397 0.87082C5.29437 1.06665 1.04625 5.19944 0.720226 10.3382C0.34608 16.2355 5.01846 21.1352 10.8352 21.1352C16.4331 21.1352 20.9712 16.5971 20.9712 10.9992C20.9712 10.3288 20.9044 9.674 20.7802 9.0399Z" fill="#FFF0D2"/>
+<path d="M10.8355 12.7451C11.8006 12.7451 12.583 11.9627 12.583 10.9976C12.583 10.0324 11.8006 9.25 10.8355 9.25C9.8703 9.25 9.08789 10.0324 9.08789 10.9976C9.08789 11.9627 9.8703 12.7451 10.8355 12.7451Z" fill="#FFF0D2"/>
+<path d="M10.8358 16.5911C10.6426 16.5911 10.4863 16.4346 10.4863 16.2416V10.9989C10.4863 10.9062 10.5232 10.8173 10.5887 10.7517L14.4334 6.90709C14.5699 6.77055 14.7911 6.77055 14.9276 6.90709C15.0642 7.04363 15.0642 7.26482 14.9276 7.40131L11.1854 11.1436V16.2416C11.1854 16.4347 11.029 16.5911 10.8358 16.5911Z" fill="#7A4646"/>
+<path d="M10.8356 12.0463C11.4147 12.0463 11.8842 11.5769 11.8842 10.9978C11.8842 10.4187 11.4147 9.94922 10.8356 9.94922C10.2566 9.94922 9.78711 10.4187 9.78711 10.9978C9.78711 11.5769 10.2566 12.0463 10.8356 12.0463Z" fill="#AA6E4D"/>
+<path d="M10.8358 4.35899C10.6426 4.35899 10.4863 4.20248 10.4863 4.00948V3.31045C10.4863 3.11745 10.6427 2.96094 10.8358 2.96094C11.0291 2.96094 11.1854 3.11745 11.1854 3.31045V4.00948C11.1854 4.20248 11.029 4.35899 10.8358 4.35899Z" fill="#DE966C"/>
+<path d="M10.8358 19.0387C10.6426 19.0387 10.4863 18.8822 10.4863 18.6892V17.9901C10.4863 17.7971 10.6427 17.6406 10.8358 17.6406C11.0291 17.6406 11.1854 17.7971 11.1854 17.9901V18.6892C11.1854 18.8822 11.029 19.0387 10.8358 19.0387Z" fill="#DE966C"/>
+<path d="M18.5251 11.3475H17.8261C17.6329 11.3475 17.4766 11.1909 17.4766 10.998C17.4766 10.805 17.6329 10.6484 17.8261 10.6484H18.5251C18.7183 10.6484 18.8746 10.805 18.8746 10.998C18.8746 11.1909 18.7183 11.3475 18.5251 11.3475Z" fill="#DE966C"/>
+<path d="M3.84546 11.3475H3.14639C2.95318 11.3475 2.79688 11.1909 2.79688 10.998C2.79688 10.805 2.95322 10.6484 3.14639 10.6484H3.84541C4.03863 10.6484 4.19493 10.805 4.19493 10.998C4.19493 11.1909 4.03863 11.3475 3.84546 11.3475Z" fill="#DE966C"/>
+<path d="M4.78099 7.85338C4.72161 7.85338 4.66151 7.83836 4.60657 7.80661L4.00108 7.4571C3.83382 7.36051 3.77651 7.14682 3.87309 6.9796C3.96968 6.81233 4.18371 6.75502 4.35059 6.85161L4.95608 7.20112C5.12335 7.29771 5.18066 7.5114 5.08407 7.67862C5.01923 7.79074 4.90178 7.85338 4.78099 7.85338Z" fill="#F7B97E"/>
+<path d="M17.4939 15.1933C17.4345 15.1933 17.3744 15.1782 17.3195 15.1465L16.714 14.797C16.5467 14.7004 16.4894 14.4867 16.586 14.3195C16.6826 14.152 16.8966 14.0949 17.0635 14.1915L17.669 14.541C17.8362 14.6376 17.8935 14.8513 17.797 15.0185C17.7321 15.1306 17.6147 15.1933 17.4939 15.1933Z" fill="#F7B97E"/>
+<path d="M14.3298 5.29299C14.2704 5.29299 14.2103 5.27796 14.1554 5.24622C13.9881 5.14964 13.9308 4.93594 14.0274 4.76872L14.3769 4.16323C14.4735 3.99579 14.6875 3.93866 14.8544 4.03524C15.0217 4.13182 15.079 4.34552 14.9824 4.51274L14.6329 5.11823C14.568 5.23035 14.4506 5.29299 14.3298 5.29299Z" fill="#F7B97E"/>
+<path d="M6.98995 18.0077C6.93057 18.0077 6.87047 17.9927 6.81553 17.961C6.64827 17.8644 6.59096 17.6507 6.68755 17.4834L7.03706 16.878C7.13331 16.7107 7.34768 16.6536 7.51456 16.75C7.68183 16.8466 7.73913 17.0602 7.64255 17.2275L7.29304 17.833C7.2282 17.9451 7.11079 18.0077 6.98995 18.0077Z" fill="#F7B97E"/>
+<path d="M16.8891 7.85337C16.7682 7.85337 16.6508 7.79073 16.586 7.67861C16.4894 7.51135 16.5467 7.2977 16.714 7.20111L17.3195 6.8516C17.486 6.75502 17.7004 6.81236 17.797 6.97959C17.8935 7.14685 17.8362 7.36051 17.669 7.45709L17.0635 7.8066C17.0085 7.83835 16.9485 7.85337 16.8891 7.85337Z" fill="#F7B97E"/>
+<path d="M4.17617 15.1933C4.05533 15.1933 3.93792 15.1306 3.87308 15.0185C3.7765 14.8512 3.83385 14.6376 4.00107 14.541L4.60656 14.1915C4.77277 14.0949 4.98714 14.1521 5.08406 14.3195C5.18065 14.4867 5.1233 14.7004 4.95608 14.797L4.35059 15.1465C4.29565 15.1782 4.23555 15.1933 4.17617 15.1933Z" fill="#F7B97E"/>
+<path d="M7.34013 5.29298C7.2193 5.29298 7.10189 5.23034 7.03705 5.11822L6.68754 4.51273C6.59095 4.34547 6.6483 4.13181 6.81553 4.03523C6.98207 3.93865 7.1961 3.99583 7.29303 4.16322L7.64254 4.76871C7.73912 4.93597 7.68178 5.14963 7.51455 5.24621C7.45962 5.27795 7.39956 5.29298 7.34013 5.29298Z" fill="#F7B97E"/>
+<path d="M14.68 18.0077C14.5591 18.0077 14.4417 17.9451 14.3769 17.833L14.0274 17.2275C13.9308 17.0602 13.9881 16.8465 14.1554 16.75C14.3219 16.6535 14.5363 16.7107 14.6329 16.8779L14.9824 17.4834C15.079 17.6507 15.0216 17.8644 14.8544 17.9609C14.7994 17.9927 14.7394 18.0077 14.68 18.0077Z" fill="#F7B97E"/>
+<path d="M10.8358 11.3475C11.0289 11.3475 11.1854 11.191 11.1854 10.998C11.1854 10.8049 11.0289 10.6484 10.8358 10.6484C10.6428 10.6484 10.4863 10.8049 10.4863 10.998C10.4863 11.191 10.6428 11.3475 10.8358 11.3475Z" fill="#7A4646"/>
+<path d="M10.8356 1.56212C5.42443 1.56212 1.07697 6.11655 1.41743 11.6012C1.70913 16.3007 5.53397 20.1256 10.2335 20.4173C15.7181 20.7578 20.2726 16.4103 20.2726 10.9991C20.2726 10.2541 20.1854 9.5297 20.0217 8.83474C19.9829 8.66988 20.0623 8.5019 20.2172 8.43346C20.4105 8.34805 20.6773 8.24402 20.8922 8.16267C21.0866 8.08907 21.3059 8.19949 21.3557 8.40125C21.6326 9.52411 21.7356 10.7154 21.6299 11.9463C21.4062 14.551 20.2433 16.8986 18.4888 18.652C18.4888 18.652 14.9619 21.4157 11.4687 21.4157C4.94621 21.4157 0.410156 16.7271 0.410156 10.1916C0.410156 7.40625 3.18409 3.34816 3.18409 3.34816C5.04237 1.49153 7.56422 0.300058 10.3375 0.175287C13.4409 0.035659 16.2657 1.20796 18.3212 3.17781L18.9202 2.71389C19.1388 2.5446 19.4582 2.68418 19.4824 2.95967L19.7199 5.66482C19.7422 5.91826 19.4949 6.10982 19.2551 6.02483L16.6954 5.11791C16.4348 5.02556 16.3795 4.68142 16.5982 4.51212L17.2071 4.04055C15.5283 2.50215 13.2923 1.56212 10.8356 1.56212Z" fill="#FB5F7A"/>
+<path d="M18.485 18.6485C18.2212 18.3848 17.7996 18.3723 17.5193 18.6183C15.5456 20.3511 12.893 21.3292 10.0123 21.102C5.09917 20.7145 1.11879 16.7339 0.731479 11.8208C0.50441 8.94025 1.48256 6.28788 3.21519 4.3143C3.46126 4.03403 3.44709 3.61138 3.18336 3.34766C1.37642 5.15274 0.197009 7.58634 0.0232257 10.2799C-0.397562 16.8019 4.95607 22.1858 11.468 21.8155C14.1882 21.6609 16.6595 20.4788 18.4881 18.6515L18.485 18.6485Z" fill="#F74455"/>
+</svg>
diff --git a/assets/icons/trigger_level_icon.svg b/assets/icons/trigger_level_icon.svg
new file mode 100644
index 00000000..56e343e8
--- /dev/null
+++ b/assets/icons/trigger_level_icon.svg
@@ -0,0 +1,23 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_8194_10077)">
+<path d="M17.6 18.673C17.3521 18.4251 17.3521 18.0231 17.6 17.7752C19.4054 15.9698 20.3996 13.5678 20.3996 11.0115C20.3996 8.45525 19.4054 6.05318 17.6 4.24784C17.3521 3.99994 17.3521 3.59795 17.6 3.35001C17.8479 3.10208 18.2499 3.10208 18.4978 3.35001C20.543 5.39516 21.6694 8.11606 21.6694 11.0115C21.6694 13.9069 20.543 16.6278 18.4978 18.673C18.2503 18.9205 17.8484 18.9213 17.6 18.673Z" fill="#7AFFE4"/>
+<path d="M15.6781 16.7502C15.4302 16.5023 15.4302 16.1003 15.6781 15.8524C16.9704 14.5602 17.6821 12.8408 17.6821 11.011C17.6821 9.18128 16.9705 7.46194 15.6781 6.1697C15.4302 5.92176 15.4302 5.51981 15.6781 5.27187C15.926 5.02398 16.328 5.02394 16.576 5.27187C18.1081 6.80393 18.9519 8.84213 18.9519 11.0111C18.9519 13.18 18.1081 15.2182 16.576 16.7503C16.3279 16.9982 15.926 16.9981 15.6781 16.7502Z" fill="#00DDC1"/>
+<path d="M13.7543 14.8285C13.5064 14.5805 13.5064 14.1785 13.7543 13.9306C14.5331 13.152 14.9619 12.1158 14.9619 11.0131C14.9619 9.91034 14.5331 8.87416 13.7543 8.09548C13.5064 7.84758 13.5064 7.44559 13.7543 7.19765C14.0022 6.94976 14.4042 6.94972 14.6521 7.19765C15.6707 8.21619 16.2317 9.5712 16.2317 11.0131C16.2317 12.455 15.6707 13.81 14.6521 14.8285C14.4042 15.0764 14.0022 15.0763 13.7543 14.8285Z" fill="#7AFFE4"/>
+<path d="M17.6 18.6732C17.8484 18.9216 18.2503 18.9207 18.4978 18.6732C20.543 16.6281 21.6694 13.9072 21.6694 11.0117H20.3996C20.3996 13.568 19.4054 15.97 17.6 17.7754C17.3521 18.0233 17.3521 18.4253 17.6 18.6732Z" fill="#00DDC1"/>
+<path d="M15.6781 16.7509C15.926 16.9988 16.3279 16.9989 16.5759 16.7509C18.1081 15.2189 18.9518 13.1807 18.9518 11.0117H17.6821C17.6821 12.8415 16.9704 14.5608 15.6781 15.8531C15.4302 16.101 15.4302 16.503 15.6781 16.7509Z" fill="#00B4BC"/>
+<path d="M13.7543 14.8272C14.0022 15.0751 14.4041 15.0751 14.6521 14.8272C15.6707 13.8086 16.2316 12.4536 16.2316 11.0117H14.9619C14.9619 12.1144 14.533 13.1506 13.7543 13.9293C13.5064 14.1772 13.5064 14.5792 13.7543 14.8272Z" fill="#00DDC1"/>
+<path d="M3.17152 18.673C1.12633 16.6278 0 13.9069 0 11.0115C0 8.11604 1.12633 5.39515 3.17152 3.35C3.41946 3.10206 3.82141 3.10211 4.06935 3.35C4.31728 3.59793 4.31728 3.99989 4.06935 4.24782C2.26396 6.05316 1.26973 8.45523 1.26973 11.0115C1.26973 13.5677 2.26396 15.9698 4.06935 17.7751C4.31728 18.023 4.31728 18.425 4.06935 18.673C3.82141 18.921 3.41937 18.9209 3.17152 18.673Z" fill="#7AFFE4"/>
+<path d="M5.09462 16.7503C3.56253 15.2182 2.71875 13.18 2.71875 11.0111C2.71875 8.84212 3.56253 6.80391 5.09466 5.27186C5.3426 5.02396 5.74459 5.02396 5.99249 5.27186C6.24038 5.51979 6.24038 5.92175 5.99249 6.16968C4.70016 7.46197 3.98848 9.1813 3.98848 11.0111C3.98848 12.8408 4.70016 14.5602 5.99249 15.8524C6.24042 16.1003 6.24042 16.5023 5.99249 16.7502C5.74489 16.9978 5.34294 16.9985 5.09462 16.7503Z" fill="#00DDC1"/>
+<path d="M7.01704 14.8285C5.99847 13.81 5.4375 12.455 5.4375 11.0131C5.4375 9.5712 5.99847 8.21619 7.01704 7.19765C7.26498 6.94972 7.66697 6.94976 7.91486 7.19765C8.1628 7.44559 8.16276 7.84758 7.91486 8.09548C7.1361 8.87416 6.70723 9.91034 6.70723 11.0131C6.70723 12.1158 7.1361 13.152 7.91486 13.9306C8.1628 14.1785 8.1628 14.5805 7.91486 14.8285C7.66727 15.0761 7.26531 15.0768 7.01704 14.8285Z" fill="#7AFFE4"/>
+<path d="M4.06935 18.6732C4.31728 18.4253 4.31728 18.0233 4.06935 17.7754C2.26396 15.97 1.26973 13.568 1.26973 11.0117H0C0 13.9072 1.12633 16.6281 3.17152 18.6732C3.41937 18.9211 3.82141 18.9212 4.06935 18.6732Z" fill="#00DDC1"/>
+<path d="M5.99249 16.7509C6.24038 16.5029 6.24038 16.101 5.99249 15.8531C4.70016 14.5609 3.98848 12.8415 3.98848 11.0117H2.71875C2.71875 13.1807 3.56253 15.2189 5.09466 16.7509C5.34294 16.9992 5.74489 16.9985 5.99249 16.7509Z" fill="#00B4BC"/>
+<path d="M7.91486 14.8271C8.1628 14.5792 8.16276 14.1772 7.91486 13.9293C7.1361 13.1506 6.70723 12.1144 6.70723 11.0117H5.4375C5.4375 12.4536 5.99846 13.8086 7.01704 14.8272C7.26527 15.0754 7.66722 15.0747 7.91486 14.8271Z" fill="#00DDC1"/>
+<path d="M10.835 13.6857C12.3123 13.6857 13.5099 12.4881 13.5099 11.0108C13.5099 9.53353 12.3123 8.33594 10.835 8.33594C9.35775 8.33594 8.16016 9.53353 8.16016 11.0108C8.16016 12.4881 9.35775 13.6857 10.835 13.6857Z" fill="#00DDC1"/>
+<path d="M10.835 13.6866C12.31 13.6866 13.5099 12.4866 13.5099 11.0117H8.16016C8.16016 12.4867 9.36009 13.6866 10.835 13.6866Z" fill="#00B4BC"/>
+</g>
+<defs>
+<clipPath id="clip0_8194_10077">
+<rect width="21.67" height="21.67" fill="white" transform="translate(0 0.164062)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/lib/pages/device_managment/all_devices/models/devices_model.dart b/lib/pages/device_managment/all_devices/models/devices_model.dart
index d07efc9b..485cb0ec 100644
--- a/lib/pages/device_managment/all_devices/models/devices_model.dart
+++ b/lib/pages/device_managment/all_devices/models/devices_model.dart
@@ -7,6 +7,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart'
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/models/flush/flush_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
 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';
@@ -155,13 +156,17 @@ class AllDevicesModel {
     batteryLevel = int.tryParse(json['battery']?.toString() ?? '');
     productName = json['productName']?.toString();
     deviceTags = json['deviceTag'] != null && json['deviceTag'] is List
-        ? (json['deviceTag'] as List).map((tag) => DeviceTagModel.fromJson(tag)).toList()
+        ? (json['deviceTag'] as List)
+            .map((tag) => DeviceTagModel.fromJson(tag))
+            .toList()
         : [];
     deviceSubSpace = json['subspace'] != null
         ? DeviceSubSpace.fromJson(json['subspace'])
         : DeviceSubSpace(subspaceName: '');
     if (json['spaces'] != null && json['spaces'] is List) {
-      spaces = (json['spaces'] as List).map((space) => DeviceSpaceModel.fromJson(space)).toList();
+      spaces = (json['spaces'] as List)
+          .map((space) => DeviceSpaceModel.fromJson(space))
+          .toList();
     }
   }
 
@@ -209,7 +214,8 @@ SOS
     String tempIcon = '';
     if (type == DeviceType.LightBulb) {
       tempIcon = Assets.lightBulb;
-    } else if (type == DeviceType.CeilingSensor || type == DeviceType.WallSensor) {
+    } else if (type == DeviceType.CeilingSensor ||
+        type == DeviceType.WallSensor) {
       tempIcon = Assets.sensors;
     } else if (type == DeviceType.AC) {
       tempIcon = Assets.ac;
@@ -239,6 +245,8 @@ SOS
       //  tempIcon = Assets.gang3touch;
     } else if (type == DeviceType.WaterLeak) {
       tempIcon = Assets.waterLeakNormal;
+    } else if (type == DeviceType.NCPS) {
+      tempIcon = Assets.sensors;
     } else {
       tempIcon = Assets.logoHorizontal;
     }
@@ -254,51 +262,75 @@ SOS
     switch (productType) {
       case 'AC':
         return [
-          SwitchFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ModeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          TempSetFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          CurrentTempFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          LevelFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ChildLockFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          SwitchFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ModeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          TempSetFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          CurrentTempFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          LevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ChildLockFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
 
       case '1G':
         return [
           OneGangSwitchFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
-          OneGangCountdownFunction(deviceId: uuid ?? '', deviceName: name ?? ''),
+          OneGangCountdownFunction(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '2G':
         return [
           TwoGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
           TwoGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? ''),
-          TwoGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
+          TwoGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? ''),
         ];
 
       case '3G':
         return [
-          ThreeGangSwitch1Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangSwitch2Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangSwitch3Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown1Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown2Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          ThreeGangCountdown3Function(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch1Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch2Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangSwitch3Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown1Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown2Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          ThreeGangCountdown3Function(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
         ];
       case 'WPS':
         return [
           //IF Functions
-          PresenceStateFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          CurrentDistanceFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          IlluminanceValueFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
-          PresenceTimeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PresenceStateFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          CurrentDistanceFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          IlluminanceValueFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          PresenceTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
 
           //THEN Functions
-          FarDetectionFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          MotionSensitivityFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          MotionLessSensitivityFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
-          IndicatorFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
-          NoOneTimeFunction(deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FarDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          MotionSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          MotionLessSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          IndicatorFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'BOTH'),
+          NoOneTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
         ];
       case 'GW':
         return [
@@ -323,6 +355,30 @@ SOS
           uuid: uuid ?? '',
           name: name ?? '',
         );
+      case 'NCPS':
+        return [
+          FlushPresenceDelayFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF',),
+
+          FlushIlluminanceFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
+          //THEN Functions
+          FlushSensitivityFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushNearDetectionFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushMaxDetectDistFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushTargetConfirmTimeFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushDisappeDelayFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushIndentLevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+          FlushTriggerLevelFunction(
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'THEN'),
+        ];
+
       default:
         return [];
     }
@@ -454,5 +510,6 @@ SOS
     "3GT": DeviceType.ThreeTouch,
     "GD": DeviceType.GarageDoor,
     "WL": DeviceType.WaterLeak,
+    "NCPS": DeviceType.NCPS,
   };
 }
diff --git a/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart b/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
index 975af0e8..bf97005d 100644
--- a/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
+++ b/lib/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.dart
@@ -97,3 +97,7 @@ class FlushMountedPresenceSensorModel {
     );
   }
 }
+
+
+
+
diff --git a/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart b/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
index 025de303..9083ffbe 100644
--- a/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
+++ b/lib/pages/device_managment/garage_door/bloc/garage_door_bloc.dart
@@ -106,14 +106,14 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
       ScheduleEntry newSchedule = ScheduleEntry(
         category: event.category,
         time: formatTimeOfDayToISO(event.time),
-        function: Status(code: 'switch_1', value: event.functionOn),
+        function: Status(code: 'doorcontact_state', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
       bool success =
           await DevicesManagementApi().addScheduleRecord(newSchedule, deviceId);
       if (success) {
         add(FetchGarageDoorSchedulesEvent(
-            deviceId: deviceId, category: 'switch_1'));
+            deviceId: deviceId, category: 'doorcontact_state'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }
@@ -149,7 +149,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
       final updatedSchedules = deviceStatus.schedules?.map((schedule) {
         if (schedule.scheduleId == event.scheduleId) {
           return schedule.copyWith(
-            function: Status(code: 'switch_1', value: event.functionOn),
+            function:
+                Status(code: 'doorcontact_state', value: event.functionOn),
             enable: event.enable,
           );
         }
@@ -274,7 +275,8 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
 
   Future<void> _onBatchControl(
       GarageDoorBatchControlEvent event, Emitter<GarageDoorState> emit) async {
-    final oldValue = event.code == 'switch_1' ? deviceStatus.switch1 : false;
+    final oldValue =
+        event.code == 'doorcontact_state' ? deviceStatus.switch1 : false;
 
     _updateLocalValue(event.code, event.value);
     emit(GarageDoorBatchStatusLoaded(deviceStatus));
@@ -409,7 +411,7 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
   void _revertValue(
       String code, dynamic oldValue, Emitter<GarageDoorState> emit) {
     switch (code) {
-      case 'switch_1':
+      case 'doorcontact_state':
         if (oldValue is bool) {
           deviceStatus = deviceStatus.copyWith(switch1: oldValue);
         }
@@ -468,10 +470,11 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
           deviceStatus = deviceStatus.copyWith(voiceControl1: value);
         }
         break;
-      case 'door_contact_state':
+      case 'doorcontact_state':
         if (value is bool) {
           deviceStatus = deviceStatus.copyWith(doorContactState: value);
         }
+
       default:
         break;
     }
@@ -490,14 +493,14 @@ class GarageDoorBloc extends Bloc<GarageDoorEvent, GarageDoorState> {
         scheduleId: event.scheduleId,
         category: event.category,
         time: formatTimeOfDayToISO(event.time),
-        function: Status(code: 'switch_1', value: event.functionOn),
+        function: Status(code: 'doorcontact_state', value: event.functionOn),
         days: ScheduleModel.convertSelectedDaysToStrings(event.selectedDays),
       );
       bool success = await DevicesManagementApi()
           .editScheduleRecord(deviceId, newSchedule);
       if (success) {
         add(FetchGarageDoorSchedulesEvent(
-            deviceId: deviceId, category: 'switch_1'));
+            deviceId: deviceId, category: 'doorcontact_state'));
       } else {
         emit(GarageDoorLoadedState(status: deviceStatus));
       }
diff --git a/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart b/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
index 886ca9ae..54dd50e0 100644
--- a/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
+++ b/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
@@ -14,7 +14,8 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout {
+class GarageDoorControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const GarageDoorControlView({required this.deviceId, super.key});
@@ -22,7 +23,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => GarageDoorBloc(deviceId: deviceId)..add(GarageDoorInitialEvent(deviceId)),
+      create: (context) => GarageDoorBloc(deviceId: deviceId)
+        ..add(GarageDoorInitialEvent(deviceId)),
       child: BlocBuilder<GarageDoorBloc, GarageDoorState>(
         builder: (context, state) {
           if (state is GarageDoorLoadingState) {
@@ -34,7 +36,9 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
               garageDoorSensor: true,
               onRowTap: (index) {},
               onClose: () {
-                context.read<GarageDoorBloc>().add(BackToGarageDoorGridViewEvent());
+                context
+                    .read<GarageDoorBloc>()
+                    .add(BackToGarageDoorGridViewEvent());
               },
             );
           } else if (state is GarageDoorLoadedState) {
@@ -71,11 +75,14 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
       children: [
         IconNameStatusContainer(
           isFullIcon: false,
-          name: status.switch1 ? 'Opened' : 'Closed',
-          icon: status.switch1 ? Assets.openedDoor : Assets.closedDoor,
+          name: status.doorContactState ? 'Opened' : 'Closed',
+          icon: status.doorContactState ? Assets.openedDoor : Assets.closedDoor,
           onTap: () {
             context.read<GarageDoorBloc>().add(
-                  GarageDoorControlEvent(deviceId: status.uuid, value: !status.switch1, code: 'switch_1'),
+                  GarageDoorControlEvent(
+                      deviceId: status.uuid,
+                      value: !status.switch1,
+                      code: 'doorcontact_state'),
                 );
           },
           status: status.switch1,
@@ -84,7 +91,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
         IconNameStatusContainer(
           onTap: () {
             context.read<GarageDoorBloc>().add(
-                  FetchGarageDoorSchedulesEvent(deviceId: deviceId, category: 'switch_1'),
+                  FetchGarageDoorSchedulesEvent(
+                      deviceId: deviceId, category: 'doorcontact_state'),
                 );
             showDialog(
                 context: context,
@@ -107,7 +115,9 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
             children: [
               IconButton(
                 onPressed: () {
-                  context.read<GarageDoorBloc>().add(DecreaseGarageDoorDelayEvent(deviceId: status.uuid));
+                  context
+                      .read<GarageDoorBloc>()
+                      .add(DecreaseGarageDoorDelayEvent(deviceId: status.uuid));
                 },
                 icon: const Icon(
                   Icons.remove,
@@ -125,7 +135,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
               ),
               Text(
                 'h',
-                style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                style: context.textTheme.bodySmall!
+                    .copyWith(color: ColorsManager.blackColor),
               ),
               Text(
                 (status.delay.inMinutes % 60).toString().padLeft(2, '0'),
@@ -136,11 +147,14 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
               ),
               Text(
                 'm',
-                style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                style: context.textTheme.bodySmall!
+                    .copyWith(color: ColorsManager.blackColor),
               ),
               IconButton(
                 onPressed: () {
-                  context.read<GarageDoorBloc>().add(IncreaseGarageDoorDelayEvent(deviceId: status.uuid));
+                  context
+                      .read<GarageDoorBloc>()
+                      .add(IncreaseGarageDoorDelayEvent(deviceId: status.uuid));
                 },
                 icon: const Icon(
                   Icons.add,
@@ -158,7 +172,9 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
           onChange: (value) {
             context.read<GarageDoorBloc>().add(
                   GarageDoorControlEvent(
-                      deviceId: status.uuid, value: value ? status.delay.inSeconds : 0, code: 'countdown_1'),
+                      deviceId: status.uuid,
+                      value: value ? status.delay.inSeconds : 0,
+                      code: 'countdown_1'),
                 );
           },
         ),
@@ -167,7 +183,8 @@ class GarageDoorControlView extends StatelessWidget with HelperResponsiveLayout
           name: 'Records',
           icon: Assets.records,
           onTap: () {
-            context.read<GarageDoorBloc>().add(FetchGarageDoorRecordsEvent(code: 'switch_1', deviceId: status.uuid));
+            context.read<GarageDoorBloc>().add(FetchGarageDoorRecordsEvent(
+                code: 'switch_1', deviceId: status.uuid));
           },
           status: false,
           textColor: ColorsManager.blackColor,
diff --git a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
index b1afbc12..a94a312b 100644
--- a/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
+++ b/lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart
@@ -4,6 +4,7 @@ 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/widgets/routine_dialogs/ac_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/three_gang_switch_dialog.dart';
@@ -116,6 +117,15 @@ class DeviceDialogHelper {
           deviceSelectedFunctions: deviceSelectedFunctions,
           device: data['device'],
         );
+      case 'NCPS':
+        return FlushPresenceSensor.showFlushFunctionsDialog(
+          context: context,
+          functions: functions,
+          uniqueCustomId: data['uniqueCustomId'],
+          deviceSelectedFunctions: deviceSelectedFunctions,
+          dialogType: dialogType,
+          device: data['device'],
+        );
 
       default:
         return null;
diff --git a/lib/pages/routines/models/flush/flush_functions.dart b/lib/pages/routines/models/flush/flush_functions.dart
new file mode 100644
index 00000000..5013c0b8
--- /dev/null
+++ b/lib/pages/routines/models/flush/flush_functions.dart
@@ -0,0 +1,407 @@
+import 'package:syncrow_web/pages/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_model.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/utils/constants/assets.dart';
+
+abstract class FlushFunctions
+    extends DeviceFunction<FlushMountedPresenceSensorModel> {
+  final String type;
+
+  FlushFunctions({
+    required super.deviceId,
+    required super.deviceName,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+    required this.type,
+  });
+
+  List<FlushOperationalValue> getOperationalValues();
+}
+
+class FlushPresenceDelayFunction extends FlushFunctions {
+  final int min;
+  FlushPresenceDelayFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        super(
+          code: FlushMountedPresenceSensorModel.codePresenceState,
+          operationName: 'Presence State',
+          icon: Assets.presenceStateIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    return [
+      FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: 'None',
+        value: "none",
+      ),
+      FlushOperationalValue(
+        icon: Assets.presenceStateIcon,
+        description: 'Presence',
+        value: 'presence',
+      ),
+    ];
+  }
+}
+
+class FlushSensiReduceFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  FlushSensiReduceFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 1,
+        max = 5,
+        step = 1,
+        super(
+          code: FlushMountedPresenceSensorModel.codeSensiReduce,
+          operationName: 'Sensitivity Reduction',
+          icon: Assets.motionlessDetectionSensitivityIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    return List.generate(
+        (max - min) ~/ step + 1,
+        (index) => FlushOperationalValue(
+              icon: Assets.currentDistanceIcon,
+              description: '${min + (index * step)}',
+              value: min + (index * step),
+            ));
+  }
+}
+
+class FlushNoneDelayFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final String unit;
+
+  FlushNoneDelayFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 10,
+        max = 10000,
+        unit = '秒',
+        super(
+          code: FlushMountedPresenceSensorModel.codeNoneDelay,
+          operationName: 'None Delay',
+          icon: Assets.nobodyTime,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    return [
+      FlushOperationalValue(
+        icon: icon,
+        description: 'Custom $unit',
+        value: null,
+      )
+    ];
+  }
+}
+
+class FlushIlluminanceFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  FlushIlluminanceFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        max = 2000,
+        step = 0,
+        super(
+          code: FlushMountedPresenceSensorModel.codeIlluminance,
+          operationName: 'Illuminance',
+          icon: Assets.IlluminanceIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    List<FlushOperationalValue> values = [];
+    for (int lux = min; lux <= max; lux += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.IlluminanceIcon,
+        description: "$lux Lux",
+        value: lux,
+      ));
+    }
+    return values;
+  }
+}
+
+class FlushOccurDistReduceFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  FlushOccurDistReduceFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        max = 100,
+        step = 1,
+        super(
+          code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
+          operationName: 'Occurrence Distance Reduction',
+          icon: Assets.assetsTempreture,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    return List.generate(
+        (max - min) ~/ step + 1,
+        (index) => FlushOperationalValue(
+              icon: Assets.assetsTempreture,
+              description: '${min + (index * step)}',
+              value: min + (index * step),
+            ));
+  }
+}
+
+// ==== then functions ====
+class FlushSensitivityFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+
+  FlushSensitivityFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 1,
+        max = 9,
+        step = 1,
+        super(
+          code: FlushMountedPresenceSensorModel.codeSensitivity,
+          operationName: 'Sensitivity',
+          icon: Assets.sensitivity,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    return List.generate(
+        (max - min) ~/ step + 1,
+        (index) => FlushOperationalValue(
+              icon: Assets.motionDetectionSensitivityValueIcon,
+              description: '${min + (index * step)}',
+              value: min + (index * step),
+            ));
+  }
+}
+
+class FlushNearDetectionFunction extends FlushFunctions {
+  final int min;
+  final double max;
+  final int step;
+  final String unit;
+
+  FlushNearDetectionFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 0,
+        max = 9.5,
+        step = 1,
+        unit = 'm',
+        super(
+          code: FlushMountedPresenceSensorModel.codeNearDetection,
+          operationName: 'Nearest Detect Dist',
+          icon: Assets.currentDistanceIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    final values = <FlushOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: '$value $unit',
+        value: value * 10,
+      ));
+    }
+    return values;
+  }
+}
+
+class FlushMaxDetectDistFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  FlushMaxDetectDistFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 75,
+        max = 600,
+        step = 75,
+        unit = 'cm',
+        super(
+          code: FlushMountedPresenceSensorModel.codeFarDetection,
+          operationName: 'Max Detect Dist',
+          icon: Assets.currentDistanceIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    final values = <FlushOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: '$value $unit',
+        value: value,
+      ));
+    }
+    return values;
+  }
+}
+
+class FlushTargetConfirmTimeFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  FlushTargetConfirmTimeFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 75,
+        max = 600,
+        step = 75,
+        unit = 'cm',
+        super(
+          code: FlushMountedPresenceSensorModel.codePresenceDelay,
+          operationName: 'Target Confirm Time',
+          icon: Assets.targetConfirmTimeIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    final values = <FlushOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: '$value $unit',
+        value: value,
+      ));
+    }
+    return values;
+  }
+}
+
+class FlushDisappeDelayFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  FlushDisappeDelayFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 75,
+        max = 600,
+        step = 75,
+        unit = 'cm',
+        super(
+          code: FlushMountedPresenceSensorModel.codeNoneDelay,
+          operationName: 'Disappe Delay',
+          icon: Assets.DisappeDelayIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    final values = <FlushOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: '$value $unit',
+        value: value,
+      ));
+    }
+    return values;
+  }
+}
+
+class FlushIndentLevelFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  FlushIndentLevelFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 75,
+        max = 600,
+        step = 75,
+        unit = 'cm',
+        super(
+          code: FlushMountedPresenceSensorModel.codeOccurDistReduce,
+          operationName: 'Indent Level',
+          icon: Assets.indentLevelIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    final values = <FlushOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: '$value $unit',
+        value: value,
+      ));
+    }
+    return values;
+  }
+}
+
+class FlushTriggerLevelFunction extends FlushFunctions {
+  final int min;
+  final int max;
+  final int step;
+  final String unit;
+
+  FlushTriggerLevelFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+  })  : min = 75,
+        max = 600,
+        step = 75,
+        unit = 'cm',
+        super(
+          code: FlushMountedPresenceSensorModel.codeSensiReduce,
+          operationName: 'Trigger Level',
+          icon: Assets.triggerLevelIcon,
+        );
+
+  @override
+  List<FlushOperationalValue> getOperationalValues() {
+    final values = <FlushOperationalValue>[];
+    for (var value = min; value <= max; value += step) {
+      values.add(FlushOperationalValue(
+        icon: Assets.nobodyTime,
+        description: '$value $unit',
+        value: value,
+      ));
+    }
+    return values;
+  }
+}
diff --git a/lib/pages/routines/models/flush/flush_operational_value.dart b/lib/pages/routines/models/flush/flush_operational_value.dart
new file mode 100644
index 00000000..af96d35b
--- /dev/null
+++ b/lib/pages/routines/models/flush/flush_operational_value.dart
@@ -0,0 +1,11 @@
+class FlushOperationalValue {
+  final String icon;
+  final String description;
+  final dynamic value;
+
+  FlushOperationalValue({
+    required this.icon,
+    required this.description,
+    required this.value,
+  });
+}
diff --git a/lib/pages/routines/widgets/if_container.dart b/lib/pages/routines/widgets/if_container.dart
index f7a4ddc1..884c8d10 100644
--- a/lib/pages/routines/widgets/if_container.dart
+++ b/lib/pages/routines/widgets/if_container.dart
@@ -28,10 +28,12 @@ class IfContainer extends StatelessWidget {
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
                         const Text('IF',
-                            style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                            style: TextStyle(
+                                fontSize: 18, fontWeight: FontWeight.bold)),
                         if (state.isAutomation && state.ifItems.isNotEmpty)
                           AutomationOperatorSelector(
-                              selectedOperator: state.selectedAutomationOperator),
+                              selectedOperator:
+                                  state.selectedAutomationOperator),
                       ],
                     ),
                     const SizedBox(height: 16),
@@ -55,16 +57,17 @@ class IfContainer extends StatelessWidget {
                             (index) => GestureDetector(
                                   onTap: () async {
                                     if (!state.isTabToRun) {
-                                      final result = await DeviceDialogHelper.showDeviceDialog(
-                                          context: context,
-                                          data: state.ifItems[index],
-                                          removeComparetors: false,
-                                          dialogType: "IF");
+                                      final result = await DeviceDialogHelper
+                                          .showDeviceDialog(
+                                              context: context,
+                                              data: state.ifItems[index],
+                                              removeComparetors: false,
+                                              dialogType: "IF");
 
                                       if (result != null) {
-                                        context
-                                            .read<RoutineBloc>()
-                                            .add(AddToIfContainer(state.ifItems[index], false));
+                                        context.read<RoutineBloc>().add(
+                                            AddToIfContainer(
+                                                state.ifItems[index], false));
                                       } else if (![
                                         'AC',
                                         '1G',
@@ -73,25 +76,32 @@ class IfContainer extends StatelessWidget {
                                         'WPS',
                                         'GW',
                                         'CPS',
-                                      ].contains(state.ifItems[index]['productType'])) {
-                                        context
-                                            .read<RoutineBloc>()
-                                            .add(AddToIfContainer(state.ifItems[index], false));
+                                        'NCPS'
+                                      ].contains(state.ifItems[index]
+                                          ['productType'])) {
+                                      
+                                        context.read<RoutineBloc>().add(
+                                            AddToIfContainer(
+                                                state.ifItems[index], false));
                                       }
                                     }
                                   },
                                   child: DraggableCard(
-                                    imagePath: state.ifItems[index]['imagePath'] ?? '',
+                                    imagePath:
+                                        state.ifItems[index]['imagePath'] ?? '',
                                     title: state.ifItems[index]['title'] ?? '',
                                     deviceData: state.ifItems[index],
-                                    padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 8),
+                                    padding: const EdgeInsets.symmetric(
+                                        horizontal: 4, vertical: 8),
                                     isFromThen: false,
                                     isFromIf: true,
                                     onRemove: () {
-                                      context.read<RoutineBloc>().add(RemoveDragCard(
-                                          index: index,
-                                          isFromThen: false,
-                                          key: state.ifItems[index]['uniqueCustomId']));
+                                      context.read<RoutineBloc>().add(
+                                          RemoveDragCard(
+                                              index: index,
+                                              isFromThen: false,
+                                              key: state.ifItems[index]
+                                                  ['uniqueCustomId']));
                                     },
                                   ),
                                 )),
@@ -112,7 +122,9 @@ class IfContainer extends StatelessWidget {
 
             if (!state.isTabToRun) {
               if (mutableData['deviceId'] == 'tab_to_run') {
-                context.read<RoutineBloc>().add(AddToIfContainer(mutableData, true));
+                context
+                    .read<RoutineBloc>()
+                    .add(AddToIfContainer(mutableData, true));
               } else {
                 final result = await DeviceDialogHelper.showDeviceDialog(
                     dialogType: 'IF',
@@ -121,10 +133,14 @@ class IfContainer extends StatelessWidget {
                     removeComparetors: false);
 
                 if (result != null) {
-                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
-                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS']
+                  context
+                      .read<RoutineBloc>()
+                      .add(AddToIfContainer(mutableData, false));
+                } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS', 'NCPS']
                     .contains(mutableData['productType'])) {
-                  context.read<RoutineBloc>().add(AddToIfContainer(mutableData, false));
+                  context
+                      .read<RoutineBloc>()
+                      .add(AddToIfContainer(mutableData, false));
                 }
               }
             }
@@ -170,7 +186,9 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'or'));
+              context
+                  .read<RoutineBloc>()
+                  .add(const ChangeAutomationOperator(operator: 'or'));
             },
           ),
           Container(
@@ -196,7 +214,9 @@ class AutomationOperatorSelector extends StatelessWidget {
               ),
             ),
             onPressed: () {
-              context.read<RoutineBloc>().add(const ChangeAutomationOperator(operator: 'and'));
+              context
+                  .read<RoutineBloc>()
+                  .add(const ChangeAutomationOperator(operator: 'and'));
             },
           ),
         ],
diff --git a/lib/pages/routines/widgets/routine_devices.dart b/lib/pages/routines/widgets/routine_devices.dart
index 3294a73a..9192b422 100644
--- a/lib/pages/routines/widgets/routine_devices.dart
+++ b/lib/pages/routines/widgets/routine_devices.dart
@@ -17,7 +17,16 @@ class _RoutineDevicesState extends State<RoutineDevices> {
     context.read<RoutineBloc>().add(FetchDevicesInRoutine());
   }
 
-  static const _allowedProductTypes = {'AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS'};
+  static const _allowedProductTypes = {
+    'AC',
+    '1G',
+    '2G',
+    '3G',
+    'WPS',
+    'GW',
+    'CPS',
+    'NCPS'
+  };
 
   @override
   Widget build(BuildContext context) {
@@ -34,7 +43,8 @@ class _RoutineDevicesState extends State<RoutineDevices> {
         });
 
         final deviceList = state.devices
-            .where((device) => _allowedProductTypes.contains(device.productType))
+            .where(
+                (device) => _allowedProductTypes.contains(device.productType))
             .toList();
 
         return Wrap(
@@ -51,12 +61,16 @@ class _RoutineDevicesState extends State<RoutineDevices> {
               'productType': device.productType,
               'functions': device.functions,
               'uniqueCustomId': '',
-              'tag': device.deviceTags!.isNotEmpty ? device.deviceTags![0].name : '',
+              'tag': device.deviceTags!.isNotEmpty
+                  ? device.deviceTags![0].name
+                  : '',
               'subSpace': device.deviceSubSpace?.subspaceName ?? '',
             };
 
             if (state.searchText != null && state.searchText!.isNotEmpty) {
-              return device.name!.toLowerCase().contains(state.searchText!.toLowerCase())
+              return device.name!
+                      .toLowerCase()
+                      .contains(state.searchText!.toLowerCase())
                   ? DraggableCard(
                       imagePath: deviceData['imagePath'] as String,
                       title: deviceData['title'] as String,
diff --git a/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_operational_values_list.dart b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_operational_values_list.dart
new file mode 100644
index 00000000..1a96cfbb
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_operational_values_list.dart
@@ -0,0 +1,70 @@
+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;
+  final dynamic selectedValue;
+  final AllDevicesModel? device;
+  final String operationName;
+  final String selectCode;
+  final ValueChanged<FlushOperationalValue> onSelect;
+  const FlushOperationalValuesList({
+    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, FlushOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Expanded(child: _buildValueDescription(value)),
+          _buildValueRadio(context, value),
+        ],
+      ),
+    );
+  }
+
+
+
+
+  Widget _buildValueDescription(FlushOperationalValue value) {
+    return Padding(
+      padding: const EdgeInsets.symmetric(horizontal: 8.0),
+      child: Text(value.description),
+    );
+  }
+
+  Widget _buildValueRadio(context, FlushOperationalValue value) {
+    return Radio<dynamic>(
+        value: value.value,
+        groupValue: selectedValue,
+        onChanged: (_) => onSelect(value));
+  }
+
+
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart
new file mode 100644
index 00000000..bf2146ad
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart
@@ -0,0 +1,208 @@
+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/flush/flush_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/flush_presence_sensor/flush_value_selector_widget.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class FlushPresenceSensor extends StatefulWidget {
+  final List<DeviceFunction> functions;
+  final AllDevicesModel? device;
+  final List<DeviceFunctionData>? deviceSelectedFunctions;
+  final String? uniqueCustomId;
+  final String dialogType;
+  final bool removeComparetors;
+
+  const FlushPresenceSensor({
+    super.key,
+    required this.functions,
+    this.device,
+    this.deviceSelectedFunctions,
+    this.uniqueCustomId,
+    required this.dialogType,
+    this.removeComparetors = false,
+  });
+
+  static Future<Map<String, dynamic>?> showFlushFunctionsDialog({
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    AllDevicesModel? device,
+    List<DeviceFunctionData>? deviceSelectedFunctions,
+    String? uniqueCustomId,
+    required String dialogType,
+    bool removeComparetors = false,
+  }) async {
+    return showDialog<Map<String, dynamic>?>(
+      context: context,
+      builder: (context) => FlushPresenceSensor(
+        functions: functions,
+        device: device,
+        deviceSelectedFunctions: deviceSelectedFunctions,
+        uniqueCustomId: uniqueCustomId,
+        removeComparetors: removeComparetors,
+        dialogType: dialogType,
+      ),
+    );
+  }
+
+  @override
+  State<FlushPresenceSensor> createState() => _WallPresenceSensorState();
+}
+
+class _WallPresenceSensorState extends State<FlushPresenceSensor> {
+  late final List<FlushFunctions> _flushFunctions;
+  @override
+  void initState() {
+    super.initState();
+    _flushFunctions =
+        widget.functions.whereType<FlushFunctions>().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('Presence Sensor 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: _flushFunctions.length,
+        separatorBuilder: (context, index) => const Padding(
+          padding: EdgeInsets.symmetric(horizontal: 40.0),
+          child: Divider(color: ColorsManager.dividerColor),
+        ),
+        itemBuilder: (context, index) {
+          final function = _flushFunctions[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: FlushValueSelectorWidget(
+        selectedFunction: selectedFunction,
+        functionData: functionData,
+        flushFunctions: _flushFunctions,
+        device: widget.device,
+        dialogType: widget.dialogType,
+        removeComparators: widget.removeComparetors,
+      ),
+    );
+  }
+
+  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,
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_value_selector_widget.dart b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_value_selector_widget.dart
new file mode 100644
index 00000000..64f060e5
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_value_selector_widget.dart
@@ -0,0 +1,178 @@
+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/device_managment/flush_mounted_presence_sensor/models/flush_mounted_presence_sensor_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_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_operational_values_list.dart';
+import 'package:syncrow_web/pages/routines/widgets/slider_value_selector.dart';
+
+class FlushValueSelectorWidget extends StatelessWidget {
+  final String selectedFunction;
+  final DeviceFunctionData functionData;
+  final List<FlushFunctions> flushFunctions;
+  final AllDevicesModel? device;
+  final String dialogType;
+  final bool removeComparators;
+
+  const FlushValueSelectorWidget({
+    required this.selectedFunction,
+    required this.functionData,
+    required this.flushFunctions,
+    required this.device,
+    required this.dialogType,
+    required this.removeComparators,
+    super.key,
+  });
+
+  (double, double) get sliderRange => switch (functionData.functionCode) {
+        FlushMountedPresenceSensorModel.codeOccurDistReduce => (0, 3),
+        FlushMountedPresenceSensorModel.codeNoneDelay => (200, 3000),
+        FlushMountedPresenceSensorModel.codeSensiReduce => (0, 3),
+        FlushMountedPresenceSensorModel.codePresenceDelay => (0, 5),
+        FlushMountedPresenceSensorModel.codeIlluminance => (0.0, 2000.0),
+        FlushMountedPresenceSensorModel.codeFarDetection => (0.0, 9.5),
+        FlushMountedPresenceSensorModel.codeNearDetection => (0.0, 9.5),
+        _ => (0.0, 100.0),
+      };
+
+  double get stepSize => switch (functionData.functionCode) {
+        FlushMountedPresenceSensorModel.codeNoneDelay => 10.0,
+        FlushMountedPresenceSensorModel.codeFarDetection => 0.5,
+        FlushMountedPresenceSensorModel.codeNearDetection => 0.5,
+        FlushMountedPresenceSensorModel.codePresenceDelay => 1.0,
+        FlushMountedPresenceSensorModel.codeOccurDistReduce => 1.0,
+        FlushMountedPresenceSensorModel.codeSensiReduce => 1.0,
+        _ => 1.0,
+      };
+
+  @override
+  Widget build(BuildContext context) {
+    final selectedFn = flushFunctions.firstWhere(
+      (f) => f.code == selectedFunction,
+      orElse: () => throw Exception('Function $selectedFunction not found'),
+    );
+
+    if (_isSliderFunction(selectedFunction)) {
+      final isNearDetection =
+          selectedFunction == FlushMountedPresenceSensorModel.codeNearDetection;
+      final isFarDetection =
+          selectedFunction == FlushMountedPresenceSensorModel.codeFarDetection;
+
+      final isDistanceDetection = isNearDetection || isFarDetection;
+      double initialValue = (functionData.value as num?)?.toDouble() ?? 0.0;
+
+      if (isDistanceDetection) {
+        initialValue = initialValue / 100;
+      }
+      return SliderValueSelector(
+        currentCondition: functionData.condition,
+        dialogType: dialogType,
+        sliderRange: sliderRange,
+        displayedValue: getDisplayText,
+        initialValue: initialValue,
+        onConditionChanged: (condition) => context.read<FunctionBloc>().add(
+              AddFunction(
+                functionData: DeviceFunctionData(
+                  entityId: device?.uuid ?? '',
+                  functionCode: selectedFunction,
+                  operationName: functionData.operationName,
+                  condition: condition,
+                  value: functionData.value ?? 0,
+                ),
+              ),
+            ),
+        onSliderChanged: (value) {
+          final roundedValue = _roundToStep(value, stepSize);
+          final finalValue =
+              isDistanceDetection ? (roundedValue * 100).toInt() : roundedValue;
+
+          context.read<FunctionBloc>().add(
+                AddFunction(
+                  functionData: DeviceFunctionData(
+                    entityId: device?.uuid ?? '',
+                    functionCode: selectedFunction,
+                    operationName: functionData.operationName,
+                    value: finalValue,
+                    condition: functionData.condition,
+                  ),
+                ),
+              );
+        },
+        unit: _unit,
+        dividendOfRange: stepSize,
+      );
+    }
+
+    return FlushOperationalValuesList(
+      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,
+                ),
+              ),
+            );
+      },
+    );
+  }
+
+  double _roundToStep(double value, double step) {
+    return (value / step).roundToDouble() * step;
+  }
+
+  bool _isSliderFunction(String function) => [
+        FlushMountedPresenceSensorModel.codeOccurDistReduce,
+        FlushMountedPresenceSensorModel.codeSensiReduce,
+        FlushMountedPresenceSensorModel.codeNoneDelay,
+        FlushMountedPresenceSensorModel.codeIlluminance,
+        FlushMountedPresenceSensorModel.codePresenceDelay,
+        FlushMountedPresenceSensorModel.codeFarDetection,
+        FlushMountedPresenceSensorModel.codeNearDetection,
+      ].contains(function);
+
+  String get _unit => switch (functionData.functionCode) {
+        FlushMountedPresenceSensorModel.codeOccurDistReduce => 'Min',
+        FlushMountedPresenceSensorModel.codeSensiReduce => 'Sec',
+        FlushMountedPresenceSensorModel.codeNoneDelay => 'Sec',
+        FlushMountedPresenceSensorModel.codePresenceDelay => 'Sec',
+        FlushMountedPresenceSensorModel.codeIlluminance => 'Lux',
+        FlushMountedPresenceSensorModel.codeFarDetection => 'm',
+        FlushMountedPresenceSensorModel.codeNearDetection => 'm',
+        _ => '',
+      };
+
+  String get getDisplayText {
+    final num? value = functionData.value;
+    double displayValue = value?.toDouble() ?? 0.0;
+
+    if (functionData.functionCode ==
+            FlushMountedPresenceSensorModel.codeNearDetection ||
+        functionData.functionCode ==
+            FlushMountedPresenceSensorModel.codeFarDetection) {
+      displayValue = displayValue / 100;
+    }
+
+    switch (functionData.functionCode) {
+      case FlushMountedPresenceSensorModel.codeFarDetection:
+      case FlushMountedPresenceSensorModel.codeNearDetection:
+        return displayValue.toStringAsFixed(1);
+      case FlushMountedPresenceSensorModel.codeOccurDistReduce:
+      case FlushMountedPresenceSensorModel.codeSensiReduce:
+      case FlushMountedPresenceSensorModel.codePresenceDelay:
+        return displayValue.toStringAsFixed(0);
+      default:
+        return displayValue.toStringAsFixed(0);
+    }
+  }
+}
diff --git a/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/time_wheel.dart b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/time_wheel.dart
new file mode 100644
index 00000000..56f74054
--- /dev/null
+++ b/lib/pages/routines/widgets/routine_dialogs/flush_presence_sensor/time_wheel.dart
@@ -0,0 +1,169 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class TimeWheelPicker extends StatefulWidget {
+  final int initialHours;
+  final int initialMinutes;
+  final int initialSeconds;
+  final Function(int, int, int) onTimeChanged;
+
+  const TimeWheelPicker({
+    super.key,
+    required this.initialHours,
+    required this.initialMinutes,
+    required this.initialSeconds,
+    required this.onTimeChanged,
+  });
+
+  @override
+  State<TimeWheelPicker> createState() => _TimeWheelPickerState();
+}
+
+class _TimeWheelPickerState extends State<TimeWheelPicker> {
+  late FixedExtentScrollController _hoursController;
+  late FixedExtentScrollController _minutesController;
+  late FixedExtentScrollController _secondsController;
+
+  @override
+  void initState() {
+    super.initState();
+    _hoursController =
+        FixedExtentScrollController(initialItem: widget.initialHours);
+    _minutesController =
+        FixedExtentScrollController(initialItem: widget.initialMinutes);
+    _secondsController =
+        FixedExtentScrollController(initialItem: widget.initialSeconds);
+  }
+
+  @override
+  void didUpdateWidget(TimeWheelPicker oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (oldWidget.initialHours != widget.initialHours) {
+      _hoursController.jumpToItem(widget.initialHours);
+    }
+    if (oldWidget.initialMinutes != widget.initialMinutes) {
+      _minutesController.jumpToItem(widget.initialMinutes);
+    }
+    if (oldWidget.initialSeconds != widget.initialSeconds) {
+      _secondsController.jumpToItem(widget.initialSeconds);
+    }
+  }
+
+
+
+  @override
+  void dispose() {
+    _hoursController.dispose();
+    _minutesController.dispose();
+    _secondsController.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.center,
+      children: [
+        _buildPickerColumn(
+            label: 'h',
+            controller: _hoursController,
+            itemCount: 3,
+            onChanged: (value) {
+              _handleTimeChange(
+                value,
+                _minutesController.selectedItem,
+                _secondsController.selectedItem,
+              );
+            }),
+        const SizedBox(width: 5),
+        _buildPickerColumn(
+            label: 'm',
+            controller: _minutesController,
+            itemCount: 60,
+            onChanged: (value) {
+              _handleTimeChange(
+                _hoursController.selectedItem,
+                value,
+                _secondsController.selectedItem,
+              );
+            }),
+        const SizedBox(width: 5),
+        _buildPickerColumn(
+          label: 's',
+          controller: _secondsController,
+          itemCount: 60,
+          onChanged: (value) => _handleTimeChange(
+            _hoursController.selectedItem,
+            _minutesController.selectedItem,
+            value,
+          ),
+        ),
+      ],
+    );
+  }
+
+  void _handleTimeChange(int hours, int minutes, int seconds) {
+    int total = hours * 3600 + minutes * 60 + seconds;
+    if (total > 10000) {
+      hours = 2;
+      minutes = 46;
+      seconds = 40;
+      total = 10000;
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        _hoursController.jumpToItem(hours);
+        _minutesController.jumpToItem(minutes);
+        _secondsController.jumpToItem(seconds);
+      });
+    }
+
+    widget.onTimeChanged(hours, minutes, seconds);
+  }
+
+  Widget _buildPickerColumn({
+    required String label,
+    required FixedExtentScrollController controller,
+    required int itemCount,
+    required Function(int) onChanged,
+  }) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          height: 40,
+          width: 40,
+          padding: const EdgeInsets.symmetric(horizontal: 5),
+          decoration: BoxDecoration(
+            color: ColorsManager.boxColor,
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: ListWheelScrollView.useDelegate(
+            controller: controller,
+            itemExtent: 40.0,
+            physics: const FixedExtentScrollPhysics(),
+            onSelectedItemChanged: onChanged,
+            childDelegate: ListWheelChildBuilderDelegate(
+              builder: (context, index) => Center(
+                child: Text(
+                  index.toString().padLeft(2),
+                  style: const TextStyle(
+                    fontSize: 18,
+                    color: ColorsManager.blue1,
+                  ),
+                ),
+              ),
+              childCount: itemCount,
+            ),
+          ),
+        ),
+        const SizedBox(width: 5),
+        Text(
+          label,
+          style: const TextStyle(
+            color: ColorsManager.blackColor,
+            fontSize: 18,
+          ),
+        ),
+      ],
+    );
+  }
+}
diff --git a/lib/pages/routines/widgets/then_container.dart b/lib/pages/routines/widgets/then_container.dart
index 3266d3b4..1e7e1382 100644
--- a/lib/pages/routines/widgets/then_container.dart
+++ b/lib/pages/routines/widgets/then_container.dart
@@ -27,7 +27,8 @@ class ThenContainer extends StatelessWidget {
                   crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     const Text('THEN',
-                        style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold)),
+                        style: TextStyle(
+                            fontSize: 18, fontWeight: FontWeight.bold)),
                     const SizedBox(height: 16),
                     state.isLoading && state.isUpdate == true
                         ? const Center(
@@ -40,11 +41,12 @@ class ThenContainer extends StatelessWidget {
                                 state.thenItems.length,
                                 (index) => GestureDetector(
                                       onTap: () async {
-                                        if (state.thenItems[index]['deviceId'] ==
+                                        if (state.thenItems[index]
+                                                ['deviceId'] ==
                                             'delay') {
                                           final result = await DelayHelper
-                                              .showDelayPickerDialog(
-                                                  context, state.thenItems[index]);
+                                              .showDelayPickerDialog(context,
+                                                  state.thenItems[index]);
 
                                           if (result != null) {
                                             context
@@ -64,14 +66,17 @@ class ThenContainer extends StatelessWidget {
                                             context: context,
                                             builder: (BuildContext context) =>
                                                 AutomationDialog(
-                                              automationName: state.thenItems[index]
-                                                      ['name'] ??
-                                                  'Automation',
-                                              automationId: state.thenItems[index]
-                                                      ['deviceId'] ??
-                                                  '',
-                                              uniqueCustomId: state.thenItems[index]
-                                                  ['uniqueCustomId'],
+                                              automationName:
+                                                  state.thenItems[index]
+                                                          ['name'] ??
+                                                      'Automation',
+                                              automationId:
+                                                  state.thenItems[index]
+                                                          ['deviceId'] ??
+                                                      '',
+                                              uniqueCustomId:
+                                                  state.thenItems[index]
+                                                      ['uniqueCustomId'],
                                             ),
                                           );
 
@@ -80,11 +85,13 @@ class ThenContainer extends StatelessWidget {
                                                 .read<RoutineBloc>()
                                                 .add(AddToThenContainer({
                                                   ...state.thenItems[index],
-                                                  'imagePath': Assets.automation,
-                                                  'title': state.thenItems[index]
-                                                          ['name'] ??
+                                                  'imagePath':
+                                                      Assets.automation,
+                                                  'title':
                                                       state.thenItems[index]
-                                                          ['title'],
+                                                              ['name'] ??
+                                                          state.thenItems[index]
+                                                              ['title'],
                                                 }));
                                           }
                                           return;
@@ -109,8 +116,9 @@ class ThenContainer extends StatelessWidget {
                                           'WPS',
                                           'CPS',
                                           "GW",
-                                        ].contains(
-                                            state.thenItems[index]['productType'])) {
+                                          "NCPS"
+                                        ].contains(state.thenItems[index]
+                                            ['productType'])) {
                                           context.read<RoutineBloc>().add(
                                               AddToThenContainer(
                                                   state.thenItems[index]));
@@ -120,7 +128,9 @@ class ThenContainer extends StatelessWidget {
                                         imagePath: state.thenItems[index]
                                                 ['imagePath'] ??
                                             '',
-                                        title: state.thenItems[index]['title'] ?? '',
+                                        title: state.thenItems[index]
+                                                ['title'] ??
+                                            '',
                                         deviceData: state.thenItems[index],
                                         padding: const EdgeInsets.symmetric(
                                             horizontal: 4, vertical: 8),
@@ -157,8 +167,8 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['type'] == 'automation') {
-              int index = state.thenItems
-                  .indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
+              int index = state.thenItems.indexWhere(
+                  (item) => item['deviceId'] == mutableData['deviceId']);
               if (index != -1) {
                 return;
               }
@@ -183,8 +193,8 @@ class ThenContainer extends StatelessWidget {
             }
 
             if (mutableData['type'] == 'tap_to_run' && state.isAutomation) {
-              int index = state.thenItems
-                  .indexWhere((item) => item['deviceId'] == mutableData['deviceId']);
+              int index = state.thenItems.indexWhere(
+                  (item) => item['deviceId'] == mutableData['deviceId']);
               if (index != -1) {
                 return;
               }
@@ -222,7 +232,7 @@ class ThenContainer extends StatelessWidget {
                 dialogType: "THEN");
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
-            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS']
+            } else if (!['AC', '1G', '2G', '3G', 'WPS', 'GW', 'CPS', "NCPS"]
                 .contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }
diff --git a/lib/utils/constants/assets.dart b/lib/utils/constants/assets.dart
index dd933789..43f7bd92 100644
--- a/lib/utils/constants/assets.dart
+++ b/lib/utils/constants/assets.dart
@@ -13,7 +13,8 @@ class Assets {
   static const String rightLine = "assets/images/right_line.png";
   static const String google = "assets/images/google.svg";
   static const String facebook = "assets/images/facebook.svg";
-  static const String invisiblePassword = "assets/images/Password_invisible.svg";
+  static const String invisiblePassword =
+      "assets/images/Password_invisible.svg";
   static const String visiblePassword = "assets/images/password_visible.svg";
   static const String accessIcon = "assets/images/access_icon.svg";
   static const String spaseManagementIcon =
@@ -30,7 +31,8 @@ class Assets {
   static const String emptyTable = "assets/images/empty_table.svg";
 
   // General assets
-  static const String motionlessDetection = "assets/icons/motionless_detection.svg";
+  static const String motionlessDetection =
+      "assets/icons/motionless_detection.svg";
   static const String acHeating = "assets/icons/ac_heating.svg";
   static const String acPowerOff = "assets/icons/ac_power_off.svg";
   static const String acFanMiddle = "assets/icons/ac_fan_middle.svg";
@@ -67,19 +69,22 @@ class Assets {
       "assets/icons/automation_functions/temp_password_unlock.svg";
   static const String doorlockNormalOpen =
       "assets/icons/automation_functions/doorlock_normal_open.svg";
-  static const String doorbell = "assets/icons/automation_functions/doorbell.svg";
+  static const String doorbell =
+      "assets/icons/automation_functions/doorbell.svg";
   static const String remoteUnlockViaApp =
       "assets/icons/automation_functions/remote_unlock_via_app.svg";
   static const String doubleLock =
       "assets/icons/automation_functions/double_lock.svg";
   static const String selfTestResult =
       "assets/icons/automation_functions/self_test_result.svg";
-  static const String lockAlarm = "assets/icons/automation_functions/lock_alarm.svg";
+  static const String lockAlarm =
+      "assets/icons/automation_functions/lock_alarm.svg";
   static const String presenceState =
       "assets/icons/automation_functions/presence_state.svg";
   static const String currentTemp =
       "assets/icons/automation_functions/current_temp.svg";
-  static const String presence = "assets/icons/automation_functions/presence.svg";
+  static const String presence =
+      "assets/icons/automation_functions/presence.svg";
   static const String residualElectricity =
       "assets/icons/automation_functions/residual_electricity.svg";
   static const String hijackAlarm =
@@ -96,12 +101,15 @@ class Assets {
 
   // Presence Sensor Assets
   static const String sensorMotionIcon = "assets/icons/sensor_motion_ic.svg";
-  static const String sensorPresenceIcon = "assets/icons/sensor_presence_ic.svg";
+  static const String sensorPresenceIcon =
+      "assets/icons/sensor_presence_ic.svg";
   static const String sensorVacantIcon = "assets/icons/sensor_vacant_ic.svg";
   static const String illuminanceRecordIcon =
       "assets/icons/illuminance_record_ic.svg";
-  static const String presenceRecordIcon = "assets/icons/presence_record_ic.svg";
-  static const String helpDescriptionIcon = "assets/icons/help_description_ic.svg";
+  static const String presenceRecordIcon =
+      "assets/icons/presence_record_ic.svg";
+  static const String helpDescriptionIcon =
+      "assets/icons/help_description_ic.svg";
 
   static const String lightPulp = "assets/icons/light_pulb.svg";
   static const String acDevice = "assets/icons/ac_device.svg";
@@ -151,10 +159,12 @@ class Assets {
   static const String unit = 'assets/icons/unit_icon.svg';
   static const String villa = 'assets/icons/villa_icon.svg';
   static const String iconEdit = 'assets/icons/icon_edit_icon.svg';
-  static const String textFieldSearch = 'assets/icons/textfield_search_icon.svg';
+  static const String textFieldSearch =
+      'assets/icons/textfield_search_icon.svg';
   static const String roundedAddIcon = 'assets/icons/rounded_add_icon.svg';
   static const String addIcon = 'assets/icons/add_icon.svg';
-  static const String smartThermostatIcon = 'assets/icons/smart_thermostat_icon.svg';
+  static const String smartThermostatIcon =
+      'assets/icons/smart_thermostat_icon.svg';
   static const String smartLightIcon = 'assets/icons/smart_light_icon.svg';
   static const String presenceSensor = 'assets/icons/presence_sensor.svg';
   static const String Gang3SwitchIcon = 'assets/icons/3_Gang_switch_icon.svg';
@@ -202,7 +212,8 @@ class Assets {
   //assets/icons/water_leak_normal.svg
   static const String waterLeakNormal = 'assets/icons/water_leak_normal.svg';
   //assets/icons/water_leak_detected.svg
-  static const String waterLeakDetected = 'assets/icons/water_leak_detected.svg';
+  static const String waterLeakDetected =
+      'assets/icons/water_leak_detected.svg';
 
   //assets/icons/automation_records.svg
   static const String automationRecords = 'assets/icons/automation_records.svg';
@@ -273,13 +284,16 @@ class Assets {
       "assets/icons/functions_icons/sensitivity.svg";
   static const String assetsSensitivityOperationIcon =
       "assets/icons/functions_icons/sesitivity_operation_icon.svg";
-  static const String assetsAcPower = "assets/icons/functions_icons/ac_power.svg";
+  static const String assetsAcPower =
+      "assets/icons/functions_icons/ac_power.svg";
   static const String assetsAcPowerOFF =
       "assets/icons/functions_icons/ac_power_off.svg";
   static const String assetsChildLock =
       "assets/icons/functions_icons/child_lock.svg";
-  static const String assetsFreezing = "assets/icons/functions_icons/freezing.svg";
-  static const String assetsFanSpeed = "assets/icons/functions_icons/fan_speed.svg";
+  static const String assetsFreezing =
+      "assets/icons/functions_icons/freezing.svg";
+  static const String assetsFanSpeed =
+      "assets/icons/functions_icons/fan_speed.svg";
   static const String assetsAcCooling =
       "assets/icons/functions_icons/ac_cooling.svg";
   static const String assetsAcHeating =
@@ -288,7 +302,8 @@ class Assets {
       "assets/icons/functions_icons/celsius_degrees.svg";
   static const String assetsTempreture =
       "assets/icons/functions_icons/tempreture.svg";
-  static const String assetsAcFanLow = "assets/icons/functions_icons/ac_fan_low.svg";
+  static const String assetsAcFanLow =
+      "assets/icons/functions_icons/ac_fan_low.svg";
   static const String assetsAcFanMiddle =
       "assets/icons/functions_icons/ac_fan_middle.svg";
   static const String assetsAcFanHigh =
@@ -307,7 +322,8 @@ class Assets {
       "assets/icons/functions_icons/far_detection.svg";
   static const String assetsFarDetectionFunction =
       "assets/icons/functions_icons/far_detection_function.svg";
-  static const String assetsIndicator = "assets/icons/functions_icons/indicator.svg";
+  static const String assetsIndicator =
+      "assets/icons/functions_icons/indicator.svg";
   static const String assetsMotionDetection =
       "assets/icons/functions_icons/motion_detection.svg";
   static const String assetsMotionlessDetection =
@@ -320,7 +336,8 @@ class Assets {
       "assets/icons/functions_icons/master_state.svg";
   static const String assetsSwitchAlarmSound =
       "assets/icons/functions_icons/switch_alarm_sound.svg";
-  static const String assetsResetOff = "assets/icons/functions_icons/reset_off.svg";
+  static const String assetsResetOff =
+      "assets/icons/functions_icons/reset_off.svg";
 
 // Assets for automation_functions
   static const String assetsCardUnlock =
@@ -364,12 +381,14 @@ class Assets {
   static const String activeUser = 'assets/icons/active_user.svg';
   static const String deActiveUser = 'assets/icons/deactive_user.svg';
   static const String invitedIcon = 'assets/icons/invited_icon.svg';
-  static const String rectangleCheckBox = 'assets/icons/rectangle_check_box.png';
+  static const String rectangleCheckBox =
+      'assets/icons/rectangle_check_box.png';
   static const String CheckBoxChecked = 'assets/icons/box_checked.png';
   static const String emptyBox = 'assets/icons/empty_box.png';
   static const String completeProcessIcon =
       'assets/icons/compleate_process_icon.svg';
-  static const String currentProcessIcon = 'assets/icons/current_process_icon.svg';
+  static const String currentProcessIcon =
+      'assets/icons/current_process_icon.svg';
   static const String uncomplete_ProcessIcon =
       'assets/icons/uncompleate_process_icon.svg';
   static const String wrongProcessIcon = 'assets/icons/wrong_process_icon.svg';
@@ -390,9 +409,11 @@ class Assets {
   static const String successIcon = 'assets/icons/success_icon.svg';
   static const String spaceLocationIcon = 'assets/icons/spaseLocationIcon.svg';
   static const String scenesPlayIcon = 'assets/icons/scenesPlayIcon.png';
-  static const String scenesPlayIconCheck = 'assets/icons/scenesPlayIconCheck.png';
+  static const String scenesPlayIconCheck =
+      'assets/icons/scenesPlayIconCheck.png';
   static const String presenceStateIcon = 'assets/icons/presence_state.svg';
-  static const String currentDistanceIcon = 'assets/icons/current_distance_icon.svg';
+  static const String currentDistanceIcon =
+      'assets/icons/current_distance_icon.svg';
 
   static const String farDetectionIcon = 'assets/icons/far_detection_icon.svg';
   static const String motionDetectionSensitivityIcon =
@@ -415,28 +436,48 @@ class Assets {
   static const String cpsMode4 = 'assets/icons/cps_mode4.svg';
   static const String closeToMotion = 'assets/icons/close_to_motion.svg';
   static const String farAwayMotion = 'assets/icons/far_away_motion.svg';
-  static const String communicationFault = 'assets/icons/communication_fault.svg';
+  static const String communicationFault =
+      'assets/icons/communication_fault.svg';
   static const String radarFault = 'assets/icons/radar_fault.svg';
-  static const String selfTestingSuccess = 'assets/icons/self_testing_success.svg';
-  static const String selfTestingFailure = 'assets/icons/self_testing_failure.svg';
-  static const String selfTestingTimeout = 'assets/icons/self_testing_timeout.svg';
+  static const String selfTestingSuccess =
+      'assets/icons/self_testing_success.svg';
+  static const String selfTestingFailure =
+      'assets/icons/self_testing_failure.svg';
+  static const String selfTestingTimeout =
+      'assets/icons/self_testing_timeout.svg';
   static const String movingSpeed = 'assets/icons/moving_speed.svg';
   static const String boundary = 'assets/icons/boundary.svg';
   static const String motionMeter = 'assets/icons/motion_meter.svg';
-  static const String spatialStaticValue = 'assets/icons/spatial_static_value.svg';
-  static const String spatialMotionValue = 'assets/icons/spatial_motion_value.svg';
+  static const String spatialStaticValue =
+      'assets/icons/spatial_static_value.svg';
+  static const String spatialMotionValue =
+      'assets/icons/spatial_motion_value.svg';
   static const String presenceJudgementThrshold =
       'assets/icons/presence_judgement_threshold.svg';
   static const String spaceType = 'assets/icons/space_type.svg';
   static const String sportsPara = 'assets/icons/sports_para.svg';
-  static const String sensitivityFeature1 = 'assets/icons/sensitivity_feature_1.svg';
-  static const String sensitivityFeature2 = 'assets/icons/sensitivity_feature_2.svg';
-  static const String sensitivityFeature3 = 'assets/icons/sensitivity_feature_3.svg';
-  static const String sensitivityFeature4 = 'assets/icons/sensitivity_feature_4.svg';
-  static const String sensitivityFeature5 = 'assets/icons/sensitivity_feature_5.svg';
-  static const String sensitivityFeature6 = 'assets/icons/sensitivity_feature_6.svg';
-  static const String sensitivityFeature7 = 'assets/icons/sensitivity_feature_7.svg';
-  static const String sensitivityFeature8 = 'assets/icons/sensitivity_feature_8.svg';
-  static const String sensitivityFeature9 = 'assets/icons/sensitivity_feature_9.svg';
+  static const String sensitivityFeature1 =
+      'assets/icons/sensitivity_feature_1.svg';
+  static const String sensitivityFeature2 =
+      'assets/icons/sensitivity_feature_2.svg';
+  static const String sensitivityFeature3 =
+      'assets/icons/sensitivity_feature_3.svg';
+  static const String sensitivityFeature4 =
+      'assets/icons/sensitivity_feature_4.svg';
+  static const String sensitivityFeature5 =
+      'assets/icons/sensitivity_feature_5.svg';
+  static const String sensitivityFeature6 =
+      'assets/icons/sensitivity_feature_6.svg';
+  static const String sensitivityFeature7 =
+      'assets/icons/sensitivity_feature_7.svg';
+  static const String sensitivityFeature8 =
+      'assets/icons/sensitivity_feature_8.svg';
+  static const String sensitivityFeature9 =
+      'assets/icons/sensitivity_feature_9.svg';
   static const String deviceTagIcon = 'assets/icons/device_tag_ic.svg';
+  static const String targetConfirmTimeIcon =
+      'assets/icons/target_confirm_time_icon.svg';
+  static const String DisappeDelayIcon = 'assets/icons/disappe_delay_icon.svg';
+  static const String indentLevelIcon = 'assets/icons/indent_level_icon.svg';
+  static const String triggerLevelIcon = 'assets/icons/trigger_level_icon.svg';
 }
diff --git a/lib/utils/enum/device_types.dart b/lib/utils/enum/device_types.dart
index 7050f13a..7ad8e02c 100644
--- a/lib/utils/enum/device_types.dart
+++ b/lib/utils/enum/device_types.dart
@@ -17,6 +17,7 @@ enum DeviceType {
   ThreeTouch,
   GarageDoor,
   WaterLeak,
+  NCPS,
   DoorSensor,
   Other,
 }
@@ -56,5 +57,6 @@ Map<String, DeviceType> devicesTypesMap = {
   "2GT": DeviceType.TwoGang,
   "3GT": DeviceType.ThreeGang,
   'GD': DeviceType.GarageDoor,
-  'WL': DeviceType.WaterLeak
+  'WL': DeviceType.WaterLeak,
+  'NCPS': DeviceType.NCPS,
 };
diff --git a/pubspec.lock b/pubspec.lock
index a0cbfaad..fb0d6a22 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -26,7 +26,7 @@ packages:
     source: hosted
     version: "2.11.0"
   bloc:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: bloc
       sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e"

From ea88f54d20c030f664f638d406e7abfff12e1162 Mon Sep 17 00:00:00 2001
From: mohammad <malnemer@uba.com.jo>
Date: Tue, 29 Apr 2025 10:22:00 +0300
Subject: [PATCH 238/238] Refactor garage door control view to use
 'doorcontact_state' code for fetching records

---
 .../garage_door/view/garage_door_control_view.dart              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart b/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
index 54dd50e0..ae2fc9e4 100644
--- a/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
+++ b/lib/pages/device_managment/garage_door/view/garage_door_control_view.dart
@@ -184,7 +184,7 @@ class GarageDoorControlView extends StatelessWidget
           icon: Assets.records,
           onTap: () {
             context.read<GarageDoorBloc>().add(FetchGarageDoorRecordsEvent(
-                code: 'switch_1', deviceId: status.uuid));
+                code: 'doorcontact_state', deviceId: status.uuid));
           },
           status: false,
           textColor: ColorsManager.blackColor,