reComite

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'] != ''
-          ? double.tryParse(json['lat']?.toString() ?? '0.0')
-          : null,
-      longitude: json['lon'] != null && json['lon'] != ''
-          ? double.tryParse(json['lon']?.toString() ?? '0.0')
-          : null,
+      latitude: json['lat'] != null ? double.parse(json['lat'] as String? ?? '0.0') : null,
+      longitude: json['lon'] != null ? double.parse(json['lon'] as String? ?? '0.0') : null,
     );
   }
 }

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,
-          'lon': 55.266608,
+          'lat': param.latitude,
+          'lon': param.longitude,
         },
       );
 

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

@@ -57,9 +57,6 @@ class Status {
     };
   }
 
-  factory Status.fromJson(String source) => Status.fromMap(json.decode(source));
-
-  String toJson() => json.encode(toMap());
   Status copyWith({
     String? code,
     dynamic value,
@@ -69,4 +66,8 @@ class Status {
       value: value ?? this.value,
     );
   }
+
+  factory Status.fromJson(String source) => Status.fromMap(json.decode(source));
+
+  String toJson() => json.encode(toMap());
 }

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/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 {
-        if (event.snapshot.value == null) return;
+      final stream = ref.onValue;
 
-        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>[];
-
-        usersMap['status'].forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus =
-            OneGangGlassStatusModel.fromJson(usersMap['productUuid'], statusList);
-
-        add(StatusUpdated(deviceStatus));
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        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,
-        countdownMinutes: currentState.countdownMinutes,
-        inchingHours: currentState.inchingHours,
-        inchingMinutes: currentState.inchingMinutes,
+        countdownRemaining: Duration.zero,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        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,8 +285,9 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
   ) async {
     try {
       if (state is ScheduleLoaded) {
+        final dateTime = DateTime.parse(event.time);
         Status status = Status(code: '', value: '');
-        if (event.deviceType == 'CUR_2') {
+        if (event.category == 'CUR_2') {
           status = status.copyWith(
               code: 'control',
               value: event.functionOn == true ? 'open' : 'close');
@@ -296,8 +295,6 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
           status =
               status.copyWith(code: event.category, value: event.functionOn);
         }
-
-        final dateTime = DateTime.parse(event.time);
         final updatedSchedule = ScheduleEntry(
           scheduleId: event.scheduleId,
           category: event.category,
@@ -408,7 +405,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 +432,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 +446,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 +476,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 +488,6 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       } else {
         timer.cancel();
         add(StopScheduleEvent(
-          countdownCode: countdownCode,
           mode: _currentCountdown == null
               ? ScheduleModes.countdown
               : ScheduleModes.inching,
@@ -526,75 +524,70 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
     try {
       final status =
           await DevicesManagementApi().getDeviceStatus(event.deviceId);
-      int totalSeconds = 0;
-      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;
-
+      print(status.status);
       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
-          ? (state as ScheduleLoaded).copyWith(
-              scheduleMode: ScheduleModes.schedule,
-              countdownHours: countdownHours,
-              countdownMinutes: countdownMinutes,
-              countdownSeconds: countdownSeconds,
-              inchingHours: deviceStatus.inchingHours,
-              inchingMinutes: deviceStatus.inchingMinutes,
-              isCountdownActive: isCountdownActive,
-              isInchingActive: isInchingActive,
-              countdownRemaining: isCountdownActive
-                  ? Duration(seconds: totalSeconds)
-                  : Duration.zero,
-            )
-          : ScheduleLoaded(
-              scheduleMode: ScheduleModes.schedule,
-              schedules: const [],
-              selectedTime: null,
-              selectedDays: List.filled(7, false),
-              functionOn: false,
-              isEditing: false,
-              deviceId: event.deviceId,
-              countdownHours: countdownHours,
-              countdownMinutes: countdownMinutes,
-              countdownSeconds: countdownSeconds,
-              inchingHours: deviceStatus.inchingHours,
-              inchingMinutes: deviceStatus.inchingMinutes,
-              isCountdownActive: isCountdownActive,
-              isInchingActive: isInchingActive,
-              countdownRemaining: isCountdownActive
-                  ? Duration(seconds: totalSeconds)
-                  : Duration.zero,
-            );
-      emit(newState);
+      final scheduleMode =
+          deviceStatus.countdownHours > 0 || deviceStatus.countdownMinutes > 0
+              ? ScheduleModes.countdown
+              : deviceStatus.inchingHours > 0 || deviceStatus.inchingMinutes > 0
+                  ? ScheduleModes.inching
+                  : ScheduleModes.schedule;
+      final isCountdown = scheduleMode == ScheduleModes.countdown;
+      final isInching = scheduleMode == ScheduleModes.inching;
 
-      if (isCountdownActive) {
-        _countdownTimer?.cancel();
-        _currentCountdown = Duration(seconds: totalSeconds);
-        countdownRemaining = _currentCountdown!;
+      Duration? countdownRemaining;
+      var isCountdownActive = false;
+      var isInchingActive = false;
 
-        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 (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: countdownRemaining ?? Duration.zero,
+        ));
+      } else {
+        emit(ScheduleLoaded(
+          schedules: const [],
+          selectedTime: null,
+          selectedDays: List.filled(7, false),
+          functionOn: false,
+          isEditing: false,
+          deviceId: deviceId,
+          scheduleMode: scheduleMode,
+          countdownHours: deviceStatus.countdownHours,
+          countdownMinutes: deviceStatus.countdownMinutes,
+          inchingHours: deviceStatus.inchingHours,
+          inchingMinutes: deviceStatus.inchingMinutes,
+          isCountdownActive: isCountdownActive,
+          isInchingActive: isInchingActive,
+          countdownRemaining: countdownRemaining ?? Duration.zero,
+        ));
+      }
+
+      // 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(
-      {required this.scheduleMode, required this.countdownCode});
+  const UpdateScheduleModeEvent({required this.scheduleMode});
 
   @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(
-      {required this.deviceId, required this.countdownCode});
+  const ScheduleFetchStatusEvent(this.deviceId);
 
   @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,
                           ),
                         );
                   },
@@ -57,10 +54,10 @@ class CountdownModeButtons extends StatelessWidget {
                   onPressed: () {
                     context.read<ScheduleBloc>().add(
                           StartScheduleEvent(
-                              mode: ScheduleModes.countdown,
-                              hours: hours,
-                              minutes: minutes,
-                              countDownCode: countDownCode),
+                            mode: ScheduleModes.countdown,
+                            hours: hours,
+                            minutes: minutes,
+                          ),
                         );
                   },
                   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
+            ? state.countdownRemaining!.inHours
+            : (isCountDown ? state.countdownHours : state.inchingHours);
+        final displayMinutes = isActive && state.countdownRemaining != null
+            ? 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 displayHours =
-            isActive && state.countdownRemaining != Duration.zero
-                ? state.countdownRemaining.inHours
-                : (isCountDown ? state.countdownHours : state.inchingHours);
+        _updateControllers(displayHours, displayMinutes, displaySeconds!);
 
-        final displayMinutes =
-            isActive && state.countdownRemaining != Duration.zero
-                ? state.countdownRemaining.inMinutes.remainder(60)
-                : (isCountDown ? state.countdownMinutes : state.inchingMinutes);
-
-        final displaySeconds =
-            isActive && state.countdownRemaining != Duration.zero
-                ? state.countdownRemaining.inSeconds.remainder(60)
-                : (isCountDown ? (state.countdownSeconds ?? 0) : 0);
-
-        _updateControllers(displayHours, displayMinutes, displaySeconds);
-
-        if (isActive &&
-            displayHours == 0 &&
-            displayMinutes == 0 &&
-            displaySeconds == 0) {
+        if (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,
-                              mode: ScheduleModes.inching,
-                              countdownCode: ''),
+                              deviceId: deviceId, mode: ScheduleModes.inching),
                         );
                   },
                   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(
-            deviceId: deviceUuid, countdownCode: countdownCode ?? '')),
+        ..add(ScheduleFetchStatusEvent(deviceUuid)),
       child: Dialog(
         backgroundColor: Colors.white,
         insetPadding: const EdgeInsets.all(20),
@@ -57,32 +52,31 @@ class BuildScheduleView extends StatelessWidget {
                       children: [
                         const ScheduleHeader(),
                         const SizedBox(height: 20),
-                        if (deviceType == 'CUR_2')
+                        if (category == '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,
-                                      schedule: ScheduleEntry(
-                                        category: category,
-                                        time: '',
-                                        function: Status(
-                                            code: code.toString(), value: null),
-                                        days: [],
-                                      ),
-                                      isEdit: false,
-                                      code: code,
-                                      deviceType: deviceType);
+                                  .showAddScheduleDialog(
+                                context,
+                                schedule: ScheduleEntry(
+                                  category: category,
+                                  time: '',
+                                  function: Status(
+                                      code: code.toString(), value: null),
+                                  days: [],
+                                ),
+                                isEdit: false,
+                                code: code,
+                              );
                               if (entry != null) {
                                 context.read<ScheduleBloc>().add(
                                       ScheduleAddEvent(
@@ -96,16 +90,14 @@ class BuildScheduleView extends StatelessWidget {
                               }
                             },
                           ),
-                        if (deviceType != 'CUR_2')
-                          if (state.scheduleMode == ScheduleModes.countdown ||
-                              state.scheduleMode == ScheduleModes.inching)
-                            CountdownInchingView(
-                              deviceId: deviceUuid,
-                            ),
+                        if (state.scheduleMode == ScheduleModes.countdown ||
+                            state.scheduleMode == ScheduleModes.inching)
+                          CountdownInchingView(
+                            deviceId: deviceUuid,
+                          ),
                         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

@@ -5,16 +5,14 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ScheduleManagementUI extends StatelessWidget {
-  final String deviceUuid;
+  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(
-          deviceUuid: deviceUuid,
-          category: category,
-          deviceType: deviceType,
-        ),
+        ScheduleTableWidget(deviceUuid: deviceUuid, category: category),
       ],
     );
   }

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(
-                        scheduleMode: value, countdownCode: countdownCode),
+                    UpdateScheduleModeEvent(scheduleMode: value),
                   );
               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(this.deviceType);
+  const _ScheduleTableView();
 
   @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(
-      List<ScheduleModel> schedules, BuildContext context, String deviceType) {
+  Widget _buildTableBody(List<ScheduleModel> schedules, BuildContext context) {
     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,
-                  deviceType: deviceType),
+              _buildScheduleRow(schedules[i], i, context),
           ],
         ),
       ),
@@ -160,19 +155,25 @@ class _ScheduleTableView extends StatelessWidget {
   }
 
   TableRow _buildScheduleRow(
-      ScheduleModel schedule, int index, BuildContext context,
-      {required String deviceType}) {
+      ScheduleModel schedule, int index, BuildContext context) {
     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,9 +195,8 @@ class _ScheduleTableView extends StatelessWidget {
             child: Text(_getSelectedDays(
                 ScheduleModel.parseSelectedDays(schedule.days)))),
         Center(child: Text(formatIsoStringToTime(schedule.time, context))),
-        if (deviceType == 'CUR_2')
-          Center(
-              child: Text(schedule.function.value == true ? 'open' : 'close'))
+        if (schedule.category == 'CUR_2')
+          Center(child: Text(schedule.function.value))
         else
           Center(child: Text(schedule.function.value ? 'On' : 'Off')),
         Center(
@@ -206,14 +206,14 @@ class _ScheduleTableView extends StatelessWidget {
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  ScheduleDialogHelper.showAddScheduleDialog(context,
-                          schedule: ScheduleEntry.fromScheduleModel(schedule),
-                          isEdit: true,
-                          deviceType: deviceType)
-                      .then((updatedSchedule) {
+                  ScheduleDialogHelper.showAddScheduleDialog(
+                    context,
+                    schedule: ScheduleEntry.fromScheduleModel(schedule),
+                    isEdit: true,
+                  ).then((updatedSchedule) {
                     if (updatedSchedule != null) {
                       bool temp;
-                      if (deviceType == 'CUR_2') {
+                      if (schedule.category == 'CUR_2') {
                         updatedSchedule.function.value == 'open'
                             ? temp = true
                             : temp = false;
@@ -222,7 +222,6 @@ class _ScheduleTableView extends StatelessWidget {
                       }
                       context.read<ScheduleBloc>().add(
                             ScheduleEditEvent(
-                                deviceType: deviceType,
                                 scheduleId: schedule.scheduleId,
                                 category: schedule.category,
                                 time: updatedSchedule.time,

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 {
-        if (event.snapshot.value == null) return;
+      final stream = ref.onValue;
 
-        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>[];
-
-        usersMap['status'].forEach((element) {
-          statusList.add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus =
-            ThreeGangGlassStatusModel.fromJson(usersMap['productUuid'], statusList);
-
-        add(StatusUpdated(deviceStatus));
+        if (data['status'] != null) {
+          for (var element in data['status']) {
+            statusList.add(
+              Status(
+                code: element['code'].toString(),
+                value: element['value'].toString(),
+              ),
+            );
+          }
+        }
+        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,177 +1,173 @@
-  import 'dart:async';
+import 'dart:async';
+import 'dart:developer';
 
-  import 'package:bloc/bloc.dart';
-  import 'package:equatable/equatable.dart';
-  import 'package:firebase_database/firebase_database.dart';
-  import 'package: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/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/services/batch_control_devices_service.dart';
-  import 'package:syncrow_web/services/control_device_service.dart';
-  import 'package:syncrow_web/services/devices_mang_api.dart';
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:firebase_database/firebase_database.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/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/services/batch_control_devices_service.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+import 'package:syncrow_web/services/devices_mang_api.dart';
 
-  part 'two_gang_glass_switch_event.dart';
-  part 'two_gang_glass_switch_state.dart';
+part 'two_gang_glass_switch_event.dart';
+part 'two_gang_glass_switch_state.dart';
 
-  class TwoGangGlassSwitchBloc
-      extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
-    final String deviceId;
-    final ControlDeviceService controlDeviceService;
-    final BatchControlDevicesService batchControlDevicesService;
+class TwoGangGlassSwitchBloc
+    extends Bloc<TwoGangGlassSwitchEvent, TwoGangGlassSwitchState> {
+  final String deviceId;
+  final ControlDeviceService controlDeviceService;
+  final BatchControlDevicesService batchControlDevicesService;
 
-    late TwoGangGlassStatusModel deviceStatus;
+  late TwoGangGlassStatusModel deviceStatus;
 
-    TwoGangGlassSwitchBloc({
-      required this.deviceId,
-      required this.controlDeviceService,
-      required this.batchControlDevicesService,
-    }) : super(TwoGangGlassSwitchInitial()) {
-      on<TwoGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
-      on<TwoGangGlassSwitchControl>(_onControl);
-      on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
-      on<TwoGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
-      on<TwoGangGlassFactoryReset>(_onFactoryReset);
-      on<StatusUpdated>(_onStatusUpdated);
+  TwoGangGlassSwitchBloc({
+    required this.deviceId,
+    required this.controlDeviceService,
+    required this.batchControlDevicesService,
+  }) : super(TwoGangGlassSwitchInitial()) {
+    on<TwoGangGlassSwitchFetchDeviceEvent>(_onFetchDeviceStatus);
+    on<TwoGangGlassSwitchControl>(_onControl);
+    on<TwoGangGlassSwitchBatchControl>(_onBatchControl);
+    on<TwoGangGlassSwitchFetchBatchStatusEvent>(_onFetchBatchStatus);
+    on<TwoGangGlassFactoryReset>(_onFactoryReset);
+    on<StatusUpdated>(_onStatusUpdated);
+  }
+
+  Future<void> _onFetchDeviceStatus(
+    TwoGangGlassSwitchFetchDeviceEvent event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
+    try {
+      final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      deviceStatus = TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
+      _listenToChanges(event.deviceId);
+      emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
+    } catch (e) {
+      emit(TwoGangGlassSwitchError(e.toString()));
     }
+  }
 
-    Future<void> _onFetchDeviceStatus(
-      TwoGangGlassSwitchFetchDeviceEvent event,
-      Emitter<TwoGangGlassSwitchState> emit,
-    ) async {
-      emit(TwoGangGlassSwitchLoading());
-      try {
-        final status = await DevicesManagementApi().getDeviceStatus(event.deviceId);
-        deviceStatus = TwoGangGlassStatusModel.fromJson(event.deviceId, status.status);
-        _listenToChanges(event.deviceId);
-        emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
-      } catch (e) {
-        emit(TwoGangGlassSwitchError(e.toString()));
-      }
-    }
+  void _listenToChanges(String deviceId) {
+    try {
+      final ref = FirebaseDatabase.instance.ref(
+        'device-status/$deviceId',
+      );
 
-    StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
+      ref.onValue.listen((event) {
+        final eventsMap = event.snapshot.value as Map<dynamic, dynamic>;
 
-    void _listenToChanges(String deviceId) {
-      try {
-        final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-        _deviceStatusSubscription = ref.onValue.listen((DatabaseEvent event) async {
-          if (event.snapshot.value == null) return;
-
-          final usersMap = event.snapshot.value! as Map<dynamic, dynamic>;
-
-          final statusList = <Status>[];
-
-          usersMap['status'].forEach((element) {
-            statusList.add(Status(code: element['code'], value: element['value']));
-          });
-
-          deviceStatus =
-              TwoGangGlassStatusModel.fromJson(usersMap['productUuid'], statusList);
-
-          add(StatusUpdated(deviceStatus));
+        List<Status> statusList = [];
+        eventsMap['status'].forEach((element) {
+          statusList.add(Status(code: element['code'], value: element['value']));
         });
-      } catch (_) {}
+
+        deviceStatus = TwoGangGlassStatusModel.fromJson(deviceId, statusList);
+        add(StatusUpdated(deviceStatus));
+      });
+    } catch (_) {
+      log(
+        'Error listening to changes',
+        name: 'TwoGangGlassSwitchBloc._listenToChanges',
+      );
     }
+  }
 
-    Future<void> _onControl(
-      TwoGangGlassSwitchControl event,
-      Emitter<TwoGangGlassSwitchState> emit,
-    ) async {
-      emit(TwoGangGlassSwitchLoading());
-      _updateLocalValue(event.code, event.value);
-      emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
+  Future<void> _onControl(
+    TwoGangGlassSwitchControl event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
+    _updateLocalValue(event.code, event.value);
+    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
 
-      try {
-        await controlDeviceService.controlDevice(
-          deviceUuid: event.deviceId,
-          status: Status(code: event.code, value: event.value),
-        );
-      } catch (e) {
-        _updateLocalValue(event.code, !event.value);
-        emit(TwoGangGlassSwitchError(e.toString()));
-      }
+    try {
+      await controlDeviceService.controlDevice(
+        deviceUuid: event.deviceId,
+        status: Status(code: event.code, value: event.value),
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(TwoGangGlassSwitchError(e.toString()));
     }
+  }
 
-    Future<void> _onBatchControl(
-      TwoGangGlassSwitchBatchControl event,
-      Emitter<TwoGangGlassSwitchState> emit,
-    ) async {
-      emit(TwoGangGlassSwitchLoading());
-      _updateLocalValue(event.code, event.value);
+  Future<void> _onBatchControl(
+    TwoGangGlassSwitchBatchControl event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
+    _updateLocalValue(event.code, event.value);
+    emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));
+
+    try {
+      await batchControlDevicesService.batchControlDevices(
+        uuids: event.deviceIds,
+        code: event.code,
+        value: event.value,
+      );
+    } catch (e) {
+      _updateLocalValue(event.code, !event.value);
+      emit(TwoGangGlassSwitchError(e.toString()));
+    }
+  }
+
+  Future<void> _onFetchBatchStatus(
+    TwoGangGlassSwitchFetchBatchStatusEvent event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
+    try {
+      final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
+      deviceStatus = TwoGangGlassStatusModel.fromJson(
+        event.deviceIds.first,
+        status.status,
+      );
       emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));
+    } catch (e) {
+      emit(TwoGangGlassSwitchError(e.toString()));
+    }
+  }
 
-      try {
-        await batchControlDevicesService.batchControlDevices(
-          uuids: event.deviceIds,
-          code: event.code,
-          value: event.value,
-        );
-      } catch (e) {
-        _updateLocalValue(event.code, !event.value);
-        emit(TwoGangGlassSwitchError(e.toString()));
+  Future<void> _onFactoryReset(
+    TwoGangGlassFactoryReset event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) async {
+    emit(TwoGangGlassSwitchLoading());
+    try {
+      final response = await DevicesManagementApi().factoryReset(
+        event.factoryReset,
+        event.deviceId,
+      );
+      if (!response) {
+        emit(TwoGangGlassSwitchError('Failed to reset device'));
+      } else {
+        add(TwoGangGlassSwitchFetchDeviceEvent(event.deviceId));
       }
+    } catch (e) {
+      emit(TwoGangGlassSwitchError(e.toString()));
     }
+  }
 
-    Future<void> _onFetchBatchStatus(
-      TwoGangGlassSwitchFetchBatchStatusEvent event,
-      Emitter<TwoGangGlassSwitchState> emit,
-    ) async {
-      emit(TwoGangGlassSwitchLoading());
-      try {
-        final status = await DevicesManagementApi().getBatchStatus(event.deviceIds);
-        deviceStatus = TwoGangGlassStatusModel.fromJson(
-          event.deviceIds.first,
-          status.status,
-        );
-        emit(TwoGangGlassSwitchBatchStatusLoaded(deviceStatus));
-      } catch (e) {
-        emit(TwoGangGlassSwitchError(e.toString()));
-      }
+  void _onStatusUpdated(
+    StatusUpdated event,
+    Emitter<TwoGangGlassSwitchState> emit,
+  ) {
+    deviceStatus = event.deviceStatus;
+    emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
+  }
+
+  void _updateLocalValue(String code, bool value) {
+    switch (code) {
+      case 'switch_1':
+        deviceStatus = deviceStatus.copyWith(switch1: value);
+        break;
+      case 'switch_2':
+        deviceStatus = deviceStatus.copyWith(switch2: value);
+        break;
     }
-
-    Future<void> _onFactoryReset(
-      TwoGangGlassFactoryReset event,
-      Emitter<TwoGangGlassSwitchState> emit,
-    ) async {
-      emit(TwoGangGlassSwitchLoading());
-      try {
-        final response = await DevicesManagementApi().factoryReset(
-          event.factoryReset,
-          event.deviceId,
-        );
-        if (!response) {
-          emit(TwoGangGlassSwitchError('Failed to reset device'));
-        } else {
-          add(TwoGangGlassSwitchFetchDeviceEvent(event.deviceId));
-        }
-      } catch (e) {
-        emit(TwoGangGlassSwitchError(e.toString()));
-      }
-    }
-
-    void _onStatusUpdated(
-      StatusUpdated event,
-      Emitter<TwoGangGlassSwitchState> emit,
-    ) {
-      deviceStatus = event.deviceStatus;
-      emit(TwoGangGlassSwitchStatusLoaded(deviceStatus));
-    }
-
-    void _updateLocalValue(String code, bool value) {
-      switch (code) {
-        case 'switch_1':
-          deviceStatus = deviceStatus.copyWith(switch1: value);
-          break;
-        case 'switch_2':
-          deviceStatus = deviceStatus.copyWith(switch2: value);
-          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,10 +18,9 @@ class ScheduleDialogHelper {
     ScheduleEntry? schedule,
     bool isEdit = false,
     String? code,
-    required String deviceType,
   }) {
     bool temp;
-    if (deviceType == 'CUR_2') {
+    if (schedule?.category == 'CUR_2') {
       temp = schedule!.function.value == 'open' ? true : false;
     } else {
       temp = schedule!.function.value;
@@ -104,7 +103,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);
                   }),
                 ],
@@ -120,29 +120,32 @@ class ScheduleDialogHelper {
                   ),
                 ),
                 SizedBox(
-                    width: 100,
-                    child: ElevatedButton(
-                      onPressed: () {
-                        dynamic temp;
-                        if (deviceType == 'CUR_2') {
-                          temp = functionOn! ? 'open' : 'close';
-                        } else {
-                          temp = functionOn;
-                        }
-                        final entry = ScheduleEntry(
-                          category: schedule?.category ?? 'switch_1',
-                          time: _formatTimeOfDayToISO(selectedTime),
-                          function: Status(
-                            code: code ?? 'switch_1',
-                            value: temp,
-                          ),
-                          days: _convertSelectedDaysToStrings(selectedDays),
-                          scheduleId: schedule.scheduleId,
-                        );
-                        Navigator.pop(ctx, entry);
-                      },
-                      child: const Text('Save'),
-                    )),
+                  width: 100,
+                  child: ElevatedButton(
+                    onPressed: () {
+                      dynamic temp;
+                      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,
+                      );
+                      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/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart

@@ -455,7 +455,7 @@ class UsersBloc extends Bloc<UsersEvent, UsersState> {
   Future<void> checkEmail(
       CheckEmailEvent event, Emitter<UsersState> emit) async {
     emit(UsersLoadingState());
-    String? res = await UserPermissionApi().checkEmail(
+    String?  res = await UserPermissionApi().checkEmail(
       emailController.text,
     );
     checkEmailValid = res!;

lib/pages/roles_and_permission/users_page/add_user_dialog/view/add_user_dialog.dart

@@ -34,7 +34,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
               return Dialog(
                   child: Container(
                 decoration: const BoxDecoration(
-                    color: Colors.white, borderRadius: BorderRadius.all(Radius.circular(20))),
+                    color: Colors.white,
+                    borderRadius: BorderRadius.all(Radius.circular(20))),
                 width: 900,
                 child: Column(
                   children: [
@@ -63,7 +64,8 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                                 children: [
                                   _buildStep1Indicator(1, "Basics", _blocRole),
                                   _buildStep2Indicator(2, "Spaces", _blocRole),
-                                  _buildStep3Indicator(3, "Role & Permissions", _blocRole),
+                                  _buildStep3Indicator(
+                                      3, "Role & Permissions", _blocRole),
                                 ],
                               ),
                             ),
@@ -105,18 +107,32 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                           ),
                           InkWell(
                             onTap: () {
+                              final isBasicsStep = currentStep == 1;
+
+                              if (isBasicsStep) {
+                                // Validate the form first
+                                final isValid = _blocRole.formKey.currentState
+                                        ?.validate() ??
+                                    false;
+
+                                if (!isValid)
+                                  return; // Stop if form is not valid
+                              }
                               _blocRole.add(const CheckEmailEvent());
 
                               setState(() {
                                 if (currentStep < 3) {
                                   currentStep++;
                                   if (currentStep == 2) {
-                                    _blocRole.add(const CheckStepStatus(isEditUser: false));
+                                    _blocRole.add(const CheckStepStatus(
+                                        isEditUser: false));
                                   } else if (currentStep == 3) {
-                                    _blocRole.add(const CheckSpacesStepStatus());
+                                    _blocRole
+                                        .add(const CheckSpacesStepStatus());
                                   }
                                 } else {
-                                  _blocRole.add(SendInviteUsers(context: context));
+                                  _blocRole
+                                      .add(SendInviteUsers(context: context));
                                 }
                               });
                             },
@@ -124,8 +140,11 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                               currentStep < 3 ? "Next" : "Save",
                               style: TextStyle(
                                   color: (_blocRole.isCompleteSpaces == false ||
-                                              _blocRole.isCompleteBasics == false ||
-                                              _blocRole.isCompleteRolePermissions == false) &&
+                                              _blocRole.isCompleteBasics ==
+                                                  false ||
+                                              _blocRole
+                                                      .isCompleteRolePermissions ==
+                                                  false) &&
                                           currentStep == 3
                                       ? ColorsManager.grayColor
                                       : ColorsManager.secondaryColor),
@@ -143,7 +162,7 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
   Widget _getFormContent() {
     switch (currentStep) {
       case 1:
-        return const BasicsView(
+        return BasicsView(
           userId: '',
         );
       case 2:
@@ -196,8 +215,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: currentStep == step
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -260,8 +283,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: currentStep == step
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],
@@ -318,8 +345,12 @@ class _AddNewUserDialogState extends State<AddNewUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: currentStep == step
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight: currentStep == step
+                        ? FontWeight.bold
+                        : FontWeight.normal,
                   ),
                 ),
               ],

lib/pages/roles_and_permission/users_page/add_user_dialog/view/basics_view.dart

@@ -1,9 +1,12 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:intl_phone_field/countries.dart';
 import 'package:intl_phone_field/country_picker_dialog.dart';
 import 'package:intl_phone_field/intl_phone_field.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_bloc.dart';
+import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_event.dart';
 import 'package:syncrow_web/pages/roles_and_permission/users_page/add_user_dialog/bloc/users_status.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -11,7 +14,9 @@ import 'package:syncrow_web/utils/style.dart';
 
 class BasicsView extends StatelessWidget {
   final String? userId;
-  const BasicsView({super.key, this.userId = ''});
+  Timer? _debounce;
+
+  BasicsView({super.key, this.userId = ''});
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<UsersBloc, UsersState>(builder: (context, state) {
@@ -21,6 +26,7 @@ class BasicsView extends StatelessWidget {
       }
       return Form(
         key: _blocRole.formKey,
+        autovalidateMode: AutovalidateMode.onUserInteraction,
         child: ListView(
           shrinkWrap: true,
           children: [
@@ -208,6 +214,14 @@ class BasicsView extends StatelessWidget {
                           fontSize: 12,
                           color: ColorsManager.textGray),
                     ),
+
+                    onChanged: (value) {
+                      if (_debounce?.isActive ?? false) _debounce!.cancel();
+                      _debounce = Timer(const Duration(milliseconds: 800), () {
+                        _blocRole.add(const CheckEmailEvent());
+                      });
+                    },
+
                     validator: (value) {
                       if (value == null || value.isEmpty) {
                         return 'Enter Email Address';