doesnt fetch devices on date change.

<!--
  Thanks for contributing!

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

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

## Description

analytics hotfixes.

## Type of Change

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

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

lib/pages/analytics/models/range_of_aqi.dart

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

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

@@ -24,11 +24,13 @@ abstract final class FetchAirQualityDataHelper {
   }) {
     final date = context.read<AnalyticsDatePickerBloc>().state.monthlyDate;
     final aqiType = context.read<AirQualityDistributionBloc>().state.selectedAqiType;
-    loadAnalyticsDevices(
-      context,
-      communityUuid: communityUuid,
-      spaceUuid: spaceUuid,
-    );
+    if (shouldFetchAnalyticsDevices) {
+      loadAnalyticsDevices(
+        context,
+        communityUuid: communityUuid,
+        spaceUuid: spaceUuid,
+      );
+    }
     loadRangeOfAqi(
       context,
       spaceUuid: spaceUuid,

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

@@ -23,6 +23,7 @@ abstract final class RangeOfAqiChartsHelper {
     return titlesData.copyWith(
       bottomTitles: titlesData.bottomTitles.copyWith(
         sideTitles: titlesData.bottomTitles.sideTitles.copyWith(
+          reservedSize: 36,
           getTitlesWidget: (value, meta) => Padding(
             padding: const EdgeInsetsDirectional.only(top: 20.0),
             child: Text(
@@ -40,6 +41,7 @@ abstract final class RangeOfAqiChartsHelper {
           reservedSize: 70,
           interval: 50,
           maxIncluded: false,
+          minIncluded: true,
           getTitlesWidget: (value, meta) {
             final text = value >= 300 ? '301+' : value.toInt().toString();
             return Padding(

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

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

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

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

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

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

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

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

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

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

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

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

lib/pages/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/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));
             }