Refactor ScheduleBloc and related components to use dynamic category handling for schedule events

…ater heater modules

<!--
  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:
-->

## Jira Ticket
[SP-1620](https://syncrow.atlassian.net/browse/SP-1620)

## Description

<!--- Describe your changes in detail -->
Refactor schedule components and make this fetcher as a reusable and fix
bugs related to it

## Type of Change

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

- [ x] ✨ 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 


[SP-1620]:
https://syncrow.atlassian.net/browse/SP-1620?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

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

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

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

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

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

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

lib/pages/common/custom_table.dart

@@ -50,20 +50,11 @@ class _DynamicTableState extends State<DynamicTable> {
   bool _selectAll = false;
   final ScrollController _verticalScrollController = ScrollController();
   final ScrollController _horizontalScrollController = ScrollController();
-  late ScrollController _horizontalHeaderScrollController;
-  late ScrollController _horizontalBodyScrollController;
+
   @override
   void initState() {
     super.initState();
     _initializeSelection();
-    _horizontalHeaderScrollController = ScrollController();
-    _horizontalBodyScrollController = ScrollController();
-
-    // Synchronize horizontal scrolling
-    _horizontalBodyScrollController.addListener(() {
-      _horizontalHeaderScrollController
-          .jumpTo(_horizontalBodyScrollController.offset);
-    });
   }
 
   @override
@@ -113,108 +104,78 @@ class _DynamicTableState extends State<DynamicTable> {
     context.read<DeviceManagementBloc>().add(UpdateSelection(_selectedRows));
   }
 
-  @override
-  void dispose() {
-    _horizontalHeaderScrollController.dispose();
-    _horizontalBodyScrollController.dispose();
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Container(
       decoration: widget.cellDecoration,
-      child: Column(
-        children: [
-          Container(
-            decoration: widget.headerDecoration ??
-                const BoxDecoration(color: ColorsManager.boxColor),
+      child: Scrollbar(
+        controller: _verticalScrollController,
+        thumbVisibility: true,
+        trackVisibility: true,
+        child: Scrollbar(
+          //fixed the horizontal scrollbar issue
+          controller: _horizontalScrollController,
+          thumbVisibility: true,
+          trackVisibility: true,
+          notificationPredicate: (notif) => notif.depth == 1,
+          child: SingleChildScrollView(
+            controller: _verticalScrollController,
             child: SingleChildScrollView(
+              controller: _horizontalScrollController,
               scrollDirection: Axis.horizontal,
-              physics: const NeverScrollableScrollPhysics(),
-              controller: _horizontalHeaderScrollController,
               child: SizedBox(
                 width: widget.size.width,
-                child: Row(
+                child: Column(
                   children: [
-                    if (widget.withCheckBox) _buildSelectAllCheckbox(),
-                    ...List.generate(widget.headers.length, (index) {
-                      return _buildTableHeaderCell(
-                          widget.headers[index], index);
-                    }),
+                    Container(
+                      decoration: widget.headerDecoration ??
+                          const BoxDecoration(
+                            color: ColorsManager.boxColor,
+                          ),
+                      child: Row(
+                        children: [
+                          if (widget.withCheckBox) _buildSelectAllCheckbox(),
+                          ...List.generate(widget.headers.length, (index) {
+                            return _buildTableHeaderCell(
+                                widget.headers[index], index);
+                          })
+                          //...widget.headers.map((header) => _buildTableHeaderCell(header)),
+                        ],
+                      ),
+                    ),
+                    SizedBox(
+                      width: widget.size.width,
+                      child: widget.isEmpty
+                          ? _buildEmptyState()
+                          : Column(
+                              children:
+                                  List.generate(widget.data.length, (rowIndex) {
+                                final row = widget.data[rowIndex];
+                                return Row(
+                                  children: [
+                                    if (widget.withCheckBox)
+                                      _buildRowCheckbox(
+                                          rowIndex, widget.size.height * 0.08),
+                                    ...row.asMap().entries.map((entry) {
+                                      return _buildTableCell(
+                                        entry.value.toString(),
+                                        widget.size.height * 0.08,
+                                        rowIndex: rowIndex,
+                                        columnIndex: entry.key,
+                                      );
+                                    }).toList(),
+                                  ],
+                                );
+                              }),
+                            ),
+                    ),
                   ],
                 ),
               ),
             ),
           ),
-          Expanded(
-            child: Scrollbar(
-              controller: _verticalScrollController,
-              thumbVisibility: true,
-              trackVisibility: true,
-              child: SingleChildScrollView(
-                controller: _verticalScrollController,
-                child: Scrollbar(
-                  controller: _horizontalBodyScrollController,
-                  thumbVisibility: false,
-                  trackVisibility: false,
-                  notificationPredicate: (notif) => notif.depth == 1,
-                  child: SingleChildScrollView(
-                    scrollDirection: Axis.horizontal,
-                    controller: _horizontalBodyScrollController,
-                    child: Container(
-                      color: ColorsManager.whiteColors,
-                      child: SizedBox(
-                        width: widget.size.width,
-                        child: widget.isEmpty
-                            ? _buildEmptyState()
-                            : Column(
-                                children: List.generate(widget.data.length,
-                                    (rowIndex) {
-                                  final row = widget.data[rowIndex];
-                                  return Row(
-                                    children: [
-                                      if (widget.withCheckBox)
-                                        _buildRowCheckbox(rowIndex,
-                                            widget.size.height * 0.08),
-                                      ...row.asMap().entries.map((entry) {
-                                        return _buildTableCell(
-                                          entry.value.toString(),
-                                          widget.size.height * 0.08,
-                                          rowIndex: rowIndex,
-                                          columnIndex: entry.key,
-                                        );
-                                      }).toList(),
-                                    ],
-                                  );
-                                }),
-                              ),
-                      ),
-                    ),
-                  ),
-                ),
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
-  Widget _buildSelectAllCheckbox() {
-    return Container(
-      width: 50,
-      decoration: const BoxDecoration(
-        border: Border.symmetric(
-          vertical: BorderSide(color: ColorsManager.boxDivider),
         ),
       ),
-      child: Checkbox(
-        value: _selectAll,
-        onChanged: widget.withSelectAll && widget.data.isNotEmpty
-            ? _toggleSelectAll
-            : null,
-      ),
     );
   }
 
@@ -244,6 +205,23 @@ class _DynamicTableState extends State<DynamicTable> {
           ),
         ],
       );
+  Widget _buildSelectAllCheckbox() {
+    return Container(
+      width: 50,
+      decoration: const BoxDecoration(
+        border: Border.symmetric(
+          vertical: BorderSide(color: ColorsManager.boxDivider),
+        ),
+      ),
+      child: Checkbox(
+        value: _selectAll,
+        onChanged: widget.withSelectAll && widget.data.isNotEmpty
+            ? _toggleSelectAll
+            : null,
+      ),
+    );
+  }
+
   Widget _buildRowCheckbox(int index, double size) {
     return Container(
       width: 50,
@@ -298,12 +276,8 @@ class _DynamicTableState extends State<DynamicTable> {
     );
   }
 
-  Widget _buildTableCell(
-    String content,
-    double size, {
-    required int rowIndex,
-    required int columnIndex,
-  }) {
+  Widget _buildTableCell(String content, double size,
+      {required int rowIndex, required int columnIndex}) {
     bool isBatteryLevel = content.endsWith('%');
     double? batteryLevel;
 
@@ -311,7 +285,6 @@ class _DynamicTableState extends State<DynamicTable> {
       batteryLevel = double.tryParse(content.replaceAll('%', '').trim());
     }
     bool isSettingsColumn = widget.headers[columnIndex] == 'Settings';
-
     if (isSettingsColumn) {
       return buildSettingsIcon(
         width: 120,
@@ -416,11 +389,10 @@ class _DynamicTableState extends State<DynamicTable> {
                   padding: const EdgeInsets.all(8.0),
                   child: Center(
                     child: SvgPicture.asset(
-                      Assets.settings, // ضع المسار الصحيح هنا
+                      Assets.settings,
                       width: 40,
                       height: 22,
-                      color: ColorsManager
-                          .primaryColor, // نفس لون الأيقونة في الصورة
+                      color: ColorsManager.primaryColor,
                     ),
                   ),
                 ),

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,109 @@
+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_button.dart

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/pages/device_managment/three_g_glass_switch/view/three_gang_glass_switch_control_view.dart

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

lib/pages/home/view/home_card.dart

@@ -34,17 +34,9 @@ class HomeCard extends StatelessWidget {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.start,
                 children: [
-                  Flexible(
-                    child: FittedBox(
-                      fit: BoxFit.scaleDown,
-                      child: Text(
-                        name,
-                        style: const TextStyle(
-                          fontSize: 30,
-                          color: Colors.white,
-                          fontWeight: FontWeight.bold,
-                        ),
-                      ),
+                  Expanded(
+                    child: SpliteNameHelperWidget(
+                      name: name,
                     ),
                   ),
                 ],
@@ -63,3 +55,72 @@ class HomeCard extends StatelessWidget {
     );
   }
 }
+
+class SpliteNameHelperWidget extends StatelessWidget {
+  final String name;
+  const SpliteNameHelperWidget({
+    super.key,
+    required this.name,
+  });
+
+  @override
+  Widget build(BuildContext context) {
+    List<String> parts = name.split(' ');
+
+    if (parts.length == 2) {
+      // Two-word string
+      return Padding(
+        padding: const EdgeInsetsGeometry.only(top: 10, left: 10),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              child: FittedBox(
+                fit: BoxFit.scaleDown,
+                child: Text(
+                  parts[0],
+                  style: const TextStyle(
+                    fontSize: 30,
+                    color: Colors.white,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+            ),
+            Expanded(
+              child: FittedBox(
+                fit: BoxFit.scaleDown,
+                child: Text(
+                  parts[1],
+                  style: const TextStyle(
+                    fontSize: 30,
+                    color: Colors.white,
+                    fontWeight: FontWeight.bold,
+                  ),
+                ),
+              ),
+            ),
+          ],
+        ),
+      );
+    } else {
+      // One-word string
+      return Text(
+        name,
+        style: const TextStyle(
+          fontSize: 30,
+          color: Colors.white,
+          fontWeight: FontWeight.bold,
+        ),
+      );
+    }
+  }
+}
+// Text(
+//                       name,
+//                       style: const TextStyle(
+//                         fontSize: 32,
+//                         color: Colors.white,
+//                         fontWeight: FontWeight.bold,
+//                       ),
+//                     )

lib/pages/home/view/home_page_web.dart

@@ -92,7 +92,7 @@ class _HomeWebPageState extends State<HomeWebPage> {
                         flex: 4,
                         child: SizedBox(
                           height: size.height * 0.6,
-                          width: size.width * 0.68,
+                          width: size.width * 0.8,
                           child: GridView.builder(
                             itemCount: homeBloc.homeItems.length,
                             gridDelegate:

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

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

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

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

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

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

lib/pages/routines/widgets/if_container.dart

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

lib/pages/routines/widgets/routine_devices.dart

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

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

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

lib/pages/routines/widgets/then_container.dart

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

lib/pages/spaces_management/all_spaces/widgets/community_structure_header_action_button.dart

@@ -49,12 +49,12 @@ class CommunityStructureHeaderActionButtons extends StatelessWidget {
             onPressed: onEdit,
             theme: theme,
           ),
-          CommunityStructureHeaderButton(
-            label: "Duplicate",
-            svgAsset: Assets.duplicate,
-            onPressed: onDuplicate,
-            theme: theme,
-          ),
+          // CommunityStructureHeaderButton(
+          //   label: "Duplicate",
+          //   svgAsset: Assets.duplicate,
+          //   onPressed: onDuplicate,
+          //   theme: theme,
+          // ),
           CommunityStructureHeaderButton(
             label: "Delete",
             svgAsset: Assets.spaceDelete,

lib/services/devices_mang_api.dart

@@ -1,3 +1,4 @@
+import 'dart:convert';
 import 'dart:core';
 import 'package:flutter/material.dart';
 import 'package:syncrow_web/pages/device_managment/all_devices/models/device_reports.dart';
@@ -386,4 +387,34 @@ class DevicesManagementApi {
     );
     return response;
   }
+
+  Future<bool> postSchedule({
+    required String category,
+    required String deviceId,
+    required String time,
+    required String code,
+    required bool value,
+    required List<String> days,
+  }) async {
+    final response = await HTTPService().post(
+      path: ApiEndpoints.saveSchedule.replaceAll('{deviceUuid}', deviceId),
+      showServerMessage: false,
+      body: jsonEncode(
+        {
+          'category': category,
+          'time': time,
+          'function': {
+            'code': code,
+            'value': value,
+          },
+          'days': days
+        },
+      ),
+      expectedResponseModel: (json) {
+        return json['success'] ?? false;
+      },
+    );
+    return response;
+  }
+
 }

lib/utils/constants/api_const.dart

@@ -136,4 +136,5 @@ abstract class ApiEndpoints {
 
   static const String assignDeviceToRoom =
       '/projects/{projectUuid}/communities/{communityUuid}/spaces/{spaceUuid}/subspaces/{subSpaceUuid}/devices/{deviceUuid}';
+  static const String saveSchedule = '/schedule/{deviceUuid}';
 }

lib/utils/constants/assets.dart

@@ -1,138 +1,138 @@
 class Assets {
   Assets._();
-  static const String background = "assets/images/Background.png";
-  static const String webBackground = "assets/images/web_Background.svg";
-  static const String webBackgroundPng = "assets/images/web_Background.png";
-  static const String blackLogo = "assets/images/black-logo.png";
-  static const String logo = "assets/images/Logo.svg";
-  static const String logoHorizontal = "assets/images/logo_horizontal.png";
-  static const String vector = "assets/images/Vector.png";
-  static const String loginLogo = "assets/images/login_logo.svg";
-  static const String whiteLogo = "assets/images/white-logo.png";
-  static const String window = "assets/images/Window.png";
-  static const String liftLine = "assets/images/lift_line.png";
-  static const String rightLine = "assets/images/right_line.png";
-  static const String google = "assets/images/google.svg";
-  static const String facebook = "assets/images/facebook.svg";
+  static const String background = 'assets/images/Background.png';
+  static const String webBackground = 'assets/images/web_Background.svg';
+  static const String webBackgroundPng = 'assets/images/web_Background.png';
+  static const String blackLogo = 'assets/images/black-logo.png';
+  static const String logo = 'assets/images/Logo.svg';
+  static const String logoHorizontal = 'assets/images/logo_horizontal.png';
+  static const String vector = 'assets/images/Vector.png';
+  static const String loginLogo = 'assets/images/login_logo.svg';
+  static const String whiteLogo = 'assets/images/white-logo.png';
+  static const String window = 'assets/images/Window.png';
+  static const String liftLine = 'assets/images/lift_line.png';
+  static const String rightLine = 'assets/images/right_line.png';
+  static const String google = 'assets/images/google.svg';
+  static const String facebook = 'assets/images/facebook.svg';
   static const String invisiblePassword =
-      "assets/images/Password_invisible.svg";
-  static const String visiblePassword = "assets/images/password_visible.svg";
-  static const String accessIcon = "assets/images/access_icon.svg";
+      'assets/images/Password_invisible.svg';
+  static const String visiblePassword = 'assets/images/password_visible.svg';
+  static const String accessIcon = 'assets/images/access_icon.svg';
   static const String spaseManagementIcon =
-      "assets/images/spase_management_icon.svg";
-  static const String devicesIcon = "assets/images/devices_icon.svg";
-  static const String analyticsIcon = "assets/icons/landing_analytics.svg";
+      'assets/images/spase_management_icon.svg';
+  static const String devicesIcon = 'assets/images/devices_icon.svg';
+  static const String analyticsIcon = 'assets/icons/landing_analytics.svg';
 
-  static const String moveinIcon = "assets/images/movein_icon.svg";
-  static const String constructionIcon = "assets/images/construction_icon.svg";
-  static const String energyIcon = "assets/images/energy_icon.svg";
-  static const String integrationsIcon = "assets/images/Integrations_icon.svg";
-  static const String assetIcon = "assets/images/asset_icon.svg";
-  static const String calendarIcon = "assets/images/calendar_icon.svg";
-  static const String deviceNoteIcon = "assets/images/device_note.svg";
-  static const String timeIcon = "assets/images/time_icon.svg";
-  static const String emptyTable = "assets/images/empty_table.svg";
+  static const String moveinIcon = 'assets/images/movein_icon.svg';
+  static const String constructionIcon = 'assets/images/construction_icon.svg';
+  static const String energyIcon = 'assets/images/energy_icon.svg';
+  static const String integrationsIcon = 'assets/images/Integrations_icon.svg';
+  static const String assetIcon = 'assets/images/asset_icon.svg';
+  static const String calendarIcon = 'assets/images/calendar_icon.svg';
+  static const String deviceNoteIcon = 'assets/images/device_note.svg';
+  static const String timeIcon = 'assets/images/time_icon.svg';
+  static const String emptyTable = 'assets/images/empty_table.svg';
 
   // General assets
   static const String motionlessDetection =
-      "assets/icons/motionless_detection.svg";
-  static const String acHeating = "assets/icons/ac_heating.svg";
-  static const String acPowerOff = "assets/icons/ac_power_off.svg";
-  static const String acFanMiddle = "assets/icons/ac_fan_middle.svg";
-  static const String switchAlarmSound = "assets/icons/switch_alarm_sound.svg";
-  static const String resetOff = "assets/icons/reset_off.svg";
+      'assets/icons/motionless_detection.svg';
+  static const String acHeating = 'assets/icons/ac_heating.svg';
+  static const String acPowerOff = 'assets/icons/ac_power_off.svg';
+  static const String acFanMiddle = 'assets/icons/ac_fan_middle.svg';
+  static const String switchAlarmSound = 'assets/icons/switch_alarm_sound.svg';
+  static const String resetOff = 'assets/icons/reset_off.svg';
   static const String sensitivityOperationIcon =
-      "assets/icons/sesitivity_operation_icon.svg";
-  static const String motionDetection = "assets/icons/motion_detection.svg";
-  static const String freezing = "assets/icons/freezing.svg";
-  static const String indicator = "assets/icons/indicator.svg";
-  static const String sceneRefresh = "assets/icons/scene_refresh.svg";
-  static const String temperature = "assets/icons/tempreture.svg";
-  static const String acFanHigh = "assets/icons/ac_fan_high.svg";
-  static const String fanSpeed = "assets/icons/fan_speed.svg";
-  static const String acFanLow = "assets/icons/ac_fan_low.svg";
-  static const String sensitivity = "assets/icons/sensitivity.svg";
-  static const String lightCountdown = "assets/icons/light_countdown.svg";
-  static const String farDetection = "assets/icons/far_detection.svg";
-  static const String sceneChildUnlock = "assets/icons/scene_child_unlock.svg";
-  static const String acFanAuto = "assets/icons/ac_fan_auto.svg";
-  static const String childLock = "assets/icons/child_lock.svg";
-  static const String factoryReset = "assets/icons/factory_reset.svg";
-  static const String acCooling = "assets/icons/ac_cooling.svg";
-  static const String sceneChildLock = "assets/icons/scene_child_lock.svg";
-  static const String celsiusDegrees = "assets/icons/celsius_degrees.svg";
-  static const String masterState = "assets/icons/master_state.svg";
-  static const String acPower = "assets/icons/ac_power.svg";
+      'assets/icons/sesitivity_operation_icon.svg';
+  static const String motionDetection = 'assets/icons/motion_detection.svg';
+  static const String freezing = 'assets/icons/freezing.svg';
+  static const String indicator = 'assets/icons/indicator.svg';
+  static const String sceneRefresh = 'assets/icons/scene_refresh.svg';
+  static const String temperature = 'assets/icons/tempreture.svg';
+  static const String acFanHigh = 'assets/icons/ac_fan_high.svg';
+  static const String fanSpeed = 'assets/icons/fan_speed.svg';
+  static const String acFanLow = 'assets/icons/ac_fan_low.svg';
+  static const String sensitivity = 'assets/icons/sensitivity.svg';
+  static const String lightCountdown = 'assets/icons/light_countdown.svg';
+  static const String farDetection = 'assets/icons/far_detection.svg';
+  static const String sceneChildUnlock = 'assets/icons/scene_child_unlock.svg';
+  static const String acFanAuto = 'assets/icons/ac_fan_auto.svg';
+  static const String childLock = 'assets/icons/child_lock.svg';
+  static const String factoryReset = 'assets/icons/factory_reset.svg';
+  static const String acCooling = 'assets/icons/ac_cooling.svg';
+  static const String sceneChildLock = 'assets/icons/scene_child_lock.svg';
+  static const String celsiusDegrees = 'assets/icons/celsius_degrees.svg';
+  static const String masterState = 'assets/icons/master_state.svg';
+  static const String acPower = 'assets/icons/ac_power.svg';
   static const String farDetectionFunction =
-      "assets/icons/far_detection_function.svg";
-  static const String nobodyTime = "assets/icons/nobody_time.svg";
+      'assets/icons/far_detection_function.svg';
+  static const String nobodyTime = 'assets/icons/nobody_time.svg';
 
   // Automation functions
   static const String tempPasswordUnlock =
-      "assets/icons/automation_functions/temp_password_unlock.svg";
+      'assets/icons/automation_functions/temp_password_unlock.svg';
   static const String doorlockNormalOpen =
-      "assets/icons/automation_functions/doorlock_normal_open.svg";
+      'assets/icons/automation_functions/doorlock_normal_open.svg';
   static const String doorbell =
-      "assets/icons/automation_functions/doorbell.svg";
+      'assets/icons/automation_functions/doorbell.svg';
   static const String remoteUnlockViaApp =
-      "assets/icons/automation_functions/remote_unlock_via_app.svg";
+      'assets/icons/automation_functions/remote_unlock_via_app.svg';
   static const String doubleLock =
-      "assets/icons/automation_functions/double_lock.svg";
+      'assets/icons/automation_functions/double_lock.svg';
   static const String selfTestResult =
-      "assets/icons/automation_functions/self_test_result.svg";
+      'assets/icons/automation_functions/self_test_result.svg';
   static const String lockAlarm =
-      "assets/icons/automation_functions/lock_alarm.svg";
+      'assets/icons/automation_functions/lock_alarm.svg';
   static const String presenceState =
-      "assets/icons/automation_functions/presence_state.svg";
+      'assets/icons/automation_functions/presence_state.svg';
   static const String currentTemp =
-      "assets/icons/automation_functions/current_temp.svg";
+      'assets/icons/automation_functions/current_temp.svg';
   static const String presence =
-      "assets/icons/automation_functions/presence.svg";
+      'assets/icons/automation_functions/presence.svg';
   static const String residualElectricity =
-      "assets/icons/automation_functions/residual_electricity.svg";
+      'assets/icons/automation_functions/residual_electricity.svg';
   static const String hijackAlarm =
-      "assets/icons/automation_functions/hijack_alarm.svg";
+      'assets/icons/automation_functions/hijack_alarm.svg';
   static const String passwordUnlock =
-      "assets/icons/automation_functions/password_unlock.svg";
+      'assets/icons/automation_functions/password_unlock.svg';
   static const String remoteUnlockRequest =
-      "assets/icons/automation_functions/remote_unlock_req.svg";
+      'assets/icons/automation_functions/remote_unlock_req.svg';
   static const String cardUnlock =
-      "assets/icons/automation_functions/card_unlock.svg";
-  static const String motion = "assets/icons/automation_functions/motion.svg";
+      'assets/icons/automation_functions/card_unlock.svg';
+  static const String motion = 'assets/icons/automation_functions/motion.svg';
   static const String fingerprintUnlock =
-      "assets/icons/automation_functions/fingerprint_unlock.svg";
+      'assets/icons/automation_functions/fingerprint_unlock.svg';
 
   // Presence Sensor Assets
-  static const String sensorMotionIcon = "assets/icons/sensor_motion_ic.svg";
+  static const String sensorMotionIcon = 'assets/icons/sensor_motion_ic.svg';
   static const String sensorPresenceIcon =
-      "assets/icons/sensor_presence_ic.svg";
-  static const String sensorVacantIcon = "assets/icons/sensor_vacant_ic.svg";
+      'assets/icons/sensor_presence_ic.svg';
+  static const String sensorVacantIcon = 'assets/icons/sensor_vacant_ic.svg';
   static const String illuminanceRecordIcon =
-      "assets/icons/illuminance_record_ic.svg";
+      'assets/icons/illuminance_record_ic.svg';
   static const String presenceRecordIcon =
-      "assets/icons/presence_record_ic.svg";
+      'assets/icons/presence_record_ic.svg';
   static const String helpDescriptionIcon =
-      "assets/icons/help_description_ic.svg";
+      'assets/icons/help_description_ic.svg';
 
-  static const String lightPulp = "assets/icons/light_pulb.svg";
-  static const String acDevice = "assets/icons/ac_device.svg";
-  static const String acAirConditioner = "assets/icons/ac_air.svg";
-  static const String acSun = "assets/icons/ac_sun.svg";
+  static const String lightPulp = 'assets/icons/light_pulb.svg';
+  static const String acDevice = 'assets/icons/ac_device.svg';
+  static const String acAirConditioner = 'assets/icons/ac_air.svg';
+  static const String acSun = 'assets/icons/ac_sun.svg';
 
   //assets/icons/3GangSwitch.svg
-  static const String gangSwitch = "assets/icons/3GangSwitch.svg";
+  static const String gangSwitch = 'assets/icons/3GangSwitch.svg';
   //assets/icons/AC.svg
-  static const String ac = "assets/icons/AC.svg";
+  static const String ac = 'assets/icons/AC.svg';
   //assets/icons/Curtain.svg
-  static const String curtain = "assets/icons/Curtain.svg";
+  static const String curtain = 'assets/icons/Curtain.svg';
   //assets/icons/doorLock.svg
-  static const String doorLock = "assets/icons/doorLock.svg";
+  static const String doorLock = 'assets/icons/doorLock.svg';
   //assets/icons/Gateway.svg
-  static const String gateway = "assets/icons/Gateway.svg";
+  static const String gateway = 'assets/icons/Gateway.svg';
   //assets/icons/Light.svg
-  static const String lightBulb = "assets/icons/Light.svg";
+  static const String lightBulb = 'assets/icons/Light.svg';
   //assets/icons/sensors.svg
-  static const String sensors = "assets/icons/sensors.svg";
+  static const String sensors = 'assets/icons/sensors.svg';
 
   //assets/icons/door_un_look_ic.svg
   static const String doorUnlock = 'assets/icons/door_un_look_ic.svg';
@@ -175,7 +175,7 @@ class Assets {
   static const String Gang1SwitchIcon = 'assets/icons/1_Gang_switch_icon.svg';
   static const String DoorLockIcon = 'assets/icons/door_lock.svg';
   static const String SmartGatewayIcon = 'assets/icons/smart_gateway_icon.svg';
-  static const String curtainIcon = "assets/images/curtain.svg";
+  static const String curtainIcon = 'assets/images/curtain.svg';
   static const String unlock = 'assets/icons/unlock_ic.svg';
   static const String firmware = 'assets/icons/firmware.svg';
   //assets/images/scheduling.svg
@@ -227,12 +227,12 @@ class Assets {
   //assets/icons/2gang.svg
   static const String twoGang = 'assets/icons/2gang.svg';
 
-  static const String frequencyIcon = "assets/icons/frequency_icon.svg";
-  static const String voltMeterIcon = "assets/icons/volt_meter_icon.svg";
-  static const String powerActiveIcon = "assets/icons/power_active_icon.svg";
-  static const String searchIcon = "assets/icons/search_icon.svg";
-  static const String voltageIcon = "assets/icons/voltage_icon.svg";
-  static const String speedoMeter = "assets/icons/speedo_meter.svg";
+  static const String frequencyIcon = 'assets/icons/frequency_icon.svg';
+  static const String voltMeterIcon = 'assets/icons/volt_meter_icon.svg';
+  static const String powerActiveIcon = 'assets/icons/power_active_icon.svg';
+  static const String searchIcon = 'assets/icons/search_icon.svg';
+  static const String voltageIcon = 'assets/icons/voltage_icon.svg';
+  static const String speedoMeter = 'assets/icons/speedo_meter.svg';
   //assets/icons/account_setting.svg
   static const String accountSetting = 'assets/icons/account_setting.svg';
 
@@ -284,99 +284,99 @@ class Assets {
 
   // Assets for functions_icons
   static const String assetsSensitivityFunction =
-      "assets/icons/functions_icons/sensitivity.svg";
+      'assets/icons/functions_icons/sensitivity.svg';
   static const String assetsSensitivityOperationIcon =
-      "assets/icons/functions_icons/sesitivity_operation_icon.svg";
+      'assets/icons/functions_icons/sesitivity_operation_icon.svg';
   static const String assetsAcPower =
-      "assets/icons/functions_icons/ac_power.svg";
+      'assets/icons/functions_icons/ac_power.svg';
   static const String assetsAcPowerOFF =
-      "assets/icons/functions_icons/ac_power_off.svg";
+      'assets/icons/functions_icons/ac_power_off.svg';
   static const String assetsChildLock =
-      "assets/icons/functions_icons/child_lock.svg";
+      'assets/icons/functions_icons/child_lock.svg';
   static const String assetsFreezing =
-      "assets/icons/functions_icons/freezing.svg";
+      'assets/icons/functions_icons/freezing.svg';
   static const String assetsFanSpeed =
-      "assets/icons/functions_icons/fan_speed.svg";
+      'assets/icons/functions_icons/fan_speed.svg';
   static const String assetsAcCooling =
-      "assets/icons/functions_icons/ac_cooling.svg";
+      'assets/icons/functions_icons/ac_cooling.svg';
   static const String assetsAcHeating =
-      "assets/icons/functions_icons/ac_heating.svg";
+      'assets/icons/functions_icons/ac_heating.svg';
   static const String assetsCelsiusDegrees =
-      "assets/icons/functions_icons/celsius_degrees.svg";
+      'assets/icons/functions_icons/celsius_degrees.svg';
   static const String assetsTempreture =
-      "assets/icons/functions_icons/tempreture.svg";
+      'assets/icons/functions_icons/tempreture.svg';
   static const String assetsAcFanLow =
-      "assets/icons/functions_icons/ac_fan_low.svg";
+      'assets/icons/functions_icons/ac_fan_low.svg';
   static const String assetsAcFanMiddle =
-      "assets/icons/functions_icons/ac_fan_middle.svg";
+      'assets/icons/functions_icons/ac_fan_middle.svg';
   static const String assetsAcFanHigh =
-      "assets/icons/functions_icons/ac_fan_high.svg";
+      'assets/icons/functions_icons/ac_fan_high.svg';
   static const String assetsAcFanAuto =
-      "assets/icons/functions_icons/ac_fan_auto.svg";
+      'assets/icons/functions_icons/ac_fan_auto.svg';
   static const String assetsSceneChildLock =
-      "assets/icons/functions_icons/scene_child_lock.svg";
+      'assets/icons/functions_icons/scene_child_lock.svg';
   static const String assetsSceneChildUnlock =
-      "assets/icons/functions_icons/scene_child_unlock.svg";
+      'assets/icons/functions_icons/scene_child_unlock.svg';
   static const String assetsSceneRefresh =
-      "assets/icons/functions_icons/scene_refresh.svg";
+      'assets/icons/functions_icons/scene_refresh.svg';
   static const String assetsLightCountdown =
-      "assets/icons/functions_icons/light_countdown.svg";
+      'assets/icons/functions_icons/light_countdown.svg';
   static const String assetsFarDetection =
-      "assets/icons/functions_icons/far_detection.svg";
+      'assets/icons/functions_icons/far_detection.svg';
   static const String assetsFarDetectionFunction =
-      "assets/icons/functions_icons/far_detection_function.svg";
+      'assets/icons/functions_icons/far_detection_function.svg';
   static const String assetsIndicator =
-      "assets/icons/functions_icons/indicator.svg";
+      'assets/icons/functions_icons/indicator.svg';
   static const String assetsMotionDetection =
-      "assets/icons/functions_icons/motion_detection.svg";
+      'assets/icons/functions_icons/motion_detection.svg';
   static const String assetsMotionlessDetection =
-      "assets/icons/functions_icons/motionless_detection.svg";
+      'assets/icons/functions_icons/motionless_detection.svg';
   static const String assetsNobodyTime =
-      "assets/icons/functions_icons/nobody_time.svg";
+      'assets/icons/functions_icons/nobody_time.svg';
   static const String assetsFactoryReset =
-      "assets/icons/functions_icons/factory_reset.svg";
+      'assets/icons/functions_icons/factory_reset.svg';
   static const String assetsMasterState =
-      "assets/icons/functions_icons/master_state.svg";
+      'assets/icons/functions_icons/master_state.svg';
   static const String assetsSwitchAlarmSound =
-      "assets/icons/functions_icons/switch_alarm_sound.svg";
+      'assets/icons/functions_icons/switch_alarm_sound.svg';
   static const String assetsResetOff =
-      "assets/icons/functions_icons/reset_off.svg";
+      'assets/icons/functions_icons/reset_off.svg';
 
 // Assets for automation_functions
   static const String assetsCardUnlock =
-      "assets/icons/functions_icons/automation_functions/card_unlock.svg";
+      'assets/icons/functions_icons/automation_functions/card_unlock.svg';
   static const String assetsDoorbell =
-      "assets/icons/functions_icons/automation_functions/doorbell.svg";
+      'assets/icons/functions_icons/automation_functions/doorbell.svg';
   static const String assetsDoorlockNormalOpen =
-      "assets/icons/functions_icons/automation_functions/doorlock_normal_open.svg";
+      'assets/icons/functions_icons/automation_functions/doorlock_normal_open.svg';
   static const String assetsDoubleLock =
-      "assets/icons/functions_icons/automation_functions/double_lock.svg";
+      'assets/icons/functions_icons/automation_functions/double_lock.svg';
   static const String assetsFingerprintUnlock =
-      "assets/icons/functions_icons/automation_functions/fingerprint_unlock.svg";
+      'assets/icons/functions_icons/automation_functions/fingerprint_unlock.svg';
   static const String assetsHijackAlarm =
-      "assets/icons/functions_icons/automation_functions/hijack_alarm.svg";
+      'assets/icons/functions_icons/automation_functions/hijack_alarm.svg';
   static const String assetsLockAlarm =
-      "assets/icons/functions_icons/automation_functions/lock_alarm.svg";
+      'assets/icons/functions_icons/automation_functions/lock_alarm.svg';
   static const String assetsPasswordUnlock =
-      "assets/icons/functions_icons/automation_functions/password_unlock.svg";
+      'assets/icons/functions_icons/automation_functions/password_unlock.svg';
   static const String assetsRemoteUnlockReq =
-      "assets/icons/functions_icons/automation_functions/remote_unlock_req.svg";
+      'assets/icons/functions_icons/automation_functions/remote_unlock_req.svg';
   static const String assetsRemoteUnlockViaApp =
-      "assets/icons/functions_icons/automation_functions/remote_unlock_via_app.svg";
+      'assets/icons/functions_icons/automation_functions/remote_unlock_via_app.svg';
   static const String assetsResidualElectricity =
-      "assets/icons/functions_icons/automation_functions/residual_electricity.svg";
+      'assets/icons/functions_icons/automation_functions/residual_electricity.svg';
   static const String assetsTempPasswordUnlock =
-      "assets/icons/functions_icons/automation_functions/temp_password_unlock.svg";
+      'assets/icons/functions_icons/automation_functions/temp_password_unlock.svg';
   static const String assetsSelfTestResult =
-      "assets/icons/functions_icons/automation_functions/self_test_result.svg";
+      'assets/icons/functions_icons/automation_functions/self_test_result.svg';
   static const String assetsPresence =
-      "assets/icons/functions_icons/automation_functions/presence.svg";
+      'assets/icons/functions_icons/automation_functions/presence.svg';
   static const String assetsMotion =
-      "assets/icons/functions_icons/automation_functions/motion.svg";
+      'assets/icons/functions_icons/automation_functions/motion.svg';
   static const String assetsCurrentTemp =
-      "assets/icons/functions_icons/automation_functions/current_temp.svg";
+      'assets/icons/functions_icons/automation_functions/current_temp.svg';
   static const String assetsPresenceState =
-      "assets/icons/functions_icons/automation_functions/presence_state.svg";
+      'assets/icons/functions_icons/automation_functions/presence_state.svg';
   //assets/icons/routine/automation.svg
   static const String automation = 'assets/icons/routine/automation.svg';
   static const String searchIconUser = 'assets/icons/search_icon_user.svg';
@@ -501,4 +501,5 @@ class Assets {
   static const String aqiAirQuality = 'assets/icons/aqi_air_quality.svg';
   static const String temperatureAqiSidebar = 'assets/icons/thermometer.svg';
   static const String humidityAqiSidebar = 'assets/icons/humidity.svg';
+  static const String autocadOccupancyImage = 'assets/images/autocad_occupancy_image.png';
 }