Fix device status display in Control modal to reflect actual status

… experience

<!--
  Thanks for contributing!

Provide a description of your changes below and a general summary in the
title

Please look at the following checklist to ensure that your PR can be
accepted quickly:
-->



## Description

<!--- Describe your changes in detail -->
Enhance navigation buttons in SmartPowerDeviceControl 

## Type of Change

<!--- Put an `x` in all the boxes that apply: -->

- [ ] ✨ New feature (non-breaking change which adds functionality)
- [x] 🛠️ Bug fix (non-breaking change which fixes an issue)
- [ ] ❌ Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] 🧹 Code refactor
- [ ] ✅ Build configuration change
- [ ] 📝 Documentation
- [ ] 🗑️ Chore

lib/pages/common/custom_table.dart

@@ -50,6 +50,9 @@ class _DynamicTableState extends State<DynamicTable> {
   bool _selectAll = false;
   final ScrollController _verticalScrollController = ScrollController();
   final ScrollController _horizontalScrollController = ScrollController();
+  static const double _fixedRowHeight = 60;
+  static const double _checkboxColumnWidth = 50;
+  static const double _settingsColumnWidth = 100;
 
   @override
   void initState() {
@@ -67,7 +70,6 @@ class _DynamicTableState extends State<DynamicTable> {
 
   bool _compareListOfLists(
       List<List<dynamic>> oldList, List<List<dynamic>> newList) {
-    // Check if the old and new lists are the same
     if (oldList.length != newList.length) return false;
 
     for (int i = 0; i < oldList.length; i++) {
@@ -104,73 +106,130 @@ class _DynamicTableState extends State<DynamicTable> {
     context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
   }
 
+  double get _totalTableWidth {
+    final hasSettings = widget.headers.contains('Settings');
+    final base = (widget.withCheckBox ? _checkboxColumnWidth : 0) +
+        (hasSettings ? _settingsColumnWidth : 0);
+    final regularCount = widget.headers.length - (hasSettings ? 1 : 0);
+    final regularWidth = (widget.size.width - base) / regularCount;
+    return base + regularCount * regularWidth;
+  }
+
   @override
   Widget build(BuildContext context) {
     return Container(
+      width: widget.size.width,
+      height: widget.size.height,
       decoration: widget.cellDecoration,
-      child: Scrollbar(
+      child: ScrollConfiguration(
-        controller: _verticalScrollController,
+        behavior: const ScrollBehavior().copyWith(scrollbars: false),
-        thumbVisibility: true,
-        trackVisibility: true,
         child: Scrollbar(
-          //fixed the horizontal scrollbar issue
           controller: _horizontalScrollController,
           thumbVisibility: true,
           trackVisibility: true,
-          notificationPredicate: (notif) => notif.depth == 1,
+          notificationPredicate: (notif) =>
+              notif.metrics.axis == Axis.horizontal,
           child: SingleChildScrollView(
-            controller: _verticalScrollController,
+            controller: _horizontalScrollController,
-            child: SingleChildScrollView(
+            scrollDirection: Axis.horizontal,
-              controller: _horizontalScrollController,
+            child: SizedBox(
-              scrollDirection: Axis.horizontal,
+              width: _totalTableWidth,
-              child: SizedBox(
+              child: Column(
-                width: widget.size.width,
+                children: [
-                child: Column(
+                  Container(
-                  children: [
+                    height: _fixedRowHeight,
-                    Container(
+                    decoration: widget.headerDecoration ??
-                      decoration: widget.headerDecoration ??
+                        const BoxDecoration(color: ColorsManager.boxColor),
-                          const BoxDecoration(
+                    child: Row(
-                            color: ColorsManager.boxColor,
+                      children: [
+                        if (widget.withCheckBox)
+                          _buildSelectAllCheckbox(_checkboxColumnWidth),
+                        for (var i = 0; i < widget.headers.length; i++)
+                          _buildTableHeaderCell(
+                            widget.headers[i],
+                            widget.headers[i] == 'Settings'
+                                ? _settingsColumnWidth
+                                : (_totalTableWidth -
+                                        (widget.withCheckBox
+                                            ? _checkboxColumnWidth
+                                            : 0) -
+                                        (widget.headers.contains('Settings')
+                                            ? _settingsColumnWidth
+                                            : 0)) /
+                                    (widget.headers.length -
+                                        (widget.headers.contains('Settings')
+                                            ? 1
+                                            : 0)),
                           ),
-                      child: Row(
+                      ],
-                        children: [
-                          if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                          ...List.generate(widget.headers.length, (index) {
-                            return _buildTableHeaderCell(
-                                widget.headers[index], index);
-                          })
-                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
-                        ],
-                      ),
                     ),
-                    SizedBox(
+                  ),
-                      width: widget.size.width,
+
-                      child: widget.isEmpty
+                  Expanded(
-                          ? _buildEmptyState()
+                    child: widget.isEmpty
-                          : Column(
+                        ? _buildEmptyState()
-                              children:
+                        : Scrollbar(
-                                  List.generate(widget.data.length, (rowIndex) {
+                            controller: _verticalScrollController,
+                            thumbVisibility: true,
+                            trackVisibility: true,
+                            notificationPredicate: (notif) =>
+                                notif.metrics.axis == Axis.vertical,
+                            child: ListView.builder(
+                              controller: _verticalScrollController,
+                              itemCount: widget.data.length,
+                              itemBuilder: (_, rowIndex) {
                                 final row = widget.data[rowIndex];
-                                return Row(
+                                return SizedBox(
-                                  children: [
+                                  height: _fixedRowHeight,
-                                    if (widget.withCheckBox)
+                                  child: Row(
-                                      _buildRowCheckbox(
+                                    children: [
-                                          rowIndex, widget.size.height * 0.08),
+                                      if (widget.withCheckBox)
-                                    ...row.asMap().entries.map((entry) {
+                                        _buildRowCheckbox(
-                                      return _buildTableCell(
+                                          rowIndex,
-                                        entry.value.toString(),
+                                          _checkboxColumnWidth,
-                                        widget.size.height * 0.08,
+                                        ),
-                                        rowIndex: rowIndex,
+                                      for (var colIndex = 0;
-                                        columnIndex: entry.key,
+                                          colIndex < row.length;
-                                      );
+                                          colIndex++)
-                                    }).toList(),
+                                        widget.headers[colIndex] == 'Settings'
-                                  ],
+                                            ? buildSettingsIcon(
+                                                width: _settingsColumnWidth,
+                                                onTap: () => widget
+                                                    .onSettingsPressed
+                                                    ?.call(rowIndex),
+                                              )
+                                            : _buildTableCell(
+                                                row[colIndex].toString(),
+                                                width: widget.headers[
+                                                            colIndex] ==
+                                                        'Settings'
+                                                    ? _settingsColumnWidth
+                                                    : (_totalTableWidth -
+                                                            (widget.withCheckBox
+                                                                ? _checkboxColumnWidth
+                                                                : 0) -
+                                                            (widget.headers
+                                                                    .contains(
+                                                                        'Settings')
+                                                                ? _settingsColumnWidth
+                                                                : 0)) /
+                                                        (widget.headers.length -
+                                                            (widget.headers
+                                                                    .contains(
+                                                                        'Settings')
+                                                                ? 1
+                                                                : 0)),
+                                                rowIndex: rowIndex,
+                                                columnIndex: colIndex,
+                                              ),
+                                    ],
+                                  ),
                                 );
-                              }),
+                              },
                             ),
-                    ),
+                          ),
-                  ],
+                  ),
-                ),
+                ],
               ),
             ),
           ),
@@ -210,9 +269,10 @@ class _DynamicTableState extends State<DynamicTable> {
           ],
         ),
       );
-  Widget _buildSelectAllCheckbox() {
+
+  Widget _buildSelectAllCheckbox(double width) {
     return Container(
-      width: 50,
+      width: width,
       decoration: const BoxDecoration(
         border: Border.symmetric(
           vertical: BorderSide(color: ColorsManager.boxDivider),
@@ -227,11 +287,11 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildRowCheckbox(int index, double size) {
+  Widget _buildRowCheckbox(int index, double width) {
     return Container(
-      width: 50,
+      width: width,
       padding: const EdgeInsets.all(8.0),
-      height: size,
+      height: _fixedRowHeight,
       decoration: const BoxDecoration(
         border: Border(
           bottom: BorderSide(
@@ -253,50 +313,47 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableHeaderCell(String title, int index) {
+  Widget _buildTableHeaderCell(String title, double width) {
-    return Expanded(
+    return Container(
-      child: Container(
+      width: width,
-        decoration: const BoxDecoration(
+      decoration: const BoxDecoration(
-          border: Border.symmetric(
+        border: Border.symmetric(
-            vertical: BorderSide(color: ColorsManager.boxDivider),
+          vertical: BorderSide(color: ColorsManager.boxDivider),
-          ),
         ),
-        constraints: const BoxConstraints.expand(height: 40),
+      ),
-        alignment: Alignment.centerLeft,
+      constraints: BoxConstraints(minHeight: 40, maxHeight: _fixedRowHeight),
-        child: Padding(
+      alignment: Alignment.centerLeft,
-          padding: EdgeInsets.symmetric(
+      child: Padding(
-              horizontal: index == widget.headers.length - 1 ? 12 : 8.0,
+        padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
-              vertical: 4),
+        child: Text(
-          child: Text(
+          title,
-            title,
+          style: context.textTheme.titleSmall!.copyWith(
-            style: context.textTheme.titleSmall!.copyWith(
+            color: ColorsManager.grayColor,
-              color: ColorsManager.grayColor,
+            fontSize: 12,
-              fontSize: 12,
+            fontWeight: FontWeight.w400,
-              fontWeight: FontWeight.w400,
-            ),
-            maxLines: 2,
           ),
+          maxLines: 2,
+          overflow: TextOverflow.ellipsis,
         ),
       ),
     );
   }
 
-  Widget _buildTableCell(String content, double size,
+  Widget _buildTableCell(String content,
-      {required int rowIndex, required int columnIndex}) {
+      {required double width,
+      required int rowIndex,
+      required int columnIndex}) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
     if (isBatteryLevel) {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
+
     bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
     if (isSettingsColumn) {
       return buildSettingsIcon(
-        width: 120,
+          width: width, onTap: () => widget.onSettingsPressed?.call(rowIndex));
-        height: 60,
-        iconSize: 40,
-        onTap: () => widget.onSettingsPressed?.call(rowIndex),
-      );
     }
 
     Color? statusColor;
@@ -320,92 +377,82 @@ class _DynamicTableState extends State<DynamicTable> {
         statusColor = Colors.black;
     }
 
-    return Expanded(
+    return Container(
-      child: Container(
+      width: width,
-        height: size,
+      height: _fixedRowHeight,
-        padding: const EdgeInsets.all(5.0),
+      padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4),
-        decoration: const BoxDecoration(
+      decoration: const BoxDecoration(
-          border: Border(
+        border: Border(
-            bottom: BorderSide(
+          bottom: BorderSide(
-              color: ColorsManager.boxDivider,
+            color: ColorsManager.boxDivider,
-              width: 1.0,
+            width: 1.0,
-            ),
           ),
-          color: Colors.white,
         ),
-        alignment: Alignment.centerLeft,
+        color: Colors.white,
-        child: Text(
+      ),
-          content,
+      alignment: Alignment.centerLeft,
-          style: TextStyle(
+      child: Text(
-              color: (batteryLevel != null && batteryLevel < 20)
+        content,
-                  ? ColorsManager.red
+        style: TextStyle(
-                  : (batteryLevel != null && batteryLevel > 20)
+          color: (batteryLevel != null && batteryLevel < 20)
-                      ? ColorsManager.green
+              ? ColorsManager.red
-                      : statusColor,
+              : (batteryLevel != null && batteryLevel > 20)
-              fontSize: 13,
+                  ? ColorsManager.green
-              fontWeight: FontWeight.w400),
+                  : statusColor,
-          maxLines: 2,
+          fontSize: 13,
+          fontWeight: FontWeight.w400,
         ),
+        maxLines: 2,
+        overflow: TextOverflow.ellipsis,
       ),
     );
   }
 
-  Widget buildSettingsIcon(
+  Widget buildSettingsIcon({required double width, VoidCallback? onTap}) {
-      {double width = 120,
+    return Container(
-      double height = 60,
+      width: width,
-      double iconSize = 40,
+      height: _fixedRowHeight,
-      VoidCallback? onTap}) {
+      padding: const EdgeInsets.only(left: 15, top: 10, bottom: 10),
-    return Column(
+      decoration: const BoxDecoration(
-      children: [
+        color: ColorsManager.whiteColors,
-        Container(
+        border: Border(
-          padding: const EdgeInsets.only(top: 10, bottom: 15, left: 10),
+          bottom: BorderSide(
-          margin: const EdgeInsets.only(right: 15),
+            color: ColorsManager.boxDivider,
-          decoration: const BoxDecoration(
+            width: 1.0,
-            color: ColorsManager.whiteColors,
-            border: Border(
-              bottom: BorderSide(
-                color: ColorsManager.boxDivider,
-                width: 1.0,
-              ),
-            ),
           ),
-          width: width,
+        ),
-          child: Padding(
+      ),
-            padding: const EdgeInsets.only(
+      child: Align(
-              right: 16.0,
+        alignment: Alignment.centerLeft,
-              left: 17.0,
+        child: Container(
-            ),
+          width: 50,
-            child: Container(
+          decoration: BoxDecoration(
-              width: 50,
+            color: const Color(0xFFF7F8FA),
-              decoration: BoxDecoration(
+            borderRadius: BorderRadius.circular(20),
-                color: const Color(0xFFF7F8FA),
+            boxShadow: [
-                borderRadius: BorderRadius.circular(height / 2),
+              BoxShadow(
-                boxShadow: [
+                color: Colors.black.withOpacity(0.17),
-                  BoxShadow(
+                blurRadius: 14,
-                    color: Colors.black.withOpacity(0.17),
+                offset: const Offset(0, 4),
-                    blurRadius: 14,
-                    offset: const Offset(0, 4),
-                  ),
-                ],
               ),
-              child: InkWell(
+            ],
-                onTap: onTap,
+          ),
-                child: Padding(
+          child: InkWell(
-                  padding: const EdgeInsets.all(8.0),
+            onTap: onTap,
-                  child: Center(
+            child: Padding(
-                    child: SvgPicture.asset(
+              padding: EdgeInsets.all(8.0),
-                      Assets.settings,
+              child: Center(
-                      width: 40,
+                child: SvgPicture.asset(
-                      height: 22,
+                  Assets.settings,
-                      color: ColorsManager.primaryColor,
+                  width: 40,
-                    ),
+                  height: 20,
-                  ),
+                  color: ColorsManager.primaryColor,
                 ),
               ),
             ),
           ),
         ),
-      ],
+      ),
     );
   }
 }

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

@@ -83,6 +83,12 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
       emit(currentState.copyWith(
         scheduleMode: event.scheduleMode,
         countdownRemaining: Duration.zero,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        isCountdownActive: false,
+        isInchingActive: false,
       ));
     }
   }
@@ -94,6 +100,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
     if (state is ScheduleLoaded) {
       final currentState = state as ScheduleLoaded;
       emit(currentState.copyWith(
+        countdownSeconds: event.seconds,
         countdownHours: event.hours,
         countdownMinutes: event.minutes,
         inchingHours: 0,
@@ -113,6 +120,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
         inchingHours: event.hours,
         inchingMinutes: event.minutes,
         countdownRemaining: Duration.zero,
+        inchingSeconds: 0, // Add this
       ));
     }
   }
@@ -424,6 +432,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
               countdownMinutes: countdownDuration.inMinutes % 60,
               countdownRemaining: countdownDuration,
               isCountdownActive: true,
+              countdownSeconds: countdownDuration.inSeconds,
             ),
           );
 
@@ -437,6 +446,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
                 countdownMinutes: 0,
                 countdownRemaining: Duration.zero,
                 isCountdownActive: false,
+                countdownSeconds: 0,
               ),
             );
           }
@@ -448,6 +458,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
               inchingMinutes: inchingDuration.inMinutes % 60,
               isInchingActive: true,
               countdownRemaining: inchingDuration,
+              countdownSeconds: inchingDuration.inSeconds,
             ),
           );
         }
@@ -574,8 +585,7 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
   }
 
   String extractTime(String isoDateTime) {
-    // Example input: "2025-06-19T15:45:00.000"
+    return isoDateTime.split('T')[1].split('.')[0];
-    return isoDateTime.split('T')[1].split('.')[0]; // gives "15:45:00"
   }
 
   int? getTimeStampWithoutSeconds(DateTime? dateTime) {

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

@@ -146,14 +146,16 @@ class UpdateScheduleModeEvent extends ScheduleEvent {
 class UpdateCountdownTimeEvent extends ScheduleEvent {
   final int hours;
   final int minutes;
+  final int seconds;
 
   const UpdateCountdownTimeEvent({
     required this.hours,
     required this.minutes,
+    required this.seconds,
   });
 
   @override
-  List<Object> get props => [hours, minutes];
+  List<Object> get props => [hours, minutes, seconds];
 }
 
 class UpdateInchingTimeEvent extends ScheduleEvent {

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

@@ -26,11 +26,15 @@ class ScheduleLoaded extends ScheduleState {
   final bool isCountdownActive;
   final int inchingHours;
   final int inchingMinutes;
+  final int inchingSeconds;
   final bool isInchingActive;
   final ScheduleModes scheduleMode;
   final Duration? countdownRemaining;
+  final int? countdownSeconds;
 
   const ScheduleLoaded({
+    this.countdownSeconds = 0,
+    this.inchingSeconds = 0,
     required this.schedules,
     this.selectedTime,
     required this.selectedDays,
@@ -61,6 +65,9 @@ class ScheduleLoaded extends ScheduleState {
     bool? isInchingActive,
     ScheduleModes? scheduleMode,
     Duration? countdownRemaining,
+    String? deviceId,
+    int? countdownSeconds,
+    int? inchingSeconds,
   }) {
     return ScheduleLoaded(
       schedules: schedules ?? this.schedules,
@@ -68,7 +75,7 @@ class ScheduleLoaded extends ScheduleState {
       selectedDays: selectedDays ?? this.selectedDays,
       functionOn: functionOn ?? this.functionOn,
       isEditing: isEditing ?? this.isEditing,
-      deviceId: deviceId,
+      deviceId: deviceId ?? this.deviceId,
       countdownHours: countdownHours ?? this.countdownHours,
       countdownMinutes: countdownMinutes ?? this.countdownMinutes,
       isCountdownActive: isCountdownActive ?? this.isCountdownActive,
@@ -77,6 +84,8 @@ class ScheduleLoaded extends ScheduleState {
       isInchingActive: isInchingActive ?? this.isInchingActive,
       scheduleMode: scheduleMode ?? this.scheduleMode,
       countdownRemaining: countdownRemaining ?? this.countdownRemaining,
+      countdownSeconds: countdownSeconds ?? this.countdownSeconds,
+      inchingSeconds: inchingSeconds ?? this.inchingSeconds,
     );
   }
 
@@ -96,6 +105,8 @@ class ScheduleLoaded extends ScheduleState {
         isInchingActive,
         scheduleMode,
         countdownRemaining,
+        countdownSeconds,
+        inchingSeconds,
       ];
 }
 

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

@@ -6,7 +6,8 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CountdownInchingView extends StatefulWidget {
-  const CountdownInchingView({super.key});
+  final String deviceId;
+  const CountdownInchingView({super.key, required this.deviceId});
 
   @override
   State<CountdownInchingView> createState() => _CountdownInchingViewState();
@@ -15,25 +16,30 @@ class CountdownInchingView extends StatefulWidget {
 class _CountdownInchingViewState extends State<CountdownInchingView> {
   late FixedExtentScrollController _hoursController;
   late FixedExtentScrollController _minutesController;
+  late FixedExtentScrollController _secondsController;
 
   int _lastHours = -1;
   int _lastMinutes = -1;
+  int _lastSeconds = -1;
 
   @override
   void initState() {
     super.initState();
     _hoursController = FixedExtentScrollController();
     _minutesController = FixedExtentScrollController();
+    _secondsController = FixedExtentScrollController();
   }
 
   @override
   void dispose() {
     _hoursController.dispose();
     _minutesController.dispose();
+    _secondsController.dispose();
     super.dispose();
   }
 
-  void _updateControllers(int displayHours, int displayMinutes) {
+  void _updateControllers(
+      int displayHours, int displayMinutes, int displaySeconds) {
     if (_lastHours != displayHours) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
         if (_hoursController.hasClients) {
@@ -50,6 +56,15 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
       });
       _lastMinutes = displayMinutes;
     }
+    // Update seconds controller
+    if (_lastSeconds != displaySeconds) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (_secondsController.hasClients) {
+          _secondsController.jumpToItem(displaySeconds);
+        }
+      });
+      _lastSeconds = displaySeconds;
+    }
   }
 
   @override
@@ -57,7 +72,6 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
     return BlocBuilder<ScheduleBloc, ScheduleState>(
       builder: (context, state) {
         if (state is! ScheduleLoaded) return const SizedBox.shrink();
-
         final isCountDown = state.scheduleMode == ScheduleModes.countdown;
         final isActive =
             isCountDown ? state.isCountdownActive : state.isInchingActive;
@@ -67,8 +81,21 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
         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);
+
+        _updateControllers(displayHours, displayMinutes, displaySeconds!);
+
+        if (displayHours == 0 && displayMinutes == 0 && displaySeconds == 0) {
+          context.read<ScheduleBloc>().add(
+                StopScheduleEvent(
+                  mode: ScheduleModes.countdown,
+                  deviceId: widget.deviceId,
+                ),
+              );
+        }
 
-        _updateControllers(displayHours, displayMinutes);
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -100,7 +127,10 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
                   (value) {
                     if (!isActive) {
                       context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: value, minutes: displayMinutes));
+                            hours: value,
+                            minutes: displayMinutes,
+                            seconds: displaySeconds,
+                          ));
                     }
                   },
                   isActive: isActive,
@@ -115,11 +145,35 @@ class _CountdownInchingViewState extends State<CountdownInchingView> {
                   (value) {
                     if (!isActive) {
                       context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: displayHours, minutes: value));
+                            hours: displayHours,
+                            minutes: value,
+                            seconds: displaySeconds,
+                          ));
                     }
                   },
                   isActive: isActive,
                 ),
+                const SizedBox(width: 10),
+                if (isActive)
+                  _buildPickerColumn(
+                    context,
+                    's',
+                    displaySeconds,
+                    60,
+                    _secondsController,
+                    (value) {
+                      if (!isActive) {
+                        context
+                            .read<ScheduleBloc>()
+                            .add(UpdateCountdownTimeEvent(
+                              hours: displayHours,
+                              minutes: displayMinutes,
+                              seconds: value,
+                            ));
+                      }
+                    },
+                    isActive: isActive,
+                  ),
               ],
             ),
           ],

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

@@ -74,7 +74,9 @@ class BuildScheduleView extends StatelessWidget {
                           ),
                         if (state.scheduleMode == ScheduleModes.countdown ||
                             state.scheduleMode == ScheduleModes.inching)
-                          const CountdownInchingView(),
+                           CountdownInchingView(
+                            deviceId: deviceUuid,
+                          ),
                         const SizedBox(height: 20),
                         if (state.scheduleMode == ScheduleModes.countdown)
                           CountdownModeButtons(

lib/pages/device_managment/shared/device_control_dialog.dart

@@ -79,6 +79,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
   }
 
   Widget _buildDeviceInfoSection() {
+    final isOnlineDevice = device.online != null && device.online!;
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 25, horizontal: 50),
       child: Table(
@@ -107,7 +108,7 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
                 'Installation Date and Time:',
                 formatDateTime(
                   DateTime.fromMillisecondsSinceEpoch(
-                    ((device.createTime ?? 0) * 1000),
+                    (device.createTime ?? 0) * 1000,
                   ),
                 ),
               ),
@@ -126,12 +127,16 @@ class DeviceControlDialog extends StatelessWidget with RouteControlsBasedCode {
           ),
           TableRow(
             children: [
-              _buildInfoRow('Status:', 'Online', statusColor: Colors.green),
+              _buildInfoRow(
+                'Status:',
+                isOnlineDevice ? 'Online' : 'offline',
+                statusColor: isOnlineDevice ? Colors.green : Colors.red,
+              ),
               _buildInfoRow(
                 'Last Offline Date and Time:',
                 formatDateTime(
                   DateTime.fromMillisecondsSinceEpoch(
-                    ((device.updateTime ?? 0) * 1000),
+                    (device.updateTime ?? 0) * 1000,
                   ),
                 ),
               ),

lib/pages/visitor_password/view/visitor_password_dialog.dart

@@ -102,7 +102,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                       ],
                     ))
                 .then((v) {
-              Navigator.of(context).pop(true);
+              Navigator.of(context).pop(v);
             });
           } else if (state is FailedState) {
             visitorBloc.stateDialog(
@@ -476,7 +476,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                   child: DefaultButton(
                     borderRadius: 8,
                     onPressed: () {
-                      Navigator.of(context).pop(true);
+                      Navigator.of(context).pop(null);
                     },
                     backgroundColor: Colors.white,
                     child: Text(
@@ -651,7 +651,7 @@ class VisitorPasswordDialog extends StatelessWidget {
                     child: DefaultButton(
                       borderRadius: 8,
                       onPressed: () {
-                        Navigator.of(context).pop();
+                        Navigator.of(context).pop(null);
                       },
                       backgroundColor: Colors.white,
                       child: Text(