push display scenes and automations

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

@@ -18,13 +18,13 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
   Widget build(BuildContext context) {
     return MultiBlocProvider(
       providers: [
-        BlocProvider(
-          create: (context) => DeviceManagementBloc()..add(FetchDevices()),
-        ),
         BlocProvider(
           create: (context) =>
               SwitchTabsBloc()..add(const TriggerSwitchTabsEvent(false)),
         ),
+        BlocProvider(
+          create: (context) => DeviceManagementBloc()..add(FetchDevices()),
+        ),
       ],
       child: WebScaffold(
         appBarTitle: FittedBox(
@@ -101,12 +101,11 @@ class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
             builder: (context, deviceState) {
               if (deviceState is DeviceManagementLoading) {
                 return const Center(child: CircularProgressIndicator());
-              } else if (deviceState is DeviceManagementLoaded ||
+              } else if (deviceState is DeviceManagementLoaded) {
-                  deviceState is DeviceManagementFiltered) {
+                return DeviceManagementBody(devices: deviceState.devices);
-                final devices = (deviceState as dynamic).devices ??
+              } else if (deviceState is DeviceManagementFiltered) {
-                    (deviceState as DeviceManagementFiltered).filteredDevices;
+                return DeviceManagementBody(
-
+                    devices: deviceState.filteredDevices);
-                return DeviceManagementBody(devices: devices);
               } else {
                 return const Center(child: Text('Error fetching Devices'));
               }

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

@@ -18,14 +18,6 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
   final TextEditingController unitNameController = TextEditingController();
   final TextEditingController productNameController = TextEditingController();
 
-  @override
-  void dispose() {
-    communityController.dispose();
-    unitNameController.dispose();
-    productNameController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return isExtraLargeScreenSize(context)

lib/pages/routiens/bloc/routine_bloc/routine_bloc.dart

@@ -13,6 +13,7 @@ part 'routine_event.dart';
 part 'routine_state.dart';
 
 const spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
+const communityId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
 
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   RoutineBloc() : super(const RoutineState()) {
@@ -114,7 +115,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     emit(state.copyWith(isLoading: true, errorMessage: null));
 
     try {
-      final scenes = await SceneApi.getScenesByUnitId(event.unitId);
+      final scenes = await SceneApi.getScenesByUnitId(event.unitId, event.communityId);
       emit(state.copyWith(
         scenes: scenes,
         isLoading: false,
@@ -233,7 +234,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       final result = await SceneApi.createScene(createSceneModel);
       if (result['success']) {
         emit(_resetState());
-        add(const LoadScenes(spaceId));
+        add(const LoadScenes(spaceId, communityId));
       } else {
         emit(state.copyWith(
           isLoading: false,

lib/pages/routiens/bloc/routine_bloc/routine_event.dart

@@ -28,11 +28,12 @@ class AddToThenContainer extends RoutineEvent {
 
 class LoadScenes extends RoutineEvent {
   final String unitId;
+  final String communityId;
 
-  const LoadScenes(this.unitId);
+  const LoadScenes(this.unitId, this.communityId);
 
   @override
-  List<Object> get props => [unitId];
+  List<Object> get props => [unitId, communityId];
 }
 
 class LoadAutomation extends RoutineEvent {

lib/pages/routiens/models/create_scene_and_autoamtion/create_automation_model.dart

@@ -1,177 +1,5 @@
 import 'dart:convert';
 
-import 'package:syncrow_web/pages/routiens/models/create_scene_and_autoamtion/create_scene_model.dart';
-
-// class CreateAutomationModel {
-//   String unitUuid;
-//   String automationName;
-//   String decisionExpr;
-//   EffectiveTime effectiveTime;
-//   List<CreateCondition> conditions;
-//   List<CreateSceneAction> actions;
-
-//   CreateAutomationModel({
-//     required this.unitUuid,
-//     required this.automationName,
-//     required this.decisionExpr,
-//     required this.effectiveTime,
-//     required this.conditions,
-//     required this.actions,
-//   });
-
-//   CreateAutomationModel copyWith({
-//     String? unitUuid,
-//     String? automationName,
-//     String? decisionExpr,
-//     EffectiveTime? effectiveTime,
-//     List<CreateCondition>? conditions,
-//     List<CreateSceneAction>? actions,
-//   }) {
-//     return CreateAutomationModel(
-//       unitUuid: unitUuid ?? this.unitUuid,
-//       automationName: automationName ?? this.automationName,
-//       decisionExpr: decisionExpr ?? this.decisionExpr,
-//       effectiveTime: effectiveTime ?? this.effectiveTime,
-//       conditions: conditions ?? this.conditions,
-//       actions: actions ?? this.actions,
-//     );
-//   }
-
-//   Map<String, dynamic> toMap([String? automationId]) {
-//     return {
-//       if (automationId == null) 'spaceUuid': unitUuid,
-//       'automationName': automationName,
-//       'decisionExpr': decisionExpr,
-//       'effectiveTime': effectiveTime.toMap(),
-//       'conditions': conditions.map((x) => x.toMap()).toList(),
-//       'actions': actions.map((x) => x.toMap()).toList(),
-//     };
-//   }
-
-//   factory CreateAutomationModel.fromMap(Map<String, dynamic> map) {
-//     return CreateAutomationModel(
-//       unitUuid: map['spaceUuid'] ?? '',
-//       automationName: map['automationName'] ?? '',
-//       decisionExpr: map['decisionExpr'] ?? '',
-//       effectiveTime: EffectiveTime.fromMap(map['effectiveTime']),
-//       conditions: List<CreateCondition>.from(
-//           map['conditions']?.map((x) => CreateCondition.fromMap(x))),
-//       actions: List<CreateSceneAction>.from(
-//           map['actions']?.map((x) => CreateSceneAction.fromMap(x))),
-//     );
-//   }
-
-//   String toJson([String? automationId]) => json.encode(toMap(automationId));
-
-//   factory CreateAutomationModel.fromJson(String source) =>
-//       CreateAutomationModel.fromMap(json.decode(source));
-
-//   @override
-//   String toString() {
-//     return 'CreateAutomationModel(unitUuid: $unitUuid, automationName: $automationName, decisionExpr: $decisionExpr, effectiveTime: $effectiveTime, conditions: $conditions, actions: $actions)';
-//   }
-// }
-
-// class EffectiveTime {
-//   String start;
-//   String end;
-//   String loops;
-
-//   EffectiveTime({
-//     required this.start,
-//     required this.end,
-//     required this.loops,
-//   });
-
-//   Map<String, dynamic> toMap() {
-//     return {
-//       'start': start,
-//       'end': end,
-//       'loops': loops,
-//     };
-//   }
-
-//   factory EffectiveTime.fromMap(Map<String, dynamic> map) {
-//     return EffectiveTime(
-//       start: map['start'] ?? '',
-//       end: map['end'] ?? '',
-//       loops: map['loops'] ?? '',
-//     );
-//   }
-
-//   @override
-//   String toString() => 'EffectiveTime(start: $start, end: $end, loops: $loops)';
-// }
-
-// class CreateCondition {
-//   int code;
-//   String entityId;
-//   String entityType;
-//   ConditionExpr expr;
-
-//   CreateCondition({
-//     required this.code,
-//     required this.entityId,
-//     required this.entityType,
-//     required this.expr,
-//   });
-
-//   Map<String, dynamic> toMap() {
-//     return {
-//       'code': code,
-//       'entityId': entityId,
-//       'entityType': entityType,
-//       'expr': expr.toMap(),
-//     };
-//   }
-
-//   factory CreateCondition.fromMap(Map<String, dynamic> map) {
-//     return CreateCondition(
-//       code: map['code'] ?? 0,
-//       entityId: map['entityId'] ?? '',
-//       entityType: map['entityType'] ?? '',
-//       expr: ConditionExpr.fromMap(map['expr']),
-//     );
-//   }
-
-//   @override
-//   String toString() =>
-//       'CreateCondition(code: $code, entityId: $entityId, entityType: $entityType, expr: $expr)';
-// }
-
-// class ConditionExpr {
-//   String statusCode;
-//   String comparator;
-//   dynamic statusValue;
-
-//   ConditionExpr({
-//     required this.statusCode,
-//     required this.comparator,
-//     required this.statusValue,
-//   });
-
-//   Map<String, dynamic> toMap() {
-//     return {
-//       'statusCode': statusCode,
-//       'comparator': comparator,
-//       'statusValue': statusValue,
-//     };
-//   }
-
-//   factory ConditionExpr.fromMap(Map<String, dynamic> map) {
-//     return ConditionExpr(
-//       statusCode: map['statusCode'] ?? '',
-//       comparator: map['comparator'] ?? '',
-//       statusValue: map['statusValue'],
-//     );
-//   }
-
-//   @override
-//   String toString() =>
-//       'ConditionExpr(statusCode: $statusCode, comparator: $comparator, statusValue: $statusValue)';
-// }
-import 'dart:convert';
-
 class CreateAutomationModel {
   String spaceUuid;
   String automationName;

lib/pages/routiens/models/routine_model.dart

@@ -22,9 +22,9 @@ class ScenesModel {
         name: json["name"] ?? '',
         status: json["status"] ?? '',
         type: json["type"] ?? '',
-        icon: (isAutomation ?? false)
+        icon: isAutomation == true
             ? Assets.automation
-            : json["icon"] as String?,
+            : (json["icon"] as String?),
       );
 
   Map<String, dynamic> toJson() => {

lib/pages/routiens/view/routines_view.dart

@@ -49,8 +49,7 @@ class RoutinesView extends StatelessWidget {
               const SizedBox(
                 height: 30,
               ),
-              const FetchRoutineScenesAutomation(),
+              const Expanded(child: FetchRoutineScenesAutomation()),
-              const Spacer(),
             ],
           ),
         );

lib/pages/routiens/widgets/main_routine_view/fetch_routine_scenes_automation.dart

@@ -4,12 +4,14 @@ import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routiens/widgets/main_routine_view/routine_view_card.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 FetchRoutineScenesAutomation extends StatefulWidget {
   const FetchRoutineScenesAutomation({super.key});
 
   @override
-  State<FetchRoutineScenesAutomation> createState() => _FetchRoutineScenesState();
+  State<FetchRoutineScenesAutomation> createState() =>
+      _FetchRoutineScenesState();
 }
 
 class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation> {
@@ -17,7 +19,7 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation> {
   void initState() {
     super.initState();
     context.read<RoutineBloc>()
-      ..add(const LoadScenes(spaceId))
+      ..add(const LoadScenes(spaceId, communityId))
       ..add(const LoadAutomation(spaceId));
   }
 
@@ -25,83 +27,84 @@ class _FetchRoutineScenesState extends State<FetchRoutineScenesAutomation> {
   Widget build(BuildContext context) {
     return BlocBuilder<RoutineBloc, RoutineState>(
       builder: (context, state) {
-        debugPrint(state.scenes.toString());
+        return SizedBox(
-        debugPrint(state.automations.toString());
+          height: 500,
-
+          child: Column(
-        return Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
-          mainAxisSize: MainAxisSize.min,
+            children: [
-          crossAxisAlignment: CrossAxisAlignment.start,
+              if (state.isLoading)
-          children: [
+                const Center(
-            Text(
+                  child: CircularProgressIndicator(),
-              "Scenes (Tab to Run)",
+                ),
-              style: Theme.of(context).textTheme.titleLarge?.copyWith(
+              Text(
-                    color: ColorsManager.grayColor,
+                "Scenes (Tab to Run)",
-                    fontWeight: FontWeight.bold,
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                  ),
+                      color: ColorsManager.grayColor,
-            ),
+                      fontWeight: FontWeight.bold,
-            const SizedBox(
+                    ),
-              height: 10,
+              ),
-            ),
+              const SizedBox(height: 10),
-            state.loadScenesErrorMessage != null
+              if (state.scenes.isEmpty)
-                ? Text(state.loadScenesErrorMessage ?? '')
-                : state.scenes.isNotEmpty
-                    ? SizedBox(
-                        height: 200,
-                        child: ListView.builder(
-                          shrinkWrap: true,
-                          scrollDirection: Axis.horizontal,
-                          itemCount: state.scenes.length,
-                          itemBuilder: (context, index) {
-                            return RoutineViewCard(
-                              onTap: () {},
-                              textString: state.scenes[index].name,
-                              icon: state.scenes[index].icon ?? Assets.logoHorizontal,
-                            );
-                          },
-                        ),
-                      )
-                    : const CircularProgressIndicator(),
-            const SizedBox(
-              height: 30,
-            ),
-            Column(
-              mainAxisSize: MainAxisSize.min,
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
                 Text(
-                  "Automations",
+                  "No scenes found",
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
+                  style: context.textTheme.bodyMedium?.copyWith(
-                        color: ColorsManager.grayColor,
+                    color: ColorsManager.grayColor,
-                        fontWeight: FontWeight.bold,
+                  ),
-                      ),
                 ),
-                const SizedBox(
+              if (state.scenes.isNotEmpty)
-                  height: 10,
+                SizedBox(
+                  height: 200,
+                  child: ListView.builder(
+                    shrinkWrap: true,
+                    scrollDirection: Axis.horizontal,
+                    itemCount: state.scenes.length,
+                    itemBuilder: (context, index) {
+                      return RoutineViewCard(
+                        onTap: () {},
+                        textString: state.scenes[index].name,
+                        icon: state.scenes[index].icon ?? Assets.logoHorizontal,
+                      );
+                    },
+                  ),
                 ),
-                state.loadAutomationErrorMessage != null
+              const SizedBox(height: 30),
-                    ? Text(state.loadAutomationErrorMessage ?? '')
+              Text(
-                    : state.automations.isNotEmpty
+                "Automations",
-                        ? Expanded(
+                style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                            child: SizedBox(
+                      color: ColorsManager.grayColor,
-                              height: 200,
+                      fontWeight: FontWeight.bold,
-                              child: ListView.builder(
+                    ),
-                                shrinkWrap: true,
+              ),
-                                scrollDirection: Axis.horizontal,
+              const SizedBox(height: 10),
-                                itemCount: state.automations.length,
+              if (state.automations.isEmpty)
-                                itemBuilder: (context, index) {
+                Text(
-                                  return RoutineViewCard(
+                  "No automations found",
-                                    onTap: () {},
+                  style: context.textTheme.bodyMedium?.copyWith(
-                                    textString: state.automations[index].name,
+                    color: ColorsManager.grayColor,
-                                    icon: Assets.automation,
+                  ),
-                                  );
+                ),
-                                },
+              if (state.automations.isNotEmpty)
-                              ),
+                SizedBox(
-                            ),
+                  height: 200,
-                          )
+                  child: ListView.builder(
-                        : const CircularProgressIndicator(),
+                    shrinkWrap: true,
-              ],
+                    scrollDirection: Axis.horizontal,
-            )
+                    itemCount: state.automations.length,
-          ],
+                    itemBuilder: (context, index) {
+                      return Padding(
+                        padding: const EdgeInsets.only(right: 8.0),
+                        child: RoutineViewCard(
+                          onTap: () {},
+                          textString: state.automations[index].name,
+                          icon: state.automations[index].icon ??
+                              Assets.automation,
+                        ),
+                      );
+                    },
+                  ),
+                ),
+            ],
+          ),
         );
       },
     );

lib/pages/routiens/widgets/main_routine_view/routine_view_card.dart

@@ -47,8 +47,16 @@ class RoutineViewCard extends StatelessWidget {
                   ),
                   height: 70,
                   width: 70,
-                  child: (icon is String) && icon.contains('.svg')
+                  child: (icon is String)
-                      ? SvgPicture.asset(icon)
+                      ? icon.endsWith('.svg')
+                          ? SvgPicture.asset(
+                              icon,
+                              fit: BoxFit.contain,
+                            )
+                          : Image.asset(
+                              icon,
+                              fit: BoxFit.contain,
+                            )
                       : Icon(
                           icon,
                           color: ColorsManager.dialogBlueTitle,

lib/pages/routiens/widgets/routine_dialogs/discard_dialog.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/custom_table.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/bloc/switch_tabs/switch_tabs_bloc.dart';
-import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
 import 'package:syncrow_web/pages/routiens/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';

lib/pages/routiens/widgets/scenes_and_automations.dart

@@ -18,7 +18,7 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
   void initState() {
     super.initState();
     context.read<RoutineBloc>()
-      ..add(const LoadScenes(spaceId))
+      ..add(const LoadScenes(spaceId, communityId))
       ..add(const LoadAutomation(spaceId));
   }
 
@@ -34,7 +34,9 @@ class _ScenesAndAutomationsState extends State<ScenesAndAutomations> {
             children: scenes.asMap().entries.map((entry) {
               final scene = entry.value;
               if (state.searchText != null && state.searchText!.isNotEmpty) {
-                return scene.name.toLowerCase().contains(state.searchText!.toLowerCase())
+                return scene.name
+                        .toLowerCase()
+                        .contains(state.searchText!.toLowerCase())
                     ? DraggableCard(
                         imagePath: scene.icon ?? Assets.loginLogo,
                         title: scene.name,

lib/services/routines_api.dart

@@ -69,14 +69,21 @@ class SceneApi {
 
   //get scene by unit id
 
-  static Future<List<ScenesModel>> getScenesByUnitId(String unitId) async {
+    static Future<List<ScenesModel>> getScenesByUnitId(
+      String unitId, String communityId,
+      {showInDevice = false}) async {
     try {
       final response = await _httpService.get(
-        path: ApiEndpoints.getSpaceScenes.replaceAll('{unitUuid}', unitId),
+        path: ApiEndpoints.getUnitScenes
+            .replaceAll('{spaceUuid}', unitId)
+            .replaceAll('{communityUuid}', communityId),
+        queryParameters: {'showInHomePage': showInDevice},
         showServerMessage: false,
         expectedResponseModel: (json) {
+          final scenesJson = json['data'] as List;
+
           List<ScenesModel> scenes = [];
-          for (var scene in json) {
+          for (var scene in scenesJson) {
             scenes.add(ScenesModel.fromJson(scene));
           }
           return scenes;
@@ -88,6 +95,25 @@ class SceneApi {
     }
   }
 
+  // static Future<List<ScenesModel>> getScenesByUnitId(String unitId) async {
+  //   try {
+  //     final response = await _httpService.get(
+  //       path: ApiEndpoints.getSpaceScenes.replaceAll('{unitUuid}', unitId),
+  //       showServerMessage: false,
+  //       expectedResponseModel: (json) {
+  //         List<ScenesModel> scenes = [];
+  //         for (var scene in json) {
+  //           scenes.add(ScenesModel.fromJson(scene));
+  //         }
+  //         return scenes;
+  //       },
+  //     );
+  //     return response;
+  //   } catch (e) {
+  //     rethrow;
+  //   }
+  // }
+
   //getAutomation
 
   static Future<List<ScenesModel>> getAutomationByUnitId(String unitId) async {

lib/utils/constants/api_const.dart

@@ -55,4 +55,6 @@ abstract class ApiEndpoints {
   static const String getIconScene = '/scene/icon';
   static const String createScene = '/scene/tap-to-run';
   static const String createAutomation = '/automation';
+  static const String getUnitScenes =
+      '/communities/{communityUuid}/spaces/{spaceUuid}/scenes';
 }