Merge branch 'dev' of https://github.com/SyncrowIOT/web into hotfix/communities_loading

<!--
  Thanks for contributing!

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

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



## Description

<!--- Describe your changes in detail -->
fix energy dialog and fix reset value in text form and fix create dialog
routine

## Type of Change

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

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

.github/.github/dependabot.yaml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "pub"
+    directory: "/"
+    schedule:
+      interval: "daily"

lib/main.dart

@@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -21,8 +20,10 @@ import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment =
+    const environment = String.fromEnvironment(
-        String.fromEnvironment('FLAVOR', defaultValue: 'production');
+      'FLAVOR',
+      defaultValue: 'production',
+    );
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
@@ -40,7 +41,7 @@ class MyApp extends StatelessWidget {
     initialLocation: RoutesConst.auth,
     routes: AppRoutes.getRoutes(),
     redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
+      final checkToken = await AuthBloc.getTokenAndValidate();
       final loggedIn = checkToken == 'Success';
       final goingToLogin = state.uri.toString() == RoutesConst.auth;
 
@@ -58,8 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
-              create: (context) => HomeBloc()..add(const FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -67,7 +67,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc(),
           ),
         ],
         child: MaterialApp.router(

lib/main_dev.dart

@@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -21,7 +20,10 @@ import 'package:syncrow_web/utils/theme/theme.dart';
 
 Future<void> main() async {
   try {
-    const environment = String.fromEnvironment('FLAVOR', defaultValue: 'development');
+    const environment = String.fromEnvironment(
+      'FLAVOR',
+      defaultValue: 'development',
+    );
     await dotenv.load(fileName: '.env.$environment');
     WidgetsFlutterBinding.ensureInitialized();
     await Firebase.initializeApp(
@@ -39,7 +41,7 @@ class MyApp extends StatelessWidget {
     initialLocation: RoutesConst.auth,
     routes: AppRoutes.getRoutes(),
     redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
+      final checkToken = await AuthBloc.getTokenAndValidate();
       final loggedIn = checkToken == 'Success';
       final goingToLogin = state.uri.toString() == RoutesConst.auth;
 
@@ -57,7 +59,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -65,7 +67,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc(),
           ),
         ],
         child: MaterialApp.router(

lib/main_staging.dart

@@ -11,7 +11,6 @@ import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
-import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/pages/visitor_password/bloc/visitor_password_bloc.dart';
 import 'package:syncrow_web/services/locator.dart';
 import 'package:syncrow_web/utils/app_routes.dart';
@@ -39,7 +38,7 @@ class MyApp extends StatelessWidget {
     initialLocation: RoutesConst.auth,
     routes: AppRoutes.getRoutes(),
     redirect: (context, state) async {
-      String checkToken = await AuthBloc.getTokenAndValidate();
+      final checkToken = await AuthBloc.getTokenAndValidate();
       final loggedIn = checkToken == 'Success';
       final goingToLogin = state.uri.toString() == RoutesConst.auth;
 
@@ -57,7 +56,7 @@ class MyApp extends StatelessWidget {
           BlocProvider<CreateRoutineBloc>(
             create: (context) => CreateRoutineBloc(),
           ),
-          BlocProvider(create: (context) => HomeBloc()..add(const FetchUserInfo())),
+          BlocProvider(create: (context) => HomeBloc()..add(FetchUserInfo())),
           BlocProvider<VisitorPasswordBloc>(
             create: (context) => VisitorPasswordBloc(),
           ),
@@ -65,7 +64,7 @@ class MyApp extends StatelessWidget {
             create: (context) => RoutineBloc(),
           ),
           BlocProvider<SpaceTreeBloc>(
-            create: (context) => SpaceTreeBloc()..add(InitialEvent()),
+            create: (context) => SpaceTreeBloc(),
           ),
         ],
         child: MaterialApp.router(

lib/pages/analytics/models/air_quality_data_model.dart

@@ -15,7 +15,9 @@ class AirQualityDataModel extends Equatable {
     return AirQualityDataModel(
       date: DateTime.parse(json['date'] as String),
       data: (json['data'] as List<dynamic>)
-          .map((e) => AirQualityPercentageData.fromJson(e as Map<String, dynamic>))
+          .map(
+            (e) => AirQualityPercentageData.fromJson(e as Map<String, dynamic>),
+          )
           .toList(),
     );
   }
@@ -23,9 +25,9 @@ class AirQualityDataModel extends Equatable {
   static final Map<String, Color> metricColors = {
     'good': ColorsManager.goodGreen.withValues(alpha: 0.7),
     'moderate': ColorsManager.moderateYellow.withValues(alpha: 0.7),
-    'poor': ColorsManager.poorOrange.withValues(alpha: 0.7),
+    'unhealthy_sensitive': ColorsManager.poorOrange.withValues(alpha: 0.7),
     'unhealthy': ColorsManager.unhealthyRed.withValues(alpha: 0.7),
-    'severe': ColorsManager.severePink.withValues(alpha: 0.7),
+    'very_unhealthy': ColorsManager.severePink.withValues(alpha: 0.7),
     'hazardous': ColorsManager.hazardousPurple.withValues(alpha: 0.7),
   };
 
@@ -36,22 +38,19 @@ class AirQualityDataModel extends Equatable {
 class AirQualityPercentageData extends Equatable {
   const AirQualityPercentageData({
     required this.type,
-    required this.name,
     required this.percentage,
   });
 
   final String type;
-  final String name;
   final double percentage;
 
   factory AirQualityPercentageData.fromJson(Map<String, dynamic> json) {
     return AirQualityPercentageData(
       type: json['type'] as String? ?? '',
-      name: json['name'] as String? ?? '',
       percentage: (json['percentage'] as num?)?.toDouble() ?? 0,
     );
   }
 
   @override
-  List<Object?> get props => [type, name, percentage];
+  List<Object?> get props => [type, percentage];
 }

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

@@ -33,7 +33,6 @@ class AirQualityDistributionBloc
         state.copyWith(
           status: AirQualityDistributionStatus.success,
           chartData: result,
-          filteredChartData: _arrangeChartDataByType(result, state.selectedAqiType),
         ),
       );
     } catch (e) {
@@ -58,24 +57,6 @@ class AirQualityDistributionBloc
     UpdateAqiTypeEvent event,
     Emitter<AirQualityDistributionState> emit,
   ) {
-    emit(
+    emit(state.copyWith(selectedAqiType: event.aqiType));
-      state.copyWith(
-        selectedAqiType: event.aqiType,
-        filteredChartData: _arrangeChartDataByType(state.chartData, event.aqiType),
-      ),
-    );
-  }
-
-  List<AirQualityDataModel> _arrangeChartDataByType(
-    List<AirQualityDataModel> data,
-    AqiType aqiType,
-  ) {
-    final filteredData = data.map(
-      (data) => AirQualityDataModel(
-        date: data.date,
-        data: data.data.where((value) => value.type == aqiType.code).toList(),
-      ),
-    );
-    return filteredData.toList();
   }
 }

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

@@ -11,28 +11,24 @@ class AirQualityDistributionState extends Equatable {
   const AirQualityDistributionState({
     this.status = AirQualityDistributionStatus.initial,
     this.chartData = const [],
-    this.filteredChartData = const [],
     this.errorMessage,
     this.selectedAqiType = AqiType.aqi,
   });
 
   final AirQualityDistributionStatus status;
   final List<AirQualityDataModel> chartData;
-  final List<AirQualityDataModel> filteredChartData;
   final String? errorMessage;
   final AqiType selectedAqiType;
 
   AirQualityDistributionState copyWith({
     AirQualityDistributionStatus? status,
     List<AirQualityDataModel>? chartData,
-    List<AirQualityDataModel>? filteredChartData,
     String? errorMessage,
     AqiType? selectedAqiType,
   }) {
     return AirQualityDistributionState(
       status: status ?? this.status,
       chartData: chartData ?? this.chartData,
-      filteredChartData: filteredChartData ?? this.filteredChartData,
       errorMessage: errorMessage ?? this.errorMessage,
       selectedAqiType: selectedAqiType ?? this.selectedAqiType,
     );

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

@@ -3,6 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_bloc.dart';
 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';
@@ -22,6 +23,7 @@ abstract final class FetchAirQualityDataHelper {
     bool shouldFetchAnalyticsDevices = true,
   }) {
     final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
     loadAnalyticsDevices(
       context,
       communityUuid: communityUuid,
@@ -36,6 +38,7 @@ abstract final class FetchAirQualityDataHelper {
       context,
       spaceUuid: spaceUuid,
       date: date,
+      aqiType: aqiType,
     );
   }
 
@@ -104,10 +107,15 @@ abstract final class FetchAirQualityDataHelper {
     BuildContext context, {
     required String spaceUuid,
     required DateTime date,
+    required AqiType aqiType,
   }) {
     context.read<AirQualityDistributionBloc>().add(
           LoadAirQualityDistribution(
-            GetAirQualityDistributionParam(spaceUuid: spaceUuid, date: date),
+            GetAirQualityDistributionParam(
+              spaceUuid: spaceUuid,
+              date: date,
+              aqiType: aqiType,
+            ),
           ),
         );
   }

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

@@ -16,11 +16,6 @@ class AqiDistributionChart extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final sortedData = List<AirQualityDataModel>.from(chartData)
-      ..sort(
-        (a, b) => a.date.compareTo(b.date),
-      );
-
     return BarChart(
       BarChartData(
         maxY: 100.1,
@@ -30,29 +25,25 @@ class AqiDistributionChart extends StatelessWidget {
         borderData: EnergyManagementChartsHelper.borderData(),
         barTouchData: _barTouchData(context),
         titlesData: _titlesData(context),
-        barGroups: _buildBarGroups(sortedData),
+        barGroups: _buildBarGroups(),
       ),
       duration: Duration.zero,
     );
   }
 
-  List<BarChartGroupData> _buildBarGroups(List<AirQualityDataModel> sortedData) {
+  List<BarChartGroupData> _buildBarGroups() {
-    return List.generate(sortedData.length, (index) {
+    return List.generate(chartData.length, (index) {
-      final data = sortedData[index];
+      final data = chartData[index];
       final stackItems = <BarChartRodData>[];
       double currentY = 0;
-      bool isFirstElement = true;
+      var isFirstElement = true;
 
-      // Sort data by type to ensure consistent order
+      for (final percentageData in data.data) {
-      final sortedPercentageData = List<AirQualityPercentageData>.from(data.data)
-        ..sort((a, b) => a.type.compareTo(b.type));
-
-      for (final percentageData in sortedPercentageData) {
         stackItems.add(
           BarChartRodData(
             fromY: currentY,
             toY: currentY + percentageData.percentage,
-            color: AirQualityDataModel.metricColors[percentageData.name]!,
+            color: AirQualityDataModel.metricColors[percentageData.type],
             borderRadius: isFirstElement
                 ? const BorderRadius.only(
                     topLeft: Radius.circular(22),
@@ -84,23 +75,21 @@ class AqiDistributionChart extends StatelessWidget {
         tooltipRoundedRadius: 16,
         tooltipPadding: const EdgeInsets.all(8),
         getTooltipItem: (group, groupIndex, rod, rodIndex) {
-          final data = chartData[group.x.toInt()];
+          final data = chartData[group.x];
 
-          final List<TextSpan> children = [];
+          final children = <TextSpan>[];
 
           final textStyle = context.textTheme.bodySmall?.copyWith(
             color: ColorsManager.blackColor,
-            fontSize: 12,
+            fontSize: 8,
           );
 
-          // Sort data by type to ensure consistent order
+          for (final percentageData in data.data) {
-          final sortedPercentageData = List<AirQualityPercentageData>.from(data.data)
+            final percentage = percentageData.percentage.toStringAsFixed(1);
-            ..sort((a, b) => a.type.compareTo(b.type));
+            final type = percentageData.type[0].toUpperCase() +
-
+                percentageData.type.substring(1).replaceAll('_', ' ');
-          for (final percentageData in sortedPercentageData) {
             children.add(TextSpan(
-              text:
+              text: '\n$type: $percentage%',
-                  '\n${percentageData.type.toUpperCase()}: ${percentageData.percentage.toStringAsFixed(1)}%',
               style: textStyle,
             ));
           }
@@ -109,9 +98,10 @@ class AqiDistributionChart extends StatelessWidget {
             DateFormat('dd/MM/yyyy').format(data.date),
             context.textTheme.bodyMedium!.copyWith(
               color: ColorsManager.blackColor,
-              fontSize: 16,
+              fontSize: 9,
               fontWeight: FontWeight.w600,
             ),
+            textAlign: TextAlign.start,
             children: children,
           );
         },

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

@@ -33,7 +33,7 @@ class AqiDistributionChartBox extends StatelessWidget {
               const Divider(),
               const SizedBox(height: 20),
               Expanded(
-                child: AqiDistributionChart(chartData: state.filteredChartData),
+                child: AqiDistributionChart(chartData: state.chartData),
               ),
             ],
           ),

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

@@ -2,8 +2,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/air_quality/blocs/air_quality_distribution/air_quality_distribution_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/energy_management/widgets/chart_title.dart';
+import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
 import 'package:syncrow_web/pages/analytics/widgets/charts_loading_widget.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
 
 class AqiDistributionChartTitle extends StatelessWidget {
   const AqiDistributionChartTitle({required this.isLoading, super.key});
@@ -31,9 +34,15 @@ class AqiDistributionChartTitle extends StatelessWidget {
           child: AqiTypeDropdown(
             onChanged: (value) {
               if (value != null) {
-                context
+                final bloc = context.read<AirQualityDistributionBloc>();
-                    .read<AirQualityDistributionBloc>()
+                try {
-                    .add(UpdateAqiTypeEvent(value));
+                  final param = _makeLoadAqiDistributionParam(context, value);
+                  bloc.add(LoadAirQualityDistribution(param));
+                } catch (_) {
+                  return;
+                } finally {
+                  bloc.add(UpdateAqiTypeEvent(value));
+                }
               }
             },
           ),
@@ -41,4 +50,19 @@ class AqiDistributionChartTitle extends StatelessWidget {
       ],
     );
   }
+
+  GetAirQualityDistributionParam _makeLoadAqiDistributionParam(
+    BuildContext context,
+    AqiType aqiType,
+  ) {
+    final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
+    final spaceUuid =
+        context.read<SpaceTreeBloc>().state.selectedSpaces.firstOrNull ?? '';
+    if (spaceUuid.isEmpty) throw Exception('Space UUID is empty');
+    return GetAirQualityDistributionParam(
+      date: date,
+      spaceUuid: spaceUuid,
+      aqiType: aqiType,
+    );
+  }
 }

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³', 'hcho'),
+  hcho('HCHO', 'mg/m³', 'cho2'),
-  tvoc('TVOC', 'µg/m³', 'tvoc'),
+  tvoc('TVOC', 'µg/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

@@ -63,7 +63,7 @@ class RangeOfAqiChart extends StatelessWidget {
             gradient: LinearGradient(
               begin: Alignment.bottomCenter,
               end: Alignment.topCenter,
-              stops: [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
+              stops: const [0.0, 0.2, 0.4, 0.6, 0.8, 1.0],
               colors: RangeOfAqiChartsHelper.gradientData.map((e) {
                 final (color, _) = e;
                 return color.withValues(alpha: 0.6);

lib/pages/analytics/modules/analytics/views/analytics_page.dart

@@ -16,7 +16,7 @@ import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/real
 import 'package:syncrow_web/pages/analytics/modules/energy_management/blocs/total_energy_consumption/total_energy_consumption_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy/occupancy_bloc.dart';
 import 'package:syncrow_web/pages/analytics/modules/occupancy/blocs/occupancy_heat_map/occupancy_heat_map_bloc.dart';
-import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/fake_air_quality_distribution_service.dart';
+import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/remote_air_quality_distribution_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/analytics_devices_service_delagate.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_energy_management_analytics_devices_service.dart';
 import 'package:syncrow_web/pages/analytics/services/analytics_devices/remote_occupancy_analytics_devices_service.dart';
@@ -27,10 +27,12 @@ import 'package:syncrow_web/pages/analytics/services/energy_consumption_per_devi
 import 'package:syncrow_web/pages/analytics/services/occupacy/remote_occupancy_service.dart';
 import 'package:syncrow_web/pages/analytics/services/occupancy_heat_map/remote_occupancy_heat_map_service.dart';
 import 'package:syncrow_web/pages/analytics/services/power_clamp_info/remote_power_clamp_info_service.dart';
-import 'package:syncrow_web/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart';
+import 'package:syncrow_web/pages/analytics/services/range_of_aqi/remote_range_of_aqi_service.dart';
 import 'package:syncrow_web/pages/analytics/services/realtime_device_service/firebase_realtime_device_service.dart';
 import 'package:syncrow_web/pages/analytics/services/total_energy_consumption/remote_total_energy_consumption_service.dart';
 import 'package:syncrow_web/pages/device_managment/shared/navigate_home_grid_view.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.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';
@@ -104,12 +106,12 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
         ),
         BlocProvider(
           create: (context) => RangeOfAqiBloc(
-            FakeRangeOfAqiService(),
+            RemoteRangeOfAqiService(_httpService),
           ),
         ),
         BlocProvider(
           create: (context) => AirQualityDistributionBloc(
-            FakeAirQualityDistributionService(),
+            RemoteAirQualityDistributionService(_httpService),
           ),
         ),
         BlocProvider(
@@ -130,9 +132,19 @@ class _AnalyticsPageState extends State<AnalyticsPage> {
   }
 }
 
-class AnalyticsPageForm extends StatelessWidget {
+class AnalyticsPageForm extends StatefulWidget {
   const AnalyticsPageForm({super.key});
 
+  @override
+  State<AnalyticsPageForm> createState() => _AnalyticsPageFormState();
+}
+
+class _AnalyticsPageFormState extends State<AnalyticsPageForm> {
+  @override
+  void initState() {
+    context.read<SpaceTreeBloc>().add(InitialEvent());
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
     return WebScaffold(

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

@@ -20,7 +20,7 @@ class AnalyticsDateFilterButton extends StatefulWidget {
   final void Function(DateTime)? onDateSelected;
   final DatePickerType datePickerType;
 
-  static final _color = ColorsManager.blackColor.withValues(alpha: 0.8);
+  static final Color _color = ColorsManager.blackColor.withValues(alpha: 0.8);
 
   @override
   State<AnalyticsDateFilterButton> createState() =>
@@ -60,10 +60,9 @@ class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
         ),
       ),
       onPressed: () {
-        showDialog(
+        showDialog<void>(
           context: context,
-          builder: (_) {
+          builder: (_) => switch (widget.datePickerType) {
-            return switch (widget.datePickerType) {
             DatePickerType.month => MonthPickerWidget(
                 selectedDate: widget.selectedDate,
                 onDateSelected: (value) {
@@ -76,7 +75,6 @@ class _AnalyticsDateFilterButtonState extends State<AnalyticsDateFilterButton> {
                   widget.onDateSelected?.call(value);
                 },
               ),
-            };
           },
         );
       },

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

@@ -118,7 +118,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
             communityUuid: communities.firstOrNull ?? '',
             spaceUuid: spaces.firstOrNull ?? '',
           );
-          break;
+          return;
         case AnalyticsPageTab.airQuality:
           _onAirQualityDateChanged(
             context,
@@ -126,8 +126,9 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
             communityUuid: communities.firstOrNull ?? '',
             spaceUuid: spaces.firstOrNull ?? '',
           );
+          return;
         default:
-          break;
+          return;
       }
     }
   }
@@ -157,6 +158,7 @@ class AnalyticsPageTabsAndChildren extends StatelessWidget {
     required String communityUuid,
     required String spaceUuid,
   }) {
+    if (spaceUuid.isEmpty) return;
     FetchAirQualityDataHelper.loadAirQualityData(
       context,
       date: date,

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

@@ -38,7 +38,7 @@ abstract final class EnergyManagementChartsHelper {
         sideTitles: SideTitles(
           showTitles: true,
           maxIncluded: false,
-          minIncluded: true,
+          minIncluded: false,
           interval: leftTitlesInterval,
           reservedSize: 110,
           getTitlesWidget: (value, meta) => Padding(

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

@@ -34,8 +34,8 @@ class OccupancyHeatMapGradient extends StatelessWidget {
                 width: 1,
               ),
               gradient: LinearGradient(
-                begin: AlignmentDirectional.centerEnd,
+                begin: AlignmentDirectional.centerStart,
-                end: AlignmentDirectional.centerStart,
+                end: AlignmentDirectional.centerEnd,
                 colors: _heatMapColors(),
               ),
             ),

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

@@ -28,11 +28,11 @@ class OccupancyPainter extends CustomPainter {
 
   @override
   void paint(Canvas canvas, Size size) {
-    final Paint fillPaint = Paint();
+    final fillPaint = Paint();
-    final Paint borderPaint = Paint()
+    final borderPaint = Paint()
       ..color = ColorsManager.grayBorder.withValues(alpha: 0.4)
       ..style = PaintingStyle.stroke;
-    final Paint hoveredBorderPaint = Paint()
+    final hoveredBorderPaint = Paint()
       ..color = Colors.black
       ..style = PaintingStyle.stroke
       ..strokeWidth = 1.5;
@@ -48,7 +48,6 @@ class OccupancyPainter extends CustomPainter {
       final rect = Rect.fromLTWH(x, y, cellSize, cellSize);
       canvas.drawRect(rect, fillPaint);
 
-      // Highlight the hovered item
       if (hoveredItem != null && hoveredItem!.index == item.index) {
         canvas.drawRect(rect, hoveredBorderPaint);
       } else {
@@ -73,16 +72,16 @@ class OccupancyPainter extends CustomPainter {
   }
 
   void _drawDashedLine(Canvas canvas, Offset start, Offset end, Paint paint) {
-    const double dashWidth = 2.0;
+    const dashWidth = 2.0;
-    const double dashSpace = 4.0;
+    const dashSpace = 4.0;
-    final double totalLength = (end - start).distance;
+    final totalLength = (end - start).distance;
-    final Offset direction = (end - start) / (end - start).distance;
+    final direction = (end - start) / (end - start).distance;
 
-    double currentLength = 0.0;
+    var currentLength = 0.0;
     while (currentLength < totalLength) {
-      final Offset dashStart = start + direction * currentLength;
+      final dashStart = start + direction * currentLength;
-      final double nextLength = currentLength + dashWidth;
+      final nextLength = currentLength + dashWidth;
-      final Offset dashEnd =
+      final dashEnd =
           start + direction * (nextLength < totalLength ? nextLength : totalLength);
       canvas.drawLine(dashStart, dashEnd, paint);
       currentLength = nextLength + dashSpace;
@@ -91,8 +90,9 @@ class OccupancyPainter extends CustomPainter {
 
   Color _getColor(int value) {
     if (maxValue == 0) return ColorsManager.vividBlue.withValues(alpha: 0);
-    final opacity = value.clamp(0, maxValue) / maxValue;
+    final clampedValue = 0.075 + (1 * value.clamp(0, maxValue) / maxValue);
-    return ColorsManager.vividBlue.withValues(alpha: opacity);
+    final opacity = value == 0 ? 0 : clampedValue;
+    return ColorsManager.vividBlue.withValues(alpha: opacity.toDouble());
   }
 
   @override

lib/pages/analytics/params/get_air_quality_distribution_param.dart

@@ -1,9 +1,14 @@
+import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
+
 class GetAirQualityDistributionParam {
   final DateTime date;
   final String spaceUuid;
+  final AqiType aqiType;
 
-  const GetAirQualityDistributionParam({
+  const GetAirQualityDistributionParam(
+ {
     required this.date,
     required this.spaceUuid,
+    required this.aqiType,
   });
 }

lib/pages/analytics/services/air_quality_distribution/fake_air_quality_distribution_service.dart

@@ -1,95 +0,0 @@
-import 'dart:math';
-
-import 'package:syncrow_web/pages/analytics/models/air_quality_data_model.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_param.dart';
-import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/air_quality_distribution_service.dart';
-
-class FakeAirQualityDistributionService implements AirQualityDistributionService {
-  final _random = Random();
-
-  @override
-  Future<List<AirQualityDataModel>> getAirQualityDistribution(
-    GetAirQualityDistributionParam param,
-  ) async {
-    return Future.delayed(
-      const Duration(milliseconds: 400),
-      () => List.generate(30, (index) {
-        final date = DateTime(2025, 5, 1).add(Duration(days: index));
-
-        final values = _generateRandomPercentages();
-        final nullMask = List.generate(6, (_) => _shouldBeNull());
-
-        if (nullMask.every((isNull) => isNull)) {
-          nullMask[_random.nextInt(6)] = false;
-        }
-
-        final nonNullValues = _redistributePercentages(values, nullMask);
-
-        return AirQualityDataModel(
-          date: date,
-          data: [
-            AirQualityPercentageData(
-              type: AqiType.aqi.code,
-              percentage: nonNullValues[0],
-              name: 'good',
-            ),
-            AirQualityPercentageData(
-              name: 'moderate',
-              type: AqiType.co2.code,
-              percentage: nonNullValues[1],
-            ),
-            AirQualityPercentageData(
-              name: 'poor',
-              percentage: nonNullValues[2],
-              type: AqiType.hcho.code,
-
-            ),
-            AirQualityPercentageData(
-              name: 'unhealthy',
-              percentage: nonNullValues[3],
-              type: AqiType.pm10.code,
-            ),
-            AirQualityPercentageData(
-              name: 'severe',
-              type: AqiType.pm25.code,
-              percentage: nonNullValues[4],
-            ),
-            AirQualityPercentageData(
-              name: 'hazardous',
-              percentage: nonNullValues[5],
-              type: AqiType.co2.code,
-            ),
-          ],
-        );
-      }),
-    );
-  }
-
-  List<double> _redistributePercentages(
-    List<double> originalValues,
-    List<bool> nullMask,
-  ) {
-    double nonNullSum = 0;
-    for (int i = 0; i < originalValues.length; i++) {
-      if (!nullMask[i]) {
-        nonNullSum += originalValues[i];
-      }
-    }
-
-    return List.generate(originalValues.length, (i) {
-      if (nullMask[i]) return 0;
-      return (originalValues[i] / nonNullSum * 100).roundToDouble();
-    });
-  }
-
-  bool _shouldBeNull() => _random.nextDouble() < 0.6;
-
-  List<double> _generateRandomPercentages() {
-    final values = List.generate(6, (_) => _random.nextDouble());
-
-    final sum = values.reduce((a, b) => a + b);
-
-    return values.map((value) => (value / sum * 100).roundToDouble()).toList();
-  }
-}

lib/pages/analytics/services/air_quality_distribution/remote_air_quality_distribution_service.dart

@@ -3,7 +3,8 @@ import 'package:syncrow_web/pages/analytics/params/get_air_quality_distribution_
 import 'package:syncrow_web/pages/analytics/services/air_quality_distribution/air_quality_distribution_service.dart';
 import 'package:syncrow_web/services/api/http_service.dart';
 
-class RemoteAirQualityDistributionService implements AirQualityDistributionService {
+final class RemoteAirQualityDistributionService
+    implements AirQualityDistributionService {
   RemoteAirQualityDistributionService(this._httpService);
 
   final HTTPService _httpService;
@@ -14,10 +15,10 @@ class RemoteAirQualityDistributionService implements AirQualityDistributionServi
   ) async {
     try {
       final response = await _httpService.get(
-        path: 'endpoint',
+        path: '/aqi/distribution/space/${param.spaceUuid}',
         queryParameters: {
-          'spaceUuid': param.spaceUuid,
+          'monthDate': _formatDate(param.date),
-          'date': param.date.toIso8601String(),
+          'pollutantType': param.aqiType.code,
         },
         expectedResponseModel: (data) {
           final json = data as Map<String, dynamic>? ?? {};
@@ -33,4 +34,8 @@ class RemoteAirQualityDistributionService implements AirQualityDistributionServi
       throw Exception('Failed to load energy consumption per phase: $e');
     }
   }
+
+  static String _formatDate(DateTime date) {
+    return '${date.year}-${date.month.toString().padLeft(2, '0')}';
+  }
 }

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

@@ -26,15 +26,15 @@ class DeviceLocationDetailsServiceDecorator implements DeviceLocationService {
       if (data != null) {
         final addressData = data['address'] as Map<String, dynamic>;
         return deviceLocationInfo.copyWith(
-          city: addressData['city'],
+          city: addressData['city'] as String?,
-          country: addressData['country_code'].toString().toUpperCase(),
+          country: addressData['country_code']?.toString().toUpperCase(),
-          address: addressData['state'],
+          address: addressData['state'] as String?,
         );
       }
 
       return deviceLocationInfo;
     } catch (e) {
-      throw Exception('Failed to load device location info: ${e.toString()}');
+      throw Exception('Failed to load device location info: $e');
     }
   }
 }

lib/pages/analytics/services/range_of_aqi/fake_range_of_aqi_service.dart

@@ -1,36 +0,0 @@
-import 'package:syncrow_web/pages/analytics/models/range_of_aqi.dart';
-import 'package:syncrow_web/pages/analytics/modules/air_quality/widgets/aqi_type_dropdown.dart';
-import 'package:syncrow_web/pages/analytics/params/get_range_of_aqi_param.dart';
-import 'package:syncrow_web/pages/analytics/services/range_of_aqi/range_of_aqi_service.dart';
-
-class FakeRangeOfAqiService implements RangeOfAqiService {
-  @override
-  Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
-    return await Future.delayed(const Duration(milliseconds: 800), () {
-      final random = DateTime.now().millisecondsSinceEpoch;
-
-      return List.generate(30, (index) {
-        final date = DateTime(2025, 5, 1).add(Duration(days: index));
-
-        final min = ((random + index * 17) % 200).toDouble();
-        final avgDelta = ((random + index * 23) % 50).toDouble() + 20;
-        final maxDelta = ((random + index * 31) % 50).toDouble() + 30;
-
-        final avg = (min + avgDelta).clamp(0.0, 301.0);
-        final max = (avg + maxDelta).clamp(0.0, 301.0);
-
-        return RangeOfAqi(  
-          data: [
-            RangeOfAqiValue(type: AqiType.aqi.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.pm25.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.pm10.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.hcho.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.tvoc.code, min: min, average: avg, max: max),
-            RangeOfAqiValue(type: AqiType.co2.code, min: min, average: avg, max: max),
-          ],
-          date: date,
-        );
-      });
-    });
-  }
-}

lib/pages/analytics/services/range_of_aqi/remote_range_of_aqi_service.dart

@@ -12,11 +12,8 @@ final class RemoteRangeOfAqiService implements RangeOfAqiService {
   Future<List<RangeOfAqi>> load(GetRangeOfAqiParam param) async {
     try {
       final response = await _httpService.get(
-        path: 'endpoint',
+        path: '/aqi/range/space/${param.spaceUuid}',
-        queryParameters: {
+        queryParameters: {'monthDate': _formatDate(param.date)},
-          'spaceUuid': param.spaceUuid,
-          'date': param.date.toIso8601String(),
-        },
         expectedResponseModel: (data) {
           final json = data as Map<String, dynamic>? ?? {};
           final mappedData = json['data'] as List<dynamic>? ?? [];
@@ -28,7 +25,11 @@ final class RemoteRangeOfAqiService implements RangeOfAqiService {
       );
       return response;
     } catch (e) {
-      throw Exception('Failed to load energy consumption per phase: $e');
+      throw Exception('Failed to load range of aqi: $e');
     }
   }
+
+  static String _formatDate(DateTime date) {
+    return '${date.year}-${date.month.toString().padLeft(2, '0')}';
+  }
 }

lib/pages/device_managment/all_devices/view/device_managment_page.dart

@@ -8,15 +8,28 @@ import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routi
 import 'package:syncrow_web/pages/routines/bloc/routine_bloc/routine_bloc.dart';
 import 'package:syncrow_web/pages/routines/view/create_new_routine_view.dart';
 import 'package:syncrow_web/pages/routines/view/routines_view.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_bloc.dart';
+import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 import 'package:syncrow_web/utils/theme/responsive_text_theme.dart';
 import 'package:syncrow_web/web_layout/web_scaffold.dart';
 
-class DeviceManagementPage extends StatelessWidget with HelperResponsiveLayout {
+class DeviceManagementPage extends StatefulWidget with HelperResponsiveLayout {
   const DeviceManagementPage({super.key});
 
+  @override
+  State<DeviceManagementPage> createState() => _DeviceManagementPageState();
+}
+
+class _DeviceManagementPageState extends State<DeviceManagementPage> {
+
+@override
+  void initState() {
+    context.read<SpaceTreeBloc>().add(InitialEvent());
+    super.initState();
+  }
   @override
   Widget build(BuildContext context) {
     return MultiBlocProvider(

lib/pages/device_managment/device_setting/device_management_content.dart

@@ -1,7 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:syncrow_web/pages/device_managment/all_devices/bloc/device_mgmt_bloc/device_managment_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
+import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/device_info_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/sub_space_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/sub_space_dialog.dart';
@@ -66,14 +69,25 @@ class DeviceManagementContent extends StatelessWidget {
           Padding(
             padding: const EdgeInsets.all(10.0),
             child: InkWell(
-              onTap: () {
+              onTap: () async {
-                showSubSpaceDialog(
+                final selectedSubSpace = await showSubSpaceDialog(
                   context,
                   communityUuid: device.community!.uuid!,
                   spaceUuid: device.spaces!.first.uuid!,
                   subSpaces: subSpaces,
-                  selected: device.subspace!.uuid,
+                  selected: deviceInfo.subspace.uuid,
                 );
+                if (selectedSubSpace != null) {
+                  Future.delayed(const Duration(milliseconds: 500), () {
+                    context.read<SettingDeviceBloc>().add(
+                          SettingBlocAssignRoom(
+                            communityUuid: device.community!.uuid!,
+                            spaceUuid: device.spaces!.first.uuid!,
+                            subSpaceUuid: selectedSubSpace.id ?? '',
+                          ),
+                        );
+                  });
+                }
               },
               child: infoRow(
                   label: 'Sub-Space:',

lib/pages/device_managment/device_setting/sub_space_dialog.dart

@@ -9,13 +9,11 @@ import 'package:syncrow_web/utils/extension/build_context_x.dart';
 class SubSpaceDialog extends StatefulWidget {
   final List<SubSpaceModel> subSpaces;
   final String? selected;
-  final void Function(SubSpaceModel?) onConfirmed;
 
   const SubSpaceDialog({
     Key? key,
     required this.subSpaces,
     this.selected,
-    required this.onConfirmed,
   }) : super(key: key);
 
   @override
@@ -86,30 +84,21 @@ class _SubSpaceDialogState extends State<SubSpaceDialog> {
   }
 }
 
-void showSubSpaceDialog(
+Future<SubSpaceModel?> showSubSpaceDialog(
   BuildContext context, {
   required List<SubSpaceModel> subSpaces,
   String? selected,
   required String communityUuid,
   required String spaceUuid,
 }) {
-  showDialog(
+  return showDialog<SubSpaceModel>(
     context: context,
-    barrierDismissible: true,
+    builder: (ctx) => BlocProvider.value(
-    builder: (ctx) => SubSpaceDialog(
+      value: BlocProvider.of<SettingDeviceBloc>(context),
+      child: SubSpaceDialog(
         subSpaces: subSpaces,
         selected: selected,
-      onConfirmed: (selectedModel) {
+      ),
-        if (selectedModel != null) {
-          context.read<SettingDeviceBloc>().add(
-                SettingBlocAssignRoom(
-                  communityUuid: communityUuid,
-                  spaceUuid: spaceUuid,
-                  subSpaceUuid: selectedModel.id ?? '',
-                ),
-              );
-        }
-      },
     ),
   );
 }

lib/pages/device_managment/device_setting/subspace_dialog_buttons.dart

@@ -1,6 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/device_setting/bloc/setting_bloc_bloc.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/settings_model/sub_space_model.dart';
 import 'package:syncrow_web/pages/device_managment/device_setting/sub_space_dialog.dart';
 import 'package:syncrow_web/utils/color_manager.dart';
@@ -64,9 +62,10 @@ class SubSpaceDialogButtons extends StatelessWidget {
                         final selectedModel = widget.subSpaces.firstWhere(
                           (space) => space.id == _selectedId,
                           orElse: () =>
-                                SubSpaceModel(id: null, name: '', devices: []));
+                              SubSpaceModel(id: null, name: '', devices: []),
-                        widget.onConfirmed(selectedModel);
+                        );
-                        Navigator.of(context).pop();
+                        Navigator.of(context)
+                            .pop(selectedModel); 
                       },
                 child: Text(
                   'Confirm',
@@ -84,31 +83,3 @@ class SubSpaceDialogButtons extends StatelessWidget {
     );
   }
 }
-
-void showSubSpaceDialog(
-  BuildContext context, {
-  required List<SubSpaceModel> subSpaces,
-  String? selected,
-  required String communityUuid,
-  required String spaceUuid,
-}) {
-  showDialog(
-    context: context,
-    barrierDismissible: true,
-    builder: (ctx) => SubSpaceDialog(
-      subSpaces: subSpaces,
-      selected: selected,
-      onConfirmed: (selectedModel) {
-        if (selectedModel != null) {
-          context.read<SettingDeviceBloc>().add(
-                SettingBlocAssignRoom(
-                  communityUuid: communityUuid,
-                  spaceUuid: spaceUuid,
-                  subSpaceUuid: selectedModel.id ?? '',
-                ),
-              );
-        }
-      },
-    ),
-  );
-}

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/schedule_view/opening_clsoing_time_dialog_body.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/schedule_view/time_out_alarm_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/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/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/schedule_view/schedule_garage_view.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/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/garage_door/widgets/opening_clsoing_time_dialog_body.dart

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

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

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

lib/pages/device_managment/garage_door/widgets/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/schedule_view/schedule__garage_table.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/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/widgets/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/schedule_view/schedule_garage_header.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/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/widgets/schedule_garage_managment_ui.dart';
-import 'package:syncrow_web/pages/device_managment/garage_door/schedule_view/schedule_garage_mode_buttons.dart';
+import 'package:syncrow_web/pages/device_managment/garage_door/widgets/schedule_garage_mode_buttons.dart';
 
 class BuildGarageDoorScheduleView extends StatefulWidget {
   const BuildGarageDoorScheduleView({super.key, required this.status});

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

@@ -3,14 +3,11 @@ 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
+class OneGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final String deviceId;
 
   const OneGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -19,8 +16,7 @@ class OneGangGlassSwitchControlView extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+          OneGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
-            ..add(OneGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<OneGangGlassSwitchBloc, OneGangGlassSwitchState>(
         builder: (context, state) {
           if (state is OneGangGlassSwitchLoading) {
@@ -37,8 +33,7 @@ class OneGangGlassSwitchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, OneGangGlassStatusModel status) {
-      BuildContext context, OneGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -81,21 +76,14 @@ class OneGangGlassSwitchControlView extends StatelessWidget
           onChange: (value) {},
           showToggle: false,
         ),
-        ScheduleControlButton(
+        ToggleWidget(
-          onTap: () {
+          value: false,
-            showDialog<void>(
+          code: '',
-                context: context,
+          deviceId: deviceId,
-                builder: (ctx) => BlocProvider.value(
+          label: 'Scheduling',
-                      value: BlocProvider.of<OneGangGlassSwitchBloc>(context),
+          icon: Assets.scheduling,
-                      child: BuildScheduleView(
+          onChange: (value) {},
-                        category: 'switch_1',
+          showToggle: false,
-                        deviceUuid: deviceId,
-                      ),
-                    ));
-          },
-          mainText: '',
-          subtitle: 'Scheduling',
-          iconPath: Assets.scheduling,
         ),
       ],
     );

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

@@ -5,10 +5,7 @@ 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
@@ -58,6 +55,7 @@ class WallLightDeviceControl extends StatelessWidget
         mainAxisSpacing: 12,
       ),
       children: [
+        const SizedBox(),
         ToggleWidget(
           value: status.switch1,
           code: 'switch_1',
@@ -71,22 +69,7 @@ class WallLightDeviceControl extends StatelessWidget
                 ));
           },
         ),
-        ScheduleControlButton(
+        const SizedBox(),
-          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/schedule_device/bloc/schedule_bloc.dart

@@ -1,587 +0,0 @@
-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,
-      ));
-    }
-  }
-
-  void _onUpdateCountdownTime(
-    UpdateCountdownTimeEvent event,
-    Emitter<ScheduleState> emit,
-  ) {
-    if (state is ScheduleLoaded) {
-      final currentState = state as ScheduleLoaded;
-      emit(currentState.copyWith(
-        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,
-      ));
-    }
-  }
-
-  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,
-            ),
-          );
-
-          if (countdownDuration.inSeconds > 0) {
-            _startCountdownTimer(emit, countdownDuration);
-          } else {
-            _countdownTimer?.cancel();
-            emit(
-              currentState.copyWith(
-                countdownHours: 0,
-                countdownMinutes: 0,
-                countdownRemaining: Duration.zero,
-                isCountdownActive: false,
-              ),
-            );
-          }
-        } else if (code == 'switch_inching') {
-          final inchingDuration = Duration(seconds: totalSeconds);
-          emit(
-            currentState.copyWith(
-              inchingHours: inchingDuration.inHours,
-              inchingMinutes: inchingDuration.inMinutes % 60,
-              isInchingActive: true,
-              countdownRemaining: inchingDuration,
-            ),
-          );
-        }
-      }
-    }
-  }
-
-  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) {
-    // Example input: "2025-06-19T15:45:00.000"
-    return isoDateTime.split('T')[1].split('.')[0]; // gives "15:45:00"
-  }
-
-  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

@@ -1,232 +0,0 @@
-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;
-
-  const UpdateCountdownTimeEvent({
-    required this.hours,
-    required this.minutes,
-  });
-
-  @override
-  List<Object> get props => [hours, minutes];
-}
-
-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

@@ -1,109 +0,0 @@
-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 bool isInchingActive;
-  final ScheduleModes scheduleMode;
-  final Duration? countdownRemaining;
-
-  const ScheduleLoaded({
-    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,
-  }) {
-    return ScheduleLoaded(
-      schedules: schedules ?? this.schedules,
-      selectedTime: selectedTime ?? this.selectedTime,
-      selectedDays: selectedDays ?? this.selectedDays,
-      functionOn: functionOn ?? this.functionOn,
-      isEditing: isEditing ?? this.isEditing,
-      deviceId: 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,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-        schedules,
-        selectedTime,
-        selectedDays,
-        functionOn,
-        isEditing,
-        deviceId,
-        countdownHours,
-        countdownMinutes,
-        isCountdownActive,
-        inchingHours,
-        inchingMinutes,
-        isInchingActive,
-        scheduleMode,
-        countdownRemaining,
-      ];
-}
-
-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_inching_view.dart

@@ -1,185 +0,0 @@
-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 {
-  const CountdownInchingView({super.key});
-
-  @override
-  State<CountdownInchingView> createState() => _CountdownInchingViewState();
-}
-
-class _CountdownInchingViewState extends State<CountdownInchingView> {
-  late FixedExtentScrollController _hoursController;
-  late FixedExtentScrollController _minutesController;
-
-  int _lastHours = -1;
-  int _lastMinutes = -1;
-
-  @override
-  void initState() {
-    super.initState();
-    _hoursController = FixedExtentScrollController();
-    _minutesController = FixedExtentScrollController();
-  }
-
-  @override
-  void dispose() {
-    _hoursController.dispose();
-    _minutesController.dispose();
-    super.dispose();
-  }
-
-  void _updateControllers(int displayHours, int displayMinutes) {
-    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;
-    }
-  }
-
-  @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);
-
-        _updateControllers(displayHours, displayMinutes);
-        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));
-                    }
-                  },
-                  isActive: isActive,
-                ),
-                const SizedBox(width: 10),
-                _buildPickerColumn(
-                  context,
-                  'm',
-                  displayMinutes,
-                  60,
-                  _minutesController,
-                  (value) {
-                    if (!isActive) {
-                      context.read<ScheduleBloc>().add(UpdateCountdownTimeEvent(
-                          hours: displayHours, minutes: 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/schedual_view.dart

@@ -1,110 +0,0 @@
-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)
-                          const CountdownInchingView(),
-                        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

@@ -1,72 +0,0 @@
-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_mode_selector.dart

@@ -1,87 +0,0 @@
-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

@@ -1,283 +0,0 @@
-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/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart

@@ -1,16 +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/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
+class ThreeGangGlassSwitchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   final String deviceId;
 
   const ThreeGangGlassSwitchControlView({required this.deviceId, super.key});
@@ -19,8 +17,7 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) =>
-          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)
+          ThreeGangGlassSwitchBlocFactory.create(deviceId: deviceId)..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
-            ..add(ThreeGangGlassSwitchFetchDeviceEvent(deviceId)),
       child: BlocBuilder<ThreeGangGlassSwitchBloc, ThreeGangGlassSwitchState>(
         builder: (context, state) {
           if (state is ThreeGangGlassSwitchLoading) {
@@ -37,8 +34,7 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
     );
   }
 
-  Widget _buildStatusControls(
+  Widget _buildStatusControls(BuildContext context, ThreeGangGlassStatusModel status) {
-      BuildContext context, ThreeGangGlassStatusModel status) {
     final isExtraLarge = isExtraLargeScreenSize(context);
     final isLarge = isLargeScreenSize(context);
     final isMedium = isMediumScreenSize(context);
@@ -102,54 +98,6 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
                 );
           },
         ),
-        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: '',
@@ -159,6 +107,15 @@ class ThreeGangGlassSwitchControlView extends StatelessWidget
           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,12 +1,9 @@
 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
@@ -93,54 +90,6 @@ 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,7 +1,5 @@
 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';
@@ -18,8 +16,7 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-        create: (context) =>
+        create: (context) => TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
-            TwoGangGlassSwitchBlocFactory.create(deviceId: deviceId)
           ..add(TwoGangGlassSwitchFetchDeviceEvent(deviceId)),
         child: BlocBuilder<TwoGangGlassSwitchBloc, TwoGangGlassSwitchState>(
           builder: (context, state) {
@@ -95,37 +92,14 @@ class TwoGangGlassSwitchControlView extends StatelessWidget
           onChange: (value) {},
           showToggle: false,
         ),
-        ScheduleControlButton(
+        ToggleWidget(
-          onTap: () {
+          value: false,
-            showDialog<void>(
+          code: '',
-                context: context,
+          deviceId: deviceId,
-                builder: (ctx) => BlocProvider.value(
+          label: 'Scheduling',
-                      value: BlocProvider.of<TwoGangGlassSwitchBloc>(context),
+          icon: Assets.scheduling,
-                      child: BuildScheduleView(
+          onChange: (value) {},
-                        deviceUuid: deviceId,
+          showToggle: false,
-                        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,8 +1,6 @@
 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';
@@ -10,11 +8,9 @@ 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
+class TwoGangBatchControlView extends StatelessWidget with HelperResponsiveLayout {
-    with HelperResponsiveLayout {
   const TwoGangBatchControlView({super.key, required this.deviceIds});
 
   final List<String> deviceIds;
@@ -22,8 +18,7 @@ class TwoGangBatchControlView extends StatelessWidget
   @override
   Widget build(BuildContext context) {
     return BlocProvider(
-      create: (context) =>
+      create: (context) => TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
-          TwoGangSwitchBlocFactory.create(deviceId: deviceIds.first)
         ..add(TwoGangSwitchFetchBatchEvent(deviceIds)),
       child: BlocBuilder<TwoGangSwitchBloc, TwoGangSwitchState>(
         builder: (context, state) {
@@ -31,8 +26,7 @@ class TwoGangBatchControlView extends StatelessWidget
             return const Center(child: CircularProgressIndicator());
           } else if (state is TwoGangSwitchStatusLoaded) {
             return _buildStatusControls(context, state.status);
-          } else if (state is TwoGangSwitchError ||
+          } else if (state is TwoGangSwitchError || state is TwoGangSwitchControlError) {
-              state is TwoGangSwitchControlError) {
             return const Center(child: Text('Error fetching status'));
           } else {
             return const Center(child: CircularProgressIndicator());
@@ -88,39 +82,6 @@ class TwoGangBatchControlView extends StatelessWidget
                   ));
             },
           ),
-          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,14 +1,11 @@
 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
@@ -40,17 +37,13 @@ class TwoGangDeviceControlView extends StatelessWidget
 
   Widget _buildStatusControls(BuildContext context, TwoGangStatusModel status) {
     return Center(
-      child: Column(
+      child: Wrap(
-        crossAxisAlignment: CrossAxisAlignment.center,
+        alignment: WrapAlignment.center,
-        mainAxisAlignment: MainAxisAlignment.center,
+        spacing: 12,
-        children: [
+        runSpacing: 12,
-          Row(
-            crossAxisAlignment: CrossAxisAlignment.center,
-            mainAxisAlignment: MainAxisAlignment.center,
         children: [
           SizedBox(
             width: 200,
-                height: 150,
             child: ToggleWidget(
               value: status.switch1,
               code: 'switch_1',
@@ -65,10 +58,8 @@ class TwoGangDeviceControlView extends StatelessWidget
               },
             ),
           ),
-              const SizedBox(width: 10),
           SizedBox(
             width: 200,
-                height: 150,
             child: ToggleWidget(
               value: status.switch2,
               code: 'switch_2',
@@ -85,58 +76,6 @@ class TwoGangDeviceControlView extends StatelessWidget
           ),
         ],
       ),
-          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,38 +1,44 @@
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/device_managment/water_heater/models/schedule_entry.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:syncrow_web/pages/device_managment/all_devices/models/device_status.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';
 
 class ScheduleDialogHelper {
-  static const List<String> allDays = [
+  static void showAddScheduleDialog(BuildContext context, {ScheduleModel? schedule, int? index, bool? isEdit}) {
-    'Sun',
+    final bloc = context.read<WaterHeaterBloc>();
-    'Mon',
-    'Tue',
-    'Wed',
-    'Thu',
-    'Fri',
-    'Sat'
-  ];
 
-  static Future<ScheduleEntry?> showAddScheduleDialog(
+    if (schedule == null) {
-    BuildContext context, {
+      bloc.add((const UpdateSelectedTimeEvent(null)));
-    ScheduleEntry? schedule,
+      bloc.add(InitializeAddScheduleEvent(
-    bool isEdit = false,
+        selectedTime: null,
-  }) {
+        selectedDays: List.filled(7, false),
-    final initialTime = schedule != null
+        functionOn: false,
-        ? _convertStringToTimeOfDay(schedule.time)
+        isEditing: false,
-        : TimeOfDay.now();
+      ));
-    final initialDays = schedule != null
+    } else {
-        ? _convertDaysStringToBooleans(schedule.days)
+      final time = _convertStringToTimeOfDay(schedule.time);
-        : List.filled(7, false);
+      final selectedDays = _convertDaysStringToBooleans(schedule.days);
-    bool? functionOn = schedule?.function.value ?? true;
-    TimeOfDay selectedTime = initialTime;
-    List<bool> selectedDays = List.of(initialDays);
 
-    return showDialog<ScheduleEntry>(
+      bloc.add(InitializeAddScheduleEvent(
+        selectedTime: time,
+        selectedDays: selectedDays,
+        functionOn: schedule.function.value,
+        isEditing: true,
+        index: index,
+      ));
+    }
+
+    showDialog(
       context: context,
       builder: (ctx) {
-        return StatefulBuilder(
+        return BlocProvider.value(
-          builder: (ctx, setState) {
+          value: bloc,
+          child: BlocBuilder<WaterHeaterBloc, WaterHeaterState>(
+            builder: (context, state) {
+              if (state is WaterHeaterDeviceStatusLoaded) {
                 return AlertDialog(
                   shape: RoundedRectangleBorder(
                     borderRadius: BorderRadius.circular(20),
@@ -46,9 +52,9 @@ class ScheduleDialogHelper {
                         children: [
                           const SizedBox(),
                           Text(
-                        isEdit ? 'Edit Schedule' : 'Add Schedule',
+                            'Scheduling',
-                        style: Theme.of(context).textTheme.titleLarge!.copyWith(
+                            style: context.textTheme.titleLarge!.copyWith(
-                              color: Colors.blue,
+                              color: ColorsManager.dialogBlueTitle,
                               fontWeight: FontWeight.bold,
                             ),
                           ),
@@ -59,152 +65,176 @@ class ScheduleDialogHelper {
                       SizedBox(
                         width: 150,
                         height: 40,
-                    child: ElevatedButton(
+                        child: DefaultButton(
-                      style: ElevatedButton.styleFrom(
+                          padding: 8,
-                        backgroundColor: Colors.grey[200],
+                          backgroundColor: ColorsManager.boxColor,
-                        shape: RoundedRectangleBorder(
+                          borderRadius: 15,
-                          borderRadius: BorderRadius.circular(15),
-                        ),
-                      ),
                           onPressed: () async {
                             TimeOfDay? time = await showTimePicker(
-                          context: ctx,
+                              context: context,
-                          initialTime: selectedTime,
+                              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) {
-                          setState(() => selectedTime = time);
+                              bloc.add(UpdateSelectedTimeEvent(time));
                             }
                           },
                           child: Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
                             children: [
                               Text(
-                            selectedTime.format(context),
+                                state.selectedTime == null ? 'Time' : state.selectedTime!.format(context),
-                            style: Theme.of(context)
+                                style: context.textTheme.bodySmall!.copyWith(
-                                .textTheme
+                                  color: ColorsManager.grayColor,
-                                .bodySmall!
+                                ),
-                                .copyWith(color: Colors.grey),
+                              ),
+                              const Icon(
+                                Icons.access_time,
+                                color: ColorsManager.grayColor,
+                                size: 18,
                               ),
-                          const Icon(Icons.access_time,
-                              color: Colors.grey, size: 18),
                             ],
                           ),
                         ),
                       ),
                       const SizedBox(height: 16),
-                  _buildDayCheckboxes(ctx, selectedDays, (i, v) {
+                      _buildDayCheckboxes(context, state.selectedDays, isEdit: isEdit),
-                    setState(() => selectedDays[i] = v);
-                  }),
                       const SizedBox(height: 16),
-                  _buildFunctionSwitch(ctx, functionOn!, (v) {
+                      _buildFunctionSwitch(context, state.functionOn, isEdit),
-                    setState(() => functionOn = v);
-                  }),
                     ],
                   ),
                   actions: [
                     SizedBox(
-                  width: 100,
+                      width: 200,
-                  child: OutlinedButton(
+                      child: DefaultButton(
+                        height: 40,
                         onPressed: () {
-                      Navigator.pop(ctx, null);
+                          Navigator.pop(context);
                         },
-                    child: const Text('Cancel'),
+                        backgroundColor: ColorsManager.boxColor,
+                        child: Text(
+                          'Cancel',
+                          style: context.textTheme.bodyMedium,
+                        ),
                       ),
                     ),
                     SizedBox(
-                  width: 100,
+                      width: 200,
-                  child: ElevatedButton(
+                      child: DefaultButton(
+                        height: 40,
                         onPressed: () {
-                      final entry = ScheduleEntry(
+                          if (state.selectedTime != null) {
-                        category: schedule?.category ?? 'switch_1',
+                            if (state.isEditing && index != null) {
-                        time: _formatTimeOfDayToISO(selectedTime),
+                              bloc.add(EditWaterHeaterScheduleEvent(
-                        function: Status(code: 'switch_1', value: functionOn),
+                                scheduleId: schedule?.scheduleId ?? '',
-                        days: _convertSelectedDaysToStrings(selectedDays),
+                                category: 'switch_1',
-                        scheduleId: schedule?.scheduleId,
+                                time: state.selectedTime!,
-                      );
+                                selectedDays: state.selectedDays,
-                      Navigator.pop(ctx, entry);
+                                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'),
                       ),
                     ),
                   ],
                 );
+              }
+              return const SizedBox();
             },
+          ),
         );
       },
     );
   }
 
-  static TimeOfDay _convertStringToTimeOfDay(String iso) {
+  static TimeOfDay _convertStringToTimeOfDay(String timeString) {
-    final dt = DateTime.tryParse(iso);
+    final regex = RegExp(r'^(\d{2}):(\d{2})$');
-    if (dt != null) return TimeOfDay(hour: dt.hour, minute: dt.minute);
+    final match = regex.firstMatch(timeString);
-    return const TimeOfDay(hour: 9, minute: 0);
+    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 List<bool> _convertDaysStringToBooleans(List<String> selectedDays) {
     final daysOfWeek = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
-    return daysOfWeek
+    List<bool> daysBoolean = List.filled(7, false);
-        .map((d) =>
+
-            selectedDays.map((e) => e.toLowerCase()).contains(d.toLowerCase()))
+    for (int i = 0; i < daysOfWeek.length; i++) {
-        .toList();
+      if (selectedDays.contains(daysOfWeek[i])) {
+        daysBoolean[i] = true;
+      }
     }
 
-  static String _formatTimeOfDayToISO(TimeOfDay t) {
+    return daysBoolean;
-    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) {
+  static Widget _buildDayCheckboxes(BuildContext context, List<bool> selectedDays, {bool? isEdit}) {
-    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: (val) => onChanged(index, val!),
+              onChanged: (bool? value) {
+                context.read<WaterHeaterBloc>().add(UpdateSelectedDayEvent(index, value!));
+              },
             ),
             Text(dayLabels[index]),
           ],
-        ),
+        );
-      ),
+      }),
     );
   }
 
-  static Widget _buildFunctionSwitch(
+  static Widget _buildFunctionSwitch(BuildContext context, bool isOn, bool? isEdit) {
-      BuildContext ctx, bool isOn, Function(bool) onChanged) {
     return Row(
       children: [
         Text(
           'Function:',
-          style:
+          style: context.textTheme.bodySmall!.copyWith(color: ColorsManager.grayColor),
-              Theme.of(ctx).textTheme.bodySmall!.copyWith(color: Colors.grey),
         ),
         const SizedBox(width: 10),
         Radio<bool>(
           value: true,
           groupValue: isOn,
-          onChanged: (val) => onChanged(true),
+          onChanged: (bool? value) {
+            context.read<WaterHeaterBloc>().add(const UpdateFunctionOnEvent(true));
+          },
         ),
         const Text('On'),
         const SizedBox(width: 10),
         Radio<bool>(
           value: false,
           groupValue: isOn,
-          onChanged: (val) => onChanged(false),
+          onChanged: (bool? value) {
+            context.read<WaterHeaterBloc>().add(const UpdateFunctionOnEvent(false));
+          },
         ),
         const Text('Off'),
       ],

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

@@ -2,7 +2,6 @@ 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;
@@ -59,8 +58,7 @@ class ScheduleEntry {
 
   String toJson() => json.encode(toMap());
 
-  factory ScheduleEntry.fromJson(String source) =>
+  factory ScheduleEntry.fromJson(String source) => ScheduleEntry.fromMap(json.decode(source));
-      ScheduleEntry.fromMap(json.decode(source));
 
   @override
   bool operator ==(Object other) {
@@ -75,23 +73,6 @@ class ScheduleEntry {
 
   @override
   int get hashCode {
-    return category.hashCode ^
+    return category.hashCode ^ time.hashCode ^ function.hashCode ^ days.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/view/water_heater_device_control.dart

@@ -2,13 +2,12 @@ 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/schedule_device/schedule_widgets/schedual_view.dart';
+import 'package:syncrow_web/pages/device_managment/water_heater/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';
@@ -36,8 +35,7 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 state is WaterHeaterBatchFailedState) {
               return const Center(child: Text('Error fetching status'));
             } else {
-              return const SizedBox(
+              return const SizedBox(height: 200, child: Center(child: SizedBox()));
-                  height: 200, child: Center(child: SizedBox()));
             }
           },
         ));
@@ -75,22 +73,48 @@ class WaterHeaterDeviceControlView extends StatelessWidget
                 ));
           },
         ),
-        ScheduleControlButton(
+        GestureDetector(
           onTap: () {
-            showDialog<void>(
+            showDialog(
                 context: context,
                 builder: (ctx) => BlocProvider.value(
                       value: BlocProvider.of<WaterHeaterBloc>(context),
-                      child: BuildScheduleView(
+                      child: BuildScheduleView(status: status),
-                        deviceUuid: device.uuid ?? '',
-                        category: 'switch_1',
-                      ),
                     ));
           },
-          mainText: '',
+          child: DeviceControlsContainer(
-          subtitle: 'Scheduling',
+            child: Column(
-          iconPath: Assets.scheduling,
+              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,
+                  ),
+                ),
+              ],
+            ),
+          ),
+        )
       ],
     );
   }

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

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

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

@@ -0,0 +1,223 @@
+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/inching_mode_buttons.dart

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

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

@@ -0,0 +1,117 @@
+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_managment_ui.dart

@@ -1,19 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/common/buttons/default_button.dart';
-import 'package:syncrow_web/pages/device_managment/schedule_device/schedule_widgets/schedule_table.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/utils/color_manager.dart';
 import 'package:syncrow_web/utils/extension/build_context_x.dart';
 
 class ScheduleManagementUI extends StatelessWidget {
-  final String deviceUuid; 
+  final WaterHeaterDeviceStatusLoaded state;
-  final VoidCallback onAddSchedule;
+  final Function onAddSchedule;
-  final String category;
 
   const ScheduleManagementUI({
     super.key,
-    required this.deviceUuid,
+    required this.state,
     required this.onAddSchedule,
-    this.category = 'switch_1',
   });
 
   @override
@@ -29,7 +28,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),
@@ -44,7 +43,7 @@ class ScheduleManagementUI extends StatelessWidget {
           ),
         ),
         const SizedBox(height: 20),
-        ScheduleTableWidget(deviceUuid: deviceUuid, category: category),
+        ScheduleTableWidget(state: state),
       ],
     );
   }

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

@@ -0,0 +1,86 @@
+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

@@ -0,0 +1,222 @@
+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/home/bloc/home_bloc.dart

@@ -13,30 +13,32 @@ import 'package:syncrow_web/pages/space_tree/bloc/space_tree_event.dart';
 import 'package:syncrow_web/services/home_api.dart';
 import 'package:syncrow_web/utils/constants/assets.dart';
 import 'package:syncrow_web/utils/constants/routes_const.dart';
-import 'package:syncrow_web/utils/navigation_service.dart';
 
 class HomeBloc extends Bloc<HomeEvent, HomeState> {
   UserModel? user;
   String terms = '';
   String policy = '';
 
-  HomeBloc() : super((HomeInitial())) {
+  HomeBloc() : super(HomeInitial()) {
-    // on<CreateNewNode>(_createNode);
     on<FetchUserInfo>(_fetchUserInfo);
     on<FetchTermEvent>(_fetchTerms);
     on<FetchPolicyEvent>(_fetchPolicy);
     on<ConfirmUserAgreementEvent>(_confirmUserAgreement);
   }
 
-  Future _fetchUserInfo(FetchUserInfo event, Emitter<HomeState> emit) async {
+  Future<void> _fetchUserInfo(
+    FetchUserInfo event,
+    Emitter<HomeState> emit,
+  ) async {
     try {
-      var uuid =
+      final uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
+      if (uuid != null) {
         user = await HomeApi().fetchUserInfo(uuid);
+      }
 
-      if (user != null && user!.project != null) {
+      if (user != null && user?.project != null) {
         await ProjectManager.setProjectUUID(user!.project!.uuid);
-
       }
       add(FetchTermEvent());
       add(FetchPolicyEvent());
@@ -47,7 +49,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _fetchTerms(FetchTermEvent event, Emitter<HomeState> emit) async {
+  Future<void> _fetchTerms(FetchTermEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
       terms = await HomeApi().fetchTerms();
@@ -57,22 +59,22 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  Future _fetchPolicy(FetchPolicyEvent event, Emitter<HomeState> emit) async {
+  Future<void> _fetchPolicy(FetchPolicyEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
       policy = await HomeApi().fetchPolicy();
       emit(HomeInitial());
     } catch (e) {
-      debugPrint("Error fetching policy: $e");
+      debugPrint('Error fetching policy: $e');
       return;
     }
   }
 
-  Future _confirmUserAgreement(
+  Future<void> _confirmUserAgreement(
       ConfirmUserAgreementEvent event, Emitter<HomeState> emit) async {
     try {
       emit(LoadingHome());
-      var uuid =
+      final uuid =
           await const FlutterSecureStorage().read(key: UserModel.userUuidKey);
       policy = await HomeApi().confirmUserAgreements(uuid);
       emit(PolicyAgreement());
@@ -81,7 +83,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
     }
   }
 
-  List<HomeItemModel> homeItems = [
+  final List<HomeItemModel> homeItems = [
     HomeItemModel(
       title: 'Access Management',
       icon: Assets.accessIcon,
@@ -126,41 +128,5 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
       },
       color: const Color(0xFF023DFE),
     ),
-
-    // HomeItemModel(
-    //   title: 'Move in',
-    //   icon: Assets.moveinIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.primaryColor,
-    // ),
-    // HomeItemModel(
-    //   title: 'Construction',
-    //   icon: Assets.constructionIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.primaryColor,
-    // ),
-    // HomeItemModel(
-    //   title: 'Energy',
-    //   icon: Assets.energyIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
-    // HomeItemModel(
-    //   title: 'Integrations',
-    //   icon: Assets.integrationsIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
-    // HomeItemModel(
-    //   title: 'Asset',
-    //   icon: Assets.assetIcon,
-    //   active: false,
-    //   onPress: (context) {},
-    //   color: ColorsManager.slidingBlueColor.withOpacity(0.2),
-    // ),
   ];
 }

lib/pages/home/view/home_page.dart

@@ -1,17 +1,37 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_bloc.dart';
+import 'package:syncrow_web/pages/home/bloc/home_event.dart';
 import 'package:syncrow_web/pages/home/view/home_page_mobile.dart';
 import 'package:syncrow_web/pages/home/view/home_page_web.dart';
 import 'package:syncrow_web/utils/helpers/responsice_layout_helper/responsive_layout_helper.dart';
 
-class HomePage extends StatelessWidget with HelperResponsiveLayout {
+class HomePage extends StatefulWidget {
   const HomePage({super.key});
 
+  @override
+  State<HomePage> createState() => _HomePageState();
+}
+
+class _HomePageState extends State<HomePage> with HelperResponsiveLayout {
+  @override
+  void initState() {
+    _fetchUserInfo();
+
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
-    final isSmallScreen = isSmallScreenSize(context);
+    if (isSmallScreenSize(context) || isMediumScreenSize(context)) {
-    final isMediumScreen = isMediumScreenSize(context);
+      return HomeMobilePage();
-    return isSmallScreen || isMediumScreen
+    }
-        ? HomeMobilePage()
+
-        : const HomeWebPage();
+    return const HomeWebPage();
+  }
+
+  void _fetchUserInfo() {
+    final bloc = context.read<HomeBloc>();
+    if (bloc.user == null) bloc.add(const FetchUserInfo());
   }
 }

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

@@ -19,7 +19,6 @@ 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});
 

lib/pages/routines/bloc/functions_bloc/functions_bloc_bloc.dart

@@ -13,6 +13,35 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     on<AddFunction>(_onAddFunction);
     on<SelectFunction>(_onSelectFunction);
   }
+  // void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
+  //   final functions = List<DeviceFunctionData>.from(state.addedFunctions);
+  //   final existingIndex = functions.indexWhere(
+  //     (f) => f.functionCode == event.functionData.functionCode,
+  //   );
+
+  //   if (existingIndex != -1) {
+  //     final existingData = functions[existingIndex];
+  //     functions[existingIndex] = DeviceFunctionData(
+  //       entityId: event.functionData.entityId,
+  //       functionCode: event.functionData.functionCode,
+  //       operationName: event.functionData.operationName,
+  //       value: event.functionData.value ?? existingData.value,
+  //       valueDescription: event.functionData.valueDescription ??
+  //           existingData.valueDescription,
+  //       condition: event.functionData.condition ?? existingData.condition,
+  //       step: event.functionData.step ?? existingData.step,
+  //     );
+  //   } else {
+  //     functions.clear();
+  //     functions.add(event.functionData);
+  //   }
+
+  //   emit(state.copyWith(
+  //     addedFunctions: functions,
+  //     selectedFunction: event.functionData.functionCode,
+  //   ));
+  // }
+
   void _onAddFunction(AddFunction event, Emitter<FunctionBlocState> emit) {
     final functions = List<DeviceFunctionData>.from(state.addedFunctions);
     final existingIndex = functions.indexWhere(
@@ -20,19 +49,10 @@ class FunctionBloc extends Bloc<FunctionBlocEvent, FunctionBlocState> {
     );
 
     if (existingIndex != -1) {
-      final existingData = functions[existingIndex];
+      // Update the function value
-      functions[existingIndex] = DeviceFunctionData(
+      functions[existingIndex] = event.functionData;
-        entityId: event.functionData.entityId,
-        functionCode: event.functionData.functionCode,
-        operationName: event.functionData.operationName,
-        value: event.functionData.value ?? existingData.value,
-        valueDescription: event.functionData.valueDescription ??
-            existingData.valueDescription,
-        condition: event.functionData.condition ?? existingData.condition,
-        step: event.functionData.step ?? existingData.step,
-      );
     } else {
-      functions.clear();
+      // Add new function value
       functions.add(event.functionData);
     }
 

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

@@ -4,8 +4,8 @@ import 'package:bloc/bloc.dart';
 import 'package:dio/dio.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter/material.dart';
-import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:syncrow_web/pages/common/bloc/project_manager.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/devices_model.dart';
 import 'package:syncrow_web/pages/routines/bloc/automation_scene_trigger_bloc/automation_status_update.dart';
 import 'package:syncrow_web/pages/routines/bloc/create_routine_bloc/create_routine_bloc.dart';
@@ -27,9 +27,6 @@ import 'package:uuid/uuid.dart';
 part 'routine_event.dart';
 part 'routine_state.dart';
 
-// String spaceId = '25c96044-fadf-44bb-93c7-3c079e527ce6';
-// String communityId = 'aff21a57-2f91-4e5c-b99b-0182c3ab65a9';
-
 class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
   RoutineBloc() : super(const RoutineState()) {
     on<AddToIfContainer>(_onAddToIfContainer);
@@ -1163,8 +1160,8 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
 
       if (result['success']) {
         add(ResetRoutineState());
-        add(LoadAutomation());
+        add(const LoadAutomation());
-        add(LoadScenes());
+        add(const LoadScenes());
       } else {
         emit(state.copyWith(
           isLoading: false,
@@ -1422,15 +1419,17 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
           event.automationId, event.automationStatusUpdate, projectId);
 
       if (success) {
-        final updatedAutomations = await SceneApi.getAutomationByUnitId(
+        // await SceneApi.getAutomationByUnitId(
-            event.automationStatusUpdate.spaceUuid,
+        //     event.automationStatusUpdate.spaceUuid,
-            event.communityId,
+        //     event.communityId,
-            projectId);
+        //     projectId);
 
         // Remove from loading set safely
+
         final updatedLoadingIds = {...state.loadingAutomationIds!}
           ..remove(event.automationId);
-
+        final updatedAutomations = changeItemStateOnToggelingSceen(
+            state.automations, event.automationId);
         emit(state.copyWith(
           automations: updatedAutomations,
           loadingAutomationIds: updatedLoadingIds,
@@ -1452,4 +1451,24 @@ class RoutineBloc extends Bloc<RoutineEvent, RoutineState> {
       ));
     }
   }
+
+  List<ScenesModel> changeItemStateOnToggelingSceen(
+      List<ScenesModel> oldSceen, String automationId) {
+    return oldSceen.map((scene) {
+      if (scene.id == automationId) {
+        return ScenesModel(
+          id: scene.id,
+          sceneTuyaId: scene.sceneTuyaId,
+          name: scene.name,
+          status: scene.status == 'enable' ? 'disable' : 'enable',
+          type: scene.type,
+          spaceName: scene.spaceName,
+          spaceId: scene.spaceId,
+          communityId: scene.communityId,
+          icon: scene.icon,
+        );
+      }
+      return scene;
+    }).toList();
+  }
 }

lib/pages/routines/create_new_routines/commu_dropdown.dart

@@ -117,7 +117,7 @@ class _DropdownContentState extends State<_DropdownContent> {
     final selectedCommunity = _findCommunity(state, state.selectedSpaceId);
 
     return Container(
-      height: 46,
+      height: 40,
       decoration: BoxDecoration(
         border: Border.all(color: Colors.grey.shade300),
         borderRadius: BorderRadius.circular(12),
@@ -149,7 +149,7 @@ class _DropdownContentState extends State<_DropdownContent> {
               ),
             ),
             height: 45,
-            width: 33,
+            width: 44,
             child: const Icon(
               Icons.keyboard_arrow_down,
               color: ColorsManager.textGray,

lib/pages/routines/create_new_routines/create_new_routines.dart

@@ -44,51 +44,60 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
               _selectedSpace = null;
               _selectedCommunity = _selectedId;
             }
-            return AlertDialog(
+            return Dialog(
               backgroundColor: Colors.white,
-              insetPadding: EdgeInsets.zero,
+              insetPadding: const EdgeInsets.symmetric(
-              contentPadding: EdgeInsets.zero,
+                horizontal: 20,
+              ),
               shape: RoundedRectangleBorder(
                   borderRadius: BorderRadius.circular(12)),
-              title: Text(
+              child: Container(
+                width: 450,
+                child: Stack(
+                  children: [
+                    Column(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        const SizedBox(height: 20),
+                        Text(
                           'Create New Routines',
                           textAlign: TextAlign.center,
-                style: Theme.of(context).textTheme.bodyMedium!.copyWith(
+                          style:
+                              Theme.of(context).textTheme.bodyMedium!.copyWith(
                                     color: ColorsManager.spaceColor,
                                     fontSize: 20,
                                     fontWeight: FontWeight.w700,
                                   ),
                         ),
-              content: Stack(
-                children: [
-                  Column(
-                    mainAxisSize: MainAxisSize.min,
-                    children: [
                         const Divider(),
                         const SizedBox(height: 20),
+                        Column(
+                          children: [
                             Column(
                               children: [
                                 Padding(
-                              padding:
+                                    padding: const EdgeInsets.only(
-                                  const EdgeInsets.only(left: 13, right: 8),
+                                        left: 13, right: 10),
                                     child: Column(
                                       children: [
                                         SpaceTreeDropdown(
                                           selectedSpaceId: _selectedId,
                                           onChanged: (String? newValue) {
-                                      setState(() => _selectedId = newValue!);
+                                            setState(
+                                                () => _selectedId = newValue!);
                                             if (_selectedId != null) {
-                                        _bloc.add(SpaceOnlyWithDevicesEvent(
+                                              _bloc.add(
+                                                  SpaceOnlyWithDevicesEvent(
                                                       _selectedId!));
                                             }
                                           },
                                         ),
                                       ],
                                     )),
-                          const SizedBox(height: 5),
+                                const SizedBox(height: 21),
-                          const SizedBox(height: 8),
                                 Padding(
-                            padding: const EdgeInsets.only(left: 15, right: 15),
+                                  padding: const EdgeInsets.only(
+                                      left: 15, right: 20),
                                   child: SpaceDropdown(
                                     hintMessage: spaceHint,
                                     spaces: spaces,
@@ -102,6 +111,8 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                                 ),
                               ],
                             ),
+                          ],
+                        ),
                         const SizedBox(height: 20),
                         const Divider(),
                         Row(
@@ -183,6 +194,7 @@ class _CreateNewRoutinesDialogState extends State<CreateNewRoutinesDialog> {
                       ),
                   ],
                 ),
+              ),
             );
           },
         ));

lib/pages/routines/create_new_routines/space_dropdown.dart

@@ -34,7 +34,9 @@ class SpaceDropdown extends StatelessWidget {
           ),
           SizedBox(
             child: Container(
+              height: 40,
               decoration: BoxDecoration(
+                color: ColorsManager.whiteColors,
                 borderRadius: BorderRadius.circular(10),
               ),
               child: DropdownButton2<String>(
@@ -45,7 +47,7 @@ class SpaceDropdown extends StatelessWidget {
                     value: space.uuid,
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.start,
+                      mainAxisAlignment: MainAxisAlignment.center,
                       children: [
                         Text(
                           '   ${space.name}',
@@ -88,7 +90,7 @@ class SpaceDropdown extends StatelessWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     children: [
                       Expanded(
-                        flex: 6,
+                        flex: 8,
                         child: Padding(
                           padding: const EdgeInsets.only(left: 10),
                           child: Text(
@@ -129,6 +131,7 @@ class SpaceDropdown extends StatelessWidget {
                 dropdownStyleData: DropdownStyleData(
                   maxHeight: MediaQuery.of(context).size.height * 0.4,
                   decoration: BoxDecoration(
+                    color: ColorsManager.whiteColors,
                     borderRadius: BorderRadius.circular(10),
                   ),
                 ),

lib/pages/routines/helper/save_routine_helper.dart

@@ -17,7 +17,8 @@ class SaveRoutineHelper {
       builder: (context) {
         return BlocBuilder<RoutineBloc, RoutineState>(
           builder: (context, state) {
-            final selectedConditionLabel = state.selectedAutomationOperator == 'and'
+            final selectedConditionLabel =
+                state.selectedAutomationOperator == 'and'
                     ? 'All Conditions are met'
                     : 'Any Condition is met';
 
@@ -37,7 +38,8 @@ class SaveRoutineHelper {
                     Text(
                       'Create a scene: ${state.routineName ?? ""}',
                       textAlign: TextAlign.center,
-                      style: Theme.of(context).textTheme.headlineMedium!.copyWith(
+                      style:
+                          Theme.of(context).textTheme.headlineMedium!.copyWith(
                                 color: ColorsManager.primaryColorWithOpacity,
                                 fontWeight: FontWeight.bold,
                               ),
@@ -58,7 +60,8 @@ class SaveRoutineHelper {
                             _buildIfConditions(state, context),
                             Container(
                               width: 1,
-                              color: ColorsManager.greyColor.withValues(alpha: 0.8),
+                              color: ColorsManager.greyColor
+                                  .withValues(alpha: 0.8),
                             ),
                             _buildThenActions(state, context),
                           ],
@@ -97,7 +100,8 @@ class SaveRoutineHelper {
       child: Row(
         spacing: 16,
         children: [
-          Expanded(child: Text('IF: $selectedConditionLabel', style: textStyle)),
+          Expanded(
+              child: Text('IF: $selectedConditionLabel', style: textStyle)),
           const Expanded(child: Text('THEN:', style: textStyle)),
         ],
       ),
@@ -143,7 +147,8 @@ class SaveRoutineHelper {
       child: ListView(
         // shrinkWrap: true,
         children: state.thenItems.map((item) {
-          final functions = state.selectedFunctions[item['uniqueCustomId']] ?? [];
+          final functions =
+              state.selectedFunctions[item['uniqueCustomId']] ?? [];
           return functionRow(item, context, functions);
         }).toList(),
       ),
@@ -203,7 +208,8 @@ class SaveRoutineHelper {
                     ),
                   ),
                   child: Center(
-                    child: item['type'] == 'tap_to_run' || item['type'] == 'scene'
+                    child:
+                        item['type'] == 'tap_to_run' || item['type'] == 'scene'
                             ? Image.memory(
                                 base64Decode(item['icon']),
                                 width: 12,

lib/pages/routines/models/pc/energy_clamp_functions.dart

@@ -405,8 +405,8 @@ class PowerFactorCStatusFunction extends EnergyClampFunctions {
           code: 'PowerFactorC',
           operationName: 'Power Factor C',
           icon: Assets.speedoMeter,
-          min: 0.00,
+          min: 0.0,
-          max: 1.00,
+          max: 1.0,
           step: 0.1,
           unit: "",
         );

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

@@ -117,10 +117,22 @@ class ACHelper {
                         },
                         onConfirm: state.addedFunctions.isNotEmpty
                             ? () {
+                                final selectedFunctionData =
+                                    state.addedFunctions.firstWhere(
+                                  (f) =>
+                                      f.functionCode == state.selectedFunction,
+                                  orElse: () => DeviceFunctionData(
+                                    entityId: '',
+                                    functionCode: state.selectedFunction ?? '',
+                                    operationName: '',
+                                    value: null,
+                                  ),
+                                );
+
                                 /// add the functions to the routine bloc
                                 context.read<RoutineBloc>().add(
                                       AddFunctionToRoutine(
-                                        state.addedFunctions,
+                                        [selectedFunctionData],
                                         uniqueCustomId,
                                       ),
                                     );

lib/pages/routines/widgets/routine_dialogs/ceiling_sensor/ceiling_sensor_dialog.dart

@@ -78,12 +78,22 @@ class _CeilingSensorDialogState extends State<CeilingSensorDialog> {
                   onCancel: () => Navigator.pop(context),
                   onConfirm: state.addedFunctions.isNotEmpty
                       ? () {
+                          final selectedFunctionData =
+                              state.addedFunctions.firstWhere(
+                            (f) => f.functionCode == state.selectedFunction,
+                            orElse: () => DeviceFunctionData(
+                              entityId: '',
+                              functionCode: state.selectedFunction ?? '',
+                              operationName: '',
+                              value: null,
+                            ),
+                          );
                           final functions = _updateValuesForAddedFunctions(
                             state.addedFunctions,
                           );
                           context.read<RoutineBloc>().add(
                                 AddFunctionToRoutine(
-                                  functions,
+                                  [selectedFunctionData],
                                   '${widget.uniqueCustomId}',
                                 ),
                               );

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

@@ -192,9 +192,18 @@ class _WallPresenceSensorState extends State<FlushPresenceSensor> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/gateway/gateway_dialog.dart

@@ -115,9 +115,18 @@ class _GatewayDialogState extends State<GatewayDialog> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId ?? '-1',
                     ),
                   );

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

@@ -147,7 +147,7 @@ class OneGangSwitchHelper {
                                   // }
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
-                                          state.addedFunctions,
+                                          [selectedFunctionData],
                                           uniqueCustomId,
                                         ),
                                       );

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_clamp_dialog.dart

@@ -250,9 +250,18 @@ class _EnergyClampDialogState extends State<EnergyClampDialog> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/power_clamp_enargy/energy_value_selector_widget.dart

@@ -27,17 +27,16 @@ class EnergyValueSelectorWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final selectedFn =
+    final selectedFn = functions.firstWhere((f) => f.code == selectedFunction);
-        functions.firstWhere((f) => f.code == selectedFunction);
     final values = selectedFn.getOperationalValues();
-    final step = selectedFn.step ?? 1.0; 
+    final step = selectedFn.step;
     final _unit = selectedFn.unit ?? '';
     final (double, double) sliderRange =
         (selectedFn.min ?? 0.0, selectedFn.max ?? 100.0);
 
     if (_isSliderFunction(selectedFunction)) {
       return CustomRoutinesTextbox(
-        withSpecialChar: false,
+        withSpecialChar: true,
         currentCondition: functionData.condition,
         dialogType: dialogType,
         sliderRange: sliderRange,
@@ -60,14 +59,14 @@ class EnergyValueSelectorWidget extends StatelessWidget {
                   entityId: device?.uuid ?? '',
                   functionCode: selectedFunction,
                   operationName: functionData.operationName,
-                  value: value.toInt(),
+                  value: value,
                   condition: functionData.condition,
                 ),
               ),
             ),
         unit: _unit,
         dividendOfRange: 1,
-        stepIncreaseAmount: step,
+        stepIncreaseAmount: step!,
       );
     }
 

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

@@ -145,9 +145,22 @@ class TwoGangSwitchHelper {
                                   //         ),
                                   //       );
                                   // }
+                                  final selectedFunctionData =
+                                      state.addedFunctions.firstWhere(
+                                    (f) =>
+                                        f.functionCode ==
+                                        state.selectedFunction,
+                                    orElse: () => DeviceFunctionData(
+                                      entityId: '',
+                                      functionCode:
+                                          state.selectedFunction ?? '',
+                                      operationName: '',
+                                      value: null,
+                                    ),
+                                  );
                                   context.read<RoutineBloc>().add(
                                         AddFunctionToRoutine(
-                                          state.addedFunctions,
+                                          [selectedFunctionData],
                                           uniqueCustomId,
                                         ),
                                       );

lib/pages/routines/widgets/routine_dialogs/wall_sensor/wall_presence_sensor.dart

@@ -210,9 +210,18 @@ class _WallPresenceSensorState extends State<WallPresenceSensor> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/routines/widgets/routine_dialogs/water_heater/water_heater_presence_sensor.dart

@@ -188,9 +188,18 @@ class _WaterHeaterDialogRoutinesState extends State<WaterHeaterDialogRoutines> {
       onCancel: () => Navigator.pop(context),
       onConfirm: state.addedFunctions.isNotEmpty
           ? () {
+              final selectedFunctionData = state.addedFunctions.firstWhere(
+                (f) => f.functionCode == state.selectedFunction,
+                orElse: () => DeviceFunctionData(
+                  entityId: '',
+                  functionCode: state.selectedFunction ?? '',
+                  operationName: '',
+                  value: null,
+                ),
+              );
               context.read<RoutineBloc>().add(
                     AddFunctionToRoutine(
-                      state.addedFunctions,
+                      [selectedFunctionData],
                       widget.uniqueCustomId!,
                     ),
                   );

lib/pages/space_management_v2/modules/communities/data/services/remote_communities_service.dart

@@ -0,0 +1,34 @@
+import 'package:dio/dio.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/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/services/communities_service.dart';
+import 'package:syncrow_web/services/api/api_exception.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+
+class RemoteCommunitiesService implements CommunitiesService {
+  const RemoteCommunitiesService(this._httpService);
+
+  final HTTPService _httpService;
+
+  static const _defaultErrorMessage = 'Failed to load communities';
+
+  @override
+  Future<List<CommunityModel>> getCommunity(LoadCommunitiesParam param) async {
+    try {
+      return _httpService.get(
+        path: '/api/communities/',
+        expectedResponseModel: (json) => (json as List<dynamic>)
+            .map((e) => CommunityModel.fromJson(e as Map<String, dynamic>))
+            .toList(),
+      );
+    } on DioException catch (e) {
+      final message = e.response?.data as Map<String, dynamic>?;
+      final error = message?['error'] as Map<String, dynamic>?;
+      final errorMessage = error?['error'] as String? ?? '';
+      throw APIException(errorMessage);
+    } catch (e) {
+      final formattedErrorMessage = [_defaultErrorMessage, '$e'].join(': ');
+      throw APIException(formattedErrorMessage);
+    }
+  }
+}

lib/pages/space_management_v2/modules/communities/domain/models/community_model.dart

@@ -0,0 +1,27 @@
+import 'package:equatable/equatable.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/space_model.dart';
+
+class CommunityModel extends Equatable {
+  final String uuid;
+  final String name;
+  final List<SpaceModel> spaces;
+
+  const CommunityModel({
+    required this.uuid,
+    required this.name,
+    required this.spaces,
+  });
+
+  factory CommunityModel.fromJson(Map<String, dynamic> json) {
+    return CommunityModel(
+      uuid: json['uuid'] as String,
+      name: json['name'] as String,
+      spaces: (json['spaces'] as List<dynamic>)
+          .map((e) => SpaceModel.fromJson(e as Map<String, dynamic>))
+          .toList(),
+    );
+  }
+
+  @override
+  List<Object?> get props => [uuid, name, spaces];
+}

lib/pages/space_management_v2/modules/communities/domain/models/space_model.dart

@@ -0,0 +1,30 @@
+import 'package:equatable/equatable.dart';
+
+class SpaceModel extends Equatable {
+  final String uuid;
+  final String spaceName;
+  final String icon;
+  final List<SpaceModel> children;
+
+  const SpaceModel({
+    required this.uuid,
+    required this.spaceName,
+    required this.icon,
+    required this.children,
+  });
+
+  factory SpaceModel.fromJson(Map<String, dynamic> json) {
+    return SpaceModel(
+      uuid: json['uuid'] as String,
+      spaceName: json['spaceName'] as String,
+      icon: json['icon'] as String,
+      children: (json['children'] as List<dynamic>?)
+              ?.map((e) => SpaceModel.fromJson(e as Map<String, dynamic>))
+              .toList() ??
+          [],
+    );
+  }
+
+  @override
+  List<Object?> get props => [uuid, spaceName, icon, children];
+}

lib/pages/space_management_v2/modules/communities/domain/params/load_communities_param.dart

@@ -0,0 +1,3 @@
+class LoadCommunitiesParam {
+  const LoadCommunitiesParam();
+}

lib/pages/space_management_v2/modules/communities/domain/services/communities_service.dart

@@ -0,0 +1,6 @@
+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/params/load_communities_param.dart';
+
+abstract class CommunitiesService {
+  Future<List<CommunityModel>> getCommunity(LoadCommunitiesParam param);
+}

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_bloc.dart

@@ -0,0 +1,50 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.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/params/load_communities_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/services/communities_service.dart';
+import 'package:syncrow_web/services/api/api_exception.dart';
+
+part 'communities_event.dart';
+part 'communities_state.dart';
+
+class CommunitiesBloc extends Bloc<CommunitiesEvent, CommunitiesState> {
+  CommunitiesBloc({
+    required CommunitiesService communitiesService,
+  })  : _communitiesService = communitiesService,
+        super(const CommunitiesState()) {
+    on<LoadCommunities>(_onLoadCommunities);
+  }
+
+  final CommunitiesService _communitiesService;
+
+  Future<void> _onLoadCommunities(
+    LoadCommunities event,
+    Emitter<CommunitiesState> emit,
+  ) async {
+    try {
+      emit(const CommunitiesState(status: CommunitiesStatus.loading));
+      final communities = await _communitiesService.getCommunity(event.param);
+      emit(
+        CommunitiesState(
+          status: CommunitiesStatus.success,
+          communities: communities,
+        ),
+      );
+    } on APIException catch (e) {
+      emit(
+        CommunitiesState(
+          status: CommunitiesStatus.failure,
+          errorMessage: e.message,
+        ),
+      );
+    } catch (e) {
+      emit(
+        CommunitiesState(
+          status: CommunitiesStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+}

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_event.dart

@@ -0,0 +1,17 @@
+part of 'communities_bloc.dart';
+
+sealed class CommunitiesEvent extends Equatable {
+  const CommunitiesEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class LoadCommunities extends CommunitiesEvent {
+  const LoadCommunities(this.param);
+
+  final LoadCommunitiesParam param;
+
+  @override
+  List<Object?> get props => [param];
+}

lib/pages/space_management_v2/modules/communities/presentation/bloc/communities_state.dart

@@ -0,0 +1,18 @@
+part of 'communities_bloc.dart';
+
+enum CommunitiesStatus { initial, loading, success, failure }
+
+final class CommunitiesState extends Equatable {
+  const CommunitiesState({
+    this.status = CommunitiesStatus.initial,
+    this.communities = const [],
+    this.errorMessage,
+  });
+
+  final CommunitiesStatus status;
+  final List<CommunityModel> communities;
+  final String? errorMessage;
+
+  @override
+  List<Object?> get props => [status, communities, errorMessage];
+}

lib/pages/space_management_v2/modules/create_community/data/services/remote_create_community_service.dart

@@ -0,0 +1,39 @@
+import 'package:dio/dio.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/create_community/domain/param/create_community_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/services/create_community_service.dart';
+import 'package:syncrow_web/services/api/api_exception.dart';
+import 'package:syncrow_web/services/api/http_service.dart';
+
+class RemoteCreateCommunityService implements CreateCommunityService {
+  const RemoteCreateCommunityService(this._httpService);
+
+  final HTTPService _httpService;
+
+  static const _defaultErrorMessage = 'Failed to create community';
+
+  @override
+  Future<CommunityModel> createCommunity(CreateCommunityParam param) async {
+    try {
+      final response = await _httpService.post(
+        path: 'endpoint',
+        expectedResponseModel: (data) => CommunityModel.fromJson(
+          data as Map<String, dynamic>,
+        ),
+      );
+      return response;
+    } on DioException catch (e) {
+      final message = e.response?.data as Map<String, dynamic>?;
+      final error = message?['error'] as Map<String, dynamic>?;
+      final errorMessage = error?['error'] as String? ?? '';
+      final formattedErrorMessage = [
+        _defaultErrorMessage,
+        errorMessage,
+      ].join(': ');
+      throw APIException(formattedErrorMessage);
+    } catch (e) {
+      final formattedErrorMessage = [_defaultErrorMessage, '$e'].join(': ');
+      throw APIException(formattedErrorMessage);
+    }
+  }
+}

lib/pages/space_management_v2/modules/create_community/domain/param/create_community_param.dart

@@ -0,0 +1,10 @@
+import 'package:equatable/equatable.dart';
+
+class CreateCommunityParam extends Equatable {
+  const CreateCommunityParam({required this.name});
+  
+  final String name;
+
+  @override
+  List<Object> get props => [name];
+}

lib/pages/space_management_v2/modules/create_community/domain/services/create_community_service.dart

@@ -0,0 +1,6 @@
+import 'package:syncrow_web/pages/space_management_v2/modules/communities/domain/models/community_model.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/param/create_community_param.dart';
+
+abstract class CreateCommunityService {
+  Future<CommunityModel> createCommunity(CreateCommunityParam param);
+}

lib/pages/space_management_v2/modules/create_community/presentation/bloc/create_community_bloc.dart

@@ -0,0 +1,36 @@
+import 'package:bloc/bloc.dart';
+import 'package:equatable/equatable.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/create_community/domain/param/create_community_param.dart';
+import 'package:syncrow_web/pages/space_management_v2/modules/create_community/domain/services/create_community_service.dart';
+import 'package:syncrow_web/services/api/api_exception.dart';
+
+part 'create_community_event.dart';
+part 'create_community_state.dart';
+
+class CreateCommunityBloc extends Bloc<CreateCommunityEvent, CreateCommunityState> {
+  final CreateCommunityService _createCommunityService;
+
+  CreateCommunityBloc(
+    this._createCommunityService,
+  ) : super(CreateCommunityInitial()) {
+    on<CreateCommunity>(_onCreateCommunity);
+  }
+
+  Future<void> _onCreateCommunity(
+    CreateCommunity event,
+    Emitter<CreateCommunityState> emit,
+  ) async {
+    emit(CreateCommunityLoading());
+    try {
+      final createdCommunity = await _createCommunityService.createCommunity(
+        event.param,
+      );
+      emit(CreateCommunitySuccess(createdCommunity));
+    } on APIException catch (e) {
+      emit(CreateCommunityFailure(e.message));
+    } catch (e) {
+      emit(CreateCommunityFailure(e.toString()));
+    }
+  }
+}

lib/pages/space_management_v2/modules/create_community/presentation/bloc/create_community_event.dart

@@ -0,0 +1,17 @@
+part of 'create_community_bloc.dart';
+
+sealed class CreateCommunityEvent extends Equatable {
+  const CreateCommunityEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+final class CreateCommunity extends CreateCommunityEvent {
+  const CreateCommunity(this.param);
+
+  final CreateCommunityParam param;
+
+  @override
+  List<Object> get props => [param];
+}