change calibration completed dialog color

lib/pages/analytics/models/analytics_device.dart

@@ -39,12 +39,8 @@ class AnalyticsDevice {
           ? ProductDevice.fromJson(json['productDevice'] as Map<String, dynamic>)
           : null,
       spaceUuid: json['spaceUuid'] as String?,
-      latitude: json['lat'] != null && json['lat'] != ''
+      latitude: json['lat'] != null ? double.parse(json['lat'] as String? ?? '0.0') : null,
-          ? double.tryParse(json['lat']?.toString() ?? '0.0')
+      longitude: json['lon'] != null ? double.parse(json['lon'] as String? ?? '0.0') : null,
-          : null,
-      longitude: json['lon'] != null && json['lon'] != ''
-          ? double.tryParse(json['lon']?.toString() ?? '0.0')
-          : null,
     );
   }
 }

lib/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart

@@ -46,11 +46,11 @@ class AirQualityDistributionBloc
     }
   }
 
-  void _onClearAirQualityDistribution(
+  Future<void> _onClearAirQualityDistribution(
     ClearAirQualityDistribution event,
     Emitter<AirQualityDistributionState> emit,
-  ) {
+  ) async {
-    emit(AirQualityDistributionState(selectedAqiType: state.selectedAqiType));
+    emit(const AirQualityDistributionState());
   }
 
   void _onUpdateAqiTypeEvent(

lib/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart

@@ -75,6 +75,6 @@ class RangeOfAqiBloc extends Bloc<RangeOfAqiEvent, RangeOfAqiState> {
     ClearRangeOfAqiEvent event,
     Emitter<RangeOfAqiState> emit,
   ) {
-    emit(RangeOfAqiState(selectedAqiType: state.selectedAqiType));
+    emit(const RangeOfAqiState());
   }
 }

lib/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_title.dart

@@ -34,7 +34,6 @@ class AqiDistributionChartTitle extends StatelessWidget {
             alignment: AlignmentDirectional.centerEnd,
             fit: BoxFit.scaleDown,
             child: AqiTypeDropdown(
-              selectedAqiType: context.watch<AirQualityDistributionBloc>().state.selectedAqiType,
               onChanged: (value) {
                 if (value != null) {
                   final bloc = context.read<AirQualityDistributionBloc>();

lib/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart

@@ -18,20 +18,19 @@ enum AqiType {
 }
 
 class AqiTypeDropdown extends StatefulWidget {
-  const AqiTypeDropdown({
+  const AqiTypeDropdown({super.key, required this.onChanged});
-    required this.onChanged,
-    this.selectedAqiType,
-    super.key,
-  });
 
   final ValueChanged<AqiType?> onChanged;
-  final AqiType? selectedAqiType;
 
   @override
   State<AqiTypeDropdown> createState() => _AqiTypeDropdownState();
 }
 
 class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
+  AqiType? _selectedItem = AqiType.aqi;
+
+  void _updateSelectedItem(AqiType? item) => setState(() => _selectedItem = item);
+
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -42,8 +41,8 @@ class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
           width: 1,
         ),
       ),
-      child: DropdownButton<AqiType>(
+      child: DropdownButton<AqiType?>(
-        value: widget.selectedAqiType,
+        value: _selectedItem,
         isDense: true,
         borderRadius: BorderRadius.circular(16),
         dropdownColor: ColorsManager.whiteColors,
@@ -60,7 +59,10 @@ class _AqiTypeDropdownState extends State<AqiTypeDropdown> {
         items: AqiType.values
             .map((e) => DropdownMenuItem(value: e, child: Text(e.value)))
             .toList(),
-        onChanged: widget.onChanged,
+        onChanged: (value) {
+          _updateSelectedItem(value);
+          widget.onChanged(value);
+        },
       ),
     );
   }

lib/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_title.dart

@@ -63,15 +63,15 @@ class RangeOfAqiChartTitle extends StatelessWidget {
             fit: BoxFit.scaleDown,
             alignment: AlignmentDirectional.centerEnd,
             child: AqiTypeDropdown(
-              selectedAqiType: context.watch<RangeOfAqiBloc>().state.selectedAqiType,
               onChanged: (value) {
                 final spaceTreeState = context.read<SpaceTreeBloc>().state;
                 final spaceUuid = spaceTreeState.selectedSpaces.firstOrNull;
+
+                if (spaceUuid == null) return;
+
                 if (value != null) {
                   context.read<RangeOfAqiBloc>().add(UpdateAqiTypeEvent(value));
                 }
-
-                if (spaceUuid == null) return;
               },
             ),
           ),

lib/pages/analytics/services/device_location/device_location_details_service_decorator.dart

@@ -17,8 +17,8 @@ class DeviceLocationDetailsServiceDecorator implements DeviceLocationService {
         'reverse',
         queryParameters: {
           'format': 'json',
-          'lat': 25.1880567,
+          'lat': param.latitude,
-          'lon': 55.266608,
+          'lon': param.longitude,
         },
       );
 

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart

@@ -16,12 +16,11 @@ class DeviceManagementBloc
   int _onlineCount = 0;
   int _offlineCount = 0;
   int _lowBatteryCount = 0;
-  final List<AllDevicesModel> _selectedDevices = [];
+  List<AllDevicesModel> _selectedDevices = [];
   List<AllDevicesModel> _filteredDevices = [];
   String currentProductName = '';
   String? currentCommunity;
   String? currentUnitName;
-  String subSpaceName = '';
 
   DeviceManagementBloc() : super(DeviceManagementInitial()) {
     on<FetchDevices>(_onFetchDevices);
@@ -32,29 +31,24 @@ class DeviceManagementBloc
     on<ResetFilters>(_onResetFilters);
     on<ResetSelectedDevices>(_onResetSelectedDevices);
     on<UpdateSelection>(_onUpdateSelection);
-    on<UpdateDeviceName>(_onUpdateDeviceName);
-    on<UpdateSubSpaceName>(_onUpdateSubSpaceName);
   }
 
   Future<void> _onFetchDevices(
       FetchDevices event, Emitter<DeviceManagementState> emit) async {
     emit(DeviceManagementLoading());
     try {
-      var devices = <AllDevicesModel>[];
+      List<AllDevicesModel> devices = [];
       _devices.clear();
-      final spaceBloc = event.context.read<SpaceTreeBloc>();
+      var spaceBloc = event.context.read<SpaceTreeBloc>();
       final projectUuid = await ProjectManager.getProjectUUID() ?? '';
-
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
+        devices = await DevicesManagementApi().fetchDevices(projectUuid);
       } else {
-        for (final community in spaceBloc.state.selectedCommunities) {
+        for (var community in spaceBloc.state.selectedCommunities) {
-          final spacesList =
+          List<String> spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
-          for (final space in spacesList) {
           devices.addAll(await DevicesManagementApi()
-                .fetchDevices(community, space, projectUuid));
+              .fetchDevices(projectUuid, spacesId: spacesList));
-          }
         }
       }
 
@@ -76,7 +70,7 @@ class DeviceManagementBloc
     }
   }
 
-  Future<void> _onFilterDevices(
+  void _onFilterDevices(
       FilterDevices event, Emitter<DeviceManagementState> emit) async {
     if (_devices.isNotEmpty) {
       _filteredDevices = List.from(_devices.where((device) {
@@ -158,7 +152,8 @@ class DeviceManagementBloc
     add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
   }
 
-  void _onSelectDevice(SelectDevice event, Emitter<DeviceManagementState> emit) {
+  void _onSelectDevice(
+      SelectDevice event, Emitter<DeviceManagementState> emit) {
     final selectedUuid = event.selectedDevice.uuid;
 
     if (_selectedDevices.any((device) => device.uuid == selectedUuid)) {
@@ -167,9 +162,9 @@ class DeviceManagementBloc
       _selectedDevices.add(event.selectedDevice);
     }
 
-    final clonedSelectedDevices = List<AllDevicesModel>.from(_selectedDevices);
+    List<AllDevicesModel> clonedSelectedDevices = List.from(_selectedDevices);
 
-    final isControlButtonEnabled =
+    bool isControlButtonEnabled =
         _checkIfControlButtonEnabled(clonedSelectedDevices);
 
     if (state is DeviceManagementLoaded) {
@@ -199,8 +194,8 @@ class DeviceManagementBloc
 
   void _onUpdateSelection(
       UpdateSelection event, Emitter<DeviceManagementState> emit) {
-    final selectedDevices = <AllDevicesModel>[];
+    List<AllDevicesModel> selectedDevices = [];
-    var devicesToSelectFrom = <AllDevicesModel>[];
+    List<AllDevicesModel> devicesToSelectFrom = [];
 
     if (state is DeviceManagementLoaded) {
       devicesToSelectFrom = (state as DeviceManagementLoaded).devices;
@@ -208,7 +203,7 @@ class DeviceManagementBloc
       devicesToSelectFrom = (state as DeviceManagementFiltered).filteredDevices;
     }
 
-    for (var i = 0; i < event.selectedRows.length; i++) {
+    for (int i = 0; i < event.selectedRows.length; i++) {
       if (event.selectedRows[i]) {
         selectedDevices.add(devicesToSelectFrom[i]);
       }
@@ -254,7 +249,8 @@ class DeviceManagementBloc
     _onlineCount = _devices.where((device) => device.online == true).length;
     _offlineCount = _devices.where((device) => device.online == false).length;
     _lowBatteryCount = _devices
-        .where((device) => device.batteryLevel != null && device.batteryLevel! < 20)
+        .where((device) =>
+            device.batteryLevel != null && device.batteryLevel! < 20)
         .length;
   }
 
@@ -271,7 +267,8 @@ class DeviceManagementBloc
     }
   }
 
-  void _onSearchDevices(SearchDevices event, Emitter<DeviceManagementState> emit) {
+  void _onSearchDevices(
+      SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
         (event.deviceNameOrProductName == null ||
@@ -300,7 +297,7 @@ class DeviceManagementBloc
     currentCommunity = event.community;
     currentUnitName = event.unitName;
 
-    final devicesToSearch = _devices;
+    List<AllDevicesModel> devicesToSearch = _devices;
 
     if (devicesToSearch.isNotEmpty) {
       final searchText = event.deviceNameOrProductName?.toLowerCase() ?? '';
@@ -343,134 +340,5 @@ class DeviceManagementBloc
     }
   }
 
-  void _onUpdateDeviceName(
-      UpdateDeviceName event, Emitter<DeviceManagementState> emit) {
-    final devices = _devices.map((device) {
-      if (device.uuid == event.deviceId) {
-        final modifiedDevice = device.copyWith(name: event.newName);
-        _selectedDevices.removeWhere((device) => device.uuid == event.deviceId);
-        _selectedDevices.add(modifiedDevice);
-        return modifiedDevice;
-      }
-      return device;
-    }).toList();
-
-    final filteredDevices = _filteredDevices.map((device) {
-      if (device.uuid == event.deviceId) {
-        final modifiedDevice = device.copyWith(name: event.newName);
-        _selectedDevices.removeWhere((device) => device.uuid == event.deviceId);
-        _selectedDevices.add(modifiedDevice);
-        return modifiedDevice;
-      }
-      return device;
-    }).toList();
-
-    _devices = devices;
-    _filteredDevices = filteredDevices;
-
-    if (state is DeviceManagementLoaded) {
-      final loaded = state as DeviceManagementLoaded;
-      final selectedDevices01 = _selectedDevices.map((device) {
-        if (device.uuid == event.deviceId) {
-          final modifiedDevice = device.copyWith(name: event.newName);
-          return modifiedDevice;
-        }
-        return device;
-      }).toList();
-      emit(DeviceManagementLoaded(
-        devices: devices,
-        selectedIndex: loaded.selectedIndex,
-        onlineCount: loaded.onlineCount,
-        offlineCount: loaded.offlineCount,
-        lowBatteryCount: loaded.lowBatteryCount,
-        selectedDevice: selectedDevices01,
-        isControlButtonEnabled: loaded.isControlButtonEnabled,
-      ));
-    } else if (state is DeviceManagementFiltered) {
-      final filtered = state as DeviceManagementFiltered;
-      final selectedDevices01 = filtered.selectedDevice?.map((device) {
-        if (device.uuid == event.deviceId) {
-          final modifiedDevice = device.copyWith(name: event.newName);
-          return modifiedDevice;
-        }
-        return device;
-      }).toList();
-      emit(DeviceManagementFiltered(
-        filteredDevices: filteredDevices,
-        selectedIndex: filtered.selectedIndex,
-        onlineCount: filtered.onlineCount,
-        offlineCount: filtered.offlineCount,
-        lowBatteryCount: filtered.lowBatteryCount,
-        selectedDevice: selectedDevices01,
-        isControlButtonEnabled: filtered.isControlButtonEnabled,
-      ));
-    }
-  }
-
-  void _onUpdateSubSpaceName(
-      UpdateSubSpaceName event, Emitter<DeviceManagementState> emit) {
-    final devices = _devices.map((device) {
-      if (device.uuid == event.deviceId) {
-        return device.copyWith(
-            subspace:
-                device.subspace?.copyWith(subspaceName: event.newSubSpaceName));
-      }
-      return device;
-    }).toList();
-
-    final filteredDevices = _filteredDevices.map((device) {
-      if (device.uuid == event.deviceId) {
-        return device.copyWith(
-            subspace:
-                device.subspace?.copyWith(subspaceName: event.newSubSpaceName));
-      }
-      return device;
-    }).toList();
-
-    _devices = devices;
-    _filteredDevices = filteredDevices;
-
-    if (state is DeviceManagementLoaded) {
-      final loaded = state as DeviceManagementLoaded;
-      final selectedDevices = loaded.selectedDevice?.map((device) {
-        if (device.uuid == event.deviceId) {
-          return device.copyWith(
-              subspace:
-                  device.subspace?.copyWith(subspaceName: event.newSubSpaceName));
-        }
-        return device;
-      }).toList();
-      emit(DeviceManagementLoaded(
-        devices: _devices,
-        selectedIndex: loaded.selectedIndex,
-        onlineCount: loaded.onlineCount,
-        offlineCount: loaded.offlineCount,
-        lowBatteryCount: loaded.lowBatteryCount,
-        selectedDevice: selectedDevices,
-        isControlButtonEnabled: loaded.isControlButtonEnabled,
-      ));
-    } else if (state is DeviceManagementFiltered) {
-      // final filtered = state as DeviceManagementFiltered;
-      // emit(DeviceManagementFiltered(
-      //   filteredDevices: _filteredDevices,
-      //   selectedIndex: filtered.selectedIndex,
-      //   onlineCount: filtered.onlineCount,
-      //   offlineCount: filtered.offlineCount,
-      //   lowBatteryCount: filtered.lowBatteryCount,
-      //   selectedDevice: filtered.selectedDevice,
-      //   isControlButtonEnabled: filtered.isControlButtonEnabled,
-      // ));
-    }
-  }
-
-  void changeSubspaceName(
-      String deviceId, String newSubSpaceName, String subspaceId) {
-    add(UpdateSubSpaceName(
-      deviceId: deviceId,
-      newSubSpaceName: newSubSpaceName,
-      subspaceId: subspaceId,
-    ));
-  }
-
   List<AllDevicesModel> get selectedDevices => _selectedDevices;
 }

lib/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_event.dart

@@ -70,21 +70,3 @@ class UpdateSelection extends DeviceManagementEvent {
 
   const UpdateSelection(this.selectedRows);
 }
-
-class UpdateDeviceName extends DeviceManagementEvent {
-  final String deviceId;
-  final String newName;
-
-  const UpdateDeviceName({required this.deviceId, required this.newName});
-}
-
-class UpdateSubSpaceName extends DeviceManagementEvent {
-  final String deviceId;
-  final String newSubSpaceName;
-  final String subspaceId;
-
-  const UpdateSubSpaceName(
-      {required this.deviceId,
-      required this.newSubSpaceName,
-      required this.subspaceId});
-}

lib/pages/device_managment/all_devices/models/device_status.dart

@@ -60,13 +60,4 @@ class Status {
   factory Status.fromJson(String source) => Status.fromMap(json.decode(source));
 
   String toJson() => json.encode(toMap());
-  Status copyWith({
-    String? code,
-    dynamic value,
-  }) {
-    return Status(
-      code: code ?? this.code,
-      value: value ?? this.value,
-    );
-  }
 }

lib/pages/device_managment/all_devices/models/device_subspace.model.dart

@@ -44,20 +44,4 @@ class DeviceSubspace {
   static List<Map<String, dynamic>> listToJson(List<DeviceSubspace> subspaces) {
     return subspaces.map((subspace) => subspace.toJson()).toList();
   }
-
-  DeviceSubspace copyWith({
-    String? uuid,
-    DateTime? createdAt,
-    DateTime? updatedAt,
-    String? subspaceName,
-    bool? disabled,
-  }) {
-    return DeviceSubspace(
-      uuid: uuid ?? this.uuid,
-      createdAt: createdAt ?? this.createdAt,
-      updatedAt: updatedAt ?? this.updatedAt,
-      subspaceName: subspaceName ?? this.subspaceName,
-      disabled: disabled ?? this.disabled,
-    );
-  }
 }

lib/pages/device_managment/all_devices/models/devices_model.dart

@@ -588,72 +588,4 @@ SOS
     "NCPS": DeviceType.NCPS,
     "PC": DeviceType.PC,
   };
-
-  AllDevicesModel copyWith({
-    DevicesModelRoom? room,
-    DeviceSubspace? subspace,
-    DevicesModelUnit? unit,
-    DeviceCommunityModel? community,
-    String? productUuid,
-    String? productType,
-    String? permissionType,
-    int? activeTime,
-    String? category,
-    String? categoryName,
-    int? createTime,
-    String? gatewayId,
-    String? icon,
-    String? ip,
-    String? lat,
-    String? localKey,
-    String? lon,
-    String? model,
-    String? name,
-    String? nodeId,
-    bool? online,
-    String? ownerId,
-    bool? sub,
-    String? timeZone,
-    int? updateTime,
-    String? uuid,
-    int? batteryLevel,
-    String? productName,
-    List<DeviceSpaceModel>? spaces,
-    List<DeviceTagModel>? deviceTags,
-    DeviceSubSpace? deviceSubSpace,
-  }) {
-    return AllDevicesModel(
-      room: room ?? this.room,
-      subspace: subspace ?? this.subspace,
-      unit: unit ?? this.unit,
-      community: community ?? this.community,
-      productUuid: productUuid ?? this.productUuid,
-      productType: productType ?? this.productType,
-      permissionType: permissionType ?? this.permissionType,
-      activeTime: activeTime ?? this.activeTime,
-      category: category ?? this.category,
-      categoryName: categoryName ?? this.categoryName,
-      createTime: createTime ?? this.createTime,
-      gatewayId: gatewayId ?? this.gatewayId,
-      icon: icon ?? this.icon,
-      ip: ip ?? this.ip,
-      lat: lat ?? this.lat,
-      localKey: localKey ?? this.localKey,
-      lon: lon ?? this.lon,
-      model: model ?? this.model,
-      name: name ?? this.name,
-      nodeId: nodeId ?? this.nodeId,
-      online: online ?? this.online,
-      ownerId: ownerId ?? this.ownerId,
-      sub: sub ?? this.sub,
-      timeZone: timeZone ?? this.timeZone,
-      updateTime: updateTime ?? this.updateTime,
-      uuid: uuid ?? this.uuid,
-      batteryLevel: batteryLevel ?? this.batteryLevel,
-      productName: productName ?? this.productName,
-      spaces: spaces ?? this.spaces,
-      deviceTags: deviceTags ?? this.deviceTags,
-      deviceSubSpace: deviceSubSpace ?? this.deviceSubSpace,
-    );
-  }
 }

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

@@ -23,7 +23,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<DeviceManagementBloc, DeviceManagementState>(
-      buildWhen: (previous, current) => previous != current,
       builder: (context, state) {
         List<AllDevicesModel> devicesToShow = [];
         int selectedIndex = 0;
@@ -32,6 +31,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
         int lowBatteryCount = 0;
         bool isControlButtonEnabled = false;
         List<AllDevicesModel> selectedDevices = [];
+
         if (state is DeviceManagementLoaded) {
           devicesToShow = state.devices;
           selectedIndex = state.selectedIndex;
@@ -111,8 +111,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                     onPressed: isControlButtonEnabled
                                         ? () {
                                             if (isAnyDeviceOffline) {
-                                              ScaffoldMessenger.of(context)
-                                                  .clearSnackBars();
                                               ScaffoldMessenger.of(context)
                                                   .showSnackBar(
                                                 const SnackBar(
@@ -192,7 +190,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                 'Product Name',
                                 'Device ID',
                                 'Space Name',
-                                'Location',
+                                'location',
                                 'Battery Level',
                                 'Installation Date and Time',
                                 'Status',
@@ -244,7 +242,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                   .map((device) => device.uuid!)
                                   .toList(),
                               isEmpty: devicesToShow.isEmpty,
-                              onSettingsPressed: (rowIndex) async {
+                              onSettingsPressed: (rowIndex) {
                                 final device = devicesToShow[rowIndex];
                                 showDeviceSettingsSidebar(context, device);
                               },
@@ -266,7 +264,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
       barrierDismissible: true,
       barrierLabel: "Device Settings",
       transitionDuration: const Duration(milliseconds: 300),
-      pageBuilder: (_, anim1, anim2) {
+      pageBuilder: (context, anim1, anim2) {
         return Align(
           alignment: Alignment.centerRight,
           child: Material(
@@ -276,7 +274,6 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
               child: DeviceSettingsPanel(
                 device: device,
                 onClose: () => Navigator.of(context).pop(),
-                deviceManagementBloc: context.read<DeviceManagementBloc>(),
               ),
             ),
           ),

lib/pages/device_managment/curtain_module/view/curtain_module_items.dart

@@ -62,10 +62,9 @@ class CurtainModuleItems extends StatelessWidget with HelperResponsiveLayout {
                                     BlocProvider.of<CurtainModuleBloc>(context),
                                 child: BuildScheduleView(
                                   deviceUuid: deviceId,
-                                  category: 'timer',
+                                  category: 'CUR_2',
                                   code: 'control',
-                                  countdownCode: 'timer',
+                                  
-                                  deviceType: 'CUR_2',
                                 ),
                               ));
                     },

lib/pages/device_managment/curtain_module/widgets/calibrate_completed_dialog.dart

@@ -17,6 +17,7 @@ class CalibrateCompletedDialog extends StatelessWidget {
   @override
   Widget build(_) {
     return AlertDialog(
+      backgroundColor: ColorsManager.whiteColors,
       contentPadding: EdgeInsets.zero,
       content: SizedBox(
         height: 250,

lib/pages/device_managment/device_setting/device_management_content.dart

@@ -19,14 +19,11 @@ class DeviceManagementContent extends StatelessWidget {
     required this.device,
     required this.subSpaces,
     required this.deviceInfo,
-    required this.deviceManagementBloc,
   });
 
   final AllDevicesModel device;
   final List<SubSpaceModel> subSpaces;
   final DeviceInfoModel deviceInfo;
-  final DeviceManagementBloc deviceManagementBloc;
-
 
   @override
   Widget build(BuildContext context) {
@@ -90,11 +87,6 @@ class DeviceManagementContent extends StatelessWidget {
                           ),
                         );
                   });
-
-                  deviceManagementBloc.add(UpdateSubSpaceName(
-                      subspaceId: selectedSubSpace.id!,
-                      deviceId: device.uuid!,
-                      newSubSpaceName: selectedSubSpace.name ?? ''));
                 }
               },
               child: infoRow(

lib/pages/device_managment/device_setting/device_settings_panel.dart

@@ -1,15 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_state.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/device_icon_type_helper.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/device_management_content.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/remove_device_widget.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/device_info_model.dart';
+import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_state.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/sub_space_model.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
@@ -19,13 +17,7 @@ import 'package:syncrow_web/web_layout/default_container.dart';
 class DeviceSettingsPanel extends StatelessWidget {
   final VoidCallback? onClose;
   final AllDevicesModel device;
-  final DeviceManagementBloc deviceManagementBloc;
+  const DeviceSettingsPanel({super.key, this.onClose, required this.device});
-  const DeviceSettingsPanel({
-    super.key,
-    this.onClose,
-    required this.device,
-    required this.deviceManagementBloc,
-  });
 
   @override
   Widget build(BuildContext context) {
@@ -142,14 +134,8 @@ class DeviceSettingsPanel extends StatelessWidget {
                                               onFieldSubmitted: (value) {
                                                 _bloc.add(const ChangeNameEvent(
                                                     value: false));
-                                                deviceManagementBloc
-                                                    ..add(UpdateDeviceName(
-                                                        deviceId: device.uuid!,
-                                                        newName: _bloc
-                                                            .nameController
-                                                            .text))..add(ResetSelectedDevices());
                                               },
-                                              decoration:const InputDecoration(
+                                              decoration: InputDecoration(
                                                 isDense: true,
                                                 contentPadding: EdgeInsets.zero,
                                                 border: InputBorder.none,
@@ -204,7 +190,6 @@ class DeviceSettingsPanel extends StatelessWidget {
                           device: device,
                           subSpaces: subSpaces.cast<SubSpaceModel>(),
                           deviceInfo: deviceInfo,
-                          deviceManagementBloc: deviceManagementBloc,
                         ),
                         const SizedBox(height: 32),
                         RemoveDeviceWidget(bloc: _bloc),

lib/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart

@@ -40,7 +40,7 @@ class OneGangGlassSwitchBloc
     emit(OneGangGlassSwitchLoading());
     try {
       final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId);
+      _listenToChanges(event.deviceId, emit);
       deviceStatus = OneGangGlassStatusModel.fromJson(event.deviceId, status.status);
       emit(OneGangGlassSwitchStatusLoaded(deviceStatus));
     } catch (e) {
@@ -48,28 +48,42 @@ class OneGangGlassSwitchBloc
     }
   }
 
-  StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
+  void _listenToChanges(
-
+    String deviceId,
-  void _listenToChanges(String deviceId) {
+    Emitter<OneGangGlassSwitchState> emit,
+  ) {
     try {
       final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      _deviceStatusSubscription = ref.onValue.listen((DatabaseEvent event) async {
+      final stream = ref.onValue;
-        if (event.snapshot.value == null) return;
 
-        final usersMap = event.snapshot.value! as Map<dynamic, dynamic>;
+      stream.listen((DatabaseEvent event) {
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;
 
         final statusList = <Status>[];
-
+        if (data['status'] != null) {
-        usersMap['status'].forEach((element) {
+          for (var element in data['status']) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+            statusList.add(
-        });
+              Status(
-
+                code: element['code'].toString(),
-        deviceStatus =
+                value: element['value'].toString(),
-            OneGangGlassStatusModel.fromJson(usersMap['productUuid'], statusList);
+              ),
-
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          final newStatus = OneGangGlassStatusModel.fromJson(deviceId, statusList);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
               add(StatusUpdated(deviceStatus));
+            }
+          }
+        }
       });
-    } catch (_) {}
+    } catch (e) {
+      emit(OneGangGlassSwitchError('Failed to listen to changes: $e'));
+    }
   }
 
   void _onStatusUpdated(
@@ -160,10 +174,4 @@ class OneGangGlassSwitchBloc
       deviceStatus = deviceStatus.copyWith(switch1: value);
     }
   }
-
-  @override
-  Future<void> close() {
-    _deviceStatusSubscription?.cancel();
-    return super.close();
-  }
 }

lib/pages/device_managment/one_g_glass_switch/view/one_gang_glass_switch_control_view.dart

@@ -90,8 +90,6 @@ class OneGangGlassSwitchControlView extends StatelessWidget
                       child: BuildScheduleView(
                         category: 'switch_1',
                         deviceUuid: deviceId,
-                        countdownCode: 'countdown_1',
-                        deviceType: '1GT',
                       ),
                     ));
           },

lib/pages/device_managment/one_gang_switch/view/wall_light_device_control.dart

@@ -80,8 +80,6 @@ class WallLightDeviceControl extends StatelessWidget
                       child: BuildScheduleView(
                         category: 'switch_1',
                         deviceUuid: deviceId,
-                        countdownCode: 'countdown_1',
-                        deviceType: '1G',
                       ),
                     ));
           },

lib/pages/device_managment/schedule_device/bloc/schedule_bloc.dart

@@ -47,7 +47,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       final success = await RemoteControlDeviceService().controlDevice(
         deviceUuid: deviceId,
         status: Status(
-          code: event.countdownCode,
+          code: 'countdown_1',
           value: 0,
         ),
       );
@@ -80,18 +80,15 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
   ) {
     if (state is ScheduleLoaded) {
       final currentState = state as ScheduleLoaded;
-
       emit(currentState.copyWith(
-        countdownSeconds: currentState.countdownSeconds,
-        selectedTime: currentState.selectedTime,
-        deviceId: deviceId,
         scheduleMode: event.scheduleMode,
-        countdownHours: currentState.countdownHours,
+        countdownRemaining: Duration.zero,
-        countdownMinutes: currentState.countdownMinutes,
+        countdownHours: 0,
-        inchingHours: currentState.inchingHours,
+        countdownMinutes: 0,
-        inchingMinutes: currentState.inchingMinutes,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        isCountdownActive: false,
         isInchingActive: false,
-        isCountdownActive: currentState.countdownRemaining > Duration.zero,
       ));
     }
   }
@@ -224,6 +221,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
         deviceId,
         event.category,
       );
+
       if (state is ScheduleLoaded) {
         final currentState = state as ScheduleLoaded;
         emit(currentState.copyWith(
@@ -287,22 +285,12 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
   ) async {
     try {
       if (state is ScheduleLoaded) {
-        Status status = Status(code: '', value: '');
-        if (event.deviceType == 'CUR_2') {
-          status = status.copyWith(
-              code: 'control',
-              value: event.functionOn == true ? 'open' : 'close');
-        } else {
-          status =
-              status.copyWith(code: event.category, value: event.functionOn);
-        }
-
         final dateTime = DateTime.parse(event.time);
         final updatedSchedule = ScheduleEntry(
           scheduleId: event.scheduleId,
           category: event.category,
           time: getTimeStampWithoutSeconds(dateTime).toString(),
-          function: status,
+          function: Status(code: event.category, value: event.functionOn),
           days: event.selectedDays,
         );
         final success = await DevicesManagementApi().editScheduleRecord(
@@ -408,7 +396,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       final totalSeconds =
           Duration(hours: event.hours, minutes: event.minutes).inSeconds;
       final code = event.mode == ScheduleModes.countdown
-          ? event.countDownCode
+          ? 'countdown_1'
           : 'switch_inching';
       final currentState = state as ScheduleLoaded;
       final duration = Duration(seconds: totalSeconds);
@@ -435,7 +423,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       );
 
       if (success) {
-        if (code == event.countDownCode) {
+        if (code == 'countdown_1') {
           final countdownDuration = Duration(seconds: totalSeconds);
 
           emit(
@@ -449,7 +437,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
           );
 
           if (countdownDuration.inSeconds > 0) {
-            _startCountdownTimer(emit, countdownDuration, event.countDownCode);
+            _startCountdownTimer(emit, countdownDuration);
           } else {
             _countdownTimer?.cancel();
             emit(
@@ -479,7 +467,9 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
   }
 
   void _startCountdownTimer(
-      Emitter<ScheduleState> emit, Duration duration, String countdownCode) {
+    Emitter<ScheduleState> emit,
+    Duration duration,
+  ) {
     _countdownTimer?.cancel();
     _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
       if (_currentCountdown != null && _currentCountdown! > Duration.zero) {
@@ -489,7 +479,6 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       } else {
         timer.cancel();
         add(StopScheduleEvent(
-          countdownCode: countdownCode,
           mode: _currentCountdown == null
               ? ScheduleModes.countdown
               : ScheduleModes.inching,
@@ -526,75 +515,70 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      int totalSeconds = 0;
+      print(status.status);
-      final countdownItem = status.status.firstWhere(
-        (item) => item.code == event.countdownCode,
-        orElse: () => Status(code: '', value: 0),
-      );
-      totalSeconds = (countdownItem.value as int?) ?? 0;
-      final countdownHours = totalSeconds ~/ 3600;
-      final countdownMinutes = (totalSeconds % 3600) ~/ 60;
-      final countdownSeconds = totalSeconds % 60;
-
       final deviceStatus =
           WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
-      final isCountdownActive = totalSeconds > 0;
-      final isInchingActive = !isCountdownActive &&
-          (deviceStatus.inchingHours > 0 || deviceStatus.inchingMinutes > 0);
 
-      final newState = state is ScheduleLoaded
+      final scheduleMode =
-          ? (state as ScheduleLoaded).copyWith(
+          deviceStatus.countdownHours > 0 || deviceStatus.countdownMinutes > 0
-              scheduleMode: ScheduleModes.schedule,
+              ? ScheduleModes.countdown
-              countdownHours: countdownHours,
+              : deviceStatus.inchingHours > 0 || deviceStatus.inchingMinutes > 0
-              countdownMinutes: countdownMinutes,
+                  ? ScheduleModes.inching
-              countdownSeconds: countdownSeconds,
+                  : ScheduleModes.schedule;
+      final isCountdown = scheduleMode == ScheduleModes.countdown;
+      final isInching = scheduleMode == ScheduleModes.inching;
+
+      Duration? countdownRemaining;
+      var isCountdownActive = false;
+      var isInchingActive = false;
+
+      if (isCountdown) {
+        countdownRemaining = Duration(
+          hours: deviceStatus.countdownHours,
+          minutes: deviceStatus.countdownMinutes,
+        );
+        isCountdownActive = countdownRemaining > Duration.zero;
+      } else if (isInching) {
+        isInchingActive = Duration(
+              hours: deviceStatus.inchingHours,
+              minutes: deviceStatus.inchingMinutes,
+            ) >
+            Duration.zero;
+      }
+      if (state is ScheduleLoaded) {
+        final currentState = state as ScheduleLoaded;
+        emit(currentState.copyWith(
+          scheduleMode: scheduleMode,
+          countdownHours: deviceStatus.countdownHours,
+          countdownMinutes: deviceStatus.countdownMinutes,
           inchingHours: deviceStatus.inchingHours,
           inchingMinutes: deviceStatus.inchingMinutes,
           isCountdownActive: isCountdownActive,
           isInchingActive: isInchingActive,
-              countdownRemaining: isCountdownActive
+          countdownRemaining: countdownRemaining ?? Duration.zero,
-                  ? Duration(seconds: totalSeconds)
+        ));
-                  : Duration.zero,
+      } else {
-            )
+        emit(ScheduleLoaded(
-          : ScheduleLoaded(
-              scheduleMode: ScheduleModes.schedule,
           schedules: const [],
           selectedTime: null,
           selectedDays: List.filled(7, false),
           functionOn: false,
           isEditing: false,
-              deviceId: event.deviceId,
+          deviceId: deviceId,
-              countdownHours: countdownHours,
+          scheduleMode: scheduleMode,
-              countdownMinutes: countdownMinutes,
+          countdownHours: deviceStatus.countdownHours,
-              countdownSeconds: countdownSeconds,
+          countdownMinutes: deviceStatus.countdownMinutes,
           inchingHours: deviceStatus.inchingHours,
           inchingMinutes: deviceStatus.inchingMinutes,
           isCountdownActive: isCountdownActive,
           isInchingActive: isInchingActive,
-              countdownRemaining: isCountdownActive
+          countdownRemaining: countdownRemaining ?? Duration.zero,
-                  ? Duration(seconds: totalSeconds)
-                  : Duration.zero,
-            );
-      emit(newState);
-
-      if (isCountdownActive) {
-        _countdownTimer?.cancel();
-        _currentCountdown = Duration(seconds: totalSeconds);
-        countdownRemaining = _currentCountdown!;
-
-        if (totalSeconds > 0) {
-          _startCountdownTimer(
-              emit, Duration(seconds: totalSeconds), event.countdownCode);
-        } else {
-          add(StopScheduleEvent(
-            countdownCode: event.countdownCode,
-            mode: ScheduleModes.countdown,
-            deviceId: event.deviceId,
         ));
       }
-      } else {
+
-        _countdownTimer?.cancel();
+      // if (isCountdownActive && countdownRemaining != null) {
-      }
+      //   _startCountdownTimer(emit, countdownRemaining);
+      // }
     } catch (e) {
       emit(ScheduleError('Failed to fetch device status: $e'));
     }

lib/pages/device_managment/schedule_device/bloc/schedule_event.dart

@@ -91,7 +91,6 @@ class ScheduleEditEvent extends ScheduleEvent {
   final String time;
   final List<String> selectedDays;
   final bool functionOn;
-  final String deviceType;
 
   const ScheduleEditEvent({
     required this.scheduleId,
@@ -99,7 +98,6 @@ class ScheduleEditEvent extends ScheduleEvent {
     required this.time,
     required this.selectedDays,
     required this.functionOn,
-    required this.deviceType,
   });
 
   @override
@@ -109,7 +107,6 @@ class ScheduleEditEvent extends ScheduleEvent {
         time,
         selectedDays,
         functionOn,
-        deviceType,
       ];
 }
 
@@ -141,13 +138,11 @@ class ScheduleUpdateEntryEvent extends ScheduleEvent {
 
 class UpdateScheduleModeEvent extends ScheduleEvent {
   final ScheduleModes scheduleMode;
-  final String countdownCode;
 
-  const UpdateScheduleModeEvent(
+  const UpdateScheduleModeEvent({required this.scheduleMode});
-      {required this.scheduleMode, required this.countdownCode});
 
   @override
-  List<Object> get props => [scheduleMode, countdownCode!];
+  List<Object> get props => [scheduleMode];
 }
 
 class UpdateCountdownTimeEvent extends ScheduleEvent {
@@ -182,32 +177,28 @@ class StartScheduleEvent extends ScheduleEvent {
   final ScheduleModes mode;
   final int hours;
   final int minutes;
-  final String countDownCode;
 
   const StartScheduleEvent({
     required this.mode,
     required this.hours,
     required this.minutes,
-    required this.countDownCode,
   });
 
   @override
-  List<Object?> get props => [mode, hours, minutes, countDownCode];
+  List<Object?> get props => [mode, hours, minutes];
 }
 
 class StopScheduleEvent extends ScheduleEvent {
   final ScheduleModes mode;
   final String deviceId;
-  final String countdownCode;
 
   const StopScheduleEvent({
     required this.mode,
     required this.deviceId,
-    required this.countdownCode,
   });
 
   @override
-  List<Object?> get props => [mode, deviceId, countdownCode];
+  List<Object?> get props => [mode, deviceId];
 }
 
 class ScheduleDecrementCountdownEvent extends ScheduleEvent {
@@ -219,13 +210,11 @@ class ScheduleDecrementCountdownEvent extends ScheduleEvent {
 
 class ScheduleFetchStatusEvent extends ScheduleEvent {
   final String deviceId;
-  final String countdownCode;
 
-  const ScheduleFetchStatusEvent(
+  const ScheduleFetchStatusEvent(this.deviceId);
-      {required this.deviceId, required this.countdownCode});
 
   @override
-  List<Object> get props => [deviceId, countdownCode];
+  List<Object> get props => [deviceId];
 }
 
 class DeleteScheduleEvent extends ScheduleEvent {

lib/pages/device_managment/schedule_device/bloc/schedule_state.dart

@@ -29,7 +29,7 @@ class ScheduleLoaded extends ScheduleState {
   final int inchingSeconds;
   final bool isInchingActive;
   final ScheduleModes scheduleMode;
-  final Duration countdownRemaining;
+  final Duration? countdownRemaining;
   final int? countdownSeconds;
 
   const ScheduleLoaded({
@@ -48,7 +48,7 @@ class ScheduleLoaded extends ScheduleState {
     this.inchingMinutes = 0,
     this.isInchingActive = false,
     this.scheduleMode = ScheduleModes.countdown,
-    this.countdownRemaining = Duration.zero,
+    this.countdownRemaining,
   });
 
   ScheduleLoaded copyWith({

lib/pages/device_managment/schedule_device/schedule_widgets/count_down_button.dart

@@ -11,7 +11,6 @@ class CountdownModeButtons extends StatelessWidget {
   final String deviceId;
   final int hours;
   final int minutes;
-  final String countDownCode;
 
   const CountdownModeButtons({
     super.key,
@@ -19,7 +18,6 @@ class CountdownModeButtons extends StatelessWidget {
     required this.deviceId,
     required this.hours,
     required this.minutes,
-    required this.countDownCode,
   });
 
   @override
@@ -45,7 +43,6 @@ class CountdownModeButtons extends StatelessWidget {
                           StopScheduleEvent(
                             mode: ScheduleModes.countdown,
                             deviceId: deviceId,
-                            countdownCode: countDownCode,
                           ),
                         );
                   },
@@ -60,7 +57,7 @@ class CountdownModeButtons extends StatelessWidget {
                             mode: ScheduleModes.countdown,
                             hours: hours,
                             minutes: minutes,
-                              countDownCode: countDownCode),
+                          ),
                         );
                   },
                   backgroundColor: ColorsManager.primaryColor,

lib/pages/device_managment/schedule_device/schedule_widgets/count_down_inching_view.dart

@@ -75,33 +75,23 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
         final isCountDown = state.scheduleMode == ScheduleModes.countdown;
         final isActive =
             isCountDown ? state.isCountdownActive : state.isInchingActive;
-
+        final displayHours = isActive && state.countdownRemaining != null
-        final displayHours =
+            ? state.countdownRemaining!.inHours
-            isActive && state.countdownRemaining != Duration.zero
-                ? state.countdownRemaining.inHours
             : (isCountDown ? state.countdownHours : state.inchingHours);
-
+        final displayMinutes = isActive && state.countdownRemaining != null
-        final displayMinutes =
+            ? state.countdownRemaining!.inMinutes.remainder(60)
-            isActive && state.countdownRemaining != Duration.zero
-                ? state.countdownRemaining.inMinutes.remainder(60)
             : (isCountDown ? state.countdownMinutes : state.inchingMinutes);
+        final displaySeconds = isActive && state.countdownRemaining != null
+            ? state.countdownRemaining!.inSeconds.remainder(60)
+            : (isCountDown ? state.countdownSeconds : state.inchingSeconds);
 
-        final displaySeconds =
+        _updateControllers(displayHours, displayMinutes, displaySeconds!);
-            isActive && state.countdownRemaining != Duration.zero
-                ? state.countdownRemaining.inSeconds.remainder(60)
-                : (isCountDown ? (state.countdownSeconds ?? 0) : 0);
 
-        _updateControllers(displayHours, displayMinutes, displaySeconds);
+        if (displayHours == 0 && displayMinutes == 0 && displaySeconds == 0) {
-
-        if (isActive &&
-            displayHours == 0 &&
-            displayMinutes == 0 &&
-            displaySeconds == 0) {
           context.read<ScheduleBloc>().add(
                 StopScheduleEvent(
                   mode: ScheduleModes.countdown,
                   deviceId: widget.deviceId,
-                  countdownCode: '',
                 ),
               );
         }

lib/pages/device_managment/schedule_device/schedule_widgets/inching_mode_buttons.dart

@@ -43,9 +43,7 @@ class InchingModeButtons extends StatelessWidget {
                   onPressed: () {
                     context.read<ScheduleBloc>().add(
                           StopScheduleEvent(
-                              deviceId: deviceId,
+                              deviceId: deviceId, mode: ScheduleModes.inching),
-                              mode: ScheduleModes.inching,
-                              countdownCode: ''),
                         );
                   },
                   backgroundColor: Colors.red,

lib/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart

@@ -18,15 +18,11 @@ class BuildScheduleView extends StatelessWidget {
     super.key,
     required this.deviceUuid,
     required this.category,
-    required this.countdownCode,
     this.code,
-    required this.deviceType,
   });
   final String deviceUuid;
   final String category;
   final String? code;
-  final String? countdownCode;
-  final String deviceType;
 
   @override
   Widget build(BuildContext context) {
@@ -35,8 +31,7 @@ class BuildScheduleView extends StatelessWidget {
         deviceId: deviceUuid,
       )
         ..add(ScheduleGetEvent(category: category))
-        ..add(ScheduleFetchStatusEvent(
+        ..add(ScheduleFetchStatusEvent(deviceUuid)),
-            deviceId: deviceUuid, countdownCode: countdownCode ?? '')),
       child: Dialog(
         backgroundColor: Colors.white,
         insetPadding: const EdgeInsets.all(20),
@@ -57,22 +52,18 @@ class BuildScheduleView extends StatelessWidget {
                       children: [
                         const ScheduleHeader(),
                         const SizedBox(height: 20),
-                        if (deviceType == 'CUR_2')
-                          const SizedBox()
-                        else
                         ScheduleModeSelector(
-                            countdownCode: countdownCode ?? '',
                           currentMode: state.scheduleMode,
                         ),
                         const SizedBox(height: 20),
                         if (state.scheduleMode == ScheduleModes.schedule)
                           ScheduleManagementUI(
-                            deviceType: deviceType,
                             category: category,
                             deviceUuid: deviceUuid,
                             onAddSchedule: () async {
                               final entry = await ScheduleDialogHelper
-                                  .showAddScheduleDialog(context,
+                                  .showAddScheduleDialog(
+                                context,
                                 schedule: ScheduleEntry(
                                   category: category,
                                   time: '',
@@ -82,7 +73,7 @@ class BuildScheduleView extends StatelessWidget {
                                 ),
                                 isEdit: false,
                                 code: code,
-                                      deviceType: deviceType);
+                              );
                               if (entry != null) {
                                 context.read<ScheduleBloc>().add(
                                       ScheduleAddEvent(
@@ -96,7 +87,6 @@ class BuildScheduleView extends StatelessWidget {
                               }
                             },
                           ),
-                        if (deviceType != 'CUR_2')
                         if (state.scheduleMode == ScheduleModes.countdown ||
                             state.scheduleMode == ScheduleModes.inching)
                           CountdownInchingView(
@@ -105,7 +95,6 @@ class BuildScheduleView extends StatelessWidget {
                         const SizedBox(height: 20),
                         if (state.scheduleMode == ScheduleModes.countdown)
                           CountdownModeButtons(
-                            countDownCode: countdownCode ?? '',
                             isActive: state.isCountdownActive,
                             deviceId: deviceUuid,
                             hours: state.countdownHours,

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_managment_ui.dart

@@ -8,13 +8,11 @@ class ScheduleManagementUI extends StatelessWidget {
   final String deviceUuid; 
   final VoidCallback onAddSchedule;
   final String category;
-  final String deviceType;
 
   const ScheduleManagementUI({
     super.key,
     required this.deviceUuid,
     required this.onAddSchedule,
-    required this.deviceType,
     this.category = 'switch_1',
   });
 
@@ -46,11 +44,7 @@ class ScheduleManagementUI extends StatelessWidget {
           ),
         ),
         const SizedBox(height: 20),
-        ScheduleTableWidget(
+        ScheduleTableWidget(deviceUuid: deviceUuid, category: category),
-          deviceUuid: deviceUuid,
-          category: category,
-          deviceType: deviceType,
-        ),
       ],
     );
   }

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_selector.dart

@@ -7,12 +7,10 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ScheduleModeSelector extends StatelessWidget {
   final ScheduleModes currentMode;
-  final String countdownCode;
 
   const ScheduleModeSelector({
     super.key,
     required this.currentMode,
-    required this.countdownCode,
   });
 
   @override
@@ -73,8 +71,7 @@ class ScheduleModeSelector extends StatelessWidget {
           onChanged: (ScheduleModes? value) {
             if (value != null) {
               context.read<ScheduleBloc>().add(
-                    UpdateScheduleModeEvent(
+                    UpdateScheduleModeEvent(scheduleMode: value),
-                        scheduleMode: value, countdownCode: countdownCode),
                   );
               if (value == ScheduleModes.schedule) {
                 context.read<ScheduleBloc>().add(

lib/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart

@@ -12,13 +12,11 @@ import 'package:syncrow_web/utils/format_date_time.dart';
 class ScheduleTableWidget extends StatelessWidget {
   final String deviceUuid;
   final String category;
-  final String deviceType;
 
   const ScheduleTableWidget({
     super.key,
     required this.deviceUuid,
     this.category = 'switch_1',
-    required this.deviceType,
   });
 
   @override
@@ -27,14 +25,13 @@ class ScheduleTableWidget extends StatelessWidget {
       create: (_) => ScheduleBloc(
         deviceId: deviceUuid,
       )..add(ScheduleGetEvent(category: category)),
-      child: _ScheduleTableView(deviceType),
+      child: _ScheduleTableView(),
     );
   }
 }
 
 class _ScheduleTableView extends StatelessWidget {
-  final String deviceType;
+  const _ScheduleTableView();
-  const _ScheduleTableView(this.deviceType);
 
   @override
   Widget build(BuildContext context) {
@@ -84,7 +81,7 @@ class _ScheduleTableView extends StatelessWidget {
                         bottomLeft: Radius.circular(20),
                         bottomRight: Radius.circular(20)),
                   ),
-                  child: _buildTableBody(state.schedules, context, deviceType));
+                  child: _buildTableBody(state.schedules, context));
             }
             if (state is ScheduleError) {
               return Center(child: Text(state.error));
@@ -126,8 +123,7 @@ class _ScheduleTableView extends StatelessWidget {
     );
   }
 
-  Widget _buildTableBody(
+  Widget _buildTableBody(List<ScheduleModel> schedules, BuildContext context) {
-      List<ScheduleModel> schedules, BuildContext context, String deviceType) {
     return SizedBox(
       height: 200,
       child: SingleChildScrollView(
@@ -136,8 +132,7 @@ class _ScheduleTableView extends StatelessWidget {
           defaultVerticalAlignment: TableCellVerticalAlignment.middle,
           children: [
             for (int i = 0; i < schedules.length; i++)
-              _buildScheduleRow(schedules[i], i, context,
+              _buildScheduleRow(schedules[i], i, context),
-                  deviceType: deviceType),
           ],
         ),
       ),
@@ -160,19 +155,25 @@ class _ScheduleTableView extends StatelessWidget {
   }
 
   TableRow _buildScheduleRow(
-      ScheduleModel schedule, int index, BuildContext context,
+      ScheduleModel schedule, int index, BuildContext context) {
-      {required String deviceType}) {
     return TableRow(
       children: [
         Center(
           child: GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () {
+              bool temp;
+              if (schedule.category == 'CUR_2') {
+                temp = schedule.function.value == 'open' ? true : false;
+              } else {
+                temp = schedule.function.value as bool;
+              }
               context.read<ScheduleBloc>().add(
                     ScheduleUpdateEntryEvent(
                       category: schedule.category,
                       scheduleId: schedule.scheduleId,
-                      functionOn: schedule.function.value,
+                      functionOn: temp,
+                      //  schedule.function.value,
                       enable: !schedule.enable,
                     ),
                   );
@@ -194,11 +195,10 @@ class _ScheduleTableView extends StatelessWidget {
             child: Text(_getSelectedDays(
                 ScheduleModel.parseSelectedDays(schedule.days)))),
         Center(child: Text(formatIsoStringToTime(schedule.time, context))),
-        if (deviceType == 'CUR_2')
+        schedule.category == 'CUR_2'
-          Center(
+            ? Center(
                 child: Text(schedule.function.value == true ? 'open' : 'close'))
-        else
+            : Center(child: Text(schedule.function.value ? 'On' : 'Off')),
-          Center(child: Text(schedule.function.value ? 'On' : 'Off')),
         Center(
           child: Wrap(
             runAlignment: WrapAlignment.center,
@@ -206,27 +206,18 @@ class _ScheduleTableView extends StatelessWidget {
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  ScheduleDialogHelper.showAddScheduleDialog(context,
+                  ScheduleDialogHelper.showAddScheduleDialog(
+                    context,
                     schedule: ScheduleEntry.fromScheduleModel(schedule),
                     isEdit: true,
-                          deviceType: deviceType)
+                  ).then((updatedSchedule) {
-                      .then((updatedSchedule) {
                     if (updatedSchedule != null) {
-                      bool temp;
-                      if (deviceType == 'CUR_2') {
-                        updatedSchedule.function.value == 'open'
-                            ? temp = true
-                            : temp = false;
-                      } else {
-                        temp = updatedSchedule.function.value;
-                      }
                       context.read<ScheduleBloc>().add(
                             ScheduleEditEvent(
-                                deviceType: deviceType,
                                 scheduleId: schedule.scheduleId,
                                 category: schedule.category,
                                 time: updatedSchedule.time,
-                                functionOn: temp,
+                                functionOn: updatedSchedule.function.value,
                                 selectedDays: updatedSchedule.days),
                           );
                     }

lib/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart

@@ -41,7 +41,7 @@ class ThreeGangGlassSwitchBloc
     emit(ThreeGangGlassSwitchLoading());
     try {
       final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      _listenToChanges(event.deviceId);
+      _listenToChanges(event.deviceId, emit);
       deviceStatus =
           ThreeGangGlassStatusModel.fromJson(event.deviceId, status.status);
       emit(ThreeGangGlassSwitchStatusLoaded(deviceStatus));
@@ -50,28 +50,42 @@ class ThreeGangGlassSwitchBloc
     }
   }
 
-  StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
+  void _listenToChanges(
-
+    String deviceId,
-  void _listenToChanges(String deviceId) {
+    Emitter<ThreeGangGlassSwitchState> emit,
+  ) {
     try {
       final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      _deviceStatusSubscription = ref.onValue.listen((DatabaseEvent event) async {
+      final stream = ref.onValue;
-        if (event.snapshot.value == null) return;
 
-        final usersMap = event.snapshot.value! as Map<dynamic, dynamic>;
+      stream.listen((DatabaseEvent event) {
+        final data = event.snapshot.value as Map<dynamic, dynamic>?;
+        if (data == null) return;
 
         final statusList = <Status>[];
-
+        if (data['status'] != null) {
-        usersMap['status'].forEach((element) {
+          for (var element in data['status']) {
-          statusList.add(Status(code: element['code'], value: element['value']));
+            statusList.add(
-        });
+              Status(
-
+                code: element['code'].toString(),
-        deviceStatus =
+                value: element['value'].toString(),
-            ThreeGangGlassStatusModel.fromJson(usersMap['productUuid'], statusList);
+              ),
-
+            );
+          }
+        }
+        if (statusList.isNotEmpty) {
+          final newStatus = ThreeGangGlassStatusModel.fromJson(deviceId, statusList);
+          if (newStatus != deviceStatus) {
+            deviceStatus = newStatus;
+            if (!isClosed) {
               add(StatusUpdated(deviceStatus));
+            }
+          }
+        }
       });
-    } catch (_) {}
+    } catch (e) {
+      emit(ThreeGangGlassSwitchError('Failed to listen to changes: $e'));
+    }
   }
 
   void _onStatusUpdated(
@@ -170,10 +184,4 @@ class ThreeGangGlassSwitchBloc
         break;
     }
   }
-
-  @override
-  Future<void> close() {
-    _deviceStatusSubscription?.cancel();
-    return super.close();
-  }
 }

lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart

@@ -111,8 +111,6 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
                       child: BuildScheduleView(
                         category: 'switch_1',
                         deviceUuid: deviceId,
-                        countdownCode: 'countdown_1',
-                        deviceType: '3GT',
                       ),
                     ));
           },
@@ -129,8 +127,6 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
                       child: BuildScheduleView(
                         category: 'switch_2',
                         deviceUuid: deviceId,
-                        countdownCode: 'countdown_2',
-                        deviceType: '3GT',
                       ),
                     ));
           },
@@ -147,8 +143,6 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
                       child: BuildScheduleView(
                         category: 'switch_3',
                         deviceUuid: deviceId,
-                        countdownCode: 'countdown_3',
-                        deviceType: '3GT',
                       ),
                     ));
           },

lib/pages/device_managment/three_gang_switch/view/living_room_device_control.dart

@@ -102,8 +102,6 @@ class LivingRoomDeviceControlsView extends StatelessWidget
                       child: BuildScheduleView(
                         deviceUuid: deviceId,
                         category: 'switch_1',
-                        countdownCode: 'countdown_1',
-                        deviceType: '3G',
                       ),
                     ));
           },
@@ -120,8 +118,6 @@ class LivingRoomDeviceControlsView extends StatelessWidget
                       child: BuildScheduleView(
                         deviceUuid: deviceId,
                         category: 'switch_2',
-                        countdownCode: 'countdown_2',
-                        deviceType: '3G',
                       ),
                     ));
           },
@@ -138,8 +134,6 @@ class LivingRoomDeviceControlsView extends StatelessWidget
                       child: BuildScheduleView(
                         deviceUuid: deviceId,
                         category: 'switch_3',
-                        countdownCode: 'countdown_3',
-                        deviceType: '3G',
                       ),
                     ));
           },

lib/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart

@@ -1,20 +1,21 @@
-  import 'dart:async';
+import 'dart:async';
+import 'dart:developer';
 
-  import 'package:bloc/bloc.dart';
+import 'package:bloc/bloc.dart';
-  import 'package:equatable/equatable.dart';
+import 'package:equatable/equatable.dart';
-  import 'package:firebase_database/firebase_database.dart';
+import 'package:firebase_database/firebase_database.dart';
-  import 'package:flutter/foundation.dart';
+import 'package:flutter/foundation.dart';
-  import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.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/all_devices/models/factory_reset_model.dart';
-  import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
+import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/models/two_gang_glass_status_model.dart';
-  import 'package:syncrow_web/services/batch_control_devices_service.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/control_device_service.dart';
-  import 'package:syncrow_web/services/devices_mang_api.dart';
+import 'package:syncrow_web/services/devices_mang_api.dart';
 
-  part 'two_gang_glass_switch_event.dart';
+part 'two_gang_glass_switch_event.dart';
-  part 'two_gang_glass_switch_state.dart';
+part 'two_gang_glass_switch_state.dart';
 
-  class TwoGangGlassSwitchBloc
+class TwoGangGlassSwitchBloc
     extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
   final String deviceId;
   final ControlDeviceService controlDeviceService;
@@ -50,28 +51,29 @@
     }
   }
 
-    StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
-
   void _listenToChanges(String deviceId) {
     try {
-        final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      final ref = FirebaseDatabase.instance.ref(
-        _deviceStatusSubscription = ref.onValue.listen((DatabaseEvent event) async {
+        'device-status/$deviceId',
-          if (event.snapshot.value == null) return;
+      );
 
-          final usersMap = event.snapshot.value! as Map<dynamic, dynamic>;
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
 
-          final statusList = <Status>[];
+        List<Status> statusList = [];
-
+        eventsMap['status'].forEach((element) {
-          usersMap['status'].forEach((element) {
           statusList.add(Status(code: element['code'], value: element['value']));
         });
 
-          deviceStatus =
+        deviceStatus = TwoGangGlassStatusModel.fromJson(deviceId, statusList);
-              TwoGangGlassStatusModel.fromJson(usersMap['productUuid'], statusList);
-
         add(StatusUpdated(deviceStatus));
       });
-      } catch (_) {}
+    } catch (_) {
+      log(
+        'Error listening to changes',
+        name: 'TwoGangGlassSwitchBloc._listenToChanges',
+      );
+    }
   }
 
   Future<void> _onControl(
@@ -168,10 +170,4 @@
         break;
     }
   }
-
-    @override
-    Future<void> close() {
-      _deviceStatusSubscription?.cancel();
-      return super.close();
-  }
 }

lib/pages/device_managment/two_g_glass_switch/view/two_gang_glass_switch_control_view.dart

@@ -102,8 +102,6 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
                 builder: (ctx) => BlocProvider.value(
                       value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
                       child: BuildScheduleView(
-                        deviceType: '2GT',
-                        countdownCode: 'countdown_1',
                         deviceUuid: deviceId,
                         category: 'switch_1',
                       ),
@@ -120,8 +118,6 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
                 builder: (ctx) => BlocProvider.value(
                       value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
                       child: BuildScheduleView(
-                        deviceType: '2GT',
-                        countdownCode: 'countdown_2',
                         deviceUuid: deviceId,
                         category: 'switch_2',
                       ),

lib/pages/device_managment/two_gang_switch/view/wall_light_batch_control.dart

@@ -97,8 +97,6 @@ class TwoGangBatchControlView extends StatelessWidget
                         child: BuildScheduleView(
                           category: 'switch_1',
                           deviceUuid: deviceIds.first,
-                          countdownCode: 'countdown_1',
-                          deviceType: '2G',
                         ),
                       ));
             },
@@ -116,8 +114,6 @@ class TwoGangBatchControlView extends StatelessWidget
                         child: BuildScheduleView(
                           category: 'switch_2',
                           deviceUuid: deviceIds.first,
-                          countdownCode: 'countdown_2',
-                          deviceType: '2G',
                         ),
                       ));
             },
@@ -125,7 +121,10 @@ class TwoGangBatchControlView extends StatelessWidget
             subtitle: 'Scheduling',
             iconPath: Assets.scheduling,
           ),
-  
+          // FirmwareUpdateWidget(
+          //   deviceId: deviceIds.first,
+          //   version: 12,
+          // ),
           FactoryResetWidget(callFactoryReset: () {
             context.read<TwoGangSwitchBloc>().add(
                   TwoGangFactoryReset(

lib/pages/device_managment/two_gang_switch/view/wall_light_device_control.dart

@@ -103,8 +103,6 @@ class TwoGangDeviceControlView extends StatelessWidget
                               child: BuildScheduleView(
                                 deviceUuid: deviceId,
                                 category: 'switch_1',
-                                countdownCode: 'countdown_1',
-                                deviceType: '2G',
                               ),
                             ));
                   },
@@ -127,8 +125,6 @@ class TwoGangDeviceControlView extends StatelessWidget
                               child: BuildScheduleView(
                                 deviceUuid: deviceId,
                                 category: 'switch_2',
-                                countdownCode: 'countdown_2',
-                                deviceType: '2G',
                               ),
                             ));
                   },

lib/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart

@@ -18,21 +18,14 @@ class ScheduleDialogHelper {
     ScheduleEntry? schedule,
     bool isEdit = false,
     String? code,
-    required String deviceType,
   }) {
-    bool temp;
-    if (deviceType == 'CUR_2') {
-      temp = schedule!.function.value == 'open' ? true : false;
-    } else {
-      temp = schedule!.function.value;
-    }
     final initialTime = schedule != null
         ? _convertStringToTimeOfDay(schedule.time)
         : TimeOfDay.now();
     final initialDays = schedule != null
         ? _convertDaysStringToBooleans(schedule.days)
         : List.filled(7, false);
-    bool? functionOn = temp;
+    bool? functionOn = schedule?.function.value ?? true;
     TimeOfDay selectedTime = initialTime;
     List<bool> selectedDays = List.of(initialDays);
 
@@ -104,7 +97,8 @@ class ScheduleDialogHelper {
                     setState(() => selectedDays[i] = v);
                   }),
                   const SizedBox(height: 16),
-                  _buildFunctionSwitch(deviceType, ctx, functionOn!, (v) {
+                  _buildFunctionSwitch(schedule!.category, ctx, functionOn!,
+                      (v) {
                     setState(() => functionOn = v);
                   }),
                 ],
@@ -124,25 +118,28 @@ class ScheduleDialogHelper {
                   child: ElevatedButton(
                     onPressed: () {
                       dynamic temp;
-                        if (deviceType == 'CUR_2') {
+                      if (schedule?.category == 'CUR_2') {
                         temp = functionOn! ? 'open' : 'close';
                       } else {
                         temp = functionOn;
                       }
+                      print(temp);
                       final entry = ScheduleEntry(
                         category: schedule?.category ?? 'switch_1',
                         time: _formatTimeOfDayToISO(selectedTime),
                         function: Status(
                           code: code ?? 'switch_1',
                           value: temp,
+                          //  functionOn,
                         ),
                         days: _convertSelectedDaysToStrings(selectedDays),
-                          scheduleId: schedule.scheduleId,
+                        scheduleId: schedule?.scheduleId,
                       );
                       Navigator.pop(ctx, entry);
                     },
                     child: const Text('Save'),
-                    )),
+                  ),
+                ),
               ],
             );
           },

lib/pages/device_managment/water_heater/view/water_heater_device_control.dart

@@ -84,8 +84,6 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                       child: BuildScheduleView(
                         deviceUuid: device.uuid ?? '',
                         category: 'switch_1',
-                        countdownCode: 'countdown_1',
-                        deviceType: 'WH',
                       ),
                     ));
           },

lib/pages/routines/bloc/routine_bloc/routine_bloc.dart

@@ -170,7 +170,7 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
     }
   }
 
-Future<void> _onLoadScenes(
+  Future<void> _onLoadScenes(
       LoadScenes event, Emitter<RoutineState> emit) async {
     emit(state.copyWith(isLoading: true, errorMessage: null));
     List<ScenesModel> scenes = [];
@@ -208,7 +208,7 @@ Future<void> _onLoadScenes(
           loadAutomationErrorMessage: '',
           scenes: scenes));
     }
-} 
+  }
 
   Future<void> _onLoadAutomation(
       LoadAutomation event, Emitter<RoutineState> emit) async {
@@ -936,16 +936,12 @@ Future<void> _onLoadScenes(
         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));
+              .fetchDevices(projectUuid, spacesId: spacesList));
-          }
         }
       } else {
-        devices.addAll(await DevicesManagementApi().fetchDevices(
+        devices.addAll(await DevicesManagementApi().fetchDevices(projectUuid,
-            createRoutineBloc.selectedCommunityId,
+            spacesId: [createRoutineBloc.selectedSpaceId]));
-            createRoutineBloc.selectedSpaceId,
-            projectUuid));
       }
 
       emit(state.copyWith(isLoading: false, devices: devices));

lib/pages/routines/widgets/routine_dialogs/curtain_dialog.dart

@@ -58,9 +58,7 @@ class CurtainHelper {
                 child: Column(
                   mainAxisSize: MainAxisSize.min,
                   children: [
-                    DialogHeader(dialogType == 'THEN'
+                    const DialogHeader('AC Functions'),
-                        ? 'Curtain Functions'
-                        : 'Curtain Conditions'),
                     Expanded(
                       child: Row(
                         crossAxisAlignment: CrossAxisAlignment.stretch,

lib/pages/spaces_management/all_spaces/model/product_model.dart

@@ -58,14 +58,11 @@ class ProductModel {
       '3G': Assets.Gang3SwitchIcon,
       '3GT': Assets.threeTouchSwitch,
       'CUR': Assets.curtain,
-      'CUR_2': Assets.curtain,
       'GD': Assets.garageDoor,
       'GW': Assets.SmartGatewayIcon,
       'DL': Assets.DoorLockIcon,
       'WL': Assets.waterLeakSensor,
       'WH': Assets.waterHeater,
-      'WM': Assets.waterLeakSensor,
-      'SOS': Assets.sos,
       'AC': Assets.ac,
       'CPS': Assets.presenceSensor,
       'PC': Assets.powerClamp,

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -2,8 +2,10 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/common/date_time_widget.dart';
+import 'package:syncrow_web/pages/common/text_field/custom_web_textfield.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_state.dart';
@@ -21,8 +23,8 @@ class VisitorPasswordDialog extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final size = MediaQuery.of(context).size;
+    Size size = MediaQuery.of(context).size;
-    final text = Theme.of(context)
+    var text = Theme.of(context)
         .textTheme
         .bodySmall!
         .copyWith(color: Colors.black, fontSize: 13);
@@ -39,7 +41,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                     title: 'Sent Successfully',
                     widgeta: Column(
                       children: [
-                        if (visitorBloc.passwordStatus!.failedOperations.isNotEmpty)
+                        if (visitorBloc
+                            .passwordStatus!.failedOperations.isNotEmpty)
                           Column(
                             children: [
                               const Text('Failed Devices'),
@@ -53,19 +56,22 @@ class VisitorPasswordDialog extends StatelessWidget {
                                       .passwordStatus!.failedOperations.length,
                                   itemBuilder: (context, index) {
                                     return Container(
-                                      margin: const EdgeInsets.all(5),
+                                      margin: EdgeInsets.all(5),
                                       decoration: containerDecoration,
                                       height: 45,
                                       child: Center(
-                                          child: Text(visitorBloc.passwordStatus!
+                                          child: Text(visitorBloc
-                                              .failedOperations[index].deviceName)),
+                                              .passwordStatus!
+                                              .failedOperations[index]
+                                              .deviceName)),
                                     );
                                   },
                                 ),
                               ),
                             ],
                           ),
-                        if (visitorBloc.passwordStatus!.successOperations.isNotEmpty)
+                        if (visitorBloc
+                            .passwordStatus!.successOperations.isNotEmpty)
                           Column(
                             children: [
                               const Text('Success Devices'),
@@ -79,12 +85,14 @@ class VisitorPasswordDialog extends StatelessWidget {
                                       .passwordStatus!.successOperations.length,
                                   itemBuilder: (context, index) {
                                     return Container(
-                                      margin: const EdgeInsets.all(5),
+                                      margin: EdgeInsets.all(5),
                                       decoration: containerDecoration,
                                       height: 45,
                                       child: Center(
-                                          child: Text(visitorBloc.passwordStatus!
+                                          child: Text(visitorBloc
-                                              .successOperations[index].deviceName)),
+                                              .passwordStatus!
+                                              .successOperations[index]
+                                              .deviceName)),
                                     );
                                   },
                                 ),
@@ -107,14 +115,16 @@ class VisitorPasswordDialog extends StatelessWidget {
         child: BlocBuilder<VisitorPasswordBloc, VisitorPasswordState>(
           builder: (BuildContext context, VisitorPasswordState state) {
             final visitorBloc = BlocProvider.of<VisitorPasswordBloc>(context);
-            final isRepeat =
+            bool isRepeat =
                 state is IsRepeatState ? state.repeat : visitorBloc.repeat;
             return AlertDialog(
               backgroundColor: Colors.white,
               title: Text(
                 'Create visitor password',
                 style: Theme.of(context).textTheme.headlineLarge!.copyWith(
-                    fontWeight: FontWeight.w400, fontSize: 24, color: Colors.black),
+                    fontWeight: FontWeight.w400,
+                    fontSize: 24,
+                    color: Colors.black),
               ),
               content: state is LoadingInitialState
                   ? const Center(child: CircularProgressIndicator())
@@ -300,9 +310,11 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           visitorBloc.accessTypeSelected ==
                                               'Offline Password') {
                                         visitorBloc.add(SelectTimeEvent(
-                                            context: context, isEffective: false));
+                                            context: context,
+                                            isEffective: false));
                                       } else {
-                                        visitorBloc.add(SelectTimeVisitorPassword(
+                                        visitorBloc.add(
+                                            SelectTimeVisitorPassword(
                                                 context: context,
                                                 isStart: false,
                                                 isRepeat: false));
@@ -314,28 +326,31 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           visitorBloc.accessTypeSelected ==
                                               'Offline Password') {
                                         visitorBloc.add(SelectTimeEvent(
-                                            context: context, isEffective: true));
+                                            context: context,
+                                            isEffective: true));
                                       } else {
-                                        visitorBloc.add(SelectTimeVisitorPassword(
+                                        visitorBloc.add(
+                                            SelectTimeVisitorPassword(
                                                 context: context,
                                                 isStart: true,
                                                 isRepeat: false));
                                       }
                                     },
-                                    firstString:
+                                    firstString: (visitorBloc
-                                        (visitorBloc.usageFrequencySelected ==
+                                                    .usageFrequencySelected ==
                                                 'Periodic' &&
                                             visitorBloc.accessTypeSelected ==
                                                 'Offline Password')
                                         ? visitorBloc.effectiveTime
-                                            : visitorBloc.startTimeAccess,
+                                        : visitorBloc.startTimeAccess
+                                            .toString(),
                                     secondString: (visitorBloc
                                                     .usageFrequencySelected ==
                                                 'Periodic' &&
                                             visitorBloc.accessTypeSelected ==
                                                 'Offline Password')
                                         ? visitorBloc.expirationTime
-                                        : visitorBloc.endTimeAccess,
+                                        : visitorBloc.endTimeAccess.toString(),
                                     icon: Assets.calendarIcon),
                               const SizedBox(
                                 height: 10,
@@ -395,7 +410,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                                             child: CupertinoSwitch(
                                               value: visitorBloc.repeat,
                                               onChanged: (value) {
-                                                visitorBloc.add(ToggleRepeatEvent());
+                                                visitorBloc
+                                                    .add(ToggleRepeatEvent());
                                               },
                                               applyTheme: true,
                                             ),
@@ -426,7 +442,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                                           },
                                         ).then((listDevice) {
                                           if (listDevice != null) {
-                                            visitorBloc.selectedDevices = listDevice;
+                                            visitorBloc.selectedDevices =
+                                                listDevice;
                                           }
                                         });
                                       },
@@ -438,7 +455,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                                             .bodySmall!
                                             .copyWith(
                                                 fontWeight: FontWeight.w400,
-                                                color: ColorsManager.whiteColors,
+                                                color:
+                                                    ColorsManager.whiteColors,
                                                 fontSize: 12),
                                       ),
                                     ),
@@ -477,30 +495,37 @@ class VisitorPasswordDialog extends StatelessWidget {
                     onPressed: () {
                       if (visitorBloc.forgetFormKey.currentState!.validate()) {
                         if (visitorBloc.selectedDevices.isNotEmpty) {
-                          if (visitorBloc.usageFrequencySelected == 'One-Time' &&
+                          if (visitorBloc.usageFrequencySelected ==
-                              visitorBloc.accessTypeSelected == 'Offline Password') {
+                                  'One-Time' &&
+                              visitorBloc.accessTypeSelected ==
+                                  'Offline Password') {
                             setPasswordFunction(context, size, visitorBloc);
                           } else if (visitorBloc.usageFrequencySelected ==
                                   'Periodic' &&
-                              visitorBloc.accessTypeSelected == 'Offline Password') {
+                              visitorBloc.accessTypeSelected ==
+                                  'Offline Password') {
                             if (visitorBloc.expirationTime != 'End Time' &&
                                 visitorBloc.effectiveTime != 'Start Time') {
                               setPasswordFunction(context, size, visitorBloc);
                             } else {
                               visitorBloc.stateDialog(
                                   context: context,
-                                  message: 'Please select Access Period to continue',
+                                  message:
+                                      'Please select Access Period to continue',
                                   title: 'Access Period');
                             }
-                          } else if (visitorBloc.endTimeAccess != 'End Time' &&
+                          } else if (visitorBloc.endTimeAccess.toString() !=
-                              visitorBloc.startTimeAccess != 'Start Time') {
+                                  'End Time' &&
+                              visitorBloc.startTimeAccess.toString() !=
+                                  'Start Time') {
                             if (visitorBloc.effectiveTimeTimeStamp != null &&
                                 visitorBloc.expirationTimeTimeStamp != null) {
                               if (isRepeat == true) {
                                 if (visitorBloc.expirationTime != 'End Time' &&
                                     visitorBloc.effectiveTime != 'Start Time' &&
                                     visitorBloc.selectedDays.isNotEmpty) {
-                                  setPasswordFunction(context, size, visitorBloc);
+                                  setPasswordFunction(
+                                      context, size, visitorBloc);
                                 } else {
                                   visitorBloc.stateDialog(
                                       context: context,
@@ -514,13 +539,15 @@ class VisitorPasswordDialog extends StatelessWidget {
                             } else {
                               visitorBloc.stateDialog(
                                   context: context,
-                                  message: 'Please select Access Period to continue',
+                                  message:
+                                      'Please select Access Period to continue',
                                   title: 'Access Period');
                             }
                           } else {
                             visitorBloc.stateDialog(
                                 context: context,
-                                message: 'Please select Access Period to continue',
+                                message:
+                                    'Please select Access Period to continue',
                                 title: 'Access Period');
                           }
                         } else {
@@ -566,17 +593,17 @@ class VisitorPasswordDialog extends StatelessWidget {
                 alignment: Alignment.center,
                 content: SizedBox(
                   height: size.height * 0.25,
-                  child: const Center(
+                  child: Center(
-                    child: CircularProgressIndicator(), // Display a loading spinner
+                    child:
+                        CircularProgressIndicator(), // Display a loading spinner
                   ),
                 ),
               );
             } else {
               return AlertDialog(
                 alignment: Alignment.center,
-                backgroundColor: Colors.white,
                 content: SizedBox(
-                  height: size.height * 0.13,
+                  height: size.height * 0.25,
                   child: Column(
                     children: [
                       Column(
@@ -590,16 +617,13 @@ class VisitorPasswordDialog extends StatelessWidget {
                               width: 35,
                             ),
                           ),
-                          const SizedBox(
-                            height: 20,
-                          ),
                           Text(
                             'Set Password',
                             style: Theme.of(context)
                                 .textTheme
                                 .headlineLarge!
                                 .copyWith(
-                                  fontSize: 24,
+                                  fontSize: 30,
                                   fontWeight: FontWeight.w400,
                                   color: Colors.black,
                                 ),
@@ -607,6 +631,15 @@ class VisitorPasswordDialog extends StatelessWidget {
                         ],
                       ),
                       const SizedBox(width: 15),
+                      Text(
+                        'This action will update all of the selected\n door locks passwords in the property.\n\nAre you sure you want to continue?',
+                        textAlign: TextAlign.center,
+                        style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                              color: ColorsManager.grayColor,
+                              fontWeight: FontWeight.w400,
+                              fontSize: 18,
+                            ),
+                      ),
                     ],
                   ),
                 ),
@@ -635,12 +668,12 @@ class VisitorPasswordDialog extends StatelessWidget {
                     decoration: containerDecoration,
                     width: size.width * 0.1,
                     child: DefaultButton(
-                      backgroundColor: Color(0xff023DFE),
                       borderRadius: 8,
                       onPressed: () {
                         Navigator.pop(context);
                         if (visitorBloc.usageFrequencySelected == 'One-Time' &&
-                            visitorBloc.accessTypeSelected == 'Online Password') {
+                            visitorBloc.accessTypeSelected ==
+                                'Online Password') {
                           visitorBloc.add(OnlineOneTimePasswordEvent(
                             context: context,
                             passwordName: visitorBloc.userNameController.text,
@@ -648,7 +681,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ));
                         } else if (visitorBloc.usageFrequencySelected ==
                                 'Periodic' &&
-                            visitorBloc.accessTypeSelected == 'Online Password') {
+                            visitorBloc.accessTypeSelected ==
+                                'Online Password') {
                           visitorBloc.add(OnlineMultipleTimePasswordEvent(
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
@@ -659,7 +693,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ));
                         } else if (visitorBloc.usageFrequencySelected ==
                                 'One-Time' &&
-                            visitorBloc.accessTypeSelected == 'Offline Password') {
+                            visitorBloc.accessTypeSelected ==
+                                'Offline Password') {
                           visitorBloc.add(OfflineOneTimePasswordEvent(
                             context: context,
                             passwordName: visitorBloc.userNameController.text,
@@ -667,7 +702,8 @@ class VisitorPasswordDialog extends StatelessWidget {
                           ));
                         } else if (visitorBloc.usageFrequencySelected ==
                                 'Periodic' &&
-                            visitorBloc.accessTypeSelected == 'Offline Password') {
+                            visitorBloc.accessTypeSelected ==
+                                'Offline Password') {
                           visitorBloc.add(OfflineMultipleTimePasswordEvent(
                             passwordName: visitorBloc.userNameController.text,
                             email: visitorBloc.emailController.text,
@@ -679,7 +715,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                         }
                       },
                       child: Text(
-                        'Confirm',
+                        'Ok',
                         style: Theme.of(context).textTheme.bodySmall!.copyWith(
                               fontWeight: FontWeight.w400,
                               color: ColorsManager.whiteColors,

lib/services/devices_mang_api.dart

@@ -13,15 +13,13 @@ import 'package:syncrow_web/utils/constants/api_const.dart';
 
 class DevicesManagementApi {
   Future<List<AllDevicesModel>> fetchDevices(
-      String communityId, String spaceId, String projectId) async {
+    String projectId, {
+    List<String>? spacesId,
+  }) async {
     try {
       final response = await HTTPService().get(
-        path: communityId.isNotEmpty && spaceId.isNotEmpty
+        queryParameters: {if (spacesId != null) 'spaces': spacesId},
-            ? ApiEndpoints.getSpaceDevices
+        path: ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
-                .replaceAll('{spaceUuid}', spaceId)
-                .replaceAll('{communityUuid}', communityId)
-                .replaceAll('{projectId}', projectId)
-            : ApiEndpoints.getAllDevices.replaceAll('{projectId}', projectId),
         showServerMessage: true,
         expectedResponseModel: (json) {
           List<dynamic> jsonData = json['data'];
@@ -416,5 +414,4 @@ class DevicesManagementApi {
     );
     return response;
   }
-
 }

lib/utils/constants/api_const.dart

@@ -18,7 +18,7 @@ abstract class ApiEndpoints {
 
   static const String getAllDevices = '/projects/{projectId}/devices';
   static const String getSpaceDevices =
-      '/projects/{projectId}/communities/{communityUuid}/spaces/{spaceUuid}/devices';
+      '/projects/{projectId}/devices';
   static const String getDeviceStatus = '/devices/{uuid}/functions/status';
   static const String getBatchStatus = '/devices/batch';