Merge branch 'dev' of https://github.com/SyncrowIOT/web into SP-1703-fe-build-device-overview-page_curtain_module

lib/common/widgets/app_loading_indicator.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class AppLoadingIndicator extends StatelessWidget {
+  const AppLoadingIndicator({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return const Center(child: CircularProgressIndicator());
+  }
+}

lib/pages/analytics/models/analytics_device.dart

@@ -25,8 +25,8 @@ class AnalyticsDevice {
 
   factory AnalyticsDevice.fromJson(Map<String, dynamic> json) {
     return AnalyticsDevice(
-      uuid: json['uuid'] as String,
-      name: json['name'] as String,
+      uuid: json['uuid'] as String? ?? '',
+      name: json['name'] as String? ?? '',
       createdAt: json['createdAt'] != null
           ? DateTime.parse(json['createdAt'] as String)
           : null,
@@ -39,8 +39,8 @@ class AnalyticsDevice {
           ? ProductDevice.fromJson(json['productDevice'] as Map<String, dynamic>)
           : null,
       spaceUuid: json['spaceUuid'] as String?,
-      latitude: json['lat'] != null ? double.parse(json['lat'] as String) : null,
-      longitude: json['lon'] != null ? double.parse(json['lon'] as String) : 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/models/occupancy_heat_map_model.dart

@@ -14,12 +14,21 @@ class OccupancyHeatMapModel extends Equatable {
   });
 
   factory OccupancyHeatMapModel.fromJson(Map<String, dynamic> json) {
+    final eventDate = json['event_date'] as String?;
+    final year = eventDate?.split('-')[0];
+    final month = eventDate?.split('-')[1];
+    final day = eventDate?.split('-')[2];
+
     return OccupancyHeatMapModel(
       uuid: json['uuid'] as String? ?? '',
-      eventDate: DateTime.parse(
-        json['event_date'] as String? ?? '${DateTime.now()}',
-      ),
-      countTotalPresenceDetected: json['count_total_presence_detected'] as int? ?? 0,
+      eventDate: DateTime(
+        int.parse(year ?? '2025'),
+        int.parse(month ?? '1'),
+        int.parse(day ?? '1'),
+      ).toUtc(),
+      countTotalPresenceDetected: num.parse(
+        json['count_total_presence_detected']?.toString() ?? '0',
+      ).toInt(),
     );
   }
 

lib/pages/analytics/models/range_of_aqi.dart

@@ -38,9 +38,9 @@ class RangeOfAqiValue extends Equatable {
   factory RangeOfAqiValue.fromJson(Map<String, dynamic> json) {
     return RangeOfAqiValue(
       type: json['type'] as String,
-      min: (json['min'] as num).toDouble(),
-      average: (json['average'] as num).toDouble(),
-      max: (json['max'] as num).toDouble(),
+      min: (json['min'] as num? ?? 0).toDouble(),
+      average: (json['average'] as num? ?? 0).toDouble(),
+      max: (json['max'] as num? ?? 0).toDouble(),
     );
   }
 

lib/pages/analytics/modules/air_quality/helpers/fetch_air_quality_data_helper.dart

@@ -4,7 +4,6 @@ import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_qualit
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/device_location/device_location_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/range_of_aqi/range_of_aqi_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_date_picker_bloc/analytics_date_picker_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/analytics/blocs/analytics_devices/analytics_devices_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/realtime_device_changes/realtime_device_changes_bloc.dart';
 import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
@@ -22,13 +21,14 @@ abstract final class FetchAirQualityDataHelper {
     required String spaceUuid,
     bool shouldFetchAnalyticsDevices = true,
   }) {
-    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
     final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
-    loadAnalyticsDevices(
-      context,
-      communityUuid: communityUuid,
-      spaceUuid: spaceUuid,
-    );
+    if (shouldFetchAnalyticsDevices) {
+      loadAnalyticsDevices(
+        context,
+        communityUuid: communityUuid,
+        spaceUuid: spaceUuid,
+      );
+    }
     loadRangeOfAqi(
       context,
       spaceUuid: spaceUuid,

lib/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart

@@ -18,11 +18,16 @@ abstract final class RangeOfAqiChartsHelper {
     (ColorsManager.hazardousPurple, 'Hazardous'),
   ];
 
-  static FlTitlesData titlesData(BuildContext context, List<RangeOfAqi> data) {
+  static FlTitlesData titlesData(
+    BuildContext context,
+    List<RangeOfAqi> data, {
+    double leftSideInterval = 50,
+  }) {
     final titlesData = EnergyManagementChartsHelper.titlesData(context);
     return titlesData.copyWith(
       bottomTitles: titlesData.bottomTitles.copyWith(
         sideTitles: titlesData.bottomTitles.sideTitles.copyWith(
+          reservedSize: 36,
           getTitlesWidget: (value, meta) => Padding(
             padding: const EdgeInsetsDirectional.only(top: 20.0),
             child: Text(
@@ -38,10 +43,11 @@ abstract final class RangeOfAqiChartsHelper {
       leftTitles: titlesData.leftTitles.copyWith(
         sideTitles: titlesData.leftTitles.sideTitles.copyWith(
           reservedSize: 70,
-          interval: 50,
+          interval: leftSideInterval,
           maxIncluded: false,
+          minIncluded: true,
           getTitlesWidget: (value, meta) {
-            final text = value >= 300 ? '301+' : value.toInt().toString();
+            final text = value.toInt().toString();
             return Padding(
               padding: const EdgeInsetsDirectional.only(end: 12),
               child: FittedBox(

lib/pages/analytics/modules/air_quality/views/air_quality_view.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/air_quality_end_side_widget.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_distribution_chart_box.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_legend.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/range_of_aqi_chart_box.dart';
 
 class AirQualityView extends StatelessWidget {
@@ -20,6 +21,10 @@ class AirQualityView extends StatelessWidget {
             child: Column(
               spacing: 32,
               children: [
+                SizedBox(
+                  height: height * 0.1,
+                  child: const AqiLegend(),
+                ),
                 SizedBox(
                   height: height * 1.2,
                   child: const AirQualityEndSideWidget(),
@@ -40,7 +45,7 @@ class AirQualityView extends StatelessWidget {
         return SingleChildScrollView(
           child: Container(
             padding: _padding,
-            height: height * 1.1,
+            height: height * 1.2,
             child: const Column(
               children: [
                 Expanded(
@@ -52,8 +57,9 @@ class AirQualityView extends StatelessWidget {
                         child: Column(
                           spacing: 20,
                           children: [
-                            Expanded(child: RangeOfAqiChartBox()),
-                            Expanded(child: AqiDistributionChartBox()),
+                            Expanded(flex: 2, child: AqiLegend()),
+                            Expanded(flex: 12, child: RangeOfAqiChartBox()),
+                            Expanded(flex: 12, child: AqiDistributionChartBox()),
                           ],
                         ),
                       ),

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

@@ -65,7 +65,7 @@ class AqiDeviceInfo extends StatelessWidget {
         );
         final tvocValue = _getValueForStatus(
           status,
-          'tvoc_value',
+          'voc_value',
           formatter: (value) => (value / 100).toStringAsFixed(2),
         );
 

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

@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
 import 'package:syncrow_web/pages/analytics/models/air_quality_data_model.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
+import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -32,8 +33,13 @@ class AqiDistributionChart extends StatelessWidget {
   }
 
   List<BarChartGroupData> _buildBarGroups() {
-    return List.generate(chartData.length, (index) {
-      final data = chartData[index];
+    final groups = <BarChartGroupData>[];
+    for (var i = 0; i < chartData.length; i++) {
+      final data = chartData[i];
+      final isAllZero = data.data.every((d) => d.percentage == 0);
+      if (isAllZero) {
+        continue;
+      }
       final stackItems = <BarChartRodData>[];
       double currentY = 0;
       var isFirstElement = true;
@@ -56,13 +62,15 @@ class AqiDistributionChart extends StatelessWidget {
         currentY += percentageData.percentage + _rodStackItemsSpacing;
         isFirstElement = false;
       }
-
-      return BarChartGroupData(
-        x: index,
-        barRods: stackItems,
-        groupVertically: true,
+      groups.add(
+        BarChartGroupData(
+          x: i,
+          barRods: stackItems,
+          groupVertically: true,
+        ),
       );
-    });
+    }
+    return groups;
   }
 
   BarTouchData _barTouchData(BuildContext context) {
@@ -73,6 +81,7 @@ class AqiDistributionChart extends StatelessWidget {
           color: ColorsManager.semiTransparentBlack,
         ),
         tooltipRoundedRadius: 16,
+        maxContentWidth: 500,
         tooltipPadding: const EdgeInsets.all(8),
         getTooltipItem: (group, groupIndex, rod, rodIndex) {
           final data = chartData[group.x];
@@ -81,10 +90,13 @@ class AqiDistributionChart extends StatelessWidget {
 
           final textStyle = context.textTheme.bodySmall?.copyWith(
             color: ColorsManager.blackColor,
-            fontSize: 8,
+            fontSize: 11,
           );
 
           for (final percentageData in data.data) {
+            if (percentageData.percentage == 0) {
+              continue;
+            }
             final percentage = percentageData.percentage.toStringAsFixed(1);
             final type = percentageData.type[0].toUpperCase() +
                 percentageData.type.substring(1).replaceAll('_', ' ');
@@ -98,7 +110,7 @@ class AqiDistributionChart extends StatelessWidget {
             DateFormat('dd/MM/yyyy').format(data.date),
             context.textTheme.bodyMedium!.copyWith(
               color: ColorsManager.blackColor,
-              fontSize: 9,
+              fontSize: 12,
               fontWeight: FontWeight.w600,
             ),
             textAlign: TextAlign.start,
@@ -118,7 +130,6 @@ class AqiDistributionChart extends StatelessWidget {
     final leftTitles = titlesData.leftTitles.copyWith(
       sideTitles: titlesData.leftTitles.sideTitles.copyWith(
         reservedSize: 70,
-        interval: 20,
         maxIncluded: false,
         minIncluded: true,
         getTitlesWidget: (value, meta) => Padding(
@@ -139,8 +150,9 @@ class AqiDistributionChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
+      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
-        showTitles: true,
+        showTitles: chartData.isNotEmpty,
         getTitlesWidget: (value, _) => FittedBox(
           alignment: AlignmentDirectional.bottomCenter,
           fit: BoxFit.scaleDown,
@@ -148,7 +160,7 @@ class AqiDistributionChart extends StatelessWidget {
             chartData[value.toInt()].date.day.toString(),
             style: context.textTheme.bodySmall?.copyWith(
               color: ColorsManager.lightGreyColor,
-              fontSize: 8,
+              fontSize: 12,
             ),
           ),
         ),

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

@@ -19,7 +19,7 @@ class AqiDistributionChartTitle extends StatelessWidget {
       children: [
         ChartsLoadingWidget(isLoading: isLoading),
         const Expanded(
-          flex: 3,
+          flex: 4,
           child: FittedBox(
             fit: BoxFit.scaleDown,
             alignment: AlignmentDirectional.centerStart,
@@ -28,23 +28,26 @@ class AqiDistributionChartTitle extends StatelessWidget {
             ),
           ),
         ),
-        FittedBox(
-          alignment: AlignmentDirectional.centerEnd,
-          fit: BoxFit.scaleDown,
-          child: AqiTypeDropdown(
-            onChanged: (value) {
-              if (value != null) {
-                final bloc = context.read<AirQualityDistributionBloc>();
-                try {
-                  final param = _makeLoadAqiDistributionParam(context, value);
-                  bloc.add(LoadAirQualityDistribution(param));
-                } catch (_) {
-                  return;
-                } finally {
-                  bloc.add(UpdateAqiTypeEvent(value));
+        Expanded(
+          flex: 2,
+          child: FittedBox(
+            alignment: AlignmentDirectional.centerEnd,
+            fit: BoxFit.scaleDown,
+            child: AqiTypeDropdown(
+              onChanged: (value) {
+                if (value != null) {
+                  final bloc = context.read<AirQualityDistributionBloc>();
+                  try {
+                    final param = _makeLoadAqiDistributionParam(context, value);
+                    bloc.add(LoadAirQualityDistribution(param));
+                  } catch (_) {
+                    return;
+                  } finally {
+                    bloc.add(UpdateAqiTypeEvent(value));
+                  }
                 }
-              }
-            },
+              },
+            ),
           ),
         ),
       ],

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

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart';
+import 'package:syncrow_web/utils/style.dart';
+
+class AqiLegend extends StatelessWidget {
+  const AqiLegend({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsetsDirectional.all(20),
+      decoration: subSectionContainerDecoration.copyWith(
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        spacing: 16,
+        children: RangeOfAqiChartsHelper.gradientData.map((e) {
+          return Flexible(
+            flex: 4,
+            child: FittedBox(
+              fit: BoxFit.fill,
+              child: ChartInformativeCell(
+                color: e.$1,
+                title: FittedBox(
+                  fit: BoxFit.fill,
+                  child: Text(e.$2),
+                ),
+                height: null,
+              ),
+            ),
+          );
+        }).toList(),
+      ),
+    );
+  }
+}

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

@@ -47,36 +47,37 @@ class AqiLocationInfoCell extends StatelessWidget {
               ),
             ),
             Align(
-              alignment: AlignmentDirectional.bottomEnd,
-              child: Padding(
-                padding: const EdgeInsetsDirectional.all(10),
-                child: SizedBox(
-                  height: 40,
-                  width: 120,
-                  child: FittedBox(
-                    fit: BoxFit.scaleDown,
-                    alignment: AlignmentDirectional.bottomEnd,
-                    child: Text(
-                      value,
-                      style: context.textTheme.bodySmall?.copyWith(
-                        color: ColorsManager.vividBlue.withValues(alpha: 0.7),
-                        fontWeight: FontWeight.w700,
-                        fontSize: 24,
+              alignment: AlignmentDirectional.bottomCenter,
+              child: Row(
+                crossAxisAlignment: CrossAxisAlignment.end,
+                children: [
+                  Expanded(
+                    child: SvgPicture.asset(
+                      svgPath,
+                      fit: BoxFit.scaleDown,
+                      alignment: AlignmentDirectional.bottomStart,
+                    ),
+                  ),
+                  Expanded(
+                    child: FittedBox(
+                      fit: BoxFit.scaleDown,
+                      alignment: AlignmentDirectional.bottomEnd,
+                      child: Padding(
+                        padding: const EdgeInsetsDirectional.all(10),
+                        child: Text(
+                          value,
+                          style: context.textTheme.bodySmall?.copyWith(
+                            color: ColorsManager.vividBlue.withValues(
+                              alpha: 0.7,
+                            ),
+                            fontWeight: FontWeight.w700,
+                            fontSize: 24,
+                          ),
+                        ),
                       ),
                     ),
                   ),
-                ),
-              ),
-            ),
-            Align(
-              alignment: AlignmentDirectional.bottomStart,
-              child: SizedBox.square(
-                dimension: MediaQuery.sizeOf(context).width * 0.45,
-                child: FittedBox(
-                  fit: BoxFit.scaleDown,
-                  alignment: AlignmentDirectional.bottomStart,
-                  child: SvgPicture.asset(svgPath),
-                ),
+                ],
               ),
             ),
           ],

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

@@ -6,8 +6,8 @@ enum AqiType {
   aqi('AQI', '', 'aqi'),
   pm25('PM2.5', 'µg/m³', 'pm25'),
   pm10('PM10', 'µg/m³', 'pm10'),
-  hcho('HCHO', 'mg/m³', 'cho2'),
-  tvoc('TVOC', 'µg/m³', 'voc'),
+  hcho('HCHO', 'mg/m³', 'ch2o'),
+  tvoc('TVOC', 'mg/m³', 'voc'),
   co2('CO2', 'ppm', 'co2');
 
   const AqiType(this.value, this.unit, this.code);

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

@@ -2,15 +2,18 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/helpers/range_of_aqi_charts_helper.dart';
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 
 class RangeOfAqiChart extends StatelessWidget {
   final List<RangeOfAqi> chartData;
+  final AqiType selectedAqiType;
 
   const RangeOfAqiChart({
     super.key,
     required this.chartData,
+    required this.selectedAqiType,
   });
 
   List<(List<double> values, Color color, Color? dotColor)> get _lines {
@@ -45,15 +48,34 @@ class RangeOfAqiChart extends StatelessWidget {
     ];
   }
 
+  (double maxY, double interval) get _maxYForAqiType {
+    const aqiMaxValues = <AqiType, (double maxY, double interval)>{
+      AqiType.aqi: (401, 100),
+      AqiType.pm25: (351, 50),
+      AqiType.pm10: (501, 100),
+      AqiType.hcho: (301, 50),
+      AqiType.tvoc: (501, 50),
+      AqiType.co2: (1251, 250),
+    };
+
+    return aqiMaxValues[selectedAqiType]!;
+  }
+
   @override
   Widget build(BuildContext context) {
     return LineChart(
       LineChartData(
         minY: 0,
-        maxY: 301,
+        maxY: _maxYForAqiType.$1,
         clipData: const FlClipData.vertical(),
-        gridData: EnergyManagementChartsHelper.gridData(horizontalInterval: 50),
-        titlesData: RangeOfAqiChartsHelper.titlesData(context, chartData),
+        gridData: EnergyManagementChartsHelper.gridData(
+          horizontalInterval: _maxYForAqiType.$2,
+        ),
+        titlesData: RangeOfAqiChartsHelper.titlesData(
+          context,
+          chartData,
+          leftSideInterval: _maxYForAqiType.$2,
+        ),
         borderData: EnergyManagementChartsHelper.borderData(),
         lineTouchData: RangeOfAqiChartsHelper.lineTouchData(chartData),
         betweenBarsData: [

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

@@ -32,7 +32,12 @@ class RangeOfAqiChartBox extends StatelessWidget {
               const SizedBox(height: 10),
               const Divider(),
               const SizedBox(height: 20),
-              Expanded(child: RangeOfAqiChart(chartData: state.filteredRangeOfAqi)),
+              Expanded(
+                child: RangeOfAqiChart(
+                  chartData: state.filteredRangeOfAqi,
+                  selectedAqiType: state.selectedAqiType,
+                ),
+              ),
             ],
           ),
         );

lib/pages/analytics/modules/analytics/widgets/chart_informative_cell.dart

@@ -7,16 +7,18 @@ class ChartInformativeCell extends StatelessWidget {
     required this.title,
     required this.color,
     this.hasBorder = false,
+    this.height,
   });
 
   final Widget title;
   final Color color;
   final bool hasBorder;
+  final double? height;
 
   @override
   Widget build(BuildContext context) {
     return Container(
-      height: MediaQuery.sizeOf(context).height * 0.0385,
+      height: height ?? MediaQuery.sizeOf(context).height * 0.0385,
       padding: const EdgeInsetsDirectional.symmetric(
         vertical: 8,
         horizontal: 12,

lib/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart

@@ -1,6 +1,7 @@
 import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/helpers/format_number_to_kwh.dart';
+import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -15,6 +16,7 @@ abstract final class EnergyManagementChartsHelper {
     return FlTitlesData(
       show: true,
       bottomTitles: AxisTitles(
+        axisNameWidget: const ChartsXAxisTitle(),
         drawBelowEverything: true,
         sideTitles: SideTitles(
           interval: 1,
@@ -62,17 +64,12 @@ abstract final class EnergyManagementChartsHelper {
     );
   }
 
-  static String getToolTipLabel(num month, double value) {
-    final monthLabel = month.toString();
-    final valueLabel = value.formatNumberToKwh;
-    final labels = [monthLabel, valueLabel];
-    return labels.where((element) => element.isNotEmpty).join(', ');
-  }
+  static String getToolTipLabel(double value) => value.formatNumberToKwh;
 
   static List<LineTooltipItem?> getTooltipItems(List<LineBarSpot> touchedSpots) {
     return touchedSpots.map((spot) {
       return LineTooltipItem(
-        getToolTipLabel(spot.x, spot.y),
+        getToolTipLabel(spot.y),
         const TextStyle(
           color: ColorsManager.textPrimaryColor,
           fontWeight: FontWeight.w600,

lib/pages/analytics/modules/energy_management/views/analytics_energy_management_view.dart

@@ -46,7 +46,7 @@ class AnalyticsEnergyManagementView extends StatelessWidget {
                     spacing: 32,
                     children: [
                       Expanded(
-                        flex: 2,
+                        flex: 7,
                         child: Column(
                           spacing: 20,
                           children: [
@@ -55,7 +55,7 @@ class AnalyticsEnergyManagementView extends StatelessWidget {
                           ],
                         ),
                       ),
-                      Expanded(child: PowerClampEnergyDataWidget()),
+                      Expanded(flex: 4, child: PowerClampEnergyDataWidget()),
                     ],
                   ),
                 ),

lib/pages/analytics/modules/energy_management/widgets/analytics_device_dropdown.dart

@@ -28,15 +28,29 @@ class AnalyticsDeviceDropdown extends StatelessWidget {
             ),
           ),
           child: Visibility(
-            visible: state.devices.isNotEmpty,
-            replacement: _buildNoDevicesFound(context),
-            child: _buildDevicesDropdown(context, state),
+            visible: state.status != AnalyticsDevicesStatus.loading,
+            replacement: _buildLoadingIndicator(),
+            child: Visibility(
+              visible: state.devices.isNotEmpty,
+              replacement: _buildNoDevicesFound(context),
+              child: _buildDevicesDropdown(context, state),
+            ),
           ),
         );
       },
     );
   }
 
+  Widget _buildLoadingIndicator() {
+    return const Center(
+      child: SizedBox(
+        width: 24,
+        height: 24,
+        child: CircularProgressIndicator(strokeWidth: 3),
+      ),
+    );
+  }
+
   static const _defaultPadding = EdgeInsetsDirectional.symmetric(
     horizontal: 20,
     vertical: 2,

lib/pages/analytics/modules/energy_management/widgets/energy_consumption_per_device_chart_box.dart

@@ -37,7 +37,7 @@ class EnergyConsumptionPerDeviceChartBox extends StatelessWidget {
                       fit: BoxFit.scaleDown,
                       alignment: AlignmentDirectional.centerStart,
                       child: ChartTitle(
-                        title: Text('Energy Consumption per Device'),
+                        title: Text('Device energy consumed'),
                       ),
                     ),
                   ),

lib/pages/analytics/modules/energy_management/widgets/total_energy_consumption_chart_box.dart

@@ -32,7 +32,7 @@ class TotalEnergyConsumptionChartBox extends StatelessWidget {
                   child: FittedBox(
                     alignment: AlignmentDirectional.centerStart,
                     fit: BoxFit.scaleDown,
-                    child: ChartTitle(title: Text('Total Energy Consumption')),
+                    child: ChartTitle(title: Text('Space energy consumed')),
                   ),
                 ),
                 const Spacer(flex: 4),

lib/pages/analytics/modules/occupancy/helpers/fetch_occupancy_data_helper.dart

@@ -81,7 +81,7 @@ abstract final class FetchOccupancyDataHelper {
             param: GetAnalyticsDevicesParam(
               communityUuid: communityUuid,
               spaceUuid: spaceUuid,
-              deviceTypes: ['WPS', 'CPS'],
+              deviceTypes: ['WPS', 'CPS', 'NCPS'],
               requestType: AnalyticsDeviceRequestType.occupancy,
             ),
             onSuccess: (device) {

lib/pages/analytics/modules/occupancy/views/analytics_occupancy_view.dart

@@ -20,7 +20,7 @@ class AnalyticsOccupancyView extends StatelessWidget {
             child: Column(
               spacing: 32,
               children: [
-                SizedBox(height: height * 0.46, child: const OccupancyEndSideBar()),
+                SizedBox(height: height * 0.8, child: const OccupancyEndSideBar()),
                 SizedBox(height: height * 0.5, child: const OccupancyChartBox()),
                 SizedBox(height: height * 0.5, child: const OccupancyHeatMapBox()),
               ],
@@ -31,12 +31,12 @@ class AnalyticsOccupancyView extends StatelessWidget {
         return SingleChildScrollView(
           child: Container(
             padding: _padding,
-            height: height * 0.9,
+            height: height * 1,
             child: const Row(
               spacing: 32,
               children: [
                 Expanded(
-                  flex: 5,
+                  flex: 7,
                   child: Column(
                     spacing: 20,
                     children: [
@@ -45,7 +45,7 @@ class AnalyticsOccupancyView extends StatelessWidget {
                     ],
                   ),
                 ),
-                Expanded(flex: 2, child: OccupancyEndSideBar()),
+                Expanded(flex: 4, child: OccupancyEndSideBar()),
               ],
             ),
           ),

lib/pages/analytics/modules/occupancy/widgets/heat_map_tooltip.dart

@@ -39,7 +39,7 @@ class HeatMapTooltip extends StatelessWidget {
             ),
             const Divider(height: 2, thickness: 1),
             Text(
-              '$value Occupants',
+              'Occupancy detected: $value',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 10,
                 fontWeight: FontWeight.w500,

lib/pages/analytics/modules/occupancy/widgets/interactive_heat_map.dart

@@ -52,7 +52,7 @@ class _InteractiveHeatMapState extends State<InteractiveHeatMap> {
             color: Colors.transparent,
             child: Transform.translate(
               offset: Offset(-(widget.cellSize * 2.5), -50),
-              child: HeatMapTooltip(date: item.date, value: item.value),
+              child: HeatMapTooltip(date: item.date.toUtc(), value: item.value),
             ),
           ),
         ),

lib/pages/analytics/modules/occupancy/widgets/occupancy_chart.dart

@@ -2,6 +2,7 @@ import 'package:fl_chart/fl_chart.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/analytics/models/occupacy.dart';
 import 'package:syncrow_web/pages/analytics/modules/energy_management/helpers/energy_management_charts_helper.dart';
+import 'package:syncrow_web/pages/analytics/widgets/charts_x_axis_title.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
@@ -88,8 +89,8 @@ class OccupancyChart extends StatelessWidget {
   }) {
     final data = chartData;
 
-    final occupancyValue = double.parse(data[group.x.toInt()].occupancy);
-    final percentage = '${(occupancyValue).toStringAsFixed(0)}%';
+    final occupancyValue = double.parse(data[group.x].occupancy);
+    final percentage = '${occupancyValue.toStringAsFixed(0)}%';
 
     return BarTooltipItem(
       percentage,
@@ -116,7 +117,7 @@ class OccupancyChart extends StatelessWidget {
             alignment: AlignmentDirectional.centerStart,
             fit: BoxFit.scaleDown,
             child: Text(
-              '${(value).toStringAsFixed(0)}%',
+              '${value.toStringAsFixed(0)}%',
               style: context.textTheme.bodySmall?.copyWith(
                 fontSize: 12,
                 color: ColorsManager.greyColor,
@@ -128,6 +129,7 @@ class OccupancyChart extends StatelessWidget {
     );
 
     final bottomTitles = AxisTitles(
+      axisNameWidget: const ChartsXAxisTitle(),
       sideTitles: SideTitles(
         showTitles: true,
         getTitlesWidget: (value, _) => FittedBox(

lib/pages/analytics/modules/occupancy/widgets/occupancy_end_side_bar.dart

@@ -23,38 +23,45 @@ class OccupancyEndSideBar extends StatelessWidget {
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
-              const AnalyticsSidebarHeader(title: 'Presnce Sensor'),
-              SizedBox(
-                height: MediaQuery.sizeOf(context).height * 0.2,
-                child: PowerClampEnergyStatusWidget(
-                  status: [
-                    PowerClampEnergyStatus(
-                      iconPath: Assets.presenceState,
-                      title: 'Presence Status',
-                      value: _valueFromCode(
-                        'presence_state',
-                        state.deviceStatusList,
+              const AnalyticsSidebarHeader(title: 'Presence Sensor'),
+              Expanded(
+                child: SizedBox(
+                  child: PowerClampEnergyStatusWidget(
+                    status: [
+                      PowerClampEnergyStatus(
+                        iconPath: Assets.presenceState,
+                        title: 'Presence Status',
+                        value: _valueFromCode(
+                          'presence_state',
+                          state.deviceStatusList,
+                        ),
+                        unit: '',
                       ),
-                      unit: '',
-                    ),
-                    PowerClampEnergyStatus(
-                      iconPath: Assets.presenceTimeIcon,
-                      title: 'Presence Time',
-                      value:
-                          '${_valueFromCode('none_body_time', state.deviceStatusList)} Min',
-                      unit: '',
-                    ),
-                    PowerClampEnergyStatus(
-                      iconPath: Assets.currentDistanceIcon,
-                      title: 'Detection Distance',
-                      value:
-                          '${_valueFromCode('space_move_val', state.deviceStatusList)} M',
-                      unit: '',
-                    ),
-                  ],
+                      PowerClampEnergyStatus(
+                        iconPath: Assets.presenceTimeIcon,
+                        title: 'Presence Time',
+                        value:
+                            '${_valueFromCode('none_body_time', state.deviceStatusList)} Min',
+                        unit: '',
+                      ),
+                      PowerClampEnergyStatus(
+                        iconPath: Assets.currentDistanceIcon,
+                        title: 'Detection Distance',
+                        value:
+                            '${_valueFromCode('space_move_val', state.deviceStatusList)} M',
+                        unit: '',
+                      ),
+                    ],
+                  ),
                 ),
               ),
               const SizedBox(height: 20),
+              Expanded(
+                flex: 2,
+                child: FittedBox(
+                  child: Image.asset(Assets.autocadOccupancyImage),
+                ),
+              ),
             ],
           ),
         );

lib/pages/analytics/modules/occupancy/widgets/occupancy_heat_map.dart

@@ -20,14 +20,14 @@ class OccupancyHeatMap extends StatelessWidget {
       : 0;
 
   DateTime _getStartingDate() {
-    final jan1 = DateTime(DateTime.now().year, 1, 1);
+    final jan1 = DateTime(DateTime.now().year, 1, 1).toUtc();
     final startOfWeek = jan1.subtract(Duration(days: jan1.weekday - 1));
     return startOfWeek;
   }
 
   List<OccupancyPaintItem> _generatePaintItems(DateTime startDate) {
     return List.generate(_totalWeeks * 7, (index) {
-      final date = startDate.add(Duration(days: index));
+      final date = startDate.toUtc().add(Duration(days: index));
       final value = heatMapData[date] ?? 0;
       return OccupancyPaintItem(index: index, value: value, date: date);
     });

lib/pages/analytics/widgets/charts_x_axis_title.dart

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class ChartsXAxisTitle extends StatelessWidget {
+  const ChartsXAxisTitle({
+    this.label = 'Day of month',
+    super.key,
+  });
+
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      label,
+      style: context.textTheme.bodySmall?.copyWith(
+        color: ColorsManager.lightGreyColor,
+        fontSize: 8,
+      ),
+    );
+  }
+}

lib/pages/auth/bloc/auth_bloc.dart

@@ -36,7 +36,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
 
   ////////////////////////////// forget password //////////////////////////////////
   final TextEditingController forgetEmailController = TextEditingController();
-  final TextEditingController forgetPasswordController = TextEditingController();
+  final TextEditingController forgetPasswordController =
+      TextEditingController();
   final TextEditingController forgetOtp = TextEditingController();
   final forgetFormKey = GlobalKey<FormState>();
   final forgetEmailKey = GlobalKey<FormState>();
@@ -53,7 +54,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
       return;
     }
     _remainingTime = 1;
-    add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+    add(UpdateTimerEvent(
+        remainingTime: _remainingTime, isButtonEnabled: false));
     try {
       forgetEmailValidate = '';
       _remainingTime = (await AuthenticationAPI.sendOtp(
@@ -90,7 +92,8 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
         _timer?.cancel();
         add(const UpdateTimerEvent(remainingTime: 0, isButtonEnabled: true));
       } else {
-        add(UpdateTimerEvent(remainingTime: _remainingTime, isButtonEnabled: false));
+        add(UpdateTimerEvent(
+            remainingTime: _remainingTime, isButtonEnabled: false));
       }
     });
   }
@@ -100,7 +103,7 @@ class AuthBloc extends Bloc<AuthEvent, AuthState> {
     emit(const TimerState(isButtonEnabled: true, remainingTime: 0));
   }
 
-Future<void> changePassword(
+  Future<void> changePassword(
       ChangePasswordEvent event, Emitter<AuthState> emit) async {
     emit(LoadingForgetState());
     try {
@@ -122,7 +125,6 @@ Future<void> changePassword(
     }
   }
 
-
   String? validateCode(String? value) {
     if (value == null || value.isEmpty) {
       return 'Code is required';
@@ -131,7 +133,9 @@ Future<void> changePassword(
   }
 
   void _onUpdateTimer(UpdateTimerEvent event, Emitter<AuthState> emit) {
-    emit(TimerState(isButtonEnabled: event.isButtonEnabled, remainingTime: event.remainingTime));
+    emit(TimerState(
+        isButtonEnabled: event.isButtonEnabled,
+        remainingTime: event.remainingTime));
   }
 
   /////////////////////////////////////  login  /////////////////////////////////////
@@ -151,7 +155,6 @@ Future<void> changePassword(
   static UserModel? user;
   bool showValidationMessage = false;
 
- 
   void _login(LoginButtonPressed event, Emitter<AuthState> emit) async {
     emit(AuthLoading());
     if (isChecked) {
@@ -170,11 +173,11 @@ Future<void> changePassword(
         );
       } on APIException catch (e) {
         validate = e.message;
-        emit(LoginInitial());
+        emit(LoginFailure(error: validate));
         return;
       } catch (e) {
         validate = 'Something went wrong';
-        emit(LoginInitial());
+        emit(LoginFailure(error: validate));
         return;
       }
 
@@ -197,7 +200,6 @@ Future<void> changePassword(
     }
   }
 
-
   checkBoxToggle(
     CheckBoxEvent event,
     Emitter<AuthState> emit,
@@ -339,12 +341,14 @@ Future<void> changePassword(
   static Future<String> getTokenAndValidate() async {
     try {
       const storage = FlutterSecureStorage();
-      final firstLaunch =
-          await SharedPreferencesHelper.readBoolFromSP(StringsManager.firstLaunch) ?? true;
+      final firstLaunch = await SharedPreferencesHelper.readBoolFromSP(
+              StringsManager.firstLaunch) ??
+          true;
       if (firstLaunch) {
         storage.deleteAll();
       }
-      await SharedPreferencesHelper.saveBoolToSP(StringsManager.firstLaunch, false);
+      await SharedPreferencesHelper.saveBoolToSP(
+          StringsManager.firstLaunch, false);
       final value = await storage.read(key: Token.loginAccessTokenKey) ?? '';
       if (value.isEmpty) {
         return 'Token not found';
@@ -397,7 +401,9 @@ Future<void> changePassword(
     final String formattedTime = [
       if (days > 0) '${days}d', // Append 'd' for days
       if (days > 0 || hours > 0)
-        hours.toString().padLeft(2, '0'), // Show hours if there are days or hours
+        hours
+            .toString()
+            .padLeft(2, '0'), // Show hours if there are days or hours
       minutes.toString().padLeft(2, '0'),
       seconds.toString().padLeft(2, '0'),
     ].join(':');

lib/pages/common/custom_table.dart

@@ -50,20 +50,11 @@ class _DynamicTableState extends State<DynamicTable> {
   bool _selectAll = false;
   final ScrollController _verticalScrollController = ScrollController();
   final ScrollController _horizontalScrollController = ScrollController();
-  late ScrollController _horizontalHeaderScrollController;
-  late ScrollController _horizontalBodyScrollController;
+
   @override
   void initState() {
     super.initState();
     _initializeSelection();
-    _horizontalHeaderScrollController = ScrollController();
-    _horizontalBodyScrollController = ScrollController();
-
-    // Synchronize horizontal scrolling
-    _horizontalBodyScrollController.addListener(() {
-      _horizontalHeaderScrollController
-          .jumpTo(_horizontalBodyScrollController.offset);
-    });
   }
 
   @override
@@ -113,94 +104,112 @@ class _DynamicTableState extends State<DynamicTable> {
     context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
   }
 
-  @override
-  void dispose() {
-    _horizontalHeaderScrollController.dispose();
-    _horizontalBodyScrollController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
       decoration: widget.cellDecoration,
-      child: Column(
-        children: [
-          Container(
-            decoration: widget.headerDecoration ??
-                const BoxDecoration(color: ColorsManager.boxColor),
+      child: Scrollbar(
+        controller: _verticalScrollController,
+        thumbVisibility: true,
+        trackVisibility: true,
+        child: Scrollbar(
+          //fixed the horizontal scrollbar issue
+          controller: _horizontalScrollController,
+          thumbVisibility: true,
+          trackVisibility: true,
+          notificationPredicate: (notif) => notif.depth == 1,
+          child: SingleChildScrollView(
+            controller: _verticalScrollController,
             child: SingleChildScrollView(
+              controller: _horizontalScrollController,
               scrollDirection: Axis.horizontal,
-              physics: const NeverScrollableScrollPhysics(),
-              controller: _horizontalHeaderScrollController,
               child: SizedBox(
                 width: widget.size.width,
-                child: Row(
+                child: Column(
                   children: [
-                    if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                    ...List.generate(widget.headers.length, (index) {
-                      return _buildTableHeaderCell(
-                          widget.headers[index], index);
-                    }),
+                    Container(
+                      decoration: widget.headerDecoration ??
+                          const BoxDecoration(
+                            color: ColorsManager.boxColor,
+                          ),
+                      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
+                          ? _buildEmptyState()
+                          : Column(
+                              children:
+                                  List.generate(widget.data.length, (rowIndex) {
+                                final row = widget.data[rowIndex];
+                                return Row(
+                                  children: [
+                                    if (widget.withCheckBox)
+                                      _buildRowCheckbox(
+                                          rowIndex, widget.size.height * 0.08),
+                                    ...row.asMap().entries.map((entry) {
+                                      return _buildTableCell(
+                                        entry.value.toString(),
+                                        widget.size.height * 0.08,
+                                        rowIndex: rowIndex,
+                                        columnIndex: entry.key,
+                                      );
+                                    }).toList(),
+                                  ],
+                                );
+                              }),
+                            ),
+                    ),
                   ],
                 ),
               ),
             ),
           ),
-          Expanded(
-            child: Scrollbar(
-              controller: _verticalScrollController,
-              thumbVisibility: true,
-              trackVisibility: true,
-              child: SingleChildScrollView(
-                controller: _verticalScrollController,
-                child: Scrollbar(
-                  controller: _horizontalBodyScrollController,
-                  thumbVisibility: false,
-                  trackVisibility: false,
-                  notificationPredicate: (notif) => notif.depth == 1,
-                  child: SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    controller: _horizontalBodyScrollController,
-                    child: Container(
-                      color: ColorsManager.whiteColors,
-                      child: SizedBox(
-                        width: widget.size.width,
-                        child: widget.isEmpty
-                            ? _buildEmptyState()
-                            : Column(
-                                children: List.generate(widget.data.length,
-                                    (rowIndex) {
-                                  final row = widget.data[rowIndex];
-                                  return Row(
-                                    children: [
-                                      if (widget.withCheckBox)
-                                        _buildRowCheckbox(rowIndex,
-                                            widget.size.height * 0.08),
-                                      ...row.asMap().entries.map((entry) {
-                                        return _buildTableCell(
-                                          entry.value.toString(),
-                                          widget.size.height * 0.08,
-                                          rowIndex: rowIndex,
-                                          columnIndex: entry.key,
-                                        );
-                                      }).toList(),
-                                    ],
-                                  );
-                                }),
-                              ),
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ],
+        ),
       ),
     );
   }
 
+  Widget _buildEmptyState() => Container(
+        height: widget.size.height,
+        color: ColorsManager.whiteColors,
+        child: Column(
+          mainAxisAlignment: MainAxisAlignment.center,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                Column(
+                  children: [
+                    SvgPicture.asset(Assets.emptyTable),
+                    const SizedBox(height: 15),
+                    Text(
+                      widget.tableName == 'AccessManagement'
+                          ? 'No Password '
+                          : 'No Devices',
+                      style: Theme.of(context)
+                          .textTheme
+                          .bodySmall!
+                          .copyWith(color: ColorsManager.grayColor),
+                    )
+                  ],
+                ),
+              ],
+            ),
+            SizedBox(height: widget.size.height * 0.5),
+          ],
+        ),
+      );
   Widget _buildSelectAllCheckbox() {
     return Container(
       width: 50,
@@ -218,32 +227,6 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildEmptyState() => Column(
-        mainAxisAlignment: MainAxisAlignment.center,
-        children: [
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Column(
-                children: [
-                  SvgPicture.asset(Assets.emptyTable),
-                  const SizedBox(height: 15),
-                  Text(
-                    widget.tableName == 'AccessManagement'
-                        ? 'No Password '
-                        : 'No Devices',
-                    style: Theme.of(context)
-                        .textTheme
-                        .bodySmall!
-                        .copyWith(color: ColorsManager.grayColor),
-                  )
-                ],
-              ),
-            ],
-          ),
-        ],
-      );
   Widget _buildRowCheckbox(int index, double size) {
     return Container(
       width: 50,
@@ -298,12 +281,8 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableCell(
-    String content,
-    double size, {
-    required int rowIndex,
-    required int columnIndex,
-  }) {
+  Widget _buildTableCell(String content, double size,
+      {required int rowIndex, required int columnIndex}) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
@@ -311,7 +290,6 @@ class _DynamicTableState extends State<DynamicTable> {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
     bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
-
     if (isSettingsColumn) {
       return buildSettingsIcon(
         width: 120,
@@ -416,11 +394,10 @@ class _DynamicTableState extends State<DynamicTable> {
                   padding: const EdgeInsets.all(8.0),
                   child: Center(
                     child: SvgPicture.asset(
-                      Assets.settings, // ضع المسار الصحيح هنا
+                      Assets.settings,
                       width: 40,
                       height: 22,
-                      color: ColorsManager
-                          .primaryColor, // نفس لون الأيقونة في الصورة
+                      color: ColorsManager.primaryColor,
                     ),
                   ),
                 ),

lib/pages/device_managment/ac/bloc/ac_bloc.dart

@@ -69,12 +69,13 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     }
   }
 
-  void _listenToChanges(deviceId) {
+  StreamSubscription<DatabaseEvent>? _deviceStatusSubscription;
+
+  void _listenToChanges(String deviceId) {
     try {
       final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
-      final stream = ref.onValue;
-
-      stream.listen((DatabaseEvent event) async {
+      _deviceStatusSubscription =
+          ref.onValue.listen((DatabaseEvent event) async {
         if (event.snapshot.value == null) return;
 
         Map<dynamic, dynamic> usersMap =
@@ -109,15 +110,14 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
     Emitter<AcsState> emit,
   ) async {
     emit(AcsLoadingState());
-    _updateDeviceFunctionFromCode(event.code, event.value);
-    emit(ACStatusLoaded(status: deviceStatus));
 
     try {
       final success = await controlDeviceService.controlDevice(
         deviceUuid: event.deviceId,
         status: Status(code: event.code, value: event.value),
       );
-
+      _updateDeviceFunctionFromCode(event.code, event.value);
+      emit(ACStatusLoaded(status: deviceStatus));
       if (!success) {
         emit(const AcsFailedState(error: 'Failed to control device'));
       }
@@ -298,13 +298,17 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
         totalSeconds--;
         scheduledHours = totalSeconds ~/ 3600;
         scheduledMinutes = (totalSeconds % 3600) ~/ 60;
-        add(UpdateTimerEvent());
+        if (!isClosed) {
+          add(UpdateTimerEvent());
+        }
       } else {
         _countdownTimer?.cancel();
         timerActive = false;
         scheduledHours = 0;
         scheduledMinutes = 0;
-        add(TimerCompletedEvent());
+        if (!isClosed) {
+          add(TimerCompletedEvent());
+        }
       }
     });
   }
@@ -331,7 +335,9 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
       _startCountdownTimer(
         emit,
       );
-      add(UpdateTimerEvent());
+      if (!isClosed) {
+        add(UpdateTimerEvent());
+      }
     }
   }
 
@@ -375,6 +381,8 @@ class AcBloc extends Bloc<AcsEvent, AcsState> {
   @override
   Future<void> close() {
     add(OnClose());
+    _countdownTimer?.cancel();
+    _deviceStatusSubscription?.cancel();
     return super.close();
   }
 }

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

@@ -40,17 +40,18 @@ class DeviceManagementBloc
       List<AllDevicesModel> devices = [];
       _devices.clear();
       var spaceBloc = event.context.read<SpaceTreeBloc>();
-           final projectUuid = await ProjectManager.getProjectUUID() ?? '';
+      final projectUuid = await ProjectManager.getProjectUUID() ?? '';
 
       if (spaceBloc.state.selectedCommunities.isEmpty) {
-        devices = await DevicesManagementApi().fetchDevices('', '', projectUuid);
+        devices =
+            await DevicesManagementApi().fetchDevices('', '', projectUuid);
       } else {
         for (var community in spaceBloc.state.selectedCommunities) {
           List<String> spacesList =
               spaceBloc.state.selectedCommunityAndSpaces[community] ?? [];
           for (var space in spacesList) {
-            devices.addAll(await DevicesManagementApi().fetchDevices(
-                community, space, projectUuid));
+            devices.addAll(await DevicesManagementApi()
+                .fetchDevices(community, space, projectUuid));
           }
         }
       }
@@ -100,7 +101,7 @@ class DeviceManagementBloc
       ));
 
       if (currentProductName.isNotEmpty) {
-        add(SearchDevices(productName: currentProductName));
+        add(SearchDevices(deviceNameOrProductName: currentProductName));
       }
     }
   }
@@ -269,34 +270,41 @@ class DeviceManagementBloc
         return 'All';
     }
   }
-
   void _onSearchDevices(
       SearchDevices event, Emitter<DeviceManagementState> emit) {
     if ((event.community == null || event.community!.isEmpty) &&
         (event.unitName == null || event.unitName!.isEmpty) &&
-        (event.productName == null || event.productName!.isEmpty)) {
+        (event.deviceNameOrProductName == null ||
+            event.deviceNameOrProductName!.isEmpty)) {
       currentProductName = '';
-      if (state is DeviceManagementFiltered) {
-        add(FilterDevices(_getFilterFromIndex(_selectedIndex)));
-      } else {
-        return;
-      }
+      _filteredDevices = List.from(_devices);
+      emit(DeviceManagementLoaded(
+        devices: _devices,
+        selectedIndex: _selectedIndex,
+        onlineCount: _onlineCount,
+        offlineCount: _offlineCount,
+        lowBatteryCount: _lowBatteryCount,
+        selectedDevice: null,
+        isControlButtonEnabled: false,
+      ));
+      return;
     }
-
-    if (event.productName == currentProductName &&
+    if (event.deviceNameOrProductName == currentProductName &&
         event.community == currentCommunity &&
         event.unitName == currentUnitName &&
         event.searchField) {
       return;
     }
 
-    currentProductName = event.productName ?? '';
+    currentProductName = event.deviceNameOrProductName ?? '';
     currentCommunity = event.community;
     currentUnitName = event.unitName;
 
-    List<AllDevicesModel> devicesToSearch = _filteredDevices;
+    List<AllDevicesModel> devicesToSearch = _devices;
 
     if (devicesToSearch.isNotEmpty) {
+      final searchText = event.deviceNameOrProductName?.toLowerCase() ?? '';
+
       final filteredDevices = devicesToSearch.where((device) {
         final matchesCommunity = event.community == null ||
             event.community!.isEmpty ||
@@ -304,31 +312,25 @@ class DeviceManagementBloc
                     ?.toLowerCase()
                     .contains(event.community!.toLowerCase()) ??
                 false);
+
         final matchesUnit = event.unitName == null ||
             event.unitName!.isEmpty ||
             (device.spaces != null &&
-                device.spaces!.isNotEmpty &&
-                device.spaces![0].spaceName!
-                    .toLowerCase()
-                    .contains(event.unitName!.toLowerCase()));
-        final matchesProductName = event.productName == null ||
-            event.productName!.isEmpty ||
-            (device.name
-                    ?.toLowerCase()
-                    .contains(event.productName!.toLowerCase()) ??
-                false);
-        final matchesDeviceName = event.productName == null ||
-            event.productName!.isEmpty ||
-            (device.categoryName
-                    ?.toLowerCase()
-                    .contains(event.productName!.toLowerCase()) ??
-                false);
+                device.spaces!.any((space) =>
+                    space.spaceName != null &&
+                    space.spaceName!
+                        .toLowerCase()
+                        .contains(event.unitName!.toLowerCase())));
 
-        return matchesCommunity &&
-            matchesUnit &&
-            (matchesProductName || matchesDeviceName);
+        final matchesSearchText = searchText.isEmpty ||
+            (device.name?.toLowerCase().contains(searchText) ?? false) ||
+            (device.productName?.toLowerCase().contains(searchText) ?? false);
+
+        return matchesCommunity && matchesUnit && matchesSearchText;
       }).toList();
 
+      _filteredDevices = filteredDevices;
+
       emit(DeviceManagementFiltered(
         filteredDevices: filteredDevices,
         selectedIndex: _selectedIndex,

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

@@ -38,18 +38,18 @@ class SelectedFilterChanged extends DeviceManagementEvent {
 class SearchDevices extends DeviceManagementEvent {
   final String? community;
   final String? unitName;
-  final String? productName;
+  final String? deviceNameOrProductName;
   final bool searchField;
 
   const SearchDevices({
     this.community,
     this.unitName,
-    this.productName,
+    this.deviceNameOrProductName,
     this.searchField = false,
   });
 
   @override
-  List<Object?> get props => [community, unitName, productName];
+  List<Object?> get props => [community, unitName, deviceNameOrProductName];
 }
 
 class SelectDevice extends DeviceManagementEvent {

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

@@ -6,6 +6,7 @@ import 'package:syncrow_web/pages/device_managment/all_devices/models/device_tag
 import 'package:syncrow_web/pages/device_managment/all_devices/models/room.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/unit.dart';
 import 'package:syncrow_web/pages/routines/models/ac/ac_function.dart';
+import 'package:syncrow_web/pages/routines/models/curtain/curtain_function.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/models/flush/flush_functions.dart';
 import 'package:syncrow_web/pages/routines/models/gang_switches/one_gang_switch/one_gang_switch.dart';
@@ -359,6 +360,14 @@ SOS
           uuid: uuid ?? '',
           name: name ?? '',
         );
+      case 'CUR':
+        return [
+          ControlCurtainFunction(
+            deviceId: uuid ?? '',
+            deviceName: name ?? '',
+            type: 'BOTH',
+          )
+        ];
       case 'NCPS':
         return [
           FlushPresenceDelayFunction(
@@ -441,15 +450,10 @@ SOS
           VoltageCStatusFunction(
               deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           CurrentCStatusFunction(
-              deviceId: uuid ?? '',
-              deviceName: name ?? '',
-              type: 'IF'), 
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
           PowerFactorCStatusFunction(
-              deviceId: uuid ?? '',
-              deviceName: name ?? '',
-              type: 'IF'), 
+              deviceId: uuid ?? '', deviceName: name ?? '', type: 'IF'),
         ];
-
       default:
         return [];
     }

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

@@ -62,7 +62,8 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
 
         final buttonLabel =
             (selectedDevices.length > 1) ? 'Batch Control' : 'Control';
-
+        final isAnyDeviceOffline =
+            selectedDevices.any((element) => !(element.online ?? false));
         return Row(
           children: [
             Expanded(child: SpaceTreeView(
@@ -103,8 +104,26 @@ class DeviceManagementBody extends StatelessWidget with HelperResponsiveLayout {
                                 decoration: containerDecoration,
                                 child: Center(
                                   child: DefaultButton(
+                                    backgroundColor: isAnyDeviceOffline
+                                        ? ColorsManager.primaryColor
+                                            .withValues(alpha: 0.1)
+                                        : null,
                                     onPressed: isControlButtonEnabled
                                         ? () {
+                                            if (isAnyDeviceOffline) {
+                                              ScaffoldMessenger.of(context)
+                                                  .showSnackBar(
+                                                const SnackBar(
+                                                  content: Text(
+                                                    'This Device is Offline',
+                                                  ),
+                                                  duration:
+                                                      Duration(seconds: 2),
+                                                ),
+                                              );
+                                              return;
+                                            }
+
                                             if (selectedDevices.length == 1) {
                                               showDialog(
                                                 context: context,

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

@@ -53,7 +53,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       controller: controller,
       onSubmitted: () {
         final searchDevicesEvent = SearchDevices(
-          productName: _productNameController.text,
+          deviceNameOrProductName: _productNameController.text,
           unitName: _unitNameController.text,
           searchField: true,
         );
@@ -68,7 +68,7 @@ class _DeviceSearchFiltersState extends State<DeviceSearchFilters>
       onSearch: () => context.read<DeviceManagementBloc>().add(
             SearchDevices(
               unitName: _unitNameController.text,
-              productName: _productNameController.text,
+              deviceNameOrProductName: _productNameController.text,
               searchField: true,
             ),
           ),

lib/pages/device_managment/door_lock/bloc/door_lock_bloc.dart

@@ -1,5 +1,3 @@
-// ignore_for_file: invalid_use_of_visible_for_testing_member
-
 import 'dart:async';
 import 'package:firebase_database/firebase_database.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -16,45 +14,38 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
 
   DoorLockBloc({required this.deviceId}) : super(DoorLockInitial()) {
     on<DoorLockFetchStatus>(_onFetchDeviceStatus);
-    //on<DoorLockControl>(_onDoorLockControl);
     on<UpdateLockEvent>(_updateLock);
     on<DoorLockFactoryReset>(_onFactoryReset);
     on<StatusUpdated>(_onStatusUpdated);
   }
 
-  _listenToChanges(deviceId) {
+  void _listenToChanges(String deviceId) {
     try {
-      DatabaseReference ref =
-          FirebaseDatabase.instance.ref('device-status/$deviceId');
-      Stream<DatabaseEvent> stream = ref.onValue;
+      final ref = FirebaseDatabase.instance.ref('device-status/$deviceId');
+      ref.onValue.listen((event) {
+        final data = event.snapshot.value;
+        if (data is Map) {
+          final statusData = data['status'] as List<dynamic>? ?? [];
+          final statusList = statusData.map((item) {
+            return Status(code: item['code'], value: item['value']);
+          }).toList();
 
-      stream.listen((DatabaseEvent event) {
-        Map<dynamic, dynamic> usersMap =
-            event.snapshot.value as Map<dynamic, dynamic>;
-
-        List<Status> statusList = [];
-        usersMap['status'].forEach((element) {
-          statusList
-              .add(Status(code: element['code'], value: element['value']));
-        });
-
-        deviceStatus =
-            DoorLockStatusModel.fromJson(usersMap['productUuid'], statusList);
-        if (!isClosed) {
-          add(StatusUpdated(deviceStatus));
+          final model =
+              DoorLockStatusModel.fromJson(data['productUuid'], statusList);
+          if (!isClosed) {
+            add(StatusUpdated(model));
+          }
         }
       });
     } catch (_) {}
   }
 
   void _onStatusUpdated(StatusUpdated event, Emitter<DoorLockState> emit) {
-    emit(DoorLockStatusLoading());
-
     deviceStatus = event.deviceStatus;
     emit(DoorLockStatusLoaded(deviceStatus));
   }
 
-  FutureOr<void> _onFetchDeviceStatus(
+  Future<void> _onFetchDeviceStatus(
       DoorLockFetchStatus event, Emitter<DoorLockState> emit) async {
     emit(DoorLockStatusLoading());
     try {
@@ -63,14 +54,13 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
       deviceStatus =
           DoorLockStatusModel.fromJson(event.deviceId, status.status);
       _listenToChanges(event.deviceId);
-
       emit(DoorLockStatusLoaded(deviceStatus));
     } catch (e) {
       emit(DoorLockControlError(e.toString()));
     }
   }
 
-  FutureOr<void> _updateLock(
+  Future<void> _updateLock(
       UpdateLockEvent event, Emitter<DoorLockState> emit) async {
     final oldValue = deviceStatus.normalOpenSwitch;
     deviceStatus = deviceStatus.copyWith(normalOpenSwitch: !oldValue);
@@ -78,7 +68,6 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
 
     try {
       final response = await DevicesManagementApi.openDoorLock(deviceId);
-
       if (!response) {
         _revertValueAndEmit(deviceId, 'normal_open_switch', oldValue, emit);
       }
@@ -88,35 +77,8 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
     }
   }
 
-  Future<void> _runDebounce({
-    required String deviceId,
-    required String code,
-    required dynamic value,
-    required dynamic oldValue,
-    required Emitter<DoorLockState> emit,
-  }) async {
-    if (_timer != null) {
-      _timer!.cancel();
-    }
-    _timer = Timer(const Duration(seconds: 1), () async {
-      try {
-        final response = await DevicesManagementApi()
-            .deviceControl(deviceId, Status(code: code, value: value));
-        if (!response) {
-          _revertValueAndEmit(deviceId, code, oldValue, emit);
-        }
-      } catch (e) {
-        _revertValueAndEmit(deviceId, code, oldValue, emit);
-      }
-    });
-  }
-
-  void _revertValueAndEmit(
-    String deviceId,
-    String code,
-    dynamic oldValue,
-    Emitter<DoorLockState> emit,
-  ) {
+  void _revertValueAndEmit(String deviceId, String code, dynamic oldValue,
+      Emitter<DoorLockState> emit) {
     _updateLocalValue(code, oldValue);
     emit(DoorLockStatusLoaded(deviceStatus));
     emit(const DoorLockControlError('Failed to control the device.'));
@@ -124,34 +86,23 @@ class DoorLockBloc extends Bloc<DoorLockEvent, DoorLockState> {
 
   void _updateLocalValue(String code, dynamic value) {
     switch (code) {
-      case 'reverse_lock':
-        if (value is bool) {
-          deviceStatus = deviceStatus.copyWith(reverseLock: value);
-        }
-        break;
       case 'normal_open_switch':
         if (value is bool) {
           deviceStatus = deviceStatus.copyWith(normalOpenSwitch: value);
         }
         break;
+      case 'reverse_lock':
+        if (value is bool) {
+          deviceStatus = deviceStatus.copyWith(reverseLock: value);
+        }
+        break;
       default:
         break;
     }
     emit(DoorLockStatusLoaded(deviceStatus));
   }
 
-  dynamic _getValueByCode(String code) {
-    switch (code) {
-      case 'reverse_lock':
-        return deviceStatus.reverseLock;
-      case 'normal_open_switch':
-        return deviceStatus.normalOpenSwitch;
-      default:
-        return null;
-    }
-  }
-
-  FutureOr<void> _onFactoryReset(
+  Future<void> _onFactoryReset(
       DoorLockFactoryReset event, Emitter<DoorLockState> emit) async {
     emit(DoorLockStatusLoading());
     try {

lib/pages/device_managment/door_lock/widget/door_button.dart

@@ -8,7 +8,7 @@ import 'package:syncrow_web/pages/device_managment/door_lock/models/door_lock_st
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
-class DoorLockButton extends StatefulWidget {
+class DoorLockButton extends StatelessWidget {
   const DoorLockButton({
     super.key,
     required this.doorLock,
@@ -18,70 +18,28 @@ class DoorLockButton extends StatefulWidget {
   final AllDevicesModel doorLock;
   final DoorLockStatusModel smartDoorModel;
 
-  @override
-  State<DoorLockButton> createState() =>
-      _DoorLockButtonState(smartDoorModel: smartDoorModel);
-}
-
-class _DoorLockButtonState extends State<DoorLockButton>
-    with SingleTickerProviderStateMixin {
-  late AnimationController _animationController;
-  late Animation<double> _animation;
-  DoorLockStatusModel smartDoorModel;
-
-  _DoorLockButtonState({required this.smartDoorModel});
-
-  @override
-  void initState() {
-    super.initState();
-    _animationController = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 500),
-    );
-    _animation = Tween<double>(begin: 0, end: 1).animate(_animationController)
-      ..addListener(() {
-        setState(() {});
-      });
-
-    if (smartDoorModel.unlockRequest > 0) {
-      _animationController.reverse(from: 1);
-    }
-  }
-
-  @override
-  void didUpdateWidget(covariant DoorLockButton oldWidget) {
-    super.didUpdateWidget(oldWidget);
-    if (oldWidget.smartDoorModel.normalOpenSwitch !=
-        widget.smartDoorModel.normalOpenSwitch) {
-      setState(() {
-        smartDoorModel = widget.smartDoorModel;
-      });
-
-      if (smartDoorModel.unlockRequest > 0) {
-        _animationController.forward(from: 0);
-      } else {
-        _animationController.reverse(from: 1);
-      }
-    }
-  }
-
-  @override
-  void dispose() {
-    _animationController.dispose();
-    super.dispose();
+  double _calculateProgress() {
+    final value = smartDoorModel.unlockRequest;
+    if (value <= 0 || value > 30) return 0;
+    return value / 30.0;
   }
 
   @override
   Widget build(BuildContext context) {
+    final progress = _calculateProgress();
+    final isEnabled = smartDoorModel.unlockRequest > 0;
+
     return SizedBox(
       width: 255,
       height: 255,
       child: InkWell(
-        onTap: () {
-          _animationController.forward(from: 0);
-          BlocProvider.of<DoorLockBloc>(context)
-              .add(UpdateLockEvent(value: !smartDoorModel.normalOpenSwitch));
-        },
+        onTap: isEnabled
+            ? () {
+                BlocProvider.of<DoorLockBloc>(context).add(
+                  UpdateLockEvent(value: !smartDoorModel.normalOpenSwitch),
+                );
+              }
+            : null,
         child: Container(
           width: 255,
           height: 255,
@@ -115,15 +73,16 @@ class _DoorLockButtonState extends State<DoorLockButton>
                   ),
                 ),
               ),
-              SizedBox.expand(
-                child: CircularProgressIndicator(
-                  value: _animation.value,
-                  strokeWidth: 8,
-                  backgroundColor: Colors.transparent,
-                  valueColor: const AlwaysStoppedAnimation<Color>(
-                      ColorsManager.primaryColor),
+              if (progress > 0)
+                SizedBox.expand(
+                  child: CircularProgressIndicator(
+                    value: progress,
+                    strokeWidth: 8,
+                    backgroundColor: Colors.transparent,
+                    valueColor: const AlwaysStoppedAnimation<Color>(
+                        ColorsManager.primaryColor),
+                  ),
                 ),
-              ),
             ],
           ),
         ),

lib/pages/device_managment/garage_door/helper/garage_door_helper.dart

@@ -4,8 +4,8 @@ import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_event.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/opening_clsoing_time_dialog_body.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/time_out_alarm_dialog_body.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/opening_clsoing_time_dialog_body.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/time_out_alarm_dialog_body.dart';
 import 'package:syncrow_web/pages/device_managment/shared/sensors_widgets/presence_display_data.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';

lib/pages/device_managment/garage_door/schedule_view/opening_clsoing_time_dialog_body.dart

@@ -1,14 +1,13 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/seconds_picker.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/seconds_picker.dart';
 
 class OpeningAndClosingTimeDialogBody extends StatefulWidget {
   final ValueChanged<int> onDurationChanged;
   final GarageDoorBloc bloc;
 
-  OpeningAndClosingTimeDialogBody({
+  const OpeningAndClosingTimeDialogBody({
     required this.onDurationChanged,
     required this.bloc,
   });

lib/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart

@@ -26,7 +26,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
         Table(
           border: TableBorder.all(
             color: ColorsManager.graysColor,
-            borderRadius: const BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
+            borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
           ),
           children: [
             TableRow(
@@ -50,17 +50,20 @@ class ScheduleGarageTableWidget extends StatelessWidget {
         BlocBuilder<GarageDoorBloc, GarageDoorState>(
           builder: (context, state) {
             if (state is ScheduleGarageLoadingState) {
-              return const SizedBox(height: 200, child: Center(child: CircularProgressIndicator()));
+              return const SizedBox(
+                  height: 200,
+                  child: Center(child: CircularProgressIndicator()));
             }
-            if (state is GarageDoorLoadedState && state.status.schedules?.isEmpty == true) {
+            if (state is GarageDoorLoadedState &&
+                state.status.schedules!.isEmpty) {
               return _buildEmptyState(context);
             } else if (state is GarageDoorLoadedState) {
               return Container(
                   height: 200,
                   decoration: BoxDecoration(
                     border: Border.all(color: ColorsManager.graysColor),
-                    borderRadius:
-                        const BorderRadius.only(bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
+                    borderRadius: const BorderRadius.vertical(
+                        bottom: Radius.circular(20)),
                   ),
                   child: _buildTableBody(state, context));
             }
@@ -78,7 +81,7 @@ class ScheduleGarageTableWidget extends StatelessWidget {
       height: 200,
       decoration: BoxDecoration(
         border: Border.all(color: ColorsManager.graysColor),
-        borderRadius: const BorderRadius.only(bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
+        borderRadius: const BorderRadius.vertical(top: Radius.circular(20)),
       ),
       child: Center(
         child: Column(
@@ -112,7 +115,8 @@ class ScheduleGarageTableWidget extends StatelessWidget {
           children: [
             if (state.status.schedules != null)
               for (int i = 0; i < state.status.schedules!.length; i++)
-                _buildScheduleRow(state.status.schedules![i], i, context, state),
+                _buildScheduleRow(
+                    state.status.schedules![i], i, context, state),
           ],
         ),
       ),
@@ -134,7 +138,8 @@ class ScheduleGarageTableWidget extends StatelessWidget {
     );
   }
 
-  TableRow _buildScheduleRow(ScheduleModel schedule, int index, BuildContext context, GarageDoorLoadedState state) {
+  TableRow _buildScheduleRow(ScheduleModel schedule, int index,
+      BuildContext context, GarageDoorLoadedState state) {
     return TableRow(
       children: [
         Center(
@@ -152,7 +157,8 @@ class ScheduleGarageTableWidget extends StatelessWidget {
               width: 24,
               height: 24,
               child: schedule.enable
-                  ? const Icon(Icons.radio_button_checked, color: ColorsManager.blueColor)
+                  ? const Icon(Icons.radio_button_checked,
+                      color: ColorsManager.blueColor)
                   : const Icon(
                       Icons.radio_button_unchecked,
                       color: ColorsManager.grayColor,
@@ -160,7 +166,9 @@ class ScheduleGarageTableWidget extends StatelessWidget {
             ),
           ),
         ),
-        Center(child: Text(_getSelectedDays(ScheduleModel.parseSelectedDays(schedule.days)))),
+        Center(
+            child: Text(_getSelectedDays(
+                ScheduleModel.parseSelectedDays(schedule.days)))),
         Center(child: Text(formatIsoStringToTime(schedule.time, context))),
         Center(child: Text(schedule.function.value ? 'On' : 'Off')),
         Center(
@@ -170,18 +178,24 @@ class ScheduleGarageTableWidget extends StatelessWidget {
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  GarageDoorDialogHelper.showAddGarageDoorScheduleDialog(context,
-                      schedule: schedule, index: index, isEdit: true);
+                  GarageDoorDialogHelper.showAddGarageDoorScheduleDialog(
+                      context,
+                      schedule: schedule,
+                      index: index,
+                      isEdit: true);
                 },
                 child: Text(
                   'Edit',
-                  style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blueColor),
+                  style: context.textTheme.bodySmall!
+                      .copyWith(color: ColorsManager.blueColor),
                 ),
               ),
               TextButton(
                 style: TextButton.styleFrom(padding: EdgeInsets.zero),
                 onPressed: () {
-                  context.read<GarageDoorBloc>().add(DeleteGarageDoorScheduleEvent(
+                  context
+                      .read<GarageDoorBloc>()
+                      .add(DeleteGarageDoorScheduleEvent(
                         index: index,
                         scheduleId: schedule.scheduleId,
                         deviceId: state.status.uuid,
@@ -189,7 +203,8 @@ class ScheduleGarageTableWidget extends StatelessWidget {
                 },
                 child: Text(
                   'Delete',
-                  style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.blueColor),
+                  style: context.textTheme.bodySmall!
+                      .copyWith(color: ColorsManager.blueColor),
                 ),
               ),
             ],

lib/pages/device_managment/garage_door/schedule_view/schedule_garage_managment_ui.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule__garage_table.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule__garage_table.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 

lib/pages/device_managment/garage_door/schedule_view/schedule_garage_view.dart

@@ -4,9 +4,9 @@ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/helper/garage_door_helper.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_header.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_managment_ui.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_header.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_managment_ui.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_mode_buttons.dart';
 
 class BuildGarageDoorScheduleView extends StatefulWidget {
   const BuildGarageDoorScheduleView({super.key, required this.status});

lib/pages/device_managment/garage_door/view/garage_door_control_view.dart

@@ -5,7 +5,7 @@ import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_
 import 'package:syncrow_web/pages/device_managment/garage_door/bloc/garage_door_state.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/helper/garage_door_helper.dart';
 import 'package:syncrow_web/pages/device_managment/garage_door/models/garage_door_model.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_view.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_view.dart';
 import 'package:syncrow_web/pages/device_managment/shared/icon_name_status_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/table/report_table.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';

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

@@ -3,11 +3,14 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/bloc/one_gang_glass_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/factories/one_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_g_glass_switch/models/once_gang_glass_status_model.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
+class OneGangGlassSwitchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const OneGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -16,7 +19,8 @@ class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiv
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
+          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+            ..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
         builder: (context, state) {
           if (state is OneGangGlassSwitchLoading) {
@@ -33,7 +37,8 @@ class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiv
     );
   }
 
-  Widget _buildStatusControls(BuildContext context, OneGangGlassStatusModel status) {
+  Widget _buildStatusControls(
+      BuildContext context, OneGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -76,14 +81,21 @@ class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiv
           onChange: (value) {},
           showToggle: false,
         ),
-        ToggleWidget(
-          value: false,
-          code: '',
-          deviceId: deviceId,
-          label: 'Scheduling',
-          icon: Assets.scheduling,
-          onChange: (value) {},
-          showToggle: false,
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<OneGangGlassSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        category: 'switch_1',
+                        deviceUuid: deviceId,
+                      ),
+                    ));
+          },
+          mainText: '',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
         ),
       ],
     );

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

@@ -5,7 +5,10 @@ import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_lig
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/bloc/wall_light_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/factories/wall_light_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/one_gang_switch/models/wall_light_status_model.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class WallLightDeviceControl extends StatelessWidget
@@ -55,7 +58,6 @@ class WallLightDeviceControl extends StatelessWidget
         mainAxisSpacing: 12,
       ),
       children: [
-        const SizedBox(),
         ToggleWidget(
           value: status.switch1,
           code: 'switch_1',
@@ -69,7 +71,22 @@ class WallLightDeviceControl extends StatelessWidget
                 ));
           },
         ),
-        const SizedBox(),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<WallLightSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        category: 'switch_1',
+                        deviceUuid: deviceId,
+                      ),
+                    ));
+          },
+          mainText: '',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
       ],
     );
   }

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

@@ -12,7 +12,8 @@ import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 //Smart Power Clamp
-class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayout {
+class SmartPowerDeviceControl extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const SmartPowerDeviceControl({super.key, required this.deviceId});
@@ -145,13 +146,16 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                       children: [
                         IconButton(
                           icon: const Icon(Icons.arrow_left),
-                          onPressed: () {
-                            blocProvider.add(SmartPowerArrowPressedEvent(-1));
-                            pageController.previousPage(
-                              duration: const Duration(milliseconds: 300),
-                              curve: Curves.easeInOut,
-                            );
-                          },
+                          onPressed: blocProvider.currentPage <= 0
+                              ? null
+                              : () {
+                                  blocProvider
+                                      .add(SmartPowerArrowPressedEvent(-1));
+                                  pageController.previousPage(
+                                    duration: const Duration(milliseconds: 300),
+                                    curve: Curves.easeInOut,
+                                  );
+                                },
                         ),
                         Text(
                           currentPage == 0
@@ -165,13 +169,16 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                         ),
                         IconButton(
                           icon: const Icon(Icons.arrow_right),
-                          onPressed: () {
-                            blocProvider.add(SmartPowerArrowPressedEvent(1));
-                            pageController.nextPage(
-                              duration: const Duration(milliseconds: 300),
-                              curve: Curves.easeInOut,
-                            );
-                          },
+                          onPressed: blocProvider.currentPage >= 3
+                              ? null
+                              : () {
+                                  blocProvider
+                                      .add(SmartPowerArrowPressedEvent(1));
+                                  pageController.nextPage(
+                                    duration: const Duration(milliseconds: 300),
+                                    curve: Curves.easeInOut,
+                                  );
+                                },
                         ),
                       ],
                     ),
@@ -195,8 +202,8 @@ class SmartPowerDeviceControl extends StatelessWidget with HelperResponsiveLayou
                             blocProvider.add(SelectDateEvent(context: context));
                             blocProvider.add(FilterRecordsByDateEvent(
                                 selectedDate: blocProvider.dateTime!,
-                                viewType:
-                                    blocProvider.views[blocProvider.currentIndex]));
+                                viewType: blocProvider
+                                    .views[blocProvider.currentIndex]));
                           },
                           widget: blocProvider.dateSwitcher(),
                           chartData: blocProvider.energyDataList.isNotEmpty

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

@@ -0,0 +1,597 @@
+import 'dart:async';
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/services/control_device_service.dart';
+import 'package:syncrow_web/services/devices_mang_api.dart';
+part 'schedule_event.dart';
+part 'schedule_state.dart';
+
+class ScheduleBloc extends Bloc<ScheduleEvent, ScheduleState> {
+  final String deviceId;
+
+  ScheduleBloc({
+    required this.deviceId,
+  }) : super(ScheduleInitial()) {
+    on<ScheduleInitializeAddEvent>(_initializeAddSchedule);
+    on<ScheduleUpdateSelectedTimeEvent>(_updateSelectedTime);
+    on<ScheduleUpdateSelectedDayEvent>(_updateSelectedDay);
+    on<ScheduleUpdateFunctionOnEvent>(_updateFunctionOn);
+    on<ScheduleGetEvent>(_getSchedule);
+    on<ScheduleAddEvent>(_onAddSchedule);
+    on<ScheduleEditEvent>(_onEditSchedule);
+    on<ScheduleUpdateEntryEvent>(_onUpdateSchedule);
+    on<UpdateScheduleModeEvent>(_onUpdateScheduleMode);
+    on<UpdateCountdownTimeEvent>(_onUpdateCountdownTime);
+    on<UpdateInchingTimeEvent>(_onUpdateInchingTime);
+    on<StartScheduleEvent>(_onStartScheduleEvent);
+    on<StopScheduleEvent>(_onStopScheduleEvent);
+    on<ScheduleDecrementCountdownEvent>(_onDecrementCountdown);
+    on<ScheduleFetchStatusEvent>(_fetchStatus);
+    on<ScheduleDeleteEvent>(_onDeleteSchedule);
+  }
+  Timer? _countdownTimer;
+  Duration countdownRemaining = Duration.zero;
+
+  Future<void> _onStopScheduleEvent(
+    StopScheduleEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+
+      final success = await RemoteControlDeviceService().controlDevice(
+        deviceUuid: deviceId,
+        status: Status(
+          code: 'countdown_1',
+          value: 0,
+        ),
+      );
+      if (success) {
+        _countdownTimer?.cancel();
+        if (event.mode == ScheduleModes.countdown) {
+          emit(currentState.copyWith(
+            countdownHours: 0,
+            countdownMinutes: 0,
+            isCountdownActive: false,
+            countdownRemaining: Duration.zero,
+          ));
+        } else if (event.mode == ScheduleModes.inching) {
+          emit(currentState.copyWith(
+            inchingHours: 0,
+            inchingMinutes: 0,
+            isInchingActive: false,
+            countdownRemaining: Duration.zero,
+          ));
+        }
+      } else {
+        emit(const ScheduleError('Failed to stop schedule'));
+      }
+    }
+  }
+
+  void _onUpdateScheduleMode(
+    UpdateScheduleModeEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        scheduleMode: event.scheduleMode,
+        countdownRemaining: Duration.zero,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        isCountdownActive: false,
+        isInchingActive: false,
+      ));
+    }
+  }
+
+  void _onUpdateCountdownTime(
+    UpdateCountdownTimeEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        countdownSeconds: event.seconds,
+        countdownHours: event.hours,
+        countdownMinutes: event.minutes,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        countdownRemaining: Duration.zero,
+      ));
+    }
+  }
+
+  void _onUpdateInchingTime(
+    UpdateInchingTimeEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        inchingHours: event.hours,
+        inchingMinutes: event.minutes,
+        countdownRemaining: Duration.zero,
+        inchingSeconds: 0, // Add this
+      ));
+    }
+  }
+
+  void _initializeAddSchedule(
+    ScheduleInitializeAddEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        selectedTime: event.selectedTime,
+        selectedDays: event.selectedDays ?? List.filled(7, false),
+        functionOn: event.functionOn ?? false,
+        isEditing: event.isEditing,
+        scheduleMode: event.scheduleMode,
+        countdownRemaining: Duration.zero,
+      ));
+    } else {
+      emit(ScheduleLoaded(
+        schedules: const [],
+        selectedTime: event.selectedTime,
+        selectedDays: event.selectedDays ?? List.filled(7, false),
+        functionOn: event.functionOn ?? false,
+        isEditing: event.isEditing,
+        deviceId: deviceId,
+        scheduleMode: event.scheduleMode,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        isCountdownActive: false,
+        isInchingActive: false,
+      ));
+    }
+  }
+
+  void _updateSelectedTime(
+    ScheduleUpdateSelectedTimeEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        selectedTime: event.selectedTime,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        countdownRemaining: Duration.zero,
+      ));
+    }
+  }
+
+  void _updateSelectedDay(
+    ScheduleUpdateSelectedDayEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      final updatedDays = List<bool>.from(currentState.selectedDays);
+      updatedDays[event.index] = event.value;
+      emit(currentState.copyWith(
+        selectedDays: updatedDays,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        countdownRemaining: Duration.zero,
+      ));
+    }
+  }
+
+  void _updateFunctionOn(
+    ScheduleUpdateFunctionOnEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        functionOn: event.isOn,
+        countdownHours: 0,
+        countdownMinutes: 0,
+        inchingHours: 0,
+        inchingMinutes: 0,
+        countdownRemaining: Duration.zero,
+      ));
+    }
+  }
+
+  Future<void> _getSchedule(
+    ScheduleGetEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    try {
+      emit(ScheduleLoading());
+      final schedules = await DevicesManagementApi().getDeviceSchedules(
+        deviceId,
+        event.category,
+      );
+
+      if (state is ScheduleLoaded) {
+        final currentState = state as ScheduleLoaded;
+        emit(currentState.copyWith(
+          schedules: schedules,
+          selectedTime: null,
+          selectedDays: List.filled(7, false),
+          functionOn: false,
+          isEditing: false,
+          countdownRemaining: Duration.zero,
+        ));
+      } else {
+        emit(ScheduleLoaded(
+          schedules: schedules,
+          selectedTime: null,
+          selectedDays: List.filled(7, false),
+          functionOn: false,
+          isEditing: false,
+          deviceId: deviceId,
+          scheduleMode: ScheduleModes.schedule,
+          countdownHours: 0,
+          countdownMinutes: 0,
+          inchingHours: 0,
+          inchingMinutes: 0,
+          isCountdownActive: false,
+          isInchingActive: false,
+        ));
+      }
+    } catch (e) {
+      emit(ScheduleError('Failed to load schedules: $e'));
+    }
+  }
+
+  Future<void> _onAddSchedule(
+    ScheduleAddEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    try {
+      if (state is ScheduleLoaded) {
+        final dateTime = DateTime.parse(event.time);
+        final success = await DevicesManagementApi().postSchedule(
+            category: event.category,
+            deviceId: deviceId,
+            time: getTimeStampWithoutSeconds(dateTime).toString(),
+            code: event.category,
+            value: event.functionOn,
+            days: event.selectedDays);
+        if (success) {
+          add(ScheduleGetEvent(category: event.category));
+        } else {
+          emit(const ScheduleError('Failed to add schedule'));
+        }
+      }
+    } catch (e) {
+      emit(ScheduleError('Failed to add schedule: $e'));
+    }
+  }
+
+  Future<void> _onEditSchedule(
+    ScheduleEditEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    try {
+      if (state is ScheduleLoaded) {
+        final dateTime = DateTime.parse(event.time);
+        final updatedSchedule = ScheduleEntry(
+          scheduleId: event.scheduleId,
+          category: event.category,
+          time: getTimeStampWithoutSeconds(dateTime).toString(),
+          function: Status(code: event.category, value: event.functionOn),
+          days: event.selectedDays,
+        );
+        final success = await DevicesManagementApi().editScheduleRecord(
+          deviceId,
+          updatedSchedule,
+        );
+
+        if (success) {
+          add(ScheduleGetEvent(
+            category: event.category,
+          ));
+        } else {
+          emit(const ScheduleError('Failed to update schedule'));
+        }
+      }
+    } catch (e) {
+      emit(ScheduleError('Failed to update schedule: $e'));
+    }
+  }
+
+  Future<void> _onUpdateSchedule(
+    ScheduleUpdateEntryEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    try {
+      if (state is ScheduleLoaded) {
+        final currentState = state as ScheduleLoaded;
+
+        final updatedSchedules = currentState.schedules.map((schedule) {
+          if (schedule.scheduleId == event.scheduleId) {
+            return schedule.copyWith(
+              function: Status(code: event.category, value: event.functionOn),
+              enable: event.enable,
+            );
+          }
+          return schedule;
+        }).toList();
+
+        final success = await DevicesManagementApi().updateScheduleRecord(
+          enable: event.enable,
+          uuid: deviceId,
+          scheduleId: event.scheduleId,
+        );
+
+        if (success) {
+          emit(currentState.copyWith(
+            schedules: updatedSchedules,
+            countdownHours: 0,
+            countdownMinutes: 0,
+            inchingHours: 0,
+            inchingMinutes: 0,
+            countdownRemaining: Duration.zero,
+          ));
+        } else {
+          emit(const ScheduleError('Failed to update schedule status'));
+        }
+      }
+    } catch (e) {
+      emit(ScheduleError('Failed to update schedule: $e'));
+    }
+  }
+
+  Future<void> _onDeleteSchedule(
+    ScheduleDeleteEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    try {
+      if (state is ScheduleLoaded) {
+        final currentState = state as ScheduleLoaded;
+        final success = await DevicesManagementApi().deleteScheduleRecord(
+          deviceId,
+          event.scheduleId,
+        );
+
+        if (success) {
+          final updatedSchedules = currentState.schedules
+              .where((s) => s.scheduleId != event.scheduleId)
+              .toList();
+          emit(currentState.copyWith(
+            schedules: updatedSchedules,
+            countdownHours: 0,
+            countdownMinutes: 0,
+            inchingHours: 0,
+            inchingMinutes: 0,
+            countdownRemaining: Duration.zero,
+          ));
+        } else {
+          emit(const ScheduleError('Failed to delete schedule'));
+        }
+      }
+    } catch (e) {
+      emit(ScheduleError('Failed to delete schedule: $e'));
+    }
+  }
+
+  Duration? _currentCountdown;
+
+  Future<void> _onStartScheduleEvent(
+    StartScheduleEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    if (state is ScheduleLoaded) {
+      final totalSeconds =
+          Duration(hours: event.hours, minutes: event.minutes).inSeconds;
+      final code = event.mode == ScheduleModes.countdown
+          ? 'countdown_1'
+          : 'switch_inching';
+      final currentState = state as ScheduleLoaded;
+      final duration = Duration(seconds: totalSeconds);
+      _currentCountdown = duration;
+      emit(currentState.copyWith(
+        countdownRemaining: duration,
+        schedules: currentState.schedules.map((schedule) {
+          if (schedule.function.code == code) {
+            return schedule.copyWith(
+              function: Status(code: code, value: totalSeconds),
+            );
+          }
+          return schedule;
+        }).toList(),
+        countdownHours: event.mode == ScheduleModes.countdown ? event.hours : 0,
+      ));
+
+      final success = await RemoteControlDeviceService().controlDevice(
+        deviceUuid: deviceId,
+        status: Status(
+          code: code,
+          value: totalSeconds,
+        ),
+      );
+
+      if (success) {
+        if (code == 'countdown_1') {
+          final countdownDuration = Duration(seconds: totalSeconds);
+
+          emit(
+            currentState.copyWith(
+              countdownHours: countdownDuration.inHours,
+              countdownMinutes: countdownDuration.inMinutes % 60,
+              countdownRemaining: countdownDuration,
+              isCountdownActive: true,
+              countdownSeconds: countdownDuration.inSeconds,
+            ),
+          );
+
+          if (countdownDuration.inSeconds > 0) {
+            _startCountdownTimer(emit, countdownDuration);
+          } else {
+            _countdownTimer?.cancel();
+            emit(
+              currentState.copyWith(
+                countdownHours: 0,
+                countdownMinutes: 0,
+                countdownRemaining: Duration.zero,
+                isCountdownActive: false,
+                countdownSeconds: 0,
+              ),
+            );
+          }
+        } else if (code == 'switch_inching') {
+          final inchingDuration = Duration(seconds: totalSeconds);
+          emit(
+            currentState.copyWith(
+              inchingHours: inchingDuration.inHours,
+              inchingMinutes: inchingDuration.inMinutes % 60,
+              isInchingActive: true,
+              countdownRemaining: inchingDuration,
+              countdownSeconds: inchingDuration.inSeconds,
+            ),
+          );
+        }
+      }
+    }
+  }
+
+  void _startCountdownTimer(
+    Emitter<ScheduleState> emit,
+    Duration duration,
+  ) {
+    _countdownTimer?.cancel();
+    _countdownTimer = Timer.periodic(const Duration(seconds: 1), (timer) {
+      if (_currentCountdown != null && _currentCountdown! > Duration.zero) {
+        _currentCountdown = _currentCountdown! - const Duration(seconds: 1);
+        countdownRemaining = _currentCountdown!;
+        add(const ScheduleDecrementCountdownEvent());
+      } else {
+        timer.cancel();
+        add(StopScheduleEvent(
+          mode: _currentCountdown == null
+              ? ScheduleModes.countdown
+              : ScheduleModes.inching,
+          deviceId: deviceId,
+        ));
+      }
+    });
+  }
+
+  void _onDecrementCountdown(
+    ScheduleDecrementCountdownEvent event,
+    Emitter<ScheduleState> emit,
+  ) {
+    if (state is ScheduleLoaded) {
+      final currentState = state as ScheduleLoaded;
+      emit(currentState.copyWith(
+        countdownRemaining: countdownRemaining,
+      ));
+    }
+  }
+
+  @override
+  Future<void> close() {
+    _countdownTimer?.cancel();
+    return super.close();
+  }
+
+  Future<void> _fetchStatus(
+    ScheduleFetchStatusEvent event,
+    Emitter<ScheduleState> emit,
+  ) async {
+    emit(ScheduleLoading());
+
+    try {
+      final status =
+          await DevicesManagementApi().getDeviceStatus(event.deviceId);
+      print(status.status);
+      final deviceStatus =
+          WaterHeaterStatusModel.fromJson(event.deviceId, status.status);
+
+      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;
+
+      Duration? countdownRemaining;
+      var isCountdownActive = false;
+      var isInchingActive = false;
+
+      if (isCountdown) {
+        countdownRemaining = Duration(
+          hours: deviceStatus.countdownHours,
+          minutes: deviceStatus.countdownMinutes,
+        );
+        isCountdownActive = countdownRemaining > Duration.zero;
+      } else if (isInching) {
+        isInchingActive = Duration(
+              hours: deviceStatus.inchingHours,
+              minutes: deviceStatus.inchingMinutes,
+            ) >
+            Duration.zero;
+      }
+      if (state is ScheduleLoaded) {
+        final currentState = state as ScheduleLoaded;
+        emit(currentState.copyWith(
+          scheduleMode: scheduleMode,
+          countdownHours: deviceStatus.countdownHours,
+          countdownMinutes: deviceStatus.countdownMinutes,
+          inchingHours: deviceStatus.inchingHours,
+          inchingMinutes: deviceStatus.inchingMinutes,
+          isCountdownActive: isCountdownActive,
+          isInchingActive: isInchingActive,
+          countdownRemaining: 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'));
+    }
+  }
+
+  String extractTime(String isoDateTime) {
+    return isoDateTime.split('T')[1].split('.')[0];
+  }
+
+  int? getTimeStampWithoutSeconds(DateTime? dateTime) {
+    if (dateTime == null) return null;
+    DateTime dateTimeWithoutSeconds = DateTime(dateTime.year, dateTime.month,
+        dateTime.day, dateTime.hour, dateTime.minute);
+    return dateTimeWithoutSeconds.millisecondsSinceEpoch ~/ 1000;
+  }
+}

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

@@ -0,0 +1,234 @@
+part of 'schedule_bloc.dart';
+
+abstract class ScheduleEvent extends Equatable {
+  const ScheduleEvent();
+}
+
+class ScheduleInitializeAddEvent extends ScheduleEvent {
+  final bool isEditing;
+  final ScheduleModes scheduleMode;
+  final TimeOfDay? selectedTime;
+  final List<bool>? selectedDays;
+  final bool? functionOn;
+
+  const ScheduleInitializeAddEvent({
+    required this.isEditing,
+    required this.scheduleMode,
+    this.selectedTime,
+    this.selectedDays,
+    this.functionOn,
+  });
+
+  @override
+  List<Object?> get props => [
+        isEditing,
+        scheduleMode,
+        selectedTime,
+        selectedDays,
+        functionOn,
+      ];
+}
+
+class ScheduleUpdateSelectedTimeEvent extends ScheduleEvent {
+  final TimeOfDay selectedTime;
+
+  const ScheduleUpdateSelectedTimeEvent(this.selectedTime);
+
+  @override
+  List<Object> get props => [selectedTime];
+}
+
+class ScheduleUpdateSelectedDayEvent extends ScheduleEvent {
+  final int index;
+  final bool value;
+
+  const ScheduleUpdateSelectedDayEvent(this.index, this.value);
+
+  @override
+  List<Object> get props => [index, value];
+}
+
+class ScheduleUpdateFunctionOnEvent extends ScheduleEvent {
+  final bool isOn;
+
+  const ScheduleUpdateFunctionOnEvent(this.isOn);
+
+  @override
+  List<Object> get props => [isOn];
+}
+
+class ScheduleGetEvent extends ScheduleEvent {
+  final String category;
+
+  const ScheduleGetEvent({required this.category});
+
+  @override
+  List<Object> get props => [category];
+}
+
+class ScheduleAddEvent extends ScheduleEvent {
+  final String category;
+  final String time;
+  final List<String> selectedDays;
+  final bool functionOn;
+
+  const ScheduleAddEvent({
+    required this.category,
+    required this.time,
+    required this.selectedDays,
+    required this.functionOn,
+  });
+
+  @override
+  List<Object> get props => [category, time, selectedDays, functionOn];
+}
+
+class ScheduleEditEvent extends ScheduleEvent {
+  final String scheduleId;
+  final String category;
+  final String time;
+  final List<String> selectedDays;
+  final bool functionOn;
+
+  const ScheduleEditEvent({
+    required this.scheduleId,
+    required this.category,
+    required this.time,
+    required this.selectedDays,
+    required this.functionOn,
+  });
+
+  @override
+  List<Object> get props => [
+        scheduleId,
+        category,
+        time,
+        selectedDays,
+        functionOn,
+      ];
+}
+
+class ScheduleDeleteEvent extends ScheduleEvent {
+  final String scheduleId;
+
+  const ScheduleDeleteEvent(this.scheduleId);
+
+  @override
+  List<Object> get props => [scheduleId];
+}
+
+class ScheduleUpdateEntryEvent extends ScheduleEvent {
+  final String scheduleId;
+  final bool functionOn;
+  final bool enable;
+  final String category;
+
+  const ScheduleUpdateEntryEvent({
+    required this.scheduleId,
+    required this.functionOn,
+    required this.enable,
+    required this.category,
+  });
+
+  @override
+  List<Object> get props => [scheduleId, functionOn, enable, category];
+}
+
+class UpdateScheduleModeEvent extends ScheduleEvent {
+  final ScheduleModes scheduleMode;
+
+  const UpdateScheduleModeEvent({required this.scheduleMode});
+
+  @override
+  List<Object> get props => [scheduleMode];
+}
+
+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, seconds];
+}
+
+class UpdateInchingTimeEvent extends ScheduleEvent {
+  final int hours;
+  final int minutes;
+
+  const UpdateInchingTimeEvent({
+    required this.hours,
+    required this.minutes,
+  });
+
+  @override
+  List<Object> get props => [hours, minutes];
+}
+
+class StartScheduleEvent extends ScheduleEvent {
+  final ScheduleModes mode;
+  final int hours;
+  final int minutes;
+
+  const StartScheduleEvent({
+    required this.mode,
+    required this.hours,
+    required this.minutes,
+  });
+
+  @override
+  List<Object?> get props => [mode, hours, minutes];
+}
+
+class StopScheduleEvent extends ScheduleEvent {
+  final ScheduleModes mode;
+  final String deviceId;
+
+  const StopScheduleEvent({
+    required this.mode,
+    required this.deviceId,
+  });
+
+  @override
+  List<Object?> get props => [mode, deviceId];
+}
+
+class ScheduleDecrementCountdownEvent extends ScheduleEvent {
+  const ScheduleDecrementCountdownEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class ScheduleFetchStatusEvent extends ScheduleEvent {
+  final String deviceId;
+
+  const ScheduleFetchStatusEvent(this.deviceId);
+
+  @override
+  List<Object> get props => [deviceId];
+}
+
+class DeleteScheduleEvent extends ScheduleEvent {
+  final String scheduleId;
+
+  const DeleteScheduleEvent(this.scheduleId);
+
+  @override
+  List<Object> get props => [scheduleId];
+}
+
+class StatusUpdatedScheduleEvent extends ScheduleEvent {
+  final String id;
+
+  const StatusUpdatedScheduleEvent(this.id);
+
+  @override
+  List<Object> get props => [id];
+}

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

@@ -0,0 +1,120 @@
+part of 'schedule_bloc.dart';
+
+abstract class ScheduleState extends Equatable {
+  const ScheduleState();
+}
+
+class ScheduleInitial extends ScheduleState {
+  @override
+  List<Object> get props => [];
+}
+
+class ScheduleLoading extends ScheduleState {
+  @override
+  List<Object> get props => [];
+}
+
+class ScheduleLoaded extends ScheduleState {
+  final List<ScheduleModel> schedules;
+  final TimeOfDay? selectedTime;
+  final List<bool> selectedDays;
+  final bool functionOn;
+  final bool isEditing;
+  final String deviceId;
+  final int countdownHours;
+  final int countdownMinutes;
+  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,
+    required this.functionOn,
+    required this.isEditing,
+    required this.deviceId,
+    this.countdownHours = 0,
+    this.countdownMinutes = 0,
+    this.isCountdownActive = false,
+    this.inchingHours = 0,
+    this.inchingMinutes = 0,
+    this.isInchingActive = false,
+    this.scheduleMode = ScheduleModes.countdown,
+    this.countdownRemaining,
+  });
+
+  ScheduleLoaded copyWith({
+    List<ScheduleModel>? schedules,
+    TimeOfDay? selectedTime,
+    List<bool>? selectedDays,
+    bool? functionOn,
+    bool? isEditing,
+    int? countdownHours,
+    int? countdownMinutes,
+    bool? isCountdownActive,
+    int? inchingHours,
+    int? inchingMinutes,
+    bool? isInchingActive,
+    ScheduleModes? scheduleMode,
+    Duration? countdownRemaining,
+    String? deviceId,
+    int? countdownSeconds,
+    int? inchingSeconds,
+  }) {
+    return ScheduleLoaded(
+      schedules: schedules ?? this.schedules,
+      selectedTime: selectedTime ?? this.selectedTime,
+      selectedDays: selectedDays ?? this.selectedDays,
+      functionOn: functionOn ?? this.functionOn,
+      isEditing: isEditing ?? this.isEditing,
+      deviceId: deviceId ?? this.deviceId,
+      countdownHours: countdownHours ?? this.countdownHours,
+      countdownMinutes: countdownMinutes ?? this.countdownMinutes,
+      isCountdownActive: isCountdownActive ?? this.isCountdownActive,
+      inchingHours: inchingHours ?? this.inchingHours,
+      inchingMinutes: inchingMinutes ?? this.inchingMinutes,
+      isInchingActive: isInchingActive ?? this.isInchingActive,
+      scheduleMode: scheduleMode ?? this.scheduleMode,
+      countdownRemaining: countdownRemaining ?? this.countdownRemaining,
+      countdownSeconds: countdownSeconds ?? this.countdownSeconds,
+      inchingSeconds: inchingSeconds ?? this.inchingSeconds,
+    );
+  }
+
+  @override
+  List<Object?> get props => [
+        schedules,
+        selectedTime,
+        selectedDays,
+        functionOn,
+        isEditing,
+        deviceId,
+        countdownHours,
+        countdownMinutes,
+        isCountdownActive,
+        inchingHours,
+        inchingMinutes,
+        isInchingActive,
+        scheduleMode,
+        countdownRemaining,
+        countdownSeconds,
+        inchingSeconds,
+      ];
+}
+
+class ScheduleError extends ScheduleState {
+  final String error;
+
+  const ScheduleError(this.error);
+
+  @override
+  List<Object> get props => [error];
+}

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

@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class CountdownModeButtons extends StatelessWidget {
@@ -38,14 +39,10 @@ class CountdownModeButtons extends StatelessWidget {
               ? DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context
-                        .read<WaterHeaterBloc>()
-                        .add(StopScheduleEvent(deviceId));
-                    context.read<WaterHeaterBloc>().add(
-                          ToggleWaterHeaterEvent(
+                    context.read<ScheduleBloc>().add(
+                          StopScheduleEvent(
+                            mode: ScheduleModes.countdown,
                             deviceId: deviceId,
-                            code: 'countdown_1',
-                            value: 0,
                           ),
                         );
                   },
@@ -55,12 +52,11 @@ class CountdownModeButtons extends StatelessWidget {
               : DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context.read<WaterHeaterBloc>().add(
-                          ToggleWaterHeaterEvent(
-                            deviceId: deviceId,
-                            code: 'countdown_1',
-                            value: Duration(hours: hours, minutes: minutes)
-                                .inSeconds,
+                    context.read<ScheduleBloc>().add(
+                          StartScheduleEvent(
+                            mode: ScheduleModes.countdown,
+                            hours: hours,
+                            minutes: minutes,
                           ),
                         );
                   },

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

@@ -0,0 +1,239 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class CountdownInchingView extends StatefulWidget {
+  final String deviceId;
+  const CountdownInchingView({super.key, required this.deviceId});
+
+  @override
+  State<CountdownInchingView> createState() => _CountdownInchingViewState();
+}
+
+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, int displaySeconds) {
+    if (_lastHours != displayHours) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (_hoursController.hasClients) {
+          _hoursController.jumpToItem(displayHours);
+        }
+      });
+      _lastHours = displayHours;
+    }
+    if (_lastMinutes != displayMinutes) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (_minutesController.hasClients) {
+          _minutesController.jumpToItem(displayMinutes);
+        }
+      });
+      _lastMinutes = displayMinutes;
+    }
+    // Update seconds controller
+    if (_lastSeconds != displaySeconds) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (_secondsController.hasClients) {
+          _secondsController.jumpToItem(displaySeconds);
+        }
+      });
+      _lastSeconds = displaySeconds;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    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;
+        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);
+
+        _updateControllers(displayHours, displayMinutes, displaySeconds!);
+
+        if (displayHours == 0 && displayMinutes == 0 && displaySeconds == 0) {
+          context.read<ScheduleBloc>().add(
+                StopScheduleEvent(
+                  mode: ScheduleModes.countdown,
+                  deviceId: widget.deviceId,
+                ),
+              );
+        }
+
+        return Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Text(
+              isCountDown ? 'Countdown:' : 'Inching:',
+              style: context.textTheme.bodySmall!.copyWith(
+                fontSize: 13,
+                color: ColorsManager.grayColor,
+              ),
+            ),
+            const SizedBox(height: 8),
+            Visibility(
+              visible: !isCountDown,
+              child: const Text(
+                'Once enabled this feature, each time the device is turned on, '
+                'it will automatically turn off after a preset time.',
+              ),
+            ),
+            const SizedBox(height: 8),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                _buildPickerColumn(
+                  context,
+                  'h',
+                  displayHours,
+                  100,
+                  _hoursController,
+                  (value) {
+                    if (!isActive) {
+                      context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
+                            hours: value,
+                            minutes: displayMinutes,
+                            seconds: displaySeconds,
+                          ));
+                    }
+                  },
+                  isActive: isActive,
+                ),
+                const SizedBox(width: 10),
+                _buildPickerColumn(
+                  context,
+                  'm',
+                  displayMinutes,
+                  60,
+                  _minutesController,
+                  (value) {
+                    if (!isActive) {
+                      context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
+                            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,
+                  ),
+              ],
+            ),
+          ],
+        );
+      },
+    );
+  }
+
+  Widget _buildPickerColumn(
+    BuildContext context,
+    String label,
+    int initialValue,
+    int itemCount,
+    FixedExtentScrollController controller,
+    ValueChanged<int> onSelected, {
+    required bool isActive,
+  }) {
+    return Row(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        Container(
+          height: 40,
+          width: 80,
+          padding: const EdgeInsets.symmetric(horizontal: 16),
+          decoration: BoxDecoration(
+            color: ColorsManager.boxColor,
+            borderRadius: BorderRadius.circular(8),
+          ),
+          child: ListWheelScrollView.useDelegate(
+            controller: controller,
+            itemExtent: 40.0,
+            physics: isActive
+                ? const NeverScrollableScrollPhysics()
+                : const FixedExtentScrollPhysics(),
+            onSelectedItemChanged: isActive ? null : onSelected,
+            childDelegate: ListWheelChildBuilderDelegate(
+              builder: (context, index) {
+                return Center(
+                  child: Text(
+                    index.toString().padLeft(2, '0'),
+                    style: TextStyle(
+                      fontSize: 24,
+                      color: isActive ? ColorsManager.grayColor : Colors.black,
+                    ),
+                  ),
+                );
+              },
+              childCount: itemCount,
+            ),
+          ),
+        ),
+        const SizedBox(width: 8),
+        Text(
+          label,
+          style: const TextStyle(
+            color: ColorsManager.grayColor,
+            fontSize: 18,
+          ),
+        ),
+      ],
+    );
+  }
+}

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

@@ -1,8 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart'
+    hide StopScheduleEvent;
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class InchingModeButtons extends StatelessWidget {
@@ -38,15 +41,9 @@ class InchingModeButtons extends StatelessWidget {
               ? DefaultButton(
                   height: 40,
                   onPressed: () {
-                    context
-                        .read<WaterHeaterBloc>()
-                        .add(StopScheduleEvent(deviceId));
-                    context.read<WaterHeaterBloc>().add(
-                          ToggleWaterHeaterEvent(
-                            deviceId: deviceId,
-                            code: 'switch_inching',
-                            value: 0,
-                          ),
+                    context.read<ScheduleBloc>().add(
+                          StopScheduleEvent(
+                              deviceId: deviceId, mode: ScheduleModes.inching),
                         );
                   },
                   backgroundColor: Colors.red,

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

@@ -0,0 +1,112 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/count_down_button.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/count_down_inching_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/inching_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_header.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_managment_ui.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_mode_selector.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+
+class BuildScheduleView extends StatelessWidget {
+  const BuildScheduleView(
+      {super.key, required this.deviceUuid, required this.category});
+  final String deviceUuid;
+  final String category;
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => ScheduleBloc(
+        deviceId: deviceUuid,
+      )
+        ..add(ScheduleGetEvent(category: category))
+        ..add(ScheduleFetchStatusEvent(deviceUuid)),
+      child: Dialog(
+        backgroundColor: Colors.white,
+        insetPadding: const EdgeInsets.all(20),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
+        child: SizedBox(
+          width: 700,
+          child: SingleChildScrollView(
+            child: Padding(
+              padding:
+                  const EdgeInsets.symmetric(horizontal: 40.0, vertical: 20),
+              child: BlocBuilder<ScheduleBloc, ScheduleState>(
+                builder: (context, state) {
+                  if (state is ScheduleLoaded) {
+                    return Column(
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        const ScheduleHeader(),
+                        const SizedBox(height: 20),
+                        ScheduleModeSelector(
+                          currentMode: state.scheduleMode,
+                        ),
+                        const SizedBox(height: 20),
+                        if (state.scheduleMode == ScheduleModes.schedule)
+                          ScheduleManagementUI(
+                            category: category,
+                            deviceUuid: deviceUuid,
+                            onAddSchedule: () async {
+                              final entry = await ScheduleDialogHelper
+                                  .showAddScheduleDialog(
+                                context,
+                                schedule: null,
+                                isEdit: false,
+                              );
+                              if (entry != null) {
+                                context.read<ScheduleBloc>().add(
+                                      ScheduleAddEvent(
+                                        category: entry.category,
+                                        time: entry.time,
+                                        functionOn: entry.function.value,
+                                        selectedDays: entry.days,
+                                      ),
+                                    );
+                              }
+                            },
+                          ),
+                        if (state.scheduleMode == ScheduleModes.countdown ||
+                            state.scheduleMode == ScheduleModes.inching)
+                           CountdownInchingView(
+                            deviceId: deviceUuid,
+                          ),
+                        const SizedBox(height: 20),
+                        if (state.scheduleMode == ScheduleModes.countdown)
+                          CountdownModeButtons(
+                            isActive: state.isCountdownActive,
+                            deviceId: deviceUuid,
+                            hours: state.countdownHours,
+                            minutes: state.countdownMinutes,
+                          ),
+                        if (state.scheduleMode == ScheduleModes.inching)
+                          InchingModeButtons(
+                            isActive: state.isInchingActive,
+                            deviceId: deviceUuid,
+                            hours: state.inchingHours,
+                            minutes: state.inchingMinutes,
+                          ),
+                        if (state.scheduleMode != ScheduleModes.countdown &&
+                            state.scheduleMode != ScheduleModes.inching)
+                          ScheduleModeButtons(
+                            onSave: () => Navigator.pop(context),
+                          ),
+                      ],
+                    );
+                  }
+                  return const Center(child: CircularProgressIndicator());
+                },
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,72 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class ScheduleControlButton extends StatelessWidget {
+  final VoidCallback onTap;
+  final String mainText;
+  final String subtitle;
+  final String iconPath;
+
+  const ScheduleControlButton({
+    super.key,
+    required this.onTap,
+    required this.mainText,
+    required this.subtitle,
+    required this.iconPath,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: DeviceControlsContainer(
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Container(
+              width: 60,
+              height: 60,
+              decoration: const BoxDecoration(
+                shape: BoxShape.circle,
+                color: ColorsManager.whiteColors,
+              ),
+              margin: const EdgeInsets.symmetric(horizontal: 4),
+              padding: const EdgeInsets.all(12),
+              child: ClipOval(
+                child: SvgPicture.asset(
+                  iconPath,
+                  fit: BoxFit.fill,
+                ),
+              ),
+            ),
+            const Spacer(),
+            Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Text(
+                  mainText,
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.titleMedium!.copyWith(
+                        fontWeight: FontWeight.w200,
+                        fontSize: 12,
+                        color: ColorsManager.blackColor,
+                      ),
+                ),
+                Text(
+                  subtitle,
+                  textAlign: TextAlign.center,
+                  style: Theme.of(context).textTheme.titleMedium!.copyWith(
+                        fontWeight: FontWeight.w400,
+                        color: ColorsManager.blackColor,
+                      ),
+                ),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

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

@@ -1,18 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_table.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_table.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ScheduleManagementUI extends StatelessWidget {
-  final WaterHeaterDeviceStatusLoaded state;
-  final Function onAddSchedule;
+  final String deviceUuid; 
+  final VoidCallback onAddSchedule;
+  final String category;
 
   const ScheduleManagementUI({
     super.key,
-    required this.state,
+    required this.deviceUuid,
     required this.onAddSchedule,
+    this.category = 'switch_1',
   });
 
   @override
@@ -28,7 +29,7 @@ class ScheduleManagementUI extends StatelessWidget {
             padding: 2,
             backgroundColor: ColorsManager.graysColor,
             borderRadius: 15,
-            onPressed: () => onAddSchedule(),
+            onPressed: onAddSchedule,
             child: Row(
               children: [
                 const Icon(Icons.add, color: ColorsManager.primaryColor),
@@ -43,7 +44,7 @@ class ScheduleManagementUI extends StatelessWidget {
           ),
         ),
         const SizedBox(height: 20),
-        ScheduleTableWidget(state: state),
+        ScheduleTableWidget(deviceUuid: deviceUuid, category: category),
       ],
     );
   }

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

@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class ScheduleModeSelector extends StatelessWidget {
+  final ScheduleModes currentMode;
+
+  const ScheduleModeSelector({
+    super.key,
+    required this.currentMode,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    final currentMode = context.select<ScheduleBloc, ScheduleModes>(
+      (bloc) => bloc.state is ScheduleLoaded &&
+              (bloc.state as ScheduleLoaded).scheduleMode != null
+          ? (bloc.state as ScheduleLoaded).scheduleMode
+          : ScheduleModes.schedule,
+    );
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Text(
+          'Type:',
+          style: context.textTheme.bodySmall!.copyWith(
+            fontSize: 13,
+            color: ColorsManager.grayColor,
+          ),
+        ),
+        const SizedBox(height: 4),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          children: [
+            _buildRadioTile(
+                context, 'Countdown', ScheduleModes.countdown, currentMode),
+            _buildRadioTile(
+                context, 'Schedule', ScheduleModes.schedule, currentMode),
+            // _buildRadioTile(
+            //     context, 'Circulate', ScheduleModes.circulate, currentMode),
+            // _buildRadioTile(
+            //     context, 'Inching', ScheduleModes.inching, currentMode),
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget _buildRadioTile(
+    BuildContext context,
+    String label,
+    ScheduleModes mode,
+    ScheduleModes currentMode,
+  ) {
+    return Flexible(
+      child: ListTile(
+        contentPadding: EdgeInsets.zero,
+        title: Text(
+          label,
+          style: context.textTheme.bodySmall!.copyWith(
+            fontSize: 13,
+            color: ColorsManager.blackColor,
+          ),
+        ),
+        leading: Radio<ScheduleModes>(
+          value: mode,
+          groupValue: currentMode,
+          onChanged: (ScheduleModes? value) {
+            if (value != null) {
+              context.read<ScheduleBloc>().add(
+                    UpdateScheduleModeEvent(scheduleMode: value),
+                  );
+              if (value == ScheduleModes.schedule) {
+                context.read<ScheduleBloc>().add(
+                      const ScheduleGetEvent(category: 'switch_1'),
+                    );
+              }
+            }
+          },
+        ),
+      ),
+    );
+  }
+}

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

@@ -0,0 +1,283 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/bloc/schedule_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+import 'package:syncrow_web/utils/format_date_time.dart';
+
+class ScheduleTableWidget extends StatelessWidget {
+  final String deviceUuid;
+  final String category;
+
+  const ScheduleTableWidget({
+    super.key,
+    required this.deviceUuid,
+    this.category = 'switch_1',
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (_) => ScheduleBloc(
+        deviceId: deviceUuid,
+      )..add(ScheduleGetEvent(category: category)),
+      child: _ScheduleTableView(),
+    );
+  }
+}
+
+class _ScheduleTableView extends StatelessWidget {
+  const _ScheduleTableView();
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      children: [
+        Table(
+          border: TableBorder.all(
+            color: ColorsManager.graysColor,
+            borderRadius: const BorderRadius.only(
+                topLeft: Radius.circular(20), topRight: Radius.circular(20)),
+          ),
+          children: [
+            TableRow(
+              decoration: const BoxDecoration(
+                color: ColorsManager.boxColor,
+                borderRadius: BorderRadius.only(
+                  topLeft: Radius.circular(20),
+                  topRight: Radius.circular(20),
+                ),
+              ),
+              children: [
+                _buildTableHeader('Active'),
+                _buildTableHeader('Days'),
+                _buildTableHeader('Time'),
+                _buildTableHeader('Function'),
+                _buildTableHeader('Action'),
+              ],
+            ),
+          ],
+        ),
+        BlocBuilder<ScheduleBloc, ScheduleState>(
+          builder: (context, state) {
+            if (state is ScheduleLoading) {
+              return const SizedBox(
+                  height: 200,
+                  child: Center(child: CircularProgressIndicator()));
+            }
+            if (state is ScheduleLoaded && state.schedules.isEmpty) {
+              return _buildEmptyState(context);
+            }
+            if (state is ScheduleLoaded) {
+              return Container(
+                  height: 200,
+                  decoration: BoxDecoration(
+                    border: Border.all(color: ColorsManager.graysColor),
+                    borderRadius: const BorderRadius.only(
+                        bottomLeft: Radius.circular(20),
+                        bottomRight: Radius.circular(20)),
+                  ),
+                  child: _buildTableBody(state.schedules, context));
+            }
+            if (state is ScheduleError) {
+              return Center(child: Text(state.error));
+            }
+            return const SizedBox(height: 200);
+          },
+        ),
+      ],
+    );
+  }
+
+  Widget _buildEmptyState(BuildContext context) {
+    return Container(
+      height: 200,
+      decoration: BoxDecoration(
+        border: Border.all(color: ColorsManager.graysColor),
+        borderRadius: const BorderRadius.only(
+            bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
+      ),
+      child: Center(
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            SvgPicture.asset(Assets.emptyRecords, width: 40, height: 40),
+            const SizedBox(height: 8),
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Text(
+                'No schedules added yet',
+                style: Theme.of(context).textTheme.bodySmall!.copyWith(
+                      fontSize: 13,
+                      color: ColorsManager.grayColor,
+                    ),
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTableBody(List<ScheduleModel> schedules, BuildContext context) {
+    return SizedBox(
+      height: 200,
+      child: SingleChildScrollView(
+        child: Table(
+          border: TableBorder.all(color: ColorsManager.graysColor),
+          defaultVerticalAlignment: TableCellVerticalAlignment.middle,
+          children: [
+            for (int i = 0; i < schedules.length; i++)
+              _buildScheduleRow(schedules[i], i, context),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildTableHeader(String label) {
+    return TableCell(
+      child: Padding(
+        padding: const EdgeInsets.all(12),
+        child: Text(
+          label,
+          style: const TextStyle(
+            fontSize: 13,
+            color: ColorsManager.grayColor,
+          ),
+        ),
+      ),
+    );
+  }
+
+  TableRow _buildScheduleRow(
+      ScheduleModel schedule, int index, BuildContext context) {
+    return TableRow(
+      children: [
+        Center(
+          child: GestureDetector(
+            behavior: HitTestBehavior.opaque,
+            onTap: () {
+              context.read<ScheduleBloc>().add(
+                    ScheduleUpdateEntryEvent(
+                      category: schedule.category,
+                      scheduleId: schedule.scheduleId,
+                      functionOn: schedule.function.value,
+                      enable: !schedule.enable,
+                    ),
+                  );
+            },
+            child: Center(
+              child: SizedBox(
+                width: 24,
+                height: 24,
+                child: schedule.enable
+                    ? const Icon(Icons.radio_button_checked,
+                        color: ColorsManager.blueColor)
+                    : const Icon(Icons.radio_button_unchecked,
+                        color: ColorsManager.grayColor),
+              ),
+            ),
+          ),
+        ),
+        Center(
+            child: Text(_getSelectedDays(
+                ScheduleModel.parseSelectedDays(schedule.days)))),
+        Center(child: Text(formatIsoStringToTime(schedule.time, context))),
+        Center(child: Text(schedule.function.value ? 'On' : 'Off')),
+        Center(
+          child: Wrap(
+            runAlignment: WrapAlignment.center,
+            children: [
+              TextButton(
+                style: TextButton.styleFrom(padding: EdgeInsets.zero),
+                onPressed: () {
+                  ScheduleDialogHelper.showAddScheduleDialog(
+                    context,
+                    schedule: ScheduleEntry.fromScheduleModel(schedule),
+                    isEdit: true,
+                  ).then((updatedSchedule) {
+                    if (updatedSchedule != null) {
+                      context.read<ScheduleBloc>().add(
+                            ScheduleEditEvent(
+                                scheduleId: schedule.scheduleId,
+                                category: schedule.category,
+                                time: updatedSchedule.time,
+                                functionOn: updatedSchedule.function.value,
+                                selectedDays: updatedSchedule.days),
+                          );
+                    }
+                  });
+                },
+                child: Text(
+                  'Edit',
+                  style: Theme.of(context)
+                      .textTheme
+                      .bodySmall!
+                      .copyWith(color: ColorsManager.blueColor),
+                ),
+              ),
+              TextButton(
+                style: TextButton.styleFrom(padding: EdgeInsets.zero),
+                onPressed: () async {
+                  final confirmed = await showDialog<bool>(
+                    context: context,
+                    builder: (BuildContext dialogContext) {
+                      return AlertDialog(
+                        title: const Text('Confirm Delete'),
+                        content: const Text(
+                            'Are you sure you want to delete this schedule?'),
+                        actions: [
+                          TextButton(
+                            onPressed: () =>
+                                Navigator.of(dialogContext).pop(false),
+                            child: Text('Cancel'),
+                          ),
+                          TextButton(
+                            onPressed: () =>
+                                Navigator.of(dialogContext).pop(true),
+                            child: const Text(
+                              'Delete',
+                              style: TextStyle(color: Colors.red),
+                            ),
+                          ),
+                        ],
+                      );
+                    },
+                  );
+
+                  if (confirmed == true) {
+                    context.read<ScheduleBloc>().add(
+                          ScheduleDeleteEvent(schedule.scheduleId),
+                        );
+                  }
+                },
+                child: Text(
+                  'Delete',
+                  style: Theme.of(context)
+                      .textTheme
+                      .bodySmall!
+                      .copyWith(color: ColorsManager.blueColor),
+                ),
+              )
+            ],
+          ),
+        ),
+      ],
+    );
+  }
+
+  String _getSelectedDays(List<bool> selectedDays) {
+    const days = ScheduleDialogHelper.allDays;
+    return selectedDays
+        .asMap()
+        .entries
+        .where((entry) => entry.value)
+        .map((entry) => days[entry.key])
+        .join(', ');
+  }
+}

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/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart

@@ -1,14 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/bloc/three_gang_glass_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/three_g_glass_switch/factories/three_gang_glass_switch_bloc_factory.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
-
 import '../models/three_gang_glass_switch.dart';
 
-class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
+class ThreeGangGlassSwitchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   final String deviceId;
 
   const ThreeGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -17,7 +19,8 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperRespons
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
+          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+            ..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
         builder: (context, state) {
           if (state is ThreeGangGlassSwitchLoading) {
@@ -34,7 +37,8 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperRespons
     );
   }
 
-  Widget _buildStatusControls(BuildContext context, ThreeGangGlassStatusModel status) {
+  Widget _buildStatusControls(
+      BuildContext context, ThreeGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -98,6 +102,54 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperRespons
                 );
           },
         ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<ThreeGangGlassSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        category: 'switch_1',
+                        deviceUuid: deviceId,
+                      ),
+                    ));
+          },
+          mainText: 'Wall Light',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<ThreeGangGlassSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        category: 'switch_2',
+                        deviceUuid: deviceId,
+                      ),
+                    ));
+          },
+          mainText: 'Ceiling Light',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<ThreeGangGlassSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        category: 'switch_3',
+                        deviceUuid: deviceId,
+                      ),
+                    ));
+          },
+          mainText: 'SpotLight',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
         ToggleWidget(
           value: false,
           code: '',
@@ -107,15 +159,6 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperRespons
           onChange: (value) {},
           showToggle: false,
         ),
-        ToggleWidget(
-          value: false,
-          code: '',
-          deviceId: deviceId,
-          label: 'Scheduling',
-          icon: Assets.scheduling,
-          onChange: (value) {},
-          showToggle: false,
-        ),
       ],
     );
   }

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

@@ -1,9 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/bloc/living_room_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/factories/living_room_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/three_gang_switch/models/living_room_model.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class LivingRoomDeviceControlsView extends StatelessWidget
@@ -90,6 +93,54 @@ class LivingRoomDeviceControlsView extends StatelessWidget
                 );
           },
         ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<LivingRoomBloc>(context),
+                      child: BuildScheduleView(
+                        deviceUuid: deviceId,
+                        category: 'switch_1',
+                      ),
+                    ));
+          },
+          mainText: 'Wall Light',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<LivingRoomBloc>(context),
+                      child: BuildScheduleView(
+                        deviceUuid: deviceId,
+                        category: 'switch_2',
+                      ),
+                    ));
+          },
+          mainText: 'Ceiling Light',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<LivingRoomBloc>(context),
+                      child: BuildScheduleView(
+                        deviceUuid: deviceId,
+                        category: 'switch_3',
+                      ),
+                    ));
+          },
+          mainText: 'Spotlight',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
       ],
     );
   }

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

@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/bloc/two_gang_glass_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_g_glass_switch/factories/two_gang_glass_switch_bloc_factory.dart';
@@ -16,8 +18,9 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
-          ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
+        create: (context) =>
+            TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+              ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
         child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
           builder: (context, state) {
             if (state is TwoGangGlassSwitchLoading) {
@@ -92,14 +95,37 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
           onChange: (value) {},
           showToggle: false,
         ),
-        ToggleWidget(
-          value: false,
-          code: '',
-          deviceId: deviceId,
-          label: 'Scheduling',
-          icon: Assets.scheduling,
-          onChange: (value) {},
-          showToggle: false,
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        deviceUuid: deviceId,
+                        category: 'switch_1',
+                      ),
+                    ));
+          },
+          mainText: 'Wall Light',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
+        ScheduleControlButton(
+          onTap: () {
+            showDialog<void>(
+                context: context,
+                builder: (ctx) => BlocProvider.value(
+                      value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
+                      child: BuildScheduleView(
+                        deviceUuid: deviceId,
+                        category: 'switch_2',
+                      ),
+                    ));
+          },
+          mainText: 'Ceiling Light',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
         ),
       ],
     );

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

@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/factory_reset_model.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/batch_control/factory_reset.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
@@ -8,9 +10,11 @@ import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayout {
+class TwoGangBatchControlView extends StatelessWidget
+    with HelperResponsiveLayout {
   const TwoGangBatchControlView({super.key, required this.deviceIds});
 
   final List<String> deviceIds;
@@ -18,15 +22,17 @@ class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayou
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
-        ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
+      create: (context) =>
+          TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
+            ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
       child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
         builder: (context, state) {
           if (state is TwoGangSwitchLoading) {
             return const Center(child: CircularProgressIndicator());
           } else if (state is TwoGangSwitchStatusLoaded) {
             return _buildStatusControls(context, state.status);
-          } else if (state is TwoGangSwitchError || state is TwoGangSwitchControlError) {
+          } else if (state is TwoGangSwitchError ||
+              state is TwoGangSwitchControlError) {
             return const Center(child: Text('Error fetching status'));
           } else {
             return const Center(child: CircularProgressIndicator());
@@ -82,6 +88,39 @@ class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayou
                   ));
             },
           ),
+          ScheduleControlButton(
+            onTap: () {
+              showDialog<void>(
+                  context: context,
+                  builder: (ctx) => BlocProvider.value(
+                        value: BlocProvider.of<TwoGangSwitchBloc>(context),
+                        child: BuildScheduleView(
+                          category: 'switch_1',
+                          deviceUuid: deviceIds.first,
+                        ),
+                      ));
+            },
+            mainText: 'Wall Light',
+            subtitle: 'Scheduling',
+            iconPath: Assets.scheduling,
+          ),
+
+          ScheduleControlButton(
+            onTap: () {
+              showDialog<void>(
+                  context: context,
+                  builder: (ctx) => BlocProvider.value(
+                        value: BlocProvider.of<TwoGangSwitchBloc>(context),
+                        child: BuildScheduleView(
+                          category: 'switch_2',
+                          deviceUuid: deviceIds.first,
+                        ),
+                      ));
+            },
+            mainText: 'Ceiling Light',
+            subtitle: 'Scheduling',
+            iconPath: Assets.scheduling,
+          ),
           // FirmwareUpdateWidget(
           //   deviceId: deviceIds.first,
           //   version: 12,

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

@@ -1,11 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_event.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/bloc/two_gang_switch_state.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/factories/two_gang_switch_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/two_gang_switch/models/two_gang_status_model.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
 class TwoGangDeviceControlView extends StatelessWidget
@@ -37,43 +40,101 @@ class TwoGangDeviceControlView extends StatelessWidget
 
   Widget _buildStatusControls(BuildContext context, TwoGangStatusModel status) {
     return Center(
-      child: Wrap(
-        alignment: WrapAlignment.center,
-        spacing: 12,
-        runSpacing: 12,
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.center,
+        mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          SizedBox(
-            width: 200,
-            child: ToggleWidget(
-              value: status.switch1,
-              code: 'switch_1',
-              deviceId: deviceId,
-              label: 'Wall Light',
-              onChange: (value) {
-                context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                      deviceId: deviceId,
-                      code: 'switch_1',
-                      value: value,
-                    ));
-              },
-            ),
-          ),
-          SizedBox(
-            width: 200,
-            child: ToggleWidget(
-              value: status.switch2,
-              code: 'switch_2',
-              deviceId: deviceId,
-              label: 'Ceiling Light',
-              onChange: (value) {
-                context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
-                      deviceId: deviceId,
-                      code: 'switch_2',
-                      value: value,
-                    ));
-              },
-            ),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SizedBox(
+                width: 200,
+                height: 150,
+                child: ToggleWidget(
+                  value: status.switch1,
+                  code: 'switch_1',
+                  deviceId: deviceId,
+                  label: 'Wall Light',
+                  onChange: (value) {
+                    context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
+                          deviceId: deviceId,
+                          code: 'switch_1',
+                          value: value,
+                        ));
+                  },
+                ),
+              ),
+              const SizedBox(width: 10),
+              SizedBox(
+                width: 200,
+                height: 150,
+                child: ToggleWidget(
+                  value: status.switch2,
+                  code: 'switch_2',
+                  deviceId: deviceId,
+                  label: 'Ceiling Light',
+                  onChange: (value) {
+                    context.read<TwoGangSwitchBloc>().add(TwoGangSwitchControl(
+                          deviceId: deviceId,
+                          code: 'switch_2',
+                          value: value,
+                        ));
+                  },
+                ),
+              ),
+            ],
           ),
+          const SizedBox(height: 20),
+          Row(
+            crossAxisAlignment: CrossAxisAlignment.center,
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              SizedBox(
+                width: 200,
+                height: 150,
+                child: ScheduleControlButton(
+                  onTap: () {
+                    showDialog<void>(
+                        context: context,
+                        builder: (ctx) => BlocProvider.value(
+                              value:
+                                  BlocProvider.of<TwoGangSwitchBloc>(context),
+                              child: BuildScheduleView(
+                                deviceUuid: deviceId,
+                                category: 'switch_1',
+                              ),
+                            ));
+                  },
+                  mainText: 'Wall Light',
+                  subtitle: 'Scheduling',
+                  iconPath: Assets.scheduling,
+                ),
+              ),
+              const SizedBox(width: 10),
+              SizedBox(
+                width: 200,
+                height: 150,
+                child: ScheduleControlButton(
+                  onTap: () {
+                    showDialog<void>(
+                        context: context,
+                        builder: (ctx) => BlocProvider.value(
+                              value:
+                                  BlocProvider.of<TwoGangSwitchBloc>(context),
+                              child: BuildScheduleView(
+                                deviceUuid: deviceId,
+                                category: 'switch_2',
+                              ),
+                            ));
+                  },
+                  mainText: 'Ceiling Light',
+                  subtitle: 'Scheduling',
+                  iconPath: Assets.scheduling,
+                ),
+              ),
+            ],
+          )
         ],
       ),
     );

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

@@ -1,240 +1,210 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.dart';
 
 class ScheduleDialogHelper {
-  static void showAddScheduleDialog(BuildContext context, {ScheduleModel? schedule, int? index, bool? isEdit}) {
-    final bloc = context.read<WaterHeaterBloc>();
+  static const List<String> allDays = [
+    'Sun',
+    'Mon',
+    'Tue',
+    'Wed',
+    'Thu',
+    'Fri',
+    'Sat'
+  ];
 
-    if (schedule == null) {
-      bloc.add((const UpdateSelectedTimeEvent(null)));
-      bloc.add(InitializeAddScheduleEvent(
-        selectedTime: null,
-        selectedDays: List.filled(7, false),
-        functionOn: false,
-        isEditing: false,
-      ));
-    } else {
-      final time = _convertStringToTimeOfDay(schedule.time);
-      final selectedDays = _convertDaysStringToBooleans(schedule.days);
+  static Future<ScheduleEntry?> showAddScheduleDialog(
+    BuildContext context, {
+    ScheduleEntry? schedule,
+    bool isEdit = false,
+  }) {
+    final initialTime = schedule != null
+        ? _convertStringToTimeOfDay(schedule.time)
+        : TimeOfDay.now();
+    final initialDays = schedule != null
+        ? _convertDaysStringToBooleans(schedule.days)
+        : List.filled(7, false);
+    bool? functionOn = schedule?.function.value ?? true;
+    TimeOfDay selectedTime = initialTime;
+    List<bool> selectedDays = List.of(initialDays);
 
-      bloc.add(InitializeAddScheduleEvent(
-        selectedTime: time,
-        selectedDays: selectedDays,
-        functionOn: schedule.function.value,
-        isEditing: true,
-        index: index,
-      ));
-    }
-
-    showDialog(
+    return showDialog<ScheduleEntry>(
       context: context,
       builder: (ctx) {
-        return BlocProvider.value(
-          value: bloc,
-          child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
-            builder: (context, state) {
-              if (state is WaterHeaterDeviceStatusLoaded) {
-                return AlertDialog(
-                  shape: RoundedRectangleBorder(
-                    borderRadius: BorderRadius.circular(20),
-                  ),
-                  content: Column(
-                    mainAxisSize: MainAxisSize.min,
-                    crossAxisAlignment: CrossAxisAlignment.start,
+        return StatefulBuilder(
+          builder: (ctx, setState) {
+            return AlertDialog(
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(20),
+              ),
+              content: Column(
+                mainAxisSize: MainAxisSize.min,
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
-                      Row(
-                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                        children: [
-                          const SizedBox(),
-                          Text(
-                            'Scheduling',
-                            style: context.textTheme.titleLarge!.copyWith(
-                              color: ColorsManager.dialogBlueTitle,
+                      const SizedBox(),
+                      Text(
+                        isEdit ? 'Edit Schedule' : 'Add Schedule',
+                        style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                              color: Colors.blue,
                               fontWeight: FontWeight.bold,
                             ),
-                          ),
-                          const SizedBox(),
-                        ],
                       ),
-                      const SizedBox(height: 24),
-                      SizedBox(
-                        width: 150,
-                        height: 40,
-                        child: DefaultButton(
-                          padding: 8,
-                          backgroundColor: ColorsManager.boxColor,
-                          borderRadius: 15,
-                          onPressed: () async {
-                            TimeOfDay? time = await showTimePicker(
-                              context: context,
-                              initialTime: state.selectedTime ?? TimeOfDay.now(),
-                              builder: (context, child) {
-                                return Theme(
-                                  data: Theme.of(context).copyWith(
-                                    colorScheme: const ColorScheme.light(
-                                      primary: ColorsManager.primaryColor,
-                                    ),
-                                  ),
-                                  child: child!,
-                                );
-                              },
-                            );
-                            if (time != null) {
-                              bloc.add(UpdateSelectedTimeEvent(time));
-                            }
-                          },
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: [
-                              Text(
-                                state.selectedTime == null ? 'Time' : state.selectedTime!.format(context),
-                                style: context.textTheme.bodySmall!.copyWith(
-                                  color: ColorsManager.grayColor,
-                                ),
-                              ),
-                              const Icon(
-                                Icons.access_time,
-                                color: ColorsManager.grayColor,
-                                size: 18,
-                              ),
-                            ],
-                          ),
-                        ),
-                      ),
-                      const SizedBox(height: 16),
-                      _buildDayCheckboxes(context, state.selectedDays, isEdit: isEdit),
-                      const SizedBox(height: 16),
-                      _buildFunctionSwitch(context, state.functionOn, isEdit),
+                      const SizedBox(),
                     ],
                   ),
-                  actions: [
-                    SizedBox(
-                      width: 200,
-                      child: DefaultButton(
-                        height: 40,
-                        onPressed: () {
-                          Navigator.pop(context);
-                        },
-                        backgroundColor: ColorsManager.boxColor,
-                        child: Text(
-                          'Cancel',
-                          style: context.textTheme.bodyMedium,
+                  const SizedBox(height: 24),
+                  SizedBox(
+                    width: 150,
+                    height: 40,
+                    child: ElevatedButton(
+                      style: ElevatedButton.styleFrom(
+                        backgroundColor: Colors.grey[200],
+                        shape: RoundedRectangleBorder(
+                          borderRadius: BorderRadius.circular(15),
                         ),
                       ),
-                    ),
-                    SizedBox(
-                      width: 200,
-                      child: DefaultButton(
-                        height: 40,
-                        onPressed: () {
-                          if (state.selectedTime != null) {
-                            if (state.isEditing && index != null) {
-                              bloc.add(EditWaterHeaterScheduleEvent(
-                                scheduleId: schedule?.scheduleId ?? '',
-                                category: 'switch_1',
-                                time: state.selectedTime!,
-                                selectedDays: state.selectedDays,
-                                functionOn: state.functionOn,
-                              ));
-                            } else {
-                              bloc.add(AddScheduleEvent(
-                                category: 'switch_1',
-                                time: state.selectedTime!,
-                                selectedDays: state.selectedDays,
-                                functionOn: state.functionOn,
-                              ));
-                            }
-                            Navigator.pop(context);
-                          }
-                        },
-                        backgroundColor: ColorsManager.primaryColor,
-                        child: const Text('Save'),
+                      onPressed: () async {
+                        TimeOfDay? time = await showTimePicker(
+                          context: ctx,
+                          initialTime: selectedTime,
+                        );
+                        if (time != null) {
+                          setState(() => selectedTime = time);
+                        }
+                      },
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                        children: [
+                          Text(
+                            selectedTime.format(context),
+                            style: Theme.of(context)
+                                .textTheme
+                                .bodySmall!
+                                .copyWith(color: Colors.grey),
+                          ),
+                          const Icon(Icons.access_time,
+                              color: Colors.grey, size: 18),
+                        ],
                       ),
                     ),
-                  ],
-                );
-              }
-              return const SizedBox();
-            },
-          ),
+                  ),
+                  const SizedBox(height: 16),
+                  _buildDayCheckboxes(ctx, selectedDays, (i, v) {
+                    setState(() => selectedDays[i] = v);
+                  }),
+                  const SizedBox(height: 16),
+                  _buildFunctionSwitch(ctx, functionOn!, (v) {
+                    setState(() => functionOn = v);
+                  }),
+                ],
+              ),
+              actions: [
+                SizedBox(
+                  width: 100,
+                  child: OutlinedButton(
+                    onPressed: () {
+                      Navigator.pop(ctx, null);
+                    },
+                    child: const Text('Cancel'),
+                  ),
+                ),
+                SizedBox(
+                  width: 100,
+                  child: ElevatedButton(
+                    onPressed: () {
+                      final entry = ScheduleEntry(
+                        category: schedule?.category ?? 'switch_1',
+                        time: _formatTimeOfDayToISO(selectedTime),
+                        function: Status(code: 'switch_1', value: functionOn),
+                        days: _convertSelectedDaysToStrings(selectedDays),
+                        scheduleId: schedule?.scheduleId,
+                      );
+                      Navigator.pop(ctx, entry);
+                    },
+                    child: const Text('Save'),
+                  ),
+                ),
+              ],
+            );
+          },
         );
       },
     );
   }
 
-  static TimeOfDay _convertStringToTimeOfDay(String timeString) {
-    final regex = RegExp(r'^(\d{2}):(\d{2})$');
-    final match = regex.firstMatch(timeString);
-    if (match != null) {
-      final hour = int.parse(match.group(1)!);
-      final minute = int.parse(match.group(2)!);
-      return TimeOfDay(hour: hour, minute: minute);
-    } else {
-      throw const FormatException('Invalid time format');
-    }
+  static TimeOfDay _convertStringToTimeOfDay(String iso) {
+    final dt = DateTime.tryParse(iso);
+    if (dt != null) return TimeOfDay(hour: dt.hour, minute: dt.minute);
+    return const TimeOfDay(hour: 9, minute: 0);
   }
 
   static List<bool> _convertDaysStringToBooleans(List<String> selectedDays) {
     final daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    List<bool> daysBoolean = List.filled(7, false);
-
-    for (int i = 0; i < daysOfWeek.length; i++) {
-      if (selectedDays.contains(daysOfWeek[i])) {
-        daysBoolean[i] = true;
-      }
-    }
-
-    return daysBoolean;
+    return daysOfWeek
+        .map((d) =>
+            selectedDays.map((e) => e.toLowerCase()).contains(d.toLowerCase()))
+        .toList();
   }
 
-  static Widget _buildDayCheckboxes(BuildContext context, List<bool> selectedDays, {bool? isEdit}) {
-    final dayLabels = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+  static String _formatTimeOfDayToISO(TimeOfDay t) {
+    final now = DateTime.now();
+    final dt = DateTime(now.year, now.month, now.day, t.hour, t.minute);
+    return dt.toIso8601String();
+  }
 
+  static List<String> _convertSelectedDaysToStrings(List<bool> selectedDays) {
+    const allDays = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
+    List<String> result = [];
+    for (int i = 0; i < selectedDays.length; i++) {
+      if (selectedDays[i]) result.add(allDays[i]);
+    }
+    return result;
+  }
+
+  static Widget _buildDayCheckboxes(BuildContext ctx, List<bool> selectedDays,
+      Function(int, bool) onChanged) {
+    final dayLabels = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
     return Row(
-      children: List.generate(7, (index) {
-        return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: List.generate(
+        7,
+        (index) => Row(
           children: [
             Checkbox(
               value: selectedDays[index],
-              onChanged: (bool? value) {
-                context.read<WaterHeaterBloc>().add(UpdateSelectedDayEvent(index, value!));
-              },
+              onChanged: (val) => onChanged(index, val!),
             ),
             Text(dayLabels[index]),
           ],
-        );
-      }),
+        ),
+      ),
     );
   }
 
-  static Widget _buildFunctionSwitch(BuildContext context, bool isOn, bool? isEdit) {
+  static Widget _buildFunctionSwitch(
+      BuildContext ctx, bool isOn, Function(bool) onChanged) {
     return Row(
       children: [
         Text(
           'Function:',
-          style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.grayColor),
+          style:
+              Theme.of(ctx).textTheme.bodySmall!.copyWith(color: Colors.grey),
         ),
         const SizedBox(width: 10),
         Radio<bool>(
           value: true,
           groupValue: isOn,
-          onChanged: (bool? value) {
-            context.read<WaterHeaterBloc>().add(const UpdateFunctionOnEvent(true));
-          },
+          onChanged: (val) => onChanged(true),
         ),
         const Text('On'),
         const SizedBox(width: 10),
         Radio<bool>(
           value: false,
           groupValue: isOn,
-          onChanged: (bool? value) {
-            context.read<WaterHeaterBloc>().add(const UpdateFunctionOnEvent(false));
-          },
+          onChanged: (val) => onChanged(false),
         ),
         const Text('Off'),
       ],

lib/pages/device_managment/water_heater/models/schedule_entry.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 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/water_heater/models/schedule_model.dart';
 
 class ScheduleEntry {
   final String category;
@@ -58,7 +59,8 @@ class ScheduleEntry {
 
   String toJson() => json.encode(toMap());
 
-  factory ScheduleEntry.fromJson(String source) => ScheduleEntry.fromMap(json.decode(source));
+  factory ScheduleEntry.fromJson(String source) =>
+      ScheduleEntry.fromMap(json.decode(source));
 
   @override
   bool operator ==(Object other) {
@@ -73,6 +75,23 @@ class ScheduleEntry {
 
   @override
   int get hashCode {
-    return category.hashCode ^ time.hashCode ^ function.hashCode ^ days.hashCode;
+    return category.hashCode ^
+        time.hashCode ^
+        function.hashCode ^
+        days.hashCode;
+  }
+
+  // Existing properties and methods
+
+  // Add the fromScheduleModel method
+
+  static ScheduleEntry fromScheduleModel(ScheduleModel scheduleModel) {
+    return ScheduleEntry(
+      days: scheduleModel.days,
+      time: scheduleModel.time,
+      function: scheduleModel.function,
+      category: scheduleModel.category,
+      scheduleId: scheduleModel.scheduleId,
+    );
   }
 }

lib/pages/device_managment/water_heater/models/water_heater_status_model.dart

@@ -16,7 +16,7 @@ class WaterHeaterStatusModel extends Equatable {
   final String cycleTiming;
   final List<ScheduleModel> schedules;
 
- const WaterHeaterStatusModel({
+  const WaterHeaterStatusModel({
     required this.uuid,
     required this.heaterSwitch,
     required this.countdownHours,

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

@@ -2,12 +2,13 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_control_button.dart';
 import 'package:syncrow_web/pages/device_managment/shared/device_controls_container.dart';
 import 'package:syncrow_web/pages/device_managment/shared/toggle_widget.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/factories/water_heater_bloc_factory.dart';
 import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedual_view.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
@@ -35,7 +36,8 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 state is WaterHeaterBatchFailedState) {
               return const Center(child: Text('Error fetching status'));
             } else {
-              return const SizedBox(height: 200, child: Center(child: SizedBox()));
+              return const SizedBox(
+                  height: 200, child: Center(child: SizedBox()));
             }
           },
         ));
@@ -73,48 +75,22 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 ));
           },
         ),
-        GestureDetector(
+        ScheduleControlButton(
           onTap: () {
-            showDialog(
+            showDialog<void>(
                 context: context,
                 builder: (ctx) => BlocProvider.value(
                       value: BlocProvider.of<WaterHeaterBloc>(context),
-                      child: BuildScheduleView(status: status),
+                      child: BuildScheduleView(
+                        deviceUuid: device.uuid ?? '',
+                        category: 'switch_1',
+                      ),
                     ));
           },
-          child: DeviceControlsContainer(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: [
-                Container(
-                  width: 60,
-                  height: 60,
-                  decoration: const BoxDecoration(
-                    shape: BoxShape.circle,
-                    color: ColorsManager.whiteColors,
-                  ),
-                  margin: const EdgeInsets.symmetric(horizontal: 4),
-                  padding: const EdgeInsets.all(12),
-                  child: ClipOval(
-                    child: SvgPicture.asset(
-                      Assets.scheduling,
-                      fit: BoxFit.fill,
-                    ),
-                  ),
-                ),
-                const Spacer(),
-                Text(
-                  'Scheduling',
-                  textAlign: TextAlign.center,
-                  style: context.textTheme.titleMedium!.copyWith(
-                    fontWeight: FontWeight.w400,
-                    color: ColorsManager.blackColor,
-                  ),
-                ),
-              ],
-            ),
-          ),
-        )
+          mainText: '',
+          subtitle: 'Scheduling',
+          iconPath: Assets.scheduling,
+        ),
       ],
     );
   }

lib/pages/device_managment/water_heater/widgets/count_down_inching_view.dart

@@ -1,223 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-
-class CountdownInchingView extends StatelessWidget {
-  final WaterHeaterDeviceStatusLoaded state;
-
-  const CountdownInchingView({
-    super.key,
-    required this.state,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final isCountDown =
-        state.scheduleMode?.name == ScheduleModes.countdown.name;
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          isCountDown ? 'Countdown:' : 'Inching:',
-          style: context.textTheme.bodySmall!.copyWith(
-            fontSize: 13,
-            color: ColorsManager.grayColor,
-          ),
-        ),
-        const SizedBox(height: 8),
-        Visibility(
-          visible: !isCountDown,
-          child: const Text(
-              'Once enabled this feature, each time the device is turned on, it will automatically turn off after a preset time.'),
-        ),
-        const SizedBox(height: 8),
-        _hourMinutesWheel(context, state),
-      ],
-    );
-  }
-
-  Row _hourMinutesWheel(
-      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
-    final isCountDown =
-        state.scheduleMode?.name == ScheduleModes.countdown.name;
-    late bool isActive;
-    if (isCountDown &&
-        state.countdownRemaining != null &&
-        state.isCountdownActive == true) {
-      isActive = true;
-    } else if (!isCountDown &&
-        state.countdownRemaining != null &&
-        state.isInchingActive == true) {
-      isActive = true;
-    } else {
-      isActive = false;
-    }
-
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        _buildPickerColumn(
-            context,
-            'h',
-            isCountDown
-                ? (state.countdownHours ?? 0)
-                : (state.inchingHours ?? 0),
-            24, (value) {
-          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
-                hours: value,
-                minutes: isCountDown
-                    ? (state.countdownMinutes ?? 0)
-                    : (state.inchingMinutes ?? 0),
-              ));
-        }, isActive: isActive),
-        const SizedBox(width: 10),
-        _buildPickerColumn(
-            context,
-            'm',
-            isCountDown
-                ? (state.countdownMinutes ?? 0)
-                : (state.inchingMinutes ?? 0),
-            60, (value) {
-          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
-                hours: isCountDown
-                    ? (state.countdownHours ?? 0)
-                    : (state.inchingHours ?? 0),
-                minutes: value,
-              ));
-        }, isActive: isActive),
-      ],
-    );
-  }
-
-  Row _hourMinutesSecondWheel(
-      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
-    final isCountDown =
-        state.scheduleMode?.name == ScheduleModes.countdown.name;
-    late bool isActive;
-    if (isCountDown &&
-        state.countdownRemaining != null &&
-        state.isCountdownActive == true) {
-      isActive = true;
-    } else if (!isCountDown &&
-        state.countdownRemaining != null &&
-        state.isInchingActive == true) {
-      isActive = true;
-    } else {
-      isActive = false;
-    }
-
-    return Row(
-      mainAxisAlignment: MainAxisAlignment.start,
-      children: [
-        _buildPickerColumn(
-            context,
-            'h',
-            isCountDown
-                ? (state.countdownHours ?? 0)
-                : (state.inchingHours ?? 0),
-            24, (value) {
-          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
-                hours: value,
-                minutes: isCountDown
-                    ? (state.countdownMinutes ?? 0)
-                    : (state.inchingMinutes ?? 0),
-              ));
-        }, isActive: isActive),
-        const SizedBox(width: 10),
-        _buildPickerColumn(
-            context,
-            'm',
-            isCountDown
-                ? (state.countdownMinutes ?? 0)
-                : (state.inchingMinutes ?? 0),
-            60, (value) {
-          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
-                hours: isCountDown
-                    ? (state.countdownHours ?? 0)
-                    : (state.inchingHours ?? 0),
-                minutes: value,
-              ));
-        }, isActive: isActive),
-        const SizedBox(width: 10),
-        _buildPickerColumn(
-            context,
-            'S',
-            isCountDown
-                ? (state.countdownMinutes ?? 0)
-                : (state.inchingMinutes ?? 0),
-            60, (value) {
-          context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                scheduleMode: state.scheduleMode ?? ScheduleModes.countdown,
-                hours: isCountDown
-                    ? (state.countdownHours ?? 0)
-                    : (state.inchingHours ?? 0),
-                minutes: value,
-              ));
-        }, isActive: isActive),
-      ],
-    );
-  }
-
-  Widget _buildPickerColumn(
-    BuildContext context,
-    String label,
-    int initialValue,
-    int itemCount,
-    ValueChanged<int> onSelected, {
-    required bool isActive,
-  }) {
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: [
-        Container(
-          height: 40,
-          width: 80,
-          padding: const EdgeInsets.symmetric(horizontal: 16),
-          decoration: BoxDecoration(
-            color: ColorsManager.boxColor,
-            borderRadius: BorderRadius.circular(8),
-          ),
-          child: ListWheelScrollView.useDelegate(
-            key: ValueKey('$label-$initialValue'),
-            controller: FixedExtentScrollController(
-              initialItem: initialValue,
-            ),
-            itemExtent: 40.0,
-            physics: const FixedExtentScrollPhysics(),
-            onSelectedItemChanged: onSelected,
-            childDelegate: ListWheelChildBuilderDelegate(
-              builder: (context, index) {
-                return Center(
-                  child: Text(
-                    index.toString().padLeft(2, '0'),
-                    style: TextStyle(
-                      fontSize: 24,
-                      color: isActive ? ColorsManager.grayColor : Colors.black,
-                    ),
-                  ),
-                );
-              },
-              childCount: itemCount,
-            ),
-          ),
-        ),
-        const SizedBox(width: 8),
-        Text(
-          label,
-          style: const TextStyle(
-            color: ColorsManager.grayColor,
-            fontSize: 18,
-          ),
-        ),
-      ],
-    );
-  }
-}

lib/pages/device_managment/water_heater/widgets/schedual_view.dart

@@ -1,117 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/helper/add_schedule_dialog_helper.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/count_down_button.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/count_down_inching_view.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/inching_mode_buttons.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_header.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_managment_ui.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_mode_buttons.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/widgets/schedule_mode_selector.dart';
-
-class BuildScheduleView extends StatefulWidget {
-  const BuildScheduleView({super.key, required this.status});
-
-  final WaterHeaterStatusModel status;
-
-  @override
-  State<BuildScheduleView> createState() => _BuildScheduleViewState();
-}
-
-class _BuildScheduleViewState extends State<BuildScheduleView> {
-  @override
-  Widget build(BuildContext context) {
-    final bloc = BlocProvider.of<WaterHeaterBloc>(context);
-
-    return BlocProvider.value(
-      value: bloc,
-      child: Dialog(
-        backgroundColor: Colors.white,
-        insetPadding: const EdgeInsets.all(20),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20),
-        ),
-        child: SizedBox(
-          width: 700,
-          child: SingleChildScrollView(
-            child: Padding(
-              padding:
-                  const EdgeInsets.symmetric(horizontal: 40.0, vertical: 20),
-              child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
-                builder: (context, state) {
-                  if (state is WaterHeaterDeviceStatusLoaded) {
-                    return Column(
-                      crossAxisAlignment: CrossAxisAlignment.start,
-                      children: [
-                        const ScheduleHeader(),
-                        const SizedBox(height: 20),
-                        ScheduleModeSelector(state: state),
-                        const SizedBox(height: 20),
-                        if (state.scheduleMode == ScheduleModes.schedule)
-                          ScheduleManagementUI(
-                            state: state,
-                            onAddSchedule: () {
-                              ScheduleDialogHelper.showAddScheduleDialog(
-                                  context,
-                                  schedule: null,
-                                  index: null,
-                                  isEdit: false);
-                            },
-                          ),
-                        if (state.scheduleMode == ScheduleModes.countdown ||
-                            state.scheduleMode == ScheduleModes.inching)
-                          CountdownInchingView(state: state),
-                        const SizedBox(height: 20),
-                        if (state.scheduleMode == ScheduleModes.countdown)
-                          CountdownModeButtons(
-                            isActive: state.isCountdownActive ?? false,
-                            deviceId: widget.status.uuid,
-                            hours: state.countdownHours ?? 0,
-                            minutes: state.countdownMinutes ?? 0,
-                          ),
-                        if (state.scheduleMode == ScheduleModes.inching)
-                          InchingModeButtons(
-                            isActive: state.isInchingActive ?? false,
-                            deviceId: widget.status.uuid,
-                            hours: state.inchingHours ?? 0,
-                            minutes: state.inchingMinutes ?? 0,
-                          ),
-                        if (state.scheduleMode != ScheduleModes.countdown &&
-                            state.scheduleMode != ScheduleModes.inching)
-                          ScheduleModeButtons(
-                            onSave: () {
-                              Navigator.pop(context);
-                            },
-                          ),
-                      ],
-                    );
-                  }
-                  if (state is WaterHeaterLoadingState) {
-                    return const SizedBox(
-                        height: 200,
-                        child: Column(
-                          mainAxisSize: MainAxisSize.min,
-                          children: [
-                            ScheduleHeader(),
-                            SizedBox(
-                              height: 20,
-                            ),
-                            Center(child: CircularProgressIndicator()),
-                          ],
-                        ));
-                  }
-                  return const SizedBox(
-                    height: 200,
-                    child: ScheduleHeader(),
-                  );
-                },
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/pages/device_managment/water_heater/widgets/schedule_mode_selector.dart

@@ -1,86 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/water_heater_status_model.dart';
-
-class ScheduleModeSelector extends StatelessWidget {
-  final WaterHeaterDeviceStatusLoaded state;
-
-  const ScheduleModeSelector({super.key, required this.state});
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Text(
-          'Type:',
-          style: context.textTheme.bodySmall!.copyWith(
-            fontSize: 13,
-            color: ColorsManager.grayColor,
-          ),
-        ),
-        const SizedBox(height: 4),
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-          children: [
-            _buildRadioTile(
-                context, 'Countdown', ScheduleModes.countdown, state),
-            _buildRadioTile(context, 'Schedule', ScheduleModes.schedule, state),
-            _buildRadioTile(
-                context, 'Circulate', ScheduleModes.circulate, state),
-            _buildRadioTile(context, 'Inching', ScheduleModes.inching, state),
-          ],
-        ),
-      ],
-    );
-  }
-
-  Widget _buildRadioTile(BuildContext context, String label, ScheduleModes mode,
-      WaterHeaterDeviceStatusLoaded state) {
-    return Flexible(
-      child: ListTile(
-        contentPadding: EdgeInsets.zero,
-        title: Text(
-          label,
-          style: context.textTheme.bodySmall!.copyWith(
-            fontSize: 13,
-            color: ColorsManager.blackColor,
-          ),
-        ),
-        leading: Radio<ScheduleModes>(
-          value: mode,
-          groupValue: state.scheduleMode,
-          onChanged: (ScheduleModes? value) {
-            if (value != null) {
-              if (value == ScheduleModes.countdown) {
-                context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                      scheduleMode: value,
-                      hours: state.countdownHours ?? 0,
-                      minutes: state.countdownMinutes ?? 0,
-                    ));
-              } else if (value == ScheduleModes.inching) {
-                context.read<WaterHeaterBloc>().add(UpdateScheduleEvent(
-                      scheduleMode: value,
-                      hours: state.inchingHours ?? 0,
-                      minutes: state.inchingMinutes ?? 0,
-                    ));
-              }
-
-              if (value == ScheduleModes.schedule) {
-                context.read<WaterHeaterBloc>().add(
-                      GetSchedulesEvent(
-                        category: 'switch_1',
-                        uuid: state.status.uuid,
-                      ),
-                    );
-              }
-            }
-          },
-        ),
-      ),
-    );
-  }
-}

lib/pages/device_managment/water_heater/widgets/schedule_table.dart

@@ -1,222 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_svg/flutter_svg.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/bloc/water_heater_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_model.dart';
-import 'package:syncrow_web/utils/color_manager.dart';
-import 'package:syncrow_web/utils/constants/assets.dart';
-import 'package:syncrow_web/utils/extension/build_context_x.dart';
-import 'package:syncrow_web/utils/format_date_time.dart';
-
-import '../helper/add_schedule_dialog_helper.dart';
-
-class ScheduleTableWidget extends StatelessWidget {
-  final WaterHeaterDeviceStatusLoaded state;
-
-  const ScheduleTableWidget({
-    super.key,
-    required this.state,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: [
-        Table(
-          border: TableBorder.all(
-            color: ColorsManager.graysColor,
-            borderRadius: const BorderRadius.only(
-                topLeft: Radius.circular(20), topRight: Radius.circular(20)),
-          ),
-          children: [
-            TableRow(
-              decoration: const BoxDecoration(
-                color: ColorsManager.boxColor,
-                borderRadius: BorderRadius.only(
-                  topLeft: Radius.circular(20),
-                  topRight: Radius.circular(20),
-                ),
-              ),
-              children: [
-                _buildTableHeader('Active'),
-                _buildTableHeader('Days'),
-                _buildTableHeader('Time'),
-                _buildTableHeader('Function'),
-                _buildTableHeader('Action'),
-              ],
-            ),
-          ],
-        ),
-        BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
-          builder: (context, state) {
-            if (state is ScheduleLoadingState) {
-              return const SizedBox(
-                  height: 200,
-                  child: Center(child: CircularProgressIndicator()));
-            }
-            if (state is WaterHeaterDeviceStatusLoaded &&
-                state.schedules.isEmpty) {
-              return _buildEmptyState(context);
-            } else if (state is WaterHeaterDeviceStatusLoaded) {
-              return Container(
-                  height: 200,
-                  decoration: BoxDecoration(
-                    border: Border.all(color: ColorsManager.graysColor),
-                    borderRadius: const BorderRadius.only(
-                        bottomLeft: Radius.circular(20),
-                        bottomRight: Radius.circular(20)),
-                  ),
-                  child: _buildTableBody(state, context));
-            }
-            return const SizedBox(
-              height: 200,
-            );
-          },
-        ),
-      ],
-    );
-  }
-
-  Widget _buildEmptyState(BuildContext context) {
-    return Container(
-      height: 200,
-      decoration: BoxDecoration(
-        border: Border.all(color: ColorsManager.graysColor),
-        borderRadius: const BorderRadius.only(
-            bottomLeft: Radius.circular(20), bottomRight: Radius.circular(20)),
-      ),
-      child: Center(
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            SvgPicture.asset(Assets.emptyRecords, width: 40, height: 40),
-            const SizedBox(height: 8),
-            Padding(
-              padding: const EdgeInsets.all(8.0),
-              child: Text(
-                'No schedules added yet',
-                style: context.textTheme.bodySmall!.copyWith(
-                  fontSize: 13,
-                  color: ColorsManager.grayColor,
-                ),
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTableBody(
-      WaterHeaterDeviceStatusLoaded state, BuildContext context) {
-    return SizedBox(
-      height: 200,
-      child: SingleChildScrollView(
-        child: Table(
-          border: TableBorder.all(color: ColorsManager.graysColor),
-          defaultVerticalAlignment: TableCellVerticalAlignment.middle,
-          children: [
-            for (int i = 0; i < state.schedules.length; i++)
-              _buildScheduleRow(state.schedules[i], i, context, state),
-          ],
-        ),
-      ),
-    );
-  }
-
-  Widget _buildTableHeader(String label) {
-    return TableCell(
-      child: Padding(
-        padding: const EdgeInsets.all(12),
-        child: Text(
-          label,
-          style: const TextStyle(
-            fontSize: 13,
-            color: ColorsManager.grayColor,
-          ),
-        ),
-      ),
-    );
-  }
-
-  TableRow _buildScheduleRow(ScheduleModel schedule, int index,
-      BuildContext context, WaterHeaterDeviceStatusLoaded state) {
-    return TableRow(
-      children: [
-        Center(
-          child: GestureDetector(
-            onTap: () {
-              context.read<WaterHeaterBloc>().add(UpdateScheduleEntryEvent(
-                    index: index,
-                    enable: !schedule.enable,
-                    scheduleId: schedule.scheduleId,
-                    deviceId: state.status.uuid,
-                    functionOn: schedule.function.value,
-                  ));
-            },
-            child: SizedBox(
-              width: 24,
-              height: 24,
-              child: schedule.enable
-                  ? const Icon(Icons.radio_button_checked,
-                      color: ColorsManager.blueColor)
-                  : const Icon(
-                      Icons.radio_button_unchecked,
-                      color: ColorsManager.grayColor,
-                    ),
-            ),
-          ),
-        ),
-        Center(
-            child: Text(_getSelectedDays(
-                ScheduleModel.parseSelectedDays(schedule.days)))),
-        Center(child: Text(formatIsoStringToTime(schedule.time, context))),
-        Center(child: Text(schedule.function.value ? 'On' : 'Off')),
-        Center(
-          child: Wrap(
-            runAlignment: WrapAlignment.center,
-            children: [
-              TextButton(
-                style: TextButton.styleFrom(padding: EdgeInsets.zero),
-                onPressed: () {
-                  ScheduleDialogHelper.showAddScheduleDialog(context,
-                      schedule: schedule, index: index, isEdit: true);
-                },
-                child: Text(
-                  'Edit',
-                  style: context.textTheme.bodySmall!
-                      .copyWith(color: ColorsManager.blueColor),
-                ),
-              ),
-              TextButton(
-                style: TextButton.styleFrom(padding: EdgeInsets.zero),
-                onPressed: () {
-                  context.read<WaterHeaterBloc>().add(DeleteScheduleEvent(
-                        index: index,
-                        scheduleId: schedule.scheduleId,
-                      ));
-                },
-                child: Text(
-                  'Delete',
-                  style: context.textTheme.bodySmall!
-                      .copyWith(color: ColorsManager.blueColor),
-                ),
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
-  }
-
-  String _getSelectedDays(List<bool> selectedDays) {
-    final days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    List<String> selectedDaysStr = [];
-    for (int i = 0; i < selectedDays.length; i++) {
-      if (selectedDays[i]) {
-        selectedDaysStr.add(days[i]);
-      }
-    }
-    return selectedDaysStr.join(', ');
-  }
-}

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

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:syncrow_web/pages/auth/model/user_model.dart';
 import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
+import 'package:syncrow_web/pages/roles_and_permission/model/roles_user_model.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';
@@ -12,8 +14,11 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 
 class EditUserDialog extends StatefulWidget {
-  final String? userId;
-  const EditUserDialog({super.key, this.userId});
+  final RolesUserModel? user;
+  const EditUserDialog({
+    super.key,
+    this.user,
+  });
 
   @override
   _EditUserDialogState createState() => _EditUserDialogState();
@@ -28,10 +33,11 @@ class _EditUserDialogState extends State<EditUserDialog> {
         create: (BuildContext context) => UsersBloc()
           // ..add(const LoadCommunityAndSpacesEvent())
           ..add(const RoleEvent())
-          ..add(GetUserByIdEvent(uuid: widget.userId)),
+          ..add(GetUserByIdEvent(uuid: widget.user!.uuid)),
         child: BlocConsumer<UsersBloc, UsersState>(listener: (context, state) {
           if (state is SpacesLoadedState) {
-            BlocProvider.of<UsersBloc>(context).add(GetUserByIdEvent(uuid: widget.userId));
+            BlocProvider.of<UsersBloc>(context)
+                .add(GetUserByIdEvent(uuid: widget.user!.uuid));
           }
         }, builder: (context, state) {
           final _blocRole = BlocProvider.of<UsersBloc>(context);
@@ -39,7 +45,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
           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: [
@@ -68,7 +75,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               _buildStep1Indicator(1, "Basics", _blocRole),
                               _buildStep2Indicator(2, "Spaces", _blocRole),
-                              _buildStep3Indicator(3, "Role & Permissions", _blocRole),
+                              _buildStep3Indicator(
+                                  3, "Role & Permissions", _blocRole),
                             ],
                           ),
                         ),
@@ -86,7 +94,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             children: [
                               const SizedBox(height: 10),
                               Expanded(
-                                child: _getFormContent(widget.userId),
+                                child: _getFormContent(widget.user!),
                               ),
                               const SizedBox(height: 20),
                             ],
@@ -116,13 +124,14 @@ class _EditUserDialogState extends State<EditUserDialog> {
                             if (currentStep < 3) {
                               currentStep++;
                               if (currentStep == 2) {
-                                _blocRole.add(CheckStepStatus(isEditUser: true));
+                                _blocRole
+                                    .add(CheckStepStatus(isEditUser: true));
                               } else if (currentStep == 3) {
                                 _blocRole.add(const CheckSpacesStepStatus());
                               }
                             } else {
-                              _blocRole
-                                  .add(EditInviteUsers(context: context, userId: widget.userId!));
+                              _blocRole.add(EditInviteUsers(
+                                  context: context, userId: widget.user!.uuid));
                             }
                           });
                         },
@@ -131,7 +140,8 @@ class _EditUserDialogState extends State<EditUserDialog> {
                           style: TextStyle(
                               color: (_blocRole.isCompleteSpaces == false ||
                                           _blocRole.isCompleteBasics == false ||
-                                          _blocRole.isCompleteRolePermissions == false) &&
+                                          _blocRole.isCompleteRolePermissions ==
+                                              false) &&
                                       currentStep == 3
                                   ? ColorsManager.grayColor
                                   : ColorsManager.secondaryColor),
@@ -146,15 +156,15 @@ class _EditUserDialogState extends State<EditUserDialog> {
         }));
   }
 
-  Widget _getFormContent(userid) {
+  Widget _getFormContent(RolesUserModel user) {
     switch (currentStep) {
       case 1:
         return BasicsView(
-          userId: userid,
+          userId: user.uuid,
         );
       case 2:
         return SpacesAccessView(
-          userId: userid,
+          userId: user.uuid,
         );
       case 3:
         return const RolesAndPermission();
@@ -166,6 +176,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
   int step3 = 0;
 
   Widget _buildStep1Indicator(int step, String label, UsersBloc bloc) {
+    final isCurrentStep = currentStep == step;
     return GestureDetector(
       onTap: () {
         setState(() {
@@ -189,7 +200,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
             child: Row(
               children: [
                 SvgPicture.asset(
-                  currentStep == step
+                  isCurrentStep
                       ? Assets.currentProcessIcon
                       : bloc.isCompleteBasics == false
                           ? Assets.wrongProcessIcon
@@ -204,8 +215,11 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: isCurrentStep
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight:
+                        isCurrentStep ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],
@@ -229,6 +243,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
   }
 
   Widget _buildStep2Indicator(int step, String label, UsersBloc bloc) {
+    final isCurrentStep = currentStep == step;
     return GestureDetector(
       onTap: () {
         setState(() {
@@ -248,7 +263,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
             child: Row(
               children: [
                 SvgPicture.asset(
-                  currentStep == step
+                  isCurrentStep
                       ? Assets.currentProcessIcon
                       : bloc.isCompleteSpaces == false
                           ? Assets.wrongProcessIcon
@@ -263,8 +278,11 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: isCurrentStep
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight:
+                        isCurrentStep ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],
@@ -288,6 +306,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
   }
 
   Widget _buildStep3Indicator(int step, String label, UsersBloc bloc) {
+    final isCurrentStep = currentStep == step;
     return GestureDetector(
       onTap: () {
         setState(() {
@@ -306,7 +325,7 @@ class _EditUserDialogState extends State<EditUserDialog> {
             child: Row(
               children: [
                 SvgPicture.asset(
-                  currentStep == step
+                  isCurrentStep
                       ? Assets.currentProcessIcon
                       : bloc.isCompleteRolePermissions == false
                           ? Assets.wrongProcessIcon
@@ -321,8 +340,11 @@ class _EditUserDialogState extends State<EditUserDialog> {
                   label,
                   style: TextStyle(
                     fontSize: 16,
-                    color: currentStep == step ? ColorsManager.blackColor : ColorsManager.greyColor,
-                    fontWeight: currentStep == step ? FontWeight.bold : FontWeight.normal,
+                    color: isCurrentStep
+                        ? ColorsManager.blackColor
+                        : ColorsManager.greyColor,
+                    fontWeight:
+                        isCurrentStep ? FontWeight.bold : FontWeight.normal,
                   ),
                 ),
               ],

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

@@ -19,6 +19,7 @@ import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/style.dart';
+
 class UsersPage extends StatelessWidget {
   UsersPage({super.key});
 
@@ -451,33 +452,31 @@ class UsersPage extends StatelessWidget {
                           ),
                           Row(
                             children: [
-                              user.isEnabled != false
-                                  ? actionButton(
-                                      isActive: true,
-                                      title: "Edit",
-                                      onTap: () {
-                                        context
-                                            .read<SpaceTreeBloc>()
-                                            .add(ClearCachedData());
-                                        showDialog(
-                                          context: context,
-                                          barrierDismissible: false,
-                                          builder: (BuildContext context) {
-                                            return EditUserDialog(
-                                                userId: user.uuid);
-                                          },
-                                        ).then((v) {
-                                          if (v != null) {
-                                            if (v != null) {
-                                              _blocRole.add(const GetUsers());
-                                            }
-                                          }
-                                        });
+                              if (user.isEnabled != false)
+                                actionButton(
+                                  isActive: true,
+                                  title: "Edit",
+                                  onTap: () {
+                                    context
+                                        .read<SpaceTreeBloc>()
+                                        .add(ClearCachedData());
+                                    showDialog(
+                                      context: context,
+                                      barrierDismissible: false,
+                                      builder: (BuildContext context) {
+                                        return EditUserDialog(user: user);
                                       },
-                                    )
-                                  : actionButton(
-                                      title: "Edit",
-                                    ),
+                                    ).then((v) {
+                                      if (v != null) {
+                                        _blocRole.add(const GetUsers());
+                                      }
+                                    });
+                                  },
+                                )
+                              else
+                                actionButton(
+                                  title: "Edit",
+                                ),
                               actionButton(
                                 title: "Delete",
                                 onTap: () {

lib/pages/routines/helper/dialog_helper/device_dialog_helper.dart

@@ -4,6 +4,7 @@ import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/models/device_functions.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ac_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_helper.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/curtain_dialog.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/flush_presence_sensor/flush_presence_sensor.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/gateway/gateway_helper.dart';
 import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/one_gang_switch_dialog.dart';
@@ -26,7 +27,7 @@ class DeviceDialogHelper {
       final result = await _getDialogForDeviceType(
         dialogType: dialogType,
         context: context,
-        productType: data['productType'],
+        productType: data['productType'] as String,
         data: data,
         functions: functions,
         removeComparetors: removeComparetors,
@@ -65,7 +66,14 @@ class DeviceDialogHelper {
           removeComparetors: removeComparetors,
           dialogType: dialogType,
         );
-
+      case 'CUR':
+        return CurtainHelper.showControlDialog(
+          dialogType: dialogType,
+          context: context,
+          functions: functions,
+          uniqueCustomId: data['uniqueCustomId'],
+          device: data['device'],
+        );
       case '1G':
         return OneGangSwitchHelper.showSwitchFunctionsDialog(
             dialogType: dialogType,

lib/pages/routines/models/curtain/curtain_function.dart

@@ -0,0 +1,49 @@
+import 'package:syncrow_web/pages/device_managment/curtain/model/curtain_model.dart';
+import 'package:syncrow_web/pages/routines/models/curtain/curtain_opertion_value.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart'
+    show DeviceFunction;
+import 'package:syncrow_web/utils/constants/app_enum.dart';
+import 'package:syncrow_web/utils/constants/assets.dart';
+
+abstract class CurtainFunction extends DeviceFunction<CurtainModel> {
+  final String type;
+  CurtainFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required this.type,
+    required super.code,
+    required super.operationName,
+    required super.icon,
+  });
+  List<CurtainOperationalValue> getOperationalValues();
+}
+
+class ControlCurtainFunction extends CurtainFunction {
+  ControlCurtainFunction({
+    required super.deviceId,
+    required super.deviceName,
+    required super.type,
+    super.code = 'control',
+    super.operationName = 'Control',
+    super.icon = Assets.curtain,
+  });
+
+  @override
+  List<CurtainOperationalValue> getOperationalValues() => [
+        CurtainOperationalValue(
+          icon: Assets.curtain,
+          description: 'OPEN',
+          value: 'open',
+        ),
+        CurtainOperationalValue(
+          icon: Assets.curtain,
+          description: 'STOP',
+          value: 'stop',
+        ),
+        CurtainOperationalValue(
+          icon: Assets.curtain,
+          description: 'CLOSE',
+          value: 'close',
+        )
+      ];
+}

lib/pages/routines/models/curtain/curtain_opertion_value.dart

@@ -0,0 +1,11 @@
+class CurtainOperationalValue {
+  final String icon;
+  final String description;
+  final String value;
+
+  CurtainOperationalValue({
+    required this.icon,
+    required this.description,
+    required this.value,
+  });
+}

lib/pages/routines/widgets/if_container.dart

@@ -148,6 +148,7 @@ class IfContainer extends StatelessWidget {
                   'NCPS',
                   'WH',
                   'PC',
+                  'CUR',
                 ].contains(mutableData['productType'])) {
                   context
                       .read<RoutineBloc>()

lib/pages/routines/widgets/routine_devices.dart

@@ -28,6 +28,7 @@ class _RoutineDevicesState extends State<RoutineDevices> {
     'NCPS',
     'WH',
     'PC',
+    'CUR',
   };
 
   @override

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

@@ -0,0 +1,270 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart';
+import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
+import 'package:syncrow_web/pages/routines/models/curtain/curtain_function.dart';
+import 'package:syncrow_web/pages/routines/models/curtain/curtain_opertion_value.dart';
+import 'package:syncrow_web/pages/routines/models/device_functions.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_footer.dart';
+import 'package:syncrow_web/pages/routines/widgets/dialog_header.dart';
+import 'package:syncrow_web/pages/routines/widgets/routine_dialogs/helpers/routine_tap_function_helper.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class CurtainHelper {
+  static Future<Map<String, dynamic>?> showControlDialog({
+    required String dialogType,
+    required BuildContext context,
+    required List<DeviceFunction> functions,
+    required String uniqueCustomId,
+    required AllDevicesModel? device,
+  }) async {
+    List<ControlCurtainFunction> curtainFunctions =
+        functions.whereType<ControlCurtainFunction>().where((function) {
+      if (dialogType == 'THEN') {
+        return function.type == 'THEN' || function.type == 'BOTH';
+      }
+      return function.type == 'IF' || function.type == 'BOTH';
+    }).toList();
+    return showDialog<Map<String, dynamic>?>(
+      context: context,
+      builder: (context) => BlocProvider(
+        create: (_) => FunctionBloc()..add(const InitializeFunctions([])),
+        child: AlertDialog(
+          contentPadding: EdgeInsets.zero,
+          content: BlocBuilder<FunctionBloc, FunctionBlocState>(
+            builder: (context, state) {
+              final selectedFunction = state.selectedFunction;
+              final selectedOperationName = state.selectedOperationName;
+              final selectedFunctionData = state.addedFunctions
+                  .firstWhere((f) => f.functionCode == selectedFunction,
+                      orElse: () => DeviceFunctionData(
+                            entityId: '',
+                            functionCode: selectedFunction ?? '',
+                            operationName: '',
+                            value: null,
+                          ));
+
+              return Container(
+                width: selectedFunction != null ? 600 : 360,
+                height: 450,
+                decoration: BoxDecoration(
+                  color: Colors.white,
+                  borderRadius: BorderRadius.circular(20),
+                ),
+                padding: const EdgeInsets.only(top: 20),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    const DialogHeader('AC Functions'),
+                    Expanded(
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: [
+                          // Function list
+                          SizedBox(
+                            width: selectedFunction != null ? 320 : 360,
+                            child: _buildFunctionsList(
+                                context: context,
+                                curtainFunctions: curtainFunctions,
+                                onFunctionSelected:
+                                    (functionCode, operationName) {
+                                  RoutineTapFunctionHelper.onTapFunction(
+                                      context,
+                                      functionCode: functionCode,
+                                      functionOperationName: operationName,
+                                      functionValueDescription:
+                                          selectedFunctionData.valueDescription,
+                                      deviceUuid: device?.uuid,
+                                      codesToAddIntoFunctionsWithDefaultValue: [
+                                        'temp_set',
+                                        'temp_current',
+                                      ],
+                                      defaultValue: 0);
+                                }),
+                          ),
+                          // Value selector
+                          if (selectedFunction != null)
+                            Expanded(
+                              child: _buildValueSelector(
+                                context: context,
+                                selectedFunction: selectedFunction,
+                                selectedFunctionData: selectedFunctionData,
+                                controlFunctions: curtainFunctions,
+                                device: device,
+                                operationName: selectedOperationName ?? '',
+                              ),
+                            ),
+                        ],
+                      ),
+                    ),
+                    DialogFooter(
+                      onCancel: () {
+                        Navigator.pop(context);
+                      },
+                      onConfirm: state.addedFunctions.isNotEmpty
+                          ? () {
+                              /// add the functions to the routine bloc
+                              context.read<RoutineBloc>().add(
+                                    AddFunctionToRoutine(
+                                      state.addedFunctions,
+                                      uniqueCustomId,
+                                    ),
+                                  );
+
+                              // Return the device data to be added to the container
+                              Navigator.pop(context, {
+                                'deviceId': functions.first.deviceId,
+                              });
+                            }
+                          : null,
+                      isConfirmEnabled: selectedFunction != null,
+                    ),
+                  ],
+                ),
+              );
+            },
+          ),
+        ),
+      ),
+    ).then((value) {
+      return value;
+    });
+  }
+
+  static Widget _buildFunctionsList({
+    required BuildContext context,
+    required List<ControlCurtainFunction> curtainFunctions,
+    required Function(String, String) onFunctionSelected,
+  }) {
+    return ListView.separated(
+      shrinkWrap: false,
+      physics: const AlwaysScrollableScrollPhysics(),
+      itemCount: curtainFunctions.length,
+      separatorBuilder: (context, index) => const Padding(
+        padding: EdgeInsets.symmetric(horizontal: 40.0),
+        child: Divider(
+          color: ColorsManager.dividerColor,
+        ),
+      ),
+      itemBuilder: (context, index) {
+        final function = curtainFunctions[index];
+        return ListTile(
+          leading: SvgPicture.asset(
+            function.icon,
+            width: 24,
+            height: 24,
+            placeholderBuilder: (BuildContext context) => Container(
+              width: 24,
+              height: 24,
+              color: Colors.transparent,
+            ),
+          ),
+          title: Text(
+            function.operationName,
+            style: context.textTheme.bodyMedium,
+          ),
+          trailing: const Icon(
+            Icons.arrow_forward_ios,
+            size: 16,
+            color: ColorsManager.textGray,
+          ),
+          onTap: () => onFunctionSelected(
+            function.code,
+            function.operationName,
+          ),
+        );
+      },
+    );
+  }
+
+  static Widget _buildValueSelector({
+    required BuildContext context,
+    required String selectedFunction,
+    required DeviceFunctionData? selectedFunctionData,
+    required List<ControlCurtainFunction> controlFunctions,
+    AllDevicesModel? device,
+    required String operationName,
+  }) {
+    final selectedFn =
+        controlFunctions.firstWhere((f) => f.code == selectedFunction);
+
+    // Rest of your existing code for other value selectors
+    final values = selectedFn.getOperationalValues();
+    return _buildOperationalValuesList(
+      context: context,
+      values: values,
+      selectedValue: selectedFunctionData?.value,
+      device: device,
+      operationName: operationName,
+      selectCode: selectedFunction,
+      selectedFunctionData: selectedFunctionData,
+    );
+  }
+
+  static Widget _buildOperationalValuesList({
+    required BuildContext context,
+    required List<CurtainOperationalValue> values,
+    required dynamic selectedValue,
+    AllDevicesModel? device,
+    required String operationName,
+    required String selectCode,
+    DeviceFunctionData? selectedFunctionData,
+
+    // required Function(dynamic) onValueChanged,
+  }) {
+    return ListView.builder(
+      shrinkWrap: false,
+      physics: const AlwaysScrollableScrollPhysics(),
+      itemCount: values.length,
+      itemBuilder: (context, index) {
+        final value = values[index];
+        final isSelected = selectedValue == value.value;
+        return ListTile(
+          leading: SvgPicture.asset(
+            value.icon,
+            width: 24,
+            height: 24,
+            placeholderBuilder: (BuildContext context) => Container(
+              width: 24,
+              height: 24,
+              color: Colors.transparent,
+            ),
+          ),
+          title: Text(
+            value.description,
+            style: context.textTheme.bodyMedium,
+          ),
+          trailing: Icon(
+            isSelected
+                ? Icons.radio_button_checked
+                : Icons.radio_button_unchecked,
+            size: 24,
+            color: isSelected
+                ? ColorsManager.primaryColorWithOpacity
+                : ColorsManager.textGray,
+          ),
+          onTap: () {
+            if (!isSelected) {
+              context.read<FunctionBloc>().add(
+                    AddFunction(
+                      functionData: DeviceFunctionData(
+                        entityId: device?.uuid ?? '',
+                        functionCode: selectCode,
+                        operationName: operationName,
+                        value: value.value,
+                        condition: selectedFunctionData?.condition,
+                        valueDescription:
+                            selectedFunctionData?.valueDescription,
+                      ),
+                    ),
+                  );
+            }
+          },
+        );
+      },
+    );
+  }
+}

lib/pages/routines/widgets/then_container.dart

@@ -30,123 +30,121 @@ class ThenContainer extends StatelessWidget {
                         style: TextStyle(
                             fontSize: 18, fontWeight: FontWeight.bold)),
                     const SizedBox(height: 16),
-                    state.isLoading && state.isUpdate == true
-                        ? const Center(
-                            child: CircularProgressIndicator(),
-                          )
-                        : Wrap(
-                            spacing: 8,
-                            runSpacing: 8,
-                            children: List.generate(
-                                state.thenItems.length,
-                                (index) => GestureDetector(
-                                      onTap: () async {
-                                        if (state.thenItems[index]
-                                                ['deviceId'] ==
-                                            'delay') {
-                                          final result = await DelayHelper
-                                              .showDelayPickerDialog(context,
-                                                  state.thenItems[index]);
-
-                                          if (result != null) {
-                                            context
-                                                .read<RoutineBloc>()
-                                                .add(AddToThenContainer({
-                                                  ...state.thenItems[index],
-                                                  'imagePath': Assets.delay,
-                                                  'title': 'Delay',
-                                                }));
-                                          }
-                                          return;
-                                        }
-
-                                        if (state.thenItems[index]['type'] ==
-                                            'automation') {
-                                          final result = await showDialog<bool>(
-                                            context: context,
-                                            builder: (BuildContext context) =>
-                                                AutomationDialog(
-                                              automationName:
-                                                  state.thenItems[index]
-                                                          ['name'] ??
-                                                      'Automation',
-                                              automationId:
-                                                  state.thenItems[index]
-                                                          ['deviceId'] ??
-                                                      '',
-                                              uniqueCustomId:
-                                                  state.thenItems[index]
-                                                      ['uniqueCustomId'],
-                                            ),
-                                          );
-
-                                          if (result != null) {
-                                            context
-                                                .read<RoutineBloc>()
-                                                .add(AddToThenContainer({
-                                                  ...state.thenItems[index],
-                                                  'imagePath':
-                                                      Assets.automation,
-                                                  'title':
-                                                      state.thenItems[index]
-                                                              ['name'] ??
-                                                          state.thenItems[index]
-                                                              ['title'],
-                                                }));
-                                          }
-                                          return;
-                                        }
-
-                                        final result = await DeviceDialogHelper
-                                            .showDeviceDialog(
-                                                context: context,
-                                                data: state.thenItems[index],
-                                                removeComparetors: true,
-                                                dialogType: "THEN");
+                    if (state.isLoading && state.isUpdate == true)
+                      const Center(
+                        child: CircularProgressIndicator(),
+                      )
+                    else
+                      Wrap(
+                          spacing: 8,
+                          runSpacing: 8,
+                          children: List.generate(
+                              state.thenItems.length,
+                              (index) => GestureDetector(
+                                    onTap: () async {
+                                      if (state.thenItems[index]['deviceId'] ==
+                                          'delay') {
+                                        final result = await DelayHelper
+                                            .showDelayPickerDialog(context,
+                                                state.thenItems[index]);
 
                                         if (result != null) {
-                                          context.read<RoutineBloc>().add(
-                                              AddToThenContainer(
-                                                  state.thenItems[index]));
-                                        } else if (![
-                                          'AC',
-                                          '1G',
-                                          '2G',
-                                          '3G',
-                                          'WPS',
-                                          'CPS',
-                                          "GW",
-                                          "NCPS",
-                                          'WH',
-                                        ].contains(state.thenItems[index]
-                                            ['productType'])) {
-                                          context.read<RoutineBloc>().add(
-                                              AddToThenContainer(
-                                                  state.thenItems[index]));
+                                          context
+                                              .read<RoutineBloc>()
+                                              .add(AddToThenContainer({
+                                                ...state.thenItems[index],
+                                                'imagePath': Assets.delay,
+                                                'title': 'Delay',
+                                              }));
                                         }
+                                        return;
+                                      }
+
+                                      if (state.thenItems[index]['type'] ==
+                                          'automation') {
+                                        final result = await showDialog<bool>(
+                                          context: context,
+                                          builder: (BuildContext context) =>
+                                              AutomationDialog(
+                                            automationName:
+                                                state.thenItems[index]['name']
+                                                        as String? ??
+                                                    'Automation',
+                                            automationId: state.thenItems[index]
+                                                    ['deviceId'] as String? ??
+                                                '',
+                                            uniqueCustomId: state
+                                                    .thenItems[index]
+                                                ['uniqueCustomId'] as String,
+                                          ),
+                                        );
+
+                                        if (result != null) {
+                                          context
+                                              .read<RoutineBloc>()
+                                              .add(AddToThenContainer({
+                                                ...state.thenItems[index],
+                                                'imagePath': Assets.automation,
+                                                'title': state.thenItems[index]
+                                                        ['name'] ??
+                                                    state.thenItems[index]
+                                                        ['title'],
+                                              }));
+                                        }
+                                        return;
+                                      }
+
+                                      final result = await DeviceDialogHelper
+                                          .showDeviceDialog(
+                                              context: context,
+                                              data: state.thenItems[index],
+                                              removeComparetors: true,
+                                              dialogType: 'THEN');
+                                      if (result != null) {
+                                        context.read<RoutineBloc>().add(
+                                            AddToThenContainer(
+                                                state.thenItems[index]));
+                                      } else if (![
+                                        'AC',
+                                        '1G',
+                                        '2G',
+                                        '3G',
+                                        'WPS',
+                                        'CPS',
+                                        'GW',
+                                        'NCPS',
+                                        'WH',
+                                        'CUR',
+                                      ].contains(state.thenItems[index]
+                                          ['productType'])) {
+                                        context.read<RoutineBloc>().add(
+                                            AddToThenContainer(
+                                                state.thenItems[index]));
+                                      }
+                                    },
+                                    child: DraggableCard(
+                                      imagePath: state.thenItems[index]
+                                              ['imagePath'] as String? ??
+                                          '',
+                                      title: state.thenItems[index]['title']
+                                              as String? ??
+                                          '',
+                                      deviceData: state.thenItems[index],
+                                      padding: const EdgeInsets.symmetric(
+                                          horizontal: 4, vertical: 8),
+                                      isFromThen: true,
+                                      isFromIf: false,
+                                      onRemove: () {
+                                        context.read<RoutineBloc>().add(
+                                            RemoveDragCard(
+                                                index: index,
+                                                isFromThen: true,
+                                                key: state.thenItems[index]
+                                                        ['uniqueCustomId']
+                                                    as String));
                                       },
-                                      child: DraggableCard(
-                                        imagePath: state.thenItems[index]
-                                                ['imagePath'] ??
-                                            '',
-                                        title: state.thenItems[index]
-                                                ['title'] ??
-                                            '',
-                                        deviceData: state.thenItems[index],
-                                        padding: const EdgeInsets.symmetric(
-                                            horizontal: 4, vertical: 8),
-                                        isFromThen: true,
-                                        isFromIf: false,
-                                        onRemove: () {
-                                          context.read<RoutineBloc>().add(
-                                              RemoveDragCard(
-                                                  index: index,
-                                                  isFromThen: true,
-                                                  key: state.thenItems[index]
-                                                      ['uniqueCustomId']));
-                                        },
-                                      ),
-                                    ))),
+                                    ),
+                                  ))),
                   ],
                 ),
               ),
@@ -230,7 +228,7 @@ class ThenContainer extends StatelessWidget {
                 context: context,
                 data: mutableData,
                 removeComparetors: true,
-                dialogType: "THEN");
+                dialogType: 'THEN');
             if (result != null) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             } else if (![
@@ -241,9 +239,10 @@ class ThenContainer extends StatelessWidget {
               'WPS',
               'GW',
               'CPS',
-              "NCPS",
-              "WH",
+              'NCPS',
+              'WH',
               'PC',
+              'CUR',
             ].contains(mutableData['productType'])) {
               context.read<RoutineBloc>().add(AddToThenContainer(mutableData));
             }

lib/pages/space_management_v2/main_module/models/space_connection_model.dart

@@ -0,0 +1,6 @@
+class SpaceConnectionModel {
+  final String from;
+  final String to;
+
+  const SpaceConnectionModel({required this.from, required this.to});
+}

lib/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart

@@ -0,0 +1,61 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_connection_model.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class SpacesConnectionsArrowPainter extends CustomPainter {
+  final List<SpaceConnectionModel> connections;
+  final Map<String, Offset> positions;
+  final double cardWidth = 150.0;
+  final double cardHeight = 90.0;
+  final Set<String> highlightedUuids;
+
+  SpacesConnectionsArrowPainter({
+    required this.connections,
+    required this.positions,
+    required this.highlightedUuids,
+  });
+
+  @override
+  void paint(Canvas canvas, Size size) {
+    for (final connection in connections) {
+      final isSelected = highlightedUuids.contains(connection.from) ||
+          highlightedUuids.contains(connection.to);
+      final paint = Paint()
+        ..color = isSelected
+            ? ColorsManager.blackColor
+            : ColorsManager.blackColor.withValues(alpha: 0.5)
+        ..strokeWidth = 2.0
+        ..style = PaintingStyle.stroke;
+
+      final from = positions[connection.from];
+      final to = positions[connection.to];
+
+      if (from != null && to != null) {
+        final startPoint =
+            Offset(from.dx + cardWidth / 2, from.dy + cardHeight - 10);
+        final endPoint = Offset(to.dx + cardWidth / 2, to.dy);
+
+        final path = Path()..moveTo(startPoint.dx, startPoint.dy);
+
+        final controlPoint1 = Offset(startPoint.dx, startPoint.dy + 20);
+        final controlPoint2 = Offset(endPoint.dx, endPoint.dy - 60);
+
+        path.cubicTo(controlPoint1.dx, controlPoint1.dy, controlPoint2.dx,
+            controlPoint2.dy, endPoint.dx, endPoint.dy);
+
+        canvas.drawPath(path, paint);
+
+        final circlePaint = Paint()
+          ..color = isSelected
+              ? ColorsManager.blackColor
+              : ColorsManager.blackColor.withValues(alpha: 0.5)
+          ..style = PaintingStyle.fill
+          ..blendMode = BlendMode.srcIn;
+        canvas.drawCircle(endPoint, 4, circlePaint);
+      }
+    }
+  }
+
+  @override
+  bool shouldRepaint(covariant CustomPainter oldDelegate) => true;
+}

lib/pages/space_management_v2/main_module/shared/helpers/space_management_community_dialog_helper.dart

@@ -0,0 +1,24 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/presentation/create_community_dialog.dart';
+
+abstract final class SpaceManagementCommunityDialogHelper {
+  static void showCreateDialog(BuildContext context) {
+    showDialog<void>(
+      context: context,
+      builder: (_) => CreateCommunityDialog(
+        title: const SelectableText('Community Name'),
+        onCreateCommunity: (community) {
+          context.read<CommunitiesBloc>().add(
+                InsertCommunity(community),
+              );
+          context.read<CommunitiesTreeSelectionBloc>().add(
+                SelectCommunityEvent(community: community),
+              );
+        },
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/shared/models/paginated_data_model.dart

@@ -0,0 +1,43 @@
+import 'package:equatable/equatable.dart';
+
+class PaginatedDataModel<T> extends Equatable {
+  const PaginatedDataModel({
+    required this.data,
+    required this.page,
+    required this.size,
+    required this.hasNext,
+    required this.totalItems,
+    required this.totalPages,
+  });
+
+  final List<T> data;
+  final int page;
+  final int size;
+  final bool hasNext;
+  final int totalItems;
+  final int totalPages;
+
+  factory PaginatedDataModel.fromJson(
+    Map<String, dynamic> json,
+    List<T> Function(List<dynamic>) fromJsonList,
+  ) {
+    return PaginatedDataModel<T>(
+      data: fromJsonList(json['data'] as List<dynamic>),
+      page: json['page'] as int? ?? 1,
+      size: json['size'] as int? ?? 25,
+      hasNext: json['hasNext'] as bool? ?? false,
+      totalItems: json['totalItem'] as int? ?? 0,
+      totalPages: json['totalPage'] as int? ?? 0,
+    );
+  }
+
+  @override
+  List<Object?> get props => [
+        data,
+        page,
+        size,
+        hasNext,
+        totalItems,
+        totalPages,
+      ];
+}

lib/pages/space_management_v2/main_module/views/space_management_page.dart

@@ -0,0 +1,47 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_management_body.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/data/services/debounced_communities_service.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/data/services/remote_communities_service.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
+import 'package:syncrow_web/web_layout/web_scaffold.dart';
+
+class SpaceManagementPage extends StatelessWidget {
+  const SpaceManagementPage({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiBlocProvider(
+      providers: [
+        BlocProvider(
+          create: (context) => CommunitiesBloc(
+            communitiesService: DebouncedCommunitiesService(
+              RemoteCommunitiesService(HTTPService()),
+            ),
+          )..add(const LoadCommunities(LoadCommunitiesParam())),
+        ),
+        BlocProvider(create: (context) => CommunitiesTreeSelectionBloc()),
+      ],
+      child: WebScaffold(
+        appBarTitle: Text(
+          'Space Management',
+          style: ResponsiveTextTheme.of(context).deviceManagementTitle,
+        ),
+        enableMenuSidebar: false,
+        centerBody: Text(
+          'Community Structure',
+          style: Theme.of(context).textTheme.bodyLarge!.copyWith(
+                fontWeight: FontWeight.bold,
+              ),
+        ),
+        rightBody: const NavigateHomeGridView(),
+        scaffoldBody: const SpaceManagementBody(),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/widgets/community_structure_canvas.dart

@@ -0,0 +1,280 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/models/space_connection_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/painters/spaces_connections_arrow_painter.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_card_widget.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/space_cell.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/presentation/communities_tree_selection_bloc/communities_tree_selection_bloc.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
+
+class CommunityStructureCanvas extends StatefulWidget {
+  const CommunityStructureCanvas({
+    required this.community,
+    required this.selectedSpace,
+    super.key,
+  });
+
+  final CommunityModel community;
+  final SpaceModel? selectedSpace;
+
+  @override
+  State<CommunityStructureCanvas> createState() => _CommunityStructureCanvasState();
+}
+
+class _CommunityStructureCanvasState extends State<CommunityStructureCanvas>
+    with SingleTickerProviderStateMixin {
+  final Map<String, Offset> _positions = {};
+  final double _cardWidth = 150.0;
+  final double _cardHeight = 90.0;
+  final double _horizontalSpacing = 150.0;
+  final double _verticalSpacing = 120.0;
+
+  late TransformationController _transformationController;
+  late AnimationController _animationController;
+
+  @override
+  void initState() {
+    _transformationController = TransformationController();
+    _animationController = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 150),
+    );
+    super.initState();
+  }
+
+  @override
+  void didUpdateWidget(covariant CommunityStructureCanvas oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    if (widget.selectedSpace?.uuid != oldWidget.selectedSpace?.uuid) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          _animateToSpace(widget.selectedSpace);
+        }
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    _transformationController.dispose();
+    _animationController.dispose();
+    super.dispose();
+  }
+
+  Set<String> _getAllDescendantUuids(SpaceModel space) {
+    final uuids = <String>{};
+    for (final child in space.children) {
+      uuids.add(child.uuid);
+      uuids.addAll(_getAllDescendantUuids(child));
+    }
+    return uuids;
+  }
+
+  void _runAnimation(Matrix4 target) {
+    final animation = Matrix4Tween(
+      begin: _transformationController.value,
+      end: target,
+    ).animate(_animationController);
+
+    void listener() {
+      _transformationController.value = animation.value;
+    }
+
+    animation.addListener(listener);
+    _animationController.forward(from: 0).whenCompleteOrCancel(() {
+      animation.removeListener(listener);
+    });
+  }
+
+  void _animateToSpace(SpaceModel? space) {
+    if (space == null) {
+      _runAnimation(Matrix4.identity());
+      return;
+    }
+
+    final position = _positions[space.uuid];
+    if (position == null) return;
+
+    const scale = 1.5;
+    final viewSize = context.size;
+    if (viewSize == null) return;
+
+    final x = -position.dx * scale + (viewSize.width / 2) - (_cardWidth * scale / 2);
+    final y =
+        -position.dy * scale + (viewSize.height / 2) - (_cardHeight * scale / 2);
+
+    final matrix = Matrix4.identity()
+      ..translate(x, y)
+      ..scale(scale);
+
+    _runAnimation(matrix);
+  }
+
+  void _onSpaceTapped(SpaceModel? space) {
+    context.read<CommunitiesTreeSelectionBloc>().add(
+          SelectSpaceEvent(community: widget.community, space: space),
+        );
+  }
+
+  void _resetSelectionAndZoom() {
+    context.read<CommunitiesTreeSelectionBloc>().add(
+          SelectSpaceEvent(
+            community: widget.community,
+            space: null,
+          ),
+        );
+  }
+
+  void _calculateLayout(
+    List<SpaceModel> spaces,
+    int depth,
+    Map<int, double> levelXOffset,
+  ) {
+    for (final space in spaces) {
+      double childSubtreeWidth = 0;
+      if (space.children.isNotEmpty) {
+        _calculateLayout(space.children, depth + 1, levelXOffset);
+        final firstChildPos = _positions[space.children.first.uuid];
+        final lastChildPos = _positions[space.children.last.uuid];
+        if (firstChildPos != null && lastChildPos != null) {
+          childSubtreeWidth = (lastChildPos.dx + _cardWidth) - firstChildPos.dx;
+        }
+      }
+
+      final currentX = levelXOffset.putIfAbsent(depth, () => 0.0);
+      double? x;
+
+      if (space.children.isNotEmpty) {
+        final firstChildPos = _positions[space.children.first.uuid]!;
+        x = firstChildPos.dx + (childSubtreeWidth - _cardWidth) / 2;
+      } else {
+        x = currentX;
+      }
+
+      if (x < currentX) {
+        final shiftX = currentX - x;
+        _shiftSubtree(space, shiftX);
+        final keysToShift = levelXOffset.keys.where((d) => d > depth).toList();
+        for (final key in keysToShift) {
+          levelXOffset[key] = levelXOffset[key]! + shiftX;
+        }
+        x += shiftX;
+      }
+
+      final y = depth * (_verticalSpacing + _cardHeight);
+      _positions[space.uuid] = Offset(x, y);
+      levelXOffset[depth] = x + _cardWidth + _horizontalSpacing;
+    }
+  }
+
+  void _shiftSubtree(SpaceModel space, double shiftX) {
+    if (_positions.containsKey(space.uuid)) {
+      _positions[space.uuid] = _positions[space.uuid]!.translate(shiftX, 0);
+    }
+    for (final child in space.children) {
+      _shiftSubtree(child, shiftX);
+    }
+  }
+
+  List<Widget> _buildTreeWidgets() {
+    _positions.clear();
+    final community = widget.community;
+
+    _calculateLayout(community.spaces, 0, {});
+
+    final selectedSpace = widget.selectedSpace;
+    final highlightedUuids = <String>{};
+    if (selectedSpace != null) {
+      highlightedUuids.add(selectedSpace.uuid);
+      highlightedUuids.addAll(_getAllDescendantUuids(selectedSpace));
+    }
+
+    final widgets = <Widget>[];
+    final connections = <SpaceConnectionModel>[];
+    _generateWidgets(community.spaces, widgets, connections, highlightedUuids);
+
+    return [
+      CustomPaint(
+        painter: SpacesConnectionsArrowPainter(
+          connections: connections,
+          positions: _positions,
+          highlightedUuids: highlightedUuids,
+        ),
+        child: Stack(alignment: AlignmentDirectional.center, children: widgets),
+      ),
+    ];
+  }
+
+  void _generateWidgets(
+    List<SpaceModel> spaces,
+    List<Widget> widgets,
+    List<SpaceConnectionModel> connections,
+    Set<String> highlightedUuids,
+  ) {
+    for (final space in spaces) {
+      final position = _positions[space.uuid];
+      if (position == null) continue;
+
+      final isHighlighted = highlightedUuids.contains(space.uuid);
+      final hasNoSelectedSpace = widget.selectedSpace == null;
+
+      widgets.add(
+        Positioned(
+          left: position.dx,
+          top: position.dy,
+          width: _cardWidth,
+          height: _cardHeight,
+          child: SpaceCardWidget(
+            buildSpaceContainer: () {
+              return Opacity(
+                opacity: hasNoSelectedSpace || isHighlighted ? 1.0 : 0.5,
+                child: Tooltip(
+                  message: space.spaceName,
+                  preferBelow: false,
+                  child: SpaceCell(
+                    onTap: () => _onSpaceTapped(space),
+                    icon: space.icon,
+                    name: space.spaceName,
+                  ),
+                ),
+              );
+            },
+            onTap: () => SpaceDetailsDialogHelper.showCreate(context),
+          ),
+        ),
+      );
+
+      for (final child in space.children) {
+        connections.add(
+          SpaceConnectionModel(from: space.uuid, to: child.uuid),
+        );
+      }
+      _generateWidgets(space.children, widgets, connections, highlightedUuids);
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final treeWidgets = _buildTreeWidgets();
+    return InteractiveViewer(
+      transformationController: _transformationController,
+      boundaryMargin: EdgeInsets.symmetric(
+        horizontal: MediaQuery.sizeOf(context).width * 0.3,
+        vertical: MediaQuery.sizeOf(context).height * 0.3,
+      ),
+      minScale: 0.5,
+      maxScale: 3.0,
+      constrained: false,
+      child: GestureDetector(
+        onTap: _resetSelectionAndZoom,
+        child: SizedBox(
+          width: MediaQuery.sizeOf(context).width * 5,
+          height: MediaQuery.sizeOf(context).height * 5,
+          child: Stack(children: treeWidgets),
+        ),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/widgets/community_template_cell.dart

@@ -0,0 +1,50 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+import 'package:syncrow_web/utils/extension/build_context_x.dart';
+
+class CommunityTemplateCell extends StatelessWidget {
+  const CommunityTemplateCell({
+    super.key,
+    required this.onTap,
+    required this.title,
+  });
+
+  final void Function() onTap;
+  final Widget title;
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Column(
+        spacing: 8,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Expanded(
+            child: AspectRatio(
+              aspectRatio: 2.0,
+              child: Container(
+                decoration: ShapeDecoration(
+                  shape: RoundedRectangleBorder(
+                    side: const BorderSide(
+                      width: 4,
+                      strokeAlign: BorderSide.strokeAlignOutside,
+                      color: ColorsManager.borderColor,
+                    ),
+                    borderRadius: BorderRadius.circular(5),
+                  ),
+                ),
+              ),
+            ),
+          ),
+          DefaultTextStyle(
+            style: context.textTheme.bodyLarge!.copyWith(
+              color: ColorsManager.blackColor,
+            ),
+            child: title,
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/widgets/create_space_button.dart

@@ -0,0 +1,43 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/space_details/presentation/helpers/space_details_dialog_helper.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class CreateSpaceButton extends StatelessWidget {
+  const CreateSpaceButton({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: () => SpaceDetailsDialogHelper.showCreate(context),
+      child: Container(
+        height: 60,
+        decoration: BoxDecoration(
+          color: Colors.white,
+          borderRadius: BorderRadius.circular(20),
+          boxShadow: [
+            BoxShadow(
+              color: Colors.grey.withValues(alpha: 0.5),
+              spreadRadius: 5,
+              blurRadius: 7,
+              offset: const Offset(0, 3),
+            ),
+          ],
+        ),
+        child: Center(
+          child: Container(
+            width: 40,
+            height: 40,
+            decoration: const BoxDecoration(
+              color: ColorsManager.boxColor,
+              shape: BoxShape.circle,
+            ),
+            child: const Icon(
+              Icons.add,
+              color: Colors.blue,
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/widgets/plus_button_widget.dart

@@ -0,0 +1,33 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/utils/color_manager.dart';
+
+class PlusButtonWidget extends StatelessWidget {
+  final Offset offset;
+  final void Function() onButtonTap;
+
+  const PlusButtonWidget({
+    super.key,
+    required this.offset,
+    required this.onButtonTap,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onButtonTap,
+      child: Container(
+        width: 30,
+        height: 30,
+        decoration: const BoxDecoration(
+          color: ColorsManager.spaceColor,
+          shape: BoxShape.circle,
+        ),
+        child: const Icon(
+          Icons.add,
+          color: ColorsManager.whiteColors,
+          size: 20,
+        ),
+      ),
+    );
+  }
+}

lib/pages/space_management_v2/main_module/widgets/space_card_widget.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:syncrow_web/pages/space_management_v2/main_module/widgets/plus_button_widget.dart';
+
+class SpaceCardWidget extends StatefulWidget {
+  final void Function() onTap;
+  final Widget Function() buildSpaceContainer;
+
+  const SpaceCardWidget({
+    required this.onTap,
+    required this.buildSpaceContainer,
+    super.key,
+  });
+
+  @override
+  State<SpaceCardWidget> createState() => _SpaceCardWidgetState();
+}
+
+class _SpaceCardWidgetState extends State<SpaceCardWidget> {
+  bool isHovered = false;
+  @override
+  Widget build(BuildContext context) {
+    return MouseRegion(
+      onEnter: (_) => setState(() => isHovered = true),
+      onExit: (_) => setState(() => isHovered = false),
+      child: SizedBox(
+        child: Stack(
+          clipBehavior: Clip.none,
+          alignment: Alignment.center,
+          children: [
+            widget.buildSpaceContainer(),
+            if (isHovered)
+              Positioned(
+                bottom: 0,
+                child: PlusButtonWidget(
+                  offset: Offset.zero,
+                  onButtonTap: widget.onTap,
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+}