Fix device status display in Control modal to reflect actual status (#337)

<!--
  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 -->
table enhancement

## 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/ac/view/ac_device_batch_control.dart

@@ -15,7 +15,8 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayout {
+class AcDeviceBatchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   const AcDeviceBatchControlView({super.key, required this.devicesIds});
 
   final List<String> devicesIds;
@@ -51,7 +52,7 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo
                   deviceId: devicesIds.first,
                   code: 'switch',
                   value: state.status.acSwitch,
-                  label: 'ThermoState',
+                  label: 'Thermostat',
                   icon: Assets.ac,
                   onChange: (value) {
                     context.read<AcBloc>().add(AcBatchControlEvent(
@@ -100,8 +101,8 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo
                       ),
                       Text(
                         'h',
-                        style:
+                        style: context.textTheme.bodySmall!
-                            context.textTheme.bodySmall!.copyWith(color: ColorsManager.blackColor),
+                            .copyWith(color: ColorsManager.blackColor),
                       ),
                       Text(
                         '30',
@@ -148,7 +149,8 @@ class AcDeviceBatchControlView extends StatelessWidget with HelperResponsiveLayo
                   callFactoryReset: () {
                     context.read<AcBloc>().add(AcFactoryResetEvent(
                           deviceId: state.status.uuid,
-                          factoryResetModel: FactoryResetModel(devicesUuid: devicesIds),
+                          factoryResetModel:
+                              FactoryResetModel(devicesUuid: devicesIds),
                         ));
                   },
                 ),

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

@@ -68,6 +68,7 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
           children: [
             Expanded(child: SpaceTreeView(
               onSelect: () {
+                context.read<DeviceManagementBloc>().add(ResetFilters());
                 context.read<DeviceManagementBloc>().add(FetchDevices(context));
               },
             )),

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

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

lib/pages/device_managment/power_clamp/view/smart_power_device_control.dart

@@ -277,6 +277,32 @@ class SmartPowerDeviceControl extends StatelessWidget
                           totalConsumption: 10000,
                           date: blocProvider.formattedDate,
                         ),
+                        EnergyConsumptionPage(
+                          formattedDate:
+                              '${blocProvider.dateTime!.day}/${blocProvider.dateTime!.month}/${blocProvider.dateTime!.year} ${blocProvider.endChartDate}',
+                          onTap: () {
+                            blocProvider.add(SelectDateEvent(context: context));
+                          },
+                          widget: blocProvider.dateSwitcher(),
+                          chartData: blocProvider.energyDataList.isNotEmpty
+                              ? blocProvider.energyDataList
+                              : [
+                                  EnergyData('12:00 AM', 4.0),
+                                  EnergyData('01:00 AM', 6.5),
+                                  EnergyData('02:00 AM', 3.8),
+                                  EnergyData('03:00 AM', 3.2),
+                                  EnergyData('04:00 AM', 6.0),
+                                  EnergyData('05:00 AM', 3.4),
+                                  EnergyData('06:00 AM', 5.2),
+                                  EnergyData('07:00 AM', 3.5),
+                                  EnergyData('08:00 AM', 6.8),
+                                  EnergyData('09:00 AM', 5.6),
+                                  EnergyData('10:00 AM', 3.9),
+                                  EnergyData('11:00 AM', 4.0),
+                                ],
+                          totalConsumption: 10000,
+                          date: blocProvider.formattedDate,
+                        ),
                       ],
                     ),
                   ),

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

@@ -232,7 +232,6 @@ class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
           selectedDays: List.filled(7, false),
           functionOn: false,
           isEditing: false,
-          countdownRemaining: Duration.zero,
         ));
       } else {
         emit(ScheduleLoaded(

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -32,113 +32,114 @@ class SpaceDropdown extends StatelessWidget {
                   color: ColorsManager.blackColor,
                 ),
           ),
-          SizedBox(
+          DropdownButton2<String>(
-            child: Container(
+            underline: const SizedBox(),
+            buttonStyleData: ButtonStyleData(
+              decoration:
+                  BoxDecoration(borderRadius: BorderRadius.circular(12)),
+            ),
+            value: selectedValue,
+            items: spaces.map((space) {
+              return DropdownMenuItem<String>(
+                value: space.uuid,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Text(
+                      '   ${space.name}',
+                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            fontSize: 16,
+                            fontWeight: FontWeight.bold,
+                            color: selectedValue == space.uuid
+                                ? ColorsManager.dialogBlueTitle
+                                : ColorsManager.blackColor,
+                          ),
+                    ),
+                    Text(
+                      '   ${space.lastThreeParents}',
+                      style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                            fontSize: 12,
+                            color: selectedValue == space.uuid
+                                ? ColorsManager.dialogBlueTitle
+                                : ColorsManager.blackColor,
+                          ),
+                    ),
+                  ],
+                ),
+              );
+            }).toList(),
+            onChanged: onChanged,
+            style: TextStyle(
+              color: Colors.black,
+              fontSize: 13,
+            ),
+            hint: Padding(
+              padding: const EdgeInsets.only(left: 10),
+              child: Text(
+                hintMessage,
+                style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                      color: ColorsManager.textGray,
+                    ),
+              ),
+            ),
+            customButton: Container(
               height: 40,
+              decoration: BoxDecoration(
+                border: Border.all(color: ColorsManager.textGray, width: 1.0),
+                borderRadius: BorderRadius.circular(10),
+              ),
+              child: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  Expanded(
+                    flex: 8,
+                    child: Padding(
+                      padding: const EdgeInsets.only(left: 10),
+                      child: Text(
+                        selectedValue != null
+                            ? spaces
+                                .firstWhere((e) => e.uuid == selectedValue)
+                                .name
+                            : hintMessage,
+                        style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                              fontSize: 13,
+                              color: selectedValue != null
+                                  ? Colors.black
+                                  : ColorsManager.textGray,
+                            ),
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                  ),
+                  Expanded(
+                    child: Container(
+                      decoration: BoxDecoration(
+                        color: Colors.grey[200],
+                        borderRadius: const BorderRadius.only(
+                          topRight: Radius.circular(10),
+                          bottomRight: Radius.circular(10),
+                        ),
+                      ),
+                      height: 45,
+                      child: const Icon(
+                        Icons.keyboard_arrow_down,
+                        color: ColorsManager.textGray,
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            ),
+            dropdownStyleData: DropdownStyleData(
+              maxHeight: MediaQuery.of(context).size.height * 0.4,
               decoration: BoxDecoration(
                 color: ColorsManager.whiteColors,
                 borderRadius: BorderRadius.circular(10),
               ),
-              child: DropdownButton2<String>(
+            ),
-                underline: const SizedBox(),
+            menuItemStyleData: const MenuItemStyleData(
-                value: selectedValue,
+              height: 60,
-                items: spaces.map((space) {
-                  return DropdownMenuItem<String>(
-                    value: space.uuid,
-                    child: Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.center,
-                      children: [
-                        Text(
-                          '   ${space.name}',
-                          style:
-                              Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                    fontSize: 12,
-                                    color: ColorsManager.blackColor,
-                                  ),
-                        ),
-                        Text(
-                          '   ${space.lastThreeParents}',
-                          style:
-                              Theme.of(context).textTheme.bodyMedium!.copyWith(
-                                    fontSize: 12,
-                                  ),
-                        ),
-                      ],
-                    ),
-                  );
-                }).toList(),
-                onChanged: onChanged,
-                style: TextStyle(color: Colors.black),
-                hint: Padding(
-                  padding: const EdgeInsets.only(left: 10),
-                  child: Text(
-                    hintMessage,
-                    style: Theme.of(context).textTheme.bodySmall!.copyWith(
-                          color: ColorsManager.textGray,
-                        ),
-                  ),
-                ),
-                customButton: Container(
-                  height: 45,
-                  decoration: BoxDecoration(
-                    border:
-                        Border.all(color: ColorsManager.textGray, width: 1.0),
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Expanded(
-                        flex: 8,
-                        child: Padding(
-                          padding: const EdgeInsets.only(left: 10),
-                          child: Text(
-                            selectedValue != null
-                                ? spaces
-                                    .firstWhere((e) => e.uuid == selectedValue)
-                                    .name
-                                : hintMessage,
-                            style:
-                                Theme.of(context).textTheme.bodySmall!.copyWith(
-                                      color: selectedValue != null
-                                          ? Colors.black
-                                          : ColorsManager.textGray,
-                                    ),
-                            overflow: TextOverflow.ellipsis,
-                          ),
-                        ),
-                      ),
-                      Expanded(
-                        child: Container(
-                          decoration: BoxDecoration(
-                            color: Colors.grey[200],
-                            borderRadius: const BorderRadius.only(
-                              topRight: Radius.circular(10),
-                              bottomRight: Radius.circular(10),
-                            ),
-                          ),
-                          height: 45,
-                          child: const Icon(
-                            Icons.keyboard_arrow_down,
-                            color: ColorsManager.textGray,
-                          ),
-                        ),
-                      ),
-                    ],
-                  ),
-                ),
-                dropdownStyleData: DropdownStyleData(
-                  maxHeight: MediaQuery.of(context).size.height * 0.4,
-                  decoration: BoxDecoration(
-                    color: ColorsManager.whiteColors,
-                    borderRadius: BorderRadius.circular(10),
-                  ),
-                ),
-                menuItemStyleData: const MenuItemStyleData(
-                  height: 60,
-                ),
-              ),
             ),
           ),
         ],

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

@@ -121,7 +121,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                 child: SizedBox(
                                   width: 16,
                                   height: 16,
-                                  child: CircularProgressIndicator(strokeWidth: 2),
+                                  child:
+                                      CircularProgressIndicator(strokeWidth: 2),
                                 ),
                               ),
                             )
@@ -159,8 +160,9 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                       height: iconSize,
                                       width: iconSize,
                                       fit: BoxFit.contain,
-                                      errorBuilder: (context, error, stackTrace) =>
+                                      errorBuilder:
-                                          Image.asset(
+                                          (context, error, stackTrace) =>
+                                              Image.asset(
                                         Assets.logo,
                                         height: iconSize,
                                         width: iconSize,
@@ -203,7 +205,8 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                             maxLines: 1,
                             style: context.textTheme.bodySmall?.copyWith(
                               color: ColorsManager.blackColor,
-                              fontSize: widget.isSmallScreenSize(context) ? 10 : 12,
+                              fontSize:
+                                  widget.isSmallScreenSize(context) ? 10 : 12,
                             ),
                           ),
                           if (widget.spaceName != '')
@@ -222,8 +225,9 @@ class _RoutineViewCardState extends State<RoutineViewCard> {
                                   maxLines: 1,
                                   style: context.textTheme.bodySmall?.copyWith(
                                     color: ColorsManager.blackColor,
-                                    fontSize:
+                                    fontSize: widget.isSmallScreenSize(context)
-                                        widget.isSmallScreenSize(context) ? 10 : 12,
+                                        ? 10
+                                        : 12,
                                   ),
                                 ),
                               ],

lib/pages/visitor_password/bloc/visitor_password_bloc.dart

@@ -21,7 +21,6 @@ import 'package:syncrow_web/utils/snack_bar.dart';
 
 class VisitorPasswordBloc
     extends Bloc<VisitorPasswordEvent, VisitorPasswordState> {
-
   VisitorPasswordBloc() : super(VisitorPasswordInitial()) {
     on<SelectUsageFrequency>(selectUsageFrequency);
     on<FetchDevice>(_onFetchDevice);
@@ -87,6 +86,9 @@ class VisitorPasswordBloc
     SelectTimeVisitorPassword event,
     Emitter<VisitorPasswordState> emit,
   ) async {
+    // Ensure expirationTimeTimeStamp has a value
+    effectiveTimeTimeStamp ??= DateTime.now().millisecondsSinceEpoch ~/ 1000;
+
     final DateTime? picked = await showDatePicker(
       context: event.context,
       initialDate: DateTime.now(),
@@ -94,86 +96,124 @@ class VisitorPasswordBloc
       lastDate: DateTime.now().add(const Duration(days: 5095)),
     );
 
-    if (picked != null) {
+    if (picked == null) return;
-      final TimeOfDay? timePicked = await showTimePicker(
+
-        context: event.context,
+    final TimeOfDay? timePicked = await showTimePicker(
-        initialTime: TimeOfDay.now(),
+      context: event.context,
-        builder: (context, child) {
+      initialTime: TimeOfDay.now(),
-          return Theme(
+      builder: (context, child) {
-            data: ThemeData.light().copyWith(
+        return Theme(
-              colorScheme: const ColorScheme.light(
+          data: ThemeData.light().copyWith(
-                primary: ColorsManager.primaryColor,
+            colorScheme: const ColorScheme.light(
-                onSurface: Colors.black,
+              primary: ColorsManager.primaryColor,
-              ),
+              onSurface: Colors.black,
-              buttonTheme: const ButtonThemeData(
-                colorScheme: ColorScheme.light(
-                  primary: Colors.green,
-                ),
-              ),
             ),
-            child: child!,
+          ),
-          );
+          child: child!,
-        },
-      );
-
-      if (timePicked != null) {
-        final selectedDateTime = DateTime(
-          picked.year,
-          picked.month,
-          picked.day,
-          timePicked.hour,
-          timePicked.minute,
         );
+      },
+    );
 
-        final selectedTimestamp =
+    if (timePicked == null) return;
-            selectedDateTime.millisecondsSinceEpoch ~/ 1000;
 
-        if (event.isStart) {
+    final selectedDateTime = DateTime(
-          if (expirationTimeTimeStamp != null &&
+      picked.year,
-              selectedTimestamp > expirationTimeTimeStamp!) {
+      picked.month,
-            CustomSnackBar.displaySnackBar(
+      picked.day,
+      timePicked.hour,
+      timePicked.minute,
+    );
+    final selectedTimestamp = selectedDateTime.millisecondsSinceEpoch ~/ 1000;
+    final currentTimestamp = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+
+    if (event.isStart) {
+      // START TIME VALIDATION
+      if (expirationTimeTimeStamp != null &&
+          selectedTimestamp > expirationTimeTimeStamp!) {
+        await showDialog<void>(
+          context: event.context,
+          builder: (context) => AlertDialog(
+            title: const Text(
               'Effective Time cannot be later than Expiration Time.',
-            );
+            ),
-            return;
+            actionsAlignment: MainAxisAlignment.center,
-          }
+            content: FilledButton(
-          if(selectedTimestamp < DateTime.now().millisecondsSinceEpoch ~/ 1000) {
+              onPressed: () {
-            if(selectedTimestamp < DateTime.now().millisecondsSinceEpoch ~/ 1000) {
+                Navigator.of(event.context).pop();
-              await showDialog<void>(
+                add(SelectTimeVisitorPassword(
-                context: event.context,
+                  context: event.context,
-                builder: (context) => AlertDialog(
+                  isStart: true,
-                  title: const Text('Effective Time cannot be earlier than current time.'),
+                  isRepeat: false,
-                  actionsAlignment: MainAxisAlignment.center,
+                ));
-                  content: 
+              },
-                    FilledButton(
+              child: const Text('OK'),
-                      onPressed: () {
+            ),
-                        Navigator.of(event.context).pop();
+          ),
-                        add(SelectTimeVisitorPassword(context: event.context, isStart: true, isRepeat: false));
+        );
-                      },
+        return;
-                      child: const Text('OK'),
-                    ),
-                  
-                ),
-              );
-            }
-            return;
-          }
-          effectiveTimeTimeStamp = selectedTimestamp;
-          startTimeAccess = selectedDateTime.toString().split('.').first;
-        } else {
-          if (effectiveTimeTimeStamp != null &&
-              selectedTimestamp < effectiveTimeTimeStamp!) {
-            CustomSnackBar.displaySnackBar(
-              'Expiration Time cannot be earlier than Effective Time.',
-            );
-            return;
-          }
-          expirationTimeTimeStamp = selectedTimestamp;
-          endTimeAccess = selectedDateTime.toString().split('.').first;
-        }
-        emit(ChangeTimeState());
-        emit(VisitorPasswordInitial());
       }
+
+      if (selectedTimestamp < currentTimestamp) {
+        await showDialog<void>(
+          context: event.context,
+          builder: (context) => AlertDialog(
+            title: const Text(
+              'Effective Time cannot be earlier than current time.',
+            ),
+            actionsAlignment: MainAxisAlignment.center,
+            content: FilledButton(
+              onPressed: () {
+                Navigator.of(event.context).pop();
+                add(SelectTimeVisitorPassword(
+                  context: event.context,
+                  isStart: true,
+                  isRepeat: false,
+                ));
+              },
+              child: const Text('OK'),
+            ),
+          ),
+        );
+        return;
+      }
+
+      // Save effective time
+      effectiveTimeTimeStamp = selectedTimestamp;
+      startTimeAccess = selectedDateTime.toString().split('.').first;
+    } else {
+      // END TIME VALIDATION
+      if (effectiveTimeTimeStamp != null &&
+          selectedTimestamp < effectiveTimeTimeStamp!) {
+        await showDialog<void>(
+          context: event.context,
+          builder: (context) => AlertDialog(
+            title: const Text(
+              'Expiration Time cannot be earlier than Effective Time.',
+            ),
+            actionsAlignment: MainAxisAlignment.center,
+            content: FilledButton(
+              onPressed: () {
+                Navigator.of(event.context).pop();
+                add(SelectTimeVisitorPassword(
+                  context: event.context,
+                  isStart: false,
+                  isRepeat: false,
+                ));
+              },
+              child: const Text('OK'),
+            ),
+          ),
+        );
+        return;
+      }
+
+      // Save expiration time
+      expirationTimeTimeStamp = selectedTimestamp;
+      endTimeAccess = selectedDateTime.toString().split('.').first;
     }
+
+    emit(ChangeTimeState());
+    emit(VisitorPasswordInitial());
   }
 
   bool toggleRepeat(
@@ -213,7 +253,7 @@ class VisitorPasswordBloc
       FetchDevice event, Emitter<VisitorPasswordState> emit) async {
     try {
       emit(DeviceLoaded());
-         final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       data = await AccessMangApi().fetchDoorLockDeviceList(projectUuid);
       emit(TableLoaded(data));